@lvce-editor/ipc 7.1.1 → 7.3.0

package/dist/browser.js

@@ -2,24 +2,25 @@ const getData$1 = event => {
   return event.data;
 };
 
-const attachEvent = (rawIpc, getData, that) => {
-  const wrapped = event => {
-    const data = getData(event);
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
     that.dispatchEvent(new MessageEvent('message', {
       data
     }));
   };
-  if ('onmessage' in rawIpc) {
-    rawIpc.onmessage = wrapped;
-  } else if ('on' in rawIpc) {
-    rawIpc.on('message', wrapped);
-  }
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
+
 class Ipc extends EventTarget {
   constructor(rawIpc) {
     super();
-    attachEvent(rawIpc, this.getData, this);
     this._rawIpc = rawIpc;
+    attachEvents(this);
   }
 }
 
@@ -50,6 +51,12 @@ class IpcChildWithModuleWorker extends Ipc {
   dispose() {
     // ignore
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap$4 = global => {
   return new IpcChildWithModuleWorker(global);
@@ -323,6 +330,12 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
       this._rawIpc.close();
     }
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap$3 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
@@ -348,12 +361,17 @@ class IpcChildWithWindow extends Ipc {
     this._rawIpc.postMessage(message);
   }
   sendAndTransfer(message, transfer) {
-    // TODO set diffrent origin
-    this._rawIpc.postMessage(message, '*', transfer);
+    this._rawIpc.postMessage(message, location.origin, transfer);
   }
   dispose() {
     // ignore
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap$2 = window => {
   return new IpcChildWithWindow(window);
@@ -497,7 +515,13 @@ class IpcParentWithModuleWorker extends Ipc {
     this._rawIpc.postMessage(message, transfer);
   }
   dispose() {
-    // igore
+    // ignore
+  }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
   }
 }
 const wrap$1 = worker => {
@@ -557,6 +581,12 @@ class IpcParentWithWebSocket extends Ipc {
   dispose() {
     this._rawIpc.close();
   }
+  onClose(callback) {
+    this._rawIpc.addEventListener('close', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap = webSocket => {
   return new IpcParentWithWebSocket(webSocket);

package/dist/index.d.ts

@@ -1,8 +1,6 @@
-interface Ipc {
+interface Ipc extends EventTarget {
   readonly send: (message: any) => void
   readonly sendAndTransfer: (message: any, transfer: any) => void
-  readonly on: any
-  readonly onmessage: any
   readonly dispose: () => void
   readonly isDisposed: () => void
 }
@@ -17,6 +15,7 @@ export const IpcChildWithElectronUtilityProcess: IpcChild
 export const IpcChildWithNodeForkedProcess: IpcChild
 export const IpcChildWithWebSocket: IpcChild
 export const IpcChildWithNodeWorker: IpcChild
+export const IpcChildWithRendererProcess2: IpcChild
 
 interface IpcParent {
   readonly create: any

package/dist/index.js

@@ -1,24 +1,25 @@
 import { VError } from '@lvce-editor/verror';
 import { string, array } from '@lvce-editor/assert';
 
-const attachEvent = (rawIpc, getData, that) => {
-  const wrapped = event => {
-    const data = getData(event);
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
     that.dispatchEvent(new MessageEvent('message', {
       data
     }));
   };
-  if ('onmessage' in rawIpc) {
-    rawIpc.onmessage = wrapped;
-  } else if ('on' in rawIpc) {
-    rawIpc.on('message', wrapped);
-  }
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
 };
+
 class Ipc extends EventTarget {
   constructor(rawIpc) {
     super();
-    attachEvent(rawIpc, this.getData, this);
     this._rawIpc = rawIpc;
+    attachEvents(this);
   }
 }
 
@@ -171,7 +172,7 @@ const isMessagePortMain = value => {
   return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
 
-const listen$7 = ({
+const listen$8 = ({
   messagePort
 }) => {
   if (!isMessagePortMain(messagePort)) {
@@ -211,16 +212,22 @@ class IpcChildWithElectronMessagePort extends Ipc {
   dispose() {
     this._rawIpc.close();
   }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
+  onClose(callback) {
+    this._rawIpc.on('close', callback);
+  }
 }
-const wrap$a = messagePort => {
+const wrap$b = messagePort => {
   return new IpcChildWithElectronMessagePort(messagePort);
 };
 
 const IpcChildWithElectronMessagePort$1 = {
   __proto__: null,
-  listen: listen$7,
+  listen: listen$8,
   signal: signal$6,
-  wrap: wrap$a
+  wrap: wrap$b
 };
 
 // @ts-ignore
@@ -240,7 +247,7 @@ const getUtilityProcessPortData = event => {
 
 const readyMessage = 'ready';
 
-const listen$6 = () => {
+const listen$7 = () => {
   // @ts-ignore
   const {
     parentPort
@@ -266,23 +273,29 @@ class IpcChildWithElectronUtilityProcess extends Ipc {
   dispose() {
     this._rawIpc.close();
   }
+  onClose(callback) {
+    this._rawIpc.on('close', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
 }
-const wrap$9 = parentPort => {
+const wrap$a = parentPort => {
   return new IpcChildWithElectronUtilityProcess(parentPort);
 };
 
 const IpcChildWithElectronUtilityProcess$1 = {
   __proto__: null,
-  listen: listen$6,
+  listen: listen$7,
   signal: signal$5,
-  wrap: wrap$9
+  wrap: wrap$a
 };
 
-const getData = event => {
+const getData$1 = event => {
   return event.data;
 };
 
-const listen$5 = () => {
+const listen$6 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
@@ -294,7 +307,7 @@ const signal$4 = global => {
 };
 class IpcChildWithModuleWorker extends Ipc {
   getData(event) {
-    return getData(event);
+    return getData$1(event);
   }
   send(message) {
     // @ts-ignore
@@ -307,16 +320,22 @@ class IpcChildWithModuleWorker extends Ipc {
   dispose() {
     // ignore
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
-const wrap$8 = global => {
+const wrap$9 = global => {
   return new IpcChildWithModuleWorker(global);
 };
 
 const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  listen: listen$5,
+  listen: listen$6,
   signal: signal$4,
-  wrap: wrap$8
+  wrap: wrap$9
 };
 
 const withResolvers = () => {
@@ -348,10 +367,10 @@ const waitForFirstMessage = async port => {
   return event.data;
 };
 
-const listen$4 = async () => {
-  const parentIpcRaw = listen$5();
+const listen$5 = async () => {
+  const parentIpcRaw = listen$6();
   signal$4(parentIpcRaw);
-  const parentIpc = wrap$8(parentIpcRaw);
+  const parentIpc = wrap$9(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -366,7 +385,7 @@ const listen$4 = async () => {
 };
 class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
   getData(event) {
-    return getData(event);
+    return getData$1(event);
   }
   send(message) {
     this._rawIpc.postMessage(message);
@@ -379,18 +398,24 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
       this._rawIpc.close();
     }
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
-const wrap$7 = port => {
+const wrap$8 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$4,
-  wrap: wrap$7
+  listen: listen$5,
+  wrap: wrap$8
 };
 
-const listen$3 = async () => {
+const listen$4 = async () => {
   if (!process.send) {
     throw new Error('process.send must be defined');
   }
@@ -414,7 +439,7 @@ const getActualData = (message, handle) => {
 };
 
 // @ts-ignore
-const wrap$6 = process => {
+const wrap$7 = process => {
   return {
     process,
     // @ts-ignore
@@ -450,16 +475,16 @@ const wrap$6 = process => {
 
 const IpcChildWithNodeForkedProcess = {
   __proto__: null,
-  listen: listen$3,
+  listen: listen$4,
   signal: signal$3,
-  wrap: wrap$6
+  wrap: wrap$7
 };
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
 
-const listen$2 = async ({
+const listen$3 = async ({
   messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
@@ -470,7 +495,7 @@ const listen$2 = async ({
 const signal$2 = messagePort => {
   messagePort.start();
 };
-const wrap$5 = port => {
+const wrap$6 = port => {
   return {
     port,
     on(event, listener) {
@@ -500,12 +525,12 @@ const wrap$5 = port => {
 
 const IpcChildWithNodeMessagePort = {
   __proto__: null,
-  listen: listen$2,
+  listen: listen$3,
   signal: signal$2,
-  wrap: wrap$5
+  wrap: wrap$6
 };
 
-const listen$1 = async () => {
+const listen$2 = async () => {
   const {
     parentPort
   } = await import('node:worker_threads');
@@ -517,7 +542,7 @@ const listen$1 = async () => {
 const signal$1 = parentPort => {
   parentPort.postMessage(readyMessage);
 };
-const wrap$4 = parentPort => {
+const wrap$5 = parentPort => {
   return {
     parentPort,
     on(event, listener) {
@@ -544,8 +569,54 @@ const wrap$4 = parentPort => {
 
 const IpcChildWithNodeWorker = {
   __proto__: null,
-  listen: listen$1,
+  listen: listen$2,
   signal: signal$1,
+  wrap: wrap$5
+};
+
+const preloadChannelType = 'port';
+const listen$1 = ({
+  webContents
+}) => {
+  return webContents;
+};
+const getData = (event, message) => {
+  const {
+    ports
+  } = event;
+  const data = {
+    ...message,
+    params: [...message.params, ...ports]
+  };
+  return data;
+};
+class IpcChildWithRendererProcess2 extends Ipc {
+  getData(event, message) {
+    return getData(event, message);
+  }
+  send(message) {
+    this._rawIpc.postMessage(preloadChannelType, message);
+  }
+  sendAndTransfer(message, transfer) {
+    this._rawIpc.postMessage(preloadChannelType, message, transfer);
+  }
+  dispose() {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.ipc.on(preloadChannelType, callback);
+  }
+  onClose(callback) {
+    this._rawIpc.on('destroyed', callback);
+  }
+}
+const wrap$4 = webContents => {
+  return new IpcChildWithRendererProcess2(webContents);
+};
+
+const IpcChildWithRendererProcess2$1 = {
+  __proto__: null,
+  listen: listen$1,
   wrap: wrap$4
 };
 
@@ -845,6 +916,12 @@ class IpcParentWithElectronUtilityProcess extends Ipc {
   dispose() {
     this._rawIpc.kill();
   }
+  onClose(callback) {
+    this._rawIpc.on('exit', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
 }
 const wrap$2 = process => {
   return new IpcParentWithElectronUtilityProcess(process);
@@ -1012,6 +1089,12 @@ class IpcParentWithNodeForkedProcess extends Ipc {
   dispose() {
     this._rawIpc.kill();
   }
+  onClose(callback) {
+    this._rawIpc.on('close', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
 }
 const wrap$1 = childProcess => {
   return new IpcParentWithNodeForkedProcess(childProcess);
@@ -1106,4 +1189,4 @@ const IpcParentWithNodeWorker = {
   wrap
 };
 
-export { IpcChildWithElectronMessagePort$1 as IpcChildWithElectronMessagePort, IpcChildWithElectronUtilityProcess$1 as IpcChildWithElectronUtilityProcess, IpcChildWithModuleWorker$1 as IpcChildWithModuleWorker, IpcChildWithModuleWorkerAndMessagePort$1 as IpcChildWithModuleWorkerAndMessagePort, IpcChildWithNodeForkedProcess, IpcChildWithNodeMessagePort, IpcChildWithNodeWorker, IpcChildWithWebSocket, 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, IpcChildWithNodeMessagePort, IpcChildWithNodeWorker, IpcChildWithRendererProcess2$1 as IpcChildWithRendererProcess2, IpcChildWithWebSocket, IpcParentWithElectronUtilityProcess$1 as IpcParentWithElectronUtilityProcess, IpcParentWithNodeForkedProcess$1 as IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker };

package/package.json

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