@lvce-editor/extension-management-worker 3.4.0 → 4.1.0

package/dist/extensionManagementWorkerMain.js

@@ -608,7 +608,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$4 = id => {
+const get$5 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -757,7 +757,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$4(id);
+  const fn = get$5(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1215,33 +1215,33 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const rpcs$1 = Object.create(null);
-const set$6 = (id, rpc) => {
-  rpcs$1[id] = rpc;
+const rpcs$2 = Object.create(null);
+const set$7 = (id, rpc) => {
+  rpcs$2[id] = rpc;
 };
-const get$3 = id => {
-  return rpcs$1[id];
+const get$4 = id => {
+  return rpcs$2[id];
 };
 const remove = id => {
-  delete rpcs$1[id];
+  delete rpcs$2[id];
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$3(rpcId);
+      const rpc = get$4(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$3(rpcId);
+      const rpc = get$4(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$3(rpcId);
+      const rpc = get$4(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1249,7 +1249,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$7(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1258,7 +1258,7 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$7(rpcId, rpc);
     }
   };
 };
@@ -1274,13 +1274,45 @@ const RendererWorker = 1;
 const SharedProcess = 1492;
 
 const {
+  dispose,
   invoke: invoke$4,
-  set: set$5
+  invokeAndTransfer: invokeAndTransfer$2,
+  registerMockRpc,
+  set: set$6
 } = create$1(ExtensionHostWorker);
+const executeReferenceProvider = async (id, offset) => {
+  // @ts-ignore
+  return invoke$4('ExtensionHostReference.executeReferenceProvider', id, offset);
+};
+const executeFileReferenceProvider = async id => {
+  // @ts-ignore
+  return invoke$4('ExtensionHostReference.executeFileReferenceProvider', id);
+};
+const getRuntimeStatus$2 = async extensionId => {
+  // @ts-ignore
+  return invoke$4('ExtensionHost.getRuntimeStatus', extensionId);
+};
+const getEnabledOutputProviderIds = async () => {
+  const channels = await invoke$4('Output.getEnabledProviders');
+  return channels;
+};
+
+const ExtensionHost = {
+  __proto__: null,
+  dispose,
+  executeFileReferenceProvider,
+  executeReferenceProvider,
+  getEnabledOutputProviderIds,
+  getRuntimeStatus: getRuntimeStatus$2,
+  invoke: invoke$4,
+  invokeAndTransfer: invokeAndTransfer$2,
+  registerMockRpc,
+  set: set$6
+};
 
 const {
   invoke: invoke$3,
-  set: set$4
+  set: set$5
 } = create$1(FileSystemWorker);
 const readFile = async uri => {
   return invoke$3('FileSystem.readFile', uri);
@@ -1295,7 +1327,7 @@ const exists = async uri => {
 const {
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$3
+  set: set$4
 } = create$1(RendererWorker);
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
@@ -1316,7 +1348,7 @@ const sendMessagePortToSharedProcess = async port => {
 
 const {
   invoke: invoke$1,
-  set: set$2
+  set: set$3
 } = create$1(SharedProcess);
 
 const create = () => {
@@ -1364,14 +1396,14 @@ const createEmptyRuntimeStatus = id => {
   };
 };
 let extensionsState = createInitialState();
-const get$2 = () => {
+const get$3 = () => {
   return extensionsState;
 };
-const set$1 = newState => {
+const set$2 = newState => {
   extensionsState = newState;
 };
 const update = newState => {
-  set$1({
+  set$2({
     ...extensionsState,
     ...newState
   });
@@ -1485,10 +1517,10 @@ const rejectAfterTimeout = async (timeout, token) => {
   }
   throw new Error(`Activation timeout of ${timeout}ms exceeded`);
 };
-const activate = async (extensionId, extension) => {
-  await invoke$4('ExtensionHost.activateExtension3', extensionId, extension);
+const activate = async (extensionId, extension, extensionHost) => {
+  await extensionHost.invoke('ExtensionHost.activateExtension3', extensionId, extension);
 };
-const activateExtension2 = async (extensionId, extension, absolutePath) => {
+const activateExtension2 = async (extensionId, extension, absolutePath, extensionHost = ExtensionHost) => {
   string(extensionId);
   object(extension);
   string(absolutePath);
@@ -1499,7 +1531,7 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
       activationStartTime: startTime,
       status: Activating
     });
-    await Promise.race([activate(extensionId, extension), rejectAfterTimeout(activationTimeout, token)]);
+    await Promise.race([activate(extensionId, extension, extensionHost), rejectAfterTimeout(activationTimeout, token)]);
     const endTime = performance.now();
     const time = endTime - startTime;
     updateRuntimeStatus(extensionId, {
@@ -1524,6 +1556,42 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
   }
 };
 
+const commandMapRef = {};
+
+const rpcs$1 = Object.create(null);
+const get$2 = extensionId => {
+  return rpcs$1[extensionId];
+};
+const getAll = () => {
+  return Object.values(rpcs$1);
+};
+const set$1 = (extensionId, rpc) => {
+  rpcs$1[extensionId] = rpc;
+};
+
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const invokeAndTransfer = (method, ...params) => {
+  return invokeAndTransfer$1(method, ...params);
+};
+
+const getOrCreateIsolatedExtensionHostWorker = async extensionId => {
+  const existingRpc = get$2(extensionId);
+  if (existingRpc) {
+    return existingRpc;
+  }
+  const rpc = await create$7({
+    commandMap: commandMapRef,
+    send(port) {
+      return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId);
+    }
+  });
+  set$1(extensionId, rpc);
+  return rpc;
+};
+
 const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1567,7 +1635,7 @@ const handleRpcInfos = (extension, platform) => {
   }
 };
 
-const importExtension = async (extensionId, absolutePath, activationEvent) => {
+const importExtension = async (extensionId, absolutePath, activationEvent, extensionHost = ExtensionHost) => {
   try {
     string(absolutePath);
     const startTime = performance.now();
@@ -1583,7 +1651,7 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
       status: Importing
     });
     try {
-      await invoke$4('ExtensionHost.importExtension2', extensionId, absolutePath);
+      await extensionHost.invoke('ExtensionHost.importExtension2', extensionId, absolutePath);
       const endTime = performance.now();
       const time = endTime - startTime;
       updateRuntimeStatus(extensionId, {
@@ -1615,11 +1683,16 @@ const interExtensionId = path => {
   return path.slice(slashIndex + 1);
 };
 
+const isExtensionIsolated = extension => {
+  return extension?.isolated === true;
+};
+
 const activateExtension3 = async (extension, absolutePath, activationEvent, platform) => {
   handleRpcInfos(extension, platform);
   const extensionId = extension.id || interExtensionId(extension.uri);
-  await importExtension(extensionId, absolutePath, activationEvent);
-  await activateExtension2(extensionId, extension, absolutePath);
+  const extensionHost = isExtensionIsolated(extension) ? await getOrCreateIsolatedExtensionHostWorker(extensionId) : undefined;
+  await importExtension(extensionId, absolutePath, activationEvent, extensionHost);
+  await activateExtension2(extensionId, extension, absolutePath, extensionHost);
 };
 
 const getJson$1 = async url => {
@@ -1667,14 +1740,6 @@ const addWebExtension = async path => {
 
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
-/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-const invoke = (method, ...params) => {
-  return invoke$2(method, ...params);
-};
-const invokeAndTransfer = (method, ...params) => {
-  return invokeAndTransfer$1(method, ...params);
-};
-
 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
@@ -1764,13 +1829,13 @@ const disabledExtensionsCacheKey = '/cache/disabledExtensions.json';
 const disableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$2(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
+  const oldState = get$3(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: [...oldState.disabledIds, id]
     };
-    set$1(newState);
+    set$2(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -1786,13 +1851,13 @@ const disableExtension2$1 = async (id, platform) => {
 const enableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$2();
+  const oldState = get$3();
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: oldState.disabledIds.filter(existing => existing !== id)
     };
-    set$1(newState);
+    set$2(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -1821,7 +1886,7 @@ const disableExtension2 = async (id, platform) => {
 };
 
 const disableExtension = async (id, isTest) => {
-  const oldState = get$2();
+  const oldState = get$3();
   return disableExtension2(id, oldState.platform);
 };
 
@@ -1848,7 +1913,7 @@ const enableExtension2 = async (id, platform) => {
 };
 
 const enableExtension = async (id, isTest) => {
-  const oldState = get$2();
+  const oldState = get$3();
   return enableExtension2(id, oldState.platform);
 };
 
@@ -2017,7 +2082,7 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return get$2().webExtensions;
+  return get$3().webExtensions;
 };
 
 const getWebExtensionsUrl = assetDir => {
@@ -2201,7 +2266,14 @@ const getRuntimeStatus = extensionId => {
   return getRuntimeStatus$1(extensionId) || emptyStatus;
 };
 
-const commandMapRef = {};
+const getItems = async rpc => {
+  return rpc.invoke('ExtensionApi.getStatusBarItems');
+};
+const getStatusBarItems = async () => {
+  const rpcs = getAll();
+  const results = await Promise.all(rpcs.map(getItems));
+  return results.flat();
+};
 
 const handleMessagePort = async port => {
   await create$8({
@@ -2239,7 +2311,7 @@ const getRpc = async platform => {
 const initializeSharedProcess = async platform => {
   const rpc = await getRpc(platform);
   if (rpc) {
-    set$2(rpc);
+    set$3(rpc);
   }
 };
 
@@ -2331,6 +2403,7 @@ const commandMap = {
   'Extensions.getRemoteUrlForWebView': getRemoteUrlForWebView,
   'Extensions.getRpcInfo': getRpcInfo,
   'Extensions.getRuntimeStatus': getRuntimeStatus,
+  'Extensions.getStatusBarItems': getStatusBarItems,
   'Extensions.handleMessagePort': handleMessagePort,
   'Extensions.importExtension': importExtension,
   'Extensions.initialize': initialize,
@@ -2346,7 +2419,7 @@ const initializeExtensionHostWorker = async () => {
       await sendMessagePortToExtensionHostWorker(port, 0);
     }
   });
-  set$5(rpc);
+  set$6(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
@@ -2356,7 +2429,7 @@ const initializeFileSystemWorker = async () => {
       await sendMessagePortToFileSystemWorker(port, 0);
     }
   });
-  set$4(rpc);
+  set$5(rpc);
 };
 
 const initializeIframeWorker = async () => {
@@ -2373,7 +2446,7 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$3(rpc);
+  set$4(rpc);
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "3.4.0",
+  "version": "4.1.0",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"