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

package/dist/extensionManagementWorkerMain.js

@@ -581,12 +581,12 @@ const IpcParentWithWebSocket$1 = {
   wrap
 };
 
-class CommandNotFoundError extends Error {
+let CommandNotFoundError$1 = class CommandNotFoundError extends Error {
   constructor(command) {
     super(`Command not found ${command}`);
     this.name = 'CommandNotFoundError';
   }
-}
+};
 const commands = Object.create(null);
 const register = commandMap => {
   Object.assign(commands, commandMap);
@@ -597,7 +597,7 @@ const getCommand = key => {
 const execute = (command, ...args) => {
   const fn = getCommand(command);
   if (!fn) {
-    throw new CommandNotFoundError(command);
+    throw new CommandNotFoundError$1(command);
   }
   return fn(...args);
 };
@@ -1642,6 +1642,14 @@ const getNodeRpcInfo = async (extensionId, rpcId) => {
   };
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    Object.defineProperty(this, 'name', {
+      value: 'CommandNotFoundError'
+    });
+  }
+}
 const createExtensionCommandMap = extensionId => {
   return {
     ...commandMapRef,
@@ -1650,6 +1658,15 @@ const createExtensionCommandMap = extensionId => {
     }
   };
 };
+const createExtensionCommandExecutor = commandMap => {
+  return (method, ...params) => {
+    const command = commandMap[method];
+    if (!command) {
+      throw new CommandNotFoundError(method);
+    }
+    return command(...params);
+  };
+};
 
 const rpcs$1 = Object.create(null);
 const get$3 = extensionId => {
@@ -1670,15 +1687,25 @@ const invokeAndTransfer = (method, ...params) => {
   return invokeAndTransfer$1(method, ...params);
 };
 
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+
 const pendingRpcs = Object.create(null);
+const bindCommandMap = (rpc, commandMap) => {
+  if (rpc.ipc) {
+    rpc.ipc.execute = createExtensionCommandExecutor(commandMap);
+  }
+  return rpc;
+};
 const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName, createRpc, invokeAndTransfer) => {
-  return createRpc({
-    commandMap: createExtensionCommandMap(extensionId),
+  const commandMap = createExtensionCommandMap(extensionId);
+  const rpc = await createRpc({
+    commandMap,
     isMessagePortOpen: true,
     send(port) {
       return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath, workerName);
     }
   });
+  return bindCommandMap(rpc, commandMap);
 };
 const createWorker = (extensionId, absolutePath, workerName) => {
   return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
@@ -2585,6 +2612,7 @@ const getRpc$1 = async (extension, assetDir, platform) => {
   if (existingRpc) {
     return existingRpc;
   }
+  handleRpcInfos(extension, platform);
   const absolutePath = getAbsolutePath(extension, assetDir, platform);
   return getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '');
 };
@@ -3359,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 = {
@@ -3416,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.3",
+  "version": "4.31.5",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"