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

refactor: remove image-size

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._
 
@@ -40,13 +41,18 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
-| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
-|:-:|:-:|:-:|:-:|
+|:-:|:-:|:-:|:-:|:-:|
+
+| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|
 
 ## Thanks
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
++ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
+
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
@@ -58,7 +64,3 @@ _Modern protocol-side framework implemented based on NTQQ._
 2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
 **本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
-
-## Warnings
-
-[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.18-32869",
+  "version": "9.9.19-34740",
-  "verHash": "e735296c",
+  "verHash": "f31348f2",
-  "linuxVersion": "3.2.16-32869",
+  "linuxVersion": "3.2.17-34740",
-  "linuxVerHash": "4c192ba9",
+  "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": {
+  "buildVersion": "34740",
-    "*": {
-      "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",
   "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.22",
+  "version": "4.7.62",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/package.json

@@ -55,6 +55,7 @@
     "ahooks": "^3.8.4",
     "axios": "^1.7.9",
     "clsx": "^2.1.1",
+    "crypto-js": "^4.2.0",
     "echarts": "^5.5.1",
     "event-source-polyfill": "^1.0.31",
     "framer-motion": "^12.0.6",
@@ -88,6 +89,7 @@
     "@eslint/js": "^9.19.0",
     "@react-types/shared": "^3.26.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@types/crypto-js": "^4.2.2",
     "@types/event-source-polyfill": "^1.0.5",
     "@types/fabric": "^5.3.9",
     "@types/node": "^22.12.0",

napcat.webui/src/controllers/webui_manager.ts

@@ -3,7 +3,7 @@ import { EventSourcePolyfill } from 'event-source-polyfill'
 import { LogLevel } from '@/const/enum'
 
 import { serverRequest } from '@/utils/request'
-
+import CryptoJS from "crypto-js";
 export interface Log {
   level: LogLevel
   message: string
@@ -17,9 +17,10 @@ export default class WebUIManager {
   }
 
   public static async loginWithToken(token: string) {
+    const sha256 = CryptoJS.SHA256(token + '.napcat').toString();
     const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
       '/auth/login',
-      { token }
+      { hash: sha256 }
     )
     return data.data.Credential
   }

napcat.webui/src/pages/web_login.tsx

@@ -47,6 +47,22 @@ export default function WebLoginPage() {
     }
   }
 
+  // 处理全局键盘事件
+  const handleKeyDown = (e: KeyboardEvent) => {
+    if (e.key === 'Enter' && !isLoading) {
+      onSubmit()
+    }
+  }
+
+  useEffect(() => {
+    document.addEventListener('keydown', handleKeyDown)
+
+    // 清理函数
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown)
+    }
+  }, [tokenValue, isLoading]) // 依赖项包含用于登录的状态
+
   useEffect(() => {
     if (token) {
       onSubmit()

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.22",
+  "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",
@@ -21,12 +21,12 @@
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
-    "@ffmpeg.wasm/main": "^0.13.1",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-typescript": "^12.1.2",
+    "@sinclair/typebox": "^0.34.9",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
@@ -38,34 +38,34 @@
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
+    "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",
     "winston": "^3.17.0",
-    "zod": "^3.24.2"
+    "ws": "npm:@karinjs/ws@1.2.0"
   },
   "dependencies": {
-    "@ffmpeg.wasm/core-mt": "^0.13.2",
+    "type-is": "^2.0.1"
-    "express": "^5.0.0",
-    "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0"
   }
-}
+}

src/common/config-base.ts

@@ -2,20 +2,22 @@ import path from 'node:path';
 import fs from 'node:fs';
 import type { NapCatCore } from '@/core';
 import json5 from 'json5';
-import { z } from 'zod';
+import Ajv, { AnySchema, ValidateFunction } from 'ajv';
 
 export abstract class ConfigBase<T> {
     name: string;
     core: NapCatCore;
     configPath: string;
     configData: T = {} as T;
-    schema: z.ZodType<T>;
+    ajv: Ajv;
+    validate: ValidateFunction<T>;
 
-    protected constructor(name: string, core: NapCatCore, configPath: string, schema: z.ZodType<T>) {
+    protected constructor(name: string, core: NapCatCore, configPath: string, ConfigSchema: AnySchema) {
         this.name = name;
         this.core = core;
         this.configPath = configPath;
-        this.schema = schema;
+        this.ajv = new Ajv({ useDefaults: true, coerceTypes: true });
+        this.validate = this.ajv.compile<T>(ConfigSchema);
         fs.mkdirSync(this.configPath, { recursive: true });
         this.read();
     }
@@ -40,16 +42,11 @@ export abstract class ConfigBase<T> {
 
     private loadConfig(configPath: string): T {
         try {
-            let configData = json5.parse(fs.readFileSync(configPath, 'utf-8'));
+            let newConfigData = json5.parse(fs.readFileSync(configPath, 'utf-8'));
-            const result = this.schema.safeParse(configData);
+            this.validate(newConfigData);
-
+            this.configData = newConfigData;
-            if (result.success) {
+            this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
-                this.configData = result.data;
+            return this.configData;
-                this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
-                return this.configData;
-            } else {
-                throw new Error(`配置文件验证失败: ${result.error.message}`);
-            }
         } catch (e: unknown) {
             this.handleError(e, '读取配置文件时发生错误');
             return {} as T;
@@ -58,14 +55,10 @@ export abstract class ConfigBase<T> {
 
     save(newConfigData: T = this.configData): void {
         const configPath = this.getConfigPath(this.core.selfInfo.uin);
+        this.validate(newConfigData);
+        this.configData = newConfigData;
         try {
-            const result = this.schema.safeParse(newConfigData);
+            fs.writeFileSync(configPath, JSON.stringify(this.configData, null, 2));
-            if (result.success) {
-                this.configData = result.data;
-                fs.writeFileSync(configPath, JSON.stringify(this.configData, null, 2));
-            } else {
-                throw new Error(`配置文件验证失败: ${result.error.message}`);
-            }
         } catch (e: unknown) {
             this.handleError(e, `保存配置文件 ${configPath} 时发生错误:`);
         }
@@ -74,8 +67,6 @@ export abstract class ConfigBase<T> {
     private handleError(e: unknown, message: string): void {
         if (e instanceof SyntaxError) {
             this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误，请检查配置文件:', e.message);
-        } else if (e instanceof z.ZodError) {
-            this.core.context.logger.logError('[Core] [Config] 配置文件验证错误:', e.message);
         } else {
             this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
         }

src/common/download-ffmpeg.ts

@@ -0,0 +1,360 @@
+// 更正导入语句
+import * as fs from 'fs';
+import * as path from 'path';
+import * as https from 'https';
+import * as os from 'os';
+import * as compressing from 'compressing';  // 修正导入方式
+import { pipeline } from 'stream/promises';
+import { fileURLToPath } from 'url';
+import { LogWrapper } from './log';
+
+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
+];
+
+/**
+ * 测试URL是否可用
+ * @param url 待测试的URL
+ * @returns 如果URL可访问返回true，否则返回false
+ */
+async function testUrl(url: string): Promise<boolean> {
+    return new Promise<boolean>((resolve) => {
+        const req = https.get(url, { timeout: 5000 }, (res) => {
+            // 检查状态码是否表示成功
+            const statusCode = res.statusCode || 0;
+            if (statusCode >= 200 && statusCode < 300) {
+                // 终止请求并返回true
+                req.destroy();
+                resolve(true);
+            } else {
+                req.destroy();
+                resolve(false);
+            }
+        });
+
+        req.on('error', () => {
+            resolve(false);
+        });
+
+        req.on('timeout', () => {
+            req.destroy();
+            resolve(false);
+        });
+    });
+}
+
+/**
+ * 查找第一个可用的URL
+ * @returns 返回第一个可用的URL，如果都不可用则返回null
+ */
+async function findAvailableUrl(): Promise<string | null> {
+    for (const url of urls) {
+        try {
+            const available = await testUrl(url);
+            if (available) {
+                return url;
+            }
+        } catch (error) {
+            // 忽略错误
+        }
+    }
+
+    return null;
+}
+/**
+ * 下载文件
+ * @param url 下载URL
+ * @param destPath 目标保存路径
+ * @returns 成功返回true，失败返回false
+ */
+async function downloadFile(url: string, destPath: string, progressCallback?: (percent: number) => void): Promise<boolean> {
+    return new Promise<boolean>((resolve) => {
+        const file = fs.createWriteStream(destPath);
+
+        const req = https.get(url, (res) => {
+            const statusCode = res.statusCode || 0;
+
+            if (statusCode >= 200 && statusCode < 300) {
+                // 获取文件总大小
+                const totalSize = parseInt(res.headers['content-length'] || '0', 10);
+                let downloadedSize = 0;
+                let lastReportedPercent = -1; // 上次报告的百分比
+                let lastReportTime = 0; // 上次报告的时间戳
+
+                // 如果有内容长度和进度回调，则添加数据监听
+                if (totalSize > 0 && progressCallback) {
+                    // 初始报告 0%
+                    progressCallback(0);
+                    lastReportTime = Date.now();
+
+                    res.on('data', (chunk) => {
+                        downloadedSize += chunk.length;
+                        const currentPercent = Math.floor((downloadedSize / totalSize) * 100);
+                        const now = Date.now();
+
+                        // 只在以下条件触发回调：
+                        // 1. 百分比变化至少为1%
+                        // 2. 距离上次报告至少500毫秒
+                        // 3. 确保报告100%完成
+                        if ((currentPercent !== lastReportedPercent &&
+                            (currentPercent - lastReportedPercent >= 1 || currentPercent === 100)) &&
+                            (now - lastReportTime >= 1000 || currentPercent === 100)) {
+
+                            progressCallback(currentPercent);
+                            lastReportedPercent = currentPercent;
+                            lastReportTime = now;
+                        }
+                    });
+                }
+
+                pipeline(res, file)
+                    .then(() => {
+                        // 确保最后报告100%
+                        if (progressCallback && lastReportedPercent !== 100) {
+                            progressCallback(100);
+                        }
+                        resolve(true);
+                    })
+                    .catch(() => resolve(false));
+            } else {
+                file.close();
+                fs.unlink(destPath, () => { });
+                resolve(false);
+            }
+        });
+
+        req.on('error', () => {
+            file.close();
+            fs.unlink(destPath, () => { });
+            resolve(false);
+        });
+    });
+}
+
+/**
+ * 解压缩zip文件中的特定内容
+ * 只解压bin目录中的文件到目标目录
+ * @param zipPath 压缩文件路径
+ * @param extractDir 解压目标路径
+ */
+async function extractBinDirectory(zipPath: string, extractDir: string): Promise<void> {
+    try {
+        // 确保目标目录存在
+        if (!fs.existsSync(extractDir)) {
+            fs.mkdirSync(extractDir, { recursive: true });
+        }
+
+        // 解压文件
+        const zipStream = new compressing.zip.UncompressStream({ source: zipPath });
+
+        return new Promise<void>((resolve, reject) => {
+            // 监听条目事件
+            zipStream.on('entry', (header, stream, next) => {
+                // 获取文件路径
+                const filePath = header.name;
+
+                // 匹配内层bin目录中的文件
+                // 例如：ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1/bin/ffmpeg.exe
+                if (filePath.includes('/bin/') && filePath.endsWith('.exe')) {
+                    // 提取文件名
+                    const fileName = path.basename(filePath);
+                    const targetPath = path.join(extractDir, fileName);
+
+                    // 创建写入流
+                    const writeStream = fs.createWriteStream(targetPath);
+
+                    // 将流管道连接到文件
+                    stream.pipe(writeStream);
+
+                    // 监听写入完成事件
+                    writeStream.on('finish', () => {
+                        next();
+                    });
+
+                    writeStream.on('error', () => {
+                        next();
+                    });
+                } else {
+                    // 跳过不需要的文件
+                    stream.resume();
+                    next();
+                }
+            });
+
+            zipStream.on('error', (err) => {
+                reject(err);
+            });
+
+            zipStream.on('finish', () => {
+                resolve();
+            });
+        });
+    } catch (err) {
+        throw err;
+    }
+}
+
+/**
+ * 下载并设置FFmpeg
+ * @param destDir 目标安装目录，默认为用户临时目录下的ffmpeg文件夹
+ * @param tempDir 临时文件目录，默认为系统临时目录
+ * @returns 返回ffmpeg可执行文件的路径，如果失败则返回null
+ */
+export async function downloadFFmpeg(
+    destDir?: string,
+    tempDir?: string,
+    progressCallback?: (percent: number, stage: string) => void
+): Promise<string | null> {
+    // 仅限Windows
+    if (os.platform() !== 'win32') {
+        return null;
+    }
+
+    const destinationDir = destDir || path.join(os.tmpdir(), 'ffmpeg');
+    const tempDirectory = tempDir || os.tmpdir();
+    const zipFilePath = path.join(tempDirectory, 'ffmpeg.zip'); // 临时下载到指定临时目录
+    const ffmpegExePath = path.join(destinationDir, 'ffmpeg.exe');
+
+    // 确保目录存在
+    if (!fs.existsSync(destinationDir)) {
+        fs.mkdirSync(destinationDir, { recursive: true });
+    }
+
+    // 确保临时目录存在
+    if (!fs.existsSync(tempDirectory)) {
+        fs.mkdirSync(tempDirectory, { recursive: true });
+    }
+
+    // 如果ffmpeg已经存在，直接返回路径
+    if (fs.existsSync(ffmpegExePath)) {
+        if (progressCallback) progressCallback(100, '已找到FFmpeg');
+        return ffmpegExePath;
+    }
+
+    // 查找可用URL
+    if (progressCallback) progressCallback(0, '查找可用下载源');
+    const availableUrl = await findAvailableUrl();
+    if (!availableUrl) {
+        return null;
+    }
+
+    // 下载文件
+    if (progressCallback) progressCallback(5, '开始下载FFmpeg');
+    const downloaded = await downloadFile(
+        availableUrl,
+        zipFilePath,
+        (percent) => {
+            // 下载占总进度的70%
+            if (progressCallback) progressCallback(5 + Math.floor(percent * 0.7), '下载FFmpeg');
+        }
+    );
+
+    if (!downloaded) {
+        return null;
+    }
+
+    try {
+        // 直接解压bin目录文件到目标目录
+        if (progressCallback) progressCallback(75, '解压FFmpeg');
+        await extractBinDirectory(zipFilePath, destinationDir);
+
+        // 清理下载文件
+        if (progressCallback) progressCallback(95, '清理临时文件');
+        try {
+            fs.unlinkSync(zipFilePath);
+        } catch (err) {
+            // 忽略清理临时文件失败的错误
+        }
+
+        // 检查ffmpeg.exe是否成功解压
+        if (fs.existsSync(ffmpegExePath)) {
+            if (progressCallback) progressCallback(100, 'FFmpeg安装完成');
+            return ffmpegExePath;
+        } else {
+            return null;
+        }
+    } catch (err) {
+        return null;
+    }
+}
+
+/**
+ * 检查系统PATH环境变量中是否存在指定可执行文件
+ * @param executable 可执行文件名
+ * @returns 如果找到返回完整路径，否则返回null
+ */
+function findExecutableInPath(executable: string): string | null {
+    // 仅适用于Windows系统
+    if (os.platform() !== 'win32') return null;
+
+    // 获取PATH环境变量
+    const pathEnv = process.env['PATH'] || '';
+    const pathDirs = pathEnv.split(';');
+
+    // 检查每个目录
+    for (const dir of pathDirs) {
+        if (!dir) continue;
+        try {
+            const filePath = path.join(dir, executable);
+            if (fs.existsSync(filePath)) {
+                return filePath;
+            }
+        } catch (error) {
+            continue;
+        }
+    }
+
+    return null;
+}
+
+export async function downloadFFmpegIfNotExists(log: LogWrapper) {
+    // 仅限Windows
+    if (os.platform() !== 'win32') {
+        return {
+            path: null,
+            reset: false
+        };
+    }
+    const ffmpegInPath = findExecutableInPath('ffmpeg.exe');
+    const ffprobeInPath = findExecutableInPath('ffprobe.exe');
+
+    if (ffmpegInPath && ffprobeInPath) {
+        const ffmpegDir = path.dirname(ffmpegInPath);
+        return {
+            path: ffmpegDir,
+            reset: true
+        };
+    }
+
+    // 如果环境变量中没有，检查项目目录中是否存在
+    const currentPath = path.dirname(fileURLToPath(import.meta.url));
+    const ffmpeg_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffmpeg.exe'));
+    const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
+
+    if (!ffmpeg_exist || !ffprobe_exist) {
+        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
+        }
+    }
+
+    return {
+        path: path.join(currentPath, 'ffmpeg'),
+        reset: true
+    }
+}

src/common/ffmpeg-worker.ts

@@ -1,308 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { FFmpeg } from '@ffmpeg.wasm/main';
-import { randomUUID } from 'crypto';
-import { readFileSync, statSync, writeFileSync } from 'fs';
-import type { VideoInfo } from './video';
-import { fileTypeFromFile } from 'file-type';
-import imageSize from 'image-size';
-import { parentPort } from 'worker_threads';
-export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
-    parentPort?.on('message', async (taskData: T) => {
-        try {
-            let ret = await cb(taskData);
-            parentPort?.postMessage(ret);
-        } catch (error: unknown) {
-            parentPort?.postMessage({ error: (error as Error).message });
-        }
-    });
-}
-export function sendLog(_log: string) {
-    //parentPort?.postMessage({ log });
-}
-class FFmpegService {
-    public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const videoFileName = `${randomUUID()}.mp4`;
-        const outputFileName = `${randomUUID()}.jpg`;
-        try {
-            ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
-            const code = await ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName);
-            if (code !== 0) {
-                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-            }
-            const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(thumbnailPath, thumbnail);
-        } catch (error) {
-            console.error('Error extracting thumbnail:', error);
-            throw error;
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(videoFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking video file:', unlinkError);
-            }
-        }
-    }
-
-    public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const inputFileName = `${randomUUID()}.pcm`;
-        const outputFileName = `${randomUUID()}.${format}`;
-        try {
-            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(inputFile));
-            const params = format === 'amr'
-                ? ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, '-ar', '8000', '-b:a', '12.2k', outputFileName]
-                : ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, outputFileName];
-            const code = await ffmpegInstance.run(...params);
-            if (code !== 0) {
-                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-            }
-            const outputData = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(outputFile, outputData);
-        } catch (error) {
-            console.error('Error converting file:', error);
-            throw error;
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(inputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking input file:', unlinkError);
-            }
-        }
-    }
-
-    public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
-        const inputFileName = `${randomUUID()}.input`;
-        const outputFileName = `${randomUUID()}.pcm`;
-        try {
-            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(filePath));
-            const params = ['-y', '-i', inputFileName, '-ar', '24000', '-ac', '1', '-f', 's16le', outputFileName];
-            const code = await ffmpegInstance.run(...params);
-            if (code !== 0) {
-                throw new Error('FFmpeg process exited with code ' + code);
-            }
-            const outputData = ffmpegInstance.fs.readFile(outputFileName);
-            writeFileSync(pcmPath, outputData);
-            return Buffer.from(outputData);
-        } catch (error: any) {
-            throw new Error('FFmpeg处理转换出错: ' + error.message);
-        } finally {
-            try {
-                ffmpegInstance.fs.unlink(outputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-            try {
-                ffmpegInstance.fs.unlink(inputFileName);
-            } catch (unlinkError) {
-                console.error('Error unlinking output file:', unlinkError);
-            }
-        }
-    }
-    public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const startTime = Date.now();
-        sendLog(`开始获取视频信息: ${videoPath}`);
-
-        // 创建一个超时包装函数
-        const withTimeout = <T>(promise: Promise<T>, timeoutMs: number, taskName: string): Promise<T> => {
-            return Promise.race([
-                promise,
-                new Promise<T>((_, reject) => {
-                    setTimeout(() => reject(new Error(`任务超时: ${taskName} (${timeoutMs}ms)`)), timeoutMs);
-                })
-            ]);
-        };
-
-        // 并行执行多个任务
-        const [fileInfo, durationInfo] = await Promise.all([
-            // 任务1: 获取文件信息和提取缩略图
-            (async () => {
-                sendLog('开始任务1: 获取文件信息和提取缩略图');
-
-                // 获取文件信息 (并行)
-                const fileInfoStartTime = Date.now();
-                const [fileType, fileSize] = await Promise.all([
-                    withTimeout(fileTypeFromFile(videoPath), 10000, '获取文件类型')
-                        .then(result => {
-                            sendLog(`获取文件类型完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
-                            return result;
-                        }),
-                    (async () => {
-                        const result = statSync(videoPath).size;
-                        sendLog(`获取文件大小完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
-                        return result;
-                    })()
-                ]);
-
-                // 直接实现缩略图提取 (不调用extractThumbnail方法)
-                const thumbStartTime = Date.now();
-                sendLog('开始提取缩略图');
-
-                const ffmpegInstance = await withTimeout(
-                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
-                    15000,
-                    '创建FFmpeg实例(缩略图)'
-                );
-
-                const videoFileName = `${randomUUID()}.mp4`;
-                const outputFileName = `${randomUUID()}.jpg`;
-
-                try {
-                    // 写入视频文件到FFmpeg
-                    const writeFileStartTime = Date.now();
-                    ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
-                    sendLog(`写入视频文件到FFmpeg完成，耗时: ${Date.now() - writeFileStartTime}ms`);
-
-                    // 提取缩略图
-                    const extractStartTime = Date.now();
-                    const code = await withTimeout(
-                        ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName),
-                        30000,
-                        '提取缩略图'
-                    );
-                    sendLog(`FFmpeg提取缩略图命令执行完成，耗时: ${Date.now() - extractStartTime}ms`);
-
-                    if (code !== 0) {
-                        throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
-                    }
-
-                    // 读取并保存缩略图
-                    const saveStartTime = Date.now();
-                    const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
-                    writeFileSync(thumbnailPath, thumbnail);
-                    sendLog(`读取并保存缩略图完成，耗时: ${Date.now() - saveStartTime}ms`);
-
-                    // 获取缩略图尺寸
-                    const imageSizeStartTime = Date.now();
-                    const image = imageSize(thumbnailPath);
-                    sendLog(`获取缩略图尺寸完成，耗时: ${Date.now() - imageSizeStartTime}ms`);
-
-                    sendLog(`提取缩略图完成，总耗时: ${Date.now() - thumbStartTime}ms`);
-
-                    return {
-                        format: fileType?.ext ?? 'mp4',
-                        size: fileSize,
-                        width: image.width ?? 100,
-                        height: image.height ?? 100
-                    };
-                } finally {
-                    // 清理资源
-                    try {
-                        ffmpegInstance.fs.unlink(outputFileName);
-                    } catch (error) {
-                        sendLog(`清理输出文件失败: ${(error as Error).message}`);
-                    }
-
-                    try {
-                        ffmpegInstance.fs.unlink(videoFileName);
-                    } catch (error) {
-                        sendLog(`清理视频文件失败: ${(error as Error).message}`);
-                    }
-                }
-            })(),
-
-            // 任务2: 获取视频时长
-            (async () => {
-                const task2StartTime = Date.now();
-                sendLog('开始任务2: 获取视频时长');
-
-                // 创建FFmpeg实例
-                const ffmpegCreateStartTime = Date.now();
-                const ffmpegInstance = await withTimeout(
-                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
-                    15000,
-                    '创建FFmpeg实例(时长)'
-                );
-                sendLog(`创建FFmpeg实例完成，耗时: ${Date.now() - ffmpegCreateStartTime}ms`);
-
-                const inputFileName = `${randomUUID()}.mp4`;
-
-                try {
-                    // 写入文件
-                    const writeStartTime = Date.now();
-                    ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
-                    sendLog(`写入文件到FFmpeg完成，耗时: ${Date.now() - writeStartTime}ms`);
-
-                    ffmpegInstance.setLogging(true);
-                    let duration = 60; // 默认值
-
-                    ffmpegInstance.setLogger((_level, ...msg) => {
-                        const message = msg.join(' ');
-                        const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
-                        if (durationMatch) {
-                            const hours = parseInt(durationMatch[1] ?? '0', 10);
-                            const minutes = parseInt(durationMatch[2] ?? '0', 10);
-                            const seconds = parseFloat(durationMatch[3] ?? '0');
-                            duration = hours * 3600 + minutes * 60 + seconds;
-                        }
-                    });
-
-                    // 执行FFmpeg
-                    const runStartTime = Date.now();
-                    await withTimeout(
-                        ffmpegInstance.run('-i', inputFileName),
-                        20000,
-                        '获取视频时长'
-                    );
-                    sendLog(`执行FFmpeg命令完成，耗时: ${Date.now() - runStartTime}ms`);
-
-                    sendLog(`任务2(获取视频时长)完成，总耗时: ${Date.now() - task2StartTime}ms`);
-                    return { time: duration };
-                } finally {
-                    try {
-                        ffmpegInstance.fs.unlink(inputFileName);
-                    } catch (error) {
-                        sendLog(`清理输入文件失败: ${(error as Error).message}`);
-                    }
-                }
-            })()
-        ]);
-
-        // 合并结果并返回
-        const totalDuration = Date.now() - startTime;
-        sendLog(`获取视频信息完成，总耗时: ${totalDuration}ms`);
-
-        return {
-            width: fileInfo.width,
-            height: fileInfo.height,
-            time: durationInfo.time,
-            format: fileInfo.format,
-            size: fileInfo.size,
-            filePath: videoPath
-        };
-    }
-}
-type FFmpegMethod = 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
-
-interface FFmpegTask {
-    method: FFmpegMethod;
-    args: any[];
-}
-export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
-    switch (method) {
-    case 'extractThumbnail':
-        return await FFmpegService.extractThumbnail(...args as [string, string]);
-    case 'convertFile':
-        return await FFmpegService.convertFile(...args as [string, string, string]);
-    case 'convert':
-        return await FFmpegService.convert(...args as [string, string]);
-    case 'getVideoInfo':
-        return await FFmpegService.getVideoInfo(...args as [string, string]);
-    default:
-        throw new Error(`Unknown method: ${method}`);
-    }
-}
-recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
-    return await handleFFmpegTask({ method, args });
-});

src/common/ffmpeg.ts

@@ -1,36 +1,195 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
-import { VideoInfo } from './video';
+import path, { dirname } from 'path';
-import path from 'path';
+import { execFile } from 'child_process';
-import { fileURLToPath } from 'url';
+import { promisify } from 'util';
-import { runTask } from './worker';
+import type { VideoInfo } from './video';
-
+import { fileTypeFromFile } from 'file-type';
-type EncodeArgs = {
+import { fileURLToPath } from 'node:url';
-    method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
+import { platform } from 'node:os';
-    args: any[];
+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 => {
+    if (process.platform === 'win32') {
+        const exeName = `${tool}.exe`;
+        const isLocalExeExists = existsSync(path.join(currentPath, 'ffmpeg', exeName));
+        return isLocalExeExists ? path.join(currentPath, 'ffmpeg', exeName) : exeName;
+    }
+    return tool;
 };
-
+export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
-type EncodeResult = any;
+export let FFPROBE_CMD = getFFmpegPath('ffprobe');
-
-function getWorkerPath() {
-    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
-}
-
 export class FFmpegService {
+    // 确保目标目录存在
+    public static setFfmpegPath(ffmpegPath: string,logger:LogWrapper): void {
+        if (platform() === 'win32') {
+            FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
+            FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
+            logger.log('[Check] ffmpeg:', FFMPEG_CMD);
+            logger.log('[Check] ffprobe:', FFPROBE_CMD);
+        }
+    }
+    private static ensureDirExists(filePath: string): void {
+        const dir = dirname(filePath);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true });
+        }
+    }
+
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
+        try {
+            this.ensureDirExists(thumbnailPath);
+
+            const { stderr } = await execFileAsync(FFMPEG_CMD, [
+                '-i', videoPath,
+                '-ss', '00:00:01.000',
+                '-vframes', '1',
+                '-y', // 覆盖输出文件
+                thumbnailPath
+            ]);
+
+            if (!existsSync(thumbnailPath)) {
+                throw new Error(`提取缩略图失败，输出文件不存在: ${stderr}`);
+            }
+        } catch (error) {
+            console.error('Error extracting thumbnail:', error);
+            throw new Error(`提取缩略图失败: ${(error as Error).message}`);
+        }
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
+        try {
+            this.ensureDirExists(outputFile);
+
+            const params = format === 'amr'
+                ? [
+                    '-f', 's16le',
+                    '-ar', '24000',
+                    '-ac', '1',
+                    '-i', inputFile,
+                    '-ar', '8000',
+                    '-b:a', '12.2k',
+                    '-y',
+                    outputFile
+                ]
+                : [
+                    '-f', 's16le',
+                    '-ar', '24000',
+                    '-ac', '1',
+                    '-i', inputFile,
+                    '-y',
+                    outputFile
+                ];
+
+            await execFileAsync(FFMPEG_CMD, params);
+
+            if (!existsSync(outputFile)) {
+                throw new Error('转换失败，输出文件不存在');
+            }
+        } catch (error) {
+            console.error('Error converting file:', error);
+            throw new Error(`文件转换失败: ${(error as Error).message}`);
+        }
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
+        try {
-        return result;
+            this.ensureDirExists(pcmPath);
+
+            await execFileAsync(FFMPEG_CMD, [
+                '-y',
+                '-i', filePath,
+                '-ar', '24000',
+                '-ac', '1',
+                '-f', 's16le',
+                pcmPath
+            ]);
+
+            if (!existsSync(pcmPath)) {
+                throw new Error('转换PCM失败，输出文件不存在');
+            }
+
+            return readFileSync(pcmPath);
+        } catch (error: any) {
+            throw new Error(`FFmpeg处理转换出错: ${error.message}`);
+        }
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
+        try {
-        return result;
+            // 并行执行获取文件信息和提取缩略图
+            const [fileInfo, duration] = await Promise.all([
+                this.getFileInfo(videoPath, thumbnailPath),
+                this.getVideoDuration(videoPath)
+            ]);
+
+            const result: VideoInfo = {
+                width: fileInfo.width,
+                height: fileInfo.height,
+                time: duration,
+                format: fileInfo.format,
+                size: fileInfo.size,
+                filePath: videoPath
+            };
+            return result;
+        } catch (error) {
+            throw error;
+        }
     }
-}
+
+    private static async getFileInfo(videoPath: string, thumbnailPath: string): Promise<{
+        format: string,
+        size: number,
+        width: number,
+        height: number
+    }> {
+
+        // 获取文件大小和类型
+        const [fileType, fileSize] = await Promise.all([
+            fileTypeFromFile(videoPath).catch(() => {
+                return null;
+            }),
+            Promise.resolve(statSync(videoPath).size)
+        ]);
+
+
+        try {
+            await this.extractThumbnail(videoPath, thumbnailPath);
+            // 获取图片尺寸
+            const dimensions = await imageSizeFallBack(thumbnailPath);
+
+            return {
+                format: fileType?.ext ?? 'mp4',
+                size: fileSize,
+                width: dimensions.width ?? 100,
+                height: dimensions.height ?? 100
+            };
+        } catch (error) {
+            return {
+                format: fileType?.ext ?? 'mp4',
+                size: fileSize,
+                width: 100,
+                height: 100
+            };
+        }
+    }
+
+    private static async getVideoDuration(videoPath: string): Promise<number> {
+        try {
+            // 使用FFprobe获取时长
+            const { stdout } = await execFileAsync(FFPROBE_CMD, [
+                '-v', 'error',
+                '-show_entries', 'format=duration',
+                '-of', 'default=noprint_wrappers=1:nokey=1',
+                videoPath
+            ]);
+
+            const duration = parseFloat(stdout.trim());
+
+            return isNaN(duration) ? 60 : duration;
+        } catch (error) {
+            return 60; // 默认时长
+        }
+    }
+}

src/common/file.ts

@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
     }
-    const fetchRes = await fetch(url, { headers }).catch((err) => {
+    const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
@@ -145,8 +145,8 @@ export enum FileUriType {
 
 export async function checkUriType(Uri: string) {
     const LocalFileRet = await solveProblem((uri: string) => {
-        if (fs.existsSync(uri)) {
+        if (fs.existsSync(path.normalize(uri))) {
-            return { Uri: uri, Type: FileUriType.Local };
+            return { Uri: path.normalize(uri), Type: FileUriType.Local };
         }
         return undefined;
     }, Uri);
@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-    case FileUriType.Local: {
+        case FileUriType.Local: {
-        const fileExt = path.extname(HandledUri);
+            const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-        const tempFilePath = path.join(dir, filename + fileExt);
+            const tempFilePath = path.join(dir, filename + fileExt);
-        fs.copyFileSync(HandledUri, tempFilePath);
+            fs.copyFileSync(HandledUri, tempFilePath);
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-    }
+        }
 
-    case FileUriType.Remote: {
+        case FileUriType.Remote: {
-        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-        fs.writeFileSync(filePath, buffer);
+            fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    case FileUriType.Base64: {
+        case FileUriType.Base64: {
-        const base64 = HandledUri.replace(/^base64:\/\//, '');
+            const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
+            const base64Buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer);
+            fs.writeFileSync(filePath, base64Buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    default:
+        default:
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/version.ts

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

src/common/worker.ts

@@ -9,7 +9,7 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
                     console.error('Worker Log--->:', (result as { log: string }).log);
                 }
                 if ((result as any)?.error) {
-                    reject(new Error('Worker error: ' + (result as { error: string }).error));
+                    reject(new Error("Worker error: " + (result as { error: string }).error));
                 }
                 resolve(result);
             });

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;
@@ -44,7 +45,7 @@ export class NTQQFileApi {
             'https://secret-service.bietiaop.com/rkeys',
             'http://ss.xingzhige.com/music_card/rkey',
         ],
-        this.context.logger
+            this.context.logger
         );
     }
 
@@ -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,
@@ -308,23 +379,24 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                    case ElementType.PIC:
+                        case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.VIDEO:
+                        case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.PTT:
+                        case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
-                    case ElementType.FILE:
+                        case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                        break;
+                            break;
                     }
                     elementIndex++;
                 }
             });
         });
+        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -345,6 +417,7 @@ export class NTQQFileApi {
             'NodeIKernelMsgListener/onRichMediaDownloadComplete',
             [{
                 fileModelId: '0',
+                downSourceType: 0,
                 downloadSourceType: 0,
                 triggerType: 1,
                 msgId: msgId,
@@ -363,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/apis/friend.ts

@@ -86,4 +86,31 @@ export class NTQQFriendApi {
             accept,
         });
     }
+    async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
+        this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
+    }
+    async getDoubtFriendRequest(count: number) {
+        let date = Date.now().toString();
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelBuddyService/getDoubtBuddyReq',
+            'NodeIKernelBuddyListener/onDoubtBuddyReqChange',
+            [date, count, ''],
+            () => true,
+            (data) => data.reqId === date
+        );
+        let requests = Promise.all(ret.doubtList.map(async (item) => {
+            return {
+                flag: item.uid, //注意强制String 非isNumeric 不遵守则不符合设计
+                uin: await this.core.apis.UserApi.getUinByUidV2(item.uid) ?? 0,// 信息字段
+                nick: item.nick, // 信息字段 这个不是nickname 可能是来源的群内的昵称
+                source: item.source, // 信息字段
+                reason: item.reason, // 信息字段
+                msg: item.msg, // 信息字段
+                group_code: item.groupCode, // 信息字段
+                time: item.reqTime, // 信息字段
+                type: 'doubt' //保留字段
+            };
+        }))
+        return requests;
+    }
 }

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,

src/core/external/appid.json

@@ -242,5 +242,49 @@
     "3.2.17-34231": {
         "appid": 537279245,
         "qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
+    },
+    "9.9.19-34362": {
+        "appid": 537279260,
+        "qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
+    },
+    "3.2.17-34362": {
+        "appid": 537279296,
+        "qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
+    },
+    "9.9.19-34467": {
+        "appid": 537282256,
+        "qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
+    },
+    "3.2.17-34467": {
+        "appid": 537282292,
+        "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
+    },
+    "9.9.19-34566": {
+        "appid": 537282307,
+        "qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
+    },
+    "3.2.17-34566": {
+        "appid": 537282343,
+        "qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
+    },
+    "3.2.17-34606": {
+        "appid": 537282343,
+        "qua": "V1_LNX_NQ_3.2.17_34606_GW_B"
+    },
+    "9.9.19-34606": {
+        "appid": 537282307,
+        "qua": "V1_WIN_NQ_9.9.19_34606_GW_B"
+    },
+    "9.9.19-34740": {
+        "appid": 537290691,
+        "qua": "V1_WIN_NQ_9.9.19_34740_GW_B"
+    },
+    "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

@@ -326,5 +326,45 @@
     "3.2.17-34231-arm64": {
         "send": "770CDC0",
         "recv": "77106F0"
+    },
+    "9.9.19-34362-x64": {
+        "send": "3BD80D0",
+        "recv": "3BDC8D0"
+    },
+    "9.9.19-34467-x64": {
+        "send": "3BD8690",
+        "recv": "3BDCE90"
+    },
+    "9.9.19-34566-x64": {
+        "send": "3BDA110",
+        "recv": "3BDE910"
+    },
+    "9.9.19-34606-x64": {
+        "send": "3BDA110",
+        "recv": "3BDE910"
+    },
+    "3.2.17-34606-x64": {
+        "send": "AD7DC60",
+        "recv": "AD81680"
+    },
+    "3.2.17-34606-arm64": {
+        "send": "7711270",
+        "recv": "7714BA0"
+    },
+    "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/helper/config.ts

@@ -1,21 +1,22 @@
 import { ConfigBase } from '@/common/config-base';
 import { NapCatCore } from '@/core';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
+import { AnySchema } from 'ajv';
 
-export const NapcatConfigSchema = z.object({
+export const NapcatConfigSchema = Type.Object({
-    fileLog: z.coerce.boolean().default(false),
+    fileLog: Type.Boolean({ default: false }),
-    consoleLog: z.coerce.boolean().default(true),
+    consoleLog: Type.Boolean({ default: true }),
-    fileLogLevel: z.coerce.string().default('debug'),
+    fileLogLevel: Type.String({ default: 'debug' }),
-    consoleLogLevel: z.coerce.string().default('info'),
+    consoleLogLevel: Type.String({ default: 'info' }),
-    packetBackend: z.coerce.string().default('auto'),
+    packetBackend: Type.String({ default: 'auto' }),
-    packetServer: z.coerce.string().default(''),
+    packetServer: Type.String({ default: '' }),
-    o3HookMode: z.coerce.number().default(0),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
-export type NapcatConfig = z.infer<typeof NapcatConfigSchema>;
+export type NapcatConfig = Static<typeof NapcatConfigSchema>;
 
 export class NapCatConfigLoader extends ConfigBase<NapcatConfig> {
-    constructor(core: NapCatCore, configPath: string, schema: z.ZodType<any>) {
+    constructor(core: NapCatCore, configPath: string, schema: AnySchema) {
         super('napcat', core, configPath, schema);
     }
-}
+}

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,57 +3,75 @@ 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);
     }
 
-    onDoubtBuddyReqChange(arg: unknown): any {
+    onDoubtBuddyReqChange(_arg:
+        {
+            reqId: string;
+            cookie: string;
+            doubtList: Array<{
+                uid: string;
+                nick: string;
+                age: number,
+                sex: number;
+                commFriendNum: number;
+                reqTime: string;
+                msg: string;
+                source: string;
+                reason: string;
+                groupCode: string;
+                nameMore?: null;
+            }>;
+        }): void | Promise<void> {
     }
 
-    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
+    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/listeners/NodeIKernelMsgListener.ts

@@ -21,7 +21,8 @@ export interface OnRichMediaDownloadCompleteParams {
     clientMsg: string,
     businessId: number,
     userTotalSpacePerDay: unknown,
-    userUsedSpacePerDay: unknown
+    userUsedSpacePerDay: unknown,
+    chatType: number,
 }
 
 export interface GroupFileInfoUpdateParamType {
@@ -97,112 +98,112 @@ export interface TempOnRecvParams {
 }
 
 export class NodeIKernelMsgListener {
-    onAddSendMsg(msgRecord: RawMessage): any {
+    onAddSendMsg(_msgRecord: RawMessage): any {
 
     }
 
-    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperDownloadComplete(_broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperProgressUpdate(_broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): any {
+    onChannelFreqLimitInfoUpdate(_contact: unknown, _z: unknown, _freqLimitInfo: unknown): any {
 
     }
 
-    onContactUnreadCntUpdate(hashMap: unknown): any {
+    onContactUnreadCntUpdate(_hashMap: unknown): any {
 
     }
 
-    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): any {
+    onCustomWithdrawConfigUpdate(_customWithdrawConfig: unknown): any {
 
     }
 
-    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): any {
+    onDraftUpdate(_contact: unknown, _arrayList: unknown, _j2: unknown): any {
 
     }
 
-    onEmojiDownloadComplete(emojiNotifyInfo: unknown): any {
+    onEmojiDownloadComplete(_emojiNotifyInfo: unknown): any {
 
     }
 
-    onEmojiResourceUpdate(emojiResourceInfo: unknown): any {
+    onEmojiResourceUpdate(_emojiResourceInfo: unknown): any {
 
     }
 
-    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFileMsgCome(arrayList: unknown): any {
+    onFileMsgCome(_arrayList: unknown): any {
 
     }
 
-    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onFirstViewDirectMsgUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFirstViewGroupGuildMapping(arrayList: unknown): any {
+    onFirstViewGroupGuildMapping(_arrayList: unknown): any {
 
     }
 
-    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): any {
+    onGrabPasswordRedBag(_i2: unknown, _str: unknown, _i3: unknown, _recvdOrder: unknown, _msgRecord: unknown): any {
 
     }
 
-    onGroupFileInfoAdd(groupItem: unknown): any {
+    onGroupFileInfoAdd(_groupItem: unknown): any {
 
     }
 
-    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): any {
+    onGroupFileInfoUpdate(_groupFileListResult: GroupFileInfoUpdateParamType): any {
 
     }
 
-    onGroupGuildUpdate(groupGuildNotifyInfo: unknown): any {
+    onGroupGuildUpdate(_groupGuildNotifyInfo: unknown): any {
 
     }
 
 
-    onGroupTransferInfoAdd(groupItem: unknown): any {
+    onGroupTransferInfoAdd(_groupItem: unknown): any {
 
     }
 
-    onGroupTransferInfoUpdate(groupFileListResult: unknown): any {
+    onGroupTransferInfoUpdate(_groupFileListResult: unknown): any {
 
     }
 
-    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): any {
+    onGuildInteractiveUpdate(_guildInteractiveNotificationItem: unknown): any {
 
     }
 
-    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): any {
+    onGuildMsgAbFlagChanged(_guildMsgAbFlag: unknown): any {
 
     }
 
-    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): any {
+    onGuildNotificationAbstractUpdate(_guildNotificationAbstractInfo: unknown): any {
 
     }
 
-    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): any {
+    onHitCsRelatedEmojiResult(_downloadRelateEmojiResultInfo: unknown): any {
 
     }
 
-    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): any {
+    onHitEmojiKeywordResult(_hitRelatedEmojiWordsResult: unknown): any {
 
     }
 
-    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): any {
+    onHitRelatedEmojiResult(_relatedWordEmojiInfo: unknown): any {
 
     }
 
-    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): any {
+    onImportOldDbProgressUpdate(_importOldDbMsgNotifyInfo: unknown): any {
 
     }
 
-    onInputStatusPush(inputStatusInfo: {
+    onInputStatusPush(_inputStatusInfo: {
         chatType: number;
         eventType: number;
         fromUin: string;
@@ -215,55 +216,55 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onKickedOffLine(kickedInfo: KickedOffLineInfo): any {
+    onKickedOffLine(_kickedInfo: KickedOffLineInfo): any {
 
     }
 
-    onLineDev(arrayList: unknown): any {
+    onLineDev(_arrayList: unknown): any {
 
     }
 
-    onLogLevelChanged(j2: unknown): any {
+    onLogLevelChanged(_j2: unknown): any {
 
     }
 
-    onMsgAbstractUpdate(arrayList: unknown): any {
+    onMsgAbstractUpdate(_arrayList: unknown): any {
 
     }
 
-    onMsgBoxChanged(arrayList: unknown): any {
+    onMsgBoxChanged(_arrayList: unknown): any {
 
     }
 
-    onMsgDelete(contact: unknown, arrayList: unknown): any {
+    onMsgDelete(_contact: unknown, _arrayList: unknown): any {
 
     }
 
-    onMsgEventListUpdate(hashMap: unknown): any {
+    onMsgEventListUpdate(_hashMap: unknown): any {
 
     }
 
-    onMsgInfoListAdd(arrayList: unknown): any {
+    onMsgInfoListAdd(_arrayList: unknown): any {
 
     }
 
-    onMsgInfoListUpdate(msgList: RawMessage[]): any {
+    onMsgInfoListUpdate(_msgList: RawMessage[]): any {
 
     }
 
-    onMsgQRCodeStatusChanged(i2: unknown): any {
+    onMsgQRCodeStatusChanged(_i2: unknown): any {
 
     }
 
-    onMsgRecall(chatType: ChatType, uid: string, msgSeq: string): any {
+    onMsgRecall(_chatType: ChatType, _uid: string, _msgSeq: string): any {
 
     }
 
-    onMsgSecurityNotify(msgRecord: unknown): any {
+    onMsgSecurityNotify(_msgRecord: unknown): any {
 
     }
 
-    onMsgSettingUpdate(msgSetting: unknown): any {
+    onMsgSettingUpdate(_msgSetting: unknown): any {
 
     }
 
@@ -279,108 +280,108 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
+    onReadFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onRecvGroupGuildFlag(i2: unknown): any {
+    onRecvGroupGuildFlag(_i2: unknown): any {
 
     }
 
-    onRecvMsg(arrayList: RawMessage[]): any {
+    onRecvMsg(_arrayList: RawMessage[]): any {
 
     }
 
-    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): any {
+    onRecvMsgSvrRspTransInfo(_j2: unknown, _contact: unknown, _i2: unknown, _i3: unknown, _str: unknown, _bArr: unknown): any {
 
     }
 
-    onRecvOnlineFileMsg(arrayList: unknown): any {
+    onRecvOnlineFileMsg(_arrayList: unknown): any {
 
     }
 
-    onRecvS2CMsg(arrayList: unknown): any {
+    onRecvS2CMsg(_arrayList: unknown): any {
 
     }
 
-    onRecvSysMsg(arrayList: Array<number>): any {
+    onRecvSysMsg(_arrayList: Array<number>): any {
 
     }
 
-    onRecvUDCFlag(i2: unknown): any {
+    onRecvUDCFlag(_i2: unknown): any {
 
     }
 
-    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
+    onRichMediaDownloadComplete(_fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
     }
 
-    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): any {
+    onRichMediaProgerssUpdate(_fileTransNotifyInfo: unknown): any {
 
     }
 
-    onRichMediaUploadComplete(fileTransNotifyInfo: unknown): any {
+    onRichMediaUploadComplete(_fileTransNotifyInfo: unknown): any {
 
     }
 
-    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): any {
+    onSearchGroupFileInfoUpdate(_searchGroupFileResult: unknown): any {
 
     }
 
-    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): any {
+    onSendMsgError(_j2: unknown, _contact: unknown, _i2: unknown, _str: unknown): any {
 
     }
 
-    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): any {
+    onSysMsgNotification(_i2: unknown, _j2: unknown, _j3: unknown, _arrayList: unknown): any {
 
     }
 
-    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): any {
+    onTempChatInfoUpdate(_tempChatInfo: TempOnRecvParams): any {
 
     }
 
-    onUnreadCntAfterFirstView(hashMap: unknown): any {
+    onUnreadCntAfterFirstView(_hashMap: unknown): any {
 
     }
 
-    onUnreadCntUpdate(hashMap: unknown): any {
+    onUnreadCntUpdate(_hashMap: unknown): any {
 
     }
 
-    onUserChannelTabStatusChanged(z: unknown): any {
+    onUserChannelTabStatusChanged(_z: unknown): any {
 
     }
 
-    onUserOnlineStatusChanged(z: unknown): any {
+    onUserOnlineStatusChanged(_z: unknown): any {
 
     }
 
-    onUserTabStatusChanged(arrayList: unknown): any {
+    onUserTabStatusChanged(_arrayList: unknown): any {
 
     }
 
-    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
+    onlineStatusBigIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
 
     }
 
-    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
+    onlineStatusSmallIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
 
     }
 
     // 第一次发现于Linux
-    onUserSecQualityChanged(...args: unknown[]): any {
+    onUserSecQualityChanged(..._args: unknown[]): any {
 
     }
 
-    onMsgWithRichLinkInfoUpdate(...args: unknown[]): any {
+    onMsgWithRichLinkInfoUpdate(..._args: unknown[]): any {
 
     }
 
-    onRedTouchChanged(...args: unknown[]): any {
+    onRedTouchChanged(..._args: unknown[]): any {
 
     }
 
     // 第一次发现于Win 9.9.9-23159
-    onBroadcastHelperProgerssUpdate(...args: unknown[]): any {
+    onBroadcastHelperProgerssUpdate(..._args: unknown[]): any {
 
     }
 }

src/core/packet/context/operationContext.ts

@@ -6,13 +6,14 @@ import {
     PacketMsgFileElement,
     PacketMsgPicElement,
     PacketMsgPttElement,
-    PacketMsgVideoElement
+    PacketMsgReplyElement,
+    PacketMsgVideoElement,
 } from '@/core/packet/message/element';
 import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
 import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
+import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/core/packet/transformer/proto';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
 import { gunzipSync } from 'zlib';
@@ -76,22 +77,24 @@ export class PacketOperationContext {
     async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
         const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
         const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
-        const reqList = msg.flatMap(m =>
+        const reqList = msg.flatMap((m) =>
-            m.msg.map(e => {
+            m.msg
-                if (e instanceof PacketMsgPicElement) {
+                .map((e) => {
-                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                    if (e instanceof PacketMsgPicElement) {
-                } else if (e instanceof PacketMsgVideoElement) {
+                        return this.context.highway.uploadImage({ chatType, peerUid }, e);
-                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgVideoElement) {
-                } else if (e instanceof PacketMsgPttElement) {
+                        return this.context.highway.uploadVideo({ chatType, peerUid }, e);
-                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgPttElement) {
-                } else if (e instanceof PacketMsgFileElement) {
+                        return this.context.highway.uploadPtt({ chatType, peerUid }, e);
-                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                    } else if (e instanceof PacketMsgFileElement) {
-                }
+                        return this.context.highway.uploadFile({ chatType, peerUid }, e);
-                return null;
+                    }
-            }).filter(Boolean)
+                    return null;
+                })
+                .filter(Boolean)
         );
         const res = await Promise.allSettled(reqList);
-        this.context.logger.info(`上传资源${res.length}个，失败${res.filter(r => r.status === 'rejected').length}个`);
+        this.context.logger.info(`上传资源${res.length}个，失败${res.filter((r) => r.status === 'rejected').length}个`);
         res.forEach((result, index) => {
             if (result.status === 'rejected') {
                 this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
@@ -100,10 +103,13 @@ export class PacketOperationContext {
     }
 
     async UploadImage(img: PacketMsgPicElement) {
-        await this.context.highway.uploadImage({
+        await this.context.highway.uploadImage(
-            chatType: ChatType.KCHATTYPEC2C,
+            {
-            peerUid: this.context.napcore.basicInfo.uid
+                chatType: ChatType.KCHATTYPEC2C,
-        }, img);
+                peerUid: this.context.napcore.basicInfo.uid,
+            },
+            img
+        );
         const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
         if (!index) {
             throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
@@ -118,6 +124,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);
@@ -125,6 +145,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);
@@ -137,24 +172,66 @@ export class PacketOperationContext {
                     coordinates: item.polygon.coordinates.map((c) => {
                         return {
                             x: c.x,
-                            y: c.y
+                            y: c.y,
                         };
                     }),
                 };
             }),
-            language: res.ocrRspBody.language
+            language: res.ocrRspBody.language,
         } as ImageOcrResult;
     }
 
-    async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
+    private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
+        const ps = msg.map((m) => {
+            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) {
+                        this.context.logger.error(`targetPeer is undefined!`);
+                    }
+                    let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
+                    if (e.isGroupReply) {
+                        targetMsg = await this.FetchGroupMessage(+(e.targetPeer?.peerUid ?? 0), e.targetMessageSeq, e.targetMessageSeq);
+                    } else {
+                        targetMsg = await this.FetchC2CMessage(await this.context.napcore.basicInfo.uin2uid(e.targetUin), e.targetMessageSeq, e.targetMessageSeq);
+                    }
+                    e.targetElems = targetMsg.at(0)?.body?.richText?.elems;
+                    e.targetSourceMsg = targetMsg.at(0);
+                }
+            });
+        }).flat();
+        await Promise.all(ps)
         await this.UploadResources(msg, groupUin);
+    }
+
+    async FetchGroupMessage(groupUin: number, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
+        const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.FetchGroupMessage.parse(resp);
+        return res.body.messages
+    }
+
+    async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
+        const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.FetchC2CMessage.parse(resp);
+        return res.messages
+    }
+
+    async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
+        await this.SendPreprocess(msg, groupUin);
         const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.UploadForwardMsg.parse(resp);
         return res.result.resId;
     }
 
-    async MoveGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string) {
+    async MoveGroupFile(
+        groupUin: number,
+        fileUUID: string,
+        currentParentDirectory: string,
+        targetParentDirectory: string
+    ) {
         const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.MoveGroupFile.parse(resp);
@@ -174,6 +251,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);
@@ -181,13 +259,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);
@@ -203,12 +274,17 @@ export class PacketOperationContext {
         return res.content.map((item) => {
             return {
                 category: item.category,
-                voices: item.voices
+                voices: item.voices,
             };
         });
     }
 
-    async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
+    async GetAiVoice(
+        groupUin: number,
+        voiceId: string,
+        text: string,
+        chatType: AIVoiceChatType
+    ): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
         let reqTime = 0;
         const reqMaxTime = 30;
         const sessionId = crypto.randomBytes(4).readUInt32BE(0);
@@ -236,6 +312,7 @@ export class PacketOperationContext {
         if (!main?.actionData.msgBody) {
             throw new Error('msgBody is empty');
         }
+        this.context.logger.debug('rawChains ', inflate.toString('hex'));
 
         const messagesPromises = main.actionData.msgBody.map(async (msg) => {
             if (!msg?.body?.richText?.elems) {
@@ -251,12 +328,12 @@ export class PacketOperationContext {
                             const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!),
                             };
                         } else {
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!),
                             };
                         }
                         return element;
@@ -269,7 +346,7 @@ export class PacketOperationContext {
                 elements: elements,
                 guildId: '',
                 isOnlineMsg: false,
-                msgId: '7467703692092974645',  // TODO: no necessary
+                msgId: '7467703692092974645', // TODO: no necessary
                 msgRandom: '0',
                 msgSeq: String(msg.contentHead.sequence ?? 0),
                 msgTime: String(msg.contentHead.timeStamp ?? 0),

src/core/packet/message/builder.ts

@@ -24,12 +24,15 @@ export class PacketMsgBuilder {
             }
             return {
                 responseHead: {
-                    fromUid: '',
                     fromUin: node.senderUin,
-                    toUid: node.groupId ? undefined : selfUid,
+                    type: 0,
+                    sigMap: 0,
+                    toUin: 0,
+                    fromUid: '',
                     forward: node.groupId ? undefined : {
                         friendName: node.senderName,
                     },
+                    toUid: node.groupId ? undefined : selfUid,
                     grp: node.groupId ? {
                         groupUin: node.groupId,
                         memberName: node.senderName,
@@ -40,16 +43,13 @@ export class PacketMsgBuilder {
                     type: node.groupId ? 82 : 9,
                     subType: node.groupId ? undefined : 4,
                     divSeq: node.groupId ? undefined : 4,
-                    msgId: crypto.randomBytes(4).readUInt32LE(0),
+                    autoReply: 0,
                     sequence: crypto.randomBytes(4).readUInt32LE(0),
                     timeStamp: +node.time.toString().substring(0, 10),
-                    field7: BigInt(1),
-                    field8: 0,
-                    field9: 0,
                     forward: {
                         field1: 0,
                         field2: 0,
-                        field3: node.groupId ? 0 : 2,
+                        field3: node.groupId ? 1 : 2,
                         unknownBase64: avatar,
                         avatar: avatar
                     }

src/core/packet/message/element.ts

@@ -10,6 +10,7 @@ import {
     MsgInfo,
     NotOnlineImage,
     OidbSvcTrpcTcp0XE37_800Response,
+    PushMsgBody,
     QBigFaceExtra,
     QSmallFaceExtra,
 } from '@/core/packet/transformer/proto';
@@ -29,7 +30,8 @@ import {
     SendReplyElement,
     SendMultiForwardMsgElement,
     SendTextElement,
-    SendVideoElement
+    SendVideoElement,
+    Peer
 } from '@/core';
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
@@ -146,41 +148,40 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
-    messageId: bigint;
+    time: number;
-    messageSeq: number;
+    targetMessageId: bigint;
-    messageClientSeq: number;
+    targetMessageSeq: number;
+    targetMessageClientSeq: number;
     targetUin: number;
     targetUid: string;
-    time: number;
+    targetElems?: NapProtoEncodeStructType<typeof Elem>[];
-    elems: PacketMsg[];
+    targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
+    targetPeer?: Peer;
 
     constructor(element: SendReplyElement) {
         super(element);
-        this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
+        this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
-        this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
+        this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
-        this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
+        this.targetMessageSeq = +(element.replyElement.replayMsgSeq ?? 0);
+        this.targetMessageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
         this.targetUin = +(element.replyElement.senderUin ?? 0);
         this.targetUid = element.replyElement.senderUidStr ?? '';
-        this.time = +(element.replyElement.replyMsgTime ?? 0);
+        this.targetPeer = element.replyElement._replyMsgPeer;
-        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
     }
 
     get isGroupReply(): boolean {
-        return this.messageClientSeq === 0;
+        return this.targetMessageClientSeq === 0;
     }
 
     override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
         return [{
             srcMsg: {
-                origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
+                origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
                 senderUin: BigInt(this.targetUin),
                 time: this.time,
-                elems: [], // TODO: in replyElement.sourceMsgTextElems
+                elems: this.targetElems ?? [],
-                pbReserve: {
+                sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
-                    messageId: this.messageId,
+                toUin: BigInt(0),
-                },
-                toUin: BigInt(this.targetUin),
-                type: 1,
             }
         }];
     }

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

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

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

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

src/core/packet/transformer/message/FetchC2CMessage.ts

@@ -0,0 +1,27 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+
+class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
+    constructor() {
+        super();
+    }
+
+    build(targetUid: string, startSeq: number, endSeq: number): OidbPacket {
+        const req = new NapProtoMsg(proto.SsoGetC2cMsg).encode({
+            friendUid: targetUid,
+            startSequence: startSeq,
+            endSequence: endSeq,
+        });
+        return {
+            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
+            data: PacketHexStrBuilder(req)
+        };
+    }
+
+    parse(data: Buffer) {
+        return new NapProtoMsg(proto.SsoGetC2cMsgResponse).decode(data);
+    }
+}
+
+export default new FetchC2CMessage();

src/core/packet/transformer/message/FetchGroupMessage.ts

@@ -0,0 +1,30 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+
+class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
+    constructor() {
+        super();
+    }
+
+    build(groupUin: number, startSeq: number, endSeq: number): OidbPacket {
+        const req = new NapProtoMsg(proto.SsoGetGroupMsg).encode({
+            info: {
+                groupUin: groupUin,
+                startSequence: startSeq,
+                endSequence: endSeq
+            },
+            direction: true
+        });
+        return {
+            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
+            data: PacketHexStrBuilder(req)
+        };
+    }
+
+    parse(data: Buffer) {
+        return new NapProtoMsg(proto.SsoGetGroupMsgResponse).decode(data);
+    }
+}
+
+export default new FetchGroupMessage();

src/core/packet/transformer/message/index.ts

@@ -1,2 +1,4 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
-export { default as DownloadForwardMsg } from './DownloadForwardMsg';
+export { default as FetchGroupMessage } from './FetchGroupMessage';
+export { default as FetchC2CMessage } from './FetchC2CMessage';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/proto/message/message.ts

@@ -13,13 +13,15 @@ import {
 export const ContentHead = {
     type: ProtoField(1, ScalarType.UINT32),
     subType: ProtoField(2, ScalarType.UINT32, true),
-    divSeq: ProtoField(3, ScalarType.UINT32, true),
+    c2cCmd: ProtoField(3, ScalarType.UINT32, true),
-    msgId: ProtoField(4, ScalarType.UINT32, true),
+    ranDom: ProtoField(4, ScalarType.UINT32, true),
     sequence: ProtoField(5, ScalarType.UINT32, true),
     timeStamp: ProtoField(6, ScalarType.UINT32, true),
-    field7: ProtoField(7, ScalarType.UINT64, true),
+    pkgNum: ProtoField(7, ScalarType.UINT64, true),
-    field8: ProtoField(8, ScalarType.UINT32, true),
+    pkgIndex: ProtoField(8, ScalarType.UINT32, true),
-    field9: ProtoField(9, ScalarType.UINT32, true),
+    divSeq: ProtoField(9, ScalarType.UINT32, true),
+    autoReply: ProtoField(10, ScalarType.UINT32),
+    ntMsgSeq: ProtoField(10, ScalarType.UINT32, true),
     newId: ProtoField(12, ScalarType.UINT64, true),
     forward: ProtoField(15, () => ForwardHead, true),
 };

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

src/core/services/NodeIKernelBuddyService.ts

@@ -106,15 +106,15 @@ export interface NodeIKernelBuddyService {
 
     getAddMeSetting(): unknown;
 
-    getDoubtBuddyReq(): unknown;
+    getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
 
     getDoubtBuddyUnreadNum(): number;
 
-    approvalDoubtBuddyReq(uid: number, isAgree: boolean): void;
+    approvalDoubtBuddyReq(uid: string, str1: string, str2: string): void;
 
     delDoubtBuddyReq(uid: number): void;
 
-    delAllDoubtBuddyReq(): void;
+    delAllDoubtBuddyReq(): Promise<GeneralCallResult>;
 
     reportDoubtBuddyReqUnread(): void;
 

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/services/NodeIKernelMsgService.ts

@@ -148,10 +148,11 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
-    //@deprecated
+    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
-    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
+    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[]
     }>;
@@ -425,7 +426,20 @@ export interface NodeIKernelMsgService {
 
     switchToOfflineGetRichMediaElement(...args: unknown[]): unknown;
 
-    downloadRichMedia(...args: unknown[]): unknown;
+    downloadRichMedia(args: {
+        fileModelId: string,
+        downSourceType: number,
+        triggerType: number,
+        msgId: string,
+        chatType: number,
+        peerUid: string,
+        elementId: string,
+        thumbSize: number,
+        downloadType: number,
+        filePath: string
+    } & {
+        downloadSourceType: number, //33800左右一下的老版本 新版34606已经完全上面格式
+    }): unknown;
 
     getFirstUnreadMsgSeq(args: {
         peerUid: string

src/core/types/element.ts

@@ -1,4 +1,15 @@
-import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg';
+import {
+    ElementType,
+    MessageElement,
+    NTGrayTipElementSubTypeV2,
+    PicSubType,
+    PicType,
+    TipAioOpGrayTipElement,
+    TipGroupElement,
+    NTVideoType,
+    FaceType,
+    Peer
+} from './msg';
 
 type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
 
@@ -213,6 +224,9 @@ export interface ReplyElement {
     senderUidStr?: string;
     replyMsgTime?: string;
     replyMsgClientSeq?: string;
+    // HACK: Attributes that were not originally available,
+    // but were added due to NTQQ and NapCat's internal implementation, are used to supplement NapCat
+    _replyMsgPeer?: Peer;
 }
 
 export interface CalendarElement {

src/core/types/msg.ts

@@ -403,7 +403,7 @@ export interface NTGroupGrayMember {
 }
 /**
  * 群灰色提示邀请者和被邀请者接口
- * 
+ *
  * */
 export interface NTGroupGrayInviterAndInvite {
     invited: NTGroupGrayMember;
@@ -501,13 +501,15 @@ export interface RawMessage {
     elements: MessageElement[];// 消息元素
     sourceType: MsgSourceType;// 消息来源类型
     isOnlineMsg: boolean;// 是否为在线消息
+    clientSeq?: string;
 }
 
 /**
  * 查询消息参数接口
  */
 export interface QueryMsgsParams {
-    chatInfo: Peer;
+    chatInfo: Peer & { privilegeFlag?: number };
+    //searchFields: number;
     filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;
@@ -565,4 +567,4 @@ export enum FaceType {
     AniSticke = 3,  // 动画贴纸
     Lottie = 4,// 新格式表情
     Poke = 5  // 可变Poke
-}
+}

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/framework/napcat.ts

@@ -9,6 +9,8 @@ import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
+import { downloadFFmpegIfNotExists } from '@/common/download-ffmpeg';
+import { FFmpegService } from '@/common/ffmpeg';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
@@ -36,6 +38,15 @@ export async function NCoreInitFramework(
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
+    if (!process.env['NAPCAT_DISABLE_FFMPEG_DOWNLOAD']) {
+        downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
+            if (reset && path) {
+                FFmpegService.setFfmpegPath(path, logger);
+            }
+        }).catch(e => {
+            logger.logError('[Ffmpeg] Error:', e);
+        });
+    }
     //直到登录成功后，执行下一步
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();

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/OneBotAction.ts

@@ -1,8 +1,9 @@
 import { ActionName, BaseCheckResult } from './router';
+import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
 import { NetworkAdapterConfig } from '../config/config';
-import { z } from 'zod';
+import { TSchema } from '@sinclair/typebox';
 
 export class OB11Response {
     private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
@@ -32,7 +33,8 @@ export class OB11Response {
 export abstract class OneBotAction<PayloadType, ReturnDataType> {
     actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
     core: NapCatCore;
-    payloadSchema?: z.ZodType<unknown> = undefined;
+    private validate?: ValidateFunction<unknown> = undefined;
+    payloadSchema?: TSchema = undefined;
     obContext: NapCatOneBot11Adapter;
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
@@ -40,30 +42,19 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
         this.core = core;
     }
 
-    protected async check(payload: unknown): Promise<BaseCheckResult> {
+    protected async check(payload: PayloadType): Promise<BaseCheckResult> {
-        if (!this.payloadSchema) {
+        if (this.payloadSchema) {
-            return { valid: true };
+            this.validate = new Ajv({ allowUnionTypes: true, useDefaults: true, coerceTypes: true }).compile(this.payloadSchema);
         }
-
+        if (this.validate && !this.validate(payload)) {
-        try {
+            const errors = this.validate.errors as ErrorObject[];
-            // 使用 zod 验证并转换数据
+            const errorMessages = errors.map(e => `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`);
-            this.payloadSchema.parse(payload);
-            return { valid: true };
-        } catch (error) {
-            if (error instanceof z.ZodError) {
-                const errorMessages = error.errors.map(e =>
-                    `Key: ${e.path.join('.')}, Message: ${e.message}`
-                );
-                return {
-                    valid: false,
-                    message: errorMessages.join('\n') || '未知错误',
-                };
-            }
             return {
                 valid: false,
-                message: '验证过程中发生未知错误'
+                message: errorMessages.join('\n') ?? '未知错误',
             };
         }
+        return { valid: true };
     }
 
     public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
@@ -95,4 +86,4 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
     }
 
     abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
-}
+}

src/onebot/action/extends/ClickInlineKeyboardButton.ts

@@ -1,15 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { OneBotAction } from '../OneBotAction';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    bot_appid: z.coerce.string(),
+    bot_appid: Type.String(),
-    button_id: z.coerce.string().default(''),
+    button_id: Type.String({ default: '' }),
-    callback_data: z.coerce.string().default(''),
+    callback_data: Type.String({ default: '' }),
-    msg_seq: z.coerce.string().default('10086'),
+    msg_seq: Type.String({ default: '10086' }),
 });
-type Payload = z.infer<typeof SchemaData>;
+
+type Payload = Static<typeof SchemaData>;
 
 export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.ClickInlineKeyboardButton;
@@ -24,6 +25,6 @@ export class ClickInlineKeyboardButton extends OneBotAction<Payload, unknown> {
             callback_data: payload.callback_data,
             dmFlag: 0,
             chatType: 2
-        });
+        })
     }
 }

src/onebot/action/extends/CreateCollection.ts

@@ -1,13 +1,13 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    rawData: z.coerce.string(),
+    rawData: Type.String(),
-    brief: z.coerce.string(),
+    brief: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class CreateCollection extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.CreateCollection;

src/onebot/action/extends/FetchCustomFace.ts

@@ -1,12 +1,12 @@
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    count: z.coerce.number().default(48),
+    count: Type.Union([Type.Number(), Type.String()], { default: 48 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class FetchCustomFace extends OneBotAction<Payload, string[]> {
     override actionName = ActionName.FetchCustomFace;

src/onebot/action/extends/FetchEmojiLike.ts

@@ -1,17 +1,17 @@
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { type NTQQMsgApi } from '@/core/apis';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    message_id: z.coerce.string(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
-    emojiId: z.coerce.string(),
+    emojiId: Type.Union([Type.Number(), Type.String()]),
-    emojiType: z.coerce.string(),
+    emojiType: Type.Union([Type.Number(), Type.String()]),
-    count: z.coerce.number().default(20),
+    count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQQMsgApi['getMsgEmojiLikesList']>>> {
     override actionName = ActionName.FetchEmojiLike;
@@ -23,7 +23,7 @@ export class FetchEmojiLike extends OneBotAction<Payload, Awaited<ReturnType<NTQ
         const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0];
         if (!msg) throw new Error('消息不存在');
         return await this.core.apis.MsgApi.getMsgEmojiLikesList(
-            msgIdPeer.Peer, msg.msgSeq, payload.emojiId, payload.emojiType, +payload.count
+            msgIdPeer.Peer, msg.msgSeq, payload.emojiId.toString(), payload.emojiType.toString(), +payload.count
         );
     }
 }

src/onebot/action/extends/GetAiCharacters.ts

@@ -1,14 +1,14 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    chat_type: z.coerce.number().default(1),
+    chat_type: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface GetAiCharactersResponse {
     type: string;

src/onebot/action/extends/GetCollectionList.ts

@@ -1,14 +1,14 @@
 import { type NTQQCollectionApi } from '@/core/apis/collection';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    category: z.coerce.number(),
+    category: Type.Union([Type.Number(), Type.String()]),
-    count: z.coerce.number().default(1),
+    count: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetCollectionList extends OneBotAction<Payload, Awaited<ReturnType<NTQQCollectionApi['getAllCollection']>>> {
     override actionName = ActionName.GetCollectionList;

src/onebot/action/extends/GetGroupInfoEx.ts

@@ -1,17 +1,17 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id:  z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupInfoEx extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.GetGroupInfoEx;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        return (await this.core.apis.GroupApi.getGroupExtFE0Info([payload.group_id])).result.groupExtInfos.get(payload.group_id);
+        return (await this.core.apis.GroupApi.getGroupExtFE0Info([payload.group_id.toString()])).result.groupExtInfos.get(payload.group_id.toString());
     }
 }

src/onebot/action/extends/GetMiniAppArk.ts

@@ -2,38 +2,38 @@ import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { MiniAppInfo, MiniAppInfoHelper } from '@/core/packet/utils/helper/miniAppHelper';
 import { MiniAppData, MiniAppRawData, MiniAppReqCustomParams, MiniAppReqParams } from '@/core/packet/entities/miniApp';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.union([
+const SchemaData = Type.Union([
-    z.object({
+    Type.Object({
-        type: z.union([z.literal('bili'), z.literal('weibo')]),
+        type: Type.Union([Type.Literal('bili'), Type.Literal('weibo')]),
-        title: z.coerce.string(),
+        title: Type.String(),
-        desc: z.coerce.string(),
+        desc: Type.String(),
-        picUrl: z.coerce.string(),
+        picUrl: Type.String(),
-        jumpUrl: z.coerce.string(),
+        jumpUrl: Type.String(),
-        webUrl: z.coerce.string().optional(),
+        webUrl: Type.Optional(Type.String()),
-        rawArkData: z.coerce.string().optional()
+        rawArkData: Type.Optional(Type.Union([Type.String()]))
     }),
-    z.object({
+    Type.Object({
-        title: z.coerce.string(),
+        title: Type.String(),
-        desc: z.coerce.string(),
+        desc: Type.String(),
-        picUrl: z.coerce.string(),
+        picUrl: Type.String(),
-        jumpUrl: z.coerce.string(),
+        jumpUrl: Type.String(),
-        iconUrl: z.coerce.string(),
+        iconUrl: Type.String(),
-        webUrl: z.coerce.string().optional(),
+        webUrl: Type.Optional(Type.String()),
-        appId: z.coerce.string(),
+        appId: Type.String(),
-        scene: z.union([z.coerce.number(), z.coerce.string()]),
+        scene: Type.Union([Type.Number(), Type.String()]),
-        templateType: z.union([z.coerce.number(), z.coerce.string()]),
+        templateType: Type.Union([Type.Number(), Type.String()]),
-        businessType: z.union([z.coerce.number(), z.coerce.string()]),
+        businessType: Type.Union([Type.Number(), Type.String()]),
-        verType: z.union([z.coerce.number(), z.coerce.string()]),
+        verType: Type.Union([Type.Number(), Type.String()]),
-        shareType: z.union([z.coerce.number(), z.coerce.string()]),
+        shareType: Type.Union([Type.Number(), Type.String()]),
-        versionId: z.coerce.string(),
+        versionId: Type.String(),
-        sdkId: z.coerce.string(),
+        sdkId: Type.String(),
-        withShareTicket: z.union([z.coerce.number(), z.coerce.string()]),
+        withShareTicket: Type.Union([Type.Number(), Type.String()]),
-        rawArkData: z.coerce.string().optional()
+        rawArkData: Type.Optional(Type.Union([Type.String()]))
     })
 ]);
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetMiniAppArk extends GetPacketStatusDepends<Payload, {
     data: MiniAppData | MiniAppRawData

src/onebot/action/extends/GetProfileLike.ts

@@ -1,15 +1,15 @@
 import { NTVoteInfo } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    start: z.coerce.number().default(0),
+    start: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    count: z.coerce.number().default(10),
+    count: Type.Union([Type.Number(), Type.String()], { default: 10 })
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetProfileLike extends OneBotAction<Payload, {
     uid: string;

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -36,7 +36,7 @@ export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
             uint64_uin: self_id,
             uint64_top: 0,
             uint32_req_num: 99,
-            bytes_cookies: ''
+            bytes_cookies: ""
         };
         const packed_data = await this.pack_data(JSON.stringify(req_json));
         const data = Buffer.from(packed_data).toString('hex');

src/onebot/action/extends/GetUserStatus.ts

@@ -1,18 +1,18 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.number(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetUserStatus extends GetPacketStatusDepends<Payload, { status: number; ext_status: number; } | undefined> {
     override actionName = ActionName.GetUserStatus;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        return await this.core.apis.PacketApi.pkt.operation.GetStrangerStatus(payload.user_id);
+        return await this.core.apis.PacketApi.pkt.operation.GetStrangerStatus(+payload.user_id);
     }
 }

src/onebot/action/extends/MoveGroupFile.ts

@@ -1,16 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
-    current_parent_directory: z.coerce.string(),
+    current_parent_directory: Type.String(),
-    target_parent_directory: z.coerce.string(),
+    target_parent_directory: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface MoveGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/OCRImage.ts

@@ -2,14 +2,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { checkFileExist, uriToLocalFile } from '@/common/file';
 import fs from 'fs';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { GeneralCallResultStatus } from '@/core';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    image: z.coerce.string(),
+    image: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class OCRImageBase extends OneBotAction<Payload, GeneralCallResultStatus> {
     override payloadSchema = SchemaData;

src/onebot/action/extends/RenameGroupFile.ts

@@ -1,16 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
-    current_parent_directory: z.coerce.string(),
+    current_parent_directory: Type.String(),
-    new_name: z.coerce.string(),
+    new_name: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface RenameGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/SendPacket.ts

@@ -1,21 +1,22 @@
 import { PacketHexStr } from '@/core/packet/transformer/base';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    cmd: z.coerce.string(),
+    cmd: Type.String(),
-    data: z.coerce.string(),
+    data: Type.String(),
-    rsp: z.coerce.boolean().default(true),
+    rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SendPacket extends GetPacketStatusDepends<Payload, string | undefined> {
     override payloadSchema = SchemaData;
     override actionName = ActionName.SendPacket;
     async _handle(payload: Payload) {
-        const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as PacketHexStr }, payload.rsp);
+        const rsp = typeof payload.rsp === 'boolean' ? payload.rsp : payload.rsp === 'true';
+        const data = await this.core.apis.PacketApi.pkt.operation.sendPacket({ cmd: payload.cmd, data: payload.data as PacketHexStr }, rsp);
         return typeof data === 'object' ? data.toString('hex') : undefined;
     }
 }

src/onebot/action/extends/SetDiyOnlineStatus.ts

@@ -1,14 +1,14 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    face_id:  z.coerce.string(),// 参考 face_config.json 的 QSid
+    face_id: Type.Union([Type.Number(), Type.String()]),// 参考 face_config.json 的 QSid
-    face_type: z.coerce.string().default('1'),
+    face_type: Type.Union([Type.Number(), Type.String()], { default: '1' }),
-    wording: z.coerce.string().default(' '),
+    wording: Type.String({ default: ' ' }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetDiyOnlineStatus extends OneBotAction<Payload, string> {
     override actionName = ActionName.SetDiyOnlineStatus;

src/onebot/action/extends/SetGroupRemark.ts

@@ -1,13 +1,13 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.String(),
-    remark: z.coerce.string(),
+    remark: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupRemark extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupRemark;

src/onebot/action/extends/SetGroupSign.ts

@@ -1,12 +1,12 @@
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class SetGroupSignBase extends GetPacketStatusDepends<Payload, void> {
     override payloadSchema = SchemaData;

src/onebot/action/extends/SetInputStatus.ts

@@ -1,14 +1,14 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType } from '@/core';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    event_type: z.coerce.number(),
+    event_type: Type.Number(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetInputStatus extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.SetInputStatus;

src/onebot/action/extends/SetLongNick.ts

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    longNick: z.coerce.string(),
+    longNick: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetLongNick extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.SetLongNick;

src/onebot/action/extends/SetOnlineStatus.ts

@@ -1,14 +1,14 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    status: z.coerce.number(),
+    status: Type.Union([Type.Number(), Type.String()]),
-    ext_status: z.coerce.number(),
+    ext_status: Type.Union([Type.Number(), Type.String()]),
-    battery_status: z.coerce.number(),
+    battery_status: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetOnlineStatus extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetOnlineStatus;

src/onebot/action/extends/SetQQAvatar.ts

@@ -2,13 +2,13 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import fs from 'node:fs/promises';
 import { checkFileExist, uriToLocalFile } from '@/common/file';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    file: z.coerce.string(),
+    file: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetAvatar extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetQQAvatar;

src/onebot/action/extends/SetSpecialTitle.ts

@@ -1,14 +1,14 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: z.coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    special_title: z.coerce.string().default(''),
+    special_title: Type.String({ default: '' }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetSpecialTitle extends GetPacketStatusDepends<Payload, void> {
     override actionName = ActionName.SetSpecialTitle;

src/onebot/action/extends/ShareContact.ts

@@ -1,15 +1,15 @@
 import { GeneralCallResult } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    group_id: z.coerce.string().optional(),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    phoneNumber: z.coerce.string().default(''),
+    phoneNumber: Type.String({ default: '' }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
     arkMsg?: string;
@@ -28,11 +28,11 @@ export class SharePeer extends OneBotAction<Payload, GeneralCallResult & {
     }
 }
 
-const SchemaDataGroupEx = z.object({
+const SchemaDataGroupEx = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type PayloadGroupEx = z.infer<typeof SchemaDataGroupEx>;
+type PayloadGroupEx = Static<typeof SchemaDataGroupEx>;
 
 export class ShareGroupEx extends OneBotAction<PayloadGroupEx, string> {
     override actionName = ActionName.ShareGroupEx;

src/onebot/action/extends/TransGroupFile.ts

@@ -1,14 +1,14 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface TransGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/TranslateEnWordToZn.ts

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    words: z.array(z.coerce.string()),
+    words: Type.Array(Type.String()),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class TranslateEnWordToZn extends OneBotAction<Payload, Array<unknown> | null> {
     override actionName = ActionName.TranslateEnWordToZn;

src/onebot/action/file/GetFile.ts

@@ -3,7 +3,7 @@ import fs from 'fs/promises';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { ActionName } from '@/onebot/action/router';
 import { OB11MessageImage, OB11MessageVideo } from '@/onebot/types';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
 export interface GetFileResponse {
     file?: string;  // path
@@ -13,13 +13,13 @@ export interface GetFileResponse {
     base64?: string;
 }
 
-const GetFileBase_PayloadSchema = z.object({
+const GetFileBase_PayloadSchema = Type.Object({
-    file: z.coerce.string().optional(),
+    file: Type.Optional(Type.String()),
-    file_id: z.coerce.string().optional(),
+    file_id: Type.Optional(Type.String())
 });
 
 
-export type GetFilePayload = z.infer<typeof GetFileBase_PayloadSchema>;
+export type GetFilePayload = Static<typeof GetFileBase_PayloadSchema>;
 
 export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
     override payloadSchema = GetFileBase_PayloadSchema;

src/onebot/action/file/GetGroupFileUrl.ts

@@ -1,14 +1,14 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface GetGroupFileUrlResponse {
     url?: string;

src/onebot/action/file/GetPrivateFileUrl.ts

@@ -1,13 +1,13 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface GetPrivateFileUrlResponse {
     url?: string;

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

@@ -1,13 +1,13 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_name: z.coerce.string(),
+    folder_name: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 interface ResponseType{
     result:unknown;
     groupItem:unknown;

src/onebot/action/go-cqhttp/DeleteGroupFile.ts

@@ -2,15 +2,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { NTQQGroupApi } from '@/core/apis';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: z.coerce.string(),
+    file_id: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class DeleteGroupFile extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFile']>>> {
     override actionName = ActionName.GOCQHTTP_DeleteGroupFile;

src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts

@@ -1,15 +1,15 @@
 import { ActionName } from '@/onebot/action/router';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { NTQQGroupApi } from '@/core/apis';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_id: z.coerce.string().optional(),
+    folder_id: Type.Optional(Type.String()),
-    folder: z.coerce.string().optional(),
+    folder: Type.Optional(Type.String()),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class DeleteGroupFileFolder extends OneBotAction<Payload, Awaited<ReturnType<NTQQGroupApi['delGroupFileFolder']>>['groupFileCommonResult']> {
     override actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;

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

@@ -4,20 +4,20 @@ import fs from 'fs';
 import { join as joinPath } from 'node:path';
 import { calculateFileMD5, uriToLocalFile } from '@/common/file';
 import { randomUUID } from 'crypto';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
 interface FileResponse {
     file: string;
 }
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    url: z.coerce.string().optional(),
+    url: Type.Optional(Type.String()),
-    base64: z.coerce.string().optional(),
+    base64: Type.Optional(Type.String()),
-    name: z.coerce.string().optional(),
+    name: Type.Optional(Type.String()),
-    headers: z.union([z.coerce.string(), z.array(z.coerce.string())]).optional(),
+    headers: Type.Optional(Type.Union([Type.String(), Type.Array(Type.String())])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResponse> {
     override actionName = ActionName.GoCQHTTP_DownloadFile;

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

@@ -2,16 +2,16 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode } from '@/onebot';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
+import { Static, Type } from '@sinclair/typebox';
 import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
-import { z } from 'zod';
 import { isNumeric } from '@/common/helper';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    message_id: z.coerce.string().optional(),
+    message_id: Type.Optional(Type.String()),
-    id: z.coerce.string().optional(),
+    id: Type.Optional(Type.String()),
 });
-type Payload = z.infer<typeof SchemaData>;
 
+type Payload = Static<typeof SchemaData>;
 export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
     messages: OB11Message[] | undefined;
 }> {

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -3,21 +3,22 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType } from '@/core/types';
 import { MessageUnique } from '@/common/message-unique';
-import { z } from 'zod';
+
+import { Static, Type } from '@sinclair/typebox';
 import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 interface Response {
     messages: OB11Message[];
 }
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string(),
+    user_id: Type.String(),
-    message_seq: z.coerce.string().optional(),
+    message_seq: Type.Optional(Type.String()),
-    count: z.coerce.number().default(20),
+    count: Type.Number({ default: 20 }),
-    reverseOrder: z.coerce.boolean().default(false)
+    reverseOrder: Type.Boolean({ default: false })
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
     override actionName = ActionName.GetFriendMsgHistory;

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

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 interface ResponseType {
     can_at_all: boolean;
     remain_at_all_count_for_group: number;

src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupFileSystemInfo extends OneBotAction<Payload, {
     file_count: number,

src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts

@@ -2,16 +2,16 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { OB11Construct } from '@/onebot/helper/data';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_id: z.coerce.string().optional(),
+    folder_id: Type.Optional(Type.String()),
-    folder: z.coerce.string().optional(),
+    folder: Type.Optional(Type.String()),
-    file_count: z.coerce.number().default(50),
+    file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupFilesByFolder extends OneBotAction<Payload, {
     files: ReturnType<typeof OB11Construct.file>[],

src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts

@@ -1,16 +1,16 @@
-import { WebHonorType } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { WebHonorType } from '@/core/types';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    type: z.nativeEnum(WebHonorType).optional()
+    type: Type.Optional(Type.Enum(WebHonorType))
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
-export class GetGroupHonorInfo extends OneBotAction<Payload, unknown> {
+export class GetGroupHonorInfo extends OneBotAction<Payload, Array<unknown>> {
     override actionName = ActionName.GetGroupHonorInfo;
     override payloadSchema = SchemaData;
 

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

@@ -3,22 +3,22 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '@/onebot/action/router';
 import { ChatType, Peer } from '@/core/types';
 import { MessageUnique } from '@/common/message-unique';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { NetworkAdapterConfig } from '@/onebot/config/config';
 
 interface Response {
     messages: OB11Message[];
 }
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.String(),
-    message_seq: z.coerce.string().optional(),
+    message_seq: Type.Optional(Type.String()),
-    count: z.coerce.number().default(20),
+    count: Type.Number({ default: 20 }),
-    reverseOrder: z.coerce.boolean().default(false)
+    reverseOrder: Type.Boolean({ default: false })
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 
 export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {

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

@@ -3,14 +3,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_count: z.coerce.number().default(50),
+    file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupRootFiles extends OneBotAction<Payload, {
     files: OB11GroupFile[],

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

@@ -3,14 +3,14 @@ import { OB11User, OB11UserSex } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { ActionName } from '@/onebot/action/router';
 import { calcQQLevel } from '@/common/helper';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    no_cache: z.coerce.boolean().default(false),
+    no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User & { uid: string }> {
     override actionName = ActionName.GoCQHTTP_GetStrangerInfo;

src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    url: z.coerce.string(),
+    url: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GoCQHTTPCheckUrlSafely extends OneBotAction<Payload, { level: number }> {
     override actionName = ActionName.GoCQHTTP_CheckUrlSafely;

src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts

@@ -1,15 +1,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    friend_id: z.coerce.string().optional(),
+    friend_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    user_id: z.coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    temp_block: z.coerce.boolean().optional(),
+    temp_block: Type.Optional(Type.Boolean()),
-    temp_both_del: z.coerce.boolean().optional(),
+    temp_both_del: Type.Optional(Type.Boolean()),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GoCQHTTPDeleteFriend extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.GoCQHTTP_DeleteFriend;

src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    model: z.coerce.string(),
+    model: Type.Optional(Type.String()),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GoCQHTTPGetModelShow extends OneBotAction<Payload, Array<{
     variants: {

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

@@ -2,20 +2,20 @@ import { checkFileExist, uriToLocalFile } from '@/common/file';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { unlink } from 'node:fs/promises';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    content: z.coerce.string(),
+    content: Type.String(),
-    image: z.coerce.string().optional(),
+    image: Type.Optional(Type.String()),
-    pinned: z.coerce.number().default(0),
+    pinned: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    type: z.coerce.number().default(1),
+    type: Type.Union([Type.Number(), Type.String()], { default: 1 }),
-    confirm_required: z.coerce.number().default(1),
+    confirm_required: Type.Union([Type.Number(), Type.String()], { default: 1 }),
-    is_show_edit_card: z.coerce.number().default(0),
+    is_show_edit_card: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    tip_window_type: z.coerce.number().default(0),
+    tip_window_type: Type.Union([Type.Number(), Type.String()], { default: 0 })
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SendGroupNotice extends OneBotAction<Payload, null> {
     override actionName = ActionName.GoCQHTTP_SendGroupNotice;

src/onebot/action/go-cqhttp/SetGroupPortrait.ts

@@ -1,15 +1,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { checkFileExistV2, uriToLocalFile } from '@/common/file';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import fs from 'node:fs/promises';
 import { GeneralCallResult } from '@/core';
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    file: z.coerce.string(),
+    file: Type.String(),
-    group_id: z.coerce.string()
+    group_id: Type.Union([Type.Number(), Type.String()])
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupPortrait extends OneBotAction<Payload, GeneralCallResult> {
     override actionName = ActionName.SetGroupPortrait;

src/onebot/action/go-cqhttp/SetQQProfile.ts

@@ -1,15 +1,15 @@
 import { NTQQUserApi } from '@/core/apis';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    nickname: z.coerce.string(),
+    nickname: Type.String(),
-    personal_note: z.coerce.string().optional(),
+    personal_note: Type.Optional(Type.String()),
-    sex: z.coerce.string().optional(), // 传Sex值？建议传0
+    sex: Type.Optional(Type.Union([Type.Number(), Type.String()])), // 传Sex值？建议传0
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 export class SetQQProfile extends OneBotAction<Payload, Awaited<ReturnType<NTQQUserApi['modifySelfProfile']>> | null> {
     override actionName = ActionName.SetQQProfile;
     override payloadSchema = SchemaData;

src/onebot/action/go-cqhttp/UploadGroupFile.ts

@@ -4,17 +4,17 @@ import { ChatType, Peer } from '@/core/types';
 import fs from 'fs';
 import { uriToLocalFile } from '@/common/file';
 import { SendMessageContext } from '@/onebot/api';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file: z.coerce.string(),
+    file: Type.String(),
-    name: z.coerce.string(),
+    name: Type.String(),
-    folder: z.coerce.string().optional(),
+    folder: Type.Optional(Type.String()),
-    folder_id: z.coerce.string().optional(),//临时扩展
+    folder_id: Type.Optional(Type.String()),//临时扩展
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> {
     override actionName = ActionName.GoCQHTTP_UploadGroupFile;
@@ -38,6 +38,7 @@ export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null>
             deleteAfterSentFiles: []
         };
         const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
+        msgContext.deleteAfterSentFiles.push(downloadResult.path);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], msgContext.deleteAfterSentFiles);
         return null;
     }

src/onebot/action/go-cqhttp/UploadPrivateFile.ts

@@ -5,15 +5,15 @@ import fs from 'fs';
 import { uriToLocalFile } from '@/common/file';
 import { SendMessageContext } from '@/onebot/api';
 import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: z.coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    file: z.coerce.string(),
+    file: Type.String(),
-    name: z.coerce.string(),
+    name: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> {
     override actionName = ActionName.GOCQHTTP_UploadPrivateFile;
@@ -23,7 +23,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
         if (payload.user_id) {
             const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
             if (!peerUid) {
-                throw new Error( `私聊${payload.user_id}不存在`);
+                throw new Error(`私聊${payload.user_id}不存在`);
             }
             const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid);
             return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid };
@@ -48,6 +48,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
             deleteAfterSentFiles: []
         };
         const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
+        msgContext.deleteAfterSentFiles.push(downloadResult.path);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], msgContext.deleteAfterSentFiles);
         return null;
     }

src/onebot/action/group/DelEssenceMsg.ts

@@ -1,13 +1,13 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    message_id: z.coerce.string(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.DelEssenceMsg;
     override payloadSchema = SchemaData;
@@ -16,7 +16,7 @@ export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
         const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
         if (!msg) {
             const data = this.core.apis.GroupApi.essenceLRU.getValue(+payload.message_id);
-            if (!data) throw new Error('消息不存在');
+            if(!data) throw new Error('消息不存在');
             const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string };
             return await this.core.apis.GroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random);
         }

src/onebot/action/group/DelGroupNotice.ts

@@ -1,13 +1,13 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    notice_id: z.coerce.string()
+    notice_id: Type.String()
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class DelGroupNotice extends OneBotAction<Payload, void> {
     override actionName = ActionName.DelGroupNotice;

src/onebot/action/group/GetAiRecord.ts

@@ -1,15 +1,15 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    character: z.coerce.string(),
+    character: Type.String(),
-    group_id: z.coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    text: z.coerce.string(),
+    text: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetAiRecord extends GetPacketStatusDepends<Payload, string> {
     override actionName = ActionName.GetAiRecord;