@lvce-editor/ipc 10.0.0 → 10.0.2

package/dist/browser.js

@@ -2,6 +2,28 @@ const getData$1 = event => {
   return event.data;
 };
 
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -33,33 +55,9 @@ const isTransferrable = value => {
   return false;
 };
 
-const walkValue = (value, transferrables) => {
-  if (!value) {
-    return value;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    const newObject = Object.create(null);
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables);
-    }
-    return newObject;
-  }
-  return value;
-};
-
 const getTransferrables = value => {
   const transferrables = [];
-  walkValue(value, transferrables);
+  walkValue(value, transferrables, isTransferrable);
   return transferrables;
 };
 

package/dist/electron.js

@@ -340,6 +340,28 @@ class IpcError extends VError {
   }
 }
 
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -371,33 +393,9 @@ const isTransferrable = value => {
   return false;
 };
 
-const walkValue = (value, transferrables) => {
-  if (!value) {
-    return value;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    const newObject = Object.create(null);
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables);
-    }
-    return newObject;
-  }
-  return value;
-};
-
 const getTransferrables = value => {
   const transferrables = [];
-  walkValue(value, transferrables);
+  walkValue(value, transferrables, isTransferrable);
   return transferrables;
 };
 
@@ -571,6 +569,14 @@ const getFirstNodeChildProcessEvent = async childProcess => {
   };
 };
 
+const getTransferrablesNode = value => {
+  const transferrables = getTransferrables(value);
+  if (transferrables.length === 0) {
+    throw new Error(`no transferrables found`);
+  }
+  return transferrables[0];
+};
+
 // @ts-ignore
 const create$1 = async ({
   path,
@@ -623,7 +629,7 @@ class IpcParentWithNodeForkedProcess extends Ipc {
     this._rawIpc.send(message);
   }
   sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
+    const transfer = getTransferrablesNode(message);
     this._rawIpc.send(message, transfer);
   }
   dispose() {
@@ -755,7 +761,7 @@ const wrap = worker => {
     },
     // @ts-ignore
     sendAndTransfer(message) {
-      const transfer = getTransferrables(message);
+      const transfer = getTransferrablesNode(message);
       this.worker.postMessage(message, transfer);
     },
     dispose() {

package/dist/index.js

@@ -1,6 +1,28 @@
 import { VError } from '@lvce-editor/verror';
 import { string } from '@lvce-editor/assert';
 
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -32,33 +54,9 @@ const isTransferrable = value => {
   return false;
 };
 
-const walkValue = (value, transferrables) => {
-  if (!value) {
-    return value;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    const newObject = Object.create(null);
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables);
-    }
-    return newObject;
-  }
-  return value;
-};
-
 const getTransferrables = value => {
   const transferrables = [];
-  walkValue(value, transferrables);
+  walkValue(value, transferrables, isTransferrable);
   return transferrables;
 };
 
@@ -277,7 +275,7 @@ const listen$8 = ({
 const signal$6 = messagePort => {
   messagePort.start();
 };
-const getActualData$1 = event => {
+const getActualData = event => {
   const {
     data,
     ports
@@ -295,7 +293,7 @@ class IpcChildWithElectronMessagePort extends Ipc {
     super(port);
   }
   getData(event) {
-    return getActualData$1(event);
+    return getActualData(event);
   }
   send(message) {
     this._rawIpc.postMessage(message);
@@ -518,6 +516,14 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$8
 };
 
+const getTransferrablesNode = value => {
+  const transferrables = getTransferrables(value);
+  if (transferrables.length === 0) {
+    throw new Error(`no transferrables found`);
+  }
+  return transferrables[0];
+};
+
 const listen$4 = async () => {
   if (!process.send) {
     throw new Error('process.send must be defined');
@@ -527,21 +533,12 @@ const listen$4 = async () => {
 const signal$3 = process => {
   process.send(readyMessage);
 };
-const getActualData = (message, handle) => {
-  if (handle) {
-    return {
-      ...message,
-      params: [handle, ...message.params]
-    };
-  }
-  return message;
-};
 class IpcChildWithNodeForkedProcess extends Ipc {
   constructor(process) {
     super(process);
   }
-  getData(message, handle) {
-    return getActualData(message, handle);
+  getData(message) {
+    return message;
   }
   onClose(callback) {
     this._rawIpc.on('close', callback);
@@ -553,7 +550,7 @@ class IpcChildWithNodeForkedProcess extends Ipc {
     this._rawIpc.on('message', callback);
   }
   sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
+    const transfer = getTransferrablesNode(message);
     this._rawIpc.send(message, transfer);
   }
   dispose() {
@@ -1181,7 +1178,7 @@ class IpcParentWithNodeForkedProcess extends Ipc {
     this._rawIpc.send(message);
   }
   sendAndTransfer(message) {
-    const transfer = getTransferrables(message);
+    const transfer = getTransferrablesNode(message);
     this._rawIpc.send(message, transfer);
   }
   dispose() {
@@ -1272,7 +1269,7 @@ const wrap = worker => {
     },
     // @ts-ignore
     sendAndTransfer(message) {
-      const transfer = getTransferrables(message);
+      const transfer = getTransferrablesNode(message);
       this.worker.postMessage(message, transfer);
     },
     dispose() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/ipc",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "description": "Inter Process Communication for Lvce Editor",
   "main": "dist/index.js",
   "type": "module",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
     "@lvce-editor/verror": "^1.4.0",
-    "@lvce-editor/web-socket-server": "^1.2.0"
+    "@lvce-editor/web-socket-server": "^1.3.0"
   },
   "engines": {
     "node": ">=18"