fix: #596

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.2.18",
+  "version": "4.2.19",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.18",
+  "version": "4.2.19",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.18';
+export const napCatVersion = '4.2.19';

src/core/apis/user.ts

@@ -2,21 +2,20 @@ import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
 import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
+import { promisify } from 'node:util';
+import { LRUCache } from '@/common/lru-cache';
 
 export class NTQQUserApi {
     context: InstanceContext;
     core: NapCatCore;
+    private uidCache: LRUCache<string, string>;
+    private uinCache: LRUCache<string, string>;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-    }
-    //self_tind格式
-    async createUidFromTinyId(tinyId: string) {
-        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
-    }
-    async getStatusByUid(uid: string) {
-        return this.context.session.getProfileService().getStatus(uid);
+        this.uidCache = new LRUCache(1000);
+        this.uinCache = new LRUCache(1000);
     }
 
     async getCoreAndBaseInfo(uids: string[]) {
@@ -170,20 +169,26 @@ export class NTQQUserApi {
         if (!skey) {
             throw new Error('SKey is Empty');
         }
+
         return skey;
     }
 
     async getUidByUinV2(Uin: string) {
+        if (this.uidCache.get(Uin)) {
+            return this.uidCache.get(Uin);
+        }
         const services = [
-            () => this.context.session.getGroupService().getUidByUins([Uin]).then((data) => data.uids.get(Uin)).catch(() => undefined),
-            () => this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin]).then((data) => data.get(Uin)).catch(() => undefined),
             () => this.context.session.getUixConvertService().getUid([Uin]).then((data) => data.uidInfo.get(Uin)).catch(() => undefined),
+            () => promisify<string, string[], Map<string, string>>
+                (this.context.session.getProfileService().getUidByUin)('FriendsServiceImpl', [Uin]).then((data) => data.get(Uin)).catch(() => undefined),
+            () => this.context.session.getGroupService().getUidByUins([Uin]).then((data) => data.uids.get(Uin)).catch(() => undefined),
             () => this.getUserDetailInfoByUin(Uin).then((data) => data.detail.uid).catch(() => undefined),
         ];
         let uid: string | undefined = undefined;
         for (const service of services) {
             uid = await service();
             if (uid && uid.indexOf('*') == -1 && uid !== '') {
+                this.uidCache.put(Uin, uid);
                 break;
             }
         }
@@ -191,10 +196,14 @@ export class NTQQUserApi {
     }
 
     async getUinByUidV2(Uid: string) {
+        if (this.uinCache.get(Uid)) {
+            return this.uinCache.get(Uid);
+        }
         const services = [
-            () => this.context.session.getGroupService().getUinByUids([Uid]).then((data) => data.uins.get(Uid)).catch(() => undefined),
-            () => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid]).then((data) => data.get(Uid)).catch(() => undefined),
             () => this.context.session.getUixConvertService().getUin([Uid]).then((data) => data.uinInfo.get(Uid)).catch(() => undefined),
+            () => this.context.session.getGroupService().getUinByUids([Uid]).then((data) => data.uins.get(Uid)).catch(() => undefined),
+            () => promisify<string, string[], Map<string, string>>
+                (this.context.session.getProfileService().getUinByUid)('FriendsServiceImpl', [Uid]).then((data) => data.get(Uid)).catch(() => undefined),
             () => this.core.apis.FriendApi.getBuddyIdMap(true).then((data) => data.getKey(Uid)).catch(() => undefined),
             () => this.getUserDetailInfo(Uid).then((data) => data.uin).catch(() => undefined),
         ];
@@ -202,6 +211,7 @@ export class NTQQUserApi {
         for (const service of services) {
             uin = await service();
             if (uin && uin !== '0' && uin !== '') {
+                this.uinCache.put(Uid, uin);
                 break;
             }
         }

src/core/services/NodeIKernelProfileService.ts

@@ -9,9 +9,9 @@ export interface NodeIKernelProfileService {
 
     getRelationFlag(callfrom: string, uids: string[]): Promise<Map<string, any>>;
 
-    getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>;
+    getUidByUin(callfrom: string, uin: Array<string>): Map<string, string>;
 
-    getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>;
+    getUinByUid(callfrom: string, uid: Array<string>): Map<string, string>;
 
     getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;