@lvce-editor/ipc 12.1.0 → 13.0.0

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export const IpcChildWithRendererProcess2: IpcChild
 export const IpcChildWithModuleWorkerAndMessagePort: IpcChild
 export const IpcChildWithModuleWorker: IpcChild
 export const IpcChildWithMessagePort: IpcChild
+export const IpcChildWithElectronWindow: IpcChild
 
 interface IpcParent {
   readonly create: any

package/dist/index.js

@@ -1,28 +1,6 @@
 import { VError } from '@lvce-editor/verror';
 import { string } from '@lvce-editor/assert';
 
-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;
-  }
-};
-
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -54,6 +32,28 @@ const isTransferrable = value => {
   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;
+  }
+};
+
 const getTransferrables = value => {
   const transferrables = [];
   walkValue(value, transferrables, isTransferrable);
@@ -139,10 +139,6 @@ const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND';
 
 const NewLine = '\n';
 
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
-
 const splitLines = lines => {
   return lines.split(NewLine);
 };
@@ -160,6 +156,10 @@ const getModuleNotFoundError = stderr => {
   };
 };
 
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+
 const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
 const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
@@ -246,7 +246,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: `${actualMessage}`,
+    message: actualMessage,
     code: '',
     stack: rest
   };
@@ -291,9 +291,6 @@ const signal$b = messagePort => {
   messagePort.start();
 };
 class IpcChildWithElectronMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData = getActualDataElectron;
   send(message) {
     this._rawIpc.postMessage(message);
@@ -455,9 +452,6 @@ const signal$8 = port => {
   port.postMessage(readyMessage);
 };
 class IpcChildWithMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(event) {
     return getData$2(event);
   }
@@ -540,6 +534,7 @@ const withResolvers = () => {
     _resolve = resolve;
   });
   return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     resolve: _resolve,
     promise
   };
@@ -580,9 +575,6 @@ const listen$6 = async () => {
   return globalThis;
 };
 class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(event) {
     return getData$2(event);
   }
@@ -616,14 +608,6 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$d
 };
 
-const getTransferrablesNode = value => {
-  const transferrables = getTransferrables(value);
-  if (transferrables.length === 0) {
-    throw new Error(`no transferrables found`);
-  }
-  return transferrables[0];
-};
-
 const getActualData = (message, handle) => {
   if (handle) {
     return {
@@ -634,6 +618,14 @@ const getActualData = (message, handle) => {
   return message;
 };
 
+const getTransferrablesNode = value => {
+  const transferrables = getTransferrables(value);
+  if (transferrables.length === 0) {
+    throw new Error(`no transferrables found`);
+  }
+  return transferrables[0];
+};
+
 const listen$5 = async () => {
   if (!process.send) {
     throw new Error('process.send must be defined');
@@ -644,9 +636,6 @@ const signal$6 = process => {
   process.send(readyMessage);
 };
 class IpcChildWithNodeForkedProcess extends Ipc {
-  constructor(process) {
-    super(process);
-  }
   getData(message, handle) {
     return getActualData(message, handle);
   }
@@ -737,9 +726,6 @@ const signal$4 = parentPort => {
   parentPort.postMessage(readyMessage);
 };
 class IpcChildWithNodeWorker extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(data) {
     return data;
   }
@@ -1056,9 +1042,6 @@ const signal$1 = messagePort => {
   messagePort.start();
 };
 class IpcParentWithElectronMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData = getActualDataElectron;
   send(message) {
     this._rawIpc.postMessage(message);
@@ -1095,12 +1078,6 @@ const Exit = 1;
 const Error$2 = 2;
 const Message$1 = 3;
 
-/**
- *
- * @param {any} utilityProcess
- * @returns
- */
-// @ts-ignore
 const getFirstUtilityProcessEvent = async utilityProcess => {
   const {
     resolve,
@@ -1108,7 +1085,6 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
   } = withResolvers();
   let stdout = '';
   let stderr = '';
-  // @ts-ignore
   const cleanup = value => {
     // @ts-ignore
     utilityProcess.stderr.off('data', handleStdErrData);
@@ -1116,18 +1092,14 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
     utilityProcess.stdout.off('data', handleStdoutData);
     utilityProcess.off('message', handleMessage);
     utilityProcess.off('exit', handleExit);
-    // @ts-ignore
     resolve(value);
   };
-  // @ts-ignore
   const handleStdErrData = data => {
     stderr += data;
   };
-  // @ts-ignore
   const handleStdoutData = data => {
     stdout += data;
   };
-  // @ts-ignore
   const handleMessage = event => {
     cleanup({
       type: Message$1,
@@ -1136,7 +1108,6 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
       stderr
     });
   };
-  // @ts-ignore
   const handleExit = event => {
     cleanup({
       type: Exit,
@@ -1151,7 +1122,6 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
   utilityProcess.stdout.on('data', handleStdoutData);
   utilityProcess.on('message', handleMessage);
   utilityProcess.on('exit', handleExit);
-  // @ts-ignore
   const {
     type,
     event
@@ -1164,7 +1134,6 @@ const getFirstUtilityProcessEvent = async utilityProcess => {
   };
 };
 
-// @ts-ignore
 const create$5 = async ({
   path,
   argv = [],
@@ -1263,9 +1232,6 @@ const signal = messagePort => {
   messagePort.start();
 };
 class IpcParentWithMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData = getData$2;
   send(message) {
     this._rawIpc.postMessage(message);
@@ -1445,9 +1411,7 @@ const fixNodeChildProcessParameters = value => {
   };
 };
 
-// @ts-ignore
 const getFirstNodeChildProcessEvent = async childProcess => {
-  // @ts-ignore
   const {
     type,
     event,
@@ -1456,7 +1420,6 @@ const getFirstNodeChildProcessEvent = async childProcess => {
   } = await new Promise((resolve, reject) => {
     let stderr = '';
     let stdout = '';
-    // @ts-ignore
     const cleanup = value => {
       if (childProcess.stdout && childProcess.stderr) {
         childProcess.stderr.off('data', handleStdErrData);
@@ -1467,15 +1430,12 @@ const getFirstNodeChildProcessEvent = async childProcess => {
       childProcess.off('error', handleError);
       resolve(value);
     };
-    // @ts-ignore
     const handleStdErrData = data => {
       stderr += data;
     };
-    // @ts-ignore
     const handleStdoutData = data => {
       stdout += data;
     };
-    // @ts-ignore
     const handleMessage = event => {
       cleanup({
         type: Message$1,
@@ -1484,7 +1444,6 @@ const getFirstNodeChildProcessEvent = async childProcess => {
         stderr
       });
     };
-    // @ts-ignore
     const handleExit = event => {
       cleanup({
         type: Exit,
@@ -1493,7 +1452,6 @@ const getFirstNodeChildProcessEvent = async childProcess => {
         stderr
       });
     };
-    // @ts-ignore
     const handleError = event => {
       cleanup({
         type: Error$2,
@@ -1622,7 +1580,6 @@ const create$1 = async ({
   env = process.env,
   execArgv = []
 }) => {
-  // @ts-ignore
   string(path);
   const actualArgv = ['--ipc-type=node-worker', ...argv];
   const actualEnv = {
@@ -1637,7 +1594,6 @@ const create$1 = async ({
     env: actualEnv,
     execArgv
   });
-  // @ts-ignore
   const {
     type,
     event
@@ -1654,9 +1610,6 @@ const create$1 = async ({
   return worker;
 };
 class IpcParentWithNodeWorker extends Ipc {
-  constructor(worker) {
-    super(worker);
-  }
   getData(message) {
     return message;
   }
@@ -1670,8 +1623,8 @@ class IpcParentWithNodeWorker extends Ipc {
     } = fixNodeWorkerParameters(message);
     this._rawIpc.postMessage(newValue, transfer);
   }
-  dispose() {
-    this._rawIpc.terminate();
+  async dispose() {
+    await this._rawIpc.terminate();
   }
   onClose(callback) {
     this._rawIpc.on('exit', callback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/ipc",
-  "version": "12.1.0",
+  "version": "13.0.0",
   "description": "Inter Process Communication for Lvce Editor",
   "main": "dist/index.js",
   "type": "module",
@@ -20,7 +20,7 @@
     "@lvce-editor/web-socket-server": "^1.4.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "types": "dist/index.d.ts",
   "browser": "dist/browser.js"