@lvce-editor/ipc 10.2.1 → 11.0.1

package/dist/browser.js

@@ -365,6 +365,11 @@ const listen$3 = async () => {
   }
   const type = firstMessage.params[0];
   if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
     parentIpc.dispose();
     const port = firstMessage.params[1];
     return port;

package/dist/electron.js

@@ -540,10 +540,10 @@ class ChildProcessError extends Error {
 // workaround for node not supporting transferrable objects
 // as parameters. If the transferrable object is a parameter,
 // it is received as a plain object is received in the receiving process
-const fixNodeParameters = value => {
+const fixNodeChildProcessParameters = value => {
   const transfer = getTransferrables(value);
   if (transfer.length === 0) {
-    throw new Error('no transferrables found');
+    throw new IpcError('no transferrables found');
   }
   const newValue = removeValues(value, transfer);
   return {
@@ -680,7 +680,7 @@ class IpcParentWithNodeForkedProcess extends Ipc {
     const {
       newValue,
       transfer
-    } = fixNodeParameters(message);
+    } = fixNodeChildProcessParameters(message);
     this._rawIpc.send(newValue, transfer);
   }
   dispose() {
@@ -703,6 +703,17 @@ const IpcParentWithNodeForkedProcess$1 = {
   wrap: wrap$2
 };
 
+const fixNodeWorkerParameters = value => {
+  const transfer = getTransferrables(value);
+  if (transfer.length === 0) {
+    throw new IpcError('no transferrables found');
+  }
+  return {
+    newValue: value,
+    transfer: transfer
+  };
+};
+
 const addListener = (emitter, type, callback) => {
   if ('addEventListener' in emitter) {
     emitter.addEventListener(type, callback);
@@ -790,41 +801,38 @@ const create$1 = async ({
   }
   return worker;
 };
-
-// @ts-ignore
+class IpcParentWithNodeWorker extends Ipc {
+  constructor(worker) {
+    super(worker);
+  }
+  getData(message) {
+    return message;
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const {
+      newValue,
+      transfer
+    } = fixNodeWorkerParameters(message);
+    this._rawIpc.postMessage(newValue, transfer);
+  }
+  dispose() {
+    this._rawIpc.terminate();
+  }
+  onClose(callback) {
+    this._rawIpc.on('exit', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
+}
 const wrap$1 = worker => {
-  return {
-    worker,
-    // @ts-ignore
-    on(event, listener) {
-      const wrappedListener = message => {
-        const syntheticEvent = {
-          data: message,
-          target: this
-        };
-        listener(syntheticEvent);
-      };
-      this.worker.on(event, wrappedListener);
-    },
-    // @ts-ignore
-    send(message) {
-      this.worker.postMessage(message);
-    },
-    // @ts-ignore
-    sendAndTransfer(message) {
-      const {
-        newValue,
-        transfer
-      } = fixNodeParameters(message);
-      this.worker.postMessage(newValue, transfer);
-    },
-    dispose() {
-      this.worker.terminate();
-    }
-  };
+  return new IpcParentWithNodeWorker(worker);
 };
 
-const IpcParentWithNodeWorker = {
+const IpcParentWithNodeWorker$1 = {
   __proto__: null,
   create: create$1,
   wrap: wrap$1
@@ -891,4 +899,4 @@ const IpcParentWithElectronMessagePort$1 = {
   wrap
 };
 
-export { IpcParentWithElectronMessagePort$1 as IpcParentWithElectronMessagePort, IpcParentWithElectronUtilityProcess$1 as IpcParentWithElectronUtilityProcess, IpcParentWithNodeForkedProcess$1 as IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker };
+export { IpcParentWithElectronMessagePort$1 as IpcParentWithElectronMessagePort, IpcParentWithElectronUtilityProcess$1 as IpcParentWithElectronUtilityProcess, IpcParentWithNodeForkedProcess$1 as IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker$1 as IpcParentWithNodeWorker };

package/dist/index.js

@@ -473,6 +473,11 @@ const listen$5 = async () => {
   }
   const type = firstMessage.params[0];
   if (type === 'message-port') {
+    parentIpc.send({
+      jsonrpc: '2.0',
+      id: firstMessage.id,
+      result: null
+    });
     parentIpc.dispose();
     const port = firstMessage.params[1];
     return port;
@@ -636,32 +641,35 @@ const listen$2 = async () => {
 const signal$2 = parentPort => {
   parentPort.postMessage(readyMessage);
 };
+class IpcChildWithNodeWorker extends Ipc {
+  constructor(port) {
+    super(port);
+  }
+  getData(data) {
+    return data;
+  }
+  onClose(callback) {
+    this._rawIpc.on('close', callback);
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrablesNode(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+}
 const wrap$6 = parentPort => {
-  return {
-    parentPort,
-    on(event, listener) {
-      const wrappedListener = (message, handle) => {
-        const event = {
-          data: getActualData(message, handle),
-          target: this
-        };
-        listener(event);
-      };
-      this.parentPort.on(event, wrappedListener);
-    },
-    off(event, listener) {
-      this.parentPort.off(event, listener);
-    },
-    send(message) {
-      this.parentPort.postMessage(message);
-    },
-    dispose() {
-      this.parentPort.close();
-    }
-  };
+  return new IpcChildWithNodeWorker(parentPort);
 };
 
-const IpcChildWithNodeWorker = {
+const IpcChildWithNodeWorker$1 = {
   __proto__: null,
   listen: listen$2,
   signal: signal$2,
@@ -1116,10 +1124,10 @@ class ChildProcessError extends Error {
 // workaround for node not supporting transferrable objects
 // as parameters. If the transferrable object is a parameter,
 // it is received as a plain object is received in the receiving process
-const fixNodeParameters = value => {
+const fixNodeChildProcessParameters = value => {
   const transfer = getTransferrables(value);
   if (transfer.length === 0) {
-    throw new Error('no transferrables found');
+    throw new IpcError('no transferrables found');
   }
   const newValue = removeValues(value, transfer);
   return {
@@ -1256,7 +1264,7 @@ class IpcParentWithNodeForkedProcess extends Ipc {
     const {
       newValue,
       transfer
-    } = fixNodeParameters(message);
+    } = fixNodeChildProcessParameters(message);
     this._rawIpc.send(newValue, transfer);
   }
   dispose() {
@@ -1279,6 +1287,17 @@ const IpcParentWithNodeForkedProcess$1 = {
   wrap: wrap$1
 };
 
+const fixNodeWorkerParameters = value => {
+  const transfer = getTransferrables(value);
+  if (transfer.length === 0) {
+    throw new IpcError('no transferrables found');
+  }
+  return {
+    newValue: value,
+    transfer: transfer
+  };
+};
+
 const getFirstNodeWorkerEvent = worker => {
   return getFirstEvent(worker, {
     message: Message,
@@ -1325,44 +1344,41 @@ const create = async ({
   }
   return worker;
 };
-
-// @ts-ignore
+class IpcParentWithNodeWorker extends Ipc {
+  constructor(worker) {
+    super(worker);
+  }
+  getData(message) {
+    return message;
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const {
+      newValue,
+      transfer
+    } = fixNodeWorkerParameters(message);
+    this._rawIpc.postMessage(newValue, transfer);
+  }
+  dispose() {
+    this._rawIpc.terminate();
+  }
+  onClose(callback) {
+    this._rawIpc.on('exit', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
+}
 const wrap = worker => {
-  return {
-    worker,
-    // @ts-ignore
-    on(event, listener) {
-      const wrappedListener = message => {
-        const syntheticEvent = {
-          data: message,
-          target: this
-        };
-        listener(syntheticEvent);
-      };
-      this.worker.on(event, wrappedListener);
-    },
-    // @ts-ignore
-    send(message) {
-      this.worker.postMessage(message);
-    },
-    // @ts-ignore
-    sendAndTransfer(message) {
-      const {
-        newValue,
-        transfer
-      } = fixNodeParameters(message);
-      this.worker.postMessage(newValue, transfer);
-    },
-    dispose() {
-      this.worker.terminate();
-    }
-  };
+  return new IpcParentWithNodeWorker(worker);
 };
 
-const IpcParentWithNodeWorker = {
+const IpcParentWithNodeWorker$1 = {
   __proto__: null,
   create,
   wrap
 };
 
-export { IpcChildWithElectronMessagePort$1 as IpcChildWithElectronMessagePort, IpcChildWithElectronUtilityProcess$1 as IpcChildWithElectronUtilityProcess, IpcChildWithModuleWorker$1 as IpcChildWithModuleWorker, IpcChildWithModuleWorkerAndMessagePort$1 as IpcChildWithModuleWorkerAndMessagePort, IpcChildWithNodeForkedProcess$1 as IpcChildWithNodeForkedProcess, IpcChildWithNodeMessagePort, IpcChildWithNodeWorker, IpcChildWithRendererProcess2$1 as IpcChildWithRendererProcess2, IpcChildWithWebSocket, IpcParentWithElectronMessagePort$1 as IpcParentWithElectronMessagePort, IpcParentWithElectronUtilityProcess$1 as IpcParentWithElectronUtilityProcess, IpcParentWithNodeForkedProcess$1 as IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker };
+export { IpcChildWithElectronMessagePort$1 as IpcChildWithElectronMessagePort, IpcChildWithElectronUtilityProcess$1 as IpcChildWithElectronUtilityProcess, IpcChildWithModuleWorker$1 as IpcChildWithModuleWorker, IpcChildWithModuleWorkerAndMessagePort$1 as IpcChildWithModuleWorkerAndMessagePort, IpcChildWithNodeForkedProcess$1 as IpcChildWithNodeForkedProcess, IpcChildWithNodeMessagePort, IpcChildWithNodeWorker$1 as IpcChildWithNodeWorker, IpcChildWithRendererProcess2$1 as IpcChildWithRendererProcess2, IpcChildWithWebSocket, IpcParentWithElectronMessagePort$1 as IpcParentWithElectronMessagePort, IpcParentWithElectronUtilityProcess$1 as IpcParentWithElectronUtilityProcess, IpcParentWithNodeForkedProcess$1 as IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker$1 as IpcParentWithNodeWorker };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/ipc",
-  "version": "10.2.1",
+  "version": "11.0.1",
   "description": "Inter Process Communication for Lvce Editor",
   "main": "dist/index.js",
   "type": "module",