@lvce-editor/extension-management-worker 4.15.0 → 4.17.0

package/dist/extensionManagementWorkerMain.js

@@ -1725,11 +1725,41 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
   return new URL('/remote' + path + '/' + relativePath, origin).href;
 };
 
+const isMissingAssetDir = assetDir => {
+  return typeof assetDir !== 'string' || assetDir.length === 0;
+};
+const isMissingPlatform = platform => {
+  return typeof platform !== 'number' || platform === 0;
+};
+const isStaticHttpAssetDir = assetDir => {
+  return assetDir.startsWith('/') || assetDir.startsWith('http');
+};
+const isHttpLocation = () => {
+  return Reflect.has(globalThis, 'location') && globalThis.location.protocol.startsWith('http');
+};
+const getRuntimeContext = async (assetDir, platform) => {
+  const resolvedAssetDir = isMissingAssetDir(assetDir) ? await invoke$3('Layout.getAssetDir') : assetDir;
+  const resolvedPlatform = isMissingPlatform(platform) ? await invoke$3('Layout.getPlatform') : platform;
+  if (isHttpLocation() && isStaticHttpAssetDir(resolvedAssetDir)) {
+    return {
+      assetDir: resolvedAssetDir,
+      platform: Web
+    };
+  }
+  return {
+    assetDir: resolvedAssetDir,
+    platform: resolvedPlatform
+  };
+};
+
+const getResponseErrorMessage = response => {
+  return response.statusText || String(response.status) || 'Request failed';
+};
 const getJson$1 = async url => {
   try {
     const response = await fetch(url);
     if (!response.ok) {
-      throw new Error(response.statusText);
+      throw new Error(getResponseErrorMessage(response));
     }
     const json = await response.json();
     return json;
@@ -1875,17 +1905,15 @@ const getExtensionsWithWorkspaceState = async extensions => {
   return withWorkspaceDisabledState(extensions, workspaceDisabledIds);
 };
 const getAllExtensionsWithState = async (extensionsState, assetDir, platform) => {
-  if (typeof assetDir !== 'string') {
-    assetDir = await invoke$3('Layout.getAssetDir');
-  }
-  if (!platform) {
-    platform = await invoke$3('Layout.getPlatform');
-  }
-  string(assetDir);
-  number(platform);
+  const {
+    assetDir: resolvedAssetDir,
+    platform: resolvedPlatform
+  } = await getRuntimeContext(assetDir, platform);
+  string(resolvedAssetDir);
+  number(resolvedPlatform);
   const meta = extensionsState.webExtensions;
-  if (platform === Web) {
-    const webExtensions = await getWebExtensions(assetDir);
+  if (resolvedPlatform === Web) {
+    const webExtensions = await getWebExtensions(resolvedAssetDir);
     return getExtensionsWithWorkspaceState([...webExtensions, ...meta]);
   }
   const local = await invoke$2('ExtensionManagement.getAllExtensions');
@@ -1936,10 +1964,14 @@ const activateByEvent = async (event, assetDir, platform) => {
         hasActivatedExtensions: Object.keys(activatingExtensions).length > 0
       };
     }
-    const extensions = await getAllExtensions(assetDir, platform);
+    const {
+      assetDir: resolvedAssetDir,
+      platform: resolvedPlatform
+    } = await getRuntimeContext(assetDir, platform);
+    const extensions = await getAllExtensions(resolvedAssetDir, resolvedPlatform);
     const matchingExtensions = extensions.filter(extension => matchesEvent(extension, event));
     for (const extension of matchingExtensions) {
-      await activateExtension(extension, event, assetDir, platform);
+      await activateExtension(extension, event, resolvedAssetDir, resolvedPlatform);
     }
     return {
       error: undefined,
@@ -2292,9 +2324,9 @@ const executeRpcResolveCompletionItemProvider = async (rpc, textDocument, args)
 };
 const executeCompletionProvider = async (extensionsState, textDocument, ...args) => {
   const {
+    assetDir,
     platform
-  } = extensionsState;
-  const assetDir = '';
+  } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$3(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcCompletionProvider(rpc, textDocument, args)));
@@ -2302,9 +2334,9 @@ const executeCompletionProvider = async (extensionsState, textDocument, ...args)
 };
 const executeResolveCompletionItemProvider = async (extensionsState, textDocument, ...args) => {
   const {
+    assetDir,
     platform
-  } = extensionsState;
-  const assetDir = '';
+  } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$3(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcResolveCompletionItemProvider(rpc, textDocument, args)));
@@ -2325,9 +2357,9 @@ const executeRpcDiagnosticProvider = async (rpc, textDocument, args) => {
 };
 const executeDiagnosticProvider = async (extensionsState, textDocument, ...args) => {
   const {
+    assetDir,
     platform
-  } = extensionsState;
-  const assetDir = '';
+  } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$2(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcDiagnosticProvider(rpc, textDocument, args)));
@@ -2348,9 +2380,9 @@ const executeRpcFormattingProvider = async (rpc, textDocument, args) => {
 };
 const executeFormattingProvider = async (extensionsState, textDocument, ...args) => {
   const {
+    assetDir,
     platform
-  } = extensionsState;
-  const assetDir = '';
+  } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$1(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcFormattingProvider(rpc, textDocument, args)));
@@ -2371,9 +2403,9 @@ const executeRpcHoverProvider = async (rpc, textDocument, args) => {
 };
 const executeHoverProvider = async (extensionsState, textDocument, ...args) => {
   const {
+    assetDir,
     platform
-  } = extensionsState;
-  const assetDir = '';
+  } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
   const results = await Promise.all(rpcs.map(rpc => executeRpcHoverProvider(rpc, textDocument, args)));
@@ -2418,16 +2450,20 @@ const getExtensionForView = async (viewId, assetDir, platform) => {
   return extension;
 };
 const getRpcForView = async (viewId, assetDir, platform) => {
-  const extension = await getExtensionForView(viewId, assetDir, platform);
+  const {
+    assetDir: resolvedAssetDir,
+    platform: resolvedPlatform
+  } = await getRuntimeContext(assetDir, platform);
+  const extension = await getExtensionForView(viewId, resolvedAssetDir, resolvedPlatform);
   const existingRpc = get$3(getExtensionId$1(extension));
   if (existingRpc) {
     return existingRpc;
   }
-  const activationResult = await activateByEvent(`onView:${viewId}`, assetDir, platform);
+  const activationResult = await activateByEvent(`onView:${viewId}`, resolvedAssetDir, resolvedPlatform);
   if (activationResult.error) {
     throw activationResult.error;
   }
-  return getRpc$1(extension, assetDir, platform);
+  return getRpc$1(extension, resolvedAssetDir, resolvedPlatform);
 };
 const getRpcForInstance = async (viewId, uid, assetDir, platform) => {
   const instance = get$1(uid);
@@ -2479,6 +2515,13 @@ const getViewMenuEntries = async (viewId, uid, menuId, assetDir, platform) => {
   }
   return instance.rpc.invoke('ExtensionApi.getViewMenuEntries', uid, menuId);
 };
+const getViewActions = async (viewId, uid, assetDir, platform) => {
+  const instance = get$1(uid);
+  if (!instance || instance.status === 'error') {
+    return [];
+  }
+  return instance.rpc.invoke('ExtensionApi.getViewActions', uid);
+};
 const requestViewRerender = async uid => {
   await invoke$3('Viewlet.executeViewletCommand', uid, 'rerender');
 };
@@ -2968,8 +3011,12 @@ const getViewsFromExtensionWorkers = async (extensions, assetDir, platform) => {
   return results.flat();
 };
 const getViews = async (assetDir, platform) => {
-  const extensions = await getAllExtensions(assetDir, platform);
-  return getViewsFromExtensionWorkers(extensions, assetDir, platform);
+  const {
+    assetDir: resolvedAssetDir,
+    platform: resolvedPlatform
+  } = await getRuntimeContext(assetDir, platform);
+  const extensions = await getAllExtensions(resolvedAssetDir, resolvedPlatform);
+  return getViewsFromExtensionWorkers(extensions, resolvedAssetDir, resolvedPlatform);
 };
 
 const StatusBarWorker = 200;
@@ -3149,6 +3196,7 @@ const commandMap = {
   'Extensions.getRpcInfo': getRpcInfo,
   'Extensions.getRuntimeStatus': getRuntimeStatus,
   'Extensions.getStatusBarItems': getStatusBarItems,
+  'Extensions.getViewActions': getViewActions,
   'Extensions.getViewMenuEntries': getViewMenuEntries,
   'Extensions.getViews': getViews,
   'Extensions.handleMessagePort': handleMessagePort,

package/package.json

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