fix

README.md

@@ -37,7 +37,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
 |:-:|:-:|:-:|:-:|
 
-| 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) |
+| 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://docs.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) |
@@ -47,6 +47,8 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
++ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
+
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
@@ -58,7 +60,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.18-32793",
-  "verHash": "e735296c",
+  "verHash": "d43f097e",
-  "linuxVersion": "3.2.16-32869",
+  "linuxVersion": "3.2.16-32793",
-  "linuxVerHash": "4c192ba9",
+  "linuxVerHash": "ee4bd910",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -34,9 +34,9 @@
       "vuex@4.1.0": "patches/vuex@4.1.0.patch"
     }
   },
-  "buildVersion": "32869",
+  "buildVersion": "32793",
   "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.28",
+  "version": "4.7.8",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/src/pages/web_login.tsx

@@ -79,7 +79,6 @@ export default function WebLoginPage() {
             <CardBody className="flex gap-5 py-5 px-5 md:px-10">
               <Input
                 isClearable
-                type="password"
                 classNames={{
                   label: 'text-black/50 dark:text-white/90',
                   input: [

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.28",
+  "version": "4.7.8",
   "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,11 +21,13 @@
     "@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",
@@ -37,9 +39,9 @@
     "@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",
     "eslint": "^9.14.0",
@@ -52,18 +54,19 @@
     "image-size": "^1.1.1",
     "json5": "^2.2.3",
     "multer": "^1.4.5-lts.1",
-    "napcat.protobuf": "^1.1.4",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.13.0",
     "vite": "^6.0.1",
-    "vite-plugin-cp": "^6.0.0",
+    "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
+    "napcat.protobuf": "^1.1.3",
     "winston": "^3.17.0",
-    "zod": "^3.24.2"
+    "compressing": "^1.10.1"
   },
   "dependencies": {
+    "@ffmpeg.wasm/core-mt": "^0.13.2",
     "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }
-}
+}

src/common/clean-task.ts

@@ -1,229 +0,0 @@
-import fs from 'fs';
-// generate Claude 3.7 Sonet Thinking
-
-interface FileRecord {
-    filePath: string;
-    addedTime: number;
-    retries: number;
-}
-
-interface CleanupTask {
-    fileRecord: FileRecord;
-    timer: NodeJS.Timeout;
-}
-
-class CleanupQueue {
-    private tasks: Map<string, CleanupTask> = new Map();
-    private readonly MAX_RETRIES = 3;
-    private isProcessing: boolean = false;
-    private pendingOperations: Array<() => void> = [];
-
-    /**
-     * 执行队列中的待处理操作，确保异步安全
-     */
-    private executeNextOperation(): void {
-        if (this.pendingOperations.length === 0) {
-            this.isProcessing = false;
-            return;
-        }
-
-        this.isProcessing = true;
-        const operation = this.pendingOperations.shift();
-        operation?.();
-
-        // 使用 setImmediate 允许事件循环继续，防止阻塞
-        setImmediate(() => this.executeNextOperation());
-    }
-
-    /**
-     * 安全执行操作，防止竞态条件
-     * @param operation 要执行的操作
-     */
-    private safeExecute(operation: () => void): void {
-        this.pendingOperations.push(operation);
-        if (!this.isProcessing) {
-            this.executeNextOperation();
-        }
-    }
-
-    /**
-     * 检查文件是否存在
-     * @param filePath 文件路径
-     * @returns 文件是否存在
-     */
-    private fileExists(filePath: string): boolean {
-        try {
-            return fs.existsSync(filePath);
-        } catch (error) {
-            //console.log(`检查文件存在出错: ${filePath}`, error);
-            return false;
-        }
-    }
-
-    /**
-     * 添加文件到清理队列
-     * @param filePath 文件路径
-     * @param cleanupDelay 清理延迟时间(毫秒)
-     */
-    addFile(filePath: string, cleanupDelay: number): void {
-        this.safeExecute(() => {
-            // 如果文件已在队列中，取消原来的计时器
-            if (this.tasks.has(filePath)) {
-                this.cancelCleanup(filePath);
-            }
-
-            // 创建新的文件记录
-            const fileRecord: FileRecord = {
-                filePath,
-                addedTime: Date.now(),
-                retries: 0
-            };
-
-            // 设置计时器
-            const timer = setTimeout(() => {
-                this.cleanupFile(fileRecord, cleanupDelay);
-            }, cleanupDelay);
-
-            // 添加到任务队列
-            this.tasks.set(filePath, { fileRecord, timer });
-        });
-    }
-
-    /**
-     * 批量添加文件到清理队列
-     * @param filePaths 文件路径数组
-     * @param cleanupDelay 清理延迟时间(毫秒)
-     */
-    addFiles(filePaths: string[], cleanupDelay: number): void {
-        this.safeExecute(() => {
-            for (const filePath of filePaths) {
-                // 内部直接处理，不通过 safeExecute 以保证批量操作的原子性
-                if (this.tasks.has(filePath)) {
-                    // 取消已有的计时器，但不使用 cancelCleanup 方法以避免重复的安全检查
-                    const existingTask = this.tasks.get(filePath);
-                    if (existingTask) {
-                        clearTimeout(existingTask.timer);
-                    }
-                }
-
-                const fileRecord: FileRecord = {
-                    filePath,
-                    addedTime: Date.now(),
-                    retries: 0
-                };
-
-                const timer = setTimeout(() => {
-                    this.cleanupFile(fileRecord, cleanupDelay);
-                }, cleanupDelay);
-
-                this.tasks.set(filePath, { fileRecord, timer });
-            }
-        });
-    }
-
-    /**
-     * 清理文件
-     * @param record 文件记录
-     * @param delay 延迟时间，用于重试
-     */
-    private cleanupFile(record: FileRecord, delay: number): void {
-        this.safeExecute(() => {
-            // 首先检查文件是否存在，不存在则视为清理成功
-            if (!this.fileExists(record.filePath)) {
-                //console.log(`文件已不存在，跳过清理: ${record.filePath}`);
-                this.tasks.delete(record.filePath);
-                return;
-            }
-
-            try {
-                // 尝试删除文件
-                fs.unlinkSync(record.filePath);
-                // 删除成功，从队列中移除任务
-                this.tasks.delete(record.filePath);
-            } catch (error) {
-                const err = error as NodeJS.ErrnoException;
-
-                // 明确处理文件不存在的情况
-                if (err.code === 'ENOENT') {
-                    //console.log(`文件在删除时不存在，视为清理成功: ${record.filePath}`);
-                    this.tasks.delete(record.filePath);
-                    return;
-                }
-
-                // 文件没有访问权限等情况
-                if (err.code === 'EACCES' || err.code === 'EPERM') {
-                    //console.error(`没有权限删除文件: ${record.filePath}`, err);
-                }
-
-                // 其他删除失败情况，考虑重试
-                if (record.retries < this.MAX_RETRIES - 1) {
-                    // 还有重试机会，增加重试次数
-                    record.retries++;
-                    //console.log(`清理文件失败，将重试(${record.retries}/${this.MAX_RETRIES}): ${record.filePath}`);
-
-                    // 设置相同的延迟时间再次尝试
-                    const timer = setTimeout(() => {
-                        this.cleanupFile(record, delay);
-                    }, delay);
-
-                    // 更新任务
-                    this.tasks.set(record.filePath, { fileRecord: record, timer });
-                } else {
-                    // 已达到最大重试次数，从队列中移除任务
-                    this.tasks.delete(record.filePath);
-                    //console.error(`清理文件失败，已达最大重试次数(${this.MAX_RETRIES}): ${record.filePath}`, error);
-                }
-            }
-        });
-    }
-
-    /**
-     * 取消文件的清理任务
-     * @param filePath 文件路径
-     * @returns 是否成功取消
-     */
-    cancelCleanup(filePath: string): boolean {
-        let cancelled = false;
-        this.safeExecute(() => {
-            const task = this.tasks.get(filePath);
-            if (task) {
-                clearTimeout(task.timer);
-                this.tasks.delete(filePath);
-                cancelled = true;
-            }
-        });
-        return cancelled;
-    }
-
-    /**
-     * 获取队列中的文件数量
-     * @returns 文件数量
-     */
-    getQueueSize(): number {
-        return this.tasks.size;
-    }
-
-    /**
-     * 获取所有待清理的文件
-     * @returns 文件路径数组
-     */
-    getPendingFiles(): string[] {
-        return Array.from(this.tasks.keys());
-    }
-
-    /**
-     * 清空所有清理任务
-     */
-    clearAll(): void {
-        this.safeExecute(() => {
-            // 取消所有定时器
-            for (const task of this.tasks.values()) {
-                clearTimeout(task.timer);
-            }
-            this.tasks.clear();
-            //console.log('已清空所有清理任务');
-        });
-    }
-}
-
-export const cleanTaskQueue = new CleanupQueue();

src/common/coerce.ts

@@ -1,14 +0,0 @@
-import { z } from 'zod';
-const boolean = () => z.preprocess(
-    val => typeof val === 'string' && (val.toLowerCase() === 'false' || val === '0') ? false : Boolean(val),
-    z.boolean()
-);
-const number = () => z.preprocess(
-    val => typeof val !== 'number' ? Number(val) : val,
-    z.number()
-);
-const string = () => z.preprocess(
-    val => typeof val !== 'string' ? String(val) : val,
-    z.string()
-);
-export const coerce = { boolean, number, string };

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

@@ -1,352 +0,0 @@
-// 更正导入语句
-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/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
-const urls = [
-    "https://github.moeyy.xyz/" + downloadOri,
-    "https://ghp.ci/" + 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) {
-        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
-            log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
-        });
-        return {
-            path: path.join(currentPath, 'ffmpeg'),
-            reset: true
-        }
-    }
-
-    return {
-        path: path.join(currentPath, 'ffmpeg'),
-        reset: true
-    }
-}

src/common/ffmpeg-worker.ts

@@ -0,0 +1,165 @@
+/* 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 });
+        }
+    });
+}
+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> {
+        await FFmpegService.extractThumbnail(videoPath, thumbnailPath);
+        const fileType = (await fileTypeFromFile(videoPath))?.ext ?? 'mp4';
+        const inputFileName = `${randomUUID()}.${fileType}`;
+        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
+        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;
+            }
+        });
+        await ffmpegInstance.run('-i', inputFileName);
+        const image = imageSize(thumbnailPath);
+        ffmpegInstance.fs.unlink(inputFileName);
+        const fileSize = statSync(videoPath).size;
+        return {
+            width: image.width ?? 100,
+            height: image.height ?? 100,
+            time: duration,
+            format: fileType,
+            size: fileSize,
+            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,195 +1,36 @@
-import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
+/* eslint-disable @typescript-eslint/no-explicit-any */
-import path, { dirname } from 'path';
+import { VideoInfo } from './video';
-import { execFile } from 'child_process';
+import path from 'path';
-import { promisify } from 'util';
+import { fileURLToPath } from 'url';
-import type { VideoInfo } from './video';
+import { runTask } from './worker';
-import { fileTypeFromFile } from 'file-type';
+
-import imageSize from 'image-size';
+type EncodeArgs = {
-import { fileURLToPath } from 'node:url';
+    method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
-import { platform } from 'node:os';
+    args: any[];
-import { LogWrapper } from './log';
-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');
+
-export let FFPROBE_CMD = getFFmpegPath('ffprobe');
+type EncodeResult = any;
+
+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> {
-        try {
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
-            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> {
-        try {
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
-            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> {
-        try {
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
-            this.ensureDirExists(pcmPath);
+        return result;
-
-            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> {
-        try {
+        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
-            // 并行执行获取文件信息和提取缩略图
+        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 = imageSize(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

@@ -76,7 +76,7 @@ export function calculateFileMD5(filePath: string): Promise<string> {
         const stream = fs.createReadStream(filePath);
         const hash = crypto.createHash('md5');
 
-        stream.on('data', (data) => {
+        stream.on('data', (data: Buffer) => {
             // 当读取到数据时，更新哈希对象的状态
             hash.update(data);
         });

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.28';
+export const napCatVersion = '4.7.8';

src/common/worker.ts

@@ -5,11 +5,8 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
     try {
         return await new Promise<R>((resolve, reject) => {
             worker.on('message', (result: R) => {
-                if ((result as any)?.log) {
-                    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((result as { error: string }).error));
                 }
                 resolve(result);
             });

src/core/apis/file.ts

@@ -41,8 +41,8 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://secret-service.bietiaop.com/rkeys',
+            'https://ss.xingzhige.com/music_card/rkey', // 国内
-            'http://ss.xingzhige.com/music_card/rkey',
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
         this.context.logger
         );
@@ -182,30 +182,23 @@ export class NTQQFileApi {
         filePath = newFilePath;
 
         const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
-        context.deleteAfterSentFiles.push(path);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
         const thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
         fs.mkdirSync(pathLib.dirname(thumbDir), { recursive: true });
         const thumbPath = pathLib.join(pathLib.dirname(thumbDir), `${md5}_0.png`);
+        try {
+            videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
+        } catch {
+            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+        }
         if (_diyThumbPath) {
             try {
                 await this.copyFile(_diyThumbPath, thumbPath);
             } catch (e) {
                 this.context.logger.logError('复制自定义缩略图失败', e);
             }
-        } else {
-            try {
-                videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
-                if (!fs.existsSync(thumbPath)) {
-                    this.context.logger.logError('获取视频缩略图失败', new Error('缩略图不存在'));
-                    throw new Error('获取视频缩略图失败');
-                }
-            } catch (e) {
-                this.context.logger.logError('获取视频信息失败', e);
-                fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-            }
         }
         context.deleteAfterSentFiles.push(thumbPath);
         const thumbSize = (await fsPromises.stat(thumbPath)).size;
@@ -231,7 +224,7 @@ export class NTQQFileApi {
             },
         };
     }
-    async createValidSendPttElement(_context: SendMessageContext, pttPath: string): Promise<SendPttElement> {
+    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
 
         const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
         if (!silkPath) {

src/core/apis/group.ts

@@ -44,13 +44,22 @@ export class NTQQGroupApi {
     }
 
     async initApi() {
-        this.initCache().then().catch(e => this.context.logger.logError(e));
+        await this.initCache().then().catch(e => this.context.logger.logError(e));
     }
 
     async initCache() {
+        let promises: Promise<void>[] = [];
         for (const group of await this.getGroups(true)) {
-            this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
+            let user = await this.refreshGroupMemberCache(group.groupCode, false).then().catch(e => this.context.logger.logError(e));
+            if (user) {
+                for (const member of user) {
+                    let promise = this.core.apis.UserApi.fetchUserDetailInfoV3(member[1].uid).then(_ => void 0).catch(e => this.context.logger.logError(e));
+                    promises.push(promise);
+                }
+            }
         }
+        await Promise.all(promises);
+        this.context.logger.logDebug('[NapCat] [Mark] 群成员缓存初始化完成');
     }
 
     async fetchGroupEssenceList(groupCode: string) {
@@ -218,10 +227,6 @@ export class NTQQGroupApi {
         return this.context.session.getRichMediaService().deleteGroupFolder(groupCode, folderId);
     }
 
-    async transGroupFile(groupCode: string, fileId: string) {
-        return this.context.session.getRichMediaService().transGroupFile(groupCode, fileId);
-    }
-
     async addGroupEssence(groupCode: string, msgId: string) {
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,

src/core/apis/msg.ts

@@ -12,7 +12,7 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
-
+    
     async clickInlineKeyboardButton(...params: Parameters<NodeIKernelMsgService['clickInlineKeyboardButton']>) {
         return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
     }

src/core/apis/user.ts

@@ -1,4 +1,4 @@
-import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
+import { ModifyProfileParams, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
 import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
@@ -77,7 +77,7 @@ export class NTQQUserApi {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
 
-    async fetchUserDetailInfo(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
+    async fetchUserDetailInfoV2(uid: string, mode: UserDetailSource = UserDetailSource.KDB) {
         const [, profile] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelProfileService/fetchUserDetailInfo',
             'NodeIKernelProfileListener/onUserDetailInfoChanged',
@@ -93,37 +93,26 @@ export class NTQQUserApi {
         return profile;
     }
 
-    async getUserDetailInfo(uid: string, no_cache: boolean = false): Promise<User> {
+    async fetchUserDetailInfoV3(uid: string) {
-        let profile = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, no_cache ? UserDetailSource.KSERVER : UserDetailSource.KDB), uid);
+        let cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB);
-        if (profile && profile.uin !== '0' && profile.commonExt) {
+        if (!cache.commonExt) {
-            return {
+            cache = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
-                ...profile.simpleInfo.status,
+        }
-                ...profile.simpleInfo.vasInfo,
+        return cache;
-                ...profile.commonExt,
+    }
-                ...profile.simpleInfo.baseInfo,
+
-                ...profile.simpleInfo.coreInfo,
+
-                qqLevel: profile.commonExt?.qqLevel,
+    async getUserDetailInfoV2(uid: string) {
-                age: profile.simpleInfo.baseInfo.age,
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfoV2(uid, UserDetailSource.KDB), uid);
-                pendantId: '',
+        if (retUser && retUser.uin !== '0') {
-                nick: profile.simpleInfo.coreInfo.nick || '',
+            return retUser;
-            };
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        profile = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfoV2(uid, UserDetailSource.KSERVER);
-        if (profile && profile.uin === '0') {
+        if (retUser && retUser.uin === '0') {
-            profile.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
         }
-        return {
+        return retUser;
-            ...profile.simpleInfo.status,
-            ...profile.simpleInfo.vasInfo,
-            ...profile.commonExt,
-            ...profile.simpleInfo.baseInfo,
-            ...profile.simpleInfo.coreInfo,
-            qqLevel: profile.commonExt?.qqLevel,
-            age: profile.simpleInfo.baseInfo.age,
-            pendantId: '',
-            nick: profile.simpleInfo.coreInfo.nick || '',
-        };
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {
@@ -212,7 +201,7 @@ export class NTQQUserApi {
             .add(() => this.context.session.getUixConvertService().getUin([uid]).then((data) => data.uinInfo.get(uid)))
             .add(() => this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [uid]).get(uid))
             .add(() => this.context.session.getGroupService().getUinByUids([uid]).then((data) => data.uins.get(uid)))
-            .add(() => this.getUserDetailInfo(uid).then((data) => data.uin));
+            .add(() => this.fetchUserDetailInfoV2(uid).then((data) => data.uin));
 
         const uin = await fallback.run().catch(() => '0');
         return uin ?? '0';

src/core/external/appid.json

@@ -226,25 +226,5 @@
     "9.9.18-33139": {
         "appid": 537273874,
         "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
-    },
-    "9.9.18-33800": {
-        "appid": 537273974,
-        "qua": "V1_WIN_NQ_9.9.18_33800_GW_B"
-    },
-    "3.2.16-33800": {
-        "appid": 537274009,
-        "qua": "V1_LNX_NQ_3.2.16_33800_GW_B"
-    },
-    "9.9.19-34231": {
-        "appid": 537279209,
-        "qua": "V1_WIN_NQ_9.9.19_34231_GW_B"
-    },
-    "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"
     }
 }

src/core/external/offset.json

@@ -302,33 +302,5 @@
     "3.2.16-33139-arm64": {
         "send": "7262BB0",
         "recv": "72664E0"
-    },
-    "9.9.18-33800-x64": {
-        "send": "39F5870",
-        "recv": "39FA070"
-    },
-    "3.2.16-33800-x64": {
-        "send": "A634F60",
-        "recv": "A638980"
-    },
-    "3.2.16-33800-arm64": {
-        "send": "7262BB0",
-        "recv": "72664E0"
-    },
-    "9.9.19-34231-x64": {
-        "send": "3BD73D0",
-        "recv": "3BDBBD0"
-    },
-    "3.2.17-34231-x64": {
-        "send": "AD787E0",
-        "recv": "AD7C200"
-    },
-    "3.2.17-34231-arm64": {
-        "send": "770CDC0",
-        "recv": "77106F0"
-    },
-    "9.9.19-34362-x64":{
-        "send": "3BD80D0",
-        "recv": "3BDC8D0"
     }
 }

src/core/helper/config.ts

@@ -1,22 +1,22 @@
 import { ConfigBase } from '@/common/config-base';
 import { NapCatCore } from '@/core';
-import { coerce } from '@/common/coerce';
+import { Type, Static } from '@sinclair/typebox';
-import { z } from 'zod';
+import { AnySchema } from 'ajv';
 
-export const NapcatConfigSchema = z.object({
+export const NapcatConfigSchema = Type.Object({
-    fileLog: coerce.boolean().default(false),
+    fileLog: Type.Boolean({ default: false }),
-    consoleLog: coerce.boolean().default(true),
+    consoleLog: Type.Boolean({ default: true }),
-    fileLogLevel: coerce.string().default('debug'),
+    fileLogLevel: Type.String({ default: 'debug' }),
-    consoleLogLevel: coerce.string().default('info'),
+    consoleLogLevel: Type.String({ default: 'info' }),
-    packetBackend: coerce.string().default('auto'),
+    packetBackend: Type.String({ default: 'auto' }),
-    packetServer: coerce.string().default(''),
+    packetServer: Type.String({ default: '' }),
-    o3HookMode: 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/helper/rkey.ts

@@ -6,17 +6,6 @@ interface ServerRkeyData {
     private_rkey: string;
     expired_time: number;
 }
-interface OneBotApiRet {
-    status: string,
-    retcode: number,
-    data: ServerRkeyData,
-    message: string,
-    wording: string,
-}
-interface UrlFailureInfo {
-    count: number;
-    lastTimestamp: number;
-}
 
 export class RkeyManager {
     serverUrl: string[] = [];
@@ -26,8 +15,9 @@ export class RkeyManager {
         private_rkey: '',
         expired_time: 0,
     };
-    private urlFailures: Map<string, UrlFailureInfo> = new Map();
+    private failureCount: number = 0;
-    private readonly FAILURE_LIMIT: number = 4;
+    private lastFailureTimestamp: number = 0;
+    private readonly FAILURE_LIMIT: number = 8;
     private readonly ONE_DAY: number = 24 * 60 * 60 * 1000;
 
     constructor(serverUrl: string[], logger: LogWrapper) {
@@ -36,92 +26,50 @@ export class RkeyManager {
     }
 
     async getRkey() {
-        const availableUrls = this.getAvailableUrls();
+        const now = new Date().getTime();
-        if (availableUrls.length === 0) {
+        if (now - this.lastFailureTimestamp > this.ONE_DAY) {
-            this.logger.logError('[Rkey] 所有服务均已禁用, 图片使用FallBack机制');
+            this.failureCount = 0; // 重置失败计数器
-            throw new Error('获取rkey失败：所有服务URL均已被禁用');
+        }
+
+        if (this.failureCount >= this.FAILURE_LIMIT) {
+            this.logger.logError('[Rkey] 服务存在异常, 图片使用FallBack机制');
+            throw new Error('获取rkey失败次数过多，请稍后再试');
         }
 
         if (this.isExpired()) {
             try {
                 await this.refreshRkey();
             } catch (e) {
-                throw new Error(`${e}`);
+                throw new Error(`${e}`);//外抛
             }
         }
         return this.rkeyData;
     }
 
-    private getAvailableUrls(): string[] {
-        return this.serverUrl.filter(url => !this.isUrlDisabled(url));
-    }
-
-    private isUrlDisabled(url: string): boolean {
-        const failureInfo = this.urlFailures.get(url);
-        if (!failureInfo) return false;
-
-        const now = new Date().getTime();
-        // 如果已经过了一天，重置失败计数
-        if (now - failureInfo.lastTimestamp > this.ONE_DAY) {
-            failureInfo.count = 0;
-            this.urlFailures.set(url, failureInfo);
-            return false;
-        }
-
-        return failureInfo.count >= this.FAILURE_LIMIT;
-    }
-
-    private updateUrlFailure(url: string) {
-        const now = new Date().getTime();
-        const failureInfo = this.urlFailures.get(url) || { count: 0, lastTimestamp: 0 };
-
-        // 如果已经过了一天，重置失败计数
-        if (now - failureInfo.lastTimestamp > this.ONE_DAY) {
-            failureInfo.count = 1;
-        } else {
-            failureInfo.count++;
-        }
-
-        failureInfo.lastTimestamp = now;
-        this.urlFailures.set(url, failureInfo);
-
-        if (failureInfo.count >= this.FAILURE_LIMIT) {
-            this.logger.logError(`[Rkey] URL ${url} 已被禁用，失败次数达到 ${this.FAILURE_LIMIT} 次`);
-        }
-    }
-
     isExpired(): boolean {
         const now = new Date().getTime() / 1000;
         return now > this.rkeyData.expired_time;
     }
 
     async refreshRkey() {
-        const availableUrls = this.getAvailableUrls();
+        //刷新rkey
-
+        for (const url of this.serverUrl) {
-        if (availableUrls.length === 0) {
-            this.logger.logError('[Rkey] 所有服务均已禁用');
-            throw new Error('获取rkey失败：所有服务URL均已被禁用');
-        }
-
-        for (const url of availableUrls) {
             try {
-                let temp = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
+                const temp = await RequestUtil.HttpGetJson<ServerRkeyData>(url, 'GET');
-                if ('retcode' in temp) {
-                    // 支持Onebot Ret风格
-                    temp = (temp as unknown as OneBotApiRet).data;
-                }
                 this.rkeyData = {
                     group_rkey: temp.group_rkey.slice(6),
                     private_rkey: temp.private_rkey.slice(6),
                     expired_time: temp.expired_time
                 };
+                this.failureCount = 0;
                 return;
             } catch (e) {
                 this.logger.logError(`[Rkey] 异常服务 ${url} 异常 / `, e);
-                this.updateUrlFailure(url);
+                this.failureCount++;
-
+                this.lastFailureTimestamp = new Date().getTime();
-                if (url === availableUrls[availableUrls.length - 1]) {
+                //是否为最后一个url
-                    throw new Error(`获取rkey失败: ${e}`);
+                if (url === this.serverUrl[this.serverUrl.length - 1]) {
+                    throw new Error(`获取rkey失败: ${e}`);//外抛
                 }
             }
         }

src/core/listeners/NodeIKernelProfileListener.ts

@@ -1,71 +1,71 @@
 import { User, UserDetailInfoListenerArg } from '@/core/types';
 
 export class NodeIKernelProfileListener {
-    onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void {
+    onUserDetailInfoChanged(_arg: UserDetailInfoListenerArg): void {
 
     }
 
-    onProfileSimpleChanged(...args: unknown[]): any {
+    onProfileSimpleChanged(..._args: unknown[]): any {
 
     }
 
-    onProfileDetailInfoChanged(profile: User): any {
+    onProfileDetailInfoChanged(_profile: User): any {
 
     }
 
-    onStatusUpdate(...args: unknown[]): any {
+    onStatusUpdate(..._args: unknown[]): any {
 
     }
 
-    onSelfStatusChanged(...args: unknown[]): any {
+    onSelfStatusChanged(..._args: unknown[]): any {
 
     }
 
-    onStrangerRemarkChanged(...args: unknown[]): any {
+    onStrangerRemarkChanged(..._args: unknown[]): any {
 
     }
 
-    onMemberListChange(...args: unknown[]): any {
+    onMemberListChange(..._args: unknown[]): any {
 
     }
 
-    onMemberInfoChange(...args: unknown[]): any {
+    onMemberInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupListUpdate(...args: unknown[]): any {
+    onGroupListUpdate(..._args: unknown[]): any {
 
     }
 
-    onGroupAllInfoChange(...args: unknown[]): any {
+    onGroupAllInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupDetailInfoChange(...args: unknown[]): any {
+    onGroupDetailInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupConfMemberChange(...args: unknown[]): any {
+    onGroupConfMemberChange(..._args: unknown[]): any {
 
     }
 
-    onGroupExtListUpdate(...args: unknown[]): any {
+    onGroupExtListUpdate(..._args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUpdated(...args: unknown[]): any {
+    onGroupNotifiesUpdated(..._args: unknown[]): any {
 
     }
 
-    onGroupNotifiesUnreadCountUpdated(...args: unknown[]): any {
+    onGroupNotifiesUnreadCountUpdated(..._args: unknown[]): any {
 
     }
 
-    onGroupMemberLevelInfoChange(...args: unknown[]): any {
+    onGroupMemberLevelInfoChange(..._args: unknown[]): any {
 
     }
 
-    onGroupBulletinChange(...args: unknown[]): any {
+    onGroupBulletinChange(..._args: unknown[]): any {
 
     }
 }

src/core/packet/context/operationContext.ts

@@ -68,8 +68,8 @@ export class PacketOperationContext {
         }
     }
 
-    async SetGroupSpecialTitle(groupUin: number, uid: string, title: string) {
+    async SetGroupSpecialTitle(groupUin: number, uid: string, tittle: string) {
-        const req = trans.SetSpecialTitle.build(groupUin, uid, title);
+        const req = trans.SetSpecialTitle.build(groupUin, uid, tittle);
         await this.context.client.sendOidbPacket(req);
     }
 
@@ -154,20 +154,6 @@ export class PacketOperationContext {
         return res.result.resId;
     }
 
-    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);
-        return res.move.retCode;
-    }
-
-    async RenameGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, newName: string) {
-        const req = trans.RenameGroupFile.build(groupUin, fileUUID, currentParentDirectory, newName);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.RenameGroupFile.parse(resp);
-        return res.rename.retCode;
-    }
-
     async GetGroupFileUrl(groupUin: number, fileUUID: string) {
         const req = trans.DownloadGroupFile.build(groupUin, fileUUID);
         const resp = await this.context.client.sendOidbPacket(req, true);

src/core/packet/transformer/action/MoveGroupFile.ts

@@ -1,35 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-
-class MoveGroupFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0x6D6Response> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string): OidbPacket {
-        const body = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6).encode({
-            move: {
-                groupUin: groupUin,
-                appId: 5,
-                busId: 102,
-                fileId: fileUUID,
-                parentDirectory: currentParentDirectory,
-                targetDirectory: targetParentDirectory,
-            }
-        });
-        return OidbBase.build(0x6D6, 5, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        const res = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6Response).decode(oidbBody);
-        if (res.move.retCode !== 0) {
-            throw new Error(`sendGroupFileMoveReq error: ${res.move.clientWording} (code=${res.move.retCode})`);
-        }
-        return res;
-    }
-}
-
-export default new MoveGroupFile();

src/core/packet/transformer/action/RenameGroupFile.ts

@@ -1,34 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-
-class RenameGroupFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0x6D6Response> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, fileUUID: string, currentParentDirectory: string, newName: string): OidbPacket {
-        const body = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6).encode({
-            rename: {
-                groupUin: groupUin,
-                busId: 102,
-                fileId: fileUUID,
-                parentFolder: currentParentDirectory,
-                newFileName: newName,
-            }
-        });
-        return OidbBase.build(0x6D6, 4, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        const res = new NapProtoMsg(proto.OidbSvcTrpcTcp0x6D6Response).decode(oidbBody);
-        if (res.rename.retCode !== 0) {
-            throw new Error(`sendGroupFileRenameReq error: ${res.rename.clientWording} (code=${res.rename.retCode})`);
-        }
-        return res;
-    }
-}
-
-export default new RenameGroupFile();

src/core/packet/transformer/action/SetSpecialTitle.ts

@@ -8,14 +8,14 @@ class SetSpecialTitle extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase>
         super();
     }
 
-    build(groupCode: number, uid: string, title: string): OidbPacket {
+    build(groupCode: number, uid: string, tittle: string): OidbPacket {
         const oidb_0x8FC_2 = new NapProtoMsg(proto.OidbSvcTrpcTcp0X8FC_2).encode({
             groupUin: +groupCode,
             body: {
                 targetUid: uid,
-                specialTitle: title,
+                specialTitle: tittle,
                 expiredTime: -1,
-                uinName: title
+                uinName: tittle
             }
         });
         return OidbBase.build(0x8FC, 2, oidb_0x8FC_2, false, false);

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

@@ -6,5 +6,3 @@ export { default as GetStrangerInfo } from './GetStrangerInfo';
 export { default as SendPoke } from './SendPoke';
 export { default as SetSpecialTitle } from './SetSpecialTitle';
 export { default as ImageOCR } from './ImageOCR';
-export { default as MoveGroupFile } from './MoveGroupFile';
-export { default as RenameGroupFile } from './RenameGroupFile';

src/core/services/NodeIKernelProfileService.ts

@@ -1,5 +1,5 @@
 import { AnyCnameRecord } from 'node:dns';
-import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailInfoListenerArg, UserDetailSource } from '@/core';
+import { BizKey, ModifyProfileParams, NodeIKernelProfileListener, ProfileBizType, SimpleInfo, UserDetailInfoByUin, UserDetailSource } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export interface NodeIKernelProfileService {
@@ -15,13 +15,7 @@ export interface NodeIKernelProfileService {
 
     getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>;
 
-    fetchUserDetailInfo(trace: string, uids: string[], source: UserDetailSource, bizType: ProfileBizType[]): Promise<GeneralCallResult &
+    fetchUserDetailInfo(trace: string, uids: string[], source: UserDetailSource, bizType: ProfileBizType[]): Promise<GeneralCallResult>;
-    {
-        source: UserDetailSource,
-        // uid -> detail
-        detail: Map<string, UserDetailInfoListenerArg>,
-    }
-    >;
 
     addKernelProfileListener(listener: NodeIKernelProfileListener): number;
 

src/core/services/NodeIKernelRichMediaService.ts

@@ -198,29 +198,9 @@ export interface NodeIKernelRichMediaService {
 
     renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown;
 
-    moveGroupFile(groupCode: string, busId: Array<number>, fileList: Array<string>, currentParentDirectory: string, targetParentDirectory: string): Promise<GeneralCallResult & {
+    moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown;
-        moveGroupFileResult: {
-            result: {
-                retCode: number,
-                retMsg: symbol,
-                clientWording: string
-            },
-            successFileIdList: Array<string>,
-            failFileIdList: Array<string>
-        }
-    }>;
 
-    transGroupFile(groupCode: string, fileId: string): Promise<GeneralCallResult & {
+    transGroupFile(arg1: unknown, arg2: unknown): unknown;
-        transGroupFileResult: {
-            result: {
-                retCode: number
-                retMsg: string
-                clientWording: string
-            }
-            saveBusId: number
-            saveFilePath: string
-        }
-    }>;
 
     searchGroupFile(
         keywords: Array<string>,

src/core/types/group.ts

@@ -1,5 +1,3 @@
-import { QQLevel, NTSex } from './user';
-
 export interface KickMemberInfo {
     optFlag: number;
     optOperate: number;
@@ -274,24 +272,42 @@ export enum NTGroupMemberRole {
     KOWNER = 4
 }
 export interface GroupMember {
-    memberRealLevel: number | undefined;
-    memberSpecialTitle?: string;
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: NTGroupMemberRole;
-    shutUpTime: number; // 禁言时间(S)
     uid: string;
+    qid: string;
     uin: string;
+    nick: string;
+    remark: string;
+    cardType: number;
+    cardName: string;
+    role: NTGroupMemberRole;
+    avatarPath: string;
+    shutUpTime: number;
+    isDelete: boolean;
+    isSpecialConcerned: boolean;
+    isSpecialShield: boolean;
     isRobot: boolean;
-    sex?: NTSex;
+    groupHonor: Uint8Array;
-    age?: number;
+    memberRealLevel: number;
-    qqLevel?: QQLevel;
+    memberLevel: number;
-    isChangeRole: boolean;
+    globalGroupLevel: number;
-    joinTime: string;
+    globalGroupPoint: number;
-    lastSpeakTime: string;
+    memberTitleId: number;
+    memberSpecialTitle: string;
+    specialTitleExpireTime: string;
+    userShowFlag: number;
+    userShowFlagNew: number;
+    richFlag: number;
+    mssVipType: number;
+    bigClubLevel: number;
+    bigClubFlag: number;
+    autoRemark: string;
+    creditLevel: number;
+    joinTime: number;
+    lastSpeakTime: number;
+    memberFlag: number;
+    memberFlagExt: number;
+    memberMobileFlag: number;
+    memberFlagExt2: number;
+    isSpecialShielded: boolean;
+    cardNameId: number;
 }

src/core/types/user.ts

@@ -207,9 +207,8 @@ interface PhotoWall {
 
 // 简单信息
 export interface SimpleInfo {
-    qqLevel?: QQLevel;//临时添加
+    uid: string;
-    uid?: string;
+    uin: string;
-    uin?: string;
     coreInfo: CoreInfo;
     baseInfo: BaseInfo;
     status: UserStatus | null;
@@ -234,13 +233,15 @@ export interface SelfStatusInfo {
     setTime: string;
 }
 
+export type UserV2 = UserDetailInfoListenerArg;
+
 // 用户详细信息监听参数
 export interface UserDetailInfoListenerArg {
     uid: string;
     uin: string;
-    simpleInfo: SimpleInfo;
+    simpleInfo?: SimpleInfo;
-    commonExt: CommonExt;
+    commonExt?: CommonExt;
-    photoWall: PhotoWall;
+    photoWall?: PhotoWall;
 }
 
 // 修改个人资料参数
@@ -333,13 +334,12 @@ export interface User {
 }
 
 // 自身信息
-export interface SelfInfo extends User {
+export interface SelfInfo extends Partial<UserV2> {
-    online?: boolean;
+    uid: string;
+    uin: string;
+    online: boolean;
 }
 
-// 好友类型
-export type Friend = User;
-
 // 业务键枚举
 export enum BizKey {
     KPRIVILEGEICON = 0,

src/core/types/webapi.ts

@@ -115,7 +115,7 @@ export interface GroupEssenceMsg {
     add_digest_uin: string;
     add_digest_nick: string;
     add_digest_time: number;
-    msg_content: { msg_type: number, text?: string, image_url?: string }[];
+    msg_content: unknown[];
     can_be_removed: true;
 }
 

src/framework/napcat.ts

@@ -9,8 +9,6 @@ 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() {
@@ -38,13 +36,6 @@ export async function NCoreInitFramework(
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-    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();
@@ -55,7 +46,6 @@ export async function NCoreInitFramework(
             resolveSelfInfo({
                 uid: loginResult.uid,
                 uin: loginResult.uin,
-                nick: '', // 获取不到
                 online: true,
             });
         };

src/onebot/action/OneBotAction.ts

@@ -1,8 +1,8 @@
 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';
 
 export class OB11Response {
     private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
@@ -32,7 +32,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?: unknown = undefined;
     obContext: NapCatOneBot11Adapter;
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
@@ -40,30 +41,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 }).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 +85,4 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
     }
 
     abstract _handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<ReturnDataType>;
-}
+}

src/onebot/action/extends/ClickInlineKeyboardButton.ts

@@ -1,16 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { OneBotAction } from '../OneBotAction';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    bot_appid: coerce.string(),
+    bot_appid: Type.String(),
-    button_id: coerce.string().default(''),
+    button_id: Type.String({ default: '' }),
-    callback_data: coerce.string().default(''),
+    callback_data: Type.String({ default: '' }),
-    msg_seq: 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;
@@ -25,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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    rawData: coerce.string(),
+    rawData: Type.String(),
-    brief: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    count: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    message_id: coerce.string(),
+    message_id: Type.Union([Type.Number(), Type.String()]),
-    emojiId: coerce.string(),
+    emojiId: Type.Union([Type.Number(), Type.String()]),
-    emojiType: coerce.string(),
+    emojiType: Type.Union([Type.Number(), Type.String()]),
-    count: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    chat_type: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    category: coerce.number(),
+    category: Type.Union([Type.Number(), Type.String()]),
-    count: 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,18 +1,17 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Type, Static } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
+const SchemaData = Type.Object({
-const SchemaData = z.object({
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    group_id:  coerce.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';
-import { coerce } from '@/common/coerce';
+
-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: coerce.string(),
+        title: Type.String(),
-        desc: coerce.string(),
+        desc: Type.String(),
-        picUrl: coerce.string(),
+        picUrl: Type.String(),
-        jumpUrl: coerce.string(),
+        jumpUrl: Type.String(),
-        webUrl: coerce.string().optional(),
+        webUrl: Type.Optional(Type.String()),
-        rawArkData: coerce.string().optional()
+        rawArkData: Type.Optional(Type.Union([Type.String()]))
     }),
-    z.object({
+    Type.Object({
-        title: coerce.string(),
+        title: Type.String(),
-        desc: coerce.string(),
+        desc: Type.String(),
-        picUrl: coerce.string(),
+        picUrl: Type.String(),
-        jumpUrl: coerce.string(),
+        jumpUrl: Type.String(),
-        iconUrl: coerce.string(),
+        iconUrl: Type.String(),
-        webUrl: coerce.string().optional(),
+        webUrl: Type.Optional(Type.String()),
-        appId: coerce.string(),
+        appId: Type.String(),
-        scene: z.union([coerce.number(), coerce.string()]),
+        scene: Type.Union([Type.Number(), Type.String()]),
-        templateType: z.union([coerce.number(), coerce.string()]),
+        templateType: Type.Union([Type.Number(), Type.String()]),
-        businessType: z.union([coerce.number(), coerce.string()]),
+        businessType: Type.Union([Type.Number(), Type.String()]),
-        verType: z.union([coerce.number(), coerce.string()]),
+        verType: Type.Union([Type.Number(), Type.String()]),
-        shareType: z.union([coerce.number(), coerce.string()]),
+        shareType: Type.Union([Type.Number(), Type.String()]),
-        versionId: coerce.string(),
+        versionId: Type.String(),
-        sdkId: coerce.string(),
+        sdkId: Type.String(),
-        withShareTicket: z.union([coerce.number(), coerce.string()]),
+        withShareTicket: Type.Union([Type.Number(), Type.String()]),
-        rawArkData: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    start: coerce.number().default(0),
+    start: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    count: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: 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,33 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
-import { coerce } from '@/common/coerce';
-const SchemaData = z.object({
-    group_id: coerce.string(),
-    file_id: coerce.string(),
-    current_parent_directory: coerce.string(),
-    target_parent_directory: coerce.string(),
-});
-
-type Payload = z.infer<typeof SchemaData>;
-
-interface MoveGroupFileResponse {
-    ok: boolean;
-}
-
-export class MoveGroupFile extends GetPacketStatusDepends<Payload, MoveGroupFileResponse> {
-    override actionName = ActionName.MoveGroupFile;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        if (contextMsgFile?.fileUUID) {
-            await this.core.apis.PacketApi.pkt.operation.MoveGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.target_parent_directory);
-            return {
-                ok: true,
-            };
-        }
-        throw new Error('real fileUUID not found!');
-    }
-}

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    image: 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,33 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
-import { coerce } from '@/common/coerce';
-const SchemaData = z.object({
-    group_id: coerce.string(),
-    file_id: coerce.string(),
-    current_parent_directory: coerce.string(),
-    new_name: coerce.string(),
-});
-
-type Payload = z.infer<typeof SchemaData>;
-
-interface RenameGroupFileResponse {
-    ok: boolean;
-}
-
-export class RenameGroupFile extends GetPacketStatusDepends<Payload, RenameGroupFileResponse> {
-    override actionName = ActionName.RenameGroupFile;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        if (contextMsgFile?.fileUUID) {
-            await this.core.apis.PacketApi.pkt.operation.RenameGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.new_name);
-            return {
-                ok: true,
-            };
-        }
-        throw new Error('real fileUUID not found!');
-    }
-}

src/onebot/action/extends/SendPacket.ts

@@ -1,22 +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';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    cmd: coerce.string(),
+    cmd: Type.String(),
-    data: coerce.string(),
+    data: Type.String(),
-    rsp: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    face_id:  coerce.string(),// 参考 face_config.json 的 QSid
+    face_id: Type.Union([Type.Number(), Type.String()]),// 参考 face_config.json 的 QSid
-    face_type: coerce.string().default('1'),
+    face_type: Type.Union([Type.Number(), Type.String()], { default: '1' }),
-    wording: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.String(),
-    remark: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    event_type: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    longNick: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    status: coerce.number(),
+    status: Type.Union([Type.Number(), Type.String()]),
-    ext_status: coerce.number(),
+    ext_status: Type.Union([Type.Number(), Type.String()]),
-    battery_status: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    file: 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/SetSpecialTittle.ts

@@ -1,17 +1,17 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    special_title: 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> {
+export class SetSpecialTittle extends GetPacketStatusDepends<Payload, void> {
-    override actionName = ActionName.SetSpecialTitle;
+    override actionName = ActionName.SetSpecialTittle;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    group_id: coerce.string().optional(),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    phoneNumber: 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: 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,34 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
-import { coerce } from '@/common/coerce';
-const SchemaData = z.object({
-    group_id: coerce.string(),
-    file_id: coerce.string(),
-});
-
-type Payload = z.infer<typeof SchemaData>;
-
-interface TransGroupFileResponse {
-    ok: boolean;
-}
-
-export class TransGroupFile extends GetPacketStatusDepends<Payload, TransGroupFileResponse> {
-    override actionName = ActionName.TransGroupFile;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload) {
-        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
-        if (contextMsgFile?.fileUUID) {
-            const result = await this.core.apis.GroupApi.transGroupFile(payload.group_id.toString(), contextMsgFile.fileUUID);
-            if (result.transGroupFileResult.result.retCode === 0) {
-                return {
-                    ok: true
-                };
-            }
-            throw new Error(result.transGroupFileResult.result.retMsg);
-        }
-        throw new Error('real fileUUID not found!');
-    }
-}

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    words: z.array(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,8 +3,8 @@ 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';
-import { coerce } from '@/common/coerce';
+
 export interface GetFileResponse {
     file?: string;  // path
     url?: string;
@@ -13,13 +13,13 @@ export interface GetFileResponse {
     base64?: string;
 }
 
-const GetFileBase_PayloadSchema = z.object({
+const GetFileBase_PayloadSchema = Type.Object({
-    file: coerce.string().optional(),
+    file: Type.Optional(Type.String()),
-    file_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    file_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_name: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_id: coerce.string().optional(),
+    folder_id: Type.Optional(Type.String()),
-    folder: 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';
-import { coerce } from '@/common/coerce';
+
 interface FileResponse {
     file: string;
 }
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    url: coerce.string().optional(),
+    url: Type.Optional(Type.String()),
-    base64: coerce.string().optional(),
+    base64: Type.Optional(Type.String()),
-    name: coerce.string().optional(),
+    name: Type.Optional(Type.String()),
-    headers: z.union([coerce.string(), z.array(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,15 +2,15 @@ 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 = Type.Object({
-import { coerce } from '@/common/coerce';
+    message_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-const SchemaData = z.object({
+    id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    message_id: coerce.string().optional(),
-    id: coerce.string().optional(),
 });
-type Payload = z.infer<typeof SchemaData>;
+
+type Payload = Static<typeof SchemaData>;
 
 export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
     messages: OB11Message[] | undefined;
@@ -53,21 +53,19 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
     }
 
     async _handle(payload: Payload) {
-        // 1. 检查消息ID是否存在
         const msgId = payload.message_id || payload.id;
         if (!msgId) {
             throw new Error('message_id is required');
         }
 
-        // 2. 定义辅助函数 - 创建伪转发消息对象
+        const fakeForwardMsg = (res_id: string) => {
-        const createFakeForwardMsg = (resId: string): RawMessage => {
             return {
                 chatType: ChatType.KCHATTYPEGROUP,
                 elements: [{
                     elementType: ElementType.MULTIFORWARD,
                     elementId: '',
                     multiForwardMsgElement: {
-                        resId: resId,
+                        resId: res_id,
                         fileName: '',
                         xmlContent: '',
                     }
@@ -98,9 +96,8 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             } as RawMessage;
         };
 
-        // 3. 定义协议回退逻辑函数
+        const protocolFallbackLogic = async (res_id: string) => {
-        const protocolFallbackLogic = async (resId: string) => {
+            const ob = (await this.obContext.apis.MsgApi.parseMessageV2(fakeForwardMsg(res_id)))?.arrayMsg;
-            const ob = (await this.obContext.apis.MsgApi.parseMessageV2(createFakeForwardMsg(resId)))?.arrayMsg;
             if (ob) {
                 return {
                     messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
@@ -108,37 +105,31 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             }
             throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
         };
-        // 4. 尝试通过正常渠道获取消息
+
-        // 如果是数字ID，优先使用getMsgsByMsgId获取
-        if (!isNumeric(msgId)) {
-            let ret = await protocolFallbackLogic(msgId);
-            if (ret.messages) {
-                return ret;
-            }
-            throw new Error('ResId无效: 找不到相关的聊天记录');
-        }
         const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
         const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
-
+        if (!rootMsg) {
-        if (rootMsg) {
+            return await protocolFallbackLogic(msgId.toString());
-            // 5. 获取消息内容
-            const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
-
-            if (data && data.result === 0 && data.msgList.length > 0) {
-                const singleMsg = data.msgList[0];
-                if (!singleMsg) {
-                    throw new Error('消息不存在或已过期');
-                }
-                // 6. 解析消息内容
-                const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;
-
-                const forwardContent = (resMsg?.message?.[0] as OB11MessageForward)?.data?.content;
-                if (forwardContent) {
-                    return { messages: forwardContent };
-                }
-            }
         }
-        // 说明消息已过期或者为内层消息 NapCat 一次返回不处理内层消息
+        const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
-        throw new Error('消息已过期或者为内层消息，无法获取转发消息');
+
+        if (!data || data.result !== 0) {
+            return await protocolFallbackLogic(msgId.toString());
+        }
+
+        const singleMsg = data.msgList[0];
+        if (!singleMsg) {
+            return await protocolFallbackLogic(msgId.toString());
+        }
+        const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;//强制array 以便处理
+        if (!(resMsg?.message?.[0] as OB11MessageForward)?.data?.content) {
+            return await protocolFallbackLogic(msgId.toString());
+        }
+        return {
+            messages: (resMsg?.message?.[0] as OB11MessageForward)?.data?.content
+        };
+        //}
+
+        // return { message: resMsg };
     }
 }

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

@@ -3,22 +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';
-import { coerce } from '@/common/coerce';
 
 interface Response {
     messages: OB11Message[];
 }
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    message_seq: coerce.string().optional(),
+    message_seq: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    count: coerce.number().default(20),
+    count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
-    reverseOrder: coerce.boolean().default(false)
+    reverseOrder: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
     override actionName = ActionName.GetFriendMsgHistory;
@@ -27,14 +27,18 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
     async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
         //处理参数
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
+
+        const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
         if (!uid) throw new Error(`记录${payload.user_id}不存在`);
         const friend = await this.core.apis.FriendApi.isBuddy(uid);
         const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid };
         const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
         const msgList = hasMessageSeq ?
-            (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
+            (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
         if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
+        //翻转消息
+        if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    folder_id: coerce.string().optional(),
+    folder_id: Type.Optional(Type.String()),
-    folder: coerce.string().optional(),
+    folder: Type.Optional(Type.String()),
-    file_count: 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 { coerce } from '@/common/coerce';
+import { Static, Type } from '@sinclair/typebox';
-const SchemaData = z.object({
+
-    group_id: coerce.string(),
+const SchemaData = Type.Object({
-    type: z.nativeEnum(WebHonorType).optional()
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    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,23 +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';
-import { coerce } from '@/common/coerce';
 
 interface Response {
     messages: OB11Message[];
 }
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    message_seq: coerce.string().optional(),
+    message_seq: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    count: coerce.number().default(20),
+    count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
-    reverseOrder: coerce.boolean().default(false)
+    reverseOrder: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 
 export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {
@@ -27,13 +26,17 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
+        //处理参数
+        const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
         const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
         const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
         const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
         const msgList = hasMessageSeq ?
-            (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
+            (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
         if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
+        //翻转消息
+        if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file_count: 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,26 +3,23 @@ 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';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    no_cache: coerce.boolean().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;
     override payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         const user_id = payload.user_id.toString();
-        const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
         let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id));
         if (!uid) uid = extendData.detail.uid;
-        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid, isNocache));
+        const info = (await this.core.apis.UserApi.fetchUserDetailInfoV2(uid));
         return {
             ...extendData.detail.simpleInfo.coreInfo,
             ...extendData.detail.commonExt ?? {},
@@ -32,17 +29,17 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
             user_id: parseInt(extendData.detail.uin) ?? 0,
             uid: info.uid ?? uid,
             nickname: extendData.detail.simpleInfo.coreInfo.nick ?? '',
-            age: extendData.detail.simpleInfo.baseInfo.age ?? info.age,
+            age: extendData.detail.simpleInfo.baseInfo.age ?? info.simpleInfo?.baseInfo.age,
             qid: extendData.detail.simpleInfo.baseInfo.qid,
-            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.qqLevel),
+            qqLevel: calcQQLevel(extendData.detail.commonExt?.qqLevel ?? info.commonExt?.qqLevel),
             sex: OB11Construct.sex(extendData.detail.simpleInfo.baseInfo.sex) ?? OB11UserSex.unknown,
-            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.longNick,
+            long_nick: extendData.detail.simpleInfo.baseInfo.longNick ?? info.simpleInfo?.baseInfo.longNick,
-            reg_time: extendData.detail.commonExt?.regTime ?? info.regTime,
+            reg_time: extendData.detail.commonExt?.regTime ?? info.commonExt?.regTime,
             is_vip: extendData.detail.simpleInfo.vasInfo?.svipFlag,
             is_years_vip: extendData.detail.simpleInfo.vasInfo?.yearVipFlag,
             vip_level: extendData.detail.simpleInfo.vasInfo?.vipLevel,
-            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.remark,
+            remark: extendData.detail.simpleInfo.coreInfo.remark ?? info.simpleInfo?.coreInfo.remark,
-            status: extendData.detail.simpleInfo.status?.status ?? info.status,
+            status: extendData.detail.simpleInfo.status?.status ?? info.simpleInfo?.status?.status,
             login_days: 0,//失效
         };
     }

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    url: 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,16 +1,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    friend_id: coerce.string().optional(),
+    friend_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    user_id: coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    temp_block: coerce.boolean().optional(),
+    temp_block: Type.Optional(Type.Boolean()),
-    temp_both_del: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    model: coerce.string(),
+    model: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    content: coerce.string(),
+    content: Type.String(),
-    image: coerce.string().optional(),
+    image: Type.Optional(Type.String()),
-    pinned: coerce.number().default(0),
+    pinned: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    type: coerce.number().default(1),
+    type: Type.Union([Type.Number(), Type.String()], { default: 1 }),
-    confirm_required: coerce.number().default(1),
+    confirm_required: Type.Union([Type.Number(), Type.String()], { default: 1 }),
-    is_show_edit_card: coerce.number().default(0),
+    is_show_edit_card: Type.Union([Type.Number(), Type.String()], { default: 0 }),
-    tip_window_type: 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,16 +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';
-import { coerce } from '@/common/coerce';
+const SchemaData = Type.Object({
-const SchemaData = z.object({
+    file: Type.String(),
-    file: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()])
-    group_id: coerce.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,30 +1,30 @@
 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    nickname: coerce.string(),
+    nickname: Type.String(),
-    personal_note: coerce.string().optional(),
+    personal_note: Type.Optional(Type.String()),
-    sex: 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;
 
     async _handle(payload: Payload) {
         const self = this.core.selfInfo;
-        const OldProfile = await this.core.apis.UserApi.getUserDetailInfo(self.uid);
+        const OldProfile = await this.core.apis.UserApi.fetchUserDetailInfoV2(self.uid);
         return await this.core.apis.UserApi.modifySelfProfile({
             nick: payload.nickname,
-            longNick: (payload?.personal_note ?? OldProfile?.longNick) || '',
+            longNick: (payload?.personal_note ?? OldProfile?.simpleInfo!.baseInfo.longNick) || '',
-            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.sex!.toString()),
+            sex: parseInt(payload?.sex ? payload?.sex.toString() : OldProfile?.simpleInfo!.baseInfo.sex!.toString()),
             birthday: {
-                birthday_year: OldProfile?.birthday_year!.toString(),
+                birthday_year: OldProfile?.simpleInfo!.baseInfo.birthday_year!.toString(),
-                birthday_month: OldProfile?.birthday_month!.toString(),
+                birthday_month: OldProfile?.simpleInfo!.baseInfo.birthday_month!.toString(),
-                birthday_day: OldProfile?.birthday_day!.toString(),
+                birthday_day: OldProfile?.simpleInfo!.baseInfo.birthday_day!.toString(),
             },
             location: undefined,
         });

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    file: coerce.string(),
+    file: Type.String(),
-    name: coerce.string(),
+    name: Type.String(),
-    folder: coerce.string().optional(),
+    folder: Type.Optional(Type.String()),
-    folder_id: 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;

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    file: coerce.string(),
+    file: Type.String(),
-    name: 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;

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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    message_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    notice_id: 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';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    character: coerce.string(),
+    character: Type.String(),
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    text: 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;

src/onebot/action/group/GetGroupEssence.ts

@@ -3,14 +3,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import crypto from 'crypto';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { NetworkAdapterConfig } from '@/onebot/config/config';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupEssence extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.GoCQHTTP_GetEssenceMsg;

src/onebot/action/group/GetGroupInfo.ts

@@ -2,13 +2,13 @@ import { OB11Group } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
+
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
     override actionName = ActionName.GetGroupInfo;
@@ -20,7 +20,6 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
             const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
             return {
                 ...data,
-                group_all_shut: data.shutUpAllTimestamp > 0 ? -1 : 0,
                 group_remark: '',
                 group_id: +payload.group_id,
                 group_name: data.groupName,

src/onebot/action/group/GetGroupList.ts

@@ -2,14 +2,13 @@ import { OB11Group } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    no_cache: coerce.boolean().default(false),
+    no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class GetGroupList extends OneBotAction<Payload, OB11Group[]> {
     override actionName = ActionName.GetGroupList;

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -2,16 +2,15 @@ import { OB11GroupMember } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    no_cache: coerce.boolean().default(false),
+    no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
     override actionName = ActionName.GetGroupMemberInfo;
@@ -33,24 +32,20 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
 
         const [member, info] = await Promise.all([
             this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
-            this.core.apis.UserApi.getUserDetailInfo(uid, isNocache),
+            this.core.apis.UserApi.fetchUserDetailInfoV2(uid),
         ]);
 
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
 
-        return info ? { ...groupMember, ...member, ...info } : member;
+        return { member, info, groupMember };
     }
 
     async _handle(payload: Payload) {
         const isNocache = this.parseBoolean(payload.no_cache ?? true);
         const uid = await this.getUid(payload.user_id);
-        const member = await this.getGroupMemberInfo(payload, uid, isNocache);
+        const { member, info } = await this.getGroupMemberInfo(payload, uid, isNocache);
-
+        console.log('member', JSON.stringify(member, null, 2), 'info', JSON.stringify(info, null, 2));
-        if (!member) {
+        return OB11Construct.groupMember(payload.group_id.toString(), member, info);
-            this.core.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息');
-        }
-
-        return OB11Construct.groupMember(payload.group_id.toString(), member);
     }
 }
 

src/onebot/action/group/GetGroupMemberList.ts

@@ -2,31 +2,49 @@ import { OB11GroupMember } from '@/onebot';
 import { OB11Construct } from '@/onebot/helper/data';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { GroupMember } from '@/core';
-import { coerce } from '@/common/coerce';
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    no_cache: coerce.boolean().default(false)
+    no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> {
     override actionName = ActionName.GetGroupMemberList;
     override payloadSchema = SchemaData;
 
+    /**
+     * 处理获取群成员列表请求
+     */
     async _handle(payload: Payload) {
         const groupIdStr = payload.group_id.toString();
         const noCache = this.parseBoolean(payload.no_cache ?? false);
+
+        // 获取群成员基本信息
         const groupMembers = await this.getGroupMembers(groupIdStr, noCache);
-        const _groupMembers = await Promise.all(
+        const memberArray = Array.from(groupMembers.values());
-            Array.from(groupMembers.values()).map(item =>
+
-                OB11Construct.groupMember(groupIdStr, item)
+        // 批量并行获取用户详情
-            )
+        const userDetailsPromises = memberArray.map(member =>
+            this.core.apis.UserApi.fetchUserDetailInfoV2(member.uid)
+                .catch(_ => {
+                    return { uin: member.uin, uid: member.uid };
+                })
         );
-        return Array.from(new Map(_groupMembers.map(member => [member.user_id, member])).values());
+        const userDetails = await Promise.all(userDetailsPromises);
+
+        // 并行构建 OneBot 格式的群成员数据
+        const groupMembersList = memberArray.map((member, index) => {
+            // 确保用户详情不会是undefined
+            const userDetail = userDetails[index] || { uin: member.uin, uid: member.uid };
+            return OB11Construct.groupMember(groupIdStr, member, userDetail);
+        });
+
+        // 直接返回处理后的成员列表，不进行去重
+        return groupMembersList;
     }
 
     private parseBoolean(value: boolean | string): boolean {
@@ -38,13 +56,18 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
         let groupMembers = memberCache.get(groupIdStr);
 
         if (noCache || !groupMembers) {
-            const data = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true).then().catch();
+            try {
-            groupMembers = memberCache.get(groupIdStr) || (await data);
+                const refreshPromise = this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr, true);
-            if (!groupMembers) {
+
-                throw new Error(`Failed to get group member list for group ${groupIdStr}`);
+                groupMembers = memberCache.get(groupIdStr) || (await refreshPromise);
+
+                if (!groupMembers) {
+                    throw new Error(`无法获取群 ${groupIdStr} 的成员列表`);
+                }
+            } catch (error) {
+                throw new Error(`获取群 ${groupIdStr} 成员列表失败: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
-
         return groupMembers;
     }
 }

src/onebot/action/group/GetGroupNotice.ts

@@ -1,8 +1,7 @@
 import { WebApiGroupNoticeFeed } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-import { coerce } from '@/common/coerce';
 interface GroupNotice {
     sender_id: number;
     publish_time: number;
@@ -17,11 +16,11 @@ interface GroupNotice {
     };
 }
 
-const SchemaData = z.object({
+const SchemaData = Type.Object({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
 

src/onebot/action/group/GetGroupShutList.ts

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