@lvce-editor/ipc 7.1.1 → 7.2.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 = event => {
+    const data = that.getData(event);
     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
 }

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 = event => {
+    const data = that.getData(event);
     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);
   }
 }
 
@@ -211,6 +212,12 @@ 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 => {
   return new IpcChildWithElectronMessagePort(messagePort);
@@ -266,6 +273,12 @@ 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 => {
   return new IpcChildWithElectronUtilityProcess(parentPort);
@@ -307,6 +320,12 @@ class IpcChildWithModuleWorker extends Ipc {
   dispose() {
     // ignore
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap$8 = global => {
   return new IpcChildWithModuleWorker(global);
@@ -379,6 +398,12 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
       this._rawIpc.close();
     }
   }
+  onClose(callback) {
+    // ignore
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
 }
 const wrap$7 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
@@ -845,6 +870,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 +1043,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);

package/package.json

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