@lvce-editor/main-process 2.1.0 → 2.3.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,
@@ -2952,96 +2606,442 @@ class IpcParentWithNodeForkedProcess extends Ipc {
 const wrap$2 = childProcess => {
   return new IpcParentWithNodeForkedProcess(childProcess);
 };
-const IpcParentWithNodeForkedProcess$1 = {
-  __proto__: null,
-  create: create$2$1,
-  wrap: wrap$2
+const IpcParentWithNodeForkedProcess$1 = {
+  __proto__: null,
+  create: create$2$2,
+  wrap: wrap$2
+};
+const fixNodeWorkerParameters = value => {
+  const transfer = getTransferrables(value);
+  if (transfer.length === 0) {
+    throw new IpcError('no transferrables found');
+  }
+  return {
+    newValue: value,
+    transfer: transfer
+  };
+};
+const getFirstNodeWorkerEvent = worker => {
+  return getFirstEvent(worker, {
+    message: Message$1,
+    exit: Exit$1,
+    error: Error$2
+  });
+};
+
+// @ts-ignore
+const create$1$2 = async ({
+  path,
+  argv = [],
+  env = process.env,
+  execArgv = []
+}) => {
+  string(path);
+  const actualArgv = ['--ipc-type=node-worker', ...argv];
+  const actualEnv = {
+    ...env,
+    ELECTRON_RUN_AS_NODE: '1'
+  };
+  const {
+    Worker
+  } = await import('node:worker_threads');
+  const worker = new Worker(path, {
+    argv: actualArgv,
+    env: actualEnv,
+    execArgv
+  });
+  const {
+    type,
+    event
+  } = await getFirstNodeWorkerEvent(worker);
+  if (type === Exit$1) {
+    throw new IpcError(`Worker exited before ipc connection was established`);
+  }
+  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');
+  }
+  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 fixNodeWorkerParameters = value => {
-  const transfer = getTransferrables(value);
-  if (transfer.length === 0) {
-    throw new IpcError('no transferrables found');
+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);
   }
-  return {
-    newValue: value,
-    transfer: transfer
-  };
 };
-const getFirstNodeWorkerEvent = worker => {
-  return getFirstEvent(worker, {
-    message: Message$1,
-    exit: Exit$1,
-    error: Error$2
-  });
+const defaultPreparePrettyError = error => {
+  return error;
+};
+const defaultLogError = () => {
+  // ignore
+};
+const defaultRequiresSocket = () => {
+  return false;
 };
+const defaultResolve = resolve;
 
-// @ts-ignore
-const create$1$1 = async ({
-  path,
-  argv = [],
-  env = process.env,
-  execArgv = []
-}) => {
-  string(path);
-  const actualArgv = ['--ipc-type=node-worker', ...argv];
-  const actualEnv = {
-    ...env,
-    ELECTRON_RUN_AS_NODE: '1'
+// 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 {
-    Worker
-  } = await import('node:worker_threads');
-  const worker = new Worker(path, {
-    argv: actualArgv,
-    env: actualEnv,
-    execArgv
-  });
-  const {
-    type,
-    event
-  } = await getFirstNodeWorkerEvent(worker);
-  if (type === Exit$1) {
-    throw new IpcError(`Worker exited before ipc connection was established`);
-  }
-  if (type === Error$2) {
-    throw new IpcError(`Worker threw an error before ipc connection was established: ${event}`);
+    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 (event !== readyMessage) {
-    throw new IpcError('unexpected first message from worker');
+  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,
@@ -3161,7 +3161,27 @@ const create$3 = async ({
 };
 const ElectronUtilityProcessRpcParent = {
   __proto__: null,
-  create: create$3
+  create: create$c
+};
+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 ElectronWebContentsRpcClient = {
+  __proto__: null,
+  create: create$b
 };
 
 const commandMapRef = Object.create(null);
@@ -3338,22 +3358,22 @@ const getOrCreate = async ({
   return state$7.promise;
 };
 const send$1 = async (method, ...params) => {
-  const ipc = await getOrCreate({
+  const rpc = await getOrCreate({
     method: ElectronUtilityProcess$1
   });
-  send$2(ipc.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.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.ipc, transfer, method, ...params);
+  return rpc.invokeAndTransfer(method, ...params);
 };
 
 const handleCliArgs = async parsedArgs => {
@@ -5376,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}`);
@@ -5469,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);
 };
 
@@ -5488,27 +5473,27 @@ const crashMainProcess$1 = () => {
   setTimeout(handleTimeout, 0);
 };
 
-const transferMessagePortMain = async (ipc, port, ...params) => {
+const transferMessagePortMain = async (rpc, port, ...params) => {
   try {
-    await invokeAndTransfer$1(ipc, 'HandleElectronMessagePort.handleElectronMessagePort', port, ...params);
+    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 (ipc, browserWindowPort, ...params) => {
-  await transferMessagePortMain(ipc, browserWindowPort, ...params);
+const connectIpc$2 = async (rpc, browserWindowPort, ...params) => {
+  await transferMessagePortMain(rpc, browserWindowPort, ...params);
 };
 
-const transferMessagePort = async (ipc, port, ...params) => {
+const transferMessagePort = async (rpc, port, ...params) => {
   try {
-    await invokeAndTransfer$1(ipc, 'HandleNodeMessagePort.handleNodeMessagePort', port, ...params);
+    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 (ipc, browserWindowPort, ...params) => {
+const connectIpc$1 = async (rpc, browserWindowPort, ...params) => {
   const messageChannel = new MessageChannel();
   const {
     port1,
@@ -5522,11 +5507,11 @@ const connectIpc$1 = async (ipc, browserWindowPort, ...params) => {
     // console.log('send message to browser window', message)
     browserWindowPort.postMessage(message);
   });
-  await transferMessagePort(ipc, port1, ...params);
+  await transferMessagePort(rpc, port1, ...params);
   browserWindowPort.start();
 };
 
-const getModule = method => {
+const getModule$1 = method => {
   switch (method) {
     case NodeWorker:
       return connectIpc$1;
@@ -5536,9 +5521,9 @@ const getModule = method => {
       throw new Error('unexpected ipc type');
   }
 };
-const connectIpc = async (method, ipc, browserWindowPort, ipcId) => {
-  const connectIpc = getModule(method);
-  return 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
@@ -5561,7 +5546,7 @@ const handlePort = async (browserWindowPort, ipcId) => {
       FOLDER: ''
     }
   });
-  await connectIpc(method, sharedProcess.ipc, browserWindowPort, ipcId);
+  await connectIpc(method, sharedProcess, browserWindowPort, ipcId);
 };
 
 // TODO reverse order of parameters: make ports first
@@ -5647,6 +5632,19 @@ const createPidMap = () => {
   return pidWindowMap;
 };
 
+const rpcs = Object.create(null);
+const set$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+
+const createUtilityProcessRpc = async options => {
+  const rpc = await ElectronUtilityProcessRpcParent.create({
+    commandMap: commandMapRef,
+    ...options
+  });
+  set$3(options.rpcId, rpc);
+};
+
 const serializeDeskopCapturerSource = source => {
   return {
     display_id: source.display_id,
@@ -6944,6 +6942,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,
@@ -7124,9 +7156,10 @@ const commandMap = {
   'AppWindow.createAppWindow': createAppWindow,
   'Beep.beep': beep$1,
   'Crash.crashMainProcess': crashMainProcess$1,
-  'DesktopCapturer.getSources': getSources,
   'CreateMessagePort.createMessagePort': createMessagePort,
   'CreatePidMap.createPidMap': createPidMap,
+  'CreateUtilityProcessRpc.createUtilityProcessRpc': createUtilityProcessRpc,
+  'DesktopCapturer.getSources': getSources,
   'ElectronApplicationMenu.setItems': setItems,
   'ElectronBeep.beep': beep,
   'ElectronContentTracing.startRecording': startRecording,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "",
   "keywords": [
     "lvce-editor",