@lvce-editor/extension-management-worker 3.1.0 → 3.3.0

package/dist/extensionManagementWorkerMain.js

@@ -1,58 +1,6 @@
-const normalizeLine = line => {
-  if (line.startsWith('Error: ')) {
-    return line.slice('Error: '.length);
-  }
-  if (line.startsWith('VError: ')) {
-    return line.slice('VError: '.length);
-  }
-  return line;
-};
-const getCombinedMessage = (error, message) => {
-  const stringifiedError = normalizeLine(`${error}`);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
-  }
-  return stringifiedError;
-};
-const NewLine$3 = '\n';
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$3, startIndex);
-};
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex$1(parent);
-  const childNewLineIndex = getNewLineIndex$1(child);
-  if (childNewLineIndex === -1) {
-    return parent;
-  }
-  const parentFirstLine = parent.slice(0, parentNewLineIndex);
-  const childRest = child.slice(childNewLineIndex);
-  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest;
-  }
-  return child;
+const activateByEvent = async () => {
+  // TODO
 };
-class VError extends Error {
-  constructor(error, message) {
-    const combinedMessage = getCombinedMessage(error, message);
-    super(combinedMessage);
-    this.name = 'VError';
-    if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack);
-    }
-    if (error.codeFrame) {
-      // @ts-ignore
-      this.codeFrame = error.codeFrame;
-    }
-    if (error.code) {
-      // @ts-ignore
-      this.code = error.code;
-    }
-  }
-}
 
 class AssertionError extends Error {
   constructor(message) {
@@ -109,6 +57,62 @@ const string = value => {
   }
 };
 
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
+  }
+  return line;
+};
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
+  }
+  return stringifiedError;
+};
+const NewLine$3 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$3, startIndex);
+};
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
+  }
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
+  }
+  const parentFirstLine = parent.slice(0, parentNewLineIndex);
+  const childRest = child.slice(childNewLineIndex);
+  const childFirstLine = normalizeLine(child.slice(0, childNewLineIndex));
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest;
+  }
+  return child;
+};
+class VError extends Error {
+  constructor(error, message) {
+    const combinedMessage = getCombinedMessage(error, message);
+    super(combinedMessage);
+    this.name = 'VError';
+    if (error instanceof Error) {
+      this.stack = mergeStacks(this.stack, error.stack);
+    }
+    if (error.codeFrame) {
+      // @ts-ignore
+      this.codeFrame = error.codeFrame;
+    }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
+    }
+  }
+}
+
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -540,7 +544,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     open: Open
   });
 };
-const create$c = async ({
+const create$d = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -577,7 +581,7 @@ const wrap = webSocket => {
 };
 const IpcParentWithWebSocket$1 = {
   __proto__: null,
-  create: create$c,
+  create: create$d,
   wrap
 };
 
@@ -816,7 +820,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,
@@ -825,7 +829,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 {
@@ -919,7 +923,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$a = (method, params) => {
+const create$b = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -927,7 +931,7 @@ const create$a = (method, params) => {
   };
 };
 
-const create$9 = (id, method, params) => {
+const create$a = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -938,12 +942,12 @@ const create$9 = (id, method, params) => {
 };
 
 let id$1 = 0;
-const create$8 = () => {
+const create$9 = () => {
   return ++id$1;
 };
 
 const registerPromise = map => {
-  const id = create$8();
+  const id = create$9();
   const {
     promise,
     resolve
@@ -960,7 +964,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 {
@@ -996,7 +1000,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$a(method, params);
+      const message = create$b(method, params);
       ipc.send(message);
     }
   };
@@ -1036,7 +1040,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$7 = async ({
+const create$8 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1054,7 +1058,7 @@ const create$7 = async ({
   return rpc;
 };
 
-const create$6 = async ({
+const create$7 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1064,13 +1068,55 @@ const create$6 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$7({
+  return create$8({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
   });
 };
 
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
+const create$6 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$7({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+
 const Https = 'https:';
 const Ws = 'ws:';
 const Wss = 'wss:';
@@ -1251,6 +1297,10 @@ const {
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$4
 } = create$1(RendererWorker);
+const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
+  const command = 'IconTheme.handleMessagePort';
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+};
 const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
@@ -1513,10 +1563,15 @@ const state$1 = {
 const push = extension => {
   state$1.webExtensions.push(extension);
 };
+const hasUri = uri => {
+  return state$1.webExtensions.some(extension => extension.uri === uri);
+};
 const get$2 = () => {
   return state$1.webExtensions;
 };
 
+// TODO store one kind of ui state for whole extension management worker
+
 const cache = Object.create(null);
 const id = 1;
 const clear = () => {
@@ -1556,6 +1611,9 @@ const getWebManifestPath = path => {
 };
 
 const addWebExtension = async path => {
+  if (hasUri(path)) {
+    return undefined;
+  }
   const manifestPath = getWebManifestPath(path);
   const manifest = await getWebExtensionManifest(path, manifestPath);
   // TODO avoid mutation if possible
@@ -2125,49 +2183,35 @@ const getRuntimeStatus = extensionId => {
 const commandMapRef = {};
 
 const handleMessagePort = async port => {
-  await create$7({
+  await create$8({
     commandMap: commandMapRef,
     messagePort: port
   });
 };
 
-const initializeExtensionHostWorker = async () => {
-  const rpc = await create$6({
+const getRpcRemote = async () => {
+  const rpc = await create$4({
     commandMap: commandMapRef,
-    async send(port) {
-      await sendMessagePortToExtensionHostWorker(port, 0);
-    }
+    type: 'shared-process'
   });
-  set$6(rpc);
+  return rpc;
 };
-
-const initializeFileSystemWorker = async () => {
-  const rpc = await create$6({
+const getRpcElectron = async () => {
+  const rpc = create$7({
     commandMap: commandMapRef,
     async send(port) {
-      await sendMessagePortToFileSystemWorker(port, 0);
+      await sendMessagePortToSharedProcess(port);
     }
   });
-  set$5(rpc);
+  return rpc;
 };
-
 const getRpc = async platform => {
   // TODO create connection to shared process
   if (platform === Remote) {
-    const rpc = await create$4({
-      commandMap: commandMapRef,
-      type: 'shared-process'
-    });
-    return rpc;
+    return getRpcRemote();
   }
   if (platform === Electron) {
-    const rpc = create$6({
-      commandMap: commandMapRef,
-      async send(port) {
-        await sendMessagePortToSharedProcess(port);
-      }
-    });
-    return rpc;
+    return getRpcElectron();
   }
   return undefined;
 };
@@ -2182,7 +2226,7 @@ const initialize = async platform => {
   update({
     platform
   });
-  await Promise.all([initializeFileSystemWorker(), initializeSharedProcess(platform), initializeExtensionHostWorker()]);
+  await initializeSharedProcess(platform);
 };
 
 const installExtension = async () => {
@@ -2249,6 +2293,7 @@ const uninstallExtension = async () => {
 const commandMap = {
   'Extensions.activate2': activateExtension2,
   'Extensions.activate3': activateExtension3,
+  'Extensions.activateByEvent': activateByEvent,
   'Extensions.addWebExtension': addWebExtension,
   'Extensions.createWebViewWorkerRpc': createWebViewWorkerRpc,
   'Extensions.createWebViewWorkerRpc2': createWebViewWorkerRpc2,
@@ -2275,14 +2320,48 @@ const commandMap = {
   'Extensions.uninstall': uninstallExtension
 };
 
-const listen = async () => {
-  Object.assign(commandMapRef, commandMap);
+const initializeExtensionHostWorker = async () => {
+  const rpc = await create$6({
+    commandMap: commandMapRef,
+    async send(port) {
+      await sendMessagePortToExtensionHostWorker(port, 0);
+    }
+  });
+  set$6(rpc);
+};
+
+const initializeFileSystemWorker = async () => {
+  const rpc = await create$6({
+    commandMap: commandMapRef,
+    async send(port) {
+      await sendMessagePortToFileSystemWorker(port, 0);
+    }
+  });
+  set$5(rpc);
+};
+
+const initializeIframeWorker = async () => {
+  const rpc = await create$6({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToIconThemeWorker(port, 0);
+    }
+  });
+  return rpc;
+};
+
+const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
   set$4(rpc);
 };
 
+const listen = async () => {
+  Object.assign(commandMapRef, commandMap);
+  await Promise.all([initializeRendererWorker(), initializeFileSystemWorker(), initializeIframeWorker(), initializeExtensionHostWorker()]);
+};
+
 const main = async () => {
   await listen();
 };

package/package.json

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