@lvce-editor/extension-management-worker 4.31.4 → 4.31.5

package/dist/extensionManagementWorkerMain.js

@@ -3387,26 +3387,59 @@ const getRpcInfo = rpcId => {
   return info;
 };
 
-const getRunningExtensionsFromState = (extensions, runtimeStatuses) => {
+const isAbsoluteIcon = icon => {
+  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
+};
+
+const isRelativeIconPath = icon => {
+  return icon.startsWith('./') || icon.startsWith('../') || icon.includes('/') || /\.(?:bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(icon);
+};
+
+const getIcon = (extension, manifestView, assetDir, platform) => {
+  const manifestIcon = manifestView?.icon;
+  if (typeof manifestIcon === 'string' && manifestIcon.length > 0) {
+    if (isAbsoluteIcon(manifestIcon) || !isRelativeIconPath(manifestIcon)) {
+      return manifestIcon;
+    }
+    return getAbsolutePath({
+      ...extension,
+      browser: manifestIcon
+    }, assetDir, platform);
+  }
+  return '';
+};
+
+const getRunningExtensionsFromState = (extensions, runtimeStatuses, assetDir, platform) => {
   return extensions.flatMap(extension => {
     const runtimeStatus = runtimeStatuses[extension.id];
     if (!runtimeStatus || runtimeStatus.status !== Activated) {
       return [];
     }
+    const manifestIcon = typeof extension.icon === 'string' ? extension.icon.replace(/^\.\//, '') : undefined;
+    const icon = getIcon(extension, {
+      icon: manifestIcon
+    }, assetDir, platform);
     return [{
       ...extension,
       activationEvent: runtimeStatus.activationEvent,
-      activationTime: runtimeStatus.activationTime
+      activationTime: runtimeStatus.activationTime,
+      ...(icon && {
+        icon
+      })
     }];
   }).toSorted((a, b) => b.activationTime - a.activationTime);
 };
 
 const getRunningExtensions = async (assetDir, platform) => {
-  const extensions = await getAllExtensions(assetDir, platform);
+  const {
+    assetDir: resolvedAssetDir,
+    platform: resolvedPlatform
+  } = await getRuntimeContext(assetDir, platform);
+  const extensions = await getAllExtensions(resolvedAssetDir, resolvedPlatform);
   const {
     runtimeStatuses
   } = get$5();
-  return getRunningExtensionsFromState(extensions, runtimeStatuses);
+  return getRunningExtensionsFromState(extensions, runtimeStatuses, resolvedAssetDir, resolvedPlatform);
 };
 
 const emptyStatus = {
@@ -3444,28 +3477,6 @@ const getCss = (extension, manifestView, assetDir, platform) => {
   }, assetDir, platform);
 };
 
-const isAbsoluteIcon = icon => {
-  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
-};
-
-const isRelativeIconPath = icon => {
-  return icon.startsWith('./') || icon.startsWith('../') || icon.includes('/') || /\.(?:bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(icon);
-};
-
-const getIcon = (extension, manifestView, assetDir, platform) => {
-  const manifestIcon = manifestView?.icon;
-  if (typeof manifestIcon === 'string' && manifestIcon.length > 0) {
-    if (isAbsoluteIcon(manifestIcon) || !isRelativeIconPath(manifestIcon)) {
-      return manifestIcon;
-    }
-    return getAbsolutePath({
-      ...extension,
-      browser: manifestIcon
-    }, assetDir, platform);
-  }
-  return '';
-};
-
 const getIframe = (extension, manifestView, assetDir, platform) => {
   const iframe = manifestView?.iframe;
   if (!iframe || typeof iframe.path !== 'string' || iframe.path.length === 0) {

package/package.json

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