Merge pull request #341 from LLOneBot/dev

3.29.3

CHANGELOG

@@ -1,14 +0,0 @@
-# 3.24.0
-
-## 修复
-
-* 修复图片rkey导致链接失效的问题
-* 修复/get_image, /get_file 无法获取图片的问题
-* 修复上报他人管理员被取消通知
-
-## 新增
-
-* 新增表情回应发送和上报
-* 新增商城表情发送，和上报 url
-* 新增转发单条消息接口 `forward_friend_single_msg`, `forward_group_single_msg`
-* 新增新增好友事件

README.md

@@ -3,7 +3,7 @@
 LiteLoaderQQNT 插件，实现 OneBot 11 协议，用以 QQ 机器人开发
 
 > [!CAUTION]\
-> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: B站，微博，知乎，抖音等）发布和讨论*任何*与本插件存在相关性的信息**
+> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本插件存在相关性的信息**
 
 TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
@@ -29,6 +29,7 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 鸣谢
 
+- [NapCatQQ](https://github.com/NapNeko/NapCatQQ)
 - [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
 - [chronocat](https://github.com/chrononeko/chronocat)
 - [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)

electron.vite.config.ts

@@ -5,14 +5,7 @@ import './scripts/gen-manifest'
 const external = [
   'silk-wasm',
   'ws',
-  'level',
-  'classic-level',
-  'abstract-level',
-  'level-supports',
-  'level-transcoder',
-  'module-error',
-  'catering',
-  'node-gyp-build',
+  '@minatojs/sql.js',
 ]
 
 function genCpModule(module: string) {

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "llonebot",
   "version": "1.0.0",
   "type": "module",
-  "description": "NTQQLiteLoaderOneBotApi",
+  "description": "",
   "main": "dist/main.js",
   "scripts": {
     "build": "electron-vite build",
@@ -16,13 +16,15 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "@minatojs/driver-sqlite": "^4.5.0",
     "compressing": "^1.10.1",
+    "cordis": "^3.18.0",
     "cors": "^2.8.5",
     "express": "^4.19.2",
     "fast-xml-parser": "^4.4.1",
-    "file-type": "^19.4.0",
+    "file-type": "^19.4.1",
     "fluent-ffmpeg": "^2.1.3",
-    "level": "^8.0.1",
+    "minato": "^3.5.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -35,7 +37,7 @@
     "electron": "^29.1.4",
     "electron-vite": "^2.3.0",
     "typescript": "^5.5.4",
-    "vite": "^5.4.0",
+    "vite": "^5.4.1",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.4.0"

src/common/config.ts

@@ -52,6 +52,7 @@ export class ConfigUtil {
       autoDeleteFile: false,
       autoDeleteFileSecond: 60,
       musicSignUrl: '',
+      msgCacheExpire: 120
     }
 
     if (!fs.existsSync(this.configPath)) {

src/common/data.ts

@@ -1,6 +1,5 @@
 import {
   type Friend,
-  type Group,
   type GroupMember,
   type SelfInfo,
 } from '../ntqqapi/types'
@@ -9,23 +8,25 @@ import { NTQQGroupApi } from '../ntqqapi/api/group'
 import { log } from './utils/log'
 import { isNumeric } from './utils/helper'
 import { NTQQFriendApi, NTQQUserApi } from '../ntqqapi/api'
+import { RawMessage } from '../ntqqapi/types'
+import { getConfigUtil } from './config'
+import { getBuildVersion } from './utils/QQBasicInfo'
 
-export let groups: Group[] = []
 export let friends: Friend[] = []
 export const llonebotError: LLOneBotError = {
   ffmpegError: '',
   httpServerError: '',
   wsServerError: '',
-  otherError: 'LLOnebot未能正常启动，请检查日志查看错误',
+  otherError: 'LLOneBot 未能正常启动，请检查日志查看错误',
 }
 // 群号 -> 群成员map(uid=>GroupMember)
 export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
 
 export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-  let filterKey = isNumeric(uinOrUid.toString()) ? 'uin' : 'uid'
-  let filterValue = uinOrUid
+  const filterKey: 'uin' | 'uid' = isNumeric(uinOrUid.toString()) ? 'uin' : 'uid'
+  const filterValue = uinOrUid
   let friend = friends.find((friend) => friend[filterKey] === filterValue.toString())
-  if (!friend) {
+  if (!friend && getBuildVersion() < 26702) {
     try {
       const _friends = await NTQQFriendApi.getFriends(true)
       friend = _friends.find((friend) => friend[filterKey] === filterValue.toString())
@@ -39,39 +40,15 @@ export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
   return friend
 }
 
-export async function getGroup(qq: string): Promise<Group | undefined> {
-  let group = groups.find((group) => group.groupCode === qq.toString())
-  if (!group) {
-    try {
-      const _groups = await NTQQGroupApi.getGroups(true)
-      group = _groups.find((group) => group.groupCode === qq.toString())
-      if (group) {
-        groups.push(group)
-      }
-    } catch (e) {
-    }
-  }
-  return group
-}
-
-export function deleteGroup(groupCode: string) {
-  const groupIndex = groups.findIndex((group) => group.groupCode === groupCode.toString())
-  // log(groups, groupCode, groupIndex);
-  if (groupIndex !== -1) {
-    log('删除群', groupCode)
-    groups.splice(groupIndex, 1)
-  }
-}
-
-export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
-  groupQQ = groupQQ.toString()
-  memberUinOrUid = memberUinOrUid.toString()
-  let members = groupMembers.get(groupQQ)
+export async function getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
+  const groupCodeStr = groupCode.toString()
+  const memberUinOrUidStr = memberUinOrUid.toString()
+  let members = groupMembers.get(groupCodeStr)
   if (!members) {
     try {
-      members = await NTQQGroupApi.getGroupMembers(groupQQ)
+      members = await NTQQGroupApi.getGroupMembers(groupCodeStr)
       // 更新群成员列表
-      groupMembers.set(groupQQ, members)
+      groupMembers.set(groupCodeStr, members)
     }
     catch (e) {
       return null
@@ -79,16 +56,16 @@ export async function getGroupMember(groupQQ: string | number, memberUinOrUid: s
   }
   const getMember = () => {
     let member: GroupMember | undefined = undefined
-    if (isNumeric(memberUinOrUid)) {
-      member = Array.from(members!.values()).find(member => member.uin === memberUinOrUid)
+    if (isNumeric(memberUinOrUidStr)) {
+      member = Array.from(members!.values()).find(member => member.uin === memberUinOrUidStr)
     } else {
-      member = members!.get(memberUinOrUid)
+      member = members!.get(memberUinOrUidStr)
     }
     return member
   }
   let member = getMember()
   if (!member) {
-    members = await NTQQGroupApi.getGroupMembers(groupQQ)
+    members = await NTQQGroupApi.getGroupMembers(groupCodeStr)
     member = getMember()
   }
   return member
@@ -102,7 +79,7 @@ const selfInfo: SelfInfo = {
 }
 
 export async function getSelfNick(force = false): Promise<string> {
-  if (!selfInfo.nick || force) {
+  if ((!selfInfo.nick || force) && selfInfo.uid) {
     const userInfo = await NTQQUserApi.getUserDetailInfo(selfInfo.uid)
     if (userInfo) {
       selfInfo.nick = userInfo.nick
@@ -127,4 +104,25 @@ export function getSelfUid() {
 
 export function getSelfUin() {
   return selfInfo['uin']
+}
+
+const messages: Map<string, RawMessage> = new Map()
+let expire: number
+
+/** 缓存近期消息内容 */
+export async function addMsgCache(msg: RawMessage) {
+  expire ??= getConfigUtil().getConfig().msgCacheExpire! * 1000
+  if (expire === 0) {
+    return
+  }
+  const id = msg.msgId
+  messages.set(id, msg)
+  setTimeout(() => {
+    messages.delete(id)
+  }, expire)
+}
+
+/** 获取近期消息内容 */
+export function getMsgCache(msgId: string) {
+  return messages.get(msgId)
 }

src/common/db.ts

@@ -1,253 +0,0 @@
-import { Level } from 'level'
-import { type GroupNotify, RawMessage } from '../ntqqapi/types'
-import { DATA_DIR } from './utils'
-import { FileCache } from './types'
-import { log } from './utils/log'
-
-type ReceiveTempUinMap = Record<string, string>
-
-class DBUtil {
-  public readonly DB_KEY_PREFIX_MSG_ID = 'msg_id_'
-  public readonly DB_KEY_PREFIX_MSG_SHORT_ID = 'msg_short_id_'
-  public readonly DB_KEY_PREFIX_MSG_SEQ_ID = 'msg_seq_id_'
-  public readonly DB_KEY_PREFIX_FILE = 'file_'
-  public readonly DB_KEY_PREFIX_GROUP_NOTIFY = 'group_notify_'
-  private readonly DB_KEY_RECEIVED_TEMP_UIN_MAP = 'received_temp_uin_map'
-  public db: Level | undefined
-  public cache: Record<string, RawMessage | string | FileCache | GroupNotify | ReceiveTempUinMap> = {} // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
-  private currentShortId: number | undefined
-
-  /*
-   * 数据库结构
-   * msg_id_101231230999: {} // 长id: RawMessage
-   * msg_short_id_1: 101231230999  // 短id: 长id
-   * msg_seq_id_1: 101231230999  // 序列id: 长id
-   * file_7827DBAFJFW2323.png: {} // 文件名: FileCache
-   * */
-
-  constructor() {
-  }
-
-  init(uin: string) {
-    const DB_PATH = DATA_DIR + `/msg_${uin}`
-    this.db = new Level(DB_PATH, { valueEncoding: 'json' })
-    const expiredMilliSecond = 1000 * 60 * 60
-    setInterval(() => {
-      // this.cache = {}
-      // 清理时间较久的缓存
-      const now = Date.now()
-      for (let key in this.cache) {
-        let message: RawMessage = this.cache[key] as RawMessage
-        if (message?.msgTime) {
-          if (now - parseInt(message.msgTime) * 1000 > expiredMilliSecond) {
-            delete this.cache[key]
-            // log("clear cache", key, message.msgTime);
-          }
-        }
-      }
-    }, expiredMilliSecond)
-  }
-
-  public async getReceivedTempUinMap(): Promise<ReceiveTempUinMap> {
-    try {
-      this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = JSON.parse(await this.db?.get(this.DB_KEY_RECEIVED_TEMP_UIN_MAP)!)
-    } catch (e) { }
-    return (this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] || {}) as ReceiveTempUinMap
-  }
-  public setReceivedTempUinMap(data: ReceiveTempUinMap) {
-    this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = data
-    this.db?.put(this.DB_KEY_RECEIVED_TEMP_UIN_MAP, JSON.stringify(data)).then()
-  }
-  private addCache(msg: RawMessage) {
-    const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-    const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + msg.msgShortId
-    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
-    this.cache[longIdKey] = this.cache[shortIdKey] = msg
-  }
-
-  public clearCache() {
-    this.cache = {}
-  }
-
-  async getMsgByShortId(shortMsgId: number): Promise<RawMessage | undefined> {
-    const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId
-    if (this.cache[shortMsgIdKey]) {
-      // log("getMsgByShortId cache", shortMsgIdKey, this.cache[shortMsgIdKey])
-      return this.cache[shortMsgIdKey] as RawMessage
-    }
-    try {
-      const longId = await this.db?.get(shortMsgIdKey)
-      const msg = await this.getMsgByLongId(longId!)
-      this.addCache(msg!)
-      return msg
-    } catch (e: any) {
-      log('getMsgByShortId db error', e.stack.toString())
-    }
-  }
-
-  async getMsgByLongId(longId: string): Promise<RawMessage | undefined> {
-    const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId
-    if (this.cache[longIdKey]) {
-      return this.cache[longIdKey] as RawMessage
-    }
-    try {
-      const data = await this.db?.get(longIdKey)
-      const msg = JSON.parse(data!)
-      this.addCache(msg)
-      return msg
-    } catch (e) {
-      // log("getMsgByLongId db error", e.stack.toString())
-    }
-  }
-
-  async getMsgBySeqId(seqId: string): Promise<RawMessage | undefined> {
-    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId
-    if (this.cache[seqIdKey]) {
-      return this.cache[seqIdKey] as RawMessage
-    }
-    try {
-      const longId = await this.db?.get(seqIdKey)
-      const msg = await this.getMsgByLongId(longId!)
-      this.addCache(msg!)
-      return msg
-    } catch (e: any) {
-      log('getMsgBySeqId db error', e.stack.toString())
-    }
-  }
-
-  async addMsg(msg: RawMessage) {
-    // 有则更新，无则添加
-    // log("addMsg", msg.msgId, msg.msgSeq, msg.msgShortId);
-    const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-    let existMsg: RawMessage | undefined = this.cache[longIdKey] as RawMessage
-    if (!existMsg) {
-      try {
-        existMsg = await this.getMsgByLongId(msg.msgId)
-      } catch (e) {
-        // log("addMsg getMsgByLongId error", e.stack.toString())
-      }
-    }
-    if (existMsg) {
-      // log("消息已存在", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId)
-      this.updateMsg(msg).then()
-      return existMsg.msgShortId
-    }
-
-    const shortMsgId = await this.genMsgShortId()
-    const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId
-    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
-    msg.msgShortId = shortMsgId
-    this.addCache(msg)
-    // log("新增消息记录", msg.msgId)
-    this.db?.put(shortIdKey, msg.msgId).then().catch()
-    this.db?.put(longIdKey, JSON.stringify(msg)).then().catch()
-    try {
-      await this.db?.get(seqIdKey)
-    } catch (e) {
-      // log("新的seqId", seqIdKey)
-      this.db?.put(seqIdKey, msg.msgId).then().catch()
-    }
-    if (!this.cache[seqIdKey]) {
-      this.cache[seqIdKey] = msg
-    }
-    return shortMsgId
-    // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
-  }
-
-  async updateMsg(msg: RawMessage) {
-    const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-    let existMsg: RawMessage | undefined = this.cache[longIdKey] as RawMessage
-    if (!existMsg) {
-      try {
-        existMsg = await this.getMsgByLongId(msg.msgId)
-      } catch (e) {
-        existMsg = msg
-      }
-    }
-
-    Object.assign(existMsg!, msg)
-    this.db?.put(longIdKey, JSON.stringify(existMsg)).then().catch()
-    const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + existMsg?.msgShortId
-    const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
-    if (!this.cache[seqIdKey]) {
-      this.cache[seqIdKey] = existMsg!
-    }
-    this.db?.put(shortIdKey, msg.msgId).then().catch()
-    try {
-      await this.db?.get(seqIdKey)
-    } catch (e) {
-      this.db?.put(seqIdKey, msg.msgId).then().catch()
-      // log("更新seqId error", e.stack, seqIdKey);
-    }
-    // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
-  }
-
-  private async genMsgShortId(): Promise<number> {
-    const key = 'msg_current_short_id'
-    if (this.currentShortId === undefined) {
-      try {
-        const id = await this.db?.get(key)
-        this.currentShortId = parseInt(id!)
-      } catch (e) {
-        this.currentShortId = -2147483640
-      }
-    }
-
-    this.currentShortId++
-    this.db?.put(key, this.currentShortId.toString()).then().catch()
-    return this.currentShortId
-  }
-
-  async addFileCache(fileNameOrUuid: string, data: FileCache) {
-    const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid
-    if (this.cache[key]) {
-      return
-    }
-    let cacheDBData = { ...data }
-    delete cacheDBData['downloadFunc']
-    this.cache[fileNameOrUuid] = data
-    try {
-      await this.db?.put(key, JSON.stringify(cacheDBData))
-    } catch (e: any) {
-      log('addFileCache db error', e.stack.toString())
-    }
-  }
-
-  async getFileCache(fileNameOrUuid: string): Promise<FileCache | undefined> {
-    const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid
-    if (this.cache[key]) {
-      return this.cache[key] as FileCache
-    }
-    try {
-      const data = await this.db?.get(key)
-      return JSON.parse(data!)
-    } catch (e) {
-      // log("getFileCache db error", e.stack.toString())
-    }
-  }
-
-  async addGroupNotify(notify: GroupNotify) {
-    const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + notify.seq
-    let existNotify = this.cache[key] as GroupNotify
-    if (existNotify) {
-      return
-    }
-    this.cache[key] = notify
-    this.db?.put(key, JSON.stringify(notify)).then().catch()
-  }
-
-  async getGroupNotify(seq: string): Promise<GroupNotify | undefined> {
-    const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + seq
-    if (this.cache[key]) {
-      return this.cache[key] as GroupNotify
-    }
-    try {
-      const data = await this.db?.get(key)
-      return JSON.parse(data!)
-    } catch (e) {
-      // log("getGroupNotify db error", e.stack.toString())
-    }
-  }
-}
-
-export const dbUtil = new DBUtil()

src/common/types.ts

@@ -30,6 +30,8 @@ export interface Config {
   ffmpeg?: string // ffmpeg路径
   musicSignUrl?: string
   ignoreBeforeLoginMsg?: boolean
+  /** 单位为秒 */
+  msgCacheExpire?: number
 }
 
 export interface LLOneBotError {
@@ -41,11 +43,22 @@ export interface LLOneBotError {
 
 export interface FileCache {
   fileName: string
-  filePath: string
   fileSize: string
-  fileUuid?: string
-  url?: string
-  msgId?: string
+  msgId: string
+  peerUid: string
+  chatType: number
   elementId: string
-  downloadFunc?: () => Promise<void>
+  elementType: number
 }
+
+export interface FileCacheV2 {
+  fileName: string
+  fileSize: string
+  fileUuid: string
+  msgId: string
+  msgTime: number
+  peerUid: string
+  chatType: number
+  elementId: string
+  elementType: number
+}

src/common/utils/EventTask.ts

@@ -16,6 +16,7 @@ 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
@@ -33,7 +34,7 @@ export class NTEventWrapper {
         if (typeof target[prop] === 'undefined') {
           // 如果方法不存在，返回一个函数，这个函数调用existentMethod
           return (...args: any[]) => {
-            current.DispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then()
+            current.dispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then()
           }
         }
         // 如果方法存在，正常返回
@@ -47,7 +48,7 @@ export class NTEventWrapper {
     this.WrapperSession = WrapperSession
   }
 
-  CreatEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+  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>> }
@@ -68,14 +69,14 @@ export class NTEventWrapper {
     }
   }
 
-  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+  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.CreatEventFunction<(listener: T) => number>(Service)
+      const addfunc = this.createEventFunction<(listener: T) => number>(Service)
       addfunc!(Listener as T)
       //console.log(addfunc!(Listener as T))
       this.ListenerManger.set(listenerMainName + uniqueCode, Listener)
@@ -84,7 +85,7 @@ export class NTEventWrapper {
   }
 
   //统一回调清理事件
-  async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+  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)
@@ -100,7 +101,7 @@ export class NTEventWrapper {
 
   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.CreatEventFunction<EventType>(EventName)
+      const EventFunc = this.createEventFunction<EventType>(EventName)
       let complete = false
       const Timeouter = setTimeout(() => {
         if (!complete) {
@@ -149,7 +150,7 @@ export class NTEventWrapper {
         this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map())
       }
       this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak)
-      this.CreatListenerFunction(ListenerMainName)
+      this.createListenerFunction(ListenerMainName)
     })
   }
 
@@ -195,8 +196,8 @@ export class NTEventWrapper {
         this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map())
       }
       this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak)
-      this.CreatListenerFunction(ListenerMainName)
-      const EventFunc = this.CreatEventFunction<EventType>(EventName)
+      this.createListenerFunction(ListenerMainName)
+      const EventFunc = this.createEventFunction<EventType>(EventName)
       retEvent = await EventFunc!(...(args as any[]))
     })
   }

src/common/utils/MessageUnique.ts

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

src/common/utils/file.ts

@@ -2,7 +2,6 @@ import fs from 'node:fs'
 import fsPromise from 'node:fs/promises'
 import path from 'node:path'
 import { log, TEMP_DIR } from './index'
-import { dbUtil } from '../db'
 import * as fileType from 'file-type'
 import { randomUUID, createHash } from 'node:crypto'
 
@@ -187,13 +186,6 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       } else {
         filePath = pathname
       }
-    } else {
-      const cache = await dbUtil.getFileCache(uri)
-      if (cache) {
-        filePath = cache.filePath
-      } else {
-        filePath = uri
-      }
     }
 
     res.isLocal = true

src/common/utils/helper.ts

@@ -143,4 +143,27 @@ export function CacheClassFuncAsyncExtend(ttl: number = 3600 * 1000, customKey:
     }
   }
   return logExecutionTime
+}
+
+// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/helper.ts#L14
+export class UUIDConverter {
+  static encode(highStr: string, lowStr: string): string {
+    const high = BigInt(highStr)
+    const low = BigInt(lowStr)
+    const highHex = high.toString(16).padStart(16, '0')
+    const lowHex = low.toString(16).padStart(16, '0')
+    const combinedHex = highHex + lowHex
+    const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
+      12,
+      16,
+    )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`
+    return uuid
+  }
+
+  static decode(uuid: string): { high: string; low: string } {
+    const hex = uuid.replace(/-/g, '')
+    const high = BigInt('0x' + hex.substring(0, 16))
+    const low = BigInt('0x' + hex.substring(16))
+    return { high: high.toString(), low: low.toString() }
+  }
 }

src/common/utils/index.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import fs from 'fs'
 
 export * from './file'
 export * from './helper'
@@ -7,12 +6,9 @@ export * from './log'
 export * from './qqlevel'
 export * from './QQBasicInfo'
 export * from './upgrade'
-export const DATA_DIR = global.LiteLoader.plugins['LLOneBot'].path.data
-export const TEMP_DIR = path.join(DATA_DIR, 'temp')
-export const PLUGIN_DIR = global.LiteLoader.plugins['LLOneBot'].path.plugin
-if (!fs.existsSync(TEMP_DIR)) {
-  fs.mkdirSync(TEMP_DIR, { recursive: true })
-}
+export const DATA_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.data
+export const TEMP_DIR: string = path.join(DATA_DIR, 'temp')
+export const PLUGIN_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.plugin
 export { getVideoInfo } from './video'
 export { checkFfmpeg } from './video'
 export { encodeSilk } from './audio'

src/common/utils/table.ts

@@ -1,3 +1,4 @@
+// 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()

src/main/main.ts

@@ -1,6 +1,7 @@
 // 运行在 Electron 主进程 下的插件入口
 
 import { BrowserWindow, dialog, ipcMain } from 'electron'
+import path from 'node:path'
 import fs from 'node:fs'
 import { Config } from '../common/types'
 import {
@@ -13,20 +14,20 @@ import {
   CHANNEL_UPDATE,
 } from '../common/channels'
 import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
-import { DATA_DIR } from '../common/utils'
+import { DATA_DIR, TEMP_DIR } from '../common/utils'
 import {
-  getGroupMember,
   llonebotError,
   setSelfInfo,
   getSelfInfo,
   getSelfUid,
-  getSelfUin
+  getSelfUin,
+  addMsgCache
 } from '../common/data'
 import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook, startHook } from '../ntqqapi/hook'
 import { OB11Constructor } from '../onebot11/constructor'
 import {
   FriendRequestNotify,
-  GroupNotifies,
+  GroupNotify,
   GroupNotifyTypes,
   RawMessage,
   BuddyReqType,
@@ -36,8 +37,7 @@ import { postOb11Event } from '../onebot11/server/post-ob11-event'
 import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
 import { OB11GroupRequestEvent } from '../onebot11/event/request/OB11GroupRequest'
 import { OB11FriendRequestEvent } from '../onebot11/event/request/OB11FriendRequest'
-import path from 'node:path'
-import { dbUtil } from '../common/db'
+import { MessageUnique } from '../common/utils/MessageUnique'
 import { setConfig } from './setConfig'
 import { NTQQUserApi, NTQQGroupApi } from '../ntqqapi/api'
 import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
@@ -48,6 +48,7 @@ import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../onebot11/event/
 import '../ntqqapi/wrapper'
 import { NTEventDispatch } from '../common/utils/EventTask'
 import { wrapperConstructor, getSession } from '../ntqqapi/wrapper'
+import { Peer } from '../ntqqapi/types'
 
 let mainWindow: BrowserWindow | null = null
 
@@ -94,7 +95,7 @@ function onLoad() {
   }
   ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
     const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
-    llonebotError.ffmpegError = ffmpegOk ? '' : '没有找到ffmpeg,音频只能发送wav和silk,视频尺寸可能异常'
+    llonebotError.ffmpegError = ffmpegOk ? '' : '没有找到 FFmpeg, 音频只能发送 WAV 和 SILK, 视频尺寸可能异常'
     let { httpServerError, wsServerError, otherError, ffmpegError } = llonebotError
     let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
     error = error.replace('\n\n', '\n')
@@ -153,9 +154,12 @@ function onLoad() {
         continue
       }
       // log("收到新消息", message.msgId, message.msgSeq)
-      // if (message.senderUin !== selfInfo.uin){
-      message.msgShortId = await dbUtil.addMsg(message)
-      // }
+      const peer: Peer = {
+        chatType: message.chatType,
+        peerUid: message.peerUid
+      }
+      message.msgShortId = MessageUnique.createMsg(peer, message.msgId)
+      addMsgCache(message)
 
       OB11Constructor.message(message)
         .then((msg) => {
@@ -180,7 +184,7 @@ function onLoad() {
         }
       })
       OB11Constructor.PrivateEvent(message).then((privateEvent) => {
-        log(message)
+        //log(message)
         if (privateEvent) {
           // log("post private event", privateEvent);
           postOb11Event(privateEvent)
@@ -210,29 +214,22 @@ function onLoad() {
     const recallMsgIds: string[] = [] // 避免重复上报
     registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
       for (const message of payload.msgList) {
-        log('message update', message.msgId, message)
         if (message.recallTime != '0') {
           if (recallMsgIds.includes(message.msgId)) {
             continue
           }
           recallMsgIds.push(message.msgId)
-          const oriMessage = await dbUtil.getMsgByLongId(message.msgId)
-          if (!oriMessage) {
+          const oriMessageId = MessageUnique.getShortIdByMsgId(message.msgId)
+          if (!oriMessageId) {
             continue
           }
-          oriMessage.recallTime = message.recallTime
-          dbUtil.updateMsg(oriMessage).then()
-          message.msgShortId = oriMessage.msgShortId
-          OB11Constructor.RecallEvent(message).then((recallEvent) => {
+          OB11Constructor.RecallEvent(message, oriMessageId).then((recallEvent) => {
             if (recallEvent) {
-              log('post recall event', recallEvent)
+              //log('post recall event', recallEvent)
               postOb11Event(recallEvent)
             }
           })
-          // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
-          continue
         }
-        dbUtil.updateMsg(message).then()
       }
     })
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
@@ -247,6 +244,7 @@ function onLoad() {
         log('report self message error: ', e.stack.toString())
       }
     })
+    const processedGroupNotify: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -254,54 +252,43 @@ function onLoad() {
     }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
       if (payload.unreadCount) {
         // log("开始获取群通知详情")
-        let notify: GroupNotifies
+        let notifies: GroupNotify[]
         try {
-          notify = await NTQQGroupApi.getGroupNotifies()
+          notifies = (await NTQQGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
         } catch (e) {
           // log("获取群通知详情失败", e);
           return
         }
 
-        const notifies = notify.notifies.slice(0, payload.unreadCount)
-        // log("获取群通知详情完成", notifies, payload);
-
         for (const notify of notifies) {
           try {
             notify.time = Date.now()
-            // const notifyTime = parseInt(notify.seq) / 1000
-            // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
-            // if (notifyTime < startTime) {
-            //     continue;
-            // }
-            let existNotify = await dbUtil.getGroupNotify(notify.seq)
-            if (existNotify) {
+            const notifyTime = parseInt(notify.seq) / 1000
+            const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
+            if (notifyTime < startTime || processedGroupNotify.includes(flag)) {
               continue
             }
-            log('收到群通知', notify)
-            await dbUtil.addGroupNotify(notify)
-            const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
+            processedGroupNotify.push(flag)
             if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
               log('有成员退出通知', notify)
-              try {
-                const member1 = await NTQQUserApi.getUserDetailInfo(notify.user1.uid)
-                let operatorId = member1.uin
-                let subType: GroupDecreaseSubType = 'leave'
-                if (notify.user2.uid) {
-                  // 是被踢的
-                  const member2 = await getGroupMember(notify.group.groupCode, notify.user2.uid)
-                  operatorId = member2?.uin!
-                  subType = 'kick'
+              const member1Uin = (await NTQQUserApi.getUinByUid(notify.user1.uid))!
+              let operatorId = member1Uin
+              let subType: GroupDecreaseSubType = 'leave'
+              if (notify.user2.uid) {
+                // 是被踢的
+                const member2Uin = await NTQQUserApi.getUinByUid(notify.user2.uid)
+                if (member2Uin) {
+                  operatorId = member2Uin
                 }
-                let groupDecreaseEvent = new OB11GroupDecreaseEvent(
-                  parseInt(notify.group.groupCode),
-                  parseInt(member1.uin),
-                  parseInt(operatorId),
-                  subType,
-                )
-                postOb11Event(groupDecreaseEvent, true)
-              } catch (e: any) {
-                log('获取群通知的成员信息失败', notify, e.stack.toString())
+                subType = 'kick'
               }
+              const groupDecreaseEvent = new OB11GroupDecreaseEvent(
+                parseInt(notify.group.groupCode),
+                parseInt(member1Uin),
+                parseInt(operatorId),
+                subType,
+              )
+              postOb11Event(groupDecreaseEvent, true)
             }
             else if ([GroupNotifyTypes.JOIN_REQUEST, GroupNotifyTypes.JOIN_REQUEST_BY_INVITED].includes(notify.type)) {
               log('有加群请求')
@@ -392,17 +379,22 @@ function onLoad() {
     log('llonebot pid', process.pid)
     const config = getConfigUtil().getConfig()
     if (!config.enableLLOB) {
+      llonebotError.otherError = 'LLOneBot 未启动'
       log('LLOneBot 开关设置为关闭，不启动LLOneBot')
       return
     }
+    if (!fs.existsSync(TEMP_DIR)) {
+      fs.mkdirSync(TEMP_DIR, { recursive: true })
+    }
     llonebotError.otherError = ''
     startTime = Date.now()
     NTEventDispatch.init({ ListenerMap: wrapperConstructor, WrapperSession: getSession()! })
-    dbUtil.init(uin)
+    MessageUnique.init(uin)
 
     log('start activate group member info')
-    NTQQGroupApi.activateMemberInfoChange().then().catch(log)
-    NTQQGroupApi.activateMemberListChange().then().catch(log)
+    // 下面两个会导致CPU占用过高，QQ卡死
+    // NTQQGroupApi.activateMemberInfoChange().then().catch(log)
+    // NTQQGroupApi.activateMemberListChange().then().catch(log)
     startReceiveHook().then()
 
     if (config.ob11.enableHttp) {
@@ -421,7 +413,7 @@ function onLoad() {
     log('LLOneBot start')
   }
 
-  const init = async () => {
+  const intervalId = setInterval(() => {
     const current = getSelfInfo()
     if (!current.uin) {
       setSelfInfo({
@@ -430,15 +422,11 @@ function onLoad() {
         nick: current.uin,
       })
     }
-    //log('self info', selfInfo, globalThis.authData)
-    if (current.uin) {
+    if (current.uin && getSession()) {
+      clearInterval(intervalId)
       start(current.uid, current.uin)
     }
-    else {
-      setTimeout(init, 1000)
-    }
-  }
-  init()
+  }, 600)
 }
 
 // 创建窗口时触发

src/ntqqapi/api/file.ts

@@ -24,6 +24,7 @@ import { fileTypeFromFile } from 'file-type'
 import fsPromise from 'node:fs/promises'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
+import { NodeIKernelSearchService } from '@/ntqqapi/services'
 
 export class NTQQFileApi {
   static async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string> {
@@ -178,7 +179,6 @@ export class NTQQFileApi {
     const url: string = element.originImageUrl!  // 没有域名
     const md5HexStr = element.md5HexStr
     const fileMd5 = element.md5HexStr
-    const fileUuid = element.fileUuid
 
     if (url) {
       const UrlParse = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
@@ -203,6 +203,122 @@ export class NTQQFileApi {
     log('图片url获取失败', element)
     return ''
   }
+
+  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/core/src/apis/file.ts#L149
+  static async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
+    let GroupData: any[] | undefined
+    let BuddyData: any[] | undefined
+    if (peer.chatType === ChatType.group) {
+      GroupData =
+        [{
+          groupCode: peer.peerUid,
+          isConf: false,
+          hasModifyConfGroupFace: true,
+          hasModifyConfGroupName: true,
+          groupName: 'LLOneBot.Cached',
+          remark: 'LLOneBot.Cached',
+        }];
+    } else if (peer.chatType === ChatType.friend) {
+      BuddyData = [{
+        category_name: 'LLOneBot.Cached',
+        peerUid: peer.peerUid,
+        peerUin: peer.peerUid,
+        remark: 'LLOneBot.Cached',
+      }]
+    } else {
+      return undefined
+    }
+
+    const session = getSession()
+    return session?.getSearchService().addSearchHistory({
+      type: 4,
+      contactList: [],
+      id: -1,
+      groupInfos: [],
+      msgs: [],
+      fileInfos: [
+        {
+          chatType: peer.chatType,
+          buddyChatInfo: BuddyData || [],
+          discussChatInfo: [],
+          groupChatInfo: GroupData || [],
+          dataLineChatInfo: [],
+          tmpChatInfo: [],
+          msgId: msgId,
+          msgSeq: msgSeq,
+          msgTime: Math.floor(Date.now() / 1000).toString(),
+          senderUid: senderUid,
+          senderNick: 'LLOneBot.Cached',
+          senderRemark: 'LLOneBot.Cached',
+          senderCard: 'LLOneBot.Cached',
+          elemId: elemId,
+          elemType: elemType,
+          fileSize: fileSize,
+          filePath: '',
+          fileName: fileName,
+          hits: [{
+            start: 12,
+            end: 14,
+          }],
+        },
+      ],
+    })
+  }
+
+  static async searchfile(keys: string[]) {
+    type EventType = NodeIKernelSearchService['searchFileWithKeywords']
+
+    interface OnListener {
+      searchId: string,
+      hasMore: boolean,
+      resultItems: {
+        chatType: ChatType,
+        buddyChatInfo: any[],
+        discussChatInfo: any[],
+        groupChatInfo:
+        {
+          groupCode: string,
+          isConf: boolean,
+          hasModifyConfGroupFace: boolean,
+          hasModifyConfGroupName: boolean,
+          groupName: string,
+          remark: string
+        }[],
+        dataLineChatInfo: any[],
+        tmpChatInfo: any[],
+        msgId: string,
+        msgSeq: string,
+        msgTime: string,
+        senderUid: string,
+        senderNick: string,
+        senderRemark: string,
+        senderCard: string,
+        elemId: string,
+        elemType: number,
+        fileSize: string,
+        filePath: string,
+        fileName: string,
+        hits:
+        {
+          start: number,
+          end: number
+        }[]
+      }[]
+    }
+
+    const Event = NTEventDispatch.createEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords')
+    let id = ''
+    const Listener = NTEventDispatch.RegisterListen<(params: OnListener) => void>
+      (
+        'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+        1,
+        20000,
+        (params) => id !== '' && params.searchId == id,
+      )
+    id = await Event!(keys, 12)
+    const [ret] = await Listener
+    return ret
+  }
 }
 
 export class NTQQFileCacheApi {

src/ntqqapi/api/friend.ts

@@ -8,6 +8,7 @@ import { CacheClassFuncAsyncExtend } from '@/common/utils/helper'
 import { LimitedHashTable } from '@/common/utils/table'
 
 export class NTQQFriendApi {
+  /** 大于或等于 26702 应使用 getBuddyV2 */
   static async getFriends(forced = false) {
     const data = await callNTQQApi<{
       data: {

src/ntqqapi/api/group.ts

@@ -1,10 +1,11 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes } from '../types'
+import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GroupNotify } from '../types'
 import { callNTQQApi, GeneralCallResult, NTQQApiMethod } from '../ntcall'
 import { NTQQWindowApi, NTQQWindows } from './window'
 import { getSession } from '../wrapper'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { NodeIKernelGroupListener } from '../listeners'
+import { NodeIKernelGroupService } from '../services'
 
 export class NTQQGroupApi {
   static async activateMemberListChange() {
@@ -45,12 +46,29 @@ export class NTQQGroupApi {
         'NodeIKernelGroupListener/onGroupListUpdate',
         1,
         5000,
-        (updateType) => true,
+        () => true,
         forced
       )
     return groupList
   }
 
+  static async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
+    type ListenerType = NodeIKernelGroupListener['onMemberInfoChange']
+    type EventType = NodeIKernelGroupService['getMemberInfo']
+    const [, , , _members] = await NTEventDispatch.CallNormalEvent<EventType, ListenerType>
+      (
+        'NodeIKernelGroupService/getMemberInfo',
+        'NodeIKernelGroupListener/onMemberInfoChange',
+        1,
+        5000,
+        (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
+          return groupCode == GroupCode && members.has(uid)
+        },
+        GroupCode, [uid], forced,
+      )
+    return _members.get(uid)
+  }
+
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
     const session = getSession()
     const groupService = session?.getGroupService()
@@ -100,6 +118,36 @@ export class NTQQGroupApi {
     )
   }
 
+  static async getSingleScreenNotifies(num: number) {
+    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
+  }
+
+  static async delGroupFile(groupCode: string, files: string[]) {
+    const session = getSession()
+    return session?.getRichMediaService().deleteGroupFile(groupCode, [102], files)!
+  }
+
+  static DelGroupFile = NTQQGroupApi.delGroupFile
+
+  static async delGroupFileFolder(groupCode: string, folderId: string) {
+    const session = getSession()
+    return session?.getRichMediaService().deleteGroupFolder(groupCode, folderId)!
+  }
+
+  static DelGroupFileFolder = NTQQGroupApi.delGroupFileFolder
+
   static async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
     const flagitem = flag.split('|')
     const groupCode = flagitem[0]

src/ntqqapi/api/msg.ts

@@ -208,8 +208,9 @@ export class NTQQMsgApi {
   }
 
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
-    const msgInfos = msgIds.map(async id => {
-      return { msgId: id, senderShowName: await getSelfNick() }
+    const senderShowName = await getSelfNick()
+    const msgInfos = msgIds.map(id => {
+      return { msgId: id, senderShowName }
     })
     const selfUid = getSelfUid()
     let data = await NTEventDispatch.CallNormalEvent<
@@ -269,4 +270,24 @@ export class NTQQMsgApi {
     const session = getSession()
     return await session?.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z)!
   }
+
+  static async getLastestMsgByUids(peer: Peer, count = 20, isReverseOrder = false) {
+    const session = getSession()
+    const ret = await session?.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+      chatInfo: peer,
+      filterMsgType: [],
+      filterSendersUid: [],
+      filterMsgToTime: '0',
+      filterMsgFromTime: '0',
+      isReverseOrder: isReverseOrder, //此参数有点离谱 注意不是本次查询的排序 而是全部消历史信息的排序 默认false 从新消息拉取到旧消息
+      isIncludeCurrent: true,
+      pageLimit: count,
+    })
+    return ret!
+  }
+
+  static async getSingleMsg(peer: Peer, seq: string) {
+    const session = getSession()
+    return await session?.getMsgService().getSingleMsg(peer, seq)!
+  }
 }

src/ntqqapi/api/user.ts

@@ -52,20 +52,11 @@ export class NTQQUserApi {
         'NodeIKernelProfileListener/onUserDetailInfoChanged',
         1,
         5000,
-        (profile) => {
-          if (profile.uid === uid) {
-            return true
-          }
-          return false
-        },
+        (profile) => profile.uid === uid,
         'BuddyProfileStore',
-        [
-          uid
-        ],
+        [uid],
         UserDetailSource.KSERVER,
-        [
-          ProfileBizType.KALL
-        ]
+        [ProfileBizType.KALL]
       )
     const RetUser: User = {
       ...profile.simpleInfo.coreInfo,
@@ -81,7 +72,7 @@ export class NTQQUserApi {
 
   static async getUserDetailInfo(uid: string, getLevel = false, withBizInfo = true) {
     if (getBuildVersion() >= 26702) {
-      return this.fetchUserDetailInfo(uid)
+      return NTQQUserApi.fetchUserDetailInfo(uid)
     }
     type EventService = NodeIKernelProfileService['getUserDetailInfoWithBizInfo']
     type EventListener = NodeIKernelProfileListener['onProfileDetailInfoChanged']
@@ -92,12 +83,7 @@ export class NTQQUserApi {
         'NodeIKernelProfileListener/onProfileDetailInfoChanged',
         2,
         5000,
-        (profile: User) => {
-          if (profile.uid === uid) {
-            return true
-          }
-          return false
-        },
+        (profile) => profile.uid === uid,
         uid,
         [0]
       )
@@ -119,7 +105,7 @@ export class NTQQUserApi {
 
   static async getQzoneCookies() {
     const uin = getSelfUin()
-    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + (await this.getClientKey()).clientKey + '&u1=https%3A%2F%2Fuser.qzone.qq.com%2F' + uin + '%2Finfocenter&keyindex=19%27'
+    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + (await NTQQUserApi.getClientKey()).clientKey + '&u1=https%3A%2F%2Fuser.qzone.qq.com%2F' + uin + '%2Finfocenter&keyindex=19%27'
     let cookies: { [key: string]: string } = {}
     try {
       cookies = await RequestUtil.HttpsGetCookies(requestUrl)
@@ -129,8 +115,9 @@ export class NTQQUserApi {
     }
     return cookies
   }
+  
   static async getSkey(): Promise<string> {
-    const clientKeyData = await this.getClientKey()
+    const clientKeyData = await NTQQUserApi.getClientKey()
     if (clientKeyData.result !== 0) {
       throw new Error('获取clientKey失败')
     }

src/ntqqapi/hook.ts

@@ -1,28 +1,30 @@
 import type { BrowserWindow } from 'electron'
 import { NTQQApiClass, NTQQApiMethod } from './ntcall'
 import { NTQQMsgApi } from './api/msg'
-import { CategoryFriend, ChatType, Group, GroupMember, GroupMemberRole, RawMessage } from './types'
 import {
-  deleteGroup,
+  CategoryFriend,
+  ChatType,
+  GroupMember,
+  GroupMemberRole,
+  RawMessage,
+  SimpleInfo, User,
+} from './types'
+import {
   friends,
   getFriend,
   getGroupMember,
-  groups,
-  getSelfUin,
   setSelfInfo
 } from '@/common/data'
-import { OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
 import { postOb11Event } from '../onebot11/server/post-ob11-event'
 import { getConfigUtil, HOOK_LOG } from '@/common/config'
-import fs from 'fs'
-import { dbUtil } from '@/common/db'
-import { NTQQGroupApi } from './api/group'
+import fs from 'node:fs'
 import { log } from '@/common/utils'
+import { randomUUID } from 'node:crypto'
+import { MessageUnique } from '../common/utils/MessageUnique'
 import { isNumeric, sleep } from '@/common/utils'
 import { OB11Constructor } from '../onebot11/constructor'
 import { OB11GroupCardEvent } from '../onebot11/event/notice/OB11GroupCardEvent'
 import { OB11GroupAdminNoticeEvent } from '../onebot11/event/notice/OB11GroupAdminNoticeEvent'
-import { randomUUID } from 'node:crypto'
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
@@ -103,8 +105,8 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                   if (hook.hookFunc.constructor.name === 'AsyncFunction') {
                     ; (_ as Promise<void>).then()
                   }
-                } catch (e) {
-                  log('hook error', e, receiveData.payload)
+                } catch (e: any) {
+                  log('hook error', ntQQApiMethodName, e.stack.toString())
                 }
               }).then()
             }
@@ -233,16 +235,16 @@ export function removeReceiveHook(id: string) {
   receiveHooks.splice(index, 1)
 }
 
-let activatedGroups: string[] = []
+//let activatedGroups: string[] = []
 
-async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
+/*async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
   for (let group of _groups) {
-    log('update group', group)
+    log('update group', group.groupCode)
     if (group.privilegeFlag === 0) {
       deleteGroup(group.groupCode)
       continue
     }
-    log('update group', group)
+    //log('update group', group)
     NTQQMsgApi.activateChat({ peerUid: group.groupCode, chatType: ChatType.group }).then().catch(log)
     let existGroup = groups.find((g) => g.groupCode == group.groupCode)
     if (existGroup) {
@@ -260,9 +262,9 @@ async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
       }
     }
   }
-}
+}*/
 
-async function processGroupEvent(payload: { groupList: Group[] }) {
+/*async function processGroupEvent(payload: { groupList: Group[] }) {
   try {
     const newGroupList = payload.groupList
     for (const group of newGroupList) {
@@ -313,12 +315,12 @@ async function processGroupEvent(payload: { groupList: Group[] }) {
     updateGroups(payload.groupList).then()
     log('更新群信息错误', e.stack.toString())
   }
-}
+}*/
 
 export async function startHook() {
 
   // 群列表变动
-  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
+  /*registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
     // updateType 3是群列表变动，2是群成员变动
     // log("群列表变动", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
@@ -332,7 +334,7 @@ export async function startHook() {
   })
   registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
     // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动", payload.updateType, payload.groupList)
+    // log("群列表变动, store", payload.updateType, payload.groupList)
     if (payload.updateType != 2) {
       updateGroups(payload.groupList).then()
     }
@@ -341,7 +343,7 @@ export async function startHook() {
         processGroupEvent(payload).then()
       }
     }
-  })
+  })*/
 
   registerReceiveHook<{
     groupCode: string
@@ -391,17 +393,32 @@ export async function startHook() {
   registerReceiveHook<{
     data: CategoryFriend[]
   }>(ReceiveCmdS.FRIENDS, (payload) => {
-    for (const fData of payload.data) {
-      const _friends = fData.buddyList
-      for (let friend of _friends) {
-        NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
-        let existFriend = friends.find((f) => f.uin == friend.uin)
-        if (!existFriend) {
-          friends.push(friend)
-        }
-        else {
-          Object.assign(existFriend, friend)
+    // log("onBuddyListChange", payload)
+    // let friendListV2: {userSimpleInfos: Map<string, SimpleInfo>} = []
+    type V2data = {userSimpleInfos: Map<string, SimpleInfo>}
+    let friendList: User[] = [];
+    if ((payload as any).userSimpleInfos) {
+      // friendListV2 = payload as any
+      friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
+        return {
+          ...v.coreInfo,
         }
+      })
+    }
+    else{
+      for (const fData of payload.data) {
+        friendList.push(...fData.buddyList)
+      }
+    }
+    log('好友列表变动', friendList)
+    for (let friend of friendList) {
+      NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
+      let existFriend = friends.find((f) => f.uin == friend.uin)
+      if (!existFriend) {
+        friends.push(friend)
+      }
+      else {
+        Object.assign(existFriend, friend)
       }
     }
   })
@@ -444,8 +461,12 @@ export async function startHook() {
   })
 
   registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
-    const message = msgRecord
-    dbUtil.addMsg(message).then()
+    const { msgId, chatType, peerUid } = msgRecord
+    const peer = {
+      chatType,
+      peerUid
+    }
+    MessageUnique.createMsg(peer, msgId)
   })
 
   registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
@@ -508,4 +529,4 @@ export async function startHook() {
       log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
     })
   })
-}
+}

src/ntqqapi/services/NodeIKernelSearchService.ts

@@ -0,0 +1,128 @@
+import { ChatType } from '../types'
+
+export interface NodeIKernelSearchService {
+    addKernelSearchListener(...args: any[]): unknown// needs 1 arguments
+
+    removeKernelSearchListener(...args: any[]): unknown// needs 1 arguments
+
+    searchStranger(...args: any[]): unknown// needs 3 arguments
+
+    searchGroup(...args: any[]): unknown// needs 1 arguments
+
+    searchLocalInfo(keywords: string, unknown: number/*4*/): unknown
+
+    cancelSearchLocalInfo(...args: any[]): unknown// needs 3 arguments
+
+    searchBuddyChatInfo(...args: any[]): unknown// needs 2 arguments
+
+    searchMoreBuddyChatInfo(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchBuddyChatInfo(...args: any[]): unknown// needs 3 arguments
+
+    searchContact(...args: any[]): unknown// needs 2 arguments
+
+    searchMoreContact(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchContact(...args: any[]): unknown// needs 3 arguments
+
+    searchGroupChatInfo(...args: any[]): unknown// needs 3 arguments
+
+    resetSearchGroupChatInfoSortType(...args: any[]): unknown// needs 3 arguments
+
+    resetSearchGroupChatInfoFilterMembers(...args: any[]): unknown// needs 3 arguments
+
+    searchMoreGroupChatInfo(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchGroupChatInfo(...args: any[]): unknown// needs 3 arguments
+
+    searchChatsWithKeywords(...args: any[]): unknown// needs 3 arguments
+
+    searchMoreChatsWithKeywords(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchChatsWithKeywords(...args: any[]): unknown// needs 3 arguments
+
+    searchChatMsgs(...args: any[]): unknown// needs 2 arguments
+
+    searchMoreChatMsgs(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchChatMsgs(...args: any[]): unknown// needs 3 arguments
+
+    searchMsgWithKeywords(...args: any[]): unknown// needs 2 arguments
+
+    searchMoreMsgWithKeywords(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchMsgWithKeywords(...args: any[]): unknown// needs 3 arguments
+
+    searchFileWithKeywords(keywords: string[], source: number): Promise<string>// needs 2 arguments
+
+    searchMoreFileWithKeywords(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchFileWithKeywords(...args: any[]): unknown// needs 3 arguments
+
+    searchAtMeChats(...args: any[]): unknown// needs 3 arguments
+
+    searchMoreAtMeChats(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchAtMeChats(...args: any[]): unknown// needs 3 arguments
+
+    searchChatAtMeMsgs(...args: any[]): unknown// needs 1 arguments
+
+    searchMoreChatAtMeMsgs(...args: any[]): unknown// needs 1 arguments
+
+    cancelSearchChatAtMeMsgs(...args: any[]): unknown// needs 3 arguments
+
+    addSearchHistory(param: {
+        type: number,//4
+        contactList: [],
+        id: number,//-1
+        groupInfos: [],
+        msgs: [],
+        fileInfos: [
+            {
+                chatType: ChatType,
+                buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>,
+                discussChatInfo: [],
+                groupChatInfo: Array<
+                    {
+                        groupCode: string,
+                        isConf: boolean,
+                        hasModifyConfGroupFace: boolean,
+                        hasModifyConfGroupName: boolean,
+                        groupName: string,
+                        remark: string
+                    }>,
+                dataLineChatInfo: [],
+                tmpChatInfo: [],
+                msgId: string,
+                msgSeq: string,
+                msgTime: string,
+                senderUid: string,
+                senderNick: string,
+                senderRemark: string,
+                senderCard: string,
+                elemId: string,
+                elemType: string,//3
+                fileSize: string,
+                filePath: string,
+                fileName: string,
+                hits: Array<
+                    {
+                        start: 12,
+                        end: 14
+                    }
+                >
+            }
+        ]
+
+    }): Promise<{
+        result: number,
+        errMsg: string,
+        id?: number
+    }>
+
+    removeSearchHistory(...args: any[]): unknown// needs 1 arguments
+
+    searchCache(...args: any[]): unknown// needs 3 arguments
+
+    clearSearchCache(...args: any[]): unknown// needs 1 arguments
+}

src/ntqqapi/services/index.ts

@@ -7,4 +7,5 @@ export * from './NodeIKernelMSFService'
 export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
-export * from './NodeIKernelTipOffService'
+export * from './NodeIKernelTipOffService'
+export * from './NodeIKernelSearchService'

src/ntqqapi/types/group.ts

@@ -45,7 +45,7 @@ export enum GroupMemberRole {
 }
 
 export interface GroupMember {
-  memberSpecialTitle: string
+  memberSpecialTitle?: string
   avatarPath: string
   cardName: string
   cardType: number
@@ -60,4 +60,7 @@ export interface GroupMember {
   isRobot: boolean
   sex?: Sex
   qqLevel?: QQLevel
+  isChangeRole: boolean
+  joinTime: string
+  lastSpeakTime: string
 }

src/ntqqapi/types/user.ts

@@ -340,4 +340,4 @@ export interface UserDetailInfoByUin {
     pendantId: string
     vipNameColorId: string
   }
-}
+}

src/ntqqapi/wrapper.ts

@@ -8,7 +8,8 @@ import {
   NodeIKernelUixConvertService,
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
-  NodeIKernelTipOffService
+  NodeIKernelTipOffService,
+  NodeIKernelSearchService
 } from './services'
 import os from 'node:os'
 const Process = require('node:process')
@@ -25,6 +26,7 @@ export interface NodeIQQNTWrapperSession {
   getRichMediaService(): NodeIKernelRichMediaService
   getTicketService(): NodeIKernelTicketService
   getTipOffService(): NodeIKernelTipOffService
+  getSearchService(): NodeIKernelSearchService
 }
 
 export interface WrapperApi {

src/onebot11/action/file/GetFile.ts

@@ -1,12 +1,11 @@
 import BaseAction from '../BaseAction'
-import fs from 'fs/promises'
-import { dbUtil } from '@/common/db'
+import fsPromise from 'node:fs/promises'
 import { getConfigUtil } from '@/common/config'
-import { checkFileReceived, log, sleep, uri2local } from '@/common/utils'
-import { NTQQFileApi } from '@/ntqqapi/api'
+import { NTQQFileApi, NTQQGroupApi, NTQQUserApi, NTQQFriendApi, NTQQMsgApi } from '@/ntqqapi/api'
 import { ActionName } from '../types'
-import { FileElement, RawMessage, VideoElement } from '@/ntqqapi/types'
-import { FileCache } from '@/common/types'
+import { UUIDConverter } from '@/common/utils/helper'
+import { Peer, ChatType, ElementType } from '@/ntqqapi/types'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -21,79 +20,60 @@ export interface GetFileResponse {
 }
 
 export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-  private getElement(msg: RawMessage, elementId: string): VideoElement | FileElement {
-    let element = msg.elements.find((e) => e.elementId === elementId)
-    if (!element) {
-      throw new Error('element not found')
-    }
-    return element.fileElement
-  }
-  private async download(cache: FileCache, file: string) {
-    log('需要调用 NTQQ 下载文件api')
-    if (cache.msgId) {
-      let msg = await dbUtil.getMsgByLongId(cache.msgId)
-      if (msg) {
-        log('找到了文件 msg', msg)
-        let element = this.getElement(msg, cache.elementId)
-        log('找到了文件 element', element)
-        // 构建下载函数
-        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, cache.elementId, '', '')
-        // 等待文件下载完成
-        msg = await dbUtil.getMsgByLongId(cache.msgId)
-        log('下载完成后的msg', msg)
-        cache.filePath = this.getElement(msg!, cache.elementId).filePath
-        await checkFileReceived(cache.filePath, 10 * 1000)
-        dbUtil.addFileCache(file, cache).then()
-      }
-    }
-  }
+  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-    let cache = await dbUtil.getFileCache(payload.file)
-    if (!cache) {
-      throw new Error('file not found')
+    const { enableLocalFile2Url } = getConfigUtil().getConfig()
+
+    let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
+    if (!fileCache?.length) {
+      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
     }
-    const { autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond } = getConfigUtil().getConfig()
-    if (cache.downloadFunc) {
-      await cache.downloadFunc()
-    }
-    try {
-      await fs.access(cache.filePath, fs.constants.F_OK)
-    } catch (e) {
-      // log("file not found", e)
-      if (cache.url) {
-        const downloadResult = await uri2local(cache.url)
-        if (downloadResult.success) {
-          cache.filePath = downloadResult.path
-          dbUtil.addFileCache(payload.file, cache).then()
-        } else {
-          await this.download(cache, payload.file)
-        }
-      } else {
-        // 没有url的可能是私聊文件或者群文件，需要自己下载
-        await this.download(cache, payload.file)
+
+    if (fileCache?.length) {
+      const downloadPath = await NTQQFileApi.downloadMedia(
+        fileCache[0].msgId,
+        fileCache[0].chatType,
+        fileCache[0].peerUid,
+        fileCache[0].elementId,
+        '',
+        ''
+      )
+      const res: GetFileResponse = {
+        file: downloadPath,
+        url: downloadPath,
+        file_size: fileCache[0].fileSize,
+        file_name: fileCache[0].fileName,
       }
-    }
-    let res: GetFileResponse = {
-      file: cache.filePath,
-      url: cache.url,
-      file_size: cache.fileSize,
-      file_name: cache.fileName,
-    }
-    if (enableLocalFile2Url) {
-      if (!cache.url) {
+      const peer: Peer = {
+        chatType: fileCache[0].chatType,
+        peerUid: fileCache[0].peerUid,
+        guildId: ''
+      }
+      if (fileCache[0].elementType === ElementType.PIC) {
+        const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
+        if (msgList.msgList.length === 0) {
+          throw new Error('msg not found')
+        }
+        const msg = msgList.msgList[0]
+        const findEle = msg.elements.find(e => e.elementId === fileCache[0].elementId)
+        if (!findEle) {
+          throw new Error('element not found')
+        }
+        res.url = await NTQQFileApi.getImageUrl(findEle.picElement)
+      } else if (fileCache[0].elementType === ElementType.VIDEO) {
+        res.url = await NTQQFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
+      }
+      if (enableLocalFile2Url && downloadPath && res.file === res.url) {
         try {
-          res.base64 = await fs.readFile(cache.filePath, 'base64')
+          res.base64 = await fsPromise.readFile(downloadPath, 'base64')
         } catch (e) {
           throw new Error('文件下载失败. ' + e)
         }
       }
+      //不手动删除？文件持久化了
+      return res
     }
-    // if (autoDeleteFile) {
-    //     setTimeout(() => {
-    //         fs.unlink(cache.filePath)
-    //     }, autoDeleteFileSecond * 1000)
-    // }
-    return res
+    throw new Error('file not found')
   }
 }
 

src/onebot11/action/file/GetImage.ts

@@ -3,4 +3,11 @@ 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/go-cqhttp/DelEssenceMsg.ts

@@ -1,24 +1,27 @@
 
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
-import { dbUtil } from '@/common/db';
+import { NTQQGroupApi } from '@/ntqqapi/api/group'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-  message_id: number | string;
+  message_id: number | string
 }
 
 export default class GoCQHTTPDelEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_DelEssenceMsg;
 
   protected async _handle(payload: Payload): Promise<any> {
-    const msg = await dbUtil.getMsgByShortId(parseInt(payload.message_id.toString()));
+    if (!payload.message_id) {
+      throw Error('message_id不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
-      throw new Error('msg not found');
+      throw new Error('msg not found')
     }
     return await NTQQGroupApi.removeGroupEssence(
-      msg.peerUid,
-      msg.msgId
-    );
+      msg.Peer.peerUid,
+      msg.MsgId,
+    )
   }
 }

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

@@ -0,0 +1,17 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '@/ntqqapi/api'
+
+interface Payload {
+    group_id: string | number
+    file_id: string
+    busid?: 102
+}
+
+export class GoCQHTTPDelGroupFile extends BaseAction<Payload, void> {
+    actionName = ActionName.GoCQHTTP_DelGroupFile
+
+    async _handle(payload: Payload) {
+        await NTQQGroupApi.delGroupFile(payload.group_id.toString(), [payload.file_id])
+    }
+}

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

@@ -1,8 +1,9 @@
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
 import fs from 'fs'
-import { join as joinPath } from 'node:path'
-import { calculateFileMD5, httpDownload, TEMP_DIR } from '../../../common/utils'
+import fsPromise from 'fs/promises'
+import path from 'node:path'
+import { calculateFileMD5, httpDownload, TEMP_DIR } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
 
 interface Payload {
@@ -22,15 +23,15 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name
-    let name = payload.name || randomUUID()
-    const filePath = joinPath(TEMP_DIR, name)
+    const name = payload.name ? path.basename(payload.name) : randomUUID()
+    const filePath = path.join(TEMP_DIR, name)
 
     if (payload.base64) {
-      fs.writeFileSync(filePath, payload.base64, 'base64')
+      await fsPromise.writeFile(filePath, payload.base64, 'base64')
     } else if (payload.url) {
       const headers = this.getHeaders(payload.headers)
-      let buffer = await httpDownload({ url: payload.url, headers: headers })
-      fs.writeFileSync(filePath, Buffer.from(buffer), 'binary')
+      const buffer = await httpDownload({ url: payload.url, headers: headers })
+      await fsPromise.writeFile(filePath, buffer)
     } else {
       throw new Error('不存在任何文件, 无法下载')
     }
@@ -38,8 +39,8 @@ export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileRespon
       if (isRandomName) {
         // 默认实现要名称未填写时文件名为文件 md5
         const md5 = await calculateFileMD5(filePath)
-        const newPath = joinPath(TEMP_DIR, md5)
-        fs.renameSync(filePath, newPath)
+        const newPath = path.join(TEMP_DIR, md5)
+        await fsPromise.rename(filePath, newPath)
         return { file: newPath }
       }
       return { file: filePath }

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

@@ -1,9 +1,9 @@
 import BaseAction from '../BaseAction'
 import { OB11ForwardMessage, OB11Message, OB11MessageData } from '../../types'
 import { NTQQMsgApi } from '@/ntqqapi/api'
-import { dbUtil } from '../../../common/db'
 import { OB11Constructor } from '../../constructor'
 import { ActionName } from '../types'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -14,30 +14,30 @@ interface Response {
   messages: (OB11Message & { content: OB11MessageData })[]
 }
 
-export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, any> {
+export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
   protected async _handle(payload: Payload): Promise<any> {
-    const message_id = payload.id || payload.message_id
-    if (!message_id) {
+    const msgId = payload.id || payload.message_id
+    if (!msgId) {
       throw Error('message_id不能为空')
     }
-    const rootMsg = await dbUtil.getMsgByLongId(message_id)
+    const rootMsgId = MessageUnique.getShortIdByMsgId(msgId)
+    const rootMsg = await MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || +msgId)
     if (!rootMsg) {
       throw Error('msg not found')
     }
-    let data = await NTQQMsgApi.getMultiMsg(
-      { chatType: rootMsg.chatType, peerUid: rootMsg.peerUid },
-      rootMsg.msgId,
-      rootMsg.msgId,
-    )
-    if (data.result !== 0) {
-      throw Error('找不到相关的聊天记录' + data.errMsg)
+    const data = await NTQQMsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId)
+    if (data?.result !== 0) {
+      throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
-    let msgList = data.msgList
-    let messages = await Promise.all(
+    const msgList = data.msgList
+    const messages = await Promise.all(
       msgList.map(async (msg) => {
-        let resMsg = await OB11Constructor.message(msg)
-        resMsg.message_id = (await dbUtil.addMsg(msg))!
+        const resMsg = await OB11Constructor.message(msg)
+        resMsg.message_id = MessageUnique.createMsg({
+          chatType: msg.chatType,
+          peerUid: msg.peerUid,
+        }, msg.msgId)!
         return resMsg
       }),
     )

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

@@ -1,16 +1,17 @@
 import BaseAction from '../BaseAction'
-import { OB11Message, OB11User } from '../../types'
-import { groups } from '../../../common/data'
+import { OB11Message } from '../../types'
 import { ActionName } from '../types'
-import { ChatType } from '../../../ntqqapi/types'
-import { dbUtil } from '../../../common/db'
-import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
+import { ChatType } from '@/ntqqapi/types'
+import { NTQQMsgApi } from '@/ntqqapi/api/msg'
 import { OB11Constructor } from '../../constructor'
+import { RawMessage } from '@/ntqqapi/types'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-  group_id: number
-  message_seq: number
-  count: number
+  group_id: number | string
+  message_seq?: number
+  count?: number
+  reverseOrder?: boolean
 }
 
 interface Response {
@@ -21,23 +22,23 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
 
   protected async _handle(payload: Payload): Promise<Response> {
-    const group = groups.find((group) => group.groupCode === payload.group_id.toString())
-    if (!group) {
-      throw `群${payload.group_id}不存在`
+    const count = payload.count || 20
+    const isReverseOrder = payload.reverseOrder || true
+    const peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() }
+    let msgList: RawMessage[]
+    // 包含 message_seq 0
+    if (!payload.message_seq) {
+      msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, count)).msgList
+    } else {
+      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq))?.MsgId
+      if (!startMsgId) throw `消息${payload.message_seq}不存在`
+      msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, count)).msgList
     }
-    const startMsgId = (await dbUtil.getMsgByShortId(payload.message_seq))?.msgId || '0'
-    // log("startMsgId", startMsgId)
-    let msgList = (
-      await NTQQMsgApi.getMsgHistory(
-        { chatType: ChatType.group, peerUid: group.groupCode },
-        startMsgId,
-        parseInt(payload.count?.toString()) || 20,
-      )
-    ).msgList
+    if (isReverseOrder) msgList.reverse()
     await Promise.all(
-      msgList.map(async (msg) => {
-        msg.msgShortId = await dbUtil.addMsg(msg)
-      }),
+      msgList.map(async msg => {
+        msg.msgShortId = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
+      })
     )
     const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Constructor.message(msg)))
     return { messages: ob11MsgList }

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

@@ -1,23 +1,26 @@
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
-import { dbUtil } from '@/common/db';
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+import { NTQQGroupApi } from '@/ntqqapi/api/group'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-    message_id: number | string;
+  message_id: number | string
 }
 
 export default class GoCQHTTPSetEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_SetEssenceMsg;
 
   protected async _handle(payload: Payload): Promise<any> {
-    const msg = await dbUtil.getMsgByShortId(parseInt(payload.message_id.toString()));
+    if (!payload.message_id) {
+      throw Error('message_id不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
-      throw new Error('msg not found');
+      throw new Error('msg not found')
     }
     return await NTQQGroupApi.addGroupEssence(
-      msg.peerUid,
-      msg.msgId
-    );
+      msg.Peer.peerUid,
+      msg.MsgId
+    )
   }
 }

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

@@ -1,6 +1,5 @@
 import fs from 'node:fs'
 import BaseAction from '../BaseAction'
-import { getGroup } from '@/common/data'
 import { ActionName } from '../types'
 import { SendMsgElementConstructor } from '@/ntqqapi/constructor'
 import { ChatType, SendFileElement } from '@/ntqqapi/types'
@@ -22,10 +21,6 @@ export class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile
 
   protected async _handle(payload: Payload): Promise<null> {
-    const group = await getGroup(payload.group_id?.toString()!)
-    if (!group) {
-      throw new Error(`群组${payload.group_id}不存在`)
-    }
     let file = payload.file
     if (fs.existsSync(file)) {
       file = `file://${file}`
@@ -34,8 +29,11 @@ export class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
     if (!downloadResult.success) {
       throw new Error(downloadResult.errMsg)
     }
-    const sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name, payload.folder_id)
-    await sendMsg({ chatType: ChatType.group, peerUid: group.groupCode }, [sendFileEle], [], true)
+    const sendFileEle = await SendMsgElementConstructor.file(downloadResult.path, payload.name, payload.folder_id)
+    await sendMsg({
+      chatType: ChatType.group,
+      peerUid: payload.group_id?.toString()!,
+    }, [sendFileEle], [], true)
     return null
   }
 }

src/onebot11/action/group/GetGroupInfo.ts

@@ -1,18 +1,18 @@
 import { OB11Group } from '../../types'
-import { getGroup } from '../../../common/data'
 import { OB11Constructor } from '../../constructor'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
+import { NTQQGroupApi } from '@/ntqqapi/api'
 
-interface PayloadType {
-  group_id: number
+interface Payload {
+  group_id: number | string
 }
 
-class GetGroupInfo extends BaseAction<PayloadType, OB11Group> {
+class GetGroupInfo extends BaseAction<Payload, OB11Group> {
   actionName = ActionName.GetGroupInfo
 
-  protected async _handle(payload: PayloadType) {
-    const group = await getGroup(payload.group_id.toString())
+  protected async _handle(payload: Payload) {
+    const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString())
     if (group) {
       return OB11Constructor.group(group)
     } else {

src/onebot11/action/group/GetGroupList.ts

@@ -1,10 +1,8 @@
 import { OB11Group } from '../../types'
 import { OB11Constructor } from '../../constructor'
-import { groups } from '../../../common/data'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
 import { NTQQGroupApi } from '../../../ntqqapi/api'
-import { log } from '../../../common/utils'
 
 interface Payload {
   no_cache: boolean | string
@@ -14,14 +12,8 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList
 
   protected async _handle(payload: Payload) {
-    if (groups.length === 0 || payload?.no_cache === true || payload?.no_cache === 'true') {
-      try {
-        const groups = await NTQQGroupApi.getGroups(true)
-        log('强制刷新群列表, 数量:', groups.length)
-        return OB11Constructor.groups(groups)
-      } catch (e) {}
-    }
-    return OB11Constructor.groups(groups)
+    const groupList = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true')
+    return OB11Constructor.groups(groupList)
   }
 }
 

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -24,7 +24,11 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
         log('群成员详细信息结果', info)
         Object.assign(member, info)
       }
-      return OB11Constructor.groupMember(payload.group_id.toString(), member)
+      const ret = OB11Constructor.groupMember(payload.group_id.toString(), member)
+      const date = Math.round(Date.now() / 1000)
+      ret.last_sent_time = Number(member.lastSpeakTime || date)
+      ret.join_time = Number(member.joinTime || date)
+      return ret
     } else {
       throw `群成员${payload.user_id}不存在`
     }

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,31 +1,58 @@
 import { OB11GroupMember } from '../../types'
-import { getGroup } from '../../../common/data'
 import { OB11Constructor } from '../../constructor'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQGroupApi } from '../../../ntqqapi/api/group'
-import { log } from '../../../common/utils'
+import { NTQQGroupApi, WebApi } from '@/ntqqapi/api'
+import { getSelfUid } from '@/common/data'
 
-export interface PayloadType {
-  group_id: number
+interface Payload {
+  group_id: number | string
   no_cache: boolean | string
 }
 
-class GetGroupMemberList extends BaseAction<PayloadType, OB11GroupMember[]> {
+class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList
 
-  protected async _handle(payload: PayloadType) {
-    const group = await getGroup(payload.group_id.toString())
-    if (group) {
-      if (!group.members?.length || payload.no_cache === true || payload.no_cache === 'true') {
-        const members = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
-        group.members = Array.from(members.values())
-        log('强制刷新群成员列表, 数量: ', group.members.length)
-      }
-      return OB11Constructor.groupMembers(group)
-    } else {
-      throw `群${payload.group_id}不存在`
+  protected async _handle(payload: Payload) {
+    const groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
+    const groupMembersArr = Array.from(groupMembers.values())
+
+    let _groupMembers = groupMembersArr.map(item => {
+      return OB11Constructor.groupMember(payload.group_id.toString(), item)
+    })
+
+    const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>()
+    const date = Math.round(Date.now() / 1000)
+
+    for (let i = 0, len = _groupMembers.length; i < len; i++) {
+      // 保证基础数据有这个 同时避免群管插件过于依赖这个杀了
+      _groupMembers[i].join_time = date
+      _groupMembers[i].last_sent_time = date
+      MemberMap.set(_groupMembers[i].user_id, _groupMembers[i])
     }
+
+    const selfRole = groupMembers.get(getSelfUid())?.role
+    const isPrivilege = selfRole === 3 || selfRole === 4
+
+    if (isPrivilege) {
+      const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString())
+      for (let i = 0, len = webGroupMembers.length; i < len; i++) {
+        if (!webGroupMembers[i]?.uin) {
+          continue
+        }
+        const MemberData = MemberMap.get(webGroupMembers[i]?.uin)
+        if (MemberData) {
+          MemberData.join_time = webGroupMembers[i]?.join_time
+          MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time
+          MemberData.qage = webGroupMembers[i]?.qage
+          MemberData.level = webGroupMembers[i]?.lv.level.toString()
+          MemberMap.set(webGroupMembers[i]?.uin, MemberData)
+        }
+      }
+    }
+
+    _groupMembers = Array.from(MemberMap.values())
+    return _groupMembers
   }
 }
 

src/onebot11/action/index.ts

@@ -1,6 +1,6 @@
 import GetMsg from './msg/GetMsg'
 import GetLoginInfo from './system/GetLoginInfo'
-import { GetFriendList, GetFriendWithCategory} from './user/GetFriendList'
+import { GetFriendList, GetFriendWithCategory } from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -53,6 +53,7 @@ import { GoCQHTTHandleQuickOperation } from './go-cqhttp/QuickOperation'
 import GoCQHTTPSetEssenceMsg from './go-cqhttp/SetEssenceMsg'
 import GoCQHTTPDelEssenceMsg from './go-cqhttp/DelEssenceMsg'
 import GetEvent from './llonebot/GetEvent'
+import { GoCQHTTPDelGroupFile } from './go-cqhttp/DelGroupFile'
 
 
 export const actionHandlers = [
@@ -113,7 +114,8 @@ export const actionHandlers = [
   new GoCQHTTGetForwardMsgAction(),
   new GoCQHTTHandleQuickOperation(),
   new GoCQHTTPSetEssenceMsg(),
-  new GoCQHTTPDelEssenceMsg()
+  new GoCQHTTPDelEssenceMsg(),
+  new GoCQHTTPDelGroupFile()
 ]
 
 function initActionMap() {

src/onebot11/action/llonebot/Debug.ts

@@ -24,7 +24,7 @@ export default class Debug extends BaseAction<Payload, any> {
     log('debug call ntqq api', payload)
     const ntqqApi = [NTQQMsgApi, NTQQFriendApi, NTQQGroupApi, NTQQUserApi, NTQQFileApi, NTQQFileCacheApi, NTQQWindowApi]
     for (const ntqqApiClass of ntqqApi) {
-      log('ntqqApiClass', ntqqApiClass)
+      //log('ntqqApiClass', ntqqApiClass)
       const method = ntqqApiClass[payload.method]
       if (method) {
         const result = method(...payload.args)

src/onebot11/action/msg/DeleteMsg.ts

@@ -1,27 +1,24 @@
 import { ActionName } from '../types'
 import BaseAction from '../BaseAction'
-import { dbUtil } from '../../../common/db'
-import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
+import { NTQQMsgApi } from '@/ntqqapi/api/msg'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-  message_id: number
+  message_id: number | string
 }
 
 class DeleteMsg extends BaseAction<Payload, void> {
   actionName = ActionName.DeleteMsg
 
   protected async _handle(payload: Payload) {
-    let msg = await dbUtil.getMsgByShortId(payload.message_id)
+    if (!payload.message_id) {
+      throw Error('message_id不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw `消息${payload.message_id}不存在`
     }
-    await NTQQMsgApi.recallMsg(
-      {
-        chatType: msg.chatType,
-        peerUid: msg.peerUid,
-      },
-      [msg.msgId],
-    )
+    await NTQQMsgApi.recallMsg(msg.Peer, [msg.MsgId])
   }
 }
 

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -1,12 +1,12 @@
 import BaseAction from '../BaseAction'
 import { NTQQMsgApi, NTQQUserApi } from '@/ntqqapi/api'
 import { ChatType } from '@/ntqqapi/types'
-import { dbUtil } from '@/common/db'
 import { ActionName } from '../types'
 import { Peer } from '@/ntqqapi/types'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-  message_id: number
+  message_id: number | string
   group_id: number | string
   user_id?: number | string
 }
@@ -24,19 +24,15 @@ abstract class ForwardSingleMsg extends BaseAction<Payload, null> {
   }
 
   protected async _handle(payload: Payload): Promise<null> {
-    const msg = await dbUtil.getMsgByShortId(payload.message_id)
+    if (!payload.message_id) {
+      throw Error('message_id不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error(`无法找到消息${payload.message_id}`)
     }
     const peer = await this.getTargetPeer(payload)
-    const ret = await NTQQMsgApi.forwardMsg(
-      {
-        chatType: msg.chatType,
-        peerUid: msg.peerUid,
-      },
-      peer,
-      [msg.msgId],
-    )
+    const ret = await NTQQMsgApi.forwardMsg(msg.Peer, peer, [msg.MsgId])
     if (ret.result !== 0) {
       throw new Error(`转发消息失败 ${ret.errMsg}`)
     }

src/onebot11/action/msg/GetMsg.ts

@@ -2,10 +2,12 @@ import { OB11Message } from '../../types'
 import { OB11Constructor } from '../../constructor'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { dbUtil } from '../../../common/db'
+import { NTQQMsgApi } from '@/ntqqapi/api'
+import { MessageUnique } from '@/common/utils/MessageUnique'
+import { getMsgCache } from '@/common/data'
 
 export interface PayloadType {
-  message_id: number
+  message_id: number | string
 }
 
 export type ReturnDataType = OB11Message
@@ -18,14 +20,22 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
     if (!payload.message_id) {
       throw '参数message_id不能为空'
     }
-    let msg = await dbUtil.getMsgByShortId(payload.message_id)
-    if (!msg) {
-      msg = await dbUtil.getMsgByLongId(payload.message_id.toString())
+    const msgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString())
+    const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(msgShortId || +payload.message_id)
+    if (!msgIdWithPeer) {
+      throw ('消息不存在')
     }
-    if (!msg) {
-      throw '消息不存在'
+    const peer = {
+      guildId: '',
+      peerUid: msgIdWithPeer.Peer.peerUid,
+      chatType: msgIdWithPeer.Peer.chatType
     }
-    return await OB11Constructor.message(msg)
+    const msg = getMsgCache(msgIdWithPeer.MsgId) ?? (await NTQQMsgApi.getMsgsByMsgId(peer, [msgIdWithPeer.MsgId])).msgList[0]
+    const retMsg = await OB11Constructor.message(msg)
+    retMsg.message_id = MessageUnique.createMsg(peer, msg.msgId)!
+    retMsg.message_seq = retMsg.message_id
+    retMsg.real_id = retMsg.message_id
+    return retMsg
   }
 }
 

src/onebot11/action/msg/SendMsg.ts

@@ -3,35 +3,35 @@ import {
   ChatType,
   ElementType,
   GroupMemberRole,
-  PicSubType,
   RawMessage,
   SendMessageElement,
-} from '../../../ntqqapi/types'
-import { getGroup, getGroupMember, getSelfUid, getSelfUin } from '../../../common/data'
+} from '@/ntqqapi/types'
+import { getGroupMember, getSelfUid, getSelfUin } from '@/common/data'
 import {
   OB11MessageCustomMusic,
   OB11MessageData,
   OB11MessageDataType,
-  OB11MessageFile,
   OB11MessageJson,
   OB11MessageMixType,
   OB11MessageMusic,
   OB11MessageNode,
   OB11PostSendMsg,
 } from '../../types'
-import { SendMsgElementConstructor } from '../../../ntqqapi/constructor'
+import { SendMsgElementConstructor } from '@/ntqqapi/constructor'
 import BaseAction from '../BaseAction'
 import { ActionName, BaseCheckResult } from '../types'
 import fs from 'node:fs'
+import fsPromise from 'node:fs/promises'
 import { decodeCQCode } from '../../cqcode'
-import { dbUtil } from '../../../common/db'
-import { getConfigUtil } from '../../../common/config'
-import { log } from '../../../common/utils/log'
-import { sleep } from '../../../common/utils/helper'
-import { uri2local } from '../../../common/utils'
+import { getConfigUtil } from '@/common/config'
+import { log } from '@/common/utils/log'
+import { sleep } from '@/common/utils/helper'
+import { uri2local } from '@/common/utils'
 import { NTQQGroupApi, NTQQMsgApi, NTQQUserApi, NTQQFriendApi } from '@/ntqqapi/api'
 import { CustomMusicSignPostData, IdMusicSignPostData, MusicSign, MusicSignPostData } from '@/common/utils/sign'
 import { Peer } from '@/ntqqapi/types/msg'
+import { MessageUnique } from '@/common/utils/MessageUnique'
+import { OB11MessageFileBase } from '../../types'
 
 export interface ReturnDataType {
   message_id: number
@@ -43,6 +43,11 @@ export enum ContextMode {
   Group = 2
 }
 
+interface MessageContext {
+  deleteAfterSentFiles: string[]
+  peer: Peer
+}
+
 export function convertMessage2List(message: OB11MessageMixType, autoEscape = false) {
   if (typeof message === 'string') {
     if (autoEscape === true) {
@@ -65,6 +70,32 @@ export function convertMessage2List(message: OB11MessageMixType, autoEscape = fa
   return message
 }
 
+// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/msg/SendMsg/create-send-elements.ts#L26
+async function handleOb11FileLikeMessage(
+  { data: inputdata }: OB11MessageFileBase,
+  { deleteAfterSentFiles }: Pick<MessageContext, 'deleteAfterSentFiles'>,
+) {
+  //有的奇怪的框架将url作为参数 而不是file 此时优先url 同时注意可能传入的是非file://开头的目录 By Mlikiowa
+  const {
+    path,
+    isLocal,
+    fileName,
+    errMsg,
+    success,
+  } = (await uri2local(inputdata?.url || inputdata.file))
+
+  if (!success) {
+    log('文件下载失败', errMsg)
+    throw Error('文件下载失败' + errMsg)
+  }
+
+  if (!isLocal) { // 只删除http和base64转过来的文件
+    deleteAfterSentFiles.push(path)
+  }
+
+  return { path, fileName: inputdata.name || fileName }
+}
+
 export async function createSendElements(
   messageData: OB11MessageData[],
   peer: Peer,
@@ -88,9 +119,8 @@ export async function createSendElements(
         if (!peer) {
           continue
         }
-        let atQQ = sendMsg.data?.qq
-        if (atQQ) {
-          atQQ = atQQ.toString()
+        if (sendMsg.data?.qq) {
+          const atQQ = String(sendMsg.data.qq)
           if (atQQ === 'all') {
             // todo：查询剩余的at全体次数
             const groupCode = peer.peerUid
@@ -130,9 +160,16 @@ export async function createSendElements(
       }
         break
       case OB11MessageDataType.reply: {
-        let replyMsgId = sendMsg.data.id
-        if (replyMsgId) {
-          const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
+        if (sendMsg.data?.id) {
+          const replyMsgId = await MessageUnique.getMsgIdAndPeerByShortId(+sendMsg.data.id)
+          if (!replyMsgId) {
+            log('回复消息不存在', replyMsgId)
+            continue
+          }
+          const replyMsg = (await NTQQMsgApi.getMsgsByMsgId(
+            replyMsgId.Peer,
+            [replyMsgId.MsgId!]
+          )).msgList[0]
           if (replyMsg) {
             sendElements.push(
               SendMsgElementConstructor.reply(
@@ -164,66 +201,36 @@ export async function createSendElements(
         )
       }
         break
-      case OB11MessageDataType.image:
-      case OB11MessageDataType.file:
-      case OB11MessageDataType.video:
-      case OB11MessageDataType.voice: {
-        const data = (sendMsg as OB11MessageFile).data
-        let file = data.file
-        const payloadFileName = data?.name
-        if (file) {
-          const cache = await dbUtil.getFileCache(file)
-          if (cache) {
-            if (fs.existsSync(cache.filePath)) {
-              file = 'file://' + cache.filePath
-            }
-            else if (cache.downloadFunc) {
-              await cache.downloadFunc()
-              file = cache.filePath
-            }
-            else if (cache.url) {
-              file = cache.url
-            }
-            log('找到文件缓存', file)
-          }
-          const { path, isLocal, fileName, errMsg } = await uri2local(file)
-          if (errMsg) {
-            throw errMsg
-          }
-          if (path) {
-            if (!isLocal) {
-              // 只删除http和base64转过来的文件
-              deleteAfterSentFiles.push(path)
-            }
-            if (sendMsg.type === OB11MessageDataType.file) {
-              log('发送文件', path, payloadFileName || fileName)
-              sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName))
-            }
-            else if (sendMsg.type === OB11MessageDataType.video) {
-              log('发送视频', path, payloadFileName || fileName)
-              let thumb = sendMsg.data?.thumb
-              if (thumb) {
-                let uri2LocalRes = await uri2local(thumb)
-                if (uri2LocalRes.success) {
-                  thumb = uri2LocalRes.path
-                }
-              }
-              sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName, thumb))
-            }
-            else if (sendMsg.type === OB11MessageDataType.voice) {
-              sendElements.push(await SendMsgElementConstructor.ptt(path))
-            }
-            else if (sendMsg.type === OB11MessageDataType.image) {
-              sendElements.push(
-                await SendMsgElementConstructor.pic(
-                  path,
-                  sendMsg.data.summary || '',
-                  <PicSubType>parseInt(sendMsg.data?.subType?.toString()!) || 0,
-                ),
-              )
-            }
-          }
+      case OB11MessageDataType.image: {
+        const res = await SendMsgElementConstructor.pic(
+          (await handleOb11FileLikeMessage(sendMsg, { deleteAfterSentFiles })).path,
+          sendMsg.data.summary || '',
+          sendMsg.data.subType || 0
+        )
+        deleteAfterSentFiles.push(res.picElement.sourcePath)
+        sendElements.push(res)
+      }
+        break
+      case OB11MessageDataType.file: {
+        const { path, fileName } = await handleOb11FileLikeMessage(sendMsg, { deleteAfterSentFiles })
+        sendElements.push(await SendMsgElementConstructor.file(path, fileName))
+      }
+        break
+      case OB11MessageDataType.video: {
+        const { path, fileName } = await handleOb11FileLikeMessage(sendMsg, { deleteAfterSentFiles })
+        let thumb = sendMsg.data.thumb
+        if (thumb) {
+          const uri2LocalRes = await uri2local(thumb)
+          if (uri2LocalRes.success) thumb = uri2LocalRes.path
         }
+        const res = await SendMsgElementConstructor.video(path, fileName, thumb)
+        deleteAfterSentFiles.push(res.videoElement.filePath)
+        sendElements.push(res)
+      }
+        break
+      case OB11MessageDataType.voice: {
+        const { path } = await handleOb11FileLikeMessage(sendMsg, { deleteAfterSentFiles })
+        sendElements.push(await SendMsgElementConstructor.ptt(path))
       }
         break
       case OB11MessageDataType.json: {
@@ -287,9 +294,8 @@ export async function sendMsg(
   log('设置消息超时时间', timeout)
   const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
   log('消息发送结果', returnMsg)
-  returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
-  deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
-  }))
+  returnMsg.msgShortId = MessageUnique.createMsg(peer, returnMsg.msgId)
+  deleteAfterSentFiles.map(path => fsPromise.unlink(path))
   return returnMsg
 }
 
@@ -299,10 +305,9 @@ async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode)
   // This redundant design of Ob11 here should be blamed.
 
   if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) {
-    const group = (await getGroup(payload.group_id))! // checked before
     return {
       chatType: ChatType.group,
-      peerUid: group.groupCode
+      peerUid: payload.group_id.toString(),
     }
   }
   if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
@@ -312,7 +317,7 @@ async function createContext(payload: OB11PostSendMsg, contextMode: ContextMode)
     return {
       chatType: isBuddy ? ChatType.friend : ChatType.temp,
       peerUid: Uid!,
-      guildId: payload.group_id || ''//临时主动发起时需要传入群号
+      guildId: payload.group_id?.toString() || '' //临时主动发起时需要传入群号
     }
   }
   throw '请指定 group_id 或 user_id'
@@ -337,12 +342,6 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         message: '音乐消息不可以和其他消息混在一起发送',
       }
     }
-    if (payload.message_type !== 'private' && payload.group_id && !(await getGroup(payload.group_id))) {
-      return {
-        valid: false,
-        message: `群${payload.group_id}不存在`,
-      }
-    }
     if (payload.user_id && payload.message_type !== 'group') {
       const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString())
       const isBuddy = await NTQQFriendApi.isBuddy(uid!)
@@ -428,8 +427,6 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
       }
     }
     const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles)
-    deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
-    }))
     return { message_id: returnMsg.msgShortId! }
   }
 
@@ -462,7 +459,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         sendElements,
         true,
       )
-      await sleep(500)
+      await sleep(400)
       return nodeMsg
     } catch (e) {
       log(e, '克隆转发消息失败,将忽略本条消息', msg)
@@ -477,25 +474,17 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
     let nodeMsgIds: string[] = []
     // 先判断一遍是不是id和自定义混用
-    let needClone =
-      messageNodes.filter((node) => node.data.id).length && messageNodes.filter((node) => !node.data.id).length
     for (const messageNode of messageNodes) {
       // 一个node表示一个人的消息
       let nodeId = messageNode.data.id
       // 有nodeId表示一个子转发消息卡片
       if (nodeId) {
-        let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId))
-        if (!needClone) {
-          nodeMsgIds.push(nodeMsg?.msgId!)
-        }
-        else {
-          if (nodeMsg?.peerUid !== selfPeer.peerUid) {
-            const cloneMsg = await this.cloneMsg(nodeMsg!)
-            if (cloneMsg) {
-              nodeMsgIds.push(cloneMsg.msgId)
-            }
-          }
+        const nodeMsg = await MessageUnique.getMsgIdAndPeerByShortId(+nodeId) || await MessageUnique.getPeerByMsgId(nodeId)
+        if (!nodeMsg) {
+          log('转发消息失败，未找到消息', nodeId)
+          continue
         }
+        nodeMsgIds.push(nodeMsg.MsgId)
       }
       else {
         // 自定义的消息
@@ -529,7 +518,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
           for (const eles of sendElementsSplit) {
             const nodeMsg = await sendMsg(selfPeer, eles, [], true)
             nodeMsgIds.push(nodeMsg.msgId)
-            await sleep(500)
+            await sleep(400)
             log('转发节点生成成功', nodeMsg.msgId)
           }
           deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
@@ -541,33 +530,25 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
 
     // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
-    let nodeMsgArray: Array<RawMessage> = []
+    const nodeMsgArray: RawMessage[] = []
     let srcPeer: Peer | null = null
     let needSendSelf = false
-    for (const [index, msgId] of nodeMsgIds.entries()) {
-      const nodeMsg = await dbUtil.getMsgByLongId(msgId)
-      if (nodeMsg) {
-        nodeMsgArray.push(nodeMsg)
-        if (!srcPeer) {
-          srcPeer = { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }
-        }
-        else if (srcPeer.peerUid !== nodeMsg.peerUid) {
+    for (const msgId of nodeMsgIds) {
+      const nodeMsgPeer = await MessageUnique.getPeerByMsgId(msgId)
+      if (nodeMsgPeer) {
+        const nodeMsg = (await NTQQMsgApi.getMsgsByMsgId(nodeMsgPeer.Peer, [msgId])).msgList[0]
+        srcPeer = srcPeer ?? { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }
+        if (srcPeer.peerUid !== nodeMsg.peerUid) {
           needSendSelf = true
-          srcPeer = selfPeer
         }
+        nodeMsgArray.push(nodeMsg)
       }
     }
-    log('nodeMsgArray', nodeMsgArray)
     nodeMsgIds = nodeMsgArray.map((msg) => msg.msgId)
     if (needSendSelf) {
-      log('需要克隆转发消息')
-      for (const [index, msg] of nodeMsgArray.entries()) {
-        if (msg.peerUid !== selfPeer.peerUid) {
-          const cloneMsg = await this.cloneMsg(msg)
-          if (cloneMsg) {
-            nodeMsgIds[index] = cloneMsg.msgId
-          }
-        }
+      for (const msg of nodeMsgArray) {
+        if (msg.peerUid === selfPeer.peerUid) continue
+        await this.cloneMsg(msg)
       }
     }
     // elements之间用换行符分隔
@@ -584,7 +565,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
       throw Error('转发消息失败，节点为空')
     }
     const returnMsg = await NTQQMsgApi.multiForwardMsg(srcPeer!, destPeer, nodeMsgIds)
-    returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
+    returnMsg.msgShortId = MessageUnique.createMsg(destPeer, returnMsg.msgId)
     return returnMsg
   }
 }

src/onebot11/action/msg/SetMsgEmojiLike.ts

@@ -1,32 +1,36 @@
 import { ActionName } from '../types'
 import BaseAction from '../BaseAction'
-import { dbUtil } from '../../../common/db'
-import { NTQQMsgApi } from '../../../ntqqapi/api/msg'
+import { NTQQMsgApi } from '@/ntqqapi/api/msg'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 interface Payload {
-  message_id: number
-  emoji_id: string
+  message_id: number | string
+  emoji_id: number | string
 }
 
 export class SetMsgEmojiLike extends BaseAction<Payload, any> {
   actionName = ActionName.SetMsgEmojiLike
 
   protected async _handle(payload: Payload) {
-    let msg = await dbUtil.getMsgByShortId(payload.message_id)
+    if (!payload.message_id) {
+      throw Error('message_id不能为空')
+    }
+    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
     if (!payload.emoji_id) {
       throw new Error('emojiId not found')
     }
+    const msgData = (await NTQQMsgApi.getMsgsByMsgId(msg.Peer, [msg.MsgId])).msgList
+    if (!msgData || msgData.length == 0 || !msgData[0].msgSeq) {
+      throw new Error('find msg by msgid error')
+    }
     return await NTQQMsgApi.setEmojiLike(
-      {
-        chatType: msg.chatType,
-        peerUid: msg.peerUid,
-      },
-      msg.msgSeq,
-      payload.emoji_id,
-      true,
+      msg.Peer,
+      msgData[0].msgSeq,
+      payload.emoji_id.toString(),
+      true
     )
   }
 }

src/onebot11/action/quick-operation.ts

@@ -4,12 +4,12 @@
 import { OB11Message, OB11MessageAt, OB11MessageData, OB11MessageDataType } from '../types'
 import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest'
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest'
-import { dbUtil } from '@/common/db'
 import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQUserApi } from '@/ntqqapi/api'
 import { ChatType, GroupRequestOperateTypes, Peer } from '@/ntqqapi/types'
 import { convertMessage2List, createSendElements, sendMsg } from './msg/SendMsg'
 import { isNull, log } from '@/common/utils'
 import { getConfigUtil } from '@/common/config'
+import { MessageUnique } from '@/common/utils/MessageUnique'
 
 
 interface QuickOperationPrivateMessage {
@@ -61,7 +61,6 @@ export async function handleQuickOperation(context: QuickOperationEvent, quickAc
 }
 
 async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMessage | QuickOperationGroupMessage) {
-  const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
   const reply = quickAction.reply
   const ob11Config = getConfigUtil().getConfig().ob11
   const peer: Peer = {
@@ -105,17 +104,21 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes
   }
   if (msg.message_type === 'group') {
     const groupMsgQuickAction = quickAction as QuickOperationGroupMessage
+    const rawMessage = await MessageUnique.getMsgIdAndPeerByShortId(+(msg.message_id ?? 0))
+    if (!rawMessage) return
     // handle group msg
     if (groupMsgQuickAction.delete) {
-      NTQQMsgApi.recallMsg(peer, [rawMessage?.msgId!]).then().catch(log)
+      NTQQMsgApi.recallMsg(peer, [rawMessage.MsgId]).then().catch(log)
     }
     if (groupMsgQuickAction.kick) {
-      NTQQGroupApi.kickMember(peer.peerUid, [rawMessage?.senderUid!]).then().catch(log)
+      const { msgList } = await NTQQMsgApi.getMsgsByMsgId(peer, [rawMessage.MsgId])
+      NTQQGroupApi.kickMember(peer.peerUid, [msgList[0].senderUid]).then().catch(log)
     }
     if (groupMsgQuickAction.ban) {
+      const { msgList } = await NTQQMsgApi.getMsgsByMsgId(peer, [rawMessage.MsgId])
       NTQQGroupApi.banMember(peer.peerUid, [
         {
-          uid: rawMessage?.senderUid!,
+          uid: msgList[0].senderUid,
           timeStamp: groupMsgQuickAction.ban_duration || 60 * 30,
         },
       ]).then().catch(log)

src/onebot11/action/types.ts

@@ -73,4 +73,5 @@ export enum ActionName {
   GetGroupHonorInfo = "get_group_honor_info",
   GoCQHTTP_SetEssenceMsg = 'set_essence_msg',
   GoCQHTTP_DelEssenceMsg = 'delete_essence_msg',
+  GoCQHTTP_DelGroupFile = 'delete_group_file',
 }

src/onebot11/constructor.ts

@@ -17,20 +17,18 @@ import {
   Group,
   Peer,
   GroupMember,
-  PicType,
   RawMessage,
   SelfInfo,
   Sex,
   TipGroupElementType,
   User,
-  VideoElement,
   FriendV2,
   ChatType2
 } from '../ntqqapi/types'
-import { deleteGroup, getGroupMember, getSelfUin } from '../common/data'
+import { getGroupMember, getSelfUin } from '../common/data'
 import { EventType } from './event/OB11BaseEvent'
 import { encodeCQCode } from './cqcode'
-import { dbUtil } from '../common/db'
+import { MessageUnique } from '../common/utils/MessageUnique'
 import { OB11GroupIncreaseEvent } from './event/notice/OB11GroupIncreaseEvent'
 import { OB11GroupBanEvent } from './event/notice/OB11GroupBanEvent'
 import { OB11GroupUploadNoticeEvent } from './event/notice/OB11GroupUploadNoticeEvent'
@@ -152,115 +150,121 @@ export class OB11Constructor {
       }
       else if (element.replyElement) {
         message_data['type'] = OB11MessageDataType.reply
-        // log("收到回复消息", element.replyElement.replayMsgSeq)
         try {
-          const replyMsg = await dbUtil.getMsgBySeqId(element.replyElement.replayMsgSeq)
-          // log("找到回复消息", replyMsg.msgShortId, replyMsg.msgId)
-          if (replyMsg) {
-            message_data['data']['id'] = replyMsg.msgShortId?.toString()
+          const records = msg.records.find(msgRecord => msgRecord.msgId === element.replyElement.sourceMsgIdInRecords)
+          if (!records) throw new Error('找不到回复消息')
+          let replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount({
+            peerUid: msg.peerUid,
+            guildId: '',
+            chatType: msg.chatType,
+          }, element.replyElement.replayMsgSeq, 1, true, true)).msgList[0]
+          if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+            const peer = {
+              chatType: msg.chatType,
+              peerUid: msg.peerUid,
+              guildId: '',
+            }
+            replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0]
           }
-          else {
-            continue
+          // 284840486: 合并消息内侧 消息具体定位不到
+          if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
+            throw new Error('回复消息消息验证失败')
           }
+          message_data['data']['id'] = MessageUnique.createMsg({
+            peerUid: msg.peerUid,
+            guildId: '',
+            chatType: msg.chatType,
+          }, replyMsg.msgId)?.toString()
         } catch (e: any) {
           log('获取不到引用的消息', e.stack, element.replyElement.replayMsgSeq)
+          continue
         }
       }
       else if (element.picElement) {
         message_data['type'] = OB11MessageDataType.image
-        // message_data["data"]["file"] = element.picElement.sourcePath
-        let fileName = element.picElement.fileName
-        const sourcePath = element.picElement.sourcePath
-        const isGif = element.picElement.picType === PicType.gif
+        const { picElement } = element
+        /*let fileName = picElement.fileName
+        const isGif = picElement.picType === PicType.gif
         if (isGif && !fileName.endsWith('.gif')) {
           fileName += '.gif'
-        }
-        message_data['data']['file'] = fileName
-        message_data['data']['subType'] = element.picElement.picSubType
-        // message_data["data"]["path"] = element.picElement.sourcePath
-        // let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
-
-        message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement)
-        // message_data["data"]["file_id"] = element.picElement.fileUuid
-        message_data['data']['file_size'] = element.picElement.fileSize
-        dbUtil
-          .addFileCache(fileName, {
-            fileName,
-            elementId: element.elementId,
-            filePath: sourcePath,
-            fileSize: element.picElement.fileSize.toString(),
-            url: message_data['data']['url'],
-            downloadFunc: async () => {
-              await NTQQFileApi.downloadMedia(
-                msg.msgId,
-                msg.chatType,
-                msg.peerUid,
-                element.elementId,
-                element.picElement.thumbPath?.get(0) || '',
-                element.picElement.sourcePath,
-              )
-            },
-          }).then()
+        }*/
+        message_data['data']['file'] = picElement.fileName
+        message_data['data']['subType'] = picElement.picSubType
+        //message_data['data']['file_id'] = picElement.fileUuid
+        message_data['data']['url'] = await NTQQFileApi.getImageUrl(picElement)
+        message_data['data']['file_size'] = picElement.fileSize
+        MessageUnique.addFileCache({
+          peerUid: msg.peerUid,
+          msgId: msg.msgId,
+          msgTime: +msg.msgTime,
+          chatType: msg.chatType,
+          elementId: element.elementId,
+          elementType: element.elementType,
+          fileName: picElement.fileName,
+          fileSize: String(picElement.fileSize || '0'),
+          fileUuid: picElement.fileUuid
+        })
       }
-      else if (element.videoElement || element.fileElement) {
-        const videoOrFileElement = element.videoElement || element.fileElement
-        const ob11MessageDataType = element.videoElement ? OB11MessageDataType.video : OB11MessageDataType.file
-        message_data['type'] = ob11MessageDataType
-        message_data['data']['file'] = videoOrFileElement.fileName
-        message_data['data']['path'] = videoOrFileElement.filePath
-        message_data['data']['file_id'] = videoOrFileElement.fileUuid
-        message_data['data']['file_size'] = videoOrFileElement.fileSize
-        if (element.videoElement) {
-          message_data['data']['url'] = await NTQQFileApi.getVideoUrl({
-            chatType: msg.chatType,
-            peerUid: msg.peerUid,
-          }, msg.msgId, element.elementId,
-          )
-        }
-        dbUtil
-          .addFileCache(videoOrFileElement.fileUuid!, {
-            msgId: msg.msgId,
-            elementId: element.elementId,
-            fileName: videoOrFileElement.fileName,
-            filePath: videoOrFileElement.filePath,
-            fileSize: videoOrFileElement.fileSize!,
-            downloadFunc: async () => {
-              await NTQQFileApi.downloadMedia(
-                msg.msgId,
-                msg.chatType,
-                msg.peerUid,
-                element.elementId,
-                ob11MessageDataType == OB11MessageDataType.video
-                  ? (videoOrFileElement as VideoElement).thumbPath?.get(0)
-                  : null,
-                videoOrFileElement.filePath,
-              )
-            },
-          })
-          .then()
-        // 怎么拿到url呢
+      else if (element.videoElement) {
+        message_data['type'] = OB11MessageDataType.video
+        const { videoElement } = element
+        message_data['data']['file'] = videoElement.fileName
+        message_data['data']['path'] = videoElement.filePath
+        //message_data['data']['file_id'] = videoElement.fileUuid
+        message_data['data']['file_size'] = videoElement.fileSize
+        message_data['data']['url'] = await NTQQFileApi.getVideoUrl({
+          chatType: msg.chatType,
+          peerUid: msg.peerUid,
+        }, msg.msgId, element.elementId)
+        MessageUnique.addFileCache({
+          peerUid: msg.peerUid,
+          msgId: msg.msgId,
+          msgTime: +msg.msgTime,
+          chatType: msg.chatType,
+          elementId: element.elementId,
+          elementType: element.elementType,
+          fileName: videoElement.fileName,
+          fileSize: String(videoElement.fileSize || '0'),
+          fileUuid: videoElement.fileUuid!
+        })
+      }
+      else if (element.fileElement) {
+        message_data['type'] = OB11MessageDataType.file
+        const { fileElement } = element
+        message_data['data']['file'] = fileElement.fileName
+        message_data['data']['path'] = fileElement.filePath
+        message_data['data']['file_id'] = fileElement.fileUuid
+        message_data['data']['file_size'] = fileElement.fileSize
+        MessageUnique.addFileCache({
+          peerUid: msg.peerUid,
+          msgId: msg.msgId,
+          msgTime: +msg.msgTime,
+          chatType: msg.chatType,
+          elementId: element.elementId,
+          elementType: element.elementType,
+          fileName: fileElement.fileName,
+          fileSize: String(fileElement.fileSize || '0'),
+          fileUuid: fileElement.fileUuid!
+        })
       }
       else if (element.pttElement) {
         message_data['type'] = OB11MessageDataType.voice
-        message_data['data']['file'] = element.pttElement.fileName
-        message_data['data']['path'] = element.pttElement.filePath
-        // message_data["data"]["file_id"] = element.pttElement.fileUuid
-        message_data['data']['file_size'] = element.pttElement.fileSize
-        dbUtil
-          .addFileCache(element.pttElement.fileName, {
-            elementId: element.elementId,
-            fileName: element.pttElement.fileName,
-            filePath: element.pttElement.filePath,
-            fileSize: element.pttElement.fileSize,
-          })
-          .then()
-
-        // log("收到语音消息", msg)
-        // window.LLAPI.Ptt2Text(message.raw.msgId, message.peer, messages).then(text => {
-        //     console.log("语音转文字结果", text)
-        // }).catch(err => {
-        //     console.log("语音转文字失败", err)
-        // })
+        const { pttElement } = element
+        message_data['data']['file'] = pttElement.fileName
+        message_data['data']['path'] = pttElement.filePath
+        //message_data['data']['file_id'] = pttElement.fileUuid
+        message_data['data']['file_size'] = pttElement.fileSize
+        MessageUnique.addFileCache({
+          peerUid: msg.peerUid,
+          msgId: msg.msgId,
+          msgTime: +msg.msgTime,
+          chatType: msg.chatType,
+          elementId: element.elementId,
+          elementType: element.elementType,
+          fileName: pttElement.fileName,
+          fileSize: String(pttElement.fileSize || '0'),
+          fileUuid: pttElement.fileUuid
+        })
       }
       else if (element.arkElement) {
         message_data['type'] = OB11MessageDataType.json
@@ -374,7 +378,7 @@ export class OB11Constructor {
       const groupElement = grayTipElement?.groupElement
       if (groupElement) {
         // log("收到群提示消息", groupElement)
-        if (groupElement.type == TipGroupElementType.memberIncrease) {
+        if (groupElement.type === TipGroupElementType.memberIncrease) {
           log('收到群成员增加消息', groupElement)
           await sleep(1000)
           const member = await getGroupMember(msg.peerUid, groupElement.memberUid)
@@ -422,25 +426,26 @@ export class OB11Constructor {
             )
           }
         }
-        else if (groupElement.type == TipGroupElementType.kicked) {
+        else if (groupElement.type === TipGroupElementType.kicked) {
           log(`收到我被踢出或退群提示, 群${msg.peerUid}`, groupElement)
-          deleteGroup(msg.peerUid)
           NTQQGroupApi.quitGroup(msg.peerUid).then()
-          const selfUin = getSelfUin()
           try {
-            const adminUin =
-              (await getGroupMember(msg.peerUid, groupElement.adminUid))?.uin ||
-              (await NTQQUserApi.getUserDetailInfo(groupElement.adminUid))?.uin
+            const adminUin = (await getGroupMember(msg.peerUid, groupElement.adminUid))?.uin || (await NTQQUserApi.getUidByUin(groupElement.adminUid))
             if (adminUin) {
               return new OB11GroupDecreaseEvent(
                 parseInt(msg.peerUid),
-                parseInt(selfUin),
+                parseInt(getSelfUin()),
                 parseInt(adminUin),
-                'kick_me',
+                'kick_me'
               )
             }
           } catch (e) {
-            return new OB11GroupDecreaseEvent(parseInt(msg.peerUid), parseInt(selfUin), 0, 'leave')
+            return new OB11GroupDecreaseEvent(
+              parseInt(msg.peerUid),
+              parseInt(getSelfUin()),
+              0,
+              'leave'
+            )
           }
         }
       }
@@ -474,16 +479,27 @@ export class OB11Constructor {
             const senderUin = emojiLikeData.gtip.qq.jp
             const msgSeq = emojiLikeData.gtip.url.msgseq
             const emojiId = emojiLikeData.gtip.face.id
-            const msg = await dbUtil.getMsgBySeqId(msgSeq)
-            if (!msg) {
+            const replyMsgList = (await NTQQMsgApi.getMsgsBySeqAndCount({
+              chatType: ChatType.group,
+              guildId: '',
+              peerUid: msg.peerUid,
+            }, msgSeq, 1, true, true)).msgList
+            if (replyMsgList.length < 1) {
               return
             }
-            return new OB11GroupMsgEmojiLikeEvent(parseInt(msg.peerUid), parseInt(senderUin), msg.msgShortId!, [
+            const likes = [
               {
                 emoji_id: emojiId,
                 count: 1,
               },
-            ])
+            ]
+            const shortId = MessageUnique.getShortIdByMsgId(replyMsgList[0].msgId)
+            return new OB11GroupMsgEmojiLikeEvent(
+              parseInt(msg.peerUid),
+              parseInt(senderUin),
+              shortId!,
+              likes
+            )
           } catch (e: any) {
             log('解析表情回应消息失败', e.stack)
           }
@@ -556,20 +572,23 @@ export class OB11Constructor {
             const searchParams = new URL(json.items[0].jp).searchParams
             const msgSeq = searchParams.get('msgSeq')!
             const Group = searchParams.get('groupCode')
-            const Businessid = searchParams.get('businessid')
             const Peer: Peer = {
               guildId: '',
               chatType: ChatType.group,
               peerUid: Group!
             }
-            let msgList = (await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true)).msgList
-            const origMsg = await dbUtil.getMsgByLongId(msgList[0].msgId)
-            const postMsg = await dbUtil.getMsgBySeqId(origMsg?.msgSeq!) ?? origMsg
+            const { msgList } = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true)
+            //const origMsg = await dbUtil.getMsgByLongId(msgList[0].msgId)
+            //const postMsg = await dbUtil.getMsgBySeqId(origMsg?.msgSeq!) ?? origMsg
             // 如果 senderUin 为 0，可能是 历史消息 或 自身消息
-            if (msgList[0].senderUin === '0') {
-              msgList[0].senderUin = postMsg?.senderUin ?? getSelfUin()
-            }
-            return new OB11GroupEssenceEvent(parseInt(msg.peerUid), postMsg?.msgShortId!, parseInt(msgList[0].senderUin!))
+            //if (msgList[0].senderUin === '0') {
+            //msgList[0].senderUin = postMsg?.senderUin ?? getSelfUin()
+            //}
+            return new OB11GroupEssenceEvent(
+              parseInt(msg.peerUid),
+              MessageUnique.getShortIdByMsgId(msgList[0].msgId)!,
+              parseInt(msgList[0].senderUin!)
+            )
             // 获取MsgSeq+Peer可获取具体消息
           }
           if (grayTipElement.jsonGrayTipElement.busiId == 2407) {
@@ -590,27 +609,26 @@ export class OB11Constructor {
 
   static async RecallEvent(
     msg: RawMessage,
+    shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
-    let msgElement = msg.elements.find(
+    const msgElement = msg.elements.find(
       (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.RECALL,
     )
     if (!msgElement) {
       return
     }
-    const isGroup = msg.chatType === ChatType.group
     const revokeElement = msgElement.grayTipElement.revokeElement
-    if (isGroup) {
+    if (msg.chatType === ChatType.group) {
       const operator = await getGroupMember(msg.peerUid, revokeElement.operatorUid)
-      const sender = await getGroupMember(msg.peerUid, revokeElement.origMsgSenderUid!)
       return new OB11GroupRecallNoticeEvent(
         parseInt(msg.peerUid),
-        parseInt(sender?.uin!),
-        parseInt(operator?.uin!),
-        msg.msgShortId!,
+        parseInt(msg.senderUin!),
+        parseInt(operator?.uin || msg.senderUin!),
+        shortId,
       )
     }
     else {
-      return new OB11FriendRecallNoticeEvent(parseInt(msg.senderUin!), msg.msgShortId!)
+      return new OB11FriendRecallNoticeEvent(parseInt(msg.senderUin!), shortId)
     }
   }
 
@@ -680,7 +698,7 @@ export class OB11Constructor {
       sex: OB11Constructor.sex(member.sex!),
       age: 0,
       area: '',
-      level: 0,
+      level: '0',
       qq_level: (member.qqLevel && calcQQLevel(member.qqLevel)) || 0,
       join_time: 0, // 暂时没法获取
       last_sent_time: 0, // 暂时没法获取

src/onebot11/server/ws/reply.ts

@@ -6,12 +6,12 @@ import { isNull } from '../../../common/utils/helper'
 
 export function wsReply(wsClient: WebSocketClass, data: OB11Response | PostEventType) {
   try {
-    let packet = Object.assign({}, data)
+    const packet = Object.assign({}, data)
     if (isNull(packet['echo'])) {
       delete packet['echo']
     }
     wsClient.send(JSON.stringify(packet))
-    log('ws 消息上报', wsClient.url || '', data)
+    //log('ws 消息上报', wsClient.url || '', data)
   } catch (e: any) {
     log('websocket 回复失败', e.stack, data)
   }

src/onebot11/types.ts

@@ -36,7 +36,7 @@ export interface OB11GroupMember {
   age?: number
   join_time?: number
   last_sent_time?: number
-  level?: number
+  level?: string
   qq_level?: number
   role?: OB11GroupMemberRole
   title?: string
@@ -48,6 +48,7 @@ export interface OB11GroupMember {
   shut_up_timestamp?: number
   // 以下为扩展字段
   is_robot?: boolean
+  qage?: number
 }
 
 export interface OB11Group {
@@ -164,7 +165,7 @@ export interface OB11MessagePoke {
   }
 }
 
-interface OB11MessageFileBase {
+export interface OB11MessageFileBase {
   data: {
     thumb?: string
     name?: string

src/renderer/index.ts

@@ -219,6 +219,11 @@ async function onSettingWindowCreated(view: Element) {
           `${window.LiteLoader.plugins['LLOneBot'].path.data}/logs`,
           SettingButton('打开', 'config-open-log-path'),
         ),
+        SettingItem(
+          '消息内容缓存时长',
+          '单位为秒，可用于获取撤回的消息',
+          `<div class="q-input"><input class="q-input__inner" data-config-key="msgCacheExpire" type="number" min="1" value="${config.msgCacheExpire}" placeholder="${config.msgCacheExpire}" /></div>`,
+        ),
       ]),
       SettingList([
         SettingItem('GitHub 仓库', `https://github.com/LLOneBot/LLOneBot`, SettingButton('点个星星', 'open-github')),

src/version.ts

@@ -1 +1 @@
-export const version = '3.28.5'
+export const version = '3.29.3'