@lvce-editor/extension-host-worker 5.17.0 → 5.18.0

package/dist/extensionHostWorkerMain.js

@@ -1749,11 +1749,11 @@ const remove$3 = id => {
   delete callbacks[id];
 };
 let id$1 = 0;
-const create$3$1 = () => {
+const create$3$2 = () => {
   return ++id$1;
 };
 const registerPromise = () => {
-  const id = create$3$1();
+  const id = create$3$2();
   const {
     resolve,
     promise
@@ -1838,7 +1838,8 @@ const splitLines$1 = lines => {
   return lines.split(NewLine$1);
 };
 const getCurrentStack = () => {
-  const currentStack = joinLines(splitLines$1(new Error().stack || '').slice(2));
+  const stackLinesToSkip = 3;
+  const currentStack = joinLines(splitLines$1(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
 const getNewLineIndex = (string, startIndex = undefined) => {
@@ -2098,7 +2099,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
+const send$1 = (transport, method, ...params) => {
   const message = create$4$2(method, params);
   transport.send(message);
 };
@@ -2109,6 +2110,12 @@ const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
 const commands = Object.create(null);
 const register$1 = commandMap => {
   Object.assign(commands, commandMap);
@@ -2119,7 +2126,7 @@ const getCommand = key => {
 const execute = (command, ...args) => {
   const fn = getCommand(command);
   if (!fn) {
-    throw new Error(`command not found ${command}`);
+    throw new CommandNotFoundError(command);
   }
   return fn(...args);
 };
@@ -2132,7 +2139,7 @@ const createRpc$1 = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
+      send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
       return invoke$1(ipc, method, ...params);
@@ -2176,7 +2183,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$e = async ({
+const create$f = async ({
   commandMap,
   messagePort
 }) => {
@@ -2191,9 +2198,9 @@ const create$e = async ({
 };
 const MessagePortRpcClient = {
   __proto__: null,
-  create: create$e
+  create: create$f
 };
-const create$d = async ({
+const create$e = async ({
   commandMap,
   messagePort,
   isMessagePortOpen
@@ -2211,7 +2218,7 @@ const create$d = async ({
 };
 const MessagePortRpcParent = {
   __proto__: null,
-  create: create$d
+  create: create$e
 };
 const create$5$1 = async ({
   commandMap,
@@ -2242,6 +2249,24 @@ const PlainMessagePortRpcParent = {
   __proto__: null,
   create: create$4$1
 };
+const create$3$1 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5$1({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3$1
+};
 const create$2$1 = async ({
   commandMap,
   webSocket
@@ -2492,6 +2517,54 @@ const createNodeRpc = async ({
   }
 };
 
+const send = async port => {
+  await invokeAndTransfer$2('SendMessagePortToExtensionHostWorker.SendMessagePortToFileSystemWorker', port);
+};
+const launchFileSystemProcess = async () => {
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    send
+  });
+  return rpc;
+};
+
+let fileSystemWorkerPromise;
+const getOrCreateRpc$1 = async () => {
+  if (!fileSystemWorkerPromise) {
+    fileSystemWorkerPromise = launchFileSystemProcess();
+  }
+  return fileSystemWorkerPromise;
+};
+const append = async (uri, content) => {
+  const rpc = await getOrCreateRpc$1();
+  await rpc.invoke('FileSystem.appendFile', uri, content);
+};
+
+const providers = Object.create(null);
+const registerOutputChannel = provider => {
+  providers[provider.id] = provider;
+  const uri = `output://${provider.id}`;
+  return {
+    async append(text) {
+      await append(uri, text);
+    },
+    getUri() {
+      return uri;
+    }
+  };
+};
+const getEnabledProviders = () => {
+  const values = Object.values(providers);
+  const enabledProviders = [];
+  for (const provider of values) {
+    enabledProviders.push({
+      id: provider.id,
+      label: provider.label
+    });
+  }
+  return enabledProviders;
+};
+
 const confirm = message => {
   string(message);
   const result = invoke$2('ConfirmPrompt.prompt', message);
@@ -3124,6 +3197,8 @@ const api = {
   // Implementation
   registerImplementationProvider: registerImplementationProvider,
   executeImplementationProvider: executeImplementationProvider,
+  // Output
+  registerOutputChannel: registerOutputChannel,
   // Prompt
   confirm: confirm,
   // QuickPick
@@ -3283,6 +3358,22 @@ const getExtensionId = extension => {
   return '<unknown>';
 };
 
+const isImportErrorChrome = error => {
+  return error && error instanceof Error && error.message.startsWith('Failed to fetch dynamically imported module');
+};
+
+const isImportErrorFirefox = error => {
+  return 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 states = Object.create(null);
 const set$5 = status => {
   states[status.id] = status;
@@ -3312,108 +3403,6 @@ const sleep = duration => {
   return promise;
 };
 
-// TODO make activation timeout configurable or remove it.
-// some extension might do workspace indexing which could take some time
-const activationTimeout$1 = 10_000;
-const rejectAfterTimeout$1 = async (timeout, token) => {
-  await sleep(timeout);
-  if (isCanceled(token)) {
-    return;
-  }
-  throw new Error(`Activation timeout of ${timeout}ms exceeded`);
-};
-
-// TODO separate importing extension and activating extension for smaller functions
-// and better error handling
-const activateExtension2 = async (extensionId, extension) => {
-  const token = create$1();
-  try {
-    const startTime = performance.now();
-    update(extensionId, {
-      status: Activating,
-      activationStartTime: startTime
-    });
-    const module = acquire(extensionId);
-    await Promise.race([module.activate(extension), rejectAfterTimeout$1(activationTimeout$1, token)]);
-    const endTime = performance.now();
-    const time = endTime - startTime;
-    update(extensionId, {
-      status: Activated,
-      activationTime: time,
-      activationEndTime: endTime
-    });
-  } catch (error) {
-    update(extensionId, {
-      status: Error$1 // TODO maybe store error also in runtime status state
-    });
-    const id = getExtensionId(extension);
-    throw new VError(error, `Failed to activate extension ${id}`);
-  } finally {
-    cancel(token);
-  }
-};
-
-const getUrlPrefix = (platform, extensionPath) => {
-  if (extensionPath.startsWith('http://') || extensionPath.startsWith('https://')) {
-    return extensionPath;
-  }
-  if (platform === Web) {
-    return extensionPath;
-  }
-  if (extensionPath.startsWith('/')) {
-    return `/remote${extensionPath}`;
-  }
-  return `/remote/${extensionPath}`;
-};
-
-const handleRpcInfos = (extension, platform) => {
-  try {
-    if (!extension) {
-      return;
-    }
-    const rpcs = extension.rpc;
-    const urlPrefix = getUrlPrefix(platform, extension.path);
-    if (!rpcs) {
-      return;
-    }
-    if (!Array.isArray(rpcs)) {
-      return;
-    }
-    for (const rpc of rpcs) {
-      rpc.url = `${urlPrefix}/${rpc.url}`;
-      add$1(rpc.id, rpc);
-    }
-  } catch (error) {
-    console.warn(`Failed to handle extension rpcs: ${error}`);
-  }
-};
-
-class ContentSecurityPolicyError extends Error {
-  constructor(violatedDirective, sourceFile, lineNumber, columnNumber) {
-    super(`Content Security Policy Violation: ${violatedDirective}`);
-    this.name = 'ContentSecurityPolicyError';
-    this.stack = sourceFile ? `Content Security Policy Violation
-    at ${sourceFile}:${lineNumber}:${columnNumber}` : `Content Security Policy Violation
-    at <unknown>`;
-  }
-}
-
-const isImportErrorChrome = error => {
-  return error && error instanceof Error && error.message.startsWith('Failed to fetch dynamically imported module');
-};
-
-const isImportErrorFirefox = error => {
-  return 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 NotFound = 404;
 
 const RE_LINE_COLUMN = /(.*)(?:\(\d+:\d+\))/;
@@ -3465,6 +3454,16 @@ const parse = async (code, options) => {
 
 const Module = 'module';
 
+class ContentSecurityPolicyError extends Error {
+  constructor(violatedDirective, sourceFile, lineNumber, columnNumber) {
+    super(`Content Security Policy Violation: ${violatedDirective}`);
+    this.name = 'ContentSecurityPolicyError';
+    this.stack = sourceFile ? `Content Security Policy Violation
+    at ${sourceFile}:${lineNumber}:${columnNumber}` : `Content Security Policy Violation
+    at <unknown>`;
+  }
+}
+
 const getLineAndColumn = (text, start, end) => {
   let index = -1;
   let line = 0;
@@ -3722,6 +3721,83 @@ const tryToGetActualImportErrorMessage = async (url, error) => {
   }
 };
 
+// TODO make activation timeout configurable or remove it.
+// some extension might do workspace indexing which could take some time
+const activationTimeout$1 = 10_000;
+const rejectAfterTimeout$1 = async (timeout, token) => {
+  await sleep(timeout);
+  if (isCanceled(token)) {
+    return;
+  }
+  throw new Error(`Activation timeout of ${timeout}ms exceeded`);
+};
+const activateExtension2 = async (extensionId, extension, absolutePath) => {
+  const token = create$1();
+  try {
+    const startTime = performance.now();
+    update(extensionId, {
+      status: Activating,
+      activationStartTime: startTime
+    });
+    const module = acquire(extensionId);
+    await Promise.race([module.activate(extension), rejectAfterTimeout$1(activationTimeout$1, token)]);
+    const endTime = performance.now();
+    const time = endTime - startTime;
+    update(extensionId, {
+      status: Activated,
+      activationTime: time,
+      activationEndTime: endTime
+    });
+  } catch (error) {
+    const id = getExtensionId(extension);
+    if (isImportError(error)) {
+      const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
+      throw new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`);
+    }
+    update(extensionId, {
+      status: Error$1 // TODO maybe store error also in runtime status state
+    });
+    throw new VError(error, `Failed to activate extension ${id}`);
+  } finally {
+    cancel(token);
+  }
+};
+
+const getUrlPrefix = (platform, extensionPath) => {
+  if (extensionPath.startsWith('http://') || extensionPath.startsWith('https://')) {
+    return extensionPath;
+  }
+  if (platform === Web) {
+    return extensionPath;
+  }
+  if (extensionPath.startsWith('/')) {
+    return `/remote${extensionPath}`;
+  }
+  return `/remote/${extensionPath}`;
+};
+
+const handleRpcInfos = (extension, platform) => {
+  try {
+    if (!extension) {
+      return;
+    }
+    const rpcs = extension.rpc;
+    const urlPrefix = getUrlPrefix(platform, extension.path);
+    if (!rpcs) {
+      return;
+    }
+    if (!Array.isArray(rpcs)) {
+      return;
+    }
+    for (const rpc of rpcs) {
+      rpc.url = `${urlPrefix}/${rpc.url}`;
+      add$1(rpc.id, rpc);
+    }
+  } catch (error) {
+    console.warn(`Failed to handle extension rpcs: ${error}`);
+  }
+};
+
 const importScript = async url => {
   try {
     return await import(url);
@@ -5948,6 +6024,7 @@ const commandMap = {
   'IndexedDb.saveValue': saveValue,
   'IndexedDb.set': set$3,
   'Languages.getLanguages': getLanguages,
+  'Output.getEnabledProviders': getEnabledProviders,
   'SaveState.saveState': saveState,
   'SearchFileWithFetch.searchFileWithFetch': searchFile$2,
   'SearchFileWithHtml.searchFileWithHtml': searchFile$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "5.17.0",
+  "version": "5.18.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"