@lvce-editor/extension-management-worker 4.30.3 → 4.31.0

package/dist/extensionManagementWorkerMain.js

@@ -604,7 +604,7 @@ const execute = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$6 = id => {
+const get$7 = id => {
   return callbacks[id];
 };
 const remove$2 = id => {
@@ -753,7 +753,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$6(id);
+  const fn = get$7(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1212,10 +1212,10 @@ const createMockRpc = ({
 };
 
 const rpcs$2 = Object.create(null);
-const set$a = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
-const get$5 = id => {
+const get$6 = id => {
   return rpcs$2[id];
 };
 const remove$1 = id => {
@@ -1226,18 +1226,18 @@ const remove$1 = id => {
 const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$5(rpcId);
+      const rpc = get$6(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$6(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$5(rpcId);
+      const rpc = get$6(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1245,7 +1245,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$a(rpcId, mockRpc);
+      set$b(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1254,14 +1254,14 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$a(rpcId, rpc);
+      set$b(rpcId, rpc);
     }
   };
 };
 
 const {
   invoke: invoke$6,
-  set: set$9
+  set: set$a
 } = create$1(6010);
 
 const Web = 1;
@@ -1277,7 +1277,7 @@ const SharedProcess = 1492;
 
 const {
   invoke: invoke$5,
-  set: set$8
+  set: set$9
 } = create$1(ErrorWorker);
 
 const {
@@ -1285,7 +1285,7 @@ const {
   invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$7
+  set: set$8
 } = create$1(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
@@ -1314,12 +1314,12 @@ const ExtensionHost = {
   invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$2,
   registerMockRpc,
-  set: set$7
+  set: set$8
 };
 
 const {
   invoke: invoke$3,
-  set: set$6
+  set: set$7
 } = create$1(FileSystemWorker);
 const readFile$1 = async uri => {
   return invoke$3('FileSystem.readFile', uri);
@@ -1337,7 +1337,7 @@ const exists = async uri => {
 const {
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$5
+  set: set$6
 } = create$1(RendererWorker);
 const sendMessagePortToAuthWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1366,7 +1366,7 @@ const sendMessagePortToSharedProcess = async port => {
 
 const {
   invoke: invoke$1,
-  set: set$4
+  set: set$5
 } = create$1(SharedProcess);
 
 const create = () => {
@@ -1416,14 +1416,14 @@ const createEmptyRuntimeStatus = id => {
 const state = {
   extensionsState: createInitialState()
 };
-const get$4 = () => {
+const get$5 = () => {
   return state.extensionsState;
 };
-const set$3 = newState => {
+const set$4 = newState => {
   state.extensionsState = newState;
 };
 const update = newState => {
-  set$3({
+  set$4({
     ...state.extensionsState,
     ...newState
   });
@@ -1578,6 +1578,79 @@ const activateExtension2 = async (extensionId, extension, absolutePath, extensio
 
 const commandMapRef = {};
 
+const extensions = Object.create(null);
+const get$4 = extensionId => {
+  return extensions[extensionId];
+};
+const set$3 = extension => {
+  extensions[extension.id] = extension;
+};
+
+const nodeRpcType = 'node';
+const joinPath = (base, relativePath) => {
+  let normalizedBase = base.replaceAll('\\', '/');
+  while (normalizedBase.endsWith('/')) {
+    normalizedBase = normalizedBase.slice(0, -1);
+  }
+  const normalizedRelativePath = relativePath.replaceAll('\\', '/').replace(/^\.\//, '');
+  return `${normalizedBase}/${normalizedRelativePath}`;
+};
+const toFileSystemPath = path => {
+  if (!path.startsWith('file:')) {
+    return path;
+  }
+  const pathname = decodeURIComponent(new URL(path).pathname);
+  return /^\/[A-Za-z]:\//.test(pathname) ? pathname.slice(1) : pathname;
+};
+const getExtensionRoot = async extension => {
+  if (extension.builtin) {
+    const builtinExtensionsPath = await invoke$2('PlatformPaths.getBuiltinExtensionsPath');
+    if (typeof builtinExtensionsPath !== 'string') {
+      throw new TypeError('builtin extensions path must be a string');
+    }
+    return joinPath(builtinExtensionsPath, extension.id);
+  }
+  const extensionPath = extension.uri || extension.path || '';
+  if (!extensionPath) {
+    throw new Error(`Extension ${extension.id} has no path`);
+  }
+  return toFileSystemPath(extensionPath);
+};
+const getDeclaredNodeRpc = (extension, rpcId) => {
+  const rpc = extension.rpc.find(candidate => candidate.id === rpcId);
+  if (!rpc) {
+    throw new Error(`Node rpc ${rpcId} is not declared by extension ${extension.id}`);
+  }
+  if (rpc.type !== nodeRpcType) {
+    throw new Error(`Rpc ${rpcId} declared by extension ${extension.id} is not a node rpc`);
+  }
+  if (!rpc.url || rpc.url.startsWith('/') || /^[A-Za-z][A-Za-z\d+.-]*:/.test(rpc.url)) {
+    throw new Error(`Node rpc ${rpcId} declared by extension ${extension.id} must use a relative url`);
+  }
+  return rpc;
+};
+const getNodeRpcInfo = async (extensionId, rpcId) => {
+  const extension = get$4(extensionId);
+  if (!extension) {
+    throw new Error(`Extension ${extensionId} has no declared rpcs`);
+  }
+  const rpc = getDeclaredNodeRpc(extension, rpcId);
+  const extensionRoot = await getExtensionRoot(extension);
+  return {
+    name: rpc.name || '',
+    path: joinPath(extensionRoot, rpc.url)
+  };
+};
+
+const createExtensionCommandMap = extensionId => {
+  return {
+    ...commandMapRef,
+    'Extensions.getNodeRpcInfo'(rpcId) {
+      return getNodeRpcInfo(extensionId, rpcId);
+    }
+  };
+};
+
 const rpcs$1 = Object.create(null);
 const get$3 = extensionId => {
   return rpcs$1[extensionId];
@@ -1597,23 +1670,40 @@ 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,
+    commandMap: createExtensionCommandMap(extensionId),
     isMessagePortOpen: true,
     send(port) {
       return invokeAndTransfer('LaunchIsolatedExtensionHostWorker.launchIsolatedExtensionHostWorker', port, extensionId, absolutePath, workerName);
     }
   });
 };
-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) => {
@@ -1672,8 +1762,19 @@ const handleRpcInfos = (extension, platform) => {
     if (!Array.isArray(rpcs)) {
       return;
     }
+    if (typeof extension.id === 'string') {
+      set$3({
+        ...extension,
+        rpc: rpcs.map(rpc => ({
+          ...rpc
+        }))
+      });
+    }
     const urlPrefix = getUrlPrefix(platform, extension.path);
     for (const rpc of rpcs) {
+      if (rpc.type === 'node') {
+        continue;
+      }
       rpc.url = `${urlPrefix}/${rpc.url}`;
       add(rpc.id, rpc);
     }
@@ -1969,7 +2070,7 @@ const getAllExtensionsWithState = async (extensionsState, assetDir, platform) =>
 };
 
 const getAllExtensions = async (assetDir, platform) => {
-  return getAllExtensionsWithState(get$4(), assetDir, platform);
+  return getAllExtensionsWithState(get$5(), assetDir, platform);
 };
 
 const activatingExtensions = Object.create(null);
@@ -2175,13 +2276,13 @@ const disabledExtensionsCacheKey = '/cache/disabledExtensions.json';
 const disableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$4(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
+  const oldState = get$5(); // TODO maybe pass in an application id? Would allow multiple editors with different extensions.
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: [...oldState.disabledIds, id]
     };
-    set$3(newState);
+    set$4(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -2197,13 +2298,13 @@ const disableExtension2$1 = async (id, platform) => {
 const enableExtension2$1 = async (id, platform) => {
   const isTest = platform === Test;
   const isWeb = platform === Web;
-  const oldState = get$4();
+  const oldState = get$5();
   if (isTest) {
     const newState = {
       ...oldState,
       disabledIds: oldState.disabledIds.filter(existing => existing !== id)
     };
-    set$3(newState);
+    set$4(newState);
   } else if (isWeb) {
     const cached = await getJson(disabledExtensionsCacheKey);
     const oldDisabled = cached?.disabledExtensions || [];
@@ -2228,7 +2329,7 @@ const disableExtension2 = async (id, platform) => {
 };
 
 const disableExtension = async (id, isTest) => {
-  const oldState = get$4();
+  const oldState = get$5();
   return disableExtension2(id, oldState.platform);
 };
 
@@ -2262,7 +2363,7 @@ const enableExtension2 = async (id, platform) => {
 };
 
 const enableExtension = async (id, isTest) => {
-  const oldState = get$4();
+  const oldState = get$5();
   return enableExtension2(id, oldState.platform);
 };
 
@@ -3079,7 +3180,7 @@ const getColorThemeNames = async (assetDir, platform) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return get$4().webExtensions;
+  return get$5().webExtensions;
 };
 
 const getExtension = async (id, assetDir, platform) => {
@@ -3216,7 +3317,7 @@ const getRunningExtensions = async (assetDir, platform) => {
   const extensions = await getAllExtensions(assetDir, platform);
   const {
     runtimeStatuses
-  } = get$4();
+  } = get$5();
   return getRunningExtensionsFromState(extensions, runtimeStatuses);
 };
 
@@ -3405,7 +3506,7 @@ const getRpc = async platform => {
 const initializeSharedProcess = async platform => {
   const rpc = await getRpc(platform);
   if (rpc) {
-    set$4(rpc);
+    set$5(rpc);
   }
 };
 
@@ -3505,7 +3606,7 @@ const uninstallExtension = async () => {
 
 const wrapCommand = command => {
   return (...args) => {
-    return command(get$4(), ...args);
+    return command(get$5(), ...args);
   };
 };
 const commandMap = {
@@ -3583,7 +3684,7 @@ const initializeAuthWorker = async () => {
       await sendMessagePortToAuthWorker(port, 0);
     }
   });
-  set$9(rpc);
+  set$a(rpc);
 };
 
 const initializeErrorWorker = async () => {
@@ -3593,7 +3694,7 @@ const initializeErrorWorker = async () => {
       await sendMessagePortToErrorWorker(port, 0);
     }
   });
-  set$8(rpc);
+  set$9(rpc);
 };
 
 const initializeExtensionHostWorker = async () => {
@@ -3603,7 +3704,7 @@ const initializeExtensionHostWorker = async () => {
       await sendMessagePortToExtensionHostWorker(port, 0);
     }
   });
-  set$7(rpc);
+  set$8(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
@@ -3613,7 +3714,7 @@ const initializeFileSystemWorker = async () => {
       await sendMessagePortToFileSystemWorker$1(port, 0);
     }
   });
-  set$6(rpc);
+  set$7(rpc);
 };
 
 const initializeIframeWorker = async () => {
@@ -3630,7 +3731,7 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$5(rpc);
+  set$6(rpc);
 };
 
 const listen = async () => {

package/package.json

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