@lvce-editor/iframe-worker 5.18.0 → 5.20.0

package/dist/iframeWorkerMain.js

@@ -711,7 +711,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$5 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -720,7 +720,7 @@ const create$6 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$5(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -884,7 +884,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+const create$6 = async ({
   commandMap,
   messagePort,
   isMessagePortOpen
@@ -902,7 +902,7 @@ const create$5 = async ({
 };
 const MessagePortRpcParent = {
   __proto__: null,
-  create: create$5
+  create: create$6
 };
 const create$2 = async ({
   commandMap
@@ -1566,6 +1566,9 @@ const commandMap$1 = {
   'WebView.readFile': readFile
 };
 
+/**
+ * @deprecated use getWebViewWorkerRpc2 instead
+ */
 const getWebViewWorkerRpc = async rpcInfo => {
   const {
     port1,
@@ -1583,14 +1586,35 @@ 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 createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
+  const rpc = await getWebViewWorkerRpc(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
+  });
+};
+
+const createWebViewRpc$1 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
+  // deprecated below
   const rpc = await getWebViewWorkerRpc(rpcInfo);
   const webViewInfo = {
     rpc,
@@ -1618,6 +1642,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;
@@ -1728,6 +1766,10 @@ const create3 = async ({
   };
 };
 
+const getSecret = async key => {
+  return invoke('WebView.getSecret', key);
+};
+
 const saveState = async () => {
   const all = getAll();
   const serialized = [];
@@ -1750,7 +1792,8 @@ const saveState = async () => {
 const commandMap = {
   'WebView.create2': create2,
   'WebView.create3': create3,
-  'WebView.saveState': saveState
+  'WebView.saveState': saveState,
+  'WebView.getSecret': getSecret
 };
 
 const listen = async () => {

package/package.json

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