@lvce-editor/iframe-worker 5.20.0 → 5.22.0

package/dist/iframeWorkerMain.js

@@ -1094,6 +1094,9 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
   if (!webViewUri) {
     return undefined;
   }
+  if (!webView) {
+    return undefined;
+  }
   let iframeSrc = webViewUri;
   let webViewRoot = webViewUri;
 
@@ -1469,6 +1472,15 @@ const create2 = async ({
   };
 };
 
+const createAndLoadWebView = async (id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle) => {
+  await invoke$2('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle);
+
+  // TODO maybe iframe waitForLoad is not needed. since it cannot be used detect errors anyway
+  // and causes flash of unstyled content, maybe a better way would be to just send the
+  // port and wait for the first port message
+  await invoke$2('WebView.load', id);
+};
+
 const invoke = async (method, ...params) => {
   return invoke$4('WebView.compatRendererWorkerInvoke', method, ...params);
 };
@@ -1566,10 +1578,7 @@ const commandMap$1 = {
   'WebView.readFile': readFile
 };
 
-/**
- * @deprecated use getWebViewWorkerRpc2 instead
- */
-const getWebViewWorkerRpc = async rpcInfo => {
+const getWebViewWorkerRpc2 = async rpcInfo => {
   const {
     port1,
     port2
@@ -1579,15 +1588,32 @@ const getWebViewWorkerRpc = async rpcInfo => {
     messagePort: port2,
     isMessagePortOpen: true
   });
-  await invokeAndTransfer$2('WebView.createWebViewWorkerRpc', rpcInfo, port1);
+  // 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 getWebViewWorkerRpc(rpcInfo);
+  const rpc = await getWebViewWorkerRpc2(rpcInfo);
   const webViewInfo = {
     rpc,
     webViewId: webView.id,
@@ -1613,6 +1639,26 @@ const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, we
   });
 };
 
+/**
+ * @deprecated use getWebViewWorkerRpc2 instead
+ */
+const getWebViewWorkerRpc = async rpcInfo => {
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  const rpcPromise = MessagePortRpcParent.create({
+    commandMap: commandMap$1,
+    messagePort: port2,
+    isMessagePortOpen: true
+  });
+  await invokeAndTransfer$2('WebView.createWebViewWorkerRpc', rpcInfo, port1);
+  const rpc = await rpcPromise;
+  // TODO rpc module should start the port
+  port2.start();
+  return rpc;
+};
+
 const createWebViewRpc$1 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
   // deprecated below
   const rpc = await getWebViewWorkerRpc(rpcInfo);
@@ -1650,6 +1696,7 @@ const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, or
   if (rpcInfo && rpcInfo.type === 'web-worker-2') {
     return createWebWorkerRpc2(rpcInfo, webView, savedState, uri, portId, webViewUid, origin);
   }
+  // legacy
   if (rpcInfo.type !== 'web-worker') {
     throw new Error(`only web worker rpc is supported for webviews`);
   }
@@ -1710,8 +1757,6 @@ const create3 = async ({
     return undefined;
   }
   const webView = getWebView(webViews, webViewId);
-
-  // TODO move all of this to iframe worker
   const {
     iframeSrc,
     webViewRoot,
@@ -1735,12 +1780,7 @@ const create3 = async ({
   const portId = create$1();
   const remotePathPrefix = '/remote';
   await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId, remotePathPrefix, useNewWebViewHandler);
-  await invoke$2('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle);
-
-  // TODO maybe iframe waitForLoad is not needed. since it cannot be used detect errors anyway
-  // and causes flash of unstyled content, maybe a better way would be to just send the
-  // port and wait for the first port message
-  await invoke$2('WebView.load', id);
+  await createAndLoadWebView(id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle);
   const origin = getWebViewOrigin(webViewPort, platform, webViewScheme, webViewId);
   const hasOldRpc = !webView || !webView.rpc || typeof webView.rpc !== 'string';
   if (hasOldRpc) {

package/package.json

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