@jsenv/core 27.3.4 → 27.5.1

package/src/omega/errors.js

@@ -1,4 +1,5 @@
 import { createDetailedMessage } from "@jsenv/log"
+import { stringifyUrlSite } from "@jsenv/urls"
 
 export const createResolveUrlError = ({
   pluginController,
@@ -15,7 +16,7 @@ export const createResolveUrlError = ({
         reason,
         ...details,
         "specifier": `"${reference.specifier}"`,
-        "specifier trace": reference.trace,
+        "specifier trace": reference.trace.message,
         ...detailsFromPluginController(pluginController),
       }),
     )
@@ -46,19 +47,24 @@ export const createFetchUrlContentError = ({
     reason,
     ...details
   }) => {
-    const fetchContentError = new Error(
+    const fetchError = new Error(
       createDetailedMessage(`Failed to fetch url content`, {
         reason,
         ...details,
         "url": urlInfo.url,
-        "url reference trace": reference.trace,
+        "url reference trace": reference.trace.message,
         ...detailsFromPluginController(pluginController),
       }),
     )
-    fetchContentError.name = "FETCH_URL_CONTENT_ERROR"
-    fetchContentError.code = code
-    fetchContentError.reason = reason
-    return fetchContentError
+    fetchError.name = "FETCH_URL_CONTENT_ERROR"
+    fetchError.code = code
+    fetchError.reason = reason
+    fetchError.url = urlInfo.url
+    fetchError.traceUrl = reference.trace.url
+    fetchError.traceLine = reference.trace.line
+    fetchError.traceColumn = reference.trace.column
+    fetchError.traceMessage = reference.trace.message
+    return fetchError
   }
 
   if (error.code === "EPERM") {
@@ -103,7 +109,7 @@ export const createTransformUrlContentError = ({
           reason,
           ...details,
           "url": urlInfo.url,
-          "url reference trace": reference.trace,
+          "url reference trace": reference.trace.message,
           ...detailsFromPluginController(pluginController),
         },
       ),
@@ -111,6 +117,34 @@ export const createTransformUrlContentError = ({
     transformError.name = "TRANSFORM_URL_CONTENT_ERROR"
     transformError.code = code
     transformError.reason = reason
+    transformError.stack = error.stack
+    transformError.url = urlInfo.url
+    transformError.traceUrl = reference.trace.url
+    transformError.traceLine = reference.trace.line
+    transformError.traceColumn = reference.trace.column
+    transformError.traceMessage = reference.trace.message
+    if (code === "PARSE_ERROR") {
+      transformError.reason = error.message
+      if (urlInfo.isInline) {
+        transformError.traceLine = reference.trace.line + error.line - 1
+        transformError.traceColumn = reference.trace.column + error.column
+        transformError.traceMessage = stringifyUrlSite({
+          url: urlInfo.inlineUrlSite.url,
+          line: transformError.traceLine,
+          column: transformError.traceColumn,
+          content: urlInfo.inlineUrlSite.content,
+        })
+      } else {
+        transformError.traceLine = error.line
+        transformError.traceColumn = error.column
+        transformError.traceMessage = stringifyUrlSite({
+          url: urlInfo.url,
+          line: error.line - 1,
+          column: error.column,
+          content: urlInfo.content,
+        })
+      }
+    }
     return transformError
   }
   return createFailedToTransformError({
@@ -130,7 +164,7 @@ export const createFinalizeUrlContentError = ({
       "reason": `An error occured during "finalizeUrlContent"`,
       ...detailsFromValueThrown(error),
       "url": urlInfo.url,
-      "url reference trace": reference.trace,
+      "url reference trace": reference.trace.message,
       ...detailsFromPluginController(pluginController),
     }),
   )

package/src/omega/kitchen.js

@@ -7,7 +7,7 @@ import {
   setUrlFilename,
 } from "@jsenv/urls"
 import { writeFileSync, ensureWindowsDriveLetter } from "@jsenv/filesystem"
-import { createDetailedMessage } from "@jsenv/log"
+import { createLogger, createDetailedMessage } from "@jsenv/log"
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 import { createPluginController } from "../plugins/plugin_controller.js"
@@ -25,12 +25,13 @@ import { isWebWorkerEntryPointReference } from "./web_workers.js"
 
 export const createKitchen = ({
   signal,
-  logger,
+  logLevel,
+
   rootDirectoryUrl,
+  scenario,
+  runtimeCompat,
   urlGraph,
-
   plugins,
-  scenario,
   sourcemaps = {
     dev: "inline", // "programmatic" and "file" also allowed
     test: "inline",
@@ -44,9 +45,9 @@ export const createKitchen = ({
     build: true,
   }[scenario],
   sourcemapsRelativeSources,
-  runtimeCompat,
   writeGeneratedFiles,
 }) => {
+  const logger = createLogger({ logLevel })
   const pluginController = createPluginController({
     plugins,
     scenario,
@@ -56,13 +57,13 @@ export const createKitchen = ({
     signal,
     logger,
     rootDirectoryUrl,
-    sourcemaps,
     urlGraph,
     scenario,
     runtimeCompat,
     isSupportedOnFutureClients: (feature) => {
       return RUNTIME_COMPAT.isSupported(runtimeCompat, feature)
     },
+    sourcemaps,
   }
   pluginController.callHooks("init", kitchenContext)
   const createReference = ({
@@ -221,7 +222,10 @@ export const createKitchen = ({
     sourcemapsRelativeSources,
     injectSourcemapPlaceholder: ({ urlInfo, specifier }) => {
       const sourcemapReference = createReference({
-        trace: `sourcemap comment placeholder for ${urlInfo.url}`,
+        trace: {
+          message: `sourcemap comment placeholder`,
+          url: urlInfo.url,
+        },
         type: "sourcemap_comment",
         subtype: urlInfo.contentType === "text/javascript" ? "js" : "css",
         parentUrl: urlInfo.url,
@@ -238,15 +242,14 @@ export const createKitchen = ({
       specifierLine,
       specifierColumn,
     }) => {
+      const sourcemapUrlSite = adjustUrlSite(urlInfo, {
+        urlGraph,
+        url: urlInfo.url,
+        line: specifierLine,
+        column: specifierColumn,
+      })
       const sourcemapReference = createReference({
-        trace: stringifyUrlSite(
-          adjustUrlSite(urlInfo, {
-            urlGraph,
-            url: urlInfo.url,
-            line: specifierLine,
-            column: specifierColumn,
-          }),
-        ),
+        trace: traceFromUrlSite(sourcemapUrlSite),
         type,
         parentUrl: urlInfo.url,
         specifier,
@@ -273,7 +276,7 @@ export const createKitchen = ({
             `no plugin has handled url during "fetchUrlContent" hook -> url will be ignored`,
             {
               "url": urlInfo.url,
-              "url reference trace": reference.trace,
+              "url reference trace": reference.trace.message,
             },
           ),
         )
@@ -408,7 +411,7 @@ export const createKitchen = ({
         },
         found: ({ trace, ...rest }) => {
           if (trace === undefined) {
-            trace = stringifyUrlSite(
+            trace = traceFromUrlSite(
               adjustUrlSite(urlInfo, {
                 urlGraph,
                 url: urlInfo.url,
@@ -423,7 +426,12 @@ export const createKitchen = ({
             ...rest,
           })
         },
-        foundInline: ({ isOriginalPosition, line, column, ...rest }) => {
+        foundInline: ({
+          isOriginalPosition,
+          specifierLine,
+          specifierColumn,
+          ...rest
+        }) => {
           const parentUrl = isOriginalPosition
             ? urlInfo.url
             : urlInfo.generatedUrl
@@ -431,15 +439,15 @@ export const createKitchen = ({
             ? urlInfo.originalContent
             : urlInfo.content
           return addReference({
-            trace: stringifyUrlSite({
+            trace: traceFromUrlSite({
               url: parentUrl,
               content: parentContent,
-              line,
-              column,
+              line: specifierLine,
+              column: specifierColumn,
             }),
             isOriginalPosition,
-            line,
-            column,
+            specifierLine,
+            specifierColumn,
             isInline: true,
             ...rest,
           })
@@ -487,7 +495,7 @@ export const createKitchen = ({
             ? urlInfo.originalContent
             : urlInfo.content
           return referenceUtils.update(reference, {
-            trace: stringifyUrlSite({
+            trace: traceFromUrlSite({
               url: parentUrl,
               content: parentContent,
               line: specifierLine,
@@ -505,7 +513,7 @@ export const createKitchen = ({
         inject: ({ trace, ...rest }) => {
           if (trace === undefined) {
             const { url, line, column } = getCallerPosition()
-            trace = stringifyUrlSite({
+            trace = traceFromUrlSite({
               url,
               line,
               column,
@@ -722,6 +730,15 @@ const memoizeCook = (cook) => {
   }
 }
 
+const traceFromUrlSite = (urlSite) => {
+  return {
+    message: stringifyUrlSite(urlSite),
+    url: urlSite.url,
+    line: urlSite.line,
+    column: urlSite.column,
+  }
+}
+
 const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
   if (reference.shouldHandle) {
     urlInfo.shouldHandle = true

package/src/omega/omega_server.js

@@ -1,13 +1,10 @@
 import {
   jsenvAccessControlAllowedHeaders,
   startServer,
-  composeServices,
-  pluginServerTiming,
-  pluginRequestWaitingCheck,
-  pluginCORS,
+  jsenvServiceCORS,
+  jsenvServiceErrorHandler,
 } from "@jsenv/server"
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
-import { createCallbackListNotifiedOnce } from "@jsenv/abort"
 
 import { createFileService } from "./server/file_service.js"
 
@@ -19,28 +16,31 @@ export const startOmegaServer = async ({
   http2 = protocol === "https",
   privateKey,
   certificate,
-  listenAnyIp,
-  ip,
+  acceptAnyIp,
+  host,
   port = 0,
   keepProcessAlive = false,
   onStop = () => {},
-  serverPlugins,
-  services,
+  services = [],
 
   rootDirectoryUrl,
   scenario,
-  urlGraph,
-  kitchen,
+  runtimeCompat,
+
+  plugins,
+  urlAnalysis,
+  htmlSupervisor,
+  nodeEsmResolution,
+  fileSystemMagicResolution,
+  transpilation,
+  clientAutoreload,
+  clientFiles,
+  cooldownBetweenFileEvents,
+  explorer,
+  sourcemaps,
+  writeGeneratedFiles,
 }) => {
-  const serverStopCallbackList = createCallbackListNotifiedOnce()
-  const coreServices = {
-    "service:file": createFileService({
-      rootDirectoryUrl,
-      urlGraph,
-      kitchen,
-      scenario,
-    }),
-  }
+  const serverStopCallbacks = []
   const server = await startServer({
     signal,
     stopOnExit: false,
@@ -54,12 +54,12 @@ export const startOmegaServer = async ({
     http2,
     certificate,
     privateKey,
-    listenAnyIp,
-    ip,
+    acceptAnyIp,
+    host,
     port,
-    plugins: {
-      ...serverPlugins,
-      ...pluginCORS({
+    requestWaitingMs: 60_1000,
+    services: [
+      jsenvServiceCORS({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,
         accessControlAllowRequestHeaders: true,
@@ -68,61 +68,83 @@ export const startOmegaServer = async ({
           "x-jsenv-execution-id",
         ],
         accessControlAllowCredentials: true,
+        timingAllowOrigin: true,
       }),
-      ...pluginServerTiming(),
-      ...pluginRequestWaitingCheck({
-        requestWaitingMs: 60 * 1000,
-      }),
-    },
-    sendErrorDetails: true,
-    errorToResponse: (error, { request }) => {
-      const getResponseForError = () => {
-        if (error && error.asResponse) {
-          return error.asResponse()
-        }
-        if (error && error.statusText === "Unexpected directory operation") {
+      ...services,
+      {
+        name: "jsenv:omega_file_service",
+        handleRequest: createFileService({
+          signal,
+          logLevel,
+          serverStopCallbacks,
+
+          rootDirectoryUrl,
+          scenario,
+          runtimeCompat,
+
+          plugins,
+          urlAnalysis,
+          htmlSupervisor,
+          nodeEsmResolution,
+          fileSystemMagicResolution,
+          transpilation,
+          clientAutoreload,
+          clientFiles,
+          cooldownBetweenFileEvents,
+          explorer,
+          sourcemaps,
+          writeGeneratedFiles,
+        }),
+      },
+      {
+        name: "jsenv:omega_error_handler",
+        handleError: (error) => {
+          const getResponseForError = () => {
+            if (error && error.asResponse) {
+              return error.asResponse()
+            }
+            if (
+              error &&
+              error.statusText === "Unexpected directory operation"
+            ) {
+              return {
+                status: 403,
+              }
+            }
+            return convertFileSystemErrorToResponseProperties(error)
+          }
+          const response = getResponseForError()
+          if (!response) {
+            return null
+          }
+          const body = JSON.stringify({
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+            body: response.body,
+          })
           return {
-            status: 403,
+            status: 200,
+            headers: {
+              "content-type": "application/json",
+              "content-length": Buffer.byteLength(body),
+            },
+            body,
           }
-        }
-        return convertFileSystemErrorToResponseProperties(error)
-      }
-      const response = getResponseForError()
-      if (!response) {
-        return null
-      }
-      const isInspectRequest = new URL(
-        request.ressource,
-        request.origin,
-      ).searchParams.has("__inspect__")
-      if (!isInspectRequest) {
-        return response
-      }
-      const body = JSON.stringify({
-        status: response.status,
-        statusText: response.statusText,
-        headers: response.headers,
-        body: response.body,
-      })
-      return {
-        status: 200,
-        headers: {
-          "content-type": "application/json",
-          "content-length": Buffer.byteLength(body),
         },
-        body,
-      }
-    },
-    requestToResponse: composeServices({
-      ...services,
-      ...coreServices,
-    }),
+      },
+      // default error handling
+      jsenvServiceErrorHandler({
+        sendErrorDetails: true,
+      }),
+    ],
     onStop: (reason) => {
       onStop()
-      serverStopCallbackList.notify(reason)
+      serverStopCallbacks.forEach((serverStopCallback) => {
+        serverStopCallback(reason)
+      })
+      serverStopCallbacks.length = 0
     },
   })
-  return {
-    ...server,
-  }
+  return server
 }