@lvce-editor/extension-host-worker 7.0.0 → 8.0.0

package/dist/extensionHostWorkerMain.js

@@ -778,10 +778,14 @@ const setConfigurations = preferences => {
 };
 
 const DebugWorker$1 = 55;
+const ExtensionManagementWorker = 9006;
 const RendererWorker$1 = 1;
 
 const rpcs$2 = Object.create(null);
 const set$c = (id, rpc) => {
+  if (rpcs$2[id]) {
+    throw new Error(`rpc with id ${id} is already registered`);
+  }
   rpcs$2[id] = rpc;
 };
 const get$b = id => {
@@ -814,16 +818,16 @@ const create$9 = rpcId => {
 
 const {
   dispose,
-  invoke: invoke$5,
-  invokeAndTransfer: invokeAndTransfer$4,
+  invoke: invoke$6,
+  invokeAndTransfer: invokeAndTransfer$5,
   set: set$b
 } = create$9(DebugWorker$1);
 
 const DebugWorker = {
   __proto__: null,
   dispose,
-  invoke: invoke$5,
-  invokeAndTransfer: invokeAndTransfer$4,
+  invoke: invoke$6,
+  invokeAndTransfer: invokeAndTransfer$5,
   set: set$b
 };
 
@@ -1711,10 +1715,10 @@ const send$1 = (transport, method, ...params) => {
   const message = create$4$2(method, params);
   transport.send(message);
 };
-const invoke$4 = (ipc, method, ...params) => {
+const invoke$5 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$3 = (ipc, method, ...params) => {
+const invokeAndTransfer$4 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -1750,10 +1754,10 @@ const createRpc$1 = ipc => {
       send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
+      return invoke$5(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$3(ipc, method, ...params);
+      return invokeAndTransfer$4(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -1909,15 +1913,49 @@ const WebWorkerRpcClient = {
 };
 
 const {
-  invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2} = create$9(RendererWorker$1);
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$3} = create$9(RendererWorker$1);
 const sendMessagePortToIframeWorker = async (port, rpcId) => {
   const command = 'Iframes.handleMessagePort';
-  await invokeAndTransfer$2('SendMessagePortToExtensionHostWorker.sendMessagePortToIframeWorker', port, command, rpcId);
+  await invokeAndTransfer$3('SendMessagePortToExtensionHostWorker.sendMessagePortToIframeWorker', port, command, rpcId);
+};
+const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
+  const command = 'Extensions.handleMessagePort';
+  await invokeAndTransfer$3('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
+};
+
+const createLazyRpc = rpcId => {
+  let rpcPromise;
+  let factory;
+  const createRpc = async () => {
+    const rpc = await factory();
+    set$c(rpcId, rpc);
+  };
+  const ensureRpc = async () => {
+    if (!rpcPromise) {
+      rpcPromise = createRpc();
+    }
+    await rpcPromise;
+  };
+  return {
+    async invoke(method, ...params) {
+      await ensureRpc();
+      const rpc = get$b(rpcId);
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      await ensureRpc();
+      const rpc = get$b(rpcId);
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    setFactory(value) {
+      factory = value;
+    }
+  };
 };
 
 const {
-  invoke: invoke$2
+  invoke: invoke$3
 } = DebugWorker;
 
 const state$9 = {
@@ -1939,20 +1977,20 @@ const registerDebugProvider = debugProvider => {
 };
 const handlePaused = async params => {
   // @ts-ignore
-  await invoke$2('Debug.paused', params);
+  await invoke$3('Debug.paused', params);
 };
 const handleResumed = async () => {
   // @ts-ignore
-  await invoke$2('Debug.resumed');
+  await invoke$3('Debug.resumed');
 };
 const handleScriptParsed = async parsedScript => {
   // @ts-ignore
-  await invoke$2('Debug.scriptParsed', parsedScript);
+  await invoke$3('Debug.scriptParsed', parsedScript);
 };
 const handleChange = async params => {
   object(params);
   // @ts-ignore
-  await invoke$2('Debug.handleChange', params);
+  await invoke$3('Debug.handleChange', params);
 };
 const start = async (protocol, path) => {
   try {
@@ -2138,18 +2176,18 @@ const {
 
 const RendererWorker = 1;
 
-const invoke$1 = (method, ...params) => {
+const invoke$2 = (method, ...params) => {
   const rpc = get$b(RendererWorker);
   return rpc.invoke(method, ...params);
 };
-const invokeAndTransfer$1 = (method, ...params) => {
+const invokeAndTransfer$2 = (method, ...params) => {
   const rpc = get$b(RendererWorker);
   return rpc.invokeAndTransfer(method, ...params);
 };
 
 const showInformationMessage = message => {
   string(message);
-  const result = invoke$1('ExtensionHostDialog.showInformationMessage', message);
+  const result = invoke$2('ExtensionHostDialog.showInformationMessage', message);
   return result;
 };
 
@@ -2212,24 +2250,24 @@ const readFileExternal = async path => {
   // this avoid parsing the potentially large message
   // and improve performance by not blocking the renderer worker
   // when reading / writing large files
-  const content = await invoke$1('FileSystem.readFile', path);
+  const content = await invoke$2('FileSystem.readFile', path);
   return content;
 };
 const removeExternal = async path => {
-  const content = await invoke$1('FileSystem.remove', path);
+  const content = await invoke$2('FileSystem.remove', path);
   return content;
 };
 const existsExternal = async uri => {
-  return await invoke$1('FileSystem.exists', uri);
+  return await invoke$2('FileSystem.exists', uri);
 };
 const mkdirExternal = async uri => {
-  return await invoke$1('FileSystem.mkdir', uri);
+  return await invoke$2('FileSystem.mkdir', uri);
 };
 const writeFileExternal = async (uri, content) => {
-  return await invoke$1('FileSystem.writeFile', uri, content);
+  return await invoke$2('FileSystem.writeFile', uri, content);
 };
 const statExternal = async uri => {
-  return await invoke$1('FileSystem.stat', uri);
+  return await invoke$2('FileSystem.stat', uri);
 };
 const readDirWithFileTypesExternal = async path => {
   // TODO when file is local,
@@ -2238,7 +2276,7 @@ const readDirWithFileTypesExternal = async path => {
   // this avoid parsing the potentially large message
   // and improve performance by not blocking the renderer worker
   // when reading / writing large files
-  const content = await invoke$1('FileSystem.readDirWithFileTypes', path);
+  const content = await invoke$2('FileSystem.readDirWithFileTypes', path);
   return content;
 };
 const remove$3 = async (protocol, path) => {
@@ -2381,7 +2419,7 @@ const sendPort = async ({
   port,
   url
 }) => {
-  await invokeAndTransfer$1('IpcParent.create', {
+  await invokeAndTransfer$2('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
     port,
@@ -2422,7 +2460,7 @@ const IpcParentWithModuleWorkerAndWorkaroundForChromeDevtoolsBug = {
 };
 
 const sendMessagePortToElectron = async (port, initialCommand) => {
-  await invokeAndTransfer$1('SendMessagePortToElectron.sendMessagePortToElectron', port, initialCommand);
+  await invokeAndTransfer$2('SendMessagePortToElectron.sendMessagePortToElectron', port, initialCommand);
 };
 
 const getPort = async type => {
@@ -2582,7 +2620,7 @@ const createNodeRpc = async ({
 
 const send = async port => {
   const initialCommand = 'FileSystem.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, initialCommand);
+  await invokeAndTransfer$2('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, initialCommand);
 };
 const launchFileSystemProcess = async () => {
   const rpc = await TransferMessagePortRpcParent.create({
@@ -2663,7 +2701,7 @@ const getEnabledProviders = () => {
 
 const confirm = message => {
   string(message);
-  const result = invoke$1('ConfirmPrompt.prompt', message);
+  const result = invoke$2('ConfirmPrompt.prompt', message);
   return result;
 };
 
@@ -2675,7 +2713,7 @@ const showQuickPick = async ({
 }) => {
   const rawPicks = await getPicks();
   const picks = rawPicks.map(toPick);
-  return invoke$1(ExtensionHostQuickPickShow, picks);
+  return invoke$2(ExtensionHostQuickPickShow, picks);
 };
 
 const {
@@ -2766,7 +2804,7 @@ const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
 const set$8 = async (url, contentSecurityPolicy) => {
   const pathName = new URL(url).pathname;
-  await invoke$1('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
+  await invoke$2('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
 };
 
 /**
@@ -2921,62 +2959,16 @@ const getProtocol = uri => {
   return '';
 };
 
-const createWebViewIpc = async webView => {
-  const {
-    origin,
-    uid
-  } = webView;
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  const rpcPromise = MessagePortRpcParent.create({
-    commandMap: {},
-    isMessagePortOpen: false,
-    messagePort: port2
-  });
-  const portType = 'test';
-  await invokeAndTransfer$1('WebView.setPort', uid, port1, origin, portType);
-  // TODO maybe don't send a message port only to get object url?
-  // TODO dispose rpc to avoid memory leak
-  const rpc = await rpcPromise;
-  return rpc;
-};
-
-const webViews = Object.create(null);
-const webViewProviders = Object.create(null);
-const getProvider = providerId => {
-  return webViewProviders[providerId];
-};
-const setProvider = (providerId, provider) => {
-  webViewProviders[providerId] = provider;
-};
-const getWebView = id => {
-  return webViews[id];
-};
-const setWebView = (id, webView) => {
-  webViews[id] = webView;
-};
-const getWebViews$1 = () => {
-  return webViews;
-};
+// @ts-ignore
 
-// TODO if webViewId is provided,
-// 1. read file as blob
-// 2. send blob to webview
-// 3. create objecturl in webview
-// 4. send back objecturl to extension host worker
-// 5. provide objectUrl to extension
+const {
+  invoke: invoke$1,
+  invokeAndTransfer: invokeAndTransfer$1,
+  setFactory
+} = createLazyRpc(ExtensionManagementWorker);
 
 const getRemoteUrlForWebView = async (uri, options = {}) => {
-  // TODO webviews should be stored in iframe worker
-  const webView = getWebView(options.webViewId);
-  if (!webView) {
-    throw new Error(`webview ${options.webViewId} not found`);
-  }
-  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$1('FileSystem.getBlob', uri)]);
-  const objectUrl = await rpc.invoke('createObjectUrl', blob);
-  return objectUrl;
+  return await invoke$1('Extensions.getRemoteUrlForWebView', uri, options);
 };
 
 const isFileProtocol = protocol => {
@@ -3013,7 +3005,7 @@ const getRemoteUrl$1 = async (uri, options = {}) => {
     return getRemoteUrlForWebView(uri, options);
   }
   if (uri.startsWith('html://')) {
-    const url = await invoke$1('Blob.getSrc', uri);
+    const url = await invoke$2('Blob.getSrc', uri);
     return url;
   }
   throw new Error(`unsupported platform for remote url`);
@@ -3056,7 +3048,7 @@ const getWebExtensions = async () => {
 };
 
 const getSharedProcessExtensions = () => {
-  return invoke$1(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
+  return invoke$2(/* ExtensionManagement.getExtensions */'ExtensionManagement.getExtensions');
 };
 const doGetExtensions = async () => {
   const meta = state$8.webExtensions;
@@ -3278,6 +3270,24 @@ const {
   }
 });
 
+const webViews = Object.create(null);
+const webViewProviders = Object.create(null);
+const getProvider = providerId => {
+  return webViewProviders[providerId];
+};
+const setProvider = (providerId, provider) => {
+  webViewProviders[providerId] = provider;
+};
+const getWebView = id => {
+  return webViews[id];
+};
+const setWebView = (id, webView) => {
+  webViews[id] = webView;
+};
+const getWebViews$1 = () => {
+  return webViews;
+};
+
 // TODO pass uuid to allow having multiple webviews open at the same time
 
 /**
@@ -3364,7 +3374,7 @@ const getWorkspaceFolder = path => {
 };
 const handleWorkspaceRefresh = async () => {
   // @ts-ignore
-  await invoke$3('Layout.handleWorkspaceRefresh');
+  await invoke$4('Layout.handleWorkspaceRefresh');
 };
 
 class FormattingError extends Error {
@@ -4184,7 +4194,7 @@ const applyBulkReplacement = async (files, ranges, replacement) => {
 };
 
 const addCssStyleSheet = (id, css) => {
-  return invoke$1('Css.addCssStyleSheet', id, css);
+  return invoke$2('Css.addCssStyleSheet', id, css);
 };
 
 const warn = (...args) => {
@@ -4617,10 +4627,10 @@ const GetColorThemeCssCachedIndexedDb = {
 };
 
 const getText$1 = key => {
-  return invoke$1('LocalStorage.getText', key);
+  return invoke$2('LocalStorage.getText', key);
 };
 const setText = (key, value) => {
-  return invoke$1('LocalStorage.setText', key, value);
+  return invoke$2('LocalStorage.setText', key, value);
 };
 
 const getCacheKey = colorThemeId => {
@@ -4655,7 +4665,7 @@ const GetColorThemeCssCachedNoop = {
 };
 
 const get = key => {
-  return invoke$1('Preferences.get', key);
+  return invoke$2('Preferences.get', key);
 };
 
 const getCacheFn = config => {
@@ -4681,7 +4691,7 @@ const getColorThemeCssCached = async (colorThemeId, getData) => {
 };
 
 const readJson = url => {
-  return invoke$1('FileSystem.readJson', url);
+  return invoke$2('FileSystem.readJson', url);
 };
 
 const dirname = (pathSeparator, path) => {
@@ -4763,7 +4773,7 @@ const getMetaThemeColor = colorThemeJson => {
 };
 
 const setThemeColor = async themeColor => {
-  await invoke$1(/* Meta.setThemeColor */'Meta.setThemeColor', /* color */themeColor);
+  await invoke$2(/* Meta.setThemeColor */'Meta.setThemeColor', /* color */themeColor);
 };
 
 // TODO by default color theme should come from local storage, session storage, cache storage, indexeddb or blob url -> fast initial load
@@ -4799,7 +4809,7 @@ const watch = async id => {
     return;
   }
   state$1.watchedTheme = id;
-  await invoke$1('ExtensionHost.watchColorTheme', id);
+  await invoke$2('ExtensionHost.watchColorTheme', id);
 };
 const getPreferredColorTheme = () => {
   const preferredColorTheme = get('workbench.colorTheme');
@@ -4872,46 +4882,18 @@ const createWebView3 = async ({
 };
 
 const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
-  // TODO this function is called from the iframe worker to create a direct
-  // connection between a webview/iframe and it's webworker. For this to work
-  // the iframe worker creates a messagechannel and sends one messageport to the webview
-  // and the other messageport to the webworker. This enables direct communication via
-  // the two message ports
-
-  // TODO have a way so that the worker already includes the webview api and the extension
-  // host subworker doesn't need to import the other file
-  await invokeAndTransfer$1('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    name: rpcInfo.name,
-    port,
-    raw: true,
-    url: rpcInfo.url
-  });
+  await invokeAndTransfer$1('Extensions.createWebViewWorkerRpc2', rpcInfo, port);
 };
 
 /**
  * @deprecated use createWebViewWorkerRpc2 which passes the worker url as a parameter
  */
 const createWebViewWorkerRpc = async (rpcInfo, port) => {
-  // TODO this function is called from the iframe worker to create a direct
-  // connection between a webview/iframe and it's webworker. For this to work
-  // the iframe worker creates a messagechannel and sends one messageport to the webview
-  // and the other messageport to the webworker. This enables direct communication via
-  // the two message ports
-
-  // TODO have a way so that the worker already includes the webview api and the extension
-  // host subworker doesn't need to import the other file
-  await invokeAndTransfer$1('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    name: rpcInfo.name,
-    port,
-    raw: true,
-    url: extensionHostSubWorkerUrl
-  });
+  await invokeAndTransfer$1('Extensions.createWebViewWorkerRpc', rpcInfo, port);
 };
 
 const executeExternalCommand = (method, ...params) => {
-  return invoke$1(method, ...params);
+  return invoke$2(method, ...params);
 };
 
 const BraceCompletionExecuteBraceCompletionProvider = 'ExtensionHostBraceCompletion.executeBraceCompletionProvider';
@@ -4979,7 +4961,7 @@ const mockExec = () => {
   try {
     // @ts-ignore
     api.exec = async (command, args, options) => {
-      const result = await invoke$1('Test.executeMockExecFunction', command, args, options);
+      const result = await invoke$2('Test.executeMockExecFunction', command, args, options);
       const {
         exitCode,
         stderr,
@@ -5005,7 +4987,7 @@ const mockRpc = () => {
     try {
       return {
         async invoke(method, ...params) {
-          const result = await invoke$1('Test.executeMockRpcFunction', options.name, method, ...params);
+          const result = await invoke$2('Test.executeMockRpcFunction', options.name, method, ...params);
           return result;
         }
       };
@@ -5479,12 +5461,8 @@ const getIconThemeJson = async iconThemeId => {
   return getIconThemeJson$1(iconThemeId);
 };
 
-const getRpcInfo = rpcId => {
-  const info = get$8(rpcId);
-  if (!info) {
-    throw new Error(`Rpc not found ${rpcId}`);
-  }
-  return info;
+const getRpcInfo = async rpcId => {
+  return await invoke$1('Extensions.getRpcInfo', rpcId);
 };
 
 const emptyStatus = {
@@ -5571,7 +5549,7 @@ const handleMessagePort = async (port, rpcId) => {
 };
 
 const handleIconThemeChange = async () => {
-  await invoke$1('IconTheme.handleIconThemeChange');
+  await invoke$2('IconTheme.handleIconThemeChange');
 };
 
 const initialIconTheme = undefined;
@@ -6326,7 +6304,18 @@ const commandMap = {
   'WebViews.getWebViews': getWebViews
 };
 
+const launchExtensionManagementWorker = async () => {
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToExtensionManagementWorker(port, 0);
+    }
+  });
+  return rpc;
+};
+
 const listen = async () => {
+  setFactory(launchExtensionManagementWorker);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"