feat: doubt friends支持

神经设计

manifest.json

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

napcat.webui/package.json

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

napcat.webui/src/controllers/webui_manager.ts

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

napcat.webui/src/pages/web_login.tsx

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.25",
+  "version": "4.7.34",
   "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",
@@ -26,6 +26,7 @@
     "@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 +38,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,14 +53,14 @@
     "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-tsconfig-paths": "^5.1.0",
+    "napcat.protobuf": "^1.1.4",
     "winston": "^3.17.0",
-    "zod": "^3.24.2"
+    "compressing": "^1.10.1"
   },
   "dependencies": {
     "express": "^5.0.0",

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.configData = result.data;
             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);
-            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

@@ -281,28 +281,72 @@ export async function downloadFFmpeg(
         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,
-            isExist: false
+            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('./ffmpeg', './cache', (percentage: number, message: string) => {
+        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
-            log.log(`[Ffmpeg] [Download] ${percentage}% - ${message}`);
+            log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
         });
         return {
             path: path.join(currentPath, 'ffmpeg'),
-            isExist: false
+            reset: true
         }
     }
+
     return {
         path: path.join(currentPath, 'ffmpeg'),
-        isExist: true
+        reset: true
     }
 }

src/common/ffmpeg.ts

@@ -7,6 +7,7 @@ import { fileTypeFromFile } from 'file-type';
 import imageSize from 'image-size';
 import { fileURLToPath } from 'node:url';
 import { platform } from 'node:os';
+import { LogWrapper } from './log';
 const currentPath = dirname(fileURLToPath(import.meta.url));
 const execFileAsync = promisify(execFile);
 const getFFmpegPath = (tool: string): string => {
@@ -19,16 +20,14 @@ const getFFmpegPath = (tool: string): string => {
 };
 export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
 export let FFPROBE_CMD = getFFmpegPath('ffprobe');
-console.log('[Info] ffmpeg:', FFMPEG_CMD);
-console.log('[Info] ffprobe:', FFPROBE_CMD);
 export class FFmpegService {
     // 确保目标目录存在
-    public static setFfmpegPath(ffmpegPath: string): void {
+    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');
-            console.log('[Info] ffmpeg:', FFMPEG_CMD);
+            logger.log('[Check] ffmpeg:', FFMPEG_CMD);
-            console.log('[Info] ffprobe:', FFPROBE_CMD);
+            logger.log('[Check] ffprobe:', FFPROBE_CMD);
         }
     }
     private static ensureDirExists(filePath: string): void {

src/common/file.ts

@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
     }
-    const fetchRes = await fetch(url, { headers }).catch((err) => {
+    const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.25';
+export const napCatVersion = '4.7.34';

src/common/worker.ts

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

src/core/apis/friend.ts

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

src/core/external/appid.json

@@ -242,5 +242,29 @@
     "3.2.17-34231": {
         "appid": 537279245,
         "qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
+    },
+    "9.9.19-34362": {
+        "appid": 537279260,
+        "qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
+    },
+    "3.2.17-34362": {
+        "appid": 537279296,
+        "qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
+    },
+    "9.9.19-34467": {
+        "appid": 537282256,
+        "qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
+    },
+    "3.2.17-34467": {
+        "appid": 537282292,
+        "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
+    },
+    "9.9.19-34566": {
+        "appid": 537282307,
+        "qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
+    },
+    "3.2.17-34566": {
+        "appid": 537282343,
+        "qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
     }
 }

src/core/external/offset.json

@@ -326,5 +326,17 @@
     "3.2.17-34231-arm64": {
         "send": "770CDC0",
         "recv": "77106F0"
+    },
+    "9.9.19-34362-x64": {
+        "send": "3BD80D0",
+        "recv": "3BDC8D0"
+    },
+    "9.9.19-34467-x64": {
+        "send": "3BD8690",
+        "recv": "3BDCE90"
+    },
+    "9.9.19-34566-x64": {
+        "send": "3BDA110",
+        "recv": "3BDE910"
     }
 }

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/listeners/NodeIKernelBuddyListener.ts

@@ -40,12 +40,30 @@ export class NodeIKernelBuddyListener {
     }
 
     onDelBatchBuddyInfos(arg: unknown): any {
+        console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
-    onDoubtBuddyReqChange(arg: unknown): any {
+    onDoubtBuddyReqChange(_arg:
+        {
+            reqId: string;
+            cookie: string;
+            doubtList: Array<{
+                uid: string;
+                nick: string;
+                age: number,
+                sex: number;
+                commFriendNum: number;
+                reqTime: string;
+                msg: string;
+                source: string;
+                reason: string;
+                groupCode: string;
+                nameMore?: null;
+            }>;
+        }): void | Promise<void> {
     }
 
-    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
+    onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
     }
 
     onNickUpdated(arg: unknown): any {

src/core/services/NodeIKernelBuddyService.ts

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

src/framework/napcat.ts

@@ -38,11 +38,15 @@ export async function NCoreInitFramework(
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-    downloadFFmpegIfNotExists(logger).then(({ path, isExist }) => {
+    if (!process.env['NAPCAT_DISABLE_FFMPEG_DOWNLOAD']) {
-        if (!isExist && path) {
+        downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
-            FFmpegService.setFfmpegPath(path);
+            if (reset && path) {
+                FFmpegService.setFfmpegPath(path, logger);
             }
+        }).catch(e => {
+            logger.logError('[Ffmpeg] Error:', e);
         });
+    }
     //直到登录成功后，执行下一步
     const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
         const loginListener = new NodeIKernelLoginListener();

src/onebot/action/OneBotAction.ts

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

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,16 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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(),
-    current_parent_directory: coerce.string(),
+    current_parent_directory: Type.String(),
-    target_parent_directory: coerce.string(),
+    target_parent_directory: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface MoveGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/OCRImage.ts

@@ -2,14 +2,14 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { checkFileExist, uriToLocalFile } from '@/common/file';
 import fs from 'fs';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { GeneralCallResultStatus } from '@/core';
-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,16 +1,16 @@
 import { ActionName } from '@/onebot/action/router';
 import { FileNapCatOneBotUUID } from '@/common/file-uuid';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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(),
-    current_parent_directory: coerce.string(),
+    current_parent_directory: Type.String(),
-    new_name: coerce.string(),
+    new_name: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 interface RenameGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/SendPacket.ts

@@ -1,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/SetSpecialTitle.ts

@@ -1,14 +1,14 @@
 import { ActionName } from '@/onebot/action/router';
 import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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> {
     override actionName = ActionName.SetSpecialTitle;

src/onebot/action/extends/ShareContact.ts

@@ -1,15 +1,15 @@
 import { GeneralCallResult } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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,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 TransGroupFileResponse {
     ok: boolean;

src/onebot/action/extends/TranslateEnWordToZn.ts

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

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.String(),
-    message_seq: coerce.string().optional(),
+    message_seq: Type.Optional(Type.String()),
-    count: coerce.number().default(20),
+    count: Type.Number({ default: 20 }),
-    reverseOrder: coerce.boolean().default(false)
+    reverseOrder: Type.Boolean({ default: false })
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
     override actionName = ActionName.GetFriendMsgHistory;

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

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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.String(),
-    message_seq: coerce.string().optional(),
+    message_seq: Type.Optional(Type.String()),
-    count: coerce.number().default(20),
+    count: Type.Number({ default: 20 }),
-    reverseOrder: coerce.boolean().default(false)
+    reverseOrder: Type.Boolean({ default: false })
 });
 
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 
 export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {

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

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

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

@@ -1,12 +1,12 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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,15 +1,15 @@
 import { NTQQUserApi } from '@/core/apis';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
-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;

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;

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;

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;

src/onebot/action/group/GetGroupMemberList.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 { 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;

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;

src/onebot/action/group/GroupPoke.ts

@@ -1,13 +1,13 @@
 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()]),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class GroupPoke extends GetPacketStatusDepends<Payload, void> {
     override actionName = ActionName.GroupPoke;

src/onebot/action/group/SendGroupAiRecord.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 SendGroupAiRecord extends GetPacketStatusDepends<Payload, {

src/onebot/action/group/SetEssenceMsg.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 SetEssenceMsg extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.SetEssenceMsg;

src/onebot/action/group/SetGroupAddRequest.ts

@@ -1,16 +1,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { NTGroupRequestOperateTypes } from '@/core/types';
 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({
-    flag: coerce.string(),
+    flag: Type.Union([Type.String(), Type.Number()]),
-    approve: coerce.boolean().default(true),
+    approve: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
-    reason: coerce.string().nullable().default(' '),
+    reason: Type.Optional(Type.Union([Type.String({ default: ' ' }), Type.Null()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupAddRequest;

src/onebot/action/group/SetGroupAdmin.ts

@@ -1,16 +1,15 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { NTGroupMemberRole } from '@/core/types';
 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()]),
-    enable: coerce.boolean().default(false),
+    enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupAdmin extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupAdmin;

src/onebot/action/group/SetGroupBan.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({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    duration: coerce.number().default(0),
+    duration: Type.Union([Type.Number(), Type.String()], { default: 0 }),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupBan extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupBan;

src/onebot/action/group/SetGroupCard.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({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    card: coerce.string().optional(),
+    card: Type.Optional(Type.String())
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupCard extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupCard;

src/onebot/action/group/SetGroupKick.ts

@@ -1,15 +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({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    user_id: coerce.string(),
+    user_id: Type.Union([Type.Number(), Type.String()]),
-    reject_add_request: coerce.boolean().optional(),
+    reject_add_request: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupKick extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupKick;

src/onebot/action/group/SetGroupLeave.ts

@@ -1,14 +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()]),
-    is_dismiss: coerce.boolean().optional(),
+    is_dismiss: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupLeave extends OneBotAction<Payload, void> {
     override actionName = ActionName.SetGroupLeave;

src/onebot/action/group/SetGroupName.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({
-    group_id: coerce.string(),
+    group_id: Type.Union([Type.Number(), Type.String()]),
-    group_name: coerce.string(),
+    group_name: Type.String(),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupName extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupName;

src/onebot/action/group/SetGroupWholeBan.ts

@@ -1,14 +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()]),
-    enable: coerce.boolean().optional(),
+    enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
     override actionName = ActionName.SetGroupWholeBan;

src/onebot/action/index.ts

@@ -114,10 +114,17 @@ import { TransGroupFile } from './extends/TransGroupFile';
 import { RenameGroupFile } from './extends/RenameGroupFile';
 import { GetRkeyServer } from './packet/GetRkeyServer';
 import { GetRkeyEx } from './packet/GetRkeyEx';
+import { CleanCache } from './system/CleanCache';
+import SetFriendRemark from './user/SetFriendRemark';
+import { SetDoubtFriendsAddRequest } from './new/SetDoubtFriendsAddRequest';
+import { GetDoubtFriendsAddRequest } from './new/GetDoubtFriendsAddRequest';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
+        new SetDoubtFriendsAddRequest(obContext, core),
+        new GetDoubtFriendsAddRequest(obContext, core),
+        new SetFriendRemark(obContext, core),
         new GetRkeyEx(obContext, core),
         new GetRkeyServer(obContext, core),
         new SetGroupRemark(obContext, core),
@@ -241,6 +248,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new ClickInlineKeyboardButton(obContext, core),
         new GetPrivateFileUrl(obContext, core),
         new GetUnidirectionalFriendList(obContext, core),
+        new CleanCache(obContext, core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/msg/DeleteMsg.ts

@@ -1,14 +1,13 @@
 import { ActionName } from '@/onebot/action/router';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 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>;
 
 class DeleteMsg extends OneBotAction<Payload, void> {
     override actionName = ActionName.DeleteMsg;

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -2,15 +2,15 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ChatType, Peer } from '@/core/types';
 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()]),
-    group_id: coerce.string().optional(),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    user_id: coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 class ForwardSingleMsg extends OneBotAction<Payload, null> {
     protected async getTargetPeer(payload: Payload): Promise<Peer> {

src/onebot/action/msg/GetMsg.ts

@@ -3,16 +3,16 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { RawMessage } from '@/core';
-import { z } from 'zod';
+import { Static, Type } from '@sinclair/typebox';
 import { NetworkAdapterConfig } from '@/onebot/config/config';
-import { coerce } from '@/common/coerce';
+
 export type ReturnDataType = OB11Message
 
-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>;
 
 class GetMsg extends OneBotAction<Payload, OB11Message> {
     override actionName = ActionName.GetMsg;

src/onebot/action/msg/MarkMsgAsRead.ts

@@ -2,15 +2,15 @@ import { ChatType, Peer } from '@/core/types';
 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({
-    user_id: coerce.string().optional(),
+    user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    group_id: coerce.string().optional(),
+    group_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
-    message_id: coerce.string().optional(),
+    message_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
 });
 
-type PlayloadType = z.infer<typeof SchemaData>;
+type PlayloadType = Static<typeof SchemaData>;
 
 class MarkMsgAsRead extends OneBotAction<PlayloadType, null> {
     async getPeer(payload: PlayloadType): Promise<Peer> {

src/onebot/action/msg/SendMsg.ts

@@ -38,7 +38,7 @@ export function normalize(message: OB11MessageMixType, autoEscape = false): OB11
 
 export async function createContext(core: NapCatCore, payload: OB11PostContext | undefined, contextMode: ContextMode = ContextMode.Normal): Promise<Peer> {
     if (!payload) {
-        throw new Error('请指定 group_id 或 user_id');
+        throw new Error('请传递请求内容');
     }
     if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) {
         return {
@@ -48,7 +48,16 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
     }
     if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
         const Uid = await core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-        if (!Uid) throw new Error('无法获取用户信息');
+        if (!Uid) {
+            if (payload.group_id) {
+                return {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: payload.group_id.toString(),
+                    guildId: ''
+                }
+            }
+            throw new Error('无法获取用户信息');
+        }
         const isBuddy = await core.apis.FriendApi.isBuddy(Uid);
         if (!isBuddy) {
             const ret = await core.apis.MsgApi.getTempChatInfo(ChatType.KCHATTYPETEMPC2CFROMGROUP, Uid);
@@ -78,7 +87,13 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
             guildId: '',
         };
     }
-    throw new Error('请指定 group_id 或 user_id');
+    if (contextMode === ContextMode.Private && payload.group_id) {
+        throw new Error('当前私聊发送,请指定 user_id 而不是 group_id');
+    }
+    if (contextMode === ContextMode.Group && payload.user_id) {
+        throw new Error('当前群聊发送,请指定 group_id 而不是 user_id');
+    }
+    throw new Error('请指定正确的 group_id 或 user_id');
 }
 
 function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {

src/onebot/action/msg/SetMsgEmojiLike.ts

@@ -1,16 +1,15 @@
 import { ActionName } from '@/onebot/action/router';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 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()]),
-    emoji_id: coerce.string(),
+    emoji_id: Type.Union([Type.Number(), Type.String()]),
-    set: coerce.boolean().optional(),
+    set: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
 });
 
-type Payload = z.infer<typeof SchemaData>;
+type Payload = Static<typeof SchemaData>;
 
 export class SetMsgEmojiLike extends OneBotAction<Payload, unknown> {
     override actionName = ActionName.SetMsgEmojiLike;

src/onebot/action/new/GetDoubtFriendsAddRequest.ts

@@ -0,0 +1,18 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    count: Type.Number({ default: 50 }),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class GetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.GetDoubtFriendsAddRequest;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.FriendApi.getDoubtFriendRequest(payload.count);
+    }
+}

src/onebot/action/new/SetDoubtFriendsAddRequest.ts

@@ -0,0 +1,21 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    flag: Type.String(),
+    //注意强制String 非isNumeric 不遵守则不符合设计
+    approve: Type.Boolean({ default: true }),
+    //该字段没有语义 仅做保留 强制为True
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class SetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
+    override actionName = ActionName.SetDoubtFriendsAddRequest;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.FriendApi.handleDoubtFriendRequest(payload.flag);
+    }
+}