@lvce-editor/json-rpc 2.0.0 → 2.1.0

package/dist/index.js

@@ -150,7 +150,6 @@ const getErrorConstructor = (message, type) => {
   if (type) {
     switch (type) {
       case DomException:
-        // @ts-ignore
         return DOMException;
       case TypeError$1:
         return TypeError;
@@ -176,7 +175,6 @@ const getErrorConstructor = (message, type) => {
 
 const constructError = (message, type, name) => {
   const ErrorConstructor = getErrorConstructor(message, type);
-  // @ts-ignore
   if (ErrorConstructor === DOMException && name) {
     return new ErrorConstructor(message, name);
   }
@@ -194,6 +192,14 @@ const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
 
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine + parentStack;
+  }
+  return parentStack;
+};
+
 const joinLines = lines => {
   return lines.join(NewLine);
 };
@@ -205,18 +211,11 @@ const splitLines = lines => {
   return lines.split(NewLine);
 };
 
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine + parentStack;
-  }
-  return parentStack;
-};
 const restoreJsonRpcError = error => {
   if (error && error instanceof Error) {
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack).slice(1));
+  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);
@@ -245,7 +244,6 @@ const restoreJsonRpcError = error => {
       }
     } else {
       if (error.stack) {
-        // TODO accessing stack might be slow
         const lowerStack = restoredError.stack || '';
         // @ts-ignore
         const indexNewLine = getNewLineIndex(lowerStack);
@@ -277,22 +275,14 @@ const unwrapJsonRpcResult = responseMessage => {
   throw new JsonRpcError('unexpected response message');
 };
 
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-
-const isSingleTransferrable = value => {
-  return isSocket(value);
-};
-
 const isMessagePort = value => {
   return typeof MessagePort !== 'undefined' && value instanceof MessagePort;
 };
 
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
+};
+
 const isMessagePortMain = value => {
   return isInstanceOf(value, 'MessagePortMain');
 };
@@ -301,6 +291,10 @@ const isOffscreenCanvas = value => {
   return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
 };
 
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
+};
+
 const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
 
 const isTransferrable = value => {
@@ -312,21 +306,45 @@ const isTransferrable = value => {
   return false;
 };
 
-const getTransferrableParams = value => {
+const walkValue = (value, transferrables) => {
+  if (!value) {
+    return;
+  }
   if (isTransferrable(value)) {
-    return value;
+    transferrables.push(value);
   }
   if (Array.isArray(value)) {
-    const result = value.filter(isTransferrable);
-    if (result.length === 0) {
-      return undefined;
+    for (const item of value) {
+      walkValue(item, transferrables);
     }
-    if (result.length === 1 && isSingleTransferrable(result[0])) {
-      return result[0];
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables);
     }
-    return result;
   }
-  return undefined;
+};
+
+const getTransferrables = value => {
+  const transferrables = [];
+  walkValue(value, transferrables);
+  return transferrables;
+};
+
+const isSingleTransferrable = value => {
+  return isSocket(value);
+};
+
+const getTransferrableParams = value => {
+  const transferrables = getTransferrables(value);
+  if (transferrables.length === 0) {
+    return undefined;
+  }
+  if (isSingleTransferrable(transferrables[0])) {
+    return transferrables[0];
+  }
+  return transferrables;
 };
 
 const create$1 = (message, error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/json-rpc",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "JsonRpc implementation",
   "main": "dist/index.js",
   "type": "module",