@lvce-editor/about-view 5.6.0 → 5.8.0

package/dist/aboutWorkerMain.js

@@ -470,6 +470,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
+};
+const splitLines = lines => {
+  return lines.split(NewLine$1);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine$1, startIndex);
 };
@@ -480,19 +490,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine$1);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine$1 + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -573,6 +580,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -585,7 +603,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -593,18 +611,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (message, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two,
-    id: message.id,
+    id,
     error
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(message, errorProperty);
+  return create$1$1(id, errorProperty);
 };
 const create$5 = (message, result) => {
   return {
@@ -617,12 +635,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create$5(message, resultProperty);
 };
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
     const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
     return getSuccessResponse(message, result);
   } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
   }
 };
 const defaultPreparePrettyError = error => {
@@ -677,7 +710,7 @@ const handleJsonRpcMessage = async (...args) => {
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -995,13 +1028,12 @@ const getKeyBindings = () => {
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
   return rpcs[id];
 };
-const RendererWorker$1 = 1;
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
 
@@ -1009,21 +1041,22 @@ const create = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get(RendererWorker$1);
+      const rpc = get(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get(RendererWorker$1);
+      const rpc = get(rpcId);
       // @ts-ignore
-      return rpc.invoke(method, ...params);
+      return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$d(rpcId, rpc);
     }
   };
 };
+const RendererWorker$1 = 1;
 const {
   invoke: invoke$3,
   set: set$3
@@ -1522,12 +1555,10 @@ const DialogIcon$1 = 'DialogIcon';
 const DialogInfoIcon = 'DialogInfoIcon';
 const MaskIconInfo = 'MaskIconInfo';
 
-const HandleClickClose = 'handleClickClose';
-const HandleClickCopy = 'handleClickCopy';
-const HandleClickOk = 'handleClickOk';
-const HandleClickButton = 'handleClickButton';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFocusIn = 'handleFocusIn';
+const HandleClickClose = 1;
+const HandleClickButton = 4;
+const HandleContextMenu = 5;
+const HandleFocusIn = 6;
 
 const Button$1 = 1;
 const Div = 4;
@@ -1570,7 +1601,7 @@ const True = 'true';
 const Button = 'button';
 const Dialog = 'dialog';
 
-const getPrimaryButtonVirtualDom = (message, onClick, name) => {
+const getPrimaryButtonVirtualDom = (message, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonPrimary),
@@ -1580,7 +1611,7 @@ const getPrimaryButtonVirtualDom = (message, onClick, name) => {
   }, text(message)];
 };
 
-const getSecondaryButtonVirtualDom = (message, onClick, name) => {
+const getSecondaryButtonVirtualDom = (message, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonSecondary),
@@ -1647,7 +1678,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     type: Div,
     className: DialogButtonsRow,
     childCount: 2
-  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy, Copy$1)];
+  }, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
   return dom;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "5.6.0",
+  "version": "5.8.0",
   "description": "About View Worker",
   "keywords": [
     "about-view"