@lvce-editor/file-system-process 2.1.0 → 2.2.0

package/dist/index.js

@@ -194,7 +194,7 @@ const isEnoentError = error => {
 };
 
 const rpcs = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$f = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -218,19 +218,22 @@ const create$6 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$f(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
     }
   };
 };
 const MainProcess$1 = -5;
 const {
-  invoke: invoke$3,
-  set: set$3
-} = create$6(MainProcess$1);
+  invoke: invoke$6,
+  set: set$6} = create$6(MainProcess$1);
 const MainProcess = {
   __proto__: null,
-  invoke: invoke$3,
-  set: set$3
+  invoke: invoke$6,
+  set: set$6
 };
 
 const {
@@ -865,7 +868,7 @@ const listen$3 = async () => {
     parentPort
   } = await import('node:worker_threads');
   if (!parentPort) {
-    throw new IpcError('parentPort is required');
+    throw new IpcError('parentPort is required for node worker threads ipc');
   }
   return parentPort;
 };
@@ -1000,8 +1003,6 @@ const handleUpgrade$1 = async (...args) => {
   // @ts-ignore
   return module.handleUpgrade(...args);
 };
-
-// @ts-ignore
 const listen$1$1 = async ({
   request,
   handle
@@ -1022,8 +1023,6 @@ const listen$1$1 = async ({
 const signal$4 = webSocket => {
   webSocket.resume();
 };
-
-// @ts-ignore
 const wrap$9 = webSocket => {
   return {
     webSocket,
@@ -1178,6 +1177,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);
 };
@@ -1188,19 +1197,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);
@@ -1281,6 +1287,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 {
@@ -1293,7 +1310,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,
@@ -1301,18 +1318,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1 = (message, error) => {
+const create$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(message, errorProperty);
+  return create$1(id, errorProperty);
 };
 const create = (message, result) => {
   return {
@@ -1325,12 +1342,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create(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 => {
@@ -1385,7 +1417,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-system-process",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "File System Process",
   "keywords": [
     "Lvce Editor",