@jsenv/core 27.5.3 → 27.6.0

package/src/plugins/html_supervisor/client/html_supervisor_installer.js

@@ -88,11 +88,15 @@ export const installHtmlSupervisor = ({
     let completed
     let result
     let error
+    const urlObject = new URL(src, window.location)
+    if (reload) {
+      urlObject.searchParams.set("hmr", Date.now())
+    }
+    __html_supervisor__.currentExecution = {
+      type: type === "module" ? "dynamic_import" : "script_injection",
+      url: urlObject.href,
+    }
     try {
-      const urlObject = new URL(src, window.location)
-      if (reload) {
-        urlObject.searchParams.set("hmr", Date.now())
-      }
       result = await execute(urlObject.href)
       completed = true
     } catch (e) {
@@ -110,6 +114,7 @@ export const installHtmlSupervisor = ({
         console.log(`${type} load ended`)
         console.groupEnd()
       }
+      __html_supervisor__.currentExecution = null
       return
     }
     const executionResult = {
@@ -140,6 +145,7 @@ export const installHtmlSupervisor = ({
     if (logs) {
       console.groupEnd()
     }
+    __html_supervisor__.currentExecution = null
   }
 
   const classicExecutionQueue = createExecutionQueue(performExecution)
@@ -220,76 +226,28 @@ export const installHtmlSupervisor = ({
   })
 
   if (errorOverlay) {
+    const onErrorReportedByBrowser = (error, { url, line, column }) => {
+      displayErrorInDocument(error, {
+        rootDirectoryUrl,
+        errorBaseUrl,
+        openInEditor,
+        url,
+        line,
+        column,
+      })
+    }
     window.addEventListener("error", (errorEvent) => {
       if (!errorEvent.isTrusted) {
         // ignore custom error event (not sent by browser)
         return
       }
       const { error, filename, lineno, colno } = errorEvent
-      displayErrorInDocument(error, {
-        rootDirectoryUrl,
-        errorBaseUrl,
-        openInEditor,
+      onErrorReportedByBrowser(error, {
         url: filename,
         line: lineno,
         column: colno,
-        reportedBy: "browser",
       })
     })
-    if (window.__server_events__) {
-      const isExecuting = () => {
-        if (pendingExecutionCount > 0) {
-          return true
-        }
-        if (
-          document.readyState === "loading" ||
-          document.readyState === "interactive"
-        ) {
-          return true
-        }
-        if (window.__reloader__ && window.__reloader__.status === "reloading") {
-          return true
-        }
-        return false
-      }
-      window.__server_events__.addEventCallbacks({
-        error_while_serving_file: (serverErrorEvent) => {
-          if (!isExecuting()) {
-            return
-          }
-          const {
-            message,
-            stack,
-            traceUrl,
-            traceLine,
-            traceColumn,
-            traceMessage,
-            requestedRessource,
-            isFaviconAutoRequest,
-          } = JSON.parse(serverErrorEvent.data)
-          if (isFaviconAutoRequest) {
-            return
-          }
-          displayErrorInDocument(
-            {
-              message,
-              stack,
-            },
-            {
-              rootDirectoryUrl,
-              errorBaseUrl,
-              openInEditor,
-              url: traceUrl,
-              line: traceLine,
-              column: traceColumn,
-              codeFrame: traceMessage,
-              reportedBy: "server",
-              requestedRessource,
-            },
-          )
-        },
-      })
-    }
   }
 }
 

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -47,25 +47,6 @@ export const jsenvPluginHtmlSupervisor = ({
       test: true,
     },
     serve: (request, context) => {
-      if (request.ressource.startsWith("/__open_in_editor__/")) {
-        const file = request.ressource.slice("/__open_in_editor__/".length)
-        if (!file) {
-          return {
-            status: 400,
-            body: "Missing file in url",
-          }
-        }
-        const launch = requireFromJsenv("launch-editor")
-        launch(fileURLToPath(file), () => {
-          // ignore error for now
-        })
-        return {
-          status: 200,
-          headers: {
-            "cache-control": "no-store",
-          },
-        }
-      }
       if (request.ressource.startsWith("/__get_code_frame__/")) {
         const url = request.ressource.slice("/__get_code_frame__/".length)
         const match = url.match(/:([0-9]+):([0-9]+)$/)
@@ -99,6 +80,76 @@ export const jsenvPluginHtmlSupervisor = ({
           body: codeFrame,
         }
       }
+      if (request.ressource.startsWith("/__get_error_cause__/")) {
+        const file = request.ressource.slice("/__get_error_cause__/".length)
+        if (!file) {
+          return {
+            status: 400,
+            body: "Missing file in url",
+          }
+        }
+        const getErrorCauseInfo = () => {
+          const urlInfo = context.urlGraph.getUrlInfo(file)
+          if (!urlInfo) {
+            return null
+          }
+          const { error } = urlInfo
+          if (error) {
+            return error
+          }
+          // search in direct dependencies (404 or 500)
+          const { dependencies } = urlInfo
+          for (const dependencyUrl of dependencies) {
+            const dependencyUrlInfo = context.urlGraph.getUrlInfo(dependencyUrl)
+            if (dependencyUrlInfo.error) {
+              return dependencyUrlInfo.error
+            }
+          }
+          return null
+        }
+        const causeInfo = getErrorCauseInfo()
+        const body = JSON.stringify(
+          causeInfo
+            ? {
+                code: causeInfo.code,
+                message: causeInfo.message,
+                reason: causeInfo.reason,
+                stack: causeInfo.stack,
+                codeFrame: causeInfo.traceMessage,
+              }
+            : null,
+          null,
+          "  ",
+        )
+        return {
+          status: 200,
+          headers: {
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            "content-length": Buffer.byteLength(body),
+          },
+          body,
+        }
+      }
+      if (request.ressource.startsWith("/__open_in_editor__/")) {
+        const file = request.ressource.slice("/__open_in_editor__/".length)
+        if (!file) {
+          return {
+            status: 400,
+            body: "Missing file in url",
+          }
+        }
+        const launch = requireFromJsenv("launch-editor")
+        launch(fileURLToPath(file), () => {
+          // ignore error for now
+        })
+        return {
+          status: 200,
+          headers: {
+            "cache-control": "no-store",
+          },
+        }
+      }
       return null
     },
     transformUrlContent: {