@lvce-editor/extension-management-worker 4.4.0 → 4.6.0

package/dist/extensionManagementWorkerMain.js

@@ -7,7 +7,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -19,7 +19,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -48,7 +48,7 @@ const number = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -1391,16 +1391,18 @@ const createEmptyRuntimeStatus = id => {
     status: None
   };
 };
-let extensionsState = createInitialState();
+const state$1 = {
+  extensionsState: createInitialState()
+};
 const get$3 = () => {
-  return extensionsState;
+  return state$1.extensionsState;
 };
 const set$3 = newState => {
-  extensionsState = newState;
+  state$1.extensionsState = newState;
 };
 const update = newState => {
   set$3({
-    ...extensionsState,
+    ...state$1.extensionsState,
     ...newState
   });
 };
@@ -1410,11 +1412,11 @@ const setPlatform = platform => {
   });
 };
 const hasWebExtensionUri = uri => {
-  return extensionsState.webExtensions.some(extension => extension.uri === uri);
+  return state$1.extensionsState.webExtensions.some(extension => extension.uri === uri);
 };
 const addWebExtension$1 = extension => {
   update({
-    webExtensions: [...extensionsState.webExtensions, extension]
+    webExtensions: [...state$1.extensionsState.webExtensions, extension]
   });
 };
 const clearCachedExtensions = () => {
@@ -1425,7 +1427,7 @@ const clearCachedExtensions = () => {
 const setRuntimeStatus = status => {
   update({
     runtimeStatuses: {
-      ...extensionsState.runtimeStatuses,
+      ...state$1.extensionsState.runtimeStatuses,
       [status.id]: {
         ...status
       }
@@ -1433,7 +1435,7 @@ const setRuntimeStatus = status => {
   });
 };
 const updateRuntimeStatus = (id, statusUpdate) => {
-  const previousStatus = extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
+  const previousStatus = state$1.extensionsState.runtimeStatuses[id] || createEmptyRuntimeStatus(id);
   setRuntimeStatus({
     ...previousStatus,
     ...statusUpdate,
@@ -1441,7 +1443,7 @@ const updateRuntimeStatus = (id, statusUpdate) => {
   });
 };
 const getRuntimeStatus$1 = extensionId => {
-  return extensionsState.runtimeStatuses[extensionId];
+  return state$1.extensionsState.runtimeStatuses[extensionId];
 };
 
 const baseName = path => {
@@ -1619,13 +1621,13 @@ const handleRpcInfos = (extension, platform) => {
       return;
     }
     const rpcs = extension.rpc;
-    const urlPrefix = getUrlPrefix(platform, extension.path);
     if (!rpcs) {
       return;
     }
     if (!Array.isArray(rpcs)) {
       return;
     }
+    const urlPrefix = getUrlPrefix(platform, extension.path);
     for (const rpc of rpcs) {
       rpc.url = `${urlPrefix}/${rpc.url}`;
       add(rpc.id, rpc);
@@ -1701,9 +1703,9 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
 const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, origin, platform, assetDir) => {
   if (path.startsWith('http')) {
     if (path.endsWith('/')) {
-      return new URL(relativePath, path).toString();
+      return new URL(relativePath, path).href;
     }
-    return new URL(relativePath, path + '/').toString();
+    return new URL(relativePath, path + '/').href;
   }
   if (!path.startsWith('/')) {
     path = '/' + path;
@@ -1717,7 +1719,7 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
   if (isBuiltin) {
     return `${assetDir}/extensions/${id}/${relativePath}`;
   }
-  return new URL('/remote' + path + '/' + relativePath, origin).toString();
+  return new URL('/remote' + path + '/' + relativePath, origin).href;
 };
 
 const getJson$1 = async url => {
@@ -1780,6 +1782,15 @@ const getExtensionId$2 = 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 doActivateExtension = async (extension, absolutePath, event, platform) => {
+  const extensionId = getExtensionId$2(extension);
+  try {
+    await activateExtension3(extension, absolutePath, event, platform);
+    runningExtensions[extensionId] = true;
+  } finally {
+    delete activatingExtensions[extensionId];
+  }
+};
 const activateExtension = async (extension, event, assetDir, platform) => {
   const extensionId = getExtensionId$2(extension);
   if (runningExtensions[extensionId]) {
@@ -1787,11 +1798,7 @@ const activateExtension = async (extension, event, assetDir, platform) => {
   }
   if (!Object.hasOwn(activatingExtensions, extensionId)) {
     const absolutePath = getAbsolutePath$1(extension, assetDir, platform);
-    activatingExtensions[extensionId] = activateExtension3(extension, absolutePath, event, platform).then(() => {
-      runningExtensions[extensionId] = true;
-    }).finally(() => {
-      delete activatingExtensions[extensionId];
-    });
+    activatingExtensions[extensionId] = doActivateExtension(extension, absolutePath, event, platform);
   }
   await activatingExtensions[extensionId];
 };
@@ -1826,15 +1833,17 @@ const getWebManifestPath = path => {
   return manifestPath;
 };
 
-let rpc;
+const state = {
+  rpc: undefined
+};
 const set$1 = value => {
-  rpc = value;
+  state.rpc = value;
 };
 const invoke = async (method, ...params) => {
-  if (!rpc) {
+  if (!state.rpc) {
     return undefined;
   }
-  return rpc.invoke(method, ...params);
+  return state.rpc.invoke(method, ...params);
 };
 
 const handleChange = async id => {
@@ -1879,7 +1888,7 @@ const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
 };
 
 const getExtensionHostSubWorkerUrl = () => {
-  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).toString();
+  return new URL('../../../../extension-host-sub-worker/src/extensionHostSubWorkerMain.js', import.meta.url).href;
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -1915,7 +1924,7 @@ const createResponseFromData = data => {
   const responseString = JSON.stringify(data);
   const response = new Response(responseString, {
     headers: {
-      [ContentLength]: `${responseString.length}`,
+      [ContentLength]: String(responseString.length),
       [ContentType]: 'application/json'
     }
   });
@@ -2349,16 +2358,21 @@ const join = (pathSeparator, ...parts) => {
   return parts.join(pathSeparator);
 };
 
+const getColorThemeUriFromExtension = (extension, colorThemeId) => {
+  if (!extension.colorThemes) {
+    return '';
+  }
+  for (const colorTheme of extension.colorThemes) {
+    if (colorTheme.id === colorThemeId) {
+      return join('/', extension.uri, colorTheme.path);
+    }
+  }
+  return '';
+};
 const getColorThemeUri = (extensions, colorThemeId) => {
   for (const extension of extensions) {
-    if (!extension.colorThemes) {
-      continue;
-    }
-    for (const colorTheme of extension.colorThemes) {
-      if (colorTheme.id !== colorThemeId) {
-        continue;
-      }
-      const absolutePath = join('/', extension.uri, colorTheme.path);
+    const absolutePath = getColorThemeUriFromExtension(extension, colorThemeId);
+    if (absolutePath) {
       return absolutePath;
     }
   }
@@ -2637,6 +2651,9 @@ const installExtension = async () => {
 };
 
 const getRemoteUrl = uri => {
+  if (uri.startsWith('http://') || uri.startsWith('https://')) {
+    return uri;
+  }
   if (uri.startsWith('/')) {
     return `/remote${uri}`;
   }

package/package.json

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