GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #942 from NapNeko/zod-refactor

Browse Source 
迁移类型校验到zod
This commit is contained in:
手瓜一十雪
2025-04-13 20:10:43 +08:00
committed by GitHub
parent d4ab191f34 45d6ebf084
commit 6c510e42e8
101 changed files with 950 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@@ -27,7 +27,6 @@
"@napneko/nap-proto-core": "^0.0.4", "@napneko/nap-proto-core": "^0.0.4",
"@rollup/plugin-node-resolve": "^16.0.0", "@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-typescript": "^12.1.2", "@rollup/plugin-typescript": "^12.1.2",
"@sinclair/typebox": "^0.34.9",
"@types/cors": "^2.8.17", "@types/cors": "^2.8.17",
"@types/express": "^5.0.0", "@types/express": "^5.0.0",
"@types/multer": "^1.4.12", "@types/multer": "^1.4.12",
@@ -39,9 +38,9 @@
"@types/ws": "^8.5.12", "@types/ws": "^8.5.12",
"@typescript-eslint/eslint-plugin": "^8.3.0", "@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0", "@typescript-eslint/parser": "^8.3.0",
"ajv": "^8.13.0",
"async-mutex": "^0.5.0", "async-mutex": "^0.5.0",
"commander": "^13.0.0", "commander": "^13.0.0",
"compressing": "^1.10.1",
"cors": "^2.8.5", "cors": "^2.8.5",
"esbuild": "0.25.0", "esbuild": "0.25.0",
"eslint": "^9.14.0", "eslint": "^9.14.0",
@@ -54,14 +53,14 @@
"image-size": "^1.1.1", "image-size": "^1.1.1",
"json5": "^2.2.3", "json5": "^2.2.3",
"multer": "^1.4.5-lts.1", "multer": "^1.4.5-lts.1",
"napcat.protobuf": "^1.1.4",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"typescript-eslint": "^8.13.0", "typescript-eslint": "^8.13.0",
"vite": "^6.0.1", "vite": "^6.0.1",
"vite-plugin-cp": "^6.0.0", "vite-plugin-cp": "^6.0.0",
"vite-tsconfig-paths": "^5.1.0", "vite-tsconfig-paths": "^5.1.0",
"napcat.protobuf": "^1.1.4",
"winston": "^3.17.0", "winston": "^3.17.0",
"compressing": "^1.10.1" "zod": "^3.24.2"
}, },
"dependencies": { "dependencies": {
"@ffmpeg.wasm/core-mt": "^0.13.2", "@ffmpeg.wasm/core-mt": "^0.13.2",

37
src/common/config-base.ts
View File

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

26
src/common/ffmpeg-worker.ts
View File

@@ -128,7 +128,7 @@ class FFmpegService {
const [fileInfo, durationInfo] = await Promise.all([ const [fileInfo, durationInfo] = await Promise.all([
// 任务1: 获取文件信息和提取缩略图 // 任务1: 获取文件信息和提取缩略图
(async () => { (async () => {
sendLog(`开始任务1: 获取文件信息和提取缩略图`); sendLog('开始任务1: 获取文件信息和提取缩略图');
// 获取文件信息 (并行) // 获取文件信息 (并行)
const fileInfoStartTime = Date.now(); const fileInfoStartTime = Date.now();
@@ -147,7 +147,7 @@ class FFmpegService {
// 直接实现缩略图提取 (不调用extractThumbnail方法) // 直接实现缩略图提取 (不调用extractThumbnail方法)
const thumbStartTime = Date.now(); const thumbStartTime = Date.now();
sendLog(`开始提取缩略图`); sendLog('开始提取缩略图');
const ffmpegInstance = await withTimeout( const ffmpegInstance = await withTimeout(
FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }), FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
@@ -215,7 +215,7 @@ class FFmpegService {
// 任务2: 获取视频时长 // 任务2: 获取视频时长
(async () => { (async () => {
const task2StartTime = Date.now(); const task2StartTime = Date.now();
sendLog(`开始任务2: 获取视频时长`); sendLog('开始任务2: 获取视频时长');
// 创建FFmpeg实例 // 创建FFmpeg实例
const ffmpegCreateStartTime = Date.now(); const ffmpegCreateStartTime = Date.now();
@@ -291,16 +291,16 @@ interface FFmpegTask {
} }
export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> { export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
switch (method) { switch (method) {
case 'extractThumbnail': case 'extractThumbnail':
return await FFmpegService.extractThumbnail(...args as [string, string]); return await FFmpegService.extractThumbnail(...args as [string, string]);
case 'convertFile': case 'convertFile':
return await FFmpegService.convertFile(...args as [string, string, string]); return await FFmpegService.convertFile(...args as [string, string, string]);
case 'convert': case 'convert':
return await FFmpegService.convert(...args as [string, string]); return await FFmpegService.convert(...args as [string, string]);
case 'getVideoInfo': case 'getVideoInfo':
return await FFmpegService.getVideoInfo(...args as [string, string]); return await FFmpegService.getVideoInfo(...args as [string, string]);
default: default:
throw new Error(`Unknown method: ${method}`); throw new Error(`Unknown method: ${method}`);
} }
} }
recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => { recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {

40
src/common/file.ts
View File

@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
const filePath = path.join(dir, filename); const filePath = path.join(dir, filename);
switch (UriType) { switch (UriType) {
case FileUriType.Local: { case FileUriType.Local: {
const fileExt = path.extname(HandledUri); const fileExt = path.extname(HandledUri);
const localFileName = path.basename(HandledUri, fileExt) + fileExt; const localFileName = path.basename(HandledUri, fileExt) + fileExt;
const tempFilePath = path.join(dir, filename + fileExt); const tempFilePath = path.join(dir, filename + fileExt);
fs.copyFileSync(HandledUri, tempFilePath); fs.copyFileSync(HandledUri, tempFilePath);
return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath }; return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
} }
case FileUriType.Remote: { case FileUriType.Remote: {
const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} }); const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
fs.writeFileSync(filePath, buffer); fs.writeFileSync(filePath, buffer);
return { success: true, errMsg: '', fileName: filename, path: filePath }; return { success: true, errMsg: '', fileName: filename, path: filePath };
} }
case FileUriType.Base64: { case FileUriType.Base64: {
const base64 = HandledUri.replace(/^base64:\/\//, ''); const base64 = HandledUri.replace(/^base64:\/\//, '');
const base64Buffer = Buffer.from(base64, 'base64'); const base64Buffer = Buffer.from(base64, 'base64');
fs.writeFileSync(filePath, base64Buffer); fs.writeFileSync(filePath, base64Buffer);
return { success: true, errMsg: '', fileName: filename, path: filePath }; return { success: true, errMsg: '', fileName: filename, path: filePath };
} }
default: default:
return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' }; return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
} }
} }

2
src/common/worker.ts
View File

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

18
src/core/apis/file.ts
View File

@@ -44,7 +44,7 @@ export class NTQQFileApi {
'https://secret-service.bietiaop.com/rkeys', 'https://secret-service.bietiaop.com/rkeys',
'http://ss.xingzhige.com/music_card/rkey', 'http://ss.xingzhige.com/music_card/rkey',
], ],
this.context.logger this.context.logger
); );
} }
@@ -308,18 +308,18 @@ export class NTQQFileApi {
element.elementType === ElementType.FILE element.elementType === ElementType.FILE
) { ) {
switch (element.elementType) { switch (element.elementType) {
case ElementType.PIC: case ElementType.PIC:
element.picElement!.sourcePath = elementResults?.[elementIndex] ?? ''; element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
break; break;
case ElementType.VIDEO: case ElementType.VIDEO:
element.videoElement!.filePath = elementResults?.[elementIndex] ?? ''; element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
break; break;
case ElementType.PTT: case ElementType.PTT:
element.pttElement!.filePath = elementResults?.[elementIndex] ?? ''; element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
break; break;
case ElementType.FILE: case ElementType.FILE:
element.fileElement!.filePath = elementResults?.[elementIndex] ?? ''; element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
break; break;
} }
elementIndex++; elementIndex++;
} }

23
src/core/helper/config.ts
View File

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

2
src/core/types/webapi.ts
View File

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

33
src/onebot/action/OneBotAction.ts
View File

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

19
src/onebot/action/extends/ClickInlineKeyboardButton.ts
View File

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

10
src/onebot/action/extends/CreateCollection.ts
View File

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

8
src/onebot/action/extends/FetchCustomFace.ts
View File

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

16
src/onebot/action/extends/FetchEmojiLike.ts
View File

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

10
src/onebot/action/extends/GetAiCharacters.ts
View File

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

10
src/onebot/action/extends/GetCollectionList.ts
View File

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

10
src/onebot/action/extends/GetGroupInfoEx.ts
View File

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

56
src/onebot/action/extends/GetMiniAppArk.ts
View File

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

12
src/onebot/action/extends/GetProfileLike.ts
View File

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

2
src/onebot/action/extends/GetUnidirectionalFriendList.ts
View File

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

10
src/onebot/action/extends/GetUserStatus.ts
View File

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

14
src/onebot/action/extends/MoveGroupFile.ts
View File

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

8
src/onebot/action/extends/OCRImage.ts
View File

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

14
src/onebot/action/extends/RenameGroupFile.ts
View File

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

15
src/onebot/action/extends/SendPacket.ts
View File

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

12
src/onebot/action/extends/SetDiyOnlineStatus.ts
View File

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

10
src/onebot/action/extends/SetGroupRemark.ts
View File

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

8
src/onebot/action/extends/SetGroupSign.ts
View File

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

10
src/onebot/action/extends/SetInputStatus.ts
View File

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

8
src/onebot/action/extends/SetLongNick.ts
View File

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

12
src/onebot/action/extends/SetOnlineStatus.ts
View File

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

8
src/onebot/action/extends/SetQQAvatar.ts
View File

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

12
src/onebot/action/extends/SetSpecialTitle.ts
View File

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

18
src/onebot/action/extends/ShareContact.ts
View File

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

10
src/onebot/action/extends/TransGroupFile.ts
View File

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

8
src/onebot/action/extends/TranslateEnWordToZn.ts
View File

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

10
src/onebot/action/file/GetFile.ts
View File

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

10
src/onebot/action/file/GetGroupFileUrl.ts
View File

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

8
src/onebot/action/file/GetPrivateFileUrl.ts
View File

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

10
src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts
View File

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

10
src/onebot/action/go-cqhttp/DeleteGroupFile.ts
View File

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

12
src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts
View File

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

14
src/onebot/action/go-cqhttp/DownloadFile.ts
View File

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

11
src/onebot/action/go-cqhttp/GetForwardMsg.ts
View File

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

15
src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts
View File

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

8
src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts
View File

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

8
src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts
View File

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

14
src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts
View File

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

14
src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts
View File

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

14
src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts
View File

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

10
src/onebot/action/go-cqhttp/GetGroupRootFiles.ts
View File

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

10
src/onebot/action/go-cqhttp/GetStrangerInfo.ts
View File

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

8
src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts
View File

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

14
src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts
View File

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

8
src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts
View File

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

22
src/onebot/action/go-cqhttp/SendGroupNotice.ts
View File

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

10
src/onebot/action/go-cqhttp/SetGroupPortrait.ts
View File

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

12
src/onebot/action/go-cqhttp/SetQQProfile.ts
View File

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

16
src/onebot/action/go-cqhttp/UploadGroupFile.ts
View File

@@ -4,17 +4,17 @@ import { ChatType, Peer } from '@/core/types';
import fs from 'fs'; import fs from 'fs';
import { uriToLocalFile } from '@/common/file'; import { uriToLocalFile } from '@/common/file';
import { SendMessageContext } from '@/onebot/api'; import { SendMessageContext } from '@/onebot/api';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
file: Type.String(), file: z.string(),
name: Type.String(), name: z.string(),
folder: Type.Optional(Type.String()), folder: z.string().optional(),
folder_id: Type.Optional(Type.String()),//临时扩展 folder_id: z.string().optional(),//临时扩展
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> { export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> {
override actionName = ActionName.GoCQHTTP_UploadGroupFile; override actionName = ActionName.GoCQHTTP_UploadGroupFile;

12
src/onebot/action/go-cqhttp/UploadPrivateFile.ts
View File

@@ -5,15 +5,15 @@ import fs from 'fs';
import { uriToLocalFile } from '@/common/file'; import { uriToLocalFile } from '@/common/file';
import { SendMessageContext } from '@/onebot/api'; import { SendMessageContext } from '@/onebot/api';
import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg'; import { ContextMode, createContext } from '@/onebot/action/msg/SendMsg';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
user_id: Type.Union([Type.Number(), Type.String()]), user_id: z.union([z.number(), z.string()]),
file: Type.String(), file: z.string(),
name: Type.String(), name: z.string(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> { export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> {
override actionName = ActionName.GOCQHTTP_UploadPrivateFile; override actionName = ActionName.GOCQHTTP_UploadPrivateFile;

8
src/onebot/action/group/DelEssenceMsg.ts
View File

@@ -1,13 +1,13 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class DelEssenceMsg extends OneBotAction<Payload, unknown> { export default class DelEssenceMsg extends OneBotAction<Payload, unknown> {
override actionName = ActionName.DelEssenceMsg; override actionName = ActionName.DelEssenceMsg;
override payloadSchema = SchemaData; override payloadSchema = SchemaData;

10
src/onebot/action/group/DelGroupNotice.ts
View File

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

12
src/onebot/action/group/GetAiRecord.ts
View File

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

8
src/onebot/action/group/GetGroupEssence.ts
View File

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

8
src/onebot/action/group/GetGroupInfo.ts
View File

@@ -2,13 +2,13 @@ import { OB11Group } from '@/onebot';
import { OB11Construct } from '@/onebot/helper/data'; import { OB11Construct } from '@/onebot/helper/data';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
class GetGroupInfo extends OneBotAction<Payload, OB11Group> { class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
override actionName = ActionName.GetGroupInfo; override actionName = ActionName.GetGroupInfo;

8
src/onebot/action/group/GetGroupList.ts
View File

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

12
src/onebot/action/group/GetGroupMemberInfo.ts
View File

@@ -2,15 +2,15 @@ import { OB11GroupMember } from '@/onebot';
import { OB11Construct } from '@/onebot/helper/data'; import { OB11Construct } from '@/onebot/helper/data';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
user_id: Type.Union([Type.Number(), Type.String()]), user_id: z.union([z.number(), z.string()]),
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])), no_cache: z.boolean().default(false),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> { class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
override actionName = ActionName.GetGroupMemberInfo; override actionName = ActionName.GetGroupMemberInfo;

10
src/onebot/action/group/GetGroupMemberList.ts
View File

@@ -2,15 +2,15 @@ import { OB11GroupMember } from '@/onebot';
import { OB11Construct } from '@/onebot/helper/data'; import { OB11Construct } from '@/onebot/helper/data';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
import { GroupMember } from '@/core'; import { GroupMember } from '@/core';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])) no_cache: z.boolean().default(false)
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> { export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> {
override actionName = ActionName.GetGroupMemberList; override actionName = ActionName.GetGroupMemberList;

8
src/onebot/action/group/GetGroupNotice.ts
View File

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

8
src/onebot/action/group/GetGroupShutList.ts
View File

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

10
src/onebot/action/group/GroupPoke.ts
View File

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

12
src/onebot/action/group/SendGroupAiRecord.ts
View File

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

8
src/onebot/action/group/SetEssenceMsg.ts
View File

@@ -1,13 +1,13 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetEssenceMsg extends OneBotAction<Payload, unknown> { export default class SetEssenceMsg extends OneBotAction<Payload, unknown> {
override actionName = ActionName.SetEssenceMsg; override actionName = ActionName.SetEssenceMsg;

12
src/onebot/action/group/SetGroupAddRequest.ts
View File

@@ -1,15 +1,15 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { NTGroupRequestOperateTypes } from '@/core/types'; import { NTGroupRequestOperateTypes } from '@/core/types';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
flag: Type.Union([Type.String(), Type.Number()]), flag: z.union([z.string(), z.number()]),
approve: Type.Optional(Type.Union([Type.Boolean(), Type.String()])), approve: z.boolean().default(true),
reason: Type.Optional(Type.Union([Type.String({ default: ' ' }), Type.Null()])), reason: z.union([z.string(), z.null()]).default(' '),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetGroupAddRequest extends OneBotAction<Payload, null> { export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
override actionName = ActionName.SetGroupAddRequest; override actionName = ActionName.SetGroupAddRequest;

12
src/onebot/action/group/SetGroupAdmin.ts
View File

@@ -1,15 +1,15 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { NTGroupMemberRole } from '@/core/types'; import { NTGroupMemberRole } from '@/core/types';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
user_id: Type.Union([Type.Number(), Type.String()]), user_id: z.union([z.number(), z.string()]),
enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])), enable: z.boolean().default(false),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetGroupAdmin extends OneBotAction<Payload, null> { export default class SetGroupAdmin extends OneBotAction<Payload, null> {
override actionName = ActionName.SetGroupAdmin; override actionName = ActionName.SetGroupAdmin;

12
src/onebot/action/group/SetGroupBan.ts
View File

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

12
src/onebot/action/group/SetGroupCard.ts
View File

@@ -1,14 +1,14 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
user_id: Type.Union([Type.Number(), Type.String()]), user_id: z.union([z.number(), z.string()]),
card: Type.Optional(Type.String()) card: z.string().optional(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetGroupCard extends OneBotAction<Payload, null> { export default class SetGroupCard extends OneBotAction<Payload, null> {
override actionName = ActionName.SetGroupCard; override actionName = ActionName.SetGroupCard;

12
src/onebot/action/group/SetGroupKick.ts
View File

@@ -1,14 +1,14 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
user_id: Type.Union([Type.Number(), Type.String()]), user_id: z.union([z.number(), z.string()]),
reject_add_request: Type.Optional(Type.Union([Type.Boolean(), Type.String()])), reject_add_request: z.union([z.boolean(), z.string()]).optional(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetGroupKick extends OneBotAction<Payload, null> { export default class SetGroupKick extends OneBotAction<Payload, null> {
override actionName = ActionName.SetGroupKick; override actionName = ActionName.SetGroupKick;

10
src/onebot/action/group/SetGroupLeave.ts
View File

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

10
src/onebot/action/group/SetGroupName.ts
View File

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

10
src/onebot/action/group/SetGroupWholeBan.ts
View File

@@ -1,13 +1,13 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
group_id: Type.Union([Type.Number(), Type.String()]), group_id: z.union([z.number(), z.string()]),
enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])), enable: z.union([z.boolean(), z.string()]).optional(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetGroupWholeBan extends OneBotAction<Payload, null> { export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
override actionName = ActionName.SetGroupWholeBan; override actionName = ActionName.SetGroupWholeBan;

8
src/onebot/action/msg/DeleteMsg.ts
View File

@@ -1,13 +1,13 @@
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
class DeleteMsg extends OneBotAction<Payload, void> { class DeleteMsg extends OneBotAction<Payload, void> {
override actionName = ActionName.DeleteMsg; override actionName = ActionName.DeleteMsg;

12
src/onebot/action/msg/ForwardSingleMsg.ts
View File

@@ -2,15 +2,15 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ChatType, Peer } from '@/core/types'; import { ChatType, Peer } from '@/core/types';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])), group_id: z.string().optional(),
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])), user_id: z.string().optional(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
class ForwardSingleMsg extends OneBotAction<Payload, null> { class ForwardSingleMsg extends OneBotAction<Payload, null> {
protected async getTargetPeer(payload: Payload): Promise<Peer> { protected async getTargetPeer(payload: Payload): Promise<Peer> {

8
src/onebot/action/msg/GetMsg.ts
View File

@@ -3,16 +3,16 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { RawMessage } from '@/core'; import { RawMessage } from '@/core';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
import { NetworkAdapterConfig } from '@/onebot/config/config'; import { NetworkAdapterConfig } from '@/onebot/config/config';
export type ReturnDataType = OB11Message export type ReturnDataType = OB11Message
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
class GetMsg extends OneBotAction<Payload, OB11Message> { class GetMsg extends OneBotAction<Payload, OB11Message> {
override actionName = ActionName.GetMsg; override actionName = ActionName.GetMsg;

12
src/onebot/action/msg/MarkMsgAsRead.ts
View File

@@ -2,15 +2,15 @@ import { ChatType, Peer } from '@/core/types';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])), user_id: z.union([z.string(), z.number()]).optional(),
group_id: Type.Optional(Type.Union([Type.String(), Type.Number()])), group_id: z.union([z.string(), z.number()]).optional(),
message_id: Type.Optional(Type.Union([Type.String(), Type.Number()])), message_id: z.union([z.string(), z.number()]).optional(),
}); });
type PlayloadType = Static<typeof SchemaData>; type PlayloadType = z.infer<typeof SchemaData>;
class MarkMsgAsRead extends OneBotAction<PlayloadType, null> { class MarkMsgAsRead extends OneBotAction<PlayloadType, null> {
async getPeer(payload: PlayloadType): Promise<Peer> { async getPeer(payload: PlayloadType): Promise<Peer> {

12
src/onebot/action/msg/SetMsgEmojiLike.ts
View File

@@ -1,15 +1,15 @@
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { MessageUnique } from '@/common/message-unique'; import { MessageUnique } from '@/common/message-unique';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
message_id: Type.Union([Type.Number(), Type.String()]), message_id: z.union([z.number(), z.string()]),
emoji_id: Type.Union([Type.Number(), Type.String()]), emoji_id: z.union([z.number(), z.string()]),
set: Type.Optional(Type.Union([Type.Boolean(), Type.String()])) set: z.boolean().optional(),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export class SetMsgEmojiLike extends OneBotAction<Payload, unknown> { export class SetMsgEmojiLike extends OneBotAction<Payload, unknown> {
override actionName = ActionName.SetMsgEmojiLike; override actionName = ActionName.SetMsgEmojiLike;

2
src/onebot/action/packet/GetRkeyEx.ts
View File

@@ -8,7 +8,7 @@ export class GetRkeyEx extends GetPacketStatusDepends<void, unknown> {
let rkeys = await this.core.apis.PacketApi.pkt.operation.FetchRkey(); let rkeys = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
return rkeys.map(rkey => { return rkeys.map(rkey => {
return { return {
type: rkey.type === 10 ? "private" : "group", type: rkey.type === 10 ? 'private' : 'group',
rkey: rkey.rkey, rkey: rkey.rkey,
created_at: rkey.time, created_at: rkey.time,
ttl: rkey.ttl, ttl: rkey.ttl,

2
src/onebot/action/packet/GetRkeyServer.ts
View File

@@ -30,7 +30,7 @@ export class GetRkeyServer extends GetPacketStatusDepends<void, { private_rkey?:
private_rkey: privateRkeyItem ? privateRkeyItem.rkey : undefined, private_rkey: privateRkeyItem ? privateRkeyItem.rkey : undefined,
group_rkey: groupRkeyItem ? groupRkeyItem.rkey : undefined, group_rkey: groupRkeyItem ? groupRkeyItem.rkey : undefined,
expired_time: this.expiryTime, expired_time: this.expiryTime,
name: "NapCat 4" name: 'NapCat 4'
}; };
return this.rkeyCache; return this.rkeyCache;

10
src/onebot/action/packet/SendPoke.ts
View File

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

8
src/onebot/action/system/GetCredentials.ts
View File

@@ -1,17 +1,17 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
interface Response { interface Response {
cookies: string, cookies: string,
token: number token: number
} }
const SchemaData = Type.Object({ const SchemaData = z.object({
domain: Type.String() domain: z.string()
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export class GetCredentials extends OneBotAction<Payload, Response> { export class GetCredentials extends OneBotAction<Payload, Response> {

8
src/onebot/action/user/FriendPoke.ts
View File

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

8
src/onebot/action/user/GetCookies.ts
View File

@@ -1,16 +1,16 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
interface Response { interface Response {
cookies: string, cookies: string,
bkn: string bkn: string
} }
const SchemaData = Type.Object({ const SchemaData = z.object({
domain: Type.String() domain: z.string()
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export class GetCookies extends OneBotAction<Payload, Response> { export class GetCookies extends OneBotAction<Payload, Response> {
override actionName = ActionName.GetCookies; override actionName = ActionName.GetCookies;

8
src/onebot/action/user/GetFriendList.ts
View File

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

8
src/onebot/action/user/GetRecentContact.ts
View File

@@ -2,13 +2,13 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { NetworkAdapterConfig } from '@/onebot/config/config'; import { NetworkAdapterConfig } from '@/onebot/config/config';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
count: Type.Union([Type.Number(), Type.String()], { default: 10 }), count: z.number().default(10),
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class GetRecentContact extends OneBotAction<Payload, unknown> { export default class GetRecentContact extends OneBotAction<Payload, unknown> {
override actionName = ActionName.GetRecentContact; override actionName = ActionName.GetRecentContact;

10
src/onebot/action/user/SendLike.ts
View File

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

12
src/onebot/action/user/SetFriendAddRequest.ts
View File

@@ -1,14 +1,14 @@
import { OneBotAction } from '@/onebot/action/OneBotAction'; import { OneBotAction } from '@/onebot/action/OneBotAction';
import { ActionName } from '@/onebot/action/router'; import { ActionName } from '@/onebot/action/router';
import { Static, Type } from '@sinclair/typebox'; import { z } from 'zod';
const SchemaData = Type.Object({ const SchemaData = z.object({
flag: Type.Union([Type.String(), Type.Number()]), flag: z.union([z.string(), z.number()]),
approve: Type.Optional(Type.Union([Type.String(), Type.Boolean()])), approve: z.union([z.string(), z.boolean()]).default(true),
remark: Type.Optional(Type.String()) remark: z.union([z.string(), z.null()]).nullable().optional()
}); });
type Payload = Static<typeof SchemaData>; type Payload = z.infer<typeof SchemaData>;
export default class SetFriendAddRequest extends OneBotAction<Payload, null> { export default class SetFriendAddRequest extends OneBotAction<Payload, null> {
override actionName = ActionName.SetFriendAddRequest; override actionName = ActionName.SetFriendAddRequest;

36
src/onebot/api/msg.ts
View File

@@ -1000,16 +1000,16 @@ export class OneBotMsgApi {
const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => { const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
const sizePromises = elements.map(async element => { const sizePromises = elements.map(async element => {
switch (element.elementType) { switch (element.elementType) {
case ElementType.PTT: case ElementType.PTT:
return (await fsPromise.stat(element.pttElement.filePath)).size; return (await fsPromise.stat(element.pttElement.filePath)).size;
case ElementType.FILE: case ElementType.FILE:
return (await fsPromise.stat(element.fileElement.filePath)).size; return (await fsPromise.stat(element.fileElement.filePath)).size;
case ElementType.VIDEO: case ElementType.VIDEO:
return (await fsPromise.stat(element.videoElement.filePath)).size; return (await fsPromise.stat(element.videoElement.filePath)).size;
case ElementType.PIC: case ElementType.PIC:
return (await fsPromise.stat(element.picElement.sourcePath)).size; return (await fsPromise.stat(element.picElement.sourcePath)).size;
default: default:
return 0; return 0;
} }
}); });
const sizes = await Promise.all(sizePromises); const sizes = await Promise.all(sizePromises);
@@ -1099,14 +1099,14 @@ export class OneBotMsgApi {
groupChangDecreseType2String(type: number): GroupDecreaseSubType { groupChangDecreseType2String(type: number): GroupDecreaseSubType {
switch (type) { switch (type) {
case 130: case 130:
return 'leave'; return 'leave';
case 131: case 131:
return 'kick'; return 'kick';
case 3: case 3:
return 'kick_me'; return 'kick_me';
default: default:
return 'kick'; return 'kick';
} }
} }

167
src/onebot/config/config.ts
View File

@@ -1,108 +1,107 @@
import { Type, Static } from '@sinclair/typebox'; import { z } from 'zod';
import Ajv from 'ajv';
const HttpServerConfigSchema = Type.Object({ const HttpServerConfigSchema = z.object({
name: Type.String({ default: 'http-server' }), name: z.string().default('http-server'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
port: Type.Number({ default: 3000 }), port: z.number().default(3000),
host: Type.String({ default: '0.0.0.0' }), host: z.string().default('0.0.0.0'),
enableCors: Type.Boolean({ default: true }), enableCors: z.boolean().default(true),
enableWebsocket: Type.Boolean({ default: true }), enableWebsocket: z.boolean().default(true),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
token: Type.String({ default: '' }), token: z.string().default(''),
debug: Type.Boolean({ default: false }) debug: z.boolean().default(false)
}); });
const HttpSseServerConfigSchema = Type.Object({ const HttpSseServerConfigSchema = z.object({
name: Type.String({ default: 'http-sse-server' }), name: z.string().default('http-sse-server'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
port: Type.Number({ default: 3000 }), port: z.number().default(3000),
host: Type.String({ default: '0.0.0.0' }), host: z.string().default('0.0.0.0'),
enableCors: Type.Boolean({ default: true }), enableCors: z.boolean().default(true),
enableWebsocket: Type.Boolean({ default: true }), enableWebsocket: z.boolean().default(true),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
token: Type.String({ default: '' }), token: z.string().default(''),
debug: Type.Boolean({ default: false }), debug: z.boolean().default(false),
reportSelfMessage: Type.Boolean({ default: false }) reportSelfMessage: z.boolean().default(false)
}); });
const HttpClientConfigSchema = Type.Object({ const HttpClientConfigSchema = z.object({
name: Type.String({ default: 'http-client' }), name: z.string().default('http-client'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
url: Type.String({ default: 'http://localhost:8080' }), url: z.string().default('http://localhost:8080'),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
reportSelfMessage: Type.Boolean({ default: false }), reportSelfMessage: z.boolean().default(false),
token: Type.String({ default: '' }), token: z.string().default(''),
debug: Type.Boolean({ default: false }) debug: z.boolean().default(false)
}); });
const WebsocketServerConfigSchema = Type.Object({ const WebsocketServerConfigSchema = z.object({
name: Type.String({ default: 'websocket-server' }), name: z.string().default('websocket-server'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
host: Type.String({ default: '0.0.0.0' }), host: z.string().default('0.0.0.0'),
port: Type.Number({ default: 3001 }), port: z.number().default(3001),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
reportSelfMessage: Type.Boolean({ default: false }), reportSelfMessage: z.boolean().default(false),
token: Type.String({ default: '' }), token: z.string().default(''),
enableForcePushEvent: Type.Boolean({ default: true }), enableForcePushEvent: z.boolean().default(true),
debug: Type.Boolean({ default: false }), debug: z.boolean().default(false),
heartInterval: Type.Number({ default: 30000 }) heartInterval: z.number().default(30000)
}); });
const WebsocketClientConfigSchema = Type.Object({ const WebsocketClientConfigSchema = z.object({
name: Type.String({ default: 'websocket-client' }), name: z.string().default('websocket-client'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
url: Type.String({ default: 'ws://localhost:8082' }), url: z.string().default('ws://localhost:8082'),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
reportSelfMessage: Type.Boolean({ default: false }), reportSelfMessage: z.boolean().default(false),
reconnectInterval: Type.Number({ default: 5000 }), reconnectInterval: z.number().default(5000),
token: Type.String({ default: '' }), token: z.string().default(''),
debug: Type.Boolean({ default: false }), debug: z.boolean().default(false),
heartInterval: Type.Number({ default: 30000 }) heartInterval: z.number().default(30000)
}); });
const PluginConfigSchema = Type.Object({ const PluginConfigSchema = z.object({
name: Type.String({ default: 'plugin' }), name: z.string().default('plugin'),
enable: Type.Boolean({ default: false }), enable: z.boolean().default(false),
messagePostFormat: Type.String({ default: 'array' }), messagePostFormat: z.string().default('array'),
reportSelfMessage: Type.Boolean({ default: false }), reportSelfMessage: z.boolean().default(false),
debug: Type.Boolean({ default: false }), debug: z.boolean().default(false),
}); });
const NetworkConfigSchema = Type.Object({ const NetworkConfigSchema = z.object({
httpServers: Type.Array(HttpServerConfigSchema, { default: [] }), httpServers: z.array(HttpServerConfigSchema).default([]),
httpSseServers: Type.Array(HttpSseServerConfigSchema, { default: [] }), httpSseServers: z.array(HttpSseServerConfigSchema).default([]),
httpClients: Type.Array(HttpClientConfigSchema, { default: [] }), httpClients: z.array(HttpClientConfigSchema).default([]),
websocketServers: Type.Array(WebsocketServerConfigSchema, { default: [] }), websocketServers: z.array(WebsocketServerConfigSchema).default([]),
websocketClients: Type.Array(WebsocketClientConfigSchema, { default: [] }), websocketClients: z.array(WebsocketClientConfigSchema).default([]),
plugins: Type.Array(PluginConfigSchema, { default: [] }) plugins: z.array(PluginConfigSchema).default([])
}, { default: {} }); }).default({});
export const OneBotConfigSchema = Type.Object({ export const OneBotConfigSchema = z.object({
network: NetworkConfigSchema, network: NetworkConfigSchema,
musicSignUrl: Type.String({ default: '' }), musicSignUrl: z.string().default(''),
enableLocalFile2Url: Type.Boolean({ default: false }), enableLocalFile2Url: z.boolean().default(false),
parseMultMsg: Type.Boolean({ default: false }) parseMultMsg: z.boolean().default(false)
}); });
export type OneBotConfig = Static<typeof OneBotConfigSchema>; export type OneBotConfig = z.infer<typeof OneBotConfigSchema>;
export type HttpServerConfig = Static<typeof HttpServerConfigSchema>; export type HttpServerConfig = z.infer<typeof HttpServerConfigSchema>;
export type HttpSseServerConfig = Static<typeof HttpSseServerConfigSchema>; export type HttpSseServerConfig = z.infer<typeof HttpSseServerConfigSchema>;
export type HttpClientConfig = Static<typeof HttpClientConfigSchema>; export type HttpClientConfig = z.infer<typeof HttpClientConfigSchema>;
export type WebsocketServerConfig = Static<typeof WebsocketServerConfigSchema>; export type WebsocketServerConfig = z.infer<typeof WebsocketServerConfigSchema>;
export type WebsocketClientConfig = Static<typeof WebsocketClientConfigSchema>; export type WebsocketClientConfig = z.infer<typeof WebsocketClientConfigSchema>;
export type PluginConfig = Static<typeof PluginConfigSchema>; export type PluginConfig = z.infer<typeof PluginConfigSchema>;
export type NetworkAdapterConfig = HttpServerConfig | HttpSseServerConfig | HttpClientConfig | WebsocketServerConfig | WebsocketClientConfig | PluginConfig; export type NetworkAdapterConfig = HttpServerConfig | HttpSseServerConfig | HttpClientConfig | WebsocketServerConfig | WebsocketClientConfig | PluginConfig;
export type NetworkConfigKey = keyof OneBotConfig['network']; export type NetworkConfigKey = keyof OneBotConfig['network'];
export function loadConfig(config: Partial<OneBotConfig>): OneBotConfig { export function loadConfig(config: Partial<OneBotConfig>): OneBotConfig {
const ajv = new Ajv({ useDefaults: true, coerceTypes: true }); try {
const validate = ajv.compile(OneBotConfigSchema); return OneBotConfigSchema.parse(config);
const valid = validate(config); } catch (error) {
if (!valid) { if (error instanceof z.ZodError) {
throw new Error(ajv.errorsText(validate.errors)); throw new Error(error.errors.map(e => `${e.path.join('.')}: ${e.message}`).join(', '));
}
throw error;
} }
return config as OneBotConfig;
} }

5
src/onebot/config/index.ts
View File

@@ -1,10 +1,11 @@
import { ConfigBase } from '@/common/config-base'; import { ConfigBase } from '@/common/config-base';
import type { NapCatCore } from '@/core'; import type { NapCatCore } from '@/core';
import { OneBotConfig } from './config'; import { OneBotConfig } from './config';
import { AnySchema } from 'ajv'; import { z } from 'zod';
export class OB11ConfigLoader extends ConfigBase<OneBotConfig> { export class OB11ConfigLoader extends ConfigBase<OneBotConfig> {
constructor(core: NapCatCore, configPath: string, schema: AnySchema) { constructor(core: NapCatCore, configPath: string, schema: z.ZodType<OneBotConfig>) {
super('onebot11', core, configPath, schema); super('onebot11', core, configPath, schema);
} }
} }

4
src/shell/base.ts
View File

@@ -141,7 +141,7 @@ async function handleLogin(
handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e)); handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
loginListener.onLoginConnected = () => { }; loginListener.onLoginConnected = () => { };
}); });
} };
loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => { loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl); WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
@@ -220,7 +220,7 @@ async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrap
logger.log(`可用于快速登录的 QQ：\n${historyLoginList logger.log(`可用于快速登录的 QQ：\n${historyLoginList
.map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`) .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
.join('\n') .join('\n')
}`); }`);
} }
loginService.getQRCodePicture(); loginService.getQRCodePicture();
try { try {

24
src/webui/src/helper/config.ts
View File

@@ -1,33 +1,27 @@
import { webUiPathWrapper } from '@/webui'; import { webUiPathWrapper } from '@/webui';
import { Type, Static } from '@sinclair/typebox';
import Ajv from 'ajv';
import fs, { constants } from 'node:fs/promises'; import fs, { constants } from 'node:fs/promises';
import { resolve } from 'node:path'; import { resolve } from 'node:path';
import { deepMerge } from '../utils/object'; import { deepMerge } from '../utils/object';
import { themeType } from '../types/theme'; import { themeType } from '../types/theme';
import { z } from 'zod';
// 限制尝试端口的次数，避免死循环
// 定义配置的类型 // 定义配置的类型
const WebUiConfigSchema = Type.Object({ const WebUiConfigSchema = z.object({
host: Type.String({ default: '0.0.0.0' }), host: z.string().default('0.0.0.0'),
port: Type.Number({ default: 6099 }), port: z.number().default(6099),
token: Type.String({ default: 'napcat' }), token: z.string().default('napcat'),
loginRate: Type.Number({ default: 10 }), loginRate: z.number().default(10),
autoLoginAccount: Type.String({ default: '' }), autoLoginAccount: z.string().default(''),
theme: themeType, theme: themeType,
}); });
export type WebUiConfigType = Static<typeof WebUiConfigSchema>; export type WebUiConfigType = z.infer<typeof WebUiConfigSchema>;
// 读取当前目录下名为 webui.json 的配置文件，如果不存在则创建初始化配置文件 // 读取当前目录下名为 webui.json 的配置文件，如果不存在则创建初始化配置文件
export class WebUiConfigWrapper { export class WebUiConfigWrapper {
WebUiConfigData: WebUiConfigType | undefined = undefined; WebUiConfigData: WebUiConfigType | undefined = undefined;
private validateAndApplyDefaults(config: Partial<WebUiConfigType>): WebUiConfigType { private validateAndApplyDefaults(config: Partial<WebUiConfigType>): WebUiConfigType {
new Ajv({ coerceTypes: true, useDefaults: true }).compile(WebUiConfigSchema)(config); config = WebUiConfigSchema.parse(config);
return config as WebUiConfigType; return config as WebUiConfigType;
} }

Some files were not shown because too many files have changed in this diff Show More