@lvce-editor/ipc 4.0.1 → 4.1.0

package/dist/browser.js

@@ -1,4 +1,4 @@
-const getData$1 = event => {
+const getData$2 = event => {
   return event.data;
 };
 
@@ -14,7 +14,7 @@ const listen$2 = () => {
 const signal$1 = global => {
   global.postMessage(readyMessage);
 };
-const wrap$3 = global => {
+const wrap$4 = global => {
   return {
     global,
     /**
@@ -32,7 +32,7 @@ const wrap$3 = global => {
     },
     set onmessage(listener) {
       const wrappedListener = event => {
-        const data = getData$1(event);
+        const data = getData$2(event);
         // @ts-expect-error
         listener({
           data,
@@ -54,7 +54,7 @@ const IpcChildWithModuleWorker = {
   __proto__: null,
   listen: listen$2,
   signal: signal$1,
-  wrap: wrap$3
+  wrap: wrap$4
 };
 
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
@@ -290,7 +290,7 @@ const waitForFirstMessage = async port => {
 const listen$1 = async () => {
   const parentIpcRaw = listen$2();
   signal$1(parentIpcRaw);
-  const parentIpc = wrap$3(parentIpcRaw);
+  const parentIpc = wrap$4(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -303,7 +303,7 @@ const listen$1 = async () => {
   }
   return globalThis;
 };
-const wrap$2 = port => {
+const wrap$3 = port => {
   return {
     port,
     /**
@@ -323,7 +323,7 @@ const wrap$2 = port => {
       if (listener) {
         // @ts-expect-error
         this.wrappedListener = event => {
-          const data = getData$1(event);
+          const data = getData$2(event);
           // @ts-expect-error
           listener({
             data,
@@ -341,7 +341,7 @@ const wrap$2 = port => {
 const IpcChildWithModuleWorkerAndMessagePort = {
   __proto__: null,
   listen: listen$1,
-  wrap: wrap$2
+  wrap: wrap$3
 };
 
 const listen = () => {
@@ -351,7 +351,7 @@ const listen = () => {
 const signal = global => {
   global.postMessage(readyMessage);
 };
-const wrap$1 = window => {
+const wrap$2 = window => {
   return {
     window,
     /**
@@ -394,35 +394,46 @@ const IpcChildWithWindow = {
   __proto__: null,
   listen,
   signal,
-  wrap: wrap$1
+  wrap: wrap$2
 };
 
 const Message = 'message';
 const Error$1 = 'error';
 
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
     resolve,
     promise
   } = withResolvers();
   const listenerMap = Object.create(null);
-  // @ts-ignore
   const cleanup = value => {
     for (const event of Object.keys(eventMap)) {
-      eventEmitter.off(event, listenerMap[event]);
+      removeListener(eventEmitter, event, listenerMap[event]);
     }
-    // @ts-ignore
     resolve(value);
   };
   for (const [event, type] of Object.entries(eventMap)) {
-    // @ts-ignore
     const listener = event => {
       cleanup({
         type,
         event
       });
     };
-    eventEmitter.on(event, listener);
+    addListener(eventEmitter, event, listener);
     listenerMap[event] = listener;
   }
   return promise;
@@ -470,7 +481,7 @@ ${relevant}`;
 
 const Module = 'module';
 
-const create = async ({
+const create$1 = async ({
   url,
   name
 }) => {
@@ -499,14 +510,14 @@ const create = async ({
   }
   return worker;
 };
-const getData = event => {
+const getData$1 = event => {
   // TODO why are some events not instance of message event?
   if (event instanceof MessageEvent) {
     return event.data;
   }
   return event;
 };
-const wrap = worker => {
+const wrap$1 = worker => {
   let handleMessage;
   return {
     get onmessage() {
@@ -515,7 +526,7 @@ const wrap = worker => {
     set onmessage(listener) {
       if (listener) {
         handleMessage = event => {
-          const data = getData(event);
+          const data = getData$1(event);
           listener({
             data,
             target: this
@@ -536,9 +547,82 @@ const wrap = worker => {
 };
 
 const IpcParentWithModuleWorker = {
+  __proto__: null,
+  create: create$1,
+  wrap: wrap$1
+};
+
+const Open = 1;
+const Close = 2;
+
+const stringifyCompact = value => {
+  return JSON.stringify(value);
+};
+const parse = content => {
+  if (content === 'undefined') {
+    return null;
+  }
+  try {
+    return JSON.parse(content);
+  } catch (error) {
+    throw new VError(error, 'failed to parse json');
+  }
+};
+
+const waitForWebSocketToBeOpen = webSocket => {
+  return getFirstEvent(webSocket, {
+    open: Open,
+    close: Close
+  });
+};
+
+const create = async ({
+  webSocket
+}) => {
+  const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
+  // @ts-ignore
+  if (firstWebSocketEvent.type === Close) {
+    throw new IpcError('Websocket connection was immediately closed');
+  }
+  return webSocket;
+};
+const getData = event => {
+  return parse(event.data);
+};
+const wrap = webSocket => {
+  return {
+    webSocket,
+    /**
+     * @type {any}
+     */
+    listener: undefined,
+    get onmessage() {
+      return this.listener;
+    },
+    set onmessage(listener) {
+      this.listener = listener;
+      const wrappedListener = event => {
+        const data = getData(event);
+        const syntheticEvent = {
+          data,
+          target: this
+        };
+        // @ts-ignore
+        listener(syntheticEvent);
+      };
+      this.webSocket.onmessage = wrappedListener;
+    },
+    send(message) {
+      const stringifiedMessage = stringifyCompact(message);
+      this.webSocket.send(stringifiedMessage);
+    }
+  };
+};
+
+const IpcParentWithWebSocket = {
   __proto__: null,
   create,
   wrap
 };
 
-export { IpcChildWithModuleWorker, IpcChildWithModuleWorkerAndMessagePort, IpcChildWithWindow, IpcParentWithModuleWorker };
+export { IpcChildWithModuleWorker, IpcChildWithModuleWorkerAndMessagePort, IpcChildWithWindow, IpcParentWithModuleWorker, IpcParentWithWebSocket };

package/dist/index.js

@@ -603,29 +603,40 @@ const IpcChildWithNodeWorker = {
 const Open = 1;
 const Close = 2;
 
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
     resolve,
     promise
   } = withResolvers();
   const listenerMap = Object.create(null);
-  // @ts-ignore
   const cleanup = value => {
     for (const event of Object.keys(eventMap)) {
-      eventEmitter.off(event, listenerMap[event]);
+      removeListener(eventEmitter, event, listenerMap[event]);
     }
-    // @ts-ignore
     resolve(value);
   };
   for (const [event, type] of Object.entries(eventMap)) {
-    // @ts-ignore
     const listener = event => {
       cleanup({
         type,
         event
       });
     };
-    eventEmitter.on(event, listener);
+    addListener(eventEmitter, event, listener);
     listenerMap[event] = listener;
   }
   return promise;

package/package.json

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