@lvce-editor/iframe-worker 5.14.0 → 5.16.0

package/dist/iframeWorkerMain.js

@@ -486,7 +486,7 @@ const callbacks = Object.create(null);
 const set$1 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get = id => {
+const get$1 = id => {
   return callbacks[id];
 };
 const remove = id => {
@@ -659,7 +659,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get(id);
+  const fn = get$1(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -813,7 +813,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$4 = (ipc, method, ...params) => {
+const invoke$5 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$4 = (ipc, method, ...params) => {
@@ -846,7 +846,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
+      return invoke$5(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$4(ipc, method, ...params);
@@ -970,7 +970,7 @@ const assetDir = getAssetDir();
 const state$1 = {
   rpc: undefined
 };
-const invoke$3 = (method, ...params) => {
+const invoke$4 = (method, ...params) => {
   const rpc = state$1.rpc;
   return rpc.invoke(method, ...params);
 };
@@ -982,8 +982,8 @@ const setRpc = rpc => {
   state$1.rpc = rpc;
 };
 
-const invoke$2 = async (method, ...params) => {
-  return invoke$3('WebView.compatExtensionHostWorkerInvoke', method, ...params);
+const invoke$3 = async (method, ...params) => {
+  return invoke$4('WebView.compatExtensionHostWorkerInvoke', method, ...params);
 };
 const invokeAndTransfer$2 = async (method, ...params) => {
   return invokeAndTransfer$3('WebView.compatExtensionHostWorkerInvokeAndTransfer', method, ...params);
@@ -1183,7 +1183,7 @@ const getPortTuple = () => {
 };
 
 const getSavedState = async () => {
-  return invoke$3('WebView.getSavedState');
+  return invoke$4('WebView.getSavedState');
 };
 
 const getSavedWebViewState = async id => {
@@ -1252,7 +1252,7 @@ const getIframePermissionPolicy = webView => {
 };
 
 const getWebViews = async () => {
-  return invoke$3('WebView.getWebViews');
+  return invoke$4('WebView.getWebViews');
 };
 
 const AllowScripts = 'allow-scripts';
@@ -1300,8 +1300,8 @@ const getPort = () => {
   return location.port;
 };
 
-const invoke$1 = async (method, ...params) => {
-  return invoke$3('WebView.compatRendererProcessInvoke', method, ...params);
+const invoke$2 = async (method, ...params) => {
+  return invoke$4('WebView.compatRendererProcessInvoke', method, ...params);
 };
 const invokeAndTransfer$1 = async (method, ...params) => {
   return invokeAndTransfer$3('WebView.compatRendererProcessInvokeAndTransfer', method, ...params);
@@ -1313,27 +1313,27 @@ const setPort = async (uid, port, origin, portType) => {
   await invokeAndTransfer$1('WebView.setPort', uid, port, origin, portType);
 };
 
-const invoke = async (method, ...params) => {
-  return invoke$3('WebView.compatSharedProcessInvoke', method, ...params);
+const invoke$1 = async (method, ...params) => {
+  return invoke$4('WebView.compatSharedProcessInvoke', method, ...params);
 };
 
 const registerProtocol = async () => {
-  await invoke('WebViewServer.registerProtocol');
+  await invoke$1('WebViewServer.registerProtocol');
 };
 const create = async (previewServerId, useNewWebViewHandler) => {
-  await invoke('WebViewServer.create', previewServerId, useNewWebViewHandler);
+  await invoke$1('WebViewServer.create', previewServerId, useNewWebViewHandler);
 };
 const start = async (previewServerId, webViewPort) => {
-  await invoke('WebViewServer.start', previewServerId, webViewPort);
+  await invoke$1('WebViewServer.start', previewServerId, webViewPort);
 };
 const setInfo2 = async info => {
-  await invoke('WebViewServer.setInfo2', info);
+  await invoke$1('WebViewServer.setInfo2', info);
 };
 const setInfo = async (previewServerId, webViewId, webViewRoot, contentSecurityPolicy, iframeContent) => {
-  await invoke('WebViewServer.setInfo', previewServerId, webViewId, webViewRoot, contentSecurityPolicy, iframeContent);
+  await invoke$1('WebViewServer.setInfo', previewServerId, webViewId, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent, remotePathPrefix) => {
-  await invoke('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
+  await invoke$1('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 
 const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId, remotePathPrefix, useNewWebViewHandler) => {
@@ -1404,7 +1404,7 @@ const create2 = async ({
 }) => {
   let root = '';
   if (platform === Remote) {
-    root = await invoke('Platform.getRoot');
+    root = await invoke$1('Platform.getRoot');
   }
   const webViews = await getWebViews();
   const locationProtocol = getProtocol$1();
@@ -1436,7 +1436,7 @@ const create2 = async ({
   const permissionPolicyString = permissionPolicy.join('; ');
   const iframeCsp = platform === Web ? csp : '';
   const credentialless = getCredentialLess(locationHost);
-  await invoke$3('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
+  await invoke$4('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
   const {
     port1,
     port2
@@ -1444,18 +1444,18 @@ const create2 = async ({
   const portId = create$1();
   const remotePathPrefix = '/remote';
   await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId, remotePathPrefix);
-  await invoke$1('WebView.create', 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$1('WebView.load', id);
+  await invoke$2('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 savedState = await getSavedWebViewState(webViewId);
-  await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
+  await invoke$3('ExtensionHostWebView.load', webViewId, savedState);
   return {
     iframeSrc,
     sandbox,
@@ -1465,6 +1465,9 @@ const create2 = async ({
   };
 };
 
+const invoke = async (method, ...params) => {
+  return invoke$4('WebView.compatRendererWorkerInvoke', method, ...params);
+};
 const invokeAndTransfer = async (method, ...params) => {
   return invokeAndTransfer$3('WebView.compatRendererWorkerInvokeAndTransfer', method, ...params);
 };
@@ -1491,6 +1494,10 @@ const createWebViewConnection = async (uid, origin) => {
   return rpc;
 };
 
+const readFile = uri => {
+  return invoke('FileSystem.readFile', uri);
+};
+
 const RE_PROTOCOL = /^([a-z-]+):\/\//;
 const getProtocol = uri => {
   const protocolMatch = uri.match(RE_PROTOCOL);
@@ -1500,6 +1507,17 @@ const getProtocol = uri => {
   return '';
 };
 
+const rpcs = Object.create(null);
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+const getAll = () => {
+  return rpcs;
+};
+
 // TODO if webViewId is provided,
 // 1. read file as blob
 // 2. send blob to webview
@@ -1508,15 +1526,12 @@ const getProtocol = uri => {
 // 5. provide objectUrl to extension
 
 const getRemoteUrlForWebView = async options => {
-  throw new Error('not implemented');
-  // TODO webviews should be stored in iframe worker
-  // const webView = ExtensionHostWebViewState.getWebView(options.webViewId as string)
-  // if (!webView) {
-  //   throw new Error(`webview ${options.webViewId} not found`)
-  // }
-  // const [rpc, blob] = await Promise.all([CreateWebViewIpc.createWebViewIpc(webView), Rpc.invoke('FileSystem.getBlob', uri)])
-  // const objectUrl = await rpc.invoke('createObjectUrl', blob)
-  // return objectUrl
+  const webView = get(options.id);
+  const rpcPromise = createWebViewConnection(webView.webViewUid, webView.origin);
+  const blobPromise = invoke('FileSystem.getBlob', options.uri);
+  const [rpc, blob] = await Promise.all([rpcPromise, blobPromise]);
+  const objectUrl = await rpc.invoke('createObjectUrl', blob);
+  return objectUrl;
 };
 
 const getRemoteUrl = async options => {
@@ -1538,11 +1553,12 @@ const getRemoteUrl = async options => {
     }
     return `/remote/${uri}`;
   }
-  return getRemoteUrlForWebView();
+  return getRemoteUrlForWebView(options);
 };
 
 const commandMap$1 = {
-  'WebView.getRemoteUrl': getRemoteUrl
+  'WebView.getRemoteUrl': getRemoteUrl,
+  'WebView.readFile': readFile
 };
 
 const getWebViewWorkerRpc = async rpcInfo => {
@@ -1562,19 +1578,11 @@ const getWebViewWorkerRpc = async rpcInfo => {
   return rpc;
 };
 
-const rpcs = Object.create(null);
-const set = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const getAll = () => {
-  return rpcs;
-};
-
 const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, origin) => {
   if (!webView || !webView.rpc || typeof webView.rpc !== 'string') {
     return;
   }
-  const rpcInfo = await invoke$2('WebView.getRpcInfo', webView.rpc);
+  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`);
   }
@@ -1582,7 +1590,9 @@ const createWebViewRpc = async (webView, savedState, uri, portId, webViewUid, or
   const webViewInfo = {
     rpc,
     webViewId: webView.id,
-    portId: portId
+    portId: portId,
+    webViewUid,
+    origin
   };
   set(portId, webViewInfo);
   await rpc.invoke('LoadFile.loadFile', rpcInfo.url);
@@ -1642,7 +1652,7 @@ const create3 = async ({
 }) => {
   let root = '';
   if (platform === Remote) {
-    root = await invoke('Platform.getRoot');
+    root = await invoke$1('Platform.getRoot');
   }
   const webViews = await getWebViews();
   const webViewId = getWebViewId(webViews, uri);
@@ -1678,16 +1688,16 @@ const create3 = async ({
   const permissionPolicyString = permissionPolicy.join('; ');
   const iframeCsp = platform === Web ? csp : '';
   const credentialless = getCredentialLess(locationHost);
-  await invoke$3('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
+  await invoke$4('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
   const portId = create$1();
   const remotePathPrefix = '/remote';
   await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId, remotePathPrefix, useNewWebViewHandler);
-  await invoke$1('WebView.create', 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$1('WebView.load', id);
+  await invoke$2('WebView.load', id);
   const origin = getWebViewOrigin(webViewPort, platform, webViewScheme, webViewId);
   const hasOldRpc = !webView || !webView.rpc || typeof webView.rpc !== 'string';
   if (hasOldRpc) {
@@ -1701,7 +1711,7 @@ const create3 = async ({
   }
   const savedState = await getSavedWebViewState(webViewId);
   if (hasOldRpc) {
-    await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
+    await invoke$3('ExtensionHostWebView.load', webViewId, savedState);
   }
   await createWebViewRpc(webView, savedState, uri, portId, id, origin);
   return {

package/package.json

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