@lvce-editor/extension-management-worker 4.9.0 → 4.11.0

package/dist/extensionManagementWorkerMain.js

@@ -1578,21 +1578,21 @@ const invokeAndTransfer = (method, ...params) => {
   return invokeAndTransfer$1(method, ...params);
 };
 
-const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, createRpc, invokeAndTransfer) => {
+const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName, createRpc, invokeAndTransfer) => {
   return createRpc({
     commandMap: commandMapRef,
     isMessagePortOpen: true,
     send(port) {
-      return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath);
+      return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath, workerName);
     }
   });
 };
-const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath) => {
+const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName = '') => {
   const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
   }
-  const rpc = await createIsolatedExtensionHostWorker(extensionId, absolutePath, create$7, invokeAndTransfer);
+  const rpc = await createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
   set$3(extensionId, rpc);
   return rpc;
 };
@@ -1696,7 +1696,7 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
   handleRpcInfos(extension, platform);
   const extensionId = extension.id || interExtensionId(extension.uri);
   if (isExtensionIsolated(extension)) {
-    await getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath);
+    await getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '');
     return;
   }
   await importExtension(extensionId, absolutePath, activationEvent);
@@ -1947,6 +1947,10 @@ const getWebManifestPath = path => {
   return manifestPath;
 };
 
+const invalidateExtensionsCache = async () => {
+  await invoke$3('ExtensionManagement.invalidateExtensionsCache');
+};
+
 const state = {
   rpc: undefined
 };
@@ -1975,6 +1979,7 @@ const addWebExtension = async path => {
   const manifest = await getWebExtensionManifest(path, manifestPath);
   addWebExtension$1(manifest);
   clearCachedExtensions();
+  await invalidateExtensionsCache();
   if (hasStatusBarItems(manifest)) {
     await handleChange(manifest.id || path);
   }
@@ -2112,10 +2117,6 @@ const enableExtension2$1 = async (id, platform) => {
   }
 };
 
-const invalidateExtensionsCache = async () => {
-  await invoke$3('ExtensionManagement.invalidateExtensionsCache');
-};
-
 const disableExtension2 = async (id, platform) => {
   string(id);
   number(platform);
@@ -2159,6 +2160,7 @@ const enableExtension2 = async (id, platform) => {
     await writeFile(disabledExtensionsJsonPath, newContent);
   }
   await enableExtension2$1(id, platform);
+  await invalidateExtensionsCache();
 };
 
 const enableExtension = async (id, isTest) => {
@@ -2245,7 +2247,7 @@ const getRpc$1 = async (extension, assetDir, platform) => {
     return existingRpc;
   }
   const absolutePath = getAbsolutePath(extension, assetDir, platform);
-  return getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath);
+  return getOrCreateIsolatedExtensionHostWorker(extensionId, absolutePath, extension.workerName || '');
 };
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
@@ -2364,6 +2366,21 @@ const remove = uid => {
   delete instances[uid];
 };
 
+const serializeError = error => {
+  if (error instanceof Error) {
+    return {
+      message: error.message,
+      name: error.name,
+      ...(error.stack && {
+        stack: error.stack
+      })
+    };
+  }
+  return {
+    message: String(error),
+    name: 'Error'
+  };
+};
 const hasView = (extension, viewId) => {
   return Array.isArray(extension.views) && extension.views.some(view => view.id === viewId);
 };
@@ -2381,36 +2398,69 @@ const getRpcForView = async (viewId, assetDir, platform) => {
   if (existingRpc) {
     return existingRpc;
   }
-  await activateByEvent(`onView:${viewId}`, assetDir, platform);
+  const activationResult = await activateByEvent(`onView:${viewId}`, assetDir, platform);
+  if (activationResult.error) {
+    throw activationResult.error;
+  }
   return getRpc$1(extension, assetDir, platform);
 };
 const getRpcForInstance = async (viewId, uid, assetDir, platform) => {
   const instance = get$1(uid);
   if (instance) {
+    if (instance.status === 'error') {
+      return undefined;
+    }
     return instance.rpc;
   }
   return getRpcForView(viewId, assetDir, platform);
 };
 const createViewInstance = async (viewId, uid, context, assetDir, platform) => {
-  const rpc = await getRpcForView(viewId, assetDir, platform);
-  const result = await rpc.invoke('ExtensionApi.createViewInstance', viewId, uid, context);
-  set$1(uid, {
-    rpc,
-    viewId
-  });
-  return result;
+  try {
+    const rpc = await getRpcForView(viewId, assetDir, platform);
+    const result = await rpc.invoke('ExtensionApi.createViewInstance', viewId, uid, context);
+    set$1(uid, {
+      rpc,
+      status: 'ready',
+      viewId
+    });
+    return {
+      ok: true,
+      result
+    };
+  } catch (error) {
+    const serializedError = serializeError(error);
+    set$1(uid, {
+      error: serializedError,
+      status: 'error',
+      viewId
+    });
+    return {
+      error: serializedError,
+      ok: false
+    };
+  }
 };
 const dispatchViewEvent = async (viewId, uid, event, assetDir, platform) => {
   const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  if (!rpc) {
+    return undefined;
+  }
   return rpc.invoke('ExtensionApi.dispatchViewEvent', uid, event);
 };
 const disposeViewInstance = async (viewId, uid, assetDir, platform) => {
   const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  if (!rpc) {
+    remove(uid);
+    return;
+  }
   await rpc.invoke('ExtensionApi.disposeViewInstance', uid);
   remove(uid);
 };
 const saveViewInstanceState = async (viewId, uid, assetDir, platform) => {
   const rpc = await getRpcForInstance(viewId, uid, assetDir, platform);
+  if (!rpc) {
+    return undefined;
+  }
   return rpc.invoke('ExtensionApi.saveViewInstanceState', uid);
 };
 
@@ -2525,9 +2575,7 @@ const get = colorThemeId => {
 const set = (colorThemeId, data) => {
   //  noop
 };
-
-const GetColorThemeCssCachedNoop = {
-  __proto__: null,
+const cache = {
   get,
   set
 };
@@ -2539,7 +2587,7 @@ const GetColorThemeCssCachedNoop = {
 const getCacheFn = config => {
   switch (config) {
     default:
-      return GetColorThemeCssCachedNoop;
+      return cache;
   }
 };
 const getColorThemeCssCached = async (colorThemeId, platform, getData) => {
@@ -2753,6 +2801,16 @@ const contributesViews = extension => {
 const getManifestView = (extension, id) => {
   return extension.views?.find(view => view.id === id);
 };
+const getCss = (extension, manifestView, assetDir, platform) => {
+  const css = manifestView?.css;
+  if (typeof css !== 'string' || css.length === 0) {
+    return '';
+  }
+  return getAbsolutePath({
+    ...extension,
+    browser: css
+  }, assetDir, platform);
+};
 const getIframe = (extension, manifestView, assetDir, platform) => {
   const iframe = manifestView?.iframe;
   if (!iframe || typeof iframe.path !== 'string' || iframe.path.length === 0) {
@@ -2771,7 +2829,11 @@ const getIframe = (extension, manifestView, assetDir, platform) => {
 const toView = (extension, registeredView, assetDir, platform) => {
   const id = registeredView.id || '';
   const manifestView = getManifestView(extension, id);
+  const css = getCss(extension, manifestView, assetDir, platform);
   return {
+    ...(css && {
+      css
+    }),
     extensionId: getExtensionId(extension),
     icon: registeredView.icon || manifestView?.icon || '',
     id,
@@ -2853,6 +2915,7 @@ const initialize = async platform => {
 
 const installExtension = async () => {
   // TODO
+  await invalidateExtensionsCache();
 };
 
 const getRemoteUrl = uri => {
@@ -2926,6 +2989,7 @@ const sendMessagePortToFileSystemWorker = async port => {
 
 const uninstallExtension = async () => {
   // TODO
+  await invalidateExtensionsCache();
 };
 
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */

package/package.json

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