@lvce-editor/extension-management-worker 4.80.0 → 4.81.1

package/dist/extensionManagementWorkerMain.js

@@ -2504,12 +2504,6 @@ const get$2 = (extensionId, applicationId) => {
   }
   return rpcs[extensionId];
 };
-const getAll$1 = applicationId => {
-  if (applicationId !== undefined) {
-    return [...(applicationRpcs.get(applicationId)?.values() || [])];
-  }
-  return Object.values(rpcs);
-};
 const getIds = applicationId => {
   if (applicationId !== undefined) {
     return [...(applicationRpcs.get(applicationId)?.keys() || [])];
@@ -5456,9 +5450,47 @@ const isRelativeIconPath = icon => {
   return icon.startsWith('./') || icon.startsWith('../') || icon.includes('/') || /\.(?:bmp|gif|ico|jpe?g|png|svg|webp)$/i.test(icon);
 };
 
+const getBuiltinIconPath = (extension, icon, assetDir, platform) => {
+  const extensionPathUrl = extension.path || extension.uri || '';
+  if (extension.builtin !== true || extension.isWeb === true || platform === Web || !extensionPathUrl.startsWith('file://')) {
+    return undefined;
+  }
+  const isLocalFileUrl = icon.startsWith('file://');
+  const isLocalAbsolutePath = icon.startsWith('/') || /^[A-Za-z]:[\\/]/.test(icon);
+  const hasUrlScheme = /^[A-Za-z][A-Za-z\d+.-]*:/.test(icon);
+  if (!isLocalFileUrl && (hasUrlScheme || !isLocalAbsolutePath && !isRelativeIconPath(icon))) {
+    return undefined;
+  }
+  const extensionPath = new URL(extensionPathUrl).pathname.replaceAll('\\', '/').replace(/\/$/, '');
+  let iconPath = icon;
+  if (isLocalFileUrl) {
+    iconPath = new URL(icon).pathname;
+  } else if (!isLocalAbsolutePath) {
+    iconPath = `${extensionPath}/${icon}`;
+  }
+  const normalizedIconPath = iconPath.replaceAll('\\', '/');
+  const normalizedExtensionPath = extensionPath.replace(/^\/([A-Za-z]:\/)/, '$1');
+  const normalizedAbsoluteIconPath = normalizedIconPath.replace(/^\/([A-Za-z]:\/)/, '$1');
+  const isWindowsPath = /^[A-Za-z]:\//.test(normalizedExtensionPath);
+  const pathToCompare = isWindowsPath ? normalizedExtensionPath.toLowerCase() : normalizedExtensionPath;
+  const iconPathToCompare = isWindowsPath ? normalizedAbsoluteIconPath.toLowerCase() : normalizedAbsoluteIconPath;
+  if (!iconPathToCompare.startsWith(`${pathToCompare}/`)) {
+    return undefined;
+  }
+  const relativePath = normalizedAbsoluteIconPath.slice(normalizedExtensionPath.length + 1);
+  const folderName = normalizedExtensionPath.split('/').findLast(Boolean);
+  if (!relativePath || !folderName || relativePath.split('/').includes('..')) {
+    return undefined;
+  }
+  return `${assetDir}/extensions/${folderName}/${relativePath}`;
+};
 const getIcon = (extension, manifestView, assetDir, platform) => {
   const manifestIcon = manifestView?.icon;
   if (typeof manifestIcon === 'string' && manifestIcon.length > 0) {
+    const builtinIconPath = getBuiltinIconPath(extension, manifestIcon, assetDir, platform);
+    if (builtinIconPath) {
+      return builtinIconPath;
+    }
     if (isAbsoluteIcon(manifestIcon) || !isRelativeIconPath(manifestIcon)) {
       return manifestIcon;
     }
@@ -5585,10 +5617,32 @@ const getItems = async rpc => {
   return rpc.invoke('ExtensionApi.getStatusBarItems');
 };
 const getStatusBarItems = async applicationId => {
-  const rpcs = getAll$1(applicationId);
-  const results = await Promise.all(rpcs.map(getItems));
+  const extensionIds = getIds(applicationId);
+  const results = await Promise.all(extensionIds.map(async extensionId => {
+    const rpc = get$2(extensionId, applicationId);
+    if (!rpc) {
+      return [];
+    }
+    const items = await getItems(rpc);
+    return items.map(item => ({
+      ...item,
+      extensionId
+    }));
+  }));
   return results.flat();
 };
+const getStatusBarItemContextMenuItems = async (extensionId, providerId, applicationId) => {
+  const rpc = get$2(extensionId, applicationId);
+  if (!rpc) {
+    return [];
+  }
+  try {
+    const items = await rpc.invoke('ExtensionApi.getStatusBarItemContextMenuItems', providerId);
+    return Array.isArray(items) ? items : [];
+  } catch {
+    return [];
+  }
+};
 
 const getCss = (extension, manifestView, assetDir, platform) => {
   const css = manifestView?.css;
@@ -6174,6 +6228,8 @@ const invokeForApplication = async (applicationId, method, ...args) => {
       return getRpcInfo$1(application, args[0]);
     case 'Extensions.getRuntimeStatus':
       return getRuntimeStatus$1(args[0], applicationId);
+    case 'Extensions.getStatusBarItemContextMenuItems':
+      return getStatusBarItemContextMenuItems(args[0], args[1], applicationId);
     case 'Extensions.getStatusBarItems':
       return getStatusBarItems(applicationId);
     case 'Extensions.getViews':
@@ -6274,6 +6330,7 @@ const commandMap = {
   'Extensions.getRpcInfo': getRpcInfo,
   'Extensions.getRunningExtensions': getRunningExtensions,
   'Extensions.getRuntimeStatus': getRuntimeStatus,
+  'Extensions.getStatusBarItemContextMenuItems': getStatusBarItemContextMenuItems,
   'Extensions.getStatusBarItems': getStatusBarItems,
   'Extensions.getViewActions': getViewActions,
   'Extensions.getViewActionsDom': getViewActionsDom,

package/package.json

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