@lynker-desktop/electron-ipc 0.0.9-alpha.5 → 0.0.9-alpha.51

package/esm/renderer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/renderer/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,UAAU,CAAA;AAG7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE9C,eAAO,MAAM,MAAM,QAAO,WAQzB,CAAA;AAED,qBAAa,WAAW;IACtB;;OAEG;IACH,MAAM,KAAK,WAAW,yBAErB;IACD;;;;;OAKG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAQnE;;;;;OAKG;WACS,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAGrE;;;;OAIG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAM/E;;;;OAIG;IACJ,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAM3E;;;;;OAKG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IASnE;;;;;;OAMG;IACJ,MAAM,CAAC,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IASlG;;;;OAIG;IACJ,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAOnF;;;;OAIG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAO/E;;OAEG;WACU,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAUtD;;;OAGG;WACU,6BAA6B,IAAI,OAAO,CAAC,MAAM,CAAC;CAS9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/renderer/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,UAAU,CAAA;AAG7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE9C,eAAO,MAAM,MAAM,QAAO,WAQzB,CAAA;AAED,qBAAa,WAAW;IACtB;;OAEG;IACH,MAAM,KAAK,WAAW,yBAErB;IACD;;;;;;OAMG;WACS,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAGrE;;;;;OAKG;IACJ,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;;;IAW3E;;;;;;OAMG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAUnE;;;;;;;OAOG;IACJ,MAAM,CAAC,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlG;;;;;OAKG;IACJ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;;;IAY/E;;OAEG;WACU,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAUtD;;;OAGG;WACU,6BAA6B,IAAI,OAAO,CAAC,MAAM,CAAC;CAS9D"}

package/esm/renderer/index.js

@@ -1,6 +1,6 @@
+import { getRandomUUID } from '../common/index.js';
 export { WINDOWL_GLOBAL_KEY } from '../common/index.js';
 
-// import { getRandomUUID } from '../common';
 const getIpc = () => {
     try {
         // @ts-ignore
@@ -18,101 +18,82 @@ class RendererIPC {
     static get ipcRenderer() {
         return getIpc();
     }
-    /**
-     * 发送一次性给主进程消息
-     * @param channel
-     * @param args
-     * @returns
-     */
-    static invokeMainOnce(channel, ...args) {
-        return new Promise(resolve => {
-            getIpc().once(`${channel}-reply`, (_event, result) => {
-                resolve(result);
-            });
-            getIpc().send(channel, ...args);
-        });
-    }
     /**
      * 发送给主进程消息
-     * @param channel
-     * @param args
-     * @returns
+     * 使用 Electron 原生的 invoke 方法，支持并发请求
+     * @param channel 消息通道名称
+     * @param args 传递给处理器的参数
+     * @returns Promise<any> 返回处理结果
      */
     static async invokeMain(channel, ...args) {
-        return await getIpc().invoke(channel, ...args);
-    }
-    /**
-     * 处理一次性主进程发送过来的消息
-     * @param channel
-     * @param handler
-     */
-    static handleMainOnce(channel, handler) {
-        getIpc().once(channel, async (_event, ...args) => {
-            const result = await handler(...args);
-            getIpc().send(`${channel}-reply`, result);
-        });
+        return await RendererIPC.ipcRenderer.invoke(channel, ...args);
     }
     /**
      * 处理主进程发送过来的消息
-     * @param channel
-     * @param handler
+     * 支持 requestId 机制，确保并发请求正确匹配
+     * @param channel 消息通道名称
+     * @param handler 处理函数，接收除 requestId 外的所有参数
      */
     static handleMain(channel, handler) {
-        getIpc().on(channel, async (_event, ...args) => {
+        RendererIPC.ipcRenderer.on(channel, async (_event, requestId, ...args) => {
             const result = await handler(...args);
-            getIpc().send(`${channel}-reply`, result);
+            RendererIPC.ipcRenderer.send(`${channel}-reply-${requestId}`, result);
         });
+        return {
+            cancel: () => {
+                RendererIPC.ipcRenderer.removeListener(channel, handler);
+            }
+        };
     }
     /**
      * 发送给渲染进程消息
-     * @param channel
-     * @param args
-     * @returns
+     * 使用唯一的 requestId 确保并发请求不会互相干扰
+     * @param channel 消息通道名称
+     * @param args 传递给渲染进程的参数
+     * @returns Promise<any> 返回渲染进程的处理结果
      */
     static invokeRenderer(channel, ...args) {
         return new Promise(resolve => {
-            getIpc().once(`${channel}-reply`, (_event, result) => {
+            const requestId = getRandomUUID();
+            RendererIPC.ipcRenderer.once(`${channel}-reply-${requestId}`, (_event, result) => {
                 resolve(result);
             });
-            getIpc().send('relay-message', { channel, args });
+            RendererIPC.ipcRenderer.send('relay-message', { channel, requestId, args });
         });
     }
     /**
      * 发送给指定渲染进程消息
-     * @param targetWindowId
-     * @param channel
-     * @param args
-     * @returns
+     * 使用唯一的 requestId 确保并发请求不会互相干扰
+     * @param targetWindowId 目标窗口ID
+     * @param channel 消息通道名称
+     * @param args 传递给渲染进程的参数
+     * @returns Promise<any> 返回渲染进程的处理结果
      */
     static invokeRendererByWinId(targetWindowId, channel, ...args) {
         return new Promise(resolve => {
-            getIpc().once(`${channel}-reply`, (_event, result) => {
+            const requestId = getRandomUUID();
+            RendererIPC.ipcRenderer.once(`${channel}-reply-${requestId}`, (_event, result) => {
                 resolve(result);
             });
-            getIpc().send('relay-message', { targetWindowId, channel, args });
-        });
-    }
-    /**
-     * 处理一次性渲染进程发送过来的消息
-     * @param channel
-     * @param handler
-     */
-    static handleRendererOnce(channel, handler) {
-        getIpc().once(channel, async (_event, ...args) => {
-            const result = await handler(...args);
-            getIpc().send('relay-reply', { originalChannel: channel, result });
+            RendererIPC.ipcRenderer.send('relay-message', { targetWindowId, channel, requestId, args });
         });
     }
     /**
      * 处理渲染进程发送过来的消息
-     * @param channel
-     * @param handler
+     * 支持 requestId 机制，确保并发请求正确匹配
+     * @param channel 消息通道名称
+     * @param handler 处理函数，接收除 requestId 外的所有参数
      */
     static handleRenderer(channel, handler) {
-        getIpc().on(channel, async (_event, ...args) => {
+        RendererIPC.ipcRenderer.on(channel, async (_event, requestId, ...args) => {
             const result = await handler(...args);
-            getIpc().send('relay-reply', { originalChannel: channel, result });
+            RendererIPC.ipcRenderer.send('relay-reply', { originalChannel: channel, requestId, result });
         });
+        return {
+            cancel: () => {
+                RendererIPC.ipcRenderer.removeListener(channel, handler);
+            }
+        };
     }
     /**
      * 获取当前渲染进程id
@@ -120,10 +101,10 @@ class RendererIPC {
     static async getCurrentWebContentId() {
         return new Promise(resolve => {
             const channel = `__GetCurrentWebContentId__`;
-            getIpc().once(`${channel}-reply`, (_event, result) => {
+            RendererIPC.ipcRenderer.once(`${channel}-reply`, (_event, result) => {
                 resolve(result);
             });
-            getIpc().send(channel);
+            RendererIPC.ipcRenderer.send(channel);
         });
     }
     /**
@@ -133,10 +114,10 @@ class RendererIPC {
     static async openCurrentWebContentDevTools() {
         return new Promise(resolve => {
             const channel = `__OpenCurrentWebContentDevTools__`;
-            getIpc().once(`${channel}-reply`, (_event, result) => {
+            RendererIPC.ipcRenderer.once(`${channel}-reply`, (_event, result) => {
                 resolve(result);
             });
-            getIpc().send(channel);
+            RendererIPC.ipcRenderer.send(channel);
         });
     }
 }

package/esm/renderer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/renderer/index.ts"],"sourcesContent":["import type { IpcRenderer, IpcRendererEvent } from 'electron'\n// import { getRandomUUID } from '../common';\n\nexport { WINDOWL_GLOBAL_KEY } from '../common'\n\nexport const getIpc = (): IpcRenderer => {\n  try {\n    // @ts-ignore\n    return window.__ELECTRON_IPC__ || window?.require('electron').ipcRenderer\n  } catch (error) {\n    console.error('当前非桌面端环境, 请在桌面端中调用');\n    return {} as IpcRenderer;\n  }\n}\n\nexport class RendererIPC {\n  /**\n   * 原生ipcRenderer\n   */\n  static get ipcRenderer() {\n    return getIpc()\n  }\n  /**\n   * 发送一次性给主进程消息\n   * @param channel\n   * @param args\n   * @returns\n   */\n\tstatic invokeMainOnce(channel: string, ...args: any[]): Promise<any> {\n\t\treturn new Promise(resolve => {\n\t\t\tgetIpc().once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tgetIpc().send(channel, ...args)\n\t\t})\n\t}\n  /**\n   * 发送给主进程消息\n   * @param channel\n   * @param args\n   * @returns\n   */\n\tstatic async invokeMain(channel: string, ...args: any[]): Promise<any> {\n\t\treturn await getIpc().invoke(channel, ...args)\n\t}\n  /**\n   * 处理一次性主进程发送过来的消息\n   * @param channel\n   * @param handler\n   */\n\tstatic handleMainOnce(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tgetIpc().once(channel, async (_event: IpcRendererEvent, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tgetIpc().send(`${channel}-reply`, result)\n\t\t})\n\t}\n  /**\n   * 处理主进程发送过来的消息\n   * @param channel\n   * @param handler\n   */\n\tstatic handleMain(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tgetIpc().on(channel, async (_event: IpcRendererEvent, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tgetIpc().send(`${channel}-reply`, result)\n\t\t})\n\t}\n  /**\n   * 发送给渲染进程消息\n   * @param channel\n   * @param args\n   * @returns\n   */\n\tstatic invokeRenderer(channel: string, ...args: any[]): Promise<any> {\n\t\treturn new Promise(resolve => {\n\t\t\tgetIpc().once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tgetIpc().send('relay-message', { channel, args })\n\t\t})\n\t}\n\n  /**\n   * 发送给指定渲染进程消息\n   * @param targetWindowId\n   * @param channel\n   * @param args\n   * @returns\n   */\n\tstatic invokeRendererByWinId(targetWindowId: number, channel: string, ...args: any[]): Promise<any> {\n\t\treturn new Promise(resolve => {\n\t\t\tgetIpc().once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tgetIpc().send('relay-message', { targetWindowId, channel, args })\n\t\t})\n\t}\n\n  /**\n   * 处理一次性渲染进程发送过来的消息\n   * @param channel\n   * @param handler\n   */\n\tstatic handleRendererOnce(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tgetIpc().once(channel, async (_event: IpcRendererEvent, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tgetIpc().send('relay-reply', { originalChannel: channel, result })\n\t\t})\n\t}\n\n  /**\n   * 处理渲染进程发送过来的消息\n   * @param channel\n   * @param handler\n   */\n\tstatic handleRenderer(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tgetIpc().on(channel, async (_event: IpcRendererEvent, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tgetIpc().send('relay-reply', { originalChannel: channel, result })\n\t\t})\n\t}\n\n  /**\n   * 获取当前渲染进程id\n   */\n  static async getCurrentWebContentId(): Promise<number> {\n    return new Promise(resolve => {\n      const channel = `__GetCurrentWebContentId__`\n\t\t\tgetIpc().once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tgetIpc().send(channel)\n\t\t})\n  }\n\n  /**\n   * 打开当前窗口的开发者工具\n   * @returns\n   */\n  static async openCurrentWebContentDevTools(): Promise<number> {\n    return new Promise(resolve => {\n      const channel = `__OpenCurrentWebContentDevTools__`\n\t\t\tgetIpc().once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tgetIpc().send(channel)\n\t\t})\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/renderer/index.ts"],"sourcesContent":["import type { IpcRenderer, IpcRendererEvent } from 'electron'\nimport { getRandomUUID } from '../common';\n\nexport { WINDOWL_GLOBAL_KEY } from '../common'\n\nexport const getIpc = (): IpcRenderer => {\n  try {\n    // @ts-ignore\n    return window.__ELECTRON_IPC__ || window?.require('electron').ipcRenderer\n  } catch (error) {\n    console.error('当前非桌面端环境, 请在桌面端中调用');\n    return {} as IpcRenderer;\n  }\n}\n\nexport class RendererIPC {\n  /**\n   * 原生ipcRenderer\n   */\n  static get ipcRenderer() {\n    return getIpc()\n  }\n  /**\n   * 发送给主进程消息\n   * 使用 Electron 原生的 invoke 方法，支持并发请求\n   * @param channel 消息通道名称\n   * @param args 传递给处理器的参数\n   * @returns Promise<any> 返回处理结果\n   */\n\tstatic async invokeMain(channel: string, ...args: any[]): Promise<any> {\n\t\treturn await RendererIPC.ipcRenderer.invoke(channel, ...args)\n\t}\n  /**\n   * 处理主进程发送过来的消息\n   * 支持 requestId 机制，确保并发请求正确匹配\n   * @param channel 消息通道名称\n   * @param handler 处理函数，接收除 requestId 外的所有参数\n   */\n\tstatic handleMain(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tRendererIPC.ipcRenderer.on(channel, async (_event: IpcRendererEvent, requestId: string, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tRendererIPC.ipcRenderer.send(`${channel}-reply-${requestId}`, result)\n\t\t})\n    return {\n      cancel: () => {\n        RendererIPC.ipcRenderer.removeListener(channel, handler)\n      }\n    };\n\t}\n  /**\n   * 发送给渲染进程消息\n   * 使用唯一的 requestId 确保并发请求不会互相干扰\n   * @param channel 消息通道名称\n   * @param args 传递给渲染进程的参数\n   * @returns Promise<any> 返回渲染进程的处理结果\n   */\n\tstatic invokeRenderer(channel: string, ...args: any[]): Promise<any> {\n\t\treturn new Promise(resolve => {\n\t\t\tconst requestId = getRandomUUID()\n\t\t\tRendererIPC.ipcRenderer.once(`${channel}-reply-${requestId}`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tRendererIPC.ipcRenderer.send('relay-message', { channel, requestId, args })\n\t\t})\n\t}\n\n  /**\n   * 发送给指定渲染进程消息\n   * 使用唯一的 requestId 确保并发请求不会互相干扰\n   * @param targetWindowId 目标窗口ID\n   * @param channel 消息通道名称\n   * @param args 传递给渲染进程的参数\n   * @returns Promise<any> 返回渲染进程的处理结果\n   */\n\tstatic invokeRendererByWinId(targetWindowId: number, channel: string, ...args: any[]): Promise<any> {\n\t\treturn new Promise(resolve => {\n\t\t\tconst requestId = getRandomUUID()\n\t\t\tRendererIPC.ipcRenderer.once(`${channel}-reply-${requestId}`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tRendererIPC.ipcRenderer.send('relay-message', { targetWindowId, channel, requestId, args })\n\t\t})\n\t}\n\n  /**\n   * 处理渲染进程发送过来的消息\n   * 支持 requestId 机制，确保并发请求正确匹配\n   * @param channel 消息通道名称\n   * @param handler 处理函数，接收除 requestId 外的所有参数\n   */\n\tstatic handleRenderer(channel: string, handler: (...args: any[]) => Promise<any>) {\n\t\tRendererIPC.ipcRenderer.on(channel, async (_event: IpcRendererEvent, requestId: string, ...args: any[]) => {\n\t\t\tconst result = await handler(...args)\n\t\t\tRendererIPC.ipcRenderer.send('relay-reply', { originalChannel: channel, requestId, result })\n\t\t})\n    return {\n      cancel: () => {\n        RendererIPC.ipcRenderer.removeListener(channel, handler)\n      }\n    };\n\t}\n\n  /**\n   * 获取当前渲染进程id\n   */\n  static async getCurrentWebContentId(): Promise<number> {\n    return new Promise(resolve => {\n      const channel = `__GetCurrentWebContentId__`\n\t\t\tRendererIPC.ipcRenderer.once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tRendererIPC.ipcRenderer.send(channel)\n\t\t})\n  }\n\n  /**\n   * 打开当前窗口的开发者工具\n   * @returns\n   */\n  static async openCurrentWebContentDevTools(): Promise<number> {\n    return new Promise(resolve => {\n      const channel = `__OpenCurrentWebContentDevTools__`\n\t\t\tRendererIPC.ipcRenderer.once(`${channel}-reply`, (_event: IpcRendererEvent, result: any) => {\n\t\t\t\tresolve(result)\n\t\t\t})\n\t\t\tRendererIPC.ipcRenderer.send(channel)\n\t\t})\n  }\n}\n"],"names":[],"mappings":"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"}

package/main/index.d.ts

@@ -1,60 +1,123 @@
 export declare let isInitialized: boolean;
+/**
+ * 主进程 IPC 通信类
+ * 负责处理主进程与渲染进程之间的消息通信
+ * 使用单例模式确保全局唯一实例
+ *
+ * 修复说明：
+ * - 为每个请求生成唯一的 requestId，解决并发请求数据错乱问题
+ * - 确保请求和响应能够正确匹配，避免多个并发请求互相干扰
+ */
 declare class MainIPC {
     static instance: MainIPC;
     private eventEmitter;
     constructor();
     /**
      * 发送给主进程消息
-     * @param channel
-     * @param args
-     * @returns
+     * 使用唯一的 requestId 确保并发请求不会互相干扰
+     *
+     * @param channel 消息通道名称
+     * @param args 传递给处理器的参数
+     * @returns Promise<any> 返回处理结果
+     *
+     * 修复说明：
+     * - 为每个请求生成唯一的 requestId
+     * - 监听 `${channel}-reply-${requestId}` 事件，确保只接收对应请求的回复
+     * - 发送请求时包含 requestId，让处理器知道如何回复
      */
-    invokeMain(channel: string, ...args: any[]): Promise<unknown>;
-    /**
-     * 处理一次性主进程发送过来的消息
-     * @param channel
-     * @param handler
-     */
-    handleMainOnce(channel: string, handler: (...args: any[]) => Promise<any>): void;
+    invokeMain(channel: string, ...args: any[]): Promise<any>;
     /**
      * 处理主进程发送过来的消息
-     * @param channel
-     * @param handler
+     * 持续监听指定通道的消息
+     *
+     * @param channel 消息通道名称
+     * @param handler 处理函数，接收除 requestId 外的所有参数
+     *
+     * 修复说明：
+     * - 接收 requestId 作为第一个参数
+     * - 使用 `${channel}-reply-${requestId}` 发送回复，确保回复给正确的请求
+     * - 支持多个并发请求，每个请求都有独立的回复通道
      */
-    handleMain(channel: string, handler: (...args: any[]) => Promise<any>): void;
+    handleMain(channel: string, handler: (...args: any[]) => Promise<any>): {
+        cancel: () => void;
+    };
     /**
      * 发送给渲染进程消息
-     * @param webContents
-     * @param channel
-     * @param args
-     * @returns
+     * 使用唯一的 requestId 确保并发请求不会互相干扰
+     *
+     * @param webContents 目标渲染进程的 WebContents 对象
+     * @param channel 消息通道名称
+     * @param args 传递给渲染进程的参数
+     * @returns Promise<any> 返回渲染进程的处理结果
+     *
+     * 修复说明：
+     * - 为每个请求生成唯一的 requestId
+     * - 监听 `${channel}-reply-${requestId}` 事件，确保只接收对应请求的回复
+     * - 发送请求时包含 requestId，让渲染进程知道如何回复
+     * - 等待渲染进程加载完成后再发送消息，确保消息能够被正确接收
      */
     invokeRenderer(webContents: Electron.WebContents, channel: string, ...args: any[]): Promise<any>;
     /**
-     * 发送给所有渲染进程消息
-     * @param channel
-     * @param args
-     * @returns
-     */
+   * 发送给所有渲染进程消息
+   * 向所有渲染进程发送消息并收集所有响应
+   *
+   * @param channel 消息通道名称
+   * @param args 传递给所有渲染进程的参数
+   * @returns Promise<any[]> 返回所有渲染进程的处理结果数组
+   *
+   * 修复说明：
+   * - 为每个请求生成唯一的 requestId
+   * - 收集所有渲染进程的响应，当所有响应都收到时才 resolve
+   * - 使用 `${channel}-reply-${requestId}` 确保只接收对应请求的回复
+   * - 如果没有渲染进程，直接返回空数组
+   * - 等待每个渲染进程加载完成后再发送消息
+   */
     invokeAllRenderer(channel: string, ...args: any[]): Promise<any>;
-    /**
-     * 处理一次性渲染进程发送过来的消息
-     * @param channel
-     * @param handler
-     */
-    handleRendererOnce(channel: string, handler: (...args: any[]) => Promise<any>): void;
     /**
      * 处理渲染进程发送过来的消息
-     * @param channel
-     * @param handler
+     * 持续监听指定通道的消息，支持超时处理
+     *
+     * @param channel 消息通道名称
+     * @param handler 处理函数，接收除 requestId 外的所有参数
+     *
+     * 修复说明：
+     * - 接收 requestId 作为第一个参数
+     * - 使用 ipcMain.handle 替代 ipcMain.on，提供更好的错误处理
+     * - 支持 8 秒超时机制，避免长时间等待
+     * - 支持并发请求，每个请求都有独立的处理流程
+     * - 提供详细的错误日志记录
      */
-    handleRenderer(channel: string, handler: (...args: any[]) => Promise<any>): void;
+    handleRenderer(channel: string, handler: (...args: any[]) => Promise<any>): {
+        cancel: () => void;
+    };
     /**
-     * 初始化
+     * 初始化消息中继功能
+     * 设置消息转发和回复机制，支持跨渲染进程通信
+     *
+     * 功能说明：
+     * - relay-message: 转发消息到指定的渲染进程或所有渲染进程
+     * - relay-reply: 处理回复消息，广播给所有渲染进程
+     * - __GetCurrentWebContentId__: 获取当前 WebContent ID
+     * - __OpenCurrentWebContentDevTools__: 打开当前 WebContent 的开发者工具
      */
     relayMessage(): void;
 }
+/**
+ * 全局 MainIPC 实例
+ * 使用全局变量确保单例模式，避免重复创建实例
+ */
 export declare const mainIPC: MainIPC;
+/**
+ * 初始化 IPC 通信系统
+ * 设置消息中继功能，确保跨进程通信正常工作
+ *
+ * @returns MainIPC 实例
+ *
+ * 功能说明：
+ * - 检查是否已经初始化，避免重复初始化
+ * - 设置消息中继功能，支持跨渲染进程通信
+ * - 返回全局 MainIPC 实例
+ */
 export declare const initialize: () => any;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/main/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":"AAIA,eAAO,IAAI,aAAa,SAAQ,CAAC;AACjC,cAAM,OAAO;IACZ,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,YAAY,CAAmC;;IAUtD;;;;;OAKG;IACE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAS/C;;;;OAIG;IACJ,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAOxE;;;;OAIG;IACJ,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAOpE;;;;;;OAMG;IACJ,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAoB/F;;;;;OAKG;IACJ,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAqB/D;;;;OAIG;IACJ,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAM5E;;;;OAIG;IACJ,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAqCxE;;OAEG;IACJ,YAAY;CA8CZ;AAED,eAAO,MAAM,OAAO,EAAE,OAAgH,CAAC;AAEvI,eAAO,MAAM,UAAU,WAWtB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":"AAIA,eAAO,IAAI,aAAa,SAAQ,CAAC;AAEjC;;;;;;;;GAQG;AACH,cAAM,OAAO;IACZ,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,YAAY,CAAmC;;IAUtD;;;;;;;;;;;;OAYG;IACE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IA8B9D;;;;;;;;;;;OAWG;IACJ,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;;;IAYpE;;;;;;;;;;;;;;OAcG;IACJ,cAAc,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IA+C7F;;;;;;;;;;;;;;KAcC;IACJ,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAuD/D;;;;;;;;;;;;;OAaG;IACJ,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;;;IAyCxE;;;;;;;;;OASG;IACJ,YAAY;CAkEZ;AAED;;;GAGG;AAEH,eAAO,MAAM,OAAO,EAAE,OAAgH,CAAC;AAEvI;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU,WAWtB,CAAA"}