@lvce-editor/file-system-worker 1.3.0 → 1.5.0

package/dist/fileSystemWorkerMain.js

@@ -485,7 +485,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     error: Error$3
   });
 };
-const create$6 = async ({
+const create$7 = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -522,7 +522,7 @@ const wrap = webSocket => {
 };
 const IpcParentWithWebSocket$1 = {
   __proto__: null,
-  create: create$6,
+  create: create$7,
   wrap
 };
 
@@ -535,7 +535,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$1 = id => {
@@ -545,16 +545,16 @@ const remove$1 = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3$1 = () => {
+const create$3 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3$1();
+  const id = create$3();
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$3(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -627,6 +627,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -637,19 +647,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -730,6 +737,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 {
@@ -742,7 +760,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,
@@ -750,20 +768,20 @@ 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) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -772,14 +790,29 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(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 => {
@@ -834,7 +867,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;
@@ -939,7 +972,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$3 = async ({
+const create$5 = async ({
   commandMap,
   messagePort
 }) => {
@@ -955,20 +988,20 @@ const create$3 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2 = async ({
+const create$4 = async ({
   commandMap,
   messagePort
 }) => {
-  return create$3({
+  return create$5({
     commandMap,
     messagePort
   });
 };
 const PlainMessagePortRpcParent = {
   __proto__: null,
-  create: create$2
+  create: create$4
 };
-const create$1 = async ({
+const create$2 = async ({
   commandMap,
   webSocket
 }) => {
@@ -984,9 +1017,9 @@ const create$1 = async ({
 };
 const WebSocketRpcParent = {
   __proto__: null,
-  create: create$1
+  create: create$2
 };
-const create$4 = async ({
+const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -998,11 +1031,11 @@ const create$4 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$4
+  create: create$1
 };
 
 const rpcs = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$g = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1026,7 +1059,11 @@ const create = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$g(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get(rpcId);
+      await rpc.dispose();
     }
   };
 };
@@ -1037,23 +1074,20 @@ const RpcId = {
   __proto__: null,
   FileSystemWorker: FileSystemWorker$1};
 const {
-  invokeAndTransfer: invokeAndTransfer$4,
-  set: set$4
-} = create(RendererWorker$1);
-const RendererWorker = {
+  invoke: invoke$8,
+  set: set$8} = create(FileSystemProcess$1);
+const FileSystemProcess = {
   __proto__: null,
-  invokeAndTransfer: invokeAndTransfer$4,
-  set: set$4
+  invoke: invoke$8,
+  set: set$8
 };
 const {
-  invoke: invoke$2,
-  set: set$2
-} = create(FileSystemProcess$1);
-const FileSystemProcess = {
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$3} = create(RendererWorker$1);
+const RendererWorker = {
   __proto__: null,
-  invoke: invoke$2,
-  set: set$2
-};
+  invokeAndTransfer: invokeAndTransfer$3,
+  set: set$3};
 
 const {
   invoke,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-system-worker",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "File System Worker",
   "keywords": [
     "Lvce Editor"