@lvce-editor/main-process 2.0.0 → 2.2.0

package/dist/mainProcessMain.js

@@ -1660,451 +1660,105 @@ const ElectronUtilityProcess$1 = 3;
 const ElectronMessagePort$1 = 4;
 const RendererProcess2 = 8;
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
-const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
-  callbacks[id] = fn;
-};
-const get$3 = id => {
-  return callbacks[id];
-};
-const remove$2 = id => {
-  delete callbacks[id];
-};
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$2(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$2 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
+const normalizeLine = line => {
+  if (line.startsWith('Error: ')) {
+    return line.slice('Error: '.length);
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice('VError: '.length);
+  }
+  return line;
 };
-class JsonRpcError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'JsonRpcError';
+const getCombinedMessage = (error, message) => {
+  const stringifiedError = normalizeLine(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
   }
-}
+  return stringifiedError;
+};
 const NewLine$2 = '\n';
-const DomException = 'DOMException';
-const ReferenceError$1 = 'ReferenceError';
-const SyntaxError$1 = 'SyntaxError';
-const TypeError$1 = 'TypeError';
-const getErrorConstructor = (message, type) => {
-  if (type) {
-    switch (type) {
-      case DomException:
-        return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
-      case ReferenceError$1:
-        return ReferenceError;
-      default:
-        return Error;
-    }
-  }
-  if (message.startsWith('TypeError: ')) {
-    return TypeError;
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
+};
+const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent;
   }
-  if (message.startsWith('SyntaxError: ')) {
-    return SyntaxError;
+  const parentNewLineIndex = getNewLineIndex$1(parent);
+  const childNewLineIndex = getNewLineIndex$1(child);
+  if (childNewLineIndex === -1) {
+    return parent;
   }
-  if (message.startsWith('ReferenceError: ')) {
-    return ReferenceError;
+  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 Error;
+  return child;
 };
-const constructError = (message, type, name) => {
-  const ErrorConstructor = getErrorConstructor(message, type);
-  if (ErrorConstructor === DOMException && name) {
-    return new ErrorConstructor(message, name);
-  }
-  if (ErrorConstructor === Error) {
-    const error = new Error(message);
-    if (name && name !== 'VError') {
-      error.name = name;
+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;
     }
-    return error;
   }
-  return new ErrorConstructor(message);
+}
+
+const isMessagePort = value => {
+  return value && value instanceof MessagePort;
 };
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+const isMessagePortMain = value => {
+  return value && value.constructor && value.constructor.name === 'MessagePortMain';
 };
-const getParentStack = error => {
-  let parentStack = error.stack || error.data || error.message || '';
-  if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$2 + parentStack;
-  }
-  return parentStack;
+const isOffscreenCanvas = value => {
+  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
 };
-const joinLines$1 = lines => {
-  return lines.join(NewLine$2);
+const isInstanceOf = (value, constructorName) => {
+  return value?.constructor?.name === constructorName;
 };
-const MethodNotFound = -32601;
-const Custom = -32001;
-const splitLines$1 = lines => {
-  return lines.split(NewLine$2);
+const isSocket = value => {
+  return isInstanceOf(value, 'Socket');
 };
-const restoreJsonRpcError = error => {
-  if (error && error instanceof Error) {
-    return error;
-  }
-  const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(1));
-  if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$2 + currentStack;
-    return restoredError;
-  }
-  if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$2 + error.data.stack + NewLine$2 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex$1(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
+const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
+const isTransferrable = value => {
+  for (const fn of transferrables) {
+    if (fn(value)) {
+      return true;
     }
-    return restoredError;
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return false;
 };
-const unwrapJsonRpcResult = responseMessage => {
-  if ('error' in responseMessage) {
-    const restoredError = restoreJsonRpcError(responseMessage.error);
-    throw restoredError;
-  }
-  if ('result' in responseMessage) {
-    return responseMessage.result;
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
   }
-  throw new JsonRpcError('unexpected response message');
-};
-const warn = (...args) => {
-  console.warn(...args);
-};
-const resolve = (id, response) => {
-  const fn = get$3(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
+  if (isTransferrable(value)) {
+    transferrables.push(value);
     return;
   }
-  fn(response);
-  remove$2(id);
-};
-const E_COMMAND_NOT_FOUND$1 = 'E_COMMAND_NOT_FOUND';
-const getErrorType = prettyError => {
-  if (prettyError && prettyError.type) {
-    return prettyError.type;
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
   }
-  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
-    return prettyError.constructor.name;
-  }
-  return undefined;
-};
-const getErrorProperty = (error, prettyError) => {
-  if (error && error.code === E_COMMAND_NOT_FOUND$1) {
-    return {
-      code: MethodNotFound,
-      message: error.message,
-      data: error.stack
-    };
-  }
-  return {
-    code: Custom,
-    message: prettyError.message,
-    data: {
-      stack: prettyError.stack,
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
-      code: prettyError.code,
-      name: prettyError.name
-    }
-  };
-};
-const create$1$2 = (message, error) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    error
-  };
-};
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
-  const prettyError = preparePrettyError(error);
-  logError(error, prettyError);
-  const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(message, errorProperty);
-};
-const create$5 = (message, result) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    result: result ?? null
-  };
-};
-const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
-};
-const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
-  try {
-    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
-    return getSuccessResponse(message, result);
-  } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
-  }
-};
-const defaultPreparePrettyError = error => {
-  return error;
-};
-const defaultLogError = () => {
-  // ignore
-};
-const defaultRequiresSocket = () => {
-  return false;
-};
-const defaultResolve = resolve;
-
-// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
-const normalizeParams = args => {
-  if (args.length === 1) {
-    const options = args[0];
-    return {
-      ipc: options.ipc,
-      message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
-      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
-    };
-  }
-  return {
-    ipc: args[0],
-    message: args[1],
-    execute: args[2],
-    resolve: args[3],
-    preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
-  };
-};
-const handleJsonRpcMessage = async (...args) => {
-  const options = normalizeParams(args);
-  const {
-    message,
-    ipc,
-    execute,
-    resolve,
-    preparePrettyError,
-    logError,
-    requiresSocket
-  } = options;
-  if ('id' in message) {
-    if ('method' in message) {
-      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-      try {
-        ipc.send(response);
-      } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
-        ipc.send(errorResponse);
-      }
-      return;
-    }
-    resolve(message.id, message);
-    return;
-  }
-  if ('method' in message) {
-    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
-    return;
-  }
-  throw new JsonRpcError('unexpected message');
-};
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$2(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send$2 = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
-
-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$1 = '\n';
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$1, startIndex);
-};
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent;
-  }
-  const parentNewLineIndex = getNewLineIndex(parent);
-  const childNewLineIndex = getNewLineIndex(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;
-};
-const isMessagePortMain = value => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain';
-};
-const isOffscreenCanvas = value => {
-  return typeof OffscreenCanvas !== 'undefined' && value instanceof OffscreenCanvas;
-};
-const isInstanceOf = (value, constructorName) => {
-  return value?.constructor?.name === constructorName;
-};
-const isSocket = value => {
-  return isInstanceOf(value, 'Socket');
-};
-const transferrables = [isMessagePort, isMessagePortMain, isOffscreenCanvas, isSocket];
-const isTransferrable = value => {
-  for (const fn of transferrables) {
-    if (fn(value)) {
-      return true;
-    }
-  }
-  return false;
-};
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
   }
 };
 const getTransferrables = value => {
@@ -2184,9 +1838,9 @@ class Ipc extends EventTarget {
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
 const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
-const NewLine = '\n';
-const joinLines = lines => {
-  return lines.join(NewLine);
+const NewLine$1 = '\n';
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
 };
 const RE_AT = /^\s+at/;
 const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
@@ -2197,7 +1851,7 @@ const getDetails = lines => {
   const index = lines.findIndex(isNormalStackLine);
   if (index === -1) {
     return {
-      actualMessage: joinLines(lines),
+      actualMessage: joinLines$1(lines),
       rest: []
     };
   }
@@ -2212,8 +1866,8 @@ const getDetails = lines => {
     rest: lines.slice(index, lastIndex)
   };
 };
-const splitLines = lines => {
-  return lines.split(NewLine);
+const splitLines$1 = lines => {
+  return lines.split(NewLine$1);
 };
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
@@ -2224,7 +1878,7 @@ const isMessageCodeBlockEndIndex = line => {
   return RE_MESSAGE_CODE_BLOCK_END.test(line);
 };
 const getMessageCodeBlock = stderr => {
-  const lines = splitLines(stderr);
+  const lines = splitLines$1(stderr);
   const startIndex = lines.findIndex(isMessageCodeBlockStartIndex);
   const endIndex = startIndex + lines.slice(startIndex).findIndex(isMessageCodeBlockEndIndex, startIndex);
   const relevantLines = lines.slice(startIndex, endIndex);
@@ -2235,7 +1889,7 @@ const isModuleNotFoundMessage = line => {
   return line.includes('[ERR_MODULE_NOT_FOUND]');
 };
 const getModuleNotFoundError = stderr => {
-  const lines = splitLines(stderr);
+  const lines = splitLines$1(stderr);
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
@@ -2283,7 +1937,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
   if (isModuleNotFoundError(stderr)) {
     return getModuleNotFoundError(stderr);
   }
-  const lines = splitLines(stderr);
+  const lines = splitLines$1(stderr);
   const {
     actualMessage,
     rest
@@ -2793,10 +2447,10 @@ class ChildProcessError extends Error {
     }
     if (stack) {
       // @ts-ignore
-      const lines = splitLines(this.stack);
+      const lines = splitLines$1(this.stack);
       const [firstLine, ...stackLines] = lines;
       const newStackLines = [firstLine, ...stack, ...stackLines];
-      const newStack = joinLines(newStackLines);
+      const newStack = joinLines$1(newStackLines);
       this.stack = newStack;
     }
   }
@@ -2882,7 +2536,7 @@ const getFirstNodeChildProcessEvent = async childProcess => {
 };
 
 // @ts-ignore
-const create$2$1 = async ({
+const create$2$2 = async ({
   path,
   argv = [],
   env,
@@ -2954,7 +2608,7 @@ const wrap$2 = childProcess => {
 };
 const IpcParentWithNodeForkedProcess$1 = {
   __proto__: null,
-  create: create$2$1,
+  create: create$2$2,
   wrap: wrap$2
 };
 const fixNodeWorkerParameters = value => {
@@ -2976,7 +2630,7 @@ const getFirstNodeWorkerEvent = worker => {
 };
 
 // @ts-ignore
-const create$1$1 = async ({
+const create$1$2 = async ({
   path,
   argv = [],
   env = process.env,
@@ -3006,42 +2660,388 @@ const create$1$1 = async ({
   if (type === Error$2) {
     throw new IpcError(`Worker threw an error before ipc connection was established: ${event}`);
   }
-  if (event !== readyMessage) {
-    throw new IpcError('unexpected first message from worker');
+  if (event !== readyMessage) {
+    throw new IpcError('unexpected first message from worker');
+  }
+  return worker;
+};
+class IpcParentWithNodeWorker extends Ipc {
+  getData(message) {
+    return message;
+  }
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const {
+      newValue,
+      transfer
+    } = fixNodeWorkerParameters(message);
+    this._rawIpc.postMessage(newValue, transfer);
+  }
+  async dispose() {
+    await this._rawIpc.terminate();
+  }
+  onClose(callback) {
+    this._rawIpc.on('exit', callback);
+  }
+  onMessage(callback) {
+    this._rawIpc.on('message', callback);
+  }
+}
+const wrap$1 = worker => {
+  return new IpcParentWithNodeWorker(worker);
+};
+const IpcParentWithNodeWorker$1 = {
+  __proto__: null,
+  create: create$1$2,
+  wrap: wrap$1
+};
+
+const Two = '2.0';
+const create$4 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const callbacks = Object.create(null);
+const set$2 = (id, fn) => {
+  callbacks[id] = fn;
+};
+const get$3 = id => {
+  return callbacks[id];
+};
+const remove$2 = id => {
+  delete callbacks[id];
+};
+let id = 0;
+const create$3 = () => {
+  return ++id;
+};
+const registerPromise = () => {
+  const id = create$3();
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  set$2(id, resolve);
+  return {
+    id,
+    promise
+  };
+};
+const create$2$1 = (method, params) => {
+  const {
+    id,
+    promise
+  } = registerPromise();
+  const message = {
+    jsonrpc: Two,
+    method,
+    params,
+    id
+  };
+  return {
+    message,
+    promise
+  };
+};
+class JsonRpcError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'JsonRpcError';
+  }
+}
+const NewLine = '\n';
+const DomException = 'DOMException';
+const ReferenceError$1 = 'ReferenceError';
+const SyntaxError$1 = 'SyntaxError';
+const TypeError$1 = 'TypeError';
+const getErrorConstructor = (message, type) => {
+  if (type) {
+    switch (type) {
+      case DomException:
+        return DOMException;
+      case TypeError$1:
+        return TypeError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case ReferenceError$1:
+        return ReferenceError;
+      default:
+        return Error;
+    }
+  }
+  if (message.startsWith('TypeError: ')) {
+    return TypeError;
+  }
+  if (message.startsWith('SyntaxError: ')) {
+    return SyntaxError;
+  }
+  if (message.startsWith('ReferenceError: ')) {
+    return ReferenceError;
+  }
+  return Error;
+};
+const constructError = (message, type, name) => {
+  const ErrorConstructor = getErrorConstructor(message, type);
+  if (ErrorConstructor === DOMException && name) {
+    return new ErrorConstructor(message, name);
+  }
+  if (ErrorConstructor === Error) {
+    const error = new Error(message);
+    if (name && name !== 'VError') {
+      error.name = name;
+    }
+    return error;
+  }
+  return new ErrorConstructor(message);
+};
+const getNewLineIndex = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine, startIndex);
+};
+const getParentStack = error => {
+  let parentStack = error.stack || error.data || error.message || '';
+  if (parentStack.startsWith('    at')) {
+    parentStack = error.message + NewLine + parentStack;
+  }
+  return parentStack;
+};
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const MethodNotFound = -32601;
+const Custom = -32001;
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const restoreJsonRpcError = error => {
+  if (error && error instanceof Error) {
+    return error;
+  }
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
+  if (error && error.code && error.code === MethodNotFound) {
+    const restoredError = new JsonRpcError(error.message);
+    const parentStack = getParentStack(error);
+    restoredError.stack = parentStack + NewLine + currentStack;
+    return restoredError;
+  }
+  if (error && error.message) {
+    const restoredError = constructError(error.message, error.type, error.name);
+    if (error.data) {
+      if (error.data.stack && error.data.type && error.message) {
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+      } else if (error.data.stack) {
+        restoredError.stack = error.data.stack;
+      }
+      if (error.data.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.data.codeFrame;
+      }
+      if (error.data.code) {
+        // @ts-ignore
+        restoredError.code = error.data.code;
+      }
+      if (error.data.type) {
+        // @ts-ignore
+        restoredError.name = error.data.type;
+      }
+    } else {
+      if (error.stack) {
+        const lowerStack = restoredError.stack || '';
+        // @ts-ignore
+        const indexNewLine = getNewLineIndex(lowerStack);
+        const parentStack = getParentStack(error);
+        // @ts-ignore
+        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+      }
+      if (error.codeFrame) {
+        // @ts-ignore
+        restoredError.codeFrame = error.codeFrame;
+      }
+    }
+    return restoredError;
+  }
+  if (typeof error === 'string') {
+    return new Error(`JsonRpc Error: ${error}`);
+  }
+  return new Error(`JsonRpc Error: ${error}`);
+};
+const unwrapJsonRpcResult = responseMessage => {
+  if ('error' in responseMessage) {
+    const restoredError = restoreJsonRpcError(responseMessage.error);
+    throw restoredError;
+  }
+  if ('result' in responseMessage) {
+    return responseMessage.result;
+  }
+  throw new JsonRpcError('unexpected response message');
+};
+const warn = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get$3(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove$2(id);
+};
+const E_COMMAND_NOT_FOUND$1 = 'E_COMMAND_NOT_FOUND';
+const getErrorType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
+  }
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
+  }
+  return undefined;
+};
+const getErrorProperty = (error, prettyError) => {
+  if (error && error.code === E_COMMAND_NOT_FOUND$1) {
+    return {
+      code: MethodNotFound,
+      message: error.message,
+      data: error.stack
+    };
+  }
+  return {
+    code: Custom,
+    message: prettyError.message,
+    data: {
+      stack: prettyError.stack,
+      codeFrame: prettyError.codeFrame,
+      type: getErrorType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
+    }
+  };
+};
+const create$1$1 = (message, error) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    error
+  };
+};
+const getErrorResponse = (message, error, preparePrettyError, logError) => {
+  const prettyError = preparePrettyError(error);
+  logError(error, prettyError);
+  const errorProperty = getErrorProperty(error, prettyError);
+  return create$1$1(message, errorProperty);
+};
+const create$5 = (message, result) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    result: result ?? null
+  };
+};
+const getSuccessResponse = (message, result) => {
+  const resultProperty = result ?? null;
+  return create$5(message, resultProperty);
+};
+const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
+  try {
+    const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
+    return getSuccessResponse(message, result);
+  } catch (error) {
+    return getErrorResponse(message, error, preparePrettyError, logError);
+  }
+};
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
+};
+const defaultResolve = resolve;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
+  if (args.length === 1) {
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
+  }
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
+};
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+      try {
+        ipc.send(response);
+      } catch (error) {
+        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        ipc.send(errorResponse);
+      }
+      return;
+    }
+    resolve(message.id, message);
+    return;
+  }
+  if ('method' in message) {
+    await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
+    return;
   }
-  return worker;
+  throw new JsonRpcError('unexpected message');
 };
-class IpcParentWithNodeWorker extends Ipc {
-  getData(message) {
-    return message;
-  }
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const {
-      newValue,
-      transfer
-    } = fixNodeWorkerParameters(message);
-    this._rawIpc.postMessage(newValue, transfer);
-  }
-  async dispose() {
-    await this._rawIpc.terminate();
-  }
-  onClose(callback) {
-    this._rawIpc.on('exit', callback);
-  }
-  onMessage(callback) {
-    this._rawIpc.on('message', callback);
+const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+  const {
+    message,
+    promise
+  } = create$2$1(method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
   }
-}
-const wrap$1 = worker => {
-  return new IpcParentWithNodeWorker(worker);
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
 };
-const IpcParentWithNodeWorker$1 = {
-  __proto__: null,
-  create: create$1$1,
-  wrap: wrap$1
+const send$2 = (transport, method, ...params) => {
+  const message = create$4(method, params);
+  transport.send(message);
+};
+const invoke$1 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, false);
+};
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
+  return invokeHelper(ipc, method, params, true);
 };
 
 const commands = Object.create(null);
@@ -3111,7 +3111,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$d = async ({
+const create$e = async ({
   commandMap,
   messagePort,
   requiresSocket
@@ -3130,9 +3130,9 @@ const create$d = async ({
 };
 const ElectronMessagePortRpcClient = {
   __proto__: null,
-  create: create$d
+  create: create$e
 };
-const create$3 = async ({
+const create$c = async ({
   commandMap,
   env,
   argv,
@@ -3151,258 +3151,54 @@ const create$3 = async ({
     name
   });
   const ipc = IpcParentWithElectronUtilityProcess$1$1.wrap(rawIpc);
-  if (requiresSocket) {
-    // @ts-ignore
-    ipc.requiresSocket = requiresSocket;
-  }
-  handleIpc$1(ipc);
-  const rpc = createRpc(ipc);
-  return rpc;
-};
-const ElectronUtilityProcessRpcParent = {
-  __proto__: null,
-  create: create$3
-};
-
-const commandMapRef = Object.create(null);
-
-const getPortTuple = () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannelMain();
-  return {
-    port1,
-    port2
-  };
-};
-
-const getSharedProcessArgv = isProduction => {
-  return [];
-};
-
-const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const E_MODULE_NOT_FOUND = 'E_MODULE_NOT_FOUND';
-
-class CommandNotFoundError extends Error {
-  constructor(id) {
-    super(`command ${id} not found`);
-    this.name = 'CommandNotFoundError';
-    // @ts-ignore
-    this.code = E_COMMAND_NOT_FOUND;
-  }
-}
-
-const App = 1;
-const AppWindow = 2;
-const Beep = 3;
-const Developer = 4;
-const Dialog = 5;
-const ElectronWindowProcessExplorer = 6;
-const Window = 7;
-const ElectronShell = 8;
-const ElectronPowerSaveBlocker = 9;
-const ElectronSafeStorage = 10;
-const ElectronContentTracing = 11;
-const ElectronNetLog = 12;
-const ElectronBrowserView = 13;
-const ElectronBrowserViewQuickPick = 14;
-const ElectronContextMenu = 16;
-const ElectronClipBoard = 17;
-const ElectronApplicationMenu = 18;
-const Process = 19;
-const ElectronNet = 20;
-const ElectronBrowserViewSuggestions = 21;
-const CreatePidMap = 22;
-const OpenExternal$1 = 23;
-const Platform = 25;
-const GetWindowId = 26;
-const DesktopCapturer = 27;
-const Trash = 28;
-const IpcParent = 29;
-const Crash = 30;
-const Exit = 31;
-const ElectronScreen = 32;
-const TemporaryMessagePort = 34;
-const ElectronWebContents = 35;
-const ElectronWebContentsView = 36;
-const ElectronWebContentsViewFunctions = 37;
-const CreateMessagePort = 38;
-const HandleElectronMessagePort = 39;
-const ElectronSession = 40;
-
-const getPrefix = commandId => {
-  return commandId.slice(0, commandId.indexOf('.'));
-};
-const getModuleId = commandId => {
-  const prefix = getPrefix(commandId);
-  switch (prefix) {
-    case 'Crash':
-      return Crash;
-    case 'ElectronApp':
-    case 'App':
-      return App;
-    case 'Beep':
-      return Beep;
-    case 'ElectronWindow':
-      return Window;
-    case 'ElectronDeveloper':
-      return Developer;
-    case 'AppWindow':
-      return AppWindow;
-    case 'ElectronWindowProcessExplorer':
-      return ElectronWindowProcessExplorer;
-    case 'ElectronDialog':
-      return Dialog;
-    case 'ElectronBeep':
-      return Beep;
-    case 'ElectronShell':
-      return ElectronShell;
-    case 'ElectronPowerSaveBlocker':
-      return ElectronPowerSaveBlocker;
-    case 'ElectronSafeStorage':
-      return ElectronSafeStorage;
-    case 'ElectronContentTracing':
-      return ElectronContentTracing;
-    case 'ElectronNetLog':
-      return ElectronNetLog;
-    case 'ElectronBrowserView':
-      return ElectronBrowserView;
-    case 'ElectronBrowserViewQuickPick':
-      return ElectronBrowserViewQuickPick;
-    case 'ElectronContextMenu':
-      return ElectronContextMenu;
-    case 'ElectronClipBoard':
-      return ElectronClipBoard;
-    case 'ElectronApplicationMenu':
-      return ElectronApplicationMenu;
-    case 'Process':
-      return Process;
-    case 'ElectronNet':
-      return ElectronNet;
-    case 'ElectronBrowserViewSuggestions':
-      return ElectronBrowserViewSuggestions;
-    case 'CreatePidMap':
-      return CreatePidMap;
-    case 'OpenExternal':
-      return OpenExternal$1;
-    case 'Platform':
-      return Platform;
-    case 'GetWindowId':
-      return GetWindowId;
-    case 'DesktopCapturer':
-      return DesktopCapturer;
-    case 'Trash':
-      return Trash;
-    case 'IpcParent':
-      return IpcParent;
-    case 'Exit':
-      return Exit;
-    case 'ElectronScreen':
-      return ElectronScreen;
-    case 'TemporaryMessagePort':
-      return TemporaryMessagePort;
-    case 'ElectronWebContents':
-      return ElectronWebContents;
-    case 'ElectronWebContentsView':
-      return ElectronWebContentsView;
-    case 'ElectronWebContentsViewFunctions':
-      return ElectronWebContentsViewFunctions;
-    case 'CreateMessagePort':
-      return CreateMessagePort;
-    case 'HandleElectronMessagePort':
-      return HandleElectronMessagePort;
-    case 'ElectronSession':
-      return ElectronSession;
-    default:
-      throw new CommandNotFoundError(commandId);
-  }
-};
-
-const state$7 = {
-  commands: Object.create(null),
-  pendingModules: Object.create(null),
-  async load(moduleId) {}
-};
-const initializeModule = module => {
-  if (module.Commands) {
-    for (const [key, value] of Object.entries(module.Commands)) {
-      if (module.name) {
-        const actualKey = `${module.name}.${key}`;
-        register(actualKey, value);
-      } else {
-        register(key, value);
-      }
-    }
-    return;
-  }
-  throw new Error(`module ${module.name || '<unnamed module>'} is missing commands`);
-};
-const getOrLoadModule = moduleId => {
-  if (!state$7.pendingModules[moduleId]) {
-    const importPromise = state$7.load(moduleId);
-    state$7.pendingModules[moduleId] = importPromise.then(initializeModule);
-  }
-  return state$7.pendingModules[moduleId];
-};
-const loadCommand = command => getOrLoadModule(getModuleId(command));
-const register = (commandId, listener) => {
-  state$7.commands[commandId] = listener;
-};
-const hasThrown = new Set();
-const loadThenExecute = async (command, ...args) => {
-  await loadCommand(command);
-  // TODO can skip then block in prod (only to prevent endless loop in dev)
-  if (!(command in state$7.commands)) {
-    if (hasThrown.has(command)) {
-      return;
-    }
-    hasThrown.add(command);
-    throw new Error(`Command did not register "${command}"`);
+  if (requiresSocket) {
+    // @ts-ignore
+    ipc.requiresSocket = requiresSocket;
   }
-  return execute(command, ...args);
+  handleIpc$1(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
 };
-const execute = (command, ...args) => {
-  if (command in state$7.commands) {
-    return state$7.commands[command](...args);
-  }
-  return loadThenExecute(command, ...args);
+const ElectronUtilityProcessRpcParent = {
+  __proto__: null,
+  create: create$c
 };
-const setLoad = load => {
-  state$7.load = load;
+const create$b = async ({
+  commandMap,
+  webContents,
+  requiresSocket
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const ipc = IpcChildWithRendererProcess2$1.wrap(webContents);
+  if (requiresSocket) {
+    // @ts-ignore
+    ipc.requiresSocket = requiresSocket;
+  }
+  handleIpc$1(ipc);
+  const rpc = createRpc(ipc);
+  return rpc;
 };
-
-const printPrettyError = (prettyError, prefix = '') => {
-  error(`${prefix}${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`);
+const ElectronWebContentsRpcClient = {
+  __proto__: null,
+  create: create$b
 };
 
-const requiresSocket = () => {
-  return false;
-};
+const commandMapRef = Object.create(null);
 
-const logError = (error, prettyError) => {
-  printPrettyError(prettyError, '[main-process] ');
-};
-const handleMessage = event => {
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, prepare,
-  // @ts-ignore
-  logError, requiresSocket);
+const getPortTuple = () => {
+  const {
+    port1,
+    port2
+  } = new MessageChannelMain();
+  return {
+    port1,
+    port2
+  };
 };
 
-const handleIpc = ipc => {
-  if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', handleMessage);
-  } else if ('on' in ipc) {
-    // deprecated
-    ipc.on('message', handleMessage);
-  }
-};
-const unhandleIpc = ipc => {
-  if ('removeEventListener' in ipc) {
-    ipc.removeEventListener('message', handleMessage);
-  } else if ('off' in ipc) {
-    ipc.off('message', handleMessage);
-  }
+const getSharedProcessArgv = isProduction => {
+  return [];
 };
 
 const EmbedsProcess = 2;
@@ -3478,15 +3274,8 @@ const getSharedProcessPath = () => {
   return join(root, 'packages', 'shared-process', 'src', 'sharedProcessMain.ts');
 };
 
-const state$6 = {
-  /**
-   * @type{any|undefined}
-   */
-  sharedProcess: undefined,
-  /**
-   * @type {any}
-   */
-  promise: undefined
+const requiresSocket = () => {
+  return false;
 };
 
 const handleChildError = error => {
@@ -3529,7 +3318,6 @@ const launchSharedProcess = async ({
   sharedProcess._rawIpc.on('exit', handleChildExit);
   // @ts-ignore
   sharedProcess._rawIpc.on('disconnect', handleChildDisconnect);
-  handleIpc(sharedProcess);
 
   // create secondary ipc to support transferring objects
   // from shared process to main process
@@ -3545,43 +3333,47 @@ const launchSharedProcess = async ({
     requiresSocket: requiresSocket,
     messagePort: port1
   });
-
-  // @ts-ignore
-  state$6.sharedProcess = sharedProcess;
   mark(DidStartSharedProcess);
-  return sharedProcess;
+  return sharedProcessRpc;
+};
+
+const state$7 = {
+  /**
+   * @type {any}
+   */
+  promise: undefined
 };
 
 const getOrCreate = async ({
   method,
   env = {}
 }) => {
-  if (!state$6.promise) {
+  if (!state$7.promise) {
     // @ts-ignore
-    state$6.promise = launchSharedProcess({
+    state$7.promise = launchSharedProcess({
       method,
       env
     });
   }
-  return state$6.promise;
+  return state$7.promise;
 };
 const send$1 = async (method, ...params) => {
-  const ipc = await getOrCreate({
+  const rpc = await getOrCreate({
     method: ElectronUtilityProcess$1
   });
-  send$2(ipc, method, ...params);
+  rpc.send(method, ...params);
 };
 const invoke = async (method, ...params) => {
-  const ipc = await getOrCreate({
+  const rpc = await getOrCreate({
     method: ElectronUtilityProcess$1
   });
-  return invoke$1(ipc, method, ...params);
+  return rpc.invoke(method, ...params);
 };
-const invokeAndTransfer = async (transfer, method, ...params) => {
-  const ipc = await getOrCreate({
+const invokeAndTransfer = async (method, ...params) => {
+  const rpc = await getOrCreate({
     method: ElectronUtilityProcess$1
   });
-  return invokeAndTransfer$1(ipc, transfer, method, ...params);
+  return rpc.invokeAndTransfer(method, ...params);
 };
 
 const handleCliArgs = async parsedArgs => {
@@ -4686,14 +4478,14 @@ const createTitleBar = items => {
 
 const PHASE_DEFAULT = 0;
 const PHASE_SHUTDOWN = -1;
-const state$5 = {
+const state$6 = {
   phase: PHASE_DEFAULT
 };
 const isShutDown = () => {
-  return state$5.phase === PHASE_SHUTDOWN;
+  return state$6.phase === PHASE_SHUTDOWN;
 };
 const setShutDown = () => {
-  state$5.phase = PHASE_SHUTDOWN;
+  state$6.phase = PHASE_SHUTDOWN;
 };
 
 // TODO move this function to shared process
@@ -4990,21 +4782,21 @@ const BeforeInputEvent = 'before-input-event';
 const Allow = 'allow';
 const Deny = 'deny';
 
-const state$4 = {
+const state$5 = {
   views: Object.create(null),
   fallThroughKeyBindings: [],
   canceled: Object.create(null)
 };
 const add$1 = (id, browserWindow, view) => {
   // state
-  state$4.views[id] = {
+  state$5.views[id] = {
     browserWindow,
     view
   };
 };
 const hasWebContents = id => {
   number(id);
-  return id in state$4.views;
+  return id in state$5.views;
 };
 /**
  *
@@ -5012,19 +4804,19 @@ const hasWebContents = id => {
  * @returns {{browserWindow: Electron.BrowserWindow, view: Electron.WebContentsView}}
  */
 const get$2 = id => {
-  return state$4.views[id];
+  return state$5.views[id];
 };
 const remove$1 = id => {
-  delete state$4.views[id];
+  delete state$5.views[id];
 };
 const setFallthroughKeyBindings = fallthroughKeyBindings => {
-  state$4.fallThroughKeyBindings = fallthroughKeyBindings;
+  state$5.fallThroughKeyBindings = fallthroughKeyBindings;
 };
 const getFallthroughKeyBindings = () => {
-  return state$4.fallThroughKeyBindings;
+  return state$5.fallThroughKeyBindings;
 };
 const setCanceled = id => {
-  state$4.canceled[id] = true;
+  state$5.canceled[id] = true;
 };
 
 const shouldAllowNavigation = webContentsId => {
@@ -5148,49 +4940,240 @@ const hydrate = async () => {
   // before being able to test multi-window behavior
   // see https://github.com/microsoft/playwright/issues/12345
 
-  const parsedCliArgs = parseCliArgs(argv);
-  const moduleId = canHandleFastCliArgs(parsedCliArgs);
-  if (moduleId) {
-    await handleFastCliArgs(moduleId, parsedCliArgs);
+  const parsedCliArgs = parseCliArgs(argv);
+  const moduleId = canHandleFastCliArgs(parsedCliArgs);
+  if (moduleId) {
+    await handleFastCliArgs(moduleId, parsedCliArgs);
+    return;
+  }
+  if (isLinux && chromeUserDataPath) {
+    setUserDataPath(chromeUserDataPath);
+    setSessionDataPath(chromeUserDataPath);
+    setCrashDumpsPath(chromeUserDataPath);
+    setLogsPath(chromeUserDataPath);
+  }
+  const hasLock = requestSingleInstanceLock(argv);
+  if (!hasLock) {
+    debug('[info] quitting because no lock');
+    exit();
+    return;
+  }
+
+  // TODO tree shake out the .env.DEV check: reading from env variables is expensive
+  if (process.stdout.isTTY && !parsedCliArgs.wait && !process.env.DEV) {
+    spawn(execPath, argv.slice(1), {
+      detached: true,
+      stdio: 'ignore'
+    });
+    exit$1(Success);
+  }
+
+  // command line switches
+  enable$1(parsedCliArgs);
+
+  // protocol
+  enable(Electron.protocol);
+
+  // app
+  on(WindowAllClosed, handleWindowAllClosed);
+  on(BeforeQuit, handleBeforeQuit);
+  on(WebContentsCreated, handleWebContentsCreated);
+  on(SecondInstance, handleSecondInstance);
+  await whenReady();
+  mark(AppReady);
+  await handleReady(parsedCliArgs, cwd());
+  debug('[info] app window created');
+};
+
+const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const E_MODULE_NOT_FOUND = 'E_MODULE_NOT_FOUND';
+
+class CommandNotFoundError extends Error {
+  constructor(id) {
+    super(`command ${id} not found`);
+    this.name = 'CommandNotFoundError';
+    // @ts-ignore
+    this.code = E_COMMAND_NOT_FOUND;
+  }
+}
+
+const App = 1;
+const AppWindow = 2;
+const Beep = 3;
+const Developer = 4;
+const Dialog = 5;
+const ElectronWindowProcessExplorer = 6;
+const Window = 7;
+const ElectronShell = 8;
+const ElectronPowerSaveBlocker = 9;
+const ElectronSafeStorage = 10;
+const ElectronContentTracing = 11;
+const ElectronNetLog = 12;
+const ElectronBrowserView = 13;
+const ElectronBrowserViewQuickPick = 14;
+const ElectronContextMenu = 16;
+const ElectronClipBoard = 17;
+const ElectronApplicationMenu = 18;
+const Process = 19;
+const ElectronNet = 20;
+const ElectronBrowserViewSuggestions = 21;
+const CreatePidMap = 22;
+const OpenExternal$1 = 23;
+const Platform = 25;
+const GetWindowId = 26;
+const DesktopCapturer = 27;
+const Trash = 28;
+const IpcParent = 29;
+const Crash = 30;
+const Exit = 31;
+const ElectronScreen = 32;
+const TemporaryMessagePort = 34;
+const ElectronWebContents = 35;
+const ElectronWebContentsView = 36;
+const ElectronWebContentsViewFunctions = 37;
+const CreateMessagePort = 38;
+const HandleElectronMessagePort = 39;
+const ElectronSession = 40;
+
+const getPrefix = commandId => {
+  return commandId.slice(0, commandId.indexOf('.'));
+};
+const getModuleId = commandId => {
+  const prefix = getPrefix(commandId);
+  switch (prefix) {
+    case 'Crash':
+      return Crash;
+    case 'ElectronApp':
+    case 'App':
+      return App;
+    case 'Beep':
+      return Beep;
+    case 'ElectronWindow':
+      return Window;
+    case 'ElectronDeveloper':
+      return Developer;
+    case 'AppWindow':
+      return AppWindow;
+    case 'ElectronWindowProcessExplorer':
+      return ElectronWindowProcessExplorer;
+    case 'ElectronDialog':
+      return Dialog;
+    case 'ElectronBeep':
+      return Beep;
+    case 'ElectronShell':
+      return ElectronShell;
+    case 'ElectronPowerSaveBlocker':
+      return ElectronPowerSaveBlocker;
+    case 'ElectronSafeStorage':
+      return ElectronSafeStorage;
+    case 'ElectronContentTracing':
+      return ElectronContentTracing;
+    case 'ElectronNetLog':
+      return ElectronNetLog;
+    case 'ElectronBrowserView':
+      return ElectronBrowserView;
+    case 'ElectronBrowserViewQuickPick':
+      return ElectronBrowserViewQuickPick;
+    case 'ElectronContextMenu':
+      return ElectronContextMenu;
+    case 'ElectronClipBoard':
+      return ElectronClipBoard;
+    case 'ElectronApplicationMenu':
+      return ElectronApplicationMenu;
+    case 'Process':
+      return Process;
+    case 'ElectronNet':
+      return ElectronNet;
+    case 'ElectronBrowserViewSuggestions':
+      return ElectronBrowserViewSuggestions;
+    case 'CreatePidMap':
+      return CreatePidMap;
+    case 'OpenExternal':
+      return OpenExternal$1;
+    case 'Platform':
+      return Platform;
+    case 'GetWindowId':
+      return GetWindowId;
+    case 'DesktopCapturer':
+      return DesktopCapturer;
+    case 'Trash':
+      return Trash;
+    case 'IpcParent':
+      return IpcParent;
+    case 'Exit':
+      return Exit;
+    case 'ElectronScreen':
+      return ElectronScreen;
+    case 'TemporaryMessagePort':
+      return TemporaryMessagePort;
+    case 'ElectronWebContents':
+      return ElectronWebContents;
+    case 'ElectronWebContentsView':
+      return ElectronWebContentsView;
+    case 'ElectronWebContentsViewFunctions':
+      return ElectronWebContentsViewFunctions;
+    case 'CreateMessagePort':
+      return CreateMessagePort;
+    case 'HandleElectronMessagePort':
+      return HandleElectronMessagePort;
+    case 'ElectronSession':
+      return ElectronSession;
+    default:
+      throw new CommandNotFoundError(commandId);
+  }
+};
+
+const state$4 = {
+  commands: Object.create(null),
+  pendingModules: Object.create(null),
+  async load(moduleId) {}
+};
+const initializeModule = module => {
+  if (module.Commands) {
+    for (const [key, value] of Object.entries(module.Commands)) {
+      if (module.name) {
+        const actualKey = `${module.name}.${key}`;
+        register(actualKey, value);
+      } else {
+        register(key, value);
+      }
+    }
     return;
   }
-  if (isLinux && chromeUserDataPath) {
-    setUserDataPath(chromeUserDataPath);
-    setSessionDataPath(chromeUserDataPath);
-    setCrashDumpsPath(chromeUserDataPath);
-    setLogsPath(chromeUserDataPath);
+  throw new Error(`module ${module.name || '<unnamed module>'} is missing commands`);
+};
+const getOrLoadModule = moduleId => {
+  if (!state$4.pendingModules[moduleId]) {
+    const importPromise = state$4.load(moduleId);
+    state$4.pendingModules[moduleId] = importPromise.then(initializeModule);
   }
-  const hasLock = requestSingleInstanceLock(argv);
-  if (!hasLock) {
-    debug('[info] quitting because no lock');
-    exit();
-    return;
+  return state$4.pendingModules[moduleId];
+};
+const loadCommand = command => getOrLoadModule(getModuleId(command));
+const register = (commandId, listener) => {
+  state$4.commands[commandId] = listener;
+};
+const hasThrown = new Set();
+const loadThenExecute = async (command, ...args) => {
+  await loadCommand(command);
+  // TODO can skip then block in prod (only to prevent endless loop in dev)
+  if (!(command in state$4.commands)) {
+    if (hasThrown.has(command)) {
+      return;
+    }
+    hasThrown.add(command);
+    throw new Error(`Command did not register "${command}"`);
   }
-
-  // TODO tree shake out the .env.DEV check: reading from env variables is expensive
-  if (process.stdout.isTTY && !parsedCliArgs.wait && !process.env.DEV) {
-    spawn(execPath, argv.slice(1), {
-      detached: true,
-      stdio: 'ignore'
-    });
-    exit$1(Success);
+  return execute(command, ...args);
+};
+const execute = (command, ...args) => {
+  if (command in state$4.commands) {
+    return state$4.commands[command](...args);
   }
-
-  // command line switches
-  enable$1(parsedCliArgs);
-
-  // protocol
-  enable(Electron.protocol);
-
-  // app
-  on(WindowAllClosed, handleWindowAllClosed);
-  on(BeforeQuit, handleBeforeQuit);
-  on(WebContentsCreated, handleWebContentsCreated);
-  on(SecondInstance, handleSecondInstance);
-  await whenReady();
-  mark(AppReady);
-  await handleReady(parsedCliArgs, cwd());
-  debug('[info] app window created');
+  return loadThenExecute(command, ...args);
+};
+const setLoad = load => {
+  state$4.load = load;
 };
 
 const ClipBoardRead = 'clipboard-read';
@@ -5298,6 +5281,35 @@ const set$1 = value => {
   state$3.session = value;
 };
 
+const printPrettyError = (prettyError, prefix = '') => {
+  error(`${prefix}${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`);
+};
+
+const logError = (error, prettyError) => {
+  printPrettyError(prettyError, '[main-process] ');
+};
+const handleMessage = event => {
+  return handleJsonRpcMessage(event.target, event.data, execute, resolve, prepare,
+  // @ts-ignore
+  logError, requiresSocket);
+};
+
+const handleIpc = ipc => {
+  if ('addEventListener' in ipc) {
+    ipc.addEventListener('message', handleMessage);
+  } else if ('on' in ipc) {
+    // deprecated
+    ipc.on('message', handleMessage);
+  }
+};
+const unhandleIpc = ipc => {
+  if ('removeEventListener' in ipc) {
+    ipc.removeEventListener('message', handleMessage);
+  } else if ('off' in ipc) {
+    ipc.off('message', handleMessage);
+  }
+};
+
 const NodeWorker = 1;
 const NodeForkedProcess = 2;
 const ElectronUtilityProcess = 3;
@@ -5384,40 +5396,6 @@ const registerWebviewProtocol = async port => {
   handle(session.protocol, WebView, handleRequest);
 };
 
-const getModule$1 = method => {
-  switch (method) {
-    case NodeForkedProcess$1:
-      return IpcChildWithNodeForkedProcess$1;
-    case NodeWorker$1:
-      return IpcChildWithNodeWorker$1;
-    case ElectronUtilityProcess$1:
-      return IpcChildWithElectronUtilityProcess$1;
-    case ElectronMessagePort$1:
-      return IpcChildWithElectronMessagePort$1;
-    case RendererProcess2:
-      return IpcChildWithRendererProcess2$1;
-    default:
-      throw new Error('unexpected ipc type');
-  }
-};
-
-const listen = async ({
-  method,
-  ...params
-}) => {
-  const module = getModule$1(method);
-  // @ts-ignore
-  const rawIpc = await module.listen(params);
-  // @ts-ignore
-  if (module.signal) {
-    // @ts-ignore
-    module.signal(rawIpc);
-  }
-  // @ts-ignore
-  const ipc = module.wrap(rawIpc);
-  return ipc;
-};
-
 class WindowLoadError extends VError {
   constructor(error, url) {
     super(error, `Failed to load url ${url}`);
@@ -5477,11 +5455,10 @@ const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titl
     }
   };
   window.on('close', handleWindowClose);
-  const ipc = await listen({
-    method: RendererProcess2,
-    webContents: window.webContents
+  await ElectronWebContentsRpcClient.create({
+    webContents: window.webContents,
+    commandMap: commandMapRef
   });
-  handleIpc(ipc);
   await loadUrl(window, url);
 };
 
@@ -5496,19 +5473,57 @@ const crashMainProcess$1 = () => {
   setTimeout(handleTimeout, 0);
 };
 
-const getModule = method => {
+const transferMessagePortMain = async (rpc, port, ...params) => {
+  try {
+    await rpc.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port, ...params);
+  } catch (error) {
+    throw new VError(error, `Failed to send message port to utility process`);
+  }
+};
+
+const connectIpc$2 = async (rpc, browserWindowPort, ...params) => {
+  await transferMessagePortMain(rpc, browserWindowPort, ...params);
+};
+
+const transferMessagePort = async (rpc, port, ...params) => {
+  try {
+    await rpc.invokeAndTransfer('HandleNodeMessagePort.handleNodeMessagePort', port, ...params);
+  } catch (error) {
+    throw new VError(error, `Failed to send message port to worker thread`);
+  }
+};
+
+const connectIpc$1 = async (rpc, browserWindowPort, ...params) => {
+  const messageChannel = new MessageChannel();
+  const {
+    port1,
+    port2
+  } = messageChannel;
+  browserWindowPort.on('message', event => {
+    // console.log('got message from browser window', event.data)
+    port2.postMessage(event.data);
+  });
+  port2.on('message', message => {
+    // console.log('send message to browser window', message)
+    browserWindowPort.postMessage(message);
+  });
+  await transferMessagePort(rpc, port1, ...params);
+  browserWindowPort.start();
+};
+
+const getModule$1 = method => {
   switch (method) {
     case NodeWorker:
-      return Promise.resolve().then(function () { return ConnectIpcNodeWorker; });
+      return connectIpc$1;
     case ElectronUtilityProcess:
-      return Promise.resolve().then(function () { return ConnectIpcElectronUtilityProcess; });
+      return connectIpc$2;
     default:
       throw new Error('unexpected ipc type');
   }
 };
-const connectIpc$2 = async (method, ipc, browserWindowPort, ipcId) => {
-  const module = await getModule(method);
-  return module.connectIpc(ipc, browserWindowPort, ipcId);
+const connectIpc = async (method, rpc, browserWindowPort, ipcId) => {
+  const connectIpc = getModule$1(method);
+  return connectIpc(rpc, browserWindowPort, ipcId);
 };
 
 // TODO maybe handle critical (first render) request via ipcMain
@@ -5531,7 +5546,7 @@ const handlePort = async (browserWindowPort, ipcId) => {
       FOLDER: ''
     }
   });
-  await connectIpc$2(method, sharedProcess, browserWindowPort, ipcId);
+  await connectIpc(method, sharedProcess, browserWindowPort, ipcId);
 };
 
 // TODO reverse order of parameters: make ports first
@@ -6914,6 +6929,40 @@ const getStats$1 = view => {
   };
 };
 
+const getModule = method => {
+  switch (method) {
+    case NodeForkedProcess$1:
+      return IpcChildWithNodeForkedProcess$1;
+    case NodeWorker$1:
+      return IpcChildWithNodeWorker$1;
+    case ElectronUtilityProcess$1:
+      return IpcChildWithElectronUtilityProcess$1;
+    case ElectronMessagePort$1:
+      return IpcChildWithElectronMessagePort$1;
+    case RendererProcess2:
+      return IpcChildWithRendererProcess2$1;
+    default:
+      throw new Error('unexpected ipc type');
+  }
+};
+
+const listen = async ({
+  method,
+  ...params
+}) => {
+  const module = getModule(method);
+  // @ts-ignore
+  const rawIpc = await module.listen(params);
+  // @ts-ignore
+  if (module.signal) {
+    // @ts-ignore
+    module.signal(rawIpc);
+  }
+  // @ts-ignore
+  const ipc = module.wrap(rawIpc);
+  return ipc;
+};
+
 const open2 = async (options, url) => {
   const allOptions = {
     ...options,
@@ -7280,54 +7329,6 @@ const index = {
 	default: isDev
 };
 
-const transferMessagePort = async (ipc, port, ...params) => {
-  try {
-    await invokeAndTransfer$1(ipc, 'HandleNodeMessagePort.handleNodeMessagePort', port, ...params);
-  } catch (error) {
-    throw new VError(error, `Failed to send message port to worker thread`);
-  }
-};
-
-const connectIpc$1 = async (ipc, browserWindowPort, ...params) => {
-  const messageChannel = new MessageChannel();
-  const {
-    port1,
-    port2
-  } = messageChannel;
-  browserWindowPort.on('message', event => {
-    // console.log('got message from browser window', event.data)
-    port2.postMessage(event.data);
-  });
-  port2.on('message', message => {
-    // console.log('send message to browser window', message)
-    browserWindowPort.postMessage(message);
-  });
-  await transferMessagePort(ipc, port1, ...params);
-  browserWindowPort.start();
-};
-
-const ConnectIpcNodeWorker = {
-	__proto__: null,
-	connectIpc: connectIpc$1
-};
-
-const transferMessagePortMain = async (ipc, port, ...params) => {
-  try {
-    await invokeAndTransfer$1(ipc, 'HandleElectronMessagePort.handleElectronMessagePort', port, ...params);
-  } catch (error) {
-    throw new VError(error, `Failed to send message port to utility process`);
-  }
-};
-
-const connectIpc = async (ipc, browserWindowPort, ...params) => {
-  await transferMessagePortMain(ipc, browserWindowPort, ...params);
-};
-
-const ConnectIpcElectronUtilityProcess = {
-	__proto__: null,
-	connectIpc
-};
-
 const name$w = 'App';
 const Commands$w = {};