@lvce-editor/extension-management-worker 4.83.1 → 4.83.3

package/dist/extensionManagementWorkerMain.js

@@ -2160,6 +2160,12 @@ const parseDirective = directive => {
 const getWorkerUrls = absolutePath => {
   const applicationUrl = new URL(getOrigin());
   const workerUrl = new URL(absolutePath, applicationUrl);
+  if (workerUrl.protocol === 'lvce:') {
+    return {
+      assetSource: new URL('./', workerUrl).href,
+      origin: applicationUrl.origin
+    };
+  }
   if (workerUrl.protocol !== 'http:' && workerUrl.protocol !== 'https:') {
     return {
       origin: applicationUrl.origin
@@ -4892,11 +4898,12 @@ const hasView = (extension, viewId) => {
 const hasOnlyViewAndCommandActivations = extension => {
   return Array.isArray(extension.activation) && extension.activation.length > 0 && extension.activation.every(event => event.startsWith('onView:') || event.startsWith('onCommand:'));
 };
+const pendingViewCreations = new WeakMap();
 const hasOtherViewInstances = rpc => {
   return getEntries().some(entry => entry.instance.status === 'ready' && entry.instance.rpc === rpc);
 };
 const disposeViewOnlyExtensionWorker = async (extensionId, rpc) => {
-  if (hasOtherViewInstances(rpc)) {
+  if (pendingViewCreations.has(rpc) || hasOtherViewInstances(rpc)) {
     return;
   }
   if (get$2(extensionId) !== rpc) {
@@ -4912,7 +4919,7 @@ const getExtensionForView = async (viewId, assetDir, platform, applicationId) =>
   }
   return extension;
 };
-const getRpcForView = async (viewId, assetDir, platform, applicationId) => {
+const getRpcForView = async (viewId, assetDir, platform, applicationId, retain) => {
   const {
     assetDir: resolvedAssetDir,
     platform: resolvedPlatform
@@ -4922,22 +4929,26 @@ const getRpcForView = async (viewId, assetDir, platform, applicationId) => {
   const existingRpc = get$2(extensionId, applicationId);
   // Application teardown and reload own application workers; global view-only disposal does not.
   if (existingRpc) {
-    return {
+    const worker = {
       disposeWorkerWhenLastViewCloses: applicationId === undefined && hasOnlyViewAndCommandActivations(extension),
       extensionId,
       rpc: existingRpc
     };
+    retain?.(worker);
+    return worker;
   }
   const activationResult = await activateByEvent(`onView:${viewId}`, resolvedAssetDir, resolvedPlatform, get$7(applicationId));
   if (activationResult.error) {
     throw activationResult.error;
   }
   const rpc = await getRpc$1(extension, resolvedAssetDir, resolvedPlatform);
-  return {
+  const worker = {
     disposeWorkerWhenLastViewCloses: applicationId === undefined && hasOnlyViewAndCommandActivations(extension),
     extensionId,
     rpc
   };
+  retain?.(worker);
+  return worker;
 };
 const getRpcForInstance = async (viewId, uid, assetDir, platform) => {
   const instance = get$1(uid);
@@ -4966,12 +4977,18 @@ const getViewMetadata = async (rpc, viewId) => {
   };
 };
 const createViewInstance = async (viewId, uid, context, assetDir, platform, applicationId) => {
+  let retainedWorker;
+  const retain = worker => {
+    retainedWorker = worker;
+    pendingViewCreations.set(worker.rpc, (pendingViewCreations.get(worker.rpc) || 0) + 1);
+  };
   try {
+    // Retain at selection time, before yielding the RPC to the caller.
     const {
       disposeWorkerWhenLastViewCloses,
       extensionId,
       rpc
-    } = await getRpcForView(viewId, assetDir, platform, applicationId);
+    } = await getRpcForView(viewId, assetDir, platform, applicationId, retain);
     const {
       eventListeners,
       stateful
@@ -5009,6 +5026,24 @@ const createViewInstance = async (viewId, uid, context, assetDir, platform, appl
       error: serializedError,
       ok: false
     };
+  } finally {
+    if (retainedWorker) {
+      const {
+        disposeWorkerWhenLastViewCloses,
+        extensionId,
+        rpc
+      } = retainedWorker;
+      const remaining = (pendingViewCreations.get(rpc) || 1) - 1;
+      if (remaining) {
+        pendingViewCreations.set(rpc, remaining);
+      } else {
+        pendingViewCreations.delete(rpc);
+      }
+      // Failed creations must also release a worker kept alive by an overlapping close.
+      if (disposeWorkerWhenLastViewCloses) {
+        await disposeViewOnlyExtensionWorker(extensionId, rpc);
+      }
+    }
   }
 };
 const dispatchViewEvent = async (viewId, uid, event, assetDir, platform) => {

package/package.json

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