work

Author: dmail

dist/build/build.js

@@ -3,8 +3,8 @@ import { extname } from "node:path";
 import { readFileSync as readFileSync$1, existsSync, readdir, chmod, stat, lstat, chmodSync, statSync, lstatSync, promises, readdirSync, openSync, closeSync, unlinkSync, rmdirSync, mkdirSync, writeFileSync as writeFileSync$1, unlink, rmdir, watch, realpathSync } from "node:fs";
 import crypto, { createHash } from "node:crypto";
 import { pathToFileURL, fileURLToPath } from "node:url";
-import { cpus, totalmem, freemem } from "node:os";
-import { cpuUsage, memoryUsage } from "node:process";
+import { totalmem, freemem } from "node:os";
+import { memoryUsage } from "node:process";
 import { stripVTControlCharacters } from "node:util";
 
 const createCallbackListNotifiedOnce = () => {
@@ -6548,174 +6548,6 @@ const getExtensionsToTry = (magicExtensions, importer) => {
   return Array.from(extensionsSet.values());
 };
 
-const startMeasuringTotalCpuUsage = () => {
-  let previousCpuArray = cpus();
-  let previousMs = Date.now();
-  let previousCpuUsage = cpuUsage();
-
-  const overall = {
-    inactive: 100,
-    active: 0,
-    system: 0,
-    user: 0,
-  };
-  const thisProcess = {
-    active: 0,
-    system: 0,
-    user: 0,
-  };
-  const details = previousCpuArray.map(() => {
-    return {
-      inactive: 100,
-      active: 0,
-      system: 0,
-      user: 0,
-    };
-  });
-
-  const samples = [];
-  const interval = setInterval(() => {
-    let cpuArray = cpus();
-    const ms = Date.now();
-    const ellapsedMs = ms - previousMs;
-    const cpuUsageSampleArray = [];
-    let overallSystemMs = 0;
-    let overallUserMs = 0;
-    let overallInactiveMs = 0;
-    let overallActiveMs = 0;
-    let overallMsEllapsed = 0;
-    let index = 0;
-    for (const cpu of cpuArray) {
-      const previousCpuTimes = previousCpuArray[index].times;
-      const cpuTimes = cpu.times;
-      const systemMs = cpuTimes.sys - previousCpuTimes.sys;
-      const userMs = cpuTimes.user - previousCpuTimes.user;
-      const activeMs = systemMs + userMs;
-      const inactiveMs = ellapsedMs - activeMs;
-      const cpuUsageSample = {
-        inactive: inactiveMs / ellapsedMs,
-        active: activeMs / ellapsedMs,
-        system: systemMs / ellapsedMs,
-        user: userMs / ellapsedMs,
-      };
-      cpuUsageSampleArray.push(cpuUsageSample);
-
-      overallSystemMs += systemMs;
-      overallUserMs += userMs;
-      overallInactiveMs += inactiveMs;
-      overallActiveMs += activeMs;
-      overallMsEllapsed += ellapsedMs;
-      index++;
-    }
-    const overallUsageSample = {
-      inactive: overallInactiveMs / overallMsEllapsed,
-      active: overallActiveMs / overallMsEllapsed,
-      system: overallSystemMs / overallMsEllapsed,
-      user: overallUserMs / overallMsEllapsed,
-    };
-    previousCpuArray = cpuArray;
-    previousMs = ms;
-
-    const processCpuUsage = cpuUsage();
-    const thisProcessSystemMs = Math.round(
-      (processCpuUsage.system - previousCpuUsage.system) / 1000,
-    );
-    const thisProcessUserMs = Math.round(
-      (processCpuUsage.user - previousCpuUsage.user) / 1000,
-    );
-    previousCpuUsage = processCpuUsage;
-
-    const thisProcessActiveMs = thisProcessSystemMs + thisProcessUserMs;
-    const thisProcessInactiveMs = overallMsEllapsed - thisProcessActiveMs;
-    const thisProcessSample = {
-      inactive: thisProcessInactiveMs / overallMsEllapsed,
-      active: thisProcessActiveMs / overallMsEllapsed,
-      system: thisProcessSystemMs / overallMsEllapsed,
-      user: thisProcessUserMs / overallMsEllapsed,
-    };
-    samples.push({
-      cpuUsageSampleArray,
-      overallUsageSample,
-      thisProcessSample,
-    });
-    if (samples.length === 10) {
-      {
-        let index = 0;
-        for (const detail of details) {
-          let systemSum = 0;
-          let userSum = 0;
-          let inactiveSum = 0;
-          let activeSum = 0;
-          for (const sample of samples) {
-            const { cpuUsageSampleArray } = sample;
-            const cpuUsageSample = cpuUsageSampleArray[index];
-            inactiveSum += cpuUsageSample.inactive;
-            activeSum += cpuUsageSample.active;
-            systemSum += cpuUsageSample.system;
-            userSum += cpuUsageSample.user;
-          }
-          Object.assign(detail, {
-            inactive: inactiveSum / samples.length,
-            active: activeSum / samples.length,
-            system: systemSum / samples.length,
-            user: userSum / samples.length,
-          });
-          index++;
-        }
-      }
-      {
-        let overallSystemSum = 0;
-        let overallUserSum = 0;
-        let overallInactiveSum = 0;
-        let overallActiveSum = 0;
-        for (const sample of samples) {
-          const { overallUsageSample } = sample;
-          overallSystemSum += overallUsageSample.system;
-          overallUserSum += overallUsageSample.user;
-          overallInactiveSum += overallUsageSample.inactive;
-          overallActiveSum += overallUsageSample.active;
-        }
-        Object.assign(overall, {
-          inactive: overallInactiveSum / samples.length,
-          active: overallActiveSum / samples.length,
-          system: overallSystemSum / samples.length,
-          user: overallUserSum / samples.length,
-        });
-      }
-      {
-        let thisProcessSystemSum = 0;
-        let thisProcessUserSum = 0;
-        let thisProcessInactiveSum = 0;
-        let thisProcessActiveSum = 0;
-        for (const sample of samples) {
-          const { thisProcessSample } = sample;
-          thisProcessSystemSum += thisProcessSample.system;
-          thisProcessUserSum += thisProcessSample.user;
-          thisProcessInactiveSum += thisProcessSample.inactive;
-          thisProcessActiveSum += thisProcessSample.active;
-        }
-        Object.assign(thisProcess, {
-          inactive: thisProcessInactiveSum / samples.length,
-          active: thisProcessActiveSum / samples.length,
-          system: thisProcessSystemSum / samples.length,
-          user: thisProcessUserSum / samples.length,
-        });
-      }
-      samples.length = 0;
-    }
-  }, 15);
-  interval.unref();
-
-  return {
-    overall,
-    thisProcess,
-    details,
-    stop: () => {
-      clearInterval(interval);
-    },
-  };
-};
-
 const startMonitoringMetric = (measure) => {
   const metrics = [];
   const takeMeasure = () => {
@@ -6761,22 +6593,6 @@ const medianFromSortedArray = (array) => {
   return medianNumber;
 };
 
-// https://gist.github.com/GaetanoPiazzolla/c40e1ebb9f709d091208e89baf9f4e00
-
-
-const startMonitoringCpuUsage = () => {
-  const cpuUsage = startMeasuringTotalCpuUsage();
-  const processCpuUsageMonitoring = startMonitoringMetric(() => {
-    return cpuUsage.thisProcess.active;
-  });
-  const osCpuUsageMonitoring = startMonitoringMetric(() => {
-    return cpuUsage.overall.active;
-  });
-  const result = [processCpuUsageMonitoring, osCpuUsageMonitoring];
-  result.stop = cpuUsage.stop;
-  return result;
-};
-
 const startMonitoringMemoryUsage = () => {
   const processMemoryUsageMonitoring = startMonitoringMetric(() => {
     return memoryUsage().rss;
@@ -11231,4 +11047,4 @@ const escapeRegexpSpecialChars = (string) => {
   });
 };
 
-export { ANSI, Abort, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, UNICODE, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, bufferToEtag, clearDirectorySync, collectFiles, compareFileUrls, comparePathnames, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createDynamicLog, createLogger, createLookupPackageDirectory, createTaskLog, distributePercentages, ensureEmptyDirectory, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, escapeRegexpSpecialChars, generateContentFrame, getCallerPosition, getExtensionsToTry, humanizeDuration, humanizeFileSize, humanizeMemory, inferRuntimeCompatFromClosestPackage, injectQueryParamIntoSpecifierWithoutEncoding, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, moveUrl, nodeDefaultRuntimeCompat, normalizeImportMap, normalizeUrl, raceProcessTeardownEvents, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, renderBigSection, renderDetails, renderTable, renderUrlOrRelativeUrlFilename, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, startMonitoringCpuUsage, startMonitoringMemoryUsage, stringifyUrlSite, updateJsonFileSync, urlIsOrIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };
+export { ANSI, Abort, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, UNICODE, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, bufferToEtag, clearDirectorySync, collectFiles, compareFileUrls, comparePathnames, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createDynamicLog, createLogger, createLookupPackageDirectory, createTaskLog, distributePercentages, ensureEmptyDirectory, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, escapeRegexpSpecialChars, generateContentFrame, getCallerPosition, getExtensionsToTry, humanizeDuration, humanizeFileSize, humanizeMemory, inferRuntimeCompatFromClosestPackage, injectQueryParamIntoSpecifierWithoutEncoding, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, moveUrl, nodeDefaultRuntimeCompat, normalizeImportMap, normalizeUrl, raceProcessTeardownEvents, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, renderBigSection, renderDetails, renderTable, renderUrlOrRelativeUrlFilename, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, startMonitoringMemoryUsage, stringifyUrlSite, updateJsonFileSync, urlIsOrIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };

dist/build/jsenv_core_packages.js

@@ -2467,8 +2467,7 @@ const parseAndTransformJsReferences = async (
   for (const sequentialAction of sequentialActions) {
     await sequentialAction();
   }
-  const { content, sourcemap } = magicSource.toContentAndSourcemap();
-  return { content, sourcemap };
+  return magicSource.toContentAndSourcemap();
 };
 
 const jsenvPluginReferenceExpectedTypes = () => {
@@ -6161,6 +6160,8 @@ const jsenvPluginImportMetaCss = () => {
             inputIsJsModule: true,
             inputUrl: urlInfo.originalUrl,
             outputUrl: urlInfo.generatedUrl,
+            // the map would be dropped: the content sent back carries none
+            options: { sourceMaps: false },
           });
           if (code === urlInfo.content) {
             // all assignments were already in array form (pre-built file) — nothing to do
@@ -8241,7 +8242,10 @@ const devServerPluginOmegaErrorHandler = () => {
               status: 403,
             };
           }
-          return convertFileSystemErrorToResponseProperties(error);
+          // the dev server runs with canExposeSensitiveData: file paths are welcome
+          return convertFileSystemErrorToResponseProperties(error, {
+            canExposeSensitiveData: true,
+          });
         };
         const response = getResponseForError();
         if (!response) {
@@ -8427,10 +8431,9 @@ const prependJsClassicInJsClassic = (jsUrlInfo, urlInfoToPrepend) => {
   const magicSource = createMagicSource(jsUrlInfo.content);
   magicSource.prepend(`${urlInfoToPrepend.content}\n\n`);
   const magicResult = magicSource.toContentAndSourcemap();
-  const sourcemap = composeTwoSourcemaps(
-    jsUrlInfo.sourcemap,
-    magicResult.sourcemap,
-  );
+  const sourcemap = jsUrlInfo.context.sourcemapsEnabled
+    ? composeTwoSourcemaps(jsUrlInfo.sourcemap, magicResult.sourcemap)
+    : null;
   jsUrlInfo.mutateContent({
     content: magicResult.content,
     sourcemap,
@@ -8448,6 +8451,7 @@ const prependJsClassicInJsModule = async (jsUrlInfo, urlInfoToPrepend) => {
     input: jsUrlInfo.content,
     inputIsJsModule: true,
     inputUrl: jsUrlInfo.originalUrl,
+    options: { sourceMaps: jsUrlInfo.context.sourcemapsEnabled },
   });
   jsUrlInfo.mutateContent({
     content: code,
@@ -10172,7 +10176,6 @@ const createUrlInfoTransformer = ({
       contentAst, // undefined most of the time
       contentEtag, // in practice always undefined
       contentLength,
-      sourcemap,
       sourcemapIsWrong,
       contentInjections,
     } = transformations;
@@ -10199,11 +10202,14 @@ const createUrlInfoTransformer = ({
         contentLength,
       });
     }
-    if (
-      sourcemap &&
-      mayHaveSourcemap(urlInfo) &&
-      shouldHandleSourcemap(urlInfo)
-    ) {
+    // "sourcemap" is read last, and only when it will be used: a plugin can
+    // hand it back as a getter that generates the map on first read, so that
+    // nothing is generated for a kitchen that throws sourcemaps away
+    const sourcemap =
+      mayHaveSourcemap(urlInfo) && shouldHandleSourcemap(urlInfo)
+        ? transformations.sourcemap
+        : null;
+    if (sourcemap) {
       const sourcemapNormalized = normalizeSourcemap(urlInfo, sourcemap);
       let currentSourcemap = urlInfo.sourcemap;
       const finalSourcemap = composeTwoSourcemaps(
@@ -10236,6 +10242,14 @@ const createUrlInfoTransformer = ({
     writeInsideOutDirectory(urlInfo);
   };
 
+  // Written synchronously on purpose, and measured: async is the tempting
+  // choice, but here it loses. A cold load cooks hundreds of files; their
+  // synchronous writes block the event loop ~160ms in total, while
+  // asynchronous writes queue in the threadpool behind tens of MB of content
+  // and sourcemaps, and a response that waits for its own write then waits
+  // ~36ms on average (18s summed over 500 responses). Not waiting is not an
+  // option either: the last write lands after the test that cooked it has
+  // ended, and the side-effect snapshots lose it.
   const writeInsideOutDirectory = (urlInfo) => {
     // writing result inside ".jsenv" directory (debug purposes)
     if (!outDirectoryUrl) {
@@ -10555,6 +10569,12 @@ const createKitchen = ({
       INJECTIONS,
       getPluginMeta: null,
       sourcemaps,
+      // a plugin producing a sourcemap can skip the work when it would be
+      // thrown away (see shouldHandleSourcemap in url_info_transformations.js)
+      sourcemapsEnabled:
+        sourcemaps === "inline" ||
+        sourcemaps === "file" ||
+        sourcemaps === "programmatic",
       outDirectoryUrl,
     },
     resolve: (specifier, importer = rootDirectoryUrl) => {

dist/start_dev_server/start_dev_server.js

@@ -75,10 +75,10 @@
     "@jsenv/ast": "6.9.2",
     "@jsenv/js-module-fallback": "1.5.1",
     "@jsenv/plugin-bundling": "2.10.18",
-    "@jsenv/plugin-minification": "1.7.9",
+    "@jsenv/plugin-minification": "1.7.10",
     "@jsenv/plugin-supervisor": "1.8.13",
     "@jsenv/plugin-transpilation": "1.6.1",
-    "@jsenv/server": "17.6.1",
+    "@jsenv/server": "17.6.2",
     "@jsenv/sourcemap": "1.4.2",
     "react-table": "7.8.0"
   },

package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@jsenv/database": "0.0.15",
-    "@jsenv/server": "17.6.1",
+    "@jsenv/server": "17.6.2",
     "@jsenv/urls": "2.9.10",
     "@tanstack/table-core": "8.21.3",
     "jsonwebtoken": "9.0.3",

packages/backend/database-manager/package.json

@@ -25,6 +25,7 @@ await startServer({
 - WebSocket and Server-Sent Events, with a broadcast helper
 - HTTPS, with http → https redirection; http2 as an option
 - CORS, server timing and error pages as plugins
+- Host header check (DNS rebinding) and bounded request bodies
 - A route inspector at `/.internal/route_inspector`
 
 # Installation