@jsenv/plugin-supervisor 1.3.3 → 1.3.5

package/dist/js/supervisor.js

@@ -9,6 +9,7 @@ window.__supervisor__ = (() => {
     reloadSupervisedScript: notImplemented,
     getDocumentExecutionResult: notImplemented
   };
+  const isWebkitOrSafari = typeof window.webkitConvertPointFromNodeToPage === "function";
   const executionResults = {};
   let documentExecutionStartTime;
   try {
@@ -205,7 +206,7 @@ window.__supervisor__ = (() => {
         error
       };
     };
-    const isWebkitOrSafari = typeof window.webkitConvertPointFromNodeToPage === "function";
+
     // https://twitter.com/damienmaillard/status/1554752482273787906
     const prepareJsModuleExecutionWithDynamicImport = src => {
       const urlObject = new URL(src, window.location);
@@ -456,15 +457,25 @@ window.__supervisor__ = (() => {
     } = {}) => {
       const exception = {
         reason,
+        isException: true,
         isError: false,
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/throw
         reportedBy,
         code: null,
+        name: null,
         message: null,
-        stack: null,
-        stackFormatIsV8: null,
+        stack: "",
+        // the stack v8 format
         stackSourcemapped: null,
-        originalStack: null,
+        stackOriginal: "",
+        // the stack from runtime, not normalized to v8
+        stackTrace: "",
+        // the stack trace (without error name and message)
+        withServerUrls: {
+          message: "",
+          stackTrace: "",
+          stack: ""
+        },
         meta: null,
         site: {
           isInline: null,
@@ -489,19 +500,20 @@ window.__supervisor__ = (() => {
         }
         if (reason instanceof Error) {
           const error = reason;
-          let message = error.message;
           exception.isError = true;
-          if (Error.captureStackTrace) {
+          exception.name = error.name || "Error";
+          exception.message = error.message || "";
+          if (Error.captureStackTrace &&
+          // captureStackTrace exists on webkit but error.stack is not v8
+          !isWebkitOrSafari) {
             // stackTrace formatted by V8
-            exception.message = message;
-            exception.stack = getErrorStackWithoutErrorMessage(error);
-            exception.stackFormatIsV8 = true;
             exception.stackSourcemapped = true;
-          } else {
-            exception.message = message;
-            exception.stack = error.stack ? "  ".concat(error.stack) : null;
-            exception.stackFormatIsV8 = false;
+            exception.stack = error.stack;
+            exception.stackTrace = getErrorStackTrace(error);
+          } else if (error.stack) {
             exception.stackSourcemapped = false;
+            exception.stackTrace = error.stack;
+            exception.stack = stringifyStack(exception);
           }
           if (error.reportedBy) {
             exception.reportedBy = error.reportedBy;
@@ -513,21 +525,21 @@ window.__supervisor__ = (() => {
           }
           {
             // chrome
-            if (message.includes("does not provide an export named")) {
+            if (error.message.includes("does not provide an export named")) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
             // firefox
-            if (message.startsWith("import not found:") || message.startsWith("ambiguous indirect export:")) {
+            if (error.message.startsWith("import not found:") || error.message.startsWith("ambiguous indirect export:")) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
             // safari
-            if (message.startsWith("import binding name")) {
+            if (error.message.startsWith("import binding name")) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
-            if (message.includes("Importing a module script failed")) {
+            if (error.message.includes("Importing a module script failed")) {
               exception.code = DYNAMIC_IMPORT_FETCH_ERROR;
               return;
             }
@@ -559,18 +571,6 @@ window.__supervisor__ = (() => {
       };
       writeBasicProperties();
 
-      // first create a version of the stack with file://
-      // (and use it to locate exception url+line+column)
-      if (exception.stack) {
-        exception.originalStack = exception.stack;
-        exception.stack = replaceUrls(exception.originalStack, serverUrlSite => {
-          const fileUrlSite = resolveUrlSite(serverUrlSite);
-          if (exception.site.url === null) {
-            Object.assign(exception.site, fileUrlSite);
-          }
-          return stringifyUrlSite(fileUrlSite);
-        });
-      }
       // then if it fails, use url+line+column passed
       if (exception.site.url === null && url) {
         if (typeof line === "string") {
@@ -590,20 +590,49 @@ window.__supervisor__ = (() => {
         }
         Object.assign(exception.site, fileUrlSite);
       }
-      exception.text = stringifyMessageAndStack(exception);
+      exception.withServerUrls.message = exception.message;
+      exception.withServerUrls.stackTrace = exception.stackTrace;
+      exception.withServerUrls.stack = exception.stack;
+      exception.message = exception.message ? replaceUrls(exception.message, serverUrlSite => {
+        const fileUrlSite = resolveUrlSite(serverUrlSite);
+        return stringifyUrlSite(fileUrlSite);
+      }) : "";
+      exception.stackTrace = exception.stackTrace ? replaceUrls(exception.stackTrace, serverUrlSite => {
+        const fileUrlSite = resolveUrlSite(serverUrlSite);
+        if (exception.site.url === null) {
+          Object.assign(exception.site, fileUrlSite);
+        }
+        return stringifyUrlSite(fileUrlSite);
+      }) : "";
+      exception.stack = stringifyStack({
+        name: exception.name,
+        message: exception.message,
+        stackTrace: exception.stackTrace
+      });
+      exception.text = stringifyStack({
+        name: exception.name,
+        message: exception.message,
+        stackTrace: exception.stackTrace
+      });
       return exception;
     };
-    const stringifyMessageAndStack = ({
+    const stringifyStack = ({
+      name,
       message,
-      stack
+      stackTrace
     }) => {
-      if (message && stack) {
-        return "".concat(message, "\n").concat(stack);
+      let stack;
+      if (name && message) {
+        stack = "".concat(name, ": ").concat(message);
+      } else if (message) {
+        stack = message;
+      } else {
+        stack = "";
       }
-      if (stack) {
-        return stack;
+      if (stackTrace) {
+        stack += "\n".concat(stackTrace);
       }
-      return message;
+      return stack;
     };
     const stringifyUrlSite = ({
       url,
@@ -653,7 +682,7 @@ window.__supervisor__ = (() => {
         column
       };
     };
-    const getErrorStackWithoutErrorMessage = error => {
+    const getErrorStackTrace = error => {
       let stack = error.stack;
       if (!stack) return "";
       const messageInStack = "".concat(error.name, ": ").concat(error.message);
@@ -771,9 +800,10 @@ window.__supervisor__ = (() => {
           });
           return textWithHtmlLinks;
         };
-        errorParts.text = stringifyMessageAndStack({
+        errorParts.text = stringifyStack({
+          name: exceptionInfo.name,
           message: exceptionInfo.message ? generateClickableText(exceptionInfo.message) : "",
-          stack: exceptionInfo.stack ? generateClickableText(exceptionInfo.stack) : ""
+          stackTrace: exceptionInfo.stackTrace ? generateClickableText(exceptionInfo.stackTrace) : ""
         });
         if (exceptionInfo.site.url) {
           errorParts.errorDetailsPromise = (async () => {
@@ -790,12 +820,14 @@ window.__supervisor__ = (() => {
                 if (!causeInfo) {
                   return null;
                 }
-                const causeText = causeInfo.code === "NOT_FOUND" ? stringifyMessageAndStack({
+                const causeText = causeInfo.code === "NOT_FOUND" ? stringifyStack({
+                  name: causeInfo.name,
                   message: generateClickableText(causeInfo.reason),
-                  stack: generateClickableText(causeInfo.codeFrame)
-                }) : stringifyMessageAndStack({
+                  stackTrace: generateClickableText(causeInfo.codeFrame)
+                }) : stringifyStack({
+                  name: causeInfo.name,
                   message: generateClickableText(causeInfo.stack),
-                  stack: generateClickableText(causeInfo.codeFrame)
+                  stackTrace: generateClickableText(causeInfo.codeFrame)
                 });
                 return {
                   cause: causeText

package/dist/jsenv_plugin_supervisor.js

@@ -1018,6 +1018,7 @@ const jsenvPluginSupervisor = ({
         const causeInfo = getErrorCauseInfo();
         const body = JSON.stringify(causeInfo ? {
           code: causeInfo.code,
+          name: causeInfo.name,
           message: causeInfo.message,
           reason: causeInfo.reason,
           stack: errorBaseUrl ? "stack mocked for snapshot" : causeInfo.stack,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "/dist/"
   ],
   "dependencies": {
-    "@jsenv/ast": "5.1.3",
+    "@jsenv/ast": "5.1.4",
     "@jsenv/urls": "2.2.1",
-    "@jsenv/sourcemap": "1.2.2",
-    "launch-editor": "2.6.0"
+    "@jsenv/sourcemap": "1.2.3",
+    "launch-editor": "2.6.1"
   },
   "scripts": {
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",

package/src/client/supervisor.js

@@ -9,6 +9,8 @@ window.__supervisor__ = (() => {
     reloadSupervisedScript: notImplemented,
     getDocumentExecutionResult: notImplemented,
   };
+  const isWebkitOrSafari =
+    typeof window.webkitConvertPointFromNodeToPage === "function";
 
   const executionResults = {};
   let documentExecutionStartTime;
@@ -192,8 +194,6 @@ window.__supervisor__ = (() => {
       executions[src] = { isInline: true, start, end, error };
     };
 
-    const isWebkitOrSafari =
-      typeof window.webkitConvertPointFromNodeToPage === "function";
     // https://twitter.com/damienmaillard/status/1554752482273787906
     const prepareJsModuleExecutionWithDynamicImport = (src) => {
       const urlObject = new URL(src, window.location);
@@ -425,14 +425,21 @@ window.__supervisor__ = (() => {
     ) => {
       const exception = {
         reason,
+        isException: true,
         isError: false, // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/throw
         reportedBy,
         code: null,
+        name: null,
         message: null,
-        stack: null,
-        stackFormatIsV8: null,
+        stack: "", // the stack v8 format
         stackSourcemapped: null,
-        originalStack: null,
+        stackOriginal: "", // the stack from runtime, not normalized to v8
+        stackTrace: "", // the stack trace (without error name and message)
+        withServerUrls: {
+          message: "",
+          stackTrace: "",
+          stack: "",
+        },
         meta: null,
         site: {
           isInline: null,
@@ -458,20 +465,24 @@ window.__supervisor__ = (() => {
         }
         if (reason instanceof Error) {
           const error = reason;
-          let message = error.message;
           exception.isError = true;
-          if (Error.captureStackTrace) {
+          exception.name = error.name || "Error";
+          exception.message = error.message || "";
+          if (
+            Error.captureStackTrace &&
+            // captureStackTrace exists on webkit but error.stack is not v8
+            !isWebkitOrSafari
+          ) {
             // stackTrace formatted by V8
-            exception.message = message;
-            exception.stack = getErrorStackWithoutErrorMessage(error);
-            exception.stackFormatIsV8 = true;
             exception.stackSourcemapped = true;
-          } else {
-            exception.message = message;
-            exception.stack = error.stack ? `  ${error.stack}` : null;
-            exception.stackFormatIsV8 = false;
+            exception.stack = error.stack;
+            exception.stackTrace = getErrorStackTrace(error);
+          } else if (error.stack) {
             exception.stackSourcemapped = false;
+            exception.stackTrace = error.stack;
+            exception.stack = stringifyStack(exception);
           }
+
           if (error.reportedBy) {
             exception.reportedBy = error.reportedBy;
           }
@@ -480,24 +491,24 @@ window.__supervisor__ = (() => {
           }
           export_missing: {
             // chrome
-            if (message.includes("does not provide an export named")) {
+            if (error.message.includes("does not provide an export named")) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
             // firefox
             if (
-              message.startsWith("import not found:") ||
-              message.startsWith("ambiguous indirect export:")
+              error.message.startsWith("import not found:") ||
+              error.message.startsWith("ambiguous indirect export:")
             ) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
             // safari
-            if (message.startsWith("import binding name")) {
+            if (error.message.startsWith("import binding name")) {
               exception.code = DYNAMIC_IMPORT_EXPORT_MISSING;
               return;
             }
-            if (message.includes("Importing a module script failed")) {
+            if (error.message.includes("Importing a module script failed")) {
               exception.code = DYNAMIC_IMPORT_FETCH_ERROR;
               return;
             }
@@ -527,21 +538,6 @@ window.__supervisor__ = (() => {
       };
       writeBasicProperties();
 
-      // first create a version of the stack with file://
-      // (and use it to locate exception url+line+column)
-      if (exception.stack) {
-        exception.originalStack = exception.stack;
-        exception.stack = replaceUrls(
-          exception.originalStack,
-          (serverUrlSite) => {
-            const fileUrlSite = resolveUrlSite(serverUrlSite);
-            if (exception.site.url === null) {
-              Object.assign(exception.site, fileUrlSite);
-            }
-            return stringifyUrlSite(fileUrlSite);
-          },
-        );
-      }
       // then if it fails, use url+line+column passed
       if (exception.site.url === null && url) {
         if (typeof line === "string") {
@@ -560,18 +556,51 @@ window.__supervisor__ = (() => {
         }
         Object.assign(exception.site, fileUrlSite);
       }
-      exception.text = stringifyMessageAndStack(exception);
+
+      exception.withServerUrls.message = exception.message;
+      exception.withServerUrls.stackTrace = exception.stackTrace;
+      exception.withServerUrls.stack = exception.stack;
+      exception.message = exception.message
+        ? replaceUrls(exception.message, (serverUrlSite) => {
+            const fileUrlSite = resolveUrlSite(serverUrlSite);
+            return stringifyUrlSite(fileUrlSite);
+          })
+        : "";
+      exception.stackTrace = exception.stackTrace
+        ? replaceUrls(exception.stackTrace, (serverUrlSite) => {
+            const fileUrlSite = resolveUrlSite(serverUrlSite);
+            if (exception.site.url === null) {
+              Object.assign(exception.site, fileUrlSite);
+            }
+            return stringifyUrlSite(fileUrlSite);
+          })
+        : "";
+      exception.stack = stringifyStack({
+        name: exception.name,
+        message: exception.message,
+        stackTrace: exception.stackTrace,
+      });
+      exception.text = stringifyStack({
+        name: exception.name,
+        message: exception.message,
+        stackTrace: exception.stackTrace,
+      });
       return exception;
     };
 
-    const stringifyMessageAndStack = ({ message, stack }) => {
-      if (message && stack) {
-        return `${message}\n${stack}`;
+    const stringifyStack = ({ name, message, stackTrace }) => {
+      let stack;
+      if (name && message) {
+        stack = `${name}: ${message}`;
+      } else if (message) {
+        stack = message;
+      } else {
+        stack = "";
       }
-      if (stack) {
-        return stack;
+      if (stackTrace) {
+        stack += `\n${stackTrace}`;
       }
-      return message;
+      return stack;
     };
 
     const stringifyUrlSite = ({ url, line, column }) => {
@@ -618,7 +647,7 @@ window.__supervisor__ = (() => {
       };
     };
 
-    const getErrorStackWithoutErrorMessage = (error) => {
+    const getErrorStackTrace = (error) => {
       let stack = error.stack;
       if (!stack) return "";
       const messageInStack = `${error.name}: ${error.message}`;
@@ -745,12 +774,13 @@ window.__supervisor__ = (() => {
           return textWithHtmlLinks;
         };
 
-        errorParts.text = stringifyMessageAndStack({
+        errorParts.text = stringifyStack({
+          name: exceptionInfo.name,
           message: exceptionInfo.message
             ? generateClickableText(exceptionInfo.message)
             : "",
-          stack: exceptionInfo.stack
-            ? generateClickableText(exceptionInfo.stack)
+          stackTrace: exceptionInfo.stackTrace
+            ? generateClickableText(exceptionInfo.stackTrace)
             : "",
         });
         if (exceptionInfo.site.url) {
@@ -779,13 +809,15 @@ window.__supervisor__ = (() => {
                 }
                 const causeText =
                   causeInfo.code === "NOT_FOUND"
-                    ? stringifyMessageAndStack({
+                    ? stringifyStack({
+                        name: causeInfo.name,
                         message: generateClickableText(causeInfo.reason),
-                        stack: generateClickableText(causeInfo.codeFrame),
+                        stackTrace: generateClickableText(causeInfo.codeFrame),
                       })
-                    : stringifyMessageAndStack({
+                    : stringifyStack({
+                        name: causeInfo.name,
                         message: generateClickableText(causeInfo.stack),
-                        stack: generateClickableText(causeInfo.codeFrame),
+                        stackTrace: generateClickableText(causeInfo.codeFrame),
                       });
                 return {
                   cause: causeText,

package/src/jsenv_plugin_supervisor.js

@@ -117,6 +117,7 @@ export const jsenvPluginSupervisor = ({
           causeInfo
             ? {
                 code: causeInfo.code,
+                name: causeInfo.name,
                 message: causeInfo.message,
                 reason: causeInfo.reason,
                 stack: errorBaseUrl