Merge pull request #436 from LLOneBot/dev

release: 3.33.4

.gitattributes

@@ -0,0 +1,7 @@
+* text eol=lf
+
+*.png -text
+*.jpg -text
+*.ico -text
+*.gif -text
+*.webp -text

.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

electron.vite.config.ts

@@ -31,7 +31,6 @@ const config: ElectronViteConfig = {
     resolve: {
       alias: {
         '@': path.resolve(__dirname, './src'),
-        './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
       },
     },
     plugins: [

manifest.json

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

package.json

@@ -7,25 +7,27 @@
   "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",
   "dependencies": {
-    "@minatojs/driver-sqlite": "^4.5.0",
+    "@minatojs/driver-sqlite": "^4.6.0",
     "compressing": "^1.10.1",
-    "cordis": "^3.18.0",
+    "cordis": "^3.18.1",
     "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",
+    "minato": "^3.6.0",
+    "protobufjs": "^7.4.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -37,9 +39,10 @@
     "@types/ws": "^8.5.12",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
-    "typescript": "^5.5.4",
+    "protobufjs-cli": "^1.1.3",
-    "vite": "^5.4.3",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.7",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.0"
 }

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

@@ -6,14 +6,6 @@ import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { fileTypeFromFile } from 'file-type'
 
-export function isGIF(path: string) {
-  const buffer = Buffer.alloc(4)
-  const fd = fs.openSync(path, 'r')
-  fs.readSync(fd, buffer, 0, 4, 0)
-  fs.closeSync(fd)
-  return buffer.toString() === 'GIF8'
-}
-
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
   return new Promise((resolve, reject) => {
@@ -91,17 +83,26 @@ interface FetchFileRes {
 }
 
 export async function fetchFile(url: string, headersInit?: Record<string, string>): Promise<FetchFileRes> {
-  const headers: Record<string, string> = {
+  const headers = new Headers({
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
     'Host': new URL(url).hostname,
     ...headersInit
-  }
+  })
-  const raw = await fetch(url, { headers }).catch((err) => {
+  let raw = await fetch(url, { headers }).catch((err) => {
     if (err.cause) {
       throw err.cause
     }
     throw err
   })
+  if (raw.status === 403 && !headers.has('Referer')) {
+    headers.set('Referer', url)
+    raw = await fetch(url, { headers }).catch((err) => {
+      if (err.cause) {
+        throw err.cause
+      }
+      throw err
+    })
+  }
   if (!raw.ok) throw new Error(`statusText: ${raw.statusText}`)
   return {
     data: Buffer.from(await raw.arrayBuffer()),

src/common/utils/messageUnique.ts

@@ -1,163 +0,0 @@
-import fsPromise from 'node:fs/promises'
-import fs from 'node:fs'
-import path from 'node:path'
-import Database, { Tables } from 'minato'
-import SQLite from '@minatojs/driver-sqlite'
-import { Peer } from '@/ntqqapi/types'
-import { createHash } from 'node:crypto'
-import { LimitedHashTable } from './table'
-import { DATA_DIR } from '../globalVars'
-import { FileCacheV2 } from '../types'
-
-interface SQLiteTables extends Tables {
-  message: {
-    shortId: number
-    msgId: string
-    chatType: number
-    peerUid: string
-  }
-  file_v2: FileCacheV2
-}
-
-interface MsgIdAndPeerByShortId {
-  MsgId: string
-  Peer: Peer
-}
-
-// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/MessageUnique.ts#L84
-class MessageUniqueWrapper {
-  private msgDataMap: LimitedHashTable<string, number>
-  private msgIdMap: LimitedHashTable<string, number>
-  private db: Database<SQLiteTables> | undefined
-
-  constructor(maxMap: number = 1000) {
-    this.msgIdMap = new LimitedHashTable<string, number>(maxMap)
-    this.msgDataMap = new LimitedHashTable<string, number>(maxMap)
-  }
-
-  async init(uin: string) {
-    const dbDir = path.join(DATA_DIR, 'database')
-    if (!fs.existsSync(dbDir)) {
-      await fsPromise.mkdir(dbDir)
-    }
-    const database = new Database<SQLiteTables>()
-    await database.connect(SQLite, {
-      path: path.join(dbDir, `${uin}.db`)
-    })
-    database.extend('message', {
-      shortId: 'integer(10)',
-      chatType: 'unsigned',
-      msgId: 'string(24)',
-      peerUid: 'string(24)'
-    }, {
-      primary: 'shortId'
-    })
-    database.extend('file_v2', {
-      fileName: 'string',
-      fileSize: 'string',
-      fileUuid: 'string(128)',
-      msgId: 'string(24)',
-      msgTime: 'unsigned(10)',
-      peerUid: 'string(24)',
-      chatType: 'unsigned',
-      elementId: 'string(24)',
-      elementType: 'unsigned',
-    }, {
-      primary: 'fileUuid',
-      indexes: ['fileName']
-    })
-    this.db = database
-  }
-
-  async getRecentMsgIds(Peer: Peer, size: number): Promise<string[]> {
-    const heads = this.msgIdMap.getHeads(size)
-    if (!heads) {
-      return []
-    }
-    const data: (MsgIdAndPeerByShortId | undefined)[] = []
-    for (const t of heads) {
-      data.push(await MessageUnique.getMsgIdAndPeerByShortId(t.value))
-    }
-    const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid)
-    return ret.map((t) => t?.MsgId).filter((t) => t !== undefined)
-  }
-
-  createMsg(peer: Peer, msgId: string): number {
-    const key = `${msgId}|${peer.chatType}|${peer.peerUid}`
-    const hash = createHash('md5').update(key).digest()
-    //设置第一个bit为0 保证shortId为正数
-    hash[0] &= 0x7f
-    const shortId = hash.readInt32BE(0)
-    //减少性能损耗
-    // const isExist = this.msgIdMap.getKey(shortId)
-    // if (isExist && isExist === msgId) {
-    //   return shortId
-    // }
-    this.msgIdMap.set(msgId, shortId)
-    this.msgDataMap.set(key, shortId)
-    this.db?.upsert('message', [{
-      msgId,
-      shortId,
-      chatType: peer.chatType,
-      peerUid: peer.peerUid
-    }], 'shortId').then()
-    return shortId
-  }
-
-  async getMsgIdAndPeerByShortId(shortId: number): Promise<MsgIdAndPeerByShortId | undefined> {
-    const data = this.msgDataMap.getKey(shortId)
-    if (data) {
-      const [msgId, chatTypeStr, peerUid] = data.split('|')
-      const peer: Peer = {
-        chatType: parseInt(chatTypeStr),
-        peerUid,
-        guildId: '',
-      }
-      return { MsgId: msgId, Peer: peer }
-    }
-    const items = await this.db?.get('message', { shortId })
-    if (items?.length) {
-      const { msgId, chatType, peerUid } = items[0]
-      return {
-        MsgId: msgId,
-        Peer: {
-          chatType,
-          peerUid,
-          guildId: '',
-        }
-      }
-    }
-    return undefined
-  }
-
-  getShortIdByMsgId(msgId: string): number | undefined {
-    return this.msgIdMap.getValue(msgId)
-  }
-
-  async getPeerByMsgId(msgId: string) {
-    const shortId = this.msgIdMap.getValue(msgId)
-    if (!shortId) return undefined
-    return await this.getMsgIdAndPeerByShortId(shortId)
-  }
-
-  resize(maxSize: number): void {
-    this.msgIdMap.resize(maxSize)
-    this.msgDataMap.resize(maxSize)
-  }
-
-  addFileCache(data: FileCacheV2) {
-    return this.db?.upsert('file_v2', [data], 'fileUuid')
-  }
-
-  getFileCacheByName(fileName: string) {
-    return this.db?.get('file_v2', { fileName }, {
-      sort: { msgTime: 'desc' }
-    })
-  }
-
-  getFileCacheById(fileUuid: string) {
-    return this.db?.get('file_v2', { fileUuid })
-  }
-}
-
-export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper()

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)
@@ -12,8 +12,9 @@ export function calcQQLevel(level: QQLevel) {
 
 /** QQ Build Version  */
 export function getBuildVersion(): number {
-  const version: string = globalThis.LiteLoader.versions.qqnt
+  //const version: string = globalThis.LiteLoader.versions.qqnt
-  return +version.split('-')[1]
+  //return +version.split('-')[1]
+  return +globalThis.LiteLoader.package.qqnt.buildVersion
 }
 
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
@@ -32,4 +33,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 downloadMirrorHosts = ['https://ghp.ci/']
-const checkVersionMirrorHosts = ['https://kkgithub.com']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
   const latestVersionText = await getRemoteVersion()
   const latestVersion = latestVersionText.split('.')
-  //log('llonebot last version', latestVersion)
+  log('LLOneBot latest version', latestVersion)
-  const currentVersion: string[] = version.split('.')
+  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 (const mirror of releasesMirrorHosts) {
-  for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
-    const mirrorGithub = checkVersionMirrorHosts[i]
+    if (version) {
-    const tVersion = await getRemoteVersionByMirror(mirrorGithub)
+      return version
-    if (tVersion && tVersion != '') {
+    }
-      Version = tVersion
+  }
-      break
+  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}] ${selfInfo.nick}(${selfInfo.uin}) | ${record.name} ${record.content}\n\n`
-        const content = `${dateTime} [${record.type}] ${userInfo} | ${record.name} ${record.content}\n\n`
         appendFile(file, content, noop)
       },
     }
@@ -33,4 +32,4 @@ export default class Log {
       enable = input.log!
     })
   }
-}
+}

src/main/main.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import fs from 'node:fs'
 import Log from './log'
 import Core from '../ntqqapi/core'
 import OneBot11Adapter from '../onebot11/adapter'
@@ -34,6 +33,11 @@ import {
   NTQQWebApi,
   NTQQWindowApi
 } from '../ntqqapi/api'
+import { mkdir } from 'node:fs/promises'
+import { existsSync, mkdirSync } from 'node:fs'
+import Database from 'minato'
+import SQLiteDriver from '@minatojs/driver-sqlite'
+import Store from './store'
 
 declare module 'cordis' {
   interface Events {
@@ -45,12 +49,12 @@ let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-  if (!fs.existsSync(DATA_DIR)) {
+  if (!existsSync(DATA_DIR)) {
-    fs.mkdirSync(DATA_DIR, { recursive: true })
+    mkdirSync(DATA_DIR, { recursive: true })
   }
 
-  if (!fs.existsSync(LOG_DIR)) {
+  if (!existsSync(LOG_DIR)) {
-    fs.mkdirSync(LOG_DIR)
+    mkdirSync(LOG_DIR)
   }
 
   ipcMain.handle(CHANNEL_CHECK_VERSION, async () => {
@@ -151,8 +155,12 @@ function onLoad() {
       log('LLOneBot 开关设置为关闭，不启动LLOneBot')
       return
     }
-    if (!fs.existsSync(TEMP_DIR)) {
+    if (!existsSync(TEMP_DIR)) {
-      fs.mkdirSync(TEMP_DIR)
+      await mkdir(TEMP_DIR)
+    }
+    const dbDir = path.join(DATA_DIR, 'database')
+    if (!existsSync(dbDir)) {
+      await mkdir(dbDir)
     }
     const ctx = new Context()
     ctx.plugin(Log, {
@@ -179,6 +187,11 @@ function onLoad() {
       enableLocalFile2Url: config.enableLocalFile2Url!,
       ffmpeg: config.ffmpeg,
     })
+    ctx.plugin(Database)
+    ctx.plugin(SQLiteDriver, {
+      path: path.join(dbDir, `${selfInfo.uin}.db`)
+    })
+    ctx.plugin(Store)
     ctx.start()
     ipcMain.on(CHANNEL_SET_CONFIG_CONFIRMED, (event, config: LLOBConfig) => {
       ctx.parallel('llonebot/config-updated', config)

src/main/store.ts

@@ -0,0 +1,126 @@
+import { Peer } from '@/ntqqapi/types'
+import { createHash } from 'node:crypto'
+import { LimitedHashTable } from '@/common/utils/table'
+import { FileCacheV2 } from '@/common/types'
+import { Context, Service } from 'cordis'
+
+declare module 'cordis' {
+  interface Context {
+    store: Store
+  }
+  interface Tables {
+    message: {
+      shortId: number
+      msgId: string
+      chatType: number
+      peerUid: string
+    }
+    file_v2: FileCacheV2
+  }
+}
+
+interface MsgInfo {
+  msgId: string
+  peer: Peer
+}
+
+export default class Store extends Service {
+  static inject = ['database', 'model']
+  private cache: LimitedHashTable<string, number>
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'store', true)
+    this.cache = new LimitedHashTable<string, number>(1000)
+    this.initDatabase()
+  }
+
+  private async initDatabase() {
+    this.ctx.model.extend('message', {
+      shortId: 'integer(10)',
+      chatType: 'unsigned',
+      msgId: 'string(24)',
+      peerUid: 'string(24)'
+    }, {
+      primary: 'shortId'
+    })
+    this.ctx.model.extend('file_v2', {
+      fileName: 'string',
+      fileSize: 'string',
+      fileUuid: 'string(128)',
+      msgId: 'string(24)',
+      msgTime: 'unsigned(10)',
+      peerUid: 'string(24)',
+      chatType: 'unsigned',
+      elementId: 'string(24)',
+      elementType: 'unsigned',
+    }, {
+      primary: 'fileUuid',
+      indexes: ['fileName']
+    })
+  }
+
+  createMsgShortId(peer: Peer, msgId: string): number {
+    const cacheKey = `${msgId}|${peer.chatType}|${peer.peerUid}`
+    const hash = createHash('md5').update(cacheKey).digest()
+    hash[0] &= 0x7f //设置第一个bit为0 保证shortId为正数
+    const shortId = hash.readInt32BE()
+    this.cache.set(cacheKey, shortId)
+    this.ctx.database.upsert('message', [{
+      msgId,
+      shortId,
+      chatType: peer.chatType,
+      peerUid: peer.peerUid
+    }], 'shortId').then()
+    return shortId
+  }
+
+  async getMsgInfoByShortId(shortId: number): Promise<MsgInfo | undefined> {
+    const data = this.cache.getKey(shortId)
+    if (data) {
+      const [msgId, chatTypeStr, peerUid] = data.split('|')
+      return {
+        msgId,
+        peer: {
+          chatType: +chatTypeStr,
+          peerUid,
+          guildId: ''
+        }
+      }
+    }
+    const items = await this.ctx.database.get('message', { shortId })
+    if (items?.length) {
+      const { msgId, chatType, peerUid } = items[0]
+      return {
+        msgId,
+        peer: {
+          chatType,
+          peerUid,
+          guildId: ''
+        }
+      }
+    }
+  }
+
+  async getShortIdByMsgId(msgId: string): Promise<number | undefined> {
+    return (await this.ctx.database.get('message', { msgId }))[0]?.shortId
+  }
+
+  getShortIdByMsgInfo(peer: Peer, msgId: string) {
+    const cacheKey = `${msgId}|${peer.chatType}|${peer.peerUid}`
+    return this.cache.getValue(cacheKey)
+  }
+
+  addFileCache(data: FileCacheV2) {
+    return this.ctx.database.upsert('file_v2', [data], 'fileUuid')
+  }
+
+  getFileCacheByName(fileName: string) {
+    return this.ctx.database.get('file_v2', { fileName }, {
+      sort: { msgTime: 'desc' }
+    })
+  }
+
+  getFileCacheById(fileUuid: string) {
+    return this.ctx.database.get('file_v2', { fileUuid })
+  }
+}

src/ntqqapi/api/file.ts

@@ -13,15 +13,14 @@ import {
   PicElement,
 } from '../types'
 import path from 'node:path'
-import fs from 'node:fs'
+import { existsSync } from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { RkeyManager } from '@/ntqqapi/helper/rkey'
 import { getSession } from '@/ntqqapi/wrapper'
-import { Peer } from '@/ntqqapi/types/msg'
+import { OnRichMediaDownloadCompleteParams, Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
 import { fileTypeFromFile } from 'file-type'
-import fsPromise from 'node:fs/promises'
+import { copyFile, stat, unlink } from 'node:fs/promises'
-import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { TEMP_DIR } from '@/common/globalVars'
@@ -38,7 +37,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) {
@@ -76,18 +75,13 @@ export class NTQQFileApi extends Service {
   // 上传文件到QQ的文件夹
   async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
-    let ext = (await this.getFileType(filePath))?.ext || ''
+    let fileName = path.basename(filePath)
-    if (ext) {
+    if (!fileName.includes('.')) {
-      ext = '.' + ext
+      const ext = (await this.getFileType(filePath))?.ext
+      fileName += ext ? '.' + ext : ''
     }
-    let fileName = `${path.basename(filePath)}`
+    const mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
-    if (fileName.indexOf('.') === -1) {
+      path_info: {
-      fileName += ext
-    }
-    const session = getSession()
-    let mediaPath: string
-    if (session) {
-      mediaPath = session?.getMsgService().getRichMediaFilePathForGuild({
         md5HexStr: fileMd5,
         fileName: fileName,
         elementType: elementType,
@@ -95,30 +89,16 @@ export class NTQQFileApi extends Service {
         thumbSize: 0,
         needCreate: true,
         downloadType: 1,
-        file_uuid: ''
+        file_uuid: '',
-      })
+      },
-    } else {
+    }])
-      mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
+    await copyFile(filePath, mediaPath)
-        path_info: {
+    const fileSize = (await stat(filePath)).size
-          md5HexStr: fileMd5,
-          fileName: fileName,
-          elementType: elementType,
-          elementSubType,
-          thumbSize: 0,
-          needCreate: true,
-          downloadType: 1,
-          file_uuid: '',
-        },
-      }])
-    }
-    await fsPromise.copyFile(filePath, mediaPath)
-    const fileSize = (await fsPromise.stat(filePath)).size
     return {
       md5: fileMd5,
       fileName,
       path: mediaPath,
       fileSize,
-      ext
     }
   }
 
@@ -133,10 +113,10 @@ export class NTQQFileApi extends Service {
     force = false
   ) {
     // 用于下载收到的消息中的图片等
-    if (sourcePath && fs.existsSync(sourcePath)) {
+    if (sourcePath && existsSync(sourcePath)) {
       if (force) {
         try {
-          await fsPromise.unlink(sourcePath)
+          await unlink(sourcePath)
         } catch { }
       } else {
         return sourcePath
@@ -177,7 +157,11 @@ export class NTQQFileApi extends Service {
   }
 
   async getImageSize(filePath: string) {
-    return await invoke<{ width: number; height: number }>(
+    return await invoke<{
+      width: number
+      height: number
+      type: string
+    }>(
       NTMethod.IMAGE_SIZE,
       [filePath],
       {

src/ntqqapi/api/friend.ts

@@ -42,13 +42,7 @@ export class NTQQFriendApi extends Service {
     return _friends
   }
 
-  async handleFriendRequest(flag: string, accept: boolean) {
+  async handleFriendRequest(friendUid: string, reqTime: string, accept: boolean) {
-    const data = flag.split('|')
-    if (data.length < 2) {
-      return
-    }
-    const friendUid = data[0]
-    const reqTime = data[1]
     const session = getSession()
     if (session) {
       return session.getBuddyService().approvalFriendRequest({
@@ -68,67 +62,42 @@ export class NTQQFriendApi extends Service {
   }
 
   async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-    const session = getSession()
+    const data = await invoke<{
-    if (session) {
+      buddyCategory: CategoryFriend[]
-      const uids: string[] = []
+      userSimpleInfos: Record<string, SimpleInfo>
-      const buddyService = session.getBuddyService()
+    }>(
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      'getBuddyList',
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
+      [refresh],
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      {
-      return Array.from(data.values())
+        className: NTClass.NODE_STORE_API,
-    } else {
+        cbCmd: ReceiveCmdS.FRIENDS,
-      const data = await invoke<{
+        afterFirstCmd: false,
-        buddyCategory: CategoryFriend[]
+      }
-        userSimpleInfos: Record<string, SimpleInfo>
+    )
-      }>(
+    const uids = data.buddyCategory.flatMap(item => item.buddyUids)
-        'getBuddyList',
+    return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      const uids = data.buddyCategory.flatMap(item => item.buddyUids)
-      return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
-    }
   }
 
   /** uid => uin */
   async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
     const retMap: Map<string, string> = new Map()
-    const session = getSession()
+    const data = await invoke<{
-    if (session) {
+      buddyCategory: CategoryFriend[]
-      const uids: string[] = []
+      userSimpleInfos: Record<string, SimpleInfo>
-      const buddyService = session.getBuddyService()
+    }>(
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      'getBuddyList',
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
+      [refresh],
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      {
-      for (const [, item] of data) {
+        className: NTClass.NODE_STORE_API,
-        if (retMap.size > 5000) {
+        cbCmd: ReceiveCmdS.FRIENDS,
-          break
+        afterFirstCmd: false,
-        }
-        retMap.set(item.uid!, item.uin!)
       }
-    } else {
+    )
-      const data = await invoke<{
+    for (const item of Object.values(data.userSimpleInfos)) {
-        buddyCategory: CategoryFriend[]
+      if (retMap.size > 5000) {
-        userSimpleInfos: Record<string, SimpleInfo>
+        break
-      }>(
-        'getBuddyList',
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      for (const item of Object.values(data.userSimpleInfos)) {
-        if (retMap.size > 5000) {
-          break
-        }
-        retMap.set(item.uid!, item.uin!)
       }
+      retMap.set(item.uid!, item.uin!)
     }
     return retMap
   }
@@ -189,4 +158,15 @@ 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
+  }
+
+  async setBuddyRemark(uid: string, remark: string) {
+    return await invoke('nodeIKernelBuddyService/setBuddyRemark', [{
+      remarkParams: { uid, remark }
+    }, null])
+  }
 }

src/ntqqapi/api/group.ts

@@ -1,10 +1,18 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam, PublishGroupBulletinReq } from '../types'
+import {
+  Group,
+  GroupMember,
+  GroupMemberRole,
+  GroupNotifies,
+  GroupRequestOperateTypes,
+  GetFileListParam,
+  OnGroupFileInfoUpdateParams,
+  PublishGroupBulletinReq
+} from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { NTQQWindows } from './window'
 import { getSession } from '../wrapper'
-import { OnGroupFileInfoUpdateParams } from '../listeners'
 import { NodeIKernelGroupService } from '../services'
 import { Service, Context } from 'cordis'
 import { isNumeric } from '@/common/utils/misc'
@@ -103,7 +111,6 @@ export class NTQQGroupApi extends Service {
       'nodeIKernelGroupService/getSingleScreenNotifies',
       [{ doubt: false, startSeq: '', number: num }, null],
       {
-
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
@@ -117,17 +124,15 @@ export class NTQQGroupApi extends Service {
     const type = parseInt(flagitem[2])
     const session = getSession()
     if (session) {
-      return session.getGroupService().operateSysNotify(
+      return session.getGroupService().operateSysNotify(false, {
-        false,
+        operateType, // 2 拒绝
-        {
+        targetMsg: {
-          'operateType': operateType, // 2 拒绝
+          seq,  // 通知序列号
-          'targetMsg': {
+          type,
-            'seq': seq,  // 通知序列号
+          groupCode,
-            'type': type,
+          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-            'groupCode': groupCode,
+        }
-            'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+      })
-          }
-        })
     } else {
       return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
         doubt: false,
@@ -214,47 +219,51 @@ export class NTQQGroupApi extends Service {
   }
 
   async getGroupRemainAtTimes(groupCode: string) {
-    return await invoke<
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
-      GeneralCallResult & {
-        atInfo: {
-          canAtAll: boolean
-          RemainAtAllCountForUin: number
-          RemainAtAllCountForGroup: number
-          atTimesMsg: string
-          canNotAtAllMsg: ''
-        }
-      }
-    >(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
   }
 
-  /** 27187 TODO */
   async removeGroupEssence(groupCode: string, msgId: string) {
     const session = getSession()
-    // 代码没测过
+    if (session) {
-    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      return session.getGroupService().removeGroupEssence({
-    const param = {
+        groupCode: groupCode,
-      groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
-      msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
-      msgSeq: Number(data?.msgList[0].msgSeq)
+      })
+    } else {
+      const ntMsgApi = this.ctx.get('ntMsgApi')!
+      const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      return await invoke('nodeIKernelGroupService/removeGroupEssence', [{
+        req: {
+          groupCode: groupCode,
+          msgRandom: Number(data?.msgList[0].msgRandom),
+          msgSeq: Number(data?.msgList[0].msgSeq)
+        }
+      }, null])
     }
-    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
-    return session?.getGroupService().removeGroupEssence(param)
   }
 
-  /** 27187 TODO */
   async addGroupEssence(groupCode: string, msgId: string) {
     const session = getSession()
-    // 代码没测过
+    if (session) {
-    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      return session.getGroupService().addGroupEssence({
-    const param = {
+        groupCode: groupCode,
-      groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
-      msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
-      msgSeq: Number(data?.msgList[0].msgSeq)
+      })
+    } else {
+      const ntMsgApi = this.ctx.get('ntMsgApi')!
+      const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      return await invoke('nodeIKernelGroupService/addGroupEssence', [{
+        req: {
+          groupCode: groupCode,
+          msgRandom: Number(data?.msgList[0].msgRandom),
+          msgSeq: Number(data?.msgList[0].msgSeq)
+        }
+      }, null])
     }
-    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
-    return session?.getGroupService().addGroupEssence(param)
   }
 
   async createGroupFileFolder(groupId: string, folderName: string) {
@@ -265,8 +274,8 @@ export class NTQQGroupApi extends Service {
     return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
   }
 
-  async deleteGroupFile(groupId: string, fileIdList: string[]) {
+  async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList: [102], fileIdList }, null])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
@@ -300,4 +309,28 @@ 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
+  }
+
+  async queryCachedEssenceMsg(groupCode: string, msgSeq = '0', msgRandom = '0') {
+    return await invoke('nodeIKernelGroupService/queryCachedEssenceMsg', [{
+      key: {
+        groupCode,
+        msgSeq: +msgSeq,
+        msgRandom: +msgRandom
+      }
+    }, null])
+  }
+
+  async getGroupHonorList(groupCode: string) {
+    // 还缺点东西
+    return await invoke('nodeIKernelGroupService/getGroupHonorList', [{
+      req: {
+        groupCode: [+groupCode]
+      }
+    }, null])
+  }
 }

src/ntqqapi/api/msg.ts

@@ -1,6 +1,6 @@
 import { invoke, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
+import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
 import { getSession } from '@/ntqqapi/wrapper'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
@@ -11,16 +11,6 @@ declare module 'cordis' {
   }
 }
 
-function generateMsgId() {
-  const timestamp = Math.floor(Date.now() / 1000)
-  const random = Math.floor(Math.random() * Math.pow(2, 32))
-  const buffer = Buffer.alloc(8)
-  buffer.writeUInt32BE(timestamp, 0)
-  buffer.writeUInt32BE(random, 4)
-  const msgId = BigInt('0x' + buffer.toString('hex')).toString()
-  return msgId
-}
-
 export class NTQQMsgApi extends Service {
   static inject = ['ntUserApi']
 
@@ -28,7 +18,7 @@ export class NTQQMsgApi extends Service {
     super(ctx, 'ntMsgApi', true)
   }
 
-  async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+  async getTempChatInfo(chatType: ChatType, peerUid: string) {
     const session = getSession()
     if (session) {
       return session.getMsgService().getTempChatInfo(chatType, peerUid)
@@ -60,7 +50,7 @@ export class NTQQMsgApi extends Service {
   }
 
   async activateChat(peer: Peer) {
-    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 20 }, null])
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }, null])
   }
 
   async activateChatAndGetHistory(peer: Peer) {
@@ -102,7 +92,7 @@ export class NTQQMsgApi extends Service {
   }
 
   async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
-    const msgId = generateMsgId()
+    const msgId = await this.generateMsgUniqueId(peer.chatType)
     peer.guildId = msgId
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/sendMsg',
@@ -183,7 +173,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
       }
@@ -235,7 +225,7 @@ export class NTQQMsgApi extends Service {
     }, null])
   }
 
-  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[]) {
+  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[] = []) {
     return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
       msgId: '0',
       msgTime: '0',
@@ -256,4 +246,27 @@ export class NTQQMsgApi extends Service {
   async setMsgRead(peer: Peer) {
     return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
   }
+
+  async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number) {
+    return await invoke('nodeIKernelMsgService/getMsgEmojiLikesList', [{
+      peer,
+      msgSeq,
+      emojiId,
+      emojiType,
+      cnt: count
+    }, null])
+  }
+
+  async fetchFavEmojiList(count: number) {
+    return await invoke('nodeIKernelMsgService/fetchFavEmojiList', [{
+      resId: '',
+      count,
+      backwardFetch: true,
+      forceRefresh: true
+    }, null])
+  }
+
+  async generateMsgUniqueId(chatType: number) {
+    return await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType }])
+  }
 }

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) {
@@ -113,18 +102,6 @@ export class NTQQUserApi extends Service {
     return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }, null])
   }
 
-  genBkn(sKey: string) {
-    sKey = sKey || ''
-    let hash = 5381
-
-    for (let i = 0; i < sKey.length; i++) {
-      const code = sKey.charCodeAt(i)
-      hash = hash + (hash << 5) + code
-    }
-
-    return (hash & 0x7fffffff).toString()
-  }
-
   async like(uid: string, count = 1) {
     const session = getSession()
     if (session) {
@@ -296,4 +273,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/webapi.ts

@@ -17,88 +17,6 @@ export enum WebHonorType {
   EMOTION = 'emotion'
 }
 
-export interface WebApiGroupMember {
-  uin: number
-  role: number
-  g: number
-  join_time: number
-  last_speak_time: number
-  lv: {
-    point: number
-    level: number
-  }
-  card: string
-  tags: string
-  flag: number
-  nick: string
-  qage: number
-  rm: number
-}
-
-interface WebApiGroupMemberRet {
-  ec: number
-  errcode: number
-  em: string
-  cache: number
-  adm_num: number
-  levelname: unknown
-  mems: WebApiGroupMember[]
-  count: number
-  svr_time: number
-  max_count: number
-  search_count: number
-  extmode: number
-}
-
-interface GroupEssenceMsg {
-  group_code: string
-  msg_seq: number
-  msg_random: number
-  sender_uin: string
-  sender_nick: string
-  sender_time: number
-  add_digest_uin: string
-  add_digest_nick: string
-  add_digest_time: number
-  msg_content: unknown[]
-  can_be_removed: true
-}
-
-export interface GroupEssenceMsgRet {
-  retcode: number
-  retmsg: string
-  data: {
-    msg_list: GroupEssenceMsg[]
-    is_end: boolean
-    group_role: number
-    config_page_url: string
-  }
-}
-
-interface SetGroupNoticeParams {
-  groupCode: string
-  content: string
-  pinned: number
-  type: number
-  isShowEditCard: number
-  tipWindowType: number
-  confirmRequired: number
-  picId: string
-  imgWidth?: number
-  imgHeight?: number
-}
-
-interface SetGroupNoticeRet {
-  ec: number
-  em: string
-  id: number
-  ltsm: number
-  new_fid: string
-  read_only: number
-  role: number
-  srv_code: number
-}
-
 export class NTQQWebApi extends Service {
   static inject = ['ntUserApi']
 
@@ -106,47 +24,6 @@ export class NTQQWebApi extends Service {
     super(ctx, 'ntWebApi', true)
   }
 
-  async getGroupMembers(groupCode: string): Promise<WebApiGroupMember[]> {
-    const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
-    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const cookieStr = this.cookieToString(cookieObject)
-    const retList: Promise<WebApiGroupMemberRet>[] = []
-    const params = new URLSearchParams({
-      st: '0',
-      end: '40',
-      sort: '1',
-      gc: groupCode,
-      bkn: this.genBkn(cookieObject.skey)
-    })
-    const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-    if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
-      return []
-    } else {
-      for (const member of fastRet.mems) {
-        memberData.push(member)
-      }
-    }
-    const pageNum = Math.ceil(fastRet.count / 40)
-    //遍历批量请求
-    for (let i = 2; i <= pageNum; i++) {
-      params.set('st', String((i - 1) * 40))
-      params.set('end', String(i * 40))
-      const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-      retList.push(ret)
-    }
-    //批量等待
-    for (let i = 1; i <= pageNum; i++) {
-      const ret = await (retList[i])
-      if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
-        continue
-      }
-      for (const member of ret.mems) {
-        memberData.push(member)
-      }
-    }
-    return memberData
-  }
-
   genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
@@ -157,10 +34,9 @@ export class NTQQWebApi extends Service {
     return (hash & 0x7FFFFFFF).toString()
   }
 
-  //实现未缓存 考虑2h缓存
+  async getGroupHonorInfo(groupCode: string, getType: string) {
-  async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+    const getDataInternal = async (groupCode: string, type: number) => {
-    const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type
-      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
       let resJson
       try {
         const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
@@ -168,7 +44,7 @@ export class NTQQWebApi extends Service {
         if (match) {
           resJson = JSON.parse(match[1].trim())
         }
-        if (Internal_type === 1) {
+        if (type === 1) {
           return resJson?.talkativeList
         } else {
           return resJson?.actorList
@@ -274,34 +150,6 @@ export class NTQQWebApi extends Service {
     return honorInfo
   }
 
-  async setGroupNotice(params: SetGroupNoticeParams): Promise<SetGroupNoticeRet> {
-    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const settings = JSON.stringify({
-      is_show_edit_card: params.isShowEditCard,
-      tip_window_type: params.tipWindowType,
-      confirm_required: params.confirmRequired
-    })
-
-    return await RequestUtil.HttpGetJson<SetGroupNoticeRet>(
-      `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
-        bkn: this.genBkn(cookieObject.skey),
-        qid: params.groupCode,
-        text: params.content,
-        pinned: params.pinned.toString(),
-        type: params.type.toString(),
-        settings: settings,
-        ...(params.picId !== '' && {
-          pic: params.picId,
-          imgWidth: params.imgWidth?.toString(),
-          imgHeight: params.imgHeight?.toString(),
-        })
-      })}`,
-      'POST',
-      '',
-      { 'Cookie': this.cookieToString(cookieObject) }
-    )
-  }
-
   private cookieToString(cookieObject: Dict) {
     return Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
   }

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

@@ -1,7 +1,6 @@
-import fs from 'node:fs'
+import { unlink } from 'node:fs/promises'
 import { Service, Context } from 'cordis'
 import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
-import { MessageUnique } from '../common/utils/messageUnique'
 import { Config as LLOBConfig } from '../common/types'
 import { llonebotError } from '../common/globalVars'
 import { isNumeric } from '../common/utils/misc'
@@ -14,11 +13,11 @@ import {
   GroupMember,
   CategoryFriend,
   SimpleInfo,
-  User,
   ChatType
 } from './types'
 import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
+import { invoke } from './ntcall'
 
 declare module 'cordis' {
   interface Context {
@@ -26,11 +25,12 @@ declare module 'cordis' {
   }
   interface Events {
     'nt/message-created': (input: RawMessage[]) => void
-    'nt/message-deleted': (input: RawMessage[]) => void
+    'nt/message-deleted': (input: RawMessage) => void
-    'nt/message-sent': (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
   }
 }
 
@@ -43,7 +43,6 @@ class Core extends Service {
 
   public start() {
     llonebotError.otherError = ''
-    MessageUnique.init(selfInfo.uin)
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
     this.ctx.on('llonebot/config-updated', input => {
@@ -53,29 +52,24 @@ class Core extends Service {
 
   private registerListener() {
     registerReceiveHook<{
-      data: CategoryFriend[]
+      data?: CategoryFriend[]
+      userSimpleInfos?: Map<string, SimpleInfo> //V2
+      buddyCategory?: CategoryFriend[] //V2
     }>(ReceiveCmdS.FRIENDS, (payload) => {
-      type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
+      let uids: string[] = []
-      let friendList: User[] = []
+      if (payload.buddyCategory) {
-      if ('userSimpleInfos' in payload) {
+        uids = payload.buddyCategory.flatMap(item => item.buddyUids)
-        friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
+      } else if (payload.data) {
-          return {
+        uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
-            ...v.coreInfo,
-          }
-        })
-      } else {
-        for (const fData of payload.data) {
-          friendList.push(...fData.buddyList)
-        }
       }
-      this.ctx.logger.info('好友列表变动', friendList.length)
+      for (const uid of uids) {
-      for (const friend of friendList) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.friend })
-        this.ctx.ntMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend })
       }
+      this.ctx.logger.info('好友列表变动', uids.length)
     })
 
     // 自动清理新消息文件
-    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
       if (!this.config.autoDeleteFile) {
         return
       }
@@ -94,9 +88,7 @@ class Core extends Service {
             }
             for (const path of pathList) {
               if (path) {
-                fs.unlink(picPath, () => {
+                unlink(path).then(() => this.ctx.logger.info('删除文件成功', path))
-                  this.ctx.logger.info('删除文件成功', path)
-                })
               }
             }
           }, this.config.autoDeleteFileSecond! * 1000)
@@ -172,29 +164,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 => {
+      for (const msg of payload.msgList) {
-        if (recallMsgIds.includes(v.msgId)) {
+        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
-          return false
+          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 +214,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 +230,4 @@ namespace Core {
   }
 }
 
-export default Core
+export default Core

src/ntqqapi/entities.ts

@@ -16,7 +16,7 @@ import {
   SendVideoElement,
 } from './types'
 import { stat, writeFile, copyFile, unlink } from 'node:fs/promises'
-import { calculateFileMD5, isGIF } from '../common/utils/file'
+import { calculateFileMD5 } from '../common/utils/file'
 import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
 import { encodeSilk } from '../common/utils/audio'
 import { Context } from 'cordis'
@@ -66,14 +66,10 @@ export namespace SendElementEntities {
     }
   }
 
-  export async function pic(ctx: Context, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
+  export async function pic(ctx: Context, picPath: string, summary = '', subType: 0 | 1 = 0, isFlashPic?: boolean): Promise<SendPicElement> {
     const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.PIC, subType)
     if (fileSize === 0) {
-      throw '文件异常，大小为0'
+      throw '文件异常，大小为 0'
-    }
-    const maxMB = 30;
-    if (fileSize > 1024 * 1024 * 30) {
-      throw `图片过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
     }
     const imageSize = await ctx.ntFileApi.getImageSize(picPath)
     const picElement = {
@@ -84,12 +80,13 @@ export namespace SendElementEntities {
       fileName: fileName,
       sourcePath: path,
       original: true,
-      picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+      picType: imageSize.type === 'gif' ? PicType.gif : PicType.jpg,
       picSubType: subType,
       fileUuid: '',
       fileSubId: '',
       thumbFileSize: 0,
       summary,
+      isFlashPic,
     }
     ctx.logger.info('图片信息', picElement)
     return {
@@ -365,4 +362,16 @@ export namespace SendElementEntities {
       },
     }
   }
+
+  export function shake(): SendFaceElement {
+    return {
+      elementType: ElementType.FACE,
+      elementId: '',
+      faceElement: {
+        faceIndex: 1,
+        faceType: 5,
+        pokeType: 1,
+      },
+    }
+  }
 }

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 = {
+export enum ReceiveCmdS {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
+  FRIENDS = 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
+  SKEY_UPDATE = 'onSkeyUpdate',
-} as const
+}
 
-export type ReceiveCmd = string
+type NTReturnData = [
-
+  {
-interface NTQQApiReturnData extends Array<unknown> {
-  0: {
     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
+  window.webContents.send = new Proxy(window.webContents.send, {
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
-    try {
+      try {
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
-      if (logHook && !isLogger) {
+          log('received ntqq api message', args)
-        log(`received ntqq api message: ${channel}`, args)
+        }
-      }
+      } catch { }
-    } catch { }
+      if (!onlyLog) {
-    if (!onlyLog) {
+        if (args[2] instanceof Array) {
-      if (args?.[1] instanceof Array) {
+          for (const receiveData of args[2]) {
-        for (const receiveData of args[1]) {
+            const ntMethodName = receiveData.cmdName
-          const ntQQApiMethodName = receiveData.cmdName
+            for (const hook of receiveHooks) {
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+              if (hook.method.includes(ntMethodName)) {
-          for (const hook of receiveHooks) {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
-            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()
             }
           }
         }
-      }
+        if (args[1]?.callbackId) {
-      if (args[0]?.callbackId) {
+          const callbackId = args[1].callbackId
-        // log("hookApiCallback", hookApiCallbacks, args)
+          if (hookApiCallbacks[callbackId]) {
-        const callbackId = args[0].callbackId
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
-        if (hookApiCallbacks[callbackId]) {
+            delete hookApiCallbacks[callbackId]
-          new Promise(resolve => {
+          }
-            hookApiCallbacks[callbackId](args[1])
-            resolve(undefined)
-          }).then()
-          delete hookApiCallbacks[callbackId]
         }
       }
-    }
+      return target.apply(thisArg, args)
-    originalSend.call(window.webContents, channel, ...args)
+    },
-  }
+  })
-  window.webContents.send = patchSend
 }
 
 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);
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
-      let isLogger = false
-      try {
-        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
-      } catch (e) { }
       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 => {
+                Promise.resolve(hook.hookFunc(callParams))
-                  try {
-                    hook.hookFunc(callParams)
-                  } catch (e) {
-                    log('hook call error', e, _args)
-                  }
-                  resolve(undefined)
-                }).then()
               }
             })
-          } 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)
-        HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }*/
       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/listeners/NodeIKernelGroupListener.ts

@@ -1,58 +0,0 @@
-import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/ntqqapi/types'
-
-export interface IGroupListener {
-  onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void
-
-  onGroupExtListUpdate(...args: unknown[]): void
-
-  onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void
-
-  onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): void
-
-  onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void
-
-  onGroupDetailInfoChange(...args: unknown[]): void
-
-  onGroupAllInfoChange(...args: unknown[]): void
-
-  onGroupsMsgMaskResult(...args: unknown[]): void
-
-  onGroupConfMemberChange(...args: unknown[]): void
-
-  onGroupBulletinChange(...args: unknown[]): void
-
-  onGetGroupBulletinListResult(...args: unknown[]): void
-
-  onMemberListChange(arg: {
-    sceneId: string,
-    ids: string[],
-    infos: Map<string, GroupMember>,
-    finish: boolean,
-    hasRobot: boolean
-  }): void
-
-  onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>): void
-
-  onSearchMemberChange(...args: unknown[]): void
-
-  onGroupBulletinRichMediaDownloadComplete(...args: unknown[]): void
-
-  onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): void
-
-  onGroupStatisticInfoChange(...args: unknown[]): void
-
-  onJoinGroupNotify(...args: unknown[]): void
-
-  onShutUpMemberListChanged(...args: unknown[]): void
-
-  onGroupBulletinRemindNotify(...args: unknown[]): void
-
-  onGroupFirstBulletinNotify(...args: unknown[]): void
-
-  onJoinGroupNoVerifyFlag(...args: unknown[]): void
-
-  onGroupArkInviteStateResult(...args: unknown[]): void
-  
-  // 发现于Win 9.9.9 23159
-  onGroupMemberLevelInfoChange(...args: unknown[]): void
-}

src/ntqqapi/listeners/NodeIKernelMsgListener.ts

@@ -1,268 +0,0 @@
-import { ChatType, RawMessage } from '@/ntqqapi/types'
-
-export interface OnRichMediaDownloadCompleteParams {
-  fileModelId: string,
-  msgElementId: string,
-  msgId: string,
-  fileId: string,
-  fileProgress: string, // '0'
-  fileSpeed: string, // '0'
-  fileErrCode: string,  // '0'
-  fileErrMsg: string,
-  fileDownType: number,  // 暂时未知
-  thumbSize: number,
-  filePath: string,
-  totalSize: string,
-  trasferStatus: number,
-  step: number,
-  commonFileInfo: unknown | null,
-  fileSrvErrCode: string,
-  clientMsg: string,
-  businessId: number,
-  userTotalSpacePerDay: unknown | null,
-  userUsedSpacePerDay: unknown | null
-}
-
-export interface OnGroupFileInfoUpdateParams {
-  retCode: number
-  retMsg: string
-  clientWording: string
-  isEnd: boolean
-  item: {
-    peerId: string
-    type: number
-    folderInfo?: {
-      folderId: string
-      parentFolderId: string
-      folderName: string
-      createTime: number
-      modifyTime: number
-      createUin: string
-      creatorName: string
-      totalFileCount: number
-      modifyUin: string
-      modifyName: string
-      usedSpace: string
-    }
-    fileInfo?: {
-      fileModelId: string
-      fileId: string
-      fileName: string
-      fileSize: string
-      busId: number
-      uploadedSize: string
-      uploadTime: number
-      deadTime: number
-      modifyTime: number
-      downloadTimes: number
-      sha: string
-      sha3: string
-      md5: string
-      uploaderLocalPath: string
-      uploaderName: string
-      uploaderUin: string
-      parentFolderId: string
-      localPath: string
-      transStatus: number
-      transType: number
-      elementId: string
-      isFolder: boolean
-    }
-  }[]
-  allFileCount: number
-  nextIndex: number
-  reqId: number
-}
-
-// {
-//   sessionType: 1,
-//   chatType: 100,
-//   peerUid: 'u_PVQ3tl6K78xxxx',
-//   groupCode: '809079648',
-//   fromNick: '拾xxxx,
-//   sig: '0x'
-// }
-export interface TempOnRecvParams {
-  sessionType: number,//1
-  chatType: ChatType,//100
-  peerUid: string,//uid
-  groupCode: string,//gc
-  fromNick: string,//gc name
-  sig: string,
-}
-
-export interface IKernelMsgListener {
-  onAddSendMsg(msgRecord: RawMessage): void
-
-  onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): void
-
-  onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): void
-
-  onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): void
-
-  onContactUnreadCntUpdate(hashMap: unknown): void
-
-  onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): void
-
-  onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): void
-
-  onEmojiDownloadComplete(emojiNotifyInfo: unknown): void
-
-  onEmojiResourceUpdate(emojiResourceInfo: unknown): void
-
-  onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onFileMsgCome(arrayList: unknown): void
-
-  onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onFirstViewGroupGuildMapping(arrayList: unknown): void
-
-  onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): void
-
-  onGroupFileInfoAdd(groupItem: unknown): void
-
-  onGroupFileInfoUpdate(groupFileListResult: OnGroupFileInfoUpdateParams): void
-
-  onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void
-
-  onGroupTransferInfoAdd(groupItem: unknown): void
-
-  onGroupTransferInfoUpdate(groupFileListResult: unknown): void
-
-  onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): void
-
-  onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): void
-
-  onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): void
-
-  onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): void
-
-  onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): void
-
-  onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): void
-
-  onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): void
-
-  onInputStatusPush(inputStatusInfo: unknown): void
-
-  onKickedOffLine(kickedInfo: unknown): void
-
-  onLineDev(arrayList: unknown): void
-
-  onLogLevelChanged(j2: unknown): void
-
-  onMsgAbstractUpdate(arrayList: unknown): void
-
-  onMsgBoxChanged(arrayList: unknown): void
-
-  onMsgDelete(contact: unknown, arrayList: unknown): void
-
-  onMsgEventListUpdate(hashMap: unknown): void
-
-  onMsgInfoListAdd(arrayList: unknown): void
-
-  onMsgInfoListUpdate(msgList: RawMessage[]): void
-
-  onMsgQRCodeStatusChanged(i2: unknown): void
-
-  onMsgRecall(i2: unknown, str: unknown, j2: unknown): void
-
-  onMsgSecurityNotify(msgRecord: unknown): void
-
-  onMsgSettingUpdate(msgSetting: unknown): void
-
-  onNtFirstViewMsgSyncEnd(): void
-
-  onNtMsgSyncEnd(): void
-
-  onNtMsgSyncStart(): void
-
-  onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onRecvGroupGuildFlag(i2: unknown): void
-
-  onRecvMsg(...arrayList: unknown[]): void
-
-  onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): void
-
-  onRecvOnlineFileMsg(arrayList: unknown): void
-
-  onRecvS2CMsg(arrayList: unknown): void
-
-  onRecvSysMsg(arrayList: unknown): void
-
-  onRecvUDCFlag(i2: unknown): void
-
-  onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): void
-
-  onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): void
-
-  onRichMediaUploadComplete(fileTransNotifyInfo: unknown): void
-
-  onSearchGroupFileInfoUpdate(searchGroupFileResult:
-    {
-      result: {
-        retCode: number,
-        retMsg: string,
-        clientWording: string
-      },
-      syncCookie: string,
-      totalMatchCount: number,
-      ownerMatchCount: number,
-      isEnd: boolean,
-      reqId: number,
-      item: Array<{
-        groupCode: string,
-        groupName: string,
-        uploaderUin: string,
-        uploaderName: string,
-        matchUin: string,
-        matchWords: Array<unknown>,
-        fileNameHits: Array<{
-          start: number,
-          end: number
-        }>,
-        fileModelId: string,
-        fileId: string,
-        fileName: string,
-        fileSize: string,
-        busId: number,
-        uploadTime: number,
-        modifyTime: number,
-        deadTime: number,
-        downloadTimes: number,
-        localPath: string
-      }>
-    }): void
-
-  onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): void
-
-  onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): void
-
-  onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): void
-
-  onUnreadCntAfterFirstView(hashMap: unknown): void
-
-  onUnreadCntUpdate(hashMap: unknown): void
-
-  onUserChannelTabStatusChanged(z: unknown): void
-
-  onUserOnlineStatusChanged(z: unknown): void
-
-  onUserTabStatusChanged(arrayList: unknown): void
-
-  onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void
-
-  onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void
-
-  // 第一次发现于Linux
-  onUserSecQualityChanged(...args: unknown[]): void
-
-  onMsgWithRichLinkInfoUpdate(...args: unknown[]): void
-
-  onRedTouchChanged(...args: unknown[]): void
-
-  // 第一次发现于Win 9.9.9 23159
-  onBroadcastHelperProgerssUpdate(...args: unknown[]): void
-}

src/ntqqapi/listeners/NodeIKernelProfileListener.ts

@@ -1,15 +0,0 @@
-import { User, UserDetailInfoListenerArg } from '@/ntqqapi/types'
-
-export interface IProfileListener {
-  onProfileSimpleChanged(...args: unknown[]): void
-
-  onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void
-
-  onProfileDetailInfoChanged(profile: User): void
-
-  onStatusUpdate(...args: unknown[]): void
-
-  onSelfStatusChanged(...args: unknown[]): void
-
-  onStrangerRemarkChanged(...args: unknown[]): void
-}

src/ntqqapi/listeners/index.ts

@@ -1,3 +0,0 @@
-export * from './NodeIKernelProfileListener'
-export * from './NodeIKernelGroupListener'
-export * from './NodeIKernelMsgListener'

src/ntqqapi/ntcall.ts

@@ -13,8 +13,7 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService,
+  NodeIKernelTipOffService
-  NodeIKernelSearchService,
 } from './services'
 
 export enum NTClass {
@@ -94,7 +93,6 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
-  nodeIKernelSearchService: NodeIKernelSearchService
 }
 
 interface InvokeOptions<ReturnType> {
@@ -123,11 +121,15 @@ export function invoke<
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
-    let success = false
+    const timeoutId = setTimeout(() => {
+      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
+      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
+    }, timeout)
+
     if (!options.cbCmd) {
       // QQ后端会返回结果，并且可以根据uuid识别
       hookApiCallbacks[callbackId] = res => {
-        success = true
+        clearTimeout(timeoutId)
         resolve(res)
       }
     }
@@ -136,17 +138,16 @@ 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)
-              success = true
+              clearTimeout(timeoutId)
               resolve(payload)
             }
           }
           else {
             removeReceiveHook(hookId)
-            success = true
+            clearTimeout(timeoutId)
             resolve(payload)
           }
         })
@@ -159,16 +160,11 @@ export function invoke<
         }
         else {
           log('ntqq api call failed,', method, res)
+          clearTimeout(timeoutId)
           reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
         }
       }
     }
-    setTimeout(() => {
-      if (!success) {
-        log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
-        reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
-      }
-    }, timeout)
 
     ipcMain.emit(
       channel,
@@ -182,4 +178,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

@@ -6,120 +6,26 @@ export enum BuddyListReqType {
 }
 
 export interface NodeIKernelBuddyService {
-  // 26702 以上
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
-    data: Array<{
+    data: {
-      categoryId: number,
+      categoryId: number
-      categorySortId: number,
+      categorySortId: number
-      categroyName: string,
+      categroyName: string
-      categroyMbCount: number,
+      categroyMbCount: number
-      onlineCount: number,
+      onlineCount: number
-      buddyUids: Array<string>
+      buddyUids: string[]
-    }>
+    }[]
   }>
 
-  //26702 以上
-  getBuddyListFromCache(callFrom: string): Promise<Array<
-    {
-      categoryId: number,//9999应该跳过 那是兜底数据吧
-      categorySortId: number,//排序方式
-      categroyName: string,//分类名
-      categroyMbCount: number,//不懂
-      onlineCount: number,//在线数目
-      buddyUids: Array<string>//Uids
-    }>>
-
-  addKernelBuddyListener(listener: unknown): number
-
-  getAllBuddyCount(): number
-
-  removeKernelBuddyListener(listener: unknown): void
-
-  getBuddyList(nocache: boolean): Promise<GeneralCallResult>
-
-  getBuddyNick(uid: number): string
-
-  getBuddyRemark(uid: number): string
-
   setBuddyRemark(uid: number, remark: string): void
 
-  getAvatarUrl(uid: number): string
-
   isBuddy(uid: string): boolean
 
-  getCategoryNameWithUid(uid: number): string
-
-  getTargetBuddySetting(uid: number): unknown
-
-  getTargetBuddySettingByType(uid: number, type: number): unknown
-
-  getBuddyReqUnreadCnt(): number
-
-  getBuddyReq(): unknown
-
-  delBuddyReq(uid: number): void
-
-  clearBuddyReqUnreadCnt(): void
-
-  reqToAddFriends(uid: number, msg: string): void
-
-  setSpacePermission(uid: number, permission: number): void
-
   approvalFriendRequest(arg: {
     friendUid: string
     reqTime: string
     accept: boolean
   }): Promise<void>
 
-  delBuddy(uid: number): void
+  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
-
+}
-  delBatchBuddy(uids: number[]): void
-
-  getSmartInfos(uid: number): unknown
-
-  setBuddyCategory(uid: number, category: number): void
-
-  setBatchBuddyCategory(uids: number[], category: number): void
-
-  addCategory(category: string): void
-
-  delCategory(category: string): void
-
-  renameCategory(oldCategory: string, newCategory: string): void
-
-  resortCategory(categorys: string[]): void
-
-  pullCategory(uid: number, category: string): void
-
-  setTop(uid: number, isTop: boolean): void
-
-  SetSpecialCare(uid: number, isSpecialCare: boolean): void
-
-  setMsgNotify(uid: number, isNotify: boolean): void
-
-  hasBuddyList(): boolean
-
-  setBlock(uid: number, isBlock: boolean): void
-
-  isBlocked(uid: number): boolean
-
-  modifyAddMeSetting(setting: unknown): void
-
-  getAddMeSetting(): unknown
-
-  getDoubtBuddyReq(): unknown
-
-  getDoubtBuddyUnreadNum(): number
-
-  approvalDoubtBuddyReq(uid: number, isAgree: boolean): void
-
-  delDoubtBuddyReq(uid: number): void
-
-  delAllDoubtBuddyReq(): void
-
-  reportDoubtBuddyReqUnread(): void
-
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,207 +1,99 @@
 import {
-  GroupExtParam,
   GroupMember,
   GroupMemberRole,
   GroupNotifyType,
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
 
 export interface NodeIKernelGroupService {
-  getMemberCommonInfo(Req: {
+  getGroupHonorList(req: { groupCode: number[] }): Promise<{
-    groupCode: string,
+    errCode: number
-    startUin: string,
+    errMsg: string
-    identifyFlag: string,
+    groupMemberHonorList: {
-    uinList: string[],
+      honorList: {
-    memberCommonFilter: {
+        groupCode: string
-      memberUin: number,
+        id: number[]
-      uinFlag: number,
+        isGray: number
-      uinFlagExt: number,
+      }[]
-      uinMobileFlag: number,
+      cacheTs: number
-      shutUpTime: number,
+      honorInfos: unknown[]
-      privilege: number,
+      joinTime: number
-    },
+    }
-    memberNum: number,
+  }>
-    filterMethod: string,
-    onlineFlag: string,
-    realSpecialTitleFlag: number
-  }): Promise<unknown>
-
-  //26702
-  getGroupMemberLevelInfo(groupCode: string): Promise<unknown>
-
-  //26702
-  getGroupHonorList(groupCodes: Array<string>): unknown
 
   getUinByUids(uins: string[]): Promise<{
-    errCode: number,
+    errCode: number
-    errMsg: string,
+    errMsg: string
     uins: Map<string, string>
   }>
 
   getUidByUins(uins: string[]): Promise<{
-    errCode: number,
+    errCode: number
-    errMsg: string,
+    errMsg: string
     uids: Map<string, string>
   }>
 
-  //26702(其实更早 但是我不知道)
+  queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<{
-  checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
+    items: {
-
+      groupCode: string
-  //26702(其实更早 但是我不知道)
+      msgSeq: number
-  getGroupLatestEssenceList(groupCode: string): Promise<unknown>
+      msgRandom: number
-
+      msgSenderUin: string
-  //26702(其实更早 但是我不知道) 
+      msgSenderNick: string
-  shareDigest(Req: {
+      opType: number
-    appId: string,
+      opUin: string
-    appType: number,
+      opNick: string
-    msgStyle: number,
+      opTime: number
-    recvUin: string,
+      grayTipSeq: string
-    sendType: number,
+    }[]
-    clientInfo: {
-      platform: number
-    },
-    richMsg: {
-      usingArk: boolean,
-      title: string,
-      summary: string,
-      url: string,
-      pictureUrl: string,
-      brief: string
-    }
-  }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  fetchGroupEssenceList(Req: { groupCode: string, pageStart: number, pageLimit: number }, Arg: unknown): Promise<unknown>
-
-  //26702
-  getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
-    errCode: number,
-    errMsg: string,
-    result: {
-      ids: Array<{
-        uid: string,
-        index: number//0
-      }>,
-      infos: Dict,
-      finish: true,
-      hasRobot: false
-    }
   }>
 
   setHeader(uid: string, path: string): unknown
 
-  addKernelGroupListener(listener: unknown): number
-
-  removeKernelGroupListener(listenerId: unknown): void
-
   createMemberListScene(groupCode: string, scene: string): string
 
-  destroyMemberListScene(SceneId: string): void
-  //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string}
   getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
-    errCode: number, errMsg: string,
+    errCode: number
-    result: { ids: string[], infos: Map<string, GroupMember>, finish: boolean, hasRobot: boolean }
+    errMsg: string
+    result: {
+      ids: {
+        uid: string
+        index: number
+      }[]
+      infos: Map<string, GroupMember>
+      finish: boolean
+      hasRobot: boolean
+    }
   }>
 
-  getPrevMemberList(): unknown
-
-  monitorMemberList(): unknown
-
-  searchMember(sceneId: string, keywords: string[]): unknown
-
-  getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise<GeneralCallResult>
-  //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
-
   kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>
 
   modifyMemberRole(groupCode: string, uid: string, role: GroupMemberRole): void
 
   modifyMemberCardName(groupCode: string, uid: string, cardName: string): void
 
-  getTransferableMemberInfo(groupCode: string): unknown//获取整个群的
-
-  transferGroup(uid: string): void
-
-  getGroupList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupExtList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupDetailInfo(groupCode: string): unknown
-
-  getMemberExtInfo(param: GroupExtParam): Promise<unknown>//req
-
-  getGroupAllInfo(): unknown
-
-  getDiscussExistInfo(): unknown
-
-  getGroupConfMember(): unknown
-
-  getGroupMsgMask(): unknown
-
-  getGroupPortrait(): void
-
   modifyGroupName(groupCode: string, groupName: string, arg: false): void
 
-  modifyGroupRemark(groupCode: string, remark: string): void
-
-  modifyGroupDetailInfo(groupCode: string, arg: unknown): void
-
-  setGroupMsgMask(groupCode: string, arg: unknown): void
-
-  changeGroupShieldSettingTemp(groupCode: string, arg: unknown): void
-
-  inviteToGroup(arg: unknown): void
-
-  inviteMembersToGroup(args: unknown[]): void
-
-  inviteMembersToGroupWithMsg(args: unknown): void
-
-  createGroup(arg: unknown): void
-
-  createGroupWithMembers(arg: unknown): void
-
   quitGroup(groupCode: string): void
 
-  destroyGroup(groupCode: string): void
+  getSingleScreenNotifies(force: boolean, startSeq: string, num: number): Promise<GeneralCallResult>
-  //获取单屏群通知列表
-  getSingleScreenNotifies(force: boolean, start_seq: string, num: number): Promise<GeneralCallResult>
-
-  clearGroupNotifies(groupCode: string): void
-
-  getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>
-
-  clearGroupNotifiesUnreadCount(groupCode: string): void
 
   operateSysNotify(
     doubt: boolean,
     operateMsg: {
-      operateType: GroupRequestOperateTypes, // 2 拒绝
+      operateType: GroupRequestOperateTypes // 2 拒绝
       targetMsg: {
-        seq: string,  // 通知序列号
+        seq: string  // 通知序列号
-        type: GroupNotifyType,
+        type: GroupNotifyType
-        groupCode: string,
+        groupCode: string
         postscript: string
       }
-    }): Promise<void>
+    }
-
+  ): Promise<void>
-  setTop(groupCode: string, isTop: boolean): void
-
-  getGroupBulletin(groupCode: string): unknown
-
-  deleteGroupBulletin(groupCode: string, seq: string): void
 
   publishGroupBulletin(groupCode: string, pskey: string, data: unknown): Promise<GeneralCallResult>
 
-  publishInstructionForNewcomers(groupCode: string, arg: unknown): void
-
   uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
     errCode: number
     errMsg: string
@@ -212,44 +104,23 @@ export interface NodeIKernelGroupService {
     }
   }>
 
-  downloadGroupBulletinRichMedia(groupCode: string): unknown
+  getGroupRemainAtTimes(groupCode: string): Promise<GeneralCallResult & {
-
+    atInfo: {
-  getGroupBulletinList(groupCode: string): unknown
+      canAtAll: boolean
-
+      RemainAtAllCountForUin: number
-  getGroupStatisticInfo(groupCode: string): unknown
+      RemainAtAllCountForGroup: number
-
+      atTimesMsg: string
-  getGroupRemainAtTimes(groupCode: string): number
+      canNotAtAllMsg: ''
-
+    }
-  getJoinGroupNoVerifyFlag(groupCode: string): unknown
+  }>
-
-  getGroupArkInviteState(groupCode: string): unknown
-
-  reqToJoinGroup(groupCode: string, arg: unknown): void
 
   setGroupShutUp(groupCode: string, shutUp: boolean): void
 
-  getGroupShutUpMemberList(groupCode: string): unknown[]
-
   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
+  addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 
-  modifyGroupExtInfo(groupCode: string, arg: unknown): void
+  removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
+}
-  //需要提前判断是否存在 高版本新增
-  addGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
-  //需要提前判断是否存在 高版本新增
-  removeGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,15 +1,14 @@
 import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
 
 export interface QueryMsgsParams {
-  chatInfo: Peer,
+  chatInfo: Peer
-  filterMsgType: [],
+  filterMsgType: []
-  filterSendersUid: string[],
+  filterSendersUid: string[]
-  filterMsgFromTime: string,
+  filterMsgFromTime: string
-  filterMsgToTime: string,
+  filterMsgToTime: string
-  pageLimit: number,
+  pageLimit: number
-  isReverseOrder: boolean,
+  isReverseOrder: boolean
   isIncludeCurrent: boolean
 }
 
@@ -31,713 +30,89 @@ export interface TmpChatInfo {
 export interface NodeIKernelMsgService {
   generateMsgUniqueId(chatType: number, time: string): string
 
-  addKernelMsgListener(nodeIKernelMsgListener: unknown): number
-
   sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 
-  addKernelMsgImportToolListener(arg: Dict): unknown
-
-  removeKernelMsgListener(args: unknown): unknown
-
-  addKernelTempChatSigListener(...args: unknown[]): unknown
-
-  removeKernelTempChatSigListener(...args: unknown[]): unknown
-
-  setAutoReplyTextList(AutoReplyText: Array<unknown>, i2: number): unknown
-
-  getAutoReplyTextList(...args: unknown[]): unknown
-
-  getOnLineDev(): void
-
-  kickOffLine(DevInfo: Dict): unknown
-
   setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
 
-  fetchStatusMgrInfo(): unknown
-
-  fetchStatusUnitedConfigInfo(): unknown
-
-  getOnlineStatusSmallIconBasePath(): unknown
-
-  getOnlineStatusSmallIconFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusSmallIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusBigIconBasePath(): unknown
-
-  downloadOnlineStatusBigIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusCommonPath(arg: string): unknown
-
-  getOnlineStatusCommonFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown
-
-  // this.tokenType = i2
-  // this.apnsToken = bArr
-  // this.voipToken = bArr2
-  // this.profileId = str
-
-  setToken(arg: Dict): unknown
-
-  switchForeGround(): unknown
-
-  switchBackGround(arg: Dict): unknown
-
-  //hex
-  setTokenForMqq(token: string): unknown
-
-  switchForeGroundForMqq(...args: unknown[]): unknown
-
-  switchBackGroundForMqq(...args: unknown[]): unknown
-
-  getMsgSetting(...args: unknown[]): unknown
-
-  setMsgSetting(...args: unknown[]): unknown
-
-  addSendMsg(...args: unknown[]): unknown
-
-  cancelSendMsg(...args: unknown[]): unknown
-
-  switchToOfflineSendMsg(peer: Peer, MsgId: string): unknown
-
-  reqToOfflineSendMsg(...args: unknown[]): unknown
-
-  refuseReceiveOnlineFileMsg(peer: Peer, MsgId: string): unknown
-
-  resendMsg(...args: unknown[]): unknown
-
-  reeditRecallMsg(...args: unknown[]): unknown
-
-  //调用请检查除开commentElements其余参数不能为null
   forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>
 
   forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
 
-  forwardSubMsgWithComment(...args: unknown[]): unknown
-
-  forwardRichMsgInVist(...args: unknown[]): unknown
-
-  forwardFile(...args: unknown[]): unknown
-  //Array<Msg>, Peer from, Peer to
-  multiForwardMsg(...args: unknown[]): unknown
-
   multiForwardMsgWithComment(...args: unknown[]): unknown
 
-  deleteRecallMsg(...args: unknown[]): unknown
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  deleteRecallMsgForLocal(...args: unknown[]): unknown
+  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  addLocalGrayTipMsg(...args: unknown[]): unknown
-
-  addLocalJsonGrayTipMsg(...args: unknown[]): unknown
-
-  addLocalJsonGrayTipMsgExt(...args: unknown[]): unknown
-
-  IsLocalJsonTipValid(...args: unknown[]): unknown
-
-  addLocalAVRecordMsg(...args: unknown[]): unknown
-
-  addLocalTofuRecordMsg(...args: unknown[]): unknown
-
-  addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<unknown> | number, front: boolean): Promise<unknown>
-
-  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<unknown>
-
-  updateElementExtBufForUI(...args: unknown[]): unknown
-
-  updateMsgRecordExtPbBufForUI(...args: unknown[]): unknown
-
-  startMsgSync(...args: unknown[]): unknown
-
-  startGuildMsgSync(...args: unknown[]): unknown
-
-  isGuildChannelSync(...args: unknown[]): unknown
-
-  getMsgUniqueId(UniqueId: string): string
-
-  isMsgMatched(...args: unknown[]): unknown
-
-  getOnlineFileMsgs(...args: unknown[]): unknown
-
-  getAllOnlineFileMsgs(...args: unknown[]): unknown
-
-  getLatestDbMsgs(peer: Peer, cnt: number): Promise<unknown>
-
-  getLastMessageList(peer: Peer[]): Promise<unknown>
-
-  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>
-
-  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  // this.$peer = contact
-  // this.$msgTime = j2
-  // this.$clientSeq = j3
-  // this.$cnt = i2
-
-  getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsWithStatus(params: {
-    peer: Peer
-    msgId: string
-    msgTime: unknown
-    cnt: unknown
-    queryOrder: boolean
-    isIncludeSelf: boolean
-    appid: unknown
-  }): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getMsgsByMsgId(peer: Peer, ids: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getRecallMsgsByMsgId(peer: Peer, MsgId: string[]): Promise<unknown>
-
   getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  getSingleMsg(peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown
-
-  getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown
-
-  getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-
-  getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-  //cnt clientSeq?并不是吧
-  getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: { type: number, subtype: Array<number> }): unknown
-
-  getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{ type: number, subtype: Array<number> }>): unknown
-
-  getMsgWithAbstractByFilterParam(...args: unknown[]): unknown
-
-  queryMsgsWithFilter(...args: unknown[]): unknown
-
-  /**
-   * @deprecated 该函数已被标记为废弃，请使用新的替代方法。
-   * 使用过滤条件查询消息列表的版本2接口。
-   * 
-   * 该函数通过一系列过滤条件来查询特定聊天中的消息列表。这些条件包括消息类型、发送者、时间范围等。
-   * 函数返回一个Promise，解析为查询结果的未知类型对象。
-   * 
-   * @param MsgId 消息ID，用于特定消息的查询。
-   * @param MsgTime 消息时间，用于指定消息的时间范围。
-   * @param param 查询参数对象，包含详细的过滤条件和分页信息。
-   * @param param.chatInfo 聊天信息，包括聊天类型和对方用户ID。
-   * @param param.filterMsgType 需要过滤的消息类型数组，留空表示不过滤。
-   * @param param.filterSendersUid 需要过滤的发送者用户ID数组。
-   * @param param.filterMsgFromTime 查询消息的起始时间。
-   * @param param.filterMsgToTime 查询消息的结束时间。
-   * @param param.pageLimit 每页的消息数量限制。
-   * @param param.isReverseOrder 是否按时间顺序倒序返回消息。
-   * @param param.isIncludeCurrent 是否包含当前页码。
-   * @returns 返回一个Promise，解析为查询结果的未知类型对象。
-   */
-  queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>
-
-  // this.chatType = i2
-  // this.peerUid = str
-
-  // this.chatInfo = new ChatInfo()
-  // this.filterMsgType = new ArrayList<>()
-  // this.filterSendersUid = new ArrayList<>()
-  // this.chatInfo = chatInfo
-  // this.filterMsgType = arrayList
-  // this.filterSendersUid = arrayList2
-  // this.filterMsgFromTime = j2
-  // this.filterMsgToTime = j3
-  // this.pageLimit = i2
-  // this.isReverseOrder = z
-  // this.isIncludeCurrent = z2
-  //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
   queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
     msgList: RawMessage[]
   }>
-  //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
-  queryFileMsgsDesktop(...args: unknown[]): unknown
-
-  setMsgRichInfoFlag(...args: unknown[]): unknown
-
-  queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<unknown>
-
-  queryPicOrVideoMsgsDesktop(...args: unknown[]): unknown
-
-  queryEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryTroopEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): unknown
-
-  setFocusOnGuild(...args: unknown[]): unknown
-
-  setFocusSession(...args: unknown[]): unknown
-
-  enableFilterUnreadInfoNotify(...args: unknown[]): unknown
-
-  enableFilterMsgAbstractNotify(...args: unknown[]): unknown
-
-  onScenesChangeForSilenceMode(...args: unknown[]): unknown
-
-  getContactUnreadCnt(...args: unknown[]): unknown
-
-  getUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntTabInfo(...args: unknown[]): unknown
-
-  getAllGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getAllJoinGuildCnt(...args: unknown[]): unknown
-
-  getAllDirectSessionUnreadCntInfo(...args: unknown[]): unknown
-
-  getCategoryUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildFeedsUnreadCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelTypeCntInfo(...args: unknown[]): unknown
-
-  setVisibleGuildCntInfo(...args: unknown[]): unknown
 
   setMsgRead(peer: Peer): Promise<GeneralCallResult>
 
-  setAllC2CAndGroupMsgRead(): Promise<unknown>
-
-  setGuildMsgRead(...args: unknown[]): unknown
-
-  setAllGuildMsgRead(...args: unknown[]): unknown
-
-  setMsgReadAndReport(...args: unknown[]): unknown
-
-  setSpecificMsgReadAndReport(...args: unknown[]): unknown
-
-  setLocalMsgRead(...args: unknown[]): unknown
-
-  setGroupGuildMsgRead(...args: unknown[]): unknown
-
-  getGuildGroupTransData(...args: unknown[]): unknown
-
-  setGroupGuildBubbleRead(...args: unknown[]): unknown
-
-  getGuildGroupBubble(...args: unknown[]): unknown
-
-  fetchGroupGuildUnread(...args: unknown[]): unknown
-
-  setGroupGuildFlag(...args: unknown[]): unknown
-
-  setGuildUDCFlag(...args: unknown[]): unknown
-
-  setGuildTabUserFlag(...args: unknown[]): unknown
-
-  setBuildMode(flag: number/*0 1 3*/): unknown
-
-  setConfigurationServiceData(...args: unknown[]): unknown
-
-  setMarkUnreadFlag(...args: unknown[]): unknown
-
-  getChannelEventFlow(...args: unknown[]): unknown
-
-  getMsgEventFlow(...args: unknown[]): unknown
-
-  getRichMediaFilePathForMobileQQSend(...args: unknown[]): unknown
-
   getRichMediaFilePathForGuild(arg: {
-    md5HexStr: string,
+    md5HexStr: string
-    fileName: string,
+    fileName: string
-    elementType: ElementType,
+    elementType: ElementType
-    elementSubType: number,
+    elementSubType: number
-    thumbSize: 0,
+    thumbSize: 0
-    needCreate: true,
+    needCreate: true
-    downloadType: 1,
+    downloadType: 1
     file_uuid: ''
   }): string
 
-  assembleMobileQQRichMediaFilePath(...args: unknown[]): unknown
-
-  getFileThumbSavePathForSend(...args: unknown[]): unknown
-
-  getFileThumbSavePath(...args: unknown[]): unknown
-
-  //猜测居多
-  translatePtt2Text(MsgId: string, Peer: Dict, MsgElement: Dict): unknown
-
-  setPttPlayedState(...args: unknown[]): unknown
-  // NodeIQQNTWrapperSession fetchFavEmojiList [
-  //   "",
-  //   48,
-  //   true,
-  //   true
-  // ]
   fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
-    emojiInfoList: Array<{
+    emojiInfoList: {
-      uin: string,
+      uin: string
-      emoId: number,
+      emoId: number
-      emoPath: string,
+      emoPath: string
-      isExist: boolean,
+      isExist: boolean
-      resId: string,
+      resId: string
-      url: string,
+      url: string
-      md5: string,
+      md5: string
-      emoOriginalPath: string,
+      emoOriginalPath: string
-      thumbPath: string,
+      thumbPath: string
-      RomaingType: string,
+      RomaingType: string
-      isAPNG: false,
+      isAPNG: false
-      isMarkFace: false,
+      isMarkFace: false
-      eId: string,
+      eId: string
-      epId: string,
+      epId: string
-      ocrWord: string,
+      ocrWord: string
-      modifyWord: string,
+      modifyWord: string
-      exposeNum: number,
+      exposeNum: number
-      clickNum: number,
+      clickNum: number
       desc: string
-    }>
+    }[]
   }>
 
-  addFavEmoji(...args: unknown[]): unknown
-
-  fetchMarketEmoticonList(...args: unknown[]): unknown
-
-  fetchMarketEmoticonShowImage(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAioImage(...args: unknown[]): unknown
-
-  fetchMarketEmotionJsonFile(...args: unknown[]): unknown
-
-  getMarketEmoticonPath(...args: unknown[]): unknown
-
-  getMarketEmoticonPathBySync(...args: unknown[]): unknown
-
-  fetchMarketEmoticonFaceImages(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAuthDetail(...args: unknown[]): unknown
-
-  getFavMarketEmoticonInfo(...args: unknown[]): unknown
-
-  addRecentUsedFace(...args: unknown[]): unknown
-
-  getRecentUsedFaceList(...args: unknown[]): unknown
-
-  getMarketEmoticonEncryptKeys(...args: unknown[]): unknown
-
-  downloadEmojiPic(...args: unknown[]): unknown
-
-  deleteFavEmoji(...args: unknown[]): unknown
-
-  modifyFavEmojiDesc(...args: unknown[]): unknown
-
-  queryFavEmojiByDesc(...args: unknown[]): unknown
-
-  getHotPicInfoListSearchString(...args: unknown[]): unknown
-
-  getHotPicSearchResult(...args: unknown[]): unknown
-
-  getHotPicHotWords(...args: unknown[]): unknown
-
-  getHotPicJumpInfo(...args: unknown[]): unknown
-
-  getEmojiResourcePath(...args: unknown[]): unknown
-
-  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown
-
-  getMsgAbstracts(...args: unknown[]): unknown
-
-  getMsgAbstract(...args: unknown[]): unknown
-
-  getMsgAbstractList(...args: unknown[]): unknown
-
-  getMsgAbstractListBySeqRange(...args: unknown[]): unknown
-
-  refreshMsgAbstracts(...args: unknown[]): unknown
-
-  refreshMsgAbstractsByGuildIds(...args: unknown[]): unknown
-
-  getRichMediaElement(...args: unknown[]): unknown
-
-  cancelGetRichMediaElement(...args: unknown[]): unknown
-
-  refuseGetRichMediaElement(...args: unknown[]): unknown
-
-  switchToOfflineGetRichMediaElement(...args: unknown[]): unknown
-
   downloadRichMedia(...args: unknown[]): unknown
 
-  getFirstUnreadMsgSeq(args: {
-    peerUid: string
-    guildId: string
-  }): unknown
-
-  getFirstUnreadCommonMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtmeMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtallMsg(...args: unknown[]): unknown
-
-  getNavigateInfo(...args: unknown[]): unknown
-
-  getChannelFreqLimitInfo(...args: unknown[]): unknown
-
-  getRecentUseEmojiList(...args: unknown[]): unknown
-
-  getRecentEmojiList(...args: unknown[]): unknown
-
   setMsgEmojiLikes(...args: unknown[]): unknown
 
   getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
-    result: number,
+    result: number
-    errMsg: string,
+    errMsg: string
-    emojiLikesList:
+    emojiLikesList: {
-    Array<{
+      tinyId: string
-      tinyId: string,
+      nickName: string
-      nickName: string,
       headUrl: string
-    }>,
+    }[]
-    cookie: string,
+    cookie: string
-    isLastPage: boolean,
+    isLastPage: boolean
     isFirstPage: boolean
   }>
 
-  setMsgEmojiLikesForRole(...args: unknown[]): unknown
+  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  clickInlineKeyboardButton(...args: unknown[]): unknown
+  getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
-
+}
-  setCurOnScreenMsg(...args: unknown[]): unknown
-
-  setCurOnScreenMsgForMsgEvent(...args: unknown[]): unknown
-
-  getMiscData(key: string): unknown
-
-  setMiscData(key: string, value: string): unknown
-
-  getBookmarkData(...args: unknown[]): unknown
-
-  setBookmarkData(...args: unknown[]): unknown
-
-  sendShowInputStatusReq(ChatType: number, EventType: number, toUid: string): Promise<unknown>
-
-  queryCalendar(...args: unknown[]): unknown
-
-  queryFirstMsgSeq(peer: Peer, ...args: unknown[]): unknown
-
-  queryRoamCalendar(...args: unknown[]): unknown
-
-  queryFirstRoamMsg(...args: unknown[]): unknown
-
-  fetchLongMsg(peer: Peer, msgId: string): unknown
-
-  fetchLongMsgWithCb(...args: unknown[]): unknown
-
-  setIsStopKernelFetchLongMsg(...args: unknown[]): unknown
-
-  insertGameResultAsMsgToDb(...args: unknown[]): unknown
-
-  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  setDraft(...args: unknown[]): unknown
-
-  getDraft(...args: unknown[]): unknown
-
-  deleteDraft(...args: unknown[]): unknown
-
-  getRecentHiddenSesionList(...args: unknown[]): unknown
-
-  setRecentHiddenSession(...args: unknown[]): unknown
-
-  delRecentHiddenSession(...args: unknown[]): unknown
-
-  getCurHiddenSession(...args: unknown[]): unknown
-
-  setCurHiddenSession(...args: unknown[]): unknown
-
-  setReplyDraft(...args: unknown[]): unknown
-
-  getReplyDraft(...args: unknown[]): unknown
-
-  deleteReplyDraft(...args: unknown[]): unknown
-
-  getFirstUnreadAtMsg(peer: Peer): unknown
-
-  clearMsgRecords(...args: unknown[]): unknown//设置已读后调用我觉得比较好 清理记录 现在别了
-
-  IsExistOldDb(...args: unknown[]): unknown
-
-  canImportOldDbMsg(...args: unknown[]): unknown
-
-  setPowerStatus(z: boolean): unknown
-
-  canProcessDataMigration(...args: unknown[]): unknown
-
-  importOldDbMsg(...args: unknown[]): unknown
-
-  stopImportOldDbMsgAndroid(...args: unknown[]): unknown
-
-  isMqqDataImportFinished(...args: unknown[]): unknown
-
-  getMqqDataImportTableNames(...args: unknown[]): unknown
-
-  getCurChatImportStatusByUin(...args: unknown[]): unknown
-
-  getDataImportUserLevel(): unknown
-
-  getMsgQRCode(...args: unknown[]): unknown
-
-  getGuestMsgAbstracts(...args: unknown[]): unknown
-
-  getGuestMsgByRange(...args: unknown[]): unknown
-
-  getGuestMsgAbstractByRange(...args: unknown[]): unknown
-
-  registerSysMsgNotification(...args: unknown[]): unknown
-
-  unregisterSysMsgNotification(...args: unknown[]): unknown
-
-  enterOrExitAio(...args: unknown[]): unknown
-
-  // this.peerUid = ""
-  // this.peerNickname = ""
-  // this.fromGroupCode = ""
-  // this.sig = new byte[0]
-  // this.selfUid = ""
-  // this.selfPhone = ""
-  // this.chatType = i2
-  // this.peerUid = str
-  // this.peerNickname = str2
-  // this.fromGroupCode = str3
-  // this.sig = bArr
-  // this.selfUid = str4
-  // this.selfPhone = str5
-  // this.gameSession = tempChatGameSession
-  prepareTempChat(args: unknown): unknown//主动临时消息 不做
-
-  sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>
-
-  getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>
-
-  setContactLocalTop(...args: unknown[]): unknown
-
-  switchAnonymousChat(...args: unknown[]): unknown
-
-  renameAnonyChatNick(...args: unknown[]): unknown
-
-  getAnonymousInfo(...args: unknown[]): unknown
-
-  updateAnonymousInfo(...args: unknown[]): unknown
-
-  sendSummonMsg(peer: Peer, MsgElement: unknown, MsgAttributeInfo: unknown): Promise<unknown>//频道的东西
-
-  outputGuildUnreadInfo(...args: unknown[]): unknown
-
-  checkMsgWithUrl(...args: unknown[]): unknown
-
-  checkTabListStatus(...args: unknown[]): unknown
-
-  getABatchOfContactMsgBoxInfo(...args: unknown[]): unknown
-
-  insertMsgToMsgBox(peer: Peer, msgId: string, arg: 2006): unknown
-
-  isHitEmojiKeyword(...args: unknown[]): unknown
-
-  getKeyWordRelatedEmoji(...args: unknown[]): unknown
-
-  recordEmoji(...args: unknown[]): unknown
-
-  fetchGetHitEmotionsByWord(args: Dict): Promise<unknown>//表情推荐？
-
-  deleteAllRoamMsgs(...args: unknown[]): unknown//漫游消息？
-
-  packRedBag(...args: unknown[]): unknown
-
-  grabRedBag(...args: unknown[]): unknown
-
-  pullDetail(...args: unknown[]): unknown
-
-  selectPasswordRedBag(...args: unknown[]): unknown
-
-  pullRedBagPasswordList(...args: unknown[]): unknown
-
-  requestTianshuAdv(...args: unknown[]): unknown
-
-  tianshuReport(...args: unknown[]): unknown
-
-  tianshuMultiReport(...args: unknown[]): unknown
-
-  GetMsgSubType(a0: number, a1: number): unknown
-
-  setIKernelPublicAccountAdapter(...args: unknown[]): unknown
-  //tempChatGameSession有关
-  createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown
-
-  dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown
-
-  dataMigrationGetMsgList(...args: unknown[]): unknown
-
-  dataMigrationStopOperation(...args: unknown[]): unknown
-
-  //新的希望
-  dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
-    extensionData: string//"Hex" 
-    extraData: string //""
-    chatType: number
-    chatUin: string
-    msgType: number
-    msgTime: string
-    msgSeq: string
-    msgRandom: string
-  }>, DataMigrationResourceInfo: {
-    extraData: string
-    filePath: string
-    fileSize: string
-    msgRandom: string
-    msgSeq: string
-    msgSubType: number
-    msgType: number
-  }): unknown
-
-  dataMigrationGetResourceLocalDestinyPath(...args: unknown[]): unknown
-
-  dataMigrationSetIOSPathPrefix(...args: unknown[]): unknown
-
-  getServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setSubscribeFolderUsingSmallRedPoint(...args: unknown[]): unknown
-
-  clearGuildNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedSquareRead(...args: unknown[]): unknown
-
-  IsC2CStyleChatType(...args: unknown[]): unknown
-
-  IsTempChatType(uin: number): unknown//猜的
-
-  getGuildInteractiveNotification(...args: unknown[]): unknown
-
-  getGuildNotificationAbstract(...args: unknown[]): unknown
-
-  setFocusOnBase(...args: unknown[]): unknown
-
-  queryArkInfo(...args: unknown[]): unknown
-
-  queryUserSecQuality(...args: unknown[]): unknown
-
-  getGuildMsgAbFlag(...args: unknown[]): unknown
-
-  getGroupMsgStorageTime(): unknown//这是嘛啊
-
-}

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -1,22 +1,25 @@
 import { BuddyProfileLikeReq } from '../types'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
-  addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void
-
-  removeKernelProfileLikeListener(listener: unknown): void
-
   setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number }
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
     info: {
-      userLikeInfos: Array<unknown>,
+      userLikeInfos: {
-      friendMaxVotes: number,
+        uid: string
+        time: string
+        favoriteInfo: {
+          total_count: number
+          last_time: number
+          today_count: number
+          userInfos: Dict[]
+        }
+        voteInfo: Dict
+      }[]
+      friendMaxVotes: number
       start: number
     }
   }>
-
+}
-  getProfileLikeScidResourceInfo(...args: unknown[]): void
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,4 +1,3 @@
-import { AnyCnameRecord } from 'node:dns'
 import { SimpleInfo } from '../types'
 import { GeneralCallResult } from './common'
 
@@ -16,91 +15,17 @@ export enum ProfileBizType {
 }
 
 export interface NodeIKernelProfileService {
-  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>//uin->uid
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
 
   getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>
 
-  // {
-  //   coreInfo: CoreInfo,
-  //   baseInfo: BaseInfo,
-  //   status: null,
-  //   vasInfo: null,
-  //   relationFlags: null,
-  //   otherFlags: null,
-  //   intimate: null
-  // }
   getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>
 
   fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>
 
-  addKernelProfileListener(listener: unknown): number
-
-  removeKernelProfileListener(listenerId: number): void
-
-  prepareRegionConfig(...args: unknown[]): unknown
-
-  getLocalStrangerRemark(): Promise<AnyCnameRecord>
-
-  enumCountryOptions(): Array<string>
-
-  enumProvinceOptions(Country: string): Array<string>
-
-  enumCityOptions(Country: string, Province: string): unknown
-
-  enumAreaOptions(...args: unknown[]): unknown
-
-  //SimpleInfo
-  // this.uid = ""
-  // this.uid = str
-  // this.uin = j2
-  // this.isBuddy = z
-  // this.coreInfo = coreInfo
-  // this.baseInfo = baseInfo
-  // this.status = statusInfo
-  // this.vasInfo = vasInfo
-  // this.relationFlags = relationFlag
-  // this.otherFlags = otherFlag
-  // this.intimate = intimate
-
-  modifySelfProfile(...args: unknown[]): Promise<unknown>
-
-  modifyDesktopMiniProfile(param: unknown): Promise<GeneralCallResult>
-
-  setNickName(NickName: string): Promise<unknown>
-
-  setLongNick(longNick: string): Promise<unknown>
-
-  setBirthday(...args: unknown[]): Promise<unknown>
-
-  setGander(...args: unknown[]): Promise<unknown>
-
   setHeader(arg: string): Promise<GeneralCallResult>
 
-  setRecommendImgFlag(...args: unknown[]): Promise<unknown>
+  getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise<GeneralCallResult>
-
-  getUserSimpleInfo(force: boolean, uids: string[],): Promise<unknown>
-
-  getUserDetailInfo(uid: string): Promise<unknown>
-
-  getUserDetailInfoWithBizInfo(uid: string, Biz: unknown[]): Promise<GeneralCallResult>
 
   getUserDetailInfoByUin(uin: string): Promise<unknown>
-
+}
-  getZplanAvatarInfos(args: string[]): Promise<unknown>
-
-  getStatus(uid: string): Promise<unknown>
-
-  startStatusPolling(isForceReset: boolean): Promise<unknown>
-
-  getSelfStatus(): Promise<unknown>
-
-  setdisableEmojiShortCuts(...args: unknown[]): unknown
-
-  getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>
-
-  //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList)
-  getCoreInfo(name: string, arg: unknown[]): unknown
-
-  //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>())
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -1,191 +1,23 @@
-import { GetFileListParam, MessageElement, Peer } from '../types'
+import { GetFileListParam, Peer } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UrlFileDownloadType {
-  KUNKNOWN,
-  KURLFILEDOWNLOADPRIVILEGEICON,
-  KURLFILEDOWNLOADPHOTOWALL,
-  KURLFILEDOWNLOADQZONE,
-  KURLFILEDOWNLOADCOMMON,
-  KURLFILEDOWNLOADINSTALLAPP
-}
-
-export enum RMBizTypeEnum {
-  KUNKNOWN,
-  KC2CFILE,
-  KGROUPFILE,
-  KC2CPIC,
-  KGROUPPIC,
-  KDISCPIC,
-  KC2CVIDEO,
-  KGROUPVIDEO,
-  KC2CPTT,
-  KGROUPPTT,
-  KFEEDCOMMENTPIC,
-  KGUILDFILE,
-  KGUILDPIC,
-  KGUILDPTT,
-  KGUILDVIDEO
-}
-
-export interface CommonFileInfo {
-  bizType: number
-  chatType: number
-  elemId: string
-  favId: string
-  fileModelId: string
-  fileName: string
-  fileSize: string
-  md5: string
-  md510m: string
-  msgId: string
-  msgTime: string
-  parent: string
-  peerUid: string
-  picThumbPath: Array<string>
-  sha: string
-  sha3: string
-  subId: string
-  uuid: string
-}
-
 export interface NodeIKernelRichMediaService {
-  //getVideoPlayUrl(peer, msgId, elemId, videoCodecFormat, VideoRequestWay.KHAND, cb)
-  // public enum VideoCodecFormatType {
-  //     KCODECFORMATH264,
-  //     KCODECFORMATH265,
-  //     KCODECFORMATH266,
-  //     KCODECFORMATAV1
-  // }
-  // public enum VideoRequestWay {
-  //     KUNKNOW,
-  //     KHAND,
-  //     KAUTO
-  // }
-  getVideoPlayUrl(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, VideoRequestWay: number): Promise<unknown>
-
-  //exParams (RMReqExParams)
-  // this.downSourceType = i2
-  // this.triggerType = i3
-  //peer, msgId, elemId, videoCodecFormat, exParams
-  // 1 0 频道在用
-  // 1 1
-  // 0 2
-
-  // public static final int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007
-  // public static final int KDOWNSOURCETYPEAIOINNER = 1
-  // public static final int KDOWNSOURCETYPEBIGSCREEN = 2
-  // public static final int KDOWNSOURCETYPEHISTORY = 3
-  // public static final int KDOWNSOURCETYPEUNKNOWN = 0
-
-  // public static final int KTRIGGERTYPEAUTO = 1
-  // public static final int KTRIGGERTYPEMANUAL = 0
-
   getVideoPlayUrlV2(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, exParams: { downSourceType: number, triggerType: number }): Promise<GeneralCallResult & {
     urlResult: {
-      v4IpUrl: [],
+      v4IpUrl: []
-      v6IpUrl: [],
+      v6IpUrl: []
-      domainUrl: Array<{
+      domainUrl: {
-        url: string,
+        url: string
-        isHttps: boolean,
+        isHttps: boolean
         httpsDomain: string
-      }>,
+      }[]
       videoCodecFormat: number
     }
   }>
 
-  getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown
+  deleteGroupFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
 
-  // this.senderUid = ""
+  createGroupFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: unknown[] } }>
-  // this.peerUid = ""
-  // this.guildId = ""
-  // this.elem = new MsgElement()
-  // this.downloadType = i2
-  // this.thumbSize = i3
-  // this.msgId = j2
-  // this.msgRandom = j3
-  // this.msgSeq = j4
-  // this.msgTime = j5
-  // this.chatType = i4
-  // this.senderUid = str
-  // this.peerUid = str2
-  // this.guildId = str3
-  // this.elem = msgElement
-  // this.useHttps = num
-
-  getVideoPlayUrlInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): Promise<unknown>
-
-  //arg双端number
-  isFileExpired(arg: number): unknown
-
-  deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
-
-  //参数与getVideoPlayUrlInVisit一样
-  downloadRichMediaInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): unknown
-  //arg3为“”
-  downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown
-  //第三个参数 Array<Type>
-  // this.fileId = ""
-  // this.fileName = ""
-  // this.fileId = str
-  // this.fileName = str2
-  // this.fileSize = j2
-  // this.fileModelId = j3
-
-  downloadFileForFileUuid(peer: Peer, uuid: string, arg3: {
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }[]): Promise<unknown>
-
-  downloadFileByUrlList(fileDownloadTyp: UrlFileDownloadType, urlList: Array<string>): unknown
-
-  downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown
-
-  createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: Array<unknown> } }>
-
-  downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown
-
-  downloadGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  renameGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  deleteTransferInfo(arg1: unknown, arg2: unknown): unknown
-
-  cancelTransferTask(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  cancelUrlDownload(arg: unknown): unknown
-
-  updateOnlineVideoElemStatus(arg: unknown): unknown
-
-  getGroupSpace(arg: unknown): unknown
 
   getGroupFileList(groupCode: string, params: GetFileListParam): Promise<GeneralCallResult & {
     groupSpaceResult: {
@@ -198,69 +30,14 @@ export interface NodeIKernelRichMediaService {
     }
   }>
 
-  getGroupFileInfo(arg1: unknown, arg2: unknown): unknown
-
-  getGroupTransferList(arg1: unknown, arg2: unknown): unknown
-
-  renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
-
   moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
 
-  transGroupFile(arg1: unknown, arg2: unknown): unknown
+  deleteGroupFile(groupCode: string, params: Array<number>, files: Array<string>): Promise<GeneralCallResult & {
-
-  searchGroupFile(
-    keywords: Array<string>,
-    param: {
-      groupIds: Array<string>,
-      fileType: number,
-      context: string,
-      count: number,
-      sortType: number,
-      groupNames: Array<string>
-    }): Promise<unknown>
-  searchGroupFileByWord(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
-
-  deleteGroupFile(GroupCode: string, params: Array<number>, Files: Array<string>): Promise<GeneralCallResult & {
     transGroupFileResult: {
       result: unknown
       successFileIdList: Array<unknown>
       failFileIdList: Array<unknown>
     }
   }>
+}
 
-  translateEnWordToZn(words: string[]): Promise<GeneralCallResult & { words: string[] }>
-
-  getScreenOCR(path: string): Promise<unknown>
-
-  batchGetGroupFileCount(Gids: Array<string>): Promise<GeneralCallResult & { groupCodes: Array<string>, groupFileCounts: Array<number> }>
-
-  queryPicDownloadSize(arg: unknown): unknown
-
-  searchGroupFile(arg1: unknown, arg2: unknown): unknown
-
-  searchMoreGroupFile(arg: unknown): unknown
-
-  cancelSearcheGroupFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  onlyDownloadFile(peer: Peer, arg2: unknown, arg3: Array<{
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }
-  >): unknown
-
-  onlyUploadFile(arg1: unknown, arg2: unknown): unknown
-
-  isExtraLargePic(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  uploadRMFileWithoutMsg(arg: {
-    bizType: RMBizTypeEnum,
-    filePath: string,
-    peerUid: string,
-    transferId: string
-    useNTV2: string
-  }): Promise<unknown>
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelSearchService.ts

@@ -1,128 +0,0 @@
-import { ChatType } from '../types'
-
-export interface NodeIKernelSearchService {
-  addKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  removeKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  searchStranger(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroup(...args: unknown[]): unknown// needs 1 arguments
-
-  searchLocalInfo(keywords: string, unknown: number/*4*/): unknown
-
-  cancelSearchLocalInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchBuddyChatInfo(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreBuddyChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchBuddyChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchContact(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreContact(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchContact(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoSortType(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoFilterMembers(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreGroupChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreChatsWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatMsgs(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreChatMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMsgWithKeywords(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreMsgWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchMsgWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchFileWithKeywords(keywords: string[], source: number): Promise<string>// needs 2 arguments
-
-  searchMoreFileWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchFileWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreAtMeChats(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  searchMoreChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatAtMeMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  addSearchHistory(param: {
-    type: number,//4
-    contactList: [],
-    id: number,//-1
-    groupInfos: [],
-    msgs: [],
-    fileInfos: [
-      {
-        chatType: ChatType,
-        buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>,
-        discussChatInfo: [],
-        groupChatInfo: Array<
-          {
-            groupCode: string,
-            isConf: boolean,
-            hasModifyConfGroupFace: boolean,
-            hasModifyConfGroupName: boolean,
-            groupName: string,
-            remark: string
-          }>,
-        dataLineChatInfo: [],
-        tmpChatInfo: [],
-        msgId: string,
-        msgSeq: string,
-        msgTime: string,
-        senderUid: string,
-        senderNick: string,
-        senderRemark: string,
-        senderCard: string,
-        elemId: string,
-        elemType: string,//3
-        fileSize: string,
-        filePath: string,
-        fileName: string,
-        hits: Array<
-          {
-            start: 12,
-            end: 14
-          }
-        >
-      }
-    ]
-
-  }): Promise<{
-    result: number,
-    errMsg: string,
-    id?: number
-  }>
-
-  removeSearchHistory(...args: unknown[]): unknown// needs 1 arguments
-
-  searchCache(...args: unknown[]): unknown// needs 3 arguments
-
-  clearSearchCache(...args: unknown[]): unknown// needs 1 arguments
-}

src/ntqqapi/services/NodeIKernelTicketService.ts

@@ -1,11 +1,10 @@
-import { forceFetchClientKeyRetType } from './common'
+import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTicketService {
-  addKernelTicketListener(listener: unknown): void
+  forceFetchClientKey(arg: string): Promise<GeneralCallResult & {
-
+    url: string
-  removeKernelTicketListener(listenerId: unknown): void
+    keyIndex: string
-
+    clientKey: string
-  forceFetchClientKey(arg: string): Promise<forceFetchClientKeyRetType>
+    expireTime: string
-
+  }>
-  isNull(): boolean
+}
-}

src/ntqqapi/services/NodeIKernelTipOffService.ts

@@ -1,19 +1,5 @@
 import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTipOffService {
-  addKernelTipOffListener(listener: unknown): void
+  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }>
-
+}
-  removeKernelTipOffListener(listenerId: unknown): void
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }> //2
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  tipOffMsgs(args: unknown[]): Promise<unknown> //1
-
-  encodeUinAesInfo(args: unknown[]): Promise<unknown> //2
-
-  isNull(): boolean
-}

src/ntqqapi/services/common.ts

@@ -1,16 +1,8 @@
 export enum GeneralCallResultStatus {
   OK = 0
-  // ERROR = 1
 }
 
 export interface GeneralCallResult {
   result: GeneralCallResultStatus
   errMsg: string
 }
-
-export interface forceFetchClientKeyRetType extends GeneralCallResult {
-  url: string
-  keyIndex: string
-  clientKey: string
-  expireTime: string
-}

src/ntqqapi/services/index.ts

@@ -9,4 +9,3 @@ export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
 export * from './NodeIKernelTipOffService'
-export * from './NodeIKernelSearchService'

src/ntqqapi/types/group.ts

@@ -62,8 +62,9 @@ export interface GroupMember {
   sex?: Sex
   qqLevel?: QQLevel
   isChangeRole: boolean
-  joinTime: string
+  joinTime: number
-  lastSpeakTime: string
+  lastSpeakTime: number
+  memberLevel: number
 }
 
 export interface PublishGroupBulletinReq {
@@ -76,4 +77,4 @@ export interface PublishGroupBulletinReq {
   oldFeedsId: ''
   pinned: number
   confirmRequired: number
-}
+}

src/ntqqapi/types/msg.ts

@@ -6,6 +6,7 @@ export interface GetFileListParam {
   startIndex: number
   sortOrder: number
   showOnlinedocFolder: number
+  folderId?: string
 }
 
 export enum ElementType {
@@ -102,7 +103,7 @@ export interface SendPicElement {
 export interface SendReplyElement {
   elementType: ElementType.REPLY
   elementId: ''
-  replyElement: ReplyElement
+  replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
@@ -129,6 +130,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 {
@@ -190,50 +197,6 @@ export enum ChatType {
   temp = 100,
 }
 
-// 来自Android分析
-export enum ChatType2 {
-  KCHATTYPEADELIE = 42,
-  KCHATTYPEBUDDYNOTIFY = 5,
-  KCHATTYPEC2C = 1,
-  KCHATTYPECIRCLE = 113,
-  KCHATTYPEDATALINE = 8,
-  KCHATTYPEDATALINEMQQ = 134,
-  KCHATTYPEDISC = 3,
-  KCHATTYPEFAV = 41,
-  KCHATTYPEGAMEMESSAGE = 105,
-  KCHATTYPEGAMEMESSAGEFOLDER = 116,
-  KCHATTYPEGROUP = 2,
-  KCHATTYPEGROUPBLESS = 133,
-  KCHATTYPEGROUPGUILD = 9,
-  KCHATTYPEGROUPHELPER = 7,
-  KCHATTYPEGROUPNOTIFY = 6,
-  KCHATTYPEGUILD = 4,
-  KCHATTYPEGUILDMETA = 16,
-  KCHATTYPEMATCHFRIEND = 104,
-  KCHATTYPEMATCHFRIENDFOLDER = 109,
-  KCHATTYPENEARBY = 106,
-  KCHATTYPENEARBYASSISTANT = 107,
-  KCHATTYPENEARBYFOLDER = 110,
-  KCHATTYPENEARBYHELLOFOLDER = 112,
-  KCHATTYPENEARBYINTERACT = 108,
-  KCHATTYPEQQNOTIFY = 132,
-  KCHATTYPERELATEACCOUNT = 131,
-  KCHATTYPESERVICEASSISTANT = 118,
-  KCHATTYPESERVICEASSISTANTSUB = 201,
-  KCHATTYPESQUAREPUBLIC = 115,
-  KCHATTYPESUBSCRIBEFOLDER = 30,
-  KCHATTYPETEMPADDRESSBOOK = 111,
-  KCHATTYPETEMPBUSSINESSCRM = 102,
-  KCHATTYPETEMPC2CFROMGROUP = 100,
-  KCHATTYPETEMPC2CFROMUNKNOWN = 99,
-  KCHATTYPETEMPFRIENDVERIFY = 101,
-  KCHATTYPETEMPNEARBYPRO = 119,
-  KCHATTYPETEMPPUBLICACCOUNT = 103,
-  KCHATTYPETEMPWPA = 117,
-  KCHATTYPEUNKNOWN = 0,
-  KCHATTYPEWEIYUN = 40,
-}
-
 export interface PttElement {
   canConvert2Text: boolean
   duration: number // 秒数
@@ -282,14 +245,28 @@ export interface PicElement {
 }
 
 export enum GrayTipElementSubType {
-  RECALL = 1,
+  REVOKE = 1,
-  INVITE_NEW_MEMBER = 12,
+  PROCLAMATION = 2,
-  MEMBER_NEW_TITLE = 17,
+  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 +276,14 @@ export interface GrayTipElement {
     isSelfOperate?: boolean
     wording: string // 自定义的撤回提示语
   }
-  aioOpGrayTipElement: TipAioOpGrayTipElement
+  aioOpGrayTipElement?: TipAioOpGrayTipElement
-  groupElement: TipGroupElement
+  groupElement?: TipGroupElement
-  xmlElement: {
+  xmlElement?: {
     templId: string
     content: string
   }
-  jsonGrayTipElement: {
+  jsonGrayTipElement?: {
-    busiId: number
+    busiId: string
     jsonStr: string
   }
 }
@@ -328,6 +305,7 @@ export interface FaceElement {
   resultId?: string
   surpriseId?: string
   randomType?: number
+  pokeType?: number
 }
 
 export interface MarketFaceElement {
@@ -461,7 +439,7 @@ export interface RawMessage {
   msgSeq: string
   msgRandom: string
   senderUid: string
-  senderUin?: string // 发送者QQ号
+  senderUin: string // 发送者QQ号
   peerUid: string // 群号 或者 QQ uid
   peerUin: string // 群号 或者 发送者QQ号
   guildId: string
@@ -471,36 +449,7 @@ export interface RawMessage {
   sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
   recallTime: string // 撤回时间, "0"是没有撤回
   records: RawMessage[]
-  elements: {
+  elements: MessageElement[]
-    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
-  }[]
 }
 
 export interface Peer {
@@ -515,7 +464,7 @@ export interface MessageElement {
   extBufForUI: string //"0x"
   textElement?: TextElement
   faceElement?: FaceElement
-  marketFaceElement?: MarkdownElement
+  marketFaceElement?: MarketFaceElement
   replyElement?: ReplyElement
   picElement?: PicElement
   pttElement?: PttElement
@@ -541,4 +490,78 @@ export interface MessageElement {
   taskTopMsgElement?: unknown
   recommendedMsgElement?: unknown
   actionBarElement?: unknown
-}
+}
+
+export interface OnRichMediaDownloadCompleteParams {
+  fileModelId: string
+  msgElementId: string
+  msgId: string
+  fileId: string
+  fileProgress: string  // '0'
+  fileSpeed: string  // '0'
+  fileErrCode: string  // '0'
+  fileErrMsg: string
+  fileDownType: number  // 暂时未知
+  thumbSize: number
+  filePath: string
+  totalSize: string
+  trasferStatus: number
+  step: number
+  commonFileInfo: unknown
+  fileSrvErrCode: string
+  clientMsg: string
+  businessId: number
+  userTotalSpacePerDay: unknown
+  userUsedSpacePerDay: unknown
+}
+
+export interface OnGroupFileInfoUpdateParams {
+  retCode: number
+  retMsg: string
+  clientWording: string
+  isEnd: boolean
+  item: {
+    peerId: string
+    type: number
+    folderInfo?: {
+      folderId: string
+      parentFolderId: string
+      folderName: string
+      createTime: number
+      modifyTime: number
+      createUin: string
+      creatorName: string
+      totalFileCount: number
+      modifyUin: string
+      modifyName: string
+      usedSpace: string
+    }
+    fileInfo?: {
+      fileModelId: string
+      fileId: string
+      fileName: string
+      fileSize: string
+      busId: number
+      uploadedSize: string
+      uploadTime: number
+      deadTime: number
+      modifyTime: number
+      downloadTimes: number
+      sha: string
+      sha3: string
+      md5: string
+      uploaderLocalPath: string
+      uploaderName: string
+      uploaderUin: string
+      parentFolderId: string
+      localPath: string
+      transStatus: number
+      transType: number
+      elementId: string
+      isFolder: boolean
+    }
+  }[]
+  allFileCount: number
+  nextIndex: number
+  reqId: number
+}

src/ntqqapi/wrapper.ts

@@ -8,8 +8,7 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService,
+  NodeIKernelTipOffService
-  NodeIKernelSearchService
 } from './services'
 import { constants } from 'node:os'
 import { Dict } from 'cosmokit'
@@ -26,37 +25,14 @@ export interface NodeIQQNTWrapperSession {
   getRichMediaService(): NodeIKernelRichMediaService
   getTicketService(): NodeIKernelTicketService
   getTipOffService(): NodeIKernelTipOffService
-  getSearchService(): NodeIKernelSearchService
 }
 
 export interface WrapperApi {
   NodeIQQNTWrapperSession?: NodeIQQNTWrapperSession
 }
 
-export interface WrapperConstructor {
-  [key: string]: unknown
-}
-
 const wrapperApi: WrapperApi = {}
 
-export const wrapperConstructor: WrapperConstructor = {}
-
-const constructor = [
-  'NodeIKernelBuddyListener',
-  'NodeIKernelGroupListener',
-  'NodeQQNTWrapperUtil',
-  'NodeIKernelMsgListener',
-  'NodeIQQNTWrapperEngine',
-  'NodeIGlobalAdapter',
-  'NodeIDependsAdapter',
-  'NodeIDispatcherAdapter',
-  'NodeIKernelSessionListener',
-  'NodeIKernelLoginService',
-  'NodeIKernelLoginListener',
-  'NodeIKernelProfileService',
-  'NodeIKernelProfileListener',
-]
-
 Process.dlopenOrig = Process.dlopen
 
 Process.dlopen = function (module: Dict, filename: string, flags = constants.dlopen.RTLD_LAZY) {
@@ -69,13 +45,10 @@ Process.dlopen = function (module: Dict, filename: string, flags = constants.dlo
         return ret
       }
     })
-    if (constructor.includes(export_name)) {
-      wrapperConstructor[export_name] = module.exports[export_name]
-    }
   }
   return dlopenRet
 }
 
 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)
+    let params: PayloadType
-    if (!result.valid) {
+    try {
-      return OB11Response.error(result.message, 400)
+      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)
+    let params: PayloadType
-    if (!result.valid) {
+    try {
-      return OB11Response.error(result.message, 1400)
+      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> {
+  protected abstract _handle(payload: PayloadType): Promise<ReturnDataType>
-    throw `pleas override ${this.actionName} _handle`
-  }
 }
 
-export default BaseAction
+export { BaseAction, Schema }

src/onebot11/action/file/GetFile.ts

@@ -1,8 +1,7 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
-import fsPromise from 'node:fs/promises'
+import { readFile } from 'node:fs/promises'
 import { ActionName } from '../types'
 import { Peer, ElementType } from '@/ntqqapi/types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -17,13 +16,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 this.ctx.store.getFileCacheById(payload.file)
     if (!fileCache?.length) {
-      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
+      fileCache = await this.ctx.store.getFileCacheByName(payload.file)
     }
 
     if (fileCache?.length) {
@@ -56,13 +58,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 +78,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> {
+  protected async _handle(payload: { file_id: string, file: string }): Promise<GetFileResponse> {
-    if (!payload.file_id) {
-      throw new Error('file_id 不能为空')
-    }
     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 { Schema } from '../BaseAction'
-import fs from 'node:fs'
+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,25 +1,24 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export class DelEssenceMsg extends BaseAction<Payload, unknown> {
+export class DeleteEssenceMsg 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) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
-      throw Error('message_id不能为空')
-    }
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
     return await this.ctx.ntGroupApi.removeGroupEssence(
-      msg.Peer.peerUid,
+      msg.peer.peerUid,
-      msg.MsgId,
+      msg.msgId,
     )
   }
 }

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
+  group_id: number | string
   file_id: string
-  busid?: 102
+  busid: number | string
 }
 
 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.union([Number, String]).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,8 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } 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
@@ -15,17 +15,22 @@ interface Response {
 
 export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.string(),
+    id: Schema.string()
+  })
+
   protected async _handle(payload: Payload) {
     const msgId = payload.id || payload.message_id
     if (!msgId) {
       throw Error('message_id不能为空')
     }
-    const rootMsgId = MessageUnique.getShortIdByMsgId(msgId)
+    const rootMsgId = await this.ctx.store.getShortIdByMsgId(msgId)
-    const rootMsg = await MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || +msgId)
+    const rootMsg = await this.ctx.store.getMsgInfoByShortId(rootMsgId || +msgId)
     if (!rootMsg) {
       throw Error('msg not found')
     }
-    const data = await this.ctx.ntMsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId)
+    const data = await this.ctx.ntMsgApi.getMultiMsg(rootMsg.peer, rootMsg.msgId, rootMsg.msgId)
     if (data?.result !== 0) {
       throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
@@ -33,19 +38,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)
-        resMsg.message_id = MessageUnique.createMsg({
+        if (!resMsg) return
+        resMsg.message_id = this.ctx.store.createMsgShortId({
           chatType: msg.chatType,
           peerUid: msg.peerUid,
         }, msg.msgId)
         return resMsg
-      }),
+      })
     )
-    const forwardMessages = messages.map(v => {
+    const forwardMessages = filterNullable(messages)
-      const msg = v as Partial<OB11ForwardMessage>
+      .map(v => {
-      msg.content = msg.message
+        const msg = v as Partial<OB11ForwardMessage>
-      delete msg.message
+        msg.content = msg.message
-      return msg as OB11ForwardMessage
+        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, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -13,6 +13,9 @@ interface Response {
 
 export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   async _handle(payload: Payload) {
     const data = await this.ctx.ntGroupApi.getGroupRemainAtTimes(payload.group_id.toString())
@@ -22,4 +25,4 @@ export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
       remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
     }
   }
-}
+}

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

@@ -0,0 +1,50 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { ChatType } from '@/ntqqapi/types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface EssenceMsg {
+  sender_id: number
+  sender_nick: string
+  sender_time: number
+  operator_id: number
+  operator_nick: string
+  operator_time: number
+  message_id: number
+}
+
+export class GetEssenceMsgList extends BaseAction<Payload, EssenceMsg[]> {
+  actionName = ActionName.GoCQHTTP_GetEssenceMsgList
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const groupCode = payload.group_id.toString()
+    const peer = {
+      guildId: '',
+      chatType: ChatType.group,
+      peerUid: groupCode
+    }
+    const essence = await this.ctx.ntGroupApi.queryCachedEssenceMsg(groupCode)
+    const data: EssenceMsg[] = []
+    for (const item of essence.items) {
+      const { msgList } = await this.ctx.ntMsgApi.queryMsgsWithFilterExBySeq(peer, String(item.msgSeq), '0')
+      const sourceMsg = msgList.find(e => e.msgRandom === String(item.msgRandom))
+      if (!sourceMsg) continue
+      data.push({
+        sender_id: +item.msgSenderUin,
+        sender_nick: item.msgSenderNick,
+        sender_time: +sourceMsg.msgTime,
+        operator_id: +item.opUin,
+        operator_nick: item.opNick,
+        operator_time: item.opTime,
+        message_id: this.ctx.store.createMsgShortId(peer, sourceMsg.msgId)
+      })
+    }
+    return data
+  }
+}

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

@@ -0,0 +1,54 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot11/types'
+
+interface Payload {
+  group_id: string | number
+  folder_id: string
+  file_count: string | number
+}
+
+interface Response {
+  files: OB11GroupFile[]
+  folders: OB11GroupFileFolder[]
+}
+
+export class GetGroupFilesByFolder extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    folder_id: Schema.string().required(),
+    file_count: Schema.union([Number, String]).default(50)
+  })
+
+  async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+      sortType: 1,
+      fileCount: +payload.file_count,
+      startIndex: 0,
+      sortOrder: 2,
+      showOnlinedocFolder: 0,
+      folderId: payload.folder_id
+    })
+    return {
+      files: data.filter(item => item.fileInfo)
+        .map(item => {
+          const file = item.fileInfo!
+          return {
+            group_id: +item.peerId,
+            file_id: file.fileId,
+            file_name: file.fileName,
+            busid: file.busId,
+            file_size: +file.fileSize,
+            upload_time: file.uploadTime,
+            dead_time: file.deadTime,
+            modify_time: file.modifyTime,
+            download_times: file.downloadTimes,
+            uploader: +file.uploaderUin,
+            uploader_name: file.uploaderName
+          }
+        }),
+      folders: []
+    }
+  }
+}

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

@@ -1,16 +1,16 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } 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
   message_seq?: number | string
-  count?: number | string
+  count: number | string
-  reverseOrder?: boolean
+  reverseOrder: boolean
 }
 
 interface Response {
@@ -19,28 +19,33 @@ interface Response {
 
 export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    message_seq: Schema.union([Number, String]),
+    count: Schema.union([Number, String]).default(20),
+    reverseOrder: Schema.boolean().default(false),
+  })
 
   protected async _handle(payload: Payload): Promise<Response> {
-    const count = payload.count || 20
+    const { count, reverseOrder } = payload
-    const isReverseOrder = payload.reverseOrder || true
     const peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() }
     let msgList: RawMessage[] | undefined
     // 包含 message_seq 0
     if (!payload.message_seq) {
       msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +count)).msgList
     } else {
-      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq))?.MsgId
+      const startMsgId = (await this.ctx.store.getMsgInfoByShortId(+payload.message_seq))?.msgId
       if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
       msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
     }
     if (!msgList?.length) throw new Error('未找到消息')
-    if (isReverseOrder) msgList.reverse()
+    if (reverseOrder) msgList.reverse()
     await Promise.all(
       msgList.map(async msg => {
-        msg.msgShortId = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
+        msg.msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
       })
     )
     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, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
 
@@ -14,18 +14,19 @@ interface Response {
 
 export class GetGroupRootFiles extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupRootFiles
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file_count: Schema.union([Number, String]).default(50),
+  })
 
   async _handle(payload: Payload) {
     const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
       sortType: 1,
-      fileCount: +(payload.file_count ?? 50),
+      fileCount: +payload.file_count,
       startIndex: 0,
       sortOrder: 2,
       showOnlinedocFolder: 0,
     })
-
-    this.ctx.logger.info(data)
-
     return {
       files: data.filter(item => item.fileInfo)
         .map(item => {
@@ -59,4 +60,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, Schema } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
@@ -12,6 +12,9 @@ interface Payload {
 
 export class GetStrangerInfo extends BaseAction<Payload, OB11User> {
   actionName = ActionName.GoCQHTTP_GetStrangerInfo
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload): Promise<OB11User> {
     if (!(getBuildVersion() >= 26702)) {

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

@@ -1,6 +1,5 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
@@ -8,16 +7,16 @@ interface Payload {
 
 export class MarkMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_MarkMsgAsRead
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.message_id) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
-      throw new Error('参数 message_id 不能为空')
-    }
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
-    await this.ctx.ntMsgApi.setMsgRead(msg.Peer)
+    await this.ctx.ntMsgApi.setMsgRead(msg.peer)
     return null
   }
 }

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'
 
@@ -9,8 +9,9 @@ interface Payload {
 
 export class HandleQuickOperation extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_HandleQuickOperation
+
   protected async _handle(payload: Payload): Promise<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,21 +1,181 @@
-import SendMsg from '../msg/SendMsg'
+import { unlink } from 'node:fs/promises'
-import { OB11PostSendMsg } from '../../types'
+import { OB11MessageNode } from '../../types'
 import { ActionName } from '../types'
-import { convertMessage2List } from '../../helper/createMessage'
+import { BaseAction, Schema } from '../BaseAction'
+import { Peer } from '@/ntqqapi/types/msg'
+import { ChatType, ElementType, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { selfInfo } from '@/common/globalVars'
+import { convertMessage2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
-export class SendForwardMsg extends SendMsg {
+interface Payload {
+  user_id?: string | number
+  group_id?: string | number
+  messages: OB11MessageNode[]
+  message_type?: 'group' | 'private'
+}
+
+interface Response {
+  message_id: number
+  forward_id?: string
+}
+
+export class SendForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_SendForwardMsg
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]),
+    group_id: Schema.union([Number, String]),
+    messages: Schema.array(Schema.any()).required(),
+    message_type: Schema.union(['group', 'private'])
+  })
 
-  protected async check(payload: OB11PostSendMsg) {
+  protected async _handle(payload: Payload) {
-    if (payload.messages) payload.message = convertMessage2List(payload.messages)
+    let contextMode = CreatePeerMode.Normal
-    return super.check(payload)
+    if (payload.message_type === 'group') {
+      contextMode = CreatePeerMode.Group
+    } else if (payload.message_type === 'private') {
+      contextMode = CreatePeerMode.Private
+    }
+    const peer = await createPeer(this.ctx, payload, contextMode)
+    const returnMsg = await this.handleForwardNode(peer, payload.messages)
+    return { message_id: returnMsg.msgShortId! }
+  }
+
+  private async cloneMsg(msg: RawMessage): Promise<RawMessage | undefined> {
+    this.ctx.logger.info('克隆的目标消息', msg)
+    const sendElements: SendMessageElement[] = []
+    for (const ele of msg.elements) {
+      sendElements.push(ele as SendMessageElement)
+    }
+    if (sendElements.length === 0) {
+      this.ctx.logger.warn('需要clone的消息无法解析，将会忽略掉', msg)
+    }
+    this.ctx.logger.info('克隆消息', sendElements)
+    try {
+      const peer = {
+        chatType: ChatType.friend,
+        peerUid: selfInfo.uid
+      }
+      const nodeMsg = await this.ctx.ntMsgApi.sendMsg(peer, sendElements)
+      await this.ctx.sleep(300)
+      return nodeMsg
+    } catch (e) {
+      this.ctx.logger.warn(e, '克隆转发消息失败,将忽略本条消息', msg)
+    }
+  }
+
+  // 返回一个合并转发的消息id
+  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]) {
+    const selfPeer = {
+      chatType: ChatType.friend,
+      peerUid: selfInfo.uid,
+    }
+    const nodeMsgIds: { msgId: string, peer: Peer }[] = []
+    // 先判断一遍是不是id和自定义混用
+    for (const messageNode of messageNodes) {
+      // 一个node表示一个人的消息
+      const nodeId = messageNode.data.id
+      // 有nodeId表示一个子转发消息卡片
+      if (nodeId) {
+        const nodeMsg = await this.ctx.store.getMsgInfoByShortId(+nodeId)
+        if (!nodeMsg) {
+          this.ctx.logger.warn('转发消息失败，未找到消息', nodeId)
+          continue
+        }
+        nodeMsgIds.push(nodeMsg)
+      }
+      else {
+        // 自定义的消息
+        // 提取消息段，发给自己生成消息id
+        try {
+          const { sendElements, deleteAfterSentFiles } = await createSendElements(
+            this.ctx,
+            convertMessage2List(messageNode.data.content),
+            destPeer
+          )
+          this.ctx.logger.info('开始生成转发节点', sendElements)
+          const sendElementsSplit: SendMessageElement[][] = []
+          let splitIndex = 0
+          for (const ele of sendElements) {
+            if (!sendElementsSplit[splitIndex]) {
+              sendElementsSplit[splitIndex] = []
+            }
+
+            if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
+              if (sendElementsSplit[splitIndex].length > 0) {
+                splitIndex++
+              }
+              sendElementsSplit[splitIndex] = [ele]
+              splitIndex++
+            }
+            else {
+              sendElementsSplit[splitIndex].push(ele)
+            }
+          }
+          this.ctx.logger.info('分割后的转发节点', sendElementsSplit)
+          for (const eles of sendElementsSplit) {
+            const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [])
+            if (!nodeMsg) {
+              this.ctx.logger.warn('转发节点生成失败', eles)
+              continue
+            }
+            nodeMsgIds.push({ msgId: nodeMsg.msgId, peer: selfPeer })
+            await this.ctx.sleep(300)
+          }
+          deleteAfterSentFiles.map(path => unlink(path))
+        } catch (e) {
+          this.ctx.logger.error('生成转发消息节点失败', e)
+        }
+      }
+    }
+
+    // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
+    const nodeMsgArray: RawMessage[] = []
+    let srcPeer: Peer
+    let needSendSelf = false
+    for (const { msgId, peer } of nodeMsgIds) {
+      const nodeMsg = (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgId])).msgList[0]
+      srcPeer ??= { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }
+      if (srcPeer.peerUid !== nodeMsg.peerUid) {
+        needSendSelf = true
+      }
+      nodeMsgArray.push(nodeMsg)
+    }
+    let retMsgIds: string[] = []
+    if (needSendSelf) {
+      for (const msg of nodeMsgArray) {
+        if (msg.peerUid === selfPeer.peerUid) {
+          retMsgIds.push(msg.msgId)
+          continue
+        }
+        const clonedMsg = await this.cloneMsg(msg)
+        if (clonedMsg) retMsgIds.push(clonedMsg.msgId)
+      }
+    } else {
+      retMsgIds = nodeMsgArray.map(msg => msg.msgId)
+    }
+    if (retMsgIds.length === 0) {
+      throw Error('转发消息失败，节点为空')
+    }
+    const returnMsg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
+    returnMsg.msgShortId = this.ctx.store.createMsgShortId(destPeer, returnMsg.msgId)
+    return returnMsg
   }
 }
 
 export class SendPrivateForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg
+
+  protected _handle(payload: Payload) {
+    payload.message_type = 'private'
+    return super._handle(payload)
+  }
 }
 
 export class SendGroupForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendGroupForwardMsg
+
+  protected _handle(payload: Payload) {
+    payload.message_type = 'group'
+    return super._handle(payload)
+  }
 }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { unlink } from 'fs/promises'
 import { checkFileReceived, uri2local } from '@/common/utils/file'
@@ -7,20 +7,24 @@ interface Payload {
   group_id: number | string
   content: string
   image?: string
-  pinned?: number | string //扩展
+  pinned: number | string //扩展
-  confirm_required?: number | string //扩展
+  confirm_required: number | string //扩展
 }
 
 export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    content: Schema.string().required(),
+    image: Schema.string(),
+    pinned: Schema.union([Number, String]).default(0),
+    confirm_required: Schema.union([Number, String]).default(1)
+  })
 
   async _handle(payload: Payload) {
-    if(!payload.content){
-      throw new Error('参数 content 不能为空')
-    }
     const groupCode = payload.group_id.toString()
-    const pinned = Number(payload.pinned ?? 0)
+    const pinned = +payload.pinned
-    const confirmRequired = Number(payload.confirm_required ?? 1)
+    const confirmRequired = +payload.confirm_required
 
     let picInfo: { id: string, width: number, height: number } | undefined
     if (payload.image) {
@@ -51,4 +55,4 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
     }
     return null
   }
-}
+}

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

@@ -1,25 +1,22 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export class SetEssenceMsg extends BaseAction<Payload, unknown> {
+export class SetEssenceMsg extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SetEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.message_id) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
-      throw Error('message_id不能为空')
-    }
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
-    return await this.ctx.ntGroupApi.addGroupEssence(
+    await this.ctx.ntGroupApi.addGroupEssence(msg.peer.peerUid, msg.msgId)
-      msg.Peer.peerUid,
+    return null
-      msg.MsgId
-    )
   }
 }

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

@@ -0,0 +1,35 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { SendElementEntities } from '@/ntqqapi/entities'
+import { uri2local } from '@/common/utils'
+import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+
+interface Payload {
+  group_id: number | string
+  file: string
+  name: string
+  folder?: string
+  folder_id?: string
+}
+
+export class UploadGroupFile extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_UploadGroupFile
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file: Schema.string().required(),
+    name: Schema.string(),
+    folder: Schema.string(),
+    folder_id: Schema.string()
+  })
+
+  protected async _handle(payload: Payload): Promise<null> {
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    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, [file], [])
+    return null
+  }
+}

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

@@ -1,32 +1,9 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { SendElementEntities } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
-interface UploadGroupFilePayload {
-  group_id: number | string
-  file: string
-  name: string
-  folder?: string
-  folder_id?: string
-}
-
-export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
-  actionName = ActionName.GoCQHTTP_UploadGroupFile
-
-  protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(payload.file)
-    if (!success) {
-      throw new Error(errMsg)
-    }
-    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder_id)
-    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    return null
-  }
-}
-
 interface UploadPrivateFilePayload {
   user_id: number | string
   file: string
@@ -35,6 +12,11 @@ interface UploadPrivateFilePayload {
 
 export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required(),
+    file: Schema.string().required(),
+    name: Schema.string()
+  })
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
     const { success, errMsg, path, fileName } = await uri2local(payload.file)

src/onebot11/action/group/GetGroupEssence.ts

@@ -1,16 +0,0 @@
-import { GroupEssenceMsgRet } from '@/ntqqapi/api'
-import BaseAction from '../BaseAction'
-import { ActionName } from '../types'
-
-interface PayloadType {
-  group_id: number
-  pages?: number
-}
-
-export class GetGroupEssence extends BaseAction<PayloadType, GroupEssenceMsgRet | void> {
-  actionName = ActionName.GoCQHTTP_GetEssenceMsg
-
-  protected async _handle() {
-    throw '此 api 暂不支持'
-  }
-}

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -1,22 +1,19 @@
-import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
-  type?: WebHonorType
+  type: 'talkative' | 'performer' | 'legend' | 'strong_newbie' | 'emotion' | 'all'
 }
 
 export class GetGroupHonorInfo extends BaseAction<Payload, unknown> {
   actionName = ActionName.GetGroupHonorInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    type: Schema.union(['talkative', 'performer', 'legend', 'strong_newbie', 'emotion', 'all']).default('all')
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.group_id) {
-      throw '缺少参数group_id'
-    }
-    if (!payload.type) {
-      payload.type = WebHonorType.ALL
-    }
     return await this.ctx.ntWebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type)
   }
 }

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,14 +9,17 @@ interface Payload {
 
 class GetGroupInfo extends BaseAction<Payload, OB11Group> {
   actionName = ActionName.GetGroupInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
+    const groupCode = payload.group_id.toString()
+    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode === groupCode)
     if (group) {
       return OB11Entities.group(group)
-    } else {
-      throw `群${payload.group_id}不存在`
     }
+    throw new Error(`群${payload.group_id}不存在`)
   }
 }
 

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,8 +1,7 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
 import { isNullable } from 'cosmokit'
 
 interface Payload {
@@ -12,35 +11,26 @@ interface Payload {
 
 class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), payload.user_id.toString())
+    const groupCode = payload.group_id.toString()
+    const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, payload.user_id.toString())
     if (member) {
       if (isNullable(member.sex)) {
-        //log('获取群成员详细信息')
         const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
-        //log('群成员详细信息结果', info)
         Object.assign(member, info)
       }
-      const ret = OB11Entities.groupMember(payload.group_id.toString(), member)
+      const ret = OB11Entities.groupMember(groupCode, member)
-      const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid)
-      if (self?.role === 3 || self?.role === 4) {
-        const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(payload.group_id.toString())
-        const target = webGroupMembers.find(e => e?.uin && e.uin === ret.user_id)
-        if (target) {
-          ret.join_time = target.join_time
-          ret.last_sent_time = target.last_speak_time
-          ret.qage = target.qage
-          ret.level = target.lv.level.toString()
-        }
-      }
       const date = Math.round(Date.now() / 1000)
-      ret.last_sent_time ||= Number(member.lastSpeakTime || date)
+      ret.last_sent_time ??= date
-      ret.join_time ||= Number(member.joinTime || date)
+      ret.join_time ??= date
       return ret
-    } else {
-      throw `群成员${payload.user_id}不存在`
     }
+    throw new Error(`群成员${payload.user_id}不存在`)
   }
 }
 

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,57 +1,35 @@
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
 
 interface Payload {
   group_id: number | string
-  no_cache: boolean | string
+  no_cache?: boolean | string
 }
 
 class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    const groupMembers = await this.ctx.ntGroupApi.getGroupMembers(payload.group_id.toString())
+    const groupCode = payload.group_id.toString()
+    let groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
+    if (groupMembers.size === 0) {
+      await this.ctx.sleep(100)
+      groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
+    }
     const groupMembersArr = Array.from(groupMembers.values())
-
-    let _groupMembers = groupMembersArr.map(item => {
-      return OB11Entities.groupMember(payload.group_id.toString(), item)
-    })
-
-    const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>()
     const date = Math.round(Date.now() / 1000)
 
-    for (let i = 0, len = _groupMembers.length; i < len; i++) {
+    return groupMembersArr.map(item => {
-      // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
+      const member = OB11Entities.groupMember(groupCode, item)
-      _groupMembers[i].join_time = date
+      member.join_time ??= date
-      _groupMembers[i].last_sent_time = date
+      member.last_sent_time ??= date
-      MemberMap.set(_groupMembers[i].user_id, _groupMembers[i])
+      return member
-    }
+    })
-
-    const selfRole = groupMembers.get(selfInfo.uid)?.role
-    const isPrivilege = selfRole === 3 || selfRole === 4
-
-    if (isPrivilege) {
-      const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(payload.group_id.toString())
-      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-        if (!webGroupMembers[i]?.uin) {
-          continue
-        }
-        const MemberData = MemberMap.get(webGroupMembers[i]?.uin)
-        if (MemberData) {
-          MemberData.join_time = webGroupMembers[i]?.join_time
-          MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time
-          MemberData.qage = webGroupMembers[i]?.qage
-          MemberData.level = webGroupMembers[i]?.lv.level.toString()
-          MemberMap.set(webGroupMembers[i]?.uin, MemberData)
-        }
-      }
-    }
-
-    _groupMembers = Array.from(MemberMap.values())
-    return _groupMembers
   }
 }
 

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,13 @@
 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

@@ -1,7 +1,7 @@
 import type Adapter from '../adapter'
 import GetMsg from './msg/GetMsg'
 import GetLoginInfo from './system/GetLoginInfo'
-import { GetFriendList, GetFriendWithCategory } from './user/GetFriendList'
+import { GetFriendList } from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -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'
@@ -37,7 +37,6 @@ import GetImage from './file/GetImage'
 import GetRecord from './file/GetRecord'
 import { MarkMsgAsRead } from './go-cqhttp/MarkMsgAsRead'
 import CleanCache from './system/CleanCache'
-import { UploadGroupFile, UploadPrivateFile } from './go-cqhttp/UploadFile'
 import { GetConfigAction, SetConfigAction } from './llonebot/Config'
 import GetGroupAddRequest from './llonebot/GetGroupAddRequest'
 import SetQQAvatar from './llonebot/SetQQAvatar'
@@ -48,12 +47,12 @@ import { GetForwardMsg } from './go-cqhttp/GetForwardMsg'
 import { GetCookies } from './user/GetCookie'
 import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
-import { GetGroupEssence } from './group/GetGroupEssence'
+import { GetEssenceMsgList } from './go-cqhttp/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
 import { HandleQuickOperation } from './go-cqhttp/QuickOperation'
 import { SetEssenceMsg } from './go-cqhttp/SetEssenceMsg'
-import { DelEssenceMsg } from './go-cqhttp/DelEssenceMsg'
+import { DeleteEssenceMsg } from './go-cqhttp/DelEssenceMsg'
-import GetEvent from './llonebot/GetEvent'
+import { GetEvent } from './llonebot/GetEvent'
 import { DelGroupFile } from './go-cqhttp/DelGroupFile'
 import { GetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
 import { CreateGroupFileFolder } from './go-cqhttp/CreateGroupFileFolder'
@@ -62,6 +61,14 @@ 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'
+import { FetchEmojiLike } from './llonebot/FetchEmojiLike'
+import { FetchCustomFace } from './llonebot/FetchCustomFace'
+import { GetFriendMsgHistory } from './llonebot/GetFriendMsgHistory'
+import { GetGroupFilesByFolder } from './go-cqhttp/GetGroupFilesByFolder'
+import { GetFriendWithCategory } from './llonebot/GetFriendWithCategory'
+import { UploadGroupFile } from './go-cqhttp/UploadGroupFile'
+import { UploadPrivateFile } from './go-cqhttp/UploadPrivateFile'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -74,6 +81,10 @@ export function initActionMap(adapter: Adapter) {
     new GetFriendWithCategory(adapter),
     new GetEvent(adapter),
     new SetOnlineStatus(adapter),
+    new GetProfileLike(adapter),
+    new GetFriendMsgHistory(adapter),
+    new FetchEmojiLike(adapter),
+    new FetchCustomFace(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -107,8 +118,8 @@ export function initActionMap(adapter: Adapter) {
     new SetMsgEmojiLike(adapter),
     new ForwardFriendSingleMsg(adapter),
     new ForwardGroupSingleMsg(adapter),
-    //以下为go-cqhttp api
+    // go-cqhttp
-    new GetGroupEssence(adapter),
+    new GetEssenceMsgList(adapter),
     new GetGroupHonorInfo(adapter),
     new SendForwardMsg(adapter),
     new SendGroupForwardMsg(adapter),
@@ -123,16 +134,17 @@ export function initActionMap(adapter: Adapter) {
     new GetForwardMsg(adapter),
     new HandleQuickOperation(adapter),
     new SetEssenceMsg(adapter),
-    new DelEssenceMsg(adapter),
+    new DeleteEssenceMsg(adapter),
     new DelGroupFile(adapter),
     new GetGroupSystemMsg(adapter),
     new CreateGroupFileFolder(adapter),
     new DelGroupFolder(adapter),
     new GetGroupAtAllRemain(adapter),
     new GetGroupRootFiles(adapter),
-    new SendGroupNotice(adapter)
+    new SendGroupNotice(adapter),
+    new GetGroupFilesByFolder(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/FetchCustomFace.ts

@@ -0,0 +1,18 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  count: number | string
+}
+
+export class FetchCustomFace extends BaseAction<Payload, string[]> {
+  actionName = ActionName.FetchCustomFace
+  payloadSchema = Schema.object({
+    count: Schema.union([Number, String]).default(48)
+  })
+
+  async _handle(payload: Payload) {
+    const ret = await this.ctx.ntMsgApi.fetchFavEmojiList(+payload.count)
+    return ret.emojiInfoList.map(e => e.url)
+  }
+}

src/onebot11/action/llonebot/FetchEmojiLike.ts

@@ -0,0 +1,27 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { Dict } from 'cosmokit'
+
+interface Payload {
+  emojiId: string
+  emojiType: string
+  message_id: string | number
+  count: string | number
+}
+
+export class FetchEmojiLike extends BaseAction<Payload, Dict> {
+  actionName = ActionName.FetchEmojiLike
+  payloadSchema = Schema.object({
+    emojiId: Schema.string().required(),
+    emojiType: Schema.string().required(),
+    message_id: Schema.union([Number, String]).required(),
+    count: Schema.union([Number, String]).default(20)
+  })
+
+  async _handle(payload: Payload) {
+    const msgInfo = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
+    if (!msgInfo) throw new Error('消息不存在')
+    const { msgSeq } = (await this.ctx.ntMsgApi.getMsgsByMsgId(msgInfo.peer, [msgInfo.msgId])).msgList[0]
+    return await this.ctx.ntMsgApi.getMsgEmojiLikesList(msgInfo.peer, msgSeq, payload.emojiId, payload.emojiType, +payload.count)
+  }
+}

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'
@@ -11,7 +11,7 @@ interface Payload {
   timeout: number
 }
 
-export default class GetEvent extends BaseAction<Payload, PostEventType[]> {
+export class GetEvent extends BaseAction<Payload, PostEventType[]> {
   actionName = ActionName.GetEvent
 
   protected async _handle(payload: Payload): Promise<PostEventType[]> {