@lvce-editor/extension-management-worker 3.3.0 → 4.0.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$6 = 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$6(id);
+  const fn = get$5(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -941,9 +941,9 @@ const create$a = (id, method, params) => {
   return message;
 };
 
-let id$1 = 0;
+let id = 0;
 const create$9 = () => {
-  return ++id$1;
+  return ++id;
 };
 
 const registerPromise = map => {
@@ -1215,33 +1215,33 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const rpcs$1 = Object.create(null);
+const rpcs$2 = Object.create(null);
 const set$7 = (id, rpc) => {
-  rpcs$1[id] = rpc;
+  rpcs$2[id] = rpc;
 };
-const get$5 = 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$5(rpcId);
+      const rpc = get$4(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$4(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$4(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1274,9 +1274,41 @@ const RendererWorker = 1;
 const SharedProcess = 1492;
 
 const {
+  dispose,
   invoke: invoke$4,
+  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,
@@ -1331,6 +1363,91 @@ const isCanceled = token => {
   return token.finished;
 };
 
+const None = 0;
+const Importing = 1;
+const Activating = 2;
+const Activated = 3;
+const Error$1 = 4;
+
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+
+const createInitialState = () => {
+  return {
+    activatedExtensions: Object.create(null),
+    cachedActivationEvents: Object.create(null),
+    cachedExtensions: undefined,
+    disabledIds: [],
+    platform: 0,
+    runtimeStatuses: Object.create(null),
+    webExtensions: []
+  };
+};
+const createEmptyRuntimeStatus = id => {
+  return {
+    activationEndTime: 0,
+    activationEvent: '',
+    activationStartTime: 0,
+    activationTime: 0,
+    id,
+    importEndTime: 0,
+    importStartTime: 0,
+    importTime: 0,
+    status: None
+  };
+};
+let extensionsState = createInitialState();
+const get$3 = () => {
+  return extensionsState;
+};
+const set$2 = newState => {
+  extensionsState = newState;
+};
+const update = newState => {
+  set$2({
+    ...extensionsState,
+    ...newState
+  });
+};
+const setPlatform = platform => {
+  update({
+    platform
+  });
+};
+const hasWebExtensionUri = uri => {
+  return extensionsState.webExtensions.some(extension => extension.uri === uri);
+};
+const addWebExtension$1 = extension => {
+  update({
+    webExtensions: [...extensionsState.webExtensions, extension]
+  });
+};
+const clearCachedExtensions = () => {
+  update({
+    cachedExtensions: undefined
+  });
+};
+const setRuntimeStatus = status => {
+  update({
+    runtimeStatuses: {
+      ...extensionsState.runtimeStatuses,
+      [status.id]: {
+        ...status
+      }
+    }
+  });
+};
+const updateRuntimeStatus = (id, statusUpdate) => {
+  const previousStatus = extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
+  setRuntimeStatus({
+    ...previousStatus,
+    ...statusUpdate,
+    id
+  });
+};
+const getRuntimeStatus$1 = extensionId => {
+  return extensionsState.runtimeStatuses[extensionId];
+};
+
 const baseName = path => {
   const slashIndex = path.lastIndexOf('/');
   return path.slice(slashIndex + 1);
@@ -1361,26 +1478,6 @@ const isImportError = error => {
   return isImportErrorChrome(error) || isImportErrorFirefox(error) || isSyntaxError(error);
 };
 
-const states = Object.create(null);
-const set$2 = status => {
-  states[status.id] = status;
-};
-const get$4 = extensionId => {
-  return states[extensionId];
-};
-const update$1 = (id, update) => {
-  states[id] = {
-    ...states[id],
-    ...update
-  };
-};
-
-const None = 0;
-const Importing = 1;
-const Activating = 2;
-const Activated = 3;
-const Error$1 = 4;
-
 const sleep = duration => {
   const {
     promise,
@@ -1420,24 +1517,24 @@ 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);
   const token = create();
   try {
     const startTime = performance.now();
-    update$1(extensionId, {
+    updateRuntimeStatus(extensionId, {
       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;
-    update$1(extensionId, {
+    updateRuntimeStatus(extensionId, {
       activationEndTime: endTime,
       activationTime: time,
       status: Activated
@@ -1450,7 +1547,7 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
         cause: error
       });
     }
-    update$1(extensionId, {
+    updateRuntimeStatus(extensionId, {
       status: Error$1 // TODO maybe store error also in runtime status state
     });
     throw new VError(error, `Failed to activate extension ${id}`);
@@ -1459,11 +1556,61 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
   }
 };
 
+const commandMapRef = {};
+
+const getPortTuple = () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  return {
+    port1,
+    port2
+  };
+};
+
+const rpcs$1 = Object.create(null);
+const get$2 = extensionId => {
+  return rpcs$1[extensionId];
+};
+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 {
+    port1,
+    port2
+  } = getPortTuple();
+  const rpcPromise = create$3({
+    commandMap: commandMapRef,
+    isMessagePortOpen: true,
+    messagePort: port2
+  });
+  port2.start();
+  await invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port1, extensionId);
+  const rpc = await rpcPromise;
+  set$1(extensionId, rpc);
+  return rpc;
+};
+
 const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$3 = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
@@ -1502,11 +1649,11 @@ 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();
-    set$2({
+    setRuntimeStatus({
       activationEndTime: 0,
       activationEvent: activationEvent,
       activationStartTime: performance.now(),
@@ -1518,15 +1665,15 @@ 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;
-      update$1(extensionId, {
+      updateRuntimeStatus(extensionId, {
         importEndTime: endTime,
         importTime: time
       });
     } catch (error) {
-      update$1(extensionId, {
+      updateRuntimeStatus(extensionId, {
         status: Error$1 // TODO maybe store error also in runtime status state
       });
       if (isImportError(error)) {
@@ -1550,32 +1697,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 state$1 = {
-  webExtensions: []
-};
-const push = extension => {
-  state$1.webExtensions.push(extension);
-};
-const hasUri = uri => {
-  return state$1.webExtensions.some(extension => extension.uri === uri);
-};
-const get$2 = () => {
-  return state$1.webExtensions;
-};
-
-// TODO store one kind of ui state for whole extension management worker
-
-const cache = Object.create(null);
-const id = 1;
-const clear = () => {
-  delete cache[id];
+  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 => {
@@ -1611,27 +1742,18 @@ const getWebManifestPath = path => {
 };
 
 const addWebExtension = async path => {
-  if (hasUri(path)) {
+  if (hasWebExtensionUri(path)) {
     return undefined;
   }
   const manifestPath = getWebManifestPath(path);
   const manifest = await getWebExtensionManifest(path, manifestPath);
-  // TODO avoid mutation if possible
-  push(manifest);
-  clear();
+  addWebExtension$1(manifest);
+  clearCachedExtensions();
   return manifest;
 };
 
 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
@@ -1718,38 +1840,16 @@ const setJson = async (cacheKey, data) => {
 
 const disabledExtensionsCacheKey = '/cache/disabledExtensions.json';
 
-/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-
-let state = {
-  activatedExtensions: Object.create(null),
-  cachedActivationEvents: Object.create(null),
-  disabledIds: [],
-  platform: 0
-};
-const set$1 = newState => {
-  state = newState;
-};
-const update = newState => {
-  const fullNewState = {
-    ...state,
-    ...newState
-  };
-  state = fullNewState;
-};
-const get$1 = () => {
-  return state;
-};
-
 const disableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$1(); // 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 || [];
@@ -1765,13 +1865,13 @@ const disableExtension2$1 = async (id, platform) => {
 const enableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$1();
+  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 || [];
@@ -1800,7 +1900,7 @@ const disableExtension2 = async (id, platform) => {
 };
 
 const disableExtension = async (id, isTest) => {
-  const oldState = get$1();
+  const oldState = get$3();
   return disableExtension2(id, oldState.platform);
 };
 
@@ -1827,7 +1927,7 @@ const enableExtension2 = async (id, platform) => {
 };
 
 const enableExtension = async (id, isTest) => {
-  const oldState = get$1();
+  const oldState = get$3();
   return enableExtension2(id, oldState.platform);
 };
 
@@ -1996,7 +2096,7 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return get$2();
+  return get$3().webExtensions;
 };
 
 const getWebExtensionsUrl = assetDir => {
@@ -2101,17 +2201,6 @@ const getExtension = async (id, assetDir, platform) => {
   return undefined;
 };
 
-const getPortTuple = () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  return {
-    port1,
-    port2
-  };
-};
-
 const createWebViewIpc = async webView => {
   const {
     origin,
@@ -2158,7 +2247,7 @@ const getRemoteUrlForWebView = async (uri, options = {}) => {
 };
 
 const getRpcInfo = rpcId => {
-  const info = get$3(rpcId);
+  const info = get$1(rpcId);
   if (!info) {
     throw new Error(`Rpc not found ${rpcId}`);
   }
@@ -2177,11 +2266,9 @@ const emptyStatus = {
   status: None
 };
 const getRuntimeStatus = extensionId => {
-  return get$4(extensionId) || emptyStatus;
+  return getRuntimeStatus$1(extensionId) || emptyStatus;
 };
 
-const commandMapRef = {};
-
 const handleMessagePort = async port => {
   await create$8({
     commandMap: commandMapRef,
@@ -2223,9 +2310,7 @@ const initializeSharedProcess = async platform => {
 };
 
 const initialize = async platform => {
-  update({
-    platform
-  });
+  setPlatform(platform);
   await initializeSharedProcess(platform);
 };
 

package/package.json

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