@lvce-editor/iframe-worker 2.2.0 → 3.0.0

package/dist/iframeWorkerMain.js

@@ -1,15 +1,15 @@
 const Two = '2.0';
-const state$1 = {
+const state$2 = {
   callbacks: Object.create(null)
 };
 const set = (id, fn) => {
-  state$1.callbacks[id] = fn;
+  state$2.callbacks[id] = fn;
 };
 const get = id => {
-  return state$1.callbacks[id];
+  return state$2.callbacks[id];
 };
 const remove = id => {
-  delete state$1.callbacks[id];
+  delete state$2.callbacks[id];
 };
 let id = 0;
 const create$3 = () => {
@@ -328,10 +328,10 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const invoke$3 = (ipc, method, ...params) => {
+const invoke$4 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
+const invokeAndTransfer$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -736,10 +736,10 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
 const createRpc = ipc => {
   const rpc = {
     invoke(method, ...params) {
-      return invoke$3(ipc, method, ...params);
+      return invoke$4(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
+      return invokeAndTransfer$3(ipc, method, ...params);
     }
   };
   return rpc;
@@ -782,8 +782,28 @@ const WebWorkerRpcClient = {
   create: create$1$1
 };
 
+const state$1 = {
+  rpc: undefined
+};
+const invoke$3 = (method, ...params) => {
+  const rpc = state$1.rpc;
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+const invokeAndTransfer$2 = (method, ...params) => {
+  const rpc = state$1.rpc;
+  // @ts-ignore
+  return rpc.invokeAndTransfer(method, ...params);
+};
+const setRpc = rpc => {
+  state$1.rpc = rpc;
+};
+
 const invoke$2 = async (method, ...params) => {
-  // TODO
+  return invoke$3('WebView.compatExtensionHostWorkerInvoke', method, ...params);
+};
+const invokeAndTransfer$1 = async (method, ...params) => {
+  return invokeAndTransfer$2('WebView.compatExtensionHostWorkerInvokeAndTransfer', method, ...params);
 };
 
 const createUrl = (protocol, host) => {
@@ -900,19 +920,23 @@ const getWebViewUri = (webViews, webViewId) => {
   }
   return webViewPath;
 };
-const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root) => {
+const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform$1 = platform) => {
   const webView = getWebView$1(webViews, webViewId);
   const webViewUri = getWebViewUri(webViews, webViewId);
+  console.log({
+    webViews,
+    webViewId
+  });
   if (!webViewUri) {
     return undefined;
   }
   let iframeSrc = webViewUri;
   let webViewRoot = webViewUri;
-  if (platform === Electron) {
+  if (platform$1 === Electron) {
     const relativePath = new URL(webViewUri).pathname.replace('/index.html', '');
     iframeSrc = `${WebView}://-${relativePath}/`;
     // TODO
-  } else if (platform === Remote) {
+  } else if (platform$1 === Remote) {
     const relativePath = new URL(webViewUri).pathname.replace('/index.html', '');
     if (webViewUri.startsWith('file://')) {
       // ignore
@@ -1047,10 +1071,10 @@ class VError extends Error {
   }
 }
 
-const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin) => {
+const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform$1 = platform) => {
   try {
     const webView = getWebView(webViews, webViewId);
-    if (platform === Web) {
+    if (platform$1 === Web) {
       return getIframeSrc$1(webView, locationOrigin);
     }
     return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root);
@@ -1070,11 +1094,8 @@ const getPortTuple = () => {
   };
 };
 
-const getJson = async () => {};
-
 const getSavedState = async () => {
-  const value = await getJson();
-  return value;
+  return invoke$3('WebView.getSavedState');
 };
 
 const getSavedWebViewState = async id => {
@@ -1117,7 +1138,7 @@ const getWebViewFrameAncestors = (locationProtocol, locationHost) => {
   return frameAncestors;
 };
 
-const getWebViewOrigin = webViewPort => {
+const getWebViewOrigin = (webViewPort, platform) => {
   // TODO don't hardcode protocol
   let origin = '';
   if (platform === Electron) {
@@ -1130,40 +1151,8 @@ const getWebViewOrigin = webViewPort => {
   return origin;
 };
 
-const invoke$1 = async (method, ...params) => {
-  // TODO
-};
-
-const getWebViewsNode = async () => {
-  const webViews = await invoke$1();
-  return webViews;
-};
-
-const getWebViewsWeb = async () => {
-  // const url = `${AssetDir.assetDir}/config/webViews.json`
-  // TODO move this to shared-process-web / network-process-web
-  // TODO handle error ?
-  // TODO use parent rpc invoke
-  // return Command.execute(/* Ajax.getJson */ 'Ajax.getJson', /* url */ url)
-  return [];
-};
-
-const getWebViewsDefault = async () => {
-  switch (platform) {
-    case Web:
-      return getWebViewsWeb();
-    case Test:
-      return [];
-    default:
-      return getWebViewsNode();
-  }
-};
 const getWebViews = async () => {
-  const nodeWebViews = await getWebViewsDefault();
-  // TODO ask renderer worker for webviews
-  // const registeredWebViews = WebViews.get()
-  const allWebViews = [...nodeWebViews];
-  return allWebViews;
+  return invoke$3('WebView.getWebViews');
 };
 
 const AllowScripts = 'allow-scripts';
@@ -1197,28 +1186,32 @@ const getProtocol = () => {
   return location.protocol;
 };
 
-const invoke = async (method, ...params) => {
-  // TODO
+const invoke$1 = async (method, ...params) => {
+  return invoke$3('WebView.compatRendererProcessInvoke', method, ...params);
 };
 const invokeAndTransfer = async (method, ...params) => {
-  // TODO
+  return invokeAndTransfer$2('WebView.compatRendererProcessInvokeAndTransfer', method, ...params);
 };
 
 const setPort = async (uid, port, origin, portType) => {
   await invokeAndTransfer('WebView.setPort', uid, port, origin, portType);
 };
 
+const invoke = async (method, ...params) => {
+  return invoke$3('WebView.compatSharedProcessInvoke', method, ...params);
+};
+
 const registerProtocol = async () => {
-  await invoke$1();
+  await invoke('WebViewServer.registerProtocol');
 };
 const create = async previewServerId => {
-  await invoke$1('WebViewServer.create', previewServerId);
+  await invoke('WebViewServer.create', previewServerId);
 };
 const start = async (previewServerId, webViewPort) => {
-  await invoke$1('WebViewServer.start', previewServerId, webViewPort);
+  await invoke('WebViewServer.start', previewServerId, webViewPort);
 };
 const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent) => {
-  await invoke$1('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
+  await invoke('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 
 const register$3 = async previewServerId => {
@@ -1226,11 +1219,6 @@ const register$3 = async previewServerId => {
   await create(previewServerId); // TODO move this up
 };
 
-const WebViewProtocolElectron = {
-  __proto__: null,
-  register: register$3
-};
-
 const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
   // TODO apply something similar for electron
   // TODO pass webview root, so that only these resources can be accessed
@@ -1242,34 +1230,24 @@ const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewR
   // TODO make this work in gitpod also
 };
 
-const WebViewProtocolRemote = {
-  __proto__: null,
-  register: register$2
-};
-
 const register$1 = async () => {
   // noop
 };
 
-const WebViewProtocolWeb = {
-  __proto__: null,
-  register: register$1
-};
-
 const getModule = platform => {
   switch (platform) {
     case Remote:
-      return WebViewProtocolRemote;
+      return register$2;
     case Electron:
-      return WebViewProtocolElectron;
+      return register$3;
     case Web:
     default:
-      return WebViewProtocolWeb;
+      return register$1;
   }
 };
 const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
-  const module = getModule(platform);
-  return module.register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
+  const fn = getModule(platform);
+  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
 };
 
 const create2 = async ({
@@ -1278,18 +1256,18 @@ const create2 = async ({
   webViewId,
   previewServerId,
   uri,
-  platform: platform$1,
+  platform,
   isGitpod
 }) => {
   let root = '';
   if (platform === Remote) {
-    root = await invoke$1();
+    root = await invoke('Platform.getRoot');
   }
   const webViews = await getWebViews();
   const locationProtocol = getProtocol();
   const locationHost = getHost();
   const locationOrigin = getOrigin();
-  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin);
+  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform);
   if (!iframeResult) {
     return undefined;
   }
@@ -1311,26 +1289,22 @@ const create2 = async ({
   // 4. create webview in extension host worker and load content
 
   const csp = getWebViewCsp(webView);
-  const sandbox = getIframeSandbox(webView, platform$1);
-  const iframeCsp = platform$1 === Web ? csp : '';
+  const sandbox = getIframeSandbox(webView, platform);
+  const iframeCsp = platform === Web ? csp : '';
   const credentialless = true;
-
-  // TODO ask renderer worker to activate
-  // await ExtensionHostManagement.activateByEvent(`onWebView:${webViewId}`)
+  await invoke$3('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
   const {
-    port1
+    port1,
+    port2
   } = getPortTuple();
   const portId = create$1();
   await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
-  await invoke('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless);
-  await invoke('WebView.load', id);
-  const origin = getWebViewOrigin(webViewPort);
+  await invoke$1('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless);
+  await invoke$1('WebView.load', id);
+  const origin = getWebViewOrigin(webViewPort, platform);
   const portType = '';
   await setPort(id, port1, origin, portType);
-
-  // TODO
-  // await ExtensionHostWorker.invokeAndTransfer('ExtensionHostWebView.create', webViewId, port2, uri, id, origin)
-
+  await invokeAndTransfer$1('ExtensionHostWebView.create', webViewId, port2, uri, id, origin);
   const savedState = await getSavedWebViewState(webViewId);
   await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
   return {
@@ -1344,25 +1318,14 @@ const create2 = async ({
 };
 
 const commandMap = {
-  // deprecated
-  'Location.getHost': getHost,
-  'Location.getOrigin': getOrigin,
-  'Location.getProtocol': getProtocol,
-  'WebView.getBaseUrl': getWebViewBaseUrl,
-  'WebView.getFrameAncestors': getWebViewFrameAncestors,
-  'WebView.getHtml': getWebViewHtml,
-  'WebView.getIframeSrc': getIframeSrc,
-  'WebView.getOrigin': getWebViewOrigin,
-  'WebView.getSandbox': getIframeSandbox,
-  'WebView.getWebViewCsp': getWebViewCsp,
-  // new
   'WebView.create2': create2
 };
 
 const listen = async () => {
-  await WebWorkerRpcClient.create({
+  const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
+  setRpc(rpc);
 };
 
 const main = async () => {

package/package.json

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