fix: 加载卡顿，群成员名片变动

src/main/main.ts

@@ -25,7 +25,7 @@ import {
   selfInfo,
   uidMaps,
 } from '../common/data'
-import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook } from '../ntqqapi/hook'
+import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook, startHook } from '../ntqqapi/hook'
 import { OB11Constructor } from '../onebot11/constructor'
 import {
   ChatType,
@@ -200,6 +200,7 @@ function onLoad() {
   }
 
   async function startReceiveHook() {
+    startHook().then()
     if (getConfigUtil().getConfig().enablePoke) {
       crychic.loadNode()
       crychic.registerPokeHandler((id, isGroup) => {
@@ -436,14 +437,33 @@ function onLoad() {
         uidMaps[value] = key
       }
     })
-    startReceiveHook().then()
+    try{
-    NTQQGroupApi.getGroups(true).then(groups=> {
+      log('start get groups')
-        for (let group of groups) {
+      const _groups = await NTQQGroupApi.getGroups()
+      log('_groups', _groups)
+      await Promise.all(
+        _groups.map(async (group) => {
+          try {
+            const members = await NTQQGroupApi.getGroupMembers(group.groupCode)
+            group.members = members
+            groups.push(group)
+          } catch (e) {
+            log('获取群成员失败', e)
           }
+        })
+      )
     }
-    ).catch(log)
+    catch (e) {
+      log('获取群列表失败', e)
+    }
+    finally {
+      log('start activate group member info')
       NTQQGroupApi.activateMemberInfoChange().then().catch(log)
       NTQQGroupApi.activateMemberListChange().then().catch(log)
+      startReceiveHook().then()
+    }
+
+
     const config = getConfigUtil().getConfig()
     if (config.ob11.enableHttp) {
       ob11HTTPServer.start(config.ob11.httpPort)

src/ntqqapi/api/group.ts

@@ -35,14 +35,20 @@ export class NTQQGroupApi {
     })
   }
   static async getGroups(forced = false) {
-    let cbCmd = ReceiveCmdS.GROUPS
+    // let cbCmd = ReceiveCmdS.GROUPS
-    if (process.platform != 'win32') {
+    // if (process.platform != 'win32') {
-      cbCmd = ReceiveCmdS.GROUPS_STORE
+    //   cbCmd = ReceiveCmdS.GROUPS_STORE
-    }
+    // }
     const result = await callNTQQApi<{
       updateType: number
       groupList: Group[]
-    }>({ methodName: NTQQApiMethod.GROUPS, args: [{ force_update: forced }, undefined], cbCmd })
+    }>({
+      methodName: NTQQApiMethod.GROUPS,
+      args: [{ force_update: forced }, undefined],
+      cbCmd: [ReceiveCmdS.GROUPS, ReceiveCmdS.GROUPS_STORE],
+      afterFirstCmd: false,
+    })
+    log('get groups result', result)
     return result.groupList
   }
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {

src/ntqqapi/hook.ts

@@ -22,6 +22,7 @@ import { NTQQGroupApi } from './api/group'
 import { log } from '@/common/utils'
 import { isNumeric, sleep } from '@/common/utils'
 import { OB11Constructor } from '../onebot11/constructor'
+import { OB11GroupCardEvent } from '../onebot11/event/notice/OB11GroupCardEvent'
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
@@ -324,41 +325,51 @@ async function processGroupEvent(payload: { groupList: Group[] }) {
   }
 }
 
+export async function startHook() {
+
 // 群列表变动
-registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
+  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
     // updateType 3是群列表变动，2是群成员变动
     // log("群列表变动", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
       updateGroups(payload.groupList).then()
-  } else {
+    }
+    else {
       if (process.platform == 'win32') {
         processGroupEvent(payload).then()
       }
     }
-})
+  })
-registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
+  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
     // updateType 3是群列表变动，2是群成员变动
     // log("群列表变动", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
       updateGroups(payload.groupList).then()
-  } else {
+    }
+    else {
       if (process.platform != 'win32') {
         processGroupEvent(payload).then()
       }
     }
-})
+  })
 
-registerReceiveHook<{
+  registerReceiveHook<{
     groupCode: string
     dataSource: number
     members: Set<GroupMember>
-}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+  }>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
     const groupCode = payload.groupCode
     const members = Array.from(payload.members.values())
     // log("群成员信息变动", groupCode, members)
     for (const member of members) {
       const existMember = await getGroupMember(groupCode, member.uin)
       if (existMember) {
+        if (member.cardName != existMember.cardName) {
+          log('群成员名片变动', `${groupCode}: ${existMember.uin}`, existMember.cardName, '->', member.cardName)
+          postOb11Event(
+            new OB11GroupCardEvent(parseInt(groupCode), parseInt(member.uin), member.cardName, existMember.cardName),
+          )
+        }
         Object.assign(existMember, member)
       }
     }
@@ -376,12 +387,12 @@ registerReceiveHook<{
     //         }
     //     }
     // }
-})
+  })
 
 // 好友列表变动
-registerReceiveHook<{
+  registerReceiveHook<{
-  data:CategoryFriend[]
+    data: CategoryFriend[]
-}>(ReceiveCmdS.FRIENDS, (payload) => {
+  }>(ReceiveCmdS.FRIENDS, (payload) => {
     rawFriends.length = 0;
     rawFriends.push(...payload.data);
     for (const fData of payload.data) {
@@ -391,14 +402,15 @@ registerReceiveHook<{
         let existFriend = friends.find((f) => f.uin == friend.uin)
         if (!existFriend) {
           friends.push(friend)
-      } else {
+        }
+        else {
           Object.assign(existFriend, friend)
         }
       }
     }
-})
+  })
 
-registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+  registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
     // 保存一下uid
     for (const message of payload.msgList) {
       const uid = message.senderUid
@@ -454,9 +466,9 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, Receiv
         }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
       }
     }
-})
+  })
 
-registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
+  registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
     const message = msgRecord
     const peerUid = message.peerUid
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
@@ -470,14 +482,14 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msg
         log('receive self msg error', e.stack)
       }
     }
-})
+  })
 
-registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
+  registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
     selfInfo.online = info.info.status !== 20
-})
+  })
 
-let activatedPeerUids: string[] = []
+  let activatedPeerUids: string[] = []
-registerReceiveHook<{
+  registerReceiveHook<{
     changedRecentContactLists: {
       listType: number
       sortedContactList: string[]
@@ -486,7 +498,7 @@ registerReceiveHook<{
         chatType: ChatType
       }[]
     }[]
-}>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+  }>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
     for (const recentContact of payload.changedRecentContactLists) {
       for (const changedContact of recentContact.changedList) {
         if (activatedPeerUids.includes(changedContact.id)) continue
@@ -503,20 +515,22 @@ registerReceiveHook<{
               }
             })
           })
-      } else {
+        }
+        else {
           NTQQMsgApi.activateChat(peer).then()
         }
       }
     }
-})
+  })
 
-registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+  registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
     const peerUid = payload[0] as string
     log('激活的聊天窗口被删除，准备重新激活', peerUid)
     let chatType = ChatType.friend
     if (isNumeric(peerUid)) {
       chatType = ChatType.group
-  } else {
+    }
+    else {
       // 检查是否好友
       if (!(await getFriend(peerUid))) {
         chatType = ChatType.temp
@@ -527,4 +541,6 @@ registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
     NTQQMsgApi.activateChat(peer).then((r) => {
       log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
     })
-})
+  })
+
+}

src/ntqqapi/ntcall.ts

@@ -107,7 +107,7 @@ interface NTQQApiParams {
   channel?: NTQQApiChannel
   classNameIsRegister?: boolean
   args?: unknown[]
-  cbCmd?: ReceiveCmd | null
+  cbCmd?: ReceiveCmd | ReceiveCmd[] | null
   cmdCB?: (payload: any) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
   timeoutSecond?: number
@@ -147,7 +147,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         success = true
         resolve(r)
       }
-    } else {
+    }
+    else {
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
         const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
@@ -158,7 +159,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
               success = true
               resolve(payload)
             }
-          } else {
+          }
+          else {
             removeReceiveHook(hookId)
             success = true
             resolve(payload)
@@ -170,7 +172,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         log(`${methodName} callback`, result)
         if (result?.result == 0 || result === undefined) {
           afterFirstCmd && secondCallback()
-        } else {
+        }
+        else {
           success = true
           reject(`ntqq api call failed, ${result.errMsg}`)
         }
@@ -188,7 +191,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       channel,
       {
         sender: {
-          send: (..._args: unknown[]) => {},
+          send: (..._args: unknown[]) => {
+          },
         },
       },
       { type: 'request', callbackId: uuid, eventName },

src/version.ts

@@ -1 +1 @@
-export const version = '3.26.4'
+export const version = '3.26.5'