@lvce-editor/iframe-worker 5.7.0 → 5.9.0

package/dist/iframeWorkerMain.js

@@ -893,6 +893,16 @@ const createLocalHostUrl = (locationProtocol, locationHost, isGitpod, webViewPor
   return `http://localhost:${webViewPort}`;
 };
 
+const getIframeSrcRemoteBaseUrl = (webViewRoot, locationOrigin) => {
+  if (webViewRoot && (webViewRoot.startsWith('http:') || webViewRoot.startsWith('https:'))) {
+    if (webViewRoot.startsWith(locationOrigin)) {
+      return webViewRoot.slice(locationOrigin.length);
+    }
+    return webViewRoot;
+  }
+  return '';
+};
+
 const getWebView = (webViews, webViewId) => {
   for (const webView of webViews) {
     if (webView.id === webViewId) {
@@ -948,7 +958,7 @@ const getWebViewUri = (webViews, webViewId) => {
   return webViewPath;
 };
 
-const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme) => {
+const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme) => {
   const webView = getWebView(webViews, webViewId);
   const webViewUri = getWebViewUri(webViews, webViewId);
   if (!webViewUri) {
@@ -965,12 +975,12 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
     webViewRoot = webView.uri;
     iframeSrc = createLocalHostUrl(locationProtocol, locationHost, isGitpod, webViewPort);
   }
-  const iframeContent = getWebViewHtml('', '', webView.elements, assetDir);
+  const baseUrl = getIframeSrcRemoteBaseUrl(webViewRoot, locationOrigin);
+  const iframeContent = getWebViewHtml(baseUrl, '', webView.elements, assetDir);
   // TODO either
   // - load webviews the same as in web using blob urls
   // - load webviews from a pattern like /webviews/:id/:fileName
   return {
-    srcDoc: '',
     iframeSrc,
     webViewRoot,
     iframeContent
@@ -1019,7 +1029,6 @@ const getIframeSrc$1 = (webView, locationOrigin, assetDir) => {
   if (srcHtml) {
     const blobUrl = getBlobUrl(srcHtml, 'text/html');
     return {
-      srcDoc: '',
       iframeSrc: blobUrl,
       webViewRoot: '',
       iframeContent: ''
@@ -1034,7 +1043,7 @@ const getIframeSrc = (webViews, webViewId, webViewPort, root, isGitpod, location
     if (platform === Web) {
       return getIframeSrc$1(webView, locationOrigin, assetDir);
     }
-    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationHost, isGitpod, root, platform, assetDir, webViewScheme);
+    return getIframeSrcRemote(webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform, assetDir, webViewScheme);
   } catch (error) {
     throw new VError(error, `Failed to construct webview iframe src`);
   }
@@ -1195,7 +1204,7 @@ const start = async (previewServerId, webViewPort) => {
 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);
 };
 
@@ -1212,7 +1221,7 @@ 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, remotePathPrefix) => {
   // TODO apply something similar for electron
   // TODO pass webview root, so that only these resources can be accessed
   // TODO pass csp configuration to server
@@ -1239,9 +1248,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) => {
   const fn = getModule(platform);
-  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId);
+  return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent, webViewId, remotePathPrefix);
 };
 
 const create2 = async ({
@@ -1273,7 +1282,6 @@ const create2 = async ({
   const {
     iframeSrc,
     webViewRoot,
-    srcDoc,
     iframeContent
   } = iframeResult;
   const frameAncestors = getWebViewFrameAncestors(locationProtocol, locationHost);
@@ -1296,7 +1304,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
@@ -1310,7 +1319,6 @@ const create2 = async ({
   const savedState = await getSavedWebViewState(webViewId);
   await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
   return {
-    srcDoc,
     iframeSrc,
     sandbox,
     portId,
@@ -1377,7 +1385,6 @@ const create3 = async ({
   const {
     iframeSrc,
     webViewRoot,
-    srcDoc,
     iframeContent
   } = iframeResult;
   const frameAncestors = getWebViewFrameAncestors(locationProtocol, locationHost);
@@ -1400,7 +1407,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);
   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
@@ -1414,7 +1422,6 @@ const create3 = async ({
   const savedState = await getSavedWebViewState(webViewId);
   await invoke$2('ExtensionHostWebView.load', webViewId, savedState);
   return {
-    srcDoc,
     iframeSrc,
     sandbox,
     portId,

package/package.json

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