@lvce-editor/iframe-worker 5.12.0 → 5.13.0

package/dist/iframeWorkerMain.js

@@ -483,7 +483,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set = (id, fn) => {
+const set$1 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get = id => {
@@ -502,7 +502,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set(id, resolve);
+  set$1(id, resolve);
   return {
     id,
     promise
@@ -1559,6 +1559,11 @@ const getWebViewWorkerRpc = async rpcInfo => {
   return rpc;
 };
 
+const rpcs = Object.create(null);
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+
 const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, origin) => {
   if (!webView || !webView.rpc || typeof webView.rpc !== 'string') {
     return;
@@ -1568,6 +1573,11 @@ const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, or
     throw new Error(`only web worker rpc is supported for webviews`);
   }
   const rpc = await getWebViewWorkerRpc(rpcInfo);
+  const webViewInfo = {
+    rpc,
+    webViewId: webView.id
+  };
+  set(portId, webViewInfo);
   await rpc.invoke('LoadFile.loadFile', rpcInfo.url);
 
   // TODO this connection might not be needed
@@ -1662,10 +1672,6 @@ const create3 = async ({
   const iframeCsp = platform === Web ? csp : '';
   const credentialless = getCredentialLess(locationHost);
   await invoke$3('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
-  const {
-    port1,
-    port2
-  } = getPortTuple();
   const portId = create$1();
   const remotePathPrefix = '/remote';
   await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId, remotePathPrefix, useNewWebViewHandler);
@@ -1676,11 +1682,20 @@ const create3 = async ({
   // port and wait for the first port message
   await invoke$1('WebView.load', id);
   const origin = getWebViewOrigin(webViewPort, platform, webViewScheme, webViewId);
-  const portType = '';
-  await setPort(id, port1, origin, portType);
-  await invokeAndTransfer$2('ExtensionHostWebView.create', webViewId, port2, uri, id, origin, webView);
+  const hasOldRpc = !webView || !webView.rpc || typeof webView.rpc !== 'string';
+  if (hasOldRpc) {
+    const {
+      port1,
+      port2
+    } = getPortTuple();
+    const portType = '';
+    await setPort(id, port1, origin, portType);
+    await invokeAndTransfer$2('ExtensionHostWebView.create', webViewId, port2, uri, id, origin, webView);
+  }
   const savedState = await getSavedWebViewState(webViewId);
-  await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
+  if (hasOldRpc) {
+    await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
+  }
   await createWebViewRpc(webView, savedState, uri, portId, id, origin);
   return {
     iframeSrc,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
   "main": "dist/iframeWorkerMain.js",
   "type": "module",