feat: Adjust the signature of invokeNative

pk5ls20 · Jul 8, 2024 · ae5e69a · ae5e69a
1 parent f2a22c9
commit ae5e69a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/invokeNTQQ/invokeNative.ts b/src/main/invokeNTQQ/invokeNative.ts
@@ -47,6 +47,7 @@ class SCListener<CB1, CB2> {
 
   private setupListener(eventName: string) {
     this.eventEmitter.on(eventName, (result: any) => {
+      // log.debug('SCListeners: Received event:', eventName, result);
       for (const [uuid, cond] of this.checkMap.entries()) {
         if (cond(result)) {
           // log.debug('SCListeners: Condition met:', uuid, result);
@@ -80,8 +81,8 @@ export async function invokeNative<
   RTS1 = never extends RTS1B ? never : RTS1B,
   RTS2 = never extends RTS2B ? never : RTS2B
 >(
-  eventName: string = 'ns-ntApi-2',
   cmdName: string,
+  eventName: string = 'ns-ntApi-2',
   channel: string = 'IPC_UP_2',
   args: AGT = [] as unknown as AGT,
   timeout: number = IPC_TIMEOUT,

diff --git a/src/main/main.ts b/src/main/main.ts
@@ -164,8 +164,8 @@ const getForwardMsgContent = async (msgData: forwardMsgData): Promise<RawMessage
   ];
   // log.debug('await invokeNative in args: ', JSON.stringify(args));
   const res = await invokeNative<unknown[], GeneralCallResult, { msgList: RawMessage[] }>(
-    'ns-ntApi-2',
     'nodeIKernelMsgService/getMultiMsg',
+    'ns-ntApi-2',
     'IPC_UP_2',
     args
   );
@@ -238,8 +238,8 @@ ipcMain.handle(channel.GET_FORWARD_MSG_CONTENT, async (_, msgData: forwardMsgDat
         null
       ];
       return invokeNative<ApiParams, GeneralCallResult, null, any, { notifyInfo: { filePath: string; msgId: string } }>(
-        'ns-ntApi-2',
         'nodeIKernelMsgService/downloadRichMedia',
+        'ns-ntApi-2',
         'IPC_UP_2',
         apiParams,
         100000,