Merge pull request #436 from LLOneBot/dev

release: 3.33.4

.gitattributes

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

README.md

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

electron.vite.config.ts

@@ -39,7 +39,6 @@ const config: ElectronViteConfig = {
           ...external.map(genCpModule),
           { src: './manifest.json', dest: 'dist' },
           { src: './icon.webp', dest: 'dist' },
-          { src: './src/ntqqapi/native/napcat-protocol-packet/Moehoo/*', dest: 'dist/main/Moehoo' },
         ],
       }),
     ],

manifest.json

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

package.json

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

scripts/gen-manifest.ts

@@ -6,17 +6,13 @@ const manifest = {
   type: 'extension',
   name: 'LLOneBot',
   slug: 'LLOneBot',
-  description: '实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发',
+  description: '实现 OneBot 11 协议，用于 QQ 机器人开发',
   version,
   icon: './icon.webp',
   authors: [
     {
       name: 'linyuchen',
       link: 'https://github.com/linyuchen'
-    },
-    {
-      "name": "idranme",
-      "link": "https://github.com/idranme"
     }
   ],
   repository: {

src/common/channels.ts

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

src/common/config.ts

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

src/common/types.ts

@@ -1,5 +1,4 @@
 export interface OB11Config {
-  enable: boolean
   httpPort: number
   httpHosts: string[]
   httpSecret?: string
@@ -17,24 +16,21 @@ export interface OB11Config {
    */
   enableQOAutoQuote?: boolean
   listenLocalhost: boolean
-  reportSelfMessage: boolean
 }
 
-export interface SatoriConfig {
+export interface CheckVersion {
-  enable: boolean
+  result: boolean
-  listen: string
+  version: 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
@@ -49,13 +45,6 @@ export interface Config {
   hosts?: string[]
   /** @deprecated */
   wsPort?: string
-  /** @deprecated */
-  reportSelfMessage?: boolean
-}
-
-export interface CheckVersion {
-  result: boolean
-  version: string
 }
 
 export interface LLOneBotError {

src/common/utils/audio.ts

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

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 { Context } from 'cordis'
+import { fileTypeFromFile } from 'file-type'
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
@@ -27,10 +27,9 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
 
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
-    const hash = createHash('md5')
-
     // 创建一个流式读取器
     const stream = fs.createReadStream(filePath)
+    const hash = createHash('md5')
 
     stream.on('data', (data: Buffer) => {
       // 当读取到数据时，更新哈希对象的状态
@@ -119,15 +118,12 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(ctx: Context, uri: string, needExt?: boolean): Promise<Uri2LocalRes> {
+export async function uri2local(uri: string, filename?: string, needExt?: boolean): Promise<Uri2LocalRes> {
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
-    const fileUri = uri.replace('%', '%25').replace('#', '%23')
+    const filePath = fileURLToPath(uri)
-    const filePath = fileURLToPath(fileUri)
     const fileName = path.basename(filePath)
-    // console.log('fileURLToPath', filePath)
-    // console.log('fileName', fileName)
     return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
   }
 
@@ -140,16 +136,15 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
     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 ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await fileTypeFromFile(filePath))?.ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -162,12 +157,12 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
   }
 
   if (type === FileUriType.OneBotBase64) {
-    let filename = randomUUID()
+    filename ??= randomUUID()
     let filePath = path.join(TEMP_DIR, filename)
     const base64 = uri.replace(/^base64:\/\//, '')
     await fsPromise.writeFile(filePath, base64, 'base64')
     if (needExt) {
-      const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+      const ext = (await fileTypeFromFile(filePath))?.ext
       filename += `.${ext}`
       await fsPromise.rename(filePath, `${filePath}.${ext}`)
       filePath = `${filePath}.${ext}`
@@ -179,12 +174,12 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
     const capture = /^data:([\w/.+-]+);base64,(.*)$/.exec(uri)
     if (capture) {
-      let filename = randomUUID()
+      filename ??= randomUUID()
       const [, _type, base64] = capture
       let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
       if (needExt) {
-        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        const ext = (await fileTypeFromFile(filePath))?.ext
         filename += `.${ext}`
         await fsPromise.rename(filePath, `${filePath}.${ext}`)
         filePath = `${filePath}.${ext}`
@@ -195,3 +190,26 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
 
   return { success: false, errMsg: '未知文件类型', fileName: '', path: '', isLocal: false }
 }
+
+export async function copyFolder(sourcePath: string, destPath: string) {
+  try {
+    const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true })
+    await fsPromise.mkdir(destPath, { recursive: true })
+    for (const entry of entries) {
+      const srcPath = path.join(sourcePath, entry.name)
+      const dstPath = path.join(destPath, entry.name)
+      if (entry.isDirectory()) {
+        await copyFolder(srcPath, dstPath)
+      } else {
+        try {
+          await fsPromise.copyFile(srcPath, dstPath)
+        } catch (error) {
+          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`)
+          // 这里可以决定是否要继续复制其他文件
+        }
+      }
+    }
+  } catch (error) {
+    console.error('复制文件夹时出错:', error)
+  }
+}

src/common/utils/legacyLog.ts

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

src/common/utils/misc.ts

@@ -17,11 +17,6 @@ export function getBuildVersion(): number {
   return +globalThis.LiteLoader.package.qqnt.buildVersion
 }
 
-/** QQ Full Version  */
-export function getFullVersion(): string {
-  return globalThis.LiteLoader.versions.qqnt
-}
-
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
 export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
   Object.keys(newObj).forEach((key) => {
@@ -43,10 +38,3 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
 export function filterNullable<T>(array: T[]) {
   return array.filter(e => !isNullable(e)) as NonNullable<T>[]
 }
-
-export function parseBool(value: string) {
-  if (['', 'true', '1'].includes(value)) {
-    return true
-  }
-  return false
-}

src/common/utils/upgrade.ts

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

src/common/utils/window.ts

@@ -1,9 +0,0 @@
-import { BrowserWindow } from 'electron'
-import { log } from '@/common/utils'
-
-export function getAllWindowIds(): number[] {
-  const allWindows = BrowserWindow.getAllWindows();
-  const ids = allWindows.map(window => window.id);
-  log('getAllWindowIds', ids);
-  return ids;
-}

src/main/log.ts

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

src/main/main.ts

@@ -2,10 +2,6 @@ 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 {
@@ -15,12 +11,15 @@ import {
   CHANNEL_LOG,
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
-  CHANNEL_UPDATE
+  CHANNEL_UPDATE,
+  CHANNEL_SET_CONFIG_CONFIRMED
 } from '../common/channels'
-import { startHook } from '../ntqqapi/hook'
+import { getBuildVersion } from '../common/utils'
+import { hookNTQQApiCall, hookNTQQApiReceive } from '../ntqqapi/hook'
 import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
 import { getConfigUtil } from '../common/config'
 import { checkFfmpeg } from '../common/utils/video'
+import { getSession } from '../ntqqapi/wrapper'
 import { Context } from 'cordis'
 import { llonebotError, selfInfo, LOG_DIR, DATA_DIR, TEMP_DIR } from '../common/globalVars'
 import { log, logFileName } from '../common/utils/legacyLog'
@@ -34,12 +33,15 @@ import {
   NTQQWebApi,
   NTQQWindowApi
 } from '../ntqqapi/api'
+import { mkdir } from 'node:fs/promises'
 import { existsSync, mkdirSync } from 'node:fs'
-import { NTQQSystemApi } from '@/ntqqapi/api/system'
+import Database from 'minato'
+import SQLiteDriver from '@minatojs/driver-sqlite'
+import Store from './store'
 
 declare module 'cordis' {
   interface Events {
-    'llob/config-updated': (input: LLOBConfig) => void
+    'llonebot/config-updated': (input: LLOBConfig) => void
   }
 }
 
@@ -55,30 +57,6 @@ 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)
-  ctx.plugin(NTQQSystemApi)
-
-  let started = false
-
   ipcMain.handle(CHANNEL_CHECK_VERSION, async () => {
     return checkNewVersion()
   })
@@ -137,9 +115,7 @@ function onLoad() {
       if (!ask) {
         getConfigUtil().setConfig(config)
         log('配置已更新', config)
-        if (started) {
+        checkFfmpeg(config.ffmpeg).then()
-          ctx.parallel('llob/config-updated', config)
-        }
         resolve(true)
         return
       }
@@ -156,9 +132,7 @@ function onLoad() {
           if (result.response === 0) {
             getConfigUtil().setConfig(config)
             log('配置已更新', config)
-            if (started) {
+            checkFfmpeg(config.ffmpeg).then()
-              ctx.parallel('llob/config-updated', config)
-            }
             resolve(true)
           }
         })
@@ -173,66 +147,87 @@ function onLoad() {
     log(arg)
   })
 
-  const intervalId = setInterval(async () => {
+  async function start() {
+    log('process pid', process.pid)
+    const config = getConfigUtil().getConfig()
+    if (!config.enableLLOB) {
+      llonebotError.otherError = 'LLOneBot 未启动'
+      log('LLOneBot 开关设置为关闭，不启动LLOneBot')
+      return
+    }
+    if (!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) {
+    if (self.uin && (buildVersion >= 27187 || getSession())) {
       clearInterval(intervalId)
-      log('process pid', process.pid)
+      start()
-      const config = getConfigUtil().getConfig()
-
-      if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
-        startHook()
-        await ctx.sleep(600)
-      } else {
-        llonebotError.otherError = 'LLOneBot 未启动'
-        log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
-        return
-      }
-      ctx.plugin(Log, {
-        enable: config.log!,
-        filename: logFileName
-      })
-      ctx.plugin(SQLiteDriver, {
-        path: path.join(dbDir, `${selfInfo.uin}.db`)
-      })
-      ctx.plugin(Store, {
-        msgCacheExpire: config.msgCacheExpire! * 1000
-      })
-      ctx.plugin(Core, config)
-      if (config.ob11.enable) {
-        ctx.plugin(OneBot11Adapter, {
-          ...config.ob11,
-          heartInterval: config.heartInterval,
-          token: config.token!,
-          debug: config.debug!,
-          musicSignUrl: config.musicSignUrl,
-          enableLocalFile2Url: config.enableLocalFile2Url!,
-          ffmpeg: config.ffmpeg,
-        })
-      }
-      if (config.satori.enable) {
-        ctx.plugin(SatoriAdapter, {
-          ...config.satori,
-          ffmpeg: config.ffmpeg,
-        })
-      }
-
-      ctx.start()
-      started = true
-      llonebotError.otherError = ''
     }
-  }, 500)
+  }, 600)
 }
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
+  if (![2, 4, 6].includes(window.id)) {
+    return
+  }
   if (window.id === 2) {
     mainWindow = window
   }
+  //log('window create', window.webContents.getURL().toString())
+  try {
+    hookNTQQApiCall(window, window.id !== 2)
+    hookNTQQApiReceive(window, window.id !== 2)
+  } catch (e) {
+    log('LLOneBot hook error: ', String(e))
+  }
 }
 
 try {

src/main/store.ts

@@ -1,4 +1,4 @@
-import { Peer, RawMessage } from '@/ntqqapi/types'
+import { Peer } from '@/ntqqapi/types'
 import { createHash } from 'node:crypto'
 import { LimitedHashTable } from '@/common/utils/table'
 import { FileCacheV2 } from '@/common/types'
@@ -24,15 +24,13 @@ interface MsgInfo {
   peer: Peer
 }
 
-class Store extends Service {
+export default class Store extends Service {
   static inject = ['database', 'model']
   private cache: LimitedHashTable<string, number>
-  private messages: Map<string, RawMessage>
 
-  constructor(protected ctx: Context, public config: Store.Config) {
+  constructor(protected ctx: Context) {
     super(ctx, 'store', true)
-    this.cache = new LimitedHashTable(1000)
+    this.cache = new LimitedHashTable<string, number>(1000)
-    this.messages = new Map()
     this.initDatabase()
   }
 
@@ -62,10 +60,9 @@ 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 //保证shortId为正数
+    hash[0] &= 0x7f //设置第一个bit为0 保证shortId为正数
     const shortId = hash.readInt32BE()
     this.cache.set(cacheKey, shortId)
     this.ctx.database.upsert('message', [{
@@ -126,29 +123,4 @@ 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,11 +16,14 @@ import path from 'node:path'
 import { existsSync } from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { RkeyManager } from '@/ntqqapi/helper/rkey'
-import { RichMediaDownloadCompleteNotify, RichMediaUploadCompleteNotify, RMBizType, Peer } from '@/ntqqapi/types/msg'
+import { getSession } from '@/ntqqapi/wrapper'
+import { 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 {
@@ -37,34 +40,40 @@ export class NTQQFileApi extends Service {
     this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
-  async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string | undefined> {
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
-    const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
+    const session = getSession()
-      peer,
+    if (session) {
-      msgId,
+      return (await session.getRichMediaService().getVideoPlayUrlV2(
-      elemId: elementId,
+        peer,
-      videoCodecFormat: 0,
+        msgId,
-      exParams: {
+        elementId,
-        downSourceType: 1,
+        0,
-        triggerType: 1
+        { downSourceType: 1, triggerType: 1 }
+      )).urlResult.domainUrl[0]?.url
+    } else {
+      const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
+        peer,
+        msgId,
+        elemId: elementId,
+        videoCodecFormat: 0,
+        exParams: {
+          downSourceType: 1,
+          triggerType: 1
+        },
+      }, null])
+      if (data.result !== 0) {
+        this.ctx.logger.warn('getVideoUrl', data)
       }
-    }])
+      return data.urlResult.domainUrl[0]?.url
-    if (data.result !== 0) {
-      this.ctx.logger.warn('getVideoUrl', data)
     }
-    return data.urlResult.domainUrl[0]?.url
   }
 
   async getFileType(filePath: string) {
-    return await invoke<{
+    return fileTypeFromFile(filePath)
-      ext: string
-      mime: string
-    }>(NTMethod.FILE_TYPE, [filePath], {
-      className: NTClass.FS_API
-    })
   }
 
-  /** 上传文件到 QQ 的文件夹 */
+  // 上传文件到QQ的文件夹
-  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
+  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
     let fileName = path.basename(filePath)
     if (!fileName.includes('.')) {
@@ -98,8 +107,8 @@ export class NTQQFileApi extends Service {
     chatType: ChatType,
     peerUid: string,
     elementId: string,
-    thumbPath = '',
+    thumbPath: string,
-    sourcePath = '',
+    sourcePath: string,
     timeout = 1000 * 60 * 2,
     force = false
   ) {
@@ -113,29 +122,38 @@ export class NTQQFileApi extends Service {
         return sourcePath
       }
     }
-    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
+    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
       'nodeIKernelMsgService/downloadRichMedia',
-      [{
+      [
-        getReq: {
+        {
-          fileModelId: '0',
+          getReq: {
-          downloadSourceType: 0,
+            fileModelId: '0',
-          triggerType: 1,
+            downloadSourceType: 0,
-          msgId: msgId,
+            triggerType: 1,
-          chatType: chatType,
+            msgId: msgId,
-          peerUid: peerUid,
+            chatType: chatType,
-          elementId: elementId,
+            peerUid: peerUid,
-          thumbSize: 0,
+            elementId: elementId,
-          downloadType: 1,
+            thumbSize: 0,
-          filePath: thumbPath,
+            downloadType: 1,
+            filePath: thumbPath,
+          },
         },
-      }],
+        null,
+      ],
       {
         cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
         cmdCB: payload => payload.notifyInfo.msgId === msgId,
         timeout
       }
     )
-    return data.notifyInfo.filePath
+    let filePath = data.notifyInfo.filePath
+    if (filePath.startsWith('\\')) {
+      const downloadPath = TEMP_DIR
+      filePath = path.join(downloadPath, filePath)
+      // 下载路径是下载文件夹的相对路径
+    }
+    return filePath
   }
 
   async getImageSize(filePath: string) {
@@ -163,8 +181,8 @@ export class NTQQFileApi extends Service {
     if (url) {
       const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
       const imageAppid = parsedUrl.searchParams.get('appid')
-      const isNTPic = imageAppid && ['1406', '1407'].includes(imageAppid)
+      const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
-      if (isNTPic) {
+      if (isNewPic) {
         let rkey = parsedUrl.searchParams.get('rkey')
         if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
@@ -183,56 +201,6 @@ export class NTQQFileApi extends Service {
     this.ctx.logger.error('图片url获取失败', element)
     return ''
   }
-
-  async downloadFileForModelId(peer: Peer, fileModelId: string, timeout = 2 * Time.minute) {
-    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
-      'nodeIKernelRichMediaService/downloadFileForModelId',
-      [{
-        peer,
-        fileModelIdList: [fileModelId],
-        save_path: ''
-      }],
-      {
-        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-        cmdCB: payload => payload.notifyInfo.fileModelId === fileModelId,
-        timeout,
-        afterFirstCmd: false
-      }
-    )
-    return data.notifyInfo.filePath
-  }
-
-  async ocrImage(path: string) {
-    return await invoke(
-      'nodeIKernelNodeMiscService/wantWinScreenOCR',
-      [
-        { url: path },
-        { timeout: 5000 }
-      ]
-    )
-  }
-
-  async uploadRMFileWithoutMsg(filePath: string, bizType: RMBizType, peerUid: string) {
-    const data = await invoke<{
-      notifyInfo: RichMediaUploadCompleteNotify
-    }>(
-      'nodeIKernelRichMediaService/uploadRMFileWithoutMsg',
-      [{
-        params: {
-          filePath,
-          bizType,
-          peerUid,
-          useNTV2: true
-        }
-      }],
-      {
-        cbCmd: ReceiveCmdS.MEDIA_UPLOAD_COMPLETE,
-        cmdCB: payload => payload.notifyInfo.filePath === filePath,
-        timeout: 10 * Time.second,
-      }
-    )
-    return data.notifyInfo
-  }
 }
 
 export class NTQQFileCacheApi extends Service {
@@ -241,19 +209,21 @@ export class NTQQFileCacheApi extends Service {
   }
 
   async setCacheSilentScan(isSilent: boolean = true) {
-    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }])
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }, null])
   }
 
   getCacheSessionPathList() {
-    return invoke<Array<{
+    return invoke<
-      key: string
+      {
-      value: string
+        key: string
-    }>>(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
+        value: string
+      }[]
+    >(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
   }
 
   scanCache() {
-    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
-    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second })
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
   }
 
   getHotUpdateCachePath() {
@@ -273,13 +243,13 @@ export class NTQQFileCacheApi extends Service {
       pageSize: pageSize,
       order: 1,
       lastRecord: _lastRecord,
-    }])
+    }, null])
   }
 
   async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
     return await invoke<GeneralCallResult>(NTMethod.CACHE_CHAT_CLEAR, [{
       chats,
       fileKeys,
-    }])
+    }, null])
   }
 }

src/ntqqapi/api/friend.ts

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

src/ntqqapi/api/group.ts

@@ -6,16 +6,16 @@ import {
   GroupNotifies,
   GroupRequestOperateTypes,
   GetFileListParam,
-  PublishGroupBulletinReq,
+  OnGroupFileInfoUpdateParams,
-  GroupAllInfo,
+  PublishGroupBulletinReq
-  GroupFileInfo,
-  GroupBulletinListResult,
-  GroupMsgMask
 } 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,6 +26,8 @@ declare module 'cordis' {
 export class NTQQGroupApi extends Service {
   static inject = ['ntWindowApi']
 
+  public groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
+
   constructor(protected ctx: Context) {
     super(ctx, 'ntGroupApi', true)
   }
@@ -46,45 +48,56 @@ export class NTQQGroupApi extends Service {
     return result.groupList
   }
 
-  async getGroupMembers(groupCode: string, num = 3000) {
+  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
-    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
+    const session = getSession()
-      groupCode,
+    let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
-      scene: 'groupMemberList_MainWindow'
+    if (session) {
-    }])
+      const groupService = session.getGroupService()
-    const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
+      const sceneId = groupService.createMemberListScene(groupCode, 'groupMemberList_MainWindow')
-    if (data.errCode !== 0) {
+      result = await groupService.getNextMemberList(sceneId, undefined, num)
-      throw new Error('获取群成员列表出错,' + data.errMsg)
+    } else {
+      const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
+      result = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }, null])
     }
-    return data.result.infos
+    if (result.errCode !== 0) {
+      throw ('获取群成员列表出错,' + result.errMsg)
+    }
+    return result.result.infos
   }
 
-  async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
+  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
-    await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
+    const groupCodeStr = groupCode.toString()
-      registerEvent: true
+    const memberUinOrUidStr = memberUinOrUid.toString()
-    })
+    if (!this.groupMembers.has(groupCodeStr)) {
-
+      try {
-    const data = await invoke<{
+        // 更新群成员列表
-      groupCode: string
+        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
-      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 data.members.get(uid)!
+        return null
+      }
+    }
+    let members = this.groupMembers.get(groupCodeStr)!
+    const getMember = () => {
+      let member: GroupMember | undefined = undefined
+      if (isNumeric(memberUinOrUidStr)) {
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
+      } else {
+        member = members.get(memberUinOrUidStr)
+      }
+      return member
+    }
+    let member = getMember()
+    if (!member) {
+      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      members = this.groupMembers.get(groupCodeStr)!
+      member = getMember()
+    }
+    return member
   }
 
   async getGroupIgnoreNotifies() {
-    await this.getSingleScreenNotifies(false, 14)
+    await this.getSingleScreenNotifies(14)
     return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
@@ -92,18 +105,16 @@ export class NTQQGroupApi extends Service {
     )
   }
 
-  async getSingleScreenNotifies(doubt: boolean, number: number, startSeq = '') {
+  async getSingleScreenNotifies(num: number) {
-    await invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
+    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
-
+    return (await invoke<GroupNotifies>(
-    const data = await invoke<GroupNotifies>(
       'nodeIKernelGroupService/getSingleScreenNotifies',
-      [{ doubt, startSeq, number }],
+      [{ doubt: false, startSeq: '', number: num }, null],
       {
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
-    )
+    )).notifies
-    return data.notifies
   }
 
   async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
@@ -111,121 +122,196 @@ export class NTQQGroupApi extends Service {
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
-    const doubt = flagitem[3] === '1'
+    const session = getSession()
-    return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
+    if (session) {
-      doubt,
+      return session.getGroupService().operateSysNotify(false, {
-      operateMsg: {
+        operateType, // 2 拒绝
-        operateType,
         targetMsg: {
-          seq,
+          seq,  // 通知序列号
           type,
           groupCode,
           postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+        }
+      })
+    } else {
+      return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
+        doubt: false,
+        operateMsg: {
+          operateType,
+          targetMsg: {
+            seq,
+            type,
+            groupCode,
+            postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+          },
         },
-      },
+      }, null])
-    }])
+    }
   }
 
   async quitGroup(groupCode: string) {
-    return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().quitGroup(groupCode)
+    } else {
+      return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }, null])
+    }
   }
 
-  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
+  async kickMember(
-    return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, 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 }>) {
-    return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
+    // timeStamp为秒数, 0为解除禁言
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().setMemberShutUp(groupCode, memList)
+    } else {
+      return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
+    }
   }
 
   async banGroup(groupCode: string, shutUp: boolean) {
-    return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().setGroupShutUp(groupCode, shutUp)
+    } else {
+      return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }, null])
+    }
   }
 
   async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
-    return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyMemberCardName(groupCode, memberUid, cardName)
+    } else {
+      return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }, null])
+    }
   }
 
   async setMemberRole(groupCode: string, memberUid: string, role: GroupMemberRole) {
-    return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyMemberRole(groupCode, memberUid, role)
+    } else {
+      return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }, null])
+    }
   }
 
   async setGroupName(groupCode: string, groupName: string) {
-    return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }])
+    const session = getSession()
+    if (session) {
+      return session.getGroupService().modifyGroupName(groupCode, groupName, false)
+    } else {
+      return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }, null])
+    }
   }
 
   async getGroupRemainAtTimes(groupCode: string) {
-    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }])
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
   }
 
   async removeGroupEssence(groupCode: string, msgId: string) {
-    const ntMsgApi = this.ctx.get('ntMsgApi')!
+    const session = getSession()
-    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    if (session) {
-    return await invoke('nodeIKernelGroupService/removeGroupEssence', [{
+      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-      req: {
+      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', [{
+        req: {
+          groupCode: groupCode,
+          msgRandom: Number(data?.msgList[0].msgRandom),
+          msgSeq: Number(data?.msgList[0].msgSeq)
+        }
+      }, null])
+    }
   }
 
   async addGroupEssence(groupCode: string, msgId: string) {
-    const ntMsgApi = this.ctx.get('ntMsgApi')!
+    const session = getSession()
-    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    if (session) {
-    return await invoke('nodeIKernelGroupService/addGroupEssence', [{
+      const data = await session.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-      req: {
+      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', [{
+        req: {
+          groupCode: groupCode,
+          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 }])
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }, null])
   }
 
   async deleteGroupFileFolder(groupId: string, folderId: string) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
   }
 
   async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
-    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
-    const data = await invoke<{ fileInfo: GroupFileInfo }>(
+    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
       'nodeIKernelRichMediaService/getGroupFileList',
-      [{
+      [
-        groupId,
+        {
-        fileListForm
+          groupId,
-      }],
+          fileListForm
+        },
+        null,
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
         afterFirstCmd: false,
         cmdCB: (payload, result) => payload.fileInfo.reqId === result
       }
     )
-    return data.fileInfo
+    return data.fileInfo.item
   }
 
   async publishGroupBulletin(groupCode: string, req: PublishGroupBulletinReq) {
     const ntUserApi = this.ctx.get('ntUserApi')!
     const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
-    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }])
+    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }, null])
   }
 
   async uploadGroupBulletinPic(groupCode: string, path: string) {
     const ntUserApi = this.ctx.get('ntUserApi')!
     const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
-    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }])
+    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }, null])
   }
 
   async getGroupRecommendContact(groupCode: string) {
-    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }])
+    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }, null])
     return ret.arkJson
   }
 
@@ -236,7 +322,7 @@ export class NTQQGroupApi extends Service {
         msgSeq: +msgSeq,
         msgRandom: +msgRandom
       }
-    }])
+    }, null])
   }
 
   async getGroupHonorList(groupCode: string) {
@@ -245,109 +331,6 @@ 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 }]
-    )
-  }
-
-  async setGroupMsgMask(groupCode: string, msgMask: GroupMsgMask) {
-    return await invoke('nodeIKernelGroupService/setGroupMsgMask', [{ groupCode, msgMask }])
-  }
-
-  async setGroupRemark(groupCode: string, groupRemark = '') {
-    return await invoke('nodeIKernelGroupService/modifyGroupRemark', [{ groupCode, groupRemark }])
   }
 }

src/ntqqapi/api/msg.ts

@@ -1,5 +1,7 @@
 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'
 
@@ -17,80 +19,98 @@ export class NTQQMsgApi extends Service {
   }
 
   async getTempChatInfo(chatType: ChatType, peerUid: string) {
-    return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getTempChatInfo(chatType, peerUid)
+    } else {
+      return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }, null])
+    }
   }
 
-  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean) {
+  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean = true) {
-    // nt_qq/global/nt_data/Emoji/emoji-resource/sysface_res/apng/ 下可以看到所有QQ表情预览
+    // nt_qq//global//nt_data//Emoji//emoji-resource//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'
-    return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }])
+    if (session) {
+      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiType, setEmoji)
+    } else {
+      return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }, null])
+    }
   }
 
   async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
-    return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)
+    } else {
+      return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }, null])
+    }
   }
 
   async activateChat(peer: Peer) {
-    return await invoke(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }])
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }, null])
   }
 
-  async activateChatAndGetHistory(peer: Peer, cnt: number) {
+  async activateChatAndGetHistory(peer: Peer) {
-    // 消息从旧到新
+    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 }])
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }, null])
   }
 
-  async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
+  async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
     if (!peer) throw new Error('peer is not allowed')
     if (!msgIds) throw new Error('msgIds is not allowed')
-    return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().getMsgsByMsgId(peer, msgIds)
+    } else {
+      return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }, null])
+    }
   }
 
-  async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, isReverseOrder: boolean = 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[]) {
-    return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }])
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().recallMsg(peer, msgIds)
+    } else {
+      return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }, null])
+    }
   }
 
   async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
-    const uniqueId = await this.generateMsgUniqueId(peer.chatType)
+    const msgId = await this.generateMsgUniqueId(peer.chatType)
-    const msgAttributeInfos = new Map()
+    peer.guildId = msgId
-    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,
+          msgId: '0',
-        msgElements,
+          peer,
-        msgAttributeInfos
+          msgElements,
-      }],
+          msgAttributeInfos: new Map()
+        },
+        null
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.msgAttrs.get(0)?.attrId === uniqueId && msgRecord.sendStatus === 2) {
+            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
-              sentMsgId = msgRecord.msgId
               return true
             }
           }
@@ -99,38 +119,22 @@ 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 uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
+    const session = getSession()
-    destPeer.guildId = uniqueId
+    if (session) {
-    const data = await invoke<{ msgList: RawMessage[] }>(
+      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
-      'nodeIKernelMsgService/forwardMsgWithComment',
+    } else {
-      [{
+      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> {
@@ -141,46 +145,66 @@ export class NTQQMsgApi extends Service {
     const selfUid = selfInfo.uid
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/multiForwardMsgWithComment',
-      [{
+      [
-        msgInfos,
+        {
-        srcContact: srcPeer,
+          msgInfos,
-        dstContact: destPeer,
+          srcContact: srcPeer,
-        commentElements: [],
+          dstContact: destPeer,
-        msgAttributeInfos: new Map(),
+          commentElements: [],
-      }],
+          msgAttributeInfos: new Map(),
+        },
+        null,
+      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (
+            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
-              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
-        }
+        },
       }
     )
-    return data.msgList.find(msgRecord => {
+    for (const msg of data.msgList) {
-      const { arkElement } = msgRecord.elements[0]
+      const arkElement = msg.elements.find(ele => ele.arkElement)
-      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
+      if (!arkElement) {
-        return true
+        continue
       }
-    })!
+      const forwardData = JSON.parse(arkElement.arkElement!.bytesData)
+      if (forwardData.app != 'com.tencent.multimsg') {
+        continue
+      }
+      if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfUid) {
+        return msg
+      }
+    }
+    throw new Error('转发消息超时')
+  }
+
+  async getMsgsBySeqAndCount(peer: Peer, msgSeq: string, count: number, desc: boolean, z: boolean) {
+    const session = getSession()
+    if (session) {
+      return await session.getMsgService().getMsgsBySeqAndCount(peer, msgSeq, count, desc, z)
+    } else {
+      return await invoke('nodeIKernelMsgService/getMsgsBySeqAndCount', [{
+        peer,
+        cnt: count,
+        msgSeq,
+        queryOrder: desc
+      }, null])
+    }
   }
 
   async getSingleMsg(peer: Peer, msgSeq: string) {
-    return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }])
+    const session = getSession()
+    if (session) {
+      return await session.getMsgService().getSingleMsg(peer, msgSeq)
+    } else {
+      return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }, null])
+    }
   }
 
   async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
@@ -198,7 +222,7 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }])
+    }, null])
   }
 
   async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[] = []) {
@@ -216,11 +240,11 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }])
+    }, null])
   }
 
   async setMsgRead(peer: Peer) {
-    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }])
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
   }
 
   async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number) {
@@ -230,7 +254,7 @@ export class NTQQMsgApi extends Service {
       emojiId,
       emojiType,
       cnt: count
-    }])
+    }, null])
   }
 
   async fetchFavEmojiList(count: number) {
@@ -239,53 +263,10 @@ export class NTQQMsgApi extends Service {
       count,
       backwardFetch: true,
       forceRefresh: true
-    }])
+    }, null])
   }
 
   async generateMsgUniqueId(chatType: number) {
-    const time = await this.getServerTime()
+    return await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType }])
-    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 }])
-  }
-
-  async sendSsoCmdReqByContend(ssoCmd: string, content: string) {
-    return await invoke('nodeIKernelMsgService/sendSsoCmdReqByContend', [{ ssoCmd, content }])
   }
 }

src/ntqqapi/api/system.ts

@@ -1,38 +0,0 @@
-import { Context, Service } from 'cordis'
-import { invoke, NTClass } from '@/ntqqapi/ntcall'
-
-declare module 'cordis' {
-  interface Context {
-    ntSystemApi: NTQQSystemApi
-  }
-}
-
-export class NTQQSystemApi extends Service {
-  constructor(protected ctx: Context) {
-    super(ctx, 'ntSystemApi', true)
-  }
-
-  async restart() {
-    // todo: 调用此接口后会将 NTQQ 设置里面的自动登录和无需手机确认打开，重启后将状态恢复到之前的状态
-
-    // 设置自动登录
-    await this.setSettingAutoLogin(true)
-    // 退出账号
-    invoke('quitAccount', [], {
-      className: NTClass.BUSINESS_API
-    }).then()
-    invoke('notifyQQClose', [{ type: 1 }], { className: NTClass.QQ_EX_API }).then()
-    // 等待登录界面，模拟点击登录按钮？还是直接调用登录方法？
-  }
-
-  async getSettingAutoLogin() {
-    // 查询是否自动登录
-    return invoke('nodeIKernelNodeMiscService/queryAutoRun', [])
-  }
-
-  async setSettingAutoLogin(state: boolean) {
-    await invoke('nodeIKernelSettingService/setNeedConfirmSwitch', [{ state: 1 }]) // 1：不需要手机确认，2：需要手机确认
-
-    await invoke('nodeIKernelSettingService/setAutoLoginSwitch', [{ state }])
-  }
-}

src/ntqqapi/api/user.ts

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

src/ntqqapi/core.ts

@@ -2,6 +2,7 @@ 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 {
@@ -12,50 +13,39 @@ 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/crychic'
-import { initWrapperSession, NTQQPacketApi } from './native/napcat-protocol-packet'
 
 declare module 'cordis' {
   interface Context {
     app: Core
   }
   interface Events {
-    'nt/message-created': (input: RawMessage) => void
+    'nt/message-created': (input: RawMessage[]) => void
     'nt/message-deleted': (input: RawMessage) => void
     'nt/message-sent': (input: RawMessage) => void
-    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
+    'nt/group-notify': (input: GroupNotify[]) => 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', 'store']
+  static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi']
-  public startTime = 0
-  public native
-  public packet!: NTQQPacketApi
 
   constructor(protected ctx: Context, public config: Core.Config) {
     super(ctx, 'app', true)
-    this.native = new Native(ctx)
-    initWrapperSession().then(session => {
-      this.packet = new NTQQPacketApi(session)
-    })
   }
 
   public start() {
-    this.startTime = Date.now()
+    llonebotError.otherError = ''
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
-    this.ctx.on('llob/config-updated', input => {
+    this.ctx.on('llonebot/config-updated', input => {
       Object.assign(this.config, input)
     })
   }
@@ -73,7 +63,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.C2C })
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.friend })
       }
       this.ctx.logger.info('好友列表变动', uids.length)
     })
@@ -126,19 +116,17 @@ class Core extends Service {
           if (activatedPeerUids.includes(contact.id)) continue
           activatedPeerUids.push(contact.id)
           const peer = { peerUid: contact.id, chatType: contact.chatType }
-          if (contact.chatType === ChatType.TempC2CFromGroup) {
+          if (contact.chatType === ChatType.temp) {
-            this.ctx.ntMsgApi.activateChatAndGetHistory(peer, 2).then(res => {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
-              for (const msg of res.msgList) {
+              this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
-                if (Date.now() / 1000 - Number(msg.msgTime) > 3) {
+                const lastTempMsg = msgList.at(-1)
-                  continue
+                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
+                  this.ctx.parallel('nt/message-created', [lastTempMsg!])
                 }
-                if (msg.senderUin && msg.senderUin !== '0') {
+              })
-                  this.ctx.store.addMsgCache(msg)
-                }
-                this.ctx.parallel('nt/message-created', msg)
-              }
             })
-          } else {
+          }
+          else {
             this.ctx.ntMsgApi.activateChat(peer)
           }
         }
@@ -148,12 +136,12 @@ class Core extends Service {
     registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
       const peerUid = payload[0] as string
       this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
-      let chatType = ChatType.C2C
+      let chatType = ChatType.friend
       if (isNumeric(peerUid)) {
-        chatType = ChatType.Group
+        chatType = ChatType.group
       }
       else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
-        chatType = ChatType.TempC2CFromGroup
+        chatType = ChatType.temp
       }
       const peer = { peerUid, chatType }
       await this.ctx.sleep(1000)
@@ -173,17 +161,7 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
-      const startTime = this.startTime / 1000
+      this.ctx.parallel('nt/message-created', payload.msgList)
-      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>()
@@ -191,30 +169,24 @@ class Core extends Service {
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
       for (const msg of payload.msgList) {
-        if (
+        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
-          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)
-            sentMsgIds.delete(msg.msgId)
+          this.ctx.parallel('nt/message-sent', msg)
-            this.ctx.parallel('nt/message-sent', msg)
-          }
         }
       }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
+      if (!this.config.reportSelfMessage) {
+        return
+      }
       sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
-    const groupNotifyIgnore: string[] = []
+    const groupNotifyFlags: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -223,34 +195,27 @@ class Core extends Service {
       if (payload.unreadCount) {
         let notifies: GroupNotify[]
         try {
-          notifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(payload.doubt, payload.unreadCount)
+          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
         } catch (e) {
           return
         }
-        for (const notify of notifies) {
+        const list = notifies.filter(v => {
-          const notifyTime = Math.trunc(+notify.seq / 1000)
+          const flag = v.group.groupCode + '|' + v.seq + '|' + v.type
-          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
+          if (groupNotifyFlags.includes(flag)) {
-            continue
+            return false
           }
-          groupNotifyIgnore.push(notify.seq)
+          groupNotifyFlags.push(flag)
-          this.ctx.parallel('nt/group-notify', { notify, doubt: payload.doubt })
+          return true
-        }
+        })
+        this.ctx.parallel('nt/group-notify', list)
       }
     })
 
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
-      for (const req of payload.data.buddyReqs) {
+      this.ctx.parallel('nt/friend-request', 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', [], { registerEvent: true })
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
 
     registerReceiveHook<{
       msgBuf: number[]

src/ntqqapi/entities.ts

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

src/ntqqapi/helper/face_config.json

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

src/ntqqapi/helper/offset.json

@@ -1,86 +0,0 @@
-{
-  "3.2.12-28418-x64": {
-    "recv": "A0723E0",
-    "send": "A06EAE0"
-  },
-  "9.9.15-28418-x64": {
-    "recv": "37A9004",
-    "send": "37A4BD0"
-  },
-  "6.9.56-28418-x64": {
-    "send": "4471360",
-    "recv": "4473BCC"
-  },
-  "6.9.56-28418-arm64": {
-    "send": "3FBDBF8",
-    "recv": "3FC0410"
-  },
-  "9.9.15-28498-x64": {
-    "recv": "37A9004",
-    "send": "37A4BD0"
-  },
-  "9.9.16-28788-x64": {
-    "send": "38076D0",
-    "recv": "380BB04"
-  },
-  "3.2.13-28788-x64": {
-    "send": "A0CEC20",
-    "recv": "A0D2520"
-  },
-  "3.2.13-28788-arm64": {
-    "send": "6E91018",
-    "recv": "6E94850"
-  },
-  "9.9.16-28971-x64": {
-    "send": "38079F0",
-    "recv": "380BE24"
-  },
-  "3.2.13-28971-x64": {
-    "send": "A0CEF60",
-    "recv": "A0D2860"
-  },
-  "3.2.12-28971-arm64": {
-    "send": "6E91318",
-    "recv": "6E94B50"
-  },
-  "6.9.58-28971-x64": {
-    "send": "449ACA0",
-    "recv": "449D50C"
-  },
-  "6.9.58-28971-arm64": {
-    "send": "3FE0DB0",
-    "recv": "3FE35C8"
-  },
-  "9.9.16-29271-x64": {
-    "send": "3833510",
-    "recv": "3837944"
-  },
-  "3.2.13-29271-x64": {
-    "send": "A11E680",
-    "recv": "A121F80"
-  },
-  "3.2.13-29271-arm64": {
-    "send": "6ECA098",
-    "recv": "6ECD8D0"
-  },
-  "9.9.16-29456-x64": {
-    "send": "3835CD0",
-    "recv": "383A104"
-  },
-  "3.2.13-29456-x64": {
-    "send": "A11E820",
-    "recv": "A122120"
-  },
-  "3.2.13-29456-arm64": {
-    "send": "6ECA130",
-    "recv": "6ECD968"
-  },
-  "6.9.59-29456-x64": {
-    "send": "44C57A0",
-    "recv": "44C800C"
-  },
-  "6.9.59-29456-arm64": {
-    "send": "4005FE8",
-    "recv": "4008800"
-  }
-}

src/ntqqapi/helper/rkey.ts

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

src/ntqqapi/hook.ts

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

src/ntqqapi/native/crychic/index.ts

@@ -1,99 +0,0 @@
-import { Context } from 'cordis'
-import { Dict } from 'cosmokit'
-import { getBuildVersion } from '../../../common/utils/misc'
-import { TEMP_DIR } from '../../../common/globalVars'
-import { copyFile } from 'fs/promises'
-import { ChatType, Peer } from '../../types'
-import path from 'node:path'
-import addon from './external/crychic-win32-x64.node?asset'
-
-export class Native {
-  public activated = false
-  private crychic?: Dict
-  private seq = 0
-  private cb: Map<number, (res: any) => void> = 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/native/moehoo/index.ts

@@ -1,138 +0,0 @@
-import { Context } from 'cordis'
-import { arch } from 'node:os'
-import { getFullVersion, getBuildVersion } from '@/common/utils/misc'
-import { selfInfo, TEMP_DIR } from '@/common/globalVars'
-import { Dict } from 'cosmokit'
-import { copyFile } from 'node:fs/promises'
-import { createHash } from 'node:crypto'
-import { Oidb } from '@/ntqqapi/proto/compiled'
-import path from 'node:path'
-import offset from '@/ntqqapi/helper/offset.json'
-
-interface Offset {
-  [key: string]: {
-    recv: string
-    send: string
-  }
-}
-
-export class Native {
-  available = false
-  moehoo?: Dict
-
-  constructor(private ctx: Context) {
-    ctx.on('ready', async () => {
-      this.init()
-    })
-  }
-
-  private async init() {
-    const key = getFullVersion() + '-' + arch()
-    const currOffset = (offset as Offset)[key]
-    if (!currOffset) {
-      return
-    }
-    const platform = process.platform + '.' + process.arch
-    try {
-      const fileName = 'MoeHoo.' + platform + '.node'  // todo: 需要加入版本号或者hash，不然多开QQ时会导致copyFile失败从而无法进行在线更新
-      const src = path.join(__dirname, 'Moehoo', fileName)
-      const dest = path.join(TEMP_DIR, fileName)
-      try {
-        await copyFile(src, dest)
-      } catch (e) {
-        // resource busy or locked?
-        this.ctx.logger.warn(e)
-      }
-      this.moehoo = require(dest)
-      this.moehoo!.InitHook(currOffset.send, currOffset.recv, () => {
-      })
-      this.available = true
-    } catch (e) {
-      this.ctx.logger.warn('moehoo 加载失败', e)
-    }
-  }
-
-  private async sendPacket(cmd: string, data: string) {
-    const traceId = `${Date.now()}${data}`.slice(0, data.length / 2)
-    const traceIdMd5 = createHash('md5').update(traceId).digest('hex')
-    this.moehoo!.SendPacket(cmd, data, traceIdMd5)
-    const res = await this.ctx.ntMsgApi.sendSsoCmdReqByContend(cmd, traceId)
-    if (res.result !== 0) {
-      throw new Error(res.errMsg)
-    }
-  }
-
-  private check() {
-    if (this.available) {
-      return
-    }
-    const minVersion = 28418
-    const maxVersion = 29456
-    const currVersion = getBuildVersion()
-    if (currVersion < minVersion || currVersion > maxVersion) {
-      throw new Error(`当前 QQ 版本 ${getBuildVersion()} 不支持，可尝试其他版本 ${minVersion}—${maxVersion}`)
-    } else {
-      throw new Error('packet backend 当前不可用')
-    }
-  }
-
-  async groupPoke(groupCode: number, uin: number) {
-    this.check()
-    const data = Oidb.Oidb_0xED3_1.encode({
-      uin,
-      groupCode
-    }).finish()
-    const req = buildOidbRequest(0xED3, 1, data)
-    await this.sendPacket(req.cmd, req.data)
-  }
-
-  async friendPoke(uin: number) {
-    this.check()
-    const data = Oidb.Oidb_0xED3_1.encode({
-      uin,
-      friendUin: uin
-    }).finish()
-    const req = buildOidbRequest(0xED3, 1, data)
-    await this.sendPacket(req.cmd, req.data)
-  }
-
-  async groupSign(groupCode: string) {
-    this.check()
-    const data = Oidb.Oidb_0xEB7_1.encode({
-      body: {
-        uin: selfInfo.uin,
-        groupCode
-      }
-    }).finish()
-    const req = buildOidbRequest(0xEB7, 1, data)
-    await this.sendPacket(req.cmd, req.data)
-  }
-
-  async setGroupSpecialTitle(groupCode: number, uid: string, title: string) {
-    this.check()
-    const data = Oidb.Oidb_0X8FC_2.encode({
-      groupCode,
-      body: {
-        targetUid: uid,
-        specialTitle: title,
-        expiredTime: -1,
-        uinName: title
-      }
-    }).finish()
-    const req = buildOidbRequest(0X8FC, 2, data, false)
-    await this.sendPacket(req.cmd, req.data)
-  }
-}
-
-function buildOidbRequest(cmd: number, subCmd: number, body: Uint8Array, reserved = true) {
-  const data = Oidb.Base.encode({
-    command: cmd,
-    subCommand: subCmd,
-    body,
-    isReserved: reserved ? 1 : 0
-  }).finish()
-  return {
-    cmd: `OidbSvcTrpcTcp.0x${cmd.toString(16).toUpperCase()}_${subCmd}`,
-    data: Buffer.from(data).toString('hex')
-  }
-}

src/ntqqapi/native/moehoo/version.ts

@@ -1,35 +0,0 @@
-import os from 'os'
-import offset from '@/ntqqapi/helper/offset.json'
-import { getFullVersion } from '@/common/utils'
-
-function getSupportVersions() {
-  let fullVersionStart: string = ''
-  switch (os.platform()) {
-    case 'linux':
-      fullVersionStart = '3'
-      break
-    case 'darwin':
-      fullVersionStart = '6'
-      break
-    case 'win32':
-      fullVersionStart = '9'
-      break
-  }
-  const supportVersions: string[] = []
-  for (const offsetKey in offset) {
-    if (offsetKey.startsWith(fullVersionStart) && offsetKey.endsWith(os.arch())) {
-      supportVersions.push(offsetKey)
-    }
-  }
-  return supportVersions
-}
-
-export function checkSupportVersion(){
-  // 检查当前 QQ 版本是否支持，不支持则抛出异常
-  const qqFullVersion = getFullVersion() // todo: 去除llqqnt依赖
-  const _ = offset[qqFullVersion + '-' + os.arch()]
-  if (!_) {
-    const supportVersion = getSupportVersions()
-    throw new Error('当前 QQ 版本不支持, 只支持: ' + supportVersion.join(', '))
-  }
-}

src/ntqqapi/native/napcat-protocol-packet/index.d.ts

@@ -1,17 +0,0 @@
-import { WrapperSession } from './wrapper-session/types';
-export { initWrapperSession } from './wrapper-session';
-export declare function checkSupportVersion(): void;
-export declare class NTQQPacketApi {
-    private qqVersion;
-    private readonly packetClient;
-    private readonly packer;
-    private logger;
-    private readonly wrapperSession;
-    constructor(wrapperSession: WrapperSession);
-    private InitSendPacket;
-    private sendPacket;
-    private sendOidbPacket;
-    sendPokePacket(peer: number, group?: number): Promise<void>;
-    sendGroupSignPacket(selfUin: string, groupCode: string): Promise<void>;
-    sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string): Promise<void>;
-}

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/index.d.ts

@@ -1 +0,0 @@
-export declare function initWrapperSession(): Promise<any>;

src/ntqqapi/native/napcat-protocol-packet/wrapper-session/types.d.ts

@@ -1,6 +0,0 @@
-export interface MsgService {
-    sendSsoCmdReqByContend: (cmd: string, trace_id: string) => Promise<unknown>;
-}
-export type WrapperSession = {
-    getMsgService(): MsgService;
-};

src/ntqqapi/ntcall.ts

@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { log } from '../common/utils'
+import { log } from '../common/utils/legacyLog'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -13,9 +13,7 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService,
+  NodeIKernelTipOffService
-  NodeIKernelRobotService,
-  NodeIKernelNodeMiscService
 } from './services'
 
 export enum NTClass {
@@ -29,8 +27,7 @@ export enum NTClass {
   SKEY_API = 'ns-SkeyApi',
   GROUP_HOME_WORK = 'ns-GroupHomeWork',
   GROUP_ESSENCE = 'ns-GroupEssence',
-  NODE_STORE_API = 'ns-NodeStoreApi',
+  NODE_STORE_API = 'ns-NodeStoreApi'
-  QQ_EX_API = 'ns-QQEXApi',
 }
 
 export enum NTMethod {
@@ -42,6 +39,7 @@ export enum NTMethod {
   MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
   RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
   EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
+  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
 
   SELF_INFO = 'fetchAuthData',
   FILE_TYPE = 'getFileType',
@@ -95,57 +93,37 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
-  nodeIKernelRobotService: NodeIKernelRobotService
-  nodeIKernelNodeMiscService: NodeIKernelNodeMiscService
 }
 
 interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
-  registerEvent?: boolean
+  classNameIsRegister?: boolean
   cbCmd?: string | string[]
   cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
   timeout?: number
 }
 
-let channel: NTChannel
-
-function getChannel() {
-  if (channel) {
-    return channel
-  }
-  if (ipcMain.eventNames().includes(NTChannel.IPC_UP_2)) {
-    return channel = NTChannel.IPC_UP_2
-  } else {
-    return channel = NTChannel.IPC_UP_3
-  }
-}
-
 export function invoke<
   R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
   S extends keyof NTService = any,
   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 ?? getChannel()
+  const channel = options.channel ?? NTChannel.IPC_UP_2
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]
-  if (options.registerEvent) {
+  if (options.classNameIsRegister) {
     eventName += '-register'
   }
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
-    let eventId: string
-
     const timeoutId = setTimeout(() => {
-      if (eventId) {
+      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
-        removeReceiveHook(eventId)
+      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
-      }
-      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, args)
-      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${JSON.stringify(args)}`)
     }, timeout)
 
     if (!options.cbCmd) {
@@ -159,15 +137,19 @@ export function invoke<
       let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
           if (options.cmdCB) {
-            if (!options.cmdCB(payload, result)) {
+            if (options.cmdCB(payload, result)) {
-              return
+              removeReceiveHook(hookId)
+              clearTimeout(timeoutId)
+              resolve(payload)
             }
           }
-          removeReceiveHook(eventId)
+          else {
-          clearTimeout(timeoutId)
+            removeReceiveHook(hookId)
-          resolve(payload)
+            clearTimeout(timeoutId)
+            resolve(payload)
+          }
         })
       }
       !afterFirstCmd && secondCallback()
@@ -177,12 +159,9 @@ export function invoke<
           afterFirstCmd && secondCallback()
         }
         else {
+          log('ntqq api call failed,', method, res)
           clearTimeout(timeoutId)
-          if (eventId) {
+          reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
-            removeReceiveHook(eventId)
-          }
-          log('ntqq api call failed,', method, args, res)
-          reject(`ntqq api call failed, ${method}, ${JSON.stringify(res)}`)
         }
       }
     }

src/ntqqapi/proto/groupNotify.proto

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

src/ntqqapi/proto/message.proto

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

src/ntqqapi/proto/oidb.proto

@@ -1,41 +0,0 @@
-syntax = "proto3";
-package Oidb;
-
-message Base {
-  uint32 command = 1;
-  uint32 subCommand = 2;
-  uint32 errorCode = 3;
-  bytes body = 4;
-  optional string errorMsg = 5;
-  uint32 isReserved = 12;
-}
-
-message Oidb_0xED3_1 {
-  uint32 uin = 1;
-  uint32 groupCode = 2;
-  uint32 friendUin = 5;
-  optional uint32 ext = 6;
-}
-
-message Oidb_0xEB7_1 {
-  Oidb_0xEB7_1_Body body = 2;
-}
-
-message Oidb_0xEB7_1_Body {
-  string uin = 1;
-  string groupCode = 2;
-  string version = 3;
-}
-
-message Oidb_0X8FC_2 {
-  uint32 groupCode = 1;
-  Oidb_0X8FC_2_Body body = 3;
-}
-
-message Oidb_0X8FC_2_Body {
-  string targetUid = 1;
-  string specialTitle = 5;
-  sint32 expiredTime = 6;
-  string uinName = 7;
-  string targetName = 8;
-}

src/ntqqapi/proto/richMedia.proto

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

src/ntqqapi/proto/systemMessage.proto

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

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -1,6 +1,10 @@
-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: {
@@ -13,7 +17,7 @@ export interface NodeIKernelBuddyService {
     }[]
   }>
 
-  setBuddyRemark(arg: unknown): Promise<GeneralCallResult>
+  setBuddyRemark(uid: number, remark: string): void
 
   isBuddy(uid: string): boolean
 

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -123,8 +123,4 @@ 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,18 +1,42 @@
-import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } 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: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], 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>
 
@@ -20,10 +44,6 @@ 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[] }>
@@ -77,7 +97,7 @@ export interface NodeIKernelMsgService {
 
   downloadRichMedia(...args: unknown[]): unknown
 
-  setMsgEmojiLikes(...args: unknown[]): Promise<GeneralCallResult>
+  setMsgEmojiLikes(...args: unknown[]): unknown
 
   getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
     result: number
@@ -95,6 +115,4 @@ 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

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

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

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

src/ntqqapi/services/NodeIKernelProfileService.ts

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

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

src/ntqqapi/services/index.ts

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

src/ntqqapi/types/group.ts

@@ -1,3 +1,12 @@
+import { QQLevel, Sex } from './user'
+
+export enum GroupListUpdateType {
+  REFRESHALL,
+  GETALL,
+  MODIFIED,
+  REMOVE
+}
+
 export interface Group {
   groupCode: string
   maxMember: number
@@ -13,9 +22,9 @@ export interface Group {
   hasModifyConfGroupName: boolean
   remarkName: string
   hasMemo: boolean
-  groupShutupExpireTime: string
+  groupShutupExpireTime: string //"0",
-  personShutupExpireTime: string
+  personShutupExpireTime: string //"0",
-  discussToGroupUin: string
+  discussToGroupUin: string //"0",
   discussToGroupMaxMsgSeq: number
   discussToGroupTime: number
   groupFlagExt: number //1073938496,
@@ -23,57 +32,39 @@ export interface Group {
   groupCreditLevel: number //0,
   groupFlagExt3: number //0,
   groupOwnerId: {
-    memberUin: string
+    memberUin: string //"0",
-    memberUid: string
+    memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
   }
+  members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
   createTime: string
 }
 
 export enum GroupMemberRole {
-  Normal = 2,
+  normal = 2,
-  Admin = 3,
+  admin = 3,
-  Owner = 4,
+  owner = 4,
 }
 
 export interface GroupMember {
-  uid: string
+  memberSpecialTitle?: string
-  qid: string
-  uin: string
-  nick: string
-  remark: string
-  cardType: number
-  cardName: string
-  role: GroupMemberRole
   avatarPath: string
-  shutUpTime: number
+  cardName: string
+  cardType: number
   isDelete: boolean
-  isSpecialConcerned: boolean
+  nick: string
-  isSpecialShield: boolean
+  qid: string
+  remark: string
+  role: GroupMemberRole // 群主:4, 管理员:3，群员:2
+  shutUpTime: number // 禁言时间，单位是什么暂时不清楚
+  uid: string // 加密的字符串
+  uin: string // QQ号
   isRobot: boolean
-  groupHonor: Uint8Array
+  sex?: Sex
-  memberRealLevel: number
+  qqLevel?: QQLevel
-  memberLevel: number
+  isChangeRole: boolean
-  globalGroupLevel: number
-  globalGroupPoint: number
-  memberTitleId: number
-  memberSpecialTitle: string
-  specialTitleExpireTime: string
-  userShowFlag: number
-  userShowFlagNew: number
-  richFlag: number
-  mssVipType: number
-  bigClubLevel: number
-  bigClubFlag: number
-  autoRemark: string
-  creditLevel: number
   joinTime: number
   lastSpeakTime: number
-  memberFlag: number
+  memberLevel: number
-  memberFlagExt: number
-  memberMobileFlag: number
-  memberFlagExt2: number
-  isSpecialShielded: boolean
-  cardNameId: number
 }
 
 export interface PublishGroupBulletinReq {
@@ -87,104 +78,3 @@ 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
-}
-
-export enum GroupMsgMask {
-  AllowNotify = 1,  // 允许提醒
-  AllowNotNotify = 4,  // 接受消息不提醒
-  BoxNotNotify = 2,  // 收进群助手不提醒
-  NotAllow = 3,  // 屏蔽
-}

src/ntqqapi/types/msg.ts

@@ -1,108 +1,125 @@
 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 {
-  Text = 1,
+  UNKNOWN = 0,
-  Pic = 2,
+  TEXT = 1,
-  File = 3,
+  PIC = 2,
-  Ptt = 4,
+  FILE = 3,
-  Video = 5,
+  PTT = 4,
-  Face = 6,
+  VIDEO = 5,
-  Reply = 7,
+  FACE = 6,
-  GrayTip = 8,
+  REPLY = 7,
-  Ark = 10,
+  WALLET = 9,
-  MarketFace = 11,
+  GreyTip = 8, //Poke别叫戳一搓了 官方名字拍一拍 戳一戳是另一个名字
-  LiveGift = 12,
+  ARK = 10,
-  StructLongMsg = 13,
+  MFACE = 11,
-  Markdown = 14,
+  LIVEGIFT = 12,
-  Giphy = 15,
+  STRUCTLONGMSG = 13,
-  MultiForward = 16,
+  MARKDOWN = 14,
-  InlineKeyboard = 17,
+  GIPHY = 15,
-  Calendar = 19,
+  MULTIFORWARD = 16,
-  YoloGameResult = 20,
+  INLINEKEYBOARD = 17,
-  AvRecord = 21,
+  INTEXTGIFT = 18,
-  TofuRecord = 23,
+  CALENDAR = 19,
-  FaceBubble = 27,
+  YOLOGAMERESULT = 20,
-  ShareLocation = 28,
+  AVRECORD = 21,
-  TaskTopMsg = 29,
+  FEED = 22,
-  RecommendedMsg = 43,
+  TOFURECORD = 23,
-  ActionBar = 44
+  ACEBUBBLE = 24,
+  ACTIVITY = 25,
+  TOFU = 26,
+  FACEBUBBLE = 27,
+  SHARELOCATION = 28,
+  TASKTOPMSG = 29,
+  RECOMMENDEDMSG = 43,
+  ACTIONBAR = 44
 }
 
 export interface SendTextElement {
-  elementType: ElementType.Text
+  elementType: ElementType.TEXT
   elementId: ''
   textElement: TextElement
 }
 
 export interface SendPttElement {
-  elementType: ElementType.Ptt
+  elementType: ElementType.PTT
   elementId: ''
-  pttElement: Partial<PttElement>
+  pttElement: {
+    fileName: string
+    filePath: string
+    md5HexStr: string
+    fileSize: number
+    duration: number // 单位是秒
+    formatType: number
+    voiceType: number
+    voiceChangeType: number
+    canConvert2Text: boolean
+    waveAmplitudes: number[]
+    fileSubId: ''
+    playState: number
+    autoConvertText: number
+  }
+}
+
+export enum PicType {
+  gif = 2000,
+  jpg = 1000,
+}
+
+export enum PicSubType {
+  normal = 0, // 普通图片，大图
+  face = 1, // 表情包小图
 }
 
 export interface SendPicElement {
-  elementType: ElementType.Pic
+  elementType: ElementType.PIC
   elementId: ''
-  picElement: Partial<PicElement>
+  picElement: {
+    md5HexStr: string
+    fileSize: number | string
+    picWidth: number
+    picHeight: number
+    fileName: string
+    sourcePath: string
+    original: boolean
+    picType: PicType
+    picSubType: PicSubType
+    fileUuid: string
+    fileSubId: string
+    thumbFileSize: number
+    summary: string
+  }
 }
 
 export interface SendReplyElement {
-  elementType: ElementType.Reply
+  elementType: ElementType.REPLY
   elementId: ''
   replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
-  elementType: ElementType.Face
+  elementType: ElementType.FACE
   elementId: ''
   faceElement: FaceElement
 }
 
 export interface SendMarketFaceElement {
-  elementType: ElementType.MarketFace
+  elementType: ElementType.MFACE
-  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: AtType
+  atType: number
   atUid: string
   atTinyId: string
   atNtUid: string
@@ -139,6 +156,47 @@ 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 // 秒数
@@ -149,7 +207,7 @@ export interface PttElement {
   fileSize: string // "4261"
   fileSubId: string // "0"
   fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-  formatType: number // 1
+  formatType: string // 1
   invalidState: number // 0
   md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
   playState: number // 0
@@ -160,7 +218,6 @@ export interface PttElement {
   voiceChangeType: number // 0
   voiceType: number // 0
   waveAmplitudes: number[]
-  autoConvertText: number
 }
 
 export interface ArkElement {
@@ -172,16 +229,6 @@ export interface ArkElement {
 export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
 export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
 
-export enum PicType {
-  GIF = 2000,
-  JPEG = 1000,
-}
-
-export enum PicSubType {
-  Normal = 0, // 普通图片，大图
-  Face = 1, // 表情包小图
-}
-
 export interface PicElement {
   picSubType: PicSubType
   picType: PicType  // 有这玩意儿吗
@@ -197,77 +244,23 @@ export interface PicElement {
   md5HexStr?: string
 }
 
-export interface TipAioOpGrayTipElement {
-  operateType: number
-  peerUid: string
-  fromGrpCodeOfTmpChat: string
-}
-
-export enum TipGroupElementType {
-  MemberIncrease = 1,
-  Kicked = 3, // 被移出群
-  Ban = 8,
-}
-
-export interface TipGroupElement {
-  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
-  role: number
-  groupName: string // 暂时获取不到
-  memberUid: string
-  memberNick: string
-  memberRemark: string
-  adminUid: string
-  adminNick: string
-  adminRemark: string
-  createGroup: null
-  memberAdd?: {
-    showType: number
-    otherAdd?: {
-      uid: string
-      name: string
-    }
-    otherAddByOtherQRCode?: unknown
-    otherAddByYourQRCode?: unknown
-    youAddByOtherQRCode?: unknown
-    otherInviteOther?: unknown
-    otherInviteYou?: unknown
-    youInviteOther?: unknown
-  }
-  shutUp?: {
-    curTime: string
-    duration: string // 禁言时间，秒
-    admin: {
-      uid: string
-      card: string
-      name: string
-      role: GroupMemberRole
-    }
-    member: {
-      uid: string
-      card: string
-      name: string
-      role: GroupMemberRole
-    }
-  }
-}
-
 export enum GrayTipElementSubType {
-  Revoke = 1,
+  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,
 }
 
@@ -288,20 +281,16 @@ export interface GrayTipElement {
   xmlElement?: {
     templId: string
     content: string
-    templParam: Map<string, string>
-    members: Map<string, string> // uid -> remark
   }
   jsonGrayTipElement?: {
     busiId: string
     jsonStr: string
-    xmlToJsonParam?: {
-      templParam: Map<string, string>
-    }
   }
 }
 
+
 export enum FaceIndex {
-  Dice = 358,
+  dice = 358,
   RPS = 359, // 石头剪刀布
 }
 
@@ -326,10 +315,6 @@ export interface MarketFaceElement {
   key: string
   imageWidth?: number
   imageHeight?: number
-  supportSize?: {
-    width: number
-    height: number
-  }[]
 }
 
 export interface VideoElement {
@@ -379,7 +364,6 @@ export interface InlineKeyboardElementRowButton {
   enter: false
   subscribeDataTemplateIds: []
 }
-
 export interface InlineKeyboardElement {
   rows: [
     {
@@ -388,9 +372,56 @@ export interface InlineKeyboardElement {
   ]
 }
 
-export interface StructLongMsgElement {
+export interface TipAioOpGrayTipElement {
-  xmlContent: string
+  // 这是什么提示来着？
-  resId: string
+  operateType: number
+  peerUid: string
+  fromGrpCodeOfTmpChat: string
+}
+
+export enum TipGroupElementType {
+  memberIncrease = 1,
+  kicked = 3, // 被移出群
+  ban = 8,
+}
+
+export interface TipGroupElement {
+  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
+  role: 0 // 暂时不知
+  groupName: string // 暂时获取不到
+  memberUid: string
+  memberNick: string
+  memberRemark: string
+  adminUid: string
+  adminNick: string
+  adminRemark: string
+  createGroup: null
+  memberAdd?: {
+    showType: 1
+    otherAdd: null
+    otherAddByOtherQRCode: null
+    otherAddByYourQRCode: null
+    youAddByOtherQRCode: null
+    otherInviteOther: null
+    otherInviteYou: null
+    youInviteOther: null
+  }
+  shutUp?: {
+    curTime: string
+    duration: string // 禁言时间，秒
+    admin: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
+    }
+    member: {
+      uid: string
+      card: string
+      name: string
+      role: GroupMemberRole
+    }
+  }
 }
 
 export interface MultiForwardMsgElement {
@@ -399,16 +430,11 @@ 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
@@ -419,30 +445,11 @@ 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
-  }>
-  isOnlineMsg: boolean
 }
 
 export interface Peer {
@@ -467,11 +474,12 @@ export interface MessageElement {
   fileElement?: FileElement
   liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: StructLongMsgElement
+  structLongMsgElement?: unknown
   multiForwardMsgElement?: MultiForwardMsgElement
   giphyElement?: unknown
+  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: unknown
+  textGiftElement?: unknown //????
   calendarElement?: unknown
   yoloGameResultElement?: unknown
   avRecordElement?: unknown
@@ -484,7 +492,7 @@ export interface MessageElement {
   actionBarElement?: unknown
 }
 
-export interface RichMediaDownloadCompleteNotify {
+export interface OnRichMediaDownloadCompleteParams {
   fileModelId: string
   msgElementId: string
   msgId: string
@@ -507,7 +515,7 @@ export interface RichMediaDownloadCompleteNotify {
   userUsedSpacePerDay: unknown
 }
 
-export interface GroupFileInfo {
+export interface OnGroupFileInfoUpdateParams {
   retCode: number
   retMsg: string
   clientWording: string
@@ -557,62 +565,3 @@ export interface GroupFileInfo {
   nextIndex: number
   reqId: number
 }
-
-export interface QueryMsgsParams {
-  chatInfo: Peer
-  filterMsgType: []
-  filterSendersUid: string[]
-  filterMsgFromTime: string
-  filterMsgToTime: string
-  pageLimit: number
-  isReverseOrder: boolean
-  isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi extends GeneralCallResult {
-  tmpChatInfo?: {
-    chatType: number
-    fromNick: string
-    groupCode: string
-    peerUid: string
-    sessionType: number
-    sig: string
-  }
-}
-
-export interface GetFileListParam {
-  sortType: number
-  fileCount: number
-  startIndex: number
-  sortOrder: number
-  showOnlinedocFolder: number
-  folderId?: string
-}
-
-export interface RichMediaUploadCompleteNotify {
-  fileId: string
-  fileDownType: number
-  filePath: string
-  totalSize: string
-  trasferStatus: number
-  commonFileInfo: {
-    uuid: string
-    fileName: string
-    fileSize: string
-    md5: string
-    sha: string
-  }
-}
-
-export enum RMBizType {
-  Unknown,
-  C2CFile,
-  GroupFile,
-  C2CPic,
-  GroupPic,
-  DiscPic,
-  C2CVideo,
-  GroupVideo,
-  C2CPtt,
-  GroupPtt,
-}

src/ntqqapi/types/notify.ts

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

src/ntqqapi/types/user.ts

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

src/ntqqapi/wrapper.ts

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

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

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

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

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

@@ -34,23 +34,25 @@ export class GetForwardMsg extends BaseAction<Payload, Response> {
     if (data?.result !== 0) {
       throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
-    const messages: (OB11ForwardMessage | undefined)[] = await Promise.all(
+    const msgList = data.msgList
-      data.msgList.map(async (msg) => {
+    const messages = await Promise.all(
-        const res = await OB11Entities.message(this.ctx, msg)
+      msgList.map(async (msg) => {
-        if (res) {
+        const resMsg = await OB11Entities.message(this.ctx, msg)
-          return {
+        if (!resMsg) return
-            content: res.message,
+        resMsg.message_id = this.ctx.store.createMsgShortId({
-            sender: {
+          chatType: msg.chatType,
-              nickname: res.sender.nickname,
+          peerUid: msg.peerUid,
-              user_id: res.sender.user_id
+        }, msg.msgId)
-            },
+        return resMsg
-            time: res.time,
-            message_format: res.message_format,
-            message_type: res.message_type
-          }
-        }
       })
     )
-    return { messages: filterNullable(messages) }
+    const forwardMessages = filterNullable(messages)
+      .map(v => {
+        const msg = v as Partial<OB11ForwardMessage>
+        msg.content = msg.message
+        delete msg.message
+        return msg as OB11ForwardMessage
+      })
+    return { messages: forwardMessages }
   }
 }

src/onebot11/action/go-cqhttp/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

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

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

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

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

@@ -1,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: number | string
+  group_id: string | number
   folder_id: string
+  file_count: string | number
 }
 
 interface Response {
@@ -17,27 +17,19 @@ 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 groupId = payload.group_id.toString()
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
-    const data: GroupFileInfo['item'] = []
+      sortType: 1,
-
+      fileCount: +payload.file_count,
-    let nextIndex: number | undefined
+      startIndex: 0,
-    while (nextIndex !== 0) {
+      sortOrder: 2,
-      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+      showOnlinedocFolder: 0,
-        sortType: 1,
+      folderId: payload.folder_id
-        fileCount: 100,
+    })
-        startIndex: nextIndex ?? 0,
-        sortOrder: 2,
-        showOnlinedocFolder: 0,
-        folderId: payload.folder_id
-      })
-      data.push(...res.item)
-      nextIndex = res.nextIndex
-    }
-
     return {
       files: data.filter(item => item.fileInfo)
         .map(item => {

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, parseBool } from '@/common/utils/misc'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -23,23 +23,29 @@ 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.union([Boolean, Schema.transform(String, parseBool)]).default(false)
+    reverseOrder: Schema.boolean().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[]
+    let msgList: RawMessage[] | undefined
-    if (!payload.message_seq || +payload.message_seq === 0) {
+    // 包含 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, true)).msgList
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
     }
     if (!msgList?.length) throw new Error('未找到消息')
     if (reverseOrder) msgList.reverse()
-    const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
+    await Promise.all(
+      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

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

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

@@ -1,10 +1,10 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
-import { GroupFileInfo } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: number | string
+  group_id: string | number
+  file_count: string | number
 }
 
 interface Response {
@@ -15,26 +15,18 @@ 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 groupId = payload.group_id.toString()
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
-    const data: GroupFileInfo['item'] = []
+      sortType: 1,
-
+      fileCount: +payload.file_count,
-    let nextIndex: number | undefined
+      startIndex: 0,
-    while (nextIndex !== 0) {
+      sortOrder: 2,
-      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+      showOnlinedocFolder: 0,
-        sortType: 1,
+    })
-        fileCount: 100,
-        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(false, 10)
+    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(10)
     const data: Response = { invited_requests: [], join_requests: [] }
     for (const notify of singleScreenNotifies) {
       if (notify.type == 1) {
@@ -38,7 +38,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           invitor_nick: notify.user1.nickName,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.Unhandle,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       } else if (notify.type == 7) {
@@ -49,7 +49,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           message: notify.postscript,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.Unhandle,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       }

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

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

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

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

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

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

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

@@ -1,19 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
-
-interface Payload {
-  group_id: number | string
-}
-
-export class SendGroupSign extends BaseAction<Payload, null> {
-  actionName = ActionName.GoCQHTTP_SendGroupSign
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-  })
-
-  async _handle(payload: Payload) {
-    await this.ctx.app.packet.sendGroupSignPacket(selfInfo.uin, payload.group_id.toString())
-    return null
-  }
-}

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

@@ -1,30 +0,0 @@
-import { BaseAction, Schema } from '../BaseAction'
-import { ActionName } from '../types'
-import { selfInfo } from '@/common/globalVars'
-import { GroupMemberRole } from '@/ntqqapi/types'
-
-interface Payload {
-  group_id: number | string
-  user_id: number | string
-  special_title?: string
-}
-
-export class SetGroupSpecialTitle extends BaseAction<Payload, null> {
-  actionName = ActionName.GoCQHTTP_SetGroupSpecialTitle
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    special_title: Schema.string()
-  })
-
-  async _handle(payload: Payload) {
-    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), payload.group_id.toString())
-    if (!uid) throw new Error(`用户${payload.user_id}的uid获取失败`)
-    const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid, false)
-    if (self.role !== GroupMemberRole.Owner){
-      throw new Error(`不是群${payload.group_id}的群主，无法设置群头衔`)
-    }
-    await this.ctx.app.packet.sendSetSpecialTittlePacket(payload.group_id.toString(), uid, payload.special_title || "")
-    return null
-  }
-}

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

@@ -1,6 +1,6 @@
 import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { SendElement } from '@/ntqqapi/entities'
+import { SendElementEntities } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -23,15 +23,11 @@ export class UploadGroupFile extends BaseAction<Payload, null> {
   })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(this.ctx, payload.file)
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
     if (!success) {
       throw new Error(errMsg)
     }
-    const name = payload.name || fileName
+    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
-    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 { SendElement } from '@/ntqqapi/entities'
+import { SendElementEntities } from '@/ntqqapi/entities'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -19,15 +19,11 @@ export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null
   })
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
-    const { success, errMsg, path, fileName } = await uri2local(this.ctx, payload.file)
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
     if (!success) {
       throw new Error(errMsg)
     }
-    const name = payload.name || fileName
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, 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,36 +2,32 @@ import { BaseAction, Schema } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { calcQQLevel, parseBool } from '@/common/utils/misc'
+import { isNullable } from 'cosmokit'
 
 interface Payload {
   group_id: number | string
   user_id: number | string
-  no_cache: boolean
 }
 
 class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo
   payloadSchema = Schema.object({
     group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required()
-    no_cache: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
   })
 
   protected async _handle(payload: Payload) {
     const groupCode = payload.group_id.toString()
-    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), groupCode)
+    const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, payload.user_id.toString())
-    if (!uid) throw new Error('无法获取用户信息')
-    const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, uid, payload.no_cache)
     if (member) {
-      const ret = OB11Entities.groupMember(+groupCode, member)
+      if (isNullable(member.sex)) {
-      const date = Math.trunc(Date.now() / 1000)
+        const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
+        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,26 +17,19 @@ 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)
-    for (let i = 0; i < 5; i++) {
+    if (groupMembers.size === 0) {
-      if (groupMembers.size > 0) {
+      await this.ctx.sleep(100)
-        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)
 
-    const date = Math.trunc(Date.now() / 1000)
+    return groupMembersArr.map(item => {
-    const groupId = Number(payload.group_id)
+      const member = OB11Entities.groupMember(groupCode, item)
-    const ret: OB11GroupMember[] = []
-
-    for (const item of groupMembers.values()) {
-      const member = OB11Entities.groupMember(groupId, item)
       member.join_time ??= date
       member.last_sent_time ??= date
-      ret.push(member)
+      return member
-    }
+    })
-
-    return ret
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

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

src/onebot11/action/group/SetGroupAdmin.ts

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

src/onebot11/action/group/SetGroupBan.ts

@@ -1,27 +1,22 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
+  group_id: number
-  user_id: number | string
+  user_id: number
-  duration: number | string
+  duration: number
 }
 
 export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    duration: Schema.union([Number, String]).default(30 * 60)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    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.banMember(groupCode, [
+    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
-      { uid, timeStamp: +payload.duration },
+      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
     ])
     return null
   }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,26 +1,21 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number | string
+  group_id: number
-  user_id: number | string
+  user_id: number
   card: string
 }
 
 export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    card: Schema.string().default('')
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    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.setMemberCard(groupCode, uid, payload.card)
+    await this.ctx.ntGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,27 +1,21 @@
-import { BaseAction, Schema } from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import { parseBool } from '@/common/utils/misc'
 
 interface Payload {
-  group_id: number | string
+  group_id: number
-  user_id: number | string
+  user_id: number
   reject_add_request: boolean
 }
 
 export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick
-  payloadSchema = Schema.object({
-    group_id: Schema.union([Number, String]).required(),
-    user_id: Schema.union([Number, String]).required(),
-    reject_add_request: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
-  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const groupCode = payload.group_id.toString()
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    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.kickMember(groupCode, [uid], payload.reject_add_request)
+    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

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

src/onebot11/action/group/SetGroupName.ts

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

src/onebot11/action/group/SetGroupWholeBan.ts

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

src/onebot11/action/index.ts

@@ -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 './llonebot/SetMsgEmojiLike'
+import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
 import { GetEssenceMsgList } from './go-cqhttp/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
@@ -69,22 +69,6 @@ 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'
-import { SetGroupSpecialTitle } from '@/onebot11/action/go-cqhttp/SetGroupSpecialTitle'
-import { SendGroupSign } from '@/onebot11/action/go-cqhttp/SendGroupSign'
-import { SetRestart } from '@/onebot11/action/system/SetRestart'
-import { SetFriendCategory } from '@/onebot11/action/llonebot/SetFriendCategory'
-import { SetFriendRemark } from '@/onebot11/action/llonebot/SetFriendRemark'
-import { SetGroupMsgMask } from '@/onebot11/action/llonebot/SetGroupMsgMask'
-import { SetGroupRemark } from '@/onebot11/action/llonebot/SetGroupRemark'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -101,14 +85,6 @@ 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),
-    new SetFriendCategory(adapter),
-    new SetFriendRemark(adapter),
-    new SetGroupMsgMask(adapter),
-    new SetGroupRemark(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -139,10 +115,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),
-    new SetRestart(adapter),
     // go-cqhttp
     new GetEssenceMsgList(adapter),
     new GetGroupHonorInfo(adapter),
@@ -168,15 +143,8 @@ 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),
-    new SetGroupSpecialTitle(adapter),
-    new SendGroupSign(adapter),
   ]
-  const actionMap = new Map()
+  const actionMap = new Map<string, BaseAction<any, unknown>>()
   for (const action of actionHandlers) {
     actionMap.set(action.actionName, action)
     actionMap.set(action.actionName + '_async', action)