feat: 更新依赖项并移除速率限制中间件

refactor: remove image-size

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"
-}
+}

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.7.51",
+  "version": "4.7.62",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.51",
+  "version": "4.7.62",
   "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",
@@ -41,30 +41,31 @@
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
+    "compressing": "^1.10.1",
     "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",
-    "express-rate-limit": "^7.5.0",
+    "express": "npm:@karinjs/express@1.0.3",
     "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",
+    "napcat.protobuf": "^1.1.4",
+    "on-finished": "^2.4.1",
+    "silk-wasm": "^3.6.1",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.13.0",
     "vite": "^6.0.1",
     "vite-plugin-cp": "^6.0.0",
+    "vite-plugin-wasm": "^3.4.1",
     "vite-tsconfig-paths": "^5.1.0",
-    "napcat.protobuf": "^1.1.4",
     "winston": "^3.17.0",
-    "compressing": "^1.10.1"
+    "ws": "npm:@karinjs/ws@1.2.0"
   },
   "dependencies": {
-    "express": "^5.0.0",
-    "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0"
+    "type-is": "^2.0.1"
   }
 }

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

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',

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.51';
+export const napCatVersion = '4.7.62';

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';
@@ -30,6 +28,7 @@ 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;
@@ -209,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,
@@ -437,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);

src/core/external/appid.json

@@ -282,5 +282,9 @@
     "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"
     }
 }

src/core/external/offset.json

@@ -354,5 +354,17 @@
     "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"
     }
 }

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 {
     }
 }

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>;
 

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 {

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;
+}

src/on-finished/index.ts

@@ -0,0 +1,372 @@
+/*!
+ * on-finished
+ * Copyright(c) 2013 Jonathan Ong
+ * Copyright(c) 2014 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+'use strict'
+
+/**
+ * 定义消息对象接口
+ */
+interface Message {
+    socket?: Socket;
+    finished?: boolean;
+    complete?: boolean;
+    readable?: boolean;
+    upgrade?: boolean;
+    __onFinished?: Listener;
+    on?: (event: string, callback: (socket: Socket) => void) => void;
+    removeListener?: (event: string, callback: Function) => void;
+    assignSocket?: (socket: Socket) => void;
+}
+
+/**
+ * 定义Socket接口
+ */
+interface Socket {
+    writable: boolean;
+    readable: boolean;
+    on?: (event: string, callback: Function) => void;
+    removeListener?: (event: string, callback: Function) => void;
+}
+
+/**
+ * 事件处理器类型
+ */
+type EventHandler = (err?: Error) => void;
+
+/**
+ * 事件元组: [对象, ...事件名称]
+ */
+type EventTuple = [unknown, ...string[]];
+
+/**
+ * 取消函数类型
+ */
+interface CancelableListener {
+    cancel: () => void;
+}
+
+/**
+ * 监听器函数类型
+ */
+type ListenerCallback = (err: Error | null, msg: Message) => void;
+
+/**
+ * 修改监听器接口，使其参数类型更通用
+ */
+interface Listener {
+    (err: Error | null | undefined): void;
+    queue: ListenerCallback[] | null;
+}
+
+/**
+ * 模块导出
+ * @public
+ */
+export { onFinished as default, isFinished };
+
+/**
+ * 模块依赖
+ * @private
+ */
+const asyncHooks = tryRequireAsyncHooks();
+
+/**
+ * 变量
+ * @private
+ */
+const defer = function(fn: ListenerCallback, err: Error | null, msg: Message): void {
+    setImmediate(fn, err, msg);
+};
+
+/**
+ * 实现 ee-first 功能：监听多个事件，当第一个事件触发时执行回调并移除所有监听器
+ * @param {Array<EventTuple>} stuff - 事件元组数组
+ * @param {EventHandler} done - 完成时的回调
+ * @returns {CancelableListener} 可取消的监听器对象
+ * @private
+ */
+function first(stuff: EventTuple[], done: EventHandler): CancelableListener {
+    if (!Array.isArray(stuff)) {
+        throw new TypeError('参数 "stuff" 必须是数组');
+    }
+
+    if (typeof done !== 'function') {
+        throw new TypeError('参数 "done" 必须是函数');
+    }
+
+    const cleanups: Function[] = [];
+    let finished = false;
+
+    // 处理所有传入的对象和事件
+    for (const tuple of stuff) {
+        if (!Array.isArray(tuple) || tuple.length < 2) {
+            throw new TypeError('每个事件元组必须是长度大于等于2的数组');
+        }
+
+        const obj = tuple[0];
+
+        if (!obj || typeof obj !== 'object') {
+            throw new TypeError('监听目标必须是对象');
+        }
+
+        // 使用类型断言确保obj有on和removeListener方法
+        const target = obj as { 
+            on: (event: string, callback: Function) => void;
+            removeListener: (event: string, callback: Function) => void;
+        };
+
+        if (typeof target.on !== 'function' || typeof target.removeListener !== 'function') {
+            throw new TypeError('监听目标必须支持 on/removeListener 方法');
+        }
+
+        const events = tuple.slice(1);
+
+        // 为每个事件创建一个监听器
+        for (const event of events) {
+            if (typeof event !== 'string') {
+                throw new TypeError('事件名称必须是字符串');
+            }
+
+            const listener = createEventListener(target, event, cleanup);
+            cleanups.push(listener.cleanup);
+            target.on(event, listener.callback);
+        }
+    }
+
+    // 创建可取消的监听器对象
+    return {
+        cancel: cleanup
+    };
+
+    // 清理函数
+    function cleanup(): void {
+        if (finished) return;
+        finished = true;
+
+        // 执行所有清理函数
+        for (const cleanup of cleanups) {
+            try {
+                cleanup();
+            } catch (err) {
+                console.error('清理事件监听器时出错:', err);
+            }
+        }
+    }
+
+    // 创建单个事件监听器
+    function createEventListener(
+        obj: { on: Function; removeListener: Function }, 
+        event: string, 
+        cleanup: Function
+    ): {
+        callback: (arg?: unknown) => void;
+        cleanup: () => void;
+    } {
+        const callback = (arg?: unknown): void => {
+            cleanup();
+            done(arg instanceof Error ? arg : undefined);
+        };
+
+        return {
+            callback,
+            cleanup: () => {
+                obj.removeListener(event, callback);
+            }
+        };
+    }
+}
+
+/**
+ * 当响应结束时调用回调，用于资源清理
+ *
+ * @param {Message} msg
+ * @param {ListenerCallback} listener
+ * @return {Message}
+ * @public
+ */
+function onFinished(msg: Message, listener: ListenerCallback): Message {
+    if (!msg || typeof msg !== 'object') {
+        throw new TypeError('参数 "msg" 必须是对象');
+    }
+
+    if (typeof listener !== 'function') {
+        throw new TypeError('参数 "listener" 必须是函数');
+    }
+
+    if (isFinished(msg) !== false) {
+        defer(listener, null, msg);
+        return msg;
+    }
+
+    // 将监听器附加到消息
+    attachListener(msg, wrap(listener));
+
+    return msg;
+}
+
+/**
+ * 确定消息是否已完成
+ *
+ * @param {Message} msg
+ * @return {boolean | undefined}
+ * @public
+ */
+function isFinished(msg: Message): boolean | undefined {
+    if (!msg || typeof msg !== 'object') {
+        throw new TypeError('参数 "msg" 必须是对象');
+    }
+
+    const socket = msg.socket;
+
+    if (typeof msg.finished === 'boolean') {
+        // OutgoingMessage
+        return Boolean(msg.finished || (socket && !socket.writable));
+    }
+
+    if (typeof msg.complete === 'boolean') {
+        // IncomingMessage
+        return Boolean(msg.upgrade || !socket || !socket.readable || (msg.complete && !msg.readable));
+    }
+
+    // 不确定状态
+    return undefined;
+}
+
+/**
+ * 将完成监听器附加到消息
+ *
+ * @param {Message} msg
+ * @param {Function} callback
+ * @private
+ */
+function attachFinishedListener(msg: Message, callback: (error?: Error) => void): void {
+    let eeMsg: CancelableListener;
+    let eeSocket: CancelableListener;
+    let finished = false;
+
+    function onFinish(error?: Error): void {
+        if (!eeMsg || !eeSocket) {
+            return; // 防御性检查
+        }
+
+        eeMsg.cancel();
+        eeSocket.cancel();
+
+        finished = true;
+        callback(error);
+    }
+
+    // 在第一个消息事件上完成
+    eeMsg = eeSocket = first([[msg, 'end', 'finish']], onFinish);
+
+    function onSocket(socket: Socket): void {
+        // 移除监听器
+        if (msg.removeListener && typeof msg.removeListener === 'function') {
+            msg.removeListener('socket', onSocket);
+        }
+
+        if (finished) return;
+        if (eeMsg !== eeSocket) return;
+
+        if (!socket || typeof socket !== 'object') {
+            return; // 防御性检查
+        }
+
+        // 在第一个socket事件上完成
+        eeSocket = first([[socket, 'error', 'close']], onFinish);
+    }
+
+    if (msg.socket) {
+        // socket已分配
+        onSocket(msg.socket);
+        return;
+    }
+
+    // 等待socket分配
+    if (msg.on && typeof msg.on === 'function') {
+        msg.on('socket', onSocket);
+    }
+}
+
+/**
+ * 将监听器附加到消息
+ *
+ * @param {Message} msg
+ * @param {ListenerCallback} listener
+ * @private
+ */
+function attachListener(msg: Message, listener: ListenerCallback): void {
+    let attached = msg.__onFinished;
+
+    // 创建私有单一监听器和队列
+    if (!attached || !attached.queue) {
+        attached = msg.__onFinished = createListener(msg);
+        attachFinishedListener(msg, attached);
+    }
+
+    if (attached.queue) {
+        attached.queue.push(listener);
+    }
+}
+
+/**
+ * 在消息上创建监听器
+ *
+ * @param {Message} msg
+ * @return {Listener}
+ * @private
+ */
+function createListener(msg: Message): Listener {
+    const listener: Listener = function listener(err: Error | null | undefined): void {
+        if (msg.__onFinished === listener) msg.__onFinished = undefined;
+        if (!listener.queue) return;
+
+        const queue = listener.queue;
+        listener.queue = null;
+
+        for (let i = 0; i < queue.length; i++) {
+            queue[i]?.(err || null, msg);
+        }
+    };
+
+    listener.queue = [];
+
+    return listener;
+}
+
+/**
+ * 尝试引入async_hooks
+ * @private
+ */
+function tryRequireAsyncHooks(): { AsyncResource?: typeof import('async_hooks').AsyncResource } {
+    try {
+        return require('async_hooks');
+    } catch (e) {
+        return {};
+    }
+}
+
+/**
+ * 如果可能，用async resource包装函数
+ * @private
+ */
+function wrap(fn: ListenerCallback): ListenerCallback {
+    if (typeof fn !== 'function') {
+        throw new TypeError('参数必须是函数');
+    }
+
+    // Node.js 16+ 总是有 AsyncResource
+    if (!asyncHooks.AsyncResource) {
+        return fn;
+    }
+
+    // 创建匿名资源
+    const res = new asyncHooks.AsyncResource(fn.name || 'bound-anonymous-fn');
+
+    // 返回绑定函数
+    return (res.runInAsyncScope.bind(res, fn, null) as ListenerCallback);
+}

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;
     }
 }

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');

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));

src/shell/pipe.ts

@@ -12,7 +12,6 @@ import { Writable } from 'stream';
 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: () => { } });
         }

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;

src/webui/src/router/File.ts

@@ -1,5 +1,4 @@
 import { Router } from 'express';
-import rateLimit from 'express-rate-limit';
 import {
     ListFilesHandler,
     CreateDirHandler,
@@ -20,15 +19,15 @@ import {
 
 const router = Router();
 
-const apiLimiter = rateLimit({
-    windowMs: 1 * 60 * 1000, // 1分钟内
-    max: 60, // 最大60个请求
-    validate: {
-        xForwardedForHeader: false,
-    },
-});
+// const apiLimiter = rateLimit({
+//     windowMs: 1 * 60 * 1000, // 1分钟内
+//     max: 60, // 最大60个请求
+//     validate: {
+//         xForwardedForHeader: false,
+//     },
+// });
 
-router.use(apiLimiter);
+// router.use(apiLimiter);
 
 router.get('/list', ListFilesHandler);
 router.post('/mkdir', CreateDirHandler);

vite.config.ts

@@ -3,6 +3,7 @@ import { defineConfig, PluginOption, UserConfig } from 'vite';
 import { resolve } from 'path';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import { builtinModules } from 'module';
+import wasm from 'vite-plugin-wasm';
 //依赖排除
 const external = [
     'silk-wasm',
@@ -21,6 +22,7 @@ if (process.env.NAPCAT_BUILDSYS == 'linux') {
 }
 
 const UniversalBaseConfigPlugin: PluginOption[] = [
+    wasm(),
     cp({
         targets: [
             { src: './manifest.json', dest: 'dist' },
@@ -44,6 +46,7 @@ const UniversalBaseConfigPlugin: PluginOption[] = [
 ];
 
 const FrameworkBaseConfigPlugin: PluginOption[] = [
+    wasm(),
     cp({
         targets: [
             { src: './manifest.json', dest: 'dist' },
@@ -63,6 +66,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
 ];
 
 const ShellBaseConfigPlugin: PluginOption[] = [
+    wasm(),
     cp({
         targets: [
             { src: './src/native/packet', dest: 'dist/moehoo', flatten: false },