Merge pull request #422 from LLOneBot/dev

release: 3.32.7

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -7,9 +7,6 @@ body:
     attributes:
       value: |
         欢迎来到 LLOneBot 的 Issue Tracker！请填写以下表格来提交 Bug。
-        在提交新的 Bug 反馈前，请确保您：
-        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
-        * 不与现有的某一 issue 重复
   - type: input
     id: system-version
     attributes:
@@ -40,8 +37,6 @@ body:
       label: OneBot 客户端
       description: 连接至 LLOneBot 的客户端版本信息
       placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
-    validations:
-      required: true
   - type: textarea
     id: what-happened
     attributes:

.gitignore

@@ -11,5 +11,6 @@ node_modules
 dist
 out
 
-.idea/
 .DS_Store
+.idea
+.vscode

manifest.json

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

package.json

@@ -7,11 +7,12 @@
   "scripts": {
     "build": "electron-vite build",
     "build-mac": "npm run build && npm run deploy-mac",
-    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
+    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins/LLOneBot/",
     "build-win": "npm run build && npm run deploy-win",
-    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\"",
+    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %LITELOADERQQNT_PROFILE%\\plugins\\LLOneBot\\\"",
     "format": "prettier -cw .",
-    "check": "tsc"
+    "check": "tsc",
+    "compile:proto": "pbjs --no-create --no-convert --no-encode --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js systemMessage.proto profileLikeTip.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
   },
   "author": "",
   "license": "MIT",
@@ -21,11 +22,12 @@
     "cordis": "^3.18.0",
     "cors": "^2.8.5",
     "cosmokit": "^1.6.2",
-    "express": "^4.19.2",
+    "express": "^5.0.0",
     "fast-xml-parser": "^4.5.0",
     "file-type": "^19.5.0",
     "fluent-ffmpeg": "^2.1.3",
     "minato": "^3.5.1",
+    "protobufjs": "^7.4.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -37,8 +39,9 @@
     "@types/ws": "^8.5.12",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.3",
+    "protobufjs-cli": "^1.1.3",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.5",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.4.1"

scripts/gen-manifest.ts

@@ -35,4 +35,4 @@ const manifest = {
   }
 }
 
-writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))
+writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))

src/common/config.ts

@@ -33,7 +33,6 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
-      enableQOAutoQuote: false,
       listenLocalhost: false
     }
     const defaultConfig: Config = {

src/common/globalVars.ts

@@ -19,4 +19,4 @@ export const selfInfo: SelfInfo = {
   uin: '',
   nick: '',
   online: true,
-}
+}

src/common/types.ts

@@ -10,7 +10,11 @@ export interface OB11Config {
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
   enableHttpHeart?: boolean
-  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
+  /**
+   * 快速操作回复自动引用原消息
+   * @deprecated
+   */
+  enableQOAutoQuote?: boolean
   listenLocalhost: boolean
 }
 
@@ -70,4 +74,4 @@ export interface FileCacheV2 {
   chatType: number
   elementId: string
   elementType: number
-}
+}

src/common/utils/audio.ts

@@ -101,7 +101,7 @@ export async function encodeSilk(ctx: Context, filePath: string) {
 
 type OutFormat = 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
 
-export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat = 'mp3') {
+export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat) {
   const silk = await fsPromise.readFile(inputFilePath)
   const { data } = await decode(silk, 24000)
   const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath))
@@ -115,4 +115,4 @@ export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat:
       '-ac 1'
     ]
   }, outFilePath)
-}
+}

src/common/utils/file.ts

@@ -133,7 +133,7 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
 
   if (type === FileUriType.RemoteURL) {
     try {
-      const res = await fetchFile(uri)
+      const res = await fetchFile(uri, { 'Referer': uri })
       const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
       if (match?.[1]) {
         filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')

src/common/utils/misc.ts

@@ -1,5 +1,5 @@
 import { QQLevel } from '@/ntqqapi/types'
-import { Dict } from 'cosmokit'
+import { Dict, isNullable } from 'cosmokit'
 
 export function isNumeric(str: string) {
   return /^\d+$/.test(str)
@@ -32,4 +32,8 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
       }
     }
   })
-}
+}
+
+export function filterNullable<T>(array: T[]) {
+  return array.filter(e => !isNullable(e)) as NonNullable<T>[]
+}

src/common/utils/table.ts

@@ -16,12 +16,11 @@ export class LimitedHashTable<K, V> {
     this.keyToValue.set(key, value)
     this.valueToKey.set(value, key)
     while (this.keyToValue.size !== this.valueToKey.size) {
-      console.log('keyToValue.size !== valueToKey.size Error Atom')
       this.keyToValue.clear()
       this.valueToKey.clear()
     }
     while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
-      const oldestKey = this.keyToValue.keys().next().value
+      const oldestKey = this.keyToValue.keys().next().value!
       this.valueToKey.delete(this.keyToValue.get(oldestKey)!)
       this.keyToValue.delete(oldestKey)
     }
@@ -56,7 +55,7 @@ export class LimitedHashTable<K, V> {
   }
 
   //获取最近刚写入的几个值
-  getHeads(size: number): { key: K; value: V }[] | undefined {
+  getHeads(size: number): { key: K, value: V }[] | undefined {
     const keyList = this.getKeyList()
     if (keyList.length === 0) {
       return undefined

src/common/utils/upgrade.ts

@@ -5,20 +5,22 @@ import { version } from '../../version'
 import { copyFolder, log, fetchFile } from '.'
 import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
 
-const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
-const checkVersionMirrorHosts = ['https://kkgithub.com']
+const downloadMirrorHosts = ['https://ghp.ci/']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
   const latestVersionText = await getRemoteVersion()
   const latestVersion = latestVersionText.split('.')
-  //log('llonebot last version', latestVersion)
-  const currentVersion: string[] = version.split('.')
+  log('LLOneBot latest version', latestVersion)
+  const currentVersion = version.split('.')
   //log('llonebot current version', currentVersion)
   for (const k of [0, 1, 2]) {
-    if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
+    const latest = parseInt(latestVersion[k])
+    const current = parseInt(currentVersion[k])
+    if (latest > current) {
       log('')
       return { result: true, version: latestVersionText }
-    } else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
+    } else if (latest < current) {
       break
     }
   }
@@ -28,7 +30,7 @@ export async function checkNewVersion() {
 export async function upgradeLLOneBot() {
   const latestVersion = await getRemoteVersion()
   if (latestVersion && latestVersion != '') {
-    const downloadUrl = 'https://github.com/LLOneBot/LLOneBot/releases/download/v' + latestVersion + '/LLOneBot.zip'
+    const downloadUrl = `https://github.com/LLOneBot/LLOneBot/releases/download/v${latestVersion}/LLOneBot.zip`
     const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
     let downloadSuccess = false
     // 多镜像下载
@@ -73,26 +75,34 @@ export async function upgradeLLOneBot() {
 }
 
 export async function getRemoteVersion() {
-  let Version = ''
-  for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-    const mirrorGithub = checkVersionMirrorHosts[i]
-    const tVersion = await getRemoteVersionByMirror(mirrorGithub)
-    if (tVersion && tVersion != '') {
-      Version = tVersion
-      break
+  for (const mirror of releasesMirrorHosts) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
+    if (version) {
+      return version
+    }
+  }
+  for (const mirror of downloadMirrorHosts) {
+    const version = await getRemoteVersionByDownloadMirror(mirror)
+    if (version) {
+      return version
     }
   }
-  return Version
-}
-
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-  let releasePage = 'error'
-
-  try {
-    releasePage = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
-    // log("releasePage", releasePage);
-    if (releasePage === 'error') return ''
-    return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
-  } catch { }
   return ''
 }
+
+export async function getRemoteVersionByDownloadMirror(mirrorGithub: string) {
+  try {
+    const source = 'https://raw.githubusercontent.com/LLOneBot/LLOneBot/main/src/version.ts'
+    const page = (await fetchFile(mirrorGithub + source)).data.toString()
+    return page.match(/(\d+\.\d+\.\d+)/)?.[0]
+  } catch (e) {
+    log(e?.toString())
+  }
+}
+
+export async function getRemoteVersionByReleasesMirror(mirrorGithub: string) {
+  try {
+    const page = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
+    return page.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
+  } catch { }
+}

src/global.d.ts

@@ -6,4 +6,4 @@ declare global {
   var LiteLoader: Dict
   var authData: Dict | undefined
   var navigation: Dict | undefined
-}
+}

src/main/log.ts

@@ -23,8 +23,7 @@ export default class Log {
           return
         }
         const dateTime = new Date(record.timestamp).toLocaleString()
-        const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
-        const content = `${dateTime} [${record.type}] ${userInfo} | ${record.name} ${record.content}\n\n`
+        const content = `${dateTime} [${record.type}] ${selfInfo.nick}(${selfInfo.uin}) | ${record.name} ${record.content}\n\n`
         appendFile(file, content, noop)
       },
     }
@@ -33,4 +32,4 @@ export default class Log {
       enable = input.log!
     })
   }
-}
+}

src/ntqqapi/api/file.ts

@@ -38,7 +38,7 @@ export class NTQQFileApi extends Service {
 
   constructor(protected ctx: Context) {
     super(ctx, 'ntFileApi', true)
-    this.rkeyManager = new RkeyManager(ctx, 'http://napcat-sign.wumiao.wang:2082/rkey')
+    this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
   async getVideoUrl(peer: Peer, msgId: string, elementId: string) {

src/ntqqapi/api/friend.ts

@@ -189,4 +189,9 @@ export class NTQQFriendApi extends Service {
       return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }, null])
     }
   }
+
+  async getBuddyRecommendContact(uin: string) {
+    const ret = await invoke('nodeIKernelBuddyService/getBuddyRecommendContactArkJson', [{ uin }, null])
+    return ret.arkMsg
+  }
 }

src/ntqqapi/api/group.ts

@@ -117,17 +117,15 @@ export class NTQQGroupApi extends Service {
     const type = parseInt(flagitem[2])
     const session = getSession()
     if (session) {
-      return session.getGroupService().operateSysNotify(
-        false,
-        {
-          'operateType': operateType, // 2 拒绝
-          'targetMsg': {
-            'seq': seq,  // 通知序列号
-            'type': type,
-            'groupCode': groupCode,
-            'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-          }
-        })
+      return session.getGroupService().operateSysNotify(false, {
+        operateType, // 2 拒绝
+        targetMsg: {
+          seq,  // 通知序列号
+          type,
+          groupCode,
+          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+        }
+      })
     } else {
       return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
         doubt: false,
@@ -265,8 +263,8 @@ export class NTQQGroupApi extends Service {
     return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
   }
 
-  async deleteGroupFile(groupId: string, fileIdList: string[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList: [102], fileIdList }, null])
+  async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
@@ -300,4 +298,9 @@ export class NTQQGroupApi extends Service {
     const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
     return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }, null])
   }
+
+  async getGroupRecommendContact(groupCode: string) {
+    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }, null])
+    return ret.arkJson
+  }
 }

src/ntqqapi/api/msg.ts

@@ -183,7 +183,7 @@ export class NTQQMsgApi extends Service {
       if (!arkElement) {
         continue
       }
-      const forwardData = JSON.parse(arkElement.arkElement.bytesData)
+      const forwardData = JSON.parse(arkElement.arkElement!.bytesData)
       if (forwardData.app != 'com.tencent.multimsg') {
         continue
       }

src/ntqqapi/api/user.ts

@@ -87,17 +87,6 @@ export class NTQQUserApi extends Service {
     return result.info
   }
 
-  async getSkey(): Promise<string> {
-    const clientKeyData = await this.forceFetchClientKey()
-    if (clientKeyData?.result !== 0) {
-      throw new Error('获取clientKey失败')
-    }
-    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
-      + '&clientkey=' + clientKeyData.clientKey
-      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
-    return (await RequestUtil.HttpsGetCookies(url))?.skey
-  }
-
   async getCookies(domain: string) {
     const clientKeyData = await this.forceFetchClientKey()
     if (clientKeyData?.result !== 0) {
@@ -296,4 +285,19 @@ export class NTQQUserApi extends Service {
       }
     }, null])
   }
+
+  async getProfileLike(uid: string) {
+    return await invoke('nodeIKernelProfileLikeService/getBuddyProfileLike', [{
+      req: {
+        friendUids: [uid],
+        basic: 1,
+        vote: 1,
+        favorite: 0,
+        userProfile: 1,
+        type: 2,
+        start: 0,
+        limit: 20,
+      }
+    }, null])
+  }
 }

src/ntqqapi/api/window.ts

@@ -1,6 +1,6 @@
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { ReceiveCmd } from '../hook'
+import { ReceiveCmdS } from '../hook'
 import { BrowserWindow } from 'electron'
 import { Service, Context } from 'cordis'
 
@@ -39,7 +39,7 @@ export class NTQQWindowApi extends Service {
   async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
     args: unknown[],
-    cbCmd: ReceiveCmd | undefined,
+    cbCmd: ReceiveCmdS | undefined,
     autoCloseSeconds: number = 2,
   ) {
     const result = await invoke<R>(

src/ntqqapi/core.ts

@@ -19,6 +19,7 @@ import {
 } from './types'
 import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
+import { invoke } from './ntcall'
 
 declare module 'cordis' {
   interface Context {
@@ -26,11 +27,12 @@ declare module 'cordis' {
   }
   interface Events {
     'nt/message-created': (input: RawMessage[]) => void
-    'nt/message-deleted': (input: RawMessage[]) => void
-    'nt/message-sent': (input: RawMessage[]) => void
+    'nt/message-deleted': (input: RawMessage) => void
+    'nt/message-sent': (input: RawMessage) => void
     'nt/group-notify': (input: GroupNotify[]) => void
     'nt/friend-request': (input: FriendRequest[]) => void
     'nt/group-member-info-updated': (input: { groupCode: string, members: GroupMember[] }) => void
+    'nt/system-message-created': (input: Uint8Array) => void
   }
 }
 
@@ -94,7 +96,7 @@ class Core extends Service {
             }
             for (const path of pathList) {
               if (path) {
-                fs.unlink(picPath, () => {
+                fs.unlink(path, () => {
                   this.ctx.logger.info('删除文件成功', path)
                 })
               }
@@ -172,29 +174,26 @@ class Core extends Service {
       this.ctx.parallel('nt/message-created', payload.msgList)
     })
 
+    const sentMsgIds = new Map<string, boolean>()
     const recallMsgIds: string[] = [] // 避免重复上报
+
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
-      const list = payload.msgList.filter(v => {
-        if (recallMsgIds.includes(v.msgId)) {
-          return false
+      for (const msg of payload.msgList) {
+        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
+          recallMsgIds.push(msg.msgId)
+          this.ctx.parallel('nt/message-deleted', msg)
+        } else if (sentMsgIds.get(msg.msgId)) {
+          sentMsgIds.delete(msg.msgId)
+          this.ctx.parallel('nt/message-sent', msg)
         }
-        recallMsgIds.push(v.msgId)
-        return true
-      })
-      this.ctx.parallel('nt/message-deleted', list)
+      }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
-      const { msgId, chatType, peerUid } = payload.msgRecord
-      const peer = {
-        chatType,
-        peerUid
-      }
-      MessageUnique.createMsg(peer, msgId)
       if (!this.config.reportSelfMessage) {
         return
       }
-      this.ctx.parallel('nt/message-sent', [payload.msgRecord])
+      sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
     const groupNotifyFlags: string[] = []
@@ -225,6 +224,14 @@ class Core extends Service {
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
       this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
     })
+
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
+
+    registerReceiveHook<{
+      msgBuf: number[]
+    }>('nodeIKernelMsgListener/onRecvSysMsg', payload => {
+      this.ctx.parallel('nt/system-message-created', Uint8Array.from(payload.msgBuf))
+    })
   }
 }
 
@@ -233,4 +240,4 @@ namespace Core {
   }
 }
 
-export default Core
+export default Core

src/ntqqapi/helper/rkey.ts

@@ -1,4 +1,4 @@
-import { Context } from "cordis"
+import { Context } from 'cordis'
 
 interface ServerRkeyData {
   group_rkey: string

src/ntqqapi/hook.ts

@@ -6,48 +6,46 @@ import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export const ReceiveCmdS = {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
-} as const
+export enum ReceiveCmdS {
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
+  FRIENDS = 'onBuddyListChange',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  SKEY_UPDATE = 'onSkeyUpdate',
+}
 
-export type ReceiveCmd = string
-
-interface NTQQApiReturnData extends Array<unknown> {
-  0: {
+type NTReturnData = [
+  {
     type: 'request'
     eventName: NTClass
     callbackId?: string
-  }
-  1: {
-    cmdName: ReceiveCmd
+  },
+  {
+    cmdName: ReceiveCmdS
     cmdType: 'event'
     payload: unknown
   }[]
-}
+]
 
 const logHook = false
 
 const receiveHooks: Array<{
-  method: ReceiveCmd[]
+  method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
   id: string
 }> = []
@@ -58,62 +56,44 @@ const callHooks: Array<{
 }> = []
 
 export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
-  const originalSend = window.webContents.send
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-    try {
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
-      if (logHook && !isLogger) {
-        log(`received ntqq api message: ${channel}`, args)
-      }
-    } catch { }
-    if (!onlyLog) {
-      if (args?.[1] instanceof Array) {
-        for (const receiveData of args[1]) {
-          const ntQQApiMethodName = receiveData.cmdName
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-          for (const hook of receiveHooks) {
-            if (hook.method.includes(ntQQApiMethodName)) {
-              new Promise(resolve => {
-                try {
-                  hook.hookFunc(receiveData.payload)
-                } catch (e) {
-                  log('hook error', ntQQApiMethodName, (e as Error).stack?.toString())
-                }
-                resolve(undefined)
-              }).then()
+  window.webContents.send = new Proxy(window.webContents.send, {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
+      try {
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+          log('received ntqq api message', args)
+        }
+      } catch { }
+      if (!onlyLog) {
+        if (args[2] instanceof Array) {
+          for (const receiveData of args[2]) {
+            const ntMethodName = receiveData.cmdName
+            for (const hook of receiveHooks) {
+              if (hook.method.includes(ntMethodName)) {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
+              }
             }
           }
         }
-      }
-      if (args[0]?.callbackId) {
-        // log("hookApiCallback", hookApiCallbacks, args)
-        const callbackId = args[0].callbackId
-        if (hookApiCallbacks[callbackId]) {
-          new Promise(resolve => {
-            hookApiCallbacks[callbackId](args[1])
-            resolve(undefined)
-          }).then()
-          delete hookApiCallbacks[callbackId]
+        if (args[1]?.callbackId) {
+          const callbackId = args[1].callbackId
+          if (hookApiCallbacks[callbackId]) {
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
+            delete hookApiCallbacks[callbackId]
+          }
         }
       }
-    }
-    originalSend.call(window.webContents, channel, ...args)
-  }
-  window.webContents.send = patchSend
+      return target.apply(thisArg, args)
+    },
+  })
 }
 
 export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
-  // 监听调用NTQQApi
   const webContents = window.webContents as Dict
   const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
 
   const proxyIpcMsg = new Proxy(ipc_message_proxy, {
     apply(target, thisArg, args) {
-      // console.log(thisArg, args);
-      let isLogger = false
-      try {
-        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
-      } catch (e) { }
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
       if (!isLogger) {
         try {
           logHook && log('call NTQQ api', thisArg, args)
@@ -121,21 +101,14 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
         if (!onlyLog) {
           try {
             const _args: unknown[] = args[3][1]
-            const cmdName: NTMethod = _args[0] as NTMethod
+            const cmdName = _args[0] as NTMethod
             const callParams = _args.slice(1)
             callHooks.forEach((hook) => {
               if (hook.method.includes(cmdName)) {
-                new Promise(resolve => {
-                  try {
-                    hook.hookFunc(callParams)
-                  } catch (e) {
-                    log('hook call error', e, _args)
-                  }
-                  resolve(undefined)
-                }).then()
+                Promise.resolve(hook.hookFunc(callParams))
               }
             })
-          } catch (e) { }
+          } catch { }
         }
       }
       return target.apply(thisArg, args)
@@ -147,7 +120,7 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-message'] = proxyIpcMsg
   }
 
-  const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
+  /*const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
       //HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
@@ -157,9 +130,7 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
         },
       })
       const ret = target.apply(thisArg, args)
-      /*try {
-        HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }*/
+      //HOOK_LOG && log('call NTQQ invoke api return', ret)
       return ret
     },
   })
@@ -167,11 +138,11 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
   } else {
     webContents._events['-ipc-invoke'] = proxyIpcInvoke
-  }
+  }*/
 }
 
 export function registerReceiveHook<PayloadType>(
-  method: ReceiveCmd | ReceiveCmd[],
+  method: string | string[],
   hookFunc: (payload: PayloadType) => void,
 ): string {
   const id = randomUUID()
@@ -179,7 +150,7 @@ export function registerReceiveHook<PayloadType>(
     method = [method]
   }
   receiveHooks.push({
-    method,
+    method: method as ReceiveCmdS[],
     hookFunc,
     id,
   })
@@ -202,4 +173,4 @@ export function registerCallHook(
 export function removeReceiveHook(id: string) {
   const index = receiveHooks.findIndex((h) => h.id === id)
   receiveHooks.splice(index, 1)
-}
+}

src/ntqqapi/ntcall.ts

@@ -136,7 +136,6 @@ export function invoke<
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
         const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
-          // log(methodName, "second callback", cbCmd, payload, cmdCB);
           if (options.cmdCB) {
             if (options.cmdCB(payload, result)) {
               removeReceiveHook(hookId)
@@ -182,4 +181,4 @@ export function invoke<
       apiArgs,
     )
   })
-}
+}

src/ntqqapi/proto/compiled.d.ts

@@ -0,0 +1,469 @@
+import * as $protobuf from "protobufjs";
+import Long = require("long");
+/** Namespace SysMsg. */
+export namespace SysMsg {
+
+    /** Properties of a SystemMessage. */
+    interface ISystemMessage {
+
+        /** SystemMessage header */
+        header?: (SysMsg.ISystemMessageHeader[]|null);
+
+        /** SystemMessage msgSpec */
+        msgSpec?: (SysMsg.ISystemMessageMsgSpec[]|null);
+
+        /** SystemMessage bodyWrapper */
+        bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+    }
+
+    /** Represents a SystemMessage. */
+    class SystemMessage implements ISystemMessage {
+
+        /**
+         * Constructs a new SystemMessage.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessage);
+
+        /** SystemMessage header. */
+        public header: SysMsg.ISystemMessageHeader[];
+
+        /** SystemMessage msgSpec. */
+        public msgSpec: SysMsg.ISystemMessageMsgSpec[];
+
+        /** SystemMessage bodyWrapper. */
+        public bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessage;
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessage;
+
+        /**
+         * Gets the default type url for SystemMessage
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageHeader. */
+    interface ISystemMessageHeader {
+
+        /** SystemMessageHeader peerNumber */
+        peerNumber?: (number|null);
+
+        /** SystemMessageHeader peerString */
+        peerString?: (string|null);
+
+        /** SystemMessageHeader uin */
+        uin?: (number|null);
+
+        /** SystemMessageHeader uid */
+        uid?: (string|null);
+    }
+
+    /** Represents a SystemMessageHeader. */
+    class SystemMessageHeader implements ISystemMessageHeader {
+
+        /**
+         * Constructs a new SystemMessageHeader.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageHeader);
+
+        /** SystemMessageHeader peerNumber. */
+        public peerNumber: number;
+
+        /** SystemMessageHeader peerString. */
+        public peerString: string;
+
+        /** SystemMessageHeader uin. */
+        public uin: number;
+
+        /** SystemMessageHeader uid. */
+        public uid?: (string|null);
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageHeader;
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageHeader;
+
+        /**
+         * Gets the default type url for SystemMessageHeader
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageMsgSpec. */
+    interface ISystemMessageMsgSpec {
+
+        /** SystemMessageMsgSpec msgType */
+        msgType?: (number|null);
+
+        /** SystemMessageMsgSpec subType */
+        subType?: (number|null);
+
+        /** SystemMessageMsgSpec subSubType */
+        subSubType?: (number|null);
+
+        /** SystemMessageMsgSpec msgSeq */
+        msgSeq?: (number|null);
+
+        /** SystemMessageMsgSpec time */
+        time?: (number|null);
+
+        /** SystemMessageMsgSpec other */
+        other?: (number|null);
+    }
+
+    /** Represents a SystemMessageMsgSpec. */
+    class SystemMessageMsgSpec implements ISystemMessageMsgSpec {
+
+        /**
+         * Constructs a new SystemMessageMsgSpec.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageMsgSpec);
+
+        /** SystemMessageMsgSpec msgType. */
+        public msgType: number;
+
+        /** SystemMessageMsgSpec subType. */
+        public subType: number;
+
+        /** SystemMessageMsgSpec subSubType. */
+        public subSubType: number;
+
+        /** SystemMessageMsgSpec msgSeq. */
+        public msgSeq: number;
+
+        /** SystemMessageMsgSpec time. */
+        public time: number;
+
+        /** SystemMessageMsgSpec other. */
+        public other: number;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Gets the default type url for SystemMessageMsgSpec
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageBodyWrapper. */
+    interface ISystemMessageBodyWrapper {
+
+        /** SystemMessageBodyWrapper body */
+        body?: (Uint8Array|null);
+    }
+
+    /** Represents a SystemMessageBodyWrapper. */
+    class SystemMessageBodyWrapper implements ISystemMessageBodyWrapper {
+
+        /**
+         * Constructs a new SystemMessageBodyWrapper.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageBodyWrapper);
+
+        /** SystemMessageBodyWrapper body. */
+        public body: Uint8Array;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Gets the default type url for SystemMessageBodyWrapper
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeDetail. */
+    interface ILikeDetail {
+
+        /** LikeDetail txt */
+        txt?: (string|null);
+
+        /** LikeDetail uin */
+        uin?: (number|null);
+
+        /** LikeDetail nickname */
+        nickname?: (string|null);
+    }
+
+    /** Represents a LikeDetail. */
+    class LikeDetail implements ILikeDetail {
+
+        /**
+         * Constructs a new LikeDetail.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeDetail);
+
+        /** LikeDetail txt. */
+        public txt: string;
+
+        /** LikeDetail uin. */
+        public uin: number;
+
+        /** LikeDetail nickname. */
+        public nickname: string;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeDetail;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeDetail;
+
+        /**
+         * Gets the default type url for LikeDetail
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeMsg. */
+    interface ILikeMsg {
+
+        /** LikeMsg count */
+        count?: (number|null);
+
+        /** LikeMsg time */
+        time?: (number|null);
+
+        /** LikeMsg detail */
+        detail?: (SysMsg.ILikeDetail|null);
+    }
+
+    /** Represents a LikeMsg. */
+    class LikeMsg implements ILikeMsg {
+
+        /**
+         * Constructs a new LikeMsg.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeMsg);
+
+        /** LikeMsg count. */
+        public count: number;
+
+        /** LikeMsg time. */
+        public time: number;
+
+        /** LikeMsg detail. */
+        public detail?: (SysMsg.ILikeDetail|null);
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeMsg;
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeMsg;
+
+        /**
+         * Gets the default type url for LikeMsg
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a ProfileLikeSubTip. */
+    interface IProfileLikeSubTip {
+
+        /** ProfileLikeSubTip msg */
+        msg?: (SysMsg.ILikeMsg|null);
+    }
+
+    /** Represents a ProfileLikeSubTip. */
+    class ProfileLikeSubTip implements IProfileLikeSubTip {
+
+        /**
+         * Constructs a new ProfileLikeSubTip.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.IProfileLikeSubTip);
+
+        /** ProfileLikeSubTip msg. */
+        public msg?: (SysMsg.ILikeMsg|null);
+
+        /**
+         * Decodes a ProfileLikeSubTip message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns ProfileLikeSubTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.ProfileLikeSubTip;
+
+        /**
+         * Decodes a ProfileLikeSubTip message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns ProfileLikeSubTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeSubTip;
+
+        /**
+         * Gets the default type url for ProfileLikeSubTip
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a ProfileLikeTip. */
+    interface IProfileLikeTip {
+
+        /** ProfileLikeTip msgType */
+        msgType?: (number|null);
+
+        /** ProfileLikeTip subType */
+        subType?: (number|null);
+
+        /** ProfileLikeTip content */
+        content?: (SysMsg.IProfileLikeSubTip|null);
+    }
+
+    /** Represents a ProfileLikeTip. */
+    class ProfileLikeTip implements IProfileLikeTip {
+
+        /**
+         * Constructs a new ProfileLikeTip.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.IProfileLikeTip);
+
+        /** ProfileLikeTip msgType. */
+        public msgType: number;
+
+        /** ProfileLikeTip subType. */
+        public subType: number;
+
+        /** ProfileLikeTip content. */
+        public content?: (SysMsg.IProfileLikeSubTip|null);
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.ProfileLikeTip;
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeTip;
+
+        /**
+         * Gets the default type url for ProfileLikeTip
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+}

src/ntqqapi/proto/profileLikeTip.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+package SysMsg;
+
+message LikeDetail {
+  string txt = 1;
+  uint32 uin = 3;
+  string nickname = 5;
+}
+
+message LikeMsg {
+  uint32 count = 1;
+  uint32 time = 2;
+  LikeDetail detail = 3;
+}
+
+message ProfileLikeSubTip {
+  LikeMsg msg = 14;
+}
+
+message ProfileLikeTip {
+  uint32 msgType = 1;
+  uint32 subType = 2;
+  ProfileLikeSubTip content = 203;
+}

src/ntqqapi/proto/systemMessage.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+package SysMsg;
+
+message SystemMessage {
+  repeated SystemMessageHeader header = 1;
+  repeated SystemMessageMsgSpec msgSpec = 2;
+  SystemMessageBodyWrapper bodyWrapper = 3;
+}
+
+message SystemMessageHeader {
+  uint32 peerNumber = 1;
+  string peerString = 2;
+  uint32 uin = 5;
+  optional string uid = 6;
+}
+
+message SystemMessageMsgSpec {
+  uint32 msgType = 1;
+  uint32 subType = 2;
+  uint32 subSubType = 3;
+  uint32 msgSeq = 5;
+  uint32 time = 6;
+  //uint64 msgId = 12;
+  uint32 other = 13;
+}
+
+message SystemMessageBodyWrapper {
+  bytes body = 2;
+  // Find the first [08], or ignore the first 7 bytes?
+}

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -119,7 +119,7 @@ export interface NodeIKernelBuddyService {
 
   reportDoubtBuddyReqUnread(): void
 
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>
+  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
 
   isNull(): boolean
-}
+}

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -52,7 +52,7 @@ export interface NodeIKernelGroupService {
   //26702(其实更早 但是我不知道)
   getGroupLatestEssenceList(groupCode: string): Promise<unknown>
 
-  //26702(其实更早 但是我不知道) 
+  //26702(其实更早 但是我不知道)
   shareDigest(Req: {
     appId: string,
     appType: number,
@@ -232,7 +232,7 @@ export interface NodeIKernelGroupService {
 
   setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>
 
-  getGroupRecommendContactArkJson(groupCode: string): unknown
+  getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>
 
   getJoinGroupLink(groupCode: string): unknown
 
@@ -244,6 +244,7 @@ export interface NodeIKernelGroupService {
     msgRandom: number,
     msgSeq: number
   }): Promise<unknown>
+
   //需要提前判断是否存在 高版本新增
   removeGroupEssence(param: {
     groupCode: string
@@ -252,4 +253,4 @@ export interface NodeIKernelGroupService {
   }): Promise<unknown>
 
   isNull(): boolean
-}
+}

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -1,5 +1,6 @@
 import { BuddyProfileLikeReq } from '../types'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
   addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void
@@ -10,8 +11,18 @@ export interface NodeIKernelProfileLikeService {
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
     info: {
-      userLikeInfos: Array<unknown>,
-      friendMaxVotes: number,
+      userLikeInfos: {
+        uid: string
+        time: string
+        favoriteInfo: {
+          total_count: number
+          last_time: number
+          today_count: number
+          userInfos: Dict[]
+        }
+        voteInfo: Dict
+      }[]
+      friendMaxVotes: number
       start: number
     }
   }>

src/ntqqapi/types/msg.ts

@@ -102,7 +102,7 @@ export interface SendPicElement {
 export interface SendReplyElement {
   elementType: ElementType.REPLY
   elementId: ''
-  replyElement: ReplyElement
+  replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
@@ -129,6 +129,12 @@ export interface ReplyElement {
   replayMsgId: string
   senderUin: string
   senderUinStr: string
+  sourceMsgIdInRecords: string
+  senderUid: string
+  senderUidStr: string
+  sourceMsgIsIncPic: boolean // 原消息是否有图片
+  sourceMsgText: string
+  replyMsgTime: string
 }
 
 export interface FileElement {
@@ -282,14 +288,28 @@ export interface PicElement {
 }
 
 export enum GrayTipElementSubType {
-  RECALL = 1,
-  INVITE_NEW_MEMBER = 12,
-  MEMBER_NEW_TITLE = 17,
+  REVOKE = 1,
+  PROCLAMATION = 2,
+  EMOJIREPLY = 3,
+  GROUP = 4,
+  BUDDY = 5,
+  FEED = 6,
+  ESSENCE = 7,
+  GROUPNOTIFY = 8,
+  BUDDYNOTIFY = 9,
+  FILE = 10,
+  FEEDCHANNELMSG = 11,
+  XMLMSG = 12,
+  LOCALMSG = 13,
+  BLOCK = 14,
+  AIOOP = 15,
+  WALLET = 16,
+  JSON = 17,
 }
 
 export interface GrayTipElement {
   subElementType: GrayTipElementSubType
-  revokeElement: {
+  revokeElement?: {
     operatorRole: string
     operatorUid: string
     operatorNick: string
@@ -299,14 +319,14 @@ export interface GrayTipElement {
     isSelfOperate?: boolean
     wording: string // 自定义的撤回提示语
   }
-  aioOpGrayTipElement: TipAioOpGrayTipElement
-  groupElement: TipGroupElement
-  xmlElement: {
+  aioOpGrayTipElement?: TipAioOpGrayTipElement
+  groupElement?: TipGroupElement
+  xmlElement?: {
     templId: string
     content: string
   }
-  jsonGrayTipElement: {
-    busiId: number
+  jsonGrayTipElement?: {
+    busiId: string
     jsonStr: string
   }
 }
@@ -471,36 +491,7 @@ export interface RawMessage {
   sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
   recallTime: string // 撤回时间, "0"是没有撤回
   records: RawMessage[]
-  elements: {
-    elementId: string
-    elementType: ElementType
-    replyElement: {
-      sourceMsgIdInRecords: string
-      senderUid: string // 原消息发送者QQ号
-      sourceMsgIsIncPic: boolean // 原消息是否有图片
-      sourceMsgText: string
-      replayMsgSeq: string // 源消息的msgSeq，可以通过这个找到源消息的msgId
-      senderUidStr: string
-      replyMsgTime: string
-    }
-    textElement: {
-      atType: AtType
-      atUid: string // QQ号
-      content: string
-      atNtUid: string // uid号
-    }
-    picElement: PicElement
-    pttElement: PttElement
-    arkElement: ArkElement
-    grayTipElement: GrayTipElement
-    faceElement: FaceElement
-    videoElement: VideoElement
-    fileElement: FileElement
-    marketFaceElement: MarketFaceElement
-    inlineKeyboardElement: InlineKeyboardElement
-    markdownElement: MarkdownElement
-    multiForwardMsgElement: MultiForwardMsgElement
-  }[]
+  elements: MessageElement[]
 }
 
 export interface Peer {
@@ -515,7 +506,7 @@ export interface MessageElement {
   extBufForUI: string //"0x"
   textElement?: TextElement
   faceElement?: FaceElement
-  marketFaceElement?: MarkdownElement
+  marketFaceElement?: MarketFaceElement
   replyElement?: ReplyElement
   picElement?: PicElement
   pttElement?: PttElement
@@ -541,4 +532,4 @@ export interface MessageElement {
   taskTopMsgElement?: unknown
   recommendedMsgElement?: unknown
   actionBarElement?: unknown
-}
+}

src/ntqqapi/wrapper.ts

@@ -78,4 +78,4 @@ Process.dlopen = function (module: Dict, filename: string, flags = constants.dlo
 
 export function getSession() {
   return wrapperApi['NodeIQQNTWrapperSession']
-}
+}

src/onebot11/action/BaseAction.ts

@@ -1,44 +1,43 @@
-import { ActionName, BaseCheckResult } from './types'
+import { ActionName } from './types'
 import { OB11Response } from './OB11Response'
 import { OB11Return } from '../types'
-import { Context } from 'cordis'
+import { Context, Schema } from 'cordis'
 import type Adapter from '../adapter'
 
 abstract class BaseAction<PayloadType, ReturnDataType> {
   abstract actionName: ActionName
   protected ctx: Context
+  payloadSchema?: Schema<PayloadType>
 
   constructor(protected adapter: Adapter) {
     this.ctx = adapter.ctx
   }
 
-  protected async check(payload: PayloadType): Promise<BaseCheckResult> {
-    return {
-      valid: true,
-    }
-  }
-
   public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
-    const result = await this.check(payload)
-    if (!result.valid) {
-      return OB11Response.error(result.message, 400)
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 400)
     }
     try {
-      const resData = await this._handle(payload)
+      const resData = await this._handle(params)
       return OB11Response.ok(resData)
     } catch (e) {
       this.ctx.logger.error('发生错误', e)
-      return OB11Response.error(e?.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200)
+      return OB11Response.error((e as Error)?.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200)
     }
   }
 
   public async websocketHandle(payload: PayloadType, echo: unknown): Promise<OB11Return<ReturnDataType | null>> {
-    const result = await this.check(payload)
-    if (!result.valid) {
-      return OB11Response.error(result.message, 1400)
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 1400)
     }
     try {
-      const resData = await this._handle(payload)
+      const resData = await this._handle(params)
       return OB11Response.ok(resData, echo)
     } catch (e) {
       this.ctx.logger.error('发生错误', e)
@@ -46,9 +45,7 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
     }
   }
 
-  protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-    throw `pleas override ${this.actionName} _handle`
-  }
+  protected abstract _handle(payload: PayloadType): Promise<ReturnDataType>
 }
 
-export default BaseAction
+export { BaseAction, Schema }

src/onebot11/action/file/GetFile.ts

@@ -1,5 +1,5 @@
-import BaseAction from '../BaseAction'
-import fsPromise from 'node:fs/promises'
+import { BaseAction, Schema } from '../BaseAction'
+import { readFile } from 'node:fs/promises'
 import { ActionName } from '../types'
 import { Peer, ElementType } from '@/ntqqapi/types'
 import { MessageUnique } from '@/common/utils/messageUnique'
@@ -17,13 +17,16 @@ export interface GetFileResponse {
 }
 
 export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
+  payloadSchema = Schema.object({
+    file: Schema.string().required()
+  })
+
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = this.adapter.config
 
-    let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
+    let fileCache = await MessageUnique.getFileCacheById(payload.file)
     if (!fileCache?.length) {
-      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
+      fileCache = await MessageUnique.getFileCacheByName(payload.file)
     }
 
     if (fileCache?.length) {
@@ -56,13 +59,13 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         if (!findEle) {
           throw new Error('element not found')
         }
-        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement)
+        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
       } else if (fileCache[0].elementType === ElementType.VIDEO) {
         res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
       if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {
-          res.base64 = await fsPromise.readFile(downloadPath, 'base64')
+          res.base64 = await readFile(downloadPath, 'base64')
         } catch (e) {
           throw new Error('文件下载失败. ' + e)
         }
@@ -76,11 +79,12 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
 
 export default class GetFile extends GetFileBase {
   actionName = ActionName.GetFile
+  payloadSchema = Schema.object({
+    file: Schema.string(),
+    file_id: Schema.string().required()
+  })
 
-  protected async _handle(payload: { file_id: string; file: string }): Promise<GetFileResponse> {
-    if (!payload.file_id) {
-      throw new Error('file_id 不能为空')
-    }
+  protected async _handle(payload: { file_id: string, file: string }): Promise<GetFileResponse> {
     payload.file = payload.file_id
     return super._handle(payload)
   }

src/onebot11/action/file/GetImage.ts

@@ -3,11 +3,4 @@ import { ActionName } from '../types'
 
 export default class GetImage extends GetFileBase {
   actionName = ActionName.GetImage
-
-  protected async _handle(payload: { file: string }) {
-    if (!payload.file) {
-      throw new Error('参数 file 不能为空')
-    }
-    return super._handle(payload)
-  }
 }

src/onebot11/action/file/GetRecord.ts

@@ -1,8 +1,9 @@
+import path from 'node:path'
 import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
 import { ActionName } from '../types'
 import { decodeSilk } from '@/common/utils/audio'
-import path from 'node:path'
-import fs from 'node:fs'
+import { Schema } from '../BaseAction'
+import { stat, readFile } from 'node:fs/promises'
 
 interface Payload extends GetFilePayload {
   out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
@@ -10,14 +11,18 @@ interface Payload extends GetFilePayload {
 
 export default class GetRecord extends GetFileBase {
   actionName = ActionName.GetRecord
+  payloadSchema = Schema.object({
+    file: Schema.string().required(),
+    out_format: Schema.string().default('mp3')
+  })
 
   protected async _handle(payload: Payload): Promise<GetFileResponse> {
     const res = await super._handle(payload)
     res.file = await decodeSilk(this.ctx, res.file!, payload.out_format)
     res.file_name = path.basename(res.file)
-    res.file_size = fs.statSync(res.file).size.toString()
+    res.file_size = (await stat(res.file)).size.toString()
     if (this.adapter.config.enableLocalFile2Url) {
-      res.base64 = fs.readFileSync(res.file, 'base64')
+      res.base64 = await readFile(res.file, 'base64')
     }
     return res
   }

src/onebot11/action/go-cqhttp/CreateGroupFileFolder.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,9 +9,13 @@ interface Payload {
 
 export class CreateGroupFileFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_CreateGroupFileFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    name: Schema.string().required(),
+  })
 
   async _handle(payload: Payload) {
     await this.ctx.ntGroupApi.createGroupFileFolder(payload.group_id.toString(), payload.name)
     return null
   }
-}
+}

src/onebot11/action/go-cqhttp/DelEssenceMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
@@ -8,11 +8,11 @@ interface Payload {
 
 export class DelEssenceMsg extends BaseAction<Payload, unknown> {
   actionName = ActionName.GoCQHTTP_DelEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.message_id) {
-      throw Error('message_id不能为空')
-    }
     const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')

src/onebot11/action/go-cqhttp/DelGroupFile.ts

@@ -1,17 +1,22 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
   group_id: string | number
   file_id: string
-  busid?: 102
+  busid: number
 }
 
 export class DelGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFile
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file_id: Schema.string().required(),
+    busid: Schema.number().default(102)
+  })
 
   async _handle(payload: Payload) {
-    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id])
+    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id], [payload.busid])
     return null
   }
-}
+}

src/onebot11/action/go-cqhttp/DelGroupFolder.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -8,9 +8,13 @@ interface Payload {
 
 export class DelGroupFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    folder_id: Schema.string().required()
+  })
 
   async _handle(payload: Payload) {
     await this.ctx.ntGroupApi.deleteGroupFileFolder(payload.group_id.toString(), payload.folder_id)
     return null
   }
-}
+}

src/onebot11/action/go-cqhttp/DownloadFile.ts

@@ -1,7 +1,7 @@
-import BaseAction from '../BaseAction'
 import fs from 'fs'
 import fsPromise from 'fs/promises'
 import path from 'node:path'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { calculateFileMD5, fetchFile } from '@/common/utils'
 import { TEMP_DIR } from '@/common/globalVars'
@@ -22,6 +22,11 @@ interface FileResponse {
 
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
+  payloadSchema = Schema.object({
+    url: String,
+    base64: String,
+    headers: Schema.union([String, Schema.array(String)])
+  })
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name

src/onebot11/action/go-cqhttp/GetForwardMsg.ts

@@ -1,8 +1,9 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11ForwardMessage } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -33,19 +34,21 @@ export class GetForwardMsg extends BaseAction<Payload, Response> {
     const messages = await Promise.all(
       msgList.map(async (msg) => {
         const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (!resMsg) return
         resMsg.message_id = MessageUnique.createMsg({
           chatType: msg.chatType,
           peerUid: msg.peerUid,
         }, msg.msgId)
         return resMsg
-      }),
+      })
     )
-    const forwardMessages = messages.map(v => {
-      const msg = v as Partial<OB11ForwardMessage>
-      msg.content = msg.message
-      delete msg.message
-      return msg as OB11ForwardMessage
-    })
+    const forwardMessages = filterNullable(messages)
+      .map(v => {
+        const msg = v as Partial<OB11ForwardMessage>
+        msg.content = msg.message
+        delete msg.message
+        return msg as OB11ForwardMessage
+      })
     return { messages: forwardMessages }
   }
 }

src/onebot11/action/go-cqhttp/GetGroupAtAllRemain.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -22,4 +22,4 @@ export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
       remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
     }
   }
-}
+}

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -1,10 +1,11 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -41,6 +42,6 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
       })
     )
     const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
-    return { messages: ob11MsgList }
+    return { messages: filterNullable(ob11MsgList) }
   }
 }

src/onebot11/action/go-cqhttp/GetGroupRootFiles.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
 
@@ -59,4 +59,4 @@ export class GetGroupRootFiles extends BaseAction<Payload, Response> {
         })
     }
   }
-}
+}

src/onebot11/action/go-cqhttp/GetGroupSystemMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
@@ -56,4 +56,4 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
     }
     return data
   }
-}
+}

src/onebot11/action/go-cqhttp/GetStrangerInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'

src/onebot11/action/go-cqhttp/MarkMsgAsRead.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
 

src/onebot11/action/go-cqhttp/QuickOperation.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../helper/quickOperation'
 import { ActionName } from '../types'
 
@@ -13,4 +13,4 @@ export class HandleQuickOperation extends BaseAction<Payload, null> {
     handleQuickOperation(this.ctx, payload.context, payload.operation).catch(e => this.ctx.logger.error(e))
     return null
   }
-}
+}

src/onebot11/action/go-cqhttp/SendForwardMsg.ts

@@ -1,14 +1,13 @@
 import SendMsg from '../msg/SendMsg'
 import { OB11PostSendMsg } from '../../types'
 import { ActionName } from '../types'
-import { convertMessage2List } from '../../helper/createMessage'
 
 export class SendForwardMsg extends SendMsg {
   actionName = ActionName.GoCQHTTP_SendForwardMsg
 
-  protected async check(payload: OB11PostSendMsg) {
-    if (payload.messages) payload.message = convertMessage2List(payload.messages)
-    return super.check(payload)
+  protected async _handle(payload: OB11PostSendMsg) {
+    if (payload.messages) payload.message = payload.messages
+    return super._handle(payload)
   }
 }
 

src/onebot11/action/go-cqhttp/SendGroupNotice.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { unlink } from 'fs/promises'
 import { checkFileReceived, uri2local } from '@/common/utils/file'
@@ -15,7 +15,7 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice
 
   async _handle(payload: Payload) {
-    if(!payload.content){
+    if (!payload.content) {
       throw new Error('参数 content 不能为空')
     }
     const groupCode = payload.group_id.toString()
@@ -51,4 +51,4 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
     }
     return null
   }
-}
+}

src/onebot11/action/go-cqhttp/SetEssenceMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
 

src/onebot11/action/go-cqhttp/UploadFile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { SendElementEntities } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
@@ -20,9 +20,9 @@ export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
     if (!success) {
       throw new Error(errMsg)
     }
-    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder_id)
+    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
+    await sendMsg(this.ctx, peer, [file], [])
     return null
   }
 }

src/onebot11/action/group/GetGroupEssence.ts

@@ -1,5 +1,5 @@
 import { GroupEssenceMsgRet } from '@/ntqqapi/api'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface PayloadType {

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -1,6 +1,6 @@
 import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 
 interface Payload {
   group_id: number

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/GetGroupList.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,6 +1,6 @@
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { selfInfo } from '@/common/globalVars'
 

src/onebot11/action/group/GetGuildList.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 export default class GetGuildList extends BaseAction<null, null> {

src/onebot11/action/group/SendGroupMsg.ts

@@ -1,14 +1,14 @@
 import SendMsg from '../msg/SendMsg'
-import { ActionName, BaseCheckResult } from '../types'
+import { ActionName } from '../types'
 import { OB11PostSendMsg } from '../../types'
 
 class SendGroupMsg extends SendMsg {
   actionName = ActionName.SendGroupMsg
 
-  protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+  protected _handle(payload: OB11PostSendMsg) {
     delete (payload as Partial<OB11PostSendMsg>).user_id
     payload.message_type = 'group'
-    return super.check(payload)
+    return super._handle(payload)
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
@@ -14,9 +14,10 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   protected async _handle(payload: Payload): Promise<null> {
     const flag = payload.flag.toString()
     const approve = payload.approve?.toString() !== 'false'
-    await this.ctx.ntGroupApi.handleGroupRequest(flag,
+    await this.ctx.ntGroupApi.handleGroupRequest(
+      flag,
       approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-      payload.reason || ''
+      payload.reason
     )
     return null
   }

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 

src/onebot11/action/group/SetGroupBan.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupCard.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupKick.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupName.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/index.ts

@@ -10,7 +10,7 @@ import SendGroupMsg from './group/SendGroupMsg'
 import SendPrivateMsg from './msg/SendPrivateMsg'
 import SendMsg from './msg/SendMsg'
 import DeleteMsg from './msg/DeleteMsg'
-import BaseAction from './BaseAction'
+import { BaseAction } from './BaseAction'
 import GetVersionInfo from './system/GetVersionInfo'
 import CanSendRecord from './system/CanSendRecord'
 import CanSendImage from './system/CanSendImage'
@@ -62,6 +62,7 @@ import { GetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'
 import { GetGroupRootFiles } from './go-cqhttp/GetGroupRootFiles'
 import { SetOnlineStatus } from './llonebot/SetOnlineStatus'
 import { SendGroupNotice } from './go-cqhttp/SendGroupNotice'
+import { GetProfileLike } from './llonebot/GetProfileLike'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -74,6 +75,7 @@ export function initActionMap(adapter: Adapter) {
     new GetFriendWithCategory(adapter),
     new GetEvent(adapter),
     new SetOnlineStatus(adapter),
+    new GetProfileLike(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -132,7 +134,7 @@ export function initActionMap(adapter: Adapter) {
     new GetGroupRootFiles(adapter),
     new SendGroupNotice(adapter)
   ]
-  const actionMap = new Map<string, BaseAction<unknown, unknown>>()
+  const actionMap = new Map<string, BaseAction<any, unknown>>()
   for (const action of actionHandlers) {
     actionMap.set(action.actionName, action)
     actionMap.set(action.actionName + '_async', action)

src/onebot11/action/llonebot/Config.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { Config } from '@/common/types'
 import { ActionName } from '../types'
 import { getConfigUtil } from '@/common/config'
@@ -13,7 +13,7 @@ export class GetConfigAction extends BaseAction<null, Config> {
 
 export class SetConfigAction extends BaseAction<Config, void> {
   actionName = ActionName.SetConfig
-  
+
   protected async _handle(payload: Config): Promise<void> {
     getConfigUtil().setConfig(payload)
   }

src/onebot11/action/llonebot/Debug.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/llonebot/GetEvent.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { getHttpEvent } from '../../helper/eventForHttp'
 import { OB11Message } from '../../types'

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupNotify, GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 

src/onebot11/action/llonebot/GetProfileLike.ts

@@ -0,0 +1,17 @@
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+import { Dict } from 'cosmokit'
+
+export class GetProfileLike extends BaseAction<void, Dict[]> {
+  actionName = ActionName.GetProfileLike
+
+  async _handle() {
+    const ret = await this.ctx.ntUserApi.getProfileLike(selfInfo.uid)
+    const listdata = ret.info.userLikeInfos[0].favoriteInfo.userInfos
+    for (const item of listdata) {
+      item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0
+    }
+    return listdata
+  }
+}

src/onebot11/action/llonebot/SetOnlineStatus.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -22,4 +22,4 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
     }
     return null
   }
-}
+}

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -1,6 +1,6 @@
-import BaseAction from '../BaseAction'
+import fs from 'node:fs'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import * as fs from 'node:fs'
 import { checkFileReceived, uri2local } from '../../../common/utils/file'
 
 interface Payload {

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ChatType } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 import { Peer } from '@/ntqqapi/types'

src/onebot11/action/msg/GetMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
@@ -15,12 +15,12 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
   protected async _handle(payload: PayloadType) {
     if (!payload.message_id) {
-      throw '参数message_id不能为空'
+      throw new Error('参数message_id不能为空')
     }
     const msgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString())
     const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(msgShortId || +payload.message_id)
     if (!msgIdWithPeer) {
-      throw ('消息不存在')
+      throw new Error('消息不存在')
     }
     const peer = {
       guildId: '',
@@ -29,6 +29,9 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
     }
     const msg = this.adapter.getMsgCache(msgIdWithPeer.MsgId) ?? (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgIdWithPeer.MsgId])).msgList[0]
     const retMsg = await OB11Entities.message(this.ctx, msg)
+    if (!retMsg) {
+      throw new Error('消息为空')
+    }
     retMsg.message_id = MessageUnique.createMsg(peer, msg.msgId)!
     retMsg.message_seq = retMsg.message_id
     retMsg.real_id = retMsg.message_id

src/onebot11/action/msg/SendMsg.ts

@@ -14,8 +14,8 @@ import {
   OB11PostSendMsg,
 } from '../../types'
 import fs from 'node:fs'
-import BaseAction from '../BaseAction'
-import { ActionName, BaseCheckResult } from '../types'
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
 import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '@/common/utils/sign'
 import { Peer } from '@/ntqqapi/types/msg'
 import { MessageUnique } from '@/common/utils/messageUnique'
@@ -29,27 +29,6 @@ interface ReturnData {
 export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
   actionName = ActionName.SendMsg
 
-  protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-    const messages = convertMessage2List(payload.message)
-    const fmNum = this.getSpecialMsgNum(messages, OB11MessageDataType.node)
-    if (fmNum && fmNum != messages.length) {
-      return {
-        valid: false,
-        message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
-      }
-    }
-    const musicNum = this.getSpecialMsgNum(messages, OB11MessageDataType.music)
-    if (musicNum && messages.length > 1) {
-      return {
-        valid: false,
-        message: '音乐消息不可以和其他消息混在一起发送',
-      }
-    }
-    return {
-      valid: true,
-    }
-  }
-
   protected async _handle(payload: OB11PostSendMsg) {
     let contextMode = CreatePeerMode.Normal
     if (payload.message_type === 'group') {

src/onebot11/action/msg/SendPrivateMsg.ts

@@ -1,13 +1,13 @@
 import SendMsg from './SendMsg'
-import { ActionName, BaseCheckResult } from '../types'
+import { ActionName } from '../types'
 import { OB11PostSendMsg } from '../../types'
 
 class SendPrivateMsg extends SendMsg {
   actionName = ActionName.SendPrivateMsg
 
-  protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+  protected _handle(payload: OB11PostSendMsg) {
     payload.message_type = 'private'
-    return super.check(payload)
+    return super._handle(payload)
   }
 }
 

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {

src/onebot11/action/system/CanSendRecord.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface ReturnType {

src/onebot11/action/system/CleanCache.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import fs from 'node:fs'
 import Path from 'node:path'
@@ -82,4 +82,4 @@ function deleteCachePath(pathList: string[]) {
   for (const path of pathList) {
     emptyPath(path)
   }
-}
+}

src/onebot11/action/system/GetLoginInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11User } from '../../types'
 import { ActionName } from '../types'
 import { selfInfo } from '@/common/globalVars'

src/onebot11/action/system/GetStatus.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Status } from '../../types'
 import { ActionName } from '../types'
 import { selfInfo } from '@/common/globalVars'

src/onebot11/action/system/GetVersionInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Version } from '../../types'
 import { ActionName } from '../types'
 import { version } from '../../../version'

src/onebot11/action/types.ts

@@ -20,6 +20,7 @@ export enum ActionName {
   GetFriendsWithCategory = 'get_friends_with_category',
   GetEvent = 'get_event',
   SetOnlineStatus = 'set_online_status',
+  GetProfileLike = 'get_profile_like',
   // onebot 11
   SendLike = 'send_like',
   GetLoginInfo = 'get_login_info',
@@ -65,9 +66,9 @@ export enum ActionName {
   GoCQHTTP_DownloadFile = 'download_file',
   GoCQHTTP_GetGroupMsgHistory = 'get_group_msg_history',
   GoCQHTTP_GetForwardMsg = 'get_forward_msg',
-  GoCQHTTP_GetEssenceMsg = "get_essence_msg_list",
-  GoCQHTTP_HandleQuickOperation = ".handle_quick_operation",
-  GetGroupHonorInfo = "get_group_honor_info",
+  GoCQHTTP_GetEssenceMsg = 'get_essence_msg_list',
+  GoCQHTTP_HandleQuickOperation = '.handle_quick_operation',
+  GetGroupHonorInfo = 'get_group_honor_info',
   GoCQHTTP_SetEssenceMsg = 'set_essence_msg',
   GoCQHTTP_DelEssenceMsg = 'delete_essence_msg',
   GoCQHTTP_DelGroupFile = 'delete_group_file',

src/onebot11/action/user/GetCookie.ts

@@ -1,26 +1,26 @@
-import BaseAction from '../BaseAction'
-import { ActionName } from '../types'
-
-interface Response {
-  cookies: string
-  bkn: string
-}
-
-interface Payload {
-  domain: string
-}
-
-export class GetCookies extends BaseAction<Payload, Response> {
-  actionName = ActionName.GetCookies
-
-  protected async _handle(payload: Payload) {
-    if (!payload.domain) {
-      throw '缺少参数 domain'
-    }
-    const cookiesObject = await this.ctx.ntUserApi.getCookies(payload.domain)
-    //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
-    const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
-    const bkn = cookiesObject.skey ? this.ctx.ntWebApi.genBkn(cookiesObject.skey) : ''
-    return { cookies, bkn }
-  }
-}
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Response {
+  cookies: string
+  bkn: string
+}
+
+interface Payload {
+  domain: string
+}
+
+export class GetCookies extends BaseAction<Payload, Response> {
+  actionName = ActionName.GetCookies
+
+  protected async _handle(payload: Payload) {
+    if (!payload.domain) {
+      throw '缺少参数 domain'
+    }
+    const cookiesObject = await this.ctx.ntUserApi.getCookies(payload.domain)
+    //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
+    const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
+    const bkn = cookiesObject.skey ? this.ctx.ntWebApi.genBkn(cookiesObject.skey) : ''
+    return { cookies, bkn }
+  }
+}

src/onebot11/action/user/GetFriendList.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
@@ -32,4 +32,4 @@ export class GetFriendWithCategory extends BaseAction<void, OB11User[]> {
       throw new Error('this ntqq version not support, must be 26702 or later')
     }
   }
-}
+}

src/onebot11/action/user/SendLike.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,6 +1,5 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQFriendApi } from '../../../ntqqapi/api/friend'
 
 interface Payload {
   flag: string

src/onebot11/adapter.ts

@@ -27,6 +27,8 @@ import { initActionMap } from './action'
 import { llonebotError } from '../common/globalVars'
 import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent'
 import { OB11GroupAdminNoticeEvent } from './event/notice/OB11GroupAdminNoticeEvent'
+import { OB11ProfileLikeEvent } from './event/notice/OB11ProfileLikeEvent'
+import { SysMsg } from '@/ntqqapi/proto/compiled'
 
 declare module 'cordis' {
   interface Context {
@@ -193,6 +195,9 @@ class OneBot11Adapter extends Service {
 
       OB11Entities.message(this.ctx, message)
         .then((msg) => {
+          if (!msg) {
+            return
+          }
           if (!this.config.debug && msg.message.length === 0) {
             return
           }
@@ -221,20 +226,16 @@ class OneBot11Adapter extends Service {
     }
   }
 
-  private handleRecallMsg(msgList: RawMessage[]) {
-    for (const message of msgList) {
-      if (message.recallTime != '0') {
-        const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId)
-        if (!oriMessageId) {
-          continue
-        }
-        OB11Entities.recallEvent(this.ctx, message, oriMessageId).then((recallEvent) => {
-          if (recallEvent) {
-            this.dispatch(recallEvent)
-          }
-        })
-      }
+  private handleRecallMsg(message: RawMessage) {
+    const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId)
+    if (!oriMessageId) {
+      return
     }
+    OB11Entities.recallEvent(this.ctx, message, oriMessageId).then((recallEvent) => {
+      if (recallEvent) {
+        this.dispatch(recallEvent)
+      }
+    })
   }
 
   private async handleFriendRequest(buddyReqs: FriendRequest[]) {
@@ -399,7 +400,7 @@ class OneBot11Adapter extends Service {
       this.handleRecallMsg(input)
     })
     this.ctx.on('nt/message-sent', input => {
-      this.handleMsg(input)
+      this.handleMsg([input])
     })
     this.ctx.on('nt/group-notify', input => {
       this.handleGroupNotify(input)
@@ -410,6 +411,19 @@ class OneBot11Adapter extends Service {
     this.ctx.on('nt/group-member-info-updated', input => {
       this.handleGroupMemberInfoUpdated(input.groupCode, input.members)
     })
+    this.ctx.on('nt/system-message-created', input => {
+      const sysMsg = SysMsg.SystemMessage.decode(input)
+      const { msgType, subType, subSubType } = sysMsg.msgSpec[0] ?? {}
+      if (msgType === 528 && subType === 39 && subSubType === 39) {
+        const tip = SysMsg.ProfileLikeTip.decode(sysMsg.bodyWrapper!.body!)
+        if (tip.msgType !== 0 || tip.subType !== 203) return
+        const detail = tip.content?.msg?.detail
+        if (!detail) return
+        const [times] = detail.txt?.match(/\d+/) ?? ['0']
+        const profileLikeEvent = new OB11ProfileLikeEvent(detail.uin!, detail.nickname!, +times)
+        this.dispatch(profileLikeEvent)
+      }
+    })
   }
 }
 
@@ -426,4 +440,4 @@ namespace OneBot11Adapter {
   }
 }
 
-export default OneBot11Adapter
+export default OneBot11Adapter

src/onebot11/connect/http.ts

@@ -1,8 +1,8 @@
-import BaseAction from '../action/BaseAction'
 import http from 'node:http'
 import cors from 'cors'
 import crypto from 'node:crypto'
 import express, { Express, Request, Response } from 'express'
+import { BaseAction } from '../action/BaseAction'
 import { Context } from 'cordis'
 import { llonebotError, selfInfo } from '@/common/globalVars'
 import { OB11Response } from '../action/OB11Response'
@@ -211,4 +211,4 @@ namespace OB11HttpPost {
   }
 }
 
-export { OB11Http, OB11HttpPost }
+export { OB11Http, OB11HttpPost }

src/onebot11/connect/ws.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../action/BaseAction'
+import { BaseAction } from '../action/BaseAction'
 import { Context } from 'cordis'
 import { WebSocket, WebSocketServer } from 'ws'
 import { llonebotError } from '@/common/globalVars'
@@ -339,4 +339,4 @@ namespace OB11WebSocketReverseManager {
   }
 }
 
-export { OB11WebSocket, OB11WebSocketReverseManager }
+export { OB11WebSocket, OB11WebSocketReverseManager }

src/onebot11/entities.ts

@@ -49,7 +49,8 @@ import { pathToFileURL } from 'node:url'
 import OneBot11Adapter from './adapter'
 
 export namespace OB11Entities {
-  export async function message(ctx: Context, msg: RawMessage): Promise<OB11Message> {
+  export async function message(ctx: Context, msg: RawMessage): Promise<OB11Message | undefined> {
+    if (!msg.senderUin || msg.senderUin === '0') return //跳过空消息
     const {
       debug,
       messagePostFormat,
@@ -57,14 +58,14 @@ export namespace OB11Entities {
     const selfUin = selfInfo.uin
     const resMsg: OB11Message = {
       self_id: parseInt(selfUin),
-      user_id: parseInt(msg.senderUin!),
+      user_id: parseInt(msg.senderUin),
       time: parseInt(msg.msgTime) || Date.now(),
       message_id: msg.msgShortId!,
       real_id: msg.msgShortId!,
       message_seq: msg.msgShortId!,
       message_type: msg.chatType === ChatType.group ? 'group' : 'private',
       sender: {
-        user_id: parseInt(msg.senderUin!),
+        user_id: parseInt(msg.senderUin),
         nickname: msg.sendNickName,
         card: msg.sendMemberName ?? '',
       },
@@ -81,7 +82,7 @@ export namespace OB11Entities {
     if (msg.chatType === ChatType.group) {
       resMsg.sub_type = 'normal'
       resMsg.group_id = parseInt(msg.peerUin)
-      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin!)
+      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin)
       if (member) {
         resMsg.sender.role = groupMemberRole(member.role)
         resMsg.sender.nickname = member.nick
@@ -164,7 +165,7 @@ export namespace OB11Entities {
 
           // 284840486: 合并消息内侧 消息具体定位不到
           if (!replyMsg && msg.peerUin !== '284840486') {
-            ctx.logger.info('queryMsgs', msgList.map(e => pick(e, ['msgSeq', 'msgRandom'])))
+            ctx.logger.info('queryMsgs', msgList.map(e => pick(e, ['msgSeq', 'msgRandom'])), records.msgRandom)
             throw new Error('回复消息验证失败')
           }
           messageSegment = {
@@ -373,31 +374,26 @@ export namespace OB11Entities {
     }
     for (const element of msg.elements) {
       if (element.grayTipElement) {
-        if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
-          const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr)
-          if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-            //判断业务类型
-            //Poke事件
-            const pokedetail: Dict[] = json.items
-            //筛选item带有uid的元素
-            const poke_uid = pokedetail.filter(item => item.uid)
-            if (poke_uid.length == 2) {
-              return new OB11FriendPokeEvent(
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid)),
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid)),
-                pokedetail
-              )
-            }
+        const { grayTipElement } = element
+        if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
+          const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+          const pokedetail: Dict[] = json.items
+          //筛选item带有uid的元素
+          const poke_uid = pokedetail.filter(item => item.uid)
+          if (poke_uid.length === 2) {
+            return new OB11FriendPokeEvent(
+              Number(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid)),
+              Number(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid)),
+              pokedetail
+            )
           }
-          //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
+        }
+        if (grayTipElement.xmlElement?.templId === '10229') {
+          const uin = +msg.peerUin || +(await ctx.ntUserApi.getUinByUid(msg.peerUid))
+          return new OB11FriendAddNoticeEvent(uin)
         }
       }
     }
-    // 好友增加事件
-    if (msg.msgType === 5 && msg.subMsgType === 12) {
-      const event = new OB11FriendAddNoticeEvent(parseInt(msg.peerUin))
-      return event
-    }
   }
 
   export async function groupEvent(ctx: Context, msg: RawMessage): Promise<OB11GroupNoticeEvent | void> {
@@ -489,7 +485,7 @@ export namespace OB11Entities {
         }
       }
       else if (element.fileElement) {
-        return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin!), {
+        return new OB11GroupUploadNoticeEvent(+msg.peerUid, +msg.senderUin!, {
           id: element.fileElement.fileUuid!,
           name: element.fileElement.fileName,
           size: parseInt(element.fileElement.fileSize),
@@ -543,7 +539,7 @@ export namespace OB11Entities {
         }
 
         if (
-          grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER &&
+          grayTipElement.subElementType == GrayTipElementSubType.XMLMSG &&
           xmlElement?.templId == '10179'
         ) {
           ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
@@ -563,35 +559,9 @@ export namespace OB11Entities {
             }
           }
         }
-        else if (grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
-          const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
-          /*
-          {
-            align: 'center',
-            items: [
-              { txt: '恭喜', type: 'nor' },
-              {
-                col: '3',
-                jp: '5',
-                param: ["QQ号"],
-                txt: '林雨辰',
-                type: 'url'
-              },
-              { txt: '获得群主授予的', type: 'nor' },
-              {
-                col: '3',
-                jp: '',
-                txt: '好好好',
-                type: 'url'
-              },
-              { txt: '头衔', type: 'nor' }
-            ]
-          }
-    
-          * */
-          if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
-            //判断业务类型
-            //Poke事件
+        else if (grayTipElement.subElementType == GrayTipElementSubType.JSON) {
+          const json = JSON.parse(grayTipElement.jsonGrayTipElement!.jsonStr)
+          if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
             const pokedetail: Dict[] = json.items
             //筛选item带有uid的元素
             const poke_uid = pokedetail.filter(item => item.uid)
@@ -604,7 +574,7 @@ export namespace OB11Entities {
               )
             }
           }
-          if (grayTipElement.jsonGrayTipElement.busiId == 2401) {
+          if (grayTipElement.jsonGrayTipElement?.busiId === '2401') {
             ctx.logger.info('收到群精华消息', json)
             const searchParams = new URL(json.items[0].jp).searchParams
             const msgSeq = searchParams.get('msgSeq')!
@@ -631,7 +601,7 @@ export namespace OB11Entities {
             )
             // 获取MsgSeq+Peer可获取具体消息
           }
-          if (grayTipElement.jsonGrayTipElement.busiId == 2407) {
+          if (grayTipElement.jsonGrayTipElement?.busiId === '2407') {
             const memberUin = json.items[1].param[0]
             const title = json.items[3].txt
             ctx.logger.info('收到群成员新头衔消息', json)
@@ -653,14 +623,14 @@ export namespace OB11Entities {
     shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
     const msgElement = msg.elements.find(
-      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.RECALL,
+      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.REVOKE,
     )
     if (!msgElement) {
       return
     }
-    const revokeElement = msgElement.grayTipElement.revokeElement
+    const revokeElement = msgElement.grayTipElement!.revokeElement
     if (msg.chatType === ChatType.group) {
-      const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement.operatorUid)
+      const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement!.operatorUid)
       return new OB11GroupRecallNoticeEvent(
         parseInt(msg.peerUid),
         parseInt(msg.senderUin!),

src/onebot11/event/OB11BaseEvent.ts

@@ -1,4 +1,4 @@
-import { selfInfo } from "@/common/globalVars"
+import { selfInfo } from '@/common/globalVars'
 
 export enum EventType {
   META = 'meta_event',