@lvce-editor/extension-management-worker 3.3.0 → 3.4.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$4 = 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$4(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 => {
@@ -1216,10 +1216,10 @@ const createMockRpc = ({
 };
 
 const rpcs$1 = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs$1[id] = rpc;
 };
-const get$5 = id => {
+const get$3 = id => {
   return rpcs$1[id];
 };
 const remove = id => {
@@ -1230,18 +1230,18 @@ const remove = id => {
 const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$5(rpcId);
+      const rpc = get$3(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$3(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$3(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1249,7 +1249,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$7(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1258,7 +1258,7 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1275,12 +1275,12 @@ const SharedProcess = 1492;
 
 const {
   invoke: invoke$4,
-  set: set$6
+  set: set$5
 } = create$1(ExtensionHostWorker);
 
 const {
   invoke: invoke$3,
-  set: set$5
+  set: set$4
 } = create$1(FileSystemWorker);
 const readFile = async uri => {
   return invoke$3('FileSystem.readFile', uri);
@@ -1295,7 +1295,7 @@ const exists = async uri => {
 const {
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$4
+  set: set$3
 } = create$1(RendererWorker);
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
@@ -1316,7 +1316,7 @@ const sendMessagePortToSharedProcess = async port => {
 
 const {
   invoke: invoke$1,
-  set: set$3
+  set: set$2
 } = create$1(SharedProcess);
 
 const create = () => {
@@ -1331,6 +1331,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$2 = () => {
+  return extensionsState;
+};
+const set$1 = newState => {
+  extensionsState = newState;
+};
+const update = newState => {
+  set$1({
+    ...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 +1446,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,
@@ -1430,14 +1495,14 @@ const activateExtension2 = async (extensionId, extension, 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)]);
     const endTime = performance.now();
     const time = endTime - startTime;
-    update$1(extensionId, {
+    updateRuntimeStatus(extensionId, {
       activationEndTime: endTime,
       activationTime: time,
       status: Activated
@@ -1450,7 +1515,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}`);
@@ -1463,7 +1528,7 @@ const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$3 = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
@@ -1506,7 +1571,7 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
   try {
     string(absolutePath);
     const startTime = performance.now();
-    set$2({
+    setRuntimeStatus({
       activationEndTime: 0,
       activationEvent: activationEvent,
       activationStartTime: performance.now(),
@@ -1521,12 +1586,12 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
       await invoke$4('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)) {
@@ -1557,27 +1622,6 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
   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 getJson$1 = async url => {
   try {
     const response = await fetch(url);
@@ -1611,14 +1655,13 @@ 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;
 };
 
@@ -1718,32 +1761,10 @@ 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$2(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
   if (isTest) {
     const newState = {
       ...oldState,
@@ -1765,7 +1786,7 @@ 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$2();
   if (isTest) {
     const newState = {
       ...oldState,
@@ -1800,7 +1821,7 @@ const disableExtension2 = async (id, platform) => {
 };
 
 const disableExtension = async (id, isTest) => {
-  const oldState = get$1();
+  const oldState = get$2();
   return disableExtension2(id, oldState.platform);
 };
 
@@ -1827,7 +1848,7 @@ const enableExtension2 = async (id, platform) => {
 };
 
 const enableExtension = async (id, isTest) => {
-  const oldState = get$1();
+  const oldState = get$2();
   return enableExtension2(id, oldState.platform);
 };
 
@@ -1996,7 +2017,7 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return get$2();
+  return get$2().webExtensions;
 };
 
 const getWebExtensionsUrl = assetDir => {
@@ -2158,7 +2179,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,7 +2198,7 @@ const emptyStatus = {
   status: None
 };
 const getRuntimeStatus = extensionId => {
-  return get$4(extensionId) || emptyStatus;
+  return getRuntimeStatus$1(extensionId) || emptyStatus;
 };
 
 const commandMapRef = {};
@@ -2218,14 +2239,12 @@ const getRpc = async platform => {
 const initializeSharedProcess = async platform => {
   const rpc = await getRpc(platform);
   if (rpc) {
-    set$3(rpc);
+    set$2(rpc);
   }
 };
 
 const initialize = async platform => {
-  update({
-    platform
-  });
+  setPlatform(platform);
   await initializeSharedProcess(platform);
 };
 
@@ -2327,7 +2346,7 @@ const initializeExtensionHostWorker = async () => {
       await sendMessagePortToExtensionHostWorker(port, 0);
     }
   });
-  set$6(rpc);
+  set$5(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
@@ -2337,7 +2356,7 @@ const initializeFileSystemWorker = async () => {
       await sendMessagePortToFileSystemWorker(port, 0);
     }
   });
-  set$5(rpc);
+  set$4(rpc);
 };
 
 const initializeIframeWorker = async () => {
@@ -2354,7 +2373,7 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$4(rpc);
+  set$3(rpc);
 };
 
 const listen = async () => {

package/package.json

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