Merge pull request #422 from LLOneBot/dev

release: 3.32.7

README.md

@@ -1,6 +1,6 @@
 # LLOneBot
 
-LiteLoaderQQNT 插件，实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发
+LiteLoaderQQNT 插件，实现 OneBot 11 协议，用于 QQ 机器人开发
 
 > [!CAUTION]\
 > 请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论任何与本插件存在相关性的信息

electron.vite.config.ts

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

manifest.json

@@ -3,17 +3,13 @@
   "type": "extension",
   "name": "LLOneBot",
   "slug": "LLOneBot",
-  "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.1.3",
+  "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
+  "version": "3.32.7",
   "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
-    },
-    {
-      "name": "idranme",
-      "link": "https://github.com/idranme"
     }
   ],
   "repository": {
@@ -34,4 +30,4 @@
     "main": "./main/main.cjs",
     "preload": "./preload/preload.cjs"
   }
-}
+}

package.json

@@ -12,38 +12,37 @@
     "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %LITELOADERQQNT_PROFILE%\\plugins\\LLOneBot\\\"",
     "format": "prettier -cw .",
     "check": "tsc",
-    "compile:proto": "pbjs --no-create --no-convert --no-delimited --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js profileLikeTip.proto groupNotify.proto message.proto richMedia.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
+    "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.6.0",
-    "@satorijs/element": "^3.1.7",
-    "@satorijs/protocol": "^1.4.2",
-    "compare-versions": "^6.1.1",
-    "cordis": "^3.18.1",
+    "@minatojs/driver-sqlite": "^4.5.0",
+    "compressing": "^1.10.1",
+    "cordis": "^3.18.0",
     "cors": "^2.8.5",
-    "cosmokit": "^1.6.3",
-    "express": "^5.0.1",
+    "cosmokit": "^1.6.2",
+    "express": "^5.0.0",
+    "fast-xml-parser": "^4.5.0",
+    "file-type": "^19.5.0",
     "fluent-ffmpeg": "^2.1.3",
-    "minato": "^3.6.0",
+    "minato": "^3.5.1",
     "protobufjs": "^7.4.0",
-    "silk-wasm": "^3.6.3",
-    "ts-case-convert": "^2.1.0",
+    "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
-    "@types/express": "^5.0.0",
+    "@types/express": "^4.17.21",
     "@types/fluent-ffmpeg": "^2.1.26",
     "@types/node": "^20.14.15",
     "@types/ws": "^8.5.12",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
     "protobufjs-cli": "^1.1.3",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10 ",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.5",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.5.1"
+  "packageManager": "yarn@4.4.1"
 }

scripts/gen-manifest.ts

@@ -6,7 +6,7 @@ const manifest = {
   type: 'extension',
   name: 'LLOneBot',
   slug: 'LLOneBot',
-  description: '实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发',
+  description: '实现 OneBot 11 协议，用于 QQ 机器人开发',
   version,
   icon: './icon.webp',
   authors: [

src/common/channels.ts

@@ -1,5 +1,6 @@
 export const CHANNEL_GET_CONFIG = 'llonebot_get_config'
 export const CHANNEL_SET_CONFIG = 'llonebot_set_config'
+export const CHANNEL_SET_CONFIG_CONFIRMED = 'llonebot_set_config_confirmed'
 export const CHANNEL_LOG = 'llonebot_log'
 export const CHANNEL_ERROR = 'llonebot_error'
 export const CHANNEL_UPDATE = 'llonebot_update'

src/common/config.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { Config, OB11Config, SatoriConfig } from './types'
+import { Config, OB11Config } from './types'
 import { selfInfo, DATA_DIR } from './globalVars'
 import { mergeNewProperties } from './utils/misc'
 
@@ -22,7 +22,6 @@ export class ConfigUtil {
 
   reloadConfig(): Config {
     const ob11Default: OB11Config = {
-      enable: true,
       httpPort: 3000,
       httpHosts: [],
       httpSecret: '',
@@ -34,24 +33,17 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
-      listenLocalhost: false,
-      reportSelfMessage: false
-    }
-    const satoriDefault: SatoriConfig = {
-      enable: true,
-      port: 5600,
-      listen: '0.0.0.0',
-      token: ''
+      listenLocalhost: false
     }
     const defaultConfig: Config = {
       enableLLOB: true,
-      satori: satoriDefault,
       ob11: ob11Default,
       heartInterval: 60000,
       token: '',
       enableLocalFile2Url: false,
       debug: false,
-      log: true,
+      log: false,
+      reportSelfMessage: false,
       autoDeleteFile: false,
       autoDeleteFileSecond: 60,
       musicSignUrl: '',
@@ -74,7 +66,6 @@ export class ConfigUtil {
       this.checkOldConfig(jsonData.ob11, jsonData, 'httpPort', 'http')
       this.checkOldConfig(jsonData.ob11, jsonData, 'httpHosts', 'hosts')
       this.checkOldConfig(jsonData.ob11, jsonData, 'wsPort', 'wsPort')
-      this.checkOldConfig(jsonData.ob11, jsonData, 'reportSelfMessage', 'reportSelfMessage')
       this.config = jsonData
       return this.config
     }
@@ -88,8 +79,8 @@ export class ConfigUtil {
   private checkOldConfig(
     currentConfig: OB11Config,
     oldConfig: Config,
-    currentKey: 'httpPort' | 'httpHosts' | 'wsPort' | 'reportSelfMessage',
-    oldKey: 'http' | 'hosts' | 'wsPort' | 'reportSelfMessage',
+    currentKey: 'httpPort' | 'httpHosts' | 'wsPort',
+    oldKey: 'http' | 'hosts' | 'wsPort',
   ) {
     // 迁移旧的配置到新配置，避免用户重新填写配置
     const oldValue = oldConfig[oldKey]

src/common/types.ts

@@ -1,5 +1,4 @@
 export interface OB11Config {
-  enable: boolean
   httpPort: number
   httpHosts: string[]
   httpSecret?: string
@@ -17,24 +16,21 @@ export interface OB11Config {
    */
   enableQOAutoQuote?: boolean
   listenLocalhost: boolean
-  reportSelfMessage: boolean
 }
 
-export interface SatoriConfig {
-  enable: boolean
-  listen: string
-  port: number
-  token: string
+export interface CheckVersion {
+  result: boolean
+  version: string
 }
 
 export interface Config {
   enableLLOB: boolean
-  satori: SatoriConfig
   ob11: OB11Config
   token?: string
   heartInterval: number // ms
   enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
   debug?: boolean
+  reportSelfMessage?: boolean
   log?: boolean
   autoDeleteFile?: boolean
   autoDeleteFileSecond?: number
@@ -49,13 +45,6 @@ export interface Config {
   hosts?: string[]
   /** @deprecated */
   wsPort?: string
-  /** @deprecated */
-  reportSelfMessage?: boolean
-}
-
-export interface CheckVersion {
-  result: boolean
-  version: string
 }
 
 export interface LLOneBotError {

src/common/utils/audio.ts

@@ -53,44 +53,49 @@ function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?
 }
 
 export async function encodeSilk(ctx: Context, filePath: string) {
-  const file = await fsPromise.readFile(filePath)
-  if (!isSilk(file)) {
-    ctx.logger.info(`语音文件${filePath}需要转换成silk`)
-    let result: EncodeResult
-    const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
-    if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
-      result = await encode(file, 0)
+  try {
+    const file = await fsPromise.readFile(filePath)
+    if (!isSilk(file)) {
+      ctx.logger.info(`语音文件${filePath}需要转换成silk`)
+      let result: EncodeResult
+      const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
+      if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
+        result = await encode(file, 0)
+      } else {
+        const input = await convert(ctx, filePath, {
+          output: [
+            '-ar 24000',
+            '-ac 1',
+            '-f s16le'
+          ]
+        })
+        result = await encode(input, 24000)
+      }
+      const pttPath = path.join(TEMP_DIR, randomUUID())
+      await fsPromise.writeFile(pttPath, result.data)
+      ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration)
+      return {
+        converted: true,
+        path: pttPath,
+        duration: result.duration / 1000,
+      }
     } else {
-      const input = await convert(ctx, filePath, {
-        output: [
-          '-ar 24000',
-          '-ac 1',
-          '-f s16le'
-        ]
-      })
-      result = await encode(input, 24000)
-    }
-    const pttPath = path.join(TEMP_DIR, randomUUID())
-    await fsPromise.writeFile(pttPath, result.data)
-    ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration)
-    return {
-      converted: true,
-      path: pttPath,
-      duration: result.duration / 1000,
-    }
-  } else {
-    const silk = file
-    let duration = 1
-    try {
-      duration = getDuration(silk) / 1000
-    } catch (e) {
-      ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
-    }
-    return {
-      converted: false,
-      path: filePath,
-      duration,
+      const silk = file
+      let duration = 1
+      try {
+        duration = getDuration(silk) / 1000
+      } catch (e) {
+        ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
+      }
+      return {
+        converted: false,
+        path: filePath,
+        duration,
+      }
     }
+  } catch (err) {
+    ctx.logger.error('convert silk failed', (err as Error).stack)
+    return {}
   }
 }
 

src/common/utils/file.ts

@@ -4,7 +4,15 @@ import path from 'node:path'
 import { TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
-import { Context } from 'cordis'
+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> {
@@ -83,26 +91,17 @@ interface FetchFileRes {
 }
 
 export async function fetchFile(url: string, headersInit?: Record<string, string>): Promise<FetchFileRes> {
-  const headers = new Headers({
+  const headers: Record<string, string> = {
     '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
-  })
-  let raw = await fetch(url, { headers }).catch((err) => {
+  }
+  const 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()),
@@ -118,15 +117,12 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(ctx: Context, uri: string, needExt?: boolean): Promise<Uri2LocalRes> {
+export async function uri2local(uri: string, filename?: string, needExt?: boolean): Promise<Uri2LocalRes> {
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
-    const fileUri = uri.replace('%', '%25').replace('#', '%23')
-    const filePath = fileURLToPath(fileUri)
+    const filePath = fileURLToPath(uri)
     const fileName = path.basename(filePath)
-    // console.log('fileURLToPath', filePath)
-    // console.log('fileName', fileName)
     return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
   }
 
@@ -137,18 +133,17 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
 
   if (type === FileUriType.RemoteURL) {
     try {
-      const res = await fetchFile(uri)
+      const res = await fetchFile(uri, { 'Referer': uri })
       const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
-      let filename: string
       if (match?.[1]) {
-        filename = match[1].replace(/[/\\:*?"<>|]/g, '_')
+        filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')
       } else {
-        filename = randomUUID()
+        filename ??= randomUUID()
       }
       let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, res.data)
       if (needExt && !path.extname(filePath)) {
-        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await fileTypeFromFile(filePath))?.ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -161,12 +156,12 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
   }
 
   if (type === FileUriType.OneBotBase64) {
-    let filename = randomUUID()
+    filename ??= randomUUID()
     let filePath = path.join(TEMP_DIR, filename)
     const base64 = uri.replace(/^base64:\/\//, '')
     await fsPromise.writeFile(filePath, base64, 'base64')
     if (needExt) {
-      const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+      const ext = (await fileTypeFromFile(filePath))?.ext
       filename += `.${ext}`
       await fsPromise.rename(filePath, `${filePath}.${ext}`)
       filePath = `${filePath}.${ext}`
@@ -178,12 +173,12 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
     const capture = /^data:([\w/.+-]+);base64,(.*)$/.exec(uri)
     if (capture) {
-      let filename = randomUUID()
+      filename ??= randomUUID()
       const [, _type, base64] = capture
       let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
       if (needExt) {
-        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await fileTypeFromFile(filePath))?.ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -194,3 +189,26 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
 
   return { success: false, errMsg: '未知文件类型', fileName: '', path: '', isLocal: false }
 }
+
+export async function copyFolder(sourcePath: string, destPath: string) {
+  try {
+    const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true })
+    await fsPromise.mkdir(destPath, { recursive: true })
+    for (const entry of entries) {
+      const srcPath = path.join(sourcePath, entry.name)
+      const dstPath = path.join(destPath, entry.name)
+      if (entry.isDirectory()) {
+        await copyFolder(srcPath, dstPath)
+      } else {
+        try {
+          await fsPromise.copyFile(srcPath, dstPath)
+        } catch (error) {
+          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`)
+          // 这里可以决定是否要继续复制其他文件
+        }
+      }
+    }
+  } catch (error) {
+    console.error('复制文件夹时出错:', error)
+  }
+}

src/common/utils/legacyLog.ts

@@ -2,7 +2,24 @@ import fs from 'fs'
 import path from 'node:path'
 import { getConfigUtil } from '../config'
 import { LOG_DIR } from '../globalVars'
-import { inspect } from 'node:util'
+import { Dict } from 'cosmokit'
+
+function truncateString(obj: Dict | null, maxLength = 500) {
+  if (obj !== null && typeof obj === 'object') {
+    Object.keys(obj).forEach((key) => {
+      if (typeof obj[key] === 'string') {
+        // 如果是字符串且超过指定长度，则截断
+        if (obj[key].length > maxLength) {
+          obj[key] = obj[key].substring(0, maxLength) + '...'
+        }
+      } else if (typeof obj[key] === 'object') {
+        // 如果是对象或数组，则递归调用
+        truncateString(obj[key], maxLength)
+      }
+    })
+  }
+  return obj
+}
 
 export const logFileName = `llonebot-${new Date().toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
 
@@ -12,16 +29,12 @@ export function log(...msg: unknown[]) {
   }
   let logMsg = ''
   for (const msgItem of msg) {
+    // 判断是否是对象
     if (typeof msgItem === 'object') {
-      logMsg += inspect(msgItem, {
-        depth: 10,
-        compact: true,
-        breakLength: Infinity,
-        maxArrayLength: 220
-      }) + ' '
-    } else {
-      logMsg += msgItem + ' '
+      logMsg += JSON.stringify(truncateString(msgItem)) + ' '
+      continue
     }
+    logMsg += msgItem + ' '
   }
   const currentDateTime = new Date().toLocaleString()
   logMsg = `${currentDateTime} ${logMsg}\n\n`

src/common/utils/messageUnique.ts

@@ -0,0 +1,163 @@
+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

@@ -12,9 +12,8 @@ export function calcQQLevel(level: QQLevel) {
 
 /** QQ Build Version  */
 export function getBuildVersion(): number {
-  //const version: string = globalThis.LiteLoader.versions.qqnt
-  //return +version.split('-')[1]
-  return +globalThis.LiteLoader.package.qqnt.buildVersion
+  const version: string = globalThis.LiteLoader.versions.qqnt
+  return +version.split('-')[1]
 }
 
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
@@ -38,10 +37,3 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
 export function filterNullable<T>(array: T[]) {
   return array.filter(e => !isNullable(e)) as NonNullable<T>[]
 }
-
-export function parseBool(value: string) {
-  if (['', 'true', '1'].includes(value)) {
-    return true
-  }
-  return false
-}

src/common/utils/upgrade.ts

@@ -1,40 +1,75 @@
 import path from 'node:path'
+import compressing from 'compressing'
 import { writeFile } from 'node:fs/promises'
 import { version } from '../../version'
-import { log, fetchFile } from '.'
-import { TEMP_DIR } from '../globalVars'
-import { compare } from 'compare-versions'
+import { copyFolder, log, fetchFile } from '.'
+import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
 
 const downloadMirrorHosts = ['https://ghp.ci/']
 const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
-  const latestVersion = await getRemoteVersion()
+  const latestVersionText = await getRemoteVersion()
+  const latestVersion = latestVersionText.split('.')
   log('LLOneBot latest version', latestVersion)
-  if (latestVersion === '') {
-    return { result: false, version: latestVersion }
-  }
-  if (compare(latestVersion, version, '>')) {
-    return { result: true, version: latestVersion }
+  const currentVersion = version.split('.')
+  //log('llonebot current version', currentVersion)
+  for (const k of [0, 1, 2]) {
+    const latest = parseInt(latestVersion[k])
+    const current = parseInt(currentVersion[k])
+    if (latest > current) {
+      log('')
+      return { result: true, version: latestVersionText }
+    } else if (latest < current) {
+      break
+    }
   }
   return { result: false, version: version }
 }
 
-export async function upgradeLLOneBot(): Promise<boolean> {
+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 filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
+    let downloadSuccess = false
     // 多镜像下载
     for (const mirrorGithub of downloadMirrorHosts) {
       try {
         const res = await fetchFile(mirrorGithub + downloadUrl)
         await writeFile(filePath, res.data)
-        return globalThis.LiteLoader.api.plugin.install(filePath)
+        downloadSuccess = true
+        break
       } catch (e) {
         log('llonebot upgrade error', e)
       }
     }
+    if (!downloadSuccess) {
+      log('llonebot upgrade error', 'download failed')
+      return false
+    }
+    const temp_ver_dir = path.join(TEMP_DIR, 'LLOneBot' + latestVersion)
+    const uncompressedPromise = async function () {
+      return new Promise<boolean>(resolve => {
+        compressing.zip
+          .uncompress(filePath, temp_ver_dir)
+          .then(() => {
+            resolve(true)
+          })
+          .catch(reason => {
+            log('llonebot upgrade failed, ', reason)
+            if (reason?.errno == -4082) {
+              resolve(true)
+            }
+            resolve(false)
+          })
+      })
+    }
+    const uncompressedResult = await uncompressedPromise()
+    // 复制文件
+    await copyFolder(temp_ver_dir, PLUGIN_DIR)
+
+    return uncompressedResult
   }
   return false
 }

src/main/log.ts

@@ -28,7 +28,7 @@ export default class Log {
       },
     }
     Logger.targets.push(target)
-    ctx.on('llob/config-updated', input => {
+    ctx.on('llonebot/config-updated', input => {
       enable = input.log!
     })
   }

src/main/main.ts

@@ -1,11 +1,8 @@
 import path from 'node:path'
+import fs from 'node:fs'
 import Log from './log'
 import Core from '../ntqqapi/core'
 import OneBot11Adapter from '../onebot11/adapter'
-import SatoriAdapter from '../satori/adapter'
-import Database from 'minato'
-import SQLiteDriver from '@minatojs/driver-sqlite'
-import Store from './store'
 import { BrowserWindow, dialog, ipcMain } from 'electron'
 import { Config as LLOBConfig } from '../common/types'
 import {
@@ -15,12 +12,15 @@ import {
   CHANNEL_LOG,
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
-  CHANNEL_UPDATE
+  CHANNEL_UPDATE,
+  CHANNEL_SET_CONFIG_CONFIRMED
 } from '../common/channels'
-import { startHook } from '../ntqqapi/hook'
+import { getBuildVersion } from '../common/utils'
+import { hookNTQQApiCall, hookNTQQApiReceive } from '../ntqqapi/hook'
 import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
 import { getConfigUtil } from '../common/config'
 import { checkFfmpeg } from '../common/utils/video'
+import { getSession } from '../ntqqapi/wrapper'
 import { Context } from 'cordis'
 import { llonebotError, selfInfo, LOG_DIR, DATA_DIR, TEMP_DIR } from '../common/globalVars'
 import { log, logFileName } from '../common/utils/legacyLog'
@@ -34,11 +34,10 @@ import {
   NTQQWebApi,
   NTQQWindowApi
 } from '../ntqqapi/api'
-import { existsSync, mkdirSync } from 'node:fs'
 
 declare module 'cordis' {
   interface Events {
-    'llob/config-updated': (input: LLOBConfig) => void
+    'llonebot/config-updated': (input: LLOBConfig) => void
   }
 }
 
@@ -46,37 +45,14 @@ let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-  if (!existsSync(DATA_DIR)) {
-    mkdirSync(DATA_DIR, { recursive: true })
+  if (!fs.existsSync(DATA_DIR)) {
+    fs.mkdirSync(DATA_DIR, { recursive: true })
   }
 
-  if (!existsSync(LOG_DIR)) {
-    mkdirSync(LOG_DIR)
+  if (!fs.existsSync(LOG_DIR)) {
+    fs.mkdirSync(LOG_DIR)
   }
 
-  if (!existsSync(TEMP_DIR)) {
-    mkdirSync(TEMP_DIR)
-  }
-
-  const dbDir = path.join(DATA_DIR, 'database')
-  if (!existsSync(dbDir)) {
-    mkdirSync(dbDir)
-  }
-
-  const ctx = new Context()
-
-  ctx.plugin(NTQQFileApi)
-  ctx.plugin(NTQQFileCacheApi)
-  ctx.plugin(NTQQFriendApi)
-  ctx.plugin(NTQQGroupApi)
-  ctx.plugin(NTQQMsgApi)
-  ctx.plugin(NTQQUserApi)
-  ctx.plugin(NTQQWebApi)
-  ctx.plugin(NTQQWindowApi)
-  ctx.plugin(Database)
-
-  let started = false
-
   ipcMain.handle(CHANNEL_CHECK_VERSION, async () => {
     return checkNewVersion()
   })
@@ -135,9 +111,7 @@ function onLoad() {
       if (!ask) {
         getConfigUtil().setConfig(config)
         log('配置已更新', config)
-        if (started) {
-          ctx.parallel('llob/config-updated', config)
-        }
+        checkFfmpeg(config.ffmpeg).then()
         resolve(true)
         return
       }
@@ -154,9 +128,7 @@ function onLoad() {
           if (result.response === 0) {
             getConfigUtil().setConfig(config)
             log('配置已更新', config)
-            if (started) {
-              ctx.parallel('llob/config-updated', config)
-            }
+            checkFfmpeg(config.ffmpeg).then()
             resolve(true)
           }
         })
@@ -171,65 +143,78 @@ function onLoad() {
     log(arg)
   })
 
-  const intervalId = setInterval(async () => {
+  async function start() {
+    log('process pid', process.pid)
+    const config = getConfigUtil().getConfig()
+    if (!config.enableLLOB) {
+      llonebotError.otherError = 'LLOneBot 未启动'
+      log('LLOneBot 开关设置为关闭，不启动LLOneBot')
+      return
+    }
+    if (!fs.existsSync(TEMP_DIR)) {
+      fs.mkdirSync(TEMP_DIR)
+    }
+    const ctx = new Context()
+    ctx.plugin(Log, {
+      enable: config.log!,
+      filename: logFileName
+    })
+    ctx.plugin(NTQQFileApi)
+    ctx.plugin(NTQQFileCacheApi)
+    ctx.plugin(NTQQFriendApi)
+    ctx.plugin(NTQQGroupApi)
+    ctx.plugin(NTQQMsgApi)
+    ctx.plugin(NTQQUserApi)
+    ctx.plugin(NTQQWebApi)
+    ctx.plugin(NTQQWindowApi)
+    ctx.plugin(Core, config)
+    ctx.plugin(OneBot11Adapter, {
+      ...config.ob11,
+      heartInterval: config.heartInterval,
+      token: config.token!,
+      debug: config.debug!,
+      reportSelfMessage: config.reportSelfMessage!,
+      msgCacheExpire: config.msgCacheExpire!,
+      musicSignUrl: config.musicSignUrl,
+      enableLocalFile2Url: config.enableLocalFile2Url!,
+      ffmpeg: config.ffmpeg,
+    })
+    ctx.start()
+    ipcMain.on(CHANNEL_SET_CONFIG_CONFIRMED, (event, config: LLOBConfig) => {
+      ctx.parallel('llonebot/config-updated', config)
+    })
+  }
+
+  const buildVersion = getBuildVersion()
+
+  const intervalId = setInterval(() => {
     const self = Object.assign(selfInfo, {
       uin: globalThis.authData?.uin,
       uid: globalThis.authData?.uid,
       online: true
     })
-    if (self.uin) {
+    if (self.uin && (buildVersion >= 27187 || getSession())) {
       clearInterval(intervalId)
-      log('process pid', process.pid)
-
-      const config = getConfigUtil().getConfig()
-
-      if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
-        startHook()
-        await ctx.sleep(600)
-      } else {
-        llonebotError.otherError = 'LLOneBot 未启动'
-        log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
-        return
-      }
-
-      ctx.plugin(Log, {
-        enable: config.log!,
-        filename: logFileName
-      })
-      ctx.plugin(SQLiteDriver, {
-        path: path.join(dbDir, `${selfInfo.uin}.db`)
-      })
-      ctx.plugin(Store, {
-        msgCacheExpire: config.msgCacheExpire! * 1000
-      })
-      ctx.plugin(Core, config)
-      if (config.ob11.enable) {
-        ctx.plugin(OneBot11Adapter, {
-          ...config.ob11,
-          heartInterval: config.heartInterval,
-          token: config.token!,
-          debug: config.debug!,
-          musicSignUrl: config.musicSignUrl,
-          enableLocalFile2Url: config.enableLocalFile2Url!,
-          ffmpeg: config.ffmpeg,
-        })
-      }
-      if (config.satori.enable) {
-        ctx.plugin(SatoriAdapter, {
-          ...config.satori,
-          ffmpeg: config.ffmpeg,
-        })
-      }
-
-      ctx.start()
-      started = true
-      llonebotError.otherError = ''
+      start()
     }
-  }, 500)
+  }, 600)
 }
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
+  if (![2, 4, 6].includes(window.id)) {
+    return
+  }
+  if (window.id === 2) {
+    mainWindow = window
+  }
+  //log('window create', window.webContents.getURL().toString())
+  try {
+    hookNTQQApiCall(window, window.id !== 2)
+    hookNTQQApiReceive(window, window.id !== 2)
+  } catch (e) {
+    log('LLOneBot hook error: ', String(e))
+  }
 }
 
 try {

src/main/store.ts

@@ -1,154 +0,0 @@
-import { Peer, RawMessage } 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
-}
-
-class Store extends Service {
-  static inject = ['database', 'model']
-  private cache: LimitedHashTable<string, number>
-  private messages: Map<string, RawMessage>
-
-  constructor(protected ctx: Context, public config: Store.Config) {
-    super(ctx, 'store', true)
-    this.cache = new LimitedHashTable(1000)
-    this.messages = new Map()
-    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 {
-    // OneBot 11 要求 message_id 为 int32
-    const cacheKey = `${msgId}|${peer.chatType}|${peer.peerUid}`
-    const hash = createHash('md5').update(cacheKey).digest()
-    hash[0] &= 0x7f //保证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 })
-  }
-
-  async addMsgCache(msg: RawMessage) {
-    const expire = this.config.msgCacheExpire
-    if (expire === 0) {
-      return
-    }
-    const id = msg.msgId
-    this.messages.set(id, msg)
-    setTimeout(() => {
-      this.messages.delete(id)
-    }, expire)
-  }
-
-  getMsgCache(msgId: string) {
-    return this.messages.get(msgId)
-  }
-}
-
-namespace Store {
-  export interface Config {
-    /** 单位为毫秒 */
-    msgCacheExpire: number
-  }
-}
-
-export default Store

src/ntqqapi/api/file.ts

@@ -13,14 +13,18 @@ import {
   PicElement,
 } from '../types'
 import path from 'node:path'
-import { existsSync } from 'node:fs'
+import fs from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { RkeyManager } from '@/ntqqapi/helper/rkey'
-import { RichMediaDownloadCompleteNotify, RichMediaUploadCompleteNotify, RMBizType, Peer } from '@/ntqqapi/types/msg'
+import { getSession } from '@/ntqqapi/wrapper'
+import { Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
-import { copyFile, stat, unlink } from 'node:fs/promises'
+import { fileTypeFromFile } from 'file-type'
+import fsPromise from 'node:fs/promises'
+import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
+import { TEMP_DIR } from '@/common/globalVars'
 
 declare module 'cordis' {
   interface Context {
@@ -37,42 +41,53 @@ export class NTQQFileApi extends Service {
     this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
-  async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string | undefined> {
-    const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
-      peer,
-      msgId,
-      elemId: elementId,
-      videoCodecFormat: 0,
-      exParams: {
-        downSourceType: 1,
-        triggerType: 1
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
+    const session = getSession()
+    if (session) {
+      return (await session.getRichMediaService().getVideoPlayUrlV2(
+        peer,
+        msgId,
+        elementId,
+        0,
+        { downSourceType: 1, triggerType: 1 }
+      )).urlResult.domainUrl[0]?.url
+    } else {
+      const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
+        peer,
+        msgId,
+        elemId: elementId,
+        videoCodecFormat: 0,
+        exParams: {
+          downSourceType: 1,
+          triggerType: 1
+        },
+      }, null])
+      if (data.result !== 0) {
+        this.ctx.logger.warn('getVideoUrl', data)
       }
-    }])
-    if (data.result !== 0) {
-      this.ctx.logger.warn('getVideoUrl', data)
+      return data.urlResult.domainUrl[0]?.url
     }
-    return data.urlResult.domainUrl[0]?.url
   }
 
   async getFileType(filePath: string) {
-    return await invoke<{
-      ext: string
-      mime: string
-    }>(NTMethod.FILE_TYPE, [filePath], {
-      className: NTClass.FS_API
-    })
+    return fileTypeFromFile(filePath)
   }
 
-  /** 上传文件到 QQ 的文件夹 */
-  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
+  // 上传文件到QQ的文件夹
+  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
-    let fileName = path.basename(filePath)
-    if (!fileName.includes('.')) {
-      const ext = (await this.getFileType(filePath))?.ext
-      fileName += ext ? '.' + ext : ''
+    let ext = (await this.getFileType(filePath))?.ext || ''
+    if (ext) {
+      ext = '.' + ext
     }
-    const mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
-      path_info: {
+    let fileName = `${path.basename(filePath)}`
+    if (fileName.indexOf('.') === -1) {
+      fileName += ext
+    }
+    const session = getSession()
+    let mediaPath: string
+    if (session) {
+      mediaPath = session?.getMsgService().getRichMediaFilePathForGuild({
         md5HexStr: fileMd5,
         fileName: fileName,
         elementType: elementType,
@@ -80,16 +95,30 @@ export class NTQQFileApi extends Service {
         thumbSize: 0,
         needCreate: true,
         downloadType: 1,
-        file_uuid: '',
-      },
-    }])
-    await copyFile(filePath, mediaPath)
-    const fileSize = (await stat(filePath)).size
+        file_uuid: ''
+      })
+    } else {
+      mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
+        path_info: {
+          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
     }
   }
 
@@ -98,52 +127,57 @@ export class NTQQFileApi extends Service {
     chatType: ChatType,
     peerUid: string,
     elementId: string,
-    thumbPath = '',
-    sourcePath = '',
+    thumbPath: string,
+    sourcePath: string,
     timeout = 1000 * 60 * 2,
     force = false
   ) {
     // 用于下载收到的消息中的图片等
-    if (sourcePath && existsSync(sourcePath)) {
+    if (sourcePath && fs.existsSync(sourcePath)) {
       if (force) {
         try {
-          await unlink(sourcePath)
+          await fsPromise.unlink(sourcePath)
         } catch { }
       } else {
         return sourcePath
       }
     }
-    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
+    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
       'nodeIKernelMsgService/downloadRichMedia',
-      [{
-        getReq: {
-          fileModelId: '0',
-          downloadSourceType: 0,
-          triggerType: 1,
-          msgId: msgId,
-          chatType: chatType,
-          peerUid: peerUid,
-          elementId: elementId,
-          thumbSize: 0,
-          downloadType: 1,
-          filePath: thumbPath,
+      [
+        {
+          getReq: {
+            fileModelId: '0',
+            downloadSourceType: 0,
+            triggerType: 1,
+            msgId: msgId,
+            chatType: chatType,
+            peerUid: peerUid,
+            elementId: elementId,
+            thumbSize: 0,
+            downloadType: 1,
+            filePath: thumbPath,
+          },
         },
-      }],
+        null,
+      ],
       {
         cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
         cmdCB: payload => payload.notifyInfo.msgId === msgId,
         timeout
       }
     )
-    return data.notifyInfo.filePath
+    let filePath = data.notifyInfo.filePath
+    if (filePath.startsWith('\\')) {
+      const downloadPath = TEMP_DIR
+      filePath = path.join(downloadPath, filePath)
+      // 下载路径是下载文件夹的相对路径
+    }
+    return filePath
   }
 
   async getImageSize(filePath: string) {
-    return await invoke<{
-      width: number
-      height: number
-      type: string
-    }>(
+    return await invoke<{ width: number; height: number }>(
       NTMethod.IMAGE_SIZE,
       [filePath],
       {
@@ -163,8 +197,8 @@ export class NTQQFileApi extends Service {
     if (url) {
       const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
       const imageAppid = parsedUrl.searchParams.get('appid')
-      const isNTPic = imageAppid && ['1406', '1407'].includes(imageAppid)
-      if (isNTPic) {
+      const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
+      if (isNewPic) {
         let rkey = parsedUrl.searchParams.get('rkey')
         if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
@@ -183,56 +217,6 @@ export class NTQQFileApi extends Service {
     this.ctx.logger.error('图片url获取失败', element)
     return ''
   }
-
-  async downloadFileForModelId(peer: Peer, fileModelId: string, timeout = 2 * Time.minute) {
-    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
-      'nodeIKernelRichMediaService/downloadFileForModelId',
-      [{
-        peer,
-        fileModelIdList: [fileModelId],
-        save_path: ''
-      }],
-      {
-        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-        cmdCB: payload => payload.notifyInfo.fileModelId === fileModelId,
-        timeout,
-        afterFirstCmd: false
-      }
-    )
-    return data.notifyInfo.filePath
-  }
-
-  async ocrImage(path: string) {
-    return await invoke(
-      'nodeIKernelNodeMiscService/wantWinScreenOCR',
-      [
-        { url: path },
-        { timeout: 5000 }
-      ]
-    )
-  }
-
-  async uploadRMFileWithoutMsg(filePath: string, bizType: RMBizType, peerUid: string) {
-    const data = await invoke<{
-      notifyInfo: RichMediaUploadCompleteNotify
-    }>(
-      'nodeIKernelRichMediaService/uploadRMFileWithoutMsg',
-      [{
-        params: {
-          filePath,
-          bizType,
-          peerUid,
-          useNTV2: true
-        }
-      }],
-      {
-        cbCmd: ReceiveCmdS.MEDIA_UPLOAD_COMPLETE,
-        cmdCB: payload => payload.notifyInfo.filePath === filePath,
-        timeout: 10 * Time.second,
-      }
-    )
-    return data.notifyInfo
-  }
 }
 
 export class NTQQFileCacheApi extends Service {
@@ -241,19 +225,21 @@ export class NTQQFileCacheApi extends Service {
   }
 
   async setCacheSilentScan(isSilent: boolean = true) {
-    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }])
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }, null])
   }
 
   getCacheSessionPathList() {
-    return invoke<Array<{
-      key: string
-      value: string
-    }>>(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
+    return invoke<
+      {
+        key: string
+        value: string
+      }[]
+    >(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
   }
 
   scanCache() {
-    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
-    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second })
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
   }
 
   getHotUpdateCachePath() {
@@ -273,13 +259,13 @@ export class NTQQFileCacheApi extends Service {
       pageSize: pageSize,
       order: 1,
       lastRecord: _lastRecord,
-    }])
+    }, null])
   }
 
   async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
     return await invoke<GeneralCallResult>(NTMethod.CACHE_CHAT_CLEAR, [{
       chats,
       fileKeys,
-    }])
+    }, null])
   }
 }

src/ntqqapi/api/friend.ts

@@ -1,6 +1,9 @@
-import { Friend, SimpleInfo, CategoryFriend } from '../types'
+import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
 import { ReceiveCmdS } from '../hook'
 import { invoke, NTMethod, NTClass } from '../ntcall'
+import { getSession } from '@/ntqqapi/wrapper'
+import { BuddyListReqType } from '../services'
+import { Dict, pick } from 'cosmokit'
 import { Service, Context } from 'cordis'
 
 declare module 'cordis' {
@@ -16,110 +19,179 @@ export class NTQQFriendApi extends Service {
 
   /** 大于或等于 26702 应使用 getBuddyV2 */
   async getFriends() {
-    const res = await invoke<{
+    const data = await invoke<{
       data: {
         categoryId: number
         categroyName: string
         categroyMbCount: number
         buddyList: Friend[]
       }[]
-    }>('getBuddyList', [], {
-      className: NTClass.NODE_STORE_API,
-      cbCmd: ReceiveCmdS.FRIENDS,
-      afterFirstCmd: false
-    })
-    return res.data.flatMap(e => e.buddyList)
+    }>(
+      'getBuddyList',
+      [],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      }
+    )
+    const _friends: Friend[] = []
+    for (const item of data.data) {
+      _friends.push(...item.buddyList)
+    }
+    return _friends
   }
 
-  async handleFriendRequest(friendUid: string, reqTime: string, accept: boolean) {
-    return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
-      approvalInfo: {
+  async handleFriendRequest(flag: 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({
         friendUid,
         reqTime,
-        accept,
-      },
-    }])
+        accept
+      })
+    } else {
+      return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
+        approvalInfo: {
+          friendUid,
+          reqTime,
+          accept,
+        },
+      }])
+    }
   }
 
-  async getBuddyV2(refresh = false): Promise<SimpleInfo[]> {
-    const data = await invoke<{
-      buddyCategory: CategoryFriend[]
-      userSimpleInfos: Record<string, SimpleInfo>
-    }>(
-      'getBuddyList',
-      [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!))
+  async getBuddyV2(refresh = false): Promise<FriendV2[]> {
+    const session = getSession()
+    if (session) {
+      const uids: string[] = []
+      const buddyService = session.getBuddyService()
+      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      return Array.from(data.values())
+    } else {
+      const data = await invoke<{
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>(
+        'getBuddyList',
+        [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 */
+  /** uid => uin */
   async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
     const retMap: Map<string, string> = new Map()
-    const data = await invoke<{
-      buddyCategory: CategoryFriend[]
-      userSimpleInfos: Record<string, SimpleInfo>
-    }>(
-      'getBuddyList',
-      [refresh],
-      {
-        className: NTClass.NODE_STORE_API,
-        cbCmd: ReceiveCmdS.FRIENDS,
-        afterFirstCmd: false,
+    const session = getSession()
+    if (session) {
+      const uids: string[] = []
+      const buddyService = session.getBuddyService()
+      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      for (const [, item] of data) {
+        if (retMap.size > 5000) {
+          break
+        }
+        retMap.set(item.uid!, item.uin!)
       }
-    )
-    for (const item of Object.values(data.userSimpleInfos)) {
-      if (retMap.size > 5000) {
-        break
+    } else {
+      const data = await invoke<{
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>(
+        '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
   }
 
-  async getBuddyV2WithCate(refresh = false) {
-    const data = await invoke<{
-      buddyCategory: CategoryFriend[]
-      userSimpleInfos: Record<string, SimpleInfo>
-    }>(
-      'getBuddyList',
-      [refresh],
-      {
-        className: NTClass.NODE_STORE_API,
-        cbCmd: ReceiveCmdS.FRIENDS,
-        afterFirstCmd: false,
+  async getBuddyV2ExWithCate(refresh = false) {
+    const session = getSession()
+    if (session) {
+      const uids: string[] = []
+      const categoryMap: Map<string, Dict> = new Map()
+      const buddyService = session.getBuddyService()
+      const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data
+      uids.push(
+        ...buddyListV2.flatMap(item => {
+          item.buddyUids.forEach(uid => {
+            categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
+          })
+          return item.buddyUids
+        }))
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      return Array.from(data).map(([key, value]) => {
+        const category = categoryMap.get(key)
+        return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
+      })
+    } else {
+      const data = await invoke<{
+        buddyCategory: CategoryFriend[]
+        userSimpleInfos: Record<string, SimpleInfo>
+      }>(
+        'getBuddyList',
+        [refresh],
+        {
+          className: NTClass.NODE_STORE_API,
+          cbCmd: ReceiveCmdS.FRIENDS,
+          afterFirstCmd: false,
+        }
+      )
+      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
+      for (const item of data.buddyCategory) {
+        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
       }
-    )
-    return data
+      return Object.values(data.userSimpleInfos)
+        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
+        .map(value => {
+          return {
+            ...value,
+            categoryId: value.baseInfo.categoryId,
+            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
+          }
+        })
+    }
   }
 
   async isBuddy(uid: string): Promise<boolean> {
-    return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }])
+    const session = getSession()
+    if (session) {
+      return session.getBuddyService().isBuddy(uid)
+    } else {
+      return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }, null])
+    }
   }
 
   async getBuddyRecommendContact(uin: string) {
-    const ret = await invoke('nodeIKernelBuddyService/getBuddyRecommendContactArkJson', [{ uin }])
+    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 }
-    }])
-  }
-
-  async delBuddy(friendUid: string) {
-    return await invoke('nodeIKernelBuddyService/delBuddy', [{
-      delInfo: {
-        friendUid,
-        tempBlock: false,
-        tempBothDel: true
-      }
-    }])
-  }
 }

src/ntqqapi/api/group.ts

@@ -1,20 +1,13 @@
 import { ReceiveCmdS } from '../hook'
-import {
-  Group,
-  GroupMember,
-  GroupMemberRole,
-  GroupNotifies,
-  GroupRequestOperateTypes,
-  GetFileListParam,
-  PublishGroupBulletinReq,
-  GroupAllInfo,
-  GroupFileInfo,
-  GroupBulletinListResult
-} from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam, 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'
 
 declare module 'cordis' {
   interface Context {
@@ -25,6 +18,8 @@ declare module 'cordis' {
 export class NTQQGroupApi extends Service {
   static inject = ['ntWindowApi']
 
+  public groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
+
   constructor(protected ctx: Context) {
     super(ctx, 'ntGroupApi', true)
   }
@@ -45,45 +40,56 @@ export class NTQQGroupApi extends Service {
     return result.groupList
   }
 
-  async getGroupMembers(groupCode: string, num = 3000) {
-    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
-      groupCode,
-      scene: 'groupMemberList_MainWindow'
-    }])
-    const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
-    if (data.errCode !== 0) {
-      throw new Error('获取群成员列表出错,' + data.errMsg)
+  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
+    const session = getSession()
+    let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
+    if (session) {
+      const groupService = session.getGroupService()
+      const sceneId = groupService.createMemberListScene(groupCode, 'groupMemberList_MainWindow')
+      result = await groupService.getNextMemberList(sceneId, undefined, num)
+    } else {
+      const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
+      result = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }, null])
     }
-    return data.result.infos
+    if (result.errCode !== 0) {
+      throw ('获取群成员列表出错,' + result.errMsg)
+    }
+    return result.result.infos
   }
 
-  async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
-    await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
-      registerEvent: true
-    })
-
-    const data = await invoke<{
-      groupCode: string
-      members: Map<string, GroupMember>
-    }>(
-      'nodeIKernelGroupService/getMemberInfo',
-      [{
-        groupCode,
-        uids: [uid],
-        forceUpdate
-      }],
-      {
-        cbCmd: 'nodeIKernelGroupListener/onMemberInfoChange',
-        afterFirstCmd: false,
-        cmdCB: payload => payload.members.has(uid),
-        timeout: 2000
+  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
+    const groupCodeStr = groupCode.toString()
+    const memberUinOrUidStr = memberUinOrUid.toString()
+    if (!this.groupMembers.has(groupCodeStr)) {
+      try {
+        // 更新群成员列表
+        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
       }
-    )
-    return data.members.get(uid)!
+      catch (e) {
+        return null
+      }
+    }
+    let members = this.groupMembers.get(groupCodeStr)!
+    const getMember = () => {
+      let member: GroupMember | undefined = undefined
+      if (isNumeric(memberUinOrUidStr)) {
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
+      } else {
+        member = members.get(memberUinOrUidStr)
+      }
+      return member
+    }
+    let member = getMember()
+    if (!member) {
+      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      members = this.groupMembers.get(groupCodeStr)!
+      member = getMember()
+    }
+    return member
   }
 
   async getGroupIgnoreNotifies() {
-    await this.getSingleScreenNotifies(false, 14)
+    await this.getSingleScreenNotifies(14)
     return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
@@ -91,18 +97,17 @@ export class NTQQGroupApi extends Service {
     )
   }
 
-  async getSingleScreenNotifies(doubt: boolean, number: number, startSeq = '') {
-    await invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
-
-    const data = await invoke<GroupNotifies>(
+  async getSingleScreenNotifies(num: number) {
+    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
+    return (await invoke<GroupNotifies>(
       'nodeIKernelGroupService/getSingleScreenNotifies',
-      [{ doubt, startSeq, number }],
+      [{ doubt: false, startSeq: '', number: num }, null],
       {
+
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
-    )
-    return data.notifies
+    )).notifies
   }
 
   async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
@@ -110,235 +115,192 @@ export class NTQQGroupApi extends Service {
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
-    const doubt = flagitem[3] === '1'
-    return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-      doubt,
-      operateMsg: {
-        operateType,
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().operateSysNotify(false, {
+        operateType, // 2 拒绝
         targetMsg: {
-          seq,
+          seq,  // 通知序列号
           type,
           groupCode,
           postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+        }
+      })
+    } else {
+      return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
+        doubt: false,
+        operateMsg: {
+          operateType,
+          targetMsg: {
+            seq,
+            type,
+            groupCode,
+            postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+          },
         },
-      },
-    }])
+      }, null])
+    }
   }
 
   async quitGroup(groupCode: string) {
-    return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().quitGroup(groupCode)
+    } else {
+      return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }, null])
+    }
   }
 
-  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
-    return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
+  async kickMember(
+    groupCode: string,
+    kickUids: string[],
+    refuseForever = false,
+    kickReason = '',
+  ) {
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().kickMember(groupCode, kickUids, refuseForever, kickReason)
+    } else {
+      return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
+    }
   }
 
-  /** timeStamp为秒数, 0为解除禁言 */
   async banMember(groupCode: string, memList: Array<{ uid: string, timeStamp: number }>) {
-    return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
+    // timeStamp为秒数, 0为解除禁言
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().setMemberShutUp(groupCode, memList)
+    } else {
+      return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
+    }
   }
 
   async banGroup(groupCode: string, shutUp: boolean) {
-    return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().setGroupShutUp(groupCode, shutUp)
+    } else {
+      return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }, null])
+    }
   }
 
   async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
-    return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyMemberCardName(groupCode, memberUid, cardName)
+    } else {
+      return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }, null])
+    }
   }
 
   async setMemberRole(groupCode: string, memberUid: string, role: GroupMemberRole) {
-    return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyMemberRole(groupCode, memberUid, role)
+    } else {
+      return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }, null])
+    }
   }
 
   async setGroupName(groupCode: string, groupName: string) {
-    return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyGroupName(groupCode, groupName, false)
+    } else {
+      return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }, null])
+    }
   }
 
   async getGroupRemainAtTimes(groupCode: string) {
-    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }])
+    return await invoke<
+      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 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)
-      }
-    }])
+    const session = getSession()
+    // 代码没测过
+    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    const param = {
+      groupCode: groupCode,
+      msgRandom: Number(data?.msgList[0].msgRandom),
+      msgSeq: Number(data?.msgList[0].msgSeq)
+    }
+    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
+    return session?.getGroupService().removeGroupEssence(param)
   }
 
+  /** 27187 TODO */
   async addGroupEssence(groupCode: string, msgId: string) {
-    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)
-      }
-    }])
+    const session = getSession()
+    // 代码没测过
+    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    const param = {
+      groupCode: groupCode,
+      msgRandom: Number(data?.msgList[0].msgRandom),
+      msgSeq: Number(data?.msgList[0].msgSeq)
+    }
+    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
+    return session?.getGroupService().addGroupEssence(param)
   }
 
   async createGroupFileFolder(groupId: string, folderName: string) {
-    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }])
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }, null])
   }
 
   async deleteGroupFileFolder(groupId: string, folderId: string) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
   }
 
   async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
-    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
-    const data = await invoke<{ fileInfo: GroupFileInfo }>(
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
       'nodeIKernelRichMediaService/getGroupFileList',
-      [{
-        groupId,
-        fileListForm
-      }],
+      [
+        {
+          groupId,
+          fileListForm
+        },
+        null,
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
         afterFirstCmd: false,
         cmdCB: (payload, result) => payload.fileInfo.reqId === result
       }
     )
-    return data.fileInfo
+    return data.fileInfo.item
   }
 
   async publishGroupBulletin(groupCode: string, req: PublishGroupBulletinReq) {
     const ntUserApi = this.ctx.get('ntUserApi')!
     const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
-    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }])
+    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }, null])
   }
 
   async uploadGroupBulletinPic(groupCode: string, path: string) {
     const ntUserApi = this.ctx.get('ntUserApi')!
     const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
-    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }])
+    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }, null])
   }
 
   async getGroupRecommendContact(groupCode: string) {
-    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }])
+    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
-      }
-    }])
-  }
-
-  async getGroupHonorList(groupCode: string) {
-    // 还缺点东西
-    return await invoke('nodeIKernelGroupService/getGroupHonorList', [{
-      req: {
-        groupCode: [+groupCode]
-      }
-    }])
-  }
-
-  async getGroupAllInfo(groupCode: string) {
-    invoke('nodeIKernelGroupListener/onGroupAllInfoChange', [], {
-      registerEvent: true
-    })
-
-    return await invoke<{ groupAll: GroupAllInfo }>(
-      'nodeIKernelGroupService/getGroupAllInfo',
-      [{
-        groupCode,
-        source: 4
-      }],
-      {
-        cbCmd: 'nodeIKernelGroupListener/onGroupAllInfoChange',
-        afterFirstCmd: false,
-        cmdCB: payload => payload.groupAll.groupCode === groupCode
-      }
-    )
-  }
-
-  async getGroupBulletinList(groupCode: string) {
-    invoke('nodeIKernelGroupListener/onGetGroupBulletinListResult', [], {
-      registerEvent: true
-    })
-
-    const ntUserApi = this.ctx.get('ntUserApi')!
-    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
-    return await invoke<{
-      groupCode: string
-      context: string
-      result: GroupBulletinListResult
-    }>(
-      'nodeIKernelGroupService/getGroupBulletinList',
-      [{
-        groupCode,
-        psKey,
-        context: '',
-        req: {
-          startIndex: -1,
-          num: 20,
-          needInstructionsForJoinGroup: 1,
-          needPublisherInfo: 1
-        }
-      }],
-      {
-        cbCmd: 'nodeIKernelGroupListener/onGetGroupBulletinListResult',
-        cmdCB: payload => payload.groupCode === groupCode,
-        afterFirstCmd: false
-      }
-    )
-  }
-
-  async setGroupAvatar(groupCode: string, path: string) {
-    return await invoke('nodeIKernelGroupService/setHeader', [{ path, groupCode }])
-  }
-
-  async searchMember(groupCode: string, keyword: string) {
-    await invoke('nodeIKernelGroupListener/onSearchMemberChange', [], {
-      registerEvent: true
-    })
-    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
-      groupCode,
-      scene: 'groupMemberList_MainWindow'
-    }])
-    const data = await invoke<{
-      sceneId: string
-      keyword: string
-      infos: Map<string, GroupMember>
-    }>(
-      'nodeIKernelGroupService/searchMember',
-      [{ sceneId, keyword }],
-      {
-        cbCmd: 'nodeIKernelGroupListener/onSearchMemberChange',
-        cmdCB: payload => {
-          return payload.sceneId === sceneId && payload.keyword === keyword
-        },
-        afterFirstCmd: false
-      }
-    )
-    return data.infos
-  }
-
-  async getGroupFileCount(groupId: string) {
-    return await invoke(
-      'nodeIKernelRichMediaService/batchGetGroupFileCount',
-      [{ groupIds: [groupId] }]
-    )
-  }
-
-  async getGroupFileSpace(groupId: string) {
-    return await invoke(
-      'nodeIKernelRichMediaService/getGroupSpace',
-      [{ groupId }]
-    )
-  }
 }

src/ntqqapi/api/msg.ts

@@ -1,5 +1,7 @@
 import { invoke, NTMethod } from '../ntcall'
-import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
+import { GeneralCallResult } from '../services'
+import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
+import { getSession } from '@/ntqqapi/wrapper'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -9,6 +11,16 @@ 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']
 
@@ -16,81 +28,99 @@ export class NTQQMsgApi extends Service {
     super(ctx, 'ntMsgApi', true)
   }
 
-  async getTempChatInfo(chatType: ChatType, peerUid: string) {
-    return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }])
+  async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getTempChatInfo(chatType, peerUid)
+    } else {
+      return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }, null])
+    }
   }
 
-  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean) {
-    // nt_qq/global/nt_data/Emoji/emoji-resource/sysface_res/apng/ 下可以看到所有QQ表情预览
-    // nt_qq/global/nt_data/Emoji/emoji-resource/face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
+  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean = true) {
+    // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
+    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
     // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
+    const session = getSession()
     const emojiType = emojiId.length > 3 ? '2' : '1'
-    return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }])
+    if (session) {
+      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiType, setEmoji)
+    } else {
+      return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }, null])
+    }
   }
 
   async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
-    return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)
+    } else {
+      return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }, null])
+    }
   }
 
   async activateChat(peer: Peer) {
-    return await invoke(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }])
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 20 }, null])
   }
 
-  async activateChatAndGetHistory(peer: Peer, cnt: number) {
-    // 消息从旧到新
-    return await invoke(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt, msgId: '0', queryOrder: true }])
+  async activateChatAndGetHistory(peer: Peer) {
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt: 20 }, null])
   }
 
   async getAioFirstViewLatestMsgs(peer: Peer, cnt: number) {
-    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }])
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }, null])
   }
 
-  async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
+  async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
     if (!peer) throw new Error('peer is not allowed')
     if (!msgIds) throw new Error('msgIds is not allowed')
-    return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getMsgsByMsgId(peer, msgIds)
+    } else {
+      return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }, null])
+    }
   }
 
-  async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
-    // 默认情况下消息时间从新到旧
-    return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder }])
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, isReverseOrder: boolean = false) {
+    const session = getSession()
+    // 消息时间从旧到新
+    if (session) {
+      return session.getMsgService().getMsgsIncludeSelf(peer, msgId, cnt, isReverseOrder)
+    } else {
+      return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder: isReverseOrder }, null])
+    }
   }
 
   async recallMsg(peer: Peer, msgIds: string[]) {
-    return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().recallMsg(peer, msgIds)
+    } else {
+      return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }, null])
+    }
   }
 
   async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
-    const uniqueId = await this.generateMsgUniqueId(peer.chatType)
-    const msgAttributeInfos = new Map()
-    msgAttributeInfos.set(0, {
-      attrType: 0,
-      attrId: uniqueId,
-      vasMsgInfo: {
-        msgNamePlateInfo: {},
-        bubbleInfo: {},
-        avatarPendantInfo: {},
-        vasFont: {},
-        iceBreakInfo: {}
-      }
-    })
-
-    let sentMsgId: string
+    const msgId = generateMsgId()
+    peer.guildId = msgId
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/sendMsg',
-      [{
-        msgId: '0',
-        peer,
-        msgElements,
-        msgAttributeInfos
-      }],
+      [
+        {
+          msgId: '0',
+          peer,
+          msgElements,
+          msgAttributeInfos: new Map()
+        },
+        null
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.msgAttrs.get(0)?.attrId === uniqueId && msgRecord.sendStatus === 2) {
-              sentMsgId = msgRecord.msgId
+            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
               return true
             }
           }
@@ -99,38 +129,22 @@ export class NTQQMsgApi extends Service {
         timeout
       }
     )
-
-    return data.msgList.find(msgRecord => msgRecord.msgId === sentMsgId)
+    return data.msgList.find(msgRecord => msgRecord.guildId === msgId)
   }
 
   async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    const uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
-    destPeer.guildId = uniqueId
-    const data = await invoke<{ msgList: RawMessage[] }>(
-      'nodeIKernelMsgService/forwardMsgWithComment',
-      [{
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
+    } else {
+      return await invoke(NTMethod.FORWARD_MSG, [{
         msgIds,
         srcContact: srcPeer,
         dstContacts: [destPeer],
         commentElements: [],
         msgAttributeInfos: new Map(),
-      }],
-      {
-        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-        afterFirstCmd: false,
-        cmdCB: payload => {
-          for (const msgRecord of payload.msgList) {
-            if (msgRecord.guildId === uniqueId && msgRecord.sendStatus === 2) {
-              return true
-            }
-          }
-          return false
-        },
-        timeout: 3000
-      }
-    )
-    delete destPeer.guildId
-    return data.msgList.filter(msgRecord => msgRecord.guildId === uniqueId)
+      }, null])
+    }
   }
 
   async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
@@ -141,46 +155,66 @@ export class NTQQMsgApi extends Service {
     const selfUid = selfInfo.uid
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/multiForwardMsgWithComment',
-      [{
-        msgInfos,
-        srcContact: srcPeer,
-        dstContact: destPeer,
-        commentElements: [],
-        msgAttributeInfos: new Map(),
-      }],
+      [
+        {
+          msgInfos,
+          srcContact: srcPeer,
+          dstContact: destPeer,
+          commentElements: [],
+          msgAttributeInfos: new Map(),
+        },
+        null,
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (
-              msgRecord.msgType === 11 &&
-              msgRecord.subMsgType === 7 &&
-              msgRecord.peerUid === destPeer.peerUid &&
-              msgRecord.senderUid === selfUid
-            ) {
-              const element = msgRecord.elements[0]
-              const data = JSON.parse(element.arkElement!.bytesData)
-              if (data.app !== 'com.tencent.multimsg' || !data.meta.detail.resid) {
-                continue
-              }
+            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
               return true
             }
           }
           return false
-        }
+        },
       }
     )
-    return data.msgList.find(msgRecord => {
-      const { arkElement } = msgRecord.elements[0]
-      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
-        return true
+    for (const msg of data.msgList) {
+      const arkElement = msg.elements.find(ele => ele.arkElement)
+      if (!arkElement) {
+        continue
       }
-    })!
+      const forwardData = JSON.parse(arkElement.arkElement!.bytesData)
+      if (forwardData.app != 'com.tencent.multimsg') {
+        continue
+      }
+      if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfUid) {
+        return msg
+      }
+    }
+    throw new Error('转发消息超时')
+  }
+
+  async getMsgsBySeqAndCount(peer: Peer, msgSeq: string, count: number, desc: boolean, z: boolean) {
+    const session = getSession()
+    if (session) {
+      return await session.getMsgService().getMsgsBySeqAndCount(peer, msgSeq, count, desc, z)
+    } else {
+      return await invoke('nodeIKernelMsgService/getMsgsBySeqAndCount', [{
+        peer,
+        cnt: count,
+        msgSeq,
+        queryOrder: desc
+      }, null])
+    }
   }
 
   async getSingleMsg(peer: Peer, msgSeq: string) {
-    return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }])
+    const session = getSession()
+    if (session) {
+      return await session.getMsgService().getSingleMsg(peer, msgSeq)
+    } else {
+      return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }, null])
+    }
   }
 
   async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
@@ -198,10 +232,10 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }])
+    }, 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',
@@ -216,72 +250,10 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }])
+    }, null])
   }
 
   async setMsgRead(peer: Peer) {
-    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }])
-  }
-
-  async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number) {
-    return await invoke('nodeIKernelMsgService/getMsgEmojiLikesList', [{
-      peer,
-      msgSeq,
-      emojiId,
-      emojiType,
-      cnt: count
-    }])
-  }
-
-  async fetchFavEmojiList(count: number) {
-    return await invoke('nodeIKernelMsgService/fetchFavEmojiList', [{
-      resId: '',
-      count,
-      backwardFetch: true,
-      forceRefresh: true
-    }])
-  }
-
-  async generateMsgUniqueId(chatType: number) {
-    const time = await this.getServerTime()
-    const uniqueId = await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType, time }])
-    if (typeof uniqueId === 'string') {
-      return uniqueId
-    } else {
-      const random = Math.trunc(Math.random() * 100)
-      return `${Date.now()}${random}`
-    }
-  }
-
-  async queryMsgsById(chatType: ChatType, msgId: string) {
-    const msgTime = this.getMsgTimeFromId(msgId)
-    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
-      msgId,
-      msgTime: '0',
-      msgSeq: '0',
-      params: {
-        chatInfo: {
-          peerUid: '',
-          chatType
-        },
-        filterMsgToTime: msgTime,
-        filterMsgFromTime: msgTime,
-        isIncludeCurrent: true,
-        pageLimit: 1,
-      }
-    }])
-  }
-
-  getMsgTimeFromId(msgId: string) {
-    // 小概率相差1毫秒
-    return String(BigInt(msgId) >> 32n)
-  }
-
-  async getServerTime() {
-    return await invoke('nodeIKernelMSFService/getServerTime', [])
-  }
-
-  async fetchUnitedCommendConfig(groups: string[]) {
-    return await invoke('nodeIKernelUnitedConfigService/fetchUnitedCommendConfig', [{ groups }])
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
   }
 }

src/ntqqapi/api/user.ts

@@ -1,8 +1,10 @@
-import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfo, UserDetailSource, ProfileBizType, SimpleInfo } from '../types'
-import { invoke, NTClass } from '../ntcall'
+import { invoke } from '../ntcall'
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
 import { getBuildVersion } from '@/common/utils'
+import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { isNullable, pick, Time } from 'cosmokit'
+import { UserDetailSource, ProfileBizType } from '../services'
+import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -19,25 +21,31 @@ export class NTQQUserApi extends Service {
     super(ctx, 'ntUserApi', true)
   }
 
-  async setSelfAvatar(path: string) {
+  async setQQAvatar(path: string) {
     return await invoke(
       'nodeIKernelProfileService/setHeader',
-      [{ path }],
+      [
+        { path },
+        null,
+      ],
       {
-        timeout: 10 * Time.second // 10秒不一定够
+        timeout: 10 * Time.second, // 10秒不一定够
       }
     )
   }
 
   async fetchUserDetailInfo(uid: string) {
-    const result = await invoke<{ info: UserDetailInfo }>(
+    const result = await invoke<{ info: UserDetailInfoListenerArg }>(
       'nodeIKernelProfileService/fetchUserDetailInfo',
-      [{
-        callFrom: 'BuddyProfileStore',
-        uid: [uid],
-        source: UserDetailSource.KSERVER,
-        bizList: [ProfileBizType.KALL]
-      }],
+      [
+        {
+          callFrom: 'BuddyProfileStore',
+          uid: [uid],
+          source: UserDetailSource.KSERVER,
+          bizList: [ProfileBizType.KALL]
+        },
+        null
+      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
         afterFirstCmd: false,
@@ -63,10 +71,13 @@ export class NTQQUserApi extends Service {
     }
     const result = await invoke<{ info: User }>(
       'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-      [{
-        uid,
-        bizList: [0]
-      }],
+      [
+        {
+          uid,
+          bizList: [0]
+        },
+        null,
+      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
         afterFirstCmd: false,
@@ -88,77 +99,121 @@ export class NTQQUserApi extends Service {
   }
 
   async getPSkey(domains: string[]) {
-    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }])
+    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) {
-    return await invoke(
-      'nodeIKernelProfileLikeService/setBuddyProfileLike',
-      [{
-        doLikeUserInfo: {
-          friendUid: uid,
-          sourceId: 71,
-          doLikeCount: count,
-          doLikeTollCount: 0
-        }
-      }]
-    )
+    const session = getSession()
+    if (session) {
+      return session.getProfileLikeService().setBuddyProfileLike({
+        friendUid: uid,
+        sourceId: 71,
+        doLikeCount: count,
+        doLikeTollCount: 0
+      })
+    } else {
+      return await invoke(
+        'nodeIKernelProfileLikeService/setBuddyProfileLike',
+        [
+          {
+            doLikeUserInfo: {
+              friendUid: uid,
+              sourceId: 71,
+              doLikeCount: count,
+              doLikeTollCount: 0
+            }
+          },
+          null,
+        ],
+      )
+    }
   }
 
-  async getUidByUinV1(uin: string, groupCode?: string) {
-    let uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
+  async getUidByUinV1(uin: string) {
+    const session = getSession()
+    // 通用转换开始尝试
+    let uid = (await session?.getUixConvertService().getUid([uin]))?.uidInfo.get(uin)
     if (!uid) {
-      const friends = await this.ctx.ntFriendApi.getFriends()
-      uid = friends.find(item => item.uin === uin)?.uid
-    }
-    if (!uid && groupCode) {
-      let member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
-      if (member.size === 0) {
-        await this.ctx.ntGroupApi.getGroupMembers(groupCode, 1)
-        await this.ctx.sleep(30)
-        member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
+      for (const membersList of this.ctx.ntGroupApi.groupMembers.values()) { //从群友列表转
+        for (const member of membersList.values()) {
+          if (member.uin === uin) {
+            uid = member.uid
+            break
+          }
+        }
+        if (uid) break
       }
-      uid = Array.from(member.values()).find(e => e.uin === uin)?.uid
     }
     if (!uid) {
-      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid
-      if (!unveifyUid.includes('*')) {
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid //特殊转换
+      if (unveifyUid.indexOf('*') === -1) {
         uid = unveifyUid
       }
     }
+    if (!uid) {
+      const friends = await this.ctx.ntFriendApi.getFriends() //从好友列表转
+      uid = friends.find(item => item.uin === uin)?.uid
+    }
     return uid
   }
 
   async getUidByUinV2(uin: string) {
-    let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uinList: [uin] }])).uids.get(uin)
-    if (uid) return uid
-    uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
-    if (uid) return uid
-    uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-    if (uid) return uid
-    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid
-    //if (!unveifyUid.includes('*')) return unveifyUid
-    return unveifyUid
+    const session = getSession()
+    if (session) {
+      let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
+      if (uid) return uid
+      uid = (await session.getProfileService().getUidByUin('FriendsServiceImpl', [uin])).get(uin)
+      if (uid) return uid
+      uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
+      if (uid) return uid
+    } else {
+      let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [uin] }])).uids.get(uin)
+      if (uid) return uid
+      uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
+      if (uid) return uid
+      uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
+      if (uid) return uid
+    }
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
+    if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  async getUidByUin(uin: string, groupCode?: string) {
+  async getUidByUin(uin: string) {
     if (getBuildVersion() >= 26702) {
       return this.getUidByUinV2(uin)
     }
-    return this.getUidByUinV1(uin, groupCode)
+    return this.getUidByUinV1(uin)
   }
 
   async getUserDetailInfoByUinV2(uin: string) {
     return await invoke<UserDetailInfoByUinV2>(
       'nodeIKernelProfileService/getUserDetailInfoByUin',
-      [{ uin }]
+      [
+        { uin },
+        null,
+      ],
     )
   }
 
   async getUserDetailInfoByUin(uin: string) {
     return await invoke<UserDetailInfoByUin>(
       'nodeIKernelProfileService/getUserDetailInfoByUin',
-      [{ uin }]
+      [
+        { uin },
+        null,
+      ],
     )
   }
 
@@ -166,21 +221,31 @@ export class NTQQUserApi extends Service {
     const ret = await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])
     let uin = ret.uinInfo.get(uid)
     if (!uin) {
-      uin = (await this.getUserDetailInfo(uid)).uin
+      uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
     }
     return uin
   }
 
   async getUinByUidV2(uid: string) {
-    let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uidList: [uid] }])).uins.get(uid)
-    if (uin && uin !== '0') return uin
-    uin = (await invoke('nodeIKernelProfileService/getUinByUid', [{ callFrom: 'FriendsServiceImpl', uid: [uid] }])).get(uid)
+    const session = getSession()
+    if (session) {
+      let uin = (await session.getGroupService().getUinByUids([uid])).uins.get(uid)
+      if (uin) return uin
+      uin = (await session.getProfileService().getUinByUid('FriendsServiceImpl', [uid])).get(uid)
+      if (uin) return uin
+      uin = (await session.getUixConvertService().getUin([uid])).uinInfo.get(uid)
+      if (uin) return uin
+    } else {
+      let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uid: [uid] }])).uins.get(uid)
+      if (uin) return uin
+      uin = (await invoke('nodeIKernelProfileService/getUinByUid', [{ callFrom: 'FriendsServiceImpl', uid: [uid] }])).get(uid)
+      if (uin) return uin
+      uin = (await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])).uinInfo.get(uid)
+      if (uin) return uin
+    }
+    let uin = (await this.ctx.ntFriendApi.getBuddyIdMap(true)).get(uid)
     if (uin) return uin
-    uin = (await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])).uinInfo.get(uid)
-    if (uin) return uin
-    uin = (await this.ctx.ntFriendApi.getBuddyIdMap()).get(uid)
-    if (uin) return uin
-    uin = (await this.getUserDetailInfo(uid)).uin
+    uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
     return uin
   }
 
@@ -192,13 +257,21 @@ export class NTQQUserApi extends Service {
   }
 
   async forceFetchClientKey() {
-    return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }])
+    const session = getSession()
+    if (session) {
+      return await session.getTicketService().forceFetchClientKey('')
+    } else {
+      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
+    }
   }
 
-  async getSelfNick(refresh = true) {
+  async getSelfNick(refresh = false) {
     if ((refresh || !selfInfo.nick) && selfInfo.uid) {
-      const data = await this.getUserSimpleInfo(selfInfo.uid)
-      selfInfo.nick = data.nick
+      const userInfo = await this.getUserDetailInfo(selfInfo.uid)
+      if (userInfo) {
+        Object.assign(selfInfo, { nick: userInfo.nick })
+        return userInfo.nick
+      }
     }
     return selfInfo.nick
   }
@@ -210,7 +283,7 @@ export class NTQQUserApi extends Service {
         extStatus,
         batteryStatus,
       }
-    }])
+    }, null])
   }
 
   async getProfileLike(uid: string) {
@@ -225,77 +298,6 @@ export class NTQQUserApi extends Service {
         start: 0,
         limit: 20,
       }
-    }])
-  }
-
-  async getUserSimpleInfoV2(uid: string, force = true) {
-    const data = await invoke<{ profiles: Record<string, SimpleInfo> }>(
-      'nodeIKernelProfileService/getUserSimpleInfo',
-      [{
-        uids: [uid],
-        force
-      }],
-      {
-        cbCmd: 'onProfileSimpleChanged',
-        afterFirstCmd: false,
-        cmdCB: payload => !isNullable(payload.profiles[uid]),
-      }
-    )
-    return data.profiles[uid].coreInfo
-  }
-
-  async getUserSimpleInfo(uid: string, force = true) {
-    if (getBuildVersion() >= 26702) {
-      return this.getUserSimpleInfoV2(uid, force)
-    }
-    const data = await invoke<{ profiles: Map<string, User> }>(
-      'nodeIKernelProfileService/getUserSimpleInfo',
-      [{
-        uids: [uid],
-        force
-      }],
-      {
-        cbCmd: 'nodeIKernelProfileListener/onProfileSimpleChanged',
-        afterFirstCmd: false,
-        cmdCB: payload => payload.profiles.has(uid),
-      }
-    )
-    const profile = data.profiles.get(uid)!
-    return pick(profile, ['nick', 'remark', 'uid', 'uin'])
-  }
-
-  async getCoreAndBaseInfo(uids: string[]) {
-    return await invoke(
-      'nodeIKernelProfileService/getCoreAndBaseInfo',
-      [{
-        uids,
-        callFrom: 'nodeStore'
-      }]
-    )
-  }
-
-  async getRobotUinRange() {
-    const data = await invoke(
-      'nodeIKernelRobotService/getRobotUinRange',
-      [{
-        req: {
-          justFetchMsgConfig: '1',
-          type: 1,
-          version: 0,
-          aioKeywordVersion: 0
-        }
-      }]
-    )
-    return data.response.robotUinRanges
-  }
-
-  async quitAccount() {
-    return await invoke(
-      'quitAccount',
-      [],
-      {
-        className: NTClass.BUSINESS_API,
-      }
-    )
+    }, null])
   }
 }

src/ntqqapi/api/webapi.ts

@@ -17,6 +17,88 @@ 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']
 
@@ -24,6 +106,47 @@ 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
@@ -34,9 +157,10 @@ export class NTQQWebApi extends Service {
     return (hash & 0x7FFFFFFF).toString()
   }
 
-  async getGroupHonorInfo(groupCode: string, getType: string) {
-    const getDataInternal = async (groupCode: string, type: number) => {
-      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type
+  //实现未缓存 考虑2h缓存
+  async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+    const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
+      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 })
@@ -44,7 +168,7 @@ export class NTQQWebApi extends Service {
         if (match) {
           resJson = JSON.parse(match[1].trim())
         }
-        if (type === 1) {
+        if (Internal_type === 1) {
           return resJson?.talkativeList
         } else {
           return resJson?.actorList
@@ -150,6 +274,34 @@ 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

@@ -35,7 +35,7 @@ export class NTQQWindowApi extends Service {
     super(ctx, 'ntWindowApi', true)
   }
 
-  /** 打开窗口并获取对应的下发事件 */
+  // 打开窗口并获取对应的下发事件
   async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
     args: unknown[],
@@ -53,6 +53,7 @@ export class NTQQWindowApi extends Service {
     )
     setTimeout(() => {
       for (const w of BrowserWindow.getAllWindows()) {
+        // log("close window", w.webContents.getURL())
         if (w.webContents.getURL().indexOf(ntQQWindow.windowUrlHash) != -1) {
           w.close()
         }

src/ntqqapi/core.ts

@@ -1,7 +1,9 @@
-import { unlink } from 'node:fs/promises'
+import fs from 'node:fs'
 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'
 import { NTMethod } from './ntcall'
 import {
@@ -12,69 +14,70 @@ import {
   GroupMember,
   CategoryFriend,
   SimpleInfo,
-  ChatType,
-  BuddyReqType,
-  GrayTipElementSubType
+  User,
+  ChatType
 } from './types'
 import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
 import { invoke } from './ntcall'
-import { Native } from './native/index'
 
 declare module 'cordis' {
   interface Context {
     app: Core
   }
   interface Events {
-    'nt/message-created': (input: RawMessage) => void
+    'nt/message-created': (input: RawMessage[]) => void
     'nt/message-deleted': (input: RawMessage) => void
     'nt/message-sent': (input: RawMessage) => void
-    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
-    'nt/friend-request': (input: FriendRequest) => 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
   }
 }
 
 class Core extends Service {
-  static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi', 'store']
-  public startTime = 0
-  public native
+  static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi']
 
   constructor(protected ctx: Context, public config: Core.Config) {
     super(ctx, 'app', true)
-    this.native = new Native(ctx)
   }
 
   public start() {
-    this.startTime = Date.now()
+    llonebotError.otherError = ''
+    MessageUnique.init(selfInfo.uin)
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
-    this.ctx.on('llob/config-updated', input => {
+    this.ctx.on('llonebot/config-updated', input => {
       Object.assign(this.config, input)
     })
   }
 
   private registerListener() {
     registerReceiveHook<{
-      data?: CategoryFriend[]
-      userSimpleInfos?: Map<string, SimpleInfo> //V2
-      buddyCategory?: CategoryFriend[] //V2
+      data: CategoryFriend[]
     }>(ReceiveCmdS.FRIENDS, (payload) => {
-      let uids: string[] = []
-      if (payload.buddyCategory) {
-        uids = payload.buddyCategory.flatMap(item => item.buddyUids)
-      } else if (payload.data) {
-        uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
+      type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
+      let friendList: User[] = []
+      if ('userSimpleInfos' in payload) {
+        friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
+          return {
+            ...v.coreInfo,
+          }
+        })
+      } else {
+        for (const fData of payload.data) {
+          friendList.push(...fData.buddyList)
+        }
       }
-      for (const uid of uids) {
-        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.C2C })
+      this.ctx.logger.info('好友列表变动', friendList.length)
+      for (const friend of friendList) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend })
       }
-      this.ctx.logger.info('好友列表变动', uids.length)
     })
 
     // 自动清理新消息文件
-    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
       if (!this.config.autoDeleteFile) {
         return
       }
@@ -93,7 +96,9 @@ class Core extends Service {
             }
             for (const path of pathList) {
               if (path) {
-                unlink(path).then(() => this.ctx.logger.info('删除文件成功', path))
+                fs.unlink(path, () => {
+                  this.ctx.logger.info('删除文件成功', path)
+                })
               }
             }
           }, this.config.autoDeleteFileSecond! * 1000)
@@ -121,19 +126,17 @@ class Core extends Service {
           if (activatedPeerUids.includes(contact.id)) continue
           activatedPeerUids.push(contact.id)
           const peer = { peerUid: contact.id, chatType: contact.chatType }
-          if (contact.chatType === ChatType.TempC2CFromGroup) {
-            this.ctx.ntMsgApi.activateChatAndGetHistory(peer, 2).then(res => {
-              for (const msg of res.msgList) {
-                if (Date.now() / 1000 - Number(msg.msgTime) > 3) {
-                  continue
+          if (contact.chatType === ChatType.temp) {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
+              this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+                const lastTempMsg = msgList.at(-1)
+                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
+                  this.ctx.parallel('nt/message-created', [lastTempMsg!])
                 }
-                if (msg.senderUin && msg.senderUin !== '0') {
-                  this.ctx.store.addMsgCache(msg)
-                }
-                this.ctx.parallel('nt/message-created', msg)
-              }
+              })
             })
-          } else {
+          }
+          else {
             this.ctx.ntMsgApi.activateChat(peer)
           }
         }
@@ -143,12 +146,12 @@ class Core extends Service {
     registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
       const peerUid = payload[0] as string
       this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
-      let chatType = ChatType.C2C
+      let chatType = ChatType.friend
       if (isNumeric(peerUid)) {
-        chatType = ChatType.Group
+        chatType = ChatType.group
       }
       else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
-        chatType = ChatType.TempC2CFromGroup
+        chatType = ChatType.temp
       }
       const peer = { peerUid, chatType }
       await this.ctx.sleep(1000)
@@ -168,17 +171,7 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
-      const startTime = this.startTime / 1000
-      for (const message of payload.msgList) {
-        // 过滤启动之前的消息
-        if (parseInt(message.msgTime) < startTime) {
-          continue
-        }
-        if (message.senderUin && message.senderUin !== '0') {
-          this.ctx.store.addMsgCache(message)
-        }
-        this.ctx.parallel('nt/message-created', message)
-      }
+      this.ctx.parallel('nt/message-created', payload.msgList)
     })
 
     const sentMsgIds = new Map<string, boolean>()
@@ -186,30 +179,24 @@ class Core extends Service {
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
       for (const msg of payload.msgList) {
-        if (
-          msg.recallTime !== '0' &&
-          msg.msgType === 5 &&
-          msg.subMsgType === 4 &&
-          msg.elements[0]?.grayTipElement?.subElementType === GrayTipElementSubType.Revoke &&
-          !recallMsgIds.includes(msg.msgId)
-        ) {
-          recallMsgIds.shift()
+        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
           recallMsgIds.push(msg.msgId)
           this.ctx.parallel('nt/message-deleted', msg)
         } else if (sentMsgIds.get(msg.msgId)) {
-          if (msg.sendStatus === 2) {
-            sentMsgIds.delete(msg.msgId)
-            this.ctx.parallel('nt/message-sent', msg)
-          }
+          sentMsgIds.delete(msg.msgId)
+          this.ctx.parallel('nt/message-sent', msg)
         }
       }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
+      if (!this.config.reportSelfMessage) {
+        return
+      }
       sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
-    const groupNotifyIgnore: string[] = []
+    const groupNotifyFlags: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -218,34 +205,27 @@ class Core extends Service {
       if (payload.unreadCount) {
         let notifies: GroupNotify[]
         try {
-          notifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(payload.doubt, payload.unreadCount)
+          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
         } catch (e) {
           return
         }
-        for (const notify of notifies) {
-          const notifyTime = Math.trunc(+notify.seq / 1000)
-          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
-            continue
+        const list = notifies.filter(v => {
+          const flag = v.group.groupCode + '|' + v.seq + '|' + v.type
+          if (groupNotifyFlags.includes(flag)) {
+            return false
           }
-          groupNotifyIgnore.push(notify.seq)
-          this.ctx.parallel('nt/group-notify', { notify, doubt: payload.doubt })
-        }
+          groupNotifyFlags.push(flag)
+          return true
+        })
+        this.ctx.parallel('nt/group-notify', list)
       }
     })
 
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
-      for (const req of payload.data.buddyReqs) {
-        if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.MeInitiatorWaitPeerConfirm)) {
-          continue
-        }
-        if (+req.reqTime < this.startTime / 1000) {
-          continue
-        }
-        this.ctx.parallel('nt/friend-request', req)
-      }
+      this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
     })
 
-    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { registerEvent: true })
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
 
     registerReceiveHook<{
       msgBuf: number[]

src/ntqqapi/entities.ts

@@ -1,6 +1,5 @@
 import ffmpeg from 'fluent-ffmpeg'
 import faceConfig from './helper/face_config.json'
-import pathLib from 'node:path'
 import {
   AtType,
   ElementType,
@@ -16,21 +15,23 @@ import {
   SendTextElement,
   SendVideoElement,
 } from './types'
-import { stat, writeFile, copyFile, unlink, access } from 'node:fs/promises'
-import { calculateFileMD5 } from '../common/utils/file'
+import { stat, writeFile, copyFile, unlink } from 'node:fs/promises'
+import { calculateFileMD5, isGIF } from '../common/utils/file'
 import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
 import { encodeSilk } from '../common/utils/audio'
 import { Context } from 'cordis'
 import { isNullable } from 'cosmokit'
 
-export namespace SendElement {
+//export const mFaceCache = new Map<string, string>() // emojiId -> faceName
+
+export namespace SendElementEntities {
   export function text(content: string): SendTextElement {
     return {
-      elementType: ElementType.Text,
+      elementType: ElementType.TEXT,
       elementId: '',
       textElement: {
         content,
-        atType: AtType.Unknown,
+        atType: AtType.notAt,
         atUid: '',
         atTinyId: '',
         atNtUid: '',
@@ -40,7 +41,7 @@ export namespace SendElement {
 
   export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
     return {
-      elementType: ElementType.Text,
+      elementType: ElementType.TEXT,
       elementId: '',
       textElement: {
         content: display,
@@ -52,23 +53,27 @@ export namespace SendElement {
     }
   }
 
-  export function reply(msgSeq: string, msgId: string, senderUin: string): SendReplyElement {
+  export function reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
     return {
-      elementType: ElementType.Reply,
+      elementType: ElementType.REPLY,
       elementId: '',
       replyElement: {
-        replayMsgSeq: msgSeq,
-        replayMsgId: msgId,
+        replayMsgSeq: msgSeq, // raw.msgSeq
+        replayMsgId: msgId, // raw.msgId
         senderUin: senderUin,
-        senderUinStr: senderUin,
+        senderUinStr: senderUinStr,
       },
     }
   }
 
-  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)
+  export async function pic(ctx: Context, picPath: string, summary: string = '', subType: 0 | 1 = 0): 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 = {
@@ -79,17 +84,16 @@ export namespace SendElement {
       fileName: fileName,
       sourcePath: path,
       original: true,
-      picType: imageSize.type === 'gif' ? PicType.GIF : PicType.JPEG,
+      picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
       picSubType: subType,
       fileUuid: '',
       fileSubId: '',
       thumbFileSize: 0,
       summary,
-      isFlashPic,
     }
     ctx.logger.info('图片信息', picElement)
     return {
-      elementType: ElementType.Pic,
+      elementType: ElementType.PIC,
       elementId: '',
       picElement,
     }
@@ -102,7 +106,7 @@ export namespace SendElement {
       throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
-      elementType: ElementType.File,
+      elementType: ElementType.FILE,
       elementId: '',
       fileElement: {
         fileName,
@@ -115,17 +119,26 @@ export namespace SendElement {
   }
 
   export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
-    await access(filePath)
-    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.Video)
+    try {
+      await stat(filePath)
+    } catch (e) {
+      throw `文件${filePath}异常，不存在`
+    }
+    ctx.logger.info('复制视频到QQ目录', filePath)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
 
+    ctx.logger.info('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
-      throw new Error('文件异常，大小为 0')
+      throw '文件异常，大小为0'
     }
-    const maxMB = 100
+    const maxMB = 100;
     if (fileSize > 1024 * 1024 * maxMB) {
-      throw new Error(`视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`)
+      throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
     }
-    const thumbDir = pathLib.dirname(path.replaceAll('\\', '/').replace(`/Ori/`, `/Thumb/`))
+    const pathLib = require('path')
+    let thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
+    thumbDir = pathLib.dirname(thumbDir)
+    // log("thumb 目录", thumb)
     let videoInfo = {
       width: 1920,
       height: 1080,
@@ -186,10 +199,11 @@ export namespace SendElement {
     const _thumbPath = await createThumb
     ctx.logger.info('生成视频缩略图', _thumbPath)
     const thumbSize = (await stat(_thumbPath)).size
+    // log("生成缩略图", _thumbPath)
     thumbPath.set(0, _thumbPath)
     const thumbMd5 = await calculateFileMD5(_thumbPath)
     const element: SendVideoElement = {
-      elementType: ElementType.Video,
+      elementType: ElementType.VIDEO,
       elementId: '',
       videoElement: {
         fileName: fileName || _fileName,
@@ -201,7 +215,17 @@ export namespace SendElement {
         thumbSize,
         thumbWidth: videoInfo.width,
         thumbHeight: videoInfo.height,
-        fileSize: String(fileSize),
+        fileSize: '' + fileSize,
+        // fileUuid: "",
+        // transferStatus: 0,
+        // progress: 0,
+        // invalidState: 0,
+        // fileSubId: "",
+        // fileBizId: null,
+        // originVideoMd5: "",
+        // fileFormat: 2,
+        // import_rich_media_context: null,
+        // sourceVideoCodecFormat: 2
       },
     }
     ctx.logger.info('videoElement', element)
@@ -210,21 +234,26 @@ export namespace SendElement {
 
   export async function ptt(ctx: Context, pttPath: string): Promise<SendPttElement> {
     const { converted, path: silkPath, duration } = await encodeSilk(ctx, pttPath)
-    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.Ptt)
+    if (!silkPath) {
+      throw '语音转换失败, 请检查语音文件是否正常'
+    }
+    // log("生成语音", silkPath, duration);
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.PTT)
     if (fileSize === 0) {
-      throw new Error('文件异常，大小为 0')
+      throw '文件异常，大小为0'
     }
     if (converted) {
       unlink(silkPath)
     }
     return {
-      elementType: ElementType.Ptt,
+      elementType: ElementType.PTT,
       elementId: '',
       pttElement: {
         fileName: fileName,
         filePath: path,
         md5HexStr: md5,
-        fileSize: String(fileSize),
+        fileSize: fileSize,
+        // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
         duration: duration,
         formatType: 1,
         voiceType: 1,
@@ -238,22 +267,22 @@ export namespace SendElement {
     }
   }
 
-  export function face(faceId: number, faceType?: number): SendFaceElement {
+  export function face(faceId: number): SendFaceElement {
     // 从face_config.json中获取表情名称
     const sysFaces = faceConfig.sysface
-    const face = sysFaces.find(face => face.QSid === String(faceId))
-    if (!faceType) {
-      if (faceId < 222) {
-        faceType = 1
-      } else {
-        faceType = 2
-      }
-      if (face?.AniStickerType) {
-        faceType = 3
-      }
+    const emojiFaces = faceConfig.emoji
+    const face = sysFaces.find((face) => face.QSid === faceId.toString())
+    faceId = parseInt(faceId.toString())
+    // let faceType = parseInt(faceId.toString().substring(0, 1));
+    let faceType = 1
+    if (faceId >= 222) {
+      faceType = 2
+    }
+    if (face?.AniStickerType) {
+      faceType = 3;
     }
     return {
-      elementType: ElementType.Face,
+      elementType: ElementType.FACE,
       elementId: '',
       faceElement: {
         faceIndex: faceId,
@@ -269,8 +298,7 @@ export namespace SendElement {
 
   export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
     return {
-      elementType: ElementType.MarketFace,
-      elementId: '',
+      elementType: ElementType.MFACE,
       marketFaceElement: {
         imageWidth: 300,
         imageHeight: 300,
@@ -287,10 +315,10 @@ export namespace SendElement {
     // 随机1到6
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
     return {
-      elementType: ElementType.Face,
+      elementType: ElementType.FACE,
       elementId: '',
       faceElement: {
-        faceIndex: FaceIndex.Dice,
+        faceIndex: FaceIndex.dice,
         faceType: 3,
         faceText: '[骰子]',
         packId: '1',
@@ -309,7 +337,7 @@ export namespace SendElement {
     // 实际测试并不能控制结果
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
     return {
-      elementType: ElementType.Face,
+      elementType: ElementType.FACE,
       elementId: '',
       faceElement: {
         faceIndex: FaceIndex.RPS,
@@ -328,7 +356,7 @@ export namespace SendElement {
 
   export function ark(data: string): SendArkElement {
     return {
-      elementType: ElementType.Ark,
+      elementType: ElementType.ARK,
       elementId: '',
       arkElement: {
         bytesData: data,
@@ -337,16 +365,4 @@ export namespace SendElement {
       },
     }
   }
-
-  export function shake(): SendFaceElement {
-    return {
-      elementType: ElementType.Face,
-      elementId: '',
-      faceElement: {
-        faceIndex: 1,
-        faceType: 5,
-        pokeType: 1,
-      },
-    }
-  }
 }

src/ntqqapi/helper/face_config.json

@@ -1,15 +1,5 @@
 {
   "sysface": [
-    {
-      "QSid": "419",
-      "QDes": "/火车",
-      "IQLid": "419",
-      "AQLid": "419",
-      "EMCode": "10419",
-      "AniStickerType": 3,
-      "AniStickerPackId": "1",
-      "AniStickerId": "47"
-    },
     {
       "QSid": "392",
       "QDes": "/龙年快乐",
@@ -3672,4 +3662,4 @@
       "EMCode": "401016"
     }
   ]
-}
+}

src/ntqqapi/helper/rkey.ts

@@ -31,18 +31,30 @@ export class RkeyManager {
 
   isExpired(): boolean {
     const now = new Date().getTime() / 1000
+    // console.log(`now: ${now}, expired_time: ${this.rkeyData.expired_time}`)
     return now > this.rkeyData.expired_time
   }
 
   async refreshRkey() {
+    //刷新rkey
     this.rkeyData = await this.fetchServerRkey()
   }
 
-  async fetchServerRkey(): Promise<ServerRkeyData> {
-    const response = await fetch(this.serverUrl)
-    if (!response.ok) {
-      throw new Error(response.statusText)
-    }
-    return response.json()
+  async fetchServerRkey() {
+    return new Promise<ServerRkeyData>((resolve, reject) => {
+      fetch(this.serverUrl)
+        .then(response => {
+          if (!response.ok) {
+            return reject(response.statusText) // 请求失败，返回错误信息
+          }
+          return response.json() // 解析 JSON 格式的响应体
+        })
+        .then(data => {
+          resolve(data)
+        })
+        .catch(error => {
+          reject(error)
+        })
+    })
   }
 }

src/ntqqapi/hook.ts

@@ -1,7 +1,8 @@
-import { NTMethod } from './ntcall'
+import type { BrowserWindow } from 'electron'
+import { NTClass, NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
-import { ipcMain } from 'electron'
+import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
@@ -25,80 +26,121 @@ export enum ReceiveCmdS {
   SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
   CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
   MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  SKEY_UPDATE = 'onSkeyUpdate',
 }
 
+type NTReturnData = [
+  {
+    type: 'request'
+    eventName: NTClass
+    callbackId?: string
+  },
+  {
+    cmdName: ReceiveCmdS
+    cmdType: 'event'
+    payload: unknown
+  }[]
+]
+
 const logHook = false
 
-const receiveHooks: Map<string, {
+const receiveHooks: Array<{
   method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
-}> = new Map()
+  id: string
+}> = []
 
 const callHooks: Array<{
   method: NTMethod[]
   hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
-export function startHook() {
-  const senderExclude = Symbol()
-
-  ipcMain.emit = new Proxy(ipcMain.emit, {
-    apply(target, thisArg, args: [eventName: string, ...args: any]) {
-      if (args[2]?.eventName.startsWith('ns-LoggerApi')) {
-        return target.apply(thisArg, args)
-      }
-      if (logHook) {
-        log('request', args)
-      }
-
-      const event = args[1]
-      if (event.sender && !event.sender[senderExclude]) {
-        event.sender[senderExclude] = true
-        event.sender.send = new Proxy(event.sender.send, {
-          apply(target, thisArg, args: any[]) {
-            if (args[1].eventName?.startsWith('ns-LoggerApi')) {
-              return target.apply(thisArg, args)
-            }
-            if (logHook) {
-              log('received', args)
-            }
-
-            const callbackId = args[1].callbackId
-            if (callbackId) {
-              if (hookApiCallbacks[callbackId]) {
-                Promise.resolve(hookApiCallbacks[callbackId](args[2]))
-                delete hookApiCallbacks[callbackId]
-              }
-            } else if (args[2]) {
-              if (['IPC_DOWN_2', 'IPC_DOWN_3'].includes(args[0])) {
-                for (const receiveData of args[2]) {
-                  for (const hook of receiveHooks.values()) {
-                    if (hook.method.includes(receiveData.cmdName)) {
-                      Promise.resolve(hook.hookFunc(receiveData.payload))
-                    }
-                  }
-                }
+export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
+  window.webContents.send = new Proxy(window.webContents.send, {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
+      try {
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+          log('received ntqq api message', args)
+        }
+      } catch { }
+      if (!onlyLog) {
+        if (args[2] instanceof Array) {
+          for (const receiveData of args[2]) {
+            const ntMethodName = receiveData.cmdName
+            for (const hook of receiveHooks) {
+              if (hook.method.includes(ntMethodName)) {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
               }
             }
-            return target.apply(thisArg, args)
           }
-        })
-      }
-
-      if (args[3]?.length) {
-        const method = args[3][0]
-        const callParams = args[3].slice(1)
-        for (const hook of callHooks) {
-          if (hook.method.includes(method)) {
-            Promise.resolve(hook.hookFunc(callParams))
+        }
+        if (args[1]?.callbackId) {
+          const callbackId = args[1].callbackId
+          if (hookApiCallbacks[callbackId]) {
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
+            delete hookApiCallbacks[callbackId]
           }
         }
       }
       return target.apply(thisArg, args)
-    }
+    },
   })
 }
 
+export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
+  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) {
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
+      if (!isLogger) {
+        try {
+          logHook && log('call NTQQ api', thisArg, args)
+        } catch (e) { }
+        if (!onlyLog) {
+          try {
+            const _args: unknown[] = args[3][1]
+            const cmdName = _args[0] as NTMethod
+            const callParams = _args.slice(1)
+            callHooks.forEach((hook) => {
+              if (hook.method.includes(cmdName)) {
+                Promise.resolve(hook.hookFunc(callParams))
+              }
+            })
+          } catch { }
+        }
+      }
+      return target.apply(thisArg, args)
+    },
+  })
+  if (webContents._events['-ipc-message']?.[0]) {
+    webContents._events['-ipc-message'][0] = proxyIpcMsg
+  } else {
+    webContents._events['-ipc-message'] = proxyIpcMsg
+  }
+
+  /*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)
+      args[0]['_replyChannel']['sendReply'] = new Proxy(args[0]['_replyChannel']['sendReply'], {
+        apply(sendtarget, sendthisArg, sendargs) {
+          sendtarget.apply(sendthisArg, sendargs)
+        },
+      })
+      const ret = target.apply(thisArg, args)
+      //HOOK_LOG && log('call NTQQ invoke api return', ret)
+      return ret
+    },
+  })
+  if (webContents._events['-ipc-invoke']?.[0]) {
+    webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
+  } else {
+    webContents._events['-ipc-invoke'] = proxyIpcInvoke
+  }*/
+}
+
 export function registerReceiveHook<PayloadType>(
   method: string | string[],
   hookFunc: (payload: PayloadType) => void,
@@ -107,9 +149,10 @@ export function registerReceiveHook<PayloadType>(
   if (!Array.isArray(method)) {
     method = [method]
   }
-  receiveHooks.set(id, {
+  receiveHooks.push({
     method: method as ReceiveCmdS[],
     hookFunc,
+    id,
   })
   return id
 }
@@ -128,5 +171,6 @@ export function registerCallHook(
 }
 
 export function removeReceiveHook(id: string) {
-  receiveHooks.delete(id)
+  const index = receiveHooks.findIndex((h) => h.id === id)
+  receiveHooks.splice(index, 1)
 }

src/ntqqapi/listeners/NodeIKernelGroupListener.ts

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,268 @@
+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

@@ -0,0 +1,15 @@
+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

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

src/ntqqapi/native/index.ts

@@ -1,99 +0,0 @@
-import { Context } from 'cordis'
-import { Dict } from 'cosmokit'
-import { getBuildVersion } from '@/common/utils/misc'
-import { TEMP_DIR } from '@/common/globalVars'
-import { copyFile } from 'fs/promises'
-import { ChatType, Peer } from '../types'
-import path from 'node:path'
-import addon from './external/crychic-win32-x64.node?asset'
-
-export class Native {
-  public activated = false
-  private crychic?: Dict
-  private seq = 0
-  private cb: Map<number, Function> = new Map()
-
-  constructor(private ctx: Context) {
-    ctx.on('ready', () => {
-      this.start()
-    })
-  }
-
-  checkPlatform() {
-    return process.platform === 'win32' && process.arch === 'x64'
-  }
-
-  checkVersion() {
-    const version = getBuildVersion()
-    // 27333—27597
-    return version >= 27333 && version < 28060
-  }
-
-  async start() {
-    if (this.crychic) {
-      return
-    }
-    if (!this.checkPlatform()) {
-      return
-    }
-    if (!this.checkVersion()) {
-      return
-    }
-    const handler = async (name: string, ...e: unknown[]) => {
-      if (name === 'cb') {
-        this.cb.get(e[0] as number)?.(e[1])
-      }
-    }
-    try {
-      const fileName = path.basename(addon)
-      const dest = path.join(TEMP_DIR, fileName)
-      try {
-        await copyFile(addon, dest)
-      } catch (e) {
-        // resource busy or locked?
-        this.ctx.logger.warn(e)
-      }
-      this.crychic = require(dest)
-      this.crychic!.setCryHandler(handler)
-      this.crychic!.init()
-      this.activated = true
-    } catch (e) {
-      this.ctx.logger.warn('crychic 加载失败', e)
-    }
-  }
-
-  async sendFriendPoke(uin: number) {
-    if (!this.crychic) return
-    this.crychic.sendFriendPoke(uin)
-    await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
-  }
-
-  async sendGroupPoke(groupCode: number, memberUin: number) {
-    if (!this.crychic) return
-    this.crychic.sendGroupPoke(memberUin, groupCode)
-    await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
-  }
-
-  uploadForward(peer: Peer, transmit: Uint8Array) {
-    return new Promise<string>(async (resolve, reject) => {
-      if (!this.crychic) return
-      let groupCode = 0
-      const uid = peer.peerUid
-      const isGroup = peer.chatType === ChatType.Group
-      if (isGroup) {
-        groupCode = +uid
-      }
-      const seq = ++this.seq
-      this.cb.set(seq, (resid: string) => {
-        this.cb.delete(seq)
-        resolve(resid)
-      })
-      setTimeout(() => {
-        this.cb.delete(seq)
-        reject(new Error('fake forward timeout'))
-      }, 5000)
-      this.crychic.uploadForward(seq, isGroup, uid, groupCode, transmit)
-      await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
-    })
-  }
-}

src/ntqqapi/ntcall.ts

@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { getBuildVersion, log } from '../common/utils'
+import { log } from '../common/utils/legacyLog'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -14,8 +14,7 @@ import {
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
   NodeIKernelTipOffService,
-  NodeIKernelRobotService,
-  NodeIKernelNodeMiscService
+  NodeIKernelSearchService,
 } from './services'
 
 export enum NTClass {
@@ -41,6 +40,7 @@ export enum NTMethod {
   MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
   RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
   EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
+  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
 
   SELF_INFO = 'fetchAuthData',
   FILE_TYPE = 'getFileType',
@@ -94,14 +94,13 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
-  nodeIKernelRobotService: NodeIKernelRobotService
-  nodeIKernelNodeMiscService: NodeIKernelNodeMiscService
+  nodeIKernelSearchService: NodeIKernelSearchService
 }
 
 interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
-  registerEvent?: boolean
+  classNameIsRegister?: boolean
   cbCmd?: string | string[]
   cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
@@ -114,30 +113,21 @@ export function invoke<
   M extends keyof NTService[S] & string = any
 >(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
   const className = options.className ?? NTClass.NT_API
-  const channel = options.channel ?? getBuildVersion() >= 28788 ? NTChannel.IPC_UP_3 : NTChannel.IPC_UP_2
+  const channel = options.channel ?? NTChannel.IPC_UP_2
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]
-  if (options.registerEvent) {
+  if (options.classNameIsRegister) {
     eventName += '-register'
   }
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
-    let eventId: string
-
-    const timeoutId = setTimeout(() => {
-      if (eventId) {
-        removeReceiveHook(eventId)
-      }
-      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, args)
-      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${JSON.stringify(args)}`)
-    }, timeout)
-
+    let success = false
     if (!options.cbCmd) {
       // QQ后端会返回结果，并且可以根据uuid识别
       hookApiCallbacks[callbackId] = res => {
-        clearTimeout(timeoutId)
+        success = true
         resolve(res)
       }
     }
@@ -145,15 +135,19 @@ export function invoke<
       let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
           if (options.cmdCB) {
-            if (!options.cmdCB(payload, result)) {
-              return
+            if (options.cmdCB(payload, result)) {
+              removeReceiveHook(hookId)
+              success = true
+              resolve(payload)
             }
           }
-          removeReceiveHook(eventId)
-          clearTimeout(timeoutId)
-          resolve(payload)
+          else {
+            removeReceiveHook(hookId)
+            success = true
+            resolve(payload)
+          }
         })
       }
       !afterFirstCmd && secondCallback()
@@ -163,15 +157,17 @@ export function invoke<
           afterFirstCmd && secondCallback()
         }
         else {
-          clearTimeout(timeoutId)
-          if (eventId) {
-            removeReceiveHook(eventId)
-          }
-          log('ntqq api call failed,', method, args, res)
-          reject(`ntqq api call failed, ${method}, ${JSON.stringify(res)}`)
+          log('ntqq api call failed,', method, res)
+          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,

src/ntqqapi/proto/groupNotify.proto

@@ -1,14 +0,0 @@
-syntax = "proto3";
-package SysMsg;
-
-message GroupMemberChange {
-  uint32 groupCode = 1;
-  string memberUid = 3;
-  uint32 type = 4;  // 130:主动 131:被动
-  string adminUid = 5;
-}
-
-message GroupInvite {
-  uint32 groupCode = 1;
-  string operatorUid = 5;
-}

src/ntqqapi/proto/message.proto

@@ -1,134 +0,0 @@
-syntax = "proto3";
-package Msg;
-
-message RoutingHead {
-  optional uint64 fromUin = 1;
-  optional string fromUid = 2;
-  optional uint32 fromAppid = 3;
-  optional uint32 fromInstid = 4;
-  optional uint64 toUin = 5;
-  optional string toUid = 6;
-  optional C2c c2c = 7;
-  optional Group group = 8;
-}
-
-message C2c {
-  optional string friendName = 6;
-}
-
-message Group {
-  optional uint64 groupCode = 1;
-  optional uint32 groupType = 2;
-  optional uint64 groupInfoSeq = 3;
-  optional string groupCard = 4;
-  optional uint32 groupCardType = 5;
-  optional uint32 groupLevel = 6;
-  optional string groupName = 7;
-  optional string extGroupKeyInfo = 8;
-  optional uint32 msgFlag = 9;
-}
-
-message ContentHead {
-  optional uint64 msgType = 1;
-  optional uint64 subType = 2;
-  optional uint32 c2cCmd = 3;
-  optional uint64 random = 4;
-  optional uint64 msgSeq = 5;
-  optional uint64 msgTime = 6;
-  optional uint32 pkgNum = 7;
-  optional uint32 pkgIndex = 8;
-  optional uint32 divSeq = 9;
-  optional uint32 autoReply = 10;
-  optional uint64 ntMsgSeq = 11;
-  optional uint64 msgUid = 12;
-  optional ContentHeadField15 field15 = 15;
-}
-
-message ContentHeadField15 {
-  optional uint32 field1 = 1;
-  optional uint32 field2 = 2;
-  optional uint32 field3 = 3;
-  optional string field4 = 4;
-  optional string field5 = 5;
-}
-
-message Message {
-  optional RoutingHead routingHead = 1;
-  optional ContentHead contentHead = 2;
-  optional MessageBody body = 3;
-}
-
-message MessageBody {
-  optional RichText richText = 1;
-  optional bytes msgContent = 2;
-  optional bytes msgEncryptContent = 3;
-}
-
-message RichText {
-  optional Attr attr = 1;
-  repeated Elem elems = 2;
-}
-
-message Elem {
-  optional Text text = 1;
-  optional Face face = 2;
-  optional LightAppElem lightApp = 51;
-  optional CommonElem commonElem = 53;
-}
-
-message Text {
-  optional string str = 1;
-  optional string link = 2;
-  optional bytes attr6Buf = 3;
-  optional bytes attr7Buf = 4;
-  optional bytes buf = 11;
-  optional bytes pbReserve = 12;
-}
-
-message Face {
-  optional uint32 index = 1;
-  optional bytes old = 2;
-  optional bytes buf = 11;
-}
-
-message LightAppElem {
-  optional bytes data = 1;
-  optional bytes msgResid = 2;
-}
-
-message CommonElem {
-  required uint32 serviceType = 1;
-  optional bytes pbElem = 2;
-  optional uint32 businessType = 3;
-}
-
-message Attr {
-  optional int32 codePage = 1;
-  optional int32 time = 2;
-  optional int32 random = 3;
-  optional int32 color = 4;
-  optional int32 size = 5;
-  optional int32 effect = 6;
-  optional int32 charSet = 7;
-  optional int32 pitchAndFamily = 8;
-  optional string fontName = 9;
-  optional bytes reserveData = 10;
-}
-
-message MarkdownElem {
-  string content = 1;
-}
-
-message PbMultiMsgItem {
-  string fileName = 1;
-  PbMultiMsgNew buffer = 2;
-}
-
-message PbMultiMsgNew {
-  repeated Message msg = 1;
-}
-
-message PbMultiMsgTransmit {
-  repeated Message msg = 1;
-  repeated PbMultiMsgItem pbItemList = 2;
-}

src/ntqqapi/proto/richMedia.proto

@@ -1,76 +0,0 @@
-syntax = "proto3";
-package RichMedia;
-
-message MsgInfo {
-  repeated MsgInfoBody msgInfoBody = 1;
-  ExtBizInfo extBizInfo = 2;
-}
-
-message MsgInfoBody {
-  IndexNode index = 1;
-  PicInfo pic = 2;
-  bool fileExist = 5;
-}
-
-message IndexNode {
-  FileInfo info = 1;
-  string fileUuid = 2;
-  uint32 storeID = 3;
-  uint32 uploadTime = 4;
-  uint32 expire = 5;
-  uint32 type = 6; //0
-}
-
-message FileInfo {
-  uint32 fileSize = 1;
-  string md5HexStr = 2;
-  string sha1HexStr = 3;
-  string fileName = 4;
-  FileType fileType = 5;
-  uint32 width = 6;
-  uint32 height = 7;
-  uint32 time = 8;
-  uint32 original = 9;
-}
-
-message FileType {
-  uint32 type = 1;
-  uint32 picFormat = 2;
-  uint32 videoFormat = 3;
-  uint32 pttFormat = 4;
-}
-
-message PicInfo {
-  string urlPath = 1;
-  PicUrlExtParams ext = 2;
-  string domain = 3;
-}
-
-message PicUrlExtParams {
-  string originalParam = 1;
-  string bigParam = 2;
-  string thumbParam = 3;
-}
-
-message ExtBizInfo {
-  PicExtBizInfo pic = 1;
-  VideoExtBizInfo video = 2;
-  uint32 busiType = 10;
-}
-
-message PicExtBizInfo {
-  uint32 bizType = 1;
-  string summary = 2;
-}
-
-message VideoExtBizInfo {
-  bytes pbReserve = 3;
-}
-
-message PicFileIdInfo {
-  bytes sha1 = 2;
-  uint32 size = 3;
-  uint32 appid = 4;
-  uint32 time = 5;
-  uint32 expire = 10;
-}

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

@@ -1,27 +1,125 @@
-import { BuddyListReqType } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
+
 export interface NodeIKernelBuddyService {
+  // 26702 以上
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
-    data: {
-      categoryId: number
-      categorySortId: number
-      categroyName: string
-      categroyMbCount: number
-      onlineCount: number
-      buddyUids: string[]
-    }[]
+    data: Array<{
+      categoryId: number,
+      categorySortId: number,
+      categroyName: string,
+      categroyMbCount: number,
+      onlineCount: number,
+      buddyUids: Array<string>
+    }>
   }>
 
-  setBuddyRemark(arg: unknown): void
+  //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
+
+  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<GeneralCallResult & { arkMsg: string }>
+
+  isNull(): boolean
 }

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,99 +1,207 @@
 import {
+  GroupExtParam,
   GroupMember,
   GroupMemberRole,
   GroupNotifyType,
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
 
 export interface NodeIKernelGroupService {
-  getGroupHonorList(req: { groupCode: number[] }): Promise<{
-    errCode: number
-    errMsg: string
-    groupMemberHonorList: {
-      honorList: {
-        groupCode: string
-        id: number[]
-        isGray: number
-      }[]
-      cacheTs: number
-      honorInfos: unknown[]
-      joinTime: number
-    }
-  }>
+  getMemberCommonInfo(Req: {
+    groupCode: string,
+    startUin: string,
+    identifyFlag: string,
+    uinList: string[],
+    memberCommonFilter: {
+      memberUin: number,
+      uinFlag: number,
+      uinFlagExt: number,
+      uinMobileFlag: number,
+      shutUpTime: number,
+      privilege: 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
-    errMsg: string
+    errCode: number,
+    errMsg: string,
     uins: Map<string, string>
   }>
 
   getUidByUins(uins: string[]): Promise<{
-    errCode: number
-    errMsg: string
+    errCode: number,
+    errMsg: string,
     uids: Map<string, string>
   }>
 
-  queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<{
-    items: {
-      groupCode: string
-      msgSeq: number
-      msgRandom: number
-      msgSenderUin: string
-      msgSenderNick: string
-      opType: number
-      opUin: string
-      opNick: string
-      opTime: number
-      grayTipSeq: string
-    }[]
+  //26702(其实更早 但是我不知道)
+  checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
+
+  //26702(其实更早 但是我不知道)
+  getGroupLatestEssenceList(groupCode: string): Promise<unknown>
+
+  //26702(其实更早 但是我不知道)
+  shareDigest(Req: {
+    appId: string,
+    appType: number,
+    msgStyle: number,
+    recvUin: 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
-    result: {
-      ids: {
-        uid: string
-        index: number
-      }[]
-      infos: Map<string, GroupMember>
-      finish: boolean
-      hasRobot: boolean
-    }
+    errCode: number, errMsg: string,
+    result: { ids: string[], 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
 
-  getSingleScreenNotifies(force: boolean, startSeq: string, num: number): Promise<GeneralCallResult>
+  destroyGroup(groupCode: string): void
+  //获取单屏群通知列表
+  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  // 通知序列号
-        type: GroupNotifyType
-        groupCode: string
+        seq: string,  // 通知序列号
+        type: GroupNotifyType,
+        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
@@ -104,27 +212,45 @@ export interface NodeIKernelGroupService {
     }
   }>
 
-  getGroupRemainAtTimes(groupCode: string): Promise<GeneralCallResult & {
-    atInfo: {
-      canAtAll: boolean
-      RemainAtAllCountForUin: number
-      RemainAtAllCountForGroup: number
-      atTimesMsg: string
-      canNotAtAllMsg: ''
-    }
-  }>
+  downloadGroupBulletinRichMedia(groupCode: string): unknown
+
+  getGroupBulletinList(groupCode: string): unknown
+
+  getGroupStatisticInfo(groupCode: string): unknown
+
+  getGroupRemainAtTimes(groupCode: string): number
+
+  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): Promise<GeneralCallResult & { arkJson: string }>
 
-  addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+  getJoinGroupLink(groupCode: string): unknown
 
-  removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+  modifyGroupExtInfo(groupCode: string, arg: unknown): void
 
-  setHeader(args: unknown[]): Promise<GeneralCallResult>
+  //需要提前判断是否存在 高版本新增
+  addGroupEssence(param: {
+    groupCode: string
+    msgRandom: number,
+    msgSeq: number
+  }): Promise<unknown>
 
-  searchMember(sceneId: string, keyword: string): Promise<void>
+  //需要提前判断是否存在 高版本新增
+  removeGroupEssence(param: {
+    groupCode: string
+    msgRandom: number,
+    msgSeq: number
+  }): Promise<unknown>
+
+  isNull(): boolean
 }

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,100 +1,743 @@
-import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
+
+export interface QueryMsgsParams {
+  chatInfo: Peer,
+  filterMsgType: [],
+  filterSendersUid: string[],
+  filterMsgFromTime: string,
+  filterMsgToTime: string,
+  pageLimit: number,
+  isReverseOrder: boolean,
+  isIncludeCurrent: boolean
+}
+
+export interface TmpChatInfoApi {
+  errMsg: string
+  result: number
+  tmpChatInfo?: TmpChatInfo
+}
+
+export interface TmpChatInfo {
+  chatType: number
+  fromNick: string
+  groupCode: string
+  peerUid: string
+  sessionType: number
+  sig: string
+}
 
 export interface NodeIKernelMsgService {
   generateMsgUniqueId(chatType: number, time: string): string
 
-  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+  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>
 
-  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult & {
-    detailErr: Map<unknown, unknown>
-  }>
+  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
 
-  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  deleteRecallMsg(...args: unknown[]): unknown
 
-  getAioFirstViewLatestMsgsAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  deleteRecallMsgForLocal(...args: unknown[]): unknown
 
-  getMsgsIncludeSelfAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  addLocalGrayTipMsg(...args: unknown[]): unknown
 
-  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  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
-    fileName: string
-    elementType: ElementType
-    elementSubType: number
-    thumbSize: 0
-    needCreate: true
-    downloadType: 1
+    md5HexStr: string,
+    fileName: string,
+    elementType: ElementType,
+    elementSubType: number,
+    thumbSize: 0,
+    needCreate: true,
+    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: {
-      uin: string
-      emoId: number
-      emoPath: string
-      isExist: boolean
-      resId: string
-      url: string
-      md5: string
-      emoOriginalPath: string
-      thumbPath: string
-      RomaingType: string
-      isAPNG: false
-      isMarkFace: false
-      eId: string
-      epId: string
-      ocrWord: string
-      modifyWord: string
-      exposeNum: number
-      clickNum: number
+    emojiInfoList: Array<{
+      uin: string,
+      emoId: number,
+      emoPath: string,
+      isExist: boolean,
+      resId: string,
+      url: string,
+      md5: string,
+      emoOriginalPath: string,
+      thumbPath: string,
+      RomaingType: string,
+      isAPNG: false,
+      isMarkFace: false,
+      eId: string,
+      epId: string,
+      ocrWord: string,
+      modifyWord: string,
+      exposeNum: 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
 
-  setMsgEmojiLikes(...args: unknown[]): Promise<GeneralCallResult>
+  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
-    errMsg: string
-    emojiLikesList: {
-      tinyId: string
-      nickName: string
+    result: number,
+    errMsg: string,
+    emojiLikesList:
+    Array<{
+      tinyId: string,
+      nickName: string,
       headUrl: string
-    }[]
-    cookie: string
-    isLastPage: boolean
+    }>,
+    cookie: string,
+    isLastPage: boolean,
     isFirstPage: boolean
   }>
 
-  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  setMsgEmojiLikesForRole(...args: unknown[]): unknown
 
-  getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
+  clickInlineKeyboardButton(...args: unknown[]): unknown
 
-  sendSsoCmdReqByContend(ssoCmd: string, content: string): Promise<GeneralCallResult & { rsp: string }>
-}
+  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/NodeIKernelNodeMiscService.ts

@@ -1,15 +0,0 @@
-export interface NodeIKernelNodeMiscService {
-  wantWinScreenOCR(...args: unknown[]): Promise<{
-    code: number
-    errMsg: string
-    result: {
-      text: string
-      [key: `pt${number}`]: {
-        x: string
-        y: string
-      }
-      charBox: unknown[]
-      score: ''
-    }[]
-  }>
-}

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -3,7 +3,11 @@ import { GeneralCallResult } from './common'
 import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
-  setBuddyProfileLike(...args: unknown[]): GeneralCallResult & { succCounts: number }
+  addKernelProfileLikeListener(listener: NodeIKernelProfileLikeService): void
+
+  removeKernelProfileLikeListener(listener: unknown): void
+
+  setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number }
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
     info: {
@@ -22,4 +26,8 @@ export interface NodeIKernelProfileLikeService {
       start: number
     }
   }>
-}
+
+  getProfileLikeScidResourceInfo(...args: unknown[]): void
+
+  isNull(): boolean
+}

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,18 +1,106 @@
+import { AnyCnameRecord } from 'node:dns'
 import { SimpleInfo } from '../types'
 import { GeneralCallResult } from './common'
 
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}
+
 export interface NodeIKernelProfileService {
-  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>//uin->uid
 
   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>
 
-  getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise<GeneralCallResult>
+  setRecommendImgFlag(...args: unknown[]): Promise<unknown>
+
+  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,23 +1,191 @@
-import { GetFileListParam, Peer } from '../types'
+import { GetFileListParam, MessageElement, 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: []
-      v6IpUrl: []
-      domainUrl: {
-        url: string
-        isHttps: boolean
+      v4IpUrl: [],
+      v6IpUrl: [],
+      domainUrl: Array<{
+        url: string,
+        isHttps: boolean,
         httpsDomain: string
-      }[]
+      }>,
       videoCodecFormat: number
     }
   }>
 
-  deleteGroupFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
+  getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown
 
-  createGroupFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: unknown[] } }>
+  // this.senderUid = ""
+  // 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: {
@@ -30,9 +198,29 @@ 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
 
-  deleteGroupFile(groupCode: string, params: Array<number>, files: Array<string>): Promise<GeneralCallResult & {
+  transGroupFile(arg1: unknown, arg2: unknown): unknown
+
+  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>
@@ -40,20 +228,39 @@ export interface NodeIKernelRichMediaService {
     }
   }>
 
-  batchGetGroupFileCount(groupIds: string[]): Promise<GeneralCallResult & {
-    groupCodes: string[]
-    groupFileCounts: number[]
-  }>
+  translateEnWordToZn(words: string[]): Promise<GeneralCallResult & { words: string[] }>
 
-  getGroupSpace(groupId: string): Promise<GeneralCallResult & {
-    groupSpaceResult: {
-      retCode: number
-      retMsg: string
-      clientWording: string
-      totalSpace: string
-      usedSpace: string
-      allUpload: boolean
-    }
-  }>
-}
+  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/NodeIKernelRobotService.ts

@@ -1,13 +0,0 @@
-import { GeneralCallResult } from './common'
-
-export interface NodeIKernelRobotService {
-  getRobotUinRange(req: unknown): Promise<GeneralCallResult & {
-    response: {
-      version: number
-      robotUinRanges: {
-        minUin: string
-        maxUin: string
-      }[]
-    }
-  }>
-}

src/ntqqapi/services/NodeIKernelSearchService.ts

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

src/ntqqapi/services/NodeIKernelTipOffService.ts

@@ -1,5 +1,19 @@
 import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTipOffService {
-  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }>
-}
+  addKernelTipOffListener(listener: unknown): void
+
+  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,8 +1,16 @@
 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,5 +9,4 @@ export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
 export * from './NodeIKernelTipOffService'
-export * from './NodeIKernelRobotService'
-export * from './NodeIKernelNodeMiscService'
+export * from './NodeIKernelSearchService'

src/ntqqapi/types/group.ts

@@ -1,3 +1,5 @@
+import { QQLevel, Sex } from './user'
+
 export enum GroupListUpdateType {
   REFRESHALL,
   GETALL,
@@ -20,9 +22,9 @@ export interface Group {
   hasModifyConfGroupName: boolean
   remarkName: string
   hasMemo: boolean
-  groupShutupExpireTime: string
-  personShutupExpireTime: string
-  discussToGroupUin: string
+  groupShutupExpireTime: string //"0",
+  personShutupExpireTime: string //"0",
+  discussToGroupUin: string //"0",
   discussToGroupMaxMsgSeq: number
   discussToGroupTime: number
   groupFlagExt: number //1073938496,
@@ -30,57 +32,38 @@ export interface Group {
   groupCreditLevel: number //0,
   groupFlagExt3: number //0,
   groupOwnerId: {
-    memberUin: string
-    memberUid: string
+    memberUin: string //"0",
+    memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
   }
+  members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
   createTime: string
 }
 
 export enum GroupMemberRole {
-  Normal = 2,
-  Admin = 3,
-  Owner = 4,
+  normal = 2,
+  admin = 3,
+  owner = 4,
 }
 
 export interface GroupMember {
-  uid: string
-  qid: string
-  uin: string
-  nick: string
-  remark: string
-  cardType: number
-  cardName: string
-  role: GroupMemberRole
+  memberSpecialTitle?: string
   avatarPath: string
-  shutUpTime: number
+  cardName: string
+  cardType: number
   isDelete: boolean
-  isSpecialConcerned: boolean
-  isSpecialShield: boolean
+  nick: string
+  qid: string
+  remark: string
+  role: GroupMemberRole // 群主:4, 管理员:3，群员:2
+  shutUpTime: number // 禁言时间，单位是什么暂时不清楚
+  uid: string // 加密的字符串
+  uin: string // QQ号
   isRobot: boolean
-  groupHonor: Uint8Array
-  memberRealLevel: number
-  memberLevel: number
-  globalGroupLevel: number
-  globalGroupPoint: number
-  memberTitleId: number
-  memberSpecialTitle: string
-  specialTitleExpireTime: string
-  userShowFlag: number
-  userShowFlagNew: number
-  richFlag: number
-  mssVipType: number
-  bigClubLevel: number
-  bigClubFlag: number
-  autoRemark: string
-  creditLevel: number
-  joinTime: number
-  lastSpeakTime: number
-  memberFlag: number
-  memberFlagExt: number
-  memberMobileFlag: number
-  memberFlagExt2: number
-  isSpecialShielded: boolean
-  cardNameId: number
+  sex?: Sex
+  qqLevel?: QQLevel
+  isChangeRole: boolean
+  joinTime: string
+  lastSpeakTime: string
 }
 
 export interface PublishGroupBulletinReq {
@@ -93,98 +76,4 @@ export interface PublishGroupBulletinReq {
   oldFeedsId: ''
   pinned: number
   confirmRequired: number
-}
-
-export interface GroupAllInfo {
-  groupCode: string
-  ownerUid: string
-  groupFlag: number
-  groupFlagExt: number
-  maxMemberNum: number
-  memberNum: number
-  groupOption: number
-  classExt: number
-  groupName: string
-  fingerMemo: string
-  groupQuestion: string
-  certType: number
-  shutUpAllTimestamp: number
-  shutUpMeTimestamp: number //解除禁言时间
-  groupTypeFlag: number
-  privilegeFlag: number
-  groupSecLevel: number
-  groupFlagExt3: number
-  isConfGroup: number
-  isModifyConfGroupFace: number
-  isModifyConfGroupName: number
-  noFigerOpenFlag: number
-  noCodeFingerOpenFlag: number
-  groupFlagExt4: number
-  groupMemo: string
-  cmdUinMsgSeq: number
-  cmdUinJoinTime: number
-  cmdUinUinFlag: number
-  cmdUinMsgMask: number
-  groupSecLevelInfo: number
-  cmdUinPrivilege: number
-  cmdUinFlagEx2: number
-  appealDeadline: number
-  remarkName: number
-  isTop: boolean
-  richFingerMemo: string
-  groupAnswer: string
-  joinGroupAuth: string
-  isAllowModifyConfGroupName: number
-}
-
-export interface GroupBulletinListResult {
-  groupCode: string
-  srvCode: number
-  readOnly: number
-  role: number
-  inst: unknown[]
-  feeds: {
-    uin: string
-    feedId: string
-    publishTime: string
-    msg: {
-      text: string
-      textFace: string
-      pics: {
-        id: string
-        width: number
-        height: number
-      }[]
-      title: string
-    }
-    type: number
-    fn: number
-    cn: number
-    vn: number
-    settings: {
-      isShowEditCard: number
-      remindTs: number
-      tipWindowType: number
-      confirmRequired: number
-    }
-    pinned: number
-    readNum: number
-    is_read: number
-    is_all_confirm: number
-  }[]
-  groupInfo: {
-    groupCode: string
-    classId: number
-  }
-  gln: number
-  tst: number
-  publisherInfos: {
-    uin: string
-    nick: string
-    avatar: string
-  }[]
-  server_time: string
-  svrt: string
-  nextIndex: number
-  jointime: string
-}
+}

src/ntqqapi/types/msg.ts

@@ -1,108 +1,124 @@
 import { GroupMemberRole } from './group'
-import { GeneralCallResult } from '../services'
+
+export interface GetFileListParam {
+  sortType: number
+  fileCount: number
+  startIndex: number
+  sortOrder: number
+  showOnlinedocFolder: number
+}
 
 export enum ElementType {
-  Text = 1,
-  Pic = 2,
-  File = 3,
-  Ptt = 4,
-  Video = 5,
-  Face = 6,
-  Reply = 7,
-  GrayTip = 8,
-  Ark = 10,
-  MarketFace = 11,
-  LiveGift = 12,
-  StructLongMsg = 13,
-  Markdown = 14,
-  Giphy = 15,
-  MultiForward = 16,
-  InlineKeyboard = 17,
-  Calendar = 19,
-  YoloGameResult = 20,
-  AvRecord = 21,
-  TofuRecord = 23,
-  FaceBubble = 27,
-  ShareLocation = 28,
-  TaskTopMsg = 29,
-  RecommendedMsg = 43,
-  ActionBar = 44
+  UNKNOWN = 0,
+  TEXT = 1,
+  PIC = 2,
+  FILE = 3,
+  PTT = 4,
+  VIDEO = 5,
+  FACE = 6,
+  REPLY = 7,
+  WALLET = 9,
+  GreyTip = 8, //Poke别叫戳一搓了 官方名字拍一拍 戳一戳是另一个名字
+  ARK = 10,
+  MFACE = 11,
+  LIVEGIFT = 12,
+  STRUCTLONGMSG = 13,
+  MARKDOWN = 14,
+  GIPHY = 15,
+  MULTIFORWARD = 16,
+  INLINEKEYBOARD = 17,
+  INTEXTGIFT = 18,
+  CALENDAR = 19,
+  YOLOGAMERESULT = 20,
+  AVRECORD = 21,
+  FEED = 22,
+  TOFURECORD = 23,
+  ACEBUBBLE = 24,
+  ACTIVITY = 25,
+  TOFU = 26,
+  FACEBUBBLE = 27,
+  SHARELOCATION = 28,
+  TASKTOPMSG = 29,
+  RECOMMENDEDMSG = 43,
+  ACTIONBAR = 44
 }
 
 export interface SendTextElement {
-  elementType: ElementType.Text
+  elementType: ElementType.TEXT
   elementId: ''
   textElement: TextElement
 }
 
 export interface SendPttElement {
-  elementType: ElementType.Ptt
+  elementType: ElementType.PTT
   elementId: ''
-  pttElement: Partial<PttElement>
+  pttElement: {
+    fileName: string
+    filePath: string
+    md5HexStr: string
+    fileSize: number
+    duration: number // 单位是秒
+    formatType: number
+    voiceType: number
+    voiceChangeType: number
+    canConvert2Text: boolean
+    waveAmplitudes: number[]
+    fileSubId: ''
+    playState: number
+    autoConvertText: number
+  }
+}
+
+export enum PicType {
+  gif = 2000,
+  jpg = 1000,
+}
+
+export enum PicSubType {
+  normal = 0, // 普通图片，大图
+  face = 1, // 表情包小图
 }
 
 export interface SendPicElement {
-  elementType: ElementType.Pic
+  elementType: ElementType.PIC
   elementId: ''
-  picElement: Partial<PicElement>
+  picElement: {
+    md5HexStr: string
+    fileSize: number | string
+    picWidth: number
+    picHeight: number
+    fileName: string
+    sourcePath: string
+    original: boolean
+    picType: PicType
+    picSubType: PicSubType
+    fileUuid: string
+    fileSubId: string
+    thumbFileSize: number
+    summary: string
+  }
 }
 
 export interface SendReplyElement {
-  elementType: ElementType.Reply
+  elementType: ElementType.REPLY
   elementId: ''
   replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
-  elementType: ElementType.Face
+  elementType: ElementType.FACE
   elementId: ''
   faceElement: FaceElement
 }
 
 export interface SendMarketFaceElement {
-  elementType: ElementType.MarketFace
-  elementId: ''
+  elementType: ElementType.MFACE
   marketFaceElement: MarketFaceElement
 }
 
-export interface SendFileElement {
-  elementType: ElementType.File
-  elementId: ''
-  fileElement: FileElement
-}
-
-export interface SendVideoElement {
-  elementType: ElementType.Video
-  elementId: ''
-  videoElement: VideoElement
-}
-
-export interface SendArkElement {
-  elementType: ElementType.Ark
-  elementId: ''
-  arkElement: Partial<ArkElement>
-}
-
-export type SendMessageElement =
-  | SendTextElement
-  | SendPttElement
-  | SendPicElement
-  | SendReplyElement
-  | SendFaceElement
-  | SendMarketFaceElement
-  | SendFileElement
-  | SendVideoElement
-  | SendArkElement
-
-export enum AtType {
-  Unknown,
-  All,
-  One,
-}
-
 export interface TextElement {
   content: string
-  atType: AtType
+  atType: number
   atUid: string
   atTinyId: string
   atNtUid: string
@@ -139,6 +155,91 @@ export interface FileElement {
   fileBizId?: number
 }
 
+export interface SendFileElement {
+  elementType: ElementType.FILE
+  elementId: ''
+  fileElement: FileElement
+}
+
+export interface SendVideoElement {
+  elementType: ElementType.VIDEO
+  elementId: ''
+  videoElement: VideoElement
+}
+
+export interface SendArkElement {
+  elementType: ElementType.ARK
+  elementId: ''
+  arkElement: ArkElement
+}
+
+export type SendMessageElement =
+  | SendTextElement
+  | SendPttElement
+  | SendPicElement
+  | SendReplyElement
+  | SendFaceElement
+  | SendMarketFaceElement
+  | SendFileElement
+  | SendVideoElement
+  | SendArkElement
+
+export enum AtType {
+  notAt = 0,
+  atAll = 1,
+  atUser = 2,
+}
+
+export enum ChatType {
+  friend = 1,
+  group = 2,
+  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 // 秒数
@@ -149,7 +250,7 @@ export interface PttElement {
   fileSize: string // "4261"
   fileSubId: string // "0"
   fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-  formatType: number // 1
+  formatType: string // 1
   invalidState: number // 0
   md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
   playState: number // 0
@@ -160,7 +261,6 @@ export interface PttElement {
   voiceChangeType: number // 0
   voiceType: number // 0
   waveAmplitudes: number[]
-  autoConvertText: number
 }
 
 export interface ArkElement {
@@ -172,16 +272,6 @@ export interface ArkElement {
 export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
 export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
 
-export enum PicType {
-  GIF = 2000,
-  JPEG = 1000,
-}
-
-export enum PicSubType {
-  Normal = 0, // 普通图片，大图
-  Face = 1, // 表情包小图
-}
-
 export interface PicElement {
   picSubType: PicSubType
   picType: PicType  // 有这玩意儿吗
@@ -197,77 +287,23 @@ export interface PicElement {
   md5HexStr?: string
 }
 
-export interface TipAioOpGrayTipElement {
-  operateType: number
-  peerUid: string
-  fromGrpCodeOfTmpChat: string
-}
-
-export enum TipGroupElementType {
-  MemberIncrease = 1,
-  Kicked = 3, // 被移出群
-  Ban = 8,
-}
-
-export interface TipGroupElement {
-  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
-  role: number
-  groupName: string // 暂时获取不到
-  memberUid: string
-  memberNick: string
-  memberRemark: string
-  adminUid: string
-  adminNick: string
-  adminRemark: string
-  createGroup: null
-  memberAdd?: {
-    showType: number
-    otherAdd?: {
-      uid: string
-      name: string
-    }
-    otherAddByOtherQRCode?: unknown
-    otherAddByYourQRCode?: unknown
-    youAddByOtherQRCode?: unknown
-    otherInviteOther?: unknown
-    otherInviteYou?: unknown
-    youInviteOther?: unknown
-  }
-  shutUp?: {
-    curTime: string
-    duration: string // 禁言时间，秒
-    admin: {
-      uid: string
-      card: string
-      name: string
-      role: GroupMemberRole
-    }
-    member: {
-      uid: string
-      card: string
-      name: string
-      role: GroupMemberRole
-    }
-  }
-}
-
 export enum GrayTipElementSubType {
-  Revoke = 1,
-  Proclamation = 2,
-  EmojiReply = 3,
-  Group = 4,
-  Buddy = 5,
-  Feed = 6,
-  Essence = 7,
-  GroupNotify = 8,
-  BuddyNotify = 9,
-  File = 10,
-  FeedChannelMsg = 11,
-  XmlMsg = 12,
-  LocalMsg = 13,
-  Block = 14,
-  AioOp = 15,
-  Wallet = 16,
+  REVOKE = 1,
+  PROCLAMATION = 2,
+  EMOJIREPLY = 3,
+  GROUP = 4,
+  BUDDY = 5,
+  FEED = 6,
+  ESSENCE = 7,
+  GROUPNOTIFY = 8,
+  BUDDYNOTIFY = 9,
+  FILE = 10,
+  FEEDCHANNELMSG = 11,
+  XMLMSG = 12,
+  LOCALMSG = 13,
+  BLOCK = 14,
+  AIOOP = 15,
+  WALLET = 16,
   JSON = 17,
 }
 
@@ -288,20 +324,16 @@ export interface GrayTipElement {
   xmlElement?: {
     templId: string
     content: string
-    templParam: Map<string, string>
-    members: Map<string, string> // uid -> remark
   }
   jsonGrayTipElement?: {
     busiId: string
     jsonStr: string
-    xmlToJsonParam?: {
-      templParam: Map<string, string>
-    }
   }
 }
 
+
 export enum FaceIndex {
-  Dice = 358,
+  dice = 358,
   RPS = 359, // 石头剪刀布
 }
 
@@ -316,7 +348,6 @@ export interface FaceElement {
   resultId?: string
   surpriseId?: string
   randomType?: number
-  pokeType?: number
 }
 
 export interface MarketFaceElement {
@@ -326,10 +357,6 @@ export interface MarketFaceElement {
   key: string
   imageWidth?: number
   imageHeight?: number
-  supportSize?: {
-    width: number
-    height: number
-  }[]
 }
 
 export interface VideoElement {
@@ -379,7 +406,6 @@ export interface InlineKeyboardElementRowButton {
   enter: false
   subscribeDataTemplateIds: []
 }
-
 export interface InlineKeyboardElement {
   rows: [
     {
@@ -388,9 +414,56 @@ export interface InlineKeyboardElement {
   ]
 }
 
-export interface StructLongMsgElement {
-  xmlContent: string
-  resId: string
+export interface TipAioOpGrayTipElement {
+  // 这是什么提示来着？
+  operateType: number
+  peerUid: string
+  fromGrpCodeOfTmpChat: string
+}
+
+export enum TipGroupElementType {
+  memberIncrease = 1,
+  kicked = 3, // 被移出群
+  ban = 8,
+}
+
+export interface TipGroupElement {
+  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
+  role: 0 // 暂时不知
+  groupName: string // 暂时获取不到
+  memberUid: string
+  memberNick: string
+  memberRemark: string
+  adminUid: string
+  adminNick: string
+  adminRemark: string
+  createGroup: null
+  memberAdd?: {
+    showType: 1
+    otherAdd: null
+    otherAddByOtherQRCode: null
+    otherAddByYourQRCode: null
+    youAddByOtherQRCode: null
+    otherInviteOther: null
+    otherInviteYou: null
+    youInviteOther: null
+  }
+  shutUp?: {
+    curTime: string
+    duration: string // 禁言时间，秒
+    admin: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
+    }
+    member: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
+    }
+  }
 }
 
 export interface MultiForwardMsgElement {
@@ -399,49 +472,26 @@ export interface MultiForwardMsgElement {
   fileName: string
 }
 
-export enum ChatType {
-  C2C = 1,
-  Group = 2,
-  TempC2CFromGroup = 100,
-}
-
 export interface RawMessage {
   msgId: string
   msgType: number
   subMsgType: number
+  msgShortId?: number // 自己维护的消息id
   msgTime: string // 时间戳，秒
   msgSeq: string
   msgRandom: string
   senderUid: string
-  senderUin: string // 发送者QQ号
+  senderUin?: string // 发送者QQ号
   peerUid: string // 群号 或者 QQ uid
   peerUin: string // 群号 或者 发送者QQ号
   guildId: string
   sendNickName: string
   sendMemberName?: string // 发送者群名片
-  sendRemarkName?: string // 发送者好友备注
   chatType: ChatType
   sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
   recallTime: string // 撤回时间, "0"是没有撤回
   records: RawMessage[]
   elements: MessageElement[]
-  peerName: string
-  multiTransInfo?: {
-    status: number
-    msgId: number
-    friendFlag: number
-    fromFaceUrl: string
-  }
-  emojiLikesList: {
-    emojiId: string
-    emojiType: string
-    likesCnt: string
-    isClicked: boolean
-  }[]
-  msgAttrs: Map<number, {
-    attrType: number
-    attrId: string
-  }>
 }
 
 export interface Peer {
@@ -466,11 +516,12 @@ export interface MessageElement {
   fileElement?: FileElement
   liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: StructLongMsgElement
+  structLongMsgElement?: unknown
   multiForwardMsgElement?: MultiForwardMsgElement
   giphyElement?: unknown
+  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: unknown
+  textGiftElement?: unknown //????
   calendarElement?: unknown
   yoloGameResultElement?: unknown
   avRecordElement?: unknown
@@ -482,136 +533,3 @@ export interface MessageElement {
   recommendedMsgElement?: unknown
   actionBarElement?: unknown
 }
-
-export interface RichMediaDownloadCompleteNotify {
-  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 GroupFileInfo {
-  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
-}
-
-export interface QueryMsgsParams {
-  chatInfo: Peer
-  filterMsgType: []
-  filterSendersUid: string[]
-  filterMsgFromTime: string
-  filterMsgToTime: string
-  pageLimit: number
-  isReverseOrder: boolean
-  isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi extends GeneralCallResult {
-  tmpChatInfo?: {
-    chatType: number
-    fromNick: string
-    groupCode: string
-    peerUid: string
-    sessionType: number
-    sig: string
-  }
-}
-
-export interface GetFileListParam {
-  sortType: number
-  fileCount: number
-  startIndex: number
-  sortOrder: number
-  showOnlinedocFolder: number
-  folderId?: string
-}
-
-export interface RichMediaUploadCompleteNotify {
-  fileId: string
-  fileDownType: number
-  filePath: string
-  totalSize: string
-  trasferStatus: number
-  commonFileInfo: {
-    uuid: string
-    fileName: string
-    fileSize: string
-    md5: string
-    sha: string
-  }
-}
-
-export enum RMBizType {
-  Unknown,
-  C2CFile,
-  GroupFile,
-  C2CPic,
-  GroupPic,
-  DiscPic,
-  C2CVideo,
-  GroupVideo,
-  C2CPtt,
-  GroupPtt,
-}

src/ntqqapi/types/notify.ts

@@ -1,19 +1,19 @@
 export enum GroupNotifyType {
-  InvitedByMember = 1,
-  RefuseInvited,
-  RefusedByAdminiStrator,
-  AgreedTojoinDirect, // 有人接受了邀请入群
-  InvitedNeedAdminiStratorPass, // 有人邀请了别人入群
-  AgreedToJoinByAdminiStrator,
-  RequestJoinNeedAdminiStratorPass,
-  SetAdmin,
-  KickMemberNotifyAdmin,
-  KickMemberNotifyKicked,
-  MemberLeaveNotifyAdmin, // 主动退出
-  CancelAdminNotifyCanceled, // 我被取消管理员
-  CancelAdminNotifyAdmin, // 其他人取消管理员
-  TransferGroupNotifyOldowner,
-  TransferGroupNotifyAdmin
+  INVITED_BY_MEMBER = 1,
+  REFUSE_INVITED,
+  REFUSED_BY_ADMINI_STRATOR,
+  AGREED_TOJOIN_DIRECT, // 有人接受了邀请入群
+  INVITED_NEED_ADMINI_STRATOR_PASS, // 有人邀请了别人入群
+  AGREED_TO_JOIN_BY_ADMINI_STRATOR,
+  REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
+  SET_ADMIN,
+  KICK_MEMBER_NOTIFY_ADMIN,
+  KICK_MEMBER_NOTIFY_KICKED,
+  MEMBER_LEAVE_NOTIFY_ADMIN, // 主动退出
+  CANCEL_ADMIN_NOTIFY_CANCELED, // 我被取消管理员
+  CANCEL_ADMIN_NOTIFY_ADMIN, // 其他人取消管理员
+  TRANSFER_GROUP_NOTIFY_OLDOWNER,
+  TRANSFER_GROUP_NOTIFY_ADMIN
 }
 
 export interface GroupNotifies {
@@ -23,11 +23,11 @@ export interface GroupNotifies {
 }
 
 export enum GroupNotifyStatus {
-  Init, // 初始化
-  Unhandle, // 未处理
-  Agreed, // 同意
-  Refused, // 拒绝
-  Ignored // 忽略
+  KINIT, // 初始化
+  KUNHANDLE, // 未处理
+  KAGREED, // 同意
+  KREFUSED, // 拒绝
+  KIGNORED // 忽略
 }
 
 export interface GroupNotify {
@@ -56,8 +56,20 @@ export enum GroupRequestOperateTypes {
 }
 
 export enum BuddyReqType {
-  MsgInfo = 12,
-  MeInitiatorWaitPeerConfirm = 13,
+  KMEINITIATOR,
+  KPEERINITIATOR,
+  KMEAGREED,
+  KMEAGREEDANDADDED,
+  KPEERAGREED,
+  KPEERAGREEDANDADDED,
+  KPEERREFUSED,
+  KMEREFUSED,
+  KMEIGNORED,
+  KMEAGREEANYONE,
+  KMESETQUESTION,
+  KMEAGREEANDADDFAILED,
+  KMSGINFO,
+  KMEINITIATORWAITPEERCONFIRM
 }
 
 export interface FriendRequest {
@@ -79,3 +91,41 @@ export interface FriendRequestNotify {
     buddyReqs: FriendRequest[]
   }
 }
+
+export enum MemberExtSourceType {
+  DEFAULTTYPE = 0,
+  TITLETYPE = 1,
+  NEWGROUPTYPE = 2,
+}
+
+export interface GroupExtParam {
+  groupCode: string
+  seq: string
+  beginUin: string
+  dataTime: string
+  uinList: Array<string>
+  uinNum: string
+  groupType: string
+  richCardNameVer: string
+  sourceType: MemberExtSourceType
+  memberExtFilter: {
+    memberLevelInfoUin: number
+    memberLevelInfoPoint: number
+    memberLevelInfoActiveDay: number
+    memberLevelInfoLevel: number
+    memberLevelInfoName: number
+    levelName: number
+    dataTime: number
+    userShowFlag: number
+    sysShowFlag: number
+    timeToUpdate: number
+    nickName: number
+    specialTitle: number
+    levelNameNew: number
+    userShowFlagNew: number
+    msgNeedField: number
+    cmdUinFlagExt3Grocery: number
+    memberIcon: number
+    memberInfoSeq: number
+  }
+}

src/ntqqapi/types/user.ts

@@ -1,8 +1,7 @@
 export enum Sex {
-  Unknown = 0,
-  Male = 1,
-  Female = 2,
-  Hidden = 255
+  male = 0,
+  female = 2,
+  unknown = 255,
 }
 
 export interface QQLevel {
@@ -68,7 +67,6 @@ export interface User {
   recommendImgFlag?: number
   disableEmojiShortCuts?: number
   pendantId?: string
-  age?: number
 }
 
 export interface SelfInfo extends User {
@@ -102,12 +100,12 @@ export interface BaseInfo {
   birthday_month: number
   birthday_day: number
   age: number
-  sex: Sex
+  sex: number
   eMail: string
   phoneNum: string
   categoryId: number
   richTime: number
-  richBuffer: Uint8Array
+  richBuffer: string
 }
 
 interface MusicInfo {
@@ -223,6 +221,11 @@ interface RelationFlags {
   isHidePrivilegeIcon: number
 }
 
+export interface FriendV2 extends SimpleInfo {
+  categoryId?: number
+  categroyName?: string
+}
+
 interface CommonExt {
   constellation: number
   shengXiao: number
@@ -252,7 +255,7 @@ interface PhotoWall {
   picList: Pic[]
 }
 
-export interface UserDetailInfo {
+export interface UserDetailInfoListenerArg {
   uid: string
   uin: string
   simpleInfo: SimpleInfo
@@ -297,7 +300,7 @@ export interface UserDetailInfoByUin {
     birthday_year: number
     birthday_month: number
     birthday_day: number
-    sex: number
+    sex: number //0
     topTime: string
     constellation: number
     shengXiao: number
@@ -341,21 +344,3 @@ export interface UserDetailInfoByUin {
     vipNameColorId: string
   }
 }
-
-export enum BuddyListReqType {
-  KNOMAL,
-  KLETTER
-}
-
-export enum UserDetailSource {
-  KDB,
-  KSERVER
-}
-
-export enum ProfileBizType {
-  KALL,
-  KBASEEXTEND,
-  KVAS,
-  KQZONE,
-  KOTHER
-}

src/ntqqapi/wrapper.ts

@@ -0,0 +1,81 @@
+import {
+  NodeIKernelBuddyService,
+  NodeIKernelGroupService,
+  NodeIKernelProfileService,
+  NodeIKernelProfileLikeService,
+  NodeIKernelMSFService,
+  NodeIKernelMsgService,
+  NodeIKernelUixConvertService,
+  NodeIKernelRichMediaService,
+  NodeIKernelTicketService,
+  NodeIKernelTipOffService,
+  NodeIKernelSearchService
+} from './services'
+import { constants } from 'node:os'
+import { Dict } from 'cosmokit'
+const Process = require('node:process')
+
+export interface NodeIQQNTWrapperSession {
+  getBuddyService(): NodeIKernelBuddyService
+  getGroupService(): NodeIKernelGroupService
+  getProfileService(): NodeIKernelProfileService
+  getProfileLikeService(): NodeIKernelProfileLikeService
+  getMsgService(): NodeIKernelMsgService
+  getMSFService(): NodeIKernelMSFService
+  getUixConvertService(): NodeIKernelUixConvertService
+  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) {
+  const dlopenRet = this.dlopenOrig(module, filename, flags)
+  for (const export_name in module.exports) {
+    module.exports[export_name] = new Proxy(module.exports[export_name], {
+      construct: (target, args) => {
+        const ret = new target(...args)
+        if (export_name === 'NodeIQQNTWrapperSession') wrapperApi.NodeIQQNTWrapperSession = ret
+        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/file/GetFile.ts

@@ -2,6 +2,7 @@ import { BaseAction, Schema } from '../BaseAction'
 import { readFile } from 'node:fs/promises'
 import { ActionName } from '../types'
 import { Peer, ElementType } from '@/ntqqapi/types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -23,9 +24,9 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = this.adapter.config
 
-    let fileCache = await this.ctx.store.getFileCacheById(payload.file)
+    let fileCache = await MessageUnique.getFileCacheById(payload.file)
     if (!fileCache?.length) {
-      fileCache = await this.ctx.store.getFileCacheByName(payload.file)
+      fileCache = await MessageUnique.getFileCacheByName(payload.file)
     }
 
     if (fileCache?.length) {
@@ -48,7 +49,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         peerUid: fileCache[0].peerUid,
         guildId: ''
       }
-      if (fileCache[0].elementType === ElementType.Pic) {
+      if (fileCache[0].elementType === ElementType.PIC) {
         const msgList = await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
         if (msgList.msgList.length === 0) {
           throw new Error('msg not found')
@@ -59,7 +60,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
           throw new Error('element not found')
         }
         res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
-      } else if (fileCache[0].elementType === ElementType.Video) {
+      } 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)) {

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

@@ -1,24 +1,25 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export class DeleteEssenceMsg extends BaseAction<Payload, unknown> {
+export class DelEssenceMsg extends BaseAction<Payload, unknown> {
   actionName = ActionName.GoCQHTTP_DelEssenceMsg
   payloadSchema = Schema.object({
     message_id: Schema.union([Number, String]).required()
   })
 
   protected async _handle(payload: Payload) {
-    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.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.msgId,
+      msg.Peer.peerUid,
+      msg.MsgId,
     )
   }
 }

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

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

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

@@ -1,21 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-
-interface Payload {
-  user_id: number | string
-}
-
-export class DeleteFriend extends BaseAction<Payload, null> {
-  actionName = ActionName.GoCQHTTP_DeleteFriend
-  payloadSchema = Schema.object({
-    user_id: Schema.union([Number, String]).required()
-  })
-
-  protected async _handle(payload: Payload) {
-    const uin = payload.user_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(uin)
-    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntFriendApi.delBuddy(uid)
-    return null
-  }
-}

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

@@ -23,8 +23,8 @@ interface FileResponse {
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
   payloadSchema = Schema.object({
-    url: Schema.string(),
-    base64: Schema.string(),
+    url: String,
+    base64: String,
     headers: Schema.union([String, Schema.array(String)])
   })
 

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

@@ -1,7 +1,8 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11ForwardMessage } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
@@ -15,42 +16,39 @@ 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 = await this.ctx.store.getShortIdByMsgId(msgId)
-    const rootMsg = await this.ctx.store.getMsgInfoByShortId(rootMsgId || +msgId)
+    const rootMsgId = MessageUnique.getShortIdByMsgId(msgId)
+    const rootMsg = await MessageUnique.getMsgIdAndPeerByShortId(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)
     }
-    const messages: (OB11ForwardMessage | undefined)[] = await Promise.all(
-      data.msgList.map(async (msg) => {
-        const res = await OB11Entities.message(this.ctx, msg)
-        if (res) {
-          return {
-            content: res.message,
-            sender: {
-              nickname: res.sender.nickname,
-              user_id: res.sender.user_id
-            },
-            time: res.time,
-            message_format: res.message_format,
-            message_type: res.message_type
-          }
-        }
+    const msgList = data.msgList
+    const messages = await Promise.all(
+      msgList.map(async (msg) => {
+        const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (!resMsg) return
+        resMsg.message_id = MessageUnique.createMsg({
+          chatType: msg.chatType,
+          peerUid: msg.peerUid,
+        }, msg.msgId)
+        return resMsg
       })
     )
-    return { messages: filterNullable(messages) }
+    const forwardMessages = filterNullable(messages)
+      .map(v => {
+        const msg = v as Partial<OB11ForwardMessage>
+        msg.content = msg.message
+        delete msg.message
+        return msg as OB11ForwardMessage
+      })
+    return { messages: forwardMessages }
   }
 }

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

@@ -1,4 +1,4 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -13,9 +13,6 @@ 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())

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

@@ -1,50 +0,0 @@
-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/GetGroupFileSystemInfo.ts

@@ -1,32 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-
-interface Payload {
-  group_id: number | string
-}
-
-interface Response {
-  file_count: number
-  limit_count: number
-  used_space: number
-  total_space: number
-}
-
-export class GetGroupFileSystemInfo extends BaseAction<Payload, Response> {
-  actionName = ActionName.GoCQHTTP_GetGroupFileSystemInfo
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required()
-  })
-
-  async _handle(payload: Payload) {
-    const groupId = payload.group_id.toString()
-    const { groupFileCounts } = await this.ctx.ntGroupApi.getGroupFileCount(groupId)
-    const { groupSpaceResult } = await this.ctx.ntGroupApi.getGroupFileSpace(groupId)
-    return {
-      file_count: groupFileCounts[0],
-      limit_count: 10000,
-      used_space: +groupSpaceResult.usedSpace,
-      total_space: +groupSpaceResult.totalSpace,
-    }
-  }
-}

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

@@ -1,82 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { pathToFileURL } from 'node:url'
-import { ChatType } from '@/ntqqapi/types'
-import { GroupFileInfo } from '@/ntqqapi/types'
-
-export interface Payload {
-  group_id: number | string
-  file_id: string
-  busid?: number
-}
-
-export interface Response {
-  url: string
-}
-
-export class GetGroupFileUrl extends BaseAction<Payload, Response> {
-  actionName = ActionName.GoCQHTTP_GetGroupFileUrl
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    file_id: Schema.string().required()
-  })
-
-  protected async _handle(payload: Payload) {
-    const file = await this.ctx.store.getFileCacheById(payload.file_id)
-    if (file.length > 0) {
-      const { msgId, chatType, peerUid, elementId } = file[0]
-      const path = await this.ctx.ntFileApi.downloadMedia(msgId, chatType, peerUid, elementId)
-      return {
-        url: pathToFileURL(path).href
-      }
-    } else {
-      const groupId = payload.group_id.toString()
-      const modelId = await this.search(groupId, payload.file_id)
-      if (modelId) {
-        const peer = {
-          chatType: ChatType.Group,
-          peerUid: groupId,
-          guildId: ''
-        }
-        const path = await this.ctx.ntFileApi.downloadFileForModelId(peer, modelId)
-        return {
-          url: pathToFileURL(path).href
-        }
-      }
-      throw new Error('file not found')
-    }
-  }
-
-  private async search(groupId: string, fileId: string, folderId?: string) {
-    let modelId: string | undefined
-    let nextIndex: number | undefined
-    const folders: GroupFileInfo['item'] = []
-    while (nextIndex !== 0) {
-      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
-        sortType: 1,
-        fileCount: 100,
-        startIndex: nextIndex ?? 0,
-        sortOrder: 2,
-        showOnlinedocFolder: 0,
-        folderId
-      })
-      const file = res.item.find(item => item.fileInfo?.fileId === fileId)
-      if (file) {
-        modelId = file.fileInfo?.fileModelId
-        break
-      }
-      folders.push(...res.item.filter(item => item.folderInfo?.totalFileCount))
-      nextIndex = res.nextIndex
-    }
-    if (!modelId) {
-      for (const item of folders) {
-        const res = await this.search(groupId, fileId, item.folderInfo?.folderId)
-        if (res) {
-          modelId = res
-          break
-        }
-      }
-    }
-    return modelId
-  }
-}

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

@@ -1,62 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot11/types'
-import { GroupFileInfo } from '@/ntqqapi/types'
-
-interface Payload {
-  group_id: number | string
-  folder_id: string
-}
-
-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()
-  })
-
-  async _handle(payload: Payload) {
-    const groupId = payload.group_id.toString()
-    const data: GroupFileInfo['item'] = []
-
-    let nextIndex: number | undefined
-    while (nextIndex !== 0) {
-      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
-        sortType: 1,
-        fileCount: 100,
-        startIndex: nextIndex ?? 0,
-        sortOrder: 2,
-        showOnlinedocFolder: 0,
-        folderId: payload.folder_id
-      })
-      data.push(...res.item)
-      nextIndex = res.nextIndex
-    }
-
-    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,17 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
-import { filterNullable, parseBool } from '@/common/utils/misc'
+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
-  reverseOrder: boolean
+  count?: number | string
+  reverseOrder?: boolean
 }
 
 interface Response {
@@ -19,27 +20,28 @@ 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.union([Boolean, Schema.transform(String, parseBool)]).default(false)
-  })
 
   protected async _handle(payload: Payload): Promise<Response> {
-    const { count, reverseOrder } = payload
-    const peer = { chatType: ChatType.Group, peerUid: payload.group_id.toString() }
-    let msgList: RawMessage[]
-    if (!payload.message_seq || +payload.message_seq === 0) {
+    const count = payload.count || 20
+    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 this.ctx.store.getMsgInfoByShortId(+payload.message_seq))?.msgId
+      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq))?.MsgId
       if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
-      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count, true)).msgList
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
     }
     if (!msgList?.length) throw new Error('未找到消息')
-    if (reverseOrder) msgList.reverse()
-    const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
+    if (isReverseOrder) msgList.reverse()
+    await Promise.all(
+      msgList.map(async msg => {
+        msg.msgShortId = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
+      })
+    )
+    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
     return { messages: filterNullable(ob11MsgList) }
   }
 }

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

@@ -1,48 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-
-interface Payload {
-  group_id: number | string
-}
-
-interface Notice {
-  sender_id: number
-  publish_time: number
-  message: {
-    text: string
-    images: {
-      height: string
-      width: string
-      id: string
-    }[]
-  }
-}
-
-export class GetGroupNotice extends BaseAction<Payload, Notice[]> {
-  actionName = ActionName.GoCQHTTP_GetGroupNotice
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required()
-  })
-
-  protected async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupBulletinList(payload.group_id.toString())
-    const result: Notice[] = []
-    for (const feed of data.result.feeds) {
-      result.push({
-        sender_id: +feed.uin,
-        publish_time: +feed.publishTime,
-        message: {
-          text: feed.msg.text,
-          images: feed.msg.pics.map(image => {
-            return {
-              height: String(image.height),
-              width: String(image.width),
-              id: image.id
-            }
-          })
-        }
-      })
-    }
-    return result
-  }
-}

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

@@ -1,10 +1,10 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
-import { GroupFileInfo } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: number | string
+  group_id: string | number
+  file_count: string | number
 }
 
 interface Response {
@@ -14,26 +14,17 @@ interface Response {
 
 export class GetGroupRootFiles extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupRootFiles
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required()
-  })
 
   async _handle(payload: Payload) {
-    const groupId = payload.group_id.toString()
-    const data: GroupFileInfo['item'] = []
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+      sortType: 1,
+      fileCount: +(payload.file_count ?? 50),
+      startIndex: 0,
+      sortOrder: 2,
+      showOnlinedocFolder: 0,
+    })
 
-    let nextIndex: number | undefined
-    while (nextIndex !== 0) {
-      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
-        sortType: 1,
-        fileCount: 100,
-        startIndex: nextIndex ?? 0,
-        sortOrder: 2,
-        showOnlinedocFolder: 0,
-      })
-      data.push(...res.item)
-      nextIndex = res.nextIndex
-    }
+    this.ctx.logger.info(data)
 
     return {
       files: data.filter(item => item.fileInfo)

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

@@ -28,7 +28,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupSystemMsg
 
   async _handle() {
-    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(false, 10)
+    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(10)
     const data: Response = { invited_requests: [], join_requests: [] }
     for (const notify of singleScreenNotifies) {
       if (notify.type == 1) {
@@ -38,7 +38,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           invitor_nick: notify.user1.nickName,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.Unhandle,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       } else if (notify.type == 7) {
@@ -49,7 +49,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           message: notify.postscript,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.Unhandle,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       }

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

@@ -1,53 +1,58 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils'
+import { OB11UserSex } from '../../types'
 import { calcQQLevel } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
 }
 
-interface Response extends OB11User {
-  reg_time: number
-  long_nick: string
-}
-
-export class GetStrangerInfo extends BaseAction<Payload, Response> {
+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) {
-    const uin = payload.user_id.toString()
-    if (getBuildVersion() >= 26702) {
-      const data = await this.ctx.ntUserApi.getUserDetailInfoByUinV2(uin)
-      return {
-        user_id: parseInt(data.detail.uin) || 0,
-        nickname: data.detail.simpleInfo.coreInfo.nick,
-        sex: OB11Entities.sex(data.detail.simpleInfo.baseInfo.sex),
-        age: data.detail.simpleInfo.baseInfo.age,
-        qid: data.detail.simpleInfo.baseInfo.qid,
-        level: data.detail.commonExt.qqLevel && calcQQLevel(data.detail.commonExt.qqLevel) || 0,
-        login_days: 0,
-        reg_time: data.detail.commonExt.regTime,
-        long_nick: data.detail.simpleInfo.baseInfo.longNick
+  protected async _handle(payload: Payload): Promise<OB11User> {
+    if (!(getBuildVersion() >= 26702)) {
+      const user_id = payload.user_id.toString()
+      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUin(user_id)
+      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
+      if (!uid || uid.indexOf('*') != -1) {
+        const ret = {
+          ...extendData,
+          user_id: parseInt(extendData.info.uin) || 0,
+          nickname: extendData.info.nick,
+          sex: OB11UserSex.unknown,
+          age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
+          qid: extendData.info.qid,
+          level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
+          login_days: 0,
+          uid: ''
+        }
+        return ret
       }
+      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
+      return OB11Entities.stranger(data)
     } else {
-      const data = await this.ctx.ntUserApi.getUserDetailInfoByUin(uin)
-      return {
-        user_id: parseInt(data.info.uin) || 0,
-        nickname: data.info.nick,
-        sex: OB11Entities.sex(data.info.sex),
-        age: data.info.birthday_year === 0 ? 0 : new Date().getFullYear() - data.info.birthday_year,
-        qid: data.info.qid,
-        level: data.info.qqLevel && calcQQLevel(data.info.qqLevel) || 0,
-        login_days: 0,
-        reg_time: data.info.regTime,
-        long_nick: data.info.longNick
+      const user_id = payload.user_id.toString()
+      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUinV2(user_id)
+      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
+      if (!uid || uid.indexOf('*') != -1) {
+        const ret = {
+          ...extendData,
+          user_id: parseInt(extendData.detail.uin) || 0,
+          nickname: extendData.detail.simpleInfo.coreInfo.nick,
+          sex: OB11UserSex.unknown,
+          age: 0,
+          level: extendData.detail.commonExt.qqLevel && calcQQLevel(extendData.detail.commonExt.qqLevel) || 0,
+          login_days: 0,
+          uid: ''
+        }
+        return ret
       }
+      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
+      return OB11Entities.stranger(data)
     }
   }
 }

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

@@ -1,5 +1,6 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
@@ -7,16 +8,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) {
-    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
+    if (!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/OCRImage.ts

@@ -1,63 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { uri2local } from '@/common/utils/file'
-import { access, unlink } from 'node:fs/promises'
-
-interface Payload {
-  image: string
-}
-
-interface TextDetection {
-  text: string
-  confidence: number
-  coordinates: {
-    x: number //int32
-    y: number
-  }[]
-}
-
-interface Response {
-  texts: TextDetection[]
-  language: string
-}
-
-export class OCRImage extends BaseAction<Payload, Response> {
-  actionName = ActionName.GoCQHTTP_OCRImage
-  payloadSchema = Schema.object({
-    image: Schema.string().required()
-  })
-
-  protected async _handle(payload: Payload) {
-    const { errMsg, isLocal, path, success } = await uri2local(this.ctx, payload.image, true)
-    if (!success) {
-      throw new Error(errMsg)
-    }
-    await access(path)
-
-    const data = await this.ctx.ntFileApi.ocrImage(path)
-    if (!isLocal) {
-      unlink(path)
-    }
-
-    const texts = data.result.map(item => {
-      const ret: TextDetection = {
-        text: item.text,
-        confidence: 1,
-        coordinates: []
-      }
-      for (let i = 0; i < 4; i++) {
-        const pt = item[`pt${i + 1}`]
-        ret.coordinates.push({
-          x: parseInt(pt.x),
-          y: parseInt(pt.y)
-        })
-      }
-      return ret
-    })
-
-    return {
-      texts,
-      language: ''
-    }
-  }
-}

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

@@ -9,7 +9,6 @@ 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,275 +1,20 @@
-import { unlink } from 'node:fs/promises'
-import { OB11MessageData, OB11MessageNode } from '../../types'
+import SendMsg from '../msg/SendMsg'
+import { OB11PostSendMsg } from '../../types'
 import { ActionName } from '../types'
-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 { message2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
-import { MessageEncoder } from '@/onebot11/helper/createMultiMessage'
-import { Msg } from '@/ntqqapi/proto/compiled'
 
-interface Payload {
-  user_id?: string | number
-  group_id?: string | number
-  messages?: OB11MessageNode[]
-  message?: OB11MessageNode[]
-  message_type?: 'group' | 'private'
-}
+export class SendForwardMsg extends SendMsg {
+  actionName = ActionName.GoCQHTTP_SendForwardMsg
 
-interface Response {
-  message_id: number
-  forward_id: string
-}
-
-export class SendForwardMsg extends BaseAction<Payload, Response> {
-  actionName = ActionName.SendForwardMsg
-  payloadSchema = Schema.object({
-    user_id: Schema.union([Number, String]),
-    group_id: Schema.union([Number, String]),
-    messages: Schema.array(Schema.any()),
-    message: Schema.array(Schema.any()),
-    message_type: Schema.union(['group', 'private'])
-  })
-
-  protected async _handle(payload: Payload) {
-    const messages = payload.messages ?? payload.message
-    if (!messages) {
-      throw new Error('未指定消息内容')
-    }
-    let contextMode = CreatePeerMode.Normal
-    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 nodes = this.parseNodeContent(messages)
-    let fake = true
-    for (const node of nodes) {
-      if (node.data.id) {
-        fake = false
-        break
-      }
-      if (node.data.content?.some(e => {
-        return !MessageEncoder.support.includes(e.type)
-      })) {
-        fake = false
-        break
-      }
-    }
-
-    if (fake && this.ctx.app.native.activated) {
-      return await this.handleFakeForwardNode(peer, nodes)
-    } else {
-      return await this.handleForwardNode(peer, nodes)
-    }
-  }
-
-  private parseNodeContent(nodes: OB11MessageNode[]) {
-    return nodes.map(e => {
-      return {
-        type: e.type,
-        data: {
-          ...e.data,
-          content: e.data.content ? message2List(e.data.content) : undefined
-        }
-      }
-    })
-  }
-
-  private async handleFakeForwardNode(peer: Peer, nodes: OB11MessageNode[]): Promise<Response> {
-    const encoder = new MessageEncoder(this.ctx, peer)
-    const raw = await encoder.generate(nodes)
-    const transmit = Msg.PbMultiMsgTransmit.encode({ pbItemList: raw.multiMsgItems }).finish()
-    const resid = await this.ctx.app.native.uploadForward(peer, transmit.subarray(1))
-    const uuid = crypto.randomUUID()
-    try {
-      const msg = await this.ctx.ntMsgApi.sendMsg(peer, [{
-        elementType: 10,
-        elementId: '',
-        arkElement: {
-          bytesData: JSON.stringify({
-            app: 'com.tencent.multimsg',
-            config: {
-              autosize: 1,
-              forward: 1,
-              round: 1,
-              type: 'normal',
-              width: 300
-            },
-            desc: '[聊天记录]',
-            extra: JSON.stringify({
-              filename: uuid,
-              tsum: raw.tsum,
-            }),
-            meta: {
-              detail: {
-                news: raw.news,
-                resid,
-                source: raw.source,
-                summary: raw.summary,
-                uniseq: uuid,
-              }
-            },
-            prompt: '[聊天记录]',
-            ver: '0.0.0.5',
-            view: 'contact'
-          })
-        }
-      }], 1800)
-      const msgShortId = this.ctx.store.createMsgShortId({
-        chatType: msg!.chatType,
-        peerUid: msg!.peerUid
-      }, msg!.msgId)
-      return { message_id: msgShortId, forward_id: resid }
-    } catch (e) {
-      this.ctx.logger.error('合并转发失败', e)
-      throw new Error(`发送伪造合并转发消息失败 (res_id: ${resid} `)
-    }
-  }
-
-  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.C2C,
-        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[]): Promise<Response> {
-    const selfPeer = {
-      chatType: ChatType.C2C,
-      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,
-            messageNode.data.content as OB11MessageData[],
-            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 msg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
-    const resid = JSON.parse(msg.elements[0].arkElement!.bytesData).meta.detail.resid
-    const msgShortId = this.ctx.store.createMsgShortId({
-      chatType: msg.chatType,
-      peerUid: msg.peerUid
-    }, msg.msgId)
-    return { message_id: msgShortId, forward_id: resid }
+  protected async _handle(payload: OB11PostSendMsg) {
+    if (payload.messages) payload.message = payload.messages
+    return super._handle(payload)
   }
 }
 
 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, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { unlink } from 'fs/promises'
 import { checkFileReceived, uri2local } from '@/common/utils/file'
@@ -7,28 +7,24 @@ interface Payload {
   group_id: number | string
   content: string
   image?: string
-  pinned: number | string //扩展
-  confirm_required: number | string //扩展
+  pinned?: 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 = +payload.pinned
-    const confirmRequired = +payload.confirm_required
+    const pinned = Number(payload.pinned ?? 0)
+    const confirmRequired = Number(payload.confirm_required ?? 1)
 
     let picInfo: { id: string, width: number, height: number } | undefined
     if (payload.image) {
-      const { path, isLocal, success, errMsg } = await uri2local(this.ctx, payload.image, true)
+      const { path, isLocal, success, errMsg } = await uri2local(payload.image, undefined, true)
       if (!success) {
         throw new Error(`设置群公告失败, 错误信息: uri2local: ${errMsg}`)
       }

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

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

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

@@ -0,0 +1,49 @@
+import { BaseAction } 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 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
+  }
+}
+
+interface UploadPrivateFilePayload {
+  user_id: number | string
+  file: string
+  name: string
+}
+
+export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null> {
+  actionName = ActionName.GoCQHTTP_UploadPrivateFile
+
+  protected async _handle(payload: UploadPrivateFilePayload): 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)
+    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
+    await sendMsg(this.ctx, peer, [sendFileEle], [])
+    return null
+  }
+}

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

@@ -1,39 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { SendElement } 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(this.ctx, payload.file)
-    if (!success) {
-      throw new Error(errMsg)
-    }
-    const name = payload.name || fileName
-    if (name.includes('/') || name.includes('\\')) {
-      throw new Error(`文件名 ${name} 不合法`)
-    }
-    const file = await SendElement.file(this.ctx, path, name, 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,35 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { SendElement } from '@/ntqqapi/entities'
-import { uri2local } from '@/common/utils'
-import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
-
-interface UploadPrivateFilePayload {
-  user_id: number | string
-  file: string
-  name: string
-}
-
-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(this.ctx, payload.file)
-    if (!success) {
-      throw new Error(errMsg)
-    }
-    const name = payload.name || fileName
-    if (name.includes('/') || name.includes('\\')) {
-      throw new Error(`文件名 ${name} 不合法`)
-    }
-    const sendFileEle = await SendElement.file(this.ctx, path, name)
-    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    return null
-  }
-}

src/onebot11/action/group/GetGroupEssence.ts

@@ -0,0 +1,16 @@
+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,19 +1,22 @@
+import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 
 interface Payload {
-  group_id: number | string
-  type: 'talkative' | 'performer' | 'legend' | 'strong_newbie' | 'emotion' | 'all'
+  group_id: number
+  type?: WebHonorType
 }
 
 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, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,17 +9,14 @@ 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 groupCode = payload.group_id.toString()
-    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode === groupCode)
+    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
     if (group) {
       return OB11Entities.group(group)
+    } else {
+      throw `群${payload.group_id}不存在`
     }
-    throw new Error(`群${payload.group_id}不存在`)
   }
 }
 

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,40 +1,46 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { calcQQLevel, parseBool } from '@/common/utils/misc'
+import { selfInfo } from '@/common/globalVars'
+import { isNullable } from 'cosmokit'
 
 interface Payload {
   group_id: number | string
   user_id: number | string
-  no_cache: boolean
 }
 
 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(),
-    no_cache: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
-  })
 
   protected async _handle(payload: Payload) {
-    const groupCode = payload.group_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), groupCode)
-    if (!uid) throw new Error('无法获取用户信息')
-    const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, uid, payload.no_cache)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), payload.user_id.toString())
     if (member) {
-      const ret = OB11Entities.groupMember(+groupCode, member)
-      const date = Math.trunc(Date.now() / 1000)
-      ret.last_sent_time ??= date
-      ret.join_time ??= date
-      const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
-      ret.sex = OB11Entities.sex(info.sex!)
-      ret.qq_level = info.qqLevel && calcQQLevel(info.qqLevel) || 0
-      ret.age = info.age ?? 0
+      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 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.join_time ||= Number(member.joinTime || date)
       return ret
+    } else {
+      throw `群成员${payload.user_id}不存在`
     }
-    throw new Error(`群成员${payload.user_id}不存在`)
   }
 }
 

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,42 +1,57 @@
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } 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 groupCode = payload.group_id.toString()
-    let groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
-    for (let i = 0; i < 5; i++) {
-      if (groupMembers.size > 0) {
-        break
+    const groupMembers = await this.ctx.ntGroupApi.getGroupMembers(payload.group_id.toString())
+    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++) {
+      // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
+      _groupMembers[i].join_time = date
+      _groupMembers[i].last_sent_time = date
+      MemberMap.set(_groupMembers[i].user_id, _groupMembers[i])
+    }
+
+    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)
+        }
       }
-      await this.ctx.sleep(60)
-      groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
     }
 
-    const date = Math.trunc(Date.now() / 1000)
-    const groupId = Number(payload.group_id)
-    const ret: OB11GroupMember[] = []
-
-    for (const item of groupMembers.values()) {
-      const member = OB11Entities.groupMember(groupId, item)
-      member.join_time ??= date
-      member.last_sent_time ??= date
-      ret.push(member)
-    }
-
-    return ret
+    _groupMembers = Array.from(MemberMap.values())
+    return _groupMembers
   }
 }
 

src/onebot11/action/group/SendGroupMsg.ts

@@ -6,6 +6,7 @@ class SendGroupMsg extends SendMsg {
   actionName = ActionName.SendGroupMsg
 
   protected _handle(payload: OB11PostSendMsg) {
+    delete (payload as Partial<OB11PostSendMsg>).user_id
     payload.message_type = 'group'
     return super._handle(payload)
   }

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,26 +1,22 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { ActionName } from '../types'
-import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
   flag: string
-  approve: boolean
+  approve?: boolean | string
   reason?: string
 }
 
 export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAddRequest
-  payloadSchema = Schema.object({
-    flag: Schema.string().required(),
-    approve: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true),
-    reason: Schema.string()
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
+    const flag = payload.flag.toString()
+    const approve = payload.approve?.toString() !== 'false'
     await this.ctx.ntGroupApi.handleGroupRequest(
-      payload.flag,
-      payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      flag,
+      approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
       payload.reason
     )
     return null

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,31 +1,26 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
-import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number | string
-  user_id: number | string
+  group_id: number
+  user_id: number
   enable: boolean
 }
 
 export default class SetGroupAdmin extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAdmin
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    enable: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
-    const uin = payload.user_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    if (!uid) throw new Error('无法获取用户信息')
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    const enable = payload.enable.toString() === 'true'
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`
+    }
     await this.ctx.ntGroupApi.setMemberRole(
-      groupCode,
-      uid,
-      payload.enable ? GroupMemberRole.Admin : GroupMemberRole.Normal
+      payload.group_id.toString(),
+      member.uid,
+      enable ? GroupMemberRole.admin : GroupMemberRole.normal,
     )
     return null
   }

src/onebot11/action/group/SetGroupBan.ts

@@ -1,27 +1,22 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
-  user_id: number | string
-  duration: number | string
+  group_id: number
+  user_id: number
+  duration: number
 }
 
 export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    duration: Schema.union([Number, String]).default(30 * 60)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
-    const uin = payload.user_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.banMember(groupCode, [
-      { uid, timeStamp: +payload.duration },
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`
+    }
+    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
+      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
     ])
     return null
   }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,26 +1,21 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
-  user_id: number | string
+  group_id: number
+  user_id: number
   card: string
 }
 
 export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    card: Schema.string().default('')
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
-    const uin = payload.user_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.setMemberCard(groupCode, uid, payload.card)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`
+    }
+    await this.ctx.ntGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,27 +1,21 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number | string
-  user_id: number | string
+  group_id: number
+  user_id: number
   reject_add_request: boolean
 }
 
 export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    reject_add_request: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
-    const uin = payload.user_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.kickMember(groupCode, [uid], payload.reject_add_request)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    if (!member) {
+      throw `群成员${payload.user_id}不存在`
+    }
+    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,19 +1,20 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
-  is_dismiss?: boolean
+  group_id: number
+  is_dismiss: boolean
 }
 
-export default class SetGroupLeave extends BaseAction<Payload, null> {
+export default class SetGroupLeave extends BaseAction<Payload, void> {
   actionName = ActionName.SetGroupLeave
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required()
-  })
 
   protected async _handle(payload: Payload) {
-    await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
-    return null
+    try {
+      await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
+    } catch (e) {
+      this.ctx.logger.error('退群失败', e)
+      throw e
+    }
   }
 }

src/onebot11/action/group/SetGroupName.ts

@@ -1,17 +1,13 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
+  group_id: number
   group_name: string
 }
 
 export default class SetGroupName extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupName
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    group_name: Schema.string().required()
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
     await this.ctx.ntGroupApi.setGroupName(payload.group_id.toString(), payload.group_name)

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,21 +1,17 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number | string
+  group_id: number
   enable: boolean
 }
 
 export default class SetGroupWholeBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupWholeBan
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    enable: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(true)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), payload.enable)
+    const enable = payload.enable.toString() === 'true'
+    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), enable)
     return null
   }
 }

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 } from './user/GetFriendList'
+import { GetFriendList, GetFriendWithCategory } from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -37,6 +37,7 @@ 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'
@@ -45,14 +46,14 @@ import { GetGroupMsgHistory } from './go-cqhttp/GetGroupMsgHistory'
 import GetFile from './file/GetFile'
 import { GetForwardMsg } from './go-cqhttp/GetForwardMsg'
 import { GetCookies } from './user/GetCookie'
-import { SetMsgEmojiLike } from './llonebot/SetMsgEmojiLike'
+import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
-import { GetEssenceMsgList } from './go-cqhttp/GetGroupEssence'
+import { GetGroupEssence } from './group/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
 import { HandleQuickOperation } from './go-cqhttp/QuickOperation'
 import { SetEssenceMsg } from './go-cqhttp/SetEssenceMsg'
-import { DeleteEssenceMsg } from './go-cqhttp/DelEssenceMsg'
-import { GetEvent } from './llonebot/GetEvent'
+import { DelEssenceMsg } from './go-cqhttp/DelEssenceMsg'
+import GetEvent from './llonebot/GetEvent'
 import { DelGroupFile } from './go-cqhttp/DelGroupFile'
 import { GetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
 import { CreateGroupFileFolder } from './go-cqhttp/CreateGroupFileFolder'
@@ -62,22 +63,6 @@ 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'
-import { GetGroupFileUrl } from './go-cqhttp/GetGroupFileUrl'
-import { GetGroupNotice } from './go-cqhttp/GetGroupNotice'
-import { GetRobotUinRange } from './llonebot/GetRobotUinRange'
-import { DeleteFriend } from './go-cqhttp/DeleteFriend'
-import { OCRImage } from './go-cqhttp/OCRImage'
-import { GroupPoke } from './llonebot/GroupPoke'
-import { FriendPoke } from './llonebot/FriendPoke'
-import { GetGroupFileSystemInfo } from './go-cqhttp/GetGroupFileSystemInfo'
-import { GetCredentials } from './system/GetCredentials'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -91,13 +76,6 @@ export function initActionMap(adapter: Adapter) {
     new GetEvent(adapter),
     new SetOnlineStatus(adapter),
     new GetProfileLike(adapter),
-    new GetFriendMsgHistory(adapter),
-    new FetchEmojiLike(adapter),
-    new FetchCustomFace(adapter),
-    new SetMsgEmojiLike(adapter),
-    new GetRobotUinRange(adapter),
-    new GroupPoke(adapter),
-    new FriendPoke(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -128,11 +106,11 @@ export function initActionMap(adapter: Adapter) {
     new GetRecord(adapter),
     new CleanCache(adapter),
     new GetCookies(adapter),
+    new SetMsgEmojiLike(adapter),
     new ForwardFriendSingleMsg(adapter),
     new ForwardGroupSingleMsg(adapter),
-    new GetCredentials(adapter),
-    // go-cqhttp
-    new GetEssenceMsgList(adapter),
+    //以下为go-cqhttp api
+    new GetGroupEssence(adapter),
     new GetGroupHonorInfo(adapter),
     new SendForwardMsg(adapter),
     new SendGroupForwardMsg(adapter),
@@ -147,22 +125,16 @@ export function initActionMap(adapter: Adapter) {
     new GetForwardMsg(adapter),
     new HandleQuickOperation(adapter),
     new SetEssenceMsg(adapter),
-    new DeleteEssenceMsg(adapter),
+    new DelEssenceMsg(adapter),
     new DelGroupFile(adapter),
     new GetGroupSystemMsg(adapter),
     new CreateGroupFileFolder(adapter),
     new DelGroupFolder(adapter),
     new GetGroupAtAllRemain(adapter),
     new GetGroupRootFiles(adapter),
-    new SendGroupNotice(adapter),
-    new GetGroupFilesByFolder(adapter),
-    new GetGroupFileUrl(adapter),
-    new GetGroupNotice(adapter),
-    new DeleteFriend(adapter),
-    new OCRImage(adapter),
-    new GetGroupFileSystemInfo(adapter),
+    new SendGroupNotice(adapter)
   ]
-  const actionMap = new Map()
+  const actionMap = new Map<string, BaseAction<any, unknown>>()
   for (const action of actionHandlers) {
     actionMap.set(action.actionName, action)
     actionMap.set(action.actionName + '_async', action)