@lvce-editor/main-process 4.11.0 → 5.0.0

package/dist/mainProcessMain.js

@@ -2291,7 +2291,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   }
   return promise;
 };
-const create$7 = ({
+const create$7$1 = ({
   messagePort
 }) => {
   if (!isMessagePortMain(messagePort)) {
@@ -2329,7 +2329,7 @@ const wrap$7 = messagePort => {
 };
 const IpcParentWithElectronMessagePort$1 = {
   __proto__: null,
-  create: create$7,
+  create: create$7$1,
   signal: signal$2,
   wrap: wrap$7
 };
@@ -2391,7 +2391,7 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
     type
   };
 };
-const create$6 = async ({
+const create$6$1 = async ({
   argv = [],
   env = process.env,
   execArgv = [],
@@ -2459,7 +2459,7 @@ const wrap$6 = process => {
 };
 const IpcParentWithElectronUtilityProcess$1$1 = {
   __proto__: null,
-  create: create$6,
+  create: create$6$1,
   wrap: wrap$6
 };
 class ChildProcessError extends Error {
@@ -2734,6 +2734,27 @@ const IpcParentWithNodeWorker$1 = {
   wrap: wrap$1
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute$1 = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
 const set$2 = (id, fn) => {
@@ -2746,14 +2767,14 @@ const remove$2 = id => {
   delete callbacks[id];
 };
 let id$1 = 0;
-const create$3 = () => {
+const create$3$1 = () => {
   return ++id$1;
 };
 const registerPromise$1 = () => {
-  const id = create$3();
+  const id = create$3$1();
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   set$2(id, resolve);
   return {
@@ -2767,10 +2788,10 @@ const create$2$1 = (method, params) => {
     promise
   } = registerPromise$1();
   const message = {
+    id,
     jsonrpc: Two$1,
     method,
-    params,
-    id
+    params
   };
   return {
     message,
@@ -2793,12 +2814,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -2954,27 +2975,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -2983,27 +3004,27 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$4 = (message, result) => {
+const create$9 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$4(message, resultProperty);
+  return create$9(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -3033,35 +3054,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -3100,36 +3121,17 @@ const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper$1(ipc, method, params);
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute$1 = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$t = (method, params) => {
+
+const create$8 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$7 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -3138,15 +3140,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id = 0;
-const create$r = () => {
+const create$6 = () => {
   return ++id;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$6();
   const {
     promise,
     resolve
@@ -3158,13 +3159,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$7(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -3200,12 +3200,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$8(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket$1 = () => {
   return false;
 };
@@ -3220,6 +3221,7 @@ const handleMessage$1 = event => {
   const actualExecute = event?.target?.execute || execute$1;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError$1, actualRequiresSocket);
 };
+
 const handleIpc$1 = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage$1);
@@ -3228,6 +3230,7 @@ const handleIpc$1 = ipc => {
     ipc.on('message', handleMessage$1);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -3236,7 +3239,8 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$q = async ({
+
+const create$5 = async ({
   commandMap,
   messagePort,
   requiresSocket
@@ -3253,11 +3257,8 @@ const create$q = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const ElectronMessagePortRpcClient = {
-  __proto__: null,
-  create: create$q
-};
-const create$o = async ({
+
+const create$4 = async ({
   argv,
   commandMap,
   env,
@@ -3284,11 +3285,8 @@ const create$o = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const ElectronUtilityProcessRpcParent = {
-  __proto__: null,
-  create: create$o
-};
-const create$n = async ({
+
+const create$3 = async ({
   commandMap,
   requiresSocket,
   webContents
@@ -3304,10 +3302,6 @@ const create$n = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const ElectronWebContentsRpcClient = {
-  __proto__: null,
-  create: create$n
-};
 
 const commandMapRef = Object.create(null);
 
@@ -3421,7 +3415,7 @@ const launchSharedProcess = async ({
     ...process.env,
     ...env
   };
-  const sharedProcessRpc = await ElectronUtilityProcessRpcParent.create({
+  const sharedProcessRpc = await create$4({
     argv: [],
     commandMap: commandMapRef,
     env: fullEnv,
@@ -3450,7 +3444,7 @@ const launchSharedProcess = async ({
     port2
   } = getPortTuple();
   await sharedProcessRpc.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port2, MainProcess);
-  await ElectronMessagePortRpcClient.create({
+  await create$5({
     commandMap: commandMapRef,
     messagePort: port1,
     requiresSocket: requiresSocket
@@ -4337,7 +4331,7 @@ const get$1 = () => {
 };
 const registerWebviewProtocol = async port => {
   object(port);
-  const rpc = await ElectronMessagePortRpcClient.create({
+  const rpc = await create$5({
     commandMap: {},
     messagePort: port,
     requiresSocket: requiresSocket
@@ -4406,7 +4400,7 @@ const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titl
     }
   };
   window.on('close', handleWindowClose);
-  await ElectronWebContentsRpcClient.create({
+  await create$3({
     commandMap: commandMapRef,
     webContents: window.webContents
   });
@@ -4597,7 +4591,7 @@ const get = id => {
 };
 
 const createUtilityProcessRpc = async options => {
-  const rpc = await ElectronUtilityProcessRpcParent.create({
+  const rpc = await create$4({
     commandMap: commandMapRef,
     ...options
   });
@@ -6185,7 +6179,7 @@ const getWindowId = webContentsId => {
 
 const handleElectronMessagePort = async (messagePort, rpcId) => {
   object(messagePort);
-  const rpc = await ElectronMessagePortRpcClient.create({
+  const rpc = await create$5({
     commandMap: commandMapRef,
     messagePort: messagePort,
     requiresSocket: requiresSocket

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "4.11.0",
+  "version": "5.0.0",
   "keywords": [
     "lvce-editor",
     "electron"
@@ -14,7 +14,7 @@
   "type": "module",
   "main": "dist/mainProcessMain.js",
   "dependencies": {
-    "electron": "40.1.0"
+    "electron": "41.1.1"
   },
   "engines": {
     "node": ">=22"