Merge pull request #411 from LLOneBot/dev

3.32.3

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: 'publish'
+name: Publish
 on:
   push:
     tags:
@@ -8,31 +8,36 @@ jobs:
   build-and-publish:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout
+      - name: Checkout
         uses: actions/checkout@v4
 
-      - name: setup node
+      - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
-      - name: install dependenies
+      - name: Install dependenies
         run: |
           export ELECTRON_SKIP_BINARY_DOWNLOAD=1
           npm install
 
-      - name: build
+      - name: Build
         run: npm run build
 
-      - name: zip
+      - name: Compress
         run: |
           sudo apt install zip -y
           cd ./dist/
           zip -r ../LLOneBot.zip ./*
 
-      - name: publish
+      - name: Extract version from tag
+        id: get-version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
+
+      - name: Release
         uses: ncipollo/release-action@v1
         with:
           artifacts: 'LLOneBot.zip'
           draft: true
           token: ${{ secrets.RELEASE_TOKEN }}
+          name: LLOneBot v${{ steps.get-version.outputs.VERSION }}

.gitignore

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

LICENSE

@@ -1,4 +1,4 @@
-MIT Without Public Sicial Media Promotion License
+MIT Without Public Social Media Promotion License
 
 Copyright (c) 2024 LLOneBot
 

README.md

@@ -3,9 +3,9 @@
 LiteLoaderQQNT 插件，实现 OneBot 11 协议，用于 QQ 机器人开发
 
 > [!CAUTION]\
-> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本插件存在相关性的信息**
+> 请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论任何与本插件存在相关性的信息
 
-TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
+TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 安装方法
 
@@ -15,10 +15,6 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 <img src="./doc/image/setting.png" width="400px" alt="设置界面"/>
 
-## HTTP 调用示例
-
-<img src="./doc/image/example.jpg" width="500px" alt="HTTP调用示例"/>
-
 ## 支持的 API
 
 见 <https://llonebot.github.io/zh-CN/develop/api>
@@ -31,10 +27,10 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 - [NapCatQQ](https://github.com/NapNeko/NapCatQQ)
 - [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
-- [chronocat](https://github.com/chrononeko/chronocat)
+- [Chronocat](https://github.com/chrononeko/chronocat)
 - [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
 - [silk-wasm](https://github.com/idranme/silk-wasm)
 
 ## 友链
 
-- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架
+- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core): An Implementation of NTQQ Protocol

electron.vite.config.ts

@@ -1,6 +1,7 @@
 import cp from 'vite-plugin-cp'
 import path from 'node:path'
 import './scripts/gen-manifest'
+import type { ElectronViteConfig } from 'electron-vite'
 
 const external = [
   'silk-wasm',
@@ -12,7 +13,7 @@ function genCpModule(module: string) {
   return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false }
 }
 
-let config = {
+const config: ElectronViteConfig = {
   main: {
     build: {
       outDir: 'dist/main',
@@ -39,9 +40,6 @@ let config = {
           ...external.map(genCpModule),
           { src: './manifest.json', dest: 'dist' },
           { src: './icon.webp', dest: 'dist' },
-          // { src: './src/ntqqapi/native/crychic/crychic-win32-x64.node', dest: 'dist/main/' },
-          // { src: './src/ntqqapi/native/moehook/MoeHoo-win32-x64.node', dest: 'dist/main/' },
-          // { src: './src/ntqqapi/native/moehook/MoeHoo-linux-x64.node', dest: 'dist/main/' },
         ],
       }),
     ],

manifest.json

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

package.json

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

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,11 +1,8 @@
 import fs from 'node:fs'
-import { Config, OB11Config } from './types'
-import { mergeNewProperties } from './utils/helper'
 import path from 'node:path'
-import { getSelfUin } from './data'
+import { Config, OB11Config } from './types'
-import { DATA_DIR } from './utils'
+import { selfInfo, DATA_DIR } from './globalVars'
-
+import { mergeNewProperties } from './utils/misc'
-//export const HOOK_LOG = false
 
 export class ConfigUtil {
   private readonly configPath: string
@@ -24,7 +21,7 @@ export class ConfigUtil {
   }
 
   reloadConfig(): Config {
-    let ob11Default: OB11Config = {
+    const ob11Default: OB11Config = {
       httpPort: 3000,
       httpHosts: [],
       httpSecret: '',
@@ -36,9 +33,10 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
-      enableQOAutoQuote: false
+      enableQOAutoQuote: false,
+      listenLocalhost: false
     }
-    let defaultConfig: Config = {
+    const defaultConfig: Config = {
       enableLLOB: true,
       ob11: ob11Default,
       heartInterval: 60000,
@@ -69,7 +67,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')
-      // console.log("get config", jsonData);
       this.config = jsonData
       return this.config
     }
@@ -81,21 +78,21 @@ export class ConfigUtil {
   }
 
   private checkOldConfig(
-    currentConfig: Config | OB11Config,
+    currentConfig: OB11Config,
-    oldConfig: Config | OB11Config,
+    oldConfig: Config,
-    currentKey: string,
+    currentKey: 'httpPort' | 'httpHosts' | 'wsPort',
-    oldKey: string,
+    oldKey: 'http' | 'hosts' | 'wsPort',
   ) {
     // 迁移旧的配置到新配置，避免用户重新填写配置
     const oldValue = oldConfig[oldKey]
     if (oldValue) {
-      currentConfig[currentKey] = oldValue
+      Object.assign(currentConfig, { [currentKey]: oldValue })
       delete oldConfig[oldKey]
     }
   }
 }
 
 export function getConfigUtil() {
-  const configFilePath = path.join(DATA_DIR, `config_${getSelfUin()}.json`)
+  const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
   return new ConfigUtil(configFilePath)
 }

src/common/data.ts

@@ -1,128 +0,0 @@
-import {
-  type Friend,
-  type GroupMember,
-  type SelfInfo,
-} from '../ntqqapi/types'
-import { type LLOneBotError } from './types'
-import { NTQQGroupApi } from '../ntqqapi/api/group'
-import { log } from './utils/log'
-import { isNumeric } from './utils/helper'
-import { NTQQFriendApi, NTQQUserApi } from '../ntqqapi/api'
-import { RawMessage } from '../ntqqapi/types'
-import { getConfigUtil } from './config'
-import { getBuildVersion } from './utils/QQBasicInfo'
-
-export let friends: Friend[] = []
-export const llonebotError: LLOneBotError = {
-  ffmpegError: '',
-  httpServerError: '',
-  wsServerError: '',
-  otherError: 'LLOneBot 未能正常启动，请检查日志查看错误',
-}
-// 群号 -> 群成员map(uid=>GroupMember)
-export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
-
-export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-  const filterKey: 'uin' | 'uid' = isNumeric(uinOrUid.toString()) ? 'uin' : 'uid'
-  const filterValue = uinOrUid
-  let friend = friends.find((friend) => friend[filterKey] === filterValue.toString())
-  if (!friend && getBuildVersion() < 26702) {
-    try {
-      const _friends = await NTQQFriendApi.getFriends(true)
-      friend = _friends.find((friend) => friend[filterKey] === filterValue.toString())
-      if (friend) {
-        friends.push(friend)
-      }
-    } catch (e: any) {
-      log('刷新好友列表失败', e.stack.toString())
-    }
-  }
-  return friend
-}
-
-export async function getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
-  const groupCodeStr = groupCode.toString()
-  const memberUinOrUidStr = memberUinOrUid.toString()
-  let members = groupMembers.get(groupCodeStr)
-  if (!members) {
-    try {
-      members = await NTQQGroupApi.getGroupMembers(groupCodeStr)
-      // 更新群成员列表
-      groupMembers.set(groupCodeStr, members)
-    }
-    catch (e) {
-      return null
-    }
-  }
-  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) {
-    members = await NTQQGroupApi.getGroupMembers(groupCodeStr)
-    groupMembers.set(groupCodeStr, members)
-    member = getMember()
-  }
-  return member
-}
-
-const selfInfo: SelfInfo = {
-  uid: '',
-  uin: '',
-  nick: '',
-  online: true,
-}
-
-export async function getSelfNick(force = false): Promise<string> {
-  if ((!selfInfo.nick || force) && selfInfo.uid) {
-    const userInfo = await NTQQUserApi.getUserDetailInfo(selfInfo.uid)
-    if (userInfo) {
-      selfInfo.nick = userInfo.nick
-      return userInfo.nick
-    }
-  }
-
-  return selfInfo.nick
-}
-
-export function getSelfInfo() {
-  return selfInfo
-}
-
-export function setSelfInfo(data: Partial<SelfInfo>) {
-  Object.assign(selfInfo, data)
-}
-
-export function getSelfUid() {
-  return selfInfo['uid']
-}
-
-export function getSelfUin() {
-  return selfInfo['uin']
-}
-
-const messages: Map<string, RawMessage> = new Map()
-
-/** 缓存近期消息内容 */
-export async function addMsgCache(msg: RawMessage) {
-  const expire = getConfigUtil().getConfig().msgCacheExpire! * 1000
-  if (expire === 0) {
-    return
-  }
-  const id = msg.msgId
-  messages.set(id, msg)
-  setTimeout(() => {
-    messages.delete(id)
-  }, expire)
-}
-
-/** 获取近期消息内容 */
-export function getMsgCache(msgId: string) {
-  return messages.get(msgId)
-}

src/common/globalVars.ts

@@ -0,0 +1,22 @@
+import { LLOneBotError } from './types'
+import { SelfInfo } from '../ntqqapi/types'
+import path from 'node:path'
+
+export const llonebotError: LLOneBotError = {
+  ffmpegError: '',
+  httpServerError: '',
+  wsServerError: '',
+  otherError: 'LLOneBot 未能正常启动，请检查日志查看错误',
+}
+
+export const DATA_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.data
+export const TEMP_DIR: string = path.join(DATA_DIR, 'temp')
+export const PLUGIN_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.plugin
+export const LOG_DIR = path.join(DATA_DIR, 'logs')
+
+export const selfInfo: SelfInfo = {
+  uid: '',
+  uin: '',
+  nick: '',
+  online: true,
+}

src/common/server/http.ts

@@ -1,119 +0,0 @@
-import express, { Express, Request, Response } from 'express'
-import http from 'node:http'
-import cors from 'cors'
-import { log } from '../utils/log'
-import { getConfigUtil } from '../config'
-import { llonebotError } from '../data'
-
-type RegisterHandler = (res: Response, payload: any) => Promise<any>
-
-export abstract class HttpServerBase {
-  name: string = 'LLOneBot'
-  private readonly expressAPP: Express
-  private server: http.Server | null = null
-
-  constructor() {
-    this.expressAPP = express()
-    // 添加 CORS 中间件
-    this.expressAPP.use(cors())
-    this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }))
-    this.expressAPP.use((req, res, next) => {
-      // 兼容处理没有带content-type的请求
-      // log("req.headers['content-type']", req.headers['content-type'])
-      req.headers['content-type'] = 'application/json'
-      const originalJson = express.json({ limit: '5000mb' })
-      // 调用原始的express.json()处理器
-      originalJson(req, res, (err) => {
-        if (err) {
-          log('Error parsing JSON:', err)
-          return res.status(400).send('Invalid JSON')
-        }
-        next()
-      })
-    })
-  }
-
-  authorize(req: Request, res: Response, next: () => void) {
-    let serverToken = getConfigUtil().getConfig().token
-    let clientToken = ''
-    const authHeader = req.get('authorization')
-    if (authHeader) {
-      clientToken = authHeader.split('Bearer ').pop()!
-      log('receive http header token', clientToken)
-    } else if (req.query.access_token) {
-      if (Array.isArray(req.query.access_token)) {
-        clientToken = req.query.access_token[0].toString()
-      } else {
-        clientToken = req.query.access_token.toString()
-      }
-      log('receive http url token', clientToken)
-    }
-
-    if (serverToken && clientToken != serverToken) {
-      return res.status(403).send(JSON.stringify({ message: 'token verify failed!' }))
-    }
-    next()
-  }
-
-  start(port: number) {
-    try {
-      this.expressAPP.get('/', (req: Request, res: Response) => {
-        res.send(`${this.name} 已启动`)
-      })
-      this.listen(port)
-      llonebotError.httpServerError = ''
-    } catch (e: any) {
-      log('HTTP服务启动失败', e.toString())
-      llonebotError.httpServerError = 'HTTP服务启动失败, ' + e.toString()
-    }
-  }
-
-  stop() {
-    llonebotError.httpServerError = ''
-    if (this.server) {
-      this.server.close()
-      this.server = null
-    }
-  }
-
-  restart(port: number) {
-    this.stop()
-    this.start(port)
-  }
-
-  abstract handleFailed(res: Response, payload: any, err: any): void
-
-  registerRouter(method: 'post' | 'get' | string, url: string, handler: RegisterHandler) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
-    }
-
-    if (!this.expressAPP[method]) {
-      const err = `${this.name} register router failed，${method} not exist`
-      log(err)
-      throw err
-    }
-    this.expressAPP[method](url, this.authorize, async (req: Request, res: Response) => {
-      let payload = req.body
-      if (method == 'get') {
-        payload = req.query
-      } else if (req.query) {
-        payload = { ...req.query, ...req.body }
-      }
-      log('收到 HTTP 请求', url, payload)
-      try {
-        res.send(await handler(res, payload))
-      } catch (e: any) {
-        this.handleFailed(res, payload, e.stack.toString())
-      }
-    })
-  }
-
-  protected listen(port: number) {
-    this.server = this.expressAPP.listen(port, '0.0.0.0', () => {
-      const info = `${this.name} started 0.0.0.0:${port}`
-      console.log(info)
-      log(info)
-    })
-  }
-}

src/common/types.ts

@@ -11,16 +11,19 @@ export interface OB11Config {
   messagePostFormat?: 'array' | 'string'
   enableHttpHeart?: boolean
   enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
+  listenLocalhost: boolean
 }
+
 export interface CheckVersion {
   result: boolean
   version: string
 }
+
 export interface Config {
   enableLLOB: boolean
   ob11: OB11Config
   token?: string
-  heartInterval?: number // ms
+  heartInterval: number // ms
   enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
   debug?: boolean
   reportSelfMessage?: boolean
@@ -32,6 +35,12 @@ export interface Config {
   ignoreBeforeLoginMsg?: boolean
   /** 单位为秒 */
   msgCacheExpire?: number
+  /** @deprecated */
+  http?: string
+  /** @deprecated */
+  hosts?: string[]
+  /** @deprecated */
+  wsPort?: string
 }
 
 export interface LLOneBotError {

src/common/utils/EventTask.ts

@@ -1,234 +0,0 @@
-import { NodeIQQNTWrapperSession } from '@/ntqqapi/wrapper'
-import { randomUUID } from 'node:crypto'
-
-interface Internal_MapKey {
-  timeout: number
-  createtime: number
-  func: (...arg: any[]) => any
-  checker: ((...args: any[]) => boolean) | undefined
-}
-
-export class ListenerClassBase {
-  [key: string]: string
-}
-
-export interface ListenerIBase {
-  new(listener: any): ListenerClassBase
-}
-
-// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/EventTask.ts#L20
-export class NTEventWrapper {
-  private ListenerMap: { [key: string]: ListenerIBase } | undefined//ListenerName-Unique -> Listener构造函数
-  private WrapperSession: NodeIQQNTWrapperSession | undefined//WrapperSession
-  private ListenerManger: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>() //ListenerName-Unique -> Listener实例
-  private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>()//tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
-  public initialised = false
-
-  constructor() {
-  }
-
-  createProxyDispatch(ListenerMainName: string) {
-    const current = this
-    return new Proxy({}, {
-      get(target: any, prop: any, receiver: any) {
-        // console.log('get', prop, typeof target[prop])
-        if (typeof target[prop] === 'undefined') {
-          // 如果方法不存在，返回一个函数，这个函数调用existentMethod
-          return (...args: any[]) => {
-            current.dispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then()
-          }
-        }
-        // 如果方法存在，正常返回
-        return Reflect.get(target, prop, receiver)
-      }
-    })
-  }
-
-  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
-    this.ListenerMap = ListenerMap
-    this.WrapperSession = WrapperSession
-    this.initialised = true
-  }
-
-  createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-    const eventNameArr = eventName.split('/')
-    type eventType = {
-      [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
-    }
-    if (eventNameArr.length > 1) {
-      const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '')
-      const eventName = eventNameArr[1]
-      //getNodeIKernelGroupListener,GroupService
-      //console.log('2', eventName)
-      const services = (this.WrapperSession as unknown as eventType)[serviceName]()
-      let event = services[eventName]
-      //重新绑定this
-      event = event.bind(services)
-      if (event) {
-        return event as T
-      }
-      return undefined
-    }
-  }
-
-  createListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
-    const ListenerType = this.ListenerMap![listenerMainName]
-    let Listener = this.ListenerManger.get(listenerMainName + uniqueCode)
-    if (!Listener && ListenerType) {
-      Listener = new ListenerType(this.createProxyDispatch(listenerMainName))
-      const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1]
-      const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener'
-      const addfunc = this.createEventFunction<(listener: T) => number>(Service)
-      addfunc!(Listener as T)
-      //console.log(addfunc!(Listener as T))
-      this.ListenerManger.set(listenerMainName + uniqueCode, Listener)
-    }
-    return Listener as T
-  }
-
-  //统一回调清理事件
-  async dispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-    //console.log("[EventDispatcher]",ListenerMainName, ListenerSubName, ...args)
-    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
-      //console.log(task.func, uuid, task.createtime, task.timeout)
-      if (task.createtime + task.timeout < Date.now()) {
-        this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid)
-        return
-      }
-      if (task.checker && task.checker(...args)) {
-        task.func(...args)
-      }
-    })
-  }
-
-  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any> | any>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-    return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
-      const EventFunc = this.createEventFunction<EventType>(EventName)
-      let complete = false
-      const Timeouter = setTimeout(() => {
-        if (!complete) {
-          reject(new Error('NTEvent EventName:' + EventName + ' timeout'))
-        }
-      }, timeout)
-      const retData = await EventFunc!(...args)
-      complete = true
-      resolve(retData)
-    })
-  }
-
-  async RegisterListen<ListenerType extends (...args: any[]) => void>(ListenerName = '', waitTimes = 1, timeout = 5000, checker: (...args: Parameters<ListenerType>) => boolean) {
-    return new Promise<Parameters<ListenerType>>((resolve, reject) => {
-      const ListenerNameList = ListenerName.split('/')
-      const ListenerMainName = ListenerNameList[0]
-      const ListenerSubName = ListenerNameList[1]
-      const id = randomUUID()
-      let complete = 0
-      let retData: Parameters<ListenerType> | undefined = undefined
-      const databack = () => {
-        if (complete == 0) {
-          reject(new Error(' ListenerName:' + ListenerName + ' timeout'))
-        } else {
-          resolve(retData!)
-        }
-      }
-      const Timeouter = setTimeout(databack, timeout)
-      const eventCallbak = {
-        timeout: timeout,
-        createtime: Date.now(),
-        checker: checker,
-        func: (...args: Parameters<ListenerType>) => {
-          complete++
-          retData = args
-          if (complete >= waitTimes) {
-            clearTimeout(Timeouter)
-            databack()
-          }
-        }
-      }
-      if (!this.EventTask.get(ListenerMainName)) {
-        this.EventTask.set(ListenerMainName, new Map())
-      }
-      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
-        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map())
-      }
-      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak)
-      this.createListenerFunction(ListenerMainName)
-    })
-  }
-
-  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>
-    (EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, checker: (...args: Parameters<ListenerType>) => boolean, ...args: Parameters<EventType>) {
-    return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
-      const id = randomUUID()
-      let complete = 0
-      let retData: Parameters<ListenerType> | undefined = undefined
-      let retEvent: any = {}
-      const databack = () => {
-        if (complete == 0) {
-          reject(new Error('Timeout: NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n'))
-        } else {
-          resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!])
-        }
-      }
-
-      const ListenerNameList = ListenerName.split('/')
-      const ListenerMainName = ListenerNameList[0]
-      const ListenerSubName = ListenerNameList[1]
-
-      const Timeouter = setTimeout(databack, timeout)
-
-      const eventCallbak = {
-        timeout: timeout,
-        createtime: Date.now(),
-        checker: checker,
-        func: (...args: any[]) => {
-          complete++
-          //console.log('func', ...args)
-          retData = args as Parameters<ListenerType>
-          if (complete >= waitTimes) {
-            clearTimeout(Timeouter)
-            databack()
-          }
-        }
-      }
-      if (!this.EventTask.get(ListenerMainName)) {
-        this.EventTask.set(ListenerMainName, new Map())
-      }
-      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
-        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map())
-      }
-      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak)
-      this.createListenerFunction(ListenerMainName)
-      const EventFunc = this.createEventFunction<EventType>(EventName)
-      retEvent = await EventFunc!(...(args as any[]))
-    })
-  }
-}
-
-export const NTEventDispatch = new NTEventWrapper()
-
-// 示例代码 快速创建事件
-// let NTEvent = new NTEventWrapper()
-// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest')
-// if (TestEvent) {
-//     TestEvent(true)
-// }
-
-// 示例代码 快速创建监听Listener类
-// let NTEvent = new NTEventWrapper()
-// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
-
-
-// 调用接口
-//let NTEvent = new NTEventWrapper()
-//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true)
-
-// 注册监听 解除监听
-// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb)
-// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core')
-
-// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode)
-// GetTest('test')
-
-// always模式
-// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) })

src/common/utils/MessageUnique.ts

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

src/common/utils/QQBasicInfo.ts

@@ -1,52 +0,0 @@
-import path from 'node:path'
-import os from 'node:os'
-import { systemPlatform } from './system'
-
-export const exePath = process.execPath
-
-function getPKGPath() {
-  let p = path.join(path.dirname(exePath), 'resources', 'app', 'package.json')
-  if (systemPlatform === 'darwin') {
-    p = path.join(path.dirname(path.dirname(exePath)), 'Resources', 'app', 'package.json')
-  }
-  return p
-}
-
-export const pkgInfoPath = getPKGPath()
-let configVersionInfoPath: string
-
-
-if (os.platform() !== 'linux') {
-  configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json')
-}
-else {
-  const userPath = os.homedir()
-  const appDataPath = path.resolve(userPath, './.config/QQ')
-  configVersionInfoPath = path.resolve(appDataPath, './versions/config.json')
-}
-
-if (typeof configVersionInfoPath !== 'string') {
-  throw new Error('Something went wrong when load QQ info path')
-}
-
-export { configVersionInfoPath }
-
-type QQPkgInfo = {
-  version: string
-  buildVersion: string
-  platform: string
-  eleArch: string
-}
-
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath)
-// platform_type: 3,
-// app_type: 4,
-// app_version: '9.9.9-23159',
-// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
-// appid: '537213764',
-// platVer: '10.0.26100',
-// clientVer: '9.9.9-23159',
-
-export function getBuildVersion(): number {
-  return +qqPkgInfo.buildVersion
-}

src/common/utils/audio.ts

@@ -2,11 +2,10 @@ import path from 'node:path'
 import ffmpeg from 'fluent-ffmpeg'
 import fsPromise from 'node:fs/promises'
 import { decode, encode, getDuration, getWavFileInfo, isWav, isSilk, EncodeResult } from 'silk-wasm'
-import { log } from './log'
+import { TEMP_DIR } from '../globalVars'
-import { TEMP_DIR } from './index'
-import { getConfigUtil } from '../config'
 import { randomUUID } from 'node:crypto'
 import { Readable } from 'node:stream'
+import { Context } from 'cordis'
 
 interface FFmpegOptions {
   input?: string[]
@@ -15,14 +14,14 @@ interface FFmpegOptions {
 
 type Input = string | Readable
 
-function convert(input: Input, options: FFmpegOptions): Promise<Buffer>
+function convert(ctx: Context, input: Input, options: FFmpegOptions): Promise<Buffer>
-function convert(input: Input, options: FFmpegOptions, outputPath: string): Promise<string>
+function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath: string): Promise<string>
-function convert(input: Input, options: FFmpegOptions, outputPath?: string): Promise<Buffer> | Promise<string> {
+function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?: string): Promise<Buffer | string> {
-  return new Promise<any>((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const chunks: Buffer[] = []
     let command = ffmpeg(input)
       .on('error', err => {
-        log(`FFmpeg处理转换出错: `, err.message)
+        ctx.logger.error(`FFmpeg处理转换出错: `, err.message)
         reject(err)
       })
       .on('end', () => {
@@ -38,7 +37,7 @@ function convert(input: Input, options: FFmpegOptions, outputPath?: string): Pro
     if (options.output) {
       command = command.outputOptions(options.output)
     }
-    const ffmpegPath = getConfigUtil().getConfig().ffmpeg
+    const ffmpegPath: string | undefined = ctx.config.ffmpeg
     if (ffmpegPath) {
       command = command.setFfmpegPath(ffmpegPath)
     }
@@ -53,17 +52,17 @@ function convert(input: Input, options: FFmpegOptions, outputPath?: string): Pro
   })
 }
 
-export async function encodeSilk(filePath: string) {
+export async function encodeSilk(ctx: Context, filePath: string) {
   try {
     const file = await fsPromise.readFile(filePath)
     if (!isSilk(file)) {
-      log(`语音文件${filePath}需要转换成silk`)
+      ctx.logger.info(`语音文件${filePath}需要转换成silk`)
       let result: EncodeResult
       const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
       if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
         result = await encode(file, 0)
       } else {
-        const input = await convert(filePath, {
+        const input = await convert(ctx, filePath, {
           output: [
             '-ar 24000',
             '-ac 1',
@@ -74,7 +73,7 @@ export async function encodeSilk(filePath: string) {
       }
       const pttPath = path.join(TEMP_DIR, randomUUID())
       await fsPromise.writeFile(pttPath, result.data)
-      log(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration)
+      ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration)
       return {
         converted: true,
         path: pttPath,
@@ -85,8 +84,8 @@ export async function encodeSilk(filePath: string) {
       let duration = 1
       try {
         duration = getDuration(silk) / 1000
-      } catch (e: any) {
+      } catch (e) {
-        log('获取语音文件时长失败, 默认为1秒', filePath, e.stack)
+        ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
       }
       return {
         converted: false,
@@ -94,22 +93,22 @@ export async function encodeSilk(filePath: string) {
         duration,
       }
     }
-  } catch (error: any) {
+  } catch (err) {
-    log('convert silk failed', error.stack)
+    ctx.logger.error('convert silk failed', (err as Error).stack)
     return {}
   }
 }
 
 type OutFormat = 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
 
-export async function decodeSilk(inputFilePath: string, outFormat: OutFormat = 'mp3') {
+export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat = 'mp3') {
   const silk = await fsPromise.readFile(inputFilePath)
   const { data } = await decode(silk, 24000)
   const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath))
   const outFilePath = tmpPath + `.${outFormat}`
   const pcmFilePath = tmpPath + '.pcm'
   await fsPromise.writeFile(pcmFilePath, data)
-  return convert(pcmFilePath, {
+  return convert(ctx, pcmFilePath, {
     input: [
       '-f s16le',
       '-ar 24000',

src/common/utils/file.ts

@@ -1,9 +1,10 @@
 import fs from 'node:fs'
 import fsPromise from 'node:fs/promises'
 import path from 'node:path'
-import { TEMP_DIR } from './index'
+import { TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
+import { fileTypeFromFile } from 'file-type'
 
 export function isGIF(path: string) {
   const buffer = Buffer.alloc(4)
@@ -56,34 +57,6 @@ export function calculateFileMD5(filePath: string): Promise<string> {
   })
 }
 
-export interface HttpDownloadOptions {
-  url: string
-  headers?: Record<string, string> | string
-}
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-  let url: string
-  let headers: Record<string, string> = {
-    'User-Agent':
-      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
-  }
-  if (typeof options === 'string') {
-    url = options
-  } else {
-    url = options.url
-    if (options.headers) {
-      if (typeof options.headers === 'string') {
-        headers = JSON.parse(options.headers)
-      } else {
-        headers = options.headers
-      }
-    }
-  }
-  const fetchRes = await fetch(url, { headers })
-  if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`)
-
-  return Buffer.from(await fetchRes.arrayBuffer())
-}
-
 export enum FileUriType {
   Unknown = 0,
   FileURL = 1,
@@ -117,10 +90,11 @@ interface FetchFileRes {
   url: string
 }
 
-async function fetchFile(url: string): Promise<FetchFileRes> {
+export async function fetchFile(url: string, headersInit?: Record<string, string>): Promise<FetchFileRes> {
   const headers: Record<string, string> = {
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
-    'Host': new URL(url).hostname
+    'Host': new URL(url).hostname,
+    ...headersInit
   }
   const raw = await fetch(url, { headers }).catch((err) => {
     if (err.cause) {
@@ -143,7 +117,7 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, filename?: string): Promise<Uri2LocalRes> {
+export async function uri2local(uri: string, filename?: string, needExt?: boolean): Promise<Uri2LocalRes> {
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
@@ -159,27 +133,39 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
 
   if (type === FileUriType.RemoteURL) {
     try {
-      const res = await fetchFile(uri)
+      const res = await fetchFile(uri, { 'Referer': uri })
       const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
       if (match?.[1]) {
         filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')
       } else {
         filename ??= randomUUID()
       }
-      const filePath = path.join(TEMP_DIR, filename)
+      let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, res.data)
+      if (needExt && !path.extname(filePath)) {
+        const ext = (await fileTypeFromFile(filePath))?.ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
       return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
-    } catch (e: any) {
+    } catch (e) {
-      const errMsg = `${uri}下载失败,` + e.toString()
+      const errMsg = `${uri} 下载失败, ${(e as Error).message}`
       return { success: false, errMsg, fileName: '', path: '', isLocal: false }
     }
   }
 
   if (type === FileUriType.OneBotBase64) {
     filename ??= randomUUID()
-    const filePath = path.join(TEMP_DIR, filename)
+    let filePath = path.join(TEMP_DIR, filename)
     const base64 = uri.replace(/^base64:\/\//, '')
     await fsPromise.writeFile(filePath, base64, 'base64')
+    if (needExt) {
+      const ext = (await fileTypeFromFile(filePath))?.ext
+      filename += `.${ext}`
+      await fsPromise.rename(filePath, `${filePath}.${ext}`)
+      filePath = `${filePath}.${ext}`
+    }
     return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
   }
 
@@ -189,8 +175,14 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
     if (capture) {
       filename ??= randomUUID()
       const [, _type, base64] = capture
-      const filePath = path.join(TEMP_DIR, filename)
+      let filePath = path.join(TEMP_DIR, filename)
       await fsPromise.writeFile(filePath, base64, 'base64')
+      if (needExt) {
+        const ext = (await fileTypeFromFile(filePath))?.ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
       return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     }
   }
@@ -202,7 +194,7 @@ export async function copyFolder(sourcePath: string, destPath: string) {
   try {
     const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true })
     await fsPromise.mkdir(destPath, { recursive: true })
-    for (let entry of entries) {
+    for (const entry of entries) {
       const srcPath = path.join(sourcePath, entry.name)
       const dstPath = path.join(destPath, entry.name)
       if (entry.isDirectory()) {

src/common/utils/helper.ts

@@ -1,169 +0,0 @@
-export function truncateString(obj: any, 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 function isNumeric(str: string) {
-  return /^\d+$/.test(str)
-}
-
-export function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
-// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
-export function mergeNewProperties(newObj: any, oldObj: any) {
-  Object.keys(newObj).forEach((key) => {
-    // 如果老对象不存在当前属性，则直接复制
-    if (!oldObj.hasOwnProperty(key)) {
-      oldObj[key] = newObj[key]
-    } else {
-      // 如果老对象和新对象的当前属性都是对象，则递归合并
-      if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
-        mergeNewProperties(newObj[key], oldObj[key])
-      } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
-        // 属性冲突，有一方不是对象，直接覆盖
-        oldObj[key] = newObj[key]
-      }
-    }
-  })
-}
-
-export function isNull(value: unknown) {
-  return value === undefined || value === null
-}
-
-/**
- * 将字符串按最大长度分割并添加换行符
- * @param str 原始字符串
- * @param maxLength 每行的最大字符数
- * @returns 处理后的字符串，超过长度的地方将会换行
- */
-export function wrapText(str: string, maxLength: number): string {
-  // 初始化一个空字符串用于存放结果
-  let result: string = ''
-
-  // 循环遍历字符串，每次步进maxLength个字符
-  for (let i = 0; i < str.length; i += maxLength) {
-    // 从i开始，截取长度为maxLength的字符串段，并添加到结果字符串
-    // 如果不是第一段，先添加一个换行符
-    if (i > 0) result += '\n'
-    result += str.substring(i, i + maxLength)
-  }
-
-  return result
-}
-
-
-/**
- * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
- * @param ttl 超时时间，单位毫秒
- * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
- * @returns 处理后缓存或调用原方法的结果
- */
-export function cacheFunc(ttl: number, customKey: string = '') {
-  const cache = new Map<string, { expiry: number; value: any }>()
-
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
-    const originalMethod = descriptor.value
-    const className = target.constructor.name  // 获取类名
-    const methodName = propertyKey             // 获取方法名
-    descriptor.value = async function (...args: any[]) {
-      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`
-      const cached = cache.get(cacheKey)
-      if (cached && cached.expiry > Date.now()) {
-        return cached.value
-      } else {
-        const result = await originalMethod.apply(this, args)
-        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl })
-        return result
-      }
-    }
-
-    return descriptor
-  }
-}
-
-export function CacheClassFuncAsync(ttl = 3600 * 1000, customKey = '') {
-  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
-    const cache = new Map<string, { expiry: number; value: any }>()
-    const originalMethod = descriptor.value
-    descriptor.value = async function (...args: any[]) {
-      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`
-      cache.forEach((value, key) => {
-        if (value.expiry < Date.now()) {
-          cache.delete(key)
-        }
-      })
-      const cachedValue = cache.get(key)
-      if (cachedValue && cachedValue.expiry > Date.now()) {
-        return cachedValue.value
-      }
-      const result = await originalMethod.apply(this, args)
-      cache.set(key, { expiry: Date.now() + ttl, value: result })
-      return result
-    }
-  }
-  return logExecutionTime
-}
-
-export function CacheClassFuncAsyncExtend(ttl: number = 3600 * 1000, customKey: string = '', checker: any = (...data: any[]) => { return true }) {
-  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
-    const cache = new Map<string, { expiry: number; value: any }>()
-    const originalMethod = descriptor.value
-    descriptor.value = async function (...args: any[]) {
-      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`
-      cache.forEach((value, key) => {
-        if (value.expiry < Date.now()) {
-          cache.delete(key)
-        }
-      })
-      const cachedValue = cache.get(key)
-      if (cachedValue && cachedValue.expiry > Date.now()) {
-        return cachedValue.value
-      }
-      const result = await originalMethod.apply(this, args)
-      if (!checker(...args, result)) {
-        return result //丢弃缓存
-      }
-      cache.set(key, { expiry: Date.now() + ttl, value: result })
-      return result
-    }
-  }
-  return logExecutionTime
-}
-
-// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/helper.ts#L14
-export class UUIDConverter {
-  static encode(highStr: string, lowStr: string): string {
-    const high = BigInt(highStr)
-    const low = BigInt(lowStr)
-    const highHex = high.toString(16).padStart(16, '0')
-    const lowHex = low.toString(16).padStart(16, '0')
-    const combinedHex = highHex + lowHex
-    const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-      12,
-      16,
-    )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`
-    return uuid
-  }
-
-  static decode(uuid: string): { high: string; low: string } {
-    const hex = uuid.replace(/-/g, '')
-    const high = BigInt('0x' + hex.substring(0, 16))
-    const low = BigInt('0x' + hex.substring(16))
-    return { high: high.toString(), low: low.toString() }
-  }
-}

src/common/utils/index.ts

@@ -1,14 +1,7 @@
-import path from 'node:path'
-
 export * from './file'
-export * from './helper'
+export * from './misc'
-export * from './log'
+export * from './legacyLog'
-export * from './qqlevel'
+export * from './misc'
-export * from './QQBasicInfo'
 export * from './upgrade'
-export const DATA_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.data
+export { getVideoInfo, checkFfmpeg } from './video'
-export const TEMP_DIR: string = path.join(DATA_DIR, 'temp')
-export const PLUGIN_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.plugin
-export { getVideoInfo } from './video'
-export { checkFfmpeg } from './video'
 export { encodeSilk } from './audio'

src/common/utils/legacyLog.ts

@@ -0,0 +1,42 @@
+import fs from 'fs'
+import path from 'node:path'
+import { getConfigUtil } from '../config'
+import { LOG_DIR } from '../globalVars'
+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, '-')
+
+export function log(...msg: unknown[]) {
+  if (!getConfigUtil().getConfig().log) {
+    return
+  }
+  let logMsg = ''
+  for (const msgItem of msg) {
+    // 判断是否是对象
+    if (typeof msgItem === 'object') {
+      logMsg += JSON.stringify(truncateString(msgItem)) + ' '
+      continue
+    }
+    logMsg += msgItem + ' '
+  }
+  const currentDateTime = new Date().toLocaleString()
+  logMsg = `${currentDateTime} ${logMsg}\n\n`
+  fs.appendFile(path.join(LOG_DIR, logFileName), logMsg, () => { })
+}

src/common/utils/log.ts

@@ -1,35 +0,0 @@
-import { getSelfInfo } from '../data'
-import fs from 'fs'
-import path from 'node:path'
-import { DATA_DIR, truncateString } from './index'
-import { getConfigUtil } from '../config'
-
-const date = new Date()
-const logFileName = `llonebot-${date.toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
-const logDir = path.join(DATA_DIR, 'logs')
-if (!fs.existsSync(logDir)) {
-  fs.mkdirSync(logDir, { recursive: true })
-}
-
-export function log(...msg: any[]) {
-  if (!getConfigUtil().getConfig().log) {
-    return //console.log(...msg);
-  }
-  const selfInfo = getSelfInfo()
-  const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
-  let logMsg = ''
-  for (let msgItem of msg) {
-    // 判断是否是对象
-    if (typeof msgItem === 'object') {
-      let obj = JSON.parse(JSON.stringify(msgItem))
-      logMsg += JSON.stringify(truncateString(obj)) + ' '
-      continue
-    }
-    logMsg += msgItem + ' '
-  }
-  let currentDateTime = new Date().toLocaleString()
-  logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
-  // sendLog(...msg);
-  // console.log(msg)
-  fs.appendFile(path.join(logDir, logFileName), logMsg, () => {})
-}

src/common/utils/messageUnique.ts

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

src/common/utils/misc.ts

@@ -0,0 +1,35 @@
+import { QQLevel } from '@/ntqqapi/types'
+import { Dict } from 'cosmokit'
+
+export function isNumeric(str: string) {
+  return /^\d+$/.test(str)
+}
+
+export function calcQQLevel(level: QQLevel) {
+  const { crownNum, sunNum, moonNum, starNum } = level
+  return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
+}
+
+/** QQ Build Version  */
+export function getBuildVersion(): number {
+  const version: string = globalThis.LiteLoader.versions.qqnt
+  return +version.split('-')[1]
+}
+
+/** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
+export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
+  Object.keys(newObj).forEach((key) => {
+    // 如果老对象不存在当前属性，则直接复制
+    if (!oldObj.hasOwnProperty(key)) {
+      oldObj[key] = newObj[key]
+    } else {
+      // 如果老对象和新对象的当前属性都是对象，则递归合并
+      if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
+        mergeNewProperties(newObj[key], oldObj[key])
+      } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
+        // 属性冲突，有一方不是对象，直接覆盖
+        oldObj[key] = newObj[key]
+      }
+    }
+  })
+}

src/common/utils/qqlevel.ts

@@ -1,7 +0,0 @@
-// QQ等级换算
-import { QQLevel } from '../../ntqqapi/types'
-
-export function calcQQLevel(level: QQLevel) {
-  const { crownNum, sunNum, moonNum, starNum } = level
-  return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
-}

src/common/utils/request.ts

@@ -1,107 +1,104 @@
-import https from 'node:https';
+import https from 'node:https'
-import http from 'node:http';
+import http from 'node:http'
-import { log } from '@/common/utils/log'
+import { Dict } from 'cosmokit'
 
 export class RequestUtil {
   // 适用于获取服务器下发cookies时获取，仅GET
   static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
-    const client = url.startsWith('https') ? https : http;
+    const client = url.startsWith('https') ? https : http
     return new Promise((resolve, reject) => {
       client.get(url, (res) => {
-        let cookies: { [key: string]: string } = {};
+        let cookies: { [key: string]: string } = {}
         const handleRedirect = (res: http.IncomingMessage) => {
-          //console.log(res.headers.location);
           if (res.statusCode === 301 || res.statusCode === 302) {
             if (res.headers.location) {
-              const redirectUrl = new URL(res.headers.location, url);
+              const redirectUrl = new URL(res.headers.location, url)
               RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
                 // 合并重定向过程中的cookies
                 //log('redirectCookies', redirectCookies)
-                cookies = { ...cookies, ...redirectCookies };
+                cookies = { ...cookies, ...redirectCookies }
-                resolve(cookies);
+                resolve(cookies)
-              });
+              })
             } else {
-              resolve(cookies);
+              resolve(cookies)
             }
           } else {
-            resolve(cookies);
+            resolve(cookies)
           }
-        };
+        }
-        res.on('data', () => { }); // Necessary to consume the stream
+        res.on('data', () => { }) // Necessary to consume the stream
         res.on('end', () => {
-          handleRedirect(res);
+          handleRedirect(res)
-        });
+        })
         if (res.headers['set-cookie']) {
-          // console.log(res.headers['set-cookie']);
+          //log('set-cookie', url, res.headers['set-cookie'])
-          //log('set-cookie', url, res.headers['set-cookie']);
           res.headers['set-cookie'].forEach((cookie) => {
-            const parts = cookie.split(';')[0].split('=');
+            const parts = cookie.split(';')[0].split('=')
-            const key = parts[0];
+            const key = parts[0]
-            const value = parts[1];
+            const value = parts[1]
             if (key && value && key.length > 0 && value.length > 0) {
-              cookies[key] = value;
+              cookies[key] = value
             }
-          });
+          })
         }
       }).on('error', (err) => {
-        reject(err);
+        reject(err)
-      });
+      })
-    });
+    })
   }
 
   // 请求和回复都是JSON data传原始内容 自动编码json
-  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
-    let option = new URL(url);
+    const option = new URL(url)
-    const protocol = url.startsWith('https://') ? https : http;
+    const protocol = url.startsWith('https://') ? https : http
     const options = {
       hostname: option.hostname,
       port: option.port,
       path: option.href,
       method: method,
       headers: headers
-    };
+    }
     return new Promise((resolve, reject) => {
-      const req = protocol.request(options, (res: any) => {
+      const req = protocol.request(options, (res: Dict) => {
-        let responseBody = '';
+        let responseBody = ''
         res.on('data', (chunk: string | Buffer) => {
-          responseBody += chunk.toString();
+          responseBody += chunk.toString()
-        });
+        })
 
         res.on('end', () => {
           try {
             if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
               if (isJsonRet) {
-                const responseJson = JSON.parse(responseBody);
+                const responseJson = JSON.parse(responseBody)
-                resolve(responseJson as T);
+                resolve(responseJson as T)
               } else {
-                resolve(responseBody as T);
+                resolve(responseBody as T)
               }
             } else {
-              reject(new Error(`Unexpected status code: ${res.statusCode}`));
+              reject(new Error(`Unexpected status code: ${res.statusCode}`))
             }
           } catch (parseError) {
-            reject(parseError);
+            reject(parseError)
           }
-        });
+        })
-      });
+      })
 
-      req.on('error', (error: any) => {
+      req.on('error', (error) => {
-        reject(error);
+        reject(error)
-      });
+      })
       if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
         if (isArgJson) {
-          req.write(JSON.stringify(data));
+          req.write(JSON.stringify(data))
         } else {
-          req.write(data);
+          req.write(data)
         }
-
       }
-      req.end();
+      req.end()
-    });
+    })
   }
 
   // 请求返回都是原始内容
-  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}) {
+  static async HttpGetText(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}) {
-    return this.HttpGetJson<string>(url, method, data, headers, false, false);
+    return this.HttpGetJson<string>(url, method, data, headers, false, false)
   }
 }

src/common/utils/sign.ts

@@ -1,4 +1,4 @@
-import { log } from './log'
+import { Context } from 'cordis'
 
 export interface IdMusicSignPostData {
   type: 'qq' | '163'
@@ -19,7 +19,7 @@ export type MusicSignPostData = IdMusicSignPostData | CustomMusicSignPostData
 export class MusicSign {
   private readonly url: string
 
-  constructor(url: string) {
+  constructor(protected ctx: Context, url: string) {
     this.url = url
   }
 
@@ -31,7 +31,7 @@ export class MusicSign {
     })
     if (!resp.ok) throw new Error(resp.statusText)
     const data = await resp.text()
-    log('音乐消息生成成功', data)
+    this.ctx.logger.info('音乐消息生成成功', data)
     return data
   }
 }

src/common/utils/system.ts

@@ -1,10 +0,0 @@
-import os from 'node:os';
-import path from 'node:path';
-
-export const systemPlatform = os.platform();
-export const cpuArch = os.arch();
-export const systemVersion = os.release();
-// export const hostname = os.hostname(); // win7不支持
-const homeDir = os.homedir();
-export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();

src/common/utils/table.ts

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

src/common/utils/upgrade.ts

@@ -1,8 +1,9 @@
-import { version } from '../../version'
+import path from 'node:path'
-import * as path from 'node:path'
-import * as fs from 'node:fs'
-import { copyFolder, httpDownload, log, PLUGIN_DIR, TEMP_DIR } from '.'
 import compressing from 'compressing'
+import { writeFile } from 'node:fs/promises'
+import { version } from '../../version'
+import { copyFolder, log, fetchFile } from '.'
+import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
 
 const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
 const checkVersionMirrorHosts = ['https://kkgithub.com']
@@ -10,10 +11,10 @@ const checkVersionMirrorHosts = ['https://kkgithub.com']
 export async function checkNewVersion() {
   const latestVersionText = await getRemoteVersion()
   const latestVersion = latestVersionText.split('.')
-  log('llonebot last version', latestVersion)
+  //log('llonebot last version', latestVersion)
   const currentVersion: string[] = version.split('.')
-  log('llonebot current version', currentVersion)
+  //log('llonebot current version', currentVersion)
-  for (let k of [0, 1, 2]) {
+  for (const k of [0, 1, 2]) {
     if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
       log('')
       return { result: true, version: latestVersionText }
@@ -33,8 +34,8 @@ export async function upgradeLLOneBot() {
     // 多镜像下载
     for (const mirrorGithub of downloadMirrorHosts) {
       try {
-        const buffer = await httpDownload(mirrorGithub + downloadUrl)
+        const res = await fetchFile(mirrorGithub + downloadUrl)
-        fs.writeFileSync(filePath, buffer)
+        await writeFile(filePath, res.data)
         downloadSuccess = true
         break
       } catch (e) {
@@ -46,14 +47,14 @@ export async function upgradeLLOneBot() {
       return false
     }
     const temp_ver_dir = path.join(TEMP_DIR, 'LLOneBot' + latestVersion)
-    let uncompressedPromise = async function () {
+    const uncompressedPromise = async function () {
-      return new Promise<boolean>((resolve, reject) => {
+      return new Promise<boolean>(resolve => {
         compressing.zip
           .uncompress(filePath, temp_ver_dir)
           .then(() => {
             resolve(true)
           })
-          .catch((reason: any) => {
+          .catch(reason => {
             log('llonebot upgrade failed, ', reason)
             if (reason?.errno == -4082) {
               resolve(true)
@@ -74,8 +75,8 @@ export async function upgradeLLOneBot() {
 export async function getRemoteVersion() {
   let Version = ''
   for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-    let mirrorGithub = checkVersionMirrorHosts[i]
+    const mirrorGithub = checkVersionMirrorHosts[i]
-    let tVersion = await getRemoteVersionByMirror(mirrorGithub)
+    const tVersion = await getRemoteVersionByMirror(mirrorGithub)
     if (tVersion && tVersion != '') {
       Version = tVersion
       break
@@ -88,10 +89,10 @@ export async function getRemoteVersionByMirror(mirrorGithub: string) {
   let releasePage = 'error'
 
   try {
-    releasePage = (await httpDownload(mirrorGithub + '/LLOneBot/LLOneBot/releases')).toString()
+    releasePage = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
     // log("releasePage", releasePage);
     if (releasePage === 'error') return ''
     return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
-  } catch {}
+  } catch { }
   return ''
 }

src/global.d.ts

@@ -1,8 +1,9 @@
-import { type LLOneBot } from './preload'
+import type { LLOneBot } from './preload'
+import { Dict } from 'cosmokit'
 
 declare global {
-  interface Window {
+  var llonebot: LLOneBot
-    llonebot: LLOneBot
+  var LiteLoader: Dict
-    LiteLoader: Record<string, any>
+  var authData: Dict | undefined
-  }
+  var navigation: Dict | undefined
 }

src/main/ipcsend.ts

@@ -1,12 +0,0 @@
-import { webContents } from 'electron'
-
-function sendIPCMsg(channel: string, ...data: any) {
-  let contents = webContents.getAllWebContents()
-  for (const content of contents) {
-    try {
-      content.send(channel, ...data)
-    } catch (e) {
-      console.log('llonebot send ipc msg to render error:', e)
-    }
-  }
-}

src/main/log.ts

@@ -0,0 +1,36 @@
+import path from 'node:path'
+import { Context, Logger } from 'cordis'
+import { appendFile } from 'node:fs'
+import { LOG_DIR, selfInfo } from '@/common/globalVars'
+import { noop } from 'cosmokit'
+
+interface Config {
+  enable: boolean
+  filename: string
+}
+
+export default class Log {
+  static name = 'logger'
+
+  constructor(ctx: Context, cfg: Config) {
+    Logger.targets.splice(0, Logger.targets.length)
+    let enable = cfg.enable
+    const file = path.join(LOG_DIR, cfg.filename)
+    const target: Logger.Target = {
+      colors: 0,
+      record: (record: Logger.Record) => {
+        if (!enable) {
+          return
+        }
+        const dateTime = new Date(record.timestamp).toLocaleString()
+        const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
+        const content = `${dateTime} [${record.type}] ${userInfo} | ${record.name} ${record.content}\n\n`
+        appendFile(file, content, noop)
+      },
+    }
+    Logger.targets.push(target)
+    ctx.on('llonebot/config-updated', input => {
+      enable = input.log!
+    })
+  }
+}

src/main/main.ts

@@ -1,9 +1,10 @@
-// 运行在 Electron 主进程 下的插件入口
-
-import { BrowserWindow, dialog, ipcMain } from 'electron'
 import path from 'node:path'
 import fs from 'node:fs'
-import { Config } from '../common/types'
+import Log from './log'
+import Core from '../ntqqapi/core'
+import OneBot11Adapter from '../onebot11/adapter'
+import { BrowserWindow, dialog, ipcMain } from 'electron'
+import { Config as LLOBConfig } from '../common/types'
 import {
   CHANNEL_CHECK_VERSION,
   CHANNEL_ERROR,
@@ -12,55 +13,55 @@ import {
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
   CHANNEL_UPDATE,
+  CHANNEL_SET_CONFIG_CONFIRMED
 } from '../common/channels'
-import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
+import { getBuildVersion } from '../common/utils'
-import { DATA_DIR, getBuildVersion, TEMP_DIR } from '../common/utils'
+import { hookNTQQApiCall, hookNTQQApiReceive } from '../ntqqapi/hook'
-import {
-  llonebotError,
-  setSelfInfo,
-  getSelfInfo,
-  getSelfUid,
-  getSelfUin,
-  addMsgCache
-} from '../common/data'
-import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook, startHook } from '../ntqqapi/hook'
-import { OB11Constructor } from '../onebot11/constructor'
-import {
-  FriendRequestNotify,
-  GroupNotify,
-  GroupNotifyTypes,
-  RawMessage,
-  BuddyReqType,
-} from '../ntqqapi/types'
-import { httpHeart, ob11HTTPServer } from '../onebot11/server/http'
-import { postOb11Event } from '../onebot11/server/post-ob11-event'
-import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
-import { OB11GroupRequestEvent } from '../onebot11/event/request/OB11GroupRequest'
-import { OB11FriendRequestEvent } from '../onebot11/event/request/OB11FriendRequest'
-import { MessageUnique } from '../common/utils/MessageUnique'
-import { setConfig } from './setConfig'
-import { NTQQUserApi, NTQQGroupApi } from '../ntqqapi/api'
 import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
-import { log } from '../common/utils/log'
 import { getConfigUtil } from '../common/config'
 import { checkFfmpeg } from '../common/utils/video'
-import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
+import { getSession } from '../ntqqapi/wrapper'
-import '../ntqqapi/wrapper'
+import { Context } from 'cordis'
-import { NTEventDispatch } from '../common/utils/EventTask'
+import { llonebotError, selfInfo, LOG_DIR, DATA_DIR, TEMP_DIR } from '../common/globalVars'
-import { wrapperConstructor, getSession } from '../ntqqapi/wrapper'
+import { log, logFileName } from '../common/utils/legacyLog'
-import { Peer } from '../ntqqapi/types'
+import {
+  NTQQFileApi,
+  NTQQFileCacheApi,
+  NTQQFriendApi,
+  NTQQGroupApi,
+  NTQQMsgApi,
+  NTQQUserApi,
+  NTQQWebApi,
+  NTQQWindowApi
+} from '../ntqqapi/api'
+
+declare module 'cordis' {
+  interface Events {
+    'llonebot/config-updated': (input: LLOBConfig) => void
+  }
+}
 
 let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-  ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
+  if (!fs.existsSync(DATA_DIR)) {
+    fs.mkdirSync(DATA_DIR, { recursive: true })
+  }
+
+  if (!fs.existsSync(LOG_DIR)) {
+    fs.mkdirSync(LOG_DIR)
+  }
+
+  ipcMain.handle(CHANNEL_CHECK_VERSION, async () => {
     return checkNewVersion()
   })
-  ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
+
+  ipcMain.handle(CHANNEL_UPDATE, async () => {
     return upgradeLLOneBot()
   })
-  ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
+
+  ipcMain.handle(CHANNEL_SELECT_FILE, async () => {
     const selectPath = new Promise<string>((resolve, reject) => {
       dialog
         .showOpenDialog({
@@ -73,11 +74,9 @@ function onLoad() {
           if (!result.canceled) {
             const _selectPath = path.join(result.filePaths[0])
             resolve(_selectPath)
-            // let config = getConfigUtil().getConfig()
+          } else {
-            // config.ffmpeg = path.join(result.filePaths[0]);
-            // getConfigUtil().setConfig(config);
-          }
             resolve('')
+          }
         })
         .catch((err) => {
           reject(err)
@@ -90,30 +89,30 @@ function onLoad() {
       return ''
     }
   })
-  if (!fs.existsSync(DATA_DIR)) {
+
-    fs.mkdirSync(DATA_DIR, { recursive: true })
+  ipcMain.handle(CHANNEL_ERROR, async () => {
-  }
-  ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
     const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
     llonebotError.ffmpegError = ffmpegOk ? '' : '没有找到 FFmpeg, 音频只能发送 WAV 和 SILK, 视频尺寸可能异常'
-    let { httpServerError, wsServerError, otherError, ffmpegError } = llonebotError
+    const { httpServerError, wsServerError, otherError, ffmpegError } = llonebotError
     let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
     error = error.replace('\n\n', '\n')
     error = error.trim()
-    log('查询llonebot错误信息', error)
+    log('查询 LLOneBot 错误信息', error)
     return error
   })
-  ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
+
+  ipcMain.handle(CHANNEL_GET_CONFIG, async () => {
     const config = getConfigUtil().getConfig()
     return config
   })
-  ipcMain.on(CHANNEL_SET_CONFIG, (event, ask: boolean, config: Config) => {
+
+  ipcMain.handle(CHANNEL_SET_CONFIG, (_event, ask: boolean, config: LLOBConfig) => {
+    return new Promise<boolean>(resolve => {
       if (!ask) {
-      setConfig(config)
+        getConfigUtil().setConfig(config)
-        .then()
+        log('配置已更新', config)
-        .catch((e) => {
+        checkFfmpeg(config.ffmpeg).then()
-          log('保存设置失败', e.stack)
+        resolve(true)
-        })
         return
       }
       dialog
@@ -127,250 +126,24 @@ function onLoad() {
         })
         .then((result) => {
           if (result.response === 0) {
-          setConfig(config)
+            getConfigUtil().setConfig(config)
-            .then()
+            log('配置已更新', config)
-            .catch((e) => {
+            checkFfmpeg(config.ffmpeg).then()
-              log('保存设置失败', e.stack)
+            resolve(true)
-            })
-        }
-        else {
           }
         })
         .catch((err) => {
           log('保存设置询问弹窗错误', err)
+          resolve(false)
+        })
     })
   })
 
-  ipcMain.on(CHANNEL_LOG, (event, arg) => {
+  ipcMain.on(CHANNEL_LOG, (_event, arg) => {
     log(arg)
   })
 
-  async function postReceiveMsg(msgList: RawMessage[]) {
+  async function start() {
-    const { debug, reportSelfMessage } = getConfigUtil().getConfig()
-    for (let message of msgList) {
-      // 过滤启动之前的消息
-      if (parseInt(message.msgTime) < startTime / 1000) {
-        continue
-      }
-      // log("收到新消息", message.msgId, message.msgSeq)
-      const peer: Peer = {
-        chatType: message.chatType,
-        peerUid: message.peerUid
-      }
-      message.msgShortId = MessageUnique.createMsg(peer, message.msgId)
-      addMsgCache(message)
-
-      OB11Constructor.message(message)
-        .then((msg) => {
-          if (!debug && msg.message.length === 0) {
-            return
-          }
-          const isSelfMsg = msg.user_id.toString() === getSelfUin()
-          if (isSelfMsg && !reportSelfMessage) {
-            return
-          }
-          if (isSelfMsg) {
-            msg.target_id = parseInt(message.peerUin)
-          }
-          postOb11Event(msg)
-          // log("post msg", msg)
-        })
-        .catch((e) => log('constructMessage error: ', e.stack.toString()))
-      OB11Constructor.GroupEvent(message).then((groupEvent) => {
-        if (groupEvent) {
-          // log("post group event", groupEvent);
-          postOb11Event(groupEvent)
-        }
-      })
-      OB11Constructor.PrivateEvent(message).then((privateEvent) => {
-        //log(message)
-        if (privateEvent) {
-          // log("post private event", privateEvent);
-          postOb11Event(privateEvent)
-        }
-      })
-    }
-  }
-
-  async function startReceiveHook() {
-    startHook()
-    registerReceiveHook<{
-      msgList: Array<RawMessage>
-    }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
-      try {
-        await postReceiveMsg(payload.msgList)
-      } catch (e: any) {
-        log('report message error: ', e.stack.toString())
-      }
-    })
-    const recallMsgIds: string[] = [] // 避免重复上报
-    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
-      for (const message of payload.msgList) {
-        if (message.recallTime != '0') {
-          if (recallMsgIds.includes(message.msgId)) {
-            continue
-          }
-          recallMsgIds.push(message.msgId)
-          const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId)
-          if (!oriMessageId) {
-            continue
-          }
-          OB11Constructor.RecallEvent(message, oriMessageId).then((recallEvent) => {
-            if (recallEvent) {
-              //log('post recall event', recallEvent)
-              postOb11Event(recallEvent)
-            }
-          })
-        }
-      }
-    })
-    registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
-      const { reportSelfMessage } = getConfigUtil().getConfig()
-      if (!reportSelfMessage) {
-        return
-      }
-      // log("reportSelfMessage", payload)
-      try {
-        await postReceiveMsg([payload.msgRecord])
-      } catch (e: any) {
-        log('report self message error: ', e.stack.toString())
-      }
-    })
-    const processedGroupNotify: string[] = []
-    registerReceiveHook<{
-      doubt: boolean
-      oldestUnreadSeq: string
-      unreadCount: number
-    }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
-      if (payload.unreadCount) {
-        // log("开始获取群通知详情")
-        let notifies: GroupNotify[]
-        try {
-          notifies = (await NTQQGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
-        } catch (e) {
-          // log("获取群通知详情失败", e);
-          return
-        }
-
-        for (const notify of notifies) {
-          try {
-            notify.time = Date.now()
-            const notifyTime = parseInt(notify.seq) / 1000
-            const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
-            if (notifyTime < startTime || processedGroupNotify.includes(flag)) {
-              continue
-            }
-            processedGroupNotify.push(flag)
-            if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
-              log('有成员退出通知', notify)
-              const member1Uin = (await NTQQUserApi.getUinByUid(notify.user1.uid))!
-              let operatorId = member1Uin
-              let subType: GroupDecreaseSubType = 'leave'
-              if (notify.user2.uid) {
-                // 是被踢的
-                const member2Uin = await NTQQUserApi.getUinByUid(notify.user2.uid)
-                if (member2Uin) {
-                  operatorId = member2Uin
-                }
-                subType = 'kick'
-              }
-              const groupDecreaseEvent = new OB11GroupDecreaseEvent(
-                parseInt(notify.group.groupCode),
-                parseInt(member1Uin),
-                parseInt(operatorId),
-                subType,
-              )
-              postOb11Event(groupDecreaseEvent, true)
-            }
-            else if ([GroupNotifyTypes.JOIN_REQUEST, GroupNotifyTypes.JOIN_REQUEST_BY_INVITED].includes(notify.type)) {
-              log('有加群请求')
-              let requestQQ = ''
-              try {
-                // uid-->uin
-                requestQQ = (await NTQQUserApi.getUinByUid(notify.user1.uid))
-                if (isNaN(parseInt(requestQQ))) {
-                  requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
-                }
-              } catch (e) {
-                log('获取加群人QQ号失败 Uid:', notify.user1.uid, e)
-              }
-              let invitorId: string
-              if (notify.type == GroupNotifyTypes.JOIN_REQUEST_BY_INVITED) {
-                // groupRequestEvent.sub_type = 'invite'
-                try {
-                  // uid-->uin
-                  invitorId = (await NTQQUserApi.getUinByUid(notify.user2.uid))
-                  if (isNaN(parseInt(invitorId))) {
-                    invitorId = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid)).uin
-                  }
-                } catch (e) {
-                  invitorId = ''
-                  log('获取邀请人QQ号失败 Uid:', notify.user2.uid, e)
-                }
-              }
-              const groupRequestEvent = new OB11GroupRequestEvent(
-                parseInt(notify.group.groupCode),
-                parseInt(requestQQ) || 0,
-                flag,
-                notify.postscript,
-                invitorId! === undefined ? undefined : +invitorId,
-                'add'
-              )
-              postOb11Event(groupRequestEvent)
-            }
-            else if (notify.type == GroupNotifyTypes.INVITE_ME) {
-              log('收到邀请我加群通知')
-              const userId = (await NTQQUserApi.getUinByUid(notify.user2.uid)) || ''
-              const groupInviteEvent = new OB11GroupRequestEvent(
-                parseInt(notify.group.groupCode),
-                parseInt(userId),
-                flag,
-                undefined,
-                undefined,
-                'invite'
-              )
-              postOb11Event(groupInviteEvent)
-            }
-          } catch (e: any) {
-            log('解析群通知失败', e.stack.toString())
-          }
-        }
-      }
-      else if (payload.doubt) {
-        // 可能有群管理员变动
-      }
-    })
-
-    registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
-      for (const req of payload.data.buddyReqs) {
-        if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
-          continue
-        }
-        if (+req.reqTime < startTime / 1000) {
-          continue
-        }
-        let userId = 0
-        try {
-          const requesterUin = await NTQQUserApi.getUinByUid(req.friendUid)
-          userId = parseInt(requesterUin)
-        } catch (e) {
-          log('获取加好友者QQ号失败', e)
-        }
-        const flag = req.friendUid + '|' + req.reqTime
-        const comment = req.extWords
-        const friendRequestEvent = new OB11FriendRequestEvent(
-          userId,
-          comment,
-          flag
-        )
-        postOb11Event(friendRequestEvent)
-      }
-    })
-  }
-
-  let startTime = 0 // 毫秒
-
-  async function start(uid: string, uin: string) {
     log('process pid', process.pid)
     const config = getConfigUtil().getConfig()
     if (!config.enableLLOB) {
@@ -379,75 +152,75 @@ function onLoad() {
       return
     }
     if (!fs.existsSync(TEMP_DIR)) {
-      fs.mkdirSync(TEMP_DIR, { recursive: true })
+      fs.mkdirSync(TEMP_DIR)
     }
-    llonebotError.otherError = ''
+    const ctx = new Context()
-    startTime = Date.now()
+    ctx.plugin(Log, {
-    const WrapperSession = getSession()
+      enable: config.log!,
-    if (WrapperSession) {
+      filename: logFileName
-      NTEventDispatch.init({ ListenerMap: wrapperConstructor, WrapperSession })
+    })
-    }
+    ctx.plugin(NTQQFileApi)
-    MessageUnique.init(uin)
+    ctx.plugin(NTQQFileCacheApi)
-
+    ctx.plugin(NTQQFriendApi)
-    //log('start activate group member info')
+    ctx.plugin(NTQQGroupApi)
-    // 下面两个会导致CPU占用过高，QQ卡死
+    ctx.plugin(NTQQMsgApi)
-    // NTQQGroupApi.activateMemberInfoChange().then().catch(log)
+    ctx.plugin(NTQQUserApi)
-    // NTQQGroupApi.activateMemberListChange().then().catch(log)
+    ctx.plugin(NTQQWebApi)
-    startReceiveHook().then()
+    ctx.plugin(NTQQWindowApi)
-
+    ctx.plugin(Core, config)
-    if (config.ob11.enableHttp) {
+    ctx.plugin(OneBot11Adapter, {
-      ob11HTTPServer.start(config.ob11.httpPort)
+      ...config.ob11,
-    }
+      heartInterval: config.heartInterval,
-    if (config.ob11.enableWs) {
+      token: config.token!,
-      ob11WebsocketServer.start(config.ob11.wsPort)
+      debug: config.debug!,
-    }
+      reportSelfMessage: config.reportSelfMessage!,
-    if (config.ob11.enableWsReverse) {
+      msgCacheExpire: config.msgCacheExpire!,
-      ob11ReverseWebsockets.start()
+      musicSignUrl: config.musicSignUrl,
-    }
+      enableLocalFile2Url: config.enableLocalFile2Url!,
-    if (config.ob11.enableHttpHeart) {
+      ffmpeg: config.ffmpeg,
-      httpHeart.start()
+    })
-    }
+    ctx.start()
-
+    ipcMain.on(CHANNEL_SET_CONFIG_CONFIRMED, (event, config: LLOBConfig) => {
-    log('LLOneBot start')
+      ctx.parallel('llonebot/config-updated', config)
+    })
   }
 
   const buildVersion = getBuildVersion()
 
   const intervalId = setInterval(() => {
-    const current = getSelfInfo()
+    const self = Object.assign(selfInfo, {
-    if (!current.uin) {
-      setSelfInfo({
       uin: globalThis.authData?.uin,
       uid: globalThis.authData?.uid,
-        nick: current.uin,
+      online: true
     })
-    }
+    if (self.uin && (buildVersion >= 27187 || getSession())) {
-    if (current.uin && (buildVersion >= 27187 || getSession())) {
       clearInterval(intervalId)
-      start(current.uid, current.uin)
+      start()
     }
   }, 600)
 }
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (window.id !== 2) {
+  if (![2, 4, 6].includes(window.id)) {
     return
   }
+  if (window.id === 2) {
     mainWindow = window
-  log('window create', window.webContents.getURL().toString())
+  }
+  //log('window create', window.webContents.getURL().toString())
   try {
-    hookNTQQApiCall(window)
+    hookNTQQApiCall(window, window.id !== 2)
-    hookNTQQApiReceive(window)
+    hookNTQQApiReceive(window, window.id !== 2)
-  } catch (e: any) {
+  } catch (e) {
-    log('LLOneBot hook error: ', e.toString())
+    log('LLOneBot hook error: ', String(e))
   }
 }
 
 try {
   onLoad()
-} catch (e: any) {
+} catch (e) {
-  console.log(e.toString())
+  console.log(e)
 }
 
 // 这两个函数都是可选的

src/main/setConfig.ts

@@ -1,67 +0,0 @@
-import { Config } from '../common/types'
-import { httpHeart, ob11HTTPServer } from '../onebot11/server/http'
-import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
-import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
-import { llonebotError } from '../common/data'
-import { getConfigUtil } from '../common/config'
-import { checkFfmpeg, log } from '../common/utils'
-
-export async function setConfig(config: Config) {
-  let oldConfig = { ...getConfigUtil().getConfig() }
-  getConfigUtil().setConfig(config)
-  if (config.ob11.httpPort != oldConfig.ob11.httpPort && config.ob11.enableHttp) {
-    ob11HTTPServer.restart(config.ob11.httpPort)
-  }
-  // 判断是否启用或关闭HTTP服务
-  if (!config.ob11.enableHttp) {
-    ob11HTTPServer.stop()
-  } else {
-    ob11HTTPServer.start(config.ob11.httpPort)
-  }
-  // 正向ws端口变化，重启服务
-  if (config.ob11.wsPort != oldConfig.ob11.wsPort) {
-    ob11WebsocketServer.restart(config.ob11.wsPort)
-    llonebotError.wsServerError = ''
-  }
-  // 判断是否启用或关闭正向ws
-  if (config.ob11.enableWs != oldConfig.ob11.enableWs) {
-    if (config.ob11.enableWs) {
-      ob11WebsocketServer.start(config.ob11.wsPort)
-    } else {
-      ob11WebsocketServer.stop()
-    }
-  }
-  // 判断是否启用或关闭反向ws
-  if (config.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
-    if (config.ob11.enableWsReverse) {
-      ob11ReverseWebsockets.start()
-    } else {
-      ob11ReverseWebsockets.stop()
-    }
-  }
-  if (config.ob11.enableWsReverse) {
-    // 判断反向ws地址有变化
-    if (config.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
-      log('反向ws地址有变化, 重启反向ws服务')
-      ob11ReverseWebsockets.restart()
-    } else {
-      for (const newHost of config.ob11.wsHosts) {
-        if (!oldConfig.ob11.wsHosts.includes(newHost)) {
-          log('反向ws地址有变化, 重启反向ws服务')
-          ob11ReverseWebsockets.restart()
-          break
-        }
-      }
-    }
-  }
-  if (config.ob11.enableHttpHeart) {
-    // 启动http心跳
-    httpHeart.start()
-  } else {
-    // 关闭http心跳
-    httpHeart.stop()
-  }
-  log('old config', oldConfig)
-  log('配置已更新', config)
-  checkFfmpeg(config.ffmpeg).then()
-}

src/ntqqapi/api/file.ts

@@ -5,7 +5,6 @@ import {
   CacheFileListItem,
   CacheFileType,
   CacheScanResult,
-  ChatCacheList,
   ChatCacheListItemBasic,
   ChatType,
   ElementType,
@@ -16,36 +15,68 @@ import {
 import path from 'node:path'
 import fs from 'node:fs'
 import { ReceiveCmdS } from '../hook'
-import { log, TEMP_DIR } from '@/common/utils'
+import { RkeyManager } from '@/ntqqapi/helper/rkey'
-import { rkeyManager } from '@/ntqqapi/helper/rkey'
 import { getSession } from '@/ntqqapi/wrapper'
 import { Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
 import { fileTypeFromFile } from 'file-type'
 import fsPromise from 'node:fs/promises'
-import { NTEventDispatch } from '@/common/utils/EventTask'
 import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
 import { Time } from 'cosmokit'
+import { Service, Context } from 'cordis'
+import { TEMP_DIR } from '@/common/globalVars'
 
-export class NTQQFileApi {
+declare module 'cordis' {
-  /** 27187 TODO */
+  interface Context {
-  static async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
+    ntFileApi: NTQQFileApi
+    ntFileCacheApi: NTQQFileCacheApi
+  }
+}
+
+export class NTQQFileApi extends Service {
+  private rkeyManager: RkeyManager
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntFileApi', true)
+    this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
+  }
+
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
     const session = getSession()
-    return (await session?.getRichMediaService().getVideoPlayUrlV2(peer,
+    if (session) {
+      return (await session.getRichMediaService().getVideoPlayUrlV2(
+        peer,
         msgId,
         elementId,
         0,
-      { downSourceType: 1, triggerType: 1 }))?.urlResult.domainUrl[0].url
+        { 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
+    }
   }
 
-  static async getFileType(filePath: string) {
+  async getFileType(filePath: string) {
     return fileTypeFromFile(filePath)
   }
 
   // 上传文件到QQ的文件夹
-  static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
+  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
-    let ext = (await NTQQFileApi.getFileType(filePath))?.ext || ''
+    let ext = (await this.getFileType(filePath))?.ext || ''
     if (ext) {
       ext = '.' + ext
     }
@@ -67,10 +98,7 @@ export class NTQQFileApi {
         file_uuid: ''
       })
     } else {
-      mediaPath = await invoke<string>({
+      mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
-        methodName: NTMethod.MEDIA_FILE_PATH,
-        args: [
-          {
         path_info: {
           md5HexStr: fileMd5,
           fileName: fileName,
@@ -81,9 +109,7 @@ export class NTQQFileApi {
           downloadType: 1,
           file_uuid: '',
         },
-          },
+      }])
-        ],
-      })
     }
     await fsPromise.copyFile(filePath, mediaPath)
     const fileSize = (await fsPromise.stat(filePath)).size
@@ -96,7 +122,7 @@ export class NTQQFileApi {
     }
   }
 
-  static async downloadMedia(
+  async downloadMedia(
     msgId: string,
     chatType: ChatType,
     peerUid: string,
@@ -116,52 +142,9 @@ export class NTQQFileApi {
         return sourcePath
       }
     }
-    let filePath: string
+    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
-    if (NTEventDispatch.initialised) {
+      'nodeIKernelMsgService/downloadRichMedia',
-      const data = await NTEventDispatch.CallNormalEvent<
+      [
-        (
-          params: {
-            fileModelId: string,
-            downloadSourceType: number,
-            triggerType: number,
-            msgId: string,
-            chatType: ChatType,
-            peerUid: string,
-            elementId: string,
-            thumbSize: number,
-            downloadType: number,
-            filePath: string
-          }) => Promise<unknown>,
-        (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-      >(
-        'NodeIKernelMsgService/downloadRichMedia',
-        'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-        1,
-        timeout,
-        (arg: OnRichMediaDownloadCompleteParams) => {
-          if (arg.msgId === msgId) {
-            return true
-          }
-          return false
-        },
-        {
-          fileModelId: '0',
-          downloadSourceType: 0,
-          triggerType: 1,
-          msgId: msgId,
-          chatType: chatType,
-          peerUid: peerUid,
-          elementId: elementId,
-          thumbSize: 0,
-          downloadType: 1,
-          filePath: thumbPath
-        }
-      )
-      filePath = data[1].filePath
-    } else {
-      const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>({
-        methodName: NTMethod.DOWNLOAD_MEDIA,
-        args: [
         {
           getReq: {
             fileModelId: '0',
@@ -178,12 +161,13 @@ export class NTQQFileApi {
         },
         null,
       ],
+      {
         cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
         cmdCB: payload => payload.notifyInfo.msgId === msgId,
         timeout
-      })
-      filePath = data.notifyInfo.filePath
       }
+    )
+    let filePath = data.notifyInfo.filePath
     if (filePath.startsWith('\\')) {
       const downloadPath = TEMP_DIR
       filePath = path.join(downloadPath, filePath)
@@ -192,15 +176,17 @@ export class NTQQFileApi {
     return filePath
   }
 
-  static async getImageSize(filePath: string) {
+  async getImageSize(filePath: string) {
-    return await invoke<{ width: number; height: number }>({
+    return await invoke<{ width: number; height: number }>(
+      NTMethod.IMAGE_SIZE,
+      [filePath],
+      {
         className: NTClass.FS_API,
-      methodName: NTMethod.IMAGE_SIZE,
+      }
-      args: [filePath],
+    )
-    })
   }
 
-  static async getImageUrl(element: PicElement) {
+  async getImageUrl(element: PicElement) {
     if (!element) {
       return ''
     }
@@ -209,17 +195,17 @@ export class NTQQFileApi {
     const fileMd5 = element.md5HexStr
 
     if (url) {
-      const UrlParse = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
+      const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
-      const imageAppid = UrlParse.searchParams.get('appid')
+      const imageAppid = parsedUrl.searchParams.get('appid')
       const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
       if (isNewPic) {
-        let UrlRkey = UrlParse.searchParams.get('rkey')
+        let rkey = parsedUrl.searchParams.get('rkey')
-        if (UrlRkey) {
+        if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
         }
-        const rkeyData = await rkeyManager.getRkey()
+        const rkeyData = await this.rkeyManager.getRkey()
-        UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey
+        rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey
-        return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`
+        return IMAGE_HTTP_HOST_NT + url + rkey
       } else {
         // 老的图片url，不需要rkey
         return IMAGE_HTTP_HOST + url
@@ -228,134 +214,58 @@ export class NTQQFileApi {
       // 没有url，需要自己拼接
       return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 || md5HexStr)!.toUpperCase()}/0`
     }
-    log('图片url获取失败', element)
+    this.ctx.logger.error('图片url获取失败', element)
     return ''
   }
 }
 
-export class NTQQFileCacheApi {
+export class NTQQFileCacheApi extends Service {
-  static async setCacheSilentScan(isSilent: boolean = true) {
+  constructor(protected ctx: Context) {
-    return await invoke<GeneralCallResult>({
+    super(ctx, 'ntFileCacheApi', true)
-      methodName: NTMethod.CACHE_SET_SILENCE,
-      args: [
-        {
-          isSilent,
-        },
-        null,
-      ],
-    })
   }
 
-  static getCacheSessionPathList() {
+  async setCacheSilentScan(isSilent: boolean = true) {
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }, null])
+  }
+
+  getCacheSessionPathList() {
     return invoke<
       {
         key: string
         value: string
       }[]
-    >({
+    >(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
-      className: NTClass.OS_API,
-      methodName: NTMethod.CACHE_PATH_SESSION,
-    })
   }
 
-  static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
+  scanCache() {
-    return invoke<any>({
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
-      // TODO: 目前还不知道真正的返回值是什么
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
-      methodName: NTMethod.CACHE_CLEAR,
-      args: [
-        {
-          keys: cacheKeys,
-        },
-        null,
-      ],
-    })
   }
 
-  static addCacheScannedPaths(pathMap: object = {}) {
+  getHotUpdateCachePath() {
-    return invoke<GeneralCallResult>({
+    return invoke<string>(NTMethod.CACHE_PATH_HOT_UPDATE, [], { className: NTClass.HOTUPDATE_API })
-      methodName: NTMethod.CACHE_ADD_SCANNED_PATH,
-      args: [
-        {
-          pathMap: { ...pathMap },
-        },
-        null,
-      ],
-    })
   }
 
-  static scanCache() {
+  getDesktopTmpPath() {
-    invoke<GeneralCallResult>({
+    return invoke<string>(NTMethod.CACHE_PATH_DESKTOP_TEMP, [], { className: NTClass.BUSINESS_API })
-      methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
-      classNameIsRegister: true,
-    }).then()
-    return invoke<CacheScanResult>({
-      methodName: NTMethod.CACHE_SCAN,
-      args: [null, null],
-      timeout: 300 * Time.second,
-    })
   }
 
-  static getHotUpdateCachePath() {
+  getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-    return invoke<string>({
-      className: NTClass.HOTUPDATE_API,
-      methodName: NTMethod.CACHE_PATH_HOT_UPDATE,
-    })
-  }
-
-  static getDesktopTmpPath() {
-    return invoke<string>({
-      className: NTClass.BUSINESS_API,
-      methodName: NTMethod.CACHE_PATH_DESKTOP_TEMP,
-    })
-  }
-
-  static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-    return new Promise<ChatCacheList>((res, rej) => {
-      invoke<ChatCacheList>({
-        methodName: NTMethod.CACHE_CHAT_GET,
-        args: [
-          {
-            chatType: type,
-            pageSize,
-            order: 1,
-            pageIndex,
-          },
-          null,
-        ],
-      })
-        .then((list) => res(list))
-        .catch((e) => rej(e))
-    })
-  }
-
-  static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
     const _lastRecord = lastRecord ? lastRecord : { fileType: fileType }
 
-    return invoke<CacheFileList>({
+    return invoke<CacheFileList>(NTMethod.CACHE_FILE_GET, [{
-      methodName: NTMethod.CACHE_FILE_GET,
-      args: [
-        {
       fileType: fileType,
       restart: true,
       pageSize: pageSize,
       order: 1,
       lastRecord: _lastRecord,
-        },
+    }, null])
-        null,
-      ],
-    })
   }
 
-  static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
+  async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-    return await invoke<GeneralCallResult>({
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_CHAT_CLEAR, [{
-      methodName: NTMethod.CACHE_CHAT_CLEAR,
-      args: [
-        {
       chats,
       fileKeys,
-        },
+    }, null])
-        null,
-      ],
-    })
   }
 }

src/ntqqapi/api/friend.ts

@@ -2,13 +2,23 @@ import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
 import { ReceiveCmdS } from '../hook'
 import { invoke, NTMethod, NTClass } from '../ntcall'
 import { getSession } from '@/ntqqapi/wrapper'
-import { BuddyListReqType, NodeIKernelProfileService } from '../services'
+import { BuddyListReqType } from '../services'
-import { NTEventDispatch } from '@/common/utils/EventTask'
+import { Dict, pick } from 'cosmokit'
-import { LimitedHashTable } from '@/common/utils/table'
+import { Service, Context } from 'cordis'
+
+declare module 'cordis' {
+  interface Context {
+    ntFriendApi: NTQQFriendApi
+  }
+}
+
+export class NTQQFriendApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntFriendApi', true)
+  }
 
-export class NTQQFriendApi {
   /** 大于或等于 26702 应使用 getBuddyV2 */
-  static async getFriends(forced = false) {
+  async getFriends() {
     const data = await invoke<{
       data: {
         categoryId: number
@@ -16,20 +26,23 @@ export class NTQQFriendApi {
         categroyMbCount: number
         buddyList: Friend[]
       }[]
-    }>({
+    }>(
-      methodName: NTMethod.FRIENDS,
+      'getBuddyList',
-      args: [{ force_update: forced }, undefined],
+      [],
+      {
+        className: NTClass.NODE_STORE_API,
         cbCmd: ReceiveCmdS.FRIENDS,
         afterFirstCmd: false,
-    })
+      }
-    let _friends: Friend[] = []
+    )
-    for (const fData of data.data) {
+    const _friends: Friend[] = []
-      _friends.push(...fData.buddyList)
+    for (const item of data.data) {
+      _friends.push(...item.buddyList)
     }
     return _friends
   }
 
-  static async handleFriendRequest(flag: string, accept: boolean) {
+  async handleFriendRequest(flag: string, accept: boolean) {
     const data = flag.split('|')
     if (data.length < 2) {
       return
@@ -44,96 +57,97 @@ export class NTQQFriendApi {
         accept
       })
     } else {
-      return await invoke({
+      return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
-        methodName: NTMethod.HANDLE_FRIEND_REQUEST,
-        args: [
-          {
         approvalInfo: {
           friendUid,
           reqTime,
           accept,
         },
-          },
+      }])
-        ],
-      })
     }
   }
 
-  static async getBuddyV2(refresh = false): Promise<FriendV2[]> {
+  async getBuddyV2(refresh = false): Promise<FriendV2[]> {
     const session = getSession()
     if (session) {
       const uids: string[] = []
       const buddyService = session.getBuddyService()
       const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
       uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      )
       return Array.from(data.values())
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
-      }>({
+      }>(
+        'getBuddyList',
+        [refresh],
+        {
           className: NTClass.NODE_STORE_API,
-        methodName: 'getBuddyList',
-        args: [refresh],
           cbCmd: ReceiveCmdS.FRIENDS,
           afterFirstCmd: false,
-      })
+        }
-      return Array.from(data.userSimpleInfos.values())
+      )
+      const uids = data.buddyCategory.flatMap(item => item.buddyUids)
+      return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
     }
   }
 
-  static async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
+  /** uid => uin */
-    const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000)
+  async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
+    const retMap: Map<string, string> = new Map()
     const session = getSession()
     if (session) {
       const uids: string[] = []
-      const buddyService = session?.getBuddyService()
+      const buddyService = session.getBuddyService()
       const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
       uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
+      for (const [, item] of data) {
-      )
+        if (retMap.size > 5000) {
-      data.forEach((value, key) => {
+          break
-        retMap.set(value.uin!, value.uid!)
+        }
-      })
+        retMap.set(item.uid!, item.uin!)
+      }
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
-      }>({
+      }>(
+        'getBuddyList',
+        [refresh],
+        {
           className: NTClass.NODE_STORE_API,
-        methodName: 'getBuddyList',
-        args: [refresh],
           cbCmd: ReceiveCmdS.FRIENDS,
           afterFirstCmd: false,
-      })
+        }
-      data.userSimpleInfos.forEach((value, key) => {
+      )
-        retMap.set(value.uin!, value.uid!)
+      for (const item of Object.values(data.userSimpleInfos)) {
-      })
+        if (retMap.size > 5000) {
+          break
+        }
+        retMap.set(item.uid!, item.uin!)
+      }
     }
     return retMap
   }
 
-  static async getBuddyV2ExWithCate(refresh = false) {
+  async getBuddyV2ExWithCate(refresh = false) {
     const session = getSession()
     if (session) {
       const uids: string[] = []
-      const categoryMap: Map<string, any> = new Map()
+      const categoryMap: Map<string, Dict> = new Map()
       const buddyService = session.getBuddyService()
-      const buddyListV2 = (await buddyService?.getBuddyListV2('0', BuddyListReqType.KNOMAL))?.data
+      const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data
       uids.push(
-        ...buddyListV2?.flatMap(item => {
+        ...buddyListV2.flatMap(item => {
           item.buddyUids.forEach(uid => {
             categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
           })
           return item.buddyUids
-        })!)
+        }))
-      const data = await NTEventDispatch.CallNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      )
       return Array.from(data).map(([key, value]) => {
         const category = categoryMap.get(key)
         return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
@@ -141,39 +155,38 @@ export class NTQQFriendApi {
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
-      }>({
+      }>(
+        'getBuddyList',
+        [refresh],
+        {
           className: NTClass.NODE_STORE_API,
-        methodName: 'getBuddyList',
-        args: [refresh],
           cbCmd: ReceiveCmdS.FRIENDS,
           afterFirstCmd: false,
-      })
+        }
-      return Array.from(data.userSimpleInfos).map(([key, value]) => {
+      )
-        if (value.baseInfo) {
+      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)
+        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
+        .map(value => {
           return {
             ...value,
             categoryId: value.baseInfo.categoryId,
-            categroyName: data.buddyCategory.find(e => e.categoryId === value.baseInfo.categoryId)?.categroyName
+            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
           }
-        }
-        return value
         })
     }
   }
 
-  static async isBuddy(uid: string): Promise<boolean> {
+  async isBuddy(uid: string): Promise<boolean> {
     const session = getSession()
     if (session) {
       return session.getBuddyService().isBuddy(uid)
     } else {
-      return await invoke<boolean>({
+      return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }, null])
-        methodName: 'nodeIKernelBuddyService/isBuddy',
-        args: [
-          { uid },
-          null,
-        ],
-      })
     }
   }
 }

src/ntqqapi/api/group.ts

@@ -1,71 +1,55 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify } from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam, PublishGroupBulletinReq } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { NTQQWindowApi, NTQQWindows } from './window'
+import { NTQQWindows } from './window'
 import { getSession } from '../wrapper'
-import { NTEventDispatch } from '@/common/utils/EventTask'
+import { OnGroupFileInfoUpdateParams } from '../listeners'
-import { NodeIKernelGroupListener } from '../listeners'
 import { NodeIKernelGroupService } from '../services'
+import { Service, Context } from 'cordis'
+import { isNumeric } from '@/common/utils/misc'
 
-export class NTQQGroupApi {
+declare module 'cordis' {
-  static async getGroups(forced = false): Promise<Group[]> {
+  interface Context {
-    if (NTEventDispatch.initialised) {
+    ntGroupApi: NTQQGroupApi
-      type ListenerType = NodeIKernelGroupListener['onGroupListUpdate']
+  }
-      const [, , groupList] = await NTEventDispatch.CallNormalEvent
+}
-        <(force: boolean) => Promise<any>, ListenerType>
+
-        (
+export class NTQQGroupApi extends Service {
-          'NodeIKernelGroupService/getGroupList',
+  static inject = ['ntWindowApi']
-          'NodeIKernelGroupListener/onGroupListUpdate',
+
-          1,
+  public groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
-          5000,
+
-          () => true,
+  constructor(protected ctx: Context) {
-          forced
+    super(ctx, 'ntGroupApi', true)
-        )
+  }
-      return groupList
+
-    } else {
+  async getGroups(): Promise<Group[]> {
     const result = await invoke<{
       updateType: number
       groupList: Group[]
-      }>({
+    }>(
+      'getGroupList',
+      [],
+      {
         className: NTClass.NODE_STORE_API,
-        methodName: 'getGroupList',
         cbCmd: ReceiveCmdS.GROUPS_STORE,
         afterFirstCmd: false,
-      })
+      }
+    )
     return result.groupList
   }
-  }
 
-  static async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
+  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
     const session = getSession()
     let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
     if (session) {
       const groupService = session.getGroupService()
-      const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow')
+      const sceneId = groupService.createMemberListScene(groupCode, 'groupMemberList_MainWindow')
       result = await groupService.getNextMemberList(sceneId, undefined, num)
     } else {
-      const sceneId = await invoke<string>({
+      const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
-        methodName: NTMethod.GROUP_MEMBER_SCENE,
+      result = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }, null])
-        args: [
-          {
-            groupCode: groupQQ,
-            scene: 'groupMemberList_MainWindow',
-          },
-        ],
-      })
-      result = await invoke<
-        ReturnType<NodeIKernelGroupService['getNextMemberList']>
-      >({
-        methodName: NTMethod.GROUP_MEMBERS,
-        args: [
-          {
-            sceneId,
-            num,
-          },
-          null,
-        ],
-      })
     }
     if (result.errCode !== 0) {
       throw ('获取群成员列表出错,' + result.errMsg)
@@ -73,47 +57,60 @@ export class NTQQGroupApi {
     return result.result.infos
   }
 
-  static async getGroupIgnoreNotifies() {
+  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
-    await NTQQGroupApi.getSingleScreenNotifies(14)
+    const groupCodeStr = groupCode.toString()
-    return await NTQQWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
+    const memberUinOrUidStr = memberUinOrUid.toString()
+    if (!this.groupMembers.has(groupCodeStr)) {
+      try {
+        // 更新群成员列表
+        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      }
+      catch (e) {
+        return null
+      }
+    }
+    let members = this.groupMembers.get(groupCodeStr)!
+    const getMember = () => {
+      let member: GroupMember | undefined = undefined
+      if (isNumeric(memberUinOrUidStr)) {
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
+      } else {
+        member = members.get(memberUinOrUidStr)
+      }
+      return member
+    }
+    let member = getMember()
+    if (!member) {
+      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      members = this.groupMembers.get(groupCodeStr)!
+      member = getMember()
+    }
+    return member
+  }
+
+  async getGroupIgnoreNotifies() {
+    await this.getSingleScreenNotifies(14)
+    return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
       ReceiveCmdS.GROUP_NOTIFY,
     )
   }
 
-  static async getSingleScreenNotifies(num: number) {
+  async getSingleScreenNotifies(num: number) {
-    if (NTEventDispatch.initialised) {
+    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
-      const [_retData, _doubt, _seq, notifies] = await NTEventDispatch.CallNormalEvent
+    return (await invoke<GroupNotifies>(
-        <(arg1: boolean, arg2: string, arg3: number) => Promise<any>, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void>
+      'nodeIKernelGroupService/getSingleScreenNotifies',
-        (
+      [{ doubt: false, startSeq: '', number: num }, null],
-          'NodeIKernelGroupService/getSingleScreenNotifies',
+      {
-          'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
+
-          1,
-          5000,
-          () => true,
-          false,
-          '',
-          num,
-        )
-      return notifies
-    } else {
-      return (await invoke<GroupNotifies>({
-        methodName: NTMethod.GET_GROUP_NOTICE,
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
-        args: [{ doubt: false, startSeq: '', number: num }, null],
-      })).notifies
       }
+    )).notifies
   }
 
-  /** 27187 TODO */
+  async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
-  static async delGroupFile(groupCode: string, files: string[]) {
-    const session = getSession()
-    return session?.getRichMediaService().deleteGroupFile(groupCode, [102], files)
-  }
-
-  static async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
     const flagitem = flag.split('|')
     const groupCode = flagitem[0]
     const seq = flagitem[1]
@@ -132,10 +129,7 @@ export class NTQQGroupApi {
           }
         })
     } else {
-      return await invoke({
+      return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-        methodName: NTMethod.HANDLE_GROUP_REQUEST,
-        args: [
-          {
         doubt: false,
         operateMsg: {
           operateType,
@@ -146,142 +140,80 @@ export class NTQQGroupApi {
             postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
           },
         },
-          },
+      }, null])
-          null,
-        ],
-      })
     }
   }
 
-  static async quitGroup(groupQQ: string) {
+  async quitGroup(groupCode: string) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().quitGroup(groupQQ)
+      return session.getGroupService().quitGroup(groupCode)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }, null])
-        methodName: NTMethod.QUIT_GROUP,
-        args: [{ groupCode: groupQQ }, null],
-      })
     }
   }
 
-  static async kickMember(
+  async kickMember(
-    groupQQ: string,
+    groupCode: string,
     kickUids: string[],
     refuseForever = false,
     kickReason = '',
   ) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().kickMember(groupQQ, kickUids, refuseForever, kickReason)
+      return session.getGroupService().kickMember(groupCode, kickUids, refuseForever, kickReason)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
-        methodName: NTMethod.KICK_MEMBER,
-        args: [
-          {
-            groupCode: groupQQ,
-            kickUids,
-            refuseForever,
-            kickReason,
-          },
-        ],
-      })
     }
   }
 
-  static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
+  async banMember(groupCode: string, memList: Array<{ uid: string, timeStamp: number }>) {
     // timeStamp为秒数, 0为解除禁言
     const session = getSession()
     if (session) {
-      return session.getGroupService().setMemberShutUp(groupQQ, memList)
+      return session.getGroupService().setMemberShutUp(groupCode, memList)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
-        methodName: NTMethod.MUTE_MEMBER,
-        args: [
-          {
-            groupCode: groupQQ,
-            memList,
-          },
-        ],
-      })
     }
   }
 
-  static async banGroup(groupQQ: string, shutUp: boolean) {
+  async banGroup(groupCode: string, shutUp: boolean) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().setGroupShutUp(groupQQ, shutUp)
+      return session.getGroupService().setGroupShutUp(groupCode, shutUp)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }, null])
-        methodName: NTMethod.MUTE_GROUP,
-        args: [
-          {
-            groupCode: groupQQ,
-            shutUp,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
+  async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName)
+      return session.getGroupService().modifyMemberCardName(groupCode, memberUid, cardName)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }, null])
-        methodName: NTMethod.SET_MEMBER_CARD,
-        args: [
-          {
-            groupCode: groupQQ,
-            uid: memberUid,
-            cardName,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+  async setMemberRole(groupCode: string, memberUid: string, role: GroupMemberRole) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().modifyMemberRole(groupQQ, memberUid, role)
+      return session.getGroupService().modifyMemberRole(groupCode, memberUid, role)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }, null])
-        methodName: NTMethod.SET_MEMBER_ROLE,
-        args: [
-          {
-            groupCode: groupQQ,
-            uid: memberUid,
-            role,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async setGroupName(groupQQ: string, groupName: string) {
+  async setGroupName(groupCode: string, groupName: string) {
     const session = getSession()
     if (session) {
-      return session.getGroupService().modifyGroupName(groupQQ, groupName, false)
+      return session.getGroupService().modifyGroupName(groupCode, groupName, false)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }, null])
-        methodName: NTMethod.SET_GROUP_NAME,
-        args: [
-          {
-            groupCode: groupQQ,
-            groupName,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async getGroupAtAllRemainCount(groupCode: string) {
+  async getGroupRemainAtTimes(groupCode: string) {
     return await invoke<
       GeneralCallResult & {
         atInfo: {
@@ -292,44 +224,80 @@ export class NTQQGroupApi {
           canNotAtAllMsg: ''
         }
       }
-    >({
+    >(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
-      methodName: NTMethod.GROUP_AT_ALL_REMAIN_COUNT,
-      args: [
-        {
-          groupCode,
-        },
-        null,
-      ],
-    })
   }
 
   /** 27187 TODO */
-  static async removeGroupEssence(GroupCode: string, msgId: string) {
+  async removeGroupEssence(groupCode: string, msgId: string) {
     const session = getSession()
     // 代码没测过
     // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
-    let MsgData = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: GroupCode }, msgId, 1, false)
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    let param = {
+    const param = {
-      groupCode: GroupCode,
+      groupCode: groupCode,
-      msgRandom: parseInt(MsgData?.msgList[0].msgRandom!),
+      msgRandom: Number(data?.msgList[0].msgRandom),
-      msgSeq: parseInt(MsgData?.msgList[0].msgSeq!)
+      msgSeq: Number(data?.msgList[0].msgSeq)
     }
     // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
     return session?.getGroupService().removeGroupEssence(param)
   }
 
   /** 27187 TODO */
-  static async addGroupEssence(GroupCode: string, msgId: string) {
+  async addGroupEssence(groupCode: string, msgId: string) {
     const session = getSession()
     // 代码没测过
     // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
-    let MsgData = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: GroupCode }, msgId, 1, false)
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    let param = {
+    const param = {
-      groupCode: GroupCode,
+      groupCode: groupCode,
-      msgRandom: parseInt(MsgData?.msgList[0].msgRandom!),
+      msgRandom: Number(data?.msgList[0].msgRandom),
-      msgSeq: parseInt(MsgData?.msgList[0].msgSeq!)
+      msgSeq: Number(data?.msgList[0].msgSeq)
     }
     // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
     return session?.getGroupService().addGroupEssence(param)
   }
+
+  async createGroupFileFolder(groupId: string, folderName: string) {
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }, null])
+  }
+
+  async deleteGroupFileFolder(groupId: string, folderId: string) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
+  }
+
+  async deleteGroupFile(groupId: string, fileIdList: string[]) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList: [102], fileIdList }, null])
+  }
+
+  async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
+      'nodeIKernelRichMediaService/getGroupFileList',
+      [
+        {
+          groupId,
+          fileListForm
+        },
+        null,
+      ],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
+        afterFirstCmd: false,
+        cmdCB: (payload, result) => payload.fileInfo.reqId === result
+      }
+    )
+    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 }, 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 }, null])
+  }
 }

src/ntqqapi/api/msg.ts

@@ -1,9 +1,15 @@
 import { invoke, NTMethod } from '../ntcall'
-import { GeneralCallResult, TmpChatInfoApi } from '../services'
+import { GeneralCallResult } from '../services'
 import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
-import { getSelfNick, getSelfUid } from '../../common/data'
 import { getSession } from '@/ntqqapi/wrapper'
-import { NTEventDispatch } from '@/common/utils/EventTask'
+import { Service, Context } from 'cordis'
+import { selfInfo } from '@/common/globalVars'
+
+declare module 'cordis' {
+  interface Context {
+    ntMsgApi: NTQQMsgApi
+  }
+}
 
 function generateMsgId() {
   const timestamp = Math.floor(Date.now() / 1000)
@@ -15,189 +21,92 @@ function generateMsgId() {
   return msgId
 }
 
-export class NTQQMsgApi {
+export class NTQQMsgApi extends Service {
-  static async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+  static inject = ['ntUserApi']
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntMsgApi', true)
+  }
+
+  async getTempChatInfo(chatType: ChatType2, peerUid: string) {
     const session = getSession()
     if (session) {
       return session.getMsgService().getTempChatInfo(chatType, peerUid)
     } else {
-      return await invoke<TmpChatInfoApi>({
+      return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }, null])
-        methodName: 'nodeIKernelMsgService/getTempChatInfo',
-        args: [
-          {
-            chatType,
-            peerUid,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
+  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean = true) {
     // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
     // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
     // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
-    emojiId = emojiId.toString()
     const session = getSession()
+    const emojiType = emojiId.length > 3 ? '2' : '1'
     if (session) {
-      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set)
+      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiType, setEmoji)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }, null])
-        methodName: NTMethod.EMOJI_LIKE,
-        args: [
-          {
-            peer,
-            msgSeq,
-            emojiId,
-            emojiType: emojiId.length > 3 ? '2' : '1',
-            setEmoji: set,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
+  async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
     const session = getSession()
     if (session) {
       return session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)
     } else {
-      return await invoke<GeneralCallResult & { msgList: RawMessage[] }>({
+      return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }, null])
-        methodName: NTMethod.GET_MULTI_MSG,
-        args: [
-          {
-            peer,
-            rootMsgId,
-            parentMsgId,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async activateChat(peer: Peer) {
+  async activateChat(peer: Peer) {
-    return await invoke<GeneralCallResult>({
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 20 }, null])
-      methodName: NTMethod.ACTIVE_CHAT_PREVIEW,
-      args: [{ peer, cnt: 20 }, null],
-    })
   }
 
-  static async activateChatAndGetHistory(peer: Peer) {
+  async activateChatAndGetHistory(peer: Peer) {
-    return await invoke<GeneralCallResult>({
+    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt: 20 }, null])
-      methodName: NTMethod.ACTIVE_CHAT_HISTORY,
-      // 参数似乎不是这样
-      args: [{ peer, cnt: 20 }, null],
-    })
   }
 
-  static async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
+  async getAioFirstViewLatestMsgs(peer: Peer, cnt: number) {
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }, null])
+  }
+
+  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')
     const session = getSession()
     if (session) {
       return session.getMsgService().getMsgsByMsgId(peer, msgIds)
     } else {
-      return await invoke<GeneralCallResult & {
+      return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }, null])
-        msgList: RawMessage[]
-      }>({
-        methodName: 'nodeIKernelMsgService/getMsgsByMsgId',
-        args: [
-          {
-            peer,
-            msgIds,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async getMsgHistory(peer: Peer, msgId: string, count: number, isReverseOrder: boolean = false) {
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, isReverseOrder: boolean = false) {
     const session = getSession()
     // 消息时间从旧到新
     if (session) {
-      return session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder)
+      return session.getMsgService().getMsgsIncludeSelf(peer, msgId, cnt, isReverseOrder)
     } else {
-      return await invoke<GeneralCallResult & { msgList: RawMessage[] }>({
+      return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder: isReverseOrder }, null])
-        methodName: NTMethod.HISTORY_MSG,
-        args: [
-          {
-            peer,
-            msgId,
-            cnt: count,
-            queryOrder: isReverseOrder,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async recallMsg(peer: Peer, msgIds: string[]) {
+  async recallMsg(peer: Peer, msgIds: string[]) {
     const session = getSession()
     if (session) {
-      return session.getMsgService().recallMsg({
+      return session.getMsgService().recallMsg(peer, msgIds)
-        chatType: peer.chatType,
-        peerUid: peer.peerUid
-      }, msgIds)
     } else {
-      return await invoke({
+      return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }, null])
-        methodName: NTMethod.RECALL_MSG,
-        args: [
-          {
-            peer,
-            msgIds,
-          },
-          null,
-        ],
-      })
     }
   }
 
-  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+  async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
     const msgId = generateMsgId()
     peer.guildId = msgId
-    let msgList: RawMessage[]
+    const data = await invoke<{ msgList: RawMessage[] }>(
-    if (NTEventDispatch.initialised) {
+      'nodeIKernelMsgService/sendMsg',
-      const data = await NTEventDispatch.CallNormalEvent<
+      [
-        (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
-        (msgList: RawMessage[]) => void
-      >(
-        'NodeIKernelMsgService/sendMsg',
-        'NodeIKernelMsgListener/onMsgInfoListUpdate',
-        1,
-        timeout,
-        (msgRecords: RawMessage[]) => {
-          for (const msgRecord of msgRecords) {
-            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
-              return true
-            }
-          }
-          return false
-        },
-        '0',
-        peer,
-        msgElements,
-        new Map()
-      )
-      msgList = data[1]
-    } else {
-      const data = await invoke<{ msgList: RawMessage[] }>({
-        methodName: 'nodeIKernelMsgService/sendMsg',
-        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-        afterFirstCmd: false,
-        cmdCB: payload => {
-          for (const msgRecord of payload.msgList) {
-            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
-              return true
-            }
-          }
-          return false
-        },
-        args: [
         {
           msgId: '0',
           peer,
@@ -206,84 +115,47 @@ export class NTQQMsgApi {
         },
         null
       ],
-        timeout
-      })
-      msgList = data.msgList
-    }
-    const retMsg = msgList.find(msgRecord => {
-      if (msgRecord.guildId === msgId) {
-        return true
-      }
-    })
-    return retMsg!
-  }
-
-  static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    const session = getSession()
-    if (session) {
-      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
-    } else {
-      return await invoke<GeneralCallResult>({
-        methodName: NTMethod.FORWARD_MSG,
-        args: [
       {
-            msgIds: msgIds,
-            srcContact: srcPeer,
-            dstContacts: [destPeer],
-            commentElements: [],
-            msgAttributeInfos: new Map(),
-          },
-          null,
-        ],
-      })
-    }
-  }
-
-  static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
-    const senderShowName = await getSelfNick()
-    const msgInfos = msgIds.map(id => {
-      return { msgId: id, senderShowName }
-    })
-    const selfUid = getSelfUid()
-    let msgList: RawMessage[]
-    if (NTEventDispatch.initialised) {
-      const data = await NTEventDispatch.CallNormalEvent<
-        (msgInfo: typeof msgInfos, srcPeer: Peer, destPeer: Peer, comment: Array<any>, attr: Map<any, any>,) => Promise<unknown>,
-        (msgList: RawMessage[]) => void
-      >(
-        'NodeIKernelMsgService/multiForwardMsgWithComment',
-        'NodeIKernelMsgListener/onMsgInfoListUpdate',
-        1,
-        5000,
-        (msgRecords: RawMessage[]) => {
-          for (let msgRecord of msgRecords) {
-            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
-              return true
-            }
-          }
-          return false
-        },
-        msgInfos,
-        srcPeer,
-        destPeer,
-        [],
-        new Map()
-      )
-      msgList = data[1]
-    } else {
-      const data = await invoke<{ msgList: RawMessage[] }>({
-        methodName: 'nodeIKernelMsgService/multiForwardMsgWithComment',
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
               return true
             }
           }
           return false
         },
-        args: [
+        timeout
+      }
+    )
+    return data.msgList.find(msgRecord => msgRecord.guildId === msgId)
+  }
+
+  async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+    const session = getSession()
+    if (session) {
+      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
+    } else {
+      return await invoke(NTMethod.FORWARD_MSG, [{
+        msgIds,
+        srcContact: srcPeer,
+        dstContacts: [destPeer],
+        commentElements: [],
+        msgAttributeInfos: new Map(),
+      }, null])
+    }
+  }
+
+  async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
+    const senderShowName = await this.ctx.ntUserApi.getSelfNick(true)
+    const msgInfos = msgIds.map(id => {
+      return { msgId: id, senderShowName }
+    })
+    const selfUid = selfInfo.uid
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/multiForwardMsgWithComment',
+      [
         {
           msgInfos,
           srcContact: srcPeer,
@@ -293,15 +165,25 @@ export class NTQQMsgApi {
         },
         null,
       ],
-      })
+      {
-      msgList = data.msgList
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+              return true
             }
-    for (const msg of msgList) {
+          }
+          return false
+        },
+      }
+    )
+    for (const msg of data.msgList) {
       const arkElement = msg.elements.find(ele => ele.arkElement)
       if (!arkElement) {
         continue
       }
-      const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
+      const forwardData = JSON.parse(arkElement.arkElement.bytesData)
       if (forwardData.app != 'com.tencent.multimsg') {
         continue
       }
@@ -312,61 +194,66 @@ export class NTQQMsgApi {
     throw new Error('转发消息超时')
   }
 
-  static async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
+  async getMsgsBySeqAndCount(peer: Peer, msgSeq: string, count: number, desc: boolean, z: boolean) {
     const session = getSession()
     if (session) {
-      return await session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z)
+      return await session.getMsgService().getMsgsBySeqAndCount(peer, msgSeq, count, desc, z)
     } else {
-      return await invoke<GeneralCallResult & {
+      return await invoke('nodeIKernelMsgService/getMsgsBySeqAndCount', [{
-        msgList: RawMessage[]
-      }>({
-        methodName: 'nodeIKernelMsgService/getMsgsBySeqAndCount',
-        args: [
-          {
         peer,
         cnt: count,
-            msgSeq: seq,
+        msgSeq,
         queryOrder: desc
-          },
+      }, null])
-          null,
-        ],
-      })
     }
   }
 
-  /** 27187 TODO */
+  async getSingleMsg(peer: Peer, msgSeq: string) {
-  static async getLastestMsgByUids(peer: Peer, count = 20, isReverseOrder = false) {
     const session = getSession()
-    const ret = await session?.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+    if (session) {
+      return await session.getMsgService().getSingleMsg(peer, msgSeq)
+    } else {
+      return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }, null])
+    }
+  }
+
+  async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
+    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
+      msgId: '0',
+      msgTime: '0',
+      msgSeq,
+      params: {
         chatInfo: peer,
         filterMsgType: [],
         filterSendersUid: [],
         filterMsgToTime: '0',
         filterMsgFromTime: '0',
-      isReverseOrder: isReverseOrder, //此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
+        isReverseOrder: true,
         isIncludeCurrent: true,
-      pageLimit: count,
+        pageLimit: 1,
-    })
+      }
-    return ret
+    }, null])
   }
 
-  static async getSingleMsg(peer: Peer, seq: string) {
+  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[]) {
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
-    if (session) {
+      msgId: '0',
-      return await session.getMsgService().getSingleMsg(peer, seq)
+      msgTime: '0',
-    } else {
+      msgSeq,
-      return await invoke<GeneralCallResult & {
+      params: {
-        msgList: RawMessage[]
+        chatInfo: peer,
-      }>({
+        filterMsgType: [],
-        methodName: 'nodeIKernelMsgService/getSingleMsg',
+        filterSendersUid,
-        args: [
+        filterMsgToTime: filterMsgTime,
-          {
+        filterMsgFromTime: filterMsgTime,
-            peer,
+        isReverseOrder: true,
-            msgSeq: seq,
+        isIncludeCurrent: true,
-          },
+        pageLimit: 1,
-          null,
-        ],
-      })
       }
+    }, null])
+  }
+
+  async setMsgRead(peer: Peer) {
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
   }
 }

src/ntqqapi/api/user.ts

@@ -1,56 +1,43 @@
-import { invoke, NTMethod } from '../ntcall'
+import { invoke } from '../ntcall'
-import { GeneralCallResult } from '../services'
 import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
-import { friends, groupMembers, getSelfUin } from '@/common/data'
+import { getBuildVersion } from '@/common/utils'
-import { CacheClassFuncAsync, getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { NodeIKernelProfileService, UserDetailSource, ProfileBizType, forceFetchClientKeyRetType } from '../services'
+import { UserDetailSource, ProfileBizType } from '../services'
-import { NodeIKernelProfileListener } from '../listeners'
-import { NTEventDispatch } from '@/common/utils/EventTask'
-import { NTQQFriendApi } from './friend'
 import { Time } from 'cosmokit'
+import { Service, Context } from 'cordis'
+import { selfInfo } from '@/common/globalVars'
 
-export class NTQQUserApi {
+declare module 'cordis' {
-  static async setQQAvatar(filePath: string) {
+  interface Context {
-    return await invoke<GeneralCallResult>({
+    ntUserApi: NTQQUserApi
-      methodName: NTMethod.SET_QQ_AVATAR,
+  }
-      args: [
+}
-        {
+
-          path: filePath,
+export class NTQQUserApi extends Service {
-        },
+  static inject = ['ntFriendApi', 'ntGroupApi']
-        null,
+
-      ],
+  constructor(protected ctx: Context) {
-      timeout: 10 * Time.second, // 10秒不一定够
+    super(ctx, 'ntUserApi', true)
-    })
   }
 
-  static async fetchUserDetailInfo(uid: string) {
+  async setQQAvatar(path: string) {
-    let info: UserDetailInfoListenerArg
+    return await invoke(
-    if (NTEventDispatch.initialised) {
+      'nodeIKernelProfileService/setHeader',
-      type EventService = NodeIKernelProfileService['fetchUserDetailInfo']
+      [
-      type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged']
+        { path },
-      const [_retData, profile] = await NTEventDispatch.CallNormalEvent
+        null,
-        <EventService, EventListener>
+      ],
-        (
+      {
-          'NodeIKernelProfileService/fetchUserDetailInfo',
+        timeout: 10 * Time.second, // 10秒不一定够
-          'NodeIKernelProfileListener/onUserDetailInfoChanged',
+      }
-          1,
-          5000,
-          (profile) => profile.uid === uid,
-          'BuddyProfileStore',
-          [uid],
-          UserDetailSource.KSERVER,
-          [ProfileBizType.KALL]
     )
-      info = profile
+  }
-    } else {
+
-      const result = await invoke<{ info: UserDetailInfoListenerArg }>({
+  async fetchUserDetailInfo(uid: string) {
-        methodName: 'nodeIKernelProfileService/fetchUserDetailInfo',
+    const result = await invoke<{ info: UserDetailInfoListenerArg }>(
-        cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+      'nodeIKernelProfileService/fetchUserDetailInfo',
-        afterFirstCmd: false,
+      [
-        cmdCB: payload => payload.info.uid === uid,
-        args: [
         {
           callFrom: 'BuddyProfileStore',
           uid: [uid],
@@ -59,9 +46,13 @@ export class NTQQUserApi {
         },
         null
       ],
-      })
+      {
-      info = result.info
+        cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.info.uid === uid,
       }
+    )
+    const { info } = result
     const ret: User = {
       ...info.simpleInfo.coreInfo,
       ...info.simpleInfo.status,
@@ -74,67 +65,55 @@ export class NTQQUserApi {
     return ret
   }
 
-  static async getUserDetailInfo(uid: string, getLevel = false, withBizInfo = true) {
+  async getUserDetailInfo(uid: string) {
     if (getBuildVersion() >= 26702) {
-      return NTQQUserApi.fetchUserDetailInfo(uid)
+      return this.fetchUserDetailInfo(uid)
     }
-    if (NTEventDispatch.initialised) {
+    const result = await invoke<{ info: User }>(
-      type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo']
+      'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-      type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged']
+      [
-      const [_retData, profile] = await NTEventDispatch.CallNormalEvent
-        <EventService, EventListener>
-        (
-          'NodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-          'NodeIKernelProfileListener/onProfileDetailInfoChanged',
-          2,
-          5000,
-          (profile) => profile.uid === uid,
-          uid,
-          [0]
-        )
-      return profile
-    } else {
-      const result = await invoke<{ info: User }>({
-        methodName: 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-        cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-        afterFirstCmd: false,
-        cmdCB: (payload) => payload.info.uid === uid,
-        args: [
         {
           uid,
           bizList: [0]
         },
         null,
       ],
-      })
+      {
+        cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: (payload) => payload.info.uid === uid,
+      }
+    )
     return result.info
   }
-  }
 
-  static async getSkey(): Promise<string> {
+  async getSkey(): Promise<string> {
-    const clientKeyData = await NTQQUserApi.forceFetchClientKey()
+    const clientKeyData = await this.forceFetchClientKey()
     if (clientKeyData?.result !== 0) {
       throw new Error('获取clientKey失败')
     }
-    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + getSelfUin()
+    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
       + '&clientkey=' + clientKeyData.clientKey
       + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
     return (await RequestUtil.HttpsGetCookies(url))?.skey
   }
 
-  @CacheClassFuncAsync(1800 * 1000)
+  async getCookies(domain: string) {
-  static async getCookies(domain: string) {
+    const clientKeyData = await this.forceFetchClientKey()
-    const clientKeyData = await NTQQUserApi.forceFetchClientKey()
     if (clientKeyData?.result !== 0) {
       throw new Error('获取clientKey失败')
     }
-    const uin = getSelfUin()
+    const uin = selfInfo.uin
     const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + clientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + uin + '%2Finfocenter&keyindex=19%27'
-    const cookies: { [key: string]: string; } = await RequestUtil.HttpsGetCookies(requestUrl)
+    const cookies: { [key: string]: string } = await RequestUtil.HttpsGetCookies(requestUrl)
     return cookies
   }
 
-  static genBkn(sKey: string) {
+  async getPSkey(domains: string[]) {
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }, null])
+  }
+
+  genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
 
@@ -146,7 +125,7 @@ export class NTQQUserApi {
     return (hash & 0x7fffffff).toString()
   }
 
-  static async like(uid: string, count = 1) {
+  async like(uid: string, count = 1) {
     const session = getSession()
     if (session) {
       return session.getProfileLikeService().setBuddyProfileLike({
@@ -156,9 +135,9 @@ export class NTQQUserApi {
         doLikeTollCount: 0
       })
     } else {
-      return await invoke<GeneralCallResult & { succCounts: number }>({
+      return await invoke(
-        methodName: 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+        'nodeIKernelProfileLikeService/setBuddyProfileLike',
-        args: [
+        [
           {
             doLikeUserInfo: {
               friendUid: uid,
@@ -169,42 +148,39 @@ export class NTQQUserApi {
           },
           null,
         ],
-      })
+      )
     }
   }
 
-  static async getUidByUinV1(Uin: string) {
+  async getUidByUinV1(uin: string) {
     const session = getSession()
     // 通用转换开始尝试
-    let uid = (await session?.getUixConvertService().getUid([Uin]))?.uidInfo.get(Uin)
+    let uid = (await session?.getUixConvertService().getUid([uin]))?.uidInfo.get(uin)
-    // Uid 好友转
     if (!uid) {
-      friends.forEach((t) => {
+      for (const membersList of this.ctx.ntGroupApi.groupMembers.values()) { //从群友列表转
-        if (t.uin == Uin) {
+        for (const member of membersList.values()) {
-          uid = t.uid
+          if (member.uin === uin) {
-        }
+            uid = member.uid
-      })
+            break
-    }
-    //Uid 群友列表转
-    if (!uid) {
-      for (let groupMembersList of groupMembers.values()) {
-        for (let GroupMember of groupMembersList.values()) {
-          if (GroupMember.uin == Uin) {
-            uid = GroupMember.uid
           }
         }
+        if (uid) break
       }
     }
     if (!uid) {
-      let unveifyUid = (await NTQQUserApi.getUserDetailInfoByUin(Uin)).info.uid;//从QQ Native 特殊转换 方法三
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid //特殊转换
-      if (unveifyUid.indexOf('*') == -1) {
+      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
   }
 
-  static async getUidByUinV2(uin: string) {
+  async getUidByUinV2(uin: string) {
     const session = getSession()
     if (session) {
       let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
@@ -214,96 +190,54 @@ export class NTQQUserApi {
       uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
       if (uid) return uid
     } else {
-      let uid = (await invoke<{ uids: Map<string, string> }>({
+      let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [uin] }])).uids.get(uin)
-        methodName: 'nodeIKernelGroupService/getUidByUins',
-        args: [
-          { uin: [uin] },
-          null,
-        ],
-      })).uids.get(uin)
       if (uid) return uid
-      uid = (await invoke<Map<string, string>>({
+      uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
-        methodName: 'nodeIKernelProfileService/getUidByUin',
-        args: [
-          {
-            callFrom: 'FriendsServiceImpl',
-            uin: [uin],
-          },
-          null,
-        ],
-      })).get(uin)
       if (uid) return uid
-      uid = (await invoke<{ uidInfo: Map<string, string> }>({
+      uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-        methodName: 'nodeIKernelUixConvertService/getUid',
-        args: [
-          { uin: [uin] },
-          null,
-        ],
-      })).uidInfo.get(uin)
       if (uid) return uid
     }
-    const unveifyUid = (await NTQQUserApi.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
     if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  static async getUidByUin(Uin: string) {
+  async getUidByUin(uin: string) {
     if (getBuildVersion() >= 26702) {
-      return await NTQQUserApi.getUidByUinV2(Uin)
+      return this.getUidByUinV2(uin)
     }
-    return await NTQQUserApi.getUidByUinV1(Uin)
+    return this.getUidByUinV1(uin)
   }
 
-  static async getUserDetailInfoByUinV2(uin: string) {
+  async getUserDetailInfoByUinV2(uin: string) {
-    if (NTEventDispatch.initialised) {
+    return await invoke<UserDetailInfoByUinV2>(
-      return await NTEventDispatch.CallNoListenerEvent
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
-        <(Uin: string) => Promise<UserDetailInfoByUinV2>>(
+      [
-          'NodeIKernelProfileService/getUserDetailInfoByUin',
-          5000,
-          uin
-        )
-    } else {
-      return await invoke<UserDetailInfoByUinV2>({
-        methodName: 'nodeIKernelProfileService/getUserDetailInfoByUin',
-        args: [
         { uin },
         null,
       ],
-      })
-    }
-  }
-
-  static async getUserDetailInfoByUin(Uin: string) {
-    return NTEventDispatch.CallNoListenerEvent
-      <(Uin: string) => Promise<UserDetailInfoByUin>>(
-        'NodeIKernelProfileService/getUserDetailInfoByUin',
-        5000,
-        Uin
     )
   }
 
-  static async getUinByUidV1(Uid: string) {
+  async getUserDetailInfoByUin(uin: string) {
-    const ret = await NTEventDispatch.CallNoListenerEvent
+    return await invoke<UserDetailInfoByUin>(
-      <(Uin: string[]) => Promise<{ uinInfo: Map<string, string> }>>(
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
-        'NodeIKernelUixConvertService/getUin',
+      [
-        5000,
+        { uin },
-        [Uid]
+        null,
+      ],
     )
-    let uin = ret.uinInfo.get(Uid)
-    if (!uin) {
-      //从Buddy缓存获取Uin
-      friends.forEach((t) => {
-        if (t.uid == Uid) {
-          uin = t.uin
-        }
-      })
   }
+
+  async getUinByUidV1(uid: string) {
+    const ret = await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])
+    let uin = ret.uinInfo.get(uid)
     if (!uin) {
-      uin = (await NTQQUserApi.getUserDetailInfo(Uid)).uin //从QQ Native 转换
+      uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
     }
     return uin
   }
 
-  static async getUinByUidV2(uid: string) {
+  async getUinByUidV2(uid: string) {
     const session = getSession()
     if (session) {
       let uin = (await session.getGroupService().getUinByUids([uid])).uins.get(uid)
@@ -312,59 +246,69 @@ export class NTQQUserApi {
       if (uin) return uin
       uin = (await session.getUixConvertService().getUin([uid])).uinInfo.get(uid)
       if (uin) return uin
-      return uin
     } else {
-      let uin = (await invoke<{ uins: Map<string, string> }>({
+      let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uid: [uid] }])).uins.get(uid)
-        methodName: 'nodeIKernelGroupService/getUinByUids',
-        args: [
-          { uid: [uid] },
-          null,
-        ],
-      })).uins.get(uid)
       if (uin) return uin
-      uin = (await invoke<Map<string, string>>({
+      uin = (await invoke('nodeIKernelProfileService/getUinByUid', [{ callFrom: 'FriendsServiceImpl', uid: [uid] }])).get(uid)
-        methodName: 'nodeIKernelProfileService/getUinByUid',
-        args: [
-          {
-            callFrom: 'FriendsServiceImpl',
-            uid: [uid],
-          },
-          null,
-        ],
-      })).get(uid)
       if (uin) return uin
-      uin = (await invoke<{ uinInfo: Map<string, string> }>({
+      uin = (await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])).uinInfo.get(uid)
-        methodName: 'nodeIKernelUixConvertService/getUin',
-        args: [
-          { uid: [uid] },
-          null,
-        ],
-      })).uinInfo.get(uid)
       if (uin) return uin
     }
-    let uin = (await NTQQFriendApi.getBuddyIdMap(true)).getKey(uid)
+    let uin = (await this.ctx.ntFriendApi.getBuddyIdMap(true)).get(uid)
     if (uin) return uin
-    uin = (await NTQQUserApi.getUserDetailInfo(uid)).uin //从QQ Native 转换
+    uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
+    return uin
   }
 
-  static async getUinByUid(Uid: string) {
+  async getUinByUid(uid: string) {
     if (getBuildVersion() >= 26702) {
-      return (await NTQQUserApi.getUinByUidV2(Uid))!
+      return this.getUinByUidV2(uid)
     }
-    return await NTQQUserApi.getUinByUidV1(Uid)
+    return this.getUinByUidV1(uid)
   }
 
-  static async forceFetchClientKey() {
+  async forceFetchClientKey() {
     const session = getSession()
     if (session) {
       return await session.getTicketService().forceFetchClientKey('')
     } else {
-      return await invoke<forceFetchClientKeyRetType>({
+      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
-        methodName: 'nodeIKernelTicketService/forceFetchClientKey',
-        args: [{
-          domain: ''
-        }, null],
-      })
     }
   }
+
+  async getSelfNick(refresh = false) {
+    if ((refresh || !selfInfo.nick) && selfInfo.uid) {
+      const userInfo = await this.getUserDetailInfo(selfInfo.uid)
+      if (userInfo) {
+        Object.assign(selfInfo, { nick: userInfo.nick })
+        return userInfo.nick
+      }
+    }
+    return selfInfo.nick
+  }
+
+  async setSelfStatus(status: number, extStatus: number, batteryStatus: number) {
+    return await invoke('nodeIKernelMsgService/setStatus', [{
+      statusReq: {
+        status,
+        extStatus,
+        batteryStatus,
+      }
+    }, null])
+  }
+
+  async getProfileLike(uid: string) {
+    return await invoke('nodeIKernelProfileLikeService/getBuddyProfileLike', [{
+      req: {
+        friendUids: [uid],
+        basic: 1,
+        vote: 1,
+        favorite: 0,
+        userProfile: 1,
+        type: 2,
+        start: 0,
+        limit: 20,
+      }
+    }, null])
+  }
 }

src/ntqqapi/api/webapi.ts

@@ -1,7 +1,12 @@
-import { getSelfUin } from '@/common/data'
-import { log } from '@/common/utils/log'
-import { NTQQUserApi } from './user'
 import { RequestUtil } from '@/common/utils/request'
+import { Service, Context } from 'cordis'
+import { Dict } from 'cosmokit'
+
+declare module 'cordis' {
+  interface Context {
+    ntWebApi: NTQQWebApi
+  }
+}
 
 export enum WebHonorType {
   ALL = 'all',
@@ -36,7 +41,7 @@ interface WebApiGroupMemberRet {
   em: string
   cache: number
   adm_num: number
-  levelname: any
+  levelname: unknown
   mems: WebApiGroupMember[]
   count: number
   svr_time: number
@@ -45,56 +50,6 @@ interface WebApiGroupMemberRet {
   extmode: number
 }
 
-export interface WebApiGroupNoticeFeed {
-  u: number//发送者
-  fid: string//fid
-  pubt: number//时间
-  msg: {
-    text: string
-    text_face: string
-    title: string,
-    pics?: {
-      id: string,
-      w: string,
-      h: string
-    }[]
-  }
-  type: number
-  fn: number
-  cn: number
-  vn: number
-  settings: {
-    is_show_edit_card: number
-    remind_ts: number
-    tip_window_type: number
-    confirm_required: number
-  }
-  read_num: number
-  is_read: number
-  is_all_confirm: number
-}
-
-export interface WebApiGroupNoticeRet {
-  ec: number
-  em: string
-  ltsm: number
-  srv_code: number
-  read_only: number
-  role: number
-  feeds: WebApiGroupNoticeFeed[]
-  group: {
-    group_id: number
-    class_ext: number
-  }
-  sta: number,
-  gln: number
-  tst: number,
-  ui: any
-  server_time: number
-  svrt: number
-  ad: number
-}
-
 interface GroupEssenceMsg {
   group_code: string
   msg_seq: number
@@ -105,7 +60,7 @@ interface GroupEssenceMsg {
   add_digest_uin: string
   add_digest_nick: string
   add_digest_time: number
-  msg_content: any[]
+  msg_content: unknown[]
   can_be_removed: true
 }
 
@@ -120,34 +75,48 @@ export interface GroupEssenceMsgRet {
   }
 }
 
-export class WebApi {
+interface SetGroupNoticeParams {
-  static async getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined> {
+  groupCode: string
-    const { cookies: CookieValue, bkn: Bkn } = (await NTQQUserApi.getCookies('qun.qq.com'))
+  content: string
-    const url = 'https://qun.qq.com/cgi-bin/group_digest/digest_list?bkn=' + Bkn + '&group_code=' + GroupCode + '&page_start=' + page_start + '&page_limit=20'
+  pinned: number
-    let ret: GroupEssenceMsgRet
+  type: number
-    try {
+  isShowEditCard: number
-      ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>(url, 'GET', '', { 'Cookie': CookieValue })
+  tipWindowType: number
-    } catch {
+  confirmRequired: number
-      return undefined
+  picId: string
-    }
+  imgWidth?: number
-    //console.log(url, CookieValue)
+  imgHeight?: number
-    if (ret.retcode !== 0) {
+}
-      return undefined
+
-    }
+interface SetGroupNoticeRet {
-    return ret
+  ec: number
+  em: string
+  id: number
+  ltsm: number
+  new_fid: string
+  read_only: number
+  role: number
+  srv_code: number
+}
+
+export class NTQQWebApi extends Service {
+  static inject = ['ntUserApi']
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntWebApi', true)
   }
 
-  static async getGroupMembers(GroupCode: string, cached: boolean = true): Promise<WebApiGroupMember[]> {
+  async getGroupMembers(groupCode: string): Promise<WebApiGroupMember[]> {
     const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
-    const cookieObject = await NTQQUserApi.getCookies('qun.qq.com')
+    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const cookieStr = Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
+    const cookieStr = this.cookieToString(cookieObject)
     const retList: Promise<WebApiGroupMemberRet>[] = []
     const params = new URLSearchParams({
       st: '0',
       end: '40',
       sort: '1',
-      gc: GroupCode,
+      gc: groupCode,
-      bkn: WebApi.genBkn(cookieObject.skey)
+      bkn: this.genBkn(cookieObject.skey)
     })
     const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
     if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
@@ -178,132 +147,162 @@ export class WebApi {
     return memberData
   }
 
-  static genBkn(sKey: string) {
+  genBkn(sKey: string) {
-    sKey = sKey || '';
+    sKey = sKey || ''
-    let hash = 5381;
+    let hash = 5381
-
     for (let i = 0; i < sKey.length; i++) {
-      const code = sKey.charCodeAt(i);
+      const code = sKey.charCodeAt(i)
-      hash = hash + (hash << 5) + code;
+      hash = hash + (hash << 5) + code
     }
-
+    return (hash & 0x7FFFFFFF).toString()
-    return (hash & 0x7FFFFFFF).toString();
   }
 
   //实现未缓存 考虑2h缓存
-  static async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+  async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
-    async function getDataInternal(Internal_groupCode: string, Internal_type: number) {
+    const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-      let url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString();
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
-      let res = '';
+      let resJson
-      let resJson;
       try {
-        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+        const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
-        const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
+        const match = res.match(/window\.__INITIAL_STATE__=(.*?);/)
         if (match) {
-          resJson = JSON.parse(match[1].trim());
+          resJson = JSON.parse(match[1].trim())
         }
         if (Internal_type === 1) {
-          return resJson?.talkativeList;
+          return resJson?.talkativeList
         } else {
-          return resJson?.actorList;
+          return resJson?.actorList
         }
       } catch (e) {
-        log('获取当前群荣耀失败', url, e);
+        this.ctx.logger.error('获取当前群荣耀失败', url, e)
       }
-      return undefined;
+      return undefined
     }
 
-    let HonorInfo: any = { group_id: groupCode };
+    const honorInfo: Dict = { group_id: groupCode }
-    const CookieValue = (await NTQQUserApi.getCookies('qun.qq.com')).cookies;
+    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
+    const cookieStr = this.cookieToString(cookieObject)
 
     if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
       try {
-        let RetInternal = await getDataInternal(groupCode, 1);
+        const RetInternal = await getDataInternal(groupCode, 1)
         if (!RetInternal) {
-          throw new Error('获取龙王信息失败');
+          throw new Error('获取龙王信息失败')
         }
-        HonorInfo.current_talkative = {
+        honorInfo.current_talkative = {
           user_id: RetInternal[0]?.uin,
           avatar: RetInternal[0]?.avatar,
           nickname: RetInternal[0]?.name,
           day_count: 0,
           description: RetInternal[0]?.desc
         }
-        HonorInfo.talkative_list = [];
+        honorInfo.talkative_list = [];
         for (const talkative_ele of RetInternal) {
-          HonorInfo.talkative_list.push({
+          honorInfo.talkative_list.push({
             user_id: talkative_ele?.uin,
             avatar: talkative_ele?.avatar,
             description: talkative_ele?.desc,
             day_count: 0,
             nickname: talkative_ele?.name
-          });
+          })
         }
       } catch (e) {
-        log(e);
+        this.ctx.logger.error(e)
       }
     }
     if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
       try {
-        let RetInternal = await getDataInternal(groupCode, 2);
+        const RetInternal = await getDataInternal(groupCode, 2)
         if (!RetInternal) {
-          throw new Error('获取群聊之火失败');
+          throw new Error('获取群聊之火失败')
         }
-        HonorInfo.performer_list = [];
+        honorInfo.performer_list = []
         for (const performer_ele of RetInternal) {
-          HonorInfo.performer_list.push({
+          honorInfo.performer_list.push({
             user_id: performer_ele?.uin,
             nickname: performer_ele?.name,
             avatar: performer_ele?.avatar,
             description: performer_ele?.desc
-          });
+          })
         }
       } catch (e) {
-        log(e);
+        this.ctx.logger.error(e)
       }
     }
     if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
       try {
-        let RetInternal = await getDataInternal(groupCode, 3);
+        const RetInternal = await getDataInternal(groupCode, 3)
         if (!RetInternal) {
-          throw new Error('获取群聊炽焰失败');
+          throw new Error('获取群聊炽焰失败')
         }
-        HonorInfo.legend_list = [];
+        honorInfo.legend_list = []
         for (const legend_ele of RetInternal) {
-          HonorInfo.legend_list.push({
+          honorInfo.legend_list.push({
             user_id: legend_ele?.uin,
             nickname: legend_ele?.name,
             avatar: legend_ele?.avatar,
             desc: legend_ele?.description
-          });
+          })
         }
       } catch (e) {
-        log('获取群聊炽焰失败', e);
+        this.ctx.logger.error('获取群聊炽焰失败', e)
       }
     }
     if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
       try {
-        let RetInternal = await getDataInternal(groupCode, 6);
+        const RetInternal = await getDataInternal(groupCode, 6)
         if (!RetInternal) {
-          throw new Error('获取快乐源泉失败');
+          throw new Error('获取快乐源泉失败')
         }
-        HonorInfo.emotion_list = [];
+        honorInfo.emotion_list = []
         for (const emotion_ele of RetInternal) {
-          HonorInfo.emotion_list.push({
+          honorInfo.emotion_list.push({
             user_id: emotion_ele?.uin,
             nickname: emotion_ele?.name,
             avatar: emotion_ele?.avatar,
             desc: emotion_ele?.description
-          });
+          })
         }
       } catch (e) {
-        log('获取快乐源泉失败', e);
+        this.ctx.logger.error('获取快乐源泉失败', e)
       }
     }
     //冒尖小春笋好像已经被tx扬了
     if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
-      HonorInfo.strong_newbie_list = [];
+      honorInfo.strong_newbie_list = []
     }
-    return HonorInfo;
+    return honorInfo
+  }
+
+  async setGroupNotice(params: SetGroupNoticeParams): Promise<SetGroupNoticeRet> {
+    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
+    const settings = JSON.stringify({
+      is_show_edit_card: params.isShowEditCard,
+      tip_window_type: params.tipWindowType,
+      confirm_required: params.confirmRequired
+    })
+
+    return await RequestUtil.HttpGetJson<SetGroupNoticeRet>(
+      `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
+        bkn: this.genBkn(cookieObject.skey),
+        qid: params.groupCode,
+        text: params.content,
+        pinned: params.pinned.toString(),
+        type: params.type.toString(),
+        settings: settings,
+        ...(params.picId !== '' && {
+          pic: params.picId,
+          imgWidth: params.imgWidth?.toString(),
+          imgHeight: params.imgHeight?.toString(),
+        })
+      })}`,
+      'POST',
+      '',
+      { 'Cookie': this.cookieToString(cookieObject) }
+    )
+  }
+
+  private cookieToString(cookieObject: Dict) {
+    return Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
   }
 }

src/ntqqapi/api/window.ts

@@ -1,43 +1,56 @@
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { ReceiveCmd } from '../hook'
+import { ReceiveCmdS } from '../hook'
 import { BrowserWindow } from 'electron'
+import { Service, Context } from 'cordis'
+
+declare module 'cordis' {
+  interface Context {
+    ntWindowApi: NTQQWindowApi
+  }
+}
 
 export interface NTQQWindow {
   windowName: string
   windowUrlHash: string
 }
 
-export class NTQQWindows {
+export namespace NTQQWindows {
-  static GroupHomeWorkWindow: NTQQWindow = {
+  export const GroupHomeWorkWindow: NTQQWindow = {
     windowName: 'GroupHomeWorkWindow',
     windowUrlHash: '#/group-home-work',
   }
-  static GroupNotifyFilterWindow: NTQQWindow = {
+  export const GroupNotifyFilterWindow: NTQQWindow = {
     windowName: 'GroupNotifyFilterWindow',
     windowUrlHash: '#/group-notify-filter',
   }
-  static GroupEssenceWindow: NTQQWindow = {
+  export const GroupEssenceWindow: NTQQWindow = {
     windowName: 'GroupEssenceWindow',
     windowUrlHash: '#/group-essence',
   }
 }
 
-export class NTQQWindowApi {
+export class NTQQWindowApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntWindowApi', true)
+  }
+
   // 打开窗口并获取对应的下发事件
-  static async openWindow<R = GeneralCallResult>(
+  async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
-    args: any[],
+    args: unknown[],
-    cbCmd: ReceiveCmd | undefined,
+    cbCmd: ReceiveCmdS | undefined,
     autoCloseSeconds: number = 2,
   ) {
-    const result = await invoke<R>({
+    const result = await invoke<R>(
+      NTMethod.OPEN_EXTRA_WINDOW,
+      [ntQQWindow.windowName, ...args],
+      {
         className: NTClass.WINDOW_API,
-      methodName: NTMethod.OPEN_EXTRA_WINDOW,
         cbCmd,
         afterFirstCmd: false,
-      args: [ntQQWindow.windowName, ...args],
+      }
-    })
+    )
     setTimeout(() => {
       for (const w of BrowserWindow.getAllWindows()) {
         // log("close window", w.webContents.getURL())

src/ntqqapi/core.ts

@@ -0,0 +1,240 @@
+import fs from 'node:fs'
+import { Service, Context } from 'cordis'
+import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
+import { MessageUnique } from '../common/utils/messageUnique'
+import { Config as LLOBConfig } from '../common/types'
+import { llonebotError } from '../common/globalVars'
+import { isNumeric } from '../common/utils/misc'
+import { NTMethod } from './ntcall'
+import {
+  RawMessage,
+  GroupNotify,
+  FriendRequestNotify,
+  FriendRequest,
+  GroupMember,
+  CategoryFriend,
+  SimpleInfo,
+  User,
+  ChatType
+} from './types'
+import { selfInfo } from '../common/globalVars'
+import { version } from '../version'
+import { invoke } from './ntcall'
+
+declare module 'cordis' {
+  interface Context {
+    app: Core
+  }
+  interface Events {
+    'nt/message-created': (input: RawMessage[]) => void
+    'nt/message-deleted': (input: RawMessage[]) => void
+    'nt/message-sent': (input: RawMessage[]) => void
+    'nt/group-notify': (input: GroupNotify[]) => void
+    'nt/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']
+
+  constructor(protected ctx: Context, public config: Core.Config) {
+    super(ctx, 'app', true)
+  }
+
+  public start() {
+    llonebotError.otherError = ''
+    MessageUnique.init(selfInfo.uin)
+    this.registerListener()
+    this.ctx.logger.info(`LLOneBot/${version}`)
+    this.ctx.on('llonebot/config-updated', input => {
+      Object.assign(this.config, input)
+    })
+  }
+
+  private registerListener() {
+    registerReceiveHook<{
+      data: CategoryFriend[]
+    }>(ReceiveCmdS.FRIENDS, (payload) => {
+      type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
+      let friendList: User[] = []
+      if ('userSimpleInfos' in payload) {
+        friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
+          return {
+            ...v.coreInfo,
+          }
+        })
+      } else {
+        for (const fData of payload.data) {
+          friendList.push(...fData.buddyList)
+        }
+      }
+      this.ctx.logger.info('好友列表变动', friendList.length)
+      for (const friend of friendList) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend })
+      }
+    })
+
+    // 自动清理新消息文件
+    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+      if (!this.config.autoDeleteFile) {
+        return
+      }
+      for (const message of payload.msgList) {
+        for (const msgElement of message.elements) {
+          setTimeout(() => {
+            const picPath = msgElement.picElement?.sourcePath
+            const picThumbPath = [...(msgElement.picElement?.thumbPath ?? []).values()]
+            const pttPath = msgElement.pttElement?.filePath
+            const filePath = msgElement.fileElement?.filePath
+            const videoPath = msgElement.videoElement?.filePath
+            const videoThumbPath = [...(msgElement.videoElement?.thumbPath ?? []).values()]
+            const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
+            if (msgElement.picElement) {
+              pathList.push(...Object.values(msgElement.picElement.thumbPath))
+            }
+            for (const path of pathList) {
+              if (path) {
+                fs.unlink(picPath, () => {
+                  this.ctx.logger.info('删除文件成功', path)
+                })
+              }
+            }
+          }, this.config.autoDeleteFileSecond! * 1000)
+        }
+      }
+    })
+
+    registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
+      Object.assign(selfInfo, { online: info.info.status !== 20 })
+    })
+
+    const activatedPeerUids: string[] = []
+    registerReceiveHook<{
+      changedRecentContactLists: {
+        listType: number
+        sortedContactList: string[]
+        changedList: {
+          id: string // peerUid
+          chatType: ChatType
+        }[]
+      }[]
+    }>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+      for (const recentContact of payload.changedRecentContactLists) {
+        for (const contact of recentContact.changedList) {
+          if (activatedPeerUids.includes(contact.id)) continue
+          activatedPeerUids.push(contact.id)
+          const peer = { peerUid: contact.id, chatType: contact.chatType }
+          if (contact.chatType === ChatType.temp) {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
+              this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+                const lastTempMsg = msgList.at(-1)
+                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
+                  this.ctx.parallel('nt/message-created', [lastTempMsg!])
+                }
+              })
+            })
+          }
+          else {
+            this.ctx.ntMsgApi.activateChat(peer)
+          }
+        }
+      }
+    })
+
+    registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+      const peerUid = payload[0] as string
+      this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
+      let chatType = ChatType.friend
+      if (isNumeric(peerUid)) {
+        chatType = ChatType.group
+      }
+      else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
+        chatType = ChatType.temp
+      }
+      const peer = { peerUid, chatType }
+      await this.ctx.sleep(1000)
+      this.ctx.ntMsgApi.activateChat(peer).then((r) => {
+        this.ctx.logger.info('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
+      })
+    })
+
+    registerReceiveHook<{
+      groupCode: string
+      dataSource: number
+      members: Set<GroupMember>
+    }>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+      const groupCode = payload.groupCode
+      const members = Array.from(payload.members.values())
+      this.ctx.parallel('nt/group-member-info-updated', { groupCode, members })
+    })
+
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
+      this.ctx.parallel('nt/message-created', payload.msgList)
+    })
+
+    const recallMsgIds: string[] = [] // 避免重复上报
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
+      const list = payload.msgList.filter(v => {
+        if (recallMsgIds.includes(v.msgId)) {
+          return false
+        }
+        recallMsgIds.push(v.msgId)
+        return true
+      })
+      this.ctx.parallel('nt/message-deleted', list)
+    })
+
+    registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
+      if (!this.config.reportSelfMessage) {
+        return
+      }
+      this.ctx.parallel('nt/message-sent', [payload.msgRecord])
+    })
+
+    const groupNotifyFlags: string[] = []
+    registerReceiveHook<{
+      doubt: boolean
+      oldestUnreadSeq: string
+      unreadCount: number
+    }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
+      if (payload.unreadCount) {
+        let notifies: GroupNotify[]
+        try {
+          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
+        } catch (e) {
+          return
+        }
+        const list = notifies.filter(v => {
+          const flag = v.group.groupCode + '|' + v.seq + '|' + v.type
+          if (groupNotifyFlags.includes(flag)) {
+            return false
+          }
+          groupNotifyFlags.push(flag)
+          return true
+        })
+        this.ctx.parallel('nt/group-notify', list)
+      }
+    })
+
+    registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
+      this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
+    })
+
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
+
+    registerReceiveHook<{
+      msgBuf: number[]
+    }>('nodeIKernelMsgListener/onRecvSysMsg', payload => {
+      this.ctx.parallel('nt/system-message-created', Uint8Array.from(payload.msgBuf))
+    })
+  }
+}
+
+namespace Core {
+  export interface Config extends LLOBConfig {
+  }
+}
+
+export default Core

src/ntqqapi/entities.ts

@@ -1,3 +1,5 @@
+import ffmpeg from 'fluent-ffmpeg'
+import faceConfig from './helper/face_config.json'
 import {
   AtType,
   ElementType,
@@ -13,24 +15,17 @@ import {
   SendTextElement,
   SendVideoElement,
 } from './types'
-import { promises as fs } from 'node:fs'
+import { stat, writeFile, copyFile, unlink } from 'node:fs/promises'
-import ffmpeg from 'fluent-ffmpeg'
-import { NTQQFileApi } from './api/file'
 import { calculateFileMD5, isGIF } from '../common/utils/file'
-import { log } from '../common/utils/log'
 import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
 import { encodeSilk } from '../common/utils/audio'
-import { isNull } from '../common/utils'
+import { Context } from 'cordis'
-import faceConfig from './helper/face_config.json'
+import { isNullable } from 'cosmokit'
 
-export const mFaceCache = new Map<string, string>() // emojiId -> faceName
+//export const mFaceCache = new Map<string, string>() // emojiId -> faceName
 
-export class SendMsgElementConstructor {
+export namespace SendElementEntities {
-  static poke(groupCode: string, uin: string) {
+  export function text(content: string): SendTextElement {
-    return null
-  }
-
-  static text(content: string): SendTextElement {
     return {
       elementType: ElementType.TEXT,
       elementId: '',
@@ -44,7 +39,7 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
+  export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
     return {
       elementType: ElementType.TEXT,
       elementId: '',
@@ -58,7 +53,7 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
+  export function reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
     return {
       elementType: ElementType.REPLY,
       elementId: '',
@@ -71,8 +66,8 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static async pic(picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
+  export async function pic(ctx: Context, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
-    const { md5, fileName, path, fileSize } = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.PIC, subType)
     if (fileSize === 0) {
       throw '文件异常，大小为0'
     }
@@ -80,7 +75,7 @@ export class SendMsgElementConstructor {
     if (fileSize > 1024 * 1024 * 30) {
       throw `图片过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
     }
-    const imageSize = await NTQQFileApi.getImageSize(picPath)
+    const imageSize = await ctx.ntFileApi.getImageSize(picPath)
     const picElement = {
       md5HexStr: md5,
       fileSize: fileSize.toString(),
@@ -96,7 +91,7 @@ export class SendMsgElementConstructor {
       thumbFileSize: 0,
       summary,
     }
-    log('图片信息', picElement)
+    ctx.logger.info('图片信息', picElement)
     return {
       elementType: ElementType.PIC,
       elementId: '',
@@ -104,34 +99,35 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static async file(filePath: string, fileName: string = '', folderId: string = ''): Promise<SendFileElement> {
+  export async function file(ctx: Context, filePath: string, fileName: string, folderId = ''): Promise<SendFileElement> {
-    const { fileName: _fileName, path, fileSize } = await NTQQFileApi.uploadFile(filePath, ElementType.FILE)
+    const fileSize = (await stat(filePath)).size.toString()
-    if (fileSize === 0) {
+    if (fileSize === '0') {
-      throw '文件异常，大小为 0'
+      ctx.logger.warn(`文件${fileName}异常，大小为 0`)
+      throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
       elementType: ElementType.FILE,
       elementId: '',
       fileElement: {
-        fileName: fileName || _fileName,
+        fileName,
-        folderId: folderId,
+        folderId,
-        filePath: path!,
+        filePath,
-        fileSize: fileSize.toString(),
+        fileSize,
       },
     }
     return element
   }
 
-  static async video(filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+  export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
     try {
-      await fs.stat(filePath)
+      await stat(filePath)
     } catch (e) {
       throw `文件${filePath}异常，不存在`
     }
-    log('复制视频到QQ目录', filePath)
+    ctx.logger.info('复制视频到QQ目录', filePath)
-    let { fileName: _fileName, path, fileSize, md5 } = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
 
-    log('复制视频到QQ目录完成', path)
+    ctx.logger.info('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
       throw '文件异常，大小为0'
     }
@@ -152,21 +148,21 @@ export class SendMsgElementConstructor {
       filePath,
     }
     try {
-      videoInfo = await getVideoInfo(path)
+      videoInfo = await getVideoInfo(ctx, path)
-      log('视频信息', videoInfo)
+      ctx.logger.info('视频信息', videoInfo)
     } catch (e) {
-      log('获取视频信息失败', e)
+      ctx.logger.info('获取视频信息失败', e)
     }
     const createThumb = new Promise<string>((resolve, reject) => {
       const thumbFileName = `${md5}_0.png`
       const thumbPath = pathLib.join(thumbDir, thumbFileName)
-      log('开始生成视频缩略图', filePath)
+      ctx.logger.info('开始生成视频缩略图', filePath)
       let completed = false
 
       function useDefaultThumb() {
         if (completed) return
-        log('获取视频封面失败，使用默认封面')
+        ctx.logger.info('获取视频封面失败，使用默认封面')
-        fs.writeFile(thumbPath, defaultVideoThumb)
+        writeFile(thumbPath, defaultVideoThumb)
           .then(() => {
             resolve(thumbPath)
           })
@@ -175,9 +171,9 @@ export class SendMsgElementConstructor {
 
       setTimeout(useDefaultThumb, 5000)
       ffmpeg(filePath)
-        .on('error', (err) => {
+        .on('error', () => {
           if (diyThumbPath) {
-            fs.copyFile(diyThumbPath, thumbPath)
+            copyFile(diyThumbPath, thumbPath)
               .then(() => {
                 completed = true
                 resolve(thumbPath)
@@ -194,19 +190,19 @@ export class SendMsgElementConstructor {
           size: videoInfo.width + 'x' + videoInfo.height,
         })
         .on('end', () => {
-          log('生成视频缩略图', thumbPath)
+          ctx.logger.info('生成视频缩略图', thumbPath)
           completed = true
           resolve(thumbPath)
         })
     })
-    let thumbPath = new Map()
+    const thumbPath = new Map()
     const _thumbPath = await createThumb
-    log('生成视频缩略图', _thumbPath)
+    ctx.logger.info('生成视频缩略图', _thumbPath)
-    const thumbSize = (await fs.stat(_thumbPath)).size
+    const thumbSize = (await stat(_thumbPath)).size
     // log("生成缩略图", _thumbPath)
     thumbPath.set(0, _thumbPath)
     const thumbMd5 = await calculateFileMD5(_thumbPath)
-    let element: SendVideoElement = {
+    const element: SendVideoElement = {
       elementType: ElementType.VIDEO,
       elementId: '',
       videoElement: {
@@ -232,22 +228,22 @@ export class SendMsgElementConstructor {
         // sourceVideoCodecFormat: 2
       },
     }
-    log('videoElement', element)
+    ctx.logger.info('videoElement', element)
     return element
   }
 
-  static async ptt(pttPath: string): Promise<SendPttElement> {
+  export async function ptt(ctx: Context, pttPath: string): Promise<SendPttElement> {
-    const { converted, path: silkPath, duration } = await encodeSilk(pttPath)
+    const { converted, path: silkPath, duration } = await encodeSilk(ctx, pttPath)
     if (!silkPath) {
       throw '语音转换失败, 请检查语音文件是否正常'
     }
     // log("生成语音", silkPath, duration);
-    const { md5, fileName, path, fileSize } = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.PTT)
     if (fileSize === 0) {
       throw '文件异常，大小为0'
     }
     if (converted) {
-      fs.unlink(silkPath).then()
+      unlink(silkPath)
     }
     return {
       elementType: ElementType.PTT,
@@ -271,7 +267,7 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static face(faceId: number): SendFaceElement {
+  export function face(faceId: number): SendFaceElement {
     // 从face_config.json中获取表情名称
     const sysFaces = faceConfig.sysface
     const emojiFaces = faceConfig.emoji
@@ -300,23 +296,24 @@ export class SendMsgElementConstructor {
     }
   }
 
-  static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement {
+  export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
     return {
       elementType: ElementType.MFACE,
       marketFaceElement: {
+        imageWidth: 300,
+        imageHeight: 300,
         emojiPackageId,
         emojiId,
         key,
-        faceName: faceName || mFaceCache.get(emojiId) || '[商城表情]',
+        faceName: summary || '[商城表情]',
       },
     }
   }
 
-  static dice(resultId: number | null): SendFaceElement {
+  export function dice(resultId?: string | number): SendFaceElement {
     // 实际测试并不能控制结果
-
     // 随机1到6
-    if (isNull(resultId)) resultId = Math.floor(Math.random() * 6) + 1
+    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
     return {
       elementType: ElementType.FACE,
       elementId: '',
@@ -328,7 +325,7 @@ export class SendMsgElementConstructor {
         stickerId: '33',
         sourceType: 1,
         stickerType: 2,
-        resultId: resultId?.toString(),
+        resultId: resultId.toString(),
         surpriseId: '',
         // "randomType": 1,
       },
@@ -336,9 +333,9 @@ export class SendMsgElementConstructor {
   }
 
   // 猜拳(石头剪刀布)表情
-  static rps(resultId: number | null): SendFaceElement {
+  export function rps(resultId?: string | number): SendFaceElement {
     // 实际测试并不能控制结果
-    if (isNull(resultId)) resultId = Math.floor(Math.random() * 3) + 1
+    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
     return {
       elementType: ElementType.FACE,
       elementId: '',
@@ -350,14 +347,14 @@ export class SendMsgElementConstructor {
         stickerId: '34',
         sourceType: 1,
         stickerType: 2,
-        resultId: resultId?.toString(),
+        resultId: resultId.toString(),
         surpriseId: '',
         // "randomType": 1,
       },
     }
   }
 
-  static ark(data: string): SendArkElement {
+  export function ark(data: string): SendArkElement {
     return {
       elementType: ElementType.ARK,
       elementId: '',

src/ntqqapi/helper/rkey.ts

@@ -1,4 +1,4 @@
-import { log } from '@/common/utils'
+import { Context } from 'cordis'
 
 interface ServerRkeyData {
   group_rkey: string
@@ -6,15 +6,15 @@ interface ServerRkeyData {
   expired_time: number
 }
 
-class RkeyManager {
+export class RkeyManager {
-  serverUrl: string = ''
+  private serverUrl: string = ''
   private rkeyData: ServerRkeyData = {
     group_rkey: '',
     private_rkey: '',
     expired_time: 0
   }
 
-  constructor(serverUrl: string) {
+  constructor(protected ctx: Context, serverUrl: string) {
     this.serverUrl = serverUrl
   }
 
@@ -23,7 +23,7 @@ class RkeyManager {
       try {
         await this.refreshRkey()
       } catch (e) {
-        log('获取rkey失败', e)
+        this.ctx.logger.error('获取rkey失败', e)
       }
     }
     return this.rkeyData
@@ -35,7 +35,7 @@ class RkeyManager {
     return now > this.rkeyData.expired_time
   }
 
-  async refreshRkey(): Promise<any> {
+  async refreshRkey() {
     //刷新rkey
     this.rkeyData = await this.fetchServerRkey()
   }
@@ -58,5 +58,3 @@ class RkeyManager {
     })
   }
 }
-
-export const rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey')

src/ntqqapi/hook.ts

@@ -1,75 +1,51 @@
 import type { BrowserWindow } from 'electron'
 import { NTClass, NTMethod } from './ntcall'
-import { NTQQMsgApi } from './api/msg'
-import {
-  CategoryFriend,
-  ChatType,
-  GroupMember,
-  GroupMemberRole,
-  RawMessage,
-  SimpleInfo, User,
-} from './types'
-import {
-  friends,
-  getFriend,
-  getGroupMember,
-  setSelfInfo
-} from '@/common/data'
-import { postOb11Event } from '../onebot11/server/post-ob11-event'
-import { getConfigUtil } from '@/common/config'
-import fs from 'node:fs'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
-import { MessageUnique } from '../common/utils/MessageUnique'
+import { Dict } from 'cosmokit'
-import { isNumeric, sleep } from '@/common/utils'
-import { OB11Constructor } from '../onebot11/constructor'
-import { OB11GroupCardEvent } from '../onebot11/event/notice/OB11GroupCardEvent'
-import { OB11GroupAdminNoticeEvent } from '../onebot11/event/notice/OB11GroupAdminNoticeEvent'
 
-export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
+export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export let ReceiveCmdS = {
+export enum ReceiveCmdS {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
+  FRIENDS = 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
+  SKEY_UPDATE = 'onSkeyUpdate',
-} as const
+}
 
-export type ReceiveCmd = string
+type NTReturnData = [
-
+  {
-interface NTQQApiReturnData<Payload = unknown> extends Array<any> {
-  0: {
     type: 'request'
     eventName: NTClass
     callbackId?: string
-  }
+  },
-  1: {
+  {
-    cmdName: ReceiveCmd
+    cmdName: ReceiveCmdS
     cmdType: 'event'
-    payload: Payload
+    payload: unknown
   }[]
-}
+]
 
 const logHook = false
 
 const receiveHooks: Array<{
-  method: ReceiveCmd[]
+  method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
   id: string
 }> = []
@@ -79,83 +55,61 @@ const callHooks: Array<{
   hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
-export function hookNTQQApiReceive(window: BrowserWindow) {
+export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
-  const originalSend = window.webContents.send
+  window.webContents.send = new Proxy(window.webContents.send, {
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
       try {
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
-      if (logHook && !isLogger) {
+          log('received ntqq api message', args)
-        log(`received ntqq api message: ${channel}`, args)
         }
       } catch { }
-    if (args?.[1] instanceof Array) {
+      if (!onlyLog) {
-      for (const receiveData of args?.[1]) {
+        if (args[2] instanceof Array) {
-        const ntQQApiMethodName = receiveData.cmdName
+          for (const receiveData of args[2]) {
-        // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+            const ntMethodName = receiveData.cmdName
             for (const hook of receiveHooks) {
-          if (hook.method.includes(ntQQApiMethodName)) {
+              if (hook.method.includes(ntMethodName)) {
-            new Promise((resolve, reject) => {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
-              try {
-                hook.hookFunc(receiveData.payload)
-              } catch (e: any) {
-                log('hook error', ntQQApiMethodName, e.stack.toString())
-              }
-              resolve(undefined)
-            }).then()
               }
             }
           }
         }
-    if (args[0]?.callbackId) {
+        if (args[1]?.callbackId) {
-      // log("hookApiCallback", hookApiCallbacks, args)
+          const callbackId = args[1].callbackId
-      const callbackId = args[0].callbackId
           if (hookApiCallbacks[callbackId]) {
-        // log("callback found")
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
-        new Promise((resolve, reject) => {
-          hookApiCallbacks[callbackId](args[1])
-          resolve(undefined)
-        }).then()
             delete hookApiCallbacks[callbackId]
           }
         }
-    originalSend.call(window.webContents, channel, ...args)
       }
-  window.webContents.send = patchSend
+      return target.apply(thisArg, args)
+    },
+  })
 }
 
-export function hookNTQQApiCall(window: BrowserWindow) {
+export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
-  // 监听调用NTQQApi
+  const webContents = window.webContents as Dict
-  let webContents = window.webContents as any
   const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
 
   const proxyIpcMsg = new Proxy(ipc_message_proxy, {
     apply(target, thisArg, args) {
-      // console.log(thisArg, args);
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
-      let isLogger = false
-      try {
-        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
-      } catch (e) { }
       if (!isLogger) {
         try {
           logHook && log('call NTQQ api', thisArg, args)
         } catch (e) { }
+        if (!onlyLog) {
           try {
             const _args: unknown[] = args[3][1]
-          const cmdName: NTMethod = _args[0] as NTMethod
+            const cmdName = _args[0] as NTMethod
             const callParams = _args.slice(1)
             callHooks.forEach((hook) => {
               if (hook.method.includes(cmdName)) {
-              new Promise((resolve, reject) => {
+                Promise.resolve(hook.hookFunc(callParams))
-                try {
-                  hook.hookFunc(callParams)
-                } catch (e: any) {
-                  log('hook call error', e, _args)
-                }
-                resolve(undefined)
-              }).then()
               }
             })
-        } catch (e) { }
+          } catch { }
+        }
       }
       return target.apply(thisArg, args)
     },
@@ -166,20 +120,17 @@ export function hookNTQQApiCall(window: BrowserWindow) {
     webContents._events['-ipc-message'] = proxyIpcMsg
   }
 
-  const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
+  /*const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
-      // console.log(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)
         },
       })
-      let ret = target.apply(thisArg, args)
+      const ret = target.apply(thisArg, args)
-      /*try {
+      //HOOK_LOG && log('call NTQQ invoke api return', ret)
-        HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }*/
       return ret
     },
   })
@@ -187,11 +138,11 @@ export function hookNTQQApiCall(window: BrowserWindow) {
     webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
   } else {
     webContents._events['-ipc-invoke'] = proxyIpcInvoke
-  }
+  }*/
 }
 
 export function registerReceiveHook<PayloadType>(
-  method: ReceiveCmd | ReceiveCmd[],
+  method: string | string[],
   hookFunc: (payload: PayloadType) => void,
 ): string {
   const id = randomUUID()
@@ -199,7 +150,7 @@ export function registerReceiveHook<PayloadType>(
     method = [method]
   }
   receiveHooks.push({
-    method,
+    method: method as ReceiveCmdS[],
     hookFunc,
     id,
   })
@@ -223,299 +174,3 @@ export function removeReceiveHook(id: string) {
   const index = receiveHooks.findIndex((h) => h.id === id)
   receiveHooks.splice(index, 1)
 }
-
-//let activatedGroups: string[] = []
-
-/*async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
-  for (let group of _groups) {
-    log('update group', group.groupCode)
-    if (group.privilegeFlag === 0) {
-      deleteGroup(group.groupCode)
-      continue
-    }
-    //log('update group', group)
-    NTQQMsgApi.activateChat({ peerUid: group.groupCode, chatType: ChatType.group }).then().catch(log)
-    let existGroup = groups.find((g) => g.groupCode == group.groupCode)
-    if (existGroup) {
-      Object.assign(existGroup, group)
-    } else {
-      groups.push(group)
-      existGroup = group
-    }
-
-    if (needUpdate) {
-      const members = await NTQQGroupApi.getGroupMembers(group.groupCode)
-
-      if (members) {
-        existGroup.members = Array.from(members.values())
-      }
-    }
-  }
-}*/
-
-/*async function processGroupEvent(payload: { groupList: Group[] }) {
-  try {
-    const newGroupList = payload.groupList
-    for (const group of newGroupList) {
-      let existGroup = groups.find((g) => g.groupCode == group.groupCode)
-      if (existGroup) {
-        if (existGroup.memberCount > group.memberCount) {
-          log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`)
-          const oldMembers = existGroup.members
-
-          await sleep(200) // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-          const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode)
-
-          group.members = Array.from(newMembers.values())
-          const newMembersSet = new Set<string>() // 建立索引降低时间复杂度
-
-          for (const member of newMembers) {
-            newMembersSet.add(member[1].uin)
-          }
-
-          // 判断bot是否是管理员，如果是管理员不需要从这里得知有人退群，这里的退群无法得知是主动退群还是被踢
-          const selfUin = getSelfUin()
-          const bot = await getGroupMember(group.groupCode, selfUin)
-          if (bot?.role == GroupMemberRole.admin || bot?.role == GroupMemberRole.owner) {
-            continue
-          }
-          for (const member of oldMembers) {
-            if (!newMembersSet.has(member.uin) && member.uin != selfUin) {
-              postOb11Event(
-                new OB11GroupDecreaseEvent(
-                  parseInt(group.groupCode),
-                  parseInt(member.uin),
-                  parseInt(member.uin),
-                  'leave',
-                ),
-              )
-              break
-            }
-          }
-        }
-        if (group.privilegeFlag === 0) {
-          deleteGroup(group.groupCode)
-        }
-      }
-    }
-
-    updateGroups(newGroupList, false).then()
-  } catch (e: any) {
-    updateGroups(payload.groupList).then()
-    log('更新群信息错误', e.stack.toString())
-  }
-}*/
-
-export async function startHook() {
-
-  // 群列表变动
-  /*registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-      updateGroups(payload.groupList).then()
-    }
-    else {
-      if (process.platform == 'win32') {
-        processGroupEvent(payload).then()
-      }
-    }
-  })
-  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动, store", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-      updateGroups(payload.groupList).then()
-    }
-    else {
-      if (process.platform != 'win32') {
-        processGroupEvent(payload).then()
-      }
-    }
-  })*/
-
-  registerReceiveHook<{
-    groupCode: string
-    dataSource: number
-    members: Set<GroupMember>
-  }>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
-    const groupCode = payload.groupCode
-    const members = Array.from(payload.members.values())
-    // log("群成员信息变动", groupCode, members)
-    for (const member of members) {
-      const existMember = await getGroupMember(groupCode, member.uin)
-      if (existMember) {
-        if (member.cardName != existMember.cardName) {
-          log('群成员名片变动', `${groupCode}: ${existMember.uin}`, existMember.cardName, '->', member.cardName)
-          postOb11Event(
-            new OB11GroupCardEvent(parseInt(groupCode), parseInt(member.uin), member.cardName, existMember.cardName),
-          )
-        } else if (member.role != existMember.role) {
-          log('有管理员变动通知')
-          const groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent(
-            member.role == GroupMemberRole.admin ? 'set' : 'unset',
-            parseInt(groupCode),
-            parseInt(member.uin)
-          )
-          postOb11Event(groupAdminNoticeEvent, true)
-        }
-        Object.assign(existMember, member)
-      }
-    }
-    // const existGroup = groups.find(g => g.groupCode == groupCode);
-    // if (existGroup) {
-    //     log("对比群成员", existGroup.members, members)
-    //     for (const member of members) {
-    //         const existMember = existGroup.members.find(m => m.uin == member.uin);
-    //         if (existMember) {
-    //             log("对比群名片", existMember.cardName, member.cardName)
-    //             if (existMember.cardName != member.cardName) {
-    //                 postOB11Event(new OB11GroupCardEvent(parseInt(existGroup.groupCode), parseInt(member.uin), member.cardName, existMember.cardName));
-    //             }
-    //             Object.assign(existMember, member);
-    //         }
-    //     }
-    // }
-  })
-
-  // 好友列表变动
-  registerReceiveHook<{
-    data: CategoryFriend[]
-  }>(ReceiveCmdS.FRIENDS, (payload) => {
-    // log("onBuddyListChange", payload)
-    // let friendListV2: {userSimpleInfos: Map<string, SimpleInfo>} = []
-    type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
-    let friendList: User[] = [];
-    if ((payload as any).userSimpleInfos) {
-      // friendListV2 = payload as any
-      friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
-        return {
-          ...v.coreInfo,
-        }
-      })
-    }
-    else {
-      for (const fData of payload.data) {
-        friendList.push(...fData.buddyList)
-      }
-    }
-    log('好友列表变动', friendList.length)
-    for (let friend of friendList) {
-      NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
-      let existFriend = friends.find((f) => f.uin == friend.uin)
-      if (!existFriend) {
-        friends.push(friend)
-      }
-      else {
-        Object.assign(existFriend, friend)
-      }
-    }
-  })
-
-  registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
-    // 自动清理新消息文件
-    const { autoDeleteFile } = getConfigUtil().getConfig()
-    if (!autoDeleteFile) {
-      return
-    }
-    for (const message of payload.msgList) {
-      // log("收到新消息，push到历史记录", message.msgId)
-      // dbUtil.addMsg(message).then()
-      // 清理文件
-
-      for (const msgElement of message.elements) {
-        setTimeout(() => {
-          const picPath = msgElement.picElement?.sourcePath
-          const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
-          const pttPath = msgElement.pttElement?.filePath
-          const filePath = msgElement.fileElement?.filePath
-          const videoPath = msgElement.videoElement?.filePath
-          const videoThumbPath: string[] = [...msgElement.videoElement.thumbPath?.values()!]
-          const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
-          if (msgElement.picElement) {
-            pathList.push(...Object.values(msgElement.picElement.thumbPath))
-          }
-
-          // log("需要清理的文件", pathList);
-          for (const path of pathList) {
-            if (path) {
-              fs.unlink(picPath, () => {
-                log('删除文件成功', path)
-              })
-            }
-          }
-        }, getConfigUtil().getConfig().autoDeleteFileSecond! * 1000)
-      }
-    }
-  })
-
-  registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
-    const { msgId, chatType, peerUid } = msgRecord
-    const peer = {
-      chatType,
-      peerUid
-    }
-    MessageUnique.createMsg(peer, msgId)
-  })
-
-  registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
-    setSelfInfo({
-      online: info.info.status !== 20
-    })
-  })
-
-  let activatedPeerUids: string[] = []
-  registerReceiveHook<{
-    changedRecentContactLists: {
-      listType: number
-      sortedContactList: string[]
-      changedList: {
-        id: string // peerUid
-        chatType: ChatType
-      }[]
-    }[]
-  }>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
-    for (const recentContact of payload.changedRecentContactLists) {
-      for (const changedContact of recentContact.changedList) {
-        if (activatedPeerUids.includes(changedContact.id)) continue
-        activatedPeerUids.push(changedContact.id)
-        const peer = { peerUid: changedContact.id, chatType: changedContact.chatType }
-        if (changedContact.chatType === ChatType.temp) {
-          log('收到临时会话消息', peer)
-          NTQQMsgApi.activateChatAndGetHistory(peer).then(() => {
-            NTQQMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
-              let lastTempMsg = msgList.pop()
-              log('激活窗口之前的第一条临时会话消息:', lastTempMsg)
-              if (Date.now() / 1000 - parseInt(lastTempMsg?.msgTime!) < 5) {
-                OB11Constructor.message(lastTempMsg!).then((r) => postOb11Event(r))
-              }
-            })
-          })
-        }
-        else {
-          NTQQMsgApi.activateChat(peer).then()
-        }
-      }
-    }
-  })
-
-  registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
-    const peerUid = payload[0] as string
-    log('激活的聊天窗口被删除，准备重新激活', peerUid)
-    let chatType = ChatType.friend
-    if (isNumeric(peerUid)) {
-      chatType = ChatType.group
-    }
-    else {
-      // 检查是否好友
-      if (!(await getFriend(peerUid))) {
-        chatType = ChatType.temp
-      }
-    }
-    const peer = { peerUid, chatType }
-    await sleep(1000)
-    NTQQMsgApi.activateChat(peer).then((r) => {
-      log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
-    })
-  })
-}

src/ntqqapi/listeners/NodeIKernelGroupListener.ts

@@ -1,6 +1,6 @@
 import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/ntqqapi/types'
 
-interface IGroupListener {
+export interface IGroupListener {
   onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void
 
   onGroupExtListUpdate(...args: unknown[]): void
@@ -52,189 +52,7 @@ interface IGroupListener {
   onJoinGroupNoVerifyFlag(...args: unknown[]): void
 
   onGroupArkInviteStateResult(...args: unknown[]): void
+  
   // 发现于Win 9.9.9 23159
   onGroupMemberLevelInfoChange(...args: unknown[]): void
 }
-
-export interface NodeIKernelGroupListener extends IGroupListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IGroupListener): NodeIKernelGroupListener
-}
-
-export class GroupListener implements IGroupListener {
-    // 发现于Win 9.9.9 23159
-    onGroupMemberLevelInfoChange(...args: unknown[]): void {
-
-    }
-    onGetGroupBulletinListResult(...args: unknown[]) {
-    }
-
-    onGroupAllInfoChange(...args: unknown[]) {
-    }
-
-    onGroupBulletinChange(...args: unknown[]) {
-    }
-
-    onGroupBulletinRemindNotify(...args: unknown[]) {
-    }
-
-    onGroupArkInviteStateResult(...args: unknown[]) {
-    }
-
-    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]) {
-    }
-
-    onGroupConfMemberChange(...args: unknown[]) {
-    }
-
-    onGroupDetailInfoChange(...args: unknown[]) {
-    }
-
-    onGroupExtListUpdate(...args: unknown[]) {
-    }
-
-    onGroupFirstBulletinNotify(...args: unknown[]) {
-    }
-
-    onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]) {
-    }
-
-    onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]) {
-    }
-
-    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]) {
-    }
-
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
-    }
-
-    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]) {
-    }
-
-    onGroupsMsgMaskResult(...args: unknown[]) {
-    }
-
-    onGroupStatisticInfoChange(...args: unknown[]) {
-    }
-
-    onJoinGroupNotify(...args: unknown[]) {
-    }
-
-    onJoinGroupNoVerifyFlag(...args: unknown[]) {
-    }
-
-    onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) {
-    }
-
-    onMemberListChange(arg: {
-        sceneId: string,
-        ids: string[],
-        infos: Map<string, GroupMember>, // uid -> GroupMember
-        finish: boolean,
-        hasRobot: boolean
-    }) {
-    }
-
-    onSearchMemberChange(...args: unknown[]) {
-    }
-
-    onShutUpMemberListChanged(...args: unknown[]) {
-    }
-}
-
-export class DebugGroupListener implements IGroupListener {
-    onGroupMemberLevelInfoChange(...args: unknown[]): void {
-        console.log('onGroupMemberLevelInfoChange:', ...args)
-    }
-    onGetGroupBulletinListResult(...args: unknown[]) {
-        console.log('onGetGroupBulletinListResult:', ...args)
-    }
-
-    onGroupAllInfoChange(...args: unknown[]) {
-        console.log('onGroupAllInfoChange:', ...args)
-    }
-
-    onGroupBulletinChange(...args: unknown[]) {
-        console.log('onGroupBulletinChange:', ...args)
-    }
-
-    onGroupBulletinRemindNotify(...args: unknown[]) {
-        console.log('onGroupBulletinRemindNotify:', ...args)
-    }
-
-    onGroupArkInviteStateResult(...args: unknown[]) {
-        console.log('onGroupArkInviteStateResult:', ...args)
-    }
-
-    onGroupBulletinRichMediaDownloadComplete(...args: unknown[]) {
-        console.log('onGroupBulletinRichMediaDownloadComplete:', ...args)
-    }
-
-    onGroupConfMemberChange(...args: unknown[]) {
-        console.log('onGroupConfMemberChange:', ...args)
-    }
-
-    onGroupDetailInfoChange(...args: unknown[]) {
-        console.log('onGroupDetailInfoChange:', ...args)
-    }
-
-    onGroupExtListUpdate(...args: unknown[]) {
-        console.log('onGroupExtListUpdate:', ...args)
-    }
-
-    onGroupFirstBulletinNotify(...args: unknown[]) {
-        console.log('onGroupFirstBulletinNotify:', ...args)
-    }
-
-    onGroupListUpdate(...args: unknown[]) {
-        console.log('onGroupListUpdate:', ...args)
-    }
-
-    onGroupNotifiesUpdated(...args: unknown[]) {
-        console.log('onGroupNotifiesUpdated:', ...args)
-    }
-
-    onGroupBulletinRichMediaProgressUpdate(...args: unknown[]) {
-        console.log('onGroupBulletinRichMediaProgressUpdate:', ...args)
-    }
-
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]) {
-        console.log('onGroupNotifiesUnreadCountUpdated:', ...args)
-    }
-
-    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]) {
-        console.log('onGroupSingleScreenNotifies:')
-    }
-
-    onGroupsMsgMaskResult(...args: unknown[]) {
-        console.log('onGroupsMsgMaskResult:', ...args)
-    }
-
-    onGroupStatisticInfoChange(...args: unknown[]) {
-        console.log('onGroupStatisticInfoChange:', ...args)
-    }
-
-    onJoinGroupNotify(...args: unknown[]) {
-        console.log('onJoinGroupNotify:', ...args)
-    }
-
-    onJoinGroupNoVerifyFlag(...args: unknown[]) {
-        console.log('onJoinGroupNoVerifyFlag:', ...args)
-    }
-
-    onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) {
-        console.log('onMemberInfoChange:', groupCode, changeType, members)
-    }
-
-    onMemberListChange(...args: unknown[]) {
-        console.log('onMemberListChange:', ...args)
-    }
-
-    onSearchMemberChange(...args: unknown[]) {
-        console.log('onSearchMemberChange:', ...args)
-    }
-
-    onShutUpMemberListChanged(...args: unknown[]) {
-        console.log('onShutUpMemberListChanged:', ...args)
-    }
-}

src/ntqqapi/listeners/NodeIKernelMsgListener.ts

@@ -23,15 +23,55 @@ export interface OnRichMediaDownloadCompleteParams {
   userUsedSpacePerDay: unknown | null
 }
 
-export interface onGroupFileInfoUpdateParamType {
+export interface OnGroupFileInfoUpdateParams {
   retCode: number
   retMsg: string
   clientWording: string
   isEnd: boolean
-    item: Array<any>
+  item: {
-    allFileCount: string
+    peerId: string
-    nextIndex: string
+    type: number
-    reqId: string
+    folderInfo?: {
+      folderId: string
+      parentFolderId: string
+      folderName: string
+      createTime: number
+      modifyTime: number
+      createUin: string
+      creatorName: string
+      totalFileCount: number
+      modifyUin: string
+      modifyName: string
+      usedSpace: string
+    }
+    fileInfo?: {
+      fileModelId: string
+      fileId: string
+      fileName: string
+      fileSize: string
+      busId: number
+      uploadedSize: string
+      uploadTime: number
+      deadTime: number
+      modifyTime: number
+      downloadTimes: number
+      sha: string
+      sha3: string
+      md5: string
+      uploaderLocalPath: string
+      uploaderName: string
+      uploaderUin: string
+      parentFolderId: string
+      localPath: string
+      transStatus: number
+      transType: number
+      elementId: string
+      isFolder: boolean
+    }
+  }[]
+  allFileCount: number
+  nextIndex: number
+  reqId: number
 }
 
 // {
@@ -82,7 +122,7 @@ export interface IKernelMsgListener {
 
   onGroupFileInfoAdd(groupItem: unknown): void
 
-    onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType): void
+  onGroupFileInfoUpdate(groupFileListResult: OnGroupFileInfoUpdateParams): void
 
   onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void
 
@@ -225,290 +265,4 @@ export interface IKernelMsgListener {
 
   // 第一次发现于Win 9.9.9 23159
   onBroadcastHelperProgerssUpdate(...args: unknown[]): void
-
-}
-
-export interface NodeIKernelMsgListener extends IKernelMsgListener {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: IKernelMsgListener): NodeIKernelMsgListener
-}
-
-
-export class MsgListener implements IKernelMsgListener {
-    onAddSendMsg(msgRecord: RawMessage) {
-
-    }
-
-    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown) {
-
-    }
-
-    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown) {
-
-    }
-
-    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown) {
-
-    }
-
-    onContactUnreadCntUpdate(hashMap: unknown) {
-
-    }
-
-    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown) {
-
-    }
-
-    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown) {
-
-    }
-
-    onEmojiDownloadComplete(emojiNotifyInfo: unknown) {
-
-    }
-
-    onEmojiResourceUpdate(emojiResourceInfo: unknown) {
-
-    }
-
-    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown) {
-
-    }
-
-    onFileMsgCome(arrayList: unknown) {
-
-    }
-
-    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown) {
-
-    }
-
-    onFirstViewGroupGuildMapping(arrayList: unknown) {
-
-    }
-
-    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown) {
-
-    }
-
-    onGroupFileInfoAdd(groupItem: unknown) {
-
-    }
-
-    onGroupFileInfoUpdate(groupFileListResult: onGroupFileInfoUpdateParamType) {
-
-    }
-
-    onGroupGuildUpdate(groupGuildNotifyInfo: unknown) {
-
-    }
-
-
-    onGroupTransferInfoAdd(groupItem: unknown) {
-
-    }
-
-    onGroupTransferInfoUpdate(groupFileListResult: unknown) {
-
-    }
-
-    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown) {
-
-    }
-
-    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown) {
-
-    }
-
-    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown) {
-
-    }
-
-    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown) {
-
-    }
-
-    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown) {
-
-    }
-
-    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown) {
-
-    }
-
-    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown) {
-
-    }
-
-    onInputStatusPush(inputStatusInfo: unknown) {
-
-    }
-
-    onKickedOffLine(kickedInfo: unknown) {
-
-    }
-
-    onLineDev(arrayList: unknown) {
-
-    }
-
-    onLogLevelChanged(j2: unknown) {
-
-    }
-
-    onMsgAbstractUpdate(arrayList: unknown) {
-
-    }
-
-    onMsgBoxChanged(arrayList: unknown) {
-
-    }
-
-    onMsgDelete(contact: unknown, arrayList: unknown) {
-
-    }
-
-    onMsgEventListUpdate(hashMap: unknown) {
-
-    }
-
-    onMsgInfoListAdd(arrayList: unknown) {
-
-    }
-
-    onMsgInfoListUpdate(msgList: RawMessage[]) {
-
-    }
-
-    onMsgQRCodeStatusChanged(i2: unknown) {
-
-    }
-
-    onMsgRecall(i2: unknown, str: unknown, j2: unknown) {
-
-    }
-
-    onMsgSecurityNotify(msgRecord: unknown) {
-
-    }
-
-    onMsgSettingUpdate(msgSetting: unknown) {
-
-    }
-
-    onNtFirstViewMsgSyncEnd() {
-
-    }
-
-    onNtMsgSyncEnd() {
-
-    }
-
-    onNtMsgSyncStart() {
-
-    }
-
-    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown) {
-
-    }
-
-    onRecvGroupGuildFlag(i2: unknown) {
-
-    }
-
-    onRecvMsg(arrayList: RawMessage[]) {
-
-    }
-
-    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown) {
-
-    }
-
-    onRecvOnlineFileMsg(arrayList: unknown) {
-
-    }
-
-    onRecvS2CMsg(arrayList: unknown) {
-
-    }
-
-    onRecvSysMsg(arrayList: unknown) {
-
-    }
-
-    onRecvUDCFlag(i2: unknown) {
-
-    }
-
-    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) {
-    }
-
-    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown) {
-
-    }
-
-    onRichMediaUploadComplete(fileTransNotifyInfo: unknown) {
-
-    }
-
-    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown) {
-
-    }
-
-    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown) {
-
-    }
-
-    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown) {
-
-    }
-
-    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams) {
-
-    }
-
-    onUnreadCntAfterFirstView(hashMap: unknown) {
-
-    }
-
-    onUnreadCntUpdate(hashMap: unknown) {
-
-    }
-
-    onUserChannelTabStatusChanged(z: unknown) {
-
-    }
-
-    onUserOnlineStatusChanged(z: unknown) {
-
-    }
-
-    onUserTabStatusChanged(arrayList: unknown) {
-
-    }
-
-    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown) {
-
-    }
-
-    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown) {
-
-    }
-
-    // 第一次发现于Linux
-    onUserSecQualityChanged(...args: unknown[]) {
-
-    }
-
-    onMsgWithRichLinkInfoUpdate(...args: unknown[]) {
-
-    }
-
-    onRedTouchChanged(...args: unknown[]) {
-
-    }
-    // 第一次发现于Win 9.9.9-23159
-    onBroadcastHelperProgerssUpdate(...args: unknown[]) {
-
-    }
 }

src/ntqqapi/listeners/NodeIKernelProfileListener.ts

@@ -1,6 +1,6 @@
 import { User, UserDetailInfoListenerArg } from '@/ntqqapi/types'
 
-interface IProfileListener {
+export interface IProfileListener {
   onProfileSimpleChanged(...args: unknown[]): void
 
   onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void
@@ -13,32 +13,3 @@ interface IProfileListener {
 
   onStrangerRemarkChanged(...args: unknown[]): void
 }
-
-export interface NodeIKernelProfileListener extends IProfileListener {
-    new(listener: IProfileListener): NodeIKernelProfileListener
-}
-
-export class ProfileListener implements IProfileListener {
-    onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void {
-
-    }
-    onProfileSimpleChanged(...args: unknown[]) {
-
-    }
-
-    onProfileDetailInfoChanged(profile: User) {
-
-    }
-
-    onStatusUpdate(...args: unknown[]) {
-
-    }
-
-    onSelfStatusChanged(...args: unknown[]) {
-
-    }
-
-    onStrangerRemarkChanged(...args: unknown[]) {
-
-    }
-}

src/ntqqapi/ntcall.ts

@@ -1,8 +1,21 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { log } from '../common/utils/log'
+import { log } from '../common/utils/legacyLog'
 import { randomUUID } from 'node:crypto'
-import { GeneralCallResult } from './services'
+import {
+  GeneralCallResult,
+  NodeIKernelBuddyService,
+  NodeIKernelProfileService,
+  NodeIKernelGroupService,
+  NodeIKernelProfileLikeService,
+  NodeIKernelMsgService,
+  NodeIKernelMSFService,
+  NodeIKernelUixConvertService,
+  NodeIKernelRichMediaService,
+  NodeIKernelTicketService,
+  NodeIKernelTipOffService,
+  NodeIKernelSearchService,
+} from './services'
 
 export enum NTClass {
   NT_API = 'ns-ntApi',
@@ -19,121 +32,112 @@ export enum NTClass {
 }
 
 export enum NTMethod {
-  RECENT_CONTACT = 'nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact',
   ACTIVE_CHAT_PREVIEW = 'nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
   ACTIVE_CHAT_HISTORY = 'nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
   HISTORY_MSG = 'nodeIKernelMsgService/getMsgsIncludeSelf',
   GET_MULTI_MSG = 'nodeIKernelMsgService/getMultiMsg',
   DELETE_ACTIVE_CHAT = 'nodeIKernelMsgService/deleteActiveChatByUid',
-  ENTER_OR_EXIT_AIO = 'nodeIKernelMsgService/enterOrExitAio',
+  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
+  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
 
-  LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
   SELF_INFO = 'fetchAuthData',
-  FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
-
-  GROUPS = 'nodeIKernelGroupService/getGroupList',
-  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
-  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
-  GROUP_MEMBERS_INFO = 'nodeIKernelGroupService/getMemberInfo',
-
-  USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
-  USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
-  USER_DETAIL_INFO_WITH_BIZ_INFO = 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
   FILE_TYPE = 'getFileType',
   FILE_MD5 = 'getFileMd5',
   FILE_COPY = 'copyFile',
   IMAGE_SIZE = 'getImageSizeFromPath',
   FILE_SIZE = 'getFileSize',
-  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+  CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
+  CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
+  CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
+  OPEN_EXTRA_WINDOW = 'openExternalWindow',
 
-  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
-  SEND_MSG = 'nodeIKernelMsgService/sendMsg',
+  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
-  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
-
-  DOWNLOAD_MEDIA = 'nodeIKernelMsgService/downloadRichMedia',
-  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
-  MULTI_FORWARD_MSG = 'nodeIKernelMsgService/multiForwardMsgWithComment', // 合并转发
-  GET_GROUP_NOTICE = 'nodeIKernelGroupService/getSingleScreenNotifies',
   HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
   QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
   GROUP_AT_ALL_REMAIN_COUNT = 'nodeIKernelGroupService/getGroupRemainAtTimes',
-  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
   KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
   MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
   MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
   SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
   SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
-  PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
   SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
-  SET_GROUP_TITLE = 'nodeIKernelGroupService/modifyMemberSpecialTitle',
+
-  ACTIVATE_MEMBER_LIST_CHANGE = 'nodeIKernelGroupListener/onMemberListChange',
+  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
-  ACTIVATE_MEMBER_INFO_CHANGE = 'nodeIKernelGroupListener/onMemberInfoChange',
-  GET_MSG_BOX_INFO = 'nodeIKernelMsgService/getABatchOfContactMsgBoxInfo',
-  GET_GROUP_ALL_INFO = 'nodeIKernelGroupService/getGroupAllInfo',
 
   CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
   CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
-  CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
-  CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
-  CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
   CACHE_SCAN = 'nodeIKernelStorageCleanService/scanCache',
   CACHE_CLEAR = 'nodeIKernelStorageCleanService/clearCacheDataByKeys',
-
   CACHE_CHAT_GET = 'nodeIKernelStorageCleanService/getChatCacheInfo',
   CACHE_FILE_GET = 'nodeIKernelStorageCleanService/getFileCacheInfo',
   CACHE_CHAT_CLEAR = 'nodeIKernelStorageCleanService/clearChatCacheInfo',
-
-  OPEN_EXTRA_WINDOW = 'openExternalWindow',
-
-  SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
 }
 
 export enum NTChannel {
+  IPC_UP_1 = 'IPC_UP_1',
   IPC_UP_2 = 'IPC_UP_2',
   IPC_UP_3 = 'IPC_UP_3',
-  IPC_UP_1 = 'IPC_UP_1',
+  IPC_UP_4 = 'IPC_UP_4'
 }
 
-interface InvokeParams<ReturnType> {
+interface NTService {
-  methodName: string
+  nodeIKernelBuddyService: NodeIKernelBuddyService
+  nodeIKernelProfileService: NodeIKernelProfileService
+  nodeIKernelGroupService: NodeIKernelGroupService
+  nodeIKernelProfileLikeService: NodeIKernelProfileLikeService
+  nodeIKernelMsgService: NodeIKernelMsgService
+  nodeIKernelMSFService: NodeIKernelMSFService
+  nodeIKernelUixConvertService: NodeIKernelUixConvertService
+  nodeIKernelRichMediaService: NodeIKernelRichMediaService
+  nodeIKernelTicketService: NodeIKernelTicketService
+  nodeIKernelTipOffService: NodeIKernelTipOffService
+  nodeIKernelSearchService: NodeIKernelSearchService
+}
+
+interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
   classNameIsRegister?: boolean
-  args?: unknown[]
   cbCmd?: string | string[]
-  cmdCB?: (payload: ReturnType) => boolean
+  cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
   timeout?: number
 }
 
-export function invoke<ReturnType>(params: InvokeParams<ReturnType>) {
+export function invoke<
-  const className = params.className ?? NTClass.NT_API
+  R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
-  const channel = params.channel ?? NTChannel.IPC_UP_2
+  S extends keyof NTService = any,
-  const timeout = params.timeout ?? 5000
+  M extends keyof NTService[S] & string = any
-  const afterFirstCmd = params.afterFirstCmd ?? true
+>(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
-  const uuid = randomUUID()
+  const className = options.className ?? NTClass.NT_API
+  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 (params.classNameIsRegister) {
+  if (options.classNameIsRegister) {
     eventName += '-register'
   }
-  const apiArgs = [params.methodName, ...(params.args ?? [])]
+  return new Promise<R>((resolve, reject) => {
-  //log('callNTQQApi', channel, eventName, apiArgs, uuid)
+    const apiArgs = [method, ...args]
-  return new Promise((resolve: (data: ReturnType) => void, reject) => {
+    const callbackId = randomUUID()
     let success = false
-    if (!params.cbCmd) {
+    if (!options.cbCmd) {
       // QQ后端会返回结果，并且可以根据uuid识别
-      hookApiCallbacks[uuid] = (r: ReturnType) => {
+      hookApiCallbacks[callbackId] = res => {
         success = true
-        resolve(r)
+        resolve(res)
       }
     }
     else {
+      let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        const hookId = registerReceiveHook<ReturnType>(params.cbCmd!, (payload) => {
+        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
-          // log(methodName, "second callback", cbCmd, payload, cmdCB);
+          if (options.cmdCB) {
-          if (!!params.cmdCB) {
+            if (options.cmdCB(payload, result)) {
-            if (params.cmdCB(payload)) {
               removeReceiveHook(hookId)
               success = true
               resolve(payload)
@@ -147,21 +151,21 @@ export function invoke<ReturnType>(params: InvokeParams<ReturnType>) {
         })
       }
       !afterFirstCmd && secondCallback()
-      hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
+      hookApiCallbacks[callbackId] = (res: GeneralCallResult) => {
-        if (result?.result === 0 || result === undefined) {
+        result = res
-          log(`${params.methodName} callback`, result)
+        if (res?.result === 0 || ['undefined', 'number'].includes(typeof res)) {
           afterFirstCmd && secondCallback()
         }
         else {
-          log('ntqq api call failed', result)
+          log('ntqq api call failed,', method, res)
-          reject(`ntqq api call failed, ${result.errMsg}`)
+          reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
         }
       }
     }
     setTimeout(() => {
       if (!success) {
-        log(`ntqq api timeout ${channel}, ${eventName}, ${params.methodName}`, apiArgs)
+        log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
-        reject(`ntqq api timeout ${channel}, ${eventName}, ${params.methodName}, ${apiArgs}`)
+        reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
       }
     }, timeout)
 
@@ -169,11 +173,11 @@ export function invoke<ReturnType>(params: InvokeParams<ReturnType>) {
       channel,
       {
         sender: {
-          send: (..._args: unknown[]) => {
+          send: () => {
           },
         },
       },
-      { type: 'request', callbackId: uuid, eventName },
+      { type: 'request', callbackId, eventName },
       apiArgs,
     )
   })

src/ntqqapi/proto/compiled.d.ts

@@ -0,0 +1,768 @@
+import * as $protobuf from "protobufjs";
+import Long = require("long");
+/** Namespace SysMsg. */
+export namespace SysMsg {
+
+    /** Properties of a SystemMessage. */
+    interface ISystemMessage {
+
+        /** SystemMessage header */
+        header?: (SysMsg.ISystemMessageHeader[]|null);
+
+        /** SystemMessage msgSpec */
+        msgSpec?: (SysMsg.ISystemMessageMsgSpec[]|null);
+
+        /** SystemMessage bodyWrapper */
+        bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+    }
+
+    /** Represents a SystemMessage. */
+    class SystemMessage implements ISystemMessage {
+
+        /**
+         * Constructs a new SystemMessage.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessage);
+
+        /** SystemMessage header. */
+        public header: SysMsg.ISystemMessageHeader[];
+
+        /** SystemMessage msgSpec. */
+        public msgSpec: SysMsg.ISystemMessageMsgSpec[];
+
+        /** SystemMessage bodyWrapper. */
+        public bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+
+        /**
+         * Creates a new SystemMessage instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns SystemMessage instance
+         */
+        public static create(properties?: SysMsg.ISystemMessage): SysMsg.SystemMessage;
+
+        /**
+         * Encodes the specified SystemMessage message. Does not implicitly {@link SysMsg.SystemMessage.verify|verify} messages.
+         * @param message SystemMessage message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ISystemMessage, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified SystemMessage message, length delimited. Does not implicitly {@link SysMsg.SystemMessage.verify|verify} messages.
+         * @param message SystemMessage message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ISystemMessage, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessage;
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessage;
+
+        /**
+         * Verifies a SystemMessage message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a SystemMessage message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns SystemMessage
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessage;
+
+        /**
+         * Creates a plain object from a SystemMessage message. Also converts values to other types if specified.
+         * @param message SystemMessage
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.SystemMessage, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this SystemMessage to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for SystemMessage
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageHeader. */
+    interface ISystemMessageHeader {
+
+        /** SystemMessageHeader peerNumber */
+        peerNumber?: (number|null);
+
+        /** SystemMessageHeader peerString */
+        peerString?: (string|null);
+
+        /** SystemMessageHeader uin */
+        uin?: (number|null);
+
+        /** SystemMessageHeader uid */
+        uid?: (string|null);
+    }
+
+    /** Represents a SystemMessageHeader. */
+    class SystemMessageHeader implements ISystemMessageHeader {
+
+        /**
+         * Constructs a new SystemMessageHeader.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageHeader);
+
+        /** SystemMessageHeader peerNumber. */
+        public peerNumber: number;
+
+        /** SystemMessageHeader peerString. */
+        public peerString: string;
+
+        /** SystemMessageHeader uin. */
+        public uin: number;
+
+        /** SystemMessageHeader uid. */
+        public uid?: (string|null);
+
+        /**
+         * Creates a new SystemMessageHeader instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns SystemMessageHeader instance
+         */
+        public static create(properties?: SysMsg.ISystemMessageHeader): SysMsg.SystemMessageHeader;
+
+        /**
+         * Encodes the specified SystemMessageHeader message. Does not implicitly {@link SysMsg.SystemMessageHeader.verify|verify} messages.
+         * @param message SystemMessageHeader message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ISystemMessageHeader, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified SystemMessageHeader message, length delimited. Does not implicitly {@link SysMsg.SystemMessageHeader.verify|verify} messages.
+         * @param message SystemMessageHeader message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ISystemMessageHeader, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageHeader;
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageHeader;
+
+        /**
+         * Verifies a SystemMessageHeader message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a SystemMessageHeader message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns SystemMessageHeader
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageHeader;
+
+        /**
+         * Creates a plain object from a SystemMessageHeader message. Also converts values to other types if specified.
+         * @param message SystemMessageHeader
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.SystemMessageHeader, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this SystemMessageHeader to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for SystemMessageHeader
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageMsgSpec. */
+    interface ISystemMessageMsgSpec {
+
+        /** SystemMessageMsgSpec msgType */
+        msgType?: (number|null);
+
+        /** SystemMessageMsgSpec subType */
+        subType?: (number|null);
+
+        /** SystemMessageMsgSpec subSubType */
+        subSubType?: (number|null);
+
+        /** SystemMessageMsgSpec msgSeq */
+        msgSeq?: (number|null);
+
+        /** SystemMessageMsgSpec time */
+        time?: (number|null);
+
+        /** SystemMessageMsgSpec other */
+        other?: (number|null);
+    }
+
+    /** Represents a SystemMessageMsgSpec. */
+    class SystemMessageMsgSpec implements ISystemMessageMsgSpec {
+
+        /**
+         * Constructs a new SystemMessageMsgSpec.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageMsgSpec);
+
+        /** SystemMessageMsgSpec msgType. */
+        public msgType: number;
+
+        /** SystemMessageMsgSpec subType. */
+        public subType: number;
+
+        /** SystemMessageMsgSpec subSubType. */
+        public subSubType: number;
+
+        /** SystemMessageMsgSpec msgSeq. */
+        public msgSeq: number;
+
+        /** SystemMessageMsgSpec time. */
+        public time: number;
+
+        /** SystemMessageMsgSpec other. */
+        public other: number;
+
+        /**
+         * Creates a new SystemMessageMsgSpec instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns SystemMessageMsgSpec instance
+         */
+        public static create(properties?: SysMsg.ISystemMessageMsgSpec): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Encodes the specified SystemMessageMsgSpec message. Does not implicitly {@link SysMsg.SystemMessageMsgSpec.verify|verify} messages.
+         * @param message SystemMessageMsgSpec message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ISystemMessageMsgSpec, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified SystemMessageMsgSpec message, length delimited. Does not implicitly {@link SysMsg.SystemMessageMsgSpec.verify|verify} messages.
+         * @param message SystemMessageMsgSpec message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ISystemMessageMsgSpec, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Verifies a SystemMessageMsgSpec message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a SystemMessageMsgSpec message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns SystemMessageMsgSpec
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Creates a plain object from a SystemMessageMsgSpec message. Also converts values to other types if specified.
+         * @param message SystemMessageMsgSpec
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.SystemMessageMsgSpec, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this SystemMessageMsgSpec to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for SystemMessageMsgSpec
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageBodyWrapper. */
+    interface ISystemMessageBodyWrapper {
+
+        /** SystemMessageBodyWrapper body */
+        body?: (Uint8Array|null);
+    }
+
+    /** Represents a SystemMessageBodyWrapper. */
+    class SystemMessageBodyWrapper implements ISystemMessageBodyWrapper {
+
+        /**
+         * Constructs a new SystemMessageBodyWrapper.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageBodyWrapper);
+
+        /** SystemMessageBodyWrapper body. */
+        public body: Uint8Array;
+
+        /**
+         * Creates a new SystemMessageBodyWrapper instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns SystemMessageBodyWrapper instance
+         */
+        public static create(properties?: SysMsg.ISystemMessageBodyWrapper): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Encodes the specified SystemMessageBodyWrapper message. Does not implicitly {@link SysMsg.SystemMessageBodyWrapper.verify|verify} messages.
+         * @param message SystemMessageBodyWrapper message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ISystemMessageBodyWrapper, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified SystemMessageBodyWrapper message, length delimited. Does not implicitly {@link SysMsg.SystemMessageBodyWrapper.verify|verify} messages.
+         * @param message SystemMessageBodyWrapper message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ISystemMessageBodyWrapper, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Verifies a SystemMessageBodyWrapper message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a SystemMessageBodyWrapper message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns SystemMessageBodyWrapper
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Creates a plain object from a SystemMessageBodyWrapper message. Also converts values to other types if specified.
+         * @param message SystemMessageBodyWrapper
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.SystemMessageBodyWrapper, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this SystemMessageBodyWrapper to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for SystemMessageBodyWrapper
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeDetail. */
+    interface ILikeDetail {
+
+        /** LikeDetail txt */
+        txt?: (string|null);
+
+        /** LikeDetail uin */
+        uin?: (number|null);
+
+        /** LikeDetail nickname */
+        nickname?: (string|null);
+    }
+
+    /** Represents a LikeDetail. */
+    class LikeDetail implements ILikeDetail {
+
+        /**
+         * Constructs a new LikeDetail.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeDetail);
+
+        /** LikeDetail txt. */
+        public txt: string;
+
+        /** LikeDetail uin. */
+        public uin: number;
+
+        /** LikeDetail nickname. */
+        public nickname: string;
+
+        /**
+         * Creates a new LikeDetail instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns LikeDetail instance
+         */
+        public static create(properties?: SysMsg.ILikeDetail): SysMsg.LikeDetail;
+
+        /**
+         * Encodes the specified LikeDetail message. Does not implicitly {@link SysMsg.LikeDetail.verify|verify} messages.
+         * @param message LikeDetail message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ILikeDetail, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified LikeDetail message, length delimited. Does not implicitly {@link SysMsg.LikeDetail.verify|verify} messages.
+         * @param message LikeDetail message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ILikeDetail, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeDetail;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeDetail;
+
+        /**
+         * Verifies a LikeDetail message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a LikeDetail message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns LikeDetail
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.LikeDetail;
+
+        /**
+         * Creates a plain object from a LikeDetail message. Also converts values to other types if specified.
+         * @param message LikeDetail
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.LikeDetail, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this LikeDetail to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for LikeDetail
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeMsg. */
+    interface ILikeMsg {
+
+        /** LikeMsg count */
+        count?: (number|null);
+
+        /** LikeMsg time */
+        time?: (number|null);
+
+        /** LikeMsg detail */
+        detail?: (SysMsg.ILikeDetail|null);
+    }
+
+    /** Represents a LikeMsg. */
+    class LikeMsg implements ILikeMsg {
+
+        /**
+         * Constructs a new LikeMsg.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeMsg);
+
+        /** LikeMsg count. */
+        public count: number;
+
+        /** LikeMsg time. */
+        public time: number;
+
+        /** LikeMsg detail. */
+        public detail?: (SysMsg.ILikeDetail|null);
+
+        /**
+         * Creates a new LikeMsg instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns LikeMsg instance
+         */
+        public static create(properties?: SysMsg.ILikeMsg): SysMsg.LikeMsg;
+
+        /**
+         * Encodes the specified LikeMsg message. Does not implicitly {@link SysMsg.LikeMsg.verify|verify} messages.
+         * @param message LikeMsg message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.ILikeMsg, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified LikeMsg message, length delimited. Does not implicitly {@link SysMsg.LikeMsg.verify|verify} messages.
+         * @param message LikeMsg message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.ILikeMsg, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeMsg;
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeMsg;
+
+        /**
+         * Verifies a LikeMsg message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a LikeMsg message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns LikeMsg
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.LikeMsg;
+
+        /**
+         * Creates a plain object from a LikeMsg message. Also converts values to other types if specified.
+         * @param message LikeMsg
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.LikeMsg, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this LikeMsg to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for LikeMsg
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a ProfileLikeTip. */
+    interface IProfileLikeTip {
+
+        /** ProfileLikeTip msg */
+        msg?: (SysMsg.ILikeMsg|null);
+    }
+
+    /** Represents a ProfileLikeTip. */
+    class ProfileLikeTip implements IProfileLikeTip {
+
+        /**
+         * Constructs a new ProfileLikeTip.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.IProfileLikeTip);
+
+        /** ProfileLikeTip msg. */
+        public msg?: (SysMsg.ILikeMsg|null);
+
+        /**
+         * Creates a new ProfileLikeTip instance using the specified properties.
+         * @param [properties] Properties to set
+         * @returns ProfileLikeTip instance
+         */
+        public static create(properties?: SysMsg.IProfileLikeTip): SysMsg.ProfileLikeTip;
+
+        /**
+         * Encodes the specified ProfileLikeTip message. Does not implicitly {@link SysMsg.ProfileLikeTip.verify|verify} messages.
+         * @param message ProfileLikeTip message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encode(message: SysMsg.IProfileLikeTip, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Encodes the specified ProfileLikeTip message, length delimited. Does not implicitly {@link SysMsg.ProfileLikeTip.verify|verify} messages.
+         * @param message ProfileLikeTip message or plain object to encode
+         * @param [writer] Writer to encode to
+         * @returns Writer
+         */
+        public static encodeDelimited(message: SysMsg.IProfileLikeTip, writer?: $protobuf.Writer): $protobuf.Writer;
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.ProfileLikeTip;
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeTip;
+
+        /**
+         * Verifies a ProfileLikeTip message.
+         * @param message Plain object to verify
+         * @returns `null` if valid, otherwise the reason why it is not
+         */
+        public static verify(message: { [k: string]: any }): (string|null);
+
+        /**
+         * Creates a ProfileLikeTip message from a plain object. Also converts values to their respective internal types.
+         * @param object Plain object
+         * @returns ProfileLikeTip
+         */
+        public static fromObject(object: { [k: string]: any }): SysMsg.ProfileLikeTip;
+
+        /**
+         * Creates a plain object from a ProfileLikeTip message. Also converts values to other types if specified.
+         * @param message ProfileLikeTip
+         * @param [options] Conversion options
+         * @returns Plain object
+         */
+        public static toObject(message: SysMsg.ProfileLikeTip, options?: $protobuf.IConversionOptions): { [k: string]: any };
+
+        /**
+         * Converts this ProfileLikeTip to JSON.
+         * @returns JSON object
+         */
+        public toJSON(): { [k: string]: any };
+
+        /**
+         * Gets the default type url for ProfileLikeTip
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+}

src/ntqqapi/proto/profileLikeTip.proto

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

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

@@ -29,7 +29,7 @@ export interface NodeIKernelBuddyService {
       buddyUids: Array<string>//Uids
     }>>
 
-    addKernelBuddyListener(listener: any): number
+  addKernelBuddyListener(listener: unknown): number
 
   getAllBuddyCount(): number
 

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,14 +1,12 @@
-import { NodeIKernelGroupListener } from '@/ntqqapi/listeners'
 import {
   GroupExtParam,
   GroupMember,
   GroupMemberRole,
-    GroupNotifyTypes,
+  GroupNotifyType,
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-
+import { Dict } from 'cosmokit'
-//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
 
 export interface NodeIKernelGroupService {
   getMemberCommonInfo(Req: {
@@ -29,8 +27,10 @@ export interface NodeIKernelGroupService {
     onlineFlag: string,
     realSpecialTitleFlag: number
   }): Promise<unknown>
+
   //26702
   getGroupMemberLevelInfo(groupCode: string): Promise<unknown>
+
   //26702
   getGroupHonorList(groupCodes: Array<string>): unknown
 
@@ -45,6 +45,7 @@ export interface NodeIKernelGroupService {
     errMsg: string,
     uids: Map<string, string>
   }>
+
   //26702(其实更早 但是我不知道)
   checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
 
@@ -70,12 +71,16 @@ export interface NodeIKernelGroupService {
       brief: string
     }
   }): Promise<unknown>
+
   //26702(其实更早 但是我不知道)
   isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+
   //26702(其实更早 但是我不知道)
   queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+
   //26702(其实更早 但是我不知道)
   fetchGroupEssenceList(Req: { groupCode: string, pageStart: number, pageLimit: number }, Arg: unknown): Promise<unknown>
+
   //26702
   getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
     errCode: number,
@@ -85,7 +90,7 @@ export interface NodeIKernelGroupService {
         uid: string,
         index: number//0
       }>,
-            infos: {},
+      infos: Dict,
       finish: true,
       hasRobot: false
     }
@@ -93,7 +98,7 @@ export interface NodeIKernelGroupService {
 
   setHeader(uid: string, path: string): unknown
 
-    addKernelGroupListener(listener: NodeIKernelGroupListener): number
+  addKernelGroupListener(listener: unknown): number
 
   removeKernelGroupListener(listenerId: unknown): void
 
@@ -171,7 +176,7 @@ export interface NodeIKernelGroupService {
 
   clearGroupNotifies(groupCode: string): void
 
-    getGroupNotifiesUnreadCount(unknown: Boolean): Promise<GeneralCallResult>
+  getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>
 
   clearGroupNotifiesUnreadCount(groupCode: string): void
 
@@ -181,7 +186,7 @@ export interface NodeIKernelGroupService {
       operateType: GroupRequestOperateTypes, // 2 拒绝
       targetMsg: {
         seq: string,  // 通知序列号
-                type: GroupNotifyTypes,
+        type: GroupNotifyType,
         groupCode: string,
         postscript: string
       }
@@ -193,15 +198,16 @@ export interface NodeIKernelGroupService {
 
   deleteGroupBulletin(groupCode: string, seq: string): void
 
-    publishGroupBulletin(groupCode: string, pskey: string, data: any): Promise<GeneralCallResult>
+  publishGroupBulletin(groupCode: string, pskey: string, data: unknown): Promise<GeneralCallResult>
 
   publishInstructionForNewcomers(groupCode: string, arg: unknown): void
 
-    uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<GeneralCallResult & {
+  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
     errCode: number
+    errMsg: string
     picInfo?: {
-            id: string,
+      id: string
-            width: number,
+      width: number
       height: number
     }
   }>

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,6 +1,6 @@
 import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
-import { NodeIKernelMsgListener } from '@/ntqqapi/listeners/NodeIKernelMsgListener'
 import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
 
 export interface QueryMsgsParams {
   chatInfo: Peer,
@@ -29,16 +29,15 @@ export interface TmpChatInfo {
 }
 
 export interface NodeIKernelMsgService {
-
   generateMsgUniqueId(chatType: number, time: string): string
 
-    addKernelMsgListener(nodeIKernelMsgListener: NodeIKernelMsgListener): number
+  addKernelMsgListener(nodeIKernelMsgListener: unknown): number
 
-    sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<GeneralCallResult>
+  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 
-    addKernelMsgImportToolListener(arg: Object): unknown
+  addKernelMsgImportToolListener(arg: Dict): unknown
 
   removeKernelMsgListener(args: unknown): unknown
 
@@ -52,7 +51,7 @@ export interface NodeIKernelMsgService {
 
   getOnLineDev(): void
 
-    kickOffLine(DevInfo: Object): unknown
+  kickOffLine(DevInfo: Dict): unknown
 
   setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
 
@@ -81,11 +80,11 @@ export interface NodeIKernelMsgService {
   // this.voipToken = bArr2
   // this.profileId = str
 
-    setToken(arg: Object): unknown
+  setToken(arg: Dict): unknown
 
   switchForeGround(): unknown
 
-    switchBackGround(arg: Object): unknown
+  switchBackGround(arg: Dict): unknown
 
   //hex
   setTokenForMqq(token: string): unknown
@@ -110,13 +109,12 @@ export interface NodeIKernelMsgService {
 
   resendMsg(...args: unknown[]): unknown
 
-    recallMsg(...args: unknown[]): unknown
-
   reeditRecallMsg(...args: unknown[]): unknown
+
   //调用请检查除开commentElements其余参数不能为null
   forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>
 
-    forwardMsgWithComment(...args: unknown[]): unknown
+  forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
 
   forwardSubMsgWithComment(...args: unknown[]): unknown
 
@@ -144,9 +142,9 @@ export interface NodeIKernelMsgService {
 
   addLocalTofuRecordMsg(...args: unknown[]): unknown
 
-    addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<any> | number, front: boolean): Promise<unknown>
+  addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<unknown> | number, front: boolean): Promise<unknown>
 
-    deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<any>
+  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<unknown>
 
   updateElementExtBufForUI(...args: unknown[]): unknown
 
@@ -170,9 +168,10 @@ export interface NodeIKernelMsgService {
 
   getLastMessageList(peer: Peer[]): Promise<unknown>
 
-    getAioFirstViewLatestMsgs(peer: Peer, num: number): unknown
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
+    msgList: RawMessage[]
+  }>
 
-    //deprecated 从9.9.15-26702版本开始，该接口已经废弃，请使用getMsgsEx
   getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>
 
   getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
@@ -371,8 +370,9 @@ export interface NodeIKernelMsgService {
   getFileThumbSavePathForSend(...args: unknown[]): unknown
 
   getFileThumbSavePath(...args: unknown[]): unknown
+
   //猜测居多
-    translatePtt2Text(MsgId: string, Peer: {}, MsgElement: {}): unknown
+  translatePtt2Text(MsgId: string, Peer: Dict, MsgElement: Dict): unknown
 
   setPttPlayedState(...args: unknown[]): unknown
   // NodeIQQNTWrapperSession fetchFavEmojiList [
@@ -449,7 +449,7 @@ export interface NodeIKernelMsgService {
 
   getEmojiResourcePath(...args: unknown[]): unknown
 
-    JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: any/*joinDragonGroupEmojiReq*/): unknown
+  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown
 
   getMsgAbstracts(...args: unknown[]): unknown
 
@@ -624,7 +624,6 @@ export interface NodeIKernelMsgService {
 
   sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>
 
-    //chattype,uid->Promise<any>
   getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>
 
   setContactLocalTop(...args: unknown[]): unknown
@@ -655,7 +654,7 @@ export interface NodeIKernelMsgService {
 
   recordEmoji(...args: unknown[]): unknown
 
-    fetchGetHitEmotionsByWord(args: Object): Promise<unknown>//表情推荐？
+  fetchGetHitEmotionsByWord(args: Dict): Promise<unknown>//表情推荐？
 
   deleteAllRoamMsgs(...args: unknown[]): unknown//漫游消息？
 

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

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

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -16,9 +16,9 @@ export enum ProfileBizType {
 }
 
 export interface NodeIKernelProfileService {
-  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string,string>>//uin->uid
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>//uin->uid
 
-  getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string,string>>
+  getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>
 
   // {
   //   coreInfo: CoreInfo,
@@ -33,7 +33,7 @@ export interface NodeIKernelProfileService {
 
   fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>
 
-  addKernelProfileListener(listener: any): number
+  addKernelProfileListener(listener: unknown): number
 
   removeKernelProfileListener(listenerId: number): void
 
@@ -64,7 +64,7 @@ export interface NodeIKernelProfileService {
 
   modifySelfProfile(...args: unknown[]): Promise<unknown>
 
-  modifyDesktopMiniProfile(param: any): Promise<GeneralCallResult>
+  modifyDesktopMiniProfile(param: unknown): Promise<GeneralCallResult>
 
   setNickName(NickName: string): Promise<unknown>
 
@@ -74,7 +74,7 @@ export interface NodeIKernelProfileService {
 
   setGander(...args: unknown[]): Promise<unknown>
 
-  setHeader(arg: string): Promise<unknown>
+  setHeader(arg: string): Promise<GeneralCallResult>
 
   setRecommendImgFlag(...args: unknown[]): Promise<unknown>
 
@@ -82,9 +82,9 @@ export interface NodeIKernelProfileService {
 
   getUserDetailInfo(uid: string): Promise<unknown>
 
-  getUserDetailInfoWithBizInfo(uid: string, Biz: any[]): Promise<GeneralCallResult>
+  getUserDetailInfoWithBizInfo(uid: string, Biz: unknown[]): Promise<GeneralCallResult>
 
-  getUserDetailInfoByUin(uin: string): Promise<any>
+  getUserDetailInfoByUin(uin: string): Promise<unknown>
 
   getZplanAvatarInfos(args: string[]): Promise<unknown>
 
@@ -99,7 +99,7 @@ export interface NodeIKernelProfileService {
   getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>
 
   //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList)
-  getCoreInfo(name: string, arg: any[]): unknown
+  getCoreInfo(name: string, arg: unknown[]): unknown
 
   //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>())
   isNull(): boolean

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -169,18 +169,14 @@ export interface NodeIKernelRichMediaService {
 
   downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown
 
-    createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: any, groupItem: Array<any> } }>
+  createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: Array<unknown> } }>
 
   downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown
 
-    createGroupFolder(arg1: unknown, arg2: unknown): unknown
-
   downloadGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
 
   renameGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
 
-    deleteGroupFolder(arg1: unknown, arg2: unknown): unknown
-
   deleteTransferInfo(arg1: unknown, arg2: unknown): unknown
 
   cancelTransferTask(arg1: unknown, arg2: unknown, arg3: unknown): unknown
@@ -226,9 +222,9 @@ export interface NodeIKernelRichMediaService {
 
   deleteGroupFile(GroupCode: string, params: Array<number>, Files: Array<string>): Promise<GeneralCallResult & {
     transGroupFileResult: {
-            result: any
+      result: unknown
-            successFileIdList: Array<any>
+      successFileIdList: Array<unknown>
-            failFileIdList: Array<any>
+      failFileIdList: Array<unknown>
     }
   }>
 

src/ntqqapi/services/NodeIKernelSearchService.ts

@@ -1,75 +1,75 @@
 import { ChatType } from '../types'
 
 export interface NodeIKernelSearchService {
-    addKernelSearchListener(...args: any[]): unknown// needs 1 arguments
+  addKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
 
-    removeKernelSearchListener(...args: any[]): unknown// needs 1 arguments
+  removeKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
 
-    searchStranger(...args: any[]): unknown// needs 3 arguments
+  searchStranger(...args: unknown[]): unknown// needs 3 arguments
 
-    searchGroup(...args: any[]): unknown// needs 1 arguments
+  searchGroup(...args: unknown[]): unknown// needs 1 arguments
 
   searchLocalInfo(keywords: string, unknown: number/*4*/): unknown
 
-    cancelSearchLocalInfo(...args: any[]): unknown// needs 3 arguments
+  cancelSearchLocalInfo(...args: unknown[]): unknown// needs 3 arguments
 
-    searchBuddyChatInfo(...args: any[]): unknown// needs 2 arguments
+  searchBuddyChatInfo(...args: unknown[]): unknown// needs 2 arguments
 
-    searchMoreBuddyChatInfo(...args: any[]): unknown// needs 1 arguments
+  searchMoreBuddyChatInfo(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchBuddyChatInfo(...args: any[]): unknown// needs 3 arguments
+  cancelSearchBuddyChatInfo(...args: unknown[]): unknown// needs 3 arguments
 
-    searchContact(...args: any[]): unknown// needs 2 arguments
+  searchContact(...args: unknown[]): unknown// needs 2 arguments
 
-    searchMoreContact(...args: any[]): unknown// needs 1 arguments
+  searchMoreContact(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchContact(...args: any[]): unknown// needs 3 arguments
+  cancelSearchContact(...args: unknown[]): unknown// needs 3 arguments
 
-    searchGroupChatInfo(...args: any[]): unknown// needs 3 arguments
+  searchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
 
-    resetSearchGroupChatInfoSortType(...args: any[]): unknown// needs 3 arguments
+  resetSearchGroupChatInfoSortType(...args: unknown[]): unknown// needs 3 arguments
 
-    resetSearchGroupChatInfoFilterMembers(...args: any[]): unknown// needs 3 arguments
+  resetSearchGroupChatInfoFilterMembers(...args: unknown[]): unknown// needs 3 arguments
 
-    searchMoreGroupChatInfo(...args: any[]): unknown// needs 1 arguments
+  searchMoreGroupChatInfo(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchGroupChatInfo(...args: any[]): unknown// needs 3 arguments
+  cancelSearchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
 
-    searchChatsWithKeywords(...args: any[]): unknown// needs 3 arguments
+  searchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
 
-    searchMoreChatsWithKeywords(...args: any[]): unknown// needs 1 arguments
+  searchMoreChatsWithKeywords(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchChatsWithKeywords(...args: any[]): unknown// needs 3 arguments
+  cancelSearchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
 
-    searchChatMsgs(...args: any[]): unknown// needs 2 arguments
+  searchChatMsgs(...args: unknown[]): unknown// needs 2 arguments
 
-    searchMoreChatMsgs(...args: any[]): unknown// needs 1 arguments
+  searchMoreChatMsgs(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchChatMsgs(...args: any[]): unknown// needs 3 arguments
+  cancelSearchChatMsgs(...args: unknown[]): unknown// needs 3 arguments
 
-    searchMsgWithKeywords(...args: any[]): unknown// needs 2 arguments
+  searchMsgWithKeywords(...args: unknown[]): unknown// needs 2 arguments
 
-    searchMoreMsgWithKeywords(...args: any[]): unknown// needs 1 arguments
+  searchMoreMsgWithKeywords(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchMsgWithKeywords(...args: any[]): unknown// needs 3 arguments
+  cancelSearchMsgWithKeywords(...args: unknown[]): unknown// needs 3 arguments
 
   searchFileWithKeywords(keywords: string[], source: number): Promise<string>// needs 2 arguments
 
-    searchMoreFileWithKeywords(...args: any[]): unknown// needs 1 arguments
+  searchMoreFileWithKeywords(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchFileWithKeywords(...args: any[]): unknown// needs 3 arguments
+  cancelSearchFileWithKeywords(...args: unknown[]): unknown// needs 3 arguments
 
-    searchAtMeChats(...args: any[]): unknown// needs 3 arguments
+  searchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
 
-    searchMoreAtMeChats(...args: any[]): unknown// needs 1 arguments
+  searchMoreAtMeChats(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchAtMeChats(...args: any[]): unknown// needs 3 arguments
+  cancelSearchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
 
-    searchChatAtMeMsgs(...args: any[]): unknown// needs 1 arguments
+  searchChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
 
-    searchMoreChatAtMeMsgs(...args: any[]): unknown// needs 1 arguments
+  searchMoreChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
 
-    cancelSearchChatAtMeMsgs(...args: any[]): unknown// needs 3 arguments
+  cancelSearchChatAtMeMsgs(...args: unknown[]): unknown// needs 3 arguments
 
   addSearchHistory(param: {
     type: number,//4
@@ -120,9 +120,9 @@ export interface NodeIKernelSearchService {
     id?: number
   }>
 
-    removeSearchHistory(...args: any[]): unknown// needs 1 arguments
+  removeSearchHistory(...args: unknown[]): unknown// needs 1 arguments
 
-    searchCache(...args: any[]): unknown// needs 3 arguments
+  searchCache(...args: unknown[]): unknown// needs 3 arguments
 
-    clearSearchCache(...args: any[]): unknown// needs 1 arguments
+  clearSearchCache(...args: unknown[]): unknown// needs 1 arguments
 }

src/ntqqapi/types/group.ts

@@ -36,6 +36,7 @@ export interface Group {
     memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
   }
   members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
+  createTime: string
 }
 
 export enum GroupMemberRole {
@@ -64,3 +65,15 @@ export interface GroupMember {
   joinTime: string
   lastSpeakTime: string
 }
+
+export interface PublishGroupBulletinReq {
+  text: string
+  picInfo?: {
+    id: string
+    width: number
+    height: number
+  }
+  oldFeedsId: ''
+  pinned: number
+  confirmRequired: number
+}

src/ntqqapi/types/msg.ts

@@ -275,7 +275,7 @@ export interface PicElement {
   thumbPath: Map<number, string>
   picWidth: number
   picHeight: number
-  fileSize: number
+  fileSize: string
   fileName: string
   fileUuid: string
   md5HexStr?: string
@@ -335,6 +335,8 @@ export interface MarketFaceElement {
   faceName?: string
   emojiId: string
   key: string
+  imageWidth?: number
+  imageHeight?: number
 }
 
 export interface VideoElement {
@@ -350,7 +352,7 @@ export interface VideoElement {
   thumbHeight?: number
   busiType?: 0 // 未知
   subBusiType?: 0 // 未知
-  thumbPath?: Map<number, any>
+  thumbPath?: Map<number, string>
   transferStatus?: 0 // 未知
   progress?: 0 // 下载进度？
   invalidState?: 0 // 未知
@@ -478,6 +480,8 @@ export interface RawMessage {
       sourceMsgIsIncPic: boolean // 原消息是否有图片
       sourceMsgText: string
       replayMsgSeq: string // 源消息的msgSeq，可以通过这个找到源消息的msgId
+      senderUidStr: string
+      replyMsgTime: string
     }
     textElement: {
       atType: AtType
@@ -519,22 +523,22 @@ export interface MessageElement {
   grayTipElement?: GrayTipElement
   arkElement?: ArkElement
   fileElement?: FileElement
-  liveGiftElement?: null
+  liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: any
+  structLongMsgElement?: unknown
   multiForwardMsgElement?: MultiForwardMsgElement
-  giphyElement?: any
+  giphyElement?: unknown
-  walletElement?: null
+  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: null //????
+  textGiftElement?: unknown //????
-  calendarElement?: any
+  calendarElement?: unknown
-  yoloGameResultElement?: any
+  yoloGameResultElement?: unknown
-  avRecordElement?: any
+  avRecordElement?: unknown
-  structMsgElement?: null
+  structMsgElement?: unknown
-  faceBubbleElement?: any
+  faceBubbleElement?: unknown
-  shareLocationElement?: any
+  shareLocationElement?: unknown
-  tofuRecordElement?: any
+  tofuRecordElement?: unknown
-  taskTopMsgElement?: any
+  taskTopMsgElement?: unknown
-  recommendedMsgElement?: any
+  recommendedMsgElement?: unknown
-  actionBarElement?: any
+  actionBarElement?: unknown
 }

src/ntqqapi/types/notify.ts

@@ -1,13 +1,19 @@
-export enum GroupNotifyTypes {
+export enum GroupNotifyType {
-  INVITE_ME = 1,
+  INVITED_BY_MEMBER = 1,
-  INVITED_JOIN = 4, // 有人接受了邀请入群
+  REFUSE_INVITED,
-  JOIN_REQUEST_BY_INVITED = 5,  // 有人邀请了别人入群
+  REFUSED_BY_ADMINI_STRATOR,
-  JOIN_REQUEST = 7,
+  AGREED_TOJOIN_DIRECT, // 有人接受了邀请入群
-  ADMIN_SET = 8,
+  INVITED_NEED_ADMINI_STRATOR_PASS, // 有人邀请了别人入群
-  KICK_MEMBER = 9,
+  AGREED_TO_JOIN_BY_ADMINI_STRATOR,
-  MEMBER_EXIT = 11, // 主动退出
+  REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
-  ADMIN_UNSET = 12, // 我被取消管理员
+  SET_ADMIN,
-  ADMIN_UNSET_OTHER = 13, // 其他人取消管理员
+  KICK_MEMBER_NOTIFY_ADMIN,
+  KICK_MEMBER_NOTIFY_KICKED,
+  MEMBER_LEAVE_NOTIFY_ADMIN, // 主动退出
+  CANCEL_ADMIN_NOTIFY_CANCELED, // 我被取消管理员
+  CANCEL_ADMIN_NOTIFY_ADMIN, // 其他人取消管理员
+  TRANSFER_GROUP_NOTIFY_OLDOWNER,
+  TRANSFER_GROUP_NOTIFY_ADMIN
 }
 
 export interface GroupNotifies {
@@ -17,17 +23,18 @@ export interface GroupNotifies {
 }
 
 export enum GroupNotifyStatus {
-  IGNORE = 0,
+  KINIT, // 初始化
-  WAIT_HANDLE = 1,
+  KUNHANDLE, // 未处理
-  APPROVE = 2,
+  KAGREED, // 同意
-  REJECT = 3,
+  KREFUSED, // 拒绝
+  KIGNORED // 忽略
 }
 
 export interface GroupNotify {
   time: number // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
   seq: string // 唯一标识符，转成数字再除以1000应该就是时间戳？
-  type: GroupNotifyTypes
+  type: GroupNotifyType
-  status: GroupNotifyStatus // 0是已忽略？，1是未处理，2是已同意
+  status: GroupNotifyStatus
   group: { groupCode: string; groupName: string }
   user1: { uid: string; nickName: string } // 被设置管理员的人
   user2: { uid: string; nickName: string } // 操作者

src/ntqqapi/types/user.ts

@@ -82,7 +82,8 @@ export interface CategoryFriend {
   categroyName: string
   categroyMbCount: number
   onlineCount: number
-  buddyList: User[]
+  buddyList: User[] // V1
+  buddyUids: string[]
 }
 
 export interface CoreInfo {
@@ -123,7 +124,7 @@ interface VideoInfo {
 
 interface ExtOnlineBusinessInfo {
   buf: string
-  customStatus: any
+  customStatus: unknown
   videoBizInfo: VideoBizInfo
   videoInfo: VideoInfo
 }
@@ -141,7 +142,7 @@ interface UserStatus {
   termType: number
   netType: number
   iconType: number
-  customStatus: any
+  customStatus: unknown
   setTime: string
   specialFlag: number
   abiFlag: number
@@ -155,8 +156,8 @@ interface UserStatus {
 
 interface PrivilegeIcon {
   jumpUrl: string
-  openIconList: any[]
+  openIconList: unknown[]
-  closeIconList: any[]
+  closeIconList: unknown[]
 }
 
 interface VasInfo {
@@ -179,7 +180,7 @@ interface VasInfo {
   fontEffect: number
   newLoverDiamondFlag: number
   extendNameplateId: number
-  diyNameplateIDs: any[]
+  diyNameplateIDs: unknown[]
   vipStartFlag: number
   vipDataFlag: number
   gameNameplateId: string
@@ -199,8 +200,8 @@ export interface SimpleInfo {
   status: UserStatus | null
   vasInfo: VasInfo | null
   relationFlags: RelationFlags | null
-  otherFlags: any | null
+  otherFlags: unknown | null
-  intimate: any | null
+  intimate: unknown | null
 }
 
 interface RelationFlags {
@@ -240,7 +241,7 @@ interface CommonExt {
   address: string
   regTime: number
   interest: string
-  labels: any[]
+  labels: string[]
   qqLevel: QQLevel
 }
 
@@ -322,12 +323,12 @@ export interface UserDetailInfoByUin {
     regTime: number
     interest: string
     termType: number
-    labels: any[]
+    labels: unknown[]
     qqLevel: { crownNum: number, sunNum: number, moonNum: number, starNum: number }
     isHideQQLevel: number
-    privilegeIcon: { jumpUrl: string, openIconList: any[], closeIconList: any[] }
+    privilegeIcon: { jumpUrl: string, openIconList: unknown[], closeIconList: unknown[] }
     isHidePrivilegeIcon: number
-    photoWall: { picList: any[] }
+    photoWall: { picList: unknown[] }
     vipFlag: boolean
     yearVipFlag: boolean
     svipFlag: boolean

src/ntqqapi/wrapper.ts

@@ -11,11 +11,11 @@ import {
   NodeIKernelTipOffService,
   NodeIKernelSearchService
 } from './services'
-import os from 'node:os'
+import { constants } from 'node:os'
+import { Dict } from 'cosmokit'
 const Process = require('node:process')
 
 export interface NodeIQQNTWrapperSession {
-  [key: string]: any
   getBuddyService(): NodeIKernelBuddyService
   getGroupService(): NodeIKernelGroupService
   getProfileService(): NodeIKernelProfileService
@@ -34,20 +34,7 @@ export interface WrapperApi {
 }
 
 export interface WrapperConstructor {
-  [key: string]: any
+  [key: string]: unknown
-  NodeIKernelBuddyListener?: any
-  NodeIKernelGroupListener?: any
-  NodeQQNTWrapperUtil?: any
-  NodeIKernelMsgListener?: any
-  NodeIQQNTWrapperEngine?: any
-  NodeIGlobalAdapter?: any
-  NodeIDependsAdapter?: any
-  NodeIDispatcherAdapter?: any
-  NodeIKernelSessionListener?: any
-  NodeIKernelLoginService?: any
-  NodeIKernelLoginListener?: any
-  NodeIKernelProfileService?: any
-  NodeIKernelProfileListener?: any
 }
 
 const wrapperApi: WrapperApi = {}
@@ -72,11 +59,11 @@ const constructor = [
 
 Process.dlopenOrig = Process.dlopen
 
-Process.dlopen = function (module, filename, flags = os.constants.dlopen.RTLD_LAZY) {
+Process.dlopen = function (module: Dict, filename: string, flags = constants.dlopen.RTLD_LAZY) {
   const dlopenRet = this.dlopenOrig(module, filename, flags)
-  for (let export_name in module.exports) {
+  for (const export_name in module.exports) {
     module.exports[export_name] = new Proxy(module.exports[export_name], {
-      construct: (target, args, _newTarget) => {
+      construct: (target, args) => {
         const ret = new target(...args)
         if (export_name === 'NodeIQQNTWrapperSession') wrapperApi.NodeIQQNTWrapperSession = ret
         return ret

src/onebot11/action/BaseAction.ts

@@ -1,11 +1,16 @@
 import { ActionName, BaseCheckResult } from './types'
 import { OB11Response } from './OB11Response'
 import { OB11Return } from '../types'
-
+import { Context } from 'cordis'
-import { log } from '../../common/utils/log'
+import type Adapter from '../adapter'
 
 abstract class BaseAction<PayloadType, ReturnDataType> {
   abstract actionName: ActionName
+  protected ctx: Context
+
+  constructor(protected adapter: Adapter) {
+    this.ctx = adapter.ctx
+  }
 
   protected async check(payload: PayloadType): Promise<BaseCheckResult> {
     return {
@@ -21,13 +26,13 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
     try {
       const resData = await this._handle(payload)
       return OB11Response.ok(resData)
-    } catch (e: any) {
+    } catch (e) {
-      log('发生错误', e)
+      this.ctx.logger.error('发生错误', e)
-      return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200)
+      return OB11Response.error(e?.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200)
     }
   }
 
-  public async websocketHandle(payload: PayloadType, echo: any): Promise<OB11Return<ReturnDataType | null>> {
+  public async websocketHandle(payload: PayloadType, echo: unknown): Promise<OB11Return<ReturnDataType | null>> {
     const result = await this.check(payload)
     if (!result.valid) {
       return OB11Response.error(result.message, 1400)
@@ -35,9 +40,9 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
     try {
       const resData = await this._handle(payload)
       return OB11Response.ok(resData, echo)
-    } catch (e: any) {
+    } catch (e) {
-      log('发生错误', e)
+      this.ctx.logger.error('发生错误', e)
-      return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo)
+      return OB11Response.error((e as Error)?.stack?.toString() || String(e), 1200, echo)
     }
   }
 

src/onebot11/action/OB11Response.ts

@@ -1,6 +1,5 @@
 import { OB11Return } from '../types'
-
+import { isNullable } from 'cosmokit'
-import { isNull } from '../../common/utils/helper'
 
 export class OB11Response {
   static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {
@@ -14,17 +13,17 @@ export class OB11Response {
     }
   }
 
-  static ok<T>(data: T, echo: any = null) {
+  static ok<T>(data: T, echo?: unknown) {
-    let res = OB11Response.res<T>(data, 'ok', 0)
+    const res = OB11Response.res<T>(data, 'ok', 0)
-    if (!isNull(echo)) {
+    if (!isNullable(echo)) {
       res.echo = echo
     }
     return res
   }
 
-  static error(err: string, retcode: number, echo: any = null) {
+  static error(err: string, retcode: number, echo?: unknown) {
-    let res = OB11Response.res(null, 'failed', retcode, err)
+    const res = OB11Response.res(null, 'failed', retcode, err)
-    if (!isNull(echo)) {
+    if (!isNullable(echo)) {
       res.echo = echo
     }
     return res

src/onebot11/action/file/GetFile.ts

@@ -1,11 +1,8 @@
 import BaseAction from '../BaseAction'
 import fsPromise from 'node:fs/promises'
-import { getConfigUtil } from '@/common/config'
-import { NTQQFileApi, NTQQGroupApi, NTQQUserApi, NTQQFriendApi, NTQQMsgApi } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import { UUIDConverter } from '@/common/utils/helper'
+import { Peer, ElementType } from '@/ntqqapi/types'
-import { Peer, ChatType, ElementType } from '@/ntqqapi/types'
+import { MessageUnique } from '@/common/utils/messageUnique'
-import { MessageUnique } from '@/common/utils/MessageUnique'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -22,7 +19,7 @@ export interface GetFileResponse {
 export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
   // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-    const { enableLocalFile2Url } = getConfigUtil().getConfig()
+    const { enableLocalFile2Url } = this.adapter.config
 
     let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
     if (!fileCache?.length) {
@@ -30,7 +27,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
     }
 
     if (fileCache?.length) {
-      const downloadPath = await NTQQFileApi.downloadMedia(
+      const downloadPath = await this.ctx.ntFileApi.downloadMedia(
         fileCache[0].msgId,
         fileCache[0].chatType,
         fileCache[0].peerUid,
@@ -50,7 +47,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         guildId: ''
       }
       if (fileCache[0].elementType === ElementType.PIC) {
-        const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
+        const msgList = await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
         if (msgList.msgList.length === 0) {
           throw new Error('msg not found')
         }
@@ -59,9 +56,9 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         if (!findEle) {
           throw new Error('element not found')
         }
-        res.url = await NTQQFileApi.getImageUrl(findEle.picElement)
+        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement)
       } else if (fileCache[0].elementType === ElementType.VIDEO) {
-        res.url = await NTQQFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
+        res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
       if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {

src/onebot11/action/file/GetRecord.ts

@@ -1,7 +1,6 @@
 import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
 import { ActionName } from '../types'
-import {decodeSilk} from "@/common/utils/audio";
+import { decodeSilk } from '@/common/utils/audio'
-import { getConfigUtil } from '@/common/config'
 import path from 'node:path'
 import fs from 'node:fs'
 
@@ -13,11 +12,11 @@ export default class GetRecord extends GetFileBase {
   actionName = ActionName.GetRecord
 
   protected async _handle(payload: Payload): Promise<GetFileResponse> {
-    let res = await super._handle(payload)
+    const res = await super._handle(payload)
-    res.file = await decodeSilk(res.file!, payload.out_format)
+    res.file = await decodeSilk(this.ctx, res.file!, payload.out_format)
     res.file_name = path.basename(res.file)
     res.file_size = fs.statSync(res.file).size.toString()
-    if (getConfigUtil().getConfig().enableLocalFile2Url){
+    if (this.adapter.config.enableLocalFile2Url) {
       res.base64 = fs.readFileSync(res.file, 'base64')
     }
     return res

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

@@ -0,0 +1,17 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+  name: string
+  parent_id?: '/'
+}
+
+export class CreateGroupFileFolder extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_CreateGroupFileFolder
+
+  async _handle(payload: Payload) {
+    await this.ctx.ntGroupApi.createGroupFileFolder(payload.group_id.toString(), payload.name)
+    return null
+  }
+}

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

@@ -1,17 +1,15 @@
-
+import BaseAction from '../BaseAction'
-import BaseAction from '../BaseAction';
+import { ActionName } from '../types'
-import { ActionName } from '../types';
+import { MessageUnique } from '@/common/utils/messageUnique'
-import { NTQQGroupApi } from '@/ntqqapi/api/group'
-import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export default class GoCQHTTPDelEssenceMsg extends BaseAction<Payload, any> {
+export class DelEssenceMsg extends BaseAction<Payload, unknown> {
-  actionName = ActionName.GoCQHTTP_DelEssenceMsg;
+  actionName = ActionName.GoCQHTTP_DelEssenceMsg
 
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     if (!payload.message_id) {
       throw Error('message_id不能为空')
     }
@@ -19,7 +17,7 @@ export default class GoCQHTTPDelEssenceMsg extends BaseAction<Payload, any> {
     if (!msg) {
       throw new Error('msg not found')
     }
-    return await NTQQGroupApi.removeGroupEssence(
+    return await this.ctx.ntGroupApi.removeGroupEssence(
       msg.Peer.peerUid,
       msg.MsgId,
     )

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

@@ -1,6 +1,5 @@
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '@/ntqqapi/api'
 
 interface Payload {
   group_id: string | number
@@ -8,10 +7,11 @@ interface Payload {
   busid?: 102
 }
 
-export class GoCQHTTPDelGroupFile extends BaseAction<Payload, void> {
+export class DelGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFile
 
   async _handle(payload: Payload) {
-        await NTQQGroupApi.delGroupFile(payload.group_id.toString(), [payload.file_id])
+    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id])
+    return null
   }
 }

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

@@ -0,0 +1,16 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+  folder_id: string
+}
+
+export class DelGroupFolder extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_DelGroupFolder
+
+  async _handle(payload: Payload) {
+    await this.ctx.ntGroupApi.deleteGroupFileFolder(payload.group_id.toString(), payload.folder_id)
+    return null
+  }
+}

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

@@ -1,10 +1,12 @@
 import BaseAction from '../BaseAction'
-import { ActionName } from '../types'
 import fs from 'fs'
 import fsPromise from 'fs/promises'
 import path from 'node:path'
-import { calculateFileMD5, httpDownload, TEMP_DIR } from '@/common/utils'
+import { ActionName } from '../types'
+import { calculateFileMD5, fetchFile } from '@/common/utils'
+import { TEMP_DIR } from '@/common/globalVars'
 import { randomUUID } from 'node:crypto'
+import { Dict } from 'cosmokit'
 
 interface Payload {
   thread_count?: number
@@ -18,7 +20,7 @@ interface FileResponse {
   file: string
 }
 
-export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileResponse> {
+export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
@@ -30,8 +32,8 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
       await fsPromise.writeFile(filePath, payload.base64, 'base64')
     } else if (payload.url) {
       const headers = this.getHeaders(payload.headers)
-      const buffer = await httpDownload({ url: payload.url, headers: headers })
+      const res = await fetchFile(payload.url, headers)
-      await fsPromise.writeFile(filePath, buffer)
+      await fsPromise.writeFile(filePath, res.data)
     } else {
       throw new Error('不存在任何文件, 无法下载')
     }
@@ -50,7 +52,7 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
   }
 
   getHeaders(headersIn?: string | string[]): Record<string, string> {
-    const headers = {}
+    const headers: Dict = {}
     if (typeof headersIn == 'string') {
       headersIn = headersIn.split('[\\r\\n]')
     }

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

@@ -1,9 +1,8 @@
 import BaseAction from '../BaseAction'
-import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types'
+import { OB11ForwardMessage } from '../../types'
-import { NTQQMsgApi } from '@/ntqqapi/api'
+import { OB11Entities } from '../../entities'
-import { OB11Constructor } from '../../constructor'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/MessageUnique'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -11,12 +10,12 @@ interface Payload {
 }
 
 interface Response {
-  messages: (OB11Message & { content: OB11MessageData })[]
+  messages: OB11ForwardMessage[]
 }
 
-export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, Response> {
+export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     const msgId = payload.id || payload.message_id
     if (!msgId) {
       throw Error('message_id不能为空')
@@ -26,26 +25,27 @@ export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, Response> {
     if (!rootMsg) {
       throw Error('msg not found')
     }
-    const data = await NTQQMsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId)
+    const data = await this.ctx.ntMsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId)
     if (data?.result !== 0) {
       throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
     const msgList = data.msgList
     const messages = await Promise.all(
       msgList.map(async (msg) => {
-        const resMsg = await OB11Constructor.message(msg)
+        const resMsg = await OB11Entities.message(this.ctx, msg)
         resMsg.message_id = MessageUnique.createMsg({
           chatType: msg.chatType,
           peerUid: msg.peerUid,
-        }, msg.msgId)!
+        }, msg.msgId)
         return resMsg
       }),
     )
-    messages.map(v => {
+    const forwardMessages = messages.map(v => {
       const msg = v as Partial<OB11ForwardMessage>
       msg.content = msg.message
       delete msg.message
+      return msg as OB11ForwardMessage
     })
-    return { messages }
+    return { messages: forwardMessages }
   }
 }

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

@@ -0,0 +1,25 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface Response {
+  can_at_all: boolean
+  remain_at_all_count_for_group: number
+  remain_at_all_count_for_uin: number
+}
+
+export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain
+
+  async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupRemainAtTimes(payload.group_id.toString())
+    return {
+      can_at_all: data.atInfo.canAtAll,
+      remain_at_all_count_for_group: data.atInfo.RemainAtAllCountForGroup,
+      remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
+    }
+  }
+}

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

@@ -2,15 +2,14 @@ import BaseAction from '../BaseAction'
 import { OB11Message } from '../../types'
 import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
-import { NTQQMsgApi } from '@/ntqqapi/api/msg'
+import { OB11Entities } from '../../entities'
-import { OB11Constructor } from '../../constructor'
 import { RawMessage } from '@/ntqqapi/types'
-import { MessageUnique } from '@/common/utils/MessageUnique'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   group_id: number | string
-  message_seq?: number
+  message_seq?: number | string
-  count?: number
+  count?: number | string
   reverseOrder?: boolean
 }
 
@@ -18,7 +17,7 @@ interface Response {
   messages: OB11Message[]
 }
 
-export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Response> {
+export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
 
   protected async _handle(payload: Payload): Promise<Response> {
@@ -28,20 +27,20 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
     let msgList: RawMessage[] | undefined
     // 包含 message_seq 0
     if (!payload.message_seq) {
-      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count))?.msgList
+      msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +count)).msgList
     } else {
-      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId
+      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq))?.MsgId
-      if (!startMsgId) throw `消息${payload.message_seq}不存在`
+      if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
-      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, count)).msgList
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
     }
-    if (!msgList?.length) throw '未找到消息'
+    if (!msgList?.length) throw new Error('未找到消息')
     if (isReverseOrder) msgList.reverse()
     await Promise.all(
       msgList.map(async msg => {
         msg.msgShortId = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
       })
     )
-    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Constructor.message(msg)))
+    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
     return { messages: ob11MsgList }
   }
 }

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

@@ -0,0 +1,62 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
+
+interface Payload {
+  group_id: string | number
+  file_count: string | number
+}
+
+interface Response {
+  files: OB11GroupFile[]
+  folders: OB11GroupFileFolder[]
+}
+
+export class GetGroupRootFiles extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupRootFiles
+
+  async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+      sortType: 1,
+      fileCount: +(payload.file_count ?? 50),
+      startIndex: 0,
+      sortOrder: 2,
+      showOnlinedocFolder: 0,
+    })
+
+    this.ctx.logger.info(data)
+
+    return {
+      files: data.filter(item => item.fileInfo)
+        .map(item => {
+          const file = item.fileInfo!
+          return {
+            group_id: +item.peerId,
+            file_id: file.fileId,
+            file_name: file.fileName,
+            busid: file.busId,
+            file_size: +file.fileSize,
+            upload_time: file.uploadTime,
+            dead_time: file.deadTime,
+            modify_time: file.modifyTime,
+            download_times: file.downloadTimes,
+            uploader: +file.uploaderUin,
+            uploader_name: file.uploaderName
+          }
+        }),
+      folders: data.filter(item => item.folderInfo)
+        .map(item => {
+          const folder = item.folderInfo!
+          return {
+            group_id: +item.peerId,
+            folder_id: folder.folderId,
+            folder_name: folder.folderName,
+            create_time: folder.createTime,
+            creator: +folder.createUin,
+            creator_name: folder.creatorName,
+            total_file_count: folder.totalFileCount
+          }
+        })
+    }
+  }
+}

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

@@ -0,0 +1,59 @@
+import BaseAction from '../BaseAction'
+import { GroupNotifyStatus } from '@/ntqqapi/types'
+import { ActionName } from '../types'
+
+interface Response {
+  invited_requests: {
+    request_id: number
+    invitor_uin: number
+    invitor_nick: string
+    group_id: number
+    group_name: string
+    checked: boolean
+    actor: number
+  }[]
+  join_requests: {
+    request_id: number
+    requester_uin: number
+    requester_nick: string
+    message: string
+    group_id: number
+    group_name: string
+    checked: boolean
+    actor: number
+  }[]
+}
+
+export class GetGroupSystemMsg extends BaseAction<void, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupSystemMsg
+
+  async _handle() {
+    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(10)
+    const data: Response = { invited_requests: [], join_requests: [] }
+    for (const notify of singleScreenNotifies) {
+      if (notify.type == 1) {
+        data.invited_requests.push({
+          request_id: +notify.seq,
+          invitor_uin: Number(await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)),
+          invitor_nick: notify.user1.nickName,
+          group_id: +notify.group.groupCode,
+          group_name: notify.group.groupName,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
+          actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
+        })
+      } else if (notify.type == 7) {
+        data.join_requests.push({
+          request_id: +notify.seq,
+          requester_uin: Number(await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)),
+          requester_nick: notify.user1.nickName,
+          message: notify.postscript,
+          group_id: +notify.group.groupCode,
+          group_name: notify.group.groupName,
+          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
+          actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
+        })
+      }
+    }
+    return data
+  }
+}

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

@@ -1,24 +1,23 @@
 import BaseAction from '../BaseAction'
 import { OB11User } from '../../types'
-import { OB11Constructor } from '../../constructor'
+import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { NTQQUserApi } from '../../../ntqqapi/api/user'
+import { getBuildVersion } from '@/common/utils'
-import { getBuildVersion } from '@/common/utils/QQBasicInfo'
 import { OB11UserSex } from '../../types'
-import { calcQQLevel } from '@/common/utils/qqlevel'
+import { calcQQLevel } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
 }
 
-export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11User> {
+export class GetStrangerInfo extends BaseAction<Payload, OB11User> {
   actionName = ActionName.GoCQHTTP_GetStrangerInfo
 
   protected async _handle(payload: Payload): Promise<OB11User> {
     if (!(getBuildVersion() >= 26702)) {
       const user_id = payload.user_id.toString()
-      const extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id)
+      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUin(user_id)
-      const uid = (await NTQQUserApi.getUidByUin(user_id))!
+      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
       if (!uid || uid.indexOf('*') != -1) {
         const ret = {
           ...extendData,
@@ -33,12 +32,12 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
         }
         return ret
       }
-      const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) }
+      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
-      return OB11Constructor.stranger(data)
+      return OB11Entities.stranger(data)
     } else {
       const user_id = payload.user_id.toString()
-      const extendData = await NTQQUserApi.getUserDetailInfoByUinV2(user_id)
+      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUinV2(user_id)
-      const uid = (await NTQQUserApi.getUidByUin(user_id))!
+      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
       if (!uid || uid.indexOf('*') != -1) {
         const ret = {
           ...extendData,
@@ -52,8 +51,8 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11Use
         }
         return ret
       }
-      const data = { ...extendData, ...(await NTQQUserApi.getUserDetailInfo(uid)) }
+      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
-      return OB11Constructor.stranger(data)
+      return OB11Entities.stranger(data)
     }
   }
 }

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

@@ -0,0 +1,23 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
+
+interface Payload {
+  message_id: number | string
+}
+
+export class MarkMsgAsRead extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_MarkMsgAsRead
+
+  protected async _handle(payload: Payload) {
+    if (!payload.message_id) {
+      throw new Error('参数 message_id 不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
+    if (!msg) {
+      throw new Error('msg not found')
+    }
+    await this.ctx.ntMsgApi.setMsgRead(msg.Peer)
+    return null
+  }
+}

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

@@ -1,17 +1,16 @@
 import BaseAction from '../BaseAction'
-import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../quick-operation'
+import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../helper/quickOperation'
-import { log } from '@/common/utils'
 import { ActionName } from '../types'
 
-interface Payload{
+interface Payload {
   context: QuickOperationEvent,
   operation: QuickOperation
 }
 
-export class GoCQHTTHandleQuickOperation extends BaseAction<Payload, null>{
+export class HandleQuickOperation extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_HandleQuickOperation
   protected async _handle(payload: Payload): Promise<null> {
-    handleQuickOperation(payload.context, payload.operation).then().catch(log);
+    handleQuickOperation(this.ctx, payload.context, payload.operation).catch(e => this.ctx.logger.error(e))
     return null
   }
 }

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

@@ -1,8 +1,9 @@
-import SendMsg, { convertMessage2List } from '../msg/SendMsg'
+import SendMsg from '../msg/SendMsg'
 import { OB11PostSendMsg } from '../../types'
 import { ActionName } from '../types'
+import { convertMessage2List } from '../../helper/createMessage'
 
-export class GoCQHTTPSendForwardMsg extends SendMsg {
+export class SendForwardMsg extends SendMsg {
   actionName = ActionName.GoCQHTTP_SendForwardMsg
 
   protected async check(payload: OB11PostSendMsg) {
@@ -11,10 +12,10 @@ export class GoCQHTTPSendForwardMsg extends SendMsg {
   }
 }
 
-export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsg {
+export class SendPrivateForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg
 }
 
-export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsg {
+export class SendGroupForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendGroupForwardMsg
 }

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

@@ -0,0 +1,54 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { unlink } from 'fs/promises'
+import { checkFileReceived, uri2local } from '@/common/utils/file'
+
+interface Payload {
+  group_id: number | string
+  content: string
+  image?: string
+  pinned?: number | string //扩展
+  confirm_required?: number | string //扩展
+}
+
+export class SendGroupNotice extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SendGroupNotice
+
+  async _handle(payload: Payload) {
+    if(!payload.content){
+      throw new Error('参数 content 不能为空')
+    }
+    const groupCode = payload.group_id.toString()
+    const pinned = Number(payload.pinned ?? 0)
+    const confirmRequired = Number(payload.confirm_required ?? 1)
+
+    let picInfo: { id: string, width: number, height: number } | undefined
+    if (payload.image) {
+      const { path, isLocal, success, errMsg } = await uri2local(payload.image, undefined, true)
+      if (!success) {
+        throw new Error(`设置群公告失败, 错误信息: uri2local: ${errMsg}`)
+      }
+      await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
+      const result = await this.ctx.ntGroupApi.uploadGroupBulletinPic(groupCode, path)
+      if (result.errCode !== 0) {
+        throw new Error(`设置群公告失败, 错误信息: uploadGroupBulletinPic: ${result.errMsg}`)
+      }
+      if (!isLocal) {
+        unlink(path)
+      }
+      picInfo = result.picInfo
+    }
+
+    const res = await this.ctx.ntGroupApi.publishGroupBulletin(groupCode, {
+      text: encodeURIComponent(payload.content),
+      oldFeedsId: '',
+      pinned,
+      confirmRequired,
+      picInfo
+    })
+    if (res.result !== 0) {
+      throw new Error(`设置群公告失败, 错误信息: ${res.errMsg}`)
+    }
+    return null
+  }
+}

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

@@ -1,16 +1,15 @@
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '@/ntqqapi/api/group'
+import { MessageUnique } from '@/common/utils/messageUnique'
-import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export default class GoCQHTTPSetEssenceMsg extends BaseAction<Payload, any> {
+export class SetEssenceMsg extends BaseAction<Payload, unknown> {
-  actionName = ActionName.GoCQHTTP_SetEssenceMsg;
+  actionName = ActionName.GoCQHTTP_SetEssenceMsg
 
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     if (!payload.message_id) {
       throw Error('message_id不能为空')
     }
@@ -18,7 +17,7 @@ export default class GoCQHTTPSetEssenceMsg extends BaseAction<Payload, any> {
     if (!msg) {
       throw new Error('msg not found')
     }
-    return await NTQQGroupApi.addGroupEssence(
+    return await this.ctx.ntGroupApi.addGroupEssence(
       msg.Peer.peerUid,
       msg.MsgId
     )

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

@@ -1,70 +1,49 @@
-import fs from 'node:fs'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { SendMsgElementConstructor } from '@/ntqqapi/constructor'
+import { SendElementEntities } from '@/ntqqapi/entities'
-import { ChatType, SendFileElement } from '@/ntqqapi/types'
 import { uri2local } from '@/common/utils'
-import { Peer } from '@/ntqqapi/types'
+import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
-import { sendMsg } from '../msg/SendMsg'
-import { NTQQUserApi, NTQQFriendApi } from '@/ntqqapi/api'
 
-interface Payload {
+interface UploadGroupFilePayload {
-  user_id: number | string
+  group_id: number | string
-  group_id?: number | string
   file: string
   name: string
   folder?: string
   folder_id?: string
 }
 
-export class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
+export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile
 
-  protected async _handle(payload: Payload): Promise<null> {
+  protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    let file = payload.file
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
-    if (fs.existsSync(file)) {
+    if (!success) {
-      file = `file://${file}`
+      throw new Error(errMsg)
     }
-    const downloadResult = await uri2local(file)
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder_id)
-    if (!downloadResult.success) {
+    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-      throw new Error(downloadResult.errMsg)
+    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    }
-    const sendFileEle = await SendMsgElementConstructor.file(downloadResult.path, payload.name, payload.folder_id)
-    await sendMsg({
-      chatType: ChatType.group,
-      peerUid: payload.group_id?.toString()!,
-    }, [sendFileEle], [], true)
     return null
   }
 }
 
-export class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null> {
+interface UploadPrivateFilePayload {
+  user_id: number | string
+  file: string
+  name: string
+}
+
+export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
 
-  async getPeer(payload: Payload): Promise<Peer> {
+  protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
-    if (payload.user_id) {
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
-      const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString())
+    if (!success) {
-      if (!peerUid) {
+      throw new Error(errMsg)
-        throw `私聊${payload.user_id}不存在`
     }
-      const isBuddy = await NTQQFriendApi.isBuddy(peerUid)
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName)
-      return { chatType: isBuddy ? ChatType.friend : ChatType.temp, peerUid }
+    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
-    }
+    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    throw '缺少参数 user_id'
-  }
-
-  protected async _handle(payload: Payload): Promise<null> {
-    const peer = await this.getPeer(payload)
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
-    }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name)
-    await sendMsg(peer, [sendFileEle], [], true)
     return null
   }
 }

src/onebot11/action/group/GetGroupEssence.ts

@@ -1,4 +1,4 @@
-import { GroupEssenceMsgRet, WebApi } from '@/ntqqapi/api'
+import { GroupEssenceMsgRet } from '@/ntqqapi/api'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
 
@@ -10,15 +10,7 @@ interface PayloadType {
 export class GetGroupEssence extends BaseAction<PayloadType, GroupEssenceMsgRet | void> {
   actionName = ActionName.GoCQHTTP_GetEssenceMsg
 
-  protected async _handle(payload: PayloadType) {
+  protected async _handle() {
     throw '此 api 暂不支持'
-    const ret = await WebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages?.toString() || '0')
-    if (!ret) {
-      throw new Error('获取失败')
-    }
-    // ret.map((item) => {
-    //
-    // })
-    return ret
   }
 }

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -1,4 +1,4 @@
-import { WebApi, WebHonorType } from '@/ntqqapi/api'
+import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
 import BaseAction from '../BaseAction'
 
@@ -7,17 +7,16 @@ interface Payload {
   type?: WebHonorType
 }
 
-export class GetGroupHonorInfo extends BaseAction<Payload, Array<any>> {
+export class GetGroupHonorInfo extends BaseAction<Payload, unknown> {
   actionName = ActionName.GetGroupHonorInfo
 
   protected async _handle(payload: Payload) {
-    // console.log(await NTQQUserApi.getRobotUinRange())
     if (!payload.group_id) {
       throw '缺少参数group_id'
     }
     if (!payload.type) {
       payload.type = WebHonorType.ALL
     }
-    return await WebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type)
+    return await this.ctx.ntWebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type)
   }
 }

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,8 +1,7 @@
 import { OB11Group } from '../../types'
-import { OB11Constructor } from '../../constructor'
+import { OB11Entities } from '../../entities'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '@/ntqqapi/api'
 
 interface Payload {
   group_id: number | string
@@ -12,9 +11,9 @@ class GetGroupInfo extends BaseAction<Payload, OB11Group> {
   actionName = ActionName.GetGroupInfo
 
   protected async _handle(payload: Payload) {
-    const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
+    const group = (await this.ctx.ntGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
     if (group) {
-      return OB11Constructor.group(group)
+      return OB11Entities.group(group)
     } else {
       throw `群${payload.group_id}不存在`
     }

src/onebot11/action/group/GetGroupList.ts

@@ -1,8 +1,7 @@
 import { OB11Group } from '../../types'
-import { OB11Constructor } from '../../constructor'
+import { OB11Entities } from '../../entities'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api'
 
 interface Payload {
   no_cache: boolean | string
@@ -11,9 +10,9 @@ interface Payload {
 class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList
 
-  protected async _handle(payload: Payload) {
+  protected async _handle() {
-    const groupList = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload?.no_cache === 'true')
+    const groupList = await this.ctx.ntGroupApi.getGroups()
-    return OB11Constructor.groups(groupList)
+    return OB11Entities.groups(groupList)
   }
 }
 

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,10 +1,9 @@
-import { OB11GroupMember } from '../../types'
-import { getGroupMember, getSelfUid } from '@/common/data'
-import { OB11Constructor } from '../../constructor'
 import BaseAction from '../BaseAction'
+import { OB11GroupMember } from '../../types'
+import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { NTQQUserApi, WebApi } from '@/ntqqapi/api'
+import { selfInfo } from '@/common/globalVars'
-import { isNull } from '@/common/utils/helper'
+import { isNullable } from 'cosmokit'
 
 interface Payload {
   group_id: number | string
@@ -15,18 +14,18 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo
 
   protected async _handle(payload: Payload) {
-    const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString())
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), payload.user_id.toString())
     if (member) {
-      if (isNull(member.sex)) {
+      if (isNullable(member.sex)) {
         //log('获取群成员详细信息')
-        const info = await NTQQUserApi.getUserDetailInfo(member.uid, true)
+        const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
         //log('群成员详细信息结果', info)
         Object.assign(member, info)
       }
-      const ret = OB11Constructor.groupMember(payload.group_id.toString(), member)
+      const ret = OB11Entities.groupMember(payload.group_id.toString(), member)
-      const self = await getGroupMember(payload.group_id.toString(), getSelfUid())
+      const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid)
       if (self?.role === 3 || self?.role === 4) {
-        const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString())
+        const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(payload.group_id.toString())
         const target = webGroupMembers.find(e => e?.uin && e.uin === ret.user_id)
         if (target) {
           ret.join_time = target.join_time

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,9 +1,8 @@
 import { OB11GroupMember } from '../../types'
-import { OB11Constructor } from '../../constructor'
+import { OB11Entities } from '../../entities'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi, WebApi } from '@/ntqqapi/api'
+import { selfInfo } from '@/common/globalVars'
-import { getSelfUid } from '@/common/data'
 
 interface Payload {
   group_id: number | string
@@ -14,11 +13,11 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList
 
   protected async _handle(payload: Payload) {
-    const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
+    const groupMembers = await this.ctx.ntGroupApi.getGroupMembers(payload.group_id.toString())
     const groupMembersArr = Array.from(groupMembers.values())
 
     let _groupMembers = groupMembersArr.map(item => {
-      return OB11Constructor.groupMember(payload.group_id.toString(), item)
+      return OB11Entities.groupMember(payload.group_id.toString(), item)
     })
 
     const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>()
@@ -31,11 +30,11 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
       MemberMap.set(_groupMembers[i].user_id, _groupMembers[i])
     }
 
-    const selfRole = groupMembers.get(getSelfUid())?.role
+    const selfRole = groupMembers.get(selfInfo.uid)?.role
     const isPrivilege = selfRole === 3 || selfRole === 4
 
     if (isPrivilege) {
-      const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString())
+      const webGroupMembers = await this.ctx.ntWebApi.getGroupMembers(payload.group_id.toString())
       for (let i = 0, len = webGroupMembers.length; i < len; i++) {
         if (!webGroupMembers[i]?.uin) {
           continue

src/onebot11/action/group/GetGuildList.ts

@@ -4,7 +4,7 @@ import { ActionName } from '../types'
 export default class GetGuildList extends BaseAction<null, null> {
   actionName = ActionName.GetGuildList
 
-  protected async _handle(payload: null): Promise<null> {
+  protected async _handle() {
     return null
   }
 }

src/onebot11/action/group/SetGroupAddRequest.ts

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

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,8 +1,6 @@
 import BaseAction from '../BaseAction'
-import { getGroupMember } from '../../../common/data'
+import { GroupMemberRole } from '@/ntqqapi/types'
-import { GroupMemberRole } from '../../../ntqqapi/types'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
   group_id: number
@@ -14,12 +12,12 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAdmin
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
     const enable = payload.enable.toString() === 'true'
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-    await NTQQGroupApi.setMemberRole(
+    await this.ctx.ntGroupApi.setMemberRole(
       payload.group_id.toString(),
       member.uid,
       enable ? GroupMemberRole.admin : GroupMemberRole.normal,

src/onebot11/action/group/SetGroupBan.ts

@@ -1,7 +1,5 @@
 import BaseAction from '../BaseAction'
-import { getGroupMember } from '../../../common/data'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
   group_id: number
@@ -13,11 +11,11 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-    await NTQQGroupApi.banMember(payload.group_id.toString(), [
+    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
       { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
     ])
     return null

src/onebot11/action/group/SetGroupCard.ts

@@ -1,7 +1,5 @@
 import BaseAction from '../BaseAction'
-import { getGroupMember } from '../../../common/data'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
   group_id: number
@@ -13,11 +11,11 @@ export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-    await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.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,7 +1,5 @@
 import BaseAction from '../BaseAction'
-import { getGroupMember } from '../../../common/data'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
 
 interface Payload {
   group_id: number
@@ -13,11 +11,11 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id)
+    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
     if (!member) {
       throw `群成员${payload.user_id}不存在`
     }
-    await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
+    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
     return null
   }
 }