@lvce-editor/extension-management-worker 4.37.0 → 4.37.2

package/dist/extensionManagementWorkerMain.js

@@ -613,7 +613,7 @@ const callbacks = Object.create(null);
 const get$7 = id => {
   return callbacks[id];
 };
-const remove$2 = id => {
+const remove$3 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -807,7 +807,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$2(id);
+  remove$3(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1270,7 +1270,7 @@ const set$b = (id, rpc) => {
 const get$6 = id => {
   return rpcs$2[id];
 };
-const remove$1 = id => {
+const remove$2 = id => {
   delete rpcs$2[id];
 };
 
@@ -1300,7 +1300,7 @@ const create$1 = rpcId => {
       set$b(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
-        remove$1(rpcId);
+        remove$2(rpcId);
       };
       // @ts-ignore
       return mockRpc;
@@ -1519,6 +1519,20 @@ const updateRuntimeStatus = (id, statusUpdate) => {
 const getRuntimeStatus$1 = extensionId => {
   return state.extensionsState.runtimeStatuses[extensionId];
 };
+const omit = (record, id) => {
+  const result = {
+    ...record
+  };
+  delete result[id];
+  return result;
+};
+const resetExtensionRuntimeState = extensionId => {
+  update({
+    activatedExtensions: omit(state.extensionsState.activatedExtensions, extensionId),
+    cachedActivationEvents: omit(state.extensionsState.cachedActivationEvents, extensionId),
+    runtimeStatuses: omit(state.extensionsState.runtimeStatuses, extensionId)
+  });
+};
 
 const baseName = path => {
   const slashIndex = path.lastIndexOf('/');
@@ -1730,6 +1744,11 @@ const getAll = () => {
 const set$2 = (extensionId, rpc) => {
   rpcs$1[extensionId] = rpc;
 };
+const remove$1 = extensionId => {
+  const rpc = rpcs$1[extensionId];
+  delete rpcs$1[extensionId];
+  return rpc;
+};
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 const invoke = (method, ...params) => {
@@ -2252,6 +2271,10 @@ const getAllExtensions = async (assetDir, platform) => {
 
 const activatingExtensions = Object.create(null);
 const runningExtensions = Object.create(null);
+const resetExtensionActivation = extensionId => {
+  delete activatingExtensions[extensionId];
+  delete runningExtensions[extensionId];
+};
 const matchesEvent = (extension, event) => {
   return !extension.disabled && isExtensionIsolated(extension) && Array.isArray(extension.activation) && extension.activation.includes(event);
 };
@@ -2311,8 +2334,12 @@ const activateByEvent = async (event, assetDir, platform) => {
   }
 };
 
-const invalidateExtensionsCache = async () => {
+const invalidateExtensionsCache = async (extensionId, disabled) => {
   try {
+    if (extensionId) {
+      await invoke$2('ExtensionManagement.handleExtensionsCacheInvalidated', extensionId, disabled);
+      return;
+    }
     await invoke$2('ExtensionManagement.handleExtensionsCacheInvalidated');
   } catch {
     // Older renderer workers do not expose the cache invalidation notification.
@@ -2420,6 +2447,26 @@ const createWebViewWorkerRpc = async (rpcInfo, port) => {
   });
 };
 
+const disposeIsolatedExtensionHostWorker = async (extensionId, invoke$1 = invoke) => {
+  const rpc = remove$1(extensionId);
+  if (!rpc) {
+    return false;
+  }
+  resetExtensionActivation(extensionId);
+  resetExtensionRuntimeState(extensionId);
+  try {
+    await invoke$1('LaunchIsolatedExtensionHostWorker.disposeIsolatedExtensionHostWorker', extensionId);
+  } catch {
+    // Older renderer workers only support disposing the extension RPC.
+  }
+  try {
+    await rpc.dispose();
+  } catch {
+    // The extension is already disabled and removed from state.
+  }
+  return true;
+};
+
 const disableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
@@ -2468,7 +2515,8 @@ const disableExtension2 = async (id, platform) => {
   number(platform);
   try {
     await disableExtension2$1(id, platform);
-    await invalidateExtensionsCache();
+    await disposeIsolatedExtensionHostWorker(id);
+    await invalidateExtensionsCache(id, true);
     return undefined;
   } catch (error) {
     return error;
@@ -2483,7 +2531,8 @@ const disableExtension = async (id, isTest) => {
 const disableWorkspaceExtension = async id => {
   string(id);
   await disableExtension$1(id);
-  await invalidateExtensionsCache();
+  await disposeIsolatedExtensionHostWorker(id);
+  await invalidateExtensionsCache(id, true);
 };
 
 const enableExtension2 = async (id, platform) => {
@@ -2506,7 +2555,7 @@ const enableExtension2 = async (id, platform) => {
     await writeFile(disabledExtensionsJsonPath, newContent);
   }
   await enableExtension2$1(id, platform);
-  await invalidateExtensionsCache();
+  await invalidateExtensionsCache(id, false);
 };
 
 const enableExtension = async (id, isTest) => {
@@ -2517,7 +2566,7 @@ const enableExtension = async (id, isTest) => {
 const enableWorkspaceExtension = async id => {
   string(id);
   await enableExtension$1(id);
-  await invalidateExtensionsCache();
+  await invalidateExtensionsCache(id, false);
 };
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
@@ -3635,6 +3684,9 @@ const contributesViews = extension => {
 };
 
 const shouldLoadViews = extension => {
+  if (extension.disabled) {
+    return false;
+  }
   if (!contributesViews(extension)) {
     return false;
   }

package/package.json

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