@lvce-editor/extension-management-worker 4.48.0 → 4.49.0

package/dist/extensionManagementWorkerMain.js

@@ -64,7 +64,7 @@ const Object$1 = 1;
 const Number = 2;
 const Array$1 = 3;
 const String$1 = 4;
-const Boolean$1 = 5;
+const Boolean = 5;
 const Function = 6;
 const Null = 7;
 const Unknown = 8;
@@ -85,7 +85,7 @@ const getType = value => {
       }
       return Object$1;
     case 'boolean':
-      return Boolean$1;
+      return Boolean;
     default:
       return Unknown;
   }
@@ -546,7 +546,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     open: Open
   });
 };
-const create$d = async ({
+const create$c = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -583,7 +583,7 @@ const wrap = webSocket => {
 };
 const IpcParentWithWebSocket$1 = {
   __proto__: null,
-  create: create$d,
+  create: create$c,
   wrap
 };
 
@@ -863,7 +863,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$c = (message, result) => {
+const create$b = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -872,7 +872,7 @@ const create$c = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$c(message, resultProperty);
+  return create$b(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -966,7 +966,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$b = (method, params) => {
+const create$a = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -974,7 +974,7 @@ const create$b = (method, params) => {
   };
 };
 
-const create$a = (id, method, params) => {
+const create$9 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -985,12 +985,12 @@ const create$a = (id, method, params) => {
 };
 
 let id = 0;
-const create$9 = () => {
+const create$8 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$9();
+  const id = create$8();
   const {
     promise,
     resolve
@@ -1007,7 +1007,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$a(id, method, params);
+  const message = create$9(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1043,7 +1043,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$b(method, params);
+      const message = create$a(method, params);
       ipc.send(message);
     }
   };
@@ -1083,7 +1083,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$8 = async ({
+const create$7 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1101,7 +1101,7 @@ const create$8 = async ({
   return rpc;
 };
 
-const create$7 = async ({
+const create$6 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1111,7 +1111,7 @@ const create$7 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$8({
+  return create$7({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -1146,13 +1146,13 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$6 = async ({
+const create$5 = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$7({
+    return create$6({
       commandMap,
       isMessagePortOpen,
       send
@@ -1180,7 +1180,7 @@ const getProtocol = () => {
   return location.protocol;
 };
 
-const create$5 = async ({
+const create$4 = async ({
   commandMap,
   webSocket
 }) => {
@@ -1212,7 +1212,7 @@ const connect = async ({
 }) => {
   const webSocket = new WebSocket(wsUrl);
   try {
-    const rpc = await create$5({
+    const rpc = await create$4({
       commandMap,
       webSocket
     });
@@ -1225,7 +1225,7 @@ const connect = async ({
     throw error;
   }
 };
-const create$4 = async ({
+const create$3 = async ({
   commandMap,
   onClose,
   type
@@ -1254,7 +1254,7 @@ const create$4 = async ({
   return connection.rpc;
 };
 
-const create$3 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen,
   messagePort
@@ -1271,7 +1271,7 @@ const create$3 = async ({
   return rpc;
 };
 
-const create$2 = async ({
+const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1303,7 +1303,7 @@ const createMockRpc = ({
 };
 
 const rpcs$2 = Object.create(null);
-const set$b = (id, rpc) => {
+const set$a = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
 const get$6 = id => {
@@ -1314,7 +1314,7 @@ const remove$2 = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$1 = rpcId => {
+const create = rpcId => {
   return {
     async dispose() {
       const rpc = get$6(rpcId);
@@ -1336,7 +1336,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$b(rpcId, mockRpc);
+      set$a(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$2(rpcId);
@@ -1345,15 +1345,15 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$b(rpcId, rpc);
+      set$a(rpcId, rpc);
     }
   };
 };
 
 const {
-  invoke: invoke$6,
-  set: set$a
-} = create$1(6010);
+  invoke: invoke$5,
+  set: set$9
+} = create(6010);
 
 const Web = 1;
 const Electron = 2;
@@ -1361,57 +1361,19 @@ const Remote = 3;
 const Test = 4;
 
 const ErrorWorker = 3308;
-const ExtensionHostWorker = 44;
 const FileSystemWorker = 209;
 const RendererWorker = 1;
 const SharedProcess = 1492;
 
 const {
-  invoke: invoke$5,
-  set: set$9
-} = create$1(ErrorWorker);
-
-const {
-  dispose,
-  invoke: invoke$4,
-  invokeAndTransfer: invokeAndTransfer$2,
-  registerMockRpc,
-  set: set$8
-} = create$1(ExtensionHostWorker);
-const executeReferenceProvider = async (id, offset) => {
-  // @ts-ignore
-  return invoke$4('ExtensionHostReference.executeReferenceProvider', id, offset);
-};
-const executeFileReferenceProvider = async id => {
-  // @ts-ignore
-  return invoke$4('ExtensionHostReference.executeFileReferenceProvider', id);
-};
-const getRuntimeStatus$2 = async extensionId => {
-  // @ts-ignore
-  return invoke$4('ExtensionHost.getRuntimeStatus', extensionId);
-};
-const getEnabledOutputProviderIds = async () => {
-  const channels = await invoke$4('Output.getEnabledProviders');
-  return channels;
-};
-
-const ExtensionHost = {
-  __proto__: null,
-  dispose,
-  executeFileReferenceProvider,
-  executeReferenceProvider,
-  getEnabledOutputProviderIds,
-  getRuntimeStatus: getRuntimeStatus$2,
   invoke: invoke$4,
-  invokeAndTransfer: invokeAndTransfer$2,
-  registerMockRpc,
   set: set$8
-};
+} = create(ErrorWorker);
 
 const {
   invoke: invoke$3,
   set: set$7
-} = create$1(FileSystemWorker);
+} = create(FileSystemWorker);
 const readFile$1 = async uri => {
   return invoke$3('FileSystem.readFile', uri);
 };
@@ -1429,7 +1391,7 @@ const {
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$6
-} = create$1(RendererWorker);
+} = create(RendererWorker);
 const sendMessagePortToAuthWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
@@ -1446,10 +1408,6 @@ const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
-const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
-};
 const sendMessagePortToSharedProcess = async port => {
   const command = 'HandleElectronMessagePort.handleElectronMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, 0);
@@ -1458,22 +1416,9 @@ const sendMessagePortToSharedProcess = async port => {
 const {
   invoke: invoke$1,
   set: set$5
-} = create$1(SharedProcess);
-
-const create = () => {
-  return {
-    finished: false
-  };
-};
-const cancel = token => {
-  token.finished = true;
-};
-const isCanceled = token => {
-  return token.finished;
-};
+} = create(SharedProcess);
 
 const None = 0;
-const Importing = 1;
 const Activating = 2;
 const Activated = 3;
 const Error$1 = 4;
@@ -1581,119 +1526,6 @@ const getErrorMessage = error => {
   return String(error);
 };
 
-const baseName = path => {
-  const slashIndex = path.lastIndexOf('/');
-  return path.slice(slashIndex + 1);
-};
-const getExtensionId$4 = extension => {
-  if (extension && extension.id) {
-    return extension.id;
-  }
-  if (extension && extension.path) {
-    return baseName(extension.path);
-  }
-  return '<unknown>';
-};
-
-const isImportErrorChrome = error => {
-  return Boolean(error && error instanceof Error && error.message.startsWith('Failed to fetch dynamically imported module'));
-};
-
-const isImportErrorFirefox = error => {
-  return Boolean(error && error instanceof TypeError && error.message === 'error loading dynamically imported module');
-};
-
-const isSyntaxError = error => {
-  return error instanceof SyntaxError;
-};
-
-const isImportError = error => {
-  return isImportErrorChrome(error) || isImportErrorFirefox(error) || isSyntaxError(error);
-};
-
-const sleep = duration => {
-  const {
-    promise,
-    resolve
-  } = Promise.withResolvers();
-  setTimeout(resolve, duration);
-  return promise;
-};
-
-const NotFound = 404;
-
-const tryToGetActualImportErrorMessage = async (url, error) => {
-  let response;
-  try {
-    response = await fetch(url);
-  } catch (error) {
-    return `Failed to import ${url}: ${error}`;
-  }
-  if (response.ok) {
-    return `Failed to import ${url}: ${error}`;
-  }
-  switch (response.status) {
-    case NotFound:
-      return `Failed to import ${url}: Not found (404)`;
-    default:
-      return `Failed to import ${url}: ${error}`;
-  }
-};
-
-// TODO make activation timeout configurable or remove it.
-// some extension might do workspace indexing which could take some time
-const activationTimeout = 10_000;
-const rejectAfterTimeout = async (timeout, token) => {
-  await sleep(timeout);
-  if (isCanceled(token)) {
-    return;
-  }
-  throw new Error(`Activation timeout of ${timeout}ms exceeded`);
-};
-const activate = async (extensionId, extension, extensionHost) => {
-  await extensionHost.invoke('ExtensionHost.activateExtension3', extensionId, extension);
-};
-const activateExtension2 = async (extensionId, extension, absolutePath, extensionHost = ExtensionHost) => {
-  string(extensionId);
-  object(extension);
-  string(absolutePath);
-  const token = create();
-  try {
-    const startTime = performance.now();
-    updateRuntimeStatus(extensionId, {
-      activationStartTime: startTime,
-      status: Activating
-    });
-    await Promise.race([activate(extensionId, extension, extensionHost), rejectAfterTimeout(activationTimeout, token)]);
-    const endTime = performance.now();
-    const time = endTime - startTime;
-    updateRuntimeStatus(extensionId, {
-      activationEndTime: endTime,
-      activationTime: time,
-      status: Activated
-    });
-  } catch (error) {
-    const id = getExtensionId$4(extension);
-    let activationError = error;
-    if (isImportError(error)) {
-      const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-      activationError = new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`, {
-        cause: error
-      });
-    }
-    updateRuntimeStatus(extensionId, {
-      error: getErrorMessage(activationError),
-      status: Error$1
-    });
-    if (activationError !== error) {
-      throw activationError;
-    }
-    throw new VError(activationError, `Failed to activate extension ${id}`);
-  } finally {
-    cancel(token);
-  }
-};
-
 const commandMapRef = {};
 
 const extensionIds = new Set();
@@ -1896,7 +1728,7 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, work
   return bindCommandMap(rpc, commandMap);
 };
 const createWorker = (extensionId, absolutePath, workerName, contentSecurityPolicy) => {
-  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, contentSecurityPolicy, create$7, invokeAndTransfer);
+  return createIsolatedExtensionHostWorker(extensionId, absolutePath, workerName, contentSecurityPolicy, create$6, invokeAndTransfer);
 };
 const createAndStoreRpc = async (extensionId, absolutePath, workerName, contentSecurityPolicy, create) => {
   const rpc = await create(extensionId, absolutePath, workerName, contentSecurityPolicy);
@@ -2009,48 +1841,6 @@ const handleRpcInfos = (extension, platform) => {
   }
 };
 
-const importExtension = async (extensionId, absolutePath, activationEvent, extensionHost = ExtensionHost) => {
-  try {
-    string(absolutePath);
-    const startTime = performance.now();
-    setRuntimeStatus({
-      activationEndTime: 0,
-      activationEvent: activationEvent,
-      activationStartTime: performance.now(),
-      activationTime: 0,
-      id: extensionId,
-      importEndTime: 0,
-      importStartTime: startTime,
-      importTime: 0,
-      status: Importing
-    });
-    try {
-      await extensionHost.invoke('ExtensionHost.importExtension2', extensionId, absolutePath);
-      const endTime = performance.now();
-      const time = endTime - startTime;
-      updateRuntimeStatus(extensionId, {
-        importEndTime: endTime,
-        importTime: time
-      });
-    } catch (error) {
-      let importError = error;
-      if (isImportError(error)) {
-        const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-        importError = new Error(actualErrorMessage, {
-          cause: error
-        });
-      }
-      updateRuntimeStatus(extensionId, {
-        error: getErrorMessage(importError),
-        status: Error$1
-      });
-      throw importError;
-    }
-  } catch (error) {
-    throw new VError(error, `Failed to import extension ${extensionId}`);
-  }
-};
-
 const NewLine = '\n';
 const Slash = '/';
 
@@ -2064,15 +1854,13 @@ const isExtensionIsolated = extension => {
 };
 
 const activateExtension3 = async (extension, absolutePath, activationEvent, platform) => {
-  handleRpcInfos(extension, platform);
   const extensionId = extension.id || interExtensionId(extension.uri);
-  if (isExtensionIsolated(extension)) {
-    const contentSecurityPolicy = getContentSecurityPolicy(extension.contentSecurityPolicy);
-    await activateIsolatedExtension(extensionId, absolutePath, extension.workerName || '', contentSecurityPolicy, activationEvent);
-    return;
+  if (!isExtensionIsolated(extension)) {
+    throw new Error(`Extension ${extensionId} does not use the isolated extension API`);
   }
-  await importExtension(extensionId, absolutePath, activationEvent);
-  await activateExtension2(extensionId, extension, absolutePath);
+  handleRpcInfos(extension, platform);
+  const contentSecurityPolicy = getContentSecurityPolicy(extension.contentSecurityPolicy);
+  await activateIsolatedExtension(extensionId, absolutePath, extension.workerName || '', contentSecurityPolicy, activationEvent);
 };
 
 const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, origin, platform, assetDir) => {
@@ -3409,7 +3197,7 @@ const saveViewInstanceState = async (viewId, uid, assetDir, platform) => {
 };
 
 const getAccessToken = (options = {}) => {
-  return invoke$6('Auth.getAccessToken', options);
+  return invoke$5('Auth.getAccessToken', options);
 };
 
 const transparent = (color, factor) => {
@@ -3715,7 +3503,7 @@ const createWebViewIpc = async webView => {
     port1,
     port2
   } = getPortTuple();
-  const rpcPromise = create$3({
+  const rpcPromise = create$2({
     commandMap: {},
     isMessagePortOpen: false,
     messagePort: port2
@@ -3810,6 +3598,15 @@ const getRunningExtensionsFromState = (extensions, runtimeStatuses, assetDir, pl
   }).toSorted((a, b) => b.activationTime - a.activationTime);
 };
 
+const sleep = duration => {
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  setTimeout(resolve, duration);
+  return promise;
+};
+
 const invokePing = async rpc => {
   try {
     await rpc.invoke('ExtensionApi.ping');
@@ -3987,7 +3784,7 @@ const handleFileChanges = async (changes = {}) => {
 };
 
 const handleMessagePort = async (port, rpcId) => {
-  await create$8({
+  await create$7({
     commandMap: commandMapRef,
     messagePort: port
   });
@@ -3995,8 +3792,8 @@ const handleMessagePort = async (port, rpcId) => {
 
 const prefix = '[Extension] Uncaught Error: ';
 const handleUncaughtExtensionError = async error => {
-  const prettyError = await invoke$5('Errors.prepare', error);
-  await invoke$5('Errors.print', prettyError, prefix);
+  const prettyError = await invoke$4('Errors.prepare', error);
+  await invoke$4('Errors.print', prettyError, prefix);
 };
 
 const handleViewContextChange = async (uid, viewId, context) => {
@@ -4004,14 +3801,14 @@ const handleViewContextChange = async (uid, viewId, context) => {
 };
 
 const getRpcRemote = async () => {
-  const rpc = await create$4({
+  const rpc = await create$3({
     commandMap: commandMapRef,
     type: 'shared-process'
   });
   return rpc;
 };
 const getRpcElectron = async () => {
-  const rpc = create$7({
+  const rpc = create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToSharedProcess(port);
@@ -4138,8 +3935,6 @@ const wrapCommand = command => {
 const commandMap = {
   'ExtensionApi.readFile': readFile,
   'ExtensionHostQuickPick.showQuickPick': showQuickPick,
-  'Extensions.activate2': activateExtension2,
-  'Extensions.activate3': activateExtension3,
   'Extensions.activateByEvent': activateByEvent,
   'Extensions.addExtension': addExtension,
   'Extensions.addWebExtension': addWebExtension,
@@ -4196,7 +3991,6 @@ const commandMap = {
   'Extensions.handleMessagePort': handleMessagePort,
   'Extensions.handleUncaughtExtensionError': handleUncaughtExtensionError,
   'Extensions.handleViewContextChange': handleViewContextChange,
-  'Extensions.importExtension': importExtension,
   'Extensions.initialize': initialize,
   'Extensions.install': installExtension,
   'Extensions.invalidateExtensionsCache': invalidateExtensionsCache,
@@ -4212,37 +4006,27 @@ const commandMap = {
 };
 
 const initializeAuthWorker = async () => {
-  const rpc = await create$6({
+  const rpc = await create$5({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToAuthWorker(port, 0);
     }
   });
-  set$a(rpc);
+  set$9(rpc);
 };
 
 const initializeErrorWorker = async () => {
-  const rpc = await create$6({
+  const rpc = await create$5({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToErrorWorker(port, 0);
     }
   });
-  set$9(rpc);
-};
-
-const initializeExtensionHostWorker = async () => {
-  const rpc = await create$6({
-    commandMap: commandMapRef,
-    async send(port) {
-      await sendMessagePortToExtensionHostWorker(port, 0);
-    }
-  });
   set$8(rpc);
 };
 
 const initializeFileSystemWorker = async () => {
-  const rpc = await create$6({
+  const rpc = await create$5({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToFileSystemWorker$1(port, 0);
@@ -4252,7 +4036,7 @@ const initializeFileSystemWorker = async () => {
 };
 
 const initializeIframeWorker = async () => {
-  const rpc = await create$6({
+  const rpc = await create$5({
     commandMap: {},
     async send(port) {
       await sendMessagePortToIconThemeWorker(port, 0);
@@ -4262,7 +4046,7 @@ const initializeIframeWorker = async () => {
 };
 
 const initializeRendererWorker = async () => {
-  const rpc = await create$2({
+  const rpc = await create$1({
     commandMap: commandMap
   });
   set$6(rpc);
@@ -4270,7 +4054,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
-  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker()]);
 };
 
 const main = async () => {

package/package.json

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