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

package/dist/extensionManagementWorkerMain.js

@@ -540,7 +540,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     open: Open
   });
 };
-const create$6 = async ({
+const create$c = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -577,13 +577,34 @@ const wrap = webSocket => {
 };
 const IpcParentWithWebSocket$1 = {
   __proto__: null,
-  create: create$6,
+  create: create$c,
   wrap
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$5 = id => {
+const get$6 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -605,12 +626,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -732,7 +753,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$5(id);
+  const fn = get$6(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -766,27 +787,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -795,27 +816,27 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$4 = (message, result) => {
+const create$b = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$4(message, resultProperty);
+  return create$b(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -845,35 +866,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -896,36 +917,17 @@ const handleJsonRpcMessage = async (...args) => {
   throw new JsonRpcError('unexpected message');
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$t = (method, params) => {
+
+const create$a = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$9 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -934,15 +936,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id$1 = 0;
-const create$r = () => {
+const create$8 = () => {
   return ++id$1;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$8();
   const {
     promise,
     resolve
@@ -954,13 +955,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$9(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -996,12 +996,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$a(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -1016,6 +1017,7 @@ const handleMessage = event => {
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -1024,6 +1026,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -1032,23 +1035,63 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+
+const create$7 = async ({
+  commandMap,
+  isMessagePortOpen = true,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    isMessagePortOpen,
+    messagePort
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
+
+const create$6 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$7({
+    commandMap,
+    isMessagePortOpen,
+    messagePort: port2
+  });
+};
+
 const Https = 'https:';
 const Ws = 'ws:';
 const Wss = 'wss:';
+
 const getWebSocketProtocol = locationProtocol => {
   return locationProtocol === Https ? Wss : Ws;
 };
+
 const getWebSocketUrl = (type, host, locationProtocol) => {
   const wsProtocol = getWebSocketProtocol(locationProtocol);
   return `${wsProtocol}//${host}/websocket/${type}`;
 };
+
 const getHost = () => {
   return location.host;
 };
 const getProtocol = () => {
   return location.protocol;
 };
-const create$i = async ({
+
+const create$5 = async ({
   commandMap,
   webSocket
 }) => {
@@ -1062,7 +1105,8 @@ const create$i = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const create$h = async ({
+
+const create$4 = async ({
   commandMap,
   type
 }) => {
@@ -1070,17 +1114,14 @@ const create$h = async ({
   const protocol = getProtocol();
   const wsUrl = getWebSocketUrl(type, host, protocol);
   const webSocket = new WebSocket(wsUrl);
-  const rpc = await create$i({
+  const rpc = await create$5({
     commandMap,
     webSocket
   });
   return rpc;
 };
-const WebSocketRpcParent2 = {
-  __proto__: null,
-  create: create$h
-};
-const create$e = async ({
+
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   messagePort
@@ -1096,51 +1137,7 @@ const create$e = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const MessagePortRpcParent = {
-  __proto__: null,
-  create: create$e
-};
-const create$5 = async ({
-  commandMap,
-  isMessagePortOpen = true,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    isMessagePortOpen,
-    messagePort
-  });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  messagePort.start();
-  return rpc;
-};
-const PlainMessagePortRpc = {
-  __proto__: null,
-  create: create$5
-};
-const create$3 = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  await send(port1);
-  return create$5({
-    commandMap,
-    isMessagePortOpen,
-    messagePort: port2
-  });
-};
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$3
-};
+
 const create$2 = async ({
   commandMap
 }) => {
@@ -1151,10 +1148,7 @@ const create$2 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2
-};
+
 const createMockRpc = ({
   commandMap
 }) => {
@@ -1175,21 +1169,11 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Web = 1;
-const Electron = 2;
-const Remote = 3;
-const Test = 4;
-
-const ExtensionHostWorker = 44;
-const FileSystemWorker = 209;
-const RendererWorker = 1;
-const SharedProcess = 1492;
-
 const rpcs$1 = Object.create(null);
 const set$7 = (id, rpc) => {
   rpcs$1[id] = rpc;
 };
-const get$4 = id => {
+const get$5 = id => {
   return rpcs$1[id];
 };
 const remove = id => {
@@ -1200,18 +1184,18 @@ const remove = id => {
 const create$1 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$4(rpcId);
+      const rpc = get$5(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1233,6 +1217,16 @@ const create$1 = rpcId => {
   };
 };
 
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+const Test = 4;
+
+const ExtensionHostWorker = 44;
+const FileSystemWorker = 209;
+const RendererWorker = 1;
+const SharedProcess = 1492;
+
 const {
   invoke: invoke$4,
   set: set$6
@@ -1259,7 +1253,6 @@ const {
 } = create$1(RendererWorker);
 const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
-  // @ts-ignore
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
 const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
@@ -1268,7 +1261,6 @@ const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
 };
 const sendMessagePortToSharedProcess = async port => {
   const command = 'HandleElectronMessagePort.handleElectronMessagePort';
-  // @ts-ignore
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, 0);
 };
 
@@ -1323,7 +1315,7 @@ const states = Object.create(null);
 const set$2 = status => {
   states[status.id] = status;
 };
-const get$3 = extensionId => {
+const get$4 = extensionId => {
   return states[extensionId];
 };
 const update$1 = (id, update) => {
@@ -1404,7 +1396,9 @@ const activateExtension2 = async (extensionId, extension, absolutePath) => {
     const id = getExtensionId(extension);
     if (isImportError(error)) {
       const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-      throw new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`);
+      throw new Error(`Failed to activate extension ${id}: ${actualErrorMessage}`, {
+        cause: error
+      });
     }
     update$1(extensionId, {
       status: Error$1 // TODO maybe store error also in runtime status state
@@ -1419,7 +1413,7 @@ const rpcs = Object.create(null);
 const add = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$2 = id => {
+const get$3 = id => {
   return rpcs[id];
 };
 
@@ -1487,7 +1481,9 @@ const importExtension = async (extensionId, absolutePath, activationEvent) => {
       });
       if (isImportError(error)) {
         const actualErrorMessage = await tryToGetActualImportErrorMessage(absolutePath, error);
-        throw new Error(actualErrorMessage);
+        throw new Error(actualErrorMessage, {
+          cause: error
+        });
       }
       throw error;
     }
@@ -1514,6 +1510,12 @@ const activateExtension3 = async (extension, absolutePath, activationEvent, plat
 const state$1 = {
   webExtensions: []
 };
+const push = extension => {
+  state$1.webExtensions.push(extension);
+};
+const get$2 = () => {
+  return state$1.webExtensions;
+};
 
 const cache = Object.create(null);
 const id = 1;
@@ -1557,7 +1559,7 @@ const addWebExtension = async path => {
   const manifestPath = getWebManifestPath(path);
   const manifest = await getWebExtensionManifest(path, manifestPath);
   // TODO avoid mutation if possible
-  state$1.webExtensions.push(manifest);
+  push(manifest);
   clear();
   return manifest;
 };
@@ -1580,7 +1582,7 @@ const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
   // the two message ports
 
   // TODO have a way so that the worker already includes the webview api and the extension
-  // host subworker doesn't need to import the other file
+  // host sub-worker doesn't need to import the other file
   await invokeAndTransfer('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name: rpcInfo.name,
@@ -1610,7 +1612,7 @@ const createWebViewWorkerRpc = async (rpcInfo, port) => {
   // the two message ports
 
   // TODO have a way so that the worker already includes the webview api and the extension
-  // host subworker doesn't need to import the other file
+  // host sub-worker doesn't need to import the other file
   await invokeAndTransfer$1('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name: rpcInfo.name,
@@ -1936,7 +1938,7 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 };
 
 const getDynamicWebExtensions = () => {
-  return state$1.webExtensions;
+  return get$2();
 };
 
 const getWebExtensionsUrl = assetDir => {
@@ -2061,7 +2063,7 @@ const createWebViewIpc = async webView => {
     port1,
     port2
   } = getPortTuple();
-  const rpcPromise = MessagePortRpcParent.create({
+  const rpcPromise = create$3({
     commandMap: {},
     isMessagePortOpen: false,
     messagePort: port2
@@ -2082,8 +2084,8 @@ const getWebView = id => {
 // TODO if webViewId is provided,
 // 1. read file as blob
 // 2. send blob to webview
-// 3. create objecturl in webview
-// 4. send back objecturl to extension host worker
+// 3. create object URL in webview
+// 4. send back object URL to extension host worker
 // 5. provide objectUrl to extension
 
 const getRemoteUrlForWebView = async (uri, options = {}) => {
@@ -2098,7 +2100,7 @@ const getRemoteUrlForWebView = async (uri, options = {}) => {
 };
 
 const getRpcInfo = rpcId => {
-  const info = get$2(rpcId);
+  const info = get$3(rpcId);
   if (!info) {
     throw new Error(`Rpc not found ${rpcId}`);
   }
@@ -2117,20 +2119,20 @@ const emptyStatus = {
   status: None
 };
 const getRuntimeStatus = extensionId => {
-  return get$3(extensionId) || emptyStatus;
+  return get$4(extensionId) || emptyStatus;
 };
 
 const commandMapRef = {};
 
 const handleMessagePort = async port => {
-  await PlainMessagePortRpc.create({
+  await create$7({
     commandMap: commandMapRef,
     messagePort: port
   });
 };
 
 const initializeExtensionHostWorker = async () => {
-  const rpc = await TransferMessagePortRpcParent.create({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToExtensionHostWorker(port, 0);
@@ -2140,7 +2142,7 @@ const initializeExtensionHostWorker = async () => {
 };
 
 const initializeFileSystemWorker = async () => {
-  const rpc = await TransferMessagePortRpcParent.create({
+  const rpc = await create$6({
     commandMap: commandMapRef,
     async send(port) {
       await sendMessagePortToFileSystemWorker(port, 0);
@@ -2152,14 +2154,14 @@ const initializeFileSystemWorker = async () => {
 const getRpc = async platform => {
   // TODO create connection to shared process
   if (platform === Remote) {
-    const rpc = await WebSocketRpcParent2.create({
+    const rpc = await create$4({
       commandMap: commandMapRef,
       type: 'shared-process'
     });
     return rpc;
   }
   if (platform === Electron) {
-    const rpc = TransferMessagePortRpcParent.create({
+    const rpc = create$6({
       commandMap: commandMapRef,
       async send(port) {
         await sendMessagePortToSharedProcess(port);
@@ -2275,7 +2277,7 @@ const commandMap = {
 
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$2({
     commandMap: commandMap
   });
   set$4(rpc);

package/package.json

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