@lvce-editor/extension-management-worker 4.88.4 → 4.89.0

package/dist/extensionManagementWorkerMain.js

@@ -127,11 +127,21 @@ const removeWebExtension = (id, applicationId) => {
   }, applicationId);
   return true;
 };
-const clearCachedExtensions = applicationId => {
+const clearCachedExtensions = (applicationId, expected) => {
+  const current = get$7(applicationId);
+  if (expected !== undefined && current.cachedExtensions?.extensions !== expected) {
+    return;
+  }
   update({
     cachedExtensions: undefined
   }, applicationId);
 };
+const clearAllCachedExtensions = () => {
+  clearCachedExtensions();
+  for (const applicationId of applications$2.keys()) {
+    clearCachedExtensions(applicationId);
+  }
+};
 const getOrCreateWebExtensionsCache = extensionsState => {
   const existing = webExtensionsCaches.get(extensionsState);
   if (existing) {
@@ -747,7 +757,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     open: Open
   });
 };
-const create$c = async ({
+const create$d = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -784,7 +794,7 @@ const wrap = webSocket => {
 };
 const IpcParentWithWebSocket$1 = {
   __proto__: null,
-  create: create$c,
+  create: create$d,
   wrap
 };
 
@@ -1095,7 +1105,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$b = (message, result) => {
+const create$c = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -1104,7 +1114,7 @@ const create$b = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$b(message, resultProperty);
+  return create$c(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1203,7 +1213,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$a = (method, params) => {
+const create$b = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -1211,7 +1221,7 @@ const create$a = (method, params) => {
   };
 };
 
-const create$9 = (id, method, params) => {
+const create$a = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -1222,12 +1232,12 @@ const create$9 = (id, method, params) => {
 };
 
 let id = 0;
-const create$8 = () => {
+const create$9 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$8();
+  const id = create$9();
   const {
     promise,
     resolve
@@ -1244,7 +1254,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$9(id, method, params);
+  const message = create$a(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1280,7 +1290,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$a(method, params);
+      const message = create$b(method, params);
       ipc.send(message);
     }
   };
@@ -1351,7 +1361,7 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$7 = async ({
+const create$8 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1369,7 +1379,7 @@ const create$7 = async ({
   return rpc;
 };
 
-const create$6 = async ({
+const create$7 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1379,20 +1389,20 @@ const create$6 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$7({
+  return create$8({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
   });
 };
 
-const create$5 = async ({
+const create$6 = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$6({
+    return create$7({
       commandMap,
       isMessagePortOpen,
       send
@@ -1420,7 +1430,7 @@ const getProtocol = () => {
   return location.protocol;
 };
 
-const create$4 = async ({
+const create$5 = async ({
   commandMap,
   webSocket
 }) => {
@@ -1452,7 +1462,7 @@ const connect$1 = async ({
 }) => {
   const webSocket = new WebSocket(wsUrl);
   try {
-    const rpc = await create$4({
+    const rpc = await create$5({
       commandMap,
       webSocket
     });
@@ -1465,7 +1475,7 @@ const connect$1 = async ({
     throw error;
   }
 };
-const create$3 = async ({
+const create$4 = async ({
   commandMap,
   onClose,
   type
@@ -1494,7 +1504,7 @@ const create$3 = async ({
   return connection.rpc;
 };
 
-const create$2 = async ({
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   messagePort
@@ -1511,7 +1521,7 @@ const create$2 = async ({
   return rpc;
 };
 
-const create$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1568,7 +1578,7 @@ const remove$2 = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create = rpcId => {
+const create$1 = rpcId => {
   return {
     async dispose() {
       const rpc = get$5(rpcId);
@@ -1607,13 +1617,13 @@ const create = rpcId => {
 const {
   invoke: invoke$9,
   set: set$c
-} = create(6010);
+} = create$1(6010);
 
 const {
   invoke: invoke$8,
   invokeAndTransfer: invokeAndTransfer$2,
   set: set$b
-} = create(19_001);
+} = create$1(19_001);
 const getCacheStorageItem = async (request, cacheName, bucketName, bucketOptions) => {
   return invoke$8('Cache.getCacheStorageItem', request, cacheName, bucketName, bucketOptions);
 };
@@ -1627,12 +1637,12 @@ const setCacheStorageItem = async (request, value, cacheName, headers, bucketNam
 const {
   invoke: invoke$7,
   set: set$a
-} = create(ErrorWorker);
+} = create$1(ErrorWorker);
 
 const {
   invoke: invoke$6,
   set: set$9
-} = create(FileSystemWorker);
+} = create$1(FileSystemWorker);
 const readFile$1 = async uri => {
   return invoke$6('FileSystem.readFile', uri);
 };
@@ -1649,13 +1659,13 @@ const exists = async uri => {
 const {
   invoke: invoke$5,
   set: set$8
-} = create(MainProcess);
+} = create$1(MainProcess);
 
 const {
   invoke: invoke$4,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$7
-} = create(RendererWorker);
+} = create$1(RendererWorker);
 const sendMessagePortToAuthWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
@@ -1680,7 +1690,7 @@ const sendMessagePortToSharedProcess = async port => {
 const {
   invoke: invoke$3,
   set: set$6
-} = create(SharedProcess);
+} = create$1(SharedProcess);
 
 const extensions = Object.create(null);
 const get$4 = extensionId => {
@@ -2166,6 +2176,32 @@ const getExtensionsWithState = async (extensions, extensionsState, platform) =>
   } = await getWorkspaceExtensionEnablementSafe();
   return withDisabledState(extensionsWithDisabledState, workspaceDisabledIds, workspaceEnabledIds);
 };
+const getSharedProcessExtensions = (extensionsState, fields) => {
+  const current = get$7(extensionsState.applicationId);
+  const requestedFields = fields === undefined ? undefined : [...new Set([...fields, 'id', 'disabled'])];
+  const cached = current.cachedExtensions;
+  if (cached) {
+    const cachedFields = cached.fields;
+    if (cachedFields === undefined || requestedFields !== undefined && requestedFields.every(field => cachedFields.includes(field))) {
+      return cached.extensions;
+    }
+  }
+  const extensions = Promise.try(() => requestedFields === undefined ? invoke$3('ExtensionManagement.getAllExtensions') : invoke$3('ExtensionManagement.getAllExtensions', requestedFields));
+  update({
+    cachedExtensions: {
+      extensions,
+      fields: requestedFields
+    }
+  }, extensionsState.applicationId);
+  void extensions.catch(() => {
+    try {
+      clearCachedExtensions(extensionsState.applicationId, extensions);
+    } catch {
+      // The application may have been disposed while discovery was pending.
+    }
+  });
+  return extensions;
+};
 const getAllExtensionsWithState = async (extensionsState, assetDir, platform, fields) => {
   const {
     assetDir: resolvedAssetDir,
@@ -2187,7 +2223,7 @@ const getAllExtensionsWithState = async (extensionsState, assetDir, platform, fi
     const compatibleExtensions = [...webExtensions, ...meta].filter(extension => isExtensionCompatible(extension, resolvedPlatform));
     extensions = await getExtensionsWithState(compatibleExtensions, extensionsState, resolvedPlatform);
   } else {
-    const local = fields === undefined ? await invoke$3('ExtensionManagement.getAllExtensions') : await invoke$3('ExtensionManagement.getAllExtensions', [...new Set([...fields, 'id', 'disabled'])]);
+    const local = await getSharedProcessExtensions(extensionsState, fields);
     extensions = await getExtensionsWithState([...local, ...meta], extensionsState, resolvedPlatform);
   }
   if (fields === undefined) {
@@ -2452,7 +2488,7 @@ const fileSystemMethods = new Set(['readFile', 'readDirWithFileTypes', 'stat', '
 const createFileSystemPort = async (application, port, extensionId) => {
   const services = getServices(application);
   const version = extensionId === undefined ? 0 : services.extensionVersions.get(extensionId) || 0;
-  const rpc = await create$7({
+  const rpc = await create$8({
     commandMap: {},
     messagePort: port
   });
@@ -2476,7 +2512,7 @@ const createFileSystemPort = async (application, port, extensionId) => {
     throw error;
   }
 };
-const dispose = async application => {
+const dispose$1 = async application => {
   const services = applications$1.get(application.applicationGeneration);
   if (!services) return;
   applications$1.delete(application.applicationGeneration);
@@ -2806,6 +2842,69 @@ const createNodeRpcMessagePort = async (extensionId, rpcId, port) => {
   await invokeAndTransfer$1('ExtensionNodeRpc.createMessagePort', port, extensionId, rpcId);
 };
 
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+const registrations = new Map();
+const byId = new Map();
+const keyFor = (extensionId, clientId, application) => JSON.stringify([application?.applicationGeneration ?? null, extensionId, clientId]);
+const create = async (extensionId, clientId, options, application) => {
+  if (application) assertCurrentApplication(application);
+  if (!Number.isSafeInteger(clientId) || clientId < 1 || !Array.isArray(options?.roots) || options.roots.length === 0 || options.recursive !== undefined && typeof options.recursive !== 'boolean' || options.roots.some(uri => typeof uri !== 'string' || !uri.startsWith('file://')) || options.exclude !== undefined && (!Array.isArray(options.exclude) || options.exclude.some(name => typeof name !== 'string'))) {
+    throw new Error('File watchers require disk roots and a valid registration id');
+  }
+  // Application hosts can expose virtual disk paths through browser callbacks;
+  // a host-process watch would observe a different filesystem for those URIs.
+  if (application) throw new Error('Disk watchers are unavailable for application filesystem providers');
+  const key = keyFor(extensionId, clientId, application);
+  if (registrations.has(key)) throw new Error('File watcher is already registered');
+  const registration = {
+    application,
+    clientId,
+    disposed: false,
+    extensionId,
+    id: crypto.randomUUID()
+  };
+  registrations.set(key, registration);
+  byId.set(registration.id, registration);
+  try {
+    await invoke$2('FileWatcher.watchExtension', registration.id, {
+      ...(options.recursive === false && {
+        depth: 0
+      }),
+      exclude: options.exclude || [],
+      roots: options.roots
+    });
+    if (registrations.get(key) !== registration || registration.disposed) throw new Error('File watcher was disposed during registration');
+  } catch (error) {
+    await dispose(extensionId, clientId, application);
+    throw error;
+  }
+};
+const dispose = async (extensionId, clientId, application) => {
+  const key = keyFor(extensionId, clientId, application);
+  const registration = registrations.get(key);
+  if (!registration) return;
+  registration.disposed = true;
+  await invoke$2('FileWatcher.disposeExtension', registration.id);
+  registrations.delete(key);
+  byId.delete(registration.id);
+};
+const disposeOwner = async (extensionId, applicationId) => {
+  const owned = registrations.values().filter(registration => registration.extensionId === extensionId && registration.application?.applicationId === applicationId).toArray();
+  await Promise.all(owned.map(registration => dispose(extensionId, registration.clientId, registration.application)));
+};
+const handleEvent = async (id, event) => {
+  const registration = byId.get(id);
+  if (!registration || registration.disposed) return;
+  const {
+    application,
+    clientId,
+    extensionId
+  } = registration;
+  if (application) assertCurrentApplication(application);
+  const rpc = get$2(extensionId, application?.applicationId);
+  await rpc?.invoke('ExtensionApi.handleFileWatcherEvent', clientId, event);
+};
+
 const extensionIds = new Set();
 const applications = new Map();
 const register = (extensionId, applicationId) => {
@@ -3060,6 +3159,8 @@ const createExtensionCommandMap = (extensionId, invokeCommand = invokeGlobalComm
     // callback (notifications, secrets, file watchers, or privileged node ports).
     return {
       ...inheritedCommands,
+      'Extensions.createFileSystemWatcher': (clientId, options) => invokeCommand('Extensions.createFileSystemWatcher', clientId, options),
+      'Extensions.disposeFileSystemWatcher': clientId => invokeCommand('Extensions.disposeFileSystemWatcher', clientId),
       'Extensions.executeCommand': (id, ...args) => executeCommand$1(invokeCommand, id, ...args),
       'Extensions.getCacheFileHandle': name => invokeCommand('Extensions.getCacheFileHandle', name),
       'Extensions.registerFileChangeHandler': () => invokeCommand('Extensions.registerFileChangeHandler'),
@@ -3069,6 +3170,9 @@ const createExtensionCommandMap = (extensionId, invokeCommand = invokeGlobalComm
   }
   return {
     ...inheritedCommands,
+    'Extensions.createFileSystemWatcher'(clientId, options) {
+      return create(extensionId, clientId, options);
+    },
     'Extensions.createNodeRpcConnection'(rpcId) {
       return createNodeRpcConnection(extensionId, rpcId);
     },
@@ -3078,6 +3182,9 @@ const createExtensionCommandMap = (extensionId, invokeCommand = invokeGlobalComm
     'Extensions.deleteSecret'(key) {
       return deleteSecret(extensionId, key);
     },
+    'Extensions.disposeFileSystemWatcher'(clientId) {
+      return dispose(extensionId, clientId);
+    },
     'Extensions.executeCommand'(id, ...args) {
       return executeCommand$1(invokeCommand, id, ...args);
     },
@@ -3145,6 +3252,12 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, work
     if (method === 'Extensions.getCacheFileHandle') {
       return getCacheFileHandle(extensionId, args[0]);
     }
+    if (method === 'Extensions.createFileSystemWatcher') {
+      return create(extensionId, args[0], args[1], application);
+    }
+    if (method === 'Extensions.disposeFileSystemWatcher') {
+      return dispose(extensionId, args[0], application);
+    }
     if (method === 'Extensions.registerFileChangeHandler') {
       return register(extensionId, application.applicationId);
     }
@@ -3179,7 +3292,7 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, work
   return bindCommandMap(rpc, commandMap);
 };
 const createWorker = (extensionId, absolutePath, workerName, contentSecurityPolicy, application) => {
-  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, contentSecurityPolicy, create$6, invokeAndTransfer, application);
+  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, contentSecurityPolicy, create$7, invokeAndTransfer, application);
 };
 const createAndStoreRpc = async (extensionId, absolutePath, workerName, contentSecurityPolicy, create, application) => {
   try {
@@ -3414,6 +3527,7 @@ const activateByEvent = async (event, assetDir, platform, application) => {
 };
 
 const invalidateExtensionsCache = async (extensionId, disabled) => {
+  clearAllCachedExtensions();
   try {
     if (extensionId) {
       await invoke$4('ExtensionManagement.handleExtensionsCacheInvalidated', extensionId, disabled);
@@ -3534,20 +3648,16 @@ const disposeIsolatedExtensionHostWorker = async (extensionId, invoke = invoke$2
   unregister(extensionId);
   const rpc = remove$1(extensionId);
   if (!rpc) {
+    await disposeOwner(extensionId);
     return false;
   }
   resetExtensionActivation(extensionId);
   resetExtensionRuntimeState(extensionId);
-  try {
-    await invoke('LaunchIsolatedExtensionHostWorker.disposeIsolatedExtensionHostWorker', extensionId);
-  } catch {
-    // Older renderer workers only support disposing the extension RPC.
-  }
-  try {
-    await rpc.dispose();
-  } catch {
-    // The extension is already disabled and removed from state.
-  }
+  // Close all owned resources even if one backend fails during teardown.
+  const [watchers] = await Promise.allSettled([disposeOwner(extensionId), Promise.try(() => invoke('LaunchIsolatedExtensionHostWorker.disposeIsolatedExtensionHostWorker', extensionId)), Promise.try(() => rpc.dispose())]);
+  // Older renderers may not support worker disposal; watcher cleanup failures
+  // still need to remain visible so their registrations can be retried.
+  if (watchers.status === 'rejected') throw watchers.reason;
   return true;
 };
 
@@ -3662,7 +3772,7 @@ const disposeExtensionApplication = async applicationId => {
   clear$1(applicationId);
   resetAllExtensionActivations(application);
   reset(applicationId);
-  const results = await Promise.allSettled([dispose(application), ...runtimes.map(async ({
+  const results = await Promise.allSettled([dispose$1(application), ...runtimes.map(async ({
     id,
     rpc
   }) => {
@@ -5583,7 +5693,7 @@ const createWebViewIpc = async webView => {
     port1,
     port2
   } = getPortTuple();
-  const rpcPromise = create$2({
+  const rpcPromise = create$3({
     commandMap: {},
     isMessagePortOpen: false,
     messagePort: port2
@@ -5974,7 +6084,7 @@ const StatusBarWorker = 200;
 const NotificationCenterWorker = 201;
 
 const handleMessagePort = async (port, rpcId) => {
-  const rpc = await create$7({
+  const rpc = await create$8({
     commandMap: commandMapRef,
     messagePort: port
   });
@@ -5990,7 +6100,7 @@ const handleViewContextChange = async (uid, viewId, context) => {
 };
 
 const defaultDependencies$4 = {
-  createRpc: create$5,
+  createRpc: create$6,
   invokeRendererAndTransfer: invokeAndTransfer$1,
   setMainProcess: set$8
 };
@@ -6011,12 +6121,12 @@ const initializeMainProcess = async (platform, dependencies = defaultDependencie
 };
 
 const defaultDependencies$3 = {
-  createLegacyWebSocketRpc: create$3,
-  createTransferMessagePortRpc: create$6,
+  createLegacyWebSocketRpc: create$4,
+  createTransferMessagePortRpc: create$7,
   createWebSocket(url, protocols) {
     return new WebSocket(url, [...protocols]);
   },
-  createWebSocketRpc: create$4,
+  createWebSocketRpc: create$5,
   invokeRenderer: invoke$4,
   sendMessagePortToSharedProcess: sendMessagePortToSharedProcess,
   setSharedProcess: set$6
@@ -6578,6 +6688,7 @@ const commandMap = {
   'Extensions.getWorkspaceTransportUri': getWorkspaceTransportUri,
   'Extensions.handleData': handleData,
   'Extensions.handleFileChanges': handleFileChanges,
+  'Extensions.handleFileWatcherEvent': handleEvent,
   'Extensions.handleLinkedExtensionChange': handleLinkedExtensionChange,
   'Extensions.handleMessagePort': handleMessagePort,
   'Extensions.handleUncaughtExtensionError': handleUncaughtExtensionError,
@@ -6610,7 +6721,7 @@ const commandMap = {
 };
 
 const initializeAuthWorker = async () => {
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToAuthWorker(port, 0);
@@ -6620,7 +6731,7 @@ const initializeAuthWorker = async () => {
 };
 
 const initializeCacheWorker = async () => {
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToCacheWorker', port);
@@ -6630,7 +6741,7 @@ const initializeCacheWorker = async () => {
 };
 
 const initializeErrorWorker = async () => {
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToErrorWorker(port, 0);
@@ -6640,7 +6751,7 @@ const initializeErrorWorker = async () => {
 };
 
 const initializeFileSystemWorker = async () => {
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToFileSystemWorker$1(port, 0);
@@ -6650,7 +6761,7 @@ const initializeFileSystemWorker = async () => {
 };
 
 const initializeIframeWorker = async () => {
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: {},
     async send(port) {
       await sendMessagePortToIconThemeWorker(port, 0);
@@ -6660,7 +6771,7 @@ const initializeIframeWorker = async () => {
 };
 
 const initializeRendererWorker = async () => {
-  const rpc = await create$1({
+  const rpc = await create$2({
     commandMap: commandMap
   });
   set$7(rpc);

package/package.json

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