@lvce-editor/iframe-worker 5.8.0 → 5.10.0

package/dist/iframeWorkerMain.js

@@ -886,20 +886,27 @@ const createUrl = (protocol, host) => {
   return protocol + '//' + host;
 };
 
-const createLocalHostUrl = (locationProtocol, locationHost, isGitpod, webViewPort) => {
+const createLocalHostUrl = (locationProtocol, locationHost, isGitpod, webViewPort, webViewId, useNewWebViewHandler) => {
   if (isGitpod) {
     return createUrl(locationProtocol, locationHost.replace('3000', `${webViewPort}`));
   }
+  if (useNewWebViewHandler) {
+    return `http://localhost:${webViewPort}/${webViewId}`;
+  }
   return `http://localhost:${webViewPort}`;
 };
 
-const getIframeSrcRemoteBaseUrl = (webViewRoot, locationOrigin) => {
+const getIframeSrcRemoteBaseUrl = (webViewRoot, locationOrigin, platform, webViewId, useNewWebViewHandler) => {
   if (webViewRoot && (webViewRoot.startsWith('http:') || webViewRoot.startsWith('https:'))) {
     if (webViewRoot.startsWith(locationOrigin)) {
-      return webViewRoot.slice(locationOrigin.length);
+      const baseUrl = webViewRoot.slice(locationOrigin.length);
+      return baseUrl;
     }
     return webViewRoot;
   }
+  if (platform === Remote && useNewWebViewHandler && webViewId) {
+    return `/${webViewId}`;
+  }
   return '';
 };
 
@@ -958,7 +965,7 @@ const getWebViewUri = (webViews, webViewId) => {
   return webViewPath;
 };
 
-const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme) => {
+const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme, useNewWebViewHandler) => {
   const webView = getWebView(webViews, webViewId);
   const webViewUri = getWebViewUri(webViews, webViewId);
   if (!webViewUri) {
@@ -973,9 +980,9 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
     iframeSrc = `${webViewScheme}://${webViewId}`;
   } else if (platform$1 === Remote) {
     webViewRoot = webView.uri;
-    iframeSrc = createLocalHostUrl(locationProtocol, locationHost, isGitpod, webViewPort);
+    iframeSrc = createLocalHostUrl(locationProtocol, locationHost, isGitpod, webViewPort, webViewId, useNewWebViewHandler);
   }
-  const baseUrl = getIframeSrcRemoteBaseUrl(webViewRoot, locationOrigin);
+  const baseUrl = getIframeSrcRemoteBaseUrl(webViewRoot, locationOrigin, platform$1, webViewId, useNewWebViewHandler);
   const iframeContent = getWebViewHtml(baseUrl, '', webView.elements, assetDir);
   // TODO either
   // - load webviews the same as in web using blob urls
@@ -1037,13 +1044,13 @@ const getIframeSrc$1 = (webView, locationOrigin, assetDir) => {
   return undefined;
 };
 
-const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme) => {
+const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme, useNewWebViewHandler) => {
   try {
     const webView = getWebView(webViews, webViewId);
     if (platform === Web) {
       return getIframeSrc$1(webView, locationOrigin, assetDir);
     }
-    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform, assetDir, webViewScheme);
+    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform, assetDir, webViewScheme, useNewWebViewHandler);
   } catch (error) {
     throw new VError(error, `Failed to construct webview iframe src`);
   }
@@ -1195,22 +1202,25 @@ const invoke = async (method, ...params) => {
 const registerProtocol = async () => {
   await invoke('WebViewServer.registerProtocol');
 };
-const create = async previewServerId => {
-  await invoke('WebViewServer.create', previewServerId);
+const create = async (previewServerId, useNewWebViewHandler) => {
+  await invoke('WebViewServer.create', previewServerId, useNewWebViewHandler);
 };
 const start = async (previewServerId, webViewPort) => {
   await invoke('WebViewServer.start', previewServerId, webViewPort);
 };
+const setInfo2 = async info => {
+  await invoke('WebViewServer.setInfo2', info);
+};
 const setInfo = async (previewServerId, webViewId, webViewRoot, contentSecurityPolicy, iframeContent) => {
   await invoke('WebViewServer.setInfo', previewServerId, webViewId, webViewRoot, contentSecurityPolicy, iframeContent);
 };
-const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent) => {
+const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent, remotePathPrefix) => {
   await invoke('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 
-const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId) => {
+const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId, remotePathPrefix, useNewWebViewHandler) => {
   await registerProtocol();
-  await create(previewServerId); // TODO move this up
+  await create(previewServerId, useNewWebViewHandler); // TODO move this up
 
   // TODO send info to electron which domain maps to which webview root.
   // for example, video-preview maps to domain lvce-oss-webview://video-preview
@@ -1221,14 +1231,24 @@ const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewR
   await setInfo(previewServerId, webViewId, webViewRoot, csp, iframeContent);
 };
 
-const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
+const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId, remotePathPrefix, useNewWebViewHandler) => {
   // TODO apply something similar for electron
   // TODO pass webview root, so that only these resources can be accessed
   // TODO pass csp configuration to server
   // TODO pass coop / coep configuration to server
-  await create(previewServerId); // TODO move this up
+  await create(previewServerId, useNewWebViewHandler); // TODO move this up
   await start(previewServerId, webViewPort); // TODO move this up
-  await setHandler(previewServerId, frameAncestors, webViewRoot, csp, iframeContent);
+  if (useNewWebViewHandler) {
+    await setInfo2({
+      webViewRoot,
+      webViewId,
+      contentSecurityPolicy: csp,
+      iframeContent,
+      remotePathPrefix
+    });
+  } else {
+    await setHandler(previewServerId, frameAncestors, webViewRoot, csp, iframeContent);
+  }
   // TODO make this work in gitpod also
 };
 
@@ -1248,9 +1268,9 @@ const getModule = platform => {
   }
 };
 
-const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId) => {
+const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId, remotePathPrefix, useNewWebViewHandler) => {
   const fn = getModule(platform);
-  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId);
+  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId, remotePathPrefix, useNewWebViewHandler);
 };
 
 const create2 = async ({
@@ -1272,7 +1292,7 @@ const create2 = async ({
   const locationProtocol = getProtocol();
   const locationHost = getHost();
   const locationOrigin = getOrigin();
-  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir$1, webViewScheme);
+  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir$1, webViewScheme, false);
   if (!iframeResult) {
     return undefined;
   }
@@ -1304,7 +1324,8 @@ const create2 = async ({
     port2
   } = getPortTuple();
   const portId = create$1();
-  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId);
+  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);
 
   // TODO maybe iframe waitForLoad is not needed. since it cannot be used detect errors anyway
@@ -1360,7 +1381,8 @@ const create3 = async ({
   isGitpod,
   platform,
   assetDir,
-  webViewScheme
+  webViewScheme,
+  useNewWebViewHandler
 }) => {
   let root = '';
   if (platform === Remote) {
@@ -1374,7 +1396,7 @@ const create3 = async ({
   const locationPort = getPort();
   const webViewPort = getWebViewPort(platform, locationPort);
   const previewServerId = getPreviewServerId();
-  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme);
+  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme, useNewWebViewHandler || false);
   if (!iframeResult) {
     return undefined;
   }
@@ -1406,7 +1428,8 @@ const create3 = async ({
     port2
   } = getPortTuple();
   const portId = create$1();
-  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId);
+  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);
 
   // TODO maybe iframe waitForLoad is not needed. since it cannot be used detect errors anyway

package/package.json

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