@lvce-editor/iframe-worker 4.0.0 → 5.0.0

package/dist/iframeWorkerMain.js

@@ -948,9 +948,7 @@ const getWebViewUri = (webViews, webViewId) => {
   return webViewPath;
 };
 
-const WebView = 'lvce-oss-webview';
-
-const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform$1 = platform, assetDir) => {
+const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme) => {
   const webView = getWebView(webViews, webViewId);
   const webViewUri = getWebViewUri(webViews, webViewId);
   if (!webViewUri) {
@@ -959,23 +957,18 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
   let iframeSrc = webViewUri;
   let webViewRoot = webViewUri;
 
-  // TODO simplify path handling, always use uris so that paths on windows, linux and macos are the same
-
+  // TODO when running in remote, try scope webviews by path or if possible by domain
   if (platform$1 === Electron) {
-    const relativePath = new URL(webViewUri).pathname.replace('/index.html', '');
-    iframeSrc = `${WebView}://-${relativePath}/`;
-    // TODO
+    const webViewId = webView.id;
+    iframeSrc = `${webViewScheme}://${webViewId}/`;
   } else if (platform$1 === Remote) {
     webViewRoot = webView.uri;
     iframeSrc = createLocalHostUrl(locationProtocol, locationHost, isGitpod, webViewPort);
   }
-  let iframeContent = getWebViewHtml('', '', webView.elements, assetDir);
+  const iframeContent = getWebViewHtml('', '', webView.elements, assetDir);
   // TODO either
   // - load webviews the same as in web using blob urls
   // - load webviews from a pattern like /webviews/:id/:fileName
-  if (!webView.path) {
-    iframeContent = iframeContent.replaceAll('/media/', '/').replaceAll('//', '/');
-  }
   return {
     srcDoc: '',
     iframeSrc,
@@ -1034,13 +1027,13 @@ const getIframeSrc$1 = (webView, locationOrigin, assetDir) => {
   return undefined;
 };
 
-const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir) => {
+const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme) => {
   try {
     const webView = getWebView(webViews, webViewId);
     if (platform === Web) {
       return getIframeSrc$1(webView, locationOrigin, assetDir);
     }
-    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform, assetDir);
+    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform, assetDir, webViewScheme);
   } catch (error) {
     throw new VError(error, `Failed to construct webview iframe src`);
   }
@@ -1101,11 +1094,11 @@ const getWebViewFrameAncestors = (locationProtocol, locationHost) => {
   return frameAncestors;
 };
 
-const getWebViewOrigin = (webViewPort, platform) => {
+const getWebViewOrigin = (webViewPort, platform, webViewScheme) => {
   // TODO don't hardcode protocol
   let origin = '';
   if (platform === Electron) {
-    origin = `${WebView}://-/`;
+    origin = `${webViewScheme}://-/`;
   } else if (platform === Remote) {
     origin = `http://localhost:${webViewPort}`;
   } else {
@@ -1137,6 +1130,17 @@ const getIframeSandbox = (webView, platform) => {
   return [AllowScripts, AllowSameOrigin, ...extensionSandbox];
 };
 
+const getWebViewTitle = webView => {
+  if (webView && webView.elements && Array.isArray(webView.elements)) {
+    for (const item of webView.elements) {
+      if (item && item.type === 'title' && typeof item.value === 'string') {
+        return item.value;
+      }
+    }
+  }
+  return 'WebView';
+};
+
 const state = {
   id: 0
 };
@@ -1161,6 +1165,8 @@ const invokeAndTransfer = async (method, ...params) => {
   return invokeAndTransfer$2('WebView.compatRendererProcessInvokeAndTransfer', method, ...params);
 };
 
+const WebView = 'lvce-oss-webview';
+
 const setPort = async (uid, port, origin, portType) => {
   await invokeAndTransfer('WebView.setPort', uid, port, origin, portType);
 };
@@ -1182,9 +1188,17 @@ const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentS
   await invoke('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 
-const register$3 = async previewServerId => {
+const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
   await registerProtocol();
   await create(previewServerId); // 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
+  // and webview root  /home/user/lvce/extensions/video-preview
+  // Then the request handler can decide by domain which webview root to use.
+  // Another option would be in electron to check what iframe (webContents)
+  // responds to which webviewRoot and setting a webviewRoot per webContents instance
+  // await WebViewServer.setInfo(previewServerId)
 };
 
 const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
@@ -1214,7 +1228,7 @@ const getModule = platform => {
   }
 };
 
-const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
+const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform) => {
   const fn = getModule(platform);
   return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
 };
@@ -1227,7 +1241,8 @@ const create2 = async ({
   uri,
   platform,
   isGitpod,
-  assetDir: assetDir$1 = assetDir
+  assetDir: assetDir$1 = assetDir,
+  webViewScheme = WebView
 }) => {
   let root = '';
   if (platform === Remote) {
@@ -1237,7 +1252,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);
+  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir$1, webViewScheme);
   if (!iframeResult) {
     return undefined;
   }
@@ -1251,7 +1266,7 @@ const create2 = async ({
     iframeContent
   } = iframeResult;
   const frameAncestors = getWebViewFrameAncestors(locationProtocol, locationHost);
-
+  const frameTitle = getWebViewTitle(webView);
   // TODO figure out order for events, e.g.
   // 1. activate extension, create webview and ports in parallel
   // 2. wait for webview to load (?)
@@ -1270,10 +1285,10 @@ const create2 = async ({
     port2
   } = getPortTuple();
   const portId = create$1();
-  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
-  await invoke$1('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString);
+  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform);
+  await invoke$1('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle);
   await invoke$1('WebView.load', id);
-  const origin = getWebViewOrigin(webViewPort, platform);
+  const origin = getWebViewOrigin(webViewPort, platform, webViewScheme);
   const portType = '';
   await setPort(id, port1, origin, portType);
   await invokeAndTransfer$1('ExtensionHostWebView.create', webViewId, port2, uri, id, origin);

package/package.json

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