fix: BuddyReq

NapNeko · Aug 24, 2024 · 212c802 · 212c802
1 parent 984b5d6
commit 212c802
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 25 deletions.
diff --git a/src/common/framework/event-legacy.ts b/src/common/framework/event-legacy.ts
@@ -162,7 +162,89 @@ export class LegacyNTEventWrapper {
             this.createListenerFunction(ListenerMainName);
         });
     }
+    async CallNormalEventV2<
+        EventType extends (...args: any[]) => Promise<any>,
+        ListenerType extends (...args: any[]) => void
+    >(
+        EventName = '',
+        ListenerName = '',
+        waitTimes = 1,
+        timeout: number = 3000,
+        checkerEvent: (ret: Awaited<ReturnType<EventType>>) => boolean = () => true,
+        checkerListener: (...args: Parameters<ListenerType>) => boolean = () => true,
+        ...args: Parameters<EventType>
+    ) {
+        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
+            async (resolve, reject) => {
+                const id = randomUUID();
+                let complete = 0;
+                let retData: Parameters<ListenerType> | undefined = undefined;
+                let retEvent: any = {};
+                const databack = () => {
+                    if (complete == 0) {
+                        reject(
+                            new Error(
+                                'Timeout: NTEvent EventName:' +
+                                EventName +
+                                ' ListenerName:' +
+                                ListenerName +
+                                ' EventRet:\n' +
+                                JSON.stringify(retEvent, null, 4) +
+                                '\n',
+                            ),
+                        );
+                    } else {
+                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+                    }
+                };
 
+                const ListenerNameList = ListenerName.split('/');
+                const ListenerMainName = ListenerNameList[0];
+                const ListenerSubName = ListenerNameList[1];
+
+                const Timeouter = setTimeout(databack, timeout);
+
+                const eventCallbak = {
+                    timeout: timeout,
+                    createtime: Date.now(),
+                    checker: checkerListener,
+                    func: (...args: any[]) => {
+                        complete++;
+                        //console.log('func', ...args);
+                        retData = args as Parameters<ListenerType>;
+                        if (complete >= waitTimes) {
+                            clearTimeout(Timeouter);
+                            databack();
+                        }
+                    },
+                };
+                if (!this.EventTask.get(ListenerMainName)) {
+                    this.EventTask.set(ListenerMainName, new Map());
+                }
+                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
+                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+                }
+                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+                this.createListenerFunction(ListenerMainName);
+                const EventFunc = this.createEventFunction<EventType>(EventName);
+                retEvent = await EventFunc!(...(args as any[]));
+                if(!checkerEvent(retEvent)){
+                    clearTimeout(Timeouter);
+                    reject(
+                        new Error(
+                            'EventChecker Failed: NTEvent EventName:' +
+                            EventName +
+                            ' ListenerName:' +
+                            ListenerName +
+                            ' EventRet:\n' +
+                            JSON.stringify(retEvent, null, 4) +
+                            '\n',
+                        ),
+                    );
+                }
+            },
+        );
+    }
     async CallNormalEvent<
         EventType extends (...args: any[]) => Promise<any>,
         ListenerType extends (...args: any[]) => void

diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts
@@ -1,5 +1,5 @@
 import { Friend, FriendV2, User } from '@/core/entities';
-import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
+import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelBuddyListener, NodeIKernelBuddyService, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
 import { LimitedHashTable } from '@/common/utils/MessageUnique';
 
 export class NTQQFriendApi {
@@ -70,31 +70,14 @@ export class NTQQFriendApi {
     async isBuddy(uid: string) {
         return this.context.session.getBuddyService().isBuddy(uid);
     }
-    async clearBuddyReqUnreadCnt(){
+    async clearBuddyReqUnreadCnt() {
         return this.context.session.getBuddyService().clearBuddyReqUnreadCnt();
     }
-    /**
-     * @deprecated
-     * @param forced
-     * @returns
-     */
-    async getFriends(forced = false): Promise<User[]> {
-        const [_retData, _BuddyArg] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise<any>, (arg: OnBuddyChangeParams) => void>
-            (
-            'NodeIKernelBuddyService/getBuddyList',
-            'NodeIKernelBuddyListener/onBuddyListChange',
-            1,
-            5000,
-            () => true,
-            forced,
-            );
-        const friends: User[] = [];
-        for (const categoryItem of _BuddyArg) {
-            for (const friend of categoryItem.buddyList) {
-                friends.push(friend);
-            }
-        }
-        return friends;
+    async getBuddyReq() {
+        const [, ret] = await this.core.eventWrapper.CallNormalEventV2
+            <NodeIKernelBuddyService['getBuddyReq'], NodeIKernelBuddyListener['onBuddyReqChange']>
+            ('NodeIKernelBuddyService/getBuddyReq', 'NodeIKernelBuddyListener/onBuddyReqChange', 1, 5000);
+        return ret;
     }
 
     async handleFriendRequest(flag: string, accept: boolean) {

diff --git a/src/core/services/NodeIKernelBuddyService.ts b/src/core/services/NodeIKernelBuddyService.ts
@@ -61,7 +61,7 @@ export interface NodeIKernelBuddyService {
 
     getBuddyReqUnreadCnt(): number;
 
-    getBuddyReq(): unknown;
+    getBuddyReq(): Promise<GeneralCallResult>;
 
     delBuddyReq(uid: number): void;