Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

fix
release: v4.6.65
2025-07-19 12:03:37 +00:00 · 2025-05-18 20:59:17 +08:00 · 2025-05-18 20:59:11 +08:00 · 2025-05-18 12:58:07 +00:00 · 2025-05-18 20:57:41 +08:00 · 2025-05-18 20:55:13 +08:00
46 changed files with 1084 additions and 232 deletions
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
+<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">

 # NapCat

-![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
+

 _Modern protocol-side framework implemented based on NTQQ._

@@ -50,6 +51,10 @@ _Modern protocol-side framework implemented based on NTQQ._

 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权

+ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
+
+ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
+  
 + 不过最最重要的 还是需要感谢屏幕前的你哦~

 ---
@@ -61,7 +66,3 @@ _Modern protocol-side framework implemented based on NTQQ._
 2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).

 **本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
-
-## Warnings
-
-[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)
--- a/external/LiteLoaderWrapper.zip
+++ b/external/LiteLoaderWrapper.zip
--- a/external/logo.png
+++ b/external/logo.png
--- a/launcher/NapCatWinBootMain.exe
+++ b/launcher/NapCatWinBootMain.exe
--- a/launcher/qqnt.json
+++ b/launcher/qqnt.json
@@ -1,9 +1,9 @@
 {
  "name": "qq-chat",
-  "version": "9.9.18-32869",
-  "verHash": "e735296c",
-  "linuxVersion": "3.2.16-32869",
-  "linuxVerHash": "4c192ba9",
+  "version": "9.9.19-34740",
+  "verHash": "f31348f2",
+  "linuxVersion": "3.2.17-34740",
+  "linuxVerHash": "5aa2d8d6",
  "private": true,
  "description": "QQ",
  "productName": "QQ",
@@ -16,27 +16,10 @@
  "bin": {
    "qd": "externals/devtools/cli/index.js"
  },
-  "appid": {
-    "win32": "537258389",
-    "darwin": "537258412",
-    "linux": "537258424"
-  },
  "main": "./loadNapCat.js",
-  "peerDependenciesMeta": {
-    "*": {
-      "optional": true
-    }
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
-      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
-      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
-    }
-  },
-  "buildVersion": "32869",
+  "buildVersion": "34740",
  "isPureShell": true,
  "isByteCodeShell": true,
  "platform": "win32",
  "eleArch": "x64"
-}
+}
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
  "name": "NapCatQQ",
  "slug": "NapCat.Framework",
  "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.7.45",
+  "version": "4.6.65",
  "icon": "./logo.png",
  "authors": [
    {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "napcat",
  "private": true,
  "type": "module",
-  "version": "4.7.45",
+  "version": "4.6.65",
  "scripts": {
    "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
    "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -42,7 +42,7 @@
    "async-mutex": "^0.5.0",
    "commander": "^13.0.0",
    "cors": "^2.8.5",
-    "esbuild": "0.25.0",
+    "esbuild": "0.25.4",
    "eslint": "^9.14.0",
    "eslint-import-resolver-typescript": "^4.0.0",
    "eslint-plugin-import": "^2.29.1",
@@ -50,7 +50,6 @@
    "fast-xml-parser": "^4.3.6",
    "file-type": "^20.0.0",
    "globals": "^16.0.0",
-    "image-size": "^1.1.1",
    "json5": "^2.2.3",
    "multer": "^1.4.5-lts.1",
    "typescript": "^5.3.3",
--- a/src/common/download-ffmpeg.ts
+++ b/src/common/download-ffmpeg.ts
@@ -8,11 +8,12 @@ import { pipeline } from 'stream/promises';
 import { fileURLToPath } from 'url';
 import { LogWrapper } from './log';

-const downloadOri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
+const downloadOri = "https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip"
 const urls = [
    "https://github.moeyy.xyz/" + downloadOri,
    "https://ghp.ci/" + downloadOri,
    "https://gh.api.99988866.xyz/" + downloadOri,
+    "https://gh.api.99988866.xyz/" + downloadOri,
    downloadOri
 ];

@@ -336,9 +337,16 @@ export async function downloadFFmpegIfNotExists(log: LogWrapper) {
    const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));

    if (!ffmpeg_exist || !ffprobe_exist) {
-        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
+        let url = await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
            log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
        });
+        if (!url) {
+            log.log('[FFmpeg] [Error] 下载FFmpeg失败');
+            return {
+                path: null,
+                reset: false
+            };
+        }
        return {
            path: path.join(currentPath, 'ffmpeg'),
            reset: true
--- a/src/common/ffmpeg.ts
+++ b/src/common/ffmpeg.ts
@@ -4,10 +4,10 @@ import { execFile } from 'child_process';
 import { promisify } from 'util';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
-import imageSize from 'image-size';
 import { fileURLToPath } from 'node:url';
 import { platform } from 'node:os';
 import { LogWrapper } from './log';
+import { imageSizeFallBack } from '@/image-size';
 const currentPath = dirname(fileURLToPath(import.meta.url));
 const execFileAsync = promisify(execFile);
 const getFFmpegPath = (tool: string): string => {
@@ -157,7 +157,7 @@ export class FFmpegService {
        try {
            await this.extractThumbnail(videoPath, thumbnailPath);
            // 获取图片尺寸
-            const dimensions = imageSize(thumbnailPath);
+            const dimensions = await imageSizeFallBack(thumbnailPath);

            return {
                format: fileType?.ext ?? 'mp4',
--- a/src/common/version.ts
+++ b/src/common/version.ts
@@ -1 +1 @@
-export const napCatVersion = '4.7.45';
+export const napCatVersion = '4.6.65';
--- a/src/core/apis/file.ts
+++ b/src/core/apis/file.ts
@@ -17,8 +17,6 @@ import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import { fileTypeFromFile } from 'file-type';
-import imageSize from 'image-size';
-import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { RkeyManager } from '@/core/helper/rkey';
 import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
@@ -28,6 +26,9 @@ import { SendMessageContext } from '@/onebot/api';
 import { getFileTypeForSendType } from '../helper/msg';
 import { FFmpegService } from '@/common/ffmpeg';
 import { rkeyDataType } from '../types/file';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { FileId } from '../packet/transformer/proto/misc/fileid';
+import { imageSizeFallBack } from '@/image-size';

 export class NTQQFileApi {
    context: InstanceContext;
@@ -63,6 +64,76 @@ export class NTQQFileApi {
        }
    }

+    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined) {
+        if (this.core.apis.PacketApi.available) {
+            try {
+                if (chatType === ChatType.KCHATTYPEGROUP && fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+peer, fileUUID);
+                } else if (file10MMd5 && fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5);
+                }
+            } catch (error) {
+                this.context.logger.logError('获取文件URL失败', (error as Error).message);
+            }
+        }
+        throw new Error('fileUUID or file10MMd5 is undefined');
+    }
+
+    async getPttUrl(peer: string, fileUUID?: string) {
+        if (this.core.apis.PacketApi.available && fileUUID) {
+            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
+            try {
+                if (appid && appid === 1403) {
+                    return this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    });
+                } else if (fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    });
+                }
+            } catch (error) {
+                this.context.logger.logError('获取文件URL失败', (error as Error).message);
+            }
+        }
+        throw new Error('packet cant get ptt url');
+    }
+
+    async getVideoUrlPacket(peer: string, fileUUID?: string) {
+        if (this.core.apis.PacketApi.available && fileUUID) {
+            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
+            try {
+                if (appid && appid === 1415) {
+                    return this.core.apis.PacketApi.pkt.operation.GetGroupVideoUrl(+peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    });
+                } else if (fileUUID) {
+                    return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
+                        fileUuid: fileUUID,
+                        storeId: 1,
+                        uploadTime: 0,
+                        ttl: 0,
+                        subType: 0,
+                    });
+                }
+            } catch (error) {
+                this.context.logger.logError('获取文件URL失败', (error as Error).message);
+            }
+        }
+        throw new Error('packet cant get video url');
+    }

    async copyFile(filePath: string, destPath: string) {
        await this.core.util.copyFile(filePath, destPath);
@@ -137,7 +208,7 @@ export class NTQQFileApi {
        if (fileSize === 0) {
            throw new Error('文件异常，大小为0');
        }
-        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        const imageSize = await imageSizeFallBack(picPath);
        context.deleteAfterSentFiles.push(path);
        return {
            elementType: ElementType.PIC,
@@ -325,6 +396,7 @@ export class NTQQFileApi {
                }
            });
        });
+        return res.flat();
    }

    async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -364,19 +436,6 @@ export class NTQQFileApi {
        return completeRetData.filePath;
    }

-    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
-        return new Promise((resolve, reject) => {
-            imageSize(filePath, (err: Error | null, dimensions) => {
-                if (err) {
-                    reject(new Error(err.message));
-                } else if (!dimensions) {
-                    reject(new Error('获取图片尺寸失败'));
-                } else {
-                    resolve(dimensions);
-                }
-            });
-        });
-    }

    async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
        const randomResultId = 100000 + Math.floor(Math.random() * 10000);
--- a/src/core/apis/msg.ts
+++ b/src/core/apis/msg.ts
@@ -71,6 +71,7 @@ export class NTQQMsgApi {
    async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
            chatInfo: peer,
+            //searchFields: 3,
            filterMsgType: [],
            filterSendersUid: [],
            filterMsgToTime: '0',
@@ -84,6 +85,7 @@ export class NTQQMsgApi {
        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
            chatInfo: peer,
            filterMsgType: [],
+            //searchFields: 3,
            filterSendersUid: SendersUid,
            filterMsgToTime: MsgTime,
            filterMsgFromTime: MsgTime,
@@ -100,6 +102,7 @@ export class NTQQMsgApi {
            filterMsgToTime: '0',
            filterMsgFromTime: '0',
            isReverseOrder: false,
+            //searchFields: 3,
            isIncludeCurrent: true,
            pageLimit: 1,
        });
@@ -110,6 +113,7 @@ export class NTQQMsgApi {
            filterMsgType: [],
            filterSendersUid: [],
            filterMsgToTime: '0',
+            //searchFields: 3,
            filterMsgFromTime: '0',
            isReverseOrder: true,
            isIncludeCurrent: true,
@@ -128,6 +132,7 @@ export class NTQQMsgApi {
            chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
            filterMsgType: [],
            filterSendersUid: [],
+            //searchFields: 3,
            filterMsgToTime: filterMsgToTime,
            filterMsgFromTime: filterMsgFromTime,
            isReverseOrder: false,
@@ -142,6 +147,7 @@ export class NTQQMsgApi {
            chatInfo: peer,
            filterMsgType: [],
            filterSendersUid: SendersUid,
+            //searchFields: 3,
            filterMsgToTime: '0',
            filterMsgFromTime: '0',
            isReverseOrder: true,
--- a/src/core/external/appid.json
+++ b/src/core/external/appid.json
@@ -282,5 +282,17 @@
    "3.2.17-34740": {
        "appid": 537290727,
        "qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
+    },
+    "9.9.19-34958": {
+        "appid": 537290742,
+        "qua": "V1_WIN_NQ_9.9.19_34958_GW_B"
+    },
+    "3.2.17-35184": {
+        "appid": 537291084,
+        "qua": "V1_LNX_NQ_3.2.17_35184_GW_B"
+    },
+    "9.9.19-35184": {
+        "appid": 537291048,
+        "qua": "V1_WIN_NQ_9.9.19_35184_GW_B"
    }
 }
--- a/src/core/external/offset.json
+++ b/src/core/external/offset.json
@@ -354,5 +354,29 @@
    "9.9.19-34740-x64": {
        "send": "3BDD8D0",
        "recv": "3BE20D0"
+    },
+    "3.2.17-34740-x64": {
+        "send": "ADDF0A0",
+        "recv": "ADE2AC0"
+    },
+    "3.2.17-34740-arm64": {
+        "send": "7753BB8",
+        "recv": "77574E8"
+    },
+    "9.9.19-34958-x64": {
+        "send": "3BDD8D0",
+        "recv": "3BE20D0"
+    },
+    "3.2.17-35184-x64": {
+        "send": "AE0DDE0",
+        "recv": "AE11800"
+    },
+    "3.2.17-35184-arm64": {
+        "send": "7776028",
+        "recv": "7779958"
+    },
+    "9.9.19-35184-x64": {
+        "send": "3BE5A10",
+        "recv": "3BEA210"
    }
 }
--- a/src/core/listeners/NodeIKernelBuddyListener.ts
+++ b/src/core/listeners/NodeIKernelBuddyListener.ts
@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];

 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(arg: unknown): any {
+    onBuddyListChangedV2(_arg: unknown): any {
    }

-    onAddBuddyNeedVerify(arg: unknown): any {
+    onAddBuddyNeedVerify(_arg: unknown): any {
    }

-    onAddMeSettingChanged(arg: unknown): any {
+    onAddMeSettingChanged(_arg: unknown): any {
    }

-    onAvatarUrlUpdated(arg: unknown): any {
+    onAvatarUrlUpdated(_arg: unknown): any {
    }

-    onBlockChanged(arg: unknown): any {
+    onBlockChanged(_arg: unknown): any {
    }

-    onBuddyDetailInfoChange(arg: unknown): any {
+    onBuddyDetailInfoChange(_arg: unknown): any {
    }

-    onBuddyInfoChange(arg: unknown): any {
+    onBuddyInfoChange(_arg: unknown): any {
    }

-    onBuddyListChange(arg: OnBuddyChangeParams): any {
+    onBuddyListChange(_arg: OnBuddyChangeParams): any {
    }

-    onBuddyRemarkUpdated(arg: unknown): any {
+    onBuddyRemarkUpdated(_arg: unknown): any {
    }

-    onBuddyReqChange(arg: FriendRequestNotify): any {
+    onBuddyReqChange(_arg: FriendRequestNotify): any {
    }

-    onBuddyReqUnreadCntChange(arg: unknown): any {
+    onBuddyReqUnreadCntChange(_arg: unknown): any {
    }

-    onCheckBuddySettingResult(arg: unknown): any {
+    onCheckBuddySettingResult(_arg: unknown): any {
    }

-    onDelBatchBuddyInfos(arg: unknown): any {
+    onDelBatchBuddyInfos(_arg: unknown): any {
        console.log('onDelBatchBuddyInfos not implemented', ...arguments);
    }

@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
    onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
    }

-    onNickUpdated(arg: unknown): any {
+    onNickUpdated(_arg: unknown): any {
    }

-    onSmartInfos(arg: unknown): any {
+    onSmartInfos(_arg: unknown): any {
    }

-    onSpacePermissionInfos(arg: unknown): any {
+    onSpacePermissionInfos(_arg: unknown): any {
    }
 }
--- a/src/core/packet/context/operationContext.ts
+++ b/src/core/packet/context/operationContext.ts
@@ -30,13 +30,8 @@ export class PacketOperationContext {
        return await this.context.client.sendOidbPacket(pkt, rsp);
    }

-    async GroupPoke(groupUin: number, uin: number) {
-        const req = trans.SendPoke.build(uin, groupUin);
-        await this.context.client.sendOidbPacket(req);
-    }
-
-    async FriendPoke(uin: number) {
-        const req = trans.SendPoke.build(uin);
+    async SendPoke(is_group: boolean, peer: number, target?: number) {
+        const req = trans.SendPoke.build(is_group, peer, target ?? peer);
        await this.context.client.sendOidbPacket(req);
    }

@@ -124,6 +119,20 @@ export class PacketOperationContext {
        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
    }

+    async GetPttUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadPtt.build(selfUid, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadPtt.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
+    async GetVideoUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadVideo.build(selfUid, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadVideo.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
    async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
        const req = trans.DownloadGroupImage.build(groupUin, node);
        const resp = await this.context.client.sendOidbPacket(req, true);
@@ -131,6 +140,21 @@ export class PacketOperationContext {
        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
    }

+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
+    async GetGroupVideoUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupVideo.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
+
    async ImageOCR(imgUrl: string) {
        const req = trans.ImageOCR.build(imgUrl);
        const resp = await this.context.client.sendOidbPacket(req, true);
@@ -154,7 +178,7 @@ export class PacketOperationContext {

    private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
        const ps = msg.map((m) => {
-            return m.msg.map(async(e) => {
+            return m.msg.map(async (e) => {
                if (e instanceof PacketMsgReplyElement && !e.targetElems) {
                    this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
                    if (!e.targetPeer?.peerUid) {
@@ -222,6 +246,7 @@ export class PacketOperationContext {
        const res = trans.DownloadGroupFile.parse(resp);
        return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
    }
+
    async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
        const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
        const resp = await this.context.client.sendOidbPacket(req, true);
@@ -229,13 +254,6 @@ export class PacketOperationContext {
        return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
    }

-    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadGroupPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
    async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
        const req = trans.GetMiniAppAdaptShareInfo.build(param);
        const resp = await this.context.client.sendOidbPacket(req, true);
--- a/src/core/packet/transformer/action/SendPoke.ts
+++ b/src/core/packet/transformer/action/SendPoke.ts
@@ -8,13 +8,13 @@ class SendPoke extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
        super();
    }

-    build(peer: number, group?: number): OidbPacket {
-        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
-            uin: peer,
-            groupUin: group,
-            friendUin: group ?? peer,
-            ext: 0
-        });
+    build(is_group: boolean, peer: number, target: number): OidbPacket {
+        const payload = {
+            uin: target,
+            ext: 0,
+            ...(is_group ? { groupUin: peer } : { friendUin: peer })
+        };
+        const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode(payload);
        return OidbBase.build(0xED3, 1, data);
    }

--- a/src/core/packet/transformer/highway/DownloadGroupVideo.ts
+++ b/src/core/packet/transformer/highway/DownloadGroupVideo.ts
@@ -0,0 +1,50 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadGroupVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 2,
+                    sceneType: 2,
+                    group: {
+                        groupUin: groupUin
+                    }
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11EA, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadGroupVideo();
--- a/src/core/packet/transformer/highway/DownloadPtt.ts
+++ b/src/core/packet/transformer/highway/DownloadPtt.ts
@@ -0,0 +1,51 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadPtt extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 1,
+                    businessType: 3,
+                    sceneType: 1,
+                    c2C: {
+                        accountType: 2,
+                        targetUid: selfUid
+                    },
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x126D, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadPtt();
--- a/src/core/packet/transformer/highway/DownloadVideo.ts
+++ b/src/core/packet/transformer/highway/DownloadVideo.ts
@@ -0,0 +1,51 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 2,
+                    sceneType: 1,
+                    c2C: {
+                        accountType: 2,
+                        targetUid: selfUid
+                    },
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11E9, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadVideo();
--- a/src/core/packet/transformer/highway/index.ts
+++ b/src/core/packet/transformer/highway/index.ts
@@ -13,3 +13,6 @@ export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
 export { default as DownloadGroupImage } from './DownloadGroupImage';
+export { default as DownloadVideo } from './DownloadVideo';
+export { default as DownloadGroupVideo } from './DownloadGroupVideo';
+export { default as DownloadPtt } from './DownloadPtt';
--- a/src/core/packet/transformer/oidb/oidbBase.ts
+++ b/src/core/packet/transformer/oidb/oidbBase.ts
@@ -7,7 +7,7 @@ class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
        super();
    }

-    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, isLafter: boolean = false): OidbPacket {
+    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, _isLafter: boolean = false): OidbPacket {
        const data = new NapProtoMsg(proto.OidbSvcTrpcTcpBase).encode({
            command: cmd,
            subCommand: subCmd,
--- a/src/core/packet/transformer/proto/misc/fileid.ts
+++ b/src/core/packet/transformer/proto/misc/fileid.ts
@@ -0,0 +1,6 @@
+import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
+
+export const FileId = {
+    appid: ProtoField(4, ScalarType.UINT32, true),
+    ttl: ProtoField(10, ScalarType.UINT32, true),
+};
--- a/src/core/services/NodeIKernelGroupService.ts
+++ b/src/core/services/NodeIKernelGroupService.ts
@@ -249,7 +249,7 @@ export interface NodeIKernelGroupService {

    reqToJoinGroup(groupCode: string, arg: unknown): void;

-    setGroupShutUp(groupCode: string, shutUp: boolean): void;
+    setGroupShutUp(groupCode: string, shutUp: boolean): Promise<GeneralCallResult>;

    getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;

--- a/src/core/services/NodeIKernelMsgService.ts
+++ b/src/core/services/NodeIKernelMsgService.ts
@@ -148,10 +148,11 @@ export interface NodeIKernelMsgService {
        msgList: RawMessage[]
    }>;

-    //@deprecated
-    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
+    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
+    getMsgs(peer: Peer & { privilegeFlag: number }, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;

-    //@deprecated
    getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
        msgList: RawMessage[]
    }>;
--- a/src/core/types/msg.ts
+++ b/src/core/types/msg.ts
@@ -508,7 +508,8 @@ export interface RawMessage {
 * 查询消息参数接口
 */
 export interface QueryMsgsParams {
-    chatInfo: Peer;
+    chatInfo: Peer & { privilegeFlag?: number };
+    //searchFields: number;
    filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
    filterSendersUid: string[];
    filterMsgFromTime: string;
--- a/src/core/types/notify.ts
+++ b/src/core/types/notify.ts
@@ -132,18 +132,26 @@ export enum BuddyReqType {
    KMEINITIATORWAITPEERCONFIRM = 13
 }

+// 其中 ? 代表新版本参数
 export interface FriendRequest {
-    isBuddy?: boolean;
    isInitiator?: boolean;
    isDecide: boolean;
    friendUid: string;
    reqType: BuddyReqType,
    reqTime: string;  // 时间戳 秒
+    flag?: number;  // 0
+    preGroupingId?: number;  // 0
+    commFriendNum?: number;  // 共同好友数
    extWords: string;  // 申请人填写的验证消息
    isUnread: boolean;
+    isDoubt?: boolean;  // 是否是可疑的好友请求
+    nameMore?: string;
    friendNick: string;
    sourceId: number;
-    groupCode: string
+    groupCode: string;
+    isBuddy?: boolean;
+    isAgreed?: boolean;
+    relation?: number;
 }

 export interface FriendRequestNotify {
--- a/src/image-size/index.ts
+++ b/src/image-size/index.ts
@@ -0,0 +1,426 @@
+import * as fs from 'fs';
+import { ReadStream } from 'fs';
+
+export interface ImageSize {
+    width: number;
+    height: number;
+}
+
+export enum ImageType {
+    JPEG = 'jpeg',
+    PNG = 'png',
+    BMP = 'bmp',
+    GIF = 'gif',
+    WEBP = 'webp',
+    UNKNOWN = 'unknown',
+}
+
+interface ImageParser {
+    readonly type: ImageType;
+    canParse(buffer: Buffer): boolean;
+    parseSize(stream: ReadStream): Promise<ImageSize | undefined>;
+}
+
+// 魔术匹配
+function matchMagic(buffer: Buffer, magic: number[], offset = 0): boolean {
+    if (buffer.length < offset + magic.length) {
+        return false;
+    }
+
+    for (let i = 0; i < magic.length; i++) {
+        if (buffer[offset + i] !== magic[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// PNG解析器
+class PngParser implements ImageParser {
+    readonly type = ImageType.PNG;
+    // PNG 魔术头：89 50 4E 47 0D 0A 1A 0A
+    private readonly PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
+
+    canParse(buffer: Buffer): boolean {
+        return matchMagic(buffer, this.PNG_SIGNATURE);
+    }
+
+    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
+        return new Promise((resolve, reject) => {
+            stream.once('error', reject);
+            stream.once('readable', () => {
+                const buf = stream.read(24) as Buffer;
+                if (!buf || buf.length < 24) {
+                    return resolve(undefined);
+                }
+                if (this.canParse(buf)) {
+                    const width = buf.readUInt32BE(16);
+                    const height = buf.readUInt32BE(20);
+                    resolve({ width, height });
+                } else {
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+}
+
+// JPEG解析器
+class JpegParser implements ImageParser {
+    readonly type = ImageType.JPEG;
+    // JPEG 魔术头：FF D8
+    private readonly JPEG_SIGNATURE = [0xFF, 0xD8];
+
+    // JPEG标记常量
+    private readonly SOF_MARKERS = {
+        SOF0: 0xC0, // 基线DCT
+        SOF1: 0xC1, // 扩展顺序DCT
+        SOF2: 0xC2, // 渐进式DCT
+        SOF3: 0xC3, // 无损
+    } as const;
+
+    // 非SOF标记
+    private readonly NON_SOF_MARKERS: number[] = [
+        0xC4, // DHT
+        0xC8, // JPEG扩展
+        0xCC, // DAC
+    ] as const;
+
+    canParse(buffer: Buffer): boolean {
+        return matchMagic(buffer, this.JPEG_SIGNATURE);
+    }
+
+    isSOFMarker(marker: number): boolean {
+        return (
+            marker === this.SOF_MARKERS.SOF0 ||
+            marker === this.SOF_MARKERS.SOF1 ||
+            marker === this.SOF_MARKERS.SOF2 ||
+            marker === this.SOF_MARKERS.SOF3
+        );
+    }
+
+    isNonSOFMarker(marker: number): boolean {
+        return this.NON_SOF_MARKERS.includes(marker);
+    }
+
+    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
+        return new Promise<ImageSize | undefined>((resolve, reject) => {
+            const BUFFER_SIZE = 1024; // 读取块大小，可以根据需要调整
+            let buffer = Buffer.alloc(0);
+            let offset = 0;
+            let found = false;
+
+            // 处理错误
+            stream.on('error', (err) => {
+                stream.destroy();
+                reject(err);
+            });
+
+            // 处理数据块
+            stream.on('data', (chunk: Buffer | string) => {
+                // 追加新数据到缓冲区
+                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+                buffer = Buffer.concat([buffer.subarray(offset), chunkBuffer]);
+                offset = 0;
+
+                // 保持缓冲区在合理大小内，只保留最后的部分用于跨块匹配
+                const bufferSize = buffer.length;
+                const MIN_REQUIRED_BYTES = 10; // SOF段最低字节数
+
+                // 从JPEG头部后开始扫描
+                while (offset < bufferSize - MIN_REQUIRED_BYTES) {
+                    // 寻找FF标记
+                    if (buffer[offset] === 0xFF && buffer[offset + 1]! >= 0xC0 && buffer[offset + 1]! <= 0xCF) {
+                        const marker = buffer[offset + 1];
+                        if (!marker) {
+                            break;
+                        }
+                        // 跳过非SOF标记
+                        if (this.isNonSOFMarker(marker)) {
+                            offset += 2;
+                            continue;
+                        }
+
+                        // 处理SOF标记 (包含尺寸信息)
+                        if (this.isSOFMarker(marker)) {
+                            // 确保缓冲区中有足够数据读取尺寸
+                            if (offset + 9 < bufferSize) {
+                                // 解析尺寸: FF XX YY YY PP HH HH WW WW ...
+                                // XX = 标记, YY YY = 段长度, PP = 精度, HH HH = 高, WW WW = 宽
+                                const height = buffer.readUInt16BE(offset + 5);
+                                const width = buffer.readUInt16BE(offset + 7);
+
+                                found = true;
+                                stream.destroy();
+                                resolve({ width, height });
+                                return;
+                            } else {
+                                // 如果缓冲区内数据不够，保留当前位置等待更多数据
+                                break;
+                            }
+                        }
+                    }
+
+                    offset++;
+                }
+
+                // 缓冲区管理: 如果处理了许多数据但没找到标记，
+                // 保留最后N字节用于跨块匹配，丢弃之前的数据
+                if (offset > BUFFER_SIZE) {
+                    const KEEP_BYTES = 20; // 保留足够数据以处理跨块边界的情况
+                    if (offset > KEEP_BYTES) {
+                        buffer = buffer.subarray(offset - KEEP_BYTES);
+                        offset = KEEP_BYTES;
+                    }
+                }
+            });
+
+            // 处理流结束
+            stream.on('end', () => {
+                if (!found) {
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+}
+
+// BMP解析器
+class BmpParser implements ImageParser {
+    readonly type = ImageType.BMP;
+    // BMP 魔术头：42 4D (BM)
+    private readonly BMP_SIGNATURE = [0x42, 0x4D];
+
+    canParse(buffer: Buffer): boolean {
+        return matchMagic(buffer, this.BMP_SIGNATURE);
+    }
+
+    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
+        return new Promise((resolve, reject) => {
+            stream.once('error', reject);
+            stream.once('readable', () => {
+                const buf = stream.read(26) as Buffer;
+                if (!buf || buf.length < 26) {
+                    return resolve(undefined);
+                }
+                if (this.canParse(buf)) {
+                    const width = buf.readUInt32LE(18);
+                    const height = buf.readUInt32LE(22);
+                    resolve({ width, height });
+                } else {
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+}
+
+// GIF解析器
+class GifParser implements ImageParser {
+    readonly type = ImageType.GIF;
+    // GIF87a 魔术头：47 49 46 38 37 61
+    private readonly GIF87A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x37, 0x61];
+    // GIF89a 魔术头：47 49 46 38 39 61
+    private readonly GIF89A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x39, 0x61];
+
+    canParse(buffer: Buffer): boolean {
+        return (
+            matchMagic(buffer, this.GIF87A_SIGNATURE) ||
+            matchMagic(buffer, this.GIF89A_SIGNATURE)
+        );
+    }
+
+    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
+        return new Promise((resolve, reject) => {
+            stream.once('error', reject);
+            stream.once('readable', () => {
+                const buf = stream.read(10) as Buffer;
+                if (!buf || buf.length < 10) {
+                    return resolve(undefined);
+                }
+                if (this.canParse(buf)) {
+                    const width = buf.readUInt16LE(6);
+                    const height = buf.readUInt16LE(8);
+                    resolve({ width, height });
+                } else {
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+}
+
+// WEBP解析器 - 完整支持VP8, VP8L, VP8X格式
+class WebpParser implements ImageParser {
+    readonly type = ImageType.WEBP;
+    // WEBP RIFF 头：52 49 46 46 (RIFF)
+    private readonly RIFF_SIGNATURE = [0x52, 0x49, 0x46, 0x46];
+    // WEBP 魔术头：57 45 42 50 (WEBP)
+    private readonly WEBP_SIGNATURE = [0x57, 0x45, 0x42, 0x50];
+
+    // WEBP 块头
+    private readonly CHUNK_VP8 = [0x56, 0x50, 0x38, 0x20];  // "VP8 "
+    private readonly CHUNK_VP8L = [0x56, 0x50, 0x38, 0x4C]; // "VP8L"
+    private readonly CHUNK_VP8X = [0x56, 0x50, 0x38, 0x58]; // "VP8X"
+
+    canParse(buffer: Buffer): boolean {
+        return (
+            buffer.length >= 12 &&
+            matchMagic(buffer, this.RIFF_SIGNATURE, 0) &&
+            matchMagic(buffer, this.WEBP_SIGNATURE, 8)
+        );
+    }
+
+    isChunkType(buffer: Buffer, offset: number, chunkType: number[]): boolean {
+        return buffer.length >= offset + 4 && matchMagic(buffer, chunkType, offset);
+    }
+
+    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
+        return new Promise((resolve, reject) => {
+            // 需要读取足够的字节来检测所有三种格式
+            const MAX_HEADER_SIZE = 32;
+            let totalBytes = 0;
+            let buffer = Buffer.alloc(0);
+
+            stream.on('error', reject);
+
+            stream.on('data', (chunk: Buffer | string) => {
+                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+                buffer = Buffer.concat([buffer, chunkBuffer]);
+                totalBytes += chunk.length;
+
+                // 检查是否有足够的字节进行格式检测
+                if (totalBytes >= MAX_HEADER_SIZE) {
+                    stream.destroy();
+
+                    // 检查基本的WEBP签名
+                    if (!this.canParse(buffer)) {
+                        return resolve(undefined);
+                    }
+
+                    // 检查chunk头部，位于字节12-15
+                    if (this.isChunkType(buffer, 12, this.CHUNK_VP8)) {
+                        // VP8格式 - 标准WebP
+                        // 宽度和高度在帧头中
+                        const width = buffer.readUInt16LE(26) & 0x3FFF;
+                        const height = buffer.readUInt16LE(28) & 0x3FFF;
+                        return resolve({ width, height });
+
+                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8L)) {
+                        // VP8L格式 - 无损WebP
+                        // 1字节标记后是14位宽度和14位高度
+                        const bits = buffer.readUInt32LE(21);
+                        const width = 1 + (bits & 0x3FFF);
+                        const height = 1 + ((bits >> 14) & 0x3FFF);
+                        return resolve({ width, height });
+
+                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8X)) {
+                        // VP8X格式 - 扩展WebP
+                        // 24位宽度和高度(减去1)
+                        if (!buffer[24] || !buffer[25] || !buffer[26] || !buffer[27] || !buffer[28] || !buffer[29]) {
+                            return resolve(undefined);
+                        }
+                        const width = 1 + ((buffer[24] | (buffer[25] << 8) | (buffer[26] << 16)) & 0xFFFFFF);
+                        const height = 1 + ((buffer[27] | (buffer[28] << 8) | (buffer[29] << 16)) & 0xFFFFFF);
+                        return resolve({ width, height });
+                    } else {
+                        // 未知的WebP子格式
+                        return resolve(undefined);
+                    }
+                }
+            });
+
+            stream.on('end', () => {
+                // 如果没有读到足够的字节
+                if (totalBytes < MAX_HEADER_SIZE) {
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+}
+
+const parsers: ReadonlyArray<ImageParser> = [
+    new PngParser(),
+    new JpegParser(),
+    new BmpParser(),
+    new GifParser(),
+    new WebpParser(),
+];
+
+export async function detectImageType(filePath: string): Promise<ImageType> {
+    return new Promise((resolve, reject) => {
+        const stream = fs.createReadStream(filePath, {
+            highWaterMark: 64, // 优化读取buffer大小
+            start: 0,
+            end: 63
+        });
+
+        let buffer: Buffer | null = null;
+
+        stream.once('error', (err) => {
+            stream.destroy();
+            reject(err);
+        });
+
+        stream.once('readable', () => {
+            buffer = stream.read(64) as Buffer;
+            stream.destroy();
+
+            if (!buffer) {
+                return resolve(ImageType.UNKNOWN);
+            }
+
+            for (const parser of parsers) {
+                if (parser.canParse(buffer)) {
+                    return resolve(parser.type);
+                }
+            }
+
+            resolve(ImageType.UNKNOWN);
+        });
+
+        stream.once('end', () => {
+            if (!buffer) {
+                resolve(ImageType.UNKNOWN);
+            }
+        });
+    });
+}
+
+export async function imageSizeFromFile(filePath: string): Promise<ImageSize | undefined> {
+    try {
+        // 先检测类型
+        const type = await detectImageType(filePath);
+        const parser = parsers.find(p => p.type === type);
+        if (!parser) {
+            return undefined;
+        }
+
+        // 用流式方式解析尺寸
+        const stream = fs.createReadStream(filePath);
+        try {
+            return await parser.parseSize(stream);
+        } catch (err) {
+            console.error(`解析图片尺寸出错: ${err}`);
+            return undefined;
+        } finally {
+            if (!stream.destroyed) {
+                stream.destroy();
+            }
+        }
+    } catch (err) {
+        console.error(`检测图片类型出错: ${err}`);
+        return undefined;
+    }
+}
+
+export async function imageSizeFallBack(
+    filePath: string,
+    fallback: ImageSize = {
+        width: 1024,
+        height: 1024,
+    }
+): Promise<ImageSize> {
+    return await imageSizeFromFile(filePath) ?? fallback;
+}
--- a/src/onebot/action/go-cqhttp/SendForwardMsg.ts
+++ b/src/onebot/action/go-cqhttp/SendForwardMsg.ts
@@ -1,4 +1,4 @@
-import { normalize, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, normalize, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { OB11PostSendMsg } from '@/onebot/types';
 import { ActionName } from '@/onebot/action/router';

@@ -19,8 +19,14 @@ export class GoCQHTTPSendForwardMsg extends GoCQHTTPSendForwardMsgBase {
 }
 export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsgBase {
    override actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
+    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
+        return this.base_handle(payload, ContextMode.Private);
+    }
 }

 export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsgBase {
    override actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
+    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
+        return this.base_handle(payload, ContextMode.Group);
+    }
 }
--- a/src/onebot/action/group/GroupPoke.ts
+++ b/src/onebot/action/group/GroupPoke.ts
@@ -1,19 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: Type.Union([Type.Number(), Type.String()]),
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class GroupPoke extends GetPacketStatusDepends<Payload, void> {
-    override actionName = ActionName.GroupPoke;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
-    }
-}
--- a/src/onebot/action/group/SendGroupMsg.ts
+++ b/src/onebot/action/group/SendGroupMsg.ts
@@ -1,17 +1,19 @@
-import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';

 // 未检测参数
 class SendGroupMsg extends SendMsgBase {
    override actionName = ActionName.SendGroupMsg;
-    override contextMode: ContextMode = ContextMode.Group;

    protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
        delete payload.user_id;
        payload.message_type = 'group';
        return super.check(payload);
    }
+    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
+        return this.base_handle(payload, ContextMode.Group);
+    }
 }

 export default SendGroupMsg;
--- a/src/onebot/action/group/SetGroupWholeBan.ts
+++ b/src/onebot/action/group/SetGroupWholeBan.ts
@@ -15,7 +15,10 @@ export default class SetGroupWholeBan extends OneBotAction<Payload, null> {

    async _handle(payload: Payload): Promise<null> {
        const enable = payload.enable?.toString() !== 'false';
-        await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
+        let res = await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
+        if (res.result !== 0) {
+            throw new Error(`SetGroupWholeBan failed: ${res.errMsg} ${res.result}`);
+        }
        return null;
    }
 }
--- a/src/onebot/action/index.ts
+++ b/src/onebot/action/index.ts
@@ -78,7 +78,6 @@ import { GetGroupFileSystemInfo } from '@/onebot/action/go-cqhttp/GetGroupFileSy
 import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
 import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
 import { GetGroupSystemMsg } from './system/GetSystemMsg';
-import { GroupPoke } from './group/GroupPoke';
 import { GetUserStatus } from './extends/GetUserStatus';
 import { GetRkey } from './extends/GetRkey';
 import { SetSpecialTitle } from './extends/SetSpecialTitle';
@@ -86,7 +85,6 @@ import { GetGroupShutList } from './group/GetGroupShutList';
 import { GetGroupMemberList } from './group/GetGroupMemberList';
 import { GetGroupFileUrl } from '@/onebot/action/file/GetGroupFileUrl';
 import { GetPacketStatus } from '@/onebot/action/packet/GetPacketStatus';
-import { FriendPoke } from '@/onebot/action/user/FriendPoke';
 import { GetCredentials } from './system/GetCredentials';
 import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign';
 import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain';
@@ -102,7 +100,7 @@ import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
 import { GetClientkey } from './extends/GetClientkey';
 import { SendPacket } from './extends/SendPacket';
-import { SendPoke } from '@/onebot/action/packet/SendPoke';
+import { FriendPoke, GroupPoke, SendPoke } from '@/onebot/action/packet/SendPoke';
 import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
 import { BotExit } from './extends/BotExit';
 import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
--- a/src/onebot/action/msg/SendMsg.ts
+++ b/src/onebot/action/msg/SendMsg.ts
@@ -104,8 +104,6 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
 }

 export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
-    contextMode = ContextMode.Normal;
-
    protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
        const messages = normalize(payload.message);
        const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node);
@@ -117,12 +115,13 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
        }
        return { valid: true };
    }
-
    async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        this.contextMode = ContextMode.Normal;
-        if (payload.message_type === 'group') this.contextMode = ContextMode.Group;
-        if (payload.message_type === 'private') this.contextMode = ContextMode.Private;
-        const peer = await createContext(this.core, payload, this.contextMode);
+        return this.base_handle(payload);
+    }
+    async base_handle(payload: OB11PostSendMsg, contextMode: ContextMode = ContextMode.Normal): Promise<ReturnDataType> {
+        if (payload.message_type === 'group') contextMode = ContextMode.Group;
+        if (payload.message_type === 'private') contextMode = ContextMode.Private;
+        const peer = await createContext(this.core, payload, contextMode);

        const messages = normalize(
            payload.message,
@@ -174,9 +173,11 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
        nickname: string,
    }, dp: number = 0): Promise<{
        finallySendElements: SendArkElement,
-        res_id?: string
+        res_id?: string,
+        deleteAfterSentFiles: string[],
    } | null> {
        const packetMsg: PacketMsg[] = [];
+        let delFiles: string[] = [];
        for (const node of messageNodes) {
            if (dp >= 3) {
                this.core.context.logger.logWarn('转发消息深度超过3层，将停止解析！');
@@ -192,9 +193,11 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                        nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户',
                    }, dp + 1);
                    sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
+                    delFiles.push(...(uploadReturnData?.deleteAfterSentFiles || []));
                } else {
                    const sendElementsCreateReturn = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer);
                    sendElements = sendElementsCreateReturn.sendElements;
+                    delFiles.push(...sendElementsCreateReturn.deleteAfterSentFiles);
                }

                const packetMsgElements: rawMsgWithSendMsg = {
@@ -218,7 +221,8 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0];
                this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${stringifyWithBigInt(msg)}`);
                if (msg) {
-                    await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
+                    let msgCache = await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
+                    delFiles.push(...msgCache);
                    const transformedMsg = this.core.apis.PacketApi.pkt.msgConverter.rawMsgToPacketMsg(msg, msgPeer);
                    this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${stringifyWithBigInt(transformedMsg)}`);
                    packetMsg.push(transformedMsg);
@@ -234,6 +238,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
        const resid = await this.core.apis.PacketApi.pkt.operation.UploadForwardMsg(packetMsg, msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : 0);
        const forwardJson = ForwardMsgBuilder.fromPacketMsg(resid, packetMsg, source, news, summary, prompt);
        return {
+            deleteAfterSentFiles: delFiles,
            finallySendElements: {
                elementType: ElementType.ARK,
                elementId: '',
@@ -255,7 +260,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
        const res_id = uploadReturnData?.res_id;
        const finallySendElements = uploadReturnData?.finallySendElements;
        if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
-        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], []).catch(() => undefined);
+        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], uploadReturnData.deleteAfterSentFiles || []).catch(() => undefined);
        return { message: returnMsg ?? null, res_id: res_id! };
    }

--- a/src/onebot/action/msg/SendPrivateMsg.ts
+++ b/src/onebot/action/msg/SendPrivateMsg.ts
@@ -1,16 +1,18 @@
-import { ContextMode, SendMsgBase } from './SendMsg';
+import { ContextMode, ReturnDataType, SendMsgBase } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';

 // 未检测参数
 class SendPrivateMsg extends SendMsgBase {
    override actionName = ActionName.SendPrivateMsg;
-    override contextMode: ContextMode = ContextMode.Private;

    protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
        payload.message_type = 'private';
        return super.check(payload);
    }
+    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
+        return this.base_handle(payload, ContextMode.Private);
+    }
 }

 export default SendPrivateMsg;
--- a/src/onebot/action/packet/SendPoke.ts
+++ b/src/onebot/action/packet/SendPoke.ts
@@ -3,21 +3,36 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';

 const SchemaData = Type.Object({
-    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    user_id: Type.Union([Type.Number(), Type.String()]),
+    group_id: Type.Optional(Type.String()),
+    user_id: Type.Optional(Type.String()),
+    target_id: Type.Optional(Type.String()),
 });

 type Payload = Static<typeof SchemaData>;
-
-export class SendPoke extends GetPacketStatusDepends<Payload, void> {
-    override actionName = ActionName.SendPoke;
+export class SendPokeBase extends GetPacketStatusDepends<Payload, void> {
    override payloadSchema = SchemaData;

    async _handle(payload: Payload) {
-        if (payload.group_id) {
-            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
-        } else {
-            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+        // 这里的 !! 可以传入空字符串 忽略这些数据有利用接口统一接口
+        const target_id = !!payload.target_id ? payload.target_id : payload.user_id;
+        const peer_id = !!payload.group_id ? payload.group_id : payload.user_id;
+
+        const is_group = !!payload.group_id;
+        if (!target_id || !peer_id) {
+            throw new Error('请检查参数，缺少 user_id 或 group_id');
        }
+
+        await this.core.apis.PacketApi.pkt.operation.SendPoke(is_group, +peer_id, +target_id);
    }
 }
+
+
+export class SendPoke extends SendPokeBase {
+    override actionName = ActionName.SendPoke;
+}
+export class GroupPoke extends SendPokeBase {
+    override actionName = ActionName.GroupPoke;
+}
+export class FriendPoke extends SendPokeBase {
+    override actionName = ActionName.FriendPoke;
+}
--- a/src/onebot/action/user/FriendPoke.ts
+++ b/src/onebot/action/user/FriendPoke.ts
@@ -1,18 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    user_id: Type.Union([Type.Number(), Type.String()])
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export class FriendPoke extends GetPacketStatusDepends<Payload, void> {
-    override actionName = ActionName.FriendPoke;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
-    }
-}
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -85,9 +85,6 @@ export class OneBotMsgApi {
        textElement: async element => {
            if (element.atType === NTMsgAtType.ATTYPEUNKNOWN) {
                let text = element.content;
-                if (!text.trim()) {
-                    return null;
-                }
                // 兼容 9.7.x 换行符
                if (text.indexOf('\n') === -1 && text.indexOf('\r\n') === -1) {
                    text = text.replace(/\r/g, '\n');
@@ -100,7 +97,7 @@ export class OneBotMsgApi {
                let qq: string = 'all';
                if (element.atType !== NTMsgAtType.ATTYPEALL) {
                    const { atNtUid, atUid } = element;
-                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : atUid;
+                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : String(Number(atUid) >>> 0);
                }
                return {
                    type: OB11MessageDataType.at,
@@ -150,12 +147,31 @@ export class OneBotMsgApi {
            };
            FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileUuid);
            FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
+            if (this.core.apis.PacketApi.available) {
+                let url;
+                try {
+                    url = await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5)
+                } catch (error) {
+                    url = '';
+                }
+                if (url) {
+                    return {
+                        type: OB11MessageDataType.file,
+                        data: {
+                            file: element.fileName,
+                            file_id: element.fileUuid,
+                            file_size: element.fileSize,
+                            url: url,
+                        },
+                    }
+                }
+            }
            return {
                type: OB11MessageDataType.file,
                data: {
                    file: element.fileName,
                    file_id: element.fileUuid,
-                    file_size: element.fileSize,
+                    file_size: element.fileSize
                },
            };
        },
@@ -225,17 +241,13 @@ export class OneBotMsgApi {
        },

        replyElement: async (element, msg) => {
-            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
            const peer = {
                chatType: msg.chatType,
                peerUid: msg.peerUid,
                guildId: '',
            };
-            if (!records || !element.replyMsgTime || !element.senderUidStr) {
-                this.core.context.logger.logError('似乎是旧版客户端,获取不到引用的消息', element.replayMsgSeq);
-                return null;
-            }

+            // 创建回复数据的通用方法
            const createReplyData = (msgId: string): OB11MessageData => ({
                type: OB11MessageDataType.reply,
                data: {
@@ -243,48 +255,96 @@ export class OneBotMsgApi {
                },
            });

-            if (records.peerUin === '284840486' || records.peerUin === '1094950020') {
+            // 查找记录
+            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
+
+            // 特定账号的特殊处理
+            if (records && (records.peerUin === '284840486' || records.peerUin === '1094950020')) {
                return createReplyData(records.msgId);
            }
-            let replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, records.msgTime, [element.senderUidStr])).msgList;
-            let replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);

-            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                this.core.context.logger.logError(
-                    '筛选结果,筛选消息失败,将使用Fallback-1 Seq: ',
+            // 获取消息的通用方法组
+            const tryFetchMethods = async (msgSeq: string, senderUid?: string, msgTime?: string, msgRandom?: string): Promise<RawMessage | undefined> => {
+                try {
+                    // 方法1：通过序号和时间筛选
+                    if (senderUid && msgTime) {
+                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(
+                            peer, msgSeq, msgTime, [senderUid]
+                        )).msgList;
+
+                        const replyMsg = msgRandom
+                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
+                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
+
+                        if (replyMsg) return replyMsg;
+
+                        this.core.context.logger.logWarn(`方法1查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
+                    }
+
+                    // 方法2：直接通过序号获取
+                    const replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(
+                        peer, msgSeq, 1, true, true
+                    )).msgList;
+
+                    const replyMsg = msgRandom
+                        ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
+                        : replyMsgList.find(msg => msg.msgSeq === msgSeq);
+
+                    if (replyMsg) return replyMsg;
+
+                    this.core.context.logger.logWarn(`方法2查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
+
+                    // 方法3：另一种筛选方式
+                    if (senderUid) {
+                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(
+                            peer, msgSeq, [senderUid]
+                        )).msgList;
+
+                        const replyMsg = msgRandom
+                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
+                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
+
+                        if (replyMsg) return replyMsg;
+
+                        this.core.context.logger.logWarn(`方法3查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
+                    }
+
+                    return undefined;
+                } catch (error) {
+                    this.core.context.logger.logError('查询回复消息出错', error);
+                    return undefined;
+                }
+            };
+
+            // 有记录情况下，使用完整信息查询
+            if (records && element.replyMsgTime && element.senderUidStr) {
+                const replyMsg = await tryFetchMethods(
                    element.replayMsgSeq,
-                    ',消息长度:',
-                    replyMsgList.length
+                    element.senderUidStr,
+                    records.msgTime,
+                    records.msgRandom
                );
-                replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer, element.replayMsgSeq, 1, true, true)).msgList;
-                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
+
+                if (replyMsg) {
+                    return createReplyData(replyMsg.msgId);
+                }
+
+                this.core.context.logger.logError('所有查找方法均失败，获取不到带记录的引用消息', element.replayMsgSeq);
+            } else {
+                // 旧版客户端或不完整记录的情况，也尝试使用相同流程
+                this.core.context.logger.logWarn('似乎是旧版客户端，尝试仅通过序号获取引用消息', element.replayMsgSeq);
+
+                const replyMsg = await tryFetchMethods(element.replayMsgSeq);
+
+                if (replyMsg) {
+                    return createReplyData(replyMsg.msgId);
+                }
+
+                this.core.context.logger.logError('所有查找方法均失败，获取不到旧客户端的引用消息', element.replayMsgSeq);
            }

-            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                this.core.context.logger.logWarn(
-                    '筛选消息失败,将使用Fallback-2 Seq:',
-                    element.replayMsgSeq,
-                    ',消息长度:',
-                    replyMsgList.length
-                );
-                replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(peer, element.replayMsgSeq, [element.senderUidStr])).msgList;
-                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
-            }
-
-
-            // 丢弃该消息段
-            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
-                this.core.context.logger.logError(
-                    '最终筛选结果,筛选消息失败,获取不到引用的消息 Seq: ',
-                    element.replayMsgSeq,
-                    ',消息长度:',
-                    replyMsgList.length
-                );
-                return null;
-            }
-            return createReplyData(replyMsg.msgId);
+            return null;
        },
-
        videoElement: async (element, msg, elementWrapper) => {
            const peer = {
                chatType: msg.chatType,
@@ -331,7 +391,17 @@ export class OneBotMsgApi {

            //开始兜底
            if (!videoDownUrl) {
-                videoDownUrl = element.filePath;
+                if (this.core.apis.PacketApi.available) {
+                    try {
+                        videoDownUrl = await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid);
+                    } catch (e) {
+                        this.core.context.logger.logError('获取视频url失败', (e as Error).stack);
+                        videoDownUrl = element.filePath;
+                    }
+                } else {
+                    videoDownUrl = element.filePath;
+                }
+
            }
            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
            return {
@@ -351,6 +421,28 @@ export class OneBotMsgApi {
                guildId: '',
            };
            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, '', element.fileName);
+            let pttUrl = '';
+            if (this.core.apis.PacketApi.available) {
+                try {
+                    pttUrl = await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid);
+                } catch (e) {
+                    this.core.context.logger.logError('获取语音url失败', (e as Error).stack);
+                    pttUrl = element.filePath;
+                }
+            } else {
+                pttUrl = element.filePath;
+            }
+            if (pttUrl) {
+                return {
+                    type: OB11MessageDataType.voice,
+                    data: {
+                        file: fileCode,
+                        path: element.filePath,
+                        url: pttUrl,
+                        file_size: element.fileSize,
+                    },
+                }
+            }
            return {
                type: OB11MessageDataType.voice,
                data: {
--- a/src/onebot/event/notice/OB11BaseNoticeEvent.ts
+++ b/src/onebot/event/notice/OB11BaseNoticeEvent.ts
@@ -2,4 +2,5 @@ import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';

 export abstract class OB11BaseNoticeEvent extends OneBotEvent {
    post_type = EventType.NOTICE;
-}
+    abstract notice_type: string;
+}
--- a/src/onebot/event/request/OB11BaseRequestEvent.ts
+++ b/src/onebot/event/request/OB11BaseRequestEvent.ts
@@ -0,0 +1,6 @@
+import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
+
+export abstract class OB11BaseRequestEvent extends OneBotEvent {
+    readonly post_type = EventType.REQUEST;
+    abstract request_type: string;
+}
--- a/src/onebot/event/request/OB11FriendRequest.ts
+++ b/src/onebot/event/request/OB11FriendRequest.ts
@@ -1,10 +1,8 @@
-import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent';
-import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
+import { OB11BaseRequestEvent } from './OB11BaseRequestEvent';

-export class OB11FriendRequestEvent extends OB11BaseNoticeEvent {
-    override post_type = EventType.REQUEST;
-    request_type = 'friend';
+export class OB11FriendRequestEvent extends OB11BaseRequestEvent {
+    override request_type = 'friend';

    user_id: number;
    comment: string;
--- a/src/onebot/event/request/OB11GroupRequest.ts
+++ b/src/onebot/event/request/OB11GroupRequest.ts
@@ -1,18 +1,18 @@
-import { OB11GroupNoticeEvent } from '@/onebot/event/notice/OB11GroupNoticeEvent';
-import { EventType } from '@/onebot/event/OneBotEvent';
 import { NapCatCore } from '@/core';
+import { OB11BaseRequestEvent } from './OB11BaseRequestEvent';

-export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {
-    override post_type = EventType.REQUEST;
-    request_type = 'group';
+export class OB11GroupRequestEvent extends OB11BaseRequestEvent {
+    override readonly request_type = 'group' as const;

-    override user_id: number;
+    group_id: number;
+    user_id: number;
    comment: string;
    flag: string;
    sub_type: string;

    constructor(core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) {
-        super(core, groupId, userId);
+        super(core);
+        this.group_id = groupId;
        this.user_id = userId;
        this.sub_type = sub_type;
        this.comment = comment;
--- a/src/onebot/index.ts
+++ b/src/onebot/index.ts
@@ -334,7 +334,7 @@ export class NapCatOneBot11Adapter {
            for (let i = 0; i < reqs.unreadNums; i++) {
                const req = reqs.buddyReqs[i];
                if (!req) continue;
-                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
+                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) || !req.isUnread) {
                    continue;
                }
                try {
@@ -352,7 +352,6 @@ export class NapCatOneBot11Adapter {
                }
            }
        };
-
        this.context.session
            .getBuddyService()
            .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));
--- a/src/onebot/network/websocket-server.ts
+++ b/src/onebot/network/websocket-server.ts
@@ -39,8 +39,11 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
                wsClient.close();
                return;
            }
-            //鉴权
-            this.authorize(this.config.token, wsClient, wsReq);
+            // 鉴权 close 不会立刻销毁 当前返回可避免挂载message事件 close 并未立刻关闭 而是存在timer操作后关闭
+            // 引发高危漏洞
+            if (!this.authorize(this.config.token, wsClient, wsReq)) {
+                return;
+            }
            const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
            const isApiConnect = paramUrl === '/api' || paramUrl === '/api/';
            if (!isApiConnect) {
@@ -145,15 +148,16 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
    }

    private authorize(token: string | undefined, wsClient: WebSocket, wsReq: IncomingMessage) {
-        if (!token || token.length == 0) return;//客户端未设置密钥
+        if (!token || token.length == 0) return true;//客户端未设置密钥
        const QueryClientToken = urlParse.parse(wsReq?.url || '', true).query['access_token'];
        const HeaderClientToken = wsReq.headers.authorization?.split('Bearer ').pop() || '';
        const ClientToken = typeof (QueryClientToken) === 'string' && QueryClientToken !== '' ? QueryClientToken : HeaderClientToken;
        if (ClientToken === token) {
-            return;
+            return true;
        }
        wsClient.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')));
        wsClient.close();
+        return false;
    }

    private checkStateAndReply<T>(data: T, wsClient: WebSocket) {
--- a/src/shell/pipe.ts
+++ b/src/shell/pipe.ts
@@ -1,6 +1,7 @@
 import { LogWrapper } from '@/common/log';
 import * as net from 'net';
 import * as process from 'process';
+import { Writable } from 'stream';

 /**
 * 连接到命名管道并重定向stdout
@@ -11,7 +12,6 @@ import * as process from 'process';
 export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000): Promise<{ disconnect: () => void }> {
    return new Promise((resolve, reject) => {
        if (process.platform !== 'win32') {
-            logger.log('只有Windows平台支持命名管道');
            // 非Windows平台不reject，而是返回一个空的disconnect函数
            return resolve({ disconnect: () => { } });
        }
@@ -25,12 +25,50 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
        }, timeoutMs);

        try {
-            let originalStdoutWrite = process.stdout.write.bind(process.stdout);
+            const originalStdoutWrite = process.stdout.write.bind(process.stdout);
            const pipeSocket = net.connect(pipePath, () => {
                // 清除超时
                clearTimeout(timeoutId);

+                // 优化网络性能设置
+                pipeSocket.setNoDelay(true); // 减少延迟
+
+                // 设置更高的高水位线，允许更多数据缓冲
+
                logger.log(`[StdOut] 已重定向到命名管道: ${pipePath}`);
+
+                // 创建拥有更优雅背压处理的 Writable 流
+                const pipeWritable = new Writable({
+                    highWaterMark: 1024 * 64, // 64KB 高水位线
+                    write(chunk, encoding, callback) {
+                        if (!pipeSocket.writable) {
+                            // 如果管道不可写，退回到原始stdout
+                            logger.log('[StdOut] 管道不可写，回退到控制台输出');
+                            return originalStdoutWrite(chunk, encoding, callback);
+                        }
+
+                        // 尝试写入数据到管道
+                        const canContinue = pipeSocket.write(chunk, encoding, () => {
+                            // 数据已被发送或放入内部缓冲区
+                        });
+
+                        if (canContinue) {
+                            // 如果返回true，表示可以继续写入更多数据
+                            // 立即通知写入流可以继续
+                            process.nextTick(callback);
+                        } else {
+                            // 如果返回false，表示内部缓冲区已满
+                            // 等待drain事件再恢复写入
+                            pipeSocket.once('drain', () => {
+                                callback();
+                            });
+                        }
+                        // 明确返回true，表示写入已处理
+                        return true;
+                    }
+                });
+
+                // 重定向stdout
                process.stdout.write = (
                    chunk: any,
                    encoding?: BufferEncoding | (() => void),
@@ -40,8 +78,11 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                        cb = encoding;
                        encoding = undefined;
                    }
-                    return pipeSocket.write(chunk, encoding as BufferEncoding, cb);
+
+                    // 使用优化的writable流处理写入
+                    return pipeWritable.write(chunk, encoding as BufferEncoding, cb as () => void);
                };
+
                // 提供断开连接的方法
                const disconnect = () => {
                    process.stdout.write = originalStdoutWrite;
@@ -53,6 +94,7 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                resolve({ disconnect });
            });

+            // 管道错误处理
            pipeSocket.on('error', (err) => {
                clearTimeout(timeoutId);
                process.stdout.write = originalStdoutWrite;
@@ -60,11 +102,18 @@ export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000)
                reject(err);
            });

+            // 管道关闭处理
            pipeSocket.on('end', () => {
                process.stdout.write = originalStdoutWrite;
                logger.log('命名管道连接已关闭');
            });

+            // 确保在连接意外关闭时恢复stdout
+            pipeSocket.on('close', () => {
+                process.stdout.write = originalStdoutWrite;
+                logger.log('命名管道连接已关闭');
+            });
+
        } catch (error) {
            clearTimeout(timeoutId);
            logger.log(`尝试连接命名管道 ${pipePath} 时发生异常:`, error);
--- a/src/webui/index.ts
+++ b/src/webui/index.ts
@@ -122,7 +122,9 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp

    // ------------挂载路由------------
    // 挂载静态路由（前端），路径为 /webui
-    app.use('/webui', express.static(pathWrapper.staticPath));
+    app.use('/webui', express.static(pathWrapper.staticPath, {
+        maxAge: '1d'
+    }));
    // 初始化WebSocket服务器
    const sslCerts = await checkCertificates(logger);
    const isHttps = !!sslCerts;
Author	SHA1	Message	Date
手瓜一十雪	6927b1c94f	Merge branch 'main' of https://github.com/NapNeko/NapCatQQ	2025-05-18 20:59:17 +08:00
手瓜一十雪	a09c6acd0d	fix	2025-05-18 20:59:11 +08:00
Mlikiowa	0963650ccb	release: v4.6.65	2025-05-18 12:58:07 +00:00
手瓜一十雪	380688b353	fix	2025-05-18 20:57:41 +08:00
手瓜一十雪	ad5466bff8	Merge branch 'main' of https://github.com/NapNeko/NapCatQQ	2025-05-18 20:55:13 +08:00
手瓜一十雪	a83652bf3f	feat: 更优美的代码	2025-05-18 20:55:11 +08:00
Mlikiowa	c632de314d	release: v4.7.64	2025-05-18 12:49:37 +00:00
手瓜一十雪	259c9610d5	Merge pull request #1022 from NapNeko/poke_enhance fix: #1018	2025-05-18 20:45:08 +08:00
手瓜一十雪	e9936c5524	fix	2025-05-18 20:42:03 +08:00
手瓜一十雪	3f60440e72	fix	2025-05-18 20:24:49 +08:00
手瓜一十雪	71a15f92fb	fix	2025-05-18 20:19:53 +08:00
手瓜一十雪	32bc0dd820	fix	2025-05-18 20:16:55 +08:00
手瓜一十雪	20d1ac9d01	fix: #1018	2025-05-18 20:15:38 +08:00
手瓜一十雪	18baf89e0e	Merge pull request #1021 from NapNeko/feat-new-context feat: 隔离context传递避免高并发干扰一个实例	2025-05-18 19:27:23 +08:00
手瓜一十雪	3a1d1f2e59	feat: 隔离context传递避免高并发干扰一个实例	2025-05-18 19:21:14 +08:00
手瓜一十雪	e9a048721d	fix: readonly	2025-05-18 19:02:31 +08:00
手瓜一十雪	68f0c7ff1a	fix: readonly	2025-05-18 19:01:57 +08:00
手瓜一十雪	2875fe94ea	Merge pull request #1020 from pohgxz/main 增加抽象类，修改继承关系	2025-05-18 18:59:25 +08:00
手瓜一十雪	1870427c0f	fix: readonly	2025-05-18 18:58:27 +08:00
手瓜一十雪	636568fd30	fix: 字面量 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-18 18:56:59 +08:00
手瓜一十雪	bbc2391bf8	fix: 别名 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-18 18:55:56 +08:00
手瓜一十雪	401684542a	fix: override Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>	2025-05-18 18:53:01 +08:00
手瓜一十雪	870edb2513	fix: override Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>	2025-05-18 18:52:07 +08:00
Nepenthe	7ad09169ea	增加抽象类，修改继承关系	2025-05-18 18:32:23 +08:00
手瓜一十雪	c1a0f8915b	docs: mai	2025-05-17 17:54:53 +08:00
Mlikiowa	dcdab8e5a1	release: v4.7.63	2025-05-17 05:09:36 +00:00
手瓜一十雪	eb3278fdab	feat: 35184	2025-05-17 11:16:39 +08:00
手瓜一十雪	34db3af48d	fix: #1007	2025-05-15 21:10:21 +08:00
Mlikiowa	198da960dd	release: v4.7.62	2025-05-12 12:37:01 +00:00
手瓜一十雪	cb83918fb3	fix	2025-05-12 20:36:39 +08:00
Mlikiowa	f59a48540b	release: v4.7.61	2025-05-12 12:34:18 +00:00
手瓜一十雪	ccf9c1a5fb	Merge pull request #1005 from NapNeko/fix-1001 refactor: remove image-size	2025-05-12 20:22:35 +08:00
手瓜一十雪	ba6a85142a	fix	2025-05-12 19:29:40 +08:00
手瓜一十雪	440baccd2a	fix	2025-05-12 19:27:46 +08:00
手瓜一十雪	690c073328	fix	2025-05-12 19:27:01 +08:00
手瓜一十雪	3f0730ed4f	fix	2025-05-12 19:25:03 +08:00
手瓜一十雪	01d5663bc8	fix: image size	2025-05-12 19:18:33 +08:00
手瓜一十雪	49806cd00e	Create index.ts	2025-05-12 19:17:17 +08:00
手瓜一十雪	935b0848e5	Merge pull request #1004 from NapNeko/dependabot/npm_and_yarn/esbuild-0.25.4 build(deps-dev): bump esbuild from 0.25.0 to 0.25.4	2025-05-12 18:45:23 +08:00
dependabot[bot]	5ca20a89a2	build(deps-dev): bump esbuild from 0.25.0 to 0.25.4 Bumps [esbuild](https://github.com/evanw/esbuild) from 0.25.0 to 0.25.4. - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](https://github.com/evanw/esbuild/compare/v0.25.0...v0.25.4) --- updated-dependencies: - dependency-name: esbuild dependency-version: 0.25.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-05-12 08:37:11 +00:00
Mlikiowa	e89a2266ec	release: v4.7.60	2025-05-11 03:32:29 +00:00
手瓜一十雪	6607533311	fix: #996	2025-05-11 11:31:52 +08:00
Mlikiowa	4057054220	release: v4.7.58	2025-05-11 03:24:02 +00:00
手瓜一十雪	055e43845e	feat: ffmpeg下载来源更换	2025-05-11 11:23:43 +08:00
Mlikiowa	d67270f2f8	release: v4.7.57	2025-05-10 13:15:37 +00:00
手瓜一十雪	d061b6c190	feat: 34958	2025-05-10 21:15:07 +08:00
Mlikiowa	945f87d77f	release: v4.7.56	2025-05-09 11:28:05 +00:00
手瓜一十雪	6c9be52d39	feat: 34740	2025-05-09 19:16:25 +08:00
手瓜一十雪	98e347f010	fix: 过滤掉已读	2025-05-09 18:51:00 +08:00
手瓜一十雪	607e367bb1	fix	2025-05-09 13:17:47 +08:00
Mlikiowa	7a25dc1ef1	release: v4.7.55	2025-05-08 10:11:36 +00:00
手瓜一十雪	e22ec4be09	Merge pull request #991 from NapNeko/fix-upload-foward-cahce-del fix: upload-foward-cache-del	2025-05-08 18:10:45 +08:00
手瓜一十雪	51a06622f9	fix: typo Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>	2025-05-08 18:04:40 +08:00
手瓜一十雪	22faf5b831	fix	2025-05-08 17:58:12 +08:00
手瓜一十雪	e781c662b2	fix	2025-05-08 15:20:55 +08:00
手瓜一十雪	5744698d24	docs: 清空不好的影响&推荐一下	2025-05-08 15:20:06 +08:00
Mlikiowa	2c2ab3cd48	release: v4.7.51	2025-05-07 15:16:50 +00:00
手瓜一十雪	cfae4f5acd	fix: 增强	2025-05-07 22:26:25 +08:00
Mlikiowa	de541e3249	release: v4.5.50	2025-05-07 14:10:15 +00:00
手瓜一十雪	f5187c5c01	Merge pull request #989 from NapNeko/file-url-feat feat: 消息上报Url重构	2025-05-07 22:09:29 +08:00
手瓜一十雪	9936279443	fix	2025-05-07 22:03:00 +08:00
手瓜一十雪	2818773fd4	fix	2025-05-07 20:53:36 +08:00
手瓜一十雪	b9293cbcd0	fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-07 20:51:50 +08:00
手瓜一十雪	5b9e44ddfc	fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-07 20:51:28 +08:00
手瓜一十雪	1791accab7	fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-07 20:51:12 +08:00
手瓜一十雪	08081360f3	fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-07 20:50:51 +08:00
手瓜一十雪	e933a95e97	fix	2025-05-07 18:10:58 +08:00
手瓜一十雪	4ef457fe6f	feat: fileUrl Get	2025-05-07 18:10:49 +08:00
Mlikiowa	bd9cae8921	release: v4.7.49	2025-05-07 09:16:28 +00:00
手瓜一十雪	303a74f8fd	feat: 背压问题	2025-05-07 17:14:57 +08:00
Mlikiowa	0b7f126ce1	release: v4.7.48	2025-05-07 08:21:34 +00:00
Clansty	308b5c027f	fix: at 变成负数	2025-05-07 03:46:17 +08:00
手瓜一十雪	ed3abc4b43	feat	2025-05-04 21:11:34 +08:00
Mlikiowa	87ecb3b380	release: v4.7.47	2025-05-03 14:27:49 +00:00
手瓜一十雪	7e31763a25	fix	2025-05-03 22:26:41 +08:00
Mlikiowa	c9df57d16a	release: v4.7.46	2025-05-03 08:08:25 +00:00
手瓜一十雪	3d0f8ee657	fix	2025-05-03 16:06:51 +08:00