@lvce-editor/iframe-worker 4.1.0 → 5.1.0

package/dist/iframeWorkerMain.js

@@ -957,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 = `${webViewScheme}://-${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,
@@ -1189,13 +1184,24 @@ const create = async previewServerId => {
 const start = async (previewServerId, webViewPort) => {
   await invoke('WebViewServer.start', previewServerId, webViewPort);
 };
+const setInfo = async (previewServerId, webViewId, webViewRoot) => {
+  await invoke('WebViewServer.setInfo', previewServerId, webViewId, webViewRoot);
+};
 const setHandler = async (previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent) => {
   await invoke('WebViewServer.setHandler', previewServerId, frameAncestors, webViewRoot, contentSecurityPolicy, iframeContent);
 };
 
-const register$3 = async previewServerId => {
+const register$3 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId) => {
   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 setInfo(previewServerId, webViewId, webViewRoot);
 };
 
 const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
@@ -1225,9 +1231,9 @@ const getModule = platform => {
   }
 };
 
-const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
+const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId) => {
   const fn = getModule(platform);
-  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
+  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId);
 };
 
 const create2 = async ({
@@ -1282,7 +1288,7 @@ const create2 = async ({
     port2
   } = getPortTuple();
   const portId = create$1();
-  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);
+  await register(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, platform, webViewId);
   await invoke$1('WebView.create', id, iframeSrc, sandbox, iframeCsp, credentialless, permissionPolicyString, frameTitle);
   await invoke$1('WebView.load', id);
   const origin = getWebViewOrigin(webViewPort, platform, webViewScheme);

package/package.json

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