@lvce-editor/iframe-worker 5.27.0 → 5.29.0

package/dist/iframeWorkerMain.js

@@ -975,6 +975,9 @@ const getIframeSrcRemoteBaseUrl = (webViewRoot, locationOrigin, platform, webVie
   if (webViewRoot && (webViewRoot.startsWith('http:') || webViewRoot.startsWith('https:'))) {
     if (webViewRoot.startsWith(locationOrigin)) {
       const baseUrl = webViewRoot.slice(locationOrigin.length);
+      if (baseUrl.startsWith('/remote')) {
+        return baseUrl;
+      }
       return `/remote${root}${baseUrl}`;
     }
     return webViewRoot;
@@ -1467,6 +1470,23 @@ const createWebViewConnection = async (uid, origin) => {
   return rpc;
 };
 
+const getPortQuadruple = () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  const {
+    port1: port3,
+    port2: port4
+  } = new MessageChannel();
+  return {
+    port1,
+    port2,
+    port3,
+    port4
+  };
+};
+
 const readFile = uri => {
   return invoke('FileSystem.readFile', uri);
 };
@@ -1487,7 +1507,7 @@ const set = (id, rpc) => {
 const get = id => {
   return rpcs[id];
 };
-const getAll = () => {
+const getAll$1 = () => {
   return rpcs;
 };
 
@@ -1577,6 +1597,47 @@ const getWebViewWorkerRpc2 = async rpcInfo => {
 // through the iframe worker. However that could introduce some overhead / latency
 // compared to direct connections
 
+const interceptors = Object.create(null);
+
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+const add = (id, port) => {
+  interceptors[id] = port;
+};
+const remove = id => {
+  delete interceptors[id];
+};
+const getAll = () => {
+  return Object.values(interceptors);
+};
+const isEmpty = () => {
+  return Object.keys(interceptors).length === 0;
+};
+
+const notifyInterceptors = message => {
+  if (isEmpty()) {
+    return;
+  }
+  const ports = getAll();
+  // TODO use rpc.invoke
+  for (const port of ports) {
+    port.postMessage({
+      jsonrpc: '2.0',
+      method: 'handleMessageCalled',
+      params: [message]
+    });
+  }
+};
+
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+const proxyPorts = (port1, port2) => {
+  port1.addEventListener('message', event => {
+    port2.postMessage(event.data);
+  });
+  port2.addEventListener('message', event => {
+    port1.postMessage(event.data);
+  });
+};
+
 const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
   const rpc = await getWebViewWorkerRpc2(rpcInfo);
   const webViewInfo = {
@@ -1592,10 +1653,25 @@ const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, we
   await createWebViewConnection(webViewUid, origin);
   const {
     port1,
-    port2
-  } = getPortTuple();
+    port2,
+    port3,
+    port4
+  } = getPortQuadruple();
   await createSecondaryWebViewConnection(webViewUid, origin, port1);
-  await rpc.invokeAndTransfer('_WebView.setPort', portId, port2);
+
+  // TODO remove message listeners on dispose
+  port2.addEventListener('message', event => {
+    notifyInterceptors(event.data);
+  });
+  port3.addEventListener('message', event => {
+    notifyInterceptors(event.data);
+  });
+  proxyPorts(port2, port3);
+  port1.start();
+  port2.start();
+  port3.start();
+  port4.start();
+  await rpc.invokeAndTransfer('_WebView.setPort', portId, port4);
   await rpc.invoke('_WebView.create', {
     id: portId,
     savedState,
@@ -1779,7 +1855,7 @@ const getSecret = async key => {
 };
 
 const getWebViewInfo = webViewId => {
-  const rpcs = getAll();
+  const rpcs = getAll$1();
   for (const value of Object.values(rpcs)) {
     if (value.webViewId === webViewId) {
       return {
@@ -1792,7 +1868,7 @@ const getWebViewInfo = webViewId => {
 };
 
 const saveState = async () => {
-  const all = getAll();
+  const all = getAll$1();
   const serialized = [];
   for (const value of Object.values(all)) {
     try {
@@ -1810,16 +1886,6 @@ const saveState = async () => {
   return serialized;
 };
 
-const interceptors = Object.create(null);
-
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-const add = (id, port) => {
-  interceptors[id] = port;
-};
-const remove = id => {
-  delete interceptors[id];
-};
-
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 const registerInterceptor = async (id, port) => {
   add(id, port);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "5.27.0",
+  "version": "5.29.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
   "keywords": [
     "iframe"