@lvce-editor/extension-management-worker 4.30.2 → 4.30.4

package/dist/extensionManagementWorkerMain.js

@@ -1597,6 +1597,7 @@ const invokeAndTransfer = (method, ...params) => {
   return invokeAndTransfer$1(method, ...params);
 };
 
+const pendingRpcs = Object.create(null);
 const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName, createRpc, invokeAndTransfer) => {
   return createRpc({
     commandMap: commandMapRef,
@@ -1606,14 +1607,30 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, work
     }
   });
 };
-const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName = '') => {
+const createWorker = (extensionId, absolutePath, workerName) => {
+  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
+};
+const createAndStoreRpc = async (extensionId, absolutePath, workerName, create) => {
+  const rpc = await create(extensionId, absolutePath, workerName);
+  set$2(extensionId, rpc);
+  return rpc;
+};
+const getOrCreateIsolatedExtensionHostWorker = async (extensionId, absolutePath, workerName = '', create = createWorker) => {
   const existingRpc = get$3(extensionId);
   if (existingRpc) {
     return existingRpc;
   }
-  const rpc = await createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, create$7, invokeAndTransfer);
-  set$2(extensionId, rpc);
-  return rpc;
+  const pendingRpc = pendingRpcs[extensionId];
+  if (pendingRpc !== undefined) {
+    return pendingRpc;
+  }
+  const newRpc = createAndStoreRpc(extensionId, absolutePath, workerName, create);
+  pendingRpcs[extensionId] = newRpc;
+  try {
+    return await newRpc;
+  } finally {
+    delete pendingRpcs[extensionId];
+  }
 };
 
 const activateIsolatedExtension = async (extensionId, absolutePath, workerName, activationEvent, getOrCreate = getOrCreateIsolatedExtensionHostWorker) => {
@@ -3244,12 +3261,6 @@ const getStatusBarItems = async () => {
   return results.flat();
 };
 
-const contributesViews = extension => {
-  return Array.isArray(extension.views) && extension.views.length > 0;
-};
-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) {
@@ -3260,13 +3271,16 @@ const getCss = (extension, manifestView, assetDir, platform) => {
     browser: css
   }, 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, registeredView, assetDir, platform) => {
+
+const getIcon = (extension, manifestView, assetDir, platform) => {
   const manifestIcon = manifestView?.icon;
   if (typeof manifestIcon === 'string' && manifestIcon.length > 0) {
     if (isAbsoluteIcon(manifestIcon) || !isRelativeIconPath(manifestIcon)) {
@@ -3277,8 +3291,9 @@ const getIcon = (extension, manifestView, registeredView, assetDir, platform) =>
       browser: manifestIcon
     }, assetDir, platform);
   }
-  return registeredView.icon || '';
+  return '';
 };
+
 const getIframe = (extension, manifestView, assetDir, platform) => {
   const iframe = manifestView?.iframe;
   if (!iframe || typeof iframe.path !== 'string' || iframe.path.length === 0) {
@@ -3294,9 +3309,9 @@ const getIframe = (extension, manifestView, assetDir, platform) => {
     }, assetDir, platform)
   };
 };
-const toView = (extension, registeredView, assetDir, platform) => {
-  const id = registeredView.id || '';
-  const manifestView = getManifestView(extension, id);
+
+const toView = (extension, manifestView, assetDir, platform) => {
+  const id = manifestView.id || '';
   const css = getCss(extension, manifestView, assetDir, platform);
   const selector = Array.isArray(manifestView?.selector) ? manifestView.selector.filter(item => typeof item === 'string') : undefined;
   const type = typeof manifestView?.type === 'string' ? manifestView.type : undefined;
@@ -3304,8 +3319,8 @@ const toView = (extension, registeredView, assetDir, platform) => {
     ...(css && {
       css
     }),
-    ...(registeredView.eventListeners && {
-      eventListeners: registeredView.eventListeners
+    ...(Array.isArray(manifestView.eventListeners) && {
+      eventListeners: manifestView.eventListeners
     }),
     ...(selector && {
       selector
@@ -3314,37 +3329,49 @@ const toView = (extension, registeredView, assetDir, platform) => {
       type
     }),
     extensionId: getExtensionId$1(extension),
-    icon: getIcon(extension, manifestView, registeredView, assetDir, platform),
+    icon: getIcon(extension, manifestView, assetDir, platform),
     id,
     iframe: getIframe(extension, manifestView, assetDir, platform),
-    kind: registeredView.kind || manifestView?.kind || '',
-    showSideBarHeader: manifestView?.showSideBarHeader !== false,
-    title: registeredView.title || manifestView?.title || id
+    kind: manifestView.kind || '',
+    showSideBarHeader: manifestView.showSideBarHeader !== false,
+    title: manifestView.title || id
   };
 };
-const getRpcViewRegistrySnapshot = async rpc => {
-  return rpc.invoke('ExtensionApi.getViewRegistrySnapshot');
-};
-const getExtensionViews = async (extension, assetDir, platform) => {
-  const rpc = await getRpc$1(extension, assetDir, platform);
-  const snapshot = await getRpcViewRegistrySnapshot(rpc);
-  if (!Array.isArray(snapshot.views)) {
+
+const getExtensionViews = (extension, assetDir, platform) => {
+  if (!Array.isArray(extension.views)) {
     return [];
   }
-  return snapshot.views.filter(view => view && typeof view.id === 'string').map(view => toView(extension, view, assetDir, platform));
+  return extension.views.filter(view => view && typeof view.id === 'string').map(view => toView(extension, view, assetDir, platform));
 };
-const getViewsFromExtensionWorkers = async (extensions, assetDir, platform) => {
-  const matchingExtensions = extensions.filter(extension => isExtensionIsolated(extension) && contributesViews(extension));
-  const results = await Promise.all(matchingExtensions.map(extension => getExtensionViews(extension, assetDir, platform)));
-  return results.flat();
+
+const contributesViews = extension => {
+  return Array.isArray(extension.views) && extension.views.length > 0;
 };
+
+const shouldLoadViews = extension => {
+  if (!contributesViews(extension)) {
+    return false;
+  }
+  if (!isExtensionIsolated(extension)) {
+    warn(`Extension "${getExtensionId$1(extension)}" contributes activity bar views but is not isolated. The views will not be shown. Add "isolated": true to extension.json to enable them.`);
+    return false;
+  }
+  return true;
+};
+
+const getViewsFromExtensions = (extensions, assetDir, platform) => {
+  const matchingExtensions = extensions.filter(shouldLoadViews);
+  return matchingExtensions.flatMap(extension => getExtensionViews(extension, assetDir, platform));
+};
+
 const getViews = async (assetDir, platform) => {
   const {
     assetDir: resolvedAssetDir,
     platform: resolvedPlatform
   } = await getRuntimeContext(assetDir, platform);
   const extensions = await getAllExtensions(resolvedAssetDir, resolvedPlatform);
-  return getViewsFromExtensionWorkers(extensions, resolvedAssetDir, resolvedPlatform);
+  return getViewsFromExtensions(extensions, resolvedAssetDir, resolvedPlatform);
 };
 
 const handleData = () => {};

package/package.json

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