Merge pull request #489 from LLOneBot/dev

release: 4.1.1

.gitattributes

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

README.md

@@ -1,6 +1,6 @@
 # LLOneBot
 
-LiteLoaderQQNT 插件，实现 OneBot 11 协议，用于 QQ 机器人开发
+LiteLoaderQQNT 插件，实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发
 
 > [!CAUTION]\
 > 请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论任何与本插件存在相关性的信息
@@ -23,6 +23,10 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 [![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
 
+## 贡献者
+
+[![Contributors](https://contributors-img.web.app/image?repo=LLOneBot/LLOneBot)](https://github.com/LOneBot/LLOneBot/graphs/contributors)
+
 ## 鸣谢
 
 - [NapCatQQ](https://github.com/NapNeko/NapCatQQ)

manifest.json

@@ -3,8 +3,8 @@
   "type": "extension",
   "name": "LLOneBot",
   "slug": "LLOneBot",
-  "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
+  "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "3.33.3",
+  "version": "4.1.1",
   "icon": "./icon.webp",
   "authors": [
     {

package.json

@@ -12,37 +12,38 @@
     "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-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"
+    "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"
   },
   "author": "",
   "license": "MIT",
   "dependencies": {
     "@minatojs/driver-sqlite": "^4.6.0",
-    "compressing": "^1.10.1",
+    "@satorijs/element": "^3.1.7",
+    "@satorijs/protocol": "^1.4.2",
+    "compare-versions": "^6.1.1",
     "cordis": "^3.18.1",
     "cors": "^2.8.5",
-    "cosmokit": "^1.6.2",
+    "cosmokit": "^1.6.3",
-    "express": "^5.0.0",
+    "express": "^5.0.1",
-    "fast-xml-parser": "^4.5.0",
-    "file-type": "^19.5.0",
     "fluent-ffmpeg": "^2.1.3",
     "minato": "^3.6.0",
     "protobufjs": "^7.4.0",
     "silk-wasm": "^3.6.1",
+    "ts-case-convert": "^2.1.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
     "@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.2",
+    "typescript": "^5.6.3",
-    "vite": "^5.4.7",
+    "vite": "^5.4.9",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.5.0"
+  "packageManager": "yarn@4.5.1"
 }

scripts/gen-manifest.ts

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

src/common/channels.ts

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

src/common/types.ts

@@ -1,4 +1,5 @@
 export interface OB11Config {
+  enable: boolean
   httpPort: number
   httpHosts: string[]
   httpSecret?: string
@@ -16,21 +17,24 @@ export interface OB11Config {
    */
   enableQOAutoQuote?: boolean
   listenLocalhost: boolean
+  reportSelfMessage: boolean
 }
 
-export interface CheckVersion {
+export interface SatoriConfig {
-  result: boolean
+  enable: boolean
-  version: string
+  listen: string
+  port: number
+  token: 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
@@ -45,6 +49,13 @@ 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,7 +53,6 @@ function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?
 }
 
 export async function encodeSilk(ctx: Context, filePath: string) {
-  try {
   const file = await fsPromise.readFile(filePath)
   if (!isSilk(file)) {
     ctx.logger.info(`语音文件${filePath}需要转换成silk`)
@@ -93,10 +92,6 @@ export async function encodeSilk(ctx: Context, filePath: string) {
       duration,
     }
   }
-  } catch (err) {
-    ctx.logger.error('convert silk failed', (err as Error).stack)
-    return {}
-  }
 }
 
 type OutFormat = 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'

src/common/utils/file.ts

@@ -4,7 +4,7 @@ import path from 'node:path'
 import { TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
-import { fileTypeFromFile } from 'file-type'
+import { Context } from 'cordis'
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
@@ -118,7 +118,7 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, filename?: string, needExt?: boolean): Promise<Uri2LocalRes> {
+export async function uri2local(ctx: Context, uri: string, needExt?: boolean): Promise<Uri2LocalRes> {
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
@@ -136,15 +136,16 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
     try {
       const res = await fetchFile(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 fileTypeFromFile(filePath))?.ext
+        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -157,12 +158,12 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
   }
 
   if (type === FileUriType.OneBotBase64) {
-    filename ??= randomUUID()
+    let 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 fileTypeFromFile(filePath))?.ext
+      const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
       filename += `.${ext}`
       await fsPromise.rename(filePath, `${filePath}.${ext}`)
       filePath = `${filePath}.${ext}`
@@ -174,12 +175,12 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
     // 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) {
-      filename ??= randomUUID()
+      let filename = randomUUID()
       const [, _type, base64] = capture
       let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
       if (needExt) {
-        const ext = (await fileTypeFromFile(filePath))?.ext
+        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -190,26 +191,3 @@ export async function uri2local(uri: string, filename?: string, needExt?: boolea
 
   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,24 +2,7 @@ import fs from 'fs'
 import path from 'node:path'
 import { getConfigUtil } from '../config'
 import { LOG_DIR } from '../globalVars'
-import { Dict } from 'cosmokit'
+import { inspect } from 'node:util'
-
-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, '-')
 
@@ -29,13 +12,17 @@ export function log(...msg: unknown[]) {
   }
   let logMsg = ''
   for (const msgItem of msg) {
-    // 判断是否是对象
     if (typeof msgItem === 'object') {
-      logMsg += JSON.stringify(truncateString(msgItem)) + ' '
+      logMsg += inspect(msgItem, {
-      continue
+        depth: 10,
-    }
+        compact: true,
+        breakLength: Infinity,
+        maxArrayLength: 220
+      }) + ' '
+    } else {
       logMsg += msgItem + ' '
     }
+  }
   const currentDateTime = new Date().toLocaleString()
   logMsg = `${currentDateTime} ${logMsg}\n\n`
   fs.appendFile(path.join(LOG_DIR, logFileName), logMsg, () => { })

src/common/utils/misc.ts

@@ -38,3 +38,10 @@ 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,75 +1,40 @@
 import path from 'node:path'
-import compressing from 'compressing'
 import { writeFile } from 'node:fs/promises'
 import { version } from '../../version'
-import { copyFolder, log, fetchFile } from '.'
+import { log, fetchFile } from '.'
-import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
+import { TEMP_DIR } from '../globalVars'
+import { compare } from 'compare-versions'
 
 const downloadMirrorHosts = ['https://ghp.ci/']
 const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
-  const latestVersionText = await getRemoteVersion()
+  const latestVersion = await getRemoteVersion()
-  const latestVersion = latestVersionText.split('.')
   log('LLOneBot latest version', latestVersion)
-  const currentVersion = version.split('.')
+  if (latestVersion === '') {
-  //log('llonebot current version', currentVersion)
+    return { result: false, version: latestVersion }
-  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
   }
+  if (compare(latestVersion, version, '>')) {
+    return { result: true, version: latestVersion }
   }
   return { result: false, version: version }
 }
 
-export async function upgradeLLOneBot() {
+export async function upgradeLLOneBot(): Promise<boolean> {
   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)
-        downloadSuccess = true
+        return globalThis.LiteLoader.api.plugin.install(filePath)
-        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('llonebot/config-updated', input => {
+    ctx.on('llob/config-updated', input => {
       enable = input.log!
     })
   }

src/main/main.ts

@@ -2,6 +2,10 @@ import path from 'node:path'
 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 {
@@ -11,15 +15,12 @@ import {
   CHANNEL_LOG,
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
-  CHANNEL_UPDATE,
+  CHANNEL_UPDATE
-  CHANNEL_SET_CONFIG_CONFIRMED
 } from '../common/channels'
-import { getBuildVersion } from '../common/utils'
+import { startHook } from '../ntqqapi/hook'
-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'
@@ -33,15 +34,11 @@ import {
   NTQQWebApi,
   NTQQWindowApi
 } from '../ntqqapi/api'
-import { mkdir } from 'node:fs/promises'
 import { existsSync, mkdirSync } from 'node:fs'
-import Database from 'minato'
-import SQLiteDriver from '@minatojs/driver-sqlite'
-import Store from './store'
 
 declare module 'cordis' {
   interface Events {
-    'llonebot/config-updated': (input: LLOBConfig) => void
+    'llob/config-updated': (input: LLOBConfig) => void
   }
 }
 
@@ -57,6 +54,29 @@ function onLoad() {
     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()
   })
@@ -115,7 +135,9 @@ function onLoad() {
       if (!ask) {
         getConfigUtil().setConfig(config)
         log('配置已更新', config)
-        checkFfmpeg(config.ffmpeg).then()
+        if (started) {
+          ctx.parallel('llob/config-updated', config)
+        }
         resolve(true)
         return
       }
@@ -132,7 +154,9 @@ function onLoad() {
           if (result.response === 0) {
             getConfigUtil().setConfig(config)
             log('配置已更新', config)
-            checkFfmpeg(config.ffmpeg).then()
+            if (started) {
+              ctx.parallel('llob/config-updated', config)
+            }
             resolve(true)
           }
         })
@@ -147,87 +171,65 @@ function onLoad() {
     log(arg)
   })
 
-  async function start() {
+  const intervalId = setInterval(async () => {
-    log('process pid', process.pid)
-    const config = getConfigUtil().getConfig()
-    if (!config.enableLLOB) {
-      llonebotError.otherError = 'LLOneBot 未启动'
-      log('LLOneBot 开关设置为关闭，不启动LLOneBot')
-      return
-    }
-    if (!existsSync(TEMP_DIR)) {
-      await mkdir(TEMP_DIR)
-    }
-    const dbDir = path.join(DATA_DIR, 'database')
-    if (!existsSync(dbDir)) {
-      await mkdir(dbDir)
-    }
-    const ctx = new Context()
-    ctx.plugin(Log, {
-      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.plugin(Database)
-    ctx.plugin(SQLiteDriver, {
-      path: path.join(dbDir, `${selfInfo.uin}.db`)
-    })
-    ctx.plugin(Store)
-    ctx.start()
-    ipcMain.on(CHANNEL_SET_CONFIG_CONFIRMED, (event, config: LLOBConfig) => {
-      ctx.parallel('llonebot/config-updated', config)
-    })
-  }
-
-  const buildVersion = getBuildVersion()
-
-  const intervalId = setInterval(() => {
     const self = Object.assign(selfInfo, {
       uin: globalThis.authData?.uin,
       uid: globalThis.authData?.uid,
       online: true
     })
-    if (self.uin && (buildVersion >= 27187 || getSession())) {
+    if (self.uin) {
       clearInterval(intervalId)
-      start()
+      log('process pid', process.pid)
+
+      const config = getConfigUtil().getConfig()
+
+      if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
+        startHook()
+        await ctx.sleep(550)
+      } 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 = ''
     }
   }, 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,4 +1,4 @@
-import { Peer } from '@/ntqqapi/types'
+import { Peer, RawMessage } from '@/ntqqapi/types'
 import { createHash } from 'node:crypto'
 import { LimitedHashTable } from '@/common/utils/table'
 import { FileCacheV2 } from '@/common/types'
@@ -24,13 +24,15 @@ interface MsgInfo {
   peer: Peer
 }
 
-export default class Store extends Service {
+class Store extends Service {
   static inject = ['database', 'model']
   private cache: LimitedHashTable<string, number>
+  private messages: Map<string, RawMessage>
 
-  constructor(protected ctx: Context) {
+  constructor(protected ctx: Context, public config: Store.Config) {
     super(ctx, 'store', true)
-    this.cache = new LimitedHashTable<string, number>(1000)
+    this.cache = new LimitedHashTable(1000)
+    this.messages = new Map()
     this.initDatabase()
   }
 
@@ -60,9 +62,10 @@ export default class Store extends Service {
   }
 
   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 //设置第一个bit为0 保证shortId为正数
+    hash[0] &= 0x7f //保证shortId为正数
     const shortId = hash.readInt32BE()
     this.cache.set(cacheKey, shortId)
     this.ctx.database.upsert('message', [{
@@ -123,4 +126,29 @@ export default class Store extends Service {
   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

@@ -16,14 +16,11 @@ import path from 'node:path'
 import { existsSync } from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { RkeyManager } from '@/ntqqapi/helper/rkey'
-import { getSession } from '@/ntqqapi/wrapper'
+import { RichMediaDownloadCompleteNotify, RichMediaUploadCompleteNotify, RMBizType, Peer } from '@/ntqqapi/types/msg'
-import { OnRichMediaDownloadCompleteParams, Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
-import { fileTypeFromFile } from 'file-type'
 import { copyFile, stat, unlink } from 'node:fs/promises'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
-import { TEMP_DIR } from '@/common/globalVars'
 
 declare module 'cordis' {
   interface Context {
@@ -40,40 +37,34 @@ export class NTQQFileApi extends Service {
     this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
-  async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string | undefined> {
-    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: {
+      params: {
         downSourceType: 1,
         triggerType: 1
-        },
+      }
-      }, null])
+    }])
     if (data.result !== 0) {
       this.ctx.logger.warn('getVideoUrl', data)
     }
     return data.urlResult.domainUrl[0]?.url
   }
-  }
 
   async getFileType(filePath: string) {
-    return fileTypeFromFile(filePath)
+    return await invoke<{
+      ext: string
+      mime: string
+    }>(NTMethod.FILE_TYPE, [filePath], {
+      className: NTClass.FS_API
+    })
   }
 
-  // 上传文件到QQ的文件夹
+  /** 上传文件到 QQ 的文件夹 */
-  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
+  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
     let fileName = path.basename(filePath)
     if (!fileName.includes('.')) {
@@ -107,8 +98,8 @@ export class NTQQFileApi extends Service {
     chatType: ChatType,
     peerUid: string,
     elementId: string,
-    thumbPath: string,
+    thumbPath = '',
-    sourcePath: string,
+    sourcePath = '',
     timeout = 1000 * 60 * 2,
     force = false
   ) {
@@ -122,10 +113,9 @@ export class NTQQFileApi extends Service {
         return sourcePath
       }
     }
-    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
+    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
       'nodeIKernelMsgService/downloadRichMedia',
-      [
+      [{
-        {
         getReq: {
           fileModelId: '0',
           downloadSourceType: 0,
@@ -138,22 +128,14 @@ export class NTQQFileApi extends Service {
           downloadType: 1,
           filePath: thumbPath,
         },
-        },
+      }],
-        null,
-      ],
       {
         cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
         cmdCB: payload => payload.notifyInfo.msgId === msgId,
         timeout
       }
     )
-    let filePath = data.notifyInfo.filePath
+    return data.notifyInfo.filePath
-    if (filePath.startsWith('\\')) {
-      const downloadPath = TEMP_DIR
-      filePath = path.join(downloadPath, filePath)
-      // 下载路径是下载文件夹的相对路径
-    }
-    return filePath
   }
 
   async getImageSize(filePath: string) {
@@ -181,8 +163,8 @@ export class NTQQFileApi extends Service {
     if (url) {
       const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
       const imageAppid = parsedUrl.searchParams.get('appid')
-      const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
+      const isNTPic = imageAppid && ['1406', '1407'].includes(imageAppid)
-      if (isNewPic) {
+      if (isNTPic) {
         let rkey = parsedUrl.searchParams.get('rkey')
         if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
@@ -201,6 +183,56 @@ 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 {
@@ -209,21 +241,19 @@ export class NTQQFileCacheApi extends Service {
   }
 
   async setCacheSilentScan(isSilent: boolean = true) {
-    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }, null])
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }])
   }
 
   getCacheSessionPathList() {
-    return invoke<
+    return invoke<Array<{
-      {
       key: string
       value: string
-      }[]
+    }>>(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
-    >(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
   }
 
   scanCache() {
-    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
-    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second })
   }
 
   getHotUpdateCachePath() {
@@ -243,13 +273,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,9 +1,6 @@
-import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
+import { Friend, 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' {
@@ -19,38 +16,22 @@ export class NTQQFriendApi extends Service {
 
   /** 大于或等于 26702 应使用 getBuddyV2 */
   async getFriends() {
-    const data = await invoke<{
+    const res = await invoke<{
       data: {
         categoryId: number
         categroyName: string
         categroyMbCount: number
         buddyList: Friend[]
       }[]
-    }>(
+    }>('getBuddyList', [], {
-      'getBuddyList',
-      [],
-      {
       className: NTClass.NODE_STORE_API,
       cbCmd: ReceiveCmdS.FRIENDS,
-        afterFirstCmd: false,
+      afterFirstCmd: false
-      }
+    })
-    )
+    return res.data.flatMap(e => e.buddyList)
-    const _friends: Friend[] = []
-    for (const item of data.data) {
-      _friends.push(...item.buddyList)
-    }
-    return _friends
   }
 
   async handleFriendRequest(friendUid: string, reqTime: string, accept: boolean) {
-    const session = getSession()
-    if (session) {
-      return session.getBuddyService().approvalFriendRequest({
-        friendUid,
-        reqTime,
-        accept
-      })
-    } else {
     return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
       approvalInfo: {
         friendUid,
@@ -59,9 +40,8 @@ export class NTQQFriendApi extends Service {
       },
     }])
   }
-  }
 
-  async getBuddyV2(refresh = false): Promise<FriendV2[]> {
+  async getBuddyV2(refresh = false): Promise<SimpleInfo[]> {
     const data = await invoke<{
       buddyCategory: CategoryFriend[]
       userSimpleInfos: Record<string, SimpleInfo>
@@ -78,7 +58,7 @@ export class NTQQFriendApi extends Service {
     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<{
@@ -102,26 +82,7 @@ export class NTQQFriendApi extends Service {
     return retMap
   }
 
-  async getBuddyV2ExWithCate(refresh = false) {
+  async getBuddyV2WithCate(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>
@@ -134,39 +95,31 @@ export class NTQQFriendApi extends Service {
         afterFirstCmd: false,
       }
     )
-      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
+    return data
-      for (const item of data.buddyCategory) {
-        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
-      }
-      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> {
-    const session = getSession()
+    return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }])
-    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 }, null])
+    const ret = await invoke('nodeIKernelBuddyService/getBuddyRecommendContactArkJson', [{ uin }])
     return ret.arkMsg
   }
 
   async setBuddyRemark(uid: string, remark: string) {
     return await invoke('nodeIKernelBuddyService/setBuddyRemark', [{
       remarkParams: { uid, remark }
-    }, null])
+    }])
+  }
+
+  async delBuddy(friendUid: string) {
+    return await invoke('nodeIKernelBuddyService/delBuddy', [{
+      delInfo: {
+        friendUid,
+        tempBlock: false,
+        tempBothDel: true
+      }
+    }])
   }
 }

src/ntqqapi/api/group.ts

@@ -6,16 +6,15 @@ import {
   GroupNotifies,
   GroupRequestOperateTypes,
   GetFileListParam,
-  OnGroupFileInfoUpdateParams,
+  PublishGroupBulletinReq,
-  PublishGroupBulletinReq
+  GroupAllInfo,
+  GroupFileInfo,
+  GroupBulletinListResult
 } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { NTQQWindows } from './window'
-import { getSession } from '../wrapper'
-import { NodeIKernelGroupService } from '../services'
 import { Service, Context } from 'cordis'
-import { isNumeric } from '@/common/utils/misc'
 
 declare module 'cordis' {
   interface Context {
@@ -26,8 +25,6 @@ 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)
   }
@@ -48,56 +45,45 @@ export class NTQQGroupApi extends Service {
     return result.groupList
   }
 
-  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
+  async getGroupMembers(groupCode: string, num = 3000) {
-    const session = getSession()
+    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
-    let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
+      groupCode,
-    if (session) {
+      scene: 'groupMemberList_MainWindow'
-      const groupService = session.getGroupService()
+    }])
-      const sceneId = groupService.createMemberListScene(groupCode, 'groupMemberList_MainWindow')
+    const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
-      result = await groupService.getNextMemberList(sceneId, undefined, num)
+    if (data.errCode !== 0) {
-    } else {
+      throw new Error('获取群成员列表出错,' + data.errMsg)
-      const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
-      result = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }, null])
     }
-    if (result.errCode !== 0) {
+    return data.result.infos
-      throw ('获取群成员列表出错,' + result.errMsg)
-    }
-    return result.result.infos
   }
 
-  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
+  async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
-    const groupCodeStr = groupCode.toString()
+    await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
-    const memberUinOrUidStr = memberUinOrUid.toString()
+      registerEvent: true
-    if (!this.groupMembers.has(groupCodeStr)) {
+    })
-      try {
+
-        // 更新群成员列表
+    const data = await invoke<{
-        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      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
       }
-      catch (e) {
+    )
-        return null
+    return data.members.get(uid)!
-      }
-    }
-    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(14)
+    await this.getSingleScreenNotifies(false, 14)
     return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
@@ -105,16 +91,18 @@ export class NTQQGroupApi extends Service {
     )
   }
 
-  async getSingleScreenNotifies(num: number) {
+  async getSingleScreenNotifies(doubt: boolean, number: number, startSeq = '') {
-    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
+    await invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
-    return (await invoke<GroupNotifies>(
+
+    const data = await invoke<GroupNotifies>(
       'nodeIKernelGroupService/getSingleScreenNotifies',
-      [{ doubt: false, startSeq: '', number: num }, null],
+      [{ doubt, startSeq, number }],
       {
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
-    )).notifies
+    )
+    return data.notifies
   }
 
   async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
@@ -122,20 +110,9 @@ export class NTQQGroupApi extends Service {
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
-    const session = getSession()
+    const doubt = flagitem[3] === '1'
-    if (session) {
-      return session.getGroupService().operateSysNotify(false, {
-        operateType, // 2 拒绝
-        targetMsg: {
-          seq,  // 通知序列号
-          type,
-          groupCode,
-          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-        }
-      })
-    } else {
     return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-        doubt: false,
+      doubt,
       operateMsg: {
         operateType,
         targetMsg: {
@@ -145,93 +122,43 @@ export class NTQQGroupApi extends Service {
           postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
         },
       },
-      }, null])
+    }])
-    }
   }
 
   async quitGroup(groupCode: string) {
-    const session = getSession()
+    return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }])
-    if (session) {
-      return session.getGroupService().quitGroup(groupCode)
-    } else {
-      return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }, null])
-    }
   }
 
-  async kickMember(
+  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
-    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 }>) {
-    // 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) {
-    const session = getSession()
+    return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }])
-    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) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }])
-    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) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }])
-    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) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }])
-    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 }, null])
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }])
   }
 
   async removeGroupEssence(groupCode: string, msgId: string) {
-    const session = getSession()
-    if (session) {
-      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-      return session.getGroupService().removeGroupEssence({
-        groupCode: groupCode,
-        msgRandom: Number(data?.msgList[0].msgRandom),
-        msgSeq: Number(data?.msgList[0].msgSeq)
-      })
-    } else {
     const ntMsgApi = this.ctx.get('ntMsgApi')!
     const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
     return await invoke('nodeIKernelGroupService/removeGroupEssence', [{
@@ -240,20 +167,10 @@ export class NTQQGroupApi extends Service {
         msgRandom: Number(data?.msgList[0].msgRandom),
         msgSeq: Number(data?.msgList[0].msgSeq)
       }
-      }, null])
+    }])
-    }
   }
 
   async addGroupEssence(groupCode: string, msgId: string) {
-    const session = getSession()
-    if (session) {
-      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-      return session.getGroupService().addGroupEssence({
-        groupCode: groupCode,
-        msgRandom: Number(data?.msgList[0].msgRandom),
-        msgSeq: Number(data?.msgList[0].msgSeq)
-      })
-    } else {
     const ntMsgApi = this.ctx.get('ntMsgApi')!
     const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
     return await invoke('nodeIKernelGroupService/addGroupEssence', [{
@@ -262,56 +179,52 @@ export class NTQQGroupApi extends Service {
         msgRandom: Number(data?.msgList[0].msgRandom),
         msgSeq: Number(data?.msgList[0].msgSeq)
       }
-      }, null])
+    }])
-    }
   }
 
   async createGroupFileFolder(groupId: string, folderName: string) {
-    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }, null])
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }])
   }
 
   async deleteGroupFileFolder(groupId: string, folderId: string) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }])
   }
 
   async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
-    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
-    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
+    const data = await invoke<{ fileInfo: GroupFileInfo }>(
       'nodeIKernelRichMediaService/getGroupFileList',
-      [
+      [{
-        {
         groupId,
         fileListForm
-        },
+      }],
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
         afterFirstCmd: false,
         cmdCB: (payload, result) => payload.fileInfo.reqId === result
       }
     )
-    return data.fileInfo.item
+    return data.fileInfo
   }
 
   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 }, null])
+    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }])
   }
 
   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 }, null])
+    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }])
   }
 
   async getGroupRecommendContact(groupCode: string) {
-    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }, null])
+    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }])
     return ret.arkJson
   }
 
@@ -322,7 +235,7 @@ export class NTQQGroupApi extends Service {
         msgSeq: +msgSeq,
         msgRandom: +msgRandom
       }
-    }, null])
+    }])
   }
 
   async getGroupHonorList(groupCode: string) {
@@ -331,6 +244,101 @@ export class NTQQGroupApi extends Service {
       req: {
         groupCode: [+groupCode]
       }
-    }, null])
+    }])
+  }
+
+  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,7 +1,5 @@
 import { invoke, NTMethod } from '../ntcall'
-import { GeneralCallResult } from '../services'
 import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
-import { getSession } from '@/ntqqapi/wrapper'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -19,98 +17,80 @@ export class NTQQMsgApi extends Service {
   }
 
   async getTempChatInfo(chatType: ChatType, peerUid: string) {
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }])
-    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 = true) {
+  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/sysface_res/apng/ 下可以看到所有QQ表情预览
-    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
+    // 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'
-    if (session) {
+    return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }])
-      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) {
-    const session = getSession()
+    return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }])
-    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<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }, null])
+    return await invoke(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }])
   }
 
-  async activateChatAndGetHistory(peer: Peer) {
+  async activateChatAndGetHistory(peer: Peer, cnt: number) {
-    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt: 20 }, null])
+    // 消息从旧到新
+    return await invoke(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt, msgId: '0', queryOrder: true }])
   }
 
   async getAioFirstViewLatestMsgs(peer: Peer, cnt: number) {
-    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }, null])
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }])
   }
 
-  async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
+  async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
     if (!peer) throw new Error('peer is not allowed')
     if (!msgIds) throw new Error('msgIds is not allowed')
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }])
-    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, isReverseOrder: boolean = false) {
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
-    const session = getSession()
+    // 默认情况下消息时间从新到旧
-    // 消息时间从旧到新
+    return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder }])
-    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[]) {
-    const session = getSession()
+    return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }])
-    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 msgId = await this.generateMsgUniqueId(peer.chatType)
+    const uniqueId = await this.generateMsgUniqueId(peer.chatType)
-    peer.guildId = msgId
+    const msgAttributeInfos = new Map()
+    msgAttributeInfos.set(0, {
+      attrType: 0,
+      attrId: uniqueId,
+      vasMsgInfo: {
+        msgNamePlateInfo: {},
+        bubbleInfo: {},
+        avatarPendantInfo: {},
+        vasFont: {},
+        iceBreakInfo: {}
+      }
+    })
+
+    let sentMsgId: string
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/sendMsg',
-      [
+      [{
-        {
         msgId: '0',
         peer,
         msgElements,
-          msgAttributeInfos: new Map()
+        msgAttributeInfos
-        },
+      }],
-        null
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+            if (msgRecord.msgAttrs.get(0)?.attrId === uniqueId && msgRecord.sendStatus === 2) {
+              sentMsgId = msgRecord.msgId
               return true
             }
           }
@@ -119,23 +99,39 @@ export class NTQQMsgApi extends Service {
         timeout
       }
     )
-    return data.msgList.find(msgRecord => msgRecord.guildId === msgId)
+
+    return data.msgList.find(msgRecord => msgRecord.msgId === sentMsgId)
   }
 
   async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    const session = getSession()
+    const uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
-    if (session) {
+    destPeer.guildId = uniqueId
-      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
+    const data = await invoke<{ msgList: RawMessage[] }>(
-    } else {
+      'nodeIKernelMsgService/forwardMsgWithComment',
-      return await invoke(NTMethod.FORWARD_MSG, [{
+      [{
         msgIds,
         srcContact: srcPeer,
         dstContacts: [destPeer],
         commentElements: [],
         msgAttributeInfos: new Map(),
-      }, null])
+      }],
+      {
+        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)
+  }
 
   async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
     const senderShowName = await this.ctx.ntUserApi.getSelfNick(true)
@@ -145,66 +141,46 @@ 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(),
-        },
+      }],
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+            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
+              }
               return true
             }
           }
           return false
-        },
+        }
       }
     )
-    for (const msg of data.msgList) {
+    return data.msgList.find(msgRecord => {
-      const arkElement = msg.elements.find(ele => ele.arkElement)
+      const { arkElement } = msgRecord.elements[0]
-      if (!arkElement) {
+      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
-        continue
+        return true
-      }
-      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) {
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }])
-    if (session) {
-      return await session.getMsgService().getSingleMsg(peer, msgSeq)
-    } else {
-      return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }, null])
-    }
   }
 
   async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
@@ -222,7 +198,7 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }, null])
+    }])
   }
 
   async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[] = []) {
@@ -240,11 +216,11 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }, null])
+    }])
   }
 
   async setMsgRead(peer: Peer) {
-    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }])
   }
 
   async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number) {
@@ -254,7 +230,7 @@ export class NTQQMsgApi extends Service {
       emojiId,
       emojiType,
       cnt: count
-    }, null])
+    }])
   }
 
   async fetchFavEmojiList(count: number) {
@@ -263,10 +239,49 @@ export class NTQQMsgApi extends Service {
       count,
       backwardFetch: true,
       forceRefresh: true
-    }, null])
+    }])
   }
 
   async generateMsgUniqueId(chatType: number) {
-    return await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType }])
+    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 }])
   }
 }

src/ntqqapi/api/user.ts

@@ -1,10 +1,8 @@
-import { invoke } from '../ntcall'
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfo, UserDetailSource, ProfileBizType, SimpleInfo } from '../types'
-import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
+import { invoke, NTClass } from '../ntcall'
 import { getBuildVersion } from '@/common/utils'
-import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { UserDetailSource, ProfileBizType } from '../services'
+import { isNullable, pick, Time } from 'cosmokit'
-import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -21,31 +19,25 @@ export class NTQQUserApi extends Service {
     super(ctx, 'ntUserApi', true)
   }
 
-  async setQQAvatar(path: string) {
+  async setSelfAvatar(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: UserDetailInfoListenerArg }>(
+    const result = await invoke<{ info: UserDetailInfo }>(
       'nodeIKernelProfileService/fetchUserDetailInfo',
-      [
+      [{
-        {
         callFrom: 'BuddyProfileStore',
         uid: [uid],
         source: UserDetailSource.KSERVER,
         bizList: [ProfileBizType.KALL]
-        },
+      }],
-        null
-      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
         afterFirstCmd: false,
@@ -71,13 +63,10 @@ export class NTQQUserApi extends Service {
     }
     const result = await invoke<{ info: User }>(
       'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-      [
+      [{
-        {
         uid,
         bizList: [0]
-        },
+      }],
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
         afterFirstCmd: false,
@@ -99,109 +88,77 @@ export class NTQQUserApi extends Service {
   }
 
   async getPSkey(domains: string[]) {
-    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }, null])
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }])
   }
 
   async like(uid: string, count = 1) {
-    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) {
+  async getUidByUinV1(uin: string, groupCode?: string) {
-    const session = getSession()
+    let uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-    // 通用转换开始尝试
-    let uid = (await session?.getUixConvertService().getUid([uin]))?.uidInfo.get(uin)
     if (!uid) {
-      for (const membersList of this.ctx.ntGroupApi.groupMembers.values()) { //从群友列表转
+      const friends = await this.ctx.ntFriendApi.getFriends()
-        for (const member of membersList.values()) {
+      uid = friends.find(item => item.uin === uin)?.uid
-          if (member.uin === uin) {
-            uid = member.uid
-            break
     }
+    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)
       }
-        if (uid) break
+      uid = Array.from(member.values()).find(e => e.uin === uin)?.uid
-      }
     }
     if (!uid) {
-      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid //特殊转换
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid
-      if (unveifyUid.indexOf('*') === -1) {
+      if (!unveifyUid.includes('*')) {
         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) {
-    const session = getSession()
+    let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uinList: [uin] }])).uids.get(uin)
-    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
-    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
+    //if (!unveifyUid.includes('*')) return unveifyUid
-    if (unveifyUid.indexOf('*') == -1) return unveifyUid
+    return unveifyUid
   }
 
-  async getUidByUin(uin: string) {
+  async getUidByUin(uin: string, groupCode?: string) {
     if (getBuildVersion() >= 26702) {
       return this.getUidByUinV2(uin)
     }
-    return this.getUidByUinV1(uin)
+    return this.getUidByUinV1(uin, groupCode)
   }
 
   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,
-      ],
     )
   }
 
@@ -209,31 +166,21 @@ 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 //从QQ Native 转换
+      uin = (await this.getUserDetailInfo(uid)).uin
     }
     return uin
   }
 
   async getUinByUidV2(uid: string) {
-    const session = getSession()
+    let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uidList: [uid] }])).uins.get(uid)
-    if (session) {
+    if (uin && uin !== '0') return uin
-      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
-    }
+    uin = (await this.ctx.ntFriendApi.getBuddyIdMap()).get(uid)
-    let uin = (await this.ctx.ntFriendApi.getBuddyIdMap(true)).get(uid)
     if (uin) return uin
-    uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
+    uin = (await this.getUserDetailInfo(uid)).uin
     return uin
   }
 
@@ -245,21 +192,13 @@ export class NTQQUserApi extends Service {
   }
 
   async forceFetchClientKey() {
-    const session = getSession()
+    return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }])
-    if (session) {
-      return await session.getTicketService().forceFetchClientKey('')
-    } else {
-      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
-    }
   }
 
-  async getSelfNick(refresh = false) {
+  async getSelfNick(refresh = true) {
     if ((refresh || !selfInfo.nick) && selfInfo.uid) {
-      const userInfo = await this.getUserDetailInfo(selfInfo.uid)
+      const data = await this.getUserSimpleInfo(selfInfo.uid)
-      if (userInfo) {
+      selfInfo.nick = data.nick
-        Object.assign(selfInfo, { nick: userInfo.nick })
-        return userInfo.nick
-      }
     }
     return selfInfo.nick
   }
@@ -271,7 +210,7 @@ export class NTQQUserApi extends Service {
         extStatus,
         batteryStatus,
       }
-    }, null])
+    }])
   }
 
   async getProfileLike(uid: string) {
@@ -286,6 +225,77 @@ export class NTQQUserApi extends Service {
         start: 0,
         limit: 20,
       }
-    }, null])
+    }])
+  }
+
+  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,
+      }
+    )
   }
 }

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,7 +53,6 @@ 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

@@ -2,7 +2,6 @@ import { unlink } from 'node:fs/promises'
 import { Service, Context } from 'cordis'
 import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
 import { Config as LLOBConfig } from '../common/types'
-import { llonebotError } from '../common/globalVars'
 import { isNumeric } from '../common/utils/misc'
 import { NTMethod } from './ntcall'
 import {
@@ -13,39 +12,45 @@ import {
   GroupMember,
   CategoryFriend,
   SimpleInfo,
-  ChatType
+  ChatType,
+  BuddyReqType,
+  GrayTipElementSubType
 } 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: GroupNotify[]) => void
+    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
-    'nt/friend-request': (input: FriendRequest[]) => 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']
+  static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi', 'store']
+  public startTime = 0
+  public native
 
   constructor(protected ctx: Context, public config: Core.Config) {
     super(ctx, 'app', true)
+    this.native = new Native(ctx)
   }
 
   public start() {
-    llonebotError.otherError = ''
+    this.startTime = Date.now()
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
-    this.ctx.on('llonebot/config-updated', input => {
+    this.ctx.on('llob/config-updated', input => {
       Object.assign(this.config, input)
     })
   }
@@ -63,7 +68,7 @@ class Core extends Service {
         uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
       }
       for (const uid of uids) {
-        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.friend })
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.C2C })
       }
       this.ctx.logger.info('好友列表变动', uids.length)
     })
@@ -116,17 +121,19 @@ 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.temp) {
+          if (contact.chatType === ChatType.TempC2CFromGroup) {
-            this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer, 2).then(res => {
-              this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+              for (const msg of res.msgList) {
-                const lastTempMsg = msgList.at(-1)
+                if (Date.now() / 1000 - Number(msg.msgTime) > 3) {
-                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
+                  continue
-                  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)
           }
         }
@@ -136,12 +143,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.friend
+      let chatType = ChatType.C2C
       if (isNumeric(peerUid)) {
-        chatType = ChatType.group
+        chatType = ChatType.Group
       }
       else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
-        chatType = ChatType.temp
+        chatType = ChatType.TempC2CFromGroup
       }
       const peer = { peerUid, chatType }
       await this.ctx.sleep(1000)
@@ -161,7 +168,17 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
-      this.ctx.parallel('nt/message-created', payload.msgList)
+      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)
+      }
     })
 
     const sentMsgIds = new Map<string, boolean>()
@@ -169,24 +186,30 @@ class Core extends Service {
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
       for (const msg of payload.msgList) {
-        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
+        if (
+          msg.recallTime !== '0' &&
+          msg.msgType === 5 &&
+          msg.subMsgType === 4 &&
+          msg.elements[0]?.grayTipElement?.subElementType === GrayTipElementSubType.Revoke &&
+          !recallMsgIds.includes(msg.msgId)
+        ) {
+          recallMsgIds.shift()
           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)
           }
         }
+      }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
-      if (!this.config.reportSelfMessage) {
-        return
-      }
       sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
-    const groupNotifyFlags: string[] = []
+    const groupNotifyIgnore: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -195,27 +218,34 @@ class Core extends Service {
       if (payload.unreadCount) {
         let notifies: GroupNotify[]
         try {
-          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
+          notifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(payload.doubt, payload.unreadCount)
         } catch (e) {
           return
         }
-        const list = notifies.filter(v => {
+        for (const notify of notifies) {
-          const flag = v.group.groupCode + '|' + v.seq + '|' + v.type
+          const notifyTime = Math.trunc(+notify.seq / 1000)
-          if (groupNotifyFlags.includes(flag)) {
+          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
-            return false
+            continue
+          }
+          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 => {
-      this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
+      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)
+      }
     })
 
-    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { registerEvent: true })
 
     registerReceiveHook<{
       msgBuf: number[]

src/ntqqapi/entities.ts

@@ -1,5 +1,6 @@
 import ffmpeg from 'fluent-ffmpeg'
 import faceConfig from './helper/face_config.json'
+import pathLib from 'node:path'
 import {
   AtType,
   ElementType,
@@ -15,23 +16,21 @@ import {
   SendTextElement,
   SendVideoElement,
 } from './types'
-import { stat, writeFile, copyFile, unlink } from 'node:fs/promises'
+import { stat, writeFile, copyFile, unlink, access } from 'node:fs/promises'
 import { calculateFileMD5 } 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 const mFaceCache = new Map<string, string>() // emojiId -> faceName
+export namespace SendElement {
-
-export namespace SendElementEntities {
   export function text(content: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content,
-        atType: AtType.notAt,
+        atType: AtType.Unknown,
         atUid: '',
         atTinyId: '',
         atNtUid: '',
@@ -41,7 +40,7 @@ export namespace SendElementEntities {
 
   export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content: display,
@@ -53,21 +52,21 @@ export namespace SendElementEntities {
     }
   }
 
-  export function reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
+  export function reply(msgSeq: string, msgId: string, senderUin: string): SendReplyElement {
     return {
-      elementType: ElementType.REPLY,
+      elementType: ElementType.Reply,
       elementId: '',
       replyElement: {
-        replayMsgSeq: msgSeq, // raw.msgSeq
+        replayMsgSeq: msgSeq,
-        replayMsgId: msgId, // raw.msgId
+        replayMsgId: msgId,
         senderUin: senderUin,
-        senderUinStr: senderUinStr,
+        senderUinStr: senderUin,
       },
     }
   }
 
   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)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, subType)
     if (fileSize === 0) {
       throw '文件异常，大小为 0'
     }
@@ -80,7 +79,7 @@ export namespace SendElementEntities {
       fileName: fileName,
       sourcePath: path,
       original: true,
-      picType: imageSize.type === 'gif' ? PicType.gif : PicType.jpg,
+      picType: imageSize.type === 'gif' ? PicType.GIF : PicType.JPEG,
       picSubType: subType,
       fileUuid: '',
       fileSubId: '',
@@ -90,7 +89,7 @@ export namespace SendElementEntities {
     }
     ctx.logger.info('图片信息', picElement)
     return {
-      elementType: ElementType.PIC,
+      elementType: ElementType.Pic,
       elementId: '',
       picElement,
     }
@@ -103,7 +102,7 @@ export namespace SendElementEntities {
       throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
-      elementType: ElementType.FILE,
+      elementType: ElementType.File,
       elementId: '',
       fileElement: {
         fileName,
@@ -116,26 +115,17 @@ export namespace SendElementEntities {
   }
 
   export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
-    try {
+    await access(filePath)
-      await stat(filePath)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.Video)
-    } 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 '文件异常，大小为0'
+      throw new Error('文件异常，大小为 0')
     }
-    const maxMB = 100;
+    const maxMB = 100
     if (fileSize > 1024 * 1024 * maxMB) {
-      throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+      throw new Error(`视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`)
     }
-    const pathLib = require('path')
+    const thumbDir = pathLib.dirname(path.replaceAll('\\', '/').replace(`/Ori/`, `/Thumb/`))
-    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,
@@ -196,11 +186,10 @@ export namespace SendElementEntities {
     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,
@@ -212,17 +201,7 @@ export namespace SendElementEntities {
         thumbSize,
         thumbWidth: videoInfo.width,
         thumbHeight: videoInfo.height,
-        fileSize: '' + fileSize,
+        fileSize: String(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)
@@ -231,26 +210,21 @@ export namespace SendElementEntities {
 
   export async function ptt(ctx: Context, pttPath: string): Promise<SendPttElement> {
     const { converted, path: silkPath, duration } = await encodeSilk(ctx, pttPath)
-    if (!silkPath) {
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.Ptt)
-      throw '语音转换失败, 请检查语音文件是否正常'
-    }
-    // log("生成语音", silkPath, duration);
-    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.PTT)
     if (fileSize === 0) {
-      throw '文件异常，大小为0'
+      throw new Error('文件异常，大小为 0')
     }
     if (converted) {
       unlink(silkPath)
     }
     return {
-      elementType: ElementType.PTT,
+      elementType: ElementType.Ptt,
       elementId: '',
       pttElement: {
         fileName: fileName,
         filePath: path,
         md5HexStr: md5,
-        fileSize: fileSize,
+        fileSize: String(fileSize),
-        // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
         duration: duration,
         formatType: 1,
         voiceType: 1,
@@ -264,22 +238,22 @@ export namespace SendElementEntities {
     }
   }
 
-  export function face(faceId: number): SendFaceElement {
+  export function face(faceId: number, faceType?: number): SendFaceElement {
     // 从face_config.json中获取表情名称
     const sysFaces = faceConfig.sysface
-    const emojiFaces = faceConfig.emoji
+    const face = sysFaces.find(face => face.QSid === String(faceId))
-    const face = sysFaces.find((face) => face.QSid === faceId.toString())
+    if (!faceType) {
-    faceId = parseInt(faceId.toString())
+      if (faceId < 222) {
-    // let faceType = parseInt(faceId.toString().substring(0, 1));
+        faceType = 1
-    let faceType = 1
+      } else {
-    if (faceId >= 222) {
         faceType = 2
       }
       if (face?.AniStickerType) {
-      faceType = 3;
+        faceType = 3
+      }
     }
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: faceId,
@@ -295,7 +269,8 @@ export namespace SendElementEntities {
 
   export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
     return {
-      elementType: ElementType.MFACE,
+      elementType: ElementType.MarketFace,
+      elementId: '',
       marketFaceElement: {
         imageWidth: 300,
         imageHeight: 300,
@@ -312,10 +287,10 @@ export namespace SendElementEntities {
     // 随机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',
@@ -334,7 +309,7 @@ export namespace SendElementEntities {
     // 实际测试并不能控制结果
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: FaceIndex.RPS,
@@ -353,7 +328,7 @@ export namespace SendElementEntities {
 
   export function ark(data: string): SendArkElement {
     return {
-      elementType: ElementType.ARK,
+      elementType: ElementType.Ark,
       elementId: '',
       arkElement: {
         bytesData: data,
@@ -365,7 +340,7 @@ export namespace SendElementEntities {
 
   export function shake(): SendFaceElement {
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: 1,

src/ntqqapi/helper/face_config.json

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

src/ntqqapi/helper/rkey.ts

@@ -31,30 +31,18 @@ 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() {
+  async fetchServerRkey(): Promise<ServerRkeyData> {
-    return new Promise<ServerRkeyData>((resolve, reject) => {
+    const response = await fetch(this.serverUrl)
-      fetch(this.serverUrl)
-        .then(response => {
     if (!response.ok) {
-            return reject(response.statusText) // 请求失败，返回错误信息
+      throw new Error(response.statusText)
     }
-          return response.json() // 解析 JSON 格式的响应体
+    return response.json()
-        })
-        .then(data => {
-          resolve(data)
-        })
-        .catch(error => {
-          reject(error)
-        })
-    })
   }
 }

src/ntqqapi/hook.ts

@@ -1,8 +1,7 @@
-import type { BrowserWindow } from 'electron'
+import { NTMethod } from './ntcall'
-import { NTClass, NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
-import { Dict } from 'cosmokit'
+import { ipcMain } from 'electron'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
@@ -26,119 +25,76 @@ 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: Array<{
+const receiveHooks: Map<string, {
   method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
-  id: string
+}> = new Map()
-}> = []
 
 const callHooks: Array<{
   method: NTMethod[]
   hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
-export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
+export function startHook() {
-  window.webContents.send = new Proxy(window.webContents.send, {
+  const senderExclude = Symbol()
-    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
+
-      try {
+  ipcMain.emit = new Proxy(ipcMain.emit, {
-        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+    apply(target, thisArg, args: [eventName: string, ...args: any]) {
-          log('received ntqq api message', args)
+      if (args[2]?.eventName.startsWith('ns-LoggerApi')) {
+        return target.apply(thisArg, args)
       }
-      } catch { }
+      if (logHook) {
-      if (!onlyLog) {
+        log('request', args)
-        if (args[2] instanceof Array) {
+      }
+
+      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]) {
               for (const receiveData of args[2]) {
-            const ntMethodName = receiveData.cmdName
+                for (const hook of receiveHooks.values()) {
-            for (const hook of receiveHooks) {
+                  if (hook.method.includes(receiveData.cmdName)) {
-              if (hook.method.includes(ntMethodName)) {
                     Promise.resolve(hook.hookFunc(receiveData.payload))
                   }
                 }
               }
             }
-        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) {
+      if (args[3]?.length) {
-  const webContents = window.webContents as Dict
+        const method = args[3][0]
-  const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
+        const callParams = args[3].slice(1)
-
+        for (const hook of callHooks) {
-  const proxyIpcMsg = new Proxy(ipc_message_proxy, {
+          if (hook.method.includes(method)) {
-    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>(
@@ -149,10 +105,9 @@ export function registerReceiveHook<PayloadType>(
   if (!Array.isArray(method)) {
     method = [method]
   }
-  receiveHooks.push({
+  receiveHooks.set(id, {
     method: method as ReceiveCmdS[],
     hookFunc,
-    id,
   })
   return id
 }
@@ -171,6 +126,5 @@ export function registerCallHook(
 }
 
 export function removeReceiveHook(id: string) {
-  const index = receiveHooks.findIndex((h) => h.id === id)
+  receiveHooks.delete(id)
-  receiveHooks.splice(index, 1)
 }

src/ntqqapi/native/index.ts

@@ -0,0 +1,99 @@
+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 { log } from '../common/utils/legacyLog'
+import { getBuildVersion, log } from '../common/utils'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -13,7 +13,9 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService
+  NodeIKernelTipOffService,
+  NodeIKernelRobotService,
+  NodeIKernelNodeMiscService
 } from './services'
 
 export enum NTClass {
@@ -39,7 +41,6 @@ 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',
@@ -93,12 +94,14 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
+  nodeIKernelRobotService: NodeIKernelRobotService
+  nodeIKernelNodeMiscService: NodeIKernelNodeMiscService
 }
 
 interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
-  classNameIsRegister?: boolean
+  registerEvent?: boolean
   cbCmd?: string | string[]
   cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
@@ -111,19 +114,24 @@ 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 ?? NTChannel.IPC_UP_2
+  const channel = options.channel ?? getBuildVersion() >= 28788 ? NTChannel.IPC_UP_3 : NTChannel.IPC_UP_2
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]
-  if (options.classNameIsRegister) {
+  if (options.registerEvent) {
     eventName += '-register'
   }
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
+    let eventId: string
+
     const timeoutId = setTimeout(() => {
-      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
+      if (eventId) {
-      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
+        removeReceiveHook(eventId)
+      }
+      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, args)
+      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${JSON.stringify(args)}`)
     }, timeout)
 
     if (!options.cbCmd) {
@@ -137,19 +145,15 @@ export function invoke<
       let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
           if (options.cmdCB) {
-            if (options.cmdCB(payload, result)) {
+            if (!options.cmdCB(payload, result)) {
-              removeReceiveHook(hookId)
+              return
+            }
+          }
+          removeReceiveHook(eventId)
           clearTimeout(timeoutId)
           resolve(payload)
-            }
-          }
-          else {
-            removeReceiveHook(hookId)
-            clearTimeout(timeoutId)
-            resolve(payload)
-          }
         })
       }
       !afterFirstCmd && secondCallback()
@@ -159,9 +163,12 @@ export function invoke<
           afterFirstCmd && secondCallback()
         }
         else {
-          log('ntqq api call failed,', method, res)
           clearTimeout(timeoutId)
-          reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
+          if (eventId) {
+            removeReceiveHook(eventId)
+          }
+          log('ntqq api call failed,', method, args, res)
+          reject(`ntqq api call failed, ${method}, ${JSON.stringify(res)}`)
         }
       }
     }

src/ntqqapi/proto/groupNotify.proto

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

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

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

@@ -1,30 +0,0 @@
-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,10 +1,6 @@
+import { BuddyListReqType } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-export enum BuddyListReqType {
-  KNOMAL,
-  KLETTER
-}
-
 export interface NodeIKernelBuddyService {
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
     data: {
@@ -17,7 +13,7 @@ export interface NodeIKernelBuddyService {
     }[]
   }>
 
-  setBuddyRemark(uid: number, remark: string): void
+  setBuddyRemark(arg: unknown): void
 
   isBuddy(uid: string): boolean
 

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -123,4 +123,8 @@ export interface NodeIKernelGroupService {
   addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 
   removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+
+  setHeader(args: unknown[]): Promise<GeneralCallResult>
+
+  searchMember(sceneId: string, keyword: string): Promise<void>
 }

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,42 +1,18 @@
-import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-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: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 
   setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
 
-  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>
+  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult & {
+    detailErr: Map<unknown, unknown>
+  }>
 
   forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
 
@@ -44,6 +20,10 @@ export interface NodeIKernelMsgService {
 
   getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
+  getAioFirstViewLatestMsgsAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsIncludeSelfAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
   getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
@@ -97,7 +77,7 @@ export interface NodeIKernelMsgService {
 
   downloadRichMedia(...args: unknown[]): unknown
 
-  setMsgEmojiLikes(...args: unknown[]): unknown
+  setMsgEmojiLikes(...args: unknown[]): Promise<GeneralCallResult>
 
   getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
     result: number
@@ -115,4 +95,6 @@ export interface NodeIKernelMsgService {
   getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
   getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
+
+  sendSsoCmdReqByContend(ssoCmd: string, content: string): Promise<GeneralCallResult & { rsp: string }>
 }

src/ntqqapi/services/NodeIKernelNodeMiscService.ts

@@ -0,0 +1,15 @@
+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,7 @@ import { GeneralCallResult } from './common'
 import { Dict } from 'cosmokit'
 
 export interface NodeIKernelProfileLikeService {
-  setBuddyProfileLike(...args: unknown[]): { result: number, errMsg: string, succCounts: number }
+  setBuddyProfileLike(...args: unknown[]): GeneralCallResult & { succCounts: number }
 
   getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
     info: {

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,19 +1,6 @@
 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>>
 

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -39,5 +39,21 @@ export interface NodeIKernelRichMediaService {
       failFileIdList: Array<unknown>
     }
   }>
+
+  batchGetGroupFileCount(groupIds: string[]): Promise<GeneralCallResult & {
+    groupCodes: string[]
+    groupFileCounts: number[]
+  }>
+
+  getGroupSpace(groupId: string): Promise<GeneralCallResult & {
+    groupSpaceResult: {
+      retCode: number
+      retMsg: string
+      clientWording: string
+      totalSpace: string
+      usedSpace: string
+      allUpload: boolean
+    }
+  }>
 }
 

src/ntqqapi/services/NodeIKernelRobotService.ts

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

src/ntqqapi/services/index.ts

@@ -9,3 +9,5 @@ export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
 export * from './NodeIKernelTipOffService'
+export * from './NodeIKernelRobotService'
+export * from './NodeIKernelNodeMiscService'

src/ntqqapi/types/group.ts

@@ -1,5 +1,3 @@
-import { QQLevel, Sex } from './user'
-
 export enum GroupListUpdateType {
   REFRESHALL,
   GETALL,
@@ -22,9 +20,9 @@ export interface Group {
   hasModifyConfGroupName: boolean
   remarkName: string
   hasMemo: boolean
-  groupShutupExpireTime: string //"0",
+  groupShutupExpireTime: string
-  personShutupExpireTime: string //"0",
+  personShutupExpireTime: string
-  discussToGroupUin: string //"0",
+  discussToGroupUin: string
   discussToGroupMaxMsgSeq: number
   discussToGroupTime: number
   groupFlagExt: number //1073938496,
@@ -32,39 +30,57 @@ export interface Group {
   groupCreditLevel: number //0,
   groupFlagExt3: number //0,
   groupOwnerId: {
-    memberUin: string //"0",
+    memberUin: string
-    memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
+    memberUid: string
   }
-  members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
   createTime: string
 }
 
 export enum GroupMemberRole {
-  normal = 2,
+  Normal = 2,
-  admin = 3,
+  Admin = 3,
-  owner = 4,
+  Owner = 4,
 }
 
 export interface GroupMember {
-  memberSpecialTitle?: string
+  uid: string
-  avatarPath: string
-  cardName: string
-  cardType: number
-  isDelete: boolean
-  nick: string
   qid: string
+  uin: string
+  nick: string
   remark: string
-  role: GroupMemberRole // 群主:4, 管理员:3，群员:2
+  cardType: number
-  shutUpTime: number // 禁言时间，单位是什么暂时不清楚
+  cardName: string
-  uid: string // 加密的字符串
+  role: GroupMemberRole
-  uin: string // QQ号
+  avatarPath: string
+  shutUpTime: number
+  isDelete: boolean
+  isSpecialConcerned: boolean
+  isSpecialShield: boolean
   isRobot: boolean
-  sex?: Sex
+  groupHonor: Uint8Array
-  qqLevel?: QQLevel
+  memberRealLevel: number
-  isChangeRole: boolean
+  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
-  memberLevel: number
+  memberFlag: number
+  memberFlagExt: number
+  memberMobileFlag: number
+  memberFlagExt2: number
+  isSpecialShielded: boolean
+  cardNameId: number
 }
 
 export interface PublishGroupBulletinReq {
@@ -78,3 +94,97 @@ export interface PublishGroupBulletinReq {
   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,125 +1,108 @@
 import { GroupMemberRole } from './group'
-
+import { GeneralCallResult } from '../services'
-export interface GetFileListParam {
-  sortType: number
-  fileCount: number
-  startIndex: number
-  sortOrder: number
-  showOnlinedocFolder: number
-  folderId?: string
-}
 
 export enum ElementType {
-  UNKNOWN = 0,
+  Text = 1,
-  TEXT = 1,
+  Pic = 2,
-  PIC = 2,
+  File = 3,
-  FILE = 3,
+  Ptt = 4,
-  PTT = 4,
+  Video = 5,
-  VIDEO = 5,
+  Face = 6,
-  FACE = 6,
+  Reply = 7,
-  REPLY = 7,
+  GrayTip = 8,
-  WALLET = 9,
+  Ark = 10,
-  GreyTip = 8, //Poke别叫戳一搓了 官方名字拍一拍 戳一戳是另一个名字
+  MarketFace = 11,
-  ARK = 10,
+  LiveGift = 12,
-  MFACE = 11,
+  StructLongMsg = 13,
-  LIVEGIFT = 12,
+  Markdown = 14,
-  STRUCTLONGMSG = 13,
+  Giphy = 15,
-  MARKDOWN = 14,
+  MultiForward = 16,
-  GIPHY = 15,
+  InlineKeyboard = 17,
-  MULTIFORWARD = 16,
+  Calendar = 19,
-  INLINEKEYBOARD = 17,
+  YoloGameResult = 20,
-  INTEXTGIFT = 18,
+  AvRecord = 21,
-  CALENDAR = 19,
+  TofuRecord = 23,
-  YOLOGAMERESULT = 20,
+  FaceBubble = 27,
-  AVRECORD = 21,
+  ShareLocation = 28,
-  FEED = 22,
+  TaskTopMsg = 29,
-  TOFURECORD = 23,
+  RecommendedMsg = 43,
-  ACEBUBBLE = 24,
+  ActionBar = 44
-  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: {
+  pttElement: Partial<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: {
+  picElement: Partial<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.MFACE
+  elementType: ElementType.MarketFace
+  elementId: ''
   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: number
+  atType: AtType
   atUid: string
   atTinyId: string
   atNtUid: string
@@ -156,47 +139,6 @@ 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,
-}
-
 export interface PttElement {
   canConvert2Text: boolean
   duration: number // 秒数
@@ -207,7 +149,7 @@ export interface PttElement {
   fileSize: string // "4261"
   fileSubId: string // "0"
   fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-  formatType: string // 1
+  formatType: number // 1
   invalidState: number // 0
   md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
   playState: number // 0
@@ -218,6 +160,7 @@ export interface PttElement {
   voiceChangeType: number // 0
   voiceType: number // 0
   waveAmplitudes: number[]
+  autoConvertText: number
 }
 
 export interface ArkElement {
@@ -229,6 +172,16 @@ 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  // 有这玩意儿吗
@@ -244,23 +197,77 @@ 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,
+  Revoke = 1,
-  PROCLAMATION = 2,
+  Proclamation = 2,
-  EMOJIREPLY = 3,
+  EmojiReply = 3,
-  GROUP = 4,
+  Group = 4,
-  BUDDY = 5,
+  Buddy = 5,
-  FEED = 6,
+  Feed = 6,
-  ESSENCE = 7,
+  Essence = 7,
-  GROUPNOTIFY = 8,
+  GroupNotify = 8,
-  BUDDYNOTIFY = 9,
+  BuddyNotify = 9,
-  FILE = 10,
+  File = 10,
-  FEEDCHANNELMSG = 11,
+  FeedChannelMsg = 11,
-  XMLMSG = 12,
+  XmlMsg = 12,
-  LOCALMSG = 13,
+  LocalMsg = 13,
-  BLOCK = 14,
+  Block = 14,
-  AIOOP = 15,
+  AioOp = 15,
-  WALLET = 16,
+  Wallet = 16,
   JSON = 17,
 }
 
@@ -281,16 +288,20 @@ 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, // 石头剪刀布
 }
 
@@ -315,6 +326,10 @@ export interface MarketFaceElement {
   key: string
   imageWidth?: number
   imageHeight?: number
+  supportSize?: {
+    width: number
+    height: number
+  }[]
 }
 
 export interface VideoElement {
@@ -364,6 +379,7 @@ export interface InlineKeyboardElementRowButton {
   enter: false
   subscribeDataTemplateIds: []
 }
+
 export interface InlineKeyboardElement {
   rows: [
     {
@@ -372,56 +388,9 @@ export interface InlineKeyboardElement {
   ]
 }
 
-export interface TipAioOpGrayTipElement {
+export interface StructLongMsgElement {
-  // 这是什么提示来着？
+  xmlContent: string
-  operateType: number
+  resId: string
-  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 {
@@ -430,11 +399,16 @@ 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
@@ -445,11 +419,29 @@ export interface RawMessage {
   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 {
@@ -474,12 +466,11 @@ export interface MessageElement {
   fileElement?: FileElement
   liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: unknown
+  structLongMsgElement?: StructLongMsgElement
   multiForwardMsgElement?: MultiForwardMsgElement
   giphyElement?: unknown
-  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: unknown //????
+  textGiftElement?: unknown
   calendarElement?: unknown
   yoloGameResultElement?: unknown
   avRecordElement?: unknown
@@ -492,7 +483,7 @@ export interface MessageElement {
   actionBarElement?: unknown
 }
 
-export interface OnRichMediaDownloadCompleteParams {
+export interface RichMediaDownloadCompleteNotify {
   fileModelId: string
   msgElementId: string
   msgId: string
@@ -515,7 +506,7 @@ export interface OnRichMediaDownloadCompleteParams {
   userUsedSpacePerDay: unknown
 }
 
-export interface OnGroupFileInfoUpdateParams {
+export interface GroupFileInfo {
   retCode: number
   retMsg: string
   clientWording: string
@@ -565,3 +556,62 @@ export interface OnGroupFileInfoUpdateParams {
   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 {
-  INVITED_BY_MEMBER = 1,
+  InvitedByMember = 1,
-  REFUSE_INVITED,
+  RefuseInvited,
-  REFUSED_BY_ADMINI_STRATOR,
+  RefusedByAdminiStrator,
-  AGREED_TOJOIN_DIRECT, // 有人接受了邀请入群
+  AgreedTojoinDirect, // 有人接受了邀请入群
-  INVITED_NEED_ADMINI_STRATOR_PASS, // 有人邀请了别人入群
+  InvitedNeedAdminiStratorPass, // 有人邀请了别人入群
-  AGREED_TO_JOIN_BY_ADMINI_STRATOR,
+  AgreedToJoinByAdminiStrator,
-  REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
+  RequestJoinNeedAdminiStratorPass,
-  SET_ADMIN,
+  SetAdmin,
-  KICK_MEMBER_NOTIFY_ADMIN,
+  KickMemberNotifyAdmin,
-  KICK_MEMBER_NOTIFY_KICKED,
+  KickMemberNotifyKicked,
-  MEMBER_LEAVE_NOTIFY_ADMIN, // 主动退出
+  MemberLeaveNotifyAdmin, // 主动退出
-  CANCEL_ADMIN_NOTIFY_CANCELED, // 我被取消管理员
+  CancelAdminNotifyCanceled, // 我被取消管理员
-  CANCEL_ADMIN_NOTIFY_ADMIN, // 其他人取消管理员
+  CancelAdminNotifyAdmin, // 其他人取消管理员
-  TRANSFER_GROUP_NOTIFY_OLDOWNER,
+  TransferGroupNotifyOldowner,
-  TRANSFER_GROUP_NOTIFY_ADMIN
+  TransferGroupNotifyAdmin
 }
 
 export interface GroupNotifies {
@@ -23,11 +23,11 @@ export interface GroupNotifies {
 }
 
 export enum GroupNotifyStatus {
-  KINIT, // 初始化
+  Init, // 初始化
-  KUNHANDLE, // 未处理
+  Unhandle, // 未处理
-  KAGREED, // 同意
+  Agreed, // 同意
-  KREFUSED, // 拒绝
+  Refused, // 拒绝
-  KIGNORED // 忽略
+  Ignored // 忽略
 }
 
 export interface GroupNotify {
@@ -56,20 +56,8 @@ export enum GroupRequestOperateTypes {
 }
 
 export enum BuddyReqType {
-  KMEINITIATOR,
+  MsgInfo = 12,
-  KPEERINITIATOR,
+  MeInitiatorWaitPeerConfirm = 13,
-  KMEAGREED,
-  KMEAGREEDANDADDED,
-  KPEERAGREED,
-  KPEERAGREEDANDADDED,
-  KPEERREFUSED,
-  KMEREFUSED,
-  KMEIGNORED,
-  KMEAGREEANYONE,
-  KMESETQUESTION,
-  KMEAGREEANDADDFAILED,
-  KMSGINFO,
-  KMEINITIATORWAITPEERCONFIRM
 }
 
 export interface FriendRequest {
@@ -91,41 +79,3 @@ 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,7 +1,8 @@
 export enum Sex {
-  male = 0,
+  Unknown = 0,
-  female = 2,
+  Male = 1,
-  unknown = 255,
+  Female = 2,
+  Hidden = 255
 }
 
 export interface QQLevel {
@@ -67,6 +68,7 @@ export interface User {
   recommendImgFlag?: number
   disableEmojiShortCuts?: number
   pendantId?: string
+  age?: number
 }
 
 export interface SelfInfo extends User {
@@ -100,12 +102,12 @@ export interface BaseInfo {
   birthday_month: number
   birthday_day: number
   age: number
-  sex: number
+  sex: Sex
   eMail: string
   phoneNum: string
   categoryId: number
   richTime: number
-  richBuffer: string
+  richBuffer: Uint8Array
 }
 
 interface MusicInfo {
@@ -221,11 +223,6 @@ interface RelationFlags {
   isHidePrivilegeIcon: number
 }
 
-export interface FriendV2 extends SimpleInfo {
-  categoryId?: number
-  categroyName?: string
-}
-
 interface CommonExt {
   constellation: number
   shengXiao: number
@@ -255,7 +252,7 @@ interface PhotoWall {
   picList: Pic[]
 }
 
-export interface UserDetailInfoListenerArg {
+export interface UserDetailInfo {
   uid: string
   uin: string
   simpleInfo: SimpleInfo
@@ -300,7 +297,7 @@ export interface UserDetailInfoByUin {
     birthday_year: number
     birthday_month: number
     birthday_day: number
-    sex: number //0
+    sex: number
     topTime: string
     constellation: number
     shengXiao: number
@@ -344,3 +341,21 @@ 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

@@ -1,54 +0,0 @@
-import {
-  NodeIKernelBuddyService,
-  NodeIKernelGroupService,
-  NodeIKernelProfileService,
-  NodeIKernelProfileLikeService,
-  NodeIKernelMSFService,
-  NodeIKernelMsgService,
-  NodeIKernelUixConvertService,
-  NodeIKernelRichMediaService,
-  NodeIKernelTicketService,
-  NodeIKernelTipOffService
-} 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
-}
-
-export interface WrapperApi {
-  NodeIQQNTWrapperSession?: NodeIQQNTWrapperSession
-}
-
-const wrapperApi: WrapperApi = {}
-
-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
-      }
-    })
-  }
-  return dlopenRet
-}
-
-export function getSession() {
-  return wrapperApi['NodeIQQNTWrapperSession']
-}

src/onebot11/action/file/GetFile.ts

@@ -48,7 +48,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 +59,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/DeleteFriend.ts

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

@@ -16,8 +16,8 @@ interface Response {
 export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
   payloadSchema = Schema.object({
-    message_id: String,
+    message_id: Schema.string(),
-    id: String
+    id: Schema.string()
   })
 
   protected async _handle(payload: Payload) {
@@ -34,25 +34,23 @@ export class GetForwardMsg extends BaseAction<Payload, Response> {
     if (data?.result !== 0) {
       throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
-    const msgList = data.msgList
+    const messages: (OB11ForwardMessage | undefined)[] = await Promise.all(
-    const messages = await Promise.all(
+      data.msgList.map(async (msg) => {
-      msgList.map(async (msg) => {
+        const res = await OB11Entities.message(this.ctx, msg)
-        const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (res) {
-        if (!resMsg) return
+          return {
-        resMsg.message_id = this.ctx.store.createMsgShortId({
+            content: res.message,
-          chatType: msg.chatType,
+            sender: {
-          peerUid: msg.peerUid,
+              nickname: res.sender.nickname,
-        }, msg.msgId)
+              user_id: res.sender.user_id
-        return resMsg
+            },
+            time: res.time,
+            message_format: res.message_format,
+            message_type: res.message_type
+          }
+        }
       })
     )
-    const forwardMessages = filterNullable(messages)
+    return { messages: 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/GetGroupEssence.ts

@@ -26,7 +26,7 @@ export class GetEssenceMsgList extends BaseAction<Payload, EssenceMsg[]> {
     const groupCode = payload.group_id.toString()
     const peer = {
       guildId: '',
-      chatType: ChatType.group,
+      chatType: ChatType.Group,
       peerUid: groupCode
     }
     const essence = await this.ctx.ntGroupApi.queryCachedEssenceMsg(groupCode)

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

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

@@ -0,0 +1,82 @@
+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,11 +1,11 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot11/types'
+import { GroupFileInfo } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
   folder_id: string
-  file_count: string | number
 }
 
 interface Response {
@@ -17,19 +17,27 @@ 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(),
+    folder_id: Schema.string().required()
-    file_count: Schema.union([Number, String]).default(50)
   })
 
   async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+    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: +payload.file_count,
+        fileCount: 100,
-      startIndex: 0,
+        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 => {

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

@@ -4,7 +4,7 @@ import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
-import { filterNullable } from '@/common/utils/misc'
+import { filterNullable, parseBool } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -23,29 +23,23 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
     group_id: Schema.union([Number, String]).required(),
     message_seq: Schema.union([Number, String]),
     count: Schema.union([Number, String]).default(20),
-    reverseOrder: Schema.boolean().default(false),
+    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() }
+    const peer = { chatType: ChatType.Group, peerUid: payload.group_id.toString() }
-    let msgList: RawMessage[] | undefined
+    let msgList: RawMessage[]
-    // 包含 message_seq 0
+    if (!payload.message_seq || +payload.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
       if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
-      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count, true)).msgList
     }
     if (!msgList?.length) throw new Error('未找到消息')
     if (reverseOrder) msgList.reverse()
-    await Promise.all(
+    const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
-      msgList.map(async msg => {
-        msg.msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-      })
-    )
-    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
     return { messages: filterNullable(ob11MsgList) }
   }
 }

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

@@ -0,0 +1,48 @@
+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 { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
+import { GroupFileInfo } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
-  file_count: string | number
 }
 
 interface Response {
@@ -15,18 +15,26 @@ interface Response {
 export class GetGroupRootFiles extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupRootFiles
   payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
+    group_id: Schema.union([Number, String]).required()
-    file_count: Schema.union([Number, String]).default(50),
   })
 
   async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+    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: +payload.file_count,
+        fileCount: 100,
-      startIndex: 0,
+        startIndex: nextIndex ?? 0,
         sortOrder: 2,
         showOnlinedocFolder: 0,
       })
+      data.push(...res.item)
+      nextIndex = res.nextIndex
+    }
+
     return {
       files: data.filter(item => item.fileInfo)
         .map(item => {

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(10)
+    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(false, 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.KUNHANDLE,
+          checked: notify.status !== GroupNotifyStatus.Unhandle,
           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.KUNHANDLE,
+          checked: notify.status !== GroupNotifyStatus.Unhandle,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       }

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

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

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

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

@@ -1,34 +1,42 @@
 import { unlink } from 'node:fs/promises'
-import { OB11MessageNode } from '../../types'
+import { OB11MessageData, OB11MessageNode } 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 { convertMessage2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+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[]
+  messages?: OB11MessageNode[]
+  message?: OB11MessageNode[]
   message_type?: 'group' | 'private'
 }
 
 interface Response {
   message_id: number
-  forward_id?: string
+  forward_id: string
 }
 
 export class SendForwardMsg extends BaseAction<Payload, Response> {
-  actionName = ActionName.GoCQHTTP_SendForwardMsg
+  actionName = ActionName.SendForwardMsg
   payloadSchema = Schema.object({
     user_id: Schema.union([Number, String]),
     group_id: Schema.union([Number, String]),
-    messages: Schema.array(Schema.any()).required(),
+    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
@@ -36,8 +44,90 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
       contextMode = CreatePeerMode.Private
     }
     const peer = await createPeer(this.ctx, payload, contextMode)
-    const returnMsg = await this.handleForwardNode(peer, payload.messages)
+
-    return { message_id: returnMsg.msgShortId! }
+    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> {
@@ -52,7 +142,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
     this.ctx.logger.info('克隆消息', sendElements)
     try {
       const peer = {
-        chatType: ChatType.friend,
+        chatType: ChatType.C2C,
         peerUid: selfInfo.uid
       }
       const nodeMsg = await this.ctx.ntMsgApi.sendMsg(peer, sendElements)
@@ -64,9 +154,9 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
   }
 
   // 返回一个合并转发的消息id
-  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]) {
+  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<Response> {
     const selfPeer = {
-      chatType: ChatType.friend,
+      chatType: ChatType.C2C,
       peerUid: selfInfo.uid,
     }
     const nodeMsgIds: { msgId: string, peer: Peer }[] = []
@@ -89,7 +179,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
         try {
           const { sendElements, deleteAfterSentFiles } = await createSendElements(
             this.ctx,
-            convertMessage2List(messageNode.data.content),
+            messageNode.data.content as OB11MessageData[],
             destPeer
           )
           this.ctx.logger.info('开始生成转发节点', sendElements)
@@ -100,7 +190,7 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
               sendElementsSplit[splitIndex] = []
             }
 
-            if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
+            if (ele.elementType === ElementType.File || ele.elementType === ElementType.Video) {
               if (sendElementsSplit[splitIndex].length > 0) {
                 splitIndex++
               }
@@ -156,9 +246,13 @@ export class SendForwardMsg extends BaseAction<Payload, Response> {
     if (retMsgIds.length === 0) {
       throw Error('转发消息失败，节点为空')
     }
-    const returnMsg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
+    const msg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
-    returnMsg.msgShortId = this.ctx.store.createMsgShortId(destPeer, returnMsg.msgId)
+    const resid = JSON.parse(msg.elements[0].arkElement!.bytesData).meta.detail.resid
-    return returnMsg
+    const msgShortId = this.ctx.store.createMsgShortId({
+      chatType: msg.chatType,
+      peerUid: msg.peerUid
+    }, msg.msgId)
+    return { message_id: msgShortId, forward_id: resid }
   }
 }
 

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

@@ -28,7 +28,7 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
 
     let picInfo: { id: string, width: number, height: number } | undefined
     if (payload.image) {
-      const { path, isLocal, success, errMsg } = await uri2local(payload.image, undefined, true)
+      const { path, isLocal, success, errMsg } = await uri2local(this.ctx, payload.image, true)
       if (!success) {
         throw new Error(`设置群公告失败, 错误信息: uri2local: ${errMsg}`)
       }

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

@@ -1,6 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { SendElementEntities } from '@/ntqqapi/entities'
+import { SendElement } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -23,11 +23,15 @@ export class UploadGroupFile extends BaseAction<Payload, null> {
   })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    const { success, errMsg, path, fileName } = await uri2local(this.ctx, 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 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,6 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { SendElementEntities } from '@/ntqqapi/entities'
+import { SendElement } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -19,11 +19,15 @@ export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null
   })
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    const { success, errMsg, path, fileName } = await uri2local(this.ctx, payload.file)
     if (!success) {
       throw new Error(errMsg)
     }
-    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName)
+    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/GetGroupMemberInfo.ts

@@ -2,32 +2,36 @@ import { BaseAction, Schema } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { isNullable } from 'cosmokit'
+import { calcQQLevel, parseBool } from '@/common/utils/misc'
 
 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()
+    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 member = await this.ctx.ntGroupApi.getGroupMember(groupCode, payload.user_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)
     if (member) {
-      if (isNullable(member.sex)) {
+      const ret = OB11Entities.groupMember(+groupCode, member)
-        const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
+      const date = Math.trunc(Date.now() / 1000)
-        Object.assign(member, info)
-      }
-      const ret = OB11Entities.groupMember(groupCode, member)
-      const date = Math.round(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
       return ret
     }
     throw new Error(`群成员${payload.user_id}不存在`)

src/onebot11/action/group/GetGroupMemberList.ts

@@ -17,19 +17,26 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   protected async _handle(payload: Payload) {
     const groupCode = payload.group_id.toString()
     let groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
-    if (groupMembers.size === 0) {
+    for (let i = 0; i < 5; i++) {
-      await this.ctx.sleep(100)
+      if (groupMembers.size > 0) {
+        break
+      }
+      await this.ctx.sleep(60)
       groupMembers = await this.ctx.ntGroupApi.getGroupMembers(groupCode)
     }
-    const groupMembersArr = Array.from(groupMembers.values())
-    const date = Math.round(Date.now() / 1000)
 
-    return groupMembersArr.map(item => {
+    const date = Math.trunc(Date.now() / 1000)
-      const member = OB11Entities.groupMember(groupCode, item)
+    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
-      return member
+      ret.push(member)
-    })
+    }
+
+    return ret
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,22 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
   flag: string
-  approve?: boolean | string
+  approve: boolean
   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(
-      flag,
+      payload.flag,
-      approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
       payload.reason
     )
     return null

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,26 +1,31 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
-  user_id: number
+  user_id: number | string
   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 member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    const groupCode = payload.group_id.toString()
-    const enable = payload.enable.toString() === 'true'
+    const uin = payload.user_id.toString()
-    if (!member) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-      throw `群成员${payload.user_id}不存在`
+    if (!uid) throw new Error('无法获取用户信息')
-    }
     await this.ctx.ntGroupApi.setMemberRole(
-      payload.group_id.toString(),
+      groupCode,
-      member.uid,
+      uid,
-      enable ? GroupMemberRole.admin : GroupMemberRole.normal,
+      payload.enable ? GroupMemberRole.Admin : GroupMemberRole.Normal
     )
     return null
   }

src/onebot11/action/group/SetGroupBan.ts

@@ -1,22 +1,27 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
-  user_id: number
+  user_id: number | string
-  duration: number
+  duration: number | string
 }
 
 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 member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    const groupCode = payload.group_id.toString()
-    if (!member) {
+    const uin = payload.user_id.toString()
-      throw `群成员${payload.user_id}不存在`
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    }
+    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
+    await this.ctx.ntGroupApi.banMember(groupCode, [
-      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
+      { uid, timeStamp: +payload.duration },
     ])
     return null
   }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,21 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
-  user_id: number
+  user_id: number | string
   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 member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    const groupCode = payload.group_id.toString()
-    if (!member) {
+    const uin = payload.user_id.toString()
-      throw `群成员${payload.user_id}不存在`
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    }
+    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
+    await this.ctx.ntGroupApi.setMemberCard(groupCode, uid, payload.card)
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,21 +1,27 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
-  user_id: number
+  user_id: number | string
   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 member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
+    const groupCode = payload.group_id.toString()
-    if (!member) {
+    const uin = payload.user_id.toString()
-      throw `群成员${payload.user_id}不存在`
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
-    }
+    if (!uid) throw new Error('无法获取用户信息')
-    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
+    await this.ctx.ntGroupApi.kickMember(groupCode, [uid], payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

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

src/onebot11/action/group/SetGroupName.ts

@@ -1,13 +1,17 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   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,17 +1,21 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   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> {
-    const enable = payload.enable.toString() === 'true'
+    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), payload.enable)
-    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), enable)
     return null
   }
 }

src/onebot11/action/index.ts

@@ -45,7 +45,7 @@ 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 './msg/SetMsgEmojiLike'
+import { SetMsgEmojiLike } from './llonebot/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
 import { GetEssenceMsgList } from './go-cqhttp/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
@@ -69,6 +69,15 @@ 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 = [
@@ -85,6 +94,10 @@ export function initActionMap(adapter: 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),
@@ -115,9 +128,9 @@ 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),
     new GetGroupHonorInfo(adapter),
@@ -143,8 +156,13 @@ export function initActionMap(adapter: 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),
   ]
-  const actionMap = new Map<string, BaseAction<any, unknown>>()
+  const actionMap = new Map()
   for (const action of actionHandlers) {
     actionMap.set(action.actionName, action)
     actionMap.set(action.actionName + '_async', action)

src/onebot11/action/llonebot/Debug.ts

@@ -16,10 +16,8 @@ export default class Debug extends BaseAction<Payload, unknown> {
     for (const ntqqApiClass of ntqqApi) {
       const method = ntqqApiClass[payload.method as keyof typeof ntqqApiClass]
       if (method && method instanceof Function) {
-        const result = method.apply(ntqqApiClass, payload.args)
+        const result = await method.apply(ntqqApiClass, payload.args)
-        if (method.constructor.name === 'AsyncFunction') {
+        this.ctx.logger.info('debug', result)
-          return await result
-        }
         return result
       }
     }

src/onebot11/action/llonebot/FriendPoke.ts

@@ -0,0 +1,25 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
+
+interface Payload {
+  user_id: number | string
+}
+
+export class FriendPoke extends BaseAction<Payload, null> {
+  actionName = ActionName.FriendPoke
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required()
+  })
+
+  async _handle(payload: Payload) {
+    if (!this.ctx.app.native.checkPlatform()) {
+      throw new Error('当前系统平台或架构不支持')
+    }
+    if (!this.ctx.app.native.checkVersion()) {
+      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    }
+    await this.ctx.app.native.sendFriendPoke(+payload.user_id)
+    return null
+  }
+}

src/onebot11/action/llonebot/GetFriendMsgHistory.ts

@@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot11/types'
 import { ActionName } from '../types'
 import { ChatType, RawMessage } from '@/ntqqapi/types'
 import { OB11Entities } from '@/onebot11/entities'
-import { filterNullable } from '@/common/utils/misc'
+import { filterNullable, parseBool } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
@@ -24,7 +24,7 @@ export class GetFriendMsgHistory extends BaseAction<Payload, Response> {
     message_seq: Schema.union([Number, String]),
     message_id: Schema.union([Number, String]),
     count: Schema.union([Number, String]).default(20),
-    reverseOrder: Schema.boolean().default(false)
+    reverseOrder: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
   })
 
   async _handle(payload: Payload): Promise<Response> {
@@ -38,14 +38,11 @@ export class GetFriendMsgHistory extends BaseAction<Payload, Response> {
       const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
       if (!uid) throw new Error(`记录${payload.user_id}不存在`)
       const isBuddy = await this.ctx.ntFriendApi.isBuddy(uid)
-      const peer = { chatType: isBuddy ? ChatType.friend : ChatType.temp, peerUid: uid }
+      const peer = { chatType: isBuddy ? ChatType.C2C : ChatType.TempC2CFromGroup, peerUid: uid }
       msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList
     }
     if (msgList.length === 0) throw new Error('未找到消息')
     if (payload.reverseOrder) msgList.reverse()
-    for (const msg of msgList) {
-      msg.msgShortId = this.ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-    }
     const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
     return { messages: filterNullable(ob11MsgList) }
   }

src/onebot11/action/llonebot/GetFriendWithCategory.ts

@@ -4,14 +4,35 @@ import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils'
 
-export class GetFriendWithCategory extends BaseAction<void, OB11User[]> {
+interface Category {
+  categoryId: number
+  categorySortId: number
+  categoryName: string
+  categoryMbCount: number
+  onlineCount: number
+  buddyList: OB11User[]
+}
+
+export class GetFriendWithCategory extends BaseAction<void, Category[]> {
   actionName = ActionName.GetFriendsWithCategory
 
   protected async _handle() {
-    if (getBuildVersion() >= 26702) {
+    if (getBuildVersion() < 26702) {
-      return OB11Entities.friendsV2(await this.ctx.ntFriendApi.getBuddyV2ExWithCate(true))
-    } else {
       throw new Error('this ntqq version not support, must be 26702 or later')
     }
+    const data = await this.ctx.ntFriendApi.getBuddyV2WithCate(true)
+    return data.buddyCategory.map(item => {
+      return {
+        categoryId: item.categoryId,
+        categorySortId: item.categorySortId,
+        categoryName: item.categroyName,
+        categoryMbCount: item.categroyMbCount,
+        onlineCount: item.onlineCount,
+        buddyList: item.buddyUids.map(uid => {
+          const info = data.userSimpleInfos[uid]
+          return OB11Entities.friendV2(info)
+        })
+      }
+    })
   }
 }

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -13,7 +13,7 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
 
   protected async _handle(): Promise<OB11GroupRequestNotify[]> {
     const data = await this.ctx.ntGroupApi.getGroupIgnoreNotifies()
-    const notifies = data.notifies.filter(notify => notify.status === GroupNotifyStatus.KUNHANDLE)
+    const notifies = data.notifies.filter(notify => notify.status === GroupNotifyStatus.Unhandle)
     const returnData: OB11GroupRequestNotify[] = []
     for (const notify of notifies) {
       const uin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)

src/onebot11/action/llonebot/GetRobotUinRange.ts

@@ -0,0 +1,11 @@
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
+import { Dict } from 'cosmokit'
+
+export class GetRobotUinRange extends BaseAction<void, Dict[]> {
+  actionName = ActionName.GetRobotUinRange
+
+  async _handle() {
+    return await this.ctx.ntUserApi.getRobotUinRange()
+  }
+}

src/onebot11/action/llonebot/GroupPoke.ts

@@ -0,0 +1,27 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { getBuildVersion } from '@/common/utils/misc'
+
+interface Payload {
+  group_id: number | string
+  user_id: number | string
+}
+
+export class GroupPoke extends BaseAction<Payload, null> {
+  actionName = ActionName.GroupPoke
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required()
+  })
+
+  async _handle(payload: Payload) {
+    if (!this.ctx.app.native.checkPlatform()) {
+      throw new Error('当前系统平台或架构不支持')
+    }
+    if (!this.ctx.app.native.checkVersion()) {
+      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 27333—27597`)
+    }
+    await this.ctx.app.native.sendGroupPoke(+payload.group_id, +payload.user_id)
+    return null
+  }
+}

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -11,13 +11,13 @@ export default class SetAvatar extends BaseAction<Payload, null> {
   actionName = ActionName.SetQQAvatar
 
   protected async _handle(payload: Payload): Promise<null> {
-    const { path, isLocal, errMsg } = await uri2local(payload.file)
+    const { path, isLocal, errMsg } = await uri2local(this.ctx, payload.file)
     if (errMsg) {
       throw new Error(errMsg)
     }
     if (path) {
       await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
-      const ret = await this.ctx.ntUserApi.setQQAvatar(path)
+      const ret = await this.ctx.ntUserApi.setSelfAvatar(path)
       if (!isLocal) {
         unlink(path)
       }

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,7 +1,6 @@
 import { BaseAction } from '../BaseAction'
-import { ChatType } from '@/ntqqapi/types'
 import { ActionName } from '../types'
-import { Peer } from '@/ntqqapi/types'
+import { createPeer } from '@/onebot11/helper/createMessage'
 
 interface Payload {
   message_id: number | string
@@ -10,17 +9,6 @@ interface Payload {
 }
 
 abstract class ForwardSingleMsg extends BaseAction<Payload, null> {
-  protected async getTargetPeer(payload: Payload): Promise<Peer> {
-    if (payload.user_id) {
-      const peerUid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
-      if (!peerUid) {
-        throw new Error(`无法找到私聊对象${payload.user_id}`)
-      }
-      return { chatType: ChatType.friend, peerUid }
-    }
-    return { chatType: ChatType.group, peerUid: payload.group_id!.toString() }
-  }
-
   protected async _handle(payload: Payload): Promise<null> {
     if (!payload.message_id) {
       throw Error('message_id不能为空')
@@ -29,10 +17,10 @@ abstract class ForwardSingleMsg extends BaseAction<Payload, null> {
     if (!msg) {
       throw new Error(`无法找到消息${payload.message_id}`)
     }
-    const peer = await this.getTargetPeer(payload)
+    const peer = await createPeer(this.ctx, payload)
     const ret = await this.ctx.ntMsgApi.forwardMsg(msg.peer, peer, [msg.msgId])
-    if (ret.result !== 0) {
+    if (ret.length === 0) {
-      throw new Error(`转发消息失败 ${ret.errMsg}`)
+      throw new Error(`转发消息失败`)
     }
     return null
   }

src/onebot11/action/msg/GetMsg.ts

@@ -25,14 +25,11 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
       peerUid: msgInfo.peer.peerUid,
       chatType: msgInfo.peer.chatType
     }
-    const msg = this.adapter.getMsgCache(msgInfo.msgId) ?? (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgInfo.msgId])).msgList[0]
+    const msg = this.ctx.store.getMsgCache(msgInfo.msgId) ?? (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgInfo.msgId])).msgList[0]
     const retMsg = await OB11Entities.message(this.ctx, msg)
     if (!retMsg) {
       throw new Error('消息为空')
     }
-    retMsg.message_id = this.ctx.store.createMsgShortId(peer, msg.msgId)
-    retMsg.message_seq = retMsg.message_id
-    retMsg.real_id = retMsg.message_id
     return retMsg
   }
 }

src/onebot11/action/msg/SendMsg.ts

@@ -9,7 +9,7 @@ import {
 import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '@/common/utils/sign'
-import { convertMessage2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+import { message2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
 interface ReturnData {
   message_id: number
@@ -26,14 +26,14 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
       contextMode = CreatePeerMode.Private
     }
     const peer = await createPeer(this.ctx, payload, contextMode)
-    const messages = convertMessage2List(
+    const messages = message2List(
       payload.message,
       payload.auto_escape === true || payload.auto_escape === 'true',
     )
-    if (this.getSpecialMsgNum(messages, OB11MessageDataType.node)) {
+    if (this.getSpecialMsgNum(messages, OB11MessageDataType.Node)) {
       throw new Error('请使用 /send_group_forward_msg 或 /send_private_forward_msg 进行合并转发')
     }
-    else if (this.getSpecialMsgNum(messages, OB11MessageDataType.music)) {
+    else if (this.getSpecialMsgNum(messages, OB11MessageDataType.Music)) {
       const music = messages[0] as OB11MessageMusic
       if (music) {
         const { musicSignUrl } = this.adapter.config
@@ -78,7 +78,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
           throw `签名音乐消息失败：${e}`
         }
         messages[0] = {
-          type: OB11MessageDataType.json,
+          type: OB11MessageDataType.Json,
           data: { data: jsonContent },
         } as OB11MessageJson
       }
@@ -93,7 +93,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
     if (!returnMsg) {
       throw new Error('消息发送失败')
     }
-    return { message_id: returnMsg.msgShortId! }
+    const msgShortId = this.ctx.store.createMsgShortId({
+      chatType: returnMsg.chatType,
+      peerUid: returnMsg.peerUid
+    }, returnMsg.msgId)
+    return { message_id: msgShortId }
   }
 
   private getSpecialMsgNum(message: OB11MessageData[], msgType: OB11MessageDataType): number {

src/onebot11/action/system/GetCredentials.ts

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

src/onebot11/action/types.ts

@@ -24,6 +24,11 @@ export enum ActionName {
   FetchEmojiLike = 'fetch_emoji_like',
   FetchCustomFace = 'fetch_custom_face',
   GetFriendMsgHistory = 'get_friend_msg_history',
+  SendForwardMsg = 'send_forward_msg',
+  SetMsgEmojiLike = 'set_msg_emoji_like',
+  GetRobotUinRange = 'get_robot_uin_range',
+  GroupPoke = 'group_poke',
+  FriendPoke = 'friend_poke',
   // onebot 11
   SendLike = 'send_like',
   GetLoginInfo = 'get_login_info',
@@ -37,7 +42,6 @@ export enum ActionName {
   SendGroupMsg = 'send_group_msg',
   SendPrivateMsg = 'send_private_msg',
   DeleteMsg = 'delete_msg',
-  SetMsgEmojiLike = 'set_msg_emoji_like',
   SetGroupAddRequest = 'set_group_add_request',
   SetFriendAddRequest = 'set_friend_add_request',
   SetGroupLeave = 'set_group_leave',
@@ -57,8 +61,8 @@ export enum ActionName {
   GetCookies = 'get_cookies',
   ForwardFriendSingleMsg = 'forward_friend_single_msg',
   ForwardGroupSingleMsg = 'forward_group_single_msg',
-  // 以下为go-cqhttp api
+  GetCredentials = 'get_credentials',
-  GoCQHTTP_SendForwardMsg = 'send_forward_msg',
+  // go-cqhttp
   GoCQHTTP_SendGroupForwardMsg = 'send_group_forward_msg',
   GoCQHTTP_SendPrivateForwardMsg = 'send_private_forward_msg',
   GoCQHTTP_GetStrangerInfo = 'get_stranger_info',
@@ -81,5 +85,10 @@ export enum ActionName {
   GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain',
   GoCQHTTP_GetGroupRootFiles = 'get_group_root_files',
   GoCQHTTP_SendGroupNotice = '_send_group_notice',
-  GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder'
+  GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder',
+  GoCQHTTP_GetGroupFileUrl = 'get_group_file_url',
+  GoCQHTTP_GetGroupNotice = '_get_group_notice',
+  GoCQHTTP_DeleteFriend = 'delete_friend',
+  GoCQHTTP_OCRImage = 'ocr_image',
+  GoCQHTTP_GetGroupFileSystemInfo = 'get_group_file_system_info',
 }

src/onebot11/action/user/GetCookie.ts

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

src/onebot11/action/user/GetFriendList.ts

@@ -3,6 +3,7 @@ import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils'
+import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
   no_cache: boolean
@@ -11,7 +12,7 @@ interface Payload {
 export class GetFriendList extends BaseAction<Payload, OB11User[]> {
   actionName = ActionName.GetFriendList
   payloadSchema = Schema.object({
-    no_cache: Schema.boolean().default(false)
+    no_cache: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
   })
 
   protected async _handle(payload: Payload) {

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -1,5 +1,6 @@
 import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
+import { ChatType } from '@/ntqqapi/types'
 
 interface Payload {
   flag: string
@@ -22,6 +23,11 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
     if (payload.remark) {
       await this.ctx.ntFriendApi.setBuddyRemark(uid, payload.remark)
     }
+    /*await this.ctx.ntMsgApi.activateChat({
+      peerUid: uid,
+      chatType: ChatType.C2C,
+      guildId: ''
+    })*/
     return null
   }
 }

src/onebot11/adapter.ts

@@ -4,30 +4,25 @@ import {
   GroupNotify,
   GroupNotifyType,
   RawMessage,
-  BuddyReqType,
-  Peer,
   FriendRequest,
-  GroupMember,
-  GroupMemberRole,
   GroupNotifyStatus
 } from '../ntqqapi/types'
 import { OB11GroupRequestEvent } from './event/request/OB11GroupRequest'
 import { OB11FriendRequestEvent } from './event/request/OB11FriendRequest'
-import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent'
+import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent'
 import { selfInfo } from '../common/globalVars'
 import { OB11Config, Config as LLOBConfig } from '../common/types'
 import { OB11WebSocket, OB11WebSocketReverseManager } from './connect/ws'
 import { OB11Http, OB11HttpPost } from './connect/http'
 import { OB11BaseEvent } from './event/OB11BaseEvent'
-import { OB11Message } from './types'
 import { OB11BaseMetaEvent } from './event/meta/OB11BaseMetaEvent'
 import { postHttpEvent } from './helper/eventForHttp'
 import { initActionMap } from './action'
 import { llonebotError } from '../common/globalVars'
-import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent'
 import { OB11GroupAdminNoticeEvent } from './event/notice/OB11GroupAdminNoticeEvent'
 import { OB11ProfileLikeEvent } from './event/notice/OB11ProfileLikeEvent'
-import { SysMsg } from '@/ntqqapi/proto/compiled'
+import { Msg, SysMsg } from '@/ntqqapi/proto/compiled'
+import { OB11GroupIncreaseEvent } from './event/notice/OB11GroupIncreaseEvent'
 
 declare module 'cordis' {
   interface Context {
@@ -36,14 +31,15 @@ declare module 'cordis' {
 }
 
 class OneBot11Adapter extends Service {
-  static inject = ['ntMsgApi', 'ntFileApi', 'ntFileCacheApi', 'ntFriendApi', 'ntGroupApi', 'ntUserApi', 'ntWindowApi', 'ntWebApi', 'store']
+  static inject = [
-
+    'ntMsgApi', 'ntFileApi', 'ntFileCacheApi', 'ntFriendApi',
-  public messages: Map<string, RawMessage> = new Map()
+    'ntGroupApi', 'ntUserApi', 'ntWindowApi', 'ntWebApi',
-  public startTime = 0
+    'store', 'app'
-  private ob11WebSocket: OB11WebSocket
+  ]
-  private ob11WebSocketReverseManager: OB11WebSocketReverseManager
+  private ob11WebSocket
-  private ob11Http: OB11Http
+  private ob11WebSocketReverseManager
-  private ob11HttpPost: OB11HttpPost
+  private ob11Http
+  private ob11HttpPost
 
   constructor(public ctx: Context, public config: OneBot11Adapter.Config) {
     super(ctx, 'onebot', true)
@@ -75,25 +71,7 @@ class OneBot11Adapter extends Service {
     })
   }
 
-  /** 缓存近期消息内容 */
+  public dispatch(event: OB11BaseEvent) {
-  public async addMsgCache(msg: RawMessage) {
-    const expire = this.config.msgCacheExpire * 1000
-    if (expire === 0) {
-      return
-    }
-    const id = msg.msgId
-    this.messages.set(id, msg)
-    setTimeout(() => {
-      this.messages.delete(id)
-    }, expire)
-  }
-
-  /** 获取近期消息内容 */
-  public getMsgCache(msgId: string) {
-    return this.messages.get(msgId)
-  }
-
-  public dispatch(event: OB11BaseEvent | OB11Message) {
     if (this.config.enableWs) {
       this.ob11WebSocket.emitEvent(event)
     }
@@ -109,36 +87,24 @@ class OneBot11Adapter extends Service {
     }
   }
 
-  private async handleGroupNotify(notifies: GroupNotify[]) {
+  private async handleGroupNotify(notify: GroupNotify, doubt: boolean) {
-    for (const notify of notifies) {
     try {
-        const notifyTime = parseInt(notify.seq) / 1000
+      const flag = `${notify.group.groupCode}|${notify.seq}|${notify.type}|${doubt === true ? '1' : '0'}`
-        if (notifyTime < this.startTime) {
+      if ([GroupNotifyType.MemberLeaveNotifyAdmin, GroupNotifyType.KickMemberNotifyAdmin].includes(notify.type)) {
-          continue
-        }
-        const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
-        if ([GroupNotifyType.MEMBER_LEAVE_NOTIFY_ADMIN, GroupNotifyType.KICK_MEMBER_NOTIFY_ADMIN].includes(notify.type)) {
-          this.ctx.logger.info('有成员退出通知', notify)
-          const member1Uin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
-          let operatorId = member1Uin
-          let subType: GroupDecreaseSubType = 'leave'
         if (notify.user2.uid) {
-            // 是被踢的
+          this.ctx.logger.info('有群成员被踢', notify.group.groupCode, notify.user1.uid, notify.user2.uid)
-            const member2Uin = await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)
+          const memberUin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
-            if (member2Uin) {
+          const adminUin = await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)
-              operatorId = member2Uin
-            }
-            subType = 'kick'
-          }
           const event = new OB11GroupDecreaseEvent(
             parseInt(notify.group.groupCode),
-            parseInt(member1Uin),
+            parseInt(memberUin),
-            parseInt(operatorId),
+            parseInt(adminUin),
-            subType,
+            'kick',
           )
           this.dispatch(event)
         }
-        else if (notify.type === GroupNotifyType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS && notify.status === GroupNotifyStatus.KUNHANDLE) {
+      }
+      else if (notify.type === GroupNotifyType.RequestJoinNeedAdminiStratorPass && notify.status === GroupNotifyStatus.Unhandle) {
         this.ctx.logger.info('有加群请求')
         const requestUin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
         const event = new OB11GroupRequestEvent(
@@ -149,7 +115,7 @@ class OneBot11Adapter extends Service {
         )
         this.dispatch(event)
       }
-        else if (notify.type === GroupNotifyType.INVITED_BY_MEMBER && notify.status === GroupNotifyStatus.KUNHANDLE) {
+      else if (notify.type === GroupNotifyType.InvitedByMember && notify.status === GroupNotifyStatus.Unhandle) {
         this.ctx.logger.info('收到邀请我加群通知')
         const userId = await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)
         const event = new OB11GroupRequestEvent(
@@ -162,7 +128,7 @@ class OneBot11Adapter extends Service {
         )
         this.dispatch(event)
       }
-        else if (notify.type === GroupNotifyType.INVITED_NEED_ADMINI_STRATOR_PASS && notify.status === GroupNotifyStatus.KUNHANDLE) {
+      else if (notify.type === GroupNotifyType.InvitedNeedAdminiStratorPass && notify.status === GroupNotifyStatus.Unhandle) {
         this.ctx.logger.info('收到群员邀请加群通知')
         const userId = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
         const event = new OB11GroupRequestEvent(
@@ -173,27 +139,27 @@ class OneBot11Adapter extends Service {
         )
         this.dispatch(event)
       }
+      else if ([
+        GroupNotifyType.SetAdmin,
+        GroupNotifyType.CancelAdminNotifyCanceled,
+        GroupNotifyType.CancelAdminNotifyAdmin
+      ].includes(notify.type)) {
+        this.ctx.logger.info('收到管理员变动通知')
+        const uin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
+        const event = new OB11GroupAdminNoticeEvent(
+          notify.type === GroupNotifyType.SetAdmin ? 'set' : 'unset',
+          parseInt(notify.group.groupCode),
+          parseInt(uin),
+        )
+        this.dispatch(event)
+      }
     } catch (e) {
       this.ctx.logger.error('解析群通知失败', (e as Error).stack)
     }
   }
-  }
 
-  private handleMsg(msgList: RawMessage[]) {
+  private handleMsg(message: RawMessage) {
-    for (const message of msgList) {
+    OB11Entities.message(this.ctx, message).then(msg => {
-      // 过滤启动之前的消息
-      if (parseInt(message.msgTime) < this.startTime / 1000) {
-        continue
-      }
-      const peer: Peer = {
-        chatType: message.chatType,
-        peerUid: message.peerUid
-      }
-      message.msgShortId = this.ctx.store.createMsgShortId(peer, message.msgId)
-      this.addMsgCache(message)
-
-      OB11Entities.message(this.ctx, message)
-        .then((msg) => {
       if (!msg) {
         return
       }
@@ -201,28 +167,23 @@ class OneBot11Adapter extends Service {
         return
       }
       const isSelfMsg = msg.user_id.toString() === selfInfo.uin
-          if (isSelfMsg && !this.config.reportSelfMessage) {
-            return
-          }
       if (isSelfMsg) {
         msg.target_id = parseInt(message.peerUin)
       }
       this.dispatch(msg)
-        })
+    }).catch(e => this.ctx.logger.error('handling incoming messages', e))
-        .catch((e) => this.ctx.logger.error('constructMessage error: ', e.stack.toString()))
 
-      OB11Entities.groupEvent(this.ctx, message).then((groupEvent) => {
+    OB11Entities.groupEvent(this.ctx, message).then(groupEvent => {
       if (groupEvent) {
         this.dispatch(groupEvent)
       }
-      })
+    }).catch(e => this.ctx.logger.error('handling incoming group events', e))
 
-      OB11Entities.privateEvent(this.ctx, message).then((privateEvent) => {
+    OB11Entities.privateEvent(this.ctx, message).then(privateEvent => {
       if (privateEvent) {
         this.dispatch(privateEvent)
       }
-      })
+    }).catch(e => this.ctx.logger.error('handling incoming buddy events', e))
-    }
   }
 
   private handleRecallMsg(message: RawMessage) {
@@ -241,14 +202,7 @@ class OneBot11Adapter extends Service {
     })
   }
 
-  private async handleFriendRequest(buddyReqs: FriendRequest[]) {
+  private async handleFriendRequest(req: FriendRequest) {
-    for (const req of buddyReqs) {
-      if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
-        continue
-      }
-      if (+req.reqTime < this.startTime / 1000) {
-        continue
-      }
     let userId = 0
     try {
       const requesterUin = await this.ctx.ntUserApi.getUinByUid(req.friendUid)
@@ -265,7 +219,6 @@ class OneBot11Adapter extends Service {
     )
     this.dispatch(friendRequestEvent)
   }
-  }
 
   private async handleConfigUpdated(config: LLOBConfig) {
     const old = this.config
@@ -348,7 +301,6 @@ class OneBot11Adapter extends Service {
       heartInterval: config.heartInterval,
       token: config.token,
       debug: config.debug,
-      reportSelfMessage: config.reportSelfMessage,
       msgCacheExpire: config.msgCacheExpire,
       musicSignUrl: config.musicSignUrl,
       enableLocalFile2Url: config.enableLocalFile2Url,
@@ -356,31 +308,7 @@ class OneBot11Adapter extends Service {
     })
   }
 
-  private async handleGroupMemberInfoUpdated(groupCode: string, members: GroupMember[]) {
-    for (const member of members) {
-      const existMember = await this.ctx.ntGroupApi.getGroupMember(groupCode, member.uin)
-      if (existMember) {
-        if (member.cardName !== existMember.cardName) {
-          this.ctx.logger.info('群成员名片变动', `${groupCode}: ${existMember.uin}`, existMember.cardName, '->', member.cardName)
-          this.dispatch(
-            new OB11GroupCardEvent(parseInt(groupCode), parseInt(member.uin), member.cardName, existMember.cardName),
-          )
-        } else if (member.role !== existMember.role) {
-          this.ctx.logger.info('有管理员变动通知')
-          const groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent(
-            member.role == GroupMemberRole.admin ? 'set' : 'unset',
-            parseInt(groupCode),
-            parseInt(member.uin)
-          )
-          this.dispatch(groupAdminNoticeEvent)
-        }
-        Object.assign(existMember, member)
-      }
-    }
-  }
-
   public start() {
-    this.startTime = Date.now()
     if (this.config.enableWs) {
       this.ob11WebSocket.start()
     }
@@ -393,7 +321,7 @@ class OneBot11Adapter extends Service {
     if (this.config.enableHttpPost) {
       this.ob11HttpPost.start()
     }
-    this.ctx.on('llonebot/config-updated', input => {
+    this.ctx.on('llob/config-updated', input => {
       this.handleConfigUpdated(input)
     })
     this.ctx.on('nt/message-created', input => {
@@ -403,28 +331,45 @@ class OneBot11Adapter extends Service {
       this.handleRecallMsg(input)
     })
     this.ctx.on('nt/message-sent', input => {
-      this.handleMsg([input])
+      if (!this.config.reportSelfMessage) {
+        return
+      }
+      this.handleMsg(input)
     })
     this.ctx.on('nt/group-notify', input => {
-      this.handleGroupNotify(input)
+      const { doubt, notify } = input
+      this.handleGroupNotify(notify, doubt)
     })
     this.ctx.on('nt/friend-request', input => {
       this.handleFriendRequest(input)
     })
-    this.ctx.on('nt/group-member-info-updated', input => {
+    this.ctx.on('nt/system-message-created', async input => {
-      this.handleGroupMemberInfoUpdated(input.groupCode, input.members)
+      const sysMsg = Msg.Message.decode(input)
-    })
+      const { msgType, subType } = sysMsg.contentHead ?? {}
-    this.ctx.on('nt/system-message-created', input => {
+      if (msgType === 528 && subType === 39) {
-      const sysMsg = SysMsg.SystemMessage.decode(input)
+        const tip = SysMsg.ProfileLikeTip.decode(sysMsg.body!.msgContent!)
-      const { msgType, subType, subSubType } = sysMsg.msgSpec[0] ?? {}
-      if (msgType === 528 && subType === 39 && subSubType === 39) {
-        const tip = SysMsg.ProfileLikeTip.decode(sysMsg.bodyWrapper!.body!)
         if (tip.msgType !== 0 || tip.subType !== 203) return
         const detail = tip.content?.msg?.detail
         if (!detail) return
         const [times] = detail.txt?.match(/\d+/) ?? ['0']
-        const profileLikeEvent = new OB11ProfileLikeEvent(detail.uin!, detail.nickname!, +times)
+        const event = new OB11ProfileLikeEvent(detail.uin!, detail.nickname!, +times)
-        this.dispatch(profileLikeEvent)
+        this.dispatch(event)
+      } else if (msgType === 33) {
+        const tip = SysMsg.GroupMemberChange.decode(sysMsg.body!.msgContent!)
+        if (tip.type !== 130) return
+        this.ctx.logger.info('群成员增加', tip)
+        const memberUin = await this.ctx.ntUserApi.getUinByUid(tip.memberUid)
+        const operatorUin = await this.ctx.ntUserApi.getUinByUid(tip.adminUid)
+        const event = new OB11GroupIncreaseEvent(tip.groupCode, +memberUin, +operatorUin)
+        this.dispatch(event)
+      } else if (msgType === 34) {
+        const tip = SysMsg.GroupMemberChange.decode(sysMsg.body!.msgContent!)
+        if (tip.type !== 130) return // adminUid: 0
+        this.ctx.logger.info('群成员减少', tip)
+        const memberUin = await this.ctx.ntUserApi.getUinByUid(tip.memberUid)
+        const userId = Number(memberUin)
+        const event = new OB11GroupDecreaseEvent(tip.groupCode, userId, userId)
+        this.dispatch(event)
       }
     })
   }
@@ -435,8 +380,6 @@ namespace OneBot11Adapter {
     heartInterval: number
     token: string
     debug: boolean
-    reportSelfMessage: boolean
-    msgCacheExpire: number
     musicSignUrl?: string
     enableLocalFile2Url: boolean
     ffmpeg?: string

src/onebot11/connect/http.ts

@@ -1,7 +1,7 @@
 import http from 'node:http'
 import cors from 'cors'
 import crypto from 'node:crypto'
-import express, { Express, Request, Response } from 'express'
+import express, { Express, Request, Response, NextFunction } from 'express'
 import { BaseAction } from '../action/BaseAction'
 import { Context } from 'cordis'
 import { llonebotError, selfInfo } from '@/common/globalVars'
@@ -12,8 +12,6 @@ import { handleQuickOperation, QuickOperationEvent } from '../helper/quickOperat
 import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'
 import { Dict } from 'cosmokit'
 
-type RegisterHandler = (res: Response, payload: unknown) => Promise<unknown>
-
 class OB11Http {
   private readonly expressAPP: Express
   private server?: http.Server
@@ -25,7 +23,6 @@ class OB11Http {
     this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }))
     this.expressAPP.use((req, res, next) => {
       // 兼容处理没有带content-type的请求
-      // log("req.headers['content-type']", req.headers['content-type'])
       req.headers['content-type'] = 'application/json'
       const originalJson = express.json({ limit: '5000mb' })
       // 调用原始的express.json()处理器
@@ -37,12 +34,8 @@ class OB11Http {
         next()
       })
     })
-    setTimeout(() => {
+    this.expressAPP.use((req, res, next) => this.authorize(req, res, next))
-      for (const [actionName, action] of config.actionMap) {
+    this.expressAPP.use((req, res, next) => this.handleRequest(req, res, next))
-        this.registerRouter('post', actionName, (res, payload) => action.handle(payload))
-        this.registerRouter('get', actionName, (res, payload) => action.handle(payload))
-      }
-    }, 0)
   }
 
   public start() {
@@ -83,8 +76,10 @@ class OB11Http {
     Object.assign(this.config, config)
   }
 
-  private authorize(req: Request, res: Response, next: () => void) {
+  private authorize(req: Request, res: Response, next: NextFunction) {
     const serverToken = this.config.token
+    if (!serverToken) return next()
+
     let clientToken = ''
     const authHeader = req.get('authorization')
     if (authHeader) {
@@ -99,36 +94,32 @@ class OB11Http {
       this.ctx.logger.info('receive http url token', clientToken)
     }
 
-    if (serverToken && clientToken !== serverToken) {
+    if (clientToken !== serverToken) {
-      return res.status(403).send(JSON.stringify({ message: 'token verify failed!' }))
+      res.status(403).json({ message: 'token verify failed!' })
-    }
+    } else {
       next()
     }
-
-  private registerRouter(method: 'post' | 'get', url: string, handler: RegisterHandler) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
   }
 
-    if (!this.expressAPP[method]) {
+  private async handleRequest(req: Request, res: Response, next: NextFunction) {
-      const err = `LLOneBot server register router failed，${method} not exist`
+    if (req.path === '/') return next()
-      this.ctx.logger.error(err)
-      throw err
-    }
-    this.expressAPP[method](url, this.authorize.bind(this), async (req: Request, res: Response) => {
     let payload = req.body
-      if (method == 'get') {
+    if (req.method === 'GET') {
       payload = req.query
     } else if (req.query) {
       payload = { ...req.query, ...req.body }
     }
-      this.ctx.logger.info('收到 HTTP 请求', url, payload)
+    this.ctx.logger.info('收到 HTTP 请求', req.url, payload)
+    const action = this.config.actionMap.get(req.path.replaceAll('/', ''))
+    if (action) {
       try {
-        res.send(await handler(res, payload))
+        res.json(await action.handle(payload))
       } catch (e) {
-        res.send(OB11Response.error((e as Error).stack!.toString(), 200))
+        res.json(OB11Response.error((e as Error).stack!.toString(), 200))
+      }
+    } else {
+      res.status(404).json(OB11Response.error('API 不存在', 404))
     }
-    })
   }
 }
 
@@ -143,11 +134,13 @@ namespace OB11Http {
 
 class OB11HttpPost {
   private disposeInterval?: () => void
+  private activated = false
 
   constructor(protected ctx: Context, public config: OB11HttpPost.Config) {
   }
 
   public start() {
+    this.activated = true
     if (this.config.enableHttpHeart && !this.disposeInterval) {
       this.disposeInterval = this.ctx.setInterval(() => {
         // ws的心跳是ws自己维护的
@@ -157,10 +150,14 @@ class OB11HttpPost {
   }
 
   public stop() {
+    this.activated = false
     this.disposeInterval?.()
   }
 
-  public async emitEvent(event: OB11BaseEvent | OB11Message) {
+  public async emitEvent(event: OB11BaseEvent) {
+    if (!this.activated || !this.config.hosts.length) {
+      return
+    }
     const msgStr = JSON.stringify(event)
     const headers: Dict = {
       'Content-Type': 'application/json',
@@ -180,7 +177,8 @@ class OB11HttpPost {
       }).then(
         async (res) => {
           if (event.post_type) {
-            this.ctx.logger.info(`HTTP 事件上报: ${host}`, event.post_type, res.status)
+            const eventName = event.post_type + '.' + event[event.post_type + '_type']
+            this.ctx.logger.info(`HTTP 事件上报: ${host}`, eventName, res.status)
           }
           try {
             const resJson = await res.json()

src/onebot11/connect/ws.ts

@@ -57,11 +57,12 @@ class OB11WebSocket {
     })
   }
 
-  public async emitEvent(event: OB11BaseEvent | OB11Message) {
+  public async emitEvent(event: OB11BaseEvent) {
     this.wsClients.forEach(({ socket, emitEvent }) => {
       if (emitEvent && socket.readyState === WebSocket.OPEN) {
         socket.send(JSON.stringify(event))
-        this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', event.post_type)
+        const eventName = event.post_type + '.' + event[event.post_type + '_type']
+        this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', eventName)
       }
     })
   }
@@ -193,10 +194,11 @@ class OB11WebSocketReverse {
     this.wsClient?.close()
   }
 
-  public emitEvent(event: OB11BaseEvent | OB11Message) {
+  public emitEvent(event: OB11BaseEvent) {
     if (this.wsClient && this.wsClient.readyState === WebSocket.OPEN) {
       this.wsClient.send(JSON.stringify(event))
-      this.ctx.logger.info('WebSocket 事件上报', this.wsClient.url ?? '', event.post_type)
+      const eventName = event.post_type + '.' + event[event.post_type + '_type']
+      this.ctx.logger.info('WebSocket 事件上报', this.wsClient.url ?? '', eventName)
     }
   }
 

src/onebot11/cqcode.ts

@@ -72,7 +72,3 @@ export function encodeCQCode(input: OB11MessageData) {
   result += ']'
   return result
 }
-
-// const result = parseCQCode("[CQ:at,qq=114514]早上好啊[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]")
-// const result = parseCQCode("好好好")
-// console.log(JSON.stringify(result))

src/onebot11/entities.ts

@@ -1,4 +1,3 @@
-import { XMLParser } from 'fast-xml-parser'
 import {
   OB11Group,
   OB11GroupMember,
@@ -20,7 +19,7 @@ import {
   Sex,
   TipGroupElementType,
   User,
-  FriendV2
+  SimpleInfo
 } from '../ntqqapi/types'
 import { EventType } from './event/OB11BaseEvent'
 import { encodeCQCode } from './cqcode'
@@ -30,7 +29,6 @@ import { OB11GroupUploadNoticeEvent } from './event/notice/OB11GroupUploadNotice
 import { OB11GroupNoticeEvent } from './event/notice/OB11GroupNoticeEvent'
 import { calcQQLevel } from '../common/utils/misc'
 import { OB11GroupTitleEvent } from './event/notice/OB11GroupTitleEvent'
-import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent'
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent'
 import { OB11GroupMsgEmojiLikeEvent } from './event/notice/OB11MsgEmojiLikeEvent'
 import { OB11FriendAddNoticeEvent } from './event/notice/OB11FriendAddNoticeEvent'
@@ -39,7 +37,7 @@ import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNotice
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'
 import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent'
 import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent'
-import { omit, isNullable, pick, Dict } from 'cosmokit'
+import { omit, pick, Dict } from 'cosmokit'
 import { Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 import { pathToFileURL } from 'node:url'
@@ -53,14 +51,15 @@ export namespace OB11Entities {
       messagePostFormat,
     } = ctx.config as OneBot11Adapter.Config
     const selfUin = selfInfo.uin
+    const msgShortId = ctx.store.createMsgShortId({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
     const resMsg: OB11Message = {
       self_id: parseInt(selfUin),
       user_id: parseInt(msg.senderUin),
       time: parseInt(msg.msgTime) || Date.now(),
-      message_id: msg.msgShortId!,
+      message_id: msgShortId,
-      real_id: msg.msgShortId!,
+      real_id: msgShortId,
-      message_seq: msg.msgShortId!,
+      message_seq: msgShortId,
-      message_type: msg.chatType === ChatType.group ? 'group' : 'private',
+      message_type: msg.chatType === ChatType.Group ? 'group' : 'private',
       sender: {
         user_id: parseInt(msg.senderUin),
         nickname: msg.sendNickName,
@@ -71,30 +70,33 @@ export namespace OB11Entities {
       sub_type: 'friend',
       message: messagePostFormat === 'string' ? '' : [],
       message_format: messagePostFormat === 'string' ? 'string' : 'array',
-      post_type: selfUin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
+      post_type: selfUin === msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
     }
     if (debug) {
       resMsg.raw = msg
     }
-    if (msg.chatType === ChatType.group) {
+    if (msg.chatType === ChatType.Group) {
       resMsg.sub_type = 'normal'
       resMsg.group_id = parseInt(msg.peerUin)
-      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin)
+      // 284840486: 合并转发内部
+      if (msg.peerUin !== '284840486') {
+        const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUid)
         if (member) {
           resMsg.sender.role = groupMemberRole(member.role)
           resMsg.sender.nickname = member.nick
           resMsg.sender.title = member.memberSpecialTitle ?? ''
         }
       }
-    else if (msg.chatType === ChatType.friend) {
-      resMsg.sub_type = 'friend'
-      resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick
     }
-    else if (msg.chatType === ChatType.temp) {
+    else if (msg.chatType === ChatType.C2C) {
+      resMsg.sub_type = 'friend'
+      resMsg.sender.nickname = (await ctx.ntUserApi.getUserSimpleInfo(msg.senderUid)).nick
+    }
+    else if (msg.chatType === ChatType.TempC2CFromGroup) {
       resMsg.sub_type = 'group'
       resMsg.temp_source = 0 //群聊
-      resMsg.sender.nickname = (await ctx.ntUserApi.getUserDetailInfo(msg.senderUid)).nick
+      resMsg.sender.nickname = (await ctx.ntUserApi.getUserSimpleInfo(msg.senderUid)).nick
-      const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType.temp, msg.senderUid)
+      const ret = await ctx.ntMsgApi.getTempChatInfo(ChatType.TempC2CFromGroup, msg.senderUid)
       if (ret?.result === 0) {
         resMsg.sender.group_id = Number(ret.tmpChatInfo?.groupCode)
       } else {
@@ -104,41 +106,35 @@ export namespace OB11Entities {
 
     for (const element of msg.elements) {
       let messageSegment: OB11MessageData | undefined
-      if (element.textElement && element.textElement?.atType !== AtType.notAt) {
+      if (element.textElement && element.textElement?.atType !== AtType.Unknown) {
         let qq: string
         let name: string | undefined
-        if (element.textElement.atType == AtType.atAll) {
+        if (element.textElement.atType === AtType.All) {
           qq = 'all'
+        } else {
+          const { atNtUid, atUid, content } = element.textElement
+          if (atUid && atUid !== '0') {
+            qq = atUid
+          } else {
+            qq = await ctx.ntUserApi.getUinByUid(atNtUid)
           }
-        else {
-          const { atNtUid, content } = element.textElement
-          let atQQ = element.textElement.atUid
-          if (!atQQ || atQQ === '0') {
-            const atMember = await ctx.ntGroupApi.getGroupMember(msg.peerUin, atNtUid)
-            if (atMember) {
-              atQQ = atMember.uin
-            }
-          }
-          if (atQQ) {
-            qq = atQQ
           name = content.replace('@', '')
         }
-        }
         messageSegment = {
-          type: OB11MessageDataType.at,
+          type: OB11MessageDataType.At,
           data: {
-            qq: qq!,
+            qq,
             name
           }
         }
       }
       else if (element.textElement) {
         const text = element.textElement.content
-        if (!text.trim()) {
+        if (!text) {
           continue
         }
         messageSegment = {
-          type: OB11MessageDataType.text,
+          type: OB11MessageDataType.Text,
           data: {
             text
           }
@@ -174,7 +170,7 @@ export namespace OB11Entities {
             throw new Error('回复消息验证失败')
           }
           messageSegment = {
-            type: OB11MessageDataType.reply,
+            type: OB11MessageDataType.Reply,
             data: {
               id: ctx.store.createMsgShortId(peer, replyMsg ? replyMsg.msgId : records.msgId).toString()
             }
@@ -188,7 +184,7 @@ export namespace OB11Entities {
         const { picElement } = element
         const fileSize = picElement.fileSize ?? '0'
         messageSegment = {
-          type: OB11MessageDataType.image,
+          type: OB11MessageDataType.Image,
           data: {
             file: picElement.fileName,
             subType: picElement.picSubType,
@@ -216,7 +212,7 @@ export namespace OB11Entities {
         }, msg.msgId, element.elementId)
         const fileSize = videoElement.fileSize ?? '0'
         messageSegment = {
-          type: OB11MessageDataType.video,
+          type: OB11MessageDataType.Video,
           data: {
             file: videoElement.fileName,
             url: videoUrl || pathToFileURL(videoElement.filePath).href,
@@ -240,7 +236,7 @@ export namespace OB11Entities {
         const { fileElement } = element
         const fileSize = fileElement.fileSize ?? '0'
         messageSegment = {
-          type: OB11MessageDataType.file,
+          type: OB11MessageDataType.File,
           data: {
             file: fileElement.fileName,
             url: pathToFileURL(fileElement.filePath).href,
@@ -265,7 +261,7 @@ export namespace OB11Entities {
         const { pttElement } = element
         const fileSize = pttElement.fileSize ?? '0'
         messageSegment = {
-          type: OB11MessageDataType.voice,
+          type: OB11MessageDataType.Record,
           data: {
             file: pttElement.fileName,
             url: pathToFileURL(pttElement.filePath).href,
@@ -288,7 +284,7 @@ export namespace OB11Entities {
       else if (element.arkElement) {
         const { arkElement } = element
         messageSegment = {
-          type: OB11MessageDataType.json,
+          type: OB11MessageDataType.Json,
           data: {
             data: arkElement.bytesData
           }
@@ -296,28 +292,31 @@ export namespace OB11Entities {
       }
       else if (element.faceElement) {
         const { faceElement } = element
-        const faceId = faceElement.faceIndex
+        const { faceIndex, pokeType } = faceElement
-        if (faceId === FaceIndex.dice) {
+        if (faceIndex === FaceIndex.Dice) {
           messageSegment = {
-            type: OB11MessageDataType.dice,
+            type: OB11MessageDataType.Dice,
             data: {
               result: faceElement.resultId!
             }
           }
-        }
+        } else if (faceIndex === FaceIndex.RPS) {
-        else if (faceId === FaceIndex.RPS) {
           messageSegment = {
-            type: OB11MessageDataType.RPS,
+            type: OB11MessageDataType.Rps,
             data: {
               result: faceElement.resultId!
             }
           }
-        }
+          /*} else if (faceIndex === 1 && pokeType === 1) {
-        else {
             messageSegment = {
-            type: OB11MessageDataType.face,
+              type: OB11MessageDataType.shake,
+              data: {}
+            }*/
+        } else {
+          messageSegment = {
+            type: OB11MessageDataType.Face,
             data: {
-              id: faceId.toString()
+              id: faceIndex.toString()
             }
           }
         }
@@ -331,7 +330,7 @@ export namespace OB11Entities {
         // const url = `https://p.qpic.cn/CDN_STATIC/0/data/imgcache/htdocs/club/item/parcel/item/${dir}/${md5}/300x300.gif?max_age=31536000`
         const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`
         messageSegment = {
-          type: OB11MessageDataType.mface,
+          type: OB11MessageDataType.Mface,
           data: {
             summary: marketFaceElement.faceName!,
             url,
@@ -340,20 +339,19 @@ export namespace OB11Entities {
             key: marketFaceElement.key
           }
         }
-        //mFaceCache.set(emojiId, element.marketFaceElement.faceName!)
       }
       else if (element.markdownElement) {
         const { markdownElement } = element
         messageSegment = {
-          type: OB11MessageDataType.markdown,
+          type: OB11MessageDataType.Markdown,
           data: {
-            data: markdownElement.content
+            content: markdownElement.content
           }
         }
       }
       else if (element.multiForwardMsgElement) {
         messageSegment = {
-          type: OB11MessageDataType.forward,
+          type: OB11MessageDataType.Forward,
           data: {
             id: msg.msgId
           }
@@ -361,27 +359,39 @@ export namespace OB11Entities {
       }
       if (messageSegment) {
         const cqCode = encodeCQCode(messageSegment)
-        if (messagePostFormat === 'string') {
+        if (messagePostFormat === 'array') {
-          (resMsg.message as string) += cqCode
-        } else {
           (resMsg.message as OB11MessageData[]).push(messageSegment)
         }
         resMsg.raw_message += cqCode
       }
     }
-    resMsg.raw_message = resMsg.raw_message.trim()
+    if (messagePostFormat === 'string') {
+      resMsg.message = resMsg.raw_message
+    }
     return resMsg
   }
 
   export async function privateEvent(ctx: Context, msg: RawMessage): Promise<OB11BaseNoticeEvent | void> {
-    if (msg.chatType !== ChatType.friend) {
+    if (msg.chatType !== ChatType.C2C) {
       return
     }
+    if (msg.msgType !== 5) {
+      return
+    }
+
     for (const element of msg.elements) {
       if (element.grayTipElement) {
         const { grayTipElement } = element
         if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
           const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+          const param = grayTipElement.jsonGrayTipElement.xmlToJsonParam
+          if (param) {
+            return new OB11FriendPokeEvent(
+              Number(param.templParam.get('uin_str1')),
+              Number(param.templParam.get('uin_str2')),
+              json.items
+            )
+          }
           const pokedetail: Dict[] = json.items
           //筛选item带有uid的元素
           const poke_uid = pokedetail.filter(item => item.uid)
@@ -403,42 +413,21 @@ export namespace OB11Entities {
   }
 
   export async function groupEvent(ctx: Context, msg: RawMessage): Promise<OB11GroupNoticeEvent | void> {
-    if (msg.chatType !== ChatType.group) {
+    if (msg.chatType !== ChatType.Group) {
       return
     }
-    if (msg.senderUin) {
+    if (msg.msgType !== 5 && msg.msgType !== 3) {
-      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUid, msg.senderUin)
+      return
-      if (member && member.cardName !== msg.sendMemberName) {
-        const event = new OB11GroupCardEvent(
-          parseInt(msg.peerUid),
-          parseInt(msg.senderUin),
-          msg.sendMemberName!,
-          member.cardName,
-        )
-        member.cardName = msg.sendMemberName!
-        return event
-      }
     }
+
     for (const element of msg.elements) {
       const grayTipElement = element.grayTipElement
       const groupElement = grayTipElement?.groupElement
+      const xmlElement = grayTipElement?.xmlElement
+
       if (groupElement) {
-        if (groupElement.type === TipGroupElementType.memberIncrease) {
+        if (groupElement.type === TipGroupElementType.Ban) {
-          ctx.logger.info('收到群成员增加消息', groupElement)
+          ctx.logger.info('收到群成员禁言提示', groupElement)
-          await ctx.sleep(1000)
-          const member = await ctx.ntGroupApi.getGroupMember(msg.peerUid, groupElement.memberUid)
-          let memberUin = member?.uin
-          if (!memberUin) {
-            memberUin = (await ctx.ntUserApi.getUserDetailInfo(groupElement.memberUid)).uin
-          }
-          const adminMember = await ctx.ntGroupApi.getGroupMember(msg.peerUid, groupElement.adminUid)
-          if (memberUin) {
-            const operatorUin = adminMember?.uin || memberUin
-            return new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(operatorUin))
-          }
-        }
-        else if (groupElement.type === TipGroupElementType.ban) {
-          ctx.logger.info('收到群群员禁言提示', groupElement)
           const memberUid = groupElement.shutUp?.member.uid
           const adminUid = groupElement.shutUp?.admin.uid
           let memberUin: string = ''
@@ -467,7 +456,7 @@ export namespace OB11Entities {
             )
           }
         }
-        else if (groupElement.type === TipGroupElementType.kicked) {
+        else if (groupElement.type === TipGroupElementType.Kicked) {
           ctx.logger.info(`收到我被踢出或退群提示, 群${msg.peerUid}`, groupElement)
           ctx.ntGroupApi.quitGroup(msg.peerUid)
           try {
@@ -498,81 +487,70 @@ export namespace OB11Entities {
           busid: element.fileElement.fileBizId || 0,
         })
       }
-
+      else if (xmlElement) {
-      if (grayTipElement) {
+        if (xmlElement.templId === '10382') {
-        const xmlElement = grayTipElement.xmlElement
+          ctx.logger.info('收到表情回应我的消息', xmlElement.templParam)
-
-        if (xmlElement?.templId === '10382') {
-          const emojiLikeData = new XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: '',
-          }).parse(xmlElement.content)
-          ctx.logger.info('收到表情回应我的消息', emojiLikeData)
           try {
-            const senderUin: string = emojiLikeData.gtip.qq.jp
+            const senderUin = xmlElement.templParam.get('jp_uin')
-            const msgSeq: string = emojiLikeData.gtip.url.msgseq
+            const msgSeq = xmlElement.templParam.get('msg_seq')
-            const emojiId: string = emojiLikeData.gtip.face.id
+            const emojiId = xmlElement.templParam.get('face_id')
             const peer = {
-              chatType: ChatType.group,
+              chatType: ChatType.Group,
               guildId: '',
               peerUid: msg.peerUid,
             }
-            const replyMsgList = (await ctx.ntMsgApi.queryFirstMsgBySeq(peer, msgSeq)).msgList
+            const replyMsgList = (await ctx.ntMsgApi.queryFirstMsgBySeq(peer, msgSeq!)).msgList
             if (!replyMsgList?.length) {
               return
             }
-            const shortId = ctx.store.getShortIdByMsgInfo(peer, replyMsgList[0].msgId)
+            const shortId = ctx.store.createMsgShortId(peer, replyMsgList[0].msgId)
             return new OB11GroupMsgEmojiLikeEvent(
               parseInt(msg.peerUid),
-              parseInt(senderUin),
+              parseInt(senderUin!),
-              shortId!,
+              shortId,
               [{
-                emoji_id: emojiId,
+                emoji_id: emojiId!,
                 count: 1,
               }]
             )
           } catch (e) {
             ctx.logger.error('解析表情回应消息失败', (e as Error).stack)
           }
+        } else if (xmlElement.templId == '10179') {
+          ctx.logger.info('收到新人被邀请进群消息', xmlElement)
+          const invitor = xmlElement.templParam.get('invitor')
+          const invitee = xmlElement.templParam.get('invitee')
+          if (invitor && invitee) {
+            return new OB11GroupIncreaseEvent(+msg.peerUid, +invitee, +invitor, 'invite')
+          }
+        }
       }
 
-        if (
+      if (grayTipElement) {
-          grayTipElement.subElementType == GrayTipElementSubType.XMLMSG &&
+        if (grayTipElement.subElementType == GrayTipElementSubType.JSON) {
-          xmlElement?.templId == '10179'
-        ) {
-          ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
-          if (xmlElement?.content) {
-            const regex = /jp="(\d+)"/g
-
-            const matches: string[] = []
-            let match: RegExpExecArray | null = null
-
-            while ((match = regex.exec(xmlElement.content)) !== null) {
-              matches.push(match[1])
-            }
-            // log("新人进群匹配到的QQ号", matches)
-            if (matches.length === 2) {
-              const [inviter, invitee] = matches
-              return new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(invitee), parseInt(inviter), 'invite')
-            }
-          }
-        }
-        else if (grayTipElement.subElementType == GrayTipElementSubType.JSON) {
           const json = JSON.parse(grayTipElement.jsonGrayTipElement!.jsonStr)
           if (grayTipElement.jsonGrayTipElement?.busiId === '1061') {
+            const param = grayTipElement.jsonGrayTipElement.xmlToJsonParam
+            if (param) {
+              return new OB11GroupPokeEvent(
+                Number(msg.peerUid),
+                Number(param.templParam.get('uin_str1')),
+                Number(param.templParam.get('uin_str2')),
+                json.items
+              )
+            }
             const pokedetail: Dict[] = json.items
             //筛选item带有uid的元素
             const poke_uid = pokedetail.filter(item => item.uid)
             if (poke_uid.length == 2) {
               return new OB11GroupPokeEvent(
-                parseInt(msg.peerUid),
+                Number(msg.peerUid),
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid) ?? 0),
+                Number(await ctx.ntUserApi.getUinByUid(poke_uid[0].uid) ?? 0),
-                parseInt(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid) ?? 0),
+                Number(await ctx.ntUserApi.getUinByUid(poke_uid[1].uid) ?? 0),
                 pokedetail
               )
             }
-          }
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === '2401' && json.items[2]) {
-          if (grayTipElement.jsonGrayTipElement?.busiId === '2401' && json.items[2]) {
             ctx.logger.info('收到群精华消息', json)
             const searchParams = new URL(json.items[2].jp).searchParams
             const msgSeq = searchParams.get('seq')
@@ -581,7 +559,7 @@ export namespace OB11Entities {
             if (!groupCode || !msgSeq || !msgRandom) return
             const peer = {
               guildId: '',
-              chatType: ChatType.group,
+              chatType: ChatType.Group,
               peerUid: groupCode
             }
             const essence = await ctx.ntGroupApi.queryCachedEssenceMsg(groupCode, msgSeq, msgRandom)
@@ -594,17 +572,16 @@ export namespace OB11Entities {
               parseInt(essence.items[0]?.msgSenderUin ?? sourceMsg.senderUin),
               parseInt(essence.items[0]?.opUin ?? '0'),
             )
-          }
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === '2407') {
-          if (grayTipElement.jsonGrayTipElement?.busiId === '2407') {
             const memberUin = json.items[1].param[0]
             const title = json.items[3].txt
             ctx.logger.info('收到群成员新头衔消息', json)
-            ctx.ntGroupApi.getGroupMember(msg.peerUid, memberUin).then(member => {
-              if (!isNullable(member)) {
-                member.memberSpecialTitle = title
-              }
-            })
             return new OB11GroupTitleEvent(parseInt(msg.peerUid), parseInt(memberUin), title)
+          } else if (grayTipElement.jsonGrayTipElement?.busiId === '19217') {
+            ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
+            const userId = new URL(json.items[2].jp).searchParams.get('robot_uin')
+            const operatorId = new URL(json.items[0].jp).searchParams.get('uin')
+            return new OB11GroupIncreaseEvent(Number(msg.peerUid), Number(userId), Number(operatorId), 'invite')
           }
         }
       }
@@ -616,14 +593,8 @@ export namespace OB11Entities {
     msg: RawMessage,
     shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
-    const msgElement = msg.elements.find(
+    const revokeElement = msg.elements[0].grayTipElement?.revokeElement
-      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.REVOKE,
+    if (msg.chatType === ChatType.Group) {
-    )
-    if (!msgElement) {
-      return
-    }
-    const revokeElement = msgElement.grayTipElement!.revokeElement
-    if (msg.chatType === ChatType.group) {
       const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement!.operatorUid)
       return new OB11GroupRecallNoticeEvent(
         parseInt(msg.peerUid),
@@ -651,75 +622,62 @@ export namespace OB11Entities {
     return friends.map(friend)
   }
 
-  export function friendsV2(friends: FriendV2[]): OB11User[] {
+  export function friendV2(raw: SimpleInfo): OB11User {
-    const data: OB11User[] = []
+    return {
-    for (const friend of friends) {
+      ...omit(raw.baseInfo, ['richBuffer', 'phoneNum']),
-      const sexValue = sex(friend.baseInfo.sex!)
+      ...omit(raw.coreInfo, ['nick']),
-      data.push({
+      user_id: parseInt(raw.coreInfo.uin),
-        ...omit(friend.baseInfo, ['richBuffer']),
+      nickname: raw.coreInfo.nick,
-        ...friend.coreInfo,
+      remark: raw.coreInfo.remark || raw.coreInfo.nick,
-        user_id: parseInt(friend.coreInfo.uin),
+      sex: sex(raw.baseInfo.sex),
-        nickname: friend.coreInfo.nick,
+      level: 0
-        remark: friend.coreInfo.nick,
-        sex: sexValue,
-        level: 0,
-        categroyName: friend.categroyName,
-        categoryId: friend.categoryId
-      })
     }
-    return data
   }
 
-  export function groupMemberRole(role: number): OB11GroupMemberRole | undefined {
+  export function friendsV2(raw: SimpleInfo[]): OB11User[] {
+    return raw.map(friendV2)
+  }
+
+  export function groupMemberRole(role: number): OB11GroupMemberRole {
     return {
-      4: OB11GroupMemberRole.owner,
+      4: OB11GroupMemberRole.Owner,
-      3: OB11GroupMemberRole.admin,
+      3: OB11GroupMemberRole.Admin,
-      2: OB11GroupMemberRole.member,
+      2: OB11GroupMemberRole.Member,
-    }[role]
+    }[role] ?? OB11GroupMemberRole.Member
   }
 
   export function sex(sex: Sex): OB11UserSex {
     const sexMap = {
-      [Sex.male]: OB11UserSex.male,
+      [Sex.Unknown]: OB11UserSex.Unknown,
-      [Sex.female]: OB11UserSex.female,
+      [Sex.Male]: OB11UserSex.Male,
-      [Sex.unknown]: OB11UserSex.unknown,
+      [Sex.Female]: OB11UserSex.Female,
+      [Sex.Hidden]: OB11UserSex.Unknown
     }
-    return sexMap[sex] || OB11UserSex.unknown
+    return sexMap[sex] ?? OB11UserSex.Unknown
   }
 
-  export function groupMember(group_id: string, member: GroupMember): OB11GroupMember {
+  export function groupMember(groupId: number, member: GroupMember): OB11GroupMember {
+    const titleExpireTime = +member.specialTitleExpireTime
+    const int32Max = 2147483647
     return {
-      group_id: parseInt(group_id),
+      group_id: groupId,
       user_id: parseInt(member.uin),
       nickname: member.nick,
-      card: member.cardName,
+      card: member.cardName || member.nick,
-      sex: sex(member.sex!),
+      sex: OB11UserSex.Unknown,
       age: 0,
       area: '',
       level: String(member.memberLevel ?? 0),
-      qq_level: (member.qqLevel && calcQQLevel(member.qqLevel)) || 0,
+      qq_level: 0,
       join_time: member.joinTime,
       last_sent_time: member.lastSpeakTime,
-      title_expire_time: 0,
+      title_expire_time: titleExpireTime > int32Max ? 0 : titleExpireTime,
       unfriendly: false,
       card_changeable: true,
       is_robot: member.isRobot,
       shut_up_timestamp: member.shutUpTime,
       role: groupMemberRole(member.role),
-      title: member.memberSpecialTitle || '',
+      title: member.memberSpecialTitle,
-    }
-  }
-
-  export function stranger(user: User): OB11User {
-    return {
-      ...user,
-      user_id: parseInt(user.uin),
-      nickname: user.nick,
-      sex: sex(user.sex!),
-      age: 0,
-      qid: user.qid,
-      login_days: 0,
-      level: (user.qqLevel && calcQQLevel(user.qqLevel)) || 0,
     }
   }