@lvce-editor/extension-host-worker 5.14.0 → 5.15.0

package/dist/extensionHostWorkerMain.js

@@ -324,7 +324,7 @@ const syncIncremental = (textDocumentId, changes) => {
   textDocument.text = before + syntheticChange.inserted + after;
   runListenersSafe(getDidChangeListeners(), textDocument, syntheticChanges);
 };
-const get$b = textDocumentId => {
+const get$c = textDocumentId => {
   const textDocument = getDocument(textDocumentId);
   return textDocument;
 };
@@ -543,7 +543,7 @@ const registerMethod = ({
 }) => {
   context[`execute${name}Provider`] = async function (textDocumentId, ...params) {
     try {
-      const textDocument = get$b(textDocumentId);
+      const textDocument = get$c(textDocumentId);
       if (!textDocument) {
         throw new Error(`textDocument with id ${textDocumentId} not found`);
       }
@@ -676,7 +676,7 @@ const executeOrganizeImports = async uid => {
   if (!organizeImportsAction) {
     return [];
   }
-  const textDocument = get$b(uid);
+  const textDocument = get$c(uid);
   const edits = await organizeImportsAction.execute(textDocument);
   return edits;
 };
@@ -768,7 +768,7 @@ const rpcs$2 = Object.create(null);
 const set$g = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
-const get$a = id => {
+const get$b = id => {
   return rpcs$2[id];
 };
 
@@ -778,13 +778,13 @@ const create$a = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$a(rpcId);
+      const rpc = get$b(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$a(rpcId);
+      const rpc = get$b(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -792,7 +792,7 @@ const create$a = rpcId => {
       set$g(rpcId, rpc);
     },
     async dispose() {
-      const rpc = get$a(rpcId);
+      const rpc = get$b(rpcId);
       await rpc.dispose();
     }
   };
@@ -1027,11 +1027,11 @@ const {
 const RendererWorker = 1;
 
 const invoke$2 = (method, ...params) => {
-  const rpc = get$a(RendererWorker);
+  const rpc = get$b(RendererWorker);
   return rpc.invoke(method, ...params);
 };
 const invokeAndTransfer$2 = (method, ...params) => {
-  const rpc = get$a(RendererWorker);
+  const rpc = get$b(RendererWorker);
   return rpc.invokeAndTransfer(method, ...params);
 };
 
@@ -1048,7 +1048,7 @@ const exec = async (command, args, options) => {
 };
 
 const fileSystemProviderMap = Object.create(null);
-const get$9 = protocol => {
+const get$a = protocol => {
   const provider = fileSystemProviderMap[protocol];
   if (!provider) {
     // @ts-ignore
@@ -1056,7 +1056,7 @@ const get$9 = protocol => {
   }
   return provider;
 };
-const set$8 = (id, provider) => {
+const set$9 = (id, provider) => {
   if (!id) {
     throw new Error('Failed to register file system provider: missing id');
   }
@@ -1067,11 +1067,11 @@ const registerFileSystemProvider = fileSystemProvider => {
   if (!fileSystemProvider.id) {
     throw new Error('Failed to register file system provider: missing id');
   }
-  set$8(fileSystemProvider.id, fileSystemProvider);
+  set$9(fileSystemProvider.id, fileSystemProvider);
 };
 const readDirWithFileTypes$2 = async (protocol, path) => {
   try {
-    const provider = get$9(protocol);
+    const provider = get$a(protocol);
     return await provider.readDirWithFileTypes(path);
   } catch (error) {
     throw new VError(error, 'Failed to execute file system provider');
@@ -1079,7 +1079,7 @@ const readDirWithFileTypes$2 = async (protocol, path) => {
 };
 const readFile$2 = async (protocol, path) => {
   try {
-    const provider = get$9(protocol);
+    const provider = get$a(protocol);
     return await provider.readFile(path);
   } catch (error) {
     throw new VError(error, 'Failed to execute file system provider');
@@ -1107,7 +1107,7 @@ const readDirWithFileTypesExternal = async path => {
 };
 const rename$1 = async (protocol, oldUri, newUri) => {
   try {
-    const provider = get$9(protocol);
+    const provider = get$a(protocol);
     return await provider.rename(oldUri, newUri);
   } catch (error) {
     throw new VError(error, 'Failed to execute file system provider');
@@ -1115,7 +1115,7 @@ const rename$1 = async (protocol, oldUri, newUri) => {
 };
 const writeFile$2 = async (protocol, uri, content) => {
   try {
-    const provider = get$9(protocol);
+    const provider = get$a(protocol);
     return await provider.writeFile(uri, content);
   } catch (error) {
     throw new VError(error, 'Failed to execute file system provider');
@@ -1123,7 +1123,7 @@ const writeFile$2 = async (protocol, uri, content) => {
 };
 const getPathSeparator = protocol => {
   try {
-    const provider = get$9(protocol);
+    const provider = get$a(protocol);
     return provider.pathSeparator;
   } catch (error) {
     throw new VError(error, 'Failed to execute file system provider');
@@ -1739,10 +1739,10 @@ const create$4$2 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$7 = (id, fn) => {
+const set$8 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$8 = id => {
+const get$9 = id => {
   return callbacks[id];
 };
 const remove$3 = id => {
@@ -1758,7 +1758,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$7(id, resolve);
+  set$8(id, resolve);
   return {
     id,
     promise
@@ -1922,7 +1922,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$8(id);
+  const fn = get$9(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -2570,7 +2570,7 @@ const getExtensionHostSubWorkerUrl = () => {
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
-const set$6 = async (url, contentSecurityPolicy) => {
+const set$7 = async (url, contentSecurityPolicy) => {
   const pathName = new URL(url).pathname;
   await invoke$2('ExtensionHostWorkerContentSecurityPolicy.set', pathName, contentSecurityPolicy);
 };
@@ -2590,7 +2590,7 @@ const createLegacyRpc = async ({
   string(name);
   object(commandMap);
   if (contentSecurityPolicy) {
-    await set$6(url, contentSecurityPolicy);
+    await set$7(url, contentSecurityPolicy);
   }
   const rpc = await create$2({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug$1,
@@ -2611,7 +2611,7 @@ const rpcs$1 = Object.create(null);
 const add$1 = (id, rpc) => {
   rpcs$1[id] = rpc;
 };
-const get$7 = id => {
+const get$8 = id => {
   return rpcs$1[id];
 };
 
@@ -2620,15 +2620,15 @@ const rpcs = Object.create(null);
 const register = (id, execute) => {
   registry[id] = execute;
 };
-const get$6 = id => {
+const get$7 = id => {
   return rpcs[id];
 };
-const set$5 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 
 const createRpcWithId$1 = async (id, commandMap, execute) => {
-  const info = get$7(id);
+  const info = get$8(id);
   if (!info) {
     throw new Error(`rpc with id ${id} not found`);
   }
@@ -2644,16 +2644,16 @@ const createRpcWithId$1 = async (id, commandMap, execute) => {
     rpc.ipc.execute = execute;
   }
   await rpc.invoke('LoadFile.loadFile', info.url);
-  set$5(id, rpc);
+  set$6(id, rpc);
   return rpc;
 };
 
 const getOrCreateRpc = async (id, commandMap, execute) => {
-  const rpc = get$6(id);
+  const rpc = get$7(id);
   if (!rpc) {
-    set$5(id, createRpcWithId$1(id, commandMap, execute));
+    set$6(id, createRpcWithId$1(id, commandMap, execute));
   }
-  return get$6(id);
+  return get$7(id);
 };
 const createRpcWithId = ({
   id,
@@ -3253,13 +3253,13 @@ const state$5 = {
 
 const cache = Object.create(null);
 const id = 1;
-const get$5 = () => {
+const get$6 = () => {
   return cache[id];
 };
 const has = () => {
   return id in cache;
 };
-const set$4 = value => {
+const set$5 = value => {
   cache[id] = value;
 };
 const clear = () => {
@@ -3724,7 +3724,7 @@ const getDbMemoized$1 = async () => {
 
 // TODO high memory usage in idb because of transactionDoneMap
 
-const set$3 = async (key, value) => {
+const set$4 = async (key, value) => {
   try {
     const db = await getDbMemoized$1();
     await db.put(storeId, value, key);
@@ -3732,7 +3732,7 @@ const set$3 = async (key, value) => {
     throw new VError(error, 'Failed to save value to indexed db');
   }
 };
-const get$4 = async key => {
+const get$5 = async key => {
   try {
     const db = await getDbMemoized$1();
     const value = await db.get(storeId, key);
@@ -3745,19 +3745,19 @@ const get$4 = async key => {
 const getCacheKey$1 = colorThemeId => {
   return 'color-theme-' + colorThemeId;
 };
-const get$3 = colorThemeId => {
+const get$4 = colorThemeId => {
   const cacheKey = getCacheKey$1(colorThemeId);
-  return get$4(cacheKey);
+  return get$5(cacheKey);
 };
-const set$2 = (colorThemeId, data) => {
+const set$3 = (colorThemeId, data) => {
   const cacheKey = getCacheKey$1(colorThemeId);
-  return set$3(cacheKey, data);
+  return set$4(cacheKey, data);
 };
 
 const GetColorThemeCssCachedIndexedDb = {
   __proto__: null,
-  get: get$3,
-  set: set$2
+  get: get$4,
+  set: set$3
 };
 
 const getText$1 = key => {
@@ -3770,35 +3770,35 @@ const setText = (key, value) => {
 const getCacheKey = colorThemeId => {
   return 'lvce-color-theme-' + colorThemeId;
 };
-const get$2 = colorThemeId => {
+const get$3 = colorThemeId => {
   const cacheKey = getCacheKey(colorThemeId);
   return getText$1(cacheKey);
 };
-const set$1 = (colorThemeId, data) => {
+const set$2 = (colorThemeId, data) => {
   const cacheKey = getCacheKey(colorThemeId);
   return setText(cacheKey, data);
 };
 
 const GetColorThemeCssCachedLocalStorage = {
   __proto__: null,
-  get: get$2,
-  set: set$1
+  get: get$3,
+  set: set$2
 };
 
-const get$1 = colorThemeId => {
+const get$2 = colorThemeId => {
   return '';
 };
-const set = (colorThemeId, data) => {
+const set$1 = (colorThemeId, data) => {
   //  noop
 };
 
 const GetColorThemeCssCachedNoop = {
   __proto__: null,
-  get: get$1,
-  set
+  get: get$2,
+  set: set$1
 };
 
-const get = key => {
+const get$1 = key => {
   return invoke$2('Preferences.get', key);
 };
 
@@ -3813,7 +3813,7 @@ const getCacheFn = config => {
   }
 };
 const getColorThemeCssCached = async (colorThemeId, getData) => {
-  const config = await get('colorTheme.cache');
+  const config = await get$1('colorTheme.cache');
   const module = await getCacheFn(config);
   const cachedData = await module.get(colorThemeId);
   if (cachedData) {
@@ -3905,9 +3905,9 @@ const getExtensions$1 = async () => {
 // TODO getExtensions is still called 6 times on startup instead of 1
 const getExtensions = () => {
   if (!has()) {
-    set$4(getExtensions$1());
+    set$5(getExtensions$1());
   }
-  return get$5();
+  return get$6();
 };
 
 const getColorThemeJson$2 = async colorThemeId => {
@@ -3976,7 +3976,7 @@ const applyColorTheme = async colorThemeId => {
       const themeColor = getMetaThemeColor(colorThemeId) || '';
       await setThemeColor(themeColor);
     }
-    if (platform !== Web && (await get('development.watchColorTheme'))) {
+    if (platform !== Web && (await get$1('development.watchColorTheme'))) {
       watch(colorThemeId);
     }
   } catch (error) {
@@ -3991,7 +3991,7 @@ const watch = async id => {
   await invoke$2('ExtensionHost.watchColorTheme', id);
 };
 const getPreferredColorTheme = () => {
-  const preferredColorTheme = get('workbench.colorTheme');
+  const preferredColorTheme = get$1('workbench.colorTheme');
   return preferredColorTheme;
 };
 
@@ -4014,7 +4014,7 @@ const hydrate$1 = async () => {
 const iframeWorkerUrl = `${assetDir}/packages/renderer-worker/node_modules/@lvce-editor/iframe-worker/dist/iframeWorkerMain.js`;
 
 const getConfiguredIframeWorkerUrl = async () => {
-  let configuredWorkerUrl = (await get('develop.iframeWorkerPath')) || '';
+  let configuredWorkerUrl = (await get$1('develop.iframeWorkerPath')) || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
   }
@@ -4594,6 +4594,26 @@ const importScript = async url => {
   }
 };
 
+const states = Object.create(null);
+const set = status => {
+  states[status.id] = status;
+};
+const get = extensionId => {
+  return states[extensionId];
+};
+const update = (id, update) => {
+  states[id] = {
+    ...states[id],
+    ...update
+  };
+};
+
+const None = 0;
+const Importing = 1;
+const Activating = 2;
+const Activated = 3;
+const Error$1 = 4;
+
 const activationTimeout = 10_000;
 const rejectAfterTimeout = async (timeout, token) => {
   await sleep(timeout);
@@ -4602,16 +4622,36 @@ const rejectAfterTimeout = async (timeout, token) => {
   }
   throw new Error(`Activation timeout of ${timeout}ms exceeded`);
 };
-const activate = async (extension, absolutePath) => {
+
+// TODO separate importing extension and activating extension for smaller functions
+// and better error handling
+const activate = async (extension, absolutePath, activationEvent) => {
+  const extensionId = extension.id;
   try {
     string(extension.path);
     string(extension.browser);
     string(absolutePath);
+    set({
+      activationEvent: activationEvent,
+      id: extensionId,
+      activationTime: 0,
+      status: Importing
+    });
+    const startTime = performance.now();
     const module = await importScript(absolutePath);
     handleRpcInfos(extension, platform);
+    update(extensionId, {
+      status: Activating
+    });
     const token = create();
     try {
       await Promise.race([module.activate(extension), rejectAfterTimeout(activationTimeout, token)]);
+      const endTime = performance.now();
+      const time = endTime - startTime;
+      update(extensionId, {
+        status: Activated,
+        activationTime: time
+      });
     } catch (error) {
       if (isImportError(error)) {
         const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
@@ -4622,6 +4662,9 @@ const activate = async (extension, absolutePath) => {
       cancel(token);
     }
   } catch (error) {
+    update(extensionId, {
+      status: Error$1 // TODO maybe store error also in runtime status state
+    });
     const id = getExtensionId(extension);
     throw new VError(error, `Failed to activate extension ${id}`);
   }
@@ -5092,20 +5135,21 @@ const getIconThemeJson = async iconThemeId => {
 };
 
 const getRpcInfo = rpcId => {
-  const info = get$7(rpcId);
+  const info = get$8(rpcId);
   if (!info) {
     throw new Error(`Rpc not found ${rpcId}`);
   }
   return info;
 };
 
+const emptyStatus = {
+  status: None,
+  id: '',
+  activationEvent: '',
+  activationTime: 0
+};
 const getRuntimeStatus = extensionId => {
-  return {
-    status: 'not-running',
-    id: extensionId,
-    activationEvent: '',
-    activationTime: 0
-  };
+  return get(extensionId) || emptyStatus;
 };
 
 const getWebViewInfo2 = providerId => {
@@ -5210,7 +5254,7 @@ const setIconTheme = async iconThemeId => {
   }
 };
 const hydrate = async () => {
-  const iconThemeId = (await get('icon-theme')) || 'vscode-icons';
+  const iconThemeId = (await get$1('icon-theme')) || 'vscode-icons';
   await setIconTheme(iconThemeId);
 };
 
@@ -5787,12 +5831,12 @@ const commandMap = {
   'IconTheme.hydrate': hydrate,
   'IconTheme.setIconTheme': setIconTheme,
   'IndexedDb.addHandle': addHandle,
-  'IndexedDb.get': get$4,
+  'IndexedDb.get': get$5,
   'IndexedDb.getHandle': getHandle$1,
   'IndexedDb.getValues': getValues,
   'IndexedDb.getValuesByIndexName': getValuesByIndexName,
   'IndexedDb.saveValue': saveValue,
-  'IndexedDb.set': set$3,
+  'IndexedDb.set': set$4,
   'Languages.getLanguages': getLanguages,
   'SaveState.saveState': saveState,
   'SearchFileWithFetch.searchFileWithFetch': searchFile$2,

package/package.json

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