Merge pull request #422 from LLOneBot/dev

release: 3.32.7

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -7,9 +7,6 @@ body:
     attributes:
       value: |
         欢迎来到 LLOneBot 的 Issue Tracker！请填写以下表格来提交 Bug。
-        在提交新的 Bug 反馈前，请确保您：
-        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
-        * 不与现有的某一 issue 重复
   - type: input
     id: system-version
     attributes:
@@ -40,8 +37,6 @@ body:
       label: OneBot 客户端
       description: 连接至 LLOneBot 的客户端版本信息
       placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
-    validations:
-      required: true
   - type: textarea
     id: what-happened
     attributes:

.gitignore

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

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.31.8",
+  "version": "3.32.7",
   "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 --no-create --no-convert --no-encode --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js systemMessage.proto profileLikeTip.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
   },
   "author": "",
   "license": "MIT",
@@ -21,11 +22,12 @@
     "cordis": "^3.18.0",
     "cors": "^2.8.5",
     "cosmokit": "^1.6.2",
-    "express": "^4.19.2",
+    "express": "^5.0.0",
     "fast-xml-parser": "^4.5.0",
-    "file-type": "^19.4.1",
+    "file-type": "^19.5.0",
     "fluent-ffmpeg": "^2.1.3",
     "minato": "^3.5.1",
+    "protobufjs": "^7.4.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -37,8 +39,9 @@
     "@types/ws": "^8.5.12",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.3",
+    "protobufjs-cli": "^1.1.3",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.5",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.4.1"

scripts/gen-manifest.ts

@@ -35,4 +35,4 @@ const manifest = {
   }
 }
 
-writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))
+writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))

src/common/config.ts

@@ -33,7 +33,6 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
-      enableQOAutoQuote: false,
       listenLocalhost: false
     }
     const defaultConfig: Config = {
@@ -86,7 +85,7 @@ export class ConfigUtil {
     // 迁移旧的配置到新配置，避免用户重新填写配置
     const oldValue = oldConfig[oldKey]
     if (oldValue) {
-      currentConfig[currentKey] = oldValue as any
+      Object.assign(currentConfig, { [currentKey]: oldValue })
       delete oldConfig[oldKey]
     }
   }

src/common/globalVars.ts

@@ -19,4 +19,4 @@ export const selfInfo: SelfInfo = {
   uin: '',
   nick: '',
   online: true,
-}
+}

src/common/types.ts

@@ -10,7 +10,11 @@ export interface OB11Config {
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
   enableHttpHeart?: boolean
-  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
+  /**
+   * 快速操作回复自动引用原消息
+   * @deprecated
+   */
+  enableQOAutoQuote?: boolean
   listenLocalhost: boolean
 }
 
@@ -70,4 +74,4 @@ export interface FileCacheV2 {
   chatType: number
   elementId: string
   elementType: number
-}
+}

src/common/utils/audio.ts

@@ -16,8 +16,8 @@ type Input = string | Readable
 
 function convert(ctx: Context, input: Input, options: FFmpegOptions): Promise<Buffer>
 function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath: string): Promise<string>
-function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?: string): Promise<Buffer> | Promise<string> {
-  return new Promise<any>((resolve, reject) => {
+function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?: string): Promise<Buffer | string> {
+  return new Promise((resolve, reject) => {
     const chunks: Buffer[] = []
     let command = ffmpeg(input)
       .on('error', err => {
@@ -84,8 +84,8 @@ export async function encodeSilk(ctx: Context, filePath: string) {
       let duration = 1
       try {
         duration = getDuration(silk) / 1000
-      } catch (e: any) {
-        ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, e.stack)
+      } catch (e) {
+        ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
       }
       return {
         converted: false,
@@ -93,15 +93,15 @@ export async function encodeSilk(ctx: Context, filePath: string) {
         duration,
       }
     }
-  } catch (error: any) {
-    ctx.logger.error('convert silk failed', error.stack)
+  } catch (err) {
+    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(ctx: Context, inputFilePath: string, outFormat: OutFormat = 'mp3') {
+export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat) {
   const silk = await fsPromise.readFile(inputFilePath)
   const { data } = await decode(silk, 24000)
   const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath))
@@ -115,4 +115,4 @@ export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat:
       '-ac 1'
     ]
   }, outFilePath)
-}
+}

src/common/utils/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/file.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 import { TEMP_DIR } from '../globalVars'
 import { randomUUID, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
+import { fileTypeFromFile } from 'file-type'
 
 export function isGIF(path: string) {
   const buffer = Buffer.alloc(4)
@@ -116,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) {
@@ -132,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) {
-      const errMsg = `${uri} 下载失败, ${e.message}`
+    } catch (e) {
+      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 }
   }
 
@@ -162,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 }
     }
   }
@@ -175,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/legacyLog.ts

@@ -2,8 +2,9 @@ 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: any, maxLength = 500) {
+function truncateString(obj: Dict | null, maxLength = 500) {
   if (obj !== null && typeof obj === 'object') {
     Object.keys(obj).forEach((key) => {
       if (typeof obj[key] === 'string') {
@@ -22,7 +23,7 @@ function truncateString(obj: any, maxLength = 500) {
 
 export const logFileName = `llonebot-${new Date().toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
 
-export function log(...msg: any[]) {
+export function log(...msg: unknown[]) {
   if (!getConfigUtil().getConfig().log) {
     return
   }

src/common/utils/messageUnique.ts

@@ -10,154 +10,154 @@ 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
+  message: {
+    shortId: number
+    msgId: string
+    chatType: number
+    peerUid: string
+  }
+  file_v2: FileCacheV2
 }
 
 interface MsgIdAndPeerByShortId {
-    MsgId: string
-    Peer: Peer
+  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
+  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)
+  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 init(uin: string) {
-        const dbDir = path.join(DATA_DIR, 'database')
-        if (!fs.existsSync(dbDir)) {
-            await fsPromise.mkdir(dbDir)
+  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: '',
         }
-        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
+      }
     }
+    return undefined
+  }
 
-    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)
-    }
+  getShortIdByMsgId(msgId: string): number | undefined {
+    return this.msgIdMap.getValue(msgId)
+  }
 
-    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 getPeerByMsgId(msgId: string) {
+    const shortId = this.msgIdMap.getValue(msgId)
+    if (!shortId) return undefined
+    return await this.getMsgIdAndPeerByShortId(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
-    }
+  resize(maxSize: number): void {
+    this.msgIdMap.resize(maxSize)
+    this.msgDataMap.resize(maxSize)
+  }
 
-    getShortIdByMsgId(msgId: string): number | undefined {
-        return this.msgIdMap.getValue(msgId)
-    }
+  addFileCache(data: FileCacheV2) {
+    return this.db?.upsert('file_v2', [data], 'fileUuid')
+  }
 
-    async getPeerByMsgId(msgId: string) {
-        const shortId = this.msgIdMap.getValue(msgId)
-        if (!shortId) return undefined
-        return await this.getMsgIdAndPeerByShortId(shortId)
-    }
+  getFileCacheByName(fileName: string) {
+    return this.db?.get('file_v2', { fileName }, {
+      sort: { msgTime: 'desc' }
+    })
+  }
 
-    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 })
-    }
+  getFileCacheById(fileUuid: string) {
+    return this.db?.get('file_v2', { fileUuid })
+  }
 }
 
 export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper()

src/common/utils/misc.ts

@@ -1,4 +1,5 @@
 import { QQLevel } from '@/ntqqapi/types'
+import { Dict, isNullable } from 'cosmokit'
 
 export function isNumeric(str: string) {
   return /^\d+$/.test(str)
@@ -16,7 +17,7 @@ export function getBuildVersion(): number {
 }
 
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
-export function mergeNewProperties(newObj: any, oldObj: any) {
+export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
   Object.keys(newObj).forEach((key) => {
     // 如果老对象不存在当前属性，则直接复制
     if (!oldObj.hasOwnProperty(key)) {
@@ -31,4 +32,8 @@ export function mergeNewProperties(newObj: any, oldObj: any) {
       }
     }
   })
-}
+}
+
+export function filterNullable<T>(array: T[]) {
+  return array.filter(e => !isNullable(e)) as NonNullable<T>[]
+}

src/common/utils/request.ts

@@ -1,106 +1,104 @@
 import https from 'node:https'
 import http from 'node:http'
+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 };
-                resolve(cookies);
-              });
+                cookies = { ...cookies, ...redirectCookies }
+                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 key = parts[0];
-            const value = parts[1];
+            const parts = cookie.split(';')[0].split('=')
+            const key = parts[0]
+            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> {
-    let option = new URL(url);
-    const protocol = url.startsWith('https://') ? https : http;
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+    const option = new URL(url)
+    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) => {
-        let responseBody = '';
+      const req = protocol.request(options, (res: Dict) => {
+        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);
-                resolve(responseJson as T);
+                const responseJson = JSON.parse(responseBody)
+                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) => {
-        reject(error);
-      });
+      req.on('error', (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> = {}) {
-    return this.HttpGetJson<string>(url, method, data, headers, false, false);
+  static async HttpGetText(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}) {
+    return this.HttpGetJson<string>(url, method, data, headers, false, false)
   }
 }

src/common/utils/table.ts

@@ -1,72 +1,71 @@
 // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/MessageUnique.ts#L5
 export class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map()
-    private valueToKey: Map<V, K> = new Map()
-    private maxSize: number
+  private keyToValue: Map<K, V> = new Map()
+  private valueToKey: Map<V, K> = new Map()
+  private maxSize: number
 
-    constructor(maxSize: number) {
-        this.maxSize = maxSize
-    }
+  constructor(maxSize: number) {
+    this.maxSize = maxSize
+  }
 
-    resize(count: number) {
-        this.maxSize = count
-    }
+  resize(count: number) {
+    this.maxSize = count
+  }
 
-    set(key: K, value: V): void {
-        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
-            this.valueToKey.delete(this.keyToValue.get(oldestKey)!)
-            this.keyToValue.delete(oldestKey)
-        }
+  set(key: K, value: V): void {
+    this.keyToValue.set(key, value)
+    this.valueToKey.set(value, key)
+    while (this.keyToValue.size !== this.valueToKey.size) {
+      this.keyToValue.clear()
+      this.valueToKey.clear()
     }
+    while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
+      const oldestKey = this.keyToValue.keys().next().value!
+      this.valueToKey.delete(this.keyToValue.get(oldestKey)!)
+      this.keyToValue.delete(oldestKey)
+    }
+  }
 
-    getValue(key: K): V | undefined {
-        return this.keyToValue.get(key)
-    }
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key)
+  }
 
-    getKey(value: V): K | undefined {
-        return this.valueToKey.get(value)
-    }
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value)
+  }
 
-    deleteByValue(value: V): void {
-        const key = this.valueToKey.get(value)
-        if (key !== undefined) {
-            this.keyToValue.delete(key)
-            this.valueToKey.delete(value)
-        }
+  deleteByValue(value: V): void {
+    const key = this.valueToKey.get(value)
+    if (key !== undefined) {
+      this.keyToValue.delete(key)
+      this.valueToKey.delete(value)
     }
+  }
 
-    deleteByKey(key: K): void {
-        const value = this.keyToValue.get(key)
-        if (value !== undefined) {
-            this.keyToValue.delete(key)
-            this.valueToKey.delete(value)
-        }
+  deleteByKey(key: K): void {
+    const value = this.keyToValue.get(key)
+    if (value !== undefined) {
+      this.keyToValue.delete(key)
+      this.valueToKey.delete(value)
     }
+  }
 
-    getKeyList(): K[] {
-        return Array.from(this.keyToValue.keys())
-    }
+  getKeyList(): K[] {
+    return Array.from(this.keyToValue.keys())
+  }
 
-    //获取最近刚写入的几个值
-    getHeads(size: number): { key: K; value: V }[] | undefined {
-        const keyList = this.getKeyList()
-        if (keyList.length === 0) {
-            return undefined
-        }
-        const result: { key: K; value: V }[] = []
-        const listSize = Math.min(size, keyList.length)
-        for (let i = 0; i < listSize; i++) {
-            const key = keyList[listSize - i]
-            result.push({ key, value: this.keyToValue.get(key)! })
-        }
-        return result
+  //获取最近刚写入的几个值
+  getHeads(size: number): { key: K, value: V }[] | undefined {
+    const keyList = this.getKeyList()
+    if (keyList.length === 0) {
+      return undefined
     }
+    const result: { key: K; value: V }[] = []
+    const listSize = Math.min(size, keyList.length)
+    for (let i = 0; i < listSize; i++) {
+      const key = keyList[listSize - i]
+      result.push({ key, value: this.keyToValue.get(key)! })
+    }
+    return result
+  }
 }

src/common/utils/upgrade.ts

@@ -5,20 +5,22 @@ import { version } from '../../version'
 import { copyFolder, log, fetchFile } from '.'
 import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
 
-const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
-const checkVersionMirrorHosts = ['https://kkgithub.com']
+const downloadMirrorHosts = ['https://ghp.ci/']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
   const latestVersionText = await getRemoteVersion()
   const latestVersion = latestVersionText.split('.')
-  //log('llonebot last version', latestVersion)
-  const currentVersion: string[] = version.split('.')
+  log('LLOneBot latest version', latestVersion)
+  const currentVersion = version.split('.')
   //log('llonebot current version', currentVersion)
-  for (let k of [0, 1, 2]) {
-    if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
+  for (const k of [0, 1, 2]) {
+    const latest = parseInt(latestVersion[k])
+    const current = parseInt(currentVersion[k])
+    if (latest > current) {
       log('')
       return { result: true, version: latestVersionText }
-    } else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
+    } else if (latest < current) {
       break
     }
   }
@@ -28,7 +30,7 @@ export async function checkNewVersion() {
 export async function upgradeLLOneBot() {
   const latestVersion = await getRemoteVersion()
   if (latestVersion && latestVersion != '') {
-    const downloadUrl = 'https://github.com/LLOneBot/LLOneBot/releases/download/v' + latestVersion + '/LLOneBot.zip'
+    const downloadUrl = `https://github.com/LLOneBot/LLOneBot/releases/download/v${latestVersion}/LLOneBot.zip`
     const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
     let downloadSuccess = false
     // 多镜像下载
@@ -47,14 +49,14 @@ export async function upgradeLLOneBot() {
       return false
     }
     const temp_ver_dir = path.join(TEMP_DIR, 'LLOneBot' + latestVersion)
-    let uncompressedPromise = async function () {
-      return new Promise<boolean>((resolve, reject) => {
+    const uncompressedPromise = async function () {
+      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)
@@ -73,26 +75,34 @@ export async function upgradeLLOneBot() {
 }
 
 export async function getRemoteVersion() {
-  let Version = ''
-  for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-    let mirrorGithub = checkVersionMirrorHosts[i]
-    let tVersion = await getRemoteVersionByMirror(mirrorGithub)
-    if (tVersion && tVersion != '') {
-      Version = tVersion
-      break
+  for (const mirror of releasesMirrorHosts) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
+    if (version) {
+      return version
+    }
+  }
+  for (const mirror of downloadMirrorHosts) {
+    const version = await getRemoteVersionByDownloadMirror(mirror)
+    if (version) {
+      return version
     }
   }
-  return Version
-}
-
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-  let releasePage = 'error'
-
-  try {
-    releasePage = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
-    // log("releasePage", releasePage);
-    if (releasePage === 'error') return ''
-    return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
-  } catch { }
   return ''
 }
+
+export async function getRemoteVersionByDownloadMirror(mirrorGithub: string) {
+  try {
+    const source = 'https://raw.githubusercontent.com/LLOneBot/LLOneBot/main/src/version.ts'
+    const page = (await fetchFile(mirrorGithub + source)).data.toString()
+    return page.match(/(\d+\.\d+\.\d+)/)?.[0]
+  } catch (e) {
+    log(e?.toString())
+  }
+}
+
+export async function getRemoteVersionByReleasesMirror(mirrorGithub: string) {
+  try {
+    const page = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
+    return page.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
+  } catch { }
+}

src/global.d.ts

@@ -6,4 +6,4 @@ declare global {
   var LiteLoader: Dict
   var authData: Dict | undefined
   var navigation: Dict | undefined
-}
+}

src/main/log.ts

@@ -14,25 +14,22 @@ export default class Log {
 
   constructor(ctx: Context, cfg: Config) {
     Logger.targets.splice(0, Logger.targets.length)
-    if (!cfg.enable) {
-      return
-    }
+    let enable = cfg.enable
     const file = path.join(LOG_DIR, cfg.filename)
-    /*const refreshNick = ctx.debounce(() => {
-      const ntUserApi = ctx.get('ntUserApi')
-      if (ntUserApi && !selfInfo.nick) {
-        ntUserApi.getSelfNick(true)
-      }
-    }, 1000)*/
     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`
+        const content = `${dateTime} [${record.type}] ${selfInfo.nick}(${selfInfo.uin}) | ${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

@@ -53,15 +53,15 @@ function onLoad() {
     fs.mkdirSync(LOG_DIR)
   }
 
-  ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
+  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({
@@ -90,10 +90,10 @@ function onLoad() {
     }
   })
 
-  ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
+  ipcMain.handle(CHANNEL_ERROR, async () => {
     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()
@@ -101,12 +101,12 @@ function onLoad() {
     return error
   })
 
-  ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
+  ipcMain.handle(CHANNEL_GET_CONFIG, async () => {
     const config = getConfigUtil().getConfig()
     return config
   })
 
-  ipcMain.handle(CHANNEL_SET_CONFIG, (event, ask: boolean, config: LLOBConfig) => {
+  ipcMain.handle(CHANNEL_SET_CONFIG, (_event, ask: boolean, config: LLOBConfig) => {
     return new Promise<boolean>(resolve => {
       if (!ask) {
         getConfigUtil().setConfig(config)
@@ -139,7 +139,7 @@ function onLoad() {
     })
   })
 
-  ipcMain.on(CHANNEL_LOG, (event, arg) => {
+  ipcMain.on(CHANNEL_LOG, (_event, arg) => {
     log(arg)
   })
 
@@ -202,7 +202,7 @@ function onLoad() {
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (![2, 4].includes(window.id)) {
+  if (![2, 4, 6].includes(window.id)) {
     return
   }
   if (window.id === 2) {
@@ -212,15 +212,15 @@ function onBrowserWindowCreated(window: BrowserWindow) {
   try {
     hookNTQQApiCall(window, window.id !== 2)
     hookNTQQApiReceive(window, window.id !== 2)
-  } catch (e: any) {
-    log('LLOneBot hook error: ', e.toString())
+  } catch (e) {
+    log('LLOneBot hook error: ', String(e))
   }
 }
 
 try {
   onLoad()
-} catch (e: any) {
-  console.log(e.toString())
+} catch (e) {
+  console.log(e)
 }
 
 // 这两个函数都是可选的

src/ntqqapi/api/file.ts

@@ -21,7 +21,6 @@ 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'
@@ -39,7 +38,7 @@ export class NTQQFileApi extends Service {
 
   constructor(protected ctx: Context) {
     super(ctx, 'ntFileApi', true)
-    this.rkeyManager = new RkeyManager(ctx, 'http://napcat-sign.wumiao.wang:2082/rkey')
+    this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
   async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
@@ -143,76 +142,32 @@ export class NTQQFileApi extends Service {
         return sourcePath
       }
     }
-    let filePath: string
-    if (NTEventDispatch.initialised) {
-      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
-        },
+    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
+      'nodeIKernelMsgService/downloadRichMedia',
+      [
         {
-          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 }>(
-        'nodeIKernelMsgService/downloadRichMedia',
-        [
-          {
-            getReq: {
-              fileModelId: '0',
-              downloadSourceType: 0,
-              triggerType: 1,
-              msgId: msgId,
-              chatType: chatType,
-              peerUid: peerUid,
-              elementId: elementId,
-              thumbSize: 0,
-              downloadType: 1,
-              filePath: thumbPath,
-            },
+          getReq: {
+            fileModelId: '0',
+            downloadSourceType: 0,
+            triggerType: 1,
+            msgId: msgId,
+            chatType: chatType,
+            peerUid: peerUid,
+            elementId: elementId,
+            thumbSize: 0,
+            downloadType: 1,
+            filePath: thumbPath,
           },
-          null,
-        ],
-        {
-          cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-          cmdCB: payload => payload.notifyInfo.msgId === msgId,
-          timeout
-        }
-      )
-      filePath = data.notifyInfo.filePath
-    }
+        },
+        null,
+      ],
+      {
+        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.msgId === msgId,
+        timeout
+      }
+    )
+    let filePath = data.notifyInfo.filePath
     if (filePath.startsWith('\\')) {
       const downloadPath = TEMP_DIR
       filePath = path.join(downloadPath, filePath)
@@ -240,17 +195,17 @@ export class NTQQFileApi extends Service {
     const fileMd5 = element.md5HexStr
 
     if (url) {
-      const UrlParse = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
-      const imageAppid = UrlParse.searchParams.get('appid')
+      const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
+      const imageAppid = parsedUrl.searchParams.get('appid')
       const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
       if (isNewPic) {
-        let UrlRkey = UrlParse.searchParams.get('rkey')
-        if (UrlRkey) {
+        let rkey = parsedUrl.searchParams.get('rkey')
+        if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
         }
         const rkeyData = await this.rkeyManager.getRkey()
-        UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey
-        return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`
+        rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey
+        return IMAGE_HTTP_HOST_NT + url + rkey
       } else {
         // 老的图片url，不需要rkey
         return IMAGE_HTTP_HOST + url

src/ntqqapi/api/friend.ts

@@ -2,9 +2,8 @@ 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 { NTEventDispatch } from '@/common/utils/eventTask'
-import { pick } from 'cosmokit'
+import { BuddyListReqType } from '../services'
+import { Dict, pick } from 'cosmokit'
 import { Service, Context } from 'cordis'
 
 declare module 'cordis' {
@@ -19,7 +18,7 @@ export class NTQQFriendApi extends Service {
   }
 
   /** 大于或等于 26702 应使用 getBuddyV2 */
-  async getFriends(forced = false) {
+  async getFriends() {
     const data = await invoke<{
       data: {
         categoryId: number
@@ -75,9 +74,7 @@ export class NTQQFriendApi extends Service {
       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']>(
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      )
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
       return Array.from(data.values())
     } else {
       const data = await invoke<{
@@ -92,11 +89,8 @@ export class NTQQFriendApi extends Service {
           afterFirstCmd: false,
         }
       )
-      const categoryUids: Map<number, string[]> = new Map()
-      for (const item of data.buddyCategory) {
-        categoryUids.set(item.categoryId, item.buddyUids)
-      }
-      return Object.values(data.userSimpleInfos).filter(v => v.baseInfo && categoryUids.get(v.baseInfo.categoryId)?.includes(v.uid!))
+      const uids = data.buddyCategory.flatMap(item => item.buddyUids)
+      return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
     }
   }
 
@@ -106,12 +100,10 @@ export class NTQQFriendApi extends Service {
     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']>(
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      )
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
       for (const [, item] of data) {
         if (retMap.size > 5000) {
           break
@@ -145,19 +137,17 @@ export class NTQQFriendApi extends Service {
     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']>(
-        'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids
-      )
+        }))
+      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
       return Array.from(data).map(([key, value]) => {
         const category = categoryMap.get(key)
         return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
@@ -199,4 +189,9 @@ export class NTQQFriendApi extends Service {
       return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }, null])
     }
   }
+
+  async getBuddyRecommendContact(uin: string) {
+    const ret = await invoke('nodeIKernelBuddyService/getBuddyRecommendContactArkJson', [{ uin }, null])
+    return ret.arkMsg
+  }
 }

src/ntqqapi/api/group.ts

@@ -1,11 +1,10 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify, GetFileListParam } from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam, PublishGroupBulletinReq } from '../types'
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { NTQQWindows } from './window'
 import { getSession } from '../wrapper'
-import { NTEventDispatch } from '@/common/utils/eventTask'
-import { NodeIKernelGroupListener, OnGroupFileInfoUpdateParams } from '../listeners'
+import { OnGroupFileInfoUpdateParams } from '../listeners'
 import { NodeIKernelGroupService } from '../services'
 import { Service, Context } from 'cordis'
 import { isNumeric } from '@/common/utils/misc'
@@ -25,35 +24,20 @@ export class NTQQGroupApi extends Service {
     super(ctx, 'ntGroupApi', true)
   }
 
-  async getGroups(forced = false): Promise<Group[]> {
-    if (NTEventDispatch.initialised) {
-      type ListenerType = NodeIKernelGroupListener['onGroupListUpdate']
-      const [, , groupList] = await NTEventDispatch.CallNormalEvent
-        <(force: boolean) => Promise<any>, ListenerType>
-        (
-          'NodeIKernelGroupService/getGroupList',
-          'NodeIKernelGroupListener/onGroupListUpdate',
-          1,
-          5000,
-          () => true,
-          forced
-        )
-      return groupList
-    } else {
-      const result = await invoke<{
-        updateType: number
-        groupList: Group[]
-      }>(
-        'getGroupList',
-        [],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.GROUPS_STORE,
-          afterFirstCmd: false,
-        }
-      )
-      return result.groupList
-    }
+  async getGroups(): Promise<Group[]> {
+    const result = await invoke<{
+      updateType: number
+      groupList: Group[]
+    }>(
+      'getGroupList',
+      [],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.GROUPS_STORE,
+        afterFirstCmd: false,
+      }
+    )
+    return result.groupList
   }
 
   async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
@@ -76,30 +60,29 @@ export class NTQQGroupApi extends Service {
   async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
     const groupCodeStr = groupCode.toString()
     const memberUinOrUidStr = memberUinOrUid.toString()
-    let members = this.groupMembers.get(groupCodeStr)
-    if (!members) {
+    if (!this.groupMembers.has(groupCodeStr)) {
       try {
-        members = await this.getGroupMembers(groupCodeStr)
         // 更新群成员列表
-        this.groupMembers.set(groupCodeStr, members)
+        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)
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
       } else {
-        member = members!.get(memberUinOrUidStr)
+        member = members.get(memberUinOrUidStr)
       }
       return member
     }
     let member = getMember()
     if (!member) {
-      members = await this.getGroupMembers(groupCodeStr)
-      this.groupMembers.set(groupCodeStr, members)
+      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      members = this.groupMembers.get(groupCodeStr)!
       member = getMember()
     }
     return member
@@ -115,32 +98,16 @@ export class NTQQGroupApi extends Service {
   }
 
   async getSingleScreenNotifies(num: number) {
-    if (NTEventDispatch.initialised) {
-      const [_retData, _doubt, _seq, notifies] = await NTEventDispatch.CallNormalEvent
-        <(arg1: boolean, arg2: string, arg3: number) => Promise<any>, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void>
-        (
-          'NodeIKernelGroupService/getSingleScreenNotifies',
-          'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
-          1,
-          5000,
-          () => true,
-          false,
-          '',
-          num,
-        )
-      return notifies
-    } else {
-      invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
-      return (await invoke<GroupNotifies>(
-        'nodeIKernelGroupService/getSingleScreenNotifies',
-        [{ doubt: false, startSeq: '', number: num }, null],
-        {
+    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
+    return (await invoke<GroupNotifies>(
+      'nodeIKernelGroupService/getSingleScreenNotifies',
+      [{ doubt: false, startSeq: '', number: num }, null],
+      {
 
-          cbCmd: ReceiveCmdS.GROUP_NOTIFY,
-          afterFirstCmd: false,
-        }
-      )).notifies
-    }
+        cbCmd: ReceiveCmdS.GROUP_NOTIFY,
+        afterFirstCmd: false,
+      }
+    )).notifies
   }
 
   async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
@@ -150,17 +117,15 @@ export class NTQQGroupApi extends Service {
     const type = parseInt(flagitem[2])
     const session = getSession()
     if (session) {
-      return session.getGroupService().operateSysNotify(
-        false,
-        {
-          'operateType': operateType, // 2 拒绝
-          'targetMsg': {
-            'seq': seq,  // 通知序列号
-            'type': type,
-            'groupCode': groupCode,
-            'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-          }
-        })
+      return session.getGroupService().operateSysNotify(false, {
+        operateType, // 2 拒绝
+        targetMsg: {
+          seq,  // 通知序列号
+          type,
+          groupCode,
+          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+        }
+      })
     } else {
       return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
         doubt: false,
@@ -261,30 +226,30 @@ export class NTQQGroupApi extends Service {
   }
 
   /** 27187 TODO */
-  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)
-    let param = {
-      groupCode: GroupCode,
-      msgRandom: parseInt(MsgData?.msgList[0].msgRandom!),
-      msgSeq: parseInt(MsgData?.msgList[0].msgSeq!)
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    const param = {
+      groupCode: groupCode,
+      msgRandom: Number(data?.msgList[0].msgRandom),
+      msgSeq: Number(data?.msgList[0].msgSeq)
     }
     // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
     return session?.getGroupService().removeGroupEssence(param)
   }
 
   /** 27187 TODO */
-  async addGroupEssence(GroupCode: string, msgId: string) {
+  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)
-    let param = {
-      groupCode: GroupCode,
-      msgRandom: parseInt(MsgData?.msgList[0].msgRandom!),
-      msgSeq: parseInt(MsgData?.msgList[0].msgSeq!)
+    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    const param = {
+      groupCode: groupCode,
+      msgRandom: Number(data?.msgList[0].msgRandom),
+      msgSeq: Number(data?.msgList[0].msgSeq)
     }
     // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
     return session?.getGroupService().addGroupEssence(param)
@@ -298,8 +263,8 @@ export class NTQQGroupApi extends Service {
     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 deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }, null])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
@@ -321,4 +286,21 @@ export class NTQQGroupApi extends Service {
     )
     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])
+  }
+
+  async getGroupRecommendContact(groupCode: string) {
+    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }, null])
+    return ret.arkJson
+  }
 }

src/ntqqapi/api/msg.ts

@@ -2,7 +2,6 @@ import { invoke, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
 import { getSession } from '@/ntqqapi/wrapper'
-import { NTEventDispatch } from '@/common/utils/eventTask'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -102,62 +101,35 @@ export class NTQQMsgApi extends Service {
     }
   }
 
-  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[]
-    if (NTEventDispatch.initialised) {
-      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) {
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/sendMsg',
+      [
+        {
+          msgId: '0',
+          peer,
+          msgElements,
+          msgAttributeInfos: new Map()
+        },
+        null
+      ],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
             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[] }>(
-        'nodeIKernelMsgService/sendMsg',
-        [
-          {
-            msgId: '0',
-            peer,
-            msgElements,
-            msgAttributeInfos: new Map()
-          },
-          null
-        ],
-        {
-          cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-          afterFirstCmd: false,
-          cmdCB: payload => {
-            for (const msgRecord of payload.msgList) {
-              if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
-                return true
-              }
-            }
-            return false
-          },
-          timeout
-        }
-      )
-      msgList = data.msgList
-    }
-    return msgList.find(msgRecord => msgRecord.guildId === msgId)
+        timeout
+      }
+    )
+    return data.msgList.find(msgRecord => msgRecord.guildId === msgId)
   }
 
   async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
@@ -165,7 +137,7 @@ export class NTQQMsgApi extends Service {
     if (session) {
       return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
     } else {
-      return await invoke<GeneralCallResult>(NTMethod.FORWARD_MSG, [{
+      return await invoke(NTMethod.FORWARD_MSG, [{
         msgIds,
         srcContact: srcPeer,
         dstContacts: [destPeer],
@@ -181,65 +153,37 @@ export class NTQQMsgApi extends Service {
       return { msgId: id, senderShowName }
     })
     const selfUid = selfInfo.uid
-    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) {
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/multiForwardMsgWithComment',
+      [
+        {
+          msgInfos,
+          srcContact: srcPeer,
+          dstContact: destPeer,
+          commentElements: [],
+          msgAttributeInfos: new Map(),
+        },
+        null,
+      ],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
             if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
               return true
             }
           }
           return false
         },
-        msgInfos,
-        srcPeer,
-        destPeer,
-        [],
-        new Map()
-      )
-      msgList = data[1]
-    } else {
-      const data = await invoke<{ msgList: RawMessage[] }>(
-        'nodeIKernelMsgService/multiForwardMsgWithComment',
-        [
-          {
-            msgInfos,
-            srcContact: srcPeer,
-            dstContact: destPeer,
-            commentElements: [],
-            msgAttributeInfos: new Map(),
-          },
-          null,
-        ],
-        {
-          cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-          afterFirstCmd: false,
-          cmdCB: payload => {
-            for (const msgRecord of payload.msgList) {
-              if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
-                return true
-              }
-            }
-            return false
-          },
-        }
-      )
-      msgList = data.msgList
-    }
-    for (const msg of msgList) {
+      }
+    )
+    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
       }
@@ -308,4 +252,8 @@ export class NTQQMsgApi extends Service {
       }
     }, null])
   }
+
+  async setMsgRead(peer: Peer) {
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }, null])
+  }
 }

src/ntqqapi/api/user.ts

@@ -1,11 +1,9 @@
-import { invoke, NTMethod } from '../ntcall'
+import { invoke } from '../ntcall'
 import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
 import { getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { NodeIKernelProfileService, UserDetailSource, ProfileBizType } from '../services'
-import { NodeIKernelProfileListener } from '../listeners'
-import { NTEventDispatch } from '@/common/utils/eventTask'
+import { UserDetailSource, ProfileBizType } from '../services'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
@@ -37,44 +35,24 @@ export class NTQQUserApi extends Service {
   }
 
   async fetchUserDetailInfo(uid: string) {
-    let info: UserDetailInfoListenerArg
-    if (NTEventDispatch.initialised) {
-      type EventService = NodeIKernelProfileService['fetchUserDetailInfo']
-      type EventListener = NodeIKernelProfileListener['onUserDetailInfoChanged']
-      const [_retData, profile] = await NTEventDispatch.CallNormalEvent
-        <EventService, EventListener>
-        (
-          'NodeIKernelProfileService/fetchUserDetailInfo',
-          'NodeIKernelProfileListener/onUserDetailInfoChanged',
-          1,
-          5000,
-          (profile) => profile.uid === uid,
-          'BuddyProfileStore',
-          [uid],
-          UserDetailSource.KSERVER,
-          [ProfileBizType.KALL]
-        )
-      info = profile
-    } else {
-      const result = await invoke<{ info: UserDetailInfoListenerArg }>(
-        'nodeIKernelProfileService/fetchUserDetailInfo',
-        [
-          {
-            callFrom: 'BuddyProfileStore',
-            uid: [uid],
-            source: UserDetailSource.KSERVER,
-            bizList: [ProfileBizType.KALL]
-          },
-          null
-        ],
+    const result = await invoke<{ info: UserDetailInfoListenerArg }>(
+      'nodeIKernelProfileService/fetchUserDetailInfo',
+      [
         {
-          cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
-          afterFirstCmd: false,
-          cmdCB: payload => payload.info.uid === uid,
-        }
-      )
-      info = result.info
-    }
+          callFrom: 'BuddyProfileStore',
+          uid: [uid],
+          source: UserDetailSource.KSERVER,
+          bizList: [ProfileBizType.KALL]
+        },
+        null
+      ],
+      {
+        cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.info.uid === uid,
+      }
+    )
+    const { info } = result
     const ret: User = {
       ...info.simpleInfo.coreInfo,
       ...info.simpleInfo.status,
@@ -87,54 +65,26 @@ export class NTQQUserApi extends Service {
     return ret
   }
 
-  async getUserDetailInfo(uid: string, getLevel = false, withBizInfo = true) {
+  async getUserDetailInfo(uid: string) {
     if (getBuildVersion() >= 26702) {
       return this.fetchUserDetailInfo(uid)
     }
-    if (NTEventDispatch.initialised) {
-      type EventService = 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 }>(
-        'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-        [
-          {
-            uid,
-            bizList: [0]
-          },
-          null,
-        ],
+    const result = await invoke<{ info: User }>(
+      'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
+      [
         {
-          cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-          afterFirstCmd: false,
-          cmdCB: (payload) => payload.info.uid === uid,
-        }
-      )
-      return result.info
-    }
-  }
-
-  async getSkey(): Promise<string> {
-    const clientKeyData = await this.forceFetchClientKey()
-    if (clientKeyData?.result !== 0) {
-      throw new Error('获取clientKey失败')
-    }
-    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
-      + '&clientkey=' + clientKeyData.clientKey
-      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
-    return (await RequestUtil.HttpsGetCookies(url))?.skey
+          uid,
+          bizList: [0]
+        },
+        null,
+      ],
+      {
+        cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: (payload) => payload.info.uid === uid,
+      }
+    )
+    return result.info
   }
 
   async getCookies(domain: string) {
@@ -148,6 +98,10 @@ export class NTQQUserApi extends Service {
     return cookies
   }
 
+  async getPSkey(domains: string[]) {
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }, null])
+  }
+
   genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
@@ -244,40 +198,27 @@ export class NTQQUserApi extends Service {
   }
 
   async getUserDetailInfoByUinV2(uin: string) {
-    if (NTEventDispatch.initialised) {
-      return await NTEventDispatch.CallNoListenerEvent
-        <(Uin: string) => Promise<UserDetailInfoByUinV2>>(
-          'NodeIKernelProfileService/getUserDetailInfoByUin',
-          5000,
-          uin
-        )
-    } else {
-      return await invoke<UserDetailInfoByUinV2>(
-        'nodeIKernelProfileService/getUserDetailInfoByUin',
-        [
-          { uin },
-          null,
-        ],
-      )
-    }
+    return await invoke<UserDetailInfoByUinV2>(
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
+      [
+        { uin },
+        null,
+      ],
+    )
   }
 
   async getUserDetailInfoByUin(uin: string) {
-    return NTEventDispatch.CallNoListenerEvent
-      <(Uin: string) => Promise<UserDetailInfoByUin>>(
-        'NodeIKernelProfileService/getUserDetailInfoByUin',
-        5000,
-        uin
-      )
+    return await invoke<UserDetailInfoByUin>(
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
+      [
+        { uin },
+        null,
+      ],
+    )
   }
 
   async getUinByUidV1(uid: string) {
-    const ret = await NTEventDispatch.CallNoListenerEvent
-      <(Uin: string[]) => Promise<{ uinInfo: Map<string, string> }>>(
-        'NodeIKernelUixConvertService/getUin',
-        5000,
-        [uid]
-      )
+    const ret = await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])
     let uin = ret.uinInfo.get(uid)
     if (!uin) {
       uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
@@ -344,4 +285,19 @@ export class NTQQUserApi extends Service {
       }
     }, null])
   }
+
+  async getProfileLike(uid: string) {
+    return await invoke('nodeIKernelProfileLikeService/getBuddyProfileLike', [{
+      req: {
+        friendUids: [uid],
+        basic: 1,
+        vote: 1,
+        favorite: 0,
+        userProfile: 1,
+        type: 2,
+        start: 0,
+        limit: 20,
+      }
+    }, null])
+  }
 }

src/ntqqapi/api/webapi.ts

@@ -41,7 +41,7 @@ interface WebApiGroupMemberRet {
   em: string
   cache: number
   adm_num: number
-  levelname: any
+  levelname: unknown
   mems: WebApiGroupMember[]
   count: number
   svr_time: number
@@ -60,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
 }
 
@@ -106,7 +106,7 @@ export class NTQQWebApi extends Service {
     super(ctx, 'ntWebApi', true)
   }
 
-  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 this.ctx.ntUserApi.getCookies('qun.qq.com')
     const cookieStr = this.cookieToString(cookieObject)
@@ -115,7 +115,7 @@ export class NTQQWebApi extends Service {
       st: '0',
       end: '40',
       sort: '1',
-      gc: GroupCode,
+      gc: groupCode,
       bkn: this.genBkn(cookieObject.skey)
     })
     const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
@@ -160,11 +160,10 @@ export class NTQQWebApi extends Service {
   //实现未缓存 考虑2h缓存
   async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
     const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-      let url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
-      let res = ''
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
       let resJson
       try {
-        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
+        const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
         const match = res.match(/window\.__INITIAL_STATE__=(.*?);/)
         if (match) {
           resJson = JSON.parse(match[1].trim())
@@ -180,26 +179,26 @@ export class NTQQWebApi extends Service {
       return undefined
     }
 
-    let HonorInfo: any = { group_id: groupCode }
+    const honorInfo: Dict = { group_id: groupCode }
     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('获取龙王信息失败')
         }
-        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,
@@ -213,13 +212,13 @@ export class NTQQWebApi extends Service {
     }
     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('获取群聊之火失败')
         }
-        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,
@@ -232,13 +231,13 @@ export class NTQQWebApi extends Service {
     }
     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('获取群聊炽焰失败')
         }
-        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,
@@ -251,13 +250,13 @@ export class NTQQWebApi extends Service {
     }
     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('获取快乐源泉失败')
         }
-        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,
@@ -270,9 +269,9 @@ export class NTQQWebApi extends Service {
     }
     //冒尖小春笋好像已经被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> {

src/ntqqapi/api/window.ts

@@ -1,6 +1,6 @@
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { ReceiveCmd } from '../hook'
+import { ReceiveCmdS } from '../hook'
 import { BrowserWindow } from 'electron'
 import { Service, Context } from 'cordis'
 
@@ -38,8 +38,8 @@ export class NTQQWindowApi extends Service {
   // 打开窗口并获取对应的下发事件
   async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
-    args: any[],
-    cbCmd: ReceiveCmd | undefined,
+    args: unknown[],
+    cbCmd: ReceiveCmdS | undefined,
     autoCloseSeconds: number = 2,
   ) {
     const result = await invoke<R>(

src/ntqqapi/core.ts

@@ -2,8 +2,6 @@ import fs from 'node:fs'
 import { Service, Context } from 'cordis'
 import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
 import { MessageUnique } from '../common/utils/messageUnique'
-import { NTEventDispatch } from '../common/utils/eventTask'
-import { wrapperConstructor, getSession } from './wrapper'
 import { Config as LLOBConfig } from '../common/types'
 import { llonebotError } from '../common/globalVars'
 import { isNumeric } from '../common/utils/misc'
@@ -21,6 +19,7 @@ import {
 } from './types'
 import { selfInfo } from '../common/globalVars'
 import { version } from '../version'
+import { invoke } from './ntcall'
 
 declare module 'cordis' {
   interface Context {
@@ -28,11 +27,12 @@ declare module 'cordis' {
   }
   interface Events {
     'nt/message-created': (input: RawMessage[]) => void
-    'nt/message-deleted': (input: RawMessage[]) => void
-    'nt/message-sent': (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/group-member-info-updated': (input: { groupCode: string, members: GroupMember[] }) => void
+    'nt/system-message-created': (input: Uint8Array) => void
   }
 }
 
@@ -45,10 +45,6 @@ class Core extends Service {
 
   public start() {
     llonebotError.otherError = ''
-    const WrapperSession = getSession()
-    if (WrapperSession) {
-      NTEventDispatch.init({ ListenerMap: wrapperConstructor, WrapperSession })
-    }
     MessageUnique.init(selfInfo.uin)
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
@@ -62,8 +58,8 @@ class Core extends Service {
       data: CategoryFriend[]
     }>(ReceiveCmdS.FRIENDS, (payload) => {
       type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
-      let friendList: User[] = [];
-      if ((payload as any).userSimpleInfos) {
+      let friendList: User[] = []
+      if ('userSimpleInfos' in payload) {
         friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
           return {
             ...v.coreInfo,
@@ -89,18 +85,18 @@ class Core extends Service {
         for (const msgElement of message.elements) {
           setTimeout(() => {
             const picPath = msgElement.picElement?.sourcePath
-            const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
+            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 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, () => {
+                fs.unlink(path, () => {
                   this.ctx.logger.info('删除文件成功', path)
                 })
               }
@@ -126,15 +122,15 @@ class Core extends Service {
       }[]
     }>(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) {
+        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 - parseInt(lastTempMsg?.msgTime!) < 5) {
+                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
                   this.ctx.parallel('nt/message-created', [lastTempMsg!])
                 }
               })
@@ -178,29 +174,26 @@ class Core extends Service {
       this.ctx.parallel('nt/message-created', payload.msgList)
     })
 
+    const sentMsgIds = new Map<string, boolean>()
     const recallMsgIds: string[] = [] // 避免重复上报
+
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
-      const list = payload.msgList.filter(v => {
-        if (recallMsgIds.includes(v.msgId)) {
-          return false
+      for (const msg of payload.msgList) {
+        if (msg.recallTime !== '0' && !recallMsgIds.includes(msg.msgId)) {
+          recallMsgIds.push(msg.msgId)
+          this.ctx.parallel('nt/message-deleted', msg)
+        } else if (sentMsgIds.get(msg.msgId)) {
+          sentMsgIds.delete(msg.msgId)
+          this.ctx.parallel('nt/message-sent', msg)
         }
-        recallMsgIds.push(v.msgId)
-        return true
-      })
-      this.ctx.parallel('nt/message-deleted', list)
+      }
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
-      const { msgId, chatType, peerUid } = payload.msgRecord
-      const peer = {
-        chatType,
-        peerUid
-      }
-      MessageUnique.createMsg(peer, msgId)
       if (!this.config.reportSelfMessage) {
         return
       }
-      this.ctx.parallel('nt/message-sent', [payload.msgRecord])
+      sentMsgIds.set(payload.msgRecord.msgId, true)
     })
 
     const groupNotifyFlags: string[] = []
@@ -231,6 +224,14 @@ class Core extends Service {
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
       this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
     })
+
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { classNameIsRegister: true })
+
+    registerReceiveHook<{
+      msgBuf: number[]
+    }>('nodeIKernelMsgListener/onRecvSysMsg', payload => {
+      this.ctx.parallel('nt/system-message-created', Uint8Array.from(payload.msgBuf))
+    })
   }
 }
 
@@ -239,4 +240,4 @@ namespace Core {
   }
 }
 
-export default Core
+export default Core

src/ntqqapi/entities.ts

@@ -99,32 +99,33 @@ export namespace SendElementEntities {
     }
   }
 
-  export async function file(ctx: Context, filePath: string, fileName: string = '', folderId: string = ''): Promise<SendFileElement> {
-    const { fileName: _fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(filePath, ElementType.FILE)
-    if (fileSize === 0) {
-      throw '文件异常，大小为 0'
+  export async function file(ctx: Context, filePath: string, fileName: string, folderId = ''): Promise<SendFileElement> {
+    const fileSize = (await stat(filePath)).size.toString()
+    if (fileSize === '0') {
+      ctx.logger.warn(`文件${fileName}异常，大小为 0`)
+      throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
       elementType: ElementType.FILE,
       elementId: '',
       fileElement: {
-        fileName: fileName || _fileName,
-        folderId: folderId,
-        filePath: path!,
-        fileSize: fileSize.toString(),
+        fileName,
+        folderId,
+        filePath,
+        fileSize,
       },
     }
     return element
   }
 
-  export async function video(ctx: Context, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+  export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
     try {
       await stat(filePath)
     } catch (e) {
       throw `文件${filePath}异常，不存在`
     }
     ctx.logger.info('复制视频到QQ目录', filePath)
-    let { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
 
     ctx.logger.info('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
@@ -170,7 +171,7 @@ export namespace SendElementEntities {
 
       setTimeout(useDefaultThumb, 5000)
       ffmpeg(filePath)
-        .on('error', (err) => {
+        .on('error', () => {
           if (diyThumbPath) {
             copyFile(diyThumbPath, thumbPath)
               .then(() => {
@@ -194,14 +195,14 @@ export namespace SendElementEntities {
           resolve(thumbPath)
         })
     })
-    let thumbPath = new Map()
+    const thumbPath = new Map()
     const _thumbPath = await createThumb
     ctx.logger.info('生成视频缩略图', _thumbPath)
     const thumbSize = (await stat(_thumbPath)).size
     // log("生成缩略图", _thumbPath)
     thumbPath.set(0, _thumbPath)
     const thumbMd5 = await calculateFileMD5(_thumbPath)
-    let element: SendVideoElement = {
+    const element: SendVideoElement = {
       elementType: ElementType.VIDEO,
       elementId: '',
       videoElement: {

src/ntqqapi/helper/rkey.ts

@@ -1,4 +1,4 @@
-import { Context } from "cordis"
+import { Context } from 'cordis'
 
 interface ServerRkeyData {
   group_rkey: string
@@ -35,7 +35,7 @@ export class RkeyManager {
     return now > this.rkeyData.expired_time
   }
 
-  async refreshRkey(): Promise<any> {
+  async refreshRkey() {
     //刷新rkey
     this.rkeyData = await this.fetchServerRkey()
   }

src/ntqqapi/hook.ts

@@ -2,51 +2,50 @@ import type { BrowserWindow } from 'electron'
 import { NTClass, NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
+import { Dict } from 'cosmokit'
 
-export const hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
+export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export const ReceiveCmdS = {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
-} as const
+export enum ReceiveCmdS {
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
+  FRIENDS = 'onBuddyListChange',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  SKEY_UPDATE = 'onSkeyUpdate',
+}
 
-export type ReceiveCmd = string
-
-interface NTQQApiReturnData<Payload = unknown> extends Array<any> {
-  0: {
+type NTReturnData = [
+  {
     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
 }> = []
@@ -57,63 +56,44 @@ const callHooks: Array<{
 }> = []
 
 export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
-  const originalSend = window.webContents.send
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-    try {
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
-      if (logHook && !isLogger) {
-        log(`received ntqq api message: ${channel}`, args)
-      }
-    } catch { }
-    if (!onlyLog) {
-      if (args?.[1] instanceof Array) {
-        for (const receiveData of args?.[1]) {
-          const ntQQApiMethodName = receiveData.cmdName
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-          for (const hook of receiveHooks) {
-            if (hook.method.includes(ntQQApiMethodName)) {
-              new Promise((resolve, reject) => {
-                try {
-                  hook.hookFunc(receiveData.payload)
-                } catch (e: any) {
-                  log('hook error', ntQQApiMethodName, e.stack.toString())
-                }
-                resolve(undefined)
-              }).then()
+  window.webContents.send = new Proxy(window.webContents.send, {
+    apply(target, thisArg, args: [channel: string, ...args: NTReturnData]) {
+      try {
+        if (logHook && !args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+          log('received ntqq api message', args)
+        }
+      } catch { }
+      if (!onlyLog) {
+        if (args[2] instanceof Array) {
+          for (const receiveData of args[2]) {
+            const ntMethodName = receiveData.cmdName
+            for (const hook of receiveHooks) {
+              if (hook.method.includes(ntMethodName)) {
+                Promise.resolve(hook.hookFunc(receiveData.payload))
+              }
             }
           }
         }
-      }
-      if (args[0]?.callbackId) {
-        // log("hookApiCallback", hookApiCallbacks, args)
-        const callbackId = args[0].callbackId
-        if (hookApiCallbacks[callbackId]) {
-          // log("callback found")
-          new Promise((resolve, reject) => {
-            hookApiCallbacks[callbackId](args[1])
-            resolve(undefined)
-          }).then()
-          delete hookApiCallbacks[callbackId]
+        if (args[1]?.callbackId) {
+          const callbackId = args[1].callbackId
+          if (hookApiCallbacks[callbackId]) {
+            Promise.resolve(hookApiCallbacks[callbackId](args[2]))
+            delete hookApiCallbacks[callbackId]
+          }
         }
       }
-    }
-    originalSend.call(window.webContents, channel, ...args)
-  }
-  window.webContents.send = patchSend
+      return target.apply(thisArg, args)
+    },
+  })
 }
 
 export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
-  // 监听调用NTQQApi
-  let webContents = window.webContents as any
+  const webContents = window.webContents as Dict
   const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
 
   const proxyIpcMsg = new Proxy(ipc_message_proxy, {
     apply(target, thisArg, args) {
-      // console.log(thisArg, args);
-      let isLogger = false
-      try {
-        isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
-      } catch (e) { }
+      const isLogger = args[3]?.[0]?.eventName?.startsWith('ns-LoggerApi')
       if (!isLogger) {
         try {
           logHook && log('call NTQQ api', thisArg, args)
@@ -121,21 +101,14 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
         if (!onlyLog) {
           try {
             const _args: unknown[] = args[3][1]
-            const cmdName: NTMethod = _args[0] as NTMethod
+            const cmdName = _args[0] as NTMethod
             const callParams = _args.slice(1)
             callHooks.forEach((hook) => {
               if (hook.method.includes(cmdName)) {
-                new Promise((resolve, reject) => {
-                  try {
-                    hook.hookFunc(callParams)
-                  } catch (e: any) {
-                    log('hook call error', e, _args)
-                  }
-                  resolve(undefined)
-                }).then()
+                Promise.resolve(hook.hookFunc(callParams))
               }
             })
-          } catch (e) { }
+          } catch { }
         }
       }
       return target.apply(thisArg, args)
@@ -147,20 +120,17 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-message'] = proxyIpcMsg
   }
 
-  const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
+  /*const ipc_invoke_proxy = webContents._events['-ipc-invoke']?.[0] || webContents._events['-ipc-invoke']
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
-      // 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)
-      /*try {
-        HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }*/
+      const ret = target.apply(thisArg, args)
+      //HOOK_LOG && log('call NTQQ invoke api return', ret)
       return ret
     },
   })
@@ -168,11 +138,11 @@ export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
     webContents._events['-ipc-invoke'][0] = proxyIpcInvoke
   } else {
     webContents._events['-ipc-invoke'] = proxyIpcInvoke
-  }
+  }*/
 }
 
 export function registerReceiveHook<PayloadType>(
-  method: ReceiveCmd | ReceiveCmd[],
+  method: string | string[],
   hookFunc: (payload: PayloadType) => void,
 ): string {
   const id = randomUUID()
@@ -180,7 +150,7 @@ export function registerReceiveHook<PayloadType>(
     method = [method]
   }
   receiveHooks.push({
-    method,
+    method: method as ReceiveCmdS[],
     hookFunc,
     id,
   })
@@ -203,4 +173,4 @@ export function registerCallHook(
 export function removeReceiveHook(id: string) {
   const index = receiveHooks.findIndex((h) => h.id === id)
   receiveHooks.splice(index, 1)
-}
+}

src/ntqqapi/listeners/NodeIKernelGroupListener.ts

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

@@ -265,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: OnGroupFileInfoUpdateParams) {
-
-  }
-
-  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
@@ -12,33 +12,4 @@ interface IProfileListener {
   onSelfStatusChanged(...args: unknown[]): void
 
   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

@@ -108,7 +108,7 @@ interface InvokeOptions<ReturnType> {
 }
 
 export function invoke<
-  R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => any>>>,
+  R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
   S extends keyof NTService = any,
   M extends keyof NTService[S] & string = any
 >(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
@@ -136,8 +136,7 @@ export function invoke<
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
         const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
-          // log(methodName, "second callback", cbCmd, payload, cmdCB);
-          if (!!options.cmdCB) {
+          if (options.cmdCB) {
             if (options.cmdCB(payload, result)) {
               removeReceiveHook(hookId)
               success = true
@@ -174,7 +173,7 @@ export function invoke<
       channel,
       {
         sender: {
-          send: (..._args: unknown[]) => {
+          send: () => {
           },
         },
       },
@@ -182,4 +181,4 @@ export function invoke<
       apiArgs,
     )
   })
-}
+}

src/ntqqapi/proto/compiled.d.ts

@@ -0,0 +1,469 @@
+import * as $protobuf from "protobufjs";
+import Long = require("long");
+/** Namespace SysMsg. */
+export namespace SysMsg {
+
+    /** Properties of a SystemMessage. */
+    interface ISystemMessage {
+
+        /** SystemMessage header */
+        header?: (SysMsg.ISystemMessageHeader[]|null);
+
+        /** SystemMessage msgSpec */
+        msgSpec?: (SysMsg.ISystemMessageMsgSpec[]|null);
+
+        /** SystemMessage bodyWrapper */
+        bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+    }
+
+    /** Represents a SystemMessage. */
+    class SystemMessage implements ISystemMessage {
+
+        /**
+         * Constructs a new SystemMessage.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessage);
+
+        /** SystemMessage header. */
+        public header: SysMsg.ISystemMessageHeader[];
+
+        /** SystemMessage msgSpec. */
+        public msgSpec: SysMsg.ISystemMessageMsgSpec[];
+
+        /** SystemMessage bodyWrapper. */
+        public bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessage;
+
+        /**
+         * Decodes a SystemMessage message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessage
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessage;
+
+        /**
+         * Gets the default type url for SystemMessage
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageHeader. */
+    interface ISystemMessageHeader {
+
+        /** SystemMessageHeader peerNumber */
+        peerNumber?: (number|null);
+
+        /** SystemMessageHeader peerString */
+        peerString?: (string|null);
+
+        /** SystemMessageHeader uin */
+        uin?: (number|null);
+
+        /** SystemMessageHeader uid */
+        uid?: (string|null);
+    }
+
+    /** Represents a SystemMessageHeader. */
+    class SystemMessageHeader implements ISystemMessageHeader {
+
+        /**
+         * Constructs a new SystemMessageHeader.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageHeader);
+
+        /** SystemMessageHeader peerNumber. */
+        public peerNumber: number;
+
+        /** SystemMessageHeader peerString. */
+        public peerString: string;
+
+        /** SystemMessageHeader uin. */
+        public uin: number;
+
+        /** SystemMessageHeader uid. */
+        public uid?: (string|null);
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageHeader;
+
+        /**
+         * Decodes a SystemMessageHeader message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageHeader
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageHeader;
+
+        /**
+         * Gets the default type url for SystemMessageHeader
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageMsgSpec. */
+    interface ISystemMessageMsgSpec {
+
+        /** SystemMessageMsgSpec msgType */
+        msgType?: (number|null);
+
+        /** SystemMessageMsgSpec subType */
+        subType?: (number|null);
+
+        /** SystemMessageMsgSpec subSubType */
+        subSubType?: (number|null);
+
+        /** SystemMessageMsgSpec msgSeq */
+        msgSeq?: (number|null);
+
+        /** SystemMessageMsgSpec time */
+        time?: (number|null);
+
+        /** SystemMessageMsgSpec other */
+        other?: (number|null);
+    }
+
+    /** Represents a SystemMessageMsgSpec. */
+    class SystemMessageMsgSpec implements ISystemMessageMsgSpec {
+
+        /**
+         * Constructs a new SystemMessageMsgSpec.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageMsgSpec);
+
+        /** SystemMessageMsgSpec msgType. */
+        public msgType: number;
+
+        /** SystemMessageMsgSpec subType. */
+        public subType: number;
+
+        /** SystemMessageMsgSpec subSubType. */
+        public subSubType: number;
+
+        /** SystemMessageMsgSpec msgSeq. */
+        public msgSeq: number;
+
+        /** SystemMessageMsgSpec time. */
+        public time: number;
+
+        /** SystemMessageMsgSpec other. */
+        public other: number;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Decodes a SystemMessageMsgSpec message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageMsgSpec
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageMsgSpec;
+
+        /**
+         * Gets the default type url for SystemMessageMsgSpec
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a SystemMessageBodyWrapper. */
+    interface ISystemMessageBodyWrapper {
+
+        /** SystemMessageBodyWrapper body */
+        body?: (Uint8Array|null);
+    }
+
+    /** Represents a SystemMessageBodyWrapper. */
+    class SystemMessageBodyWrapper implements ISystemMessageBodyWrapper {
+
+        /**
+         * Constructs a new SystemMessageBodyWrapper.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ISystemMessageBodyWrapper);
+
+        /** SystemMessageBodyWrapper body. */
+        public body: Uint8Array;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns SystemMessageBodyWrapper
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageBodyWrapper;
+
+        /**
+         * Gets the default type url for SystemMessageBodyWrapper
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeDetail. */
+    interface ILikeDetail {
+
+        /** LikeDetail txt */
+        txt?: (string|null);
+
+        /** LikeDetail uin */
+        uin?: (number|null);
+
+        /** LikeDetail nickname */
+        nickname?: (string|null);
+    }
+
+    /** Represents a LikeDetail. */
+    class LikeDetail implements ILikeDetail {
+
+        /**
+         * Constructs a new LikeDetail.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeDetail);
+
+        /** LikeDetail txt. */
+        public txt: string;
+
+        /** LikeDetail uin. */
+        public uin: number;
+
+        /** LikeDetail nickname. */
+        public nickname: string;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeDetail;
+
+        /**
+         * Decodes a LikeDetail message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeDetail
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeDetail;
+
+        /**
+         * Gets the default type url for LikeDetail
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a LikeMsg. */
+    interface ILikeMsg {
+
+        /** LikeMsg count */
+        count?: (number|null);
+
+        /** LikeMsg time */
+        time?: (number|null);
+
+        /** LikeMsg detail */
+        detail?: (SysMsg.ILikeDetail|null);
+    }
+
+    /** Represents a LikeMsg. */
+    class LikeMsg implements ILikeMsg {
+
+        /**
+         * Constructs a new LikeMsg.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.ILikeMsg);
+
+        /** LikeMsg count. */
+        public count: number;
+
+        /** LikeMsg time. */
+        public time: number;
+
+        /** LikeMsg detail. */
+        public detail?: (SysMsg.ILikeDetail|null);
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.LikeMsg;
+
+        /**
+         * Decodes a LikeMsg message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns LikeMsg
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeMsg;
+
+        /**
+         * Gets the default type url for LikeMsg
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a ProfileLikeSubTip. */
+    interface IProfileLikeSubTip {
+
+        /** ProfileLikeSubTip msg */
+        msg?: (SysMsg.ILikeMsg|null);
+    }
+
+    /** Represents a ProfileLikeSubTip. */
+    class ProfileLikeSubTip implements IProfileLikeSubTip {
+
+        /**
+         * Constructs a new ProfileLikeSubTip.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.IProfileLikeSubTip);
+
+        /** ProfileLikeSubTip msg. */
+        public msg?: (SysMsg.ILikeMsg|null);
+
+        /**
+         * Decodes a ProfileLikeSubTip message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns ProfileLikeSubTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.ProfileLikeSubTip;
+
+        /**
+         * Decodes a ProfileLikeSubTip message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns ProfileLikeSubTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeSubTip;
+
+        /**
+         * Gets the default type url for ProfileLikeSubTip
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+
+    /** Properties of a ProfileLikeTip. */
+    interface IProfileLikeTip {
+
+        /** ProfileLikeTip msgType */
+        msgType?: (number|null);
+
+        /** ProfileLikeTip subType */
+        subType?: (number|null);
+
+        /** ProfileLikeTip content */
+        content?: (SysMsg.IProfileLikeSubTip|null);
+    }
+
+    /** Represents a ProfileLikeTip. */
+    class ProfileLikeTip implements IProfileLikeTip {
+
+        /**
+         * Constructs a new ProfileLikeTip.
+         * @param [properties] Properties to set
+         */
+        constructor(properties?: SysMsg.IProfileLikeTip);
+
+        /** ProfileLikeTip msgType. */
+        public msgType: number;
+
+        /** ProfileLikeTip subType. */
+        public subType: number;
+
+        /** ProfileLikeTip content. */
+        public content?: (SysMsg.IProfileLikeSubTip|null);
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer.
+         * @param reader Reader or buffer to decode from
+         * @param [length] Message length if known beforehand
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): SysMsg.ProfileLikeTip;
+
+        /**
+         * Decodes a ProfileLikeTip message from the specified reader or buffer, length delimited.
+         * @param reader Reader or buffer to decode from
+         * @returns ProfileLikeTip
+         * @throws {Error} If the payload is not a reader or valid buffer
+         * @throws {$protobuf.util.ProtocolError} If required fields are missing
+         */
+        public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeTip;
+
+        /**
+         * Gets the default type url for ProfileLikeTip
+         * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
+         * @returns The default type url
+         */
+        public static getTypeUrl(typeUrlPrefix?: string): string;
+    }
+}

src/ntqqapi/proto/profileLikeTip.proto

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

src/ntqqapi/proto/systemMessage.proto

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

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -29,7 +29,7 @@ export interface NodeIKernelBuddyService {
       buddyUids: Array<string>//Uids
     }>>
 
-  addKernelBuddyListener(listener: any): number
+  addKernelBuddyListener(listener: unknown): number
 
   getAllBuddyCount(): number
 
@@ -119,7 +119,7 @@ export interface NodeIKernelBuddyService {
 
   reportDoubtBuddyReqUnread(): void
 
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>
+  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
 
   isNull(): boolean
-}
+}

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,4 +1,3 @@
-import { NodeIKernelGroupListener } from '@/ntqqapi/listeners'
 import {
   GroupExtParam,
   GroupMember,
@@ -7,8 +6,7 @@ import {
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-
-//高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
+import { Dict } from 'cosmokit'
 
 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,13 +45,14 @@ export interface NodeIKernelGroupService {
     errMsg: string,
     uids: Map<string, string>
   }>
+
   //26702(其实更早 但是我不知道)
   checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
 
   //26702(其实更早 但是我不知道)
   getGroupLatestEssenceList(groupCode: string): Promise<unknown>
 
-  //26702(其实更早 但是我不知道) 
+  //26702(其实更早 但是我不知道)
   shareDigest(Req: {
     appId: string,
     appType: number,
@@ -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
 
@@ -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,
-      width: number,
+      id: string
+      width: number
       height: number
     }
   }>
@@ -226,7 +232,7 @@ export interface NodeIKernelGroupService {
 
   setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>
 
-  getGroupRecommendContactArkJson(groupCode: string): unknown
+  getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>
 
   getJoinGroupLink(groupCode: string): unknown
 
@@ -238,6 +244,7 @@ export interface NodeIKernelGroupService {
     msgRandom: number,
     msgSeq: number
   }): Promise<unknown>
+
   //需要提前判断是否存在 高版本新增
   removeGroupEssence(param: {
     groupCode: string
@@ -246,4 +253,4 @@ export interface NodeIKernelGroupService {
   }): Promise<unknown>
 
   isNull(): boolean
-}
+}

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
@@ -111,10 +110,11 @@ export interface NodeIKernelMsgService {
   resendMsg(...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
 
@@ -142,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
 
@@ -370,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 [
@@ -448,7 +449,7 @@ export interface NodeIKernelMsgService {
 
   getEmojiResourcePath(...args: unknown[]): unknown
 
-  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: any/*joinDragonGroupEmojiReq*/): unknown
+  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown
 
   getMsgAbstracts(...args: unknown[]): unknown
 
@@ -623,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
@@ -654,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': {
-      'userLikeInfos': Array<any>,
-      'friendMaxVotes': number,
-      'start': number
+    info: {
+      userLikeInfos: {
+        uid: string
+        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

@@ -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>
 
@@ -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,7 +169,7 @@ 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
 
@@ -222,9 +222,9 @@ export interface NodeIKernelRichMediaService {
 
   deleteGroupFile(GroupCode: string, params: Array<number>, Files: Array<string>): Promise<GeneralCallResult & {
     transGroupFileResult: {
-      result: any
-      successFileIdList: Array<any>
-      failFileIdList: Array<any>
+      result: unknown
+      successFileIdList: Array<unknown>
+      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

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

@@ -102,7 +102,7 @@ export interface SendPicElement {
 export interface SendReplyElement {
   elementType: ElementType.REPLY
   elementId: ''
-  replyElement: ReplyElement
+  replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
@@ -129,6 +129,12 @@ export interface ReplyElement {
   replayMsgId: string
   senderUin: string
   senderUinStr: string
+  sourceMsgIdInRecords: string
+  senderUid: string
+  senderUidStr: string
+  sourceMsgIsIncPic: boolean // 原消息是否有图片
+  sourceMsgText: string
+  replyMsgTime: string
 }
 
 export interface FileElement {
@@ -282,14 +288,28 @@ export interface PicElement {
 }
 
 export enum GrayTipElementSubType {
-  RECALL = 1,
-  INVITE_NEW_MEMBER = 12,
-  MEMBER_NEW_TITLE = 17,
+  REVOKE = 1,
+  PROCLAMATION = 2,
+  EMOJIREPLY = 3,
+  GROUP = 4,
+  BUDDY = 5,
+  FEED = 6,
+  ESSENCE = 7,
+  GROUPNOTIFY = 8,
+  BUDDYNOTIFY = 9,
+  FILE = 10,
+  FEEDCHANNELMSG = 11,
+  XMLMSG = 12,
+  LOCALMSG = 13,
+  BLOCK = 14,
+  AIOOP = 15,
+  WALLET = 16,
+  JSON = 17,
 }
 
 export interface GrayTipElement {
   subElementType: GrayTipElementSubType
-  revokeElement: {
+  revokeElement?: {
     operatorRole: string
     operatorUid: string
     operatorNick: string
@@ -299,14 +319,14 @@ export interface GrayTipElement {
     isSelfOperate?: boolean
     wording: string // 自定义的撤回提示语
   }
-  aioOpGrayTipElement: TipAioOpGrayTipElement
-  groupElement: TipGroupElement
-  xmlElement: {
+  aioOpGrayTipElement?: TipAioOpGrayTipElement
+  groupElement?: TipGroupElement
+  xmlElement?: {
     templId: string
     content: string
   }
-  jsonGrayTipElement: {
-    busiId: number
+  jsonGrayTipElement?: {
+    busiId: string
     jsonStr: string
   }
 }
@@ -352,7 +372,7 @@ export interface VideoElement {
   thumbHeight?: number
   busiType?: 0 // 未知
   subBusiType?: 0 // 未知
-  thumbPath?: Map<number, any>
+  thumbPath?: Map<number, string>
   transferStatus?: 0 // 未知
   progress?: 0 // 下载进度？
   invalidState?: 0 // 未知
@@ -471,36 +491,7 @@ export interface RawMessage {
   sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
   recallTime: string // 撤回时间, "0"是没有撤回
   records: RawMessage[]
-  elements: {
-    elementId: string
-    elementType: ElementType
-    replyElement: {
-      sourceMsgIdInRecords: string
-      senderUid: string // 原消息发送者QQ号
-      sourceMsgIsIncPic: boolean // 原消息是否有图片
-      sourceMsgText: string
-      replayMsgSeq: string // 源消息的msgSeq，可以通过这个找到源消息的msgId
-      senderUidStr: string
-      replyMsgTime: string
-    }
-    textElement: {
-      atType: AtType
-      atUid: string // QQ号
-      content: string
-      atNtUid: string // uid号
-    }
-    picElement: PicElement
-    pttElement: PttElement
-    arkElement: ArkElement
-    grayTipElement: GrayTipElement
-    faceElement: FaceElement
-    videoElement: VideoElement
-    fileElement: FileElement
-    marketFaceElement: MarketFaceElement
-    inlineKeyboardElement: InlineKeyboardElement
-    markdownElement: MarkdownElement
-    multiForwardMsgElement: MultiForwardMsgElement
-  }[]
+  elements: MessageElement[]
 }
 
 export interface Peer {
@@ -515,7 +506,7 @@ export interface MessageElement {
   extBufForUI: string //"0x"
   textElement?: TextElement
   faceElement?: FaceElement
-  marketFaceElement?: MarkdownElement
+  marketFaceElement?: MarketFaceElement
   replyElement?: ReplyElement
   picElement?: PicElement
   pttElement?: PttElement
@@ -523,22 +514,22 @@ export interface MessageElement {
   grayTipElement?: GrayTipElement
   arkElement?: ArkElement
   fileElement?: FileElement
-  liveGiftElement?: null
+  liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: any
+  structLongMsgElement?: unknown
   multiForwardMsgElement?: MultiForwardMsgElement
-  giphyElement?: any
-  walletElement?: null
+  giphyElement?: unknown
+  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: null //????
-  calendarElement?: any
-  yoloGameResultElement?: any
-  avRecordElement?: any
-  structMsgElement?: null
-  faceBubbleElement?: any
-  shareLocationElement?: any
-  tofuRecordElement?: any
-  taskTopMsgElement?: any
-  recommendedMsgElement?: any
-  actionBarElement?: any
-}
+  textGiftElement?: unknown //????
+  calendarElement?: unknown
+  yoloGameResultElement?: unknown
+  avRecordElement?: unknown
+  structMsgElement?: unknown
+  faceBubbleElement?: unknown
+  shareLocationElement?: unknown
+  tofuRecordElement?: unknown
+  taskTopMsgElement?: unknown
+  recommendedMsgElement?: unknown
+  actionBarElement?: unknown
+}

src/ntqqapi/types/user.ts

@@ -124,7 +124,7 @@ interface VideoInfo {
 
 interface ExtOnlineBusinessInfo {
   buf: string
-  customStatus: any
+  customStatus: unknown
   videoBizInfo: VideoBizInfo
   videoInfo: VideoInfo
 }
@@ -142,7 +142,7 @@ interface UserStatus {
   termType: number
   netType: number
   iconType: number
-  customStatus: any
+  customStatus: unknown
   setTime: string
   specialFlag: number
   abiFlag: number
@@ -156,8 +156,8 @@ interface UserStatus {
 
 interface PrivilegeIcon {
   jumpUrl: string
-  openIconList: any[]
-  closeIconList: any[]
+  openIconList: unknown[]
+  closeIconList: unknown[]
 }
 
 interface VasInfo {
@@ -180,7 +180,7 @@ interface VasInfo {
   fontEffect: number
   newLoverDiamondFlag: number
   extendNameplateId: number
-  diyNameplateIDs: any[]
+  diyNameplateIDs: unknown[]
   vipStartFlag: number
   vipDataFlag: number
   gameNameplateId: string
@@ -200,8 +200,8 @@ export interface SimpleInfo {
   status: UserStatus | null
   vasInfo: VasInfo | null
   relationFlags: RelationFlags | null
-  otherFlags: any | null
-  intimate: any | null
+  otherFlags: unknown | null
+  intimate: unknown | null
 }
 
 interface RelationFlags {
@@ -241,7 +241,7 @@ interface CommonExt {
   address: string
   regTime: number
   interest: string
-  labels: any[]
+  labels: string[]
   qqLevel: QQLevel
 }
 
@@ -323,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

@@ -16,7 +16,6 @@ import { Dict } from 'cosmokit'
 const Process = require('node:process')
 
 export interface NodeIQQNTWrapperSession {
-  [key: string]: any
   getBuddyService(): NodeIKernelBuddyService
   getGroupService(): NodeIKernelGroupService
   getProfileService(): NodeIKernelProfileService
@@ -35,20 +34,7 @@ export interface WrapperApi {
 }
 
 export interface WrapperConstructor {
-  [key: string]: any
-  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
+  [key: string]: unknown
 }
 
 const wrapperApi: WrapperApi = {}
@@ -75,9 +61,9 @@ Process.dlopenOrig = Process.dlopen
 
 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
@@ -92,4 +78,4 @@ Process.dlopen = function (module: Dict, filename: string, flags = constants.dlo
 
 export function getSession() {
   return wrapperApi['NodeIQQNTWrapperSession']
-}
+}

src/onebot11/action/BaseAction.ts

@@ -1,54 +1,51 @@
-import { ActionName, BaseCheckResult } from './types'
+import { ActionName } from './types'
 import { OB11Response } from './OB11Response'
 import { OB11Return } from '../types'
-import { Context } from 'cordis'
+import { Context, Schema } from 'cordis'
 import type Adapter from '../adapter'
 
 abstract class BaseAction<PayloadType, ReturnDataType> {
   abstract actionName: ActionName
   protected ctx: Context
+  payloadSchema?: Schema<PayloadType>
 
   constructor(protected adapter: Adapter) {
     this.ctx = adapter.ctx
   }
 
-  protected async check(payload: PayloadType): Promise<BaseCheckResult> {
-    return {
-      valid: true,
-    }
-  }
-
   public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
-    const result = await this.check(payload)
-    if (!result.valid) {
-      return OB11Response.error(result.message, 400)
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 400)
     }
     try {
-      const resData = await this._handle(payload)
+      const resData = await this._handle(params)
       return OB11Response.ok(resData)
-    } catch (e: any) {
+    } catch (e) {
       this.ctx.logger.error('发生错误', e)
-      return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200)
+      return OB11Response.error((e as Error)?.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200)
     }
   }
 
-  public async websocketHandle(payload: PayloadType, echo: any): Promise<OB11Return<ReturnDataType | null>> {
-    const result = await this.check(payload)
-    if (!result.valid) {
-      return OB11Response.error(result.message, 1400)
+  public async websocketHandle(payload: PayloadType, echo: unknown): Promise<OB11Return<ReturnDataType | null>> {
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 1400)
     }
     try {
-      const resData = await this._handle(payload)
+      const resData = await this._handle(params)
       return OB11Response.ok(resData, echo)
-    } catch (e: any) {
+    } catch (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)
     }
   }
 
-  protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-    throw `pleas override ${this.actionName} _handle`
-  }
+  protected abstract _handle(payload: PayloadType): Promise<ReturnDataType>
 }
 
-export default BaseAction
+export { BaseAction, Schema }

src/onebot11/action/OB11Response.ts

@@ -13,16 +13,16 @@ export class OB11Response {
     }
   }
 
-  static ok<T>(data: T, echo: any = null) {
-    let res = OB11Response.res<T>(data, 'ok', 0)
+  static ok<T>(data: T, echo?: unknown) {
+    const res = OB11Response.res<T>(data, 'ok', 0)
     if (!isNullable(echo)) {
       res.echo = echo
     }
     return res
   }
 
-  static error(err: string, retcode: number, echo: any = null) {
-    let res = OB11Response.res(null, 'failed', retcode, err)
+  static error(err: string, retcode: number, echo?: unknown) {
+    const res = OB11Response.res(null, 'failed', retcode, err)
     if (!isNullable(echo)) {
       res.echo = echo
     }

src/onebot11/action/file/GetFile.ts

@@ -1,5 +1,5 @@
-import BaseAction from '../BaseAction'
-import fsPromise from 'node:fs/promises'
+import { BaseAction, Schema } from '../BaseAction'
+import { readFile } from 'node:fs/promises'
 import { ActionName } from '../types'
 import { Peer, ElementType } from '@/ntqqapi/types'
 import { MessageUnique } from '@/common/utils/messageUnique'
@@ -17,13 +17,16 @@ export interface GetFileResponse {
 }
 
 export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
+  payloadSchema = Schema.object({
+    file: Schema.string().required()
+  })
+
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = this.adapter.config
 
-    let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
+    let fileCache = await MessageUnique.getFileCacheById(payload.file)
     if (!fileCache?.length) {
-      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
+      fileCache = await MessageUnique.getFileCacheByName(payload.file)
     }
 
     if (fileCache?.length) {
@@ -56,13 +59,13 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         if (!findEle) {
           throw new Error('element not found')
         }
-        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement)
+        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
       } else if (fileCache[0].elementType === ElementType.VIDEO) {
         res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
       if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {
-          res.base64 = await fsPromise.readFile(downloadPath, 'base64')
+          res.base64 = await readFile(downloadPath, 'base64')
         } catch (e) {
           throw new Error('文件下载失败. ' + e)
         }
@@ -76,11 +79,12 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
 
 export default class GetFile extends GetFileBase {
   actionName = ActionName.GetFile
+  payloadSchema = Schema.object({
+    file: Schema.string(),
+    file_id: Schema.string().required()
+  })
 
-  protected async _handle(payload: { file_id: string; file: string }): Promise<GetFileResponse> {
-    if (!payload.file_id) {
-      throw new Error('file_id 不能为空')
-    }
+  protected async _handle(payload: { file_id: string, file: string }): Promise<GetFileResponse> {
     payload.file = payload.file_id
     return super._handle(payload)
   }

src/onebot11/action/file/GetImage.ts

@@ -3,11 +3,4 @@ import { ActionName } from '../types'
 
 export default class GetImage extends GetFileBase {
   actionName = ActionName.GetImage
-
-  protected async _handle(payload: { file: string }) {
-    if (!payload.file) {
-      throw new Error('参数 file 不能为空')
-    }
-    return super._handle(payload)
-  }
 }

src/onebot11/action/file/GetRecord.ts

@@ -1,8 +1,9 @@
+import path from 'node:path'
 import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
 import { ActionName } from '../types'
 import { decodeSilk } from '@/common/utils/audio'
-import path from 'node:path'
-import fs from 'node:fs'
+import { Schema } from '../BaseAction'
+import { stat, readFile } from 'node:fs/promises'
 
 interface Payload extends GetFilePayload {
   out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
@@ -10,14 +11,18 @@ interface Payload extends GetFilePayload {
 
 export default class GetRecord extends GetFileBase {
   actionName = ActionName.GetRecord
+  payloadSchema = Schema.object({
+    file: Schema.string().required(),
+    out_format: Schema.string().default('mp3')
+  })
 
   protected async _handle(payload: Payload): Promise<GetFileResponse> {
-    let res = await super._handle(payload)
+    const res = await super._handle(payload)
     res.file = await decodeSilk(this.ctx, res.file!, payload.out_format)
     res.file_name = path.basename(res.file)
-    res.file_size = fs.statSync(res.file).size.toString()
+    res.file_size = (await stat(res.file)).size.toString()
     if (this.adapter.config.enableLocalFile2Url) {
-      res.base64 = fs.readFileSync(res.file, 'base64')
+      res.base64 = await readFile(res.file, 'base64')
     }
     return res
   }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,9 +9,13 @@ interface Payload {
 
 export class CreateGroupFileFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_CreateGroupFileFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    name: Schema.string().required(),
+  })
 
   async _handle(payload: Payload) {
     await this.ctx.ntGroupApi.createGroupFileFolder(payload.group_id.toString(), payload.name)
     return null
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
@@ -6,13 +6,13 @@ interface Payload {
   message_id: number | string
 }
 
-export class DelEssenceMsg extends BaseAction<Payload, any> {
-  actionName = ActionName.GoCQHTTP_DelEssenceMsg;
+export class DelEssenceMsg extends BaseAction<Payload, unknown> {
+  actionName = ActionName.GoCQHTTP_DelEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
-  protected async _handle(payload: Payload): Promise<any> {
-    if (!payload.message_id) {
-      throw Error('message_id不能为空')
-    }
+  protected async _handle(payload: Payload) {
     const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')

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

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

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -8,9 +8,13 @@ interface Payload {
 
 export class DelGroupFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    folder_id: Schema.string().required()
+  })
 
   async _handle(payload: Payload) {
     await this.ctx.ntGroupApi.deleteGroupFileFolder(payload.group_id.toString(), payload.folder_id)
     return null
   }
-}
+}

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

@@ -1,7 +1,7 @@
-import BaseAction from '../BaseAction'
 import fs from 'fs'
 import fsPromise from 'fs/promises'
 import path from 'node:path'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { calculateFileMD5, fetchFile } from '@/common/utils'
 import { TEMP_DIR } from '@/common/globalVars'
@@ -22,6 +22,11 @@ interface FileResponse {
 
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
+  payloadSchema = Schema.object({
+    url: String,
+    base64: String,
+    headers: Schema.union([String, Schema.array(String)])
+  })
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name

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

@@ -1,8 +1,9 @@
-import BaseAction from '../BaseAction'
-import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types'
+import { BaseAction } from '../BaseAction'
+import { OB11ForwardMessage } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -10,12 +11,12 @@ interface Payload {
 }
 
 interface Response {
-  messages: (OB11Message & { content: OB11MessageData })[]
+  messages: OB11ForwardMessage[]
 }
 
 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不能为空')
@@ -33,18 +34,21 @@ export class GetForwardMsg extends BaseAction<Payload, Response> {
     const messages = await Promise.all(
       msgList.map(async (msg) => {
         const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (!resMsg) return
         resMsg.message_id = MessageUnique.createMsg({
           chatType: msg.chatType,
           peerUid: msg.peerUid,
-        }, msg.msgId)!
+        }, msg.msgId)
         return resMsg
-      }),
+      })
     )
-    messages.map(v => {
-      const msg = v as Partial<OB11ForwardMessage>
-      msg.content = msg.message
-      delete msg.message
-    })
-    return { messages }
+    const forwardMessages = filterNullable(messages)
+      .map(v => {
+        const msg = v as Partial<OB11ForwardMessage>
+        msg.content = msg.message
+        delete msg.message
+        return msg as OB11ForwardMessage
+      })
+    return { messages: forwardMessages }
   }
 }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -22,4 +22,4 @@ export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
       remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
     }
   }
-}
+}

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

@@ -1,10 +1,11 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -41,6 +42,6 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
       })
     )
     const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
-    return { messages: ob11MsgList }
+    return { messages: filterNullable(ob11MsgList) }
   }
 }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
 
@@ -59,4 +59,4 @@ export class GetGroupRootFiles extends BaseAction<Payload, Response> {
         })
     }
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
@@ -27,7 +27,7 @@ interface Response {
 export class GetGroupSystemMsg extends BaseAction<void, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupSystemMsg
 
-  async _handle(payload: void) {
+  async _handle() {
     const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(10)
     const data: Response = { invited_requests: [], join_requests: [] }
     for (const notify of singleScreenNotifies) {
@@ -56,4 +56,4 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
     }
     return data
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'

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

@@ -1,14 +1,23 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
-  message_id: number
+  message_id: number | string
 }
 
 export class MarkMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_MarkMsgAsRead
 
-  protected async _handle(payload: Payload): Promise<null> {
+  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,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../helper/quickOperation'
 import { ActionName } from '../types'
 
@@ -13,4 +13,4 @@ export class HandleQuickOperation extends BaseAction<Payload, null> {
     handleQuickOperation(this.ctx, payload.context, payload.operation).catch(e => this.ctx.logger.error(e))
     return null
   }
-}
+}

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

@@ -1,14 +1,13 @@
 import SendMsg from '../msg/SendMsg'
 import { OB11PostSendMsg } from '../../types'
 import { ActionName } from '../types'
-import { convertMessage2List } from '../../helper/createMessage'
 
 export class SendForwardMsg extends SendMsg {
   actionName = ActionName.GoCQHTTP_SendForwardMsg
 
-  protected async check(payload: OB11PostSendMsg) {
-    if (payload.messages) payload.message = convertMessage2List(payload.messages)
-    return super.check(payload)
+  protected async _handle(payload: OB11PostSendMsg) {
+    if (payload.messages) payload.message = payload.messages
+    return super._handle(payload)
   }
 }
 

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

@@ -1,5 +1,7 @@
-import BaseAction from '../BaseAction'
+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
@@ -13,25 +15,40 @@ export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice
 
   async _handle(payload: Payload) {
-    const type = 1
-    const isShowEditCard = 0
-    const tipWindowType = 0
+    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)
 
-    const result = await this.ctx.ntWebApi.setGroupNotice({
-      groupCode: payload.group_id.toString(),
-      content: payload.content,
+    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,
-      type,
-      isShowEditCard,
-      tipWindowType,
       confirmRequired,
-      picId: ''
+      picInfo
     })
-    if (result.ec !== 0) {
-      throw new Error(`设置群公告失败, 错误信息: ${result.em}`)
+    if (res.result !== 0) {
+      throw new Error(`设置群公告失败, 错误信息: ${res.errMsg}`)
     }
     return null
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
@@ -6,10 +6,10 @@ interface Payload {
   message_id: number | string
 }
 
-export class SetEssenceMsg extends BaseAction<Payload, any> {
-  actionName = ActionName.GoCQHTTP_SetEssenceMsg;
+export class SetEssenceMsg extends BaseAction<Payload, unknown> {
+  actionName = ActionName.GoCQHTTP_SetEssenceMsg
 
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     if (!payload.message_id) {
       throw Error('message_id不能为空')
     }

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

@@ -1,8 +1,6 @@
-import fs from 'node:fs'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { SendElementEntities } from '@/ntqqapi/entities'
-import { SendFileElement } from '@/ntqqapi/types'
 import { uri2local } from '@/common/utils'
 import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
 
@@ -18,17 +16,13 @@ export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile
 
   protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
     }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name, payload.folder_id)
+    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [sendFileEle], [], true)
+    await sendMsg(this.ctx, peer, [file], [])
     return null
   }
 }
@@ -43,17 +37,13 @@ export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
 
   protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
+    const { success, errMsg, path, fileName } = await uri2local(payload.file)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
-    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 SendElementEntities.file(this.ctx, downloadResult.path, payload.name)
-    await sendMsg(this.ctx, peer, [sendFileEle], [], true)
+    await sendMsg(this.ctx, peer, [sendFileEle], [])
     return null
   }
 }

src/onebot11/action/group/GetGroupEssence.ts

@@ -1,5 +1,5 @@
 import { GroupEssenceMsgRet } from '@/ntqqapi/api'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface PayloadType {
@@ -10,7 +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 暂不支持'
   }
 }

src/onebot11/action/group/GetGroupHonorInfo.ts

@@ -1,17 +1,16 @@
 import { WebHonorType } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 
 interface Payload {
   group_id: number
   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'
     }

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/GetGroupList.ts

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

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
@@ -18,7 +18,7 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
     if (member) {
       if (isNullable(member.sex)) {
         //log('获取群成员详细信息')
-        const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid, true)
+        const info = await this.ctx.ntUserApi.getUserDetailInfo(member.uid)
         //log('群成员详细信息结果', info)
         Object.assign(member, info)
       }

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,6 +1,6 @@
 import { OB11GroupMember } from '../../types'
 import { OB11Entities } from '../../entities'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { selfInfo } from '@/common/globalVars'
 

src/onebot11/action/group/GetGuildList.ts

@@ -1,10 +1,10 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 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/SendGroupMsg.ts

@@ -1,14 +1,14 @@
 import SendMsg from '../msg/SendMsg'
-import { ActionName, BaseCheckResult } from '../types'
+import { ActionName } from '../types'
 import { OB11PostSendMsg } from '../../types'
 
 class SendGroupMsg extends SendMsg {
   actionName = ActionName.SendGroupMsg
 
-  protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+  protected _handle(payload: OB11PostSendMsg) {
     delete (payload as Partial<OB11PostSendMsg>).user_id
     payload.message_type = 'group'
-    return super.check(payload)
+    return super._handle(payload)
   }
 }
 

src/onebot11/action/group/SetGroupAddRequest.ts

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

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 

src/onebot11/action/group/SetGroupBan.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupCard.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupKick.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -6,10 +6,10 @@ interface Payload {
   is_dismiss: boolean
 }
 
-export default class SetGroupLeave extends BaseAction<Payload, any> {
+export default class SetGroupLeave extends BaseAction<Payload, void> {
   actionName = ActionName.SetGroupLeave
 
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     try {
       await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
     } catch (e) {

src/onebot11/action/group/SetGroupName.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {

src/onebot11/action/index.ts

@@ -10,7 +10,7 @@ import SendGroupMsg from './group/SendGroupMsg'
 import SendPrivateMsg from './msg/SendPrivateMsg'
 import SendMsg from './msg/SendMsg'
 import DeleteMsg from './msg/DeleteMsg'
-import BaseAction from './BaseAction'
+import { BaseAction } from './BaseAction'
 import GetVersionInfo from './system/GetVersionInfo'
 import CanSendRecord from './system/CanSendRecord'
 import CanSendImage from './system/CanSendImage'
@@ -62,6 +62,7 @@ import { GetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'
 import { GetGroupRootFiles } from './go-cqhttp/GetGroupRootFiles'
 import { SetOnlineStatus } from './llonebot/SetOnlineStatus'
 import { SendGroupNotice } from './go-cqhttp/SendGroupNotice'
+import { GetProfileLike } from './llonebot/GetProfileLike'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -74,6 +75,7 @@ export function initActionMap(adapter: Adapter) {
     new GetFriendWithCategory(adapter),
     new GetEvent(adapter),
     new SetOnlineStatus(adapter),
+    new GetProfileLike(adapter),
     // onebot11
     new SendLike(adapter),
     new GetMsg(adapter),
@@ -132,7 +134,7 @@ export function initActionMap(adapter: Adapter) {
     new GetGroupRootFiles(adapter),
     new SendGroupNotice(adapter)
   ]
-  const actionMap = new Map<string, BaseAction<any, any>>()
+  const actionMap = new Map<string, BaseAction<any, unknown>>()
   for (const action of actionHandlers) {
     actionMap.set(action.actionName, action)
     actionMap.set(action.actionName + '_async', action)

src/onebot11/action/llonebot/Config.ts

@@ -1,17 +1,19 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { Config } from '@/common/types'
 import { ActionName } from '../types'
 import { getConfigUtil } from '@/common/config'
 
 export class GetConfigAction extends BaseAction<null, Config> {
   actionName = ActionName.GetConfig
-  protected async _handle(payload: null): Promise<Config> {
+
+  protected async _handle(): Promise<Config> {
     return getConfigUtil().getConfig()
   }
 }
 
 export class SetConfigAction extends BaseAction<Config, void> {
   actionName = ActionName.SetConfig
+
   protected async _handle(payload: Config): Promise<void> {
     getConfigUtil().setConfig(payload)
   }

src/onebot11/action/llonebot/Debug.ts

@@ -1,15 +1,15 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
   method: string
-  args: any[]
+  args: unknown[]
 }
 
-export default class Debug extends BaseAction<Payload, any> {
+export default class Debug extends BaseAction<Payload, unknown> {
   actionName = ActionName.Debug
 
-  protected async _handle(payload: Payload): Promise<any> {
+  protected async _handle(payload: Payload) {
     this.ctx.logger.info('debug call ntqq api', payload)
     const { ntMsgApi, ntFileApi, ntFileCacheApi, ntFriendApi, ntGroupApi, ntUserApi, ntWindowApi } = this.ctx
     const ntqqApi = [ntMsgApi, ntFriendApi, ntGroupApi, ntUserApi, ntFileApi, ntFileCacheApi, ntWindowApi]

src/onebot11/action/llonebot/GetEvent.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 import { getHttpEvent } from '../../helper/eventForHttp'
 import { OB11Message } from '../../types'
@@ -13,13 +13,14 @@ interface Payload {
 
 export default class GetEvent extends BaseAction<Payload, PostEventType[]> {
   actionName = ActionName.GetEvent
+
   protected async _handle(payload: Payload): Promise<PostEventType[]> {
     let key = ''
     if (payload.key) {
       key = payload.key
     }
-    let timeout = parseInt(payload.timeout?.toString()) || 0
-    let evts = await getHttpEvent(key, timeout)
+    const timeout = parseInt(payload.timeout?.toString()) || 0
+    const evts = await getHttpEvent(key, timeout)
     return evts
   }
 }

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupNotify, GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
@@ -11,7 +11,7 @@ interface OB11GroupRequestNotify {
 export default class GetGroupAddRequest extends BaseAction<null, OB11GroupRequestNotify[]> {
   actionName = ActionName.GetGroupIgnoreAddRequest
 
-  protected async _handle(payload: null): Promise<OB11GroupRequestNotify[]> {
+  protected async _handle(): Promise<OB11GroupRequestNotify[]> {
     const data = await this.ctx.ntGroupApi.getGroupIgnoreNotifies()
     const notifies: GroupNotify[] = data.notifies.filter((notify) => notify.status === GroupNotifyStatus.KUNHANDLE)
     const returnData: OB11GroupRequestNotify[] = []

src/onebot11/action/llonebot/GetProfileLike.ts

@@ -0,0 +1,17 @@
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+import { Dict } from 'cosmokit'
+
+export class GetProfileLike extends BaseAction<void, Dict[]> {
+  actionName = ActionName.GetProfileLike
+
+  async _handle() {
+    const ret = await this.ctx.ntUserApi.getProfileLike(selfInfo.uid)
+    const listdata = ret.info.userLikeInfos[0].favoriteInfo.userInfos
+    for (const item of listdata) {
+      item.uin = Number(await this.ctx.ntUserApi.getUinByUid(item.uid)) || 0
+    }
+    return listdata
+  }
+}

src/onebot11/action/llonebot/SetOnlineStatus.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -22,4 +22,4 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
     }
     return null
   }
-}
+}

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -1,6 +1,6 @@
-import BaseAction from '../BaseAction'
+import fs from 'node:fs'
+import { BaseAction } from '../BaseAction'
 import { ActionName } from '../types'
-import * as fs from 'node:fs'
 import { checkFileReceived, uri2local } from '../../../common/utils/file'
 
 interface Payload {

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,5 +1,5 @@
 import { ActionName } from '../types'
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { ChatType } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 import { Peer } from '@/ntqqapi/types'

src/onebot11/action/msg/GetMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
@@ -15,12 +15,12 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
   protected async _handle(payload: PayloadType) {
     if (!payload.message_id) {
-      throw '参数message_id不能为空'
+      throw new Error('参数message_id不能为空')
     }
     const msgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString())
     const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(msgShortId || +payload.message_id)
     if (!msgIdWithPeer) {
-      throw ('消息不存在')
+      throw new Error('消息不存在')
     }
     const peer = {
       guildId: '',
@@ -29,6 +29,9 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
     }
     const msg = this.adapter.getMsgCache(msgIdWithPeer.MsgId) ?? (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgIdWithPeer.MsgId])).msgList[0]
     const retMsg = await OB11Entities.message(this.ctx, msg)
+    if (!retMsg) {
+      throw new Error('消息为空')
+    }
     retMsg.message_id = MessageUnique.createMsg(peer, msg.msgId)!
     retMsg.message_seq = retMsg.message_id
     retMsg.real_id = retMsg.message_id

src/onebot11/action/msg/SendMsg.ts

@@ -14,8 +14,8 @@ import {
   OB11PostSendMsg,
 } from '../../types'
 import fs from 'node:fs'
-import BaseAction from '../BaseAction'
-import { ActionName, BaseCheckResult } from '../types'
+import { BaseAction } from '../BaseAction'
+import { ActionName } from '../types'
 import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '@/common/utils/sign'
 import { Peer } from '@/ntqqapi/types/msg'
 import { MessageUnique } from '@/common/utils/messageUnique'
@@ -29,29 +29,6 @@ interface ReturnData {
 export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
   actionName = ActionName.SendMsg
 
-  protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
-    const messages = convertMessage2List(payload.message)
-    const fmNum = this.getSpecialMsgNum(messages, OB11MessageDataType.node)
-    if (fmNum && fmNum != messages.length) {
-      return {
-        valid: false,
-        message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
-      }
-    }
-    const musicNum = this.getSpecialMsgNum(messages, OB11MessageDataType.music)
-    if (musicNum && messages.length > 1) {
-      return {
-        valid: false,
-        message: '音乐消息不可以和其他消息混在一起发送',
-      }
-    }
-    if (payload.user_id && payload.message_type !== 'group') {
-    }
-    return {
-      valid: true,
-    }
-  }
-
   protected async _handle(payload: OB11PostSendMsg) {
     let contextMode = CreatePeerMode.Normal
     if (payload.message_type === 'group') {
@@ -67,9 +44,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
     if (this.getSpecialMsgNum(messages, OB11MessageDataType.node)) {
       try {
         const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[])
-        return { message_id: returnMsg?.msgShortId! }
-      } catch (e: any) {
-        throw '发送转发消息失败 ' + e.toString()
+        return { message_id: returnMsg.msgShortId! }
+      } catch (e) {
+        throw '发送转发消息失败 ' + e
       }
     }
     else if (this.getSpecialMsgNum(messages, OB11MessageDataType.music)) {
@@ -144,26 +121,20 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
 
   private async cloneMsg(msg: RawMessage): Promise<RawMessage | undefined> {
     this.ctx.logger.info('克隆的目标消息', msg)
-    let sendElements: SendMessageElement[] = []
+    const sendElements: SendMessageElement[] = []
     for (const ele of msg.elements) {
       sendElements.push(ele as SendMessageElement)
-      // Object.keys(ele).forEach((eleKey) => {
-      //     if (eleKey.endsWith("Element")) {
-      //     }
     }
     if (sendElements.length === 0) {
       this.ctx.logger.warn('需要clone的消息无法解析，将会忽略掉', msg)
     }
     this.ctx.logger.info('克隆消息', sendElements)
     try {
-      const nodeMsg = await this.ctx.ntMsgApi.sendMsg(
-        {
-          chatType: ChatType.friend,
-          peerUid: selfInfo.uid,
-        },
-        sendElements,
-        true,
-      )
+      const peer = {
+        chatType: ChatType.friend,
+        peerUid: selfInfo.uid
+      }
+      const nodeMsg = await this.ctx.ntMsgApi.sendMsg(peer, sendElements)
       await this.ctx.sleep(400)
       return nodeMsg
     } catch (e) {
@@ -181,7 +152,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
     // 先判断一遍是不是id和自定义混用
     for (const messageNode of messageNodes) {
       // 一个node表示一个人的消息
-      let nodeId = messageNode.data.id
+      const nodeId = messageNode.data.id
       // 有nodeId表示一个子转发消息卡片
       if (nodeId) {
         const nodeMsg = await MessageUnique.getMsgIdAndPeerByShortId(+nodeId) || await MessageUnique.getPeerByMsgId(nodeId)
@@ -201,7 +172,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
             destPeer
           )
           this.ctx.logger.info('开始生成转发节点', sendElements)
-          let sendElementsSplit: SendMessageElement[][] = []
+          const sendElementsSplit: SendMessageElement[][] = []
           let splitIndex = 0
           for (const ele of sendElements) {
             if (!sendElementsSplit[splitIndex]) {
@@ -222,7 +193,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnData> {
           }
           // log("分割后的转发节点", sendElementsSplit)
           for (const eles of sendElementsSplit) {
-            const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [], true)
+            const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [])
             if (!nodeMsg) {
               this.ctx.logger.warn('转发节点生成失败', eles)
               continue