Merge pull request #470 from LLOneBot/dev

release: 4.0.8

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "icon": "./icon.webp",
   "authors": [
     {

src/ntqqapi/api/group.ts

@@ -45,8 +45,11 @@ export class NTQQGroupApi extends Service {
     return result.groupList
   }
 
-  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
-    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
+  async getGroupMembers(groupCode: string, num = 3000) {
+    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
+      groupCode,
+      scene: 'groupMemberList_MainWindow'
+    }])
     const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
     if (data.errCode !== 0) {
       throw new Error('获取群成员列表出错,' + data.errMsg)

src/ntqqapi/api/user.ts

@@ -118,7 +118,7 @@ export class NTQQUserApi extends Service {
         await this.ctx.sleep(30)
         member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
       }
-      uid = member.values().find(e => e.uin === uin)?.uid
+      uid = Array.from(member.values()).find(e => e.uin === uin)?.uid
     }
     if (!uid) {
       const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid

src/ntqqapi/native/index.ts

@@ -1,7 +1,6 @@
 import { Context } from 'cordis'
 import { Dict } from 'cosmokit'
 import { getBuildVersion } from '@/common/utils/misc'
-// @ts-expect-error: Unreachable code error
 import addon from './external/crychic-win32-x64.node?asset'
 
 export class Native {
@@ -35,7 +34,7 @@ export class Native {
     }
     try {
       this.crychic = require(addon)
-      this.crychic.init()
+      this.crychic!.init()
     } catch (e) {
       this.ctx.logger.warn('crychic 加载失败', e)
     }

src/ntqqapi/ntcall.ts

@@ -124,7 +124,12 @@ export function invoke<
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
+    let eventId: string
+
     const timeoutId = setTimeout(() => {
+      if (eventId) {
+        removeReceiveHook(eventId)
+      }
       log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, args)
       reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${JSON.stringify(args)}`)
     }, timeout)
@@ -140,16 +145,16 @@ export function invoke<
       let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
           if (options.cmdCB) {
             if (options.cmdCB(payload, result)) {
-              removeReceiveHook(hookId)
+              removeReceiveHook(eventId)
               clearTimeout(timeoutId)
               resolve(payload)
             }
           }
           else {
-            removeReceiveHook(hookId)
+            removeReceiveHook(eventId)
             clearTimeout(timeoutId)
             resolve(payload)
           }

src/ntqqapi/types/msg.ts

@@ -294,6 +294,9 @@ export interface GrayTipElement {
   jsonGrayTipElement?: {
     busiId: string
     jsonStr: string
+    xmlToJsonParam?: {
+      templParam: Map<string, string>
+    }
   }
 }
 

src/onebot11/action/group/GetGroupMemberList.ts

@@ -17,7 +17,10 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   protected async _handle(payload: Payload) {
     const groupCode = payload.group_id.toString()
     let groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
-    if (groupMembers.size === 0) {
+    for (let i = 0; i < 5; i++) {
+      if (groupMembers.size > 0) {
+        break
+      }
       await this.ctx.sleep(100)
       groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
     }

src/onebot11/entities.ts

@@ -548,14 +548,23 @@ export namespace OB11Entities {
         else if (grayTipElement.subElementType == GrayTipElementSubType.JSON) {
           const json = JSON.parse(grayTipElement.jsonGrayTipElement!.jsonStr)
           if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
+            const param = grayTipElement.jsonGrayTipElement.xmlToJsonParam
+            if (param) {
+              return new OB11GroupPokeEvent(
+                Number(msg.peerUid),
+                Number(param.templParam.get('uin_str1')),
+                Number(param.templParam.get('uin_str2')),
+                json.items
+              )
+            }
             const pokedetail: Dict[] = json.items
             //筛选item带有uid的元素
             const poke_uid = pokedetail.filter(item => item.uid)
             if (poke_uid.length == 2) {
               return new OB11GroupPokeEvent(
-                parseInt(msg.peerUid),
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid) ?? 0),
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid) ?? 0),
+                Number(msg.peerUid),
+                Number(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid) ?? 0),
+                Number(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid) ?? 0),
                 pokedetail
               )
             }
@@ -665,11 +674,13 @@ export namespace OB11Entities {
   }
 
   export function groupMember(group_id: string, member: GroupMember): OB11GroupMember {
+    const titleExpireTime = +member.specialTitleExpireTime
+    const int32Max = Math.pow(2, 31) - 1
     return {
       group_id: parseInt(group_id),
       user_id: parseInt(member.uin),
       nickname: member.nick,
-      card: member.cardName,
+      card: member.cardName || member.nick,
       sex: OB11UserSex.Unknown,
       age: 0,
       area: '',
@@ -677,7 +688,7 @@ export namespace OB11Entities {
       qq_level: 0,
       join_time: member.joinTime,
       last_sent_time: member.lastSpeakTime,
-      title_expire_time: +member.specialTitleExpireTime,
+      title_expire_time: titleExpireTime > int32Max ? 0 : titleExpireTime,
       unfriendly: false,
       card_changeable: true,
       is_robot: member.isRobot,

src/version.ts

@@ -1 +1 @@
-export const version = '4.0.7'
+export const version = '4.0.8'

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "ES2023",
     "module": "CommonJS",
     "outDir": "./dist",
     "strict": true,
@@ -20,7 +20,10 @@
         "./src/ntqqapi/*"
       ]
     },
-    "noEmit": true
+    "noEmit": true,
+    "types": [
+      "electron-vite/node"
+    ]
   },
   "include": [
     "src",