@lvce-editor/iframe-worker 5.19.0 → 5.21.0

package/dist/iframeWorkerMain.js

@@ -1566,6 +1566,70 @@ const commandMap$1 = {
   'WebView.readFile': readFile
 };
 
+const getWebViewWorkerRpc2 = async rpcInfo => {
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  const rpcPromise = MessagePortRpcParent.create({
+    commandMap: commandMap$1,
+    messagePort: port2,
+    isMessagePortOpen: true
+  });
+  // TODO
+  // 1. ask extension host worker to ask renderer worker to ask renderer process to create a worker with given url
+  // 2. send the port through renderer worker to renderer process to the worker for a direct connection
+  await invokeAndTransfer$2('WebView.createWebViewWorkerRpc2', rpcInfo, port1);
+  const rpc = await rpcPromise;
+  // TODO rpc module should start the port
+  port2.start();
+  return rpc;
+};
+
+// TODO not part of this function but, for the webview webworker connection,
+// send two ports to the iframe
+// one port for builtin events like ctrl+shift+p keydown event for quickpick
+// second port for the webview webworker connection
+
+// this creates in total
+// 1 iframe
+// 1 worker
+// 6 messageports
+
+// one way to reduce the number of messageports could be to route the worker events
+// through the iframe worker. However that could introduce some overhead / latency
+// compared to direct connections
+
+const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
+  const rpc = await getWebViewWorkerRpc2(rpcInfo);
+  const webViewInfo = {
+    rpc,
+    webViewId: webView.id,
+    portId: portId,
+    webViewUid,
+    origin
+  };
+  set(portId, webViewInfo);
+
+  // TODO this connection might not be needed
+  await createWebViewConnection(webViewUid, origin);
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  await createSecondaryWebViewConnection(webViewUid, origin, port1);
+  await rpc.invokeAndTransfer('_WebView.setPort', portId, port2);
+  await rpc.invoke('_WebView.create', {
+    id: portId,
+    savedState,
+    webViewId: webView.id,
+    uri
+  });
+};
+
+/**
+ * @deprecated use getWebViewWorkerRpc2 instead
+ */
 const getWebViewWorkerRpc = async rpcInfo => {
   const {
     port1,
@@ -1583,14 +1647,8 @@ const getWebViewWorkerRpc = async rpcInfo => {
   return rpc;
 };
 
-const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, origin) => {
-  if (!webView || !webView.rpc || typeof webView.rpc !== 'string') {
-    return;
-  }
-  const rpcInfo = await invoke$3('WebView.getRpcInfo', webView.rpc);
-  if (rpcInfo.type !== 'web-worker') {
-    throw new Error(`only web worker rpc is supported for webviews`);
-  }
+const createWebViewRpc$1 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
+  // deprecated below
   const rpc = await getWebViewWorkerRpc(rpcInfo);
   const webViewInfo = {
     rpc,
@@ -1618,6 +1676,20 @@ const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, or
   });
 };
 
+const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, origin) => {
+  if (!webView || !webView.rpc || typeof webView.rpc !== 'string') {
+    return;
+  }
+  const rpcInfo = await invoke$3('WebView.getRpcInfo', webView.rpc);
+  if (rpcInfo && rpcInfo.type === 'web-worker-2') {
+    return createWebWorkerRpc2(rpcInfo, webView, savedState, uri, portId, webViewUid, origin);
+  }
+  if (rpcInfo.type !== 'web-worker') {
+    throw new Error(`only web worker rpc is supported for webviews`);
+  }
+  return createWebViewRpc$1(rpcInfo, webView, savedState, uri, portId, webViewUid, origin);
+};
+
 const getPreviewServerId = () => {
   // TODO
   return 1;

package/package.json

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