@lvce-editor/json-rpc 6.0.0 → 6.2.0

package/dist/index.js

@@ -120,6 +120,19 @@ 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);
 };
@@ -132,22 +145,17 @@ 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);
@@ -266,19 +274,19 @@ 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) => {
@@ -294,12 +302,28 @@ const getSuccessResponse = (message, result) => {
   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);
   }
 };
 
@@ -356,7 +380,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/json-rpc",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "JsonRpc implementation",
   "main": "dist/index.js",
   "type": "module",