@lvce-editor/iframe-worker 5.16.0 → 5.18.0

package/dist/iframeWorkerMain.js

@@ -483,10 +483,10 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$1 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$1 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
@@ -502,7 +502,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$1(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -659,7 +659,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$1(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -967,20 +967,24 @@ const getAssetDir = () => {
 };
 const assetDir = getAssetDir();
 
-const state$1 = {
-  rpc: undefined
+const RendererWorker = 1;
+
+const rpcs$1 = Object.create(null);
+const set$1 = (id, rpc) => {
+  rpcs$1[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs$1[id];
 };
+
 const invoke$4 = (method, ...params) => {
-  const rpc = state$1.rpc;
+  const rpc = get$1(RendererWorker);
   return rpc.invoke(method, ...params);
 };
 const invokeAndTransfer$3 = (method, ...params) => {
-  const rpc = state$1.rpc;
+  const rpc = get$1(RendererWorker);
   return rpc.invokeAndTransfer(method, ...params);
 };
-const setRpc = rpc => {
-  state$1.rpc = rpc;
-};
 
 const invoke$3 = async (method, ...params) => {
   return invoke$4('WebView.compatExtensionHostWorkerInvoke', method, ...params);
@@ -1041,13 +1045,17 @@ const getWebViewHtml = (baseUrl, locationOrigin, elements, assetDir) => {
   const middle = [];
   middle.push('<meta charset="utf-8">');
   for (const element of elements) {
-    if (element.type === 'title') {
-      middle.push(`<title>${element.value}</title>`);
-    } else if (element.type === 'script') {
-      middle.push(`<script type="module" src="${locationOrigin}${assetDir}/js/preview-injected.js"></script>`);
-      middle.push(`<script type="module" src="${locationOrigin}${baseUrl}/${element.path}"></script>`);
-    } else if (element.type === 'css') {
-      middle.push(`<link rel="stylesheet" href="${locationOrigin}${baseUrl}/${element.path}" />`);
+    switch (element.type) {
+      case 'title':
+        middle.push(`<title>${element.value}</title>`);
+        break;
+      case 'script':
+        middle.push(`<script type="module" src="${locationOrigin}${assetDir}/js/preview-injected.js"></script>`);
+        middle.push(`<script type="module" src="${locationOrigin}${baseUrl}/${element.path}"></script>`);
+        break;
+      case 'css':
+        middle.push(`<link rel="stylesheet" href="${locationOrigin}${baseUrl}/${element.path}" />`);
+        break;
     }
   }
   const middleHtml = middle.join('\n    ');
@@ -1309,6 +1317,7 @@ const invokeAndTransfer$1 = async (method, ...params) => {
 
 const WebView = 'lvce-oss-webview';
 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 const setPort = async (uid, port, origin, portType) => {
   await invokeAndTransfer$1('WebView.setPort', uid, port, origin, portType);
 };
@@ -1356,17 +1365,13 @@ const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewR
   // TODO pass coop / coep configuration to server
   await create(previewServerId, useNewWebViewHandler); // TODO move this up
   await start(previewServerId, webViewPort); // TODO move this up
-  if (useNewWebViewHandler) {
-    await setInfo2({
-      webViewRoot,
-      webViewId,
-      contentSecurityPolicy: csp,
-      iframeContent,
-      remotePathPrefix
-    });
-  } else {
-    await setHandler(previewServerId, frameAncestors, webViewRoot, csp, iframeContent);
-  }
+  await (useNewWebViewHandler ? setInfo2({
+    webViewRoot,
+    webViewId,
+    contentSecurityPolicy: csp,
+    iframeContent,
+    remotePathPrefix
+  }) : setHandler(previewServerId, frameAncestors, webViewRoot, csp, iframeContent));
   // TODO make this work in gitpod also
 };
 
@@ -1380,7 +1385,6 @@ const getModule = platform => {
       return register$2;
     case Electron:
       return register$3;
-    case Web:
     default:
       return register$1;
   }
@@ -1472,6 +1476,7 @@ const invokeAndTransfer = async (method, ...params) => {
   return invokeAndTransfer$3('WebView.compatRendererWorkerInvokeAndTransfer', method, ...params);
 };
 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 const createSecondaryWebViewConnection = async (uid, origin, port) => {
   const portType = 'application';
   await invokeAndTransfer('WebView.setPort', uid, port, origin, portType);
@@ -1734,7 +1739,7 @@ const saveState = async () => {
         value: savedState
       });
     } catch (error) {
-      console.log(error);
+      console.error(error);
       // TODO maybe log the error
       // ignore
     }
@@ -1752,7 +1757,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  setRpc(rpc);
+  set$1(RendererWorker, rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "5.16.0",
+  "version": "5.18.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
-  "main": "dist/iframeWorkerMain.js",
-  "type": "module",
+  "keywords": [
+    "iframe"
+  ],
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/iframe-worker.git"
   },
-  "keywords": [
-    "iframe"
-  ],
+  "license": "MIT",
   "author": "Lvce Editor",
-  "license": "MIT"
+  "type": "module",
+  "main": "dist/iframeWorkerMain.js"
 }