Merge pull request #352 from LLOneBot/dev

3.29.5

LICENSE

@@ -1,4 +1,4 @@
-MIT License
+MIT Without Public Sicial Media Promotion License
 
 Copyright (c) 2024 LLOneBot
 
@@ -19,3 +19,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+You may use this software in accordance with the above terms, but you are not 
+allowed to promote this project or your projects based on this project on any 
+public social media.

README.md

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

manifest.json

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

package.json

@@ -16,15 +16,15 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@minatojs/driver-sqlite": "^4.4.1",
+    "@minatojs/driver-sqlite": "^4.5.0",
     "compressing": "^1.10.1",
-    "cordis": "^3.17.9",
+    "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",
-    "minato": "^3.4.3",
+    "minato": "^3.5.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -34,10 +34,10 @@
     "@types/fluent-ffmpeg": "^2.1.25",
     "@types/node": "^20.14.15",
     "@types/ws": "^8.5.12",
-    "electron": "^29.1.4",
+    "electron": "^31.4.0",
     "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"

scripts/gen-manifest.ts

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

scripts/test/test_db.ts

@@ -1,17 +0,0 @@
-import { Level } from 'level'
-
-const db = new Level(process.env['level_db_path'] as string, { valueEncoding: 'json' })
-
-async function getGroupNotify() {
-  let keys = await db.keys().all()
-  let result: string[] = []
-  for (const key of keys) {
-    // console.log(key)
-    if (key.startsWith('group_notify_')) {
-      result.push(key)
-    }
-  }
-  return result
-}
-
-getGroupNotify().then(console.log)

src/common/config.ts

@@ -5,9 +5,7 @@ import path from 'node:path'
 import { getSelfUin } from './data'
 import { DATA_DIR } from './utils'
 
-export const HOOK_LOG = false
-
-export const ALLOW_SEND_TEMP_MSG = false
+//export const HOOK_LOG = false
 
 export class ConfigUtil {
   private readonly configPath: string
@@ -52,6 +50,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,8 +8,10 @@ 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: '',
@@ -22,10 +23,10 @@ export const llonebotError: LLOneBotError = {
 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,17 @@ 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)
+    groupMembers.set(groupCodeStr, members)
     member = getMember()
   }
   return member
@@ -128,3 +106,24 @@ 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/types.ts

@@ -30,6 +30,8 @@ export interface Config {
   ffmpeg?: string // ffmpeg路径
   musicSignUrl?: string
   ignoreBeforeLoginMsg?: boolean
+  /** 单位为秒 */
+  msgCacheExpire?: number
 }
 
 export interface LLOneBotError {
@@ -48,3 +50,15 @@ export interface FileCache {
   elementId: string
   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/MessageUnique.ts

@@ -7,7 +7,7 @@ import SQLite from '@minatojs/driver-sqlite'
 import fsPromise from 'node:fs/promises'
 import fs from 'node:fs'
 import path from 'node:path'
-import { FileCache } from '../types'
+import { FileCacheV2 } from '../types'
 
 interface SQLiteTables extends Tables {
     message: {
@@ -16,7 +16,7 @@ interface SQLiteTables extends Tables {
         chatType: number
         peerUid: string
     }
-    file: FileCache
+    file_v2: FileCacheV2
 }
 
 interface MsgIdAndPeerByShortId {
@@ -52,16 +52,19 @@ class MessageUniqueWrapper {
         }, {
             primary: 'shortId'
         })
-        database.extend('file', {
+        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: 'fileName'
+            primary: 'fileUuid',
+            indexes: ['fileName']
         })
         this.db = database
     }
@@ -142,12 +145,18 @@ class MessageUniqueWrapper {
         this.msgDataMap.resize(maxSize)
     }
 
-    addFileCache(data: FileCache) {
-        return this.db?.upsert('file', [data], 'fileName')
+    addFileCache(data: FileCacheV2) {
+        return this.db?.upsert('file_v2', [data], 'fileUuid')
     }
 
-    getFileCache(fileName: string) {
-        return this.db?.get('file', { fileName })
+    getFileCacheByName(fileName: string) {
+        return this.db?.get('file_v2', { fileName }, {
+            sort: { msgTime: 'desc' }
+        })
+    }
+
+    getFileCacheById(fileUuid: string) {
+        return this.db?.get('file_v2', { fileUuid })
     }
 }
 

src/common/utils/request.ts

@@ -16,7 +16,7 @@ export class RequestUtil {
               const redirectUrl = new URL(res.headers.location, url);
               RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
                 // 合并重定向过程中的cookies
-                log('redirectCookies', redirectCookies)
+                //log('redirectCookies', redirectCookies)
                 cookies = { ...cookies, ...redirectCookies };
                 resolve(cookies);
               });
@@ -33,7 +33,7 @@ export class RequestUtil {
         });
         if (res.headers['set-cookie']) {
           // console.log(res.headers['set-cookie']);
-          log('set-cookie', url, res.headers['set-cookie']);
+          //log('set-cookie', url, res.headers['set-cookie']);
           res.headers['set-cookie'].forEach((cookie) => {
             const parts = cookie.split(';')[0].split('=');
             const key = parts[0];

src/main/main.ts

@@ -16,18 +16,18 @@ import {
 import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
 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,
@@ -95,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')
@@ -159,6 +159,7 @@ function onLoad() {
         peerUid: message.peerUid
       }
       message.msgShortId = MessageUnique.createMsg(peer, message.msgId)
+      addMsgCache(message)
 
       OB11Constructor.message(message)
         .then((msg) => {
@@ -183,7 +184,7 @@ function onLoad() {
         }
       })
       OB11Constructor.PrivateEvent(message).then((privateEvent) => {
-        log(message)
+        //log(message)
         if (privateEvent) {
           // log("post private event", privateEvent);
           postOb11Event(privateEvent)
@@ -243,6 +244,7 @@ function onLoad() {
         log('report self message error: ', e.stack.toString())
       }
     })
+    const processedGroupNotify: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -250,48 +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
-            if (notifyTime < startTime) {
+            const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type
+            if (notifyTime < startTime || processedGroupNotify.includes(flag)) {
               continue
             }
-            log('收到群通知', 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('有加群请求')

src/ntqqapi/api/friend.ts

@@ -8,7 +8,7 @@ import { CacheClassFuncAsyncExtend } from '@/common/utils/helper'
 import { LimitedHashTable } from '@/common/utils/table'
 
 export class NTQQFriendApi {
-  /** >=26702 应使用 getBuddyV2 */
+  /** 大于或等于 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/webapi.ts

@@ -138,45 +138,47 @@ export class WebApi {
     return ret
   }
 
-  @CacheClassFuncAsync(3600 * 1000, 'webapi_get_group_members')
   static async getGroupMembers(GroupCode: string, cached: boolean = true): Promise<WebApiGroupMember[]> {
-    //logDebug('webapi 获取群成员', GroupCode)
-    let MemberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
-    try {
-      const CookiesObject = await NTQQUserApi.getCookies('qun.qq.com')
-      const CookieValue = Object.entries(CookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
-      const Bkn = WebApi.genBkn(CookiesObject.skey)
-      const retList: Promise<WebApiGroupMemberRet>[] = []
-      const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>('https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=0&end=40&sort=1&gc=' + GroupCode + '&bkn=' + Bkn, 'POST', '', { 'Cookie': CookieValue });
-      if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
-        return []
-      } else {
-        for (const key in fastRet.mems) {
-          MemberData.push(fastRet.mems[key])
-        }
+    const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
+    const cookieObject = await NTQQUserApi.getCookies('qun.qq.com')
+    const cookieStr = Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
+    const retList: Promise<WebApiGroupMemberRet>[] = []
+    const params = new URLSearchParams({
+      st: '0',
+      end: '40',
+      sort: '1',
+      gc: GroupCode,
+      bkn: WebApi.genBkn(cookieObject.skey)
+    })
+    const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
+    if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
+      return []
+    } else {
+      for (const member of fastRet.mems) {
+        memberData.push(member)
       }
-      //初始化获取PageNum
-      const PageNum = Math.ceil(fastRet.count / 40)
-      //遍历批量请求
-      for (let i = 2; i <= PageNum; i++) {
-        const ret: Promise<WebApiGroupMemberRet> = RequestUtil.HttpGetJson<WebApiGroupMemberRet>('https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?st=' + (i - 1) * 40 + '&end=' + i * 40 + '&sort=1&gc=' + GroupCode + '&bkn=' + Bkn, 'POST', '', { 'Cookie': CookieValue });
-        retList.push(ret)
-      }
-      //批量等待
-      for (let i = 1; i <= PageNum; i++) {
-        const ret = await (retList[i])
-        if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
-          continue
-        }
-        for (const key in ret.mems) {
-          MemberData.push(ret.mems[key])
-        }
-      }
-    } catch {
-      return MemberData
     }
-    return MemberData
+    const pageNum = Math.ceil(fastRet.count / 40)
+    //遍历批量请求
+    for (let i = 2; i <= pageNum; i++) {
+      params.set('st', String((i - 1) * 40))
+      params.set('end', String(i * 40))
+      const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
+      retList.push(ret)
+    }
+    //批量等待
+    for (let i = 1; i <= pageNum; i++) {
+      const ret = await (retList[i])
+      if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
+        continue
+      }
+      for (const member of ret.mems) {
+        memberData.push(member)
+      }
+    }
+    return memberData
   }
+
   // public static async addGroupDigest(groupCode: string, msgSeq: string) {
   //   const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`;
   //   const res = await this.request(url);

src/ntqqapi/hook.ts

@@ -4,27 +4,20 @@ import { NTQQMsgApi } from './api/msg'
 import {
   CategoryFriend,
   ChatType,
-  FriendV2,
-  Group,
   GroupMember,
   GroupMemberRole,
   RawMessage,
   SimpleInfo, User,
 } from './types'
 import {
-  deleteGroup,
   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 { getConfigUtil } from '@/common/config'
 import fs from 'node:fs'
-import { NTQQGroupApi } from './api/group'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
 import { MessageUnique } from '../common/utils/MessageUnique'
@@ -88,7 +81,7 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
   const originalSend = window.webContents.send
   const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
     // console.log("hookNTQQApiReceive", channel, args)
-    let isLogger = false
+    /*let isLogger = false
     try {
       isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
     } catch (e) { }
@@ -98,7 +91,7 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
       } catch (e) {
         log('hook log error', e, args)
       }
-    }
+    }*/
     try {
       if (args?.[1] instanceof Array) {
         for (let receiveData of args?.[1]) {
@@ -152,9 +145,9 @@ export function hookNTQQApiCall(window: BrowserWindow) {
         isLogger = args[3][0].eventName.startsWith('ns-LoggerApi')
       } catch (e) { }
       if (!isLogger) {
-        try {
+        /*try {
           HOOK_LOG && log('call NTQQ api', thisArg, args)
-        } catch (e) { }
+        } catch (e) { }*/
         try {
           const _args: unknown[] = args[3][1]
           const cmdName: NTQQApiMethod = _args[0] as NTQQApiMethod
@@ -188,16 +181,16 @@ export function hookNTQQApiCall(window: BrowserWindow) {
   const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
     apply(target, thisArg, args) {
       // console.log(args);
-      HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
+      //HOOK_LOG && log('call NTQQ invoke api', thisArg, args)
       args[0]['_replyChannel']['sendReply'] = new Proxy(args[0]['_replyChannel']['sendReply'], {
         apply(sendtarget, sendthisArg, sendargs) {
           sendtarget.apply(sendthisArg, sendargs)
         },
       })
       let ret = target.apply(thisArg, args)
-      try {
+      /*try {
         HOOK_LOG && log('call NTQQ invoke api return', ret)
-      } catch (e) { }
+      } catch (e) { }*/
       return ret
     },
   })
@@ -242,9 +235,9 @@ 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.groupCode)
     if (group.privilegeFlag === 0) {
@@ -269,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) {
@@ -322,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) {
@@ -350,7 +343,7 @@ export async function startHook() {
         processGroupEvent(payload).then()
       }
     }
-  })
+  })*/
 
   registerReceiveHook<{
     groupCode: string

src/ntqqapi/ntcall.ts

@@ -1,7 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook } from './hook'
 import { log } from '../common/utils/log'
-import { HOOK_LOG } from '../common/config'
 import { randomUUID } from 'node:crypto'
 
 export enum NTQQApiClass {
@@ -15,6 +14,7 @@ export enum NTQQApiClass {
   SKEY_API = 'ns-SkeyApi',
   GROUP_HOME_WORK = 'ns-GroupHomeWork',
   GROUP_ESSENCE = 'ns-GroupEssence',
+  NODE_STORE_API = 'ns-NodeStoreApi'
 }
 
 export enum NTQQApiMethod {
@@ -129,7 +129,7 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
   timeout = timeout ?? 5
   afterFirstCmd = afterFirstCmd ?? true
   const uuid = randomUUID()
-  HOOK_LOG && log('callNTQQApi', channel, className, methodName, args, uuid)
+  //HOOK_LOG && log('callNTQQApi', channel, className, methodName, args, uuid)
   return new Promise((resolve: (data: ReturnType) => void, reject) => {
     // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
     const _timeout = timeout * 1000
@@ -202,25 +202,4 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
 export interface GeneralCallResult {
   result: number // 0: success
   errMsg: string
-}
-
-export class NTQQApi {
-  static async call(className: NTQQApiClass, cmdName: string, args: any[]) {
-    return await callNTQQApi<GeneralCallResult>({
-      className,
-      methodName: cmdName,
-      args: [...args],
-    })
-  }
-
-  static async fetchUnitedCommendConfig() {
-    return await callNTQQApi<GeneralCallResult>({
-      methodName: NTQQApiMethod.FETCH_UNITED_COMMEND_CONFIG,
-      args: [
-        {
-          groups: ['100243'],
-        },
-      ],
-    })
-  }
-}
+}

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/onebot11/action/OB11Response.ts

@@ -10,7 +10,7 @@ export class OB11Response {
       data: data,
       message: message,
       wording: message,
-      echo: null,
+      echo: undefined,
     }
   }
 

src/onebot11/action/file/GetFile.ts

@@ -23,66 +23,12 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
   // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = getConfigUtil().getConfig()
-    let UuidData: {
-      high: string
-      low: string
-    } | undefined
-    try {
-      UuidData = UUIDConverter.decode(payload.file)
-      if (UuidData) {
-        const peerUin = UuidData.high
-        const msgId = UuidData.low
-        const isGroup: boolean = !!(await NTQQGroupApi.getGroups(false)).find(e => e.groupCode == peerUin)
-        let peer: Peer | undefined
-        //识别Peer
-        if (isGroup) {
-          peer = { chatType: ChatType.group, peerUid: peerUin }
-        }
-        const PeerUid = await NTQQUserApi.getUidByUinV2(peerUin)
-        if (PeerUid) {
-          const isBuddy = await NTQQFriendApi.isBuddy(PeerUid)
-          if (isBuddy) {
-            peer = { chatType: ChatType.friend, peerUid: PeerUid }
-          } else {
-            peer = { chatType: ChatType.temp, peerUid: PeerUid }
-          }
-        }
-        if (!peer) {
-          throw new Error('chattype not support')
-        }
-        const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [msgId])
-        if (msgList.msgList.length === 0) {
-          throw new Error('msg not found')
-        }
-        const msg = msgList.msgList[0]
-        const findEle = msg.elements.find(e => e.elementType == ElementType.VIDEO || e.elementType == ElementType.FILE || e.elementType == ElementType.PTT)
-        if (!findEle) {
-          throw new Error('element not found')
-        }
-        const downloadPath = await NTQQFileApi.downloadMedia(msgId, msg.chatType, msg.peerUid, findEle.elementId, '', '')
-        const fileSize = findEle?.videoElement?.fileSize || findEle?.fileElement?.fileSize || findEle?.pttElement?.fileSize || '0'
-        const fileName = findEle?.videoElement?.fileName || findEle?.fileElement?.fileName || findEle?.pttElement?.fileName || ''
-        const res: GetFileResponse = {
-          file: downloadPath,
-          url: downloadPath,
-          file_size: fileSize,
-          file_name: fileName,
-        }
-        if (enableLocalFile2Url && downloadPath) {
-          try {
-            res.base64 = await fsPromise.readFile(downloadPath, 'base64')
-          } catch (e) {
-            throw new Error('文件下载失败. ' + e)
-          }
-        }
-        //不手动删除？文件持久化了
-        return res
-      }
-    } catch {
 
+    let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
+    if (!fileCache?.length) {
+      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
     }
 
-    const fileCache = await MessageUnique.getFileCache(String(payload.file))
     if (fileCache?.length) {
       const downloadPath = await NTQQFileApi.downloadMedia(
         fileCache[0].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/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

@@ -1,30 +1,44 @@
 import { OB11GroupMember } from '../../types'
-import { getGroupMember } from '../../../common/data'
+import { getGroupMember, getSelfUid } from '@/common/data'
 import { OB11Constructor } from '../../constructor'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQUserApi } from '../../../ntqqapi/api/user'
-import { log } from '../../../common/utils/log'
-import { isNull } from '../../../common/utils/helper'
+import { NTQQUserApi, WebApi } from '@/ntqqapi/api'
+import { isNull } from '@/common/utils/helper'
 
-export interface PayloadType {
-  group_id: number
-  user_id: number
+interface Payload {
+  group_id: number | string
+  user_id: number | string
 }
 
-class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
+class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo
 
-  protected async _handle(payload: PayloadType) {
+  protected async _handle(payload: Payload) {
     const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString())
     if (member) {
       if (isNull(member.sex)) {
-        log('获取群成员详细信息')
-        let info = await NTQQUserApi.getUserDetailInfo(member.uid, true)
-        log('群成员详细信息结果', info)
+        //log('获取群成员详细信息')
+        const info = await NTQQUserApi.getUserDetailInfo(member.uid, true)
+        //log('群成员详细信息结果', info)
         Object.assign(member, info)
       }
-      return OB11Constructor.groupMember(payload.group_id.toString(), member)
+      const ret = OB11Constructor.groupMember(payload.group_id.toString(), member)
+      const self = await getGroupMember(payload.group_id.toString(), getSelfUid())
+      if (self?.role === 3 || self?.role === 4) {
+        const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString())
+        const target = webGroupMembers.find(e => e?.uin && e.uin === ret.user_id)
+        if (target) {
+          ret.join_time = target.join_time
+          ret.last_sent_time = target.last_speak_time
+          ret.qage = target.qage
+          ret.level = target.lv.level.toString()
+        }
+      }
+      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/msg/GetMsg.ts

@@ -4,6 +4,7 @@ import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
 import { NTQQMsgApi } from '@/ntqqapi/api'
 import { MessageUnique } from '@/common/utils/MessageUnique'
+import { getMsgCache } from '@/common/data'
 
 export interface PayloadType {
   message_id: number | string
@@ -29,12 +30,9 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
       peerUid: msgIdWithPeer.Peer.peerUid,
       chatType: msgIdWithPeer.Peer.chatType
     }
-    const msg = await NTQQMsgApi.getMsgsByMsgId(
-      peer,
-      [msgIdWithPeer?.MsgId || payload.message_id.toString()]
-    )
-    const retMsg = await OB11Constructor.message(msg.msgList[0])
-    retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!
+    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

@@ -6,7 +6,7 @@ import {
   RawMessage,
   SendMessageElement,
 } from '@/ntqqapi/types'
-import { getGroup, getGroupMember, getSelfUid, getSelfUin } from '@/common/data'
+import { getGroupMember, getSelfUid, getSelfUin } from '@/common/data'
 import {
   OB11MessageCustomMusic,
   OB11MessageData,
@@ -119,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
@@ -161,7 +160,7 @@ export async function createSendElements(
       }
         break
       case OB11MessageDataType.reply: {
-        if (sendMsg.data.id) {
+        if (sendMsg.data?.id) {
           const replyMsgId = await MessageUnique.getMsgIdAndPeerByShortId(+sendMsg.data.id)
           if (!replyMsgId) {
             log('回复消息不存在', replyMsgId)
@@ -290,12 +289,12 @@ export async function sendMsg(
       log('文件大小计算失败', e, fileElement)
     }
   }
-  log('发送消息总大小', totalSize, 'bytes')
-  let timeout = ((totalSize / 1024 / 100) * 1000) + 5000  // 100kb/s
-  log('设置消息超时时间', timeout)
+  //log('发送消息总大小', totalSize, 'bytes')
+  const timeout = 10000 + (totalSize / 1024 / 256 * 1000)  // 10s Basic Timeout + PredictTime( For File 512kb/s )
+  //log('设置消息超时时间', timeout)
   const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
-  log('消息发送结果', returnMsg)
   returnMsg.msgShortId = MessageUnique.createMsg(peer, returnMsg.msgId)
+  log('消息发送', returnMsg.msgShortId)
   deleteAfterSentFiles.map(path => fsPromise.unlink(path))
   return returnMsg
 }
@@ -306,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) {
@@ -319,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'
@@ -344,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!)

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,7 +17,6 @@ import {
   Group,
   Peer,
   GroupMember,
-  PicType,
   RawMessage,
   SelfInfo,
   Sex,
@@ -26,11 +25,10 @@ import {
   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 { MessageUnique } from '../common/utils/MessageUnique'
-import { UUIDConverter } from '../common/utils/helper'
 import { OB11GroupIncreaseEvent } from './event/notice/OB11GroupIncreaseEvent'
 import { OB11GroupBanEvent } from './event/notice/OB11GroupBanEvent'
 import { OB11GroupUploadNoticeEvent } from './event/notice/OB11GroupUploadNoticeEvent'
@@ -192,41 +190,61 @@ export class OB11Constructor {
         }*/
         message_data['data']['file'] = picElement.fileName
         message_data['data']['subType'] = picElement.picSubType
-        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId)
+        //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
-        message_data['type'] = element.videoElement ? OB11MessageDataType.video : OB11MessageDataType.file
-        message_data['data']['file'] = videoOrFileElement.fileName
-        message_data['data']['path'] = videoOrFileElement.filePath
-        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId)
-        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,
-          )
-        }
+      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: videoOrFileElement.fileName,
-          fileSize: String(videoOrFileElement.fileSize || '0')
+          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) {
@@ -234,16 +252,18 @@ export class OB11Constructor {
         const { pttElement } = element
         message_data['data']['file'] = pttElement.fileName
         message_data['data']['path'] = pttElement.filePath
-        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId)
+        //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')
+          fileSize: String(pttElement.fileSize || '0'),
+          fileUuid: pttElement.fileUuid
         })
       }
       else if (element.arkElement) {
@@ -358,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)
@@ -406,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'
+            )
           }
         }
       }
@@ -590,21 +611,19 @@ export class OB11Constructor {
     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!),
+        parseInt(msg.senderUin!),
+        parseInt(operator?.uin || msg.senderUin!),
         shortId,
       )
     }
@@ -679,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/post-ob11-event.ts

@@ -61,13 +61,15 @@ export function postOb11Event(msg: PostEventType, reportSelf = false, postWs = t
         body: msgStr,
       }).then(
         async (res) => {
-          log(`新消息事件HTTP上报成功: ${host} `, msgStr)
+          if (msg.post_type) {
+            log(`HTTP 事件上报: ${host} `, msg.post_type)
+          }
           try {
             const resJson = await res.json()
             log(`新消息事件HTTP上报返回快速操作: `, JSON.stringify(resJson))
             handleQuickOperation(msg as QuickOperationEvent, resJson).then().catch(log);
           } catch (e) {
-            log(`新消息事件HTTP上报没有返回快速操作，不需要处理`)
+            //log(`新消息事件HTTP上报没有返回快速操作，不需要处理`)
             return
           }
         },

src/onebot11/server/ws/reply.ts

@@ -1,18 +1,15 @@
 import { WebSocket as WebSocketClass } from 'ws'
-import { OB11Response } from '../../action/OB11Response'
 import { PostEventType } from '../post-ob11-event'
-import { log } from '../../../common/utils/log'
-import { isNull } from '../../../common/utils/helper'
+import { log } from '@/common/utils/log'
+import { OB11Return } from '../../types'
 
-export function wsReply(wsClient: WebSocketClass, data: OB11Response | PostEventType) {
+export function wsReply(wsClient: WebSocketClass, data: OB11Return<any> | PostEventType) {
   try {
-    const packet = Object.assign({}, data)
-    if (isNull(packet['echo'])) {
-      delete packet['echo']
+    wsClient.send(JSON.stringify(data))
+    if (data['post_type']) {
+      log('WebSocket 事件上报', wsClient.url ?? '', data['post_type'])
     }
-    wsClient.send(JSON.stringify(packet))
-    //log('ws 消息上报', wsClient.url || '', data)
   } catch (e: any) {
-    log('websocket 回复失败', e.stack, data)
+    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 {

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.29.1'
+export const version = '3.29.5'