@lvce-editor/iframe-worker 5.24.0 → 5.26.0

package/dist/iframeWorkerMain.js

@@ -919,54 +919,6 @@ const WebWorkerRpcClient = {
   create: create$2
 };
 
-const Web = 1;
-const Electron = 2;
-const Remote = 3;
-const Test = 4;
-
-/* istanbul ignore file */
-
-// TODO this should always be completely tree shaken out during build, maybe need to be marked as @__Pure for terser to work
-
-// TODO treeshake this function out when targeting electron
-
-/**
- * @returns {number}
- */
-const getPlatform = () => {
-  // @ts-ignore
-  if (typeof PLATFORM !== 'undefined') {
-    // @ts-ignore
-    return PLATFORM;
-  }
-  // @ts-ignore
-  if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
-    return Test;
-  }
-  // TODO find a better way to pass runtime environment
-  if (typeof name !== 'undefined' && name.endsWith('(Electron)')) {
-    return Electron;
-  }
-  if (typeof name !== 'undefined' && name.endsWith('(Web)')) {
-    return Web;
-  }
-  return Remote;
-};
-const platform = getPlatform();
-
-const getAssetDir = () => {
-  // @ts-ignore
-  if (typeof ASSET_DIR !== 'undefined') {
-    // @ts-ignore
-    return ASSET_DIR;
-  }
-  if (platform === Electron) {
-    return '';
-  }
-  return '';
-};
-const assetDir = getAssetDir();
-
 const RendererWorker = 1;
 
 const rpcs$1 = Object.create(null);
@@ -1015,6 +967,10 @@ const createLocalHostUrl = (locationProtocol, locationHost, isGitpod, webViewPor
   return `http://localhost:${webViewPort}`;
 };
 
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+
 const getIframeSrcRemoteBaseUrl = (webViewRoot, locationOrigin, platform, webViewId, useNewWebViewHandler, root) => {
   if (webViewRoot && (webViewRoot.startsWith('http:') || webViewRoot.startsWith('https:'))) {
     if (webViewRoot.startsWith(locationOrigin)) {
@@ -1088,7 +1044,7 @@ const getWebViewUri = (webViews, webViewId) => {
   return webViewPath;
 };
 
-const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform$1 = platform, assetDir, webViewScheme, useNewWebViewHandler) => {
+const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol, locationOrigin, locationHost, isGitpod, root, platform, assetDir, webViewScheme, useNewWebViewHandler) => {
   const webView = getWebView(webViews, webViewId);
   const webViewUri = getWebViewUri(webViews, webViewId);
   if (!webViewUri) {
@@ -1101,14 +1057,14 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
   let webViewRoot = webViewUri;
 
   // TODO when running in remote, try scope webviews by path or if possible by domain
-  if (platform$1 === Electron) {
+  if (platform === Electron) {
     const webViewId = webView.id;
     iframeSrc = `${webViewScheme}://${webViewId}`;
-  } else if (platform$1 === Remote) {
+  } else if (platform === Remote) {
     webViewRoot = webView.uri;
     iframeSrc = createLocalHostUrl(locationProtocol, locationHost, isGitpod, webViewPort, webViewId, useNewWebViewHandler);
   }
-  const baseUrl = getIframeSrcRemoteBaseUrl(webViewRoot, locationOrigin, platform$1, webViewId, useNewWebViewHandler, root);
+  const baseUrl = getIframeSrcRemoteBaseUrl(webViewRoot, locationOrigin, platform, webViewId, useNewWebViewHandler, root);
   const iframeContent = getWebViewHtml(baseUrl, '', webView.elements, assetDir);
   // TODO either
   // - load webviews the same as in web using blob urls
@@ -1406,7 +1362,7 @@ const create2 = async ({
   uri,
   platform,
   isGitpod,
-  assetDir: assetDir$1 = assetDir,
+  assetDir = '',
   webViewScheme = WebView
 }) => {
   let root = '';
@@ -1417,7 +1373,7 @@ const create2 = async ({
   const locationProtocol = getProtocol$1();
   const locationHost = getHost();
   const locationOrigin = getOrigin();
-  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir$1, webViewScheme, false);
+  const iframeResult = getIframeSrc(webViews, webViewId, webViewPort, root, isGitpod, locationProtocol, locationHost, locationOrigin, platform, assetDir, webViewScheme, false);
   if (!iframeResult) {
     return undefined;
   }
@@ -1551,10 +1507,19 @@ const getRemoteUrlForWebView = async options => {
   return objectUrl;
 };
 
+let platform = 0;
+const setPlatform = value => {
+  platform = value;
+};
+const getPlatform = () => {
+  return platform;
+};
+
 const getRemoteUrl = async options => {
   const {
     uri
   } = options;
+  const platform = getPlatform() || Web;
   // TODO uri should always have protocol
   // then ask file system provider for remote url, for example disk file system provider or html file system provider
   const protocol = getProtocol(uri);
@@ -1740,6 +1705,7 @@ const create3 = async ({
   webViewScheme,
   useNewWebViewHandler
 }) => {
+  setPlatform(platform);
   let root = '';
   if (platform === Remote) {
     root = await invoke$1('Platform.getRoot');
@@ -1776,6 +1742,8 @@ const create3 = async ({
   const permissionPolicyString = permissionPolicy.join('; ');
   const iframeCsp = platform === Web ? csp : '';
   const credentialless = getCredentialLess(locationHost);
+
+  // TODO remove this
   await invoke$4('ExtensionHostManagement.activateByEvent', `onWebView:${webViewId}`);
   const portId = create$1();
   const remotePathPrefix = '/remote';
@@ -1814,17 +1782,15 @@ const getWebViewInfo = webViewId => {
   const rpcs = getAll();
   for (const value of Object.values(rpcs)) {
     if (value.webViewId === webViewId) {
-      return value;
+      return {
+        uid: value.webViewUid,
+        origin: value.origin
+      };
     }
   }
   return undefined;
 };
 
-const GetWebViewInfo = {
-  __proto__: null,
-  getWebViewInfo
-};
-
 const saveState = async () => {
   const all = getAll();
   const serialized = [];
@@ -1849,7 +1815,7 @@ const commandMap = {
   'WebView.create3': create3,
   'WebView.saveState': saveState,
   'WebView.getSecret': getSecret,
-  'WebView.getWebViewInfo': GetWebViewInfo
+  'WebView.getWebViewInfo': getWebViewInfo
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "5.24.0",
+  "version": "5.26.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
   "keywords": [
     "iframe"