@lvce-editor/extension-management-worker 4.40.1 → 4.41.1

package/dist/extensionManagementWorkerMain.js

@@ -1438,6 +1438,7 @@ const Importing = 1;
 const Activating = 2;
 const Activated = 3;
 const Error$1 = 4;
+const Terminated = 5;
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
@@ -1534,6 +1535,13 @@ const resetExtensionRuntimeState = extensionId => {
   });
 };
 
+const getErrorMessage = error => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+};
+
 const baseName = path => {
   const slashIndex = path.lastIndexOf('/');
   return path.slice(slashIndex + 1);
@@ -1627,16 +1635,21 @@ const activateExtension2 = async (extensionId, extension, absolutePath, extensio
     });
   } catch (error) {
     const id = getExtensionId$4(extension);
+    let activationError = error;
     if (isImportError(error)) {
       const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-      throw new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`, {
+      activationError = new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`, {
         cause: error
       });
     }
     updateRuntimeStatus(extensionId, {
-      status: Error$1 // TODO maybe store error also in runtime status state
+      error: getErrorMessage(activationError),
+      status: Error$1
     });
-    throw new VError(error, `Failed to activate extension ${id}`);
+    if (activationError !== error) {
+      throw activationError;
+    }
+    throw new VError(activationError, `Failed to activate extension ${id}`);
   } finally {
     cancel(token);
   }
@@ -1821,6 +1834,7 @@ const activateIsolatedExtension = async (extensionId, absolutePath, workerName,
     });
   } catch (error) {
     updateRuntimeStatus(extensionId, {
+      error: getErrorMessage(error),
       status: Error$1
     });
     throw error;
@@ -1915,16 +1929,18 @@ const importExtension = async (extensionId, absolutePath, activationEvent, exten
         importTime: time
       });
     } catch (error) {
-      updateRuntimeStatus(extensionId, {
-        status: Error$1 // TODO maybe store error also in runtime status state
-      });
+      let importError = error;
       if (isImportError(error)) {
         const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-        throw new Error(actualErrorMessage, {
+        importError = new Error(actualErrorMessage, {
           cause: error
         });
       }
-      throw error;
+      updateRuntimeStatus(extensionId, {
+        error: getErrorMessage(importError),
+        status: Error$1
+      });
+      throw importError;
     }
   } catch (error) {
     throw new VError(error, `Failed to import extension ${extensionId}`);
@@ -2284,12 +2300,17 @@ const getExtensionId$3 = extension => {
 const getAbsolutePath$1 = (extension, assetDir, platform) => {
   return getExtensionAbsolutePath(extension.id, extension.isWeb, extension.builtin, extension.path || extension.uri, extension.browser, globalThis.location.origin, platform, assetDir);
 };
+const notifyRunningExtensionsChanged = () => {
+  setTimeout(() => {
+    void invoke$2('Layout.handleExtensionsChanged');
+  }, 0);
+};
 const doActivateExtension = async (extension, absolutePath, event, platform) => {
   const extensionId = getExtensionId$3(extension);
   try {
     await activateExtension3(extension, absolutePath, event, platform);
     runningExtensions[extensionId] = true;
-    await invoke$2('Layout.handleExtensionsChanged');
+    notifyRunningExtensionsChanged();
   } finally {
     delete activatingExtensions[extensionId];
   }
@@ -3599,10 +3620,16 @@ const getIcon = (extension, manifestView, assetDir, platform) => {
   return '';
 };
 
+const statusNames = {
+  [Activated]: 'running',
+  [Error$1]: 'error',
+  [Terminated]: 'terminated'
+};
 const getRunningExtensionsFromState = (extensions, runtimeStatuses, assetDir, platform) => {
   return extensions.flatMap(extension => {
     const runtimeStatus = runtimeStatuses[extension.id];
-    if (!runtimeStatus || runtimeStatus.status !== Activated) {
+    const status = runtimeStatus && statusNames[runtimeStatus.status];
+    if (!runtimeStatus || !status) {
       return [];
     }
     const manifestIcon = typeof extension.icon === 'string' ? extension.icon.replace(/^\.\//, '') : undefined;
@@ -3613,19 +3640,51 @@ const getRunningExtensionsFromState = (extensions, runtimeStatuses, assetDir, pl
       ...extension,
       activationEvent: runtimeStatus.activationEvent,
       activationTime: runtimeStatus.activationTime,
+      error: runtimeStatus.error || '',
       ...(icon && {
         icon
-      })
+      }),
+      status
     }];
   }).toSorted((a, b) => b.activationTime - a.activationTime);
 };
 
+const invokePing = async rpc => {
+  try {
+    await rpc.invoke('ExtensionApi.ping');
+  } catch {
+    // Any response proves that the worker is still alive.
+  }
+  return true;
+};
+const waitForTimeout = async (timeout, sleep) => {
+  await sleep(timeout);
+  return false;
+};
+const isResponsive = async (rpc, timeout, sleep) => {
+  return Promise.race([invokePing(rpc), waitForTimeout(timeout, sleep)]);
+};
+const updateTerminatedExtensionStatuses = async (runtimeStatuses, getRpc = get$3, timeout = 250, sleep$1 = sleep) => {
+  const activatedStatuses = Object.values(runtimeStatuses).filter(status => status.status === Activated);
+  await Promise.all(activatedStatuses.map(async status => {
+    const rpc = getRpc(status.id);
+    if (!rpc || (await isResponsive(rpc, timeout, sleep$1))) {
+      return;
+    }
+    updateRuntimeStatus(status.id, {
+      error: 'Extension worker stopped responding',
+      status: Terminated
+    });
+  }));
+};
+
 const getRunningExtensions = async (assetDir, platform) => {
   const {
     assetDir: resolvedAssetDir,
     platform: resolvedPlatform
   } = await getRuntimeContext(assetDir, platform);
   const extensions = await getAllExtensions(resolvedAssetDir, resolvedPlatform);
+  await updateTerminatedExtensionStatuses(get$5().runtimeStatuses);
   const {
     runtimeStatuses
   } = get$5();

package/package.json

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