mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
Compare commits
44 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fb20b2e16c | ||
![]() |
9df7c341a9 | ||
![]() |
7c113d6e04 | ||
![]() |
a6f22167ff | ||
![]() |
d49e69735a | ||
![]() |
eca73eae18 | ||
![]() |
d3a34dfdf9 | ||
![]() |
623188d884 | ||
![]() |
f093f52792 | ||
![]() |
d53607a118 | ||
![]() |
5f637e064a | ||
![]() |
e4b21e94f5 | ||
![]() |
fc37288827 | ||
![]() |
dad7245a3a | ||
![]() |
4190831081 | ||
![]() |
c509a01d7d | ||
![]() |
6d259593fd | ||
![]() |
bd3e06520f | ||
![]() |
41dccd98a9 | ||
![]() |
54e6d5c3f2 | ||
![]() |
3f6249f39c | ||
![]() |
a888714629 | ||
![]() |
17ef3231df | ||
![]() |
cc30b51d58 | ||
![]() |
9d40eacc15 | ||
![]() |
a0415c5f4e | ||
![]() |
941978b578 | ||
![]() |
06538b9122 | ||
![]() |
dd895d7c17 | ||
![]() |
9257a6cfde | ||
![]() |
f8260067ab | ||
![]() |
40b06daf1e | ||
![]() |
e30915a06b | ||
![]() |
2ab3898d28 | ||
![]() |
6e38e748b8 | ||
![]() |
7ecdd63bef | ||
![]() |
8056962203 | ||
![]() |
7a42f8c26f | ||
![]() |
6c510e42e8 | ||
![]() |
45d6ebf084 | ||
![]() |
2147c4ffee | ||
![]() |
d4ab191f34 | ||
![]() |
a5e53a713b | ||
![]() |
e3f965a9d6 |
@@ -47,8 +47,6 @@ _Modern protocol-side framework implemented based on NTQQ._
|
|||||||
|
|
||||||
+ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
|
+ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
|
||||||
|
|
||||||
+ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
|
|
||||||
|
|
||||||
+ 不过最最重要的 还是需要感谢屏幕前的你哦~
|
+ 不过最最重要的 还是需要感谢屏幕前的你哦~
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -60,3 +58,7 @@ _Modern protocol-side framework implemented based on NTQQ._
|
|||||||
2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
|
2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
|
||||||
|
|
||||||
**本仓库仅用于提高易用性,实现消息推送类功能,此外,禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规,由此造成的问题由使用者和提供违规使用教程者负责。**
|
**本仓库仅用于提高易用性,实现消息推送类功能,此外,禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规,由此造成的问题由使用者和提供违规使用教程者负责。**
|
||||||
|
|
||||||
|
## Warnings
|
||||||
|
|
||||||
|
[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)
|
||||||
|
Binary file not shown.
@@ -4,7 +4,7 @@
|
|||||||
"name": "NapCatQQ",
|
"name": "NapCatQQ",
|
||||||
"slug": "NapCat.Framework",
|
"slug": "NapCat.Framework",
|
||||||
"description": "高性能的 OneBot 11 协议实现",
|
"description": "高性能的 OneBot 11 协议实现",
|
||||||
"version": "4.7.17",
|
"version": "4.7.30",
|
||||||
"icon": "./logo.png",
|
"icon": "./logo.png",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
|
11
package.json
11
package.json
@@ -2,7 +2,7 @@
|
|||||||
"name": "napcat",
|
"name": "napcat",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "4.7.17",
|
"version": "4.7.30",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
|
||||||
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
|
||||||
@@ -21,13 +21,11 @@
|
|||||||
"@eslint/compat": "^1.2.2",
|
"@eslint/compat": "^1.2.2",
|
||||||
"@eslint/eslintrc": "^3.1.0",
|
"@eslint/eslintrc": "^3.1.0",
|
||||||
"@eslint/js": "^9.14.0",
|
"@eslint/js": "^9.14.0",
|
||||||
"@ffmpeg.wasm/main": "^0.13.1",
|
|
||||||
"@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
|
"@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
|
||||||
"@log4js-node/log4js-api": "^1.0.2",
|
"@log4js-node/log4js-api": "^1.0.2",
|
||||||
"@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 +37,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,17 +52,16 @@
|
|||||||
"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",
|
|
||||||
"express": "^5.0.0",
|
"express": "^5.0.0",
|
||||||
"silk-wasm": "^3.6.1",
|
"silk-wasm": "^3.6.1",
|
||||||
"ws": "^8.18.0"
|
"ws": "^8.18.0"
|
||||||
|
26
src/common/coerce.ts
Normal file
26
src/common/coerce.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { z } from 'zod';
|
||||||
|
|
||||||
|
const boolean = () => z.preprocess(
|
||||||
|
val => val === null || val === undefined
|
||||||
|
? val
|
||||||
|
: typeof val === 'string' && (val.toLowerCase() === 'false' || val === '0')
|
||||||
|
? false
|
||||||
|
: Boolean(val),
|
||||||
|
z.boolean()
|
||||||
|
);
|
||||||
|
|
||||||
|
const number = () => z.preprocess(
|
||||||
|
val => val === null || val === undefined
|
||||||
|
? val
|
||||||
|
: typeof val !== 'number' ? Number(val) : val,
|
||||||
|
z.number()
|
||||||
|
);
|
||||||
|
|
||||||
|
const string = () => z.preprocess(
|
||||||
|
val => val === null || val === undefined
|
||||||
|
? val
|
||||||
|
: typeof val !== 'string' ? String(val) : val,
|
||||||
|
z.string()
|
||||||
|
);
|
||||||
|
|
||||||
|
export const coerce = { boolean, number, string };
|
@@ -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;
|
|
||||||
|
if (result.success) {
|
||||||
|
this.configData = result.data;
|
||||||
this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
|
this.core.context.logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
|
||||||
return 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 {
|
||||||
|
const result = this.schema.safeParse(newConfigData);
|
||||||
|
if (result.success) {
|
||||||
|
this.configData = result.data;
|
||||||
fs.writeFileSync(configPath, JSON.stringify(this.configData, null, 2));
|
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);
|
||||||
}
|
}
|
||||||
|
352
src/common/download-ffmpeg.ts
Normal file
352
src/common/download-ffmpeg.ts
Normal file
@@ -0,0 +1,352 @@
|
|||||||
|
// 更正导入语句
|
||||||
|
import * as fs from 'fs';
|
||||||
|
import * as path from 'path';
|
||||||
|
import * as https from 'https';
|
||||||
|
import * as os from 'os';
|
||||||
|
import * as compressing from 'compressing'; // 修正导入方式
|
||||||
|
import { pipeline } from 'stream/promises';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
|
import { LogWrapper } from './log';
|
||||||
|
|
||||||
|
const downloadOri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
|
||||||
|
const urls = [
|
||||||
|
"https://github.moeyy.xyz/" + downloadOri,
|
||||||
|
"https://ghp.ci/" + downloadOri,
|
||||||
|
"https://gh.api.99988866.xyz/" + downloadOri,
|
||||||
|
downloadOri
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 测试URL是否可用
|
||||||
|
* @param url 待测试的URL
|
||||||
|
* @returns 如果URL可访问返回true,否则返回false
|
||||||
|
*/
|
||||||
|
async function testUrl(url: string): Promise<boolean> {
|
||||||
|
return new Promise<boolean>((resolve) => {
|
||||||
|
const req = https.get(url, { timeout: 5000 }, (res) => {
|
||||||
|
// 检查状态码是否表示成功
|
||||||
|
const statusCode = res.statusCode || 0;
|
||||||
|
if (statusCode >= 200 && statusCode < 300) {
|
||||||
|
// 终止请求并返回true
|
||||||
|
req.destroy();
|
||||||
|
resolve(true);
|
||||||
|
} else {
|
||||||
|
req.destroy();
|
||||||
|
resolve(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
req.on('error', () => {
|
||||||
|
resolve(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
req.on('timeout', () => {
|
||||||
|
req.destroy();
|
||||||
|
resolve(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查找第一个可用的URL
|
||||||
|
* @returns 返回第一个可用的URL,如果都不可用则返回null
|
||||||
|
*/
|
||||||
|
async function findAvailableUrl(): Promise<string | null> {
|
||||||
|
for (const url of urls) {
|
||||||
|
try {
|
||||||
|
const available = await testUrl(url);
|
||||||
|
if (available) {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// 忽略错误
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 下载文件
|
||||||
|
* @param url 下载URL
|
||||||
|
* @param destPath 目标保存路径
|
||||||
|
* @returns 成功返回true,失败返回false
|
||||||
|
*/
|
||||||
|
async function downloadFile(url: string, destPath: string, progressCallback?: (percent: number) => void): Promise<boolean> {
|
||||||
|
return new Promise<boolean>((resolve) => {
|
||||||
|
const file = fs.createWriteStream(destPath);
|
||||||
|
|
||||||
|
const req = https.get(url, (res) => {
|
||||||
|
const statusCode = res.statusCode || 0;
|
||||||
|
|
||||||
|
if (statusCode >= 200 && statusCode < 300) {
|
||||||
|
// 获取文件总大小
|
||||||
|
const totalSize = parseInt(res.headers['content-length'] || '0', 10);
|
||||||
|
let downloadedSize = 0;
|
||||||
|
let lastReportedPercent = -1; // 上次报告的百分比
|
||||||
|
let lastReportTime = 0; // 上次报告的时间戳
|
||||||
|
|
||||||
|
// 如果有内容长度和进度回调,则添加数据监听
|
||||||
|
if (totalSize > 0 && progressCallback) {
|
||||||
|
// 初始报告 0%
|
||||||
|
progressCallback(0);
|
||||||
|
lastReportTime = Date.now();
|
||||||
|
|
||||||
|
res.on('data', (chunk) => {
|
||||||
|
downloadedSize += chunk.length;
|
||||||
|
const currentPercent = Math.floor((downloadedSize / totalSize) * 100);
|
||||||
|
const now = Date.now();
|
||||||
|
|
||||||
|
// 只在以下条件触发回调:
|
||||||
|
// 1. 百分比变化至少为1%
|
||||||
|
// 2. 距离上次报告至少500毫秒
|
||||||
|
// 3. 确保报告100%完成
|
||||||
|
if ((currentPercent !== lastReportedPercent &&
|
||||||
|
(currentPercent - lastReportedPercent >= 1 || currentPercent === 100)) &&
|
||||||
|
(now - lastReportTime >= 1000 || currentPercent === 100)) {
|
||||||
|
|
||||||
|
progressCallback(currentPercent);
|
||||||
|
lastReportedPercent = currentPercent;
|
||||||
|
lastReportTime = now;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
pipeline(res, file)
|
||||||
|
.then(() => {
|
||||||
|
// 确保最后报告100%
|
||||||
|
if (progressCallback && lastReportedPercent !== 100) {
|
||||||
|
progressCallback(100);
|
||||||
|
}
|
||||||
|
resolve(true);
|
||||||
|
})
|
||||||
|
.catch(() => resolve(false));
|
||||||
|
} else {
|
||||||
|
file.close();
|
||||||
|
fs.unlink(destPath, () => { });
|
||||||
|
resolve(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
req.on('error', () => {
|
||||||
|
file.close();
|
||||||
|
fs.unlink(destPath, () => { });
|
||||||
|
resolve(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 解压缩zip文件中的特定内容
|
||||||
|
* 只解压bin目录中的文件到目标目录
|
||||||
|
* @param zipPath 压缩文件路径
|
||||||
|
* @param extractDir 解压目标路径
|
||||||
|
*/
|
||||||
|
async function extractBinDirectory(zipPath: string, extractDir: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
// 确保目标目录存在
|
||||||
|
if (!fs.existsSync(extractDir)) {
|
||||||
|
fs.mkdirSync(extractDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解压文件
|
||||||
|
const zipStream = new compressing.zip.UncompressStream({ source: zipPath });
|
||||||
|
|
||||||
|
return new Promise<void>((resolve, reject) => {
|
||||||
|
// 监听条目事件
|
||||||
|
zipStream.on('entry', (header, stream, next) => {
|
||||||
|
// 获取文件路径
|
||||||
|
const filePath = header.name;
|
||||||
|
|
||||||
|
// 匹配内层bin目录中的文件
|
||||||
|
// 例如:ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1/bin/ffmpeg.exe
|
||||||
|
if (filePath.includes('/bin/') && filePath.endsWith('.exe')) {
|
||||||
|
// 提取文件名
|
||||||
|
const fileName = path.basename(filePath);
|
||||||
|
const targetPath = path.join(extractDir, fileName);
|
||||||
|
|
||||||
|
// 创建写入流
|
||||||
|
const writeStream = fs.createWriteStream(targetPath);
|
||||||
|
|
||||||
|
// 将流管道连接到文件
|
||||||
|
stream.pipe(writeStream);
|
||||||
|
|
||||||
|
// 监听写入完成事件
|
||||||
|
writeStream.on('finish', () => {
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
|
||||||
|
writeStream.on('error', () => {
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// 跳过不需要的文件
|
||||||
|
stream.resume();
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
zipStream.on('error', (err) => {
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
|
||||||
|
zipStream.on('finish', () => {
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载并设置FFmpeg
|
||||||
|
* @param destDir 目标安装目录,默认为用户临时目录下的ffmpeg文件夹
|
||||||
|
* @param tempDir 临时文件目录,默认为系统临时目录
|
||||||
|
* @returns 返回ffmpeg可执行文件的路径,如果失败则返回null
|
||||||
|
*/
|
||||||
|
export async function downloadFFmpeg(
|
||||||
|
destDir?: string,
|
||||||
|
tempDir?: string,
|
||||||
|
progressCallback?: (percent: number, stage: string) => void
|
||||||
|
): Promise<string | null> {
|
||||||
|
// 仅限Windows
|
||||||
|
if (os.platform() !== 'win32') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const destinationDir = destDir || path.join(os.tmpdir(), 'ffmpeg');
|
||||||
|
const tempDirectory = tempDir || os.tmpdir();
|
||||||
|
const zipFilePath = path.join(tempDirectory, 'ffmpeg.zip'); // 临时下载到指定临时目录
|
||||||
|
const ffmpegExePath = path.join(destinationDir, 'ffmpeg.exe');
|
||||||
|
|
||||||
|
// 确保目录存在
|
||||||
|
if (!fs.existsSync(destinationDir)) {
|
||||||
|
fs.mkdirSync(destinationDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// 确保临时目录存在
|
||||||
|
if (!fs.existsSync(tempDirectory)) {
|
||||||
|
fs.mkdirSync(tempDirectory, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果ffmpeg已经存在,直接返回路径
|
||||||
|
if (fs.existsSync(ffmpegExePath)) {
|
||||||
|
if (progressCallback) progressCallback(100, '已找到FFmpeg');
|
||||||
|
return ffmpegExePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查找可用URL
|
||||||
|
if (progressCallback) progressCallback(0, '查找可用下载源');
|
||||||
|
const availableUrl = await findAvailableUrl();
|
||||||
|
if (!availableUrl) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 下载文件
|
||||||
|
if (progressCallback) progressCallback(5, '开始下载FFmpeg');
|
||||||
|
const downloaded = await downloadFile(
|
||||||
|
availableUrl,
|
||||||
|
zipFilePath,
|
||||||
|
(percent) => {
|
||||||
|
// 下载占总进度的70%
|
||||||
|
if (progressCallback) progressCallback(5 + Math.floor(percent * 0.7), '下载FFmpeg');
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!downloaded) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 直接解压bin目录文件到目标目录
|
||||||
|
if (progressCallback) progressCallback(75, '解压FFmpeg');
|
||||||
|
await extractBinDirectory(zipFilePath, destinationDir);
|
||||||
|
|
||||||
|
// 清理下载文件
|
||||||
|
if (progressCallback) progressCallback(95, '清理临时文件');
|
||||||
|
try {
|
||||||
|
fs.unlinkSync(zipFilePath);
|
||||||
|
} catch (err) {
|
||||||
|
// 忽略清理临时文件失败的错误
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查ffmpeg.exe是否成功解压
|
||||||
|
if (fs.existsSync(ffmpegExePath)) {
|
||||||
|
if (progressCallback) progressCallback(100, 'FFmpeg安装完成');
|
||||||
|
return ffmpegExePath;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检查系统PATH环境变量中是否存在指定可执行文件
|
||||||
|
* @param executable 可执行文件名
|
||||||
|
* @returns 如果找到返回完整路径,否则返回null
|
||||||
|
*/
|
||||||
|
function findExecutableInPath(executable: string): string | null {
|
||||||
|
// 仅适用于Windows系统
|
||||||
|
if (os.platform() !== 'win32') return null;
|
||||||
|
|
||||||
|
// 获取PATH环境变量
|
||||||
|
const pathEnv = process.env['PATH'] || '';
|
||||||
|
const pathDirs = pathEnv.split(';');
|
||||||
|
|
||||||
|
// 检查每个目录
|
||||||
|
for (const dir of pathDirs) {
|
||||||
|
if (!dir) continue;
|
||||||
|
try {
|
||||||
|
const filePath = path.join(dir, executable);
|
||||||
|
if (fs.existsSync(filePath)) {
|
||||||
|
return filePath;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function downloadFFmpegIfNotExists(log: LogWrapper) {
|
||||||
|
// 仅限Windows
|
||||||
|
if (os.platform() !== 'win32') {
|
||||||
|
return {
|
||||||
|
path: null,
|
||||||
|
reset: false
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const ffmpegInPath = findExecutableInPath('ffmpeg.exe');
|
||||||
|
const ffprobeInPath = findExecutableInPath('ffprobe.exe');
|
||||||
|
|
||||||
|
if (ffmpegInPath && ffprobeInPath) {
|
||||||
|
const ffmpegDir = path.dirname(ffmpegInPath);
|
||||||
|
return {
|
||||||
|
path: ffmpegDir,
|
||||||
|
reset: true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 如果环境变量中没有,检查项目目录中是否存在
|
||||||
|
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
||||||
|
const ffmpeg_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffmpeg.exe'));
|
||||||
|
const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
|
||||||
|
|
||||||
|
if (!ffmpeg_exist || !ffprobe_exist) {
|
||||||
|
await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
|
||||||
|
log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
path: path.join(currentPath, 'ffmpeg'),
|
||||||
|
reset: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
path: path.join(currentPath, 'ffmpeg'),
|
||||||
|
reset: true
|
||||||
|
}
|
||||||
|
}
|
@@ -1,308 +0,0 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
||||||
import { FFmpeg } from '@ffmpeg.wasm/main';
|
|
||||||
import { randomUUID } from 'crypto';
|
|
||||||
import { readFileSync, statSync, writeFileSync } from 'fs';
|
|
||||||
import type { VideoInfo } from './video';
|
|
||||||
import { fileTypeFromFile } from 'file-type';
|
|
||||||
import imageSize from 'image-size';
|
|
||||||
import { parentPort } from 'worker_threads';
|
|
||||||
export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
|
|
||||||
parentPort?.on('message', async (taskData: T) => {
|
|
||||||
try {
|
|
||||||
let ret = await cb(taskData);
|
|
||||||
parentPort?.postMessage(ret);
|
|
||||||
} catch (error: unknown) {
|
|
||||||
parentPort?.postMessage({ error: (error as Error).message });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
export function sendLog(_log: string) {
|
|
||||||
//parentPort?.postMessage({ log });
|
|
||||||
}
|
|
||||||
class FFmpegService {
|
|
||||||
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
|
||||||
const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
|
|
||||||
const videoFileName = `${randomUUID()}.mp4`;
|
|
||||||
const outputFileName = `${randomUUID()}.jpg`;
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
|
|
||||||
const code = await ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName);
|
|
||||||
if (code !== 0) {
|
|
||||||
throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
|
|
||||||
}
|
|
||||||
const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
|
|
||||||
writeFileSync(thumbnailPath, thumbnail);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error extracting thumbnail:', error);
|
|
||||||
throw error;
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(outputFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking output file:', unlinkError);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(videoFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking video file:', unlinkError);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
|
|
||||||
const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
|
|
||||||
const inputFileName = `${randomUUID()}.pcm`;
|
|
||||||
const outputFileName = `${randomUUID()}.${format}`;
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.writeFile(inputFileName, readFileSync(inputFile));
|
|
||||||
const params = format === 'amr'
|
|
||||||
? ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, '-ar', '8000', '-b:a', '12.2k', outputFileName]
|
|
||||||
: ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, outputFileName];
|
|
||||||
const code = await ffmpegInstance.run(...params);
|
|
||||||
if (code !== 0) {
|
|
||||||
throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
|
|
||||||
}
|
|
||||||
const outputData = ffmpegInstance.fs.readFile(outputFileName);
|
|
||||||
writeFileSync(outputFile, outputData);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error converting file:', error);
|
|
||||||
throw error;
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(outputFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking output file:', unlinkError);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(inputFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking input file:', unlinkError);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
|
|
||||||
const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
|
|
||||||
const inputFileName = `${randomUUID()}.input`;
|
|
||||||
const outputFileName = `${randomUUID()}.pcm`;
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.writeFile(inputFileName, readFileSync(filePath));
|
|
||||||
const params = ['-y', '-i', inputFileName, '-ar', '24000', '-ac', '1', '-f', 's16le', outputFileName];
|
|
||||||
const code = await ffmpegInstance.run(...params);
|
|
||||||
if (code !== 0) {
|
|
||||||
throw new Error('FFmpeg process exited with code ' + code);
|
|
||||||
}
|
|
||||||
const outputData = ffmpegInstance.fs.readFile(outputFileName);
|
|
||||||
writeFileSync(pcmPath, outputData);
|
|
||||||
return Buffer.from(outputData);
|
|
||||||
} catch (error: any) {
|
|
||||||
throw new Error('FFmpeg处理转换出错: ' + error.message);
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(outputFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking output file:', unlinkError);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(inputFileName);
|
|
||||||
} catch (unlinkError) {
|
|
||||||
console.error('Error unlinking output file:', unlinkError);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
|
|
||||||
const startTime = Date.now();
|
|
||||||
sendLog(`开始获取视频信息: ${videoPath}`);
|
|
||||||
|
|
||||||
// 创建一个超时包装函数
|
|
||||||
const withTimeout = <T>(promise: Promise<T>, timeoutMs: number, taskName: string): Promise<T> => {
|
|
||||||
return Promise.race([
|
|
||||||
promise,
|
|
||||||
new Promise<T>((_, reject) => {
|
|
||||||
setTimeout(() => reject(new Error(`任务超时: ${taskName} (${timeoutMs}ms)`)), timeoutMs);
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
// 并行执行多个任务
|
|
||||||
const [fileInfo, durationInfo] = await Promise.all([
|
|
||||||
// 任务1: 获取文件信息和提取缩略图
|
|
||||||
(async () => {
|
|
||||||
sendLog(`开始任务1: 获取文件信息和提取缩略图`);
|
|
||||||
|
|
||||||
// 获取文件信息 (并行)
|
|
||||||
const fileInfoStartTime = Date.now();
|
|
||||||
const [fileType, fileSize] = await Promise.all([
|
|
||||||
withTimeout(fileTypeFromFile(videoPath), 10000, '获取文件类型')
|
|
||||||
.then(result => {
|
|
||||||
sendLog(`获取文件类型完成,耗时: ${Date.now() - fileInfoStartTime}ms`);
|
|
||||||
return result;
|
|
||||||
}),
|
|
||||||
(async () => {
|
|
||||||
const result = statSync(videoPath).size;
|
|
||||||
sendLog(`获取文件大小完成,耗时: ${Date.now() - fileInfoStartTime}ms`);
|
|
||||||
return result;
|
|
||||||
})()
|
|
||||||
]);
|
|
||||||
|
|
||||||
// 直接实现缩略图提取 (不调用extractThumbnail方法)
|
|
||||||
const thumbStartTime = Date.now();
|
|
||||||
sendLog(`开始提取缩略图`);
|
|
||||||
|
|
||||||
const ffmpegInstance = await withTimeout(
|
|
||||||
FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
|
|
||||||
15000,
|
|
||||||
'创建FFmpeg实例(缩略图)'
|
|
||||||
);
|
|
||||||
|
|
||||||
const videoFileName = `${randomUUID()}.mp4`;
|
|
||||||
const outputFileName = `${randomUUID()}.jpg`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 写入视频文件到FFmpeg
|
|
||||||
const writeFileStartTime = Date.now();
|
|
||||||
ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
|
|
||||||
sendLog(`写入视频文件到FFmpeg完成,耗时: ${Date.now() - writeFileStartTime}ms`);
|
|
||||||
|
|
||||||
// 提取缩略图
|
|
||||||
const extractStartTime = Date.now();
|
|
||||||
const code = await withTimeout(
|
|
||||||
ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName),
|
|
||||||
30000,
|
|
||||||
'提取缩略图'
|
|
||||||
);
|
|
||||||
sendLog(`FFmpeg提取缩略图命令执行完成,耗时: ${Date.now() - extractStartTime}ms`);
|
|
||||||
|
|
||||||
if (code !== 0) {
|
|
||||||
throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 读取并保存缩略图
|
|
||||||
const saveStartTime = Date.now();
|
|
||||||
const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
|
|
||||||
writeFileSync(thumbnailPath, thumbnail);
|
|
||||||
sendLog(`读取并保存缩略图完成,耗时: ${Date.now() - saveStartTime}ms`);
|
|
||||||
|
|
||||||
// 获取缩略图尺寸
|
|
||||||
const imageSizeStartTime = Date.now();
|
|
||||||
const image = imageSize(thumbnailPath);
|
|
||||||
sendLog(`获取缩略图尺寸完成,耗时: ${Date.now() - imageSizeStartTime}ms`);
|
|
||||||
|
|
||||||
sendLog(`提取缩略图完成,总耗时: ${Date.now() - thumbStartTime}ms`);
|
|
||||||
|
|
||||||
return {
|
|
||||||
format: fileType?.ext ?? 'mp4',
|
|
||||||
size: fileSize,
|
|
||||||
width: image.width ?? 100,
|
|
||||||
height: image.height ?? 100
|
|
||||||
};
|
|
||||||
} finally {
|
|
||||||
// 清理资源
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(outputFileName);
|
|
||||||
} catch (error) {
|
|
||||||
sendLog(`清理输出文件失败: ${(error as Error).message}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(videoFileName);
|
|
||||||
} catch (error) {
|
|
||||||
sendLog(`清理视频文件失败: ${(error as Error).message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})(),
|
|
||||||
|
|
||||||
// 任务2: 获取视频时长
|
|
||||||
(async () => {
|
|
||||||
const task2StartTime = Date.now();
|
|
||||||
sendLog(`开始任务2: 获取视频时长`);
|
|
||||||
|
|
||||||
// 创建FFmpeg实例
|
|
||||||
const ffmpegCreateStartTime = Date.now();
|
|
||||||
const ffmpegInstance = await withTimeout(
|
|
||||||
FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
|
|
||||||
15000,
|
|
||||||
'创建FFmpeg实例(时长)'
|
|
||||||
);
|
|
||||||
sendLog(`创建FFmpeg实例完成,耗时: ${Date.now() - ffmpegCreateStartTime}ms`);
|
|
||||||
|
|
||||||
const inputFileName = `${randomUUID()}.mp4`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 写入文件
|
|
||||||
const writeStartTime = Date.now();
|
|
||||||
ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
|
|
||||||
sendLog(`写入文件到FFmpeg完成,耗时: ${Date.now() - writeStartTime}ms`);
|
|
||||||
|
|
||||||
ffmpegInstance.setLogging(true);
|
|
||||||
let duration = 60; // 默认值
|
|
||||||
|
|
||||||
ffmpegInstance.setLogger((_level, ...msg) => {
|
|
||||||
const message = msg.join(' ');
|
|
||||||
const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
|
|
||||||
if (durationMatch) {
|
|
||||||
const hours = parseInt(durationMatch[1] ?? '0', 10);
|
|
||||||
const minutes = parseInt(durationMatch[2] ?? '0', 10);
|
|
||||||
const seconds = parseFloat(durationMatch[3] ?? '0');
|
|
||||||
duration = hours * 3600 + minutes * 60 + seconds;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 执行FFmpeg
|
|
||||||
const runStartTime = Date.now();
|
|
||||||
await withTimeout(
|
|
||||||
ffmpegInstance.run('-i', inputFileName),
|
|
||||||
20000,
|
|
||||||
'获取视频时长'
|
|
||||||
);
|
|
||||||
sendLog(`执行FFmpeg命令完成,耗时: ${Date.now() - runStartTime}ms`);
|
|
||||||
|
|
||||||
sendLog(`任务2(获取视频时长)完成,总耗时: ${Date.now() - task2StartTime}ms`);
|
|
||||||
return { time: duration };
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
ffmpegInstance.fs.unlink(inputFileName);
|
|
||||||
} catch (error) {
|
|
||||||
sendLog(`清理输入文件失败: ${(error as Error).message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})()
|
|
||||||
]);
|
|
||||||
|
|
||||||
// 合并结果并返回
|
|
||||||
const totalDuration = Date.now() - startTime;
|
|
||||||
sendLog(`获取视频信息完成,总耗时: ${totalDuration}ms`);
|
|
||||||
|
|
||||||
return {
|
|
||||||
width: fileInfo.width,
|
|
||||||
height: fileInfo.height,
|
|
||||||
time: durationInfo.time,
|
|
||||||
format: fileInfo.format,
|
|
||||||
size: fileInfo.size,
|
|
||||||
filePath: videoPath
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type FFmpegMethod = 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
|
|
||||||
|
|
||||||
interface FFmpegTask {
|
|
||||||
method: FFmpegMethod;
|
|
||||||
args: any[];
|
|
||||||
}
|
|
||||||
export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
|
|
||||||
switch (method) {
|
|
||||||
case 'extractThumbnail':
|
|
||||||
return await FFmpegService.extractThumbnail(...args as [string, string]);
|
|
||||||
case 'convertFile':
|
|
||||||
return await FFmpegService.convertFile(...args as [string, string, string]);
|
|
||||||
case 'convert':
|
|
||||||
return await FFmpegService.convert(...args as [string, string]);
|
|
||||||
case 'getVideoInfo':
|
|
||||||
return await FFmpegService.getVideoInfo(...args as [string, string]);
|
|
||||||
default:
|
|
||||||
throw new Error(`Unknown method: ${method}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
|
|
||||||
return await handleFFmpegTask({ method, args });
|
|
||||||
});
|
|
@@ -1,36 +1,195 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
|
||||||
import { VideoInfo } from './video';
|
import path, { dirname } from 'path';
|
||||||
import path from 'path';
|
import { execFile } from 'child_process';
|
||||||
import { fileURLToPath } from 'url';
|
import { promisify } from 'util';
|
||||||
import { runTask } from './worker';
|
import type { VideoInfo } from './video';
|
||||||
|
import { fileTypeFromFile } from 'file-type';
|
||||||
type EncodeArgs = {
|
import imageSize from 'image-size';
|
||||||
method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
|
import { fileURLToPath } from 'node:url';
|
||||||
args: any[];
|
import { platform } from 'node:os';
|
||||||
|
import { LogWrapper } from './log';
|
||||||
|
const currentPath = dirname(fileURLToPath(import.meta.url));
|
||||||
|
const execFileAsync = promisify(execFile);
|
||||||
|
const getFFmpegPath = (tool: string): string => {
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
const exeName = `${tool}.exe`;
|
||||||
|
const isLocalExeExists = existsSync(path.join(currentPath, 'ffmpeg', exeName));
|
||||||
|
return isLocalExeExists ? path.join(currentPath, 'ffmpeg', exeName) : exeName;
|
||||||
|
}
|
||||||
|
return tool;
|
||||||
};
|
};
|
||||||
|
export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
|
||||||
type EncodeResult = any;
|
export let FFPROBE_CMD = getFFmpegPath('ffprobe');
|
||||||
|
export class FFmpegService {
|
||||||
function getWorkerPath() {
|
// 确保目标目录存在
|
||||||
return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
|
public static setFfmpegPath(ffmpegPath: string,logger:LogWrapper): void {
|
||||||
|
if (platform() === 'win32') {
|
||||||
|
FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
|
||||||
|
FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
|
||||||
|
logger.log('[Check] ffmpeg:', FFMPEG_CMD);
|
||||||
|
logger.log('[Check] ffprobe:', FFPROBE_CMD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private static ensureDirExists(filePath: string): void {
|
||||||
|
const dir = dirname(filePath);
|
||||||
|
if (!existsSync(dir)) {
|
||||||
|
mkdirSync(dir, { recursive: true });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class FFmpegService {
|
|
||||||
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
|
||||||
await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
|
try {
|
||||||
|
this.ensureDirExists(thumbnailPath);
|
||||||
|
|
||||||
|
const { stderr } = await execFileAsync(FFMPEG_CMD, [
|
||||||
|
'-i', videoPath,
|
||||||
|
'-ss', '00:00:01.000',
|
||||||
|
'-vframes', '1',
|
||||||
|
'-y', // 覆盖输出文件
|
||||||
|
thumbnailPath
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!existsSync(thumbnailPath)) {
|
||||||
|
throw new Error(`提取缩略图失败,输出文件不存在: ${stderr}`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error extracting thumbnail:', error);
|
||||||
|
throw new Error(`提取缩略图失败: ${(error as Error).message}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
|
public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
|
||||||
await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
|
try {
|
||||||
|
this.ensureDirExists(outputFile);
|
||||||
|
|
||||||
|
const params = format === 'amr'
|
||||||
|
? [
|
||||||
|
'-f', 's16le',
|
||||||
|
'-ar', '24000',
|
||||||
|
'-ac', '1',
|
||||||
|
'-i', inputFile,
|
||||||
|
'-ar', '8000',
|
||||||
|
'-b:a', '12.2k',
|
||||||
|
'-y',
|
||||||
|
outputFile
|
||||||
|
]
|
||||||
|
: [
|
||||||
|
'-f', 's16le',
|
||||||
|
'-ar', '24000',
|
||||||
|
'-ac', '1',
|
||||||
|
'-i', inputFile,
|
||||||
|
'-y',
|
||||||
|
outputFile
|
||||||
|
];
|
||||||
|
|
||||||
|
await execFileAsync(FFMPEG_CMD, params);
|
||||||
|
|
||||||
|
if (!existsSync(outputFile)) {
|
||||||
|
throw new Error('转换失败,输出文件不存在');
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error converting file:', error);
|
||||||
|
throw new Error(`文件转换失败: ${(error as Error).message}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
|
public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
|
||||||
const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
|
try {
|
||||||
return result;
|
this.ensureDirExists(pcmPath);
|
||||||
|
|
||||||
|
await execFileAsync(FFMPEG_CMD, [
|
||||||
|
'-y',
|
||||||
|
'-i', filePath,
|
||||||
|
'-ar', '24000',
|
||||||
|
'-ac', '1',
|
||||||
|
'-f', 's16le',
|
||||||
|
pcmPath
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!existsSync(pcmPath)) {
|
||||||
|
throw new Error('转换PCM失败,输出文件不存在');
|
||||||
|
}
|
||||||
|
|
||||||
|
return readFileSync(pcmPath);
|
||||||
|
} catch (error: any) {
|
||||||
|
throw new Error(`FFmpeg处理转换出错: ${error.message}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
|
public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
|
||||||
const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
|
try {
|
||||||
|
// 并行执行获取文件信息和提取缩略图
|
||||||
|
const [fileInfo, duration] = await Promise.all([
|
||||||
|
this.getFileInfo(videoPath, thumbnailPath),
|
||||||
|
this.getVideoDuration(videoPath)
|
||||||
|
]);
|
||||||
|
|
||||||
|
const result: VideoInfo = {
|
||||||
|
width: fileInfo.width,
|
||||||
|
height: fileInfo.height,
|
||||||
|
time: duration,
|
||||||
|
format: fileInfo.format,
|
||||||
|
size: fileInfo.size,
|
||||||
|
filePath: videoPath
|
||||||
|
};
|
||||||
return result;
|
return result;
|
||||||
|
} catch (error) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async getFileInfo(videoPath: string, thumbnailPath: string): Promise<{
|
||||||
|
format: string,
|
||||||
|
size: number,
|
||||||
|
width: number,
|
||||||
|
height: number
|
||||||
|
}> {
|
||||||
|
|
||||||
|
// 获取文件大小和类型
|
||||||
|
const [fileType, fileSize] = await Promise.all([
|
||||||
|
fileTypeFromFile(videoPath).catch(() => {
|
||||||
|
return null;
|
||||||
|
}),
|
||||||
|
Promise.resolve(statSync(videoPath).size)
|
||||||
|
]);
|
||||||
|
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.extractThumbnail(videoPath, thumbnailPath);
|
||||||
|
// 获取图片尺寸
|
||||||
|
const dimensions = imageSize(thumbnailPath);
|
||||||
|
|
||||||
|
return {
|
||||||
|
format: fileType?.ext ?? 'mp4',
|
||||||
|
size: fileSize,
|
||||||
|
width: dimensions.width ?? 100,
|
||||||
|
height: dimensions.height ?? 100
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
return {
|
||||||
|
format: fileType?.ext ?? 'mp4',
|
||||||
|
size: fileSize,
|
||||||
|
width: 100,
|
||||||
|
height: 100
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async getVideoDuration(videoPath: string): Promise<number> {
|
||||||
|
try {
|
||||||
|
// 使用FFprobe获取时长
|
||||||
|
const { stdout } = await execFileAsync(FFPROBE_CMD, [
|
||||||
|
'-v', 'error',
|
||||||
|
'-show_entries', 'format=duration',
|
||||||
|
'-of', 'default=noprint_wrappers=1:nokey=1',
|
||||||
|
videoPath
|
||||||
|
]);
|
||||||
|
|
||||||
|
const duration = parseFloat(stdout.trim());
|
||||||
|
|
||||||
|
return isNaN(duration) ? 60 : duration;
|
||||||
|
} catch (error) {
|
||||||
|
return 60; // 默认时长
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1 +1 @@
|
|||||||
export const napCatVersion = '4.7.17';
|
export const napCatVersion = '4.7.30';
|
||||||
|
@@ -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);
|
||||||
});
|
});
|
||||||
|
4
src/core/external/appid.json
vendored
4
src/core/external/appid.json
vendored
@@ -242,5 +242,9 @@
|
|||||||
"3.2.17-34231": {
|
"3.2.17-34231": {
|
||||||
"appid": 537279245,
|
"appid": 537279245,
|
||||||
"qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
|
"qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
|
||||||
|
},
|
||||||
|
"9.9.19-34362": {
|
||||||
|
"appid": 537279260,
|
||||||
|
"qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
|
||||||
}
|
}
|
||||||
}
|
}
|
4
src/core/external/offset.json
vendored
4
src/core/external/offset.json
vendored
@@ -326,5 +326,9 @@
|
|||||||
"3.2.17-34231-arm64": {
|
"3.2.17-34231-arm64": {
|
||||||
"send": "770CDC0",
|
"send": "770CDC0",
|
||||||
"recv": "77106F0"
|
"recv": "77106F0"
|
||||||
|
},
|
||||||
|
"9.9.19-34362-x64":{
|
||||||
|
"send": "3BD80D0",
|
||||||
|
"recv": "3BDC8D0"
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,22 +1,22 @@
|
|||||||
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 { coerce } from '@/common/coerce';
|
||||||
import { AnySchema } from 'ajv';
|
import { z } from 'zod';
|
||||||
|
|
||||||
export const NapcatConfigSchema = Type.Object({
|
export const NapcatConfigSchema = z.object({
|
||||||
fileLog: Type.Boolean({ default: false }),
|
fileLog: coerce.boolean().default(false),
|
||||||
consoleLog: Type.Boolean({ default: true }),
|
consoleLog: coerce.boolean().default(true),
|
||||||
fileLogLevel: Type.String({ default: 'debug' }),
|
fileLogLevel: coerce.string().default('debug'),
|
||||||
consoleLogLevel: Type.String({ default: 'info' }),
|
consoleLogLevel: coerce.string().default('info'),
|
||||||
packetBackend: Type.String({ default: 'auto' }),
|
packetBackend: coerce.string().default('auto'),
|
||||||
packetServer: Type.String({ default: '' }),
|
packetServer: coerce.string().default(''),
|
||||||
o3HookMode: Type.Number({ default: 0 }),
|
o3HookMode: coerce.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);
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,6 +9,8 @@ import { NodeIKernelLoginService } from '@/core/services';
|
|||||||
import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
|
import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
|
||||||
import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
|
import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
|
||||||
import { NapCatOneBot11Adapter } from '@/onebot';
|
import { NapCatOneBot11Adapter } from '@/onebot';
|
||||||
|
import { downloadFFmpegIfNotExists } from '@/common/download-ffmpeg';
|
||||||
|
import { FFmpegService } from '@/common/ffmpeg';
|
||||||
|
|
||||||
//Framework ES入口文件
|
//Framework ES入口文件
|
||||||
export async function getWebUiUrl() {
|
export async function getWebUiUrl() {
|
||||||
@@ -36,6 +38,13 @@ export async function NCoreInitFramework(
|
|||||||
const logger = new LogWrapper(pathWrapper.logsPath);
|
const logger = new LogWrapper(pathWrapper.logsPath);
|
||||||
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
|
||||||
const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
|
const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
|
||||||
|
downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
|
||||||
|
if (reset && path) {
|
||||||
|
FFmpegService.setFfmpegPath(path,logger);
|
||||||
|
}
|
||||||
|
}).catch(e => {
|
||||||
|
logger.logError('[Ffmpeg] Error:', e);
|
||||||
|
});
|
||||||
//直到登录成功后,执行下一步
|
//直到登录成功后,执行下一步
|
||||||
const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
|
const selfInfo = await new Promise<SelfInfo>((resolveSelfInfo) => {
|
||||||
const loginListener = new NodeIKernelLoginListener();
|
const loginListener = new NodeIKernelLoginListener();
|
||||||
|
Binary file not shown.
Binary file not shown.
@@ -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<PayloadType, z.ZodTypeDef, unknown> = undefined;
|
||||||
payloadSchema?: TSchema = undefined;
|
|
||||||
obContext: NapCatOneBot11Adapter;
|
obContext: NapCatOneBot11Adapter;
|
||||||
|
|
||||||
constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
||||||
@@ -42,28 +40,39 @@ 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 & { parsedPayload?: PayloadType }> {
|
||||||
if (this.payloadSchema) {
|
if (!this.payloadSchema) {
|
||||||
this.validate = new Ajv({ allowUnionTypes: true, useDefaults: true, coerceTypes: true }).compile(this.payloadSchema);
|
return { valid: true, parsedPayload: payload as PayloadType };
|
||||||
}
|
|
||||||
if (this.validate && !this.validate(payload)) {
|
|
||||||
const errors = this.validate.errors as ErrorObject[];
|
|
||||||
const errorMessages = errors.map(e => `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`);
|
|
||||||
return {
|
|
||||||
valid: false,
|
|
||||||
message: errorMessages.join('\n') ?? '未知错误',
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return { valid: true };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async handle(payload: PayloadType, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
try {
|
||||||
|
// 使用 zod 验证并转换数据,并返回解析后的数据
|
||||||
|
const parsedPayload = this.payloadSchema.parse(payload) as PayloadType;
|
||||||
|
return { valid: true, parsedPayload };
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof z.ZodError) {
|
||||||
|
const errorMessages = error.errors.map(e =>
|
||||||
|
`Key: ${e.path.join('.')}, Message: ${e.message}`
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: errorMessages.join('\n') || '未知错误',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
valid: false,
|
||||||
|
message: '验证过程中发生未知错误'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async handle(payload: unknown, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
||||||
const result = await this.check(payload);
|
const result = await this.check(payload);
|
||||||
if (!result.valid) {
|
if (!result.valid) {
|
||||||
return OB11Response.error(result.message, 400);
|
return OB11Response.error(result.message!, 400);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const resData = await this._handle(payload, adaptername, config);
|
const resData = await this._handle(result.parsedPayload as PayloadType, adaptername, config);
|
||||||
return OB11Response.ok(resData);
|
return OB11Response.ok(resData);
|
||||||
} catch (e: unknown) {
|
} catch (e: unknown) {
|
||||||
this.core.context.logger.logError('发生错误', e);
|
this.core.context.logger.logError('发生错误', e);
|
||||||
@@ -71,13 +80,13 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async websocketHandle(payload: PayloadType, echo: unknown, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
public async websocketHandle(payload: unknown, echo: unknown, adaptername: string, config: NetworkAdapterConfig): Promise<OB11Return<ReturnDataType | null>> {
|
||||||
const result = await this.check(payload);
|
const result = await this.check(payload);
|
||||||
if (!result.valid) {
|
if (!result.valid) {
|
||||||
return OB11Response.error(result.message, 1400, echo);
|
return OB11Response.error(result.message!, 1400, echo);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const resData = await this._handle(payload, adaptername, config);
|
const resData = await this._handle(result.parsedPayload as PayloadType, adaptername, config);
|
||||||
return OB11Response.ok(resData, echo);
|
return OB11Response.ok(resData, echo);
|
||||||
} catch (e: unknown) {
|
} catch (e: unknown) {
|
||||||
this.core.context.logger.logError('发生错误', e);
|
this.core.context.logger.logError('发生错误', e);
|
||||||
|
@@ -1,16 +1,16 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
bot_appid: Type.String(),
|
bot_appid: coerce.string(),
|
||||||
button_id: Type.String({ default: '' }),
|
button_id: coerce.string().default(''),
|
||||||
callback_data: Type.String({ default: '' }),
|
callback_data: coerce.string().default(''),
|
||||||
msg_seq: Type.String({ default: '10086' }),
|
msg_seq: coerce.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 +25,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
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
rawData: Type.String(),
|
rawData: coerce.string(),
|
||||||
brief: Type.String(),
|
brief: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
count: Type.Union([Type.Number(), Type.String()], { default: 48 }),
|
count: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.string(),
|
||||||
emojiId: Type.Union([Type.Number(), Type.String()]),
|
emojiId: coerce.string(),
|
||||||
emojiType: Type.Union([Type.Number(), Type.String()]),
|
emojiType: coerce.string(),
|
||||||
count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
|
count: coerce.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
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
chat_type: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
|
chat_type: coerce.number().default(1),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetAiCharactersResponse {
|
interface GetAiCharactersResponse {
|
||||||
type: string;
|
type: string;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
category: Type.Union([Type.Number(), Type.String()]),
|
category: coerce.number(),
|
||||||
count: Type.Union([Type.Union([Type.Number(), Type.String()])], { default: 1 }),
|
count: coerce.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;
|
||||||
|
@@ -1,17 +1,18 @@
|
|||||||
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({
|
import { coerce } from '@/common/coerce';
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
const SchemaData = z.object({
|
||||||
|
group_id: coerce.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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
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: coerce.string(),
|
||||||
desc: Type.String(),
|
desc: coerce.string(),
|
||||||
picUrl: Type.String(),
|
picUrl: coerce.string(),
|
||||||
jumpUrl: Type.String(),
|
jumpUrl: coerce.string(),
|
||||||
webUrl: Type.Optional(Type.String()),
|
webUrl: coerce.string().optional(),
|
||||||
rawArkData: Type.Optional(Type.Union([Type.String()]))
|
rawArkData: coerce.string().optional()
|
||||||
}),
|
}),
|
||||||
Type.Object({
|
z.object({
|
||||||
title: Type.String(),
|
title: coerce.string(),
|
||||||
desc: Type.String(),
|
desc: coerce.string(),
|
||||||
picUrl: Type.String(),
|
picUrl: coerce.string(),
|
||||||
jumpUrl: Type.String(),
|
jumpUrl: coerce.string(),
|
||||||
iconUrl: Type.String(),
|
iconUrl: coerce.string(),
|
||||||
webUrl: Type.Optional(Type.String()),
|
webUrl: coerce.string().optional(),
|
||||||
appId: Type.String(),
|
appId: coerce.string(),
|
||||||
scene: Type.Union([Type.Number(), Type.String()]),
|
scene: z.union([coerce.number(), coerce.string()]),
|
||||||
templateType: Type.Union([Type.Number(), Type.String()]),
|
templateType: z.union([coerce.number(), coerce.string()]),
|
||||||
businessType: Type.Union([Type.Number(), Type.String()]),
|
businessType: z.union([coerce.number(), coerce.string()]),
|
||||||
verType: Type.Union([Type.Number(), Type.String()]),
|
verType: z.union([coerce.number(), coerce.string()]),
|
||||||
shareType: Type.Union([Type.Number(), Type.String()]),
|
shareType: z.union([coerce.number(), coerce.string()]),
|
||||||
versionId: Type.String(),
|
versionId: coerce.string(),
|
||||||
sdkId: Type.String(),
|
sdkId: coerce.string(),
|
||||||
withShareTicket: Type.Union([Type.Number(), Type.String()]),
|
withShareTicket: z.union([coerce.number(), coerce.string()]),
|
||||||
rawArkData: Type.Optional(Type.Union([Type.String()]))
|
rawArkData: coerce.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
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
user_id: coerce.string().optional(),
|
||||||
start: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
start: coerce.number().default(0),
|
||||||
count: Type.Union([Type.Number(), Type.String()], { default: 10 })
|
count: coerce.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;
|
||||||
|
@@ -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');
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_id: Type.String(),
|
file_id: coerce.string(),
|
||||||
current_parent_directory: Type.String(),
|
current_parent_directory: coerce.string(),
|
||||||
target_parent_directory: Type.String(),
|
target_parent_directory: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface MoveGroupFileResponse {
|
interface MoveGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
image: Type.String(),
|
image: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_id: Type.String(),
|
file_id: coerce.string(),
|
||||||
current_parent_directory: Type.String(),
|
current_parent_directory: coerce.string(),
|
||||||
new_name: Type.String(),
|
new_name: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface RenameGroupFileResponse {
|
interface RenameGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -1,22 +1,22 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
cmd: Type.String(),
|
cmd: coerce.string(),
|
||||||
data: Type.String(),
|
data: coerce.string(),
|
||||||
rsp: Type.Union([Type.String(), Type.Boolean()], { default: true }),
|
rsp: coerce.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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
face_id: Type.Union([Type.Number(), Type.String()]),// 参考 face_config.json 的 QSid
|
face_id: coerce.string(),// 参考 face_config.json 的 QSid
|
||||||
face_type: Type.Union([Type.Number(), Type.String()], { default: '1' }),
|
face_type: coerce.string().default('1'),
|
||||||
wording: Type.String({ default: ' ' }),
|
wording: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.String(),
|
group_id: coerce.string(),
|
||||||
remark: Type.String(),
|
remark: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
event_type: Type.Number(),
|
event_type: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
longNick: Type.String(),
|
longNick: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
status: Type.Union([Type.Number(), Type.String()]),
|
status: coerce.number(),
|
||||||
ext_status: Type.Union([Type.Number(), Type.String()]),
|
ext_status: coerce.number(),
|
||||||
battery_status: Type.Union([Type.Number(), Type.String()]),
|
battery_status: coerce.number(),
|
||||||
});
|
});
|
||||||
|
|
||||||
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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
file: Type.String(),
|
file: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
special_title: Type.String({ default: '' }),
|
special_title: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
user_id: coerce.string().optional(),
|
||||||
group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
group_id: coerce.string().optional(),
|
||||||
phoneNumber: Type.String({ default: '' }),
|
phoneNumber: coerce.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: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_id: Type.String(),
|
file_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface TransGroupFileResponse {
|
interface TransGroupFileResponse {
|
||||||
ok: boolean;
|
ok: boolean;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
words: Type.Array(Type.String()),
|
words: z.array(coerce.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;
|
||||||
|
@@ -3,8 +3,8 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
export interface GetFileResponse {
|
export interface GetFileResponse {
|
||||||
file?: string; // path
|
file?: string; // path
|
||||||
url?: string;
|
url?: string;
|
||||||
@@ -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: coerce.string().optional(),
|
||||||
file_id: Type.Optional(Type.String())
|
file_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_id: Type.String(),
|
file_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetGroupFileUrlResponse {
|
interface GetGroupFileUrlResponse {
|
||||||
url?: string;
|
url?: string;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
file_id: Type.String(),
|
file_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
interface GetPrivateFileUrlResponse {
|
interface GetPrivateFileUrlResponse {
|
||||||
url?: string;
|
url?: string;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
folder_name: Type.String(),
|
folder_name: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
interface ResponseType{
|
interface ResponseType{
|
||||||
result:unknown;
|
result:unknown;
|
||||||
groupItem:unknown;
|
groupItem:unknown;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_id: Type.String(),
|
file_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
folder_id: Type.Optional(Type.String()),
|
folder_id: coerce.string().optional(),
|
||||||
folder: Type.Optional(Type.String()),
|
folder: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
interface FileResponse {
|
interface FileResponse {
|
||||||
file: string;
|
file: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
url: Type.Optional(Type.String()),
|
url: coerce.string().optional(),
|
||||||
base64: Type.Optional(Type.String()),
|
base64: coerce.string().optional(),
|
||||||
name: Type.Optional(Type.String()),
|
name: coerce.string().optional(),
|
||||||
headers: Type.Optional(Type.Union([Type.String(), Type.Array(Type.String())])),
|
headers: z.union([coerce.string(), z.array(coerce.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;
|
||||||
|
@@ -2,15 +2,15 @@ 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({
|
import { isNumeric } from '@/common/helper';
|
||||||
message_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
import { coerce } from '@/common/coerce';
|
||||||
id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
const SchemaData = z.object({
|
||||||
|
message_id: coerce.string().optional(),
|
||||||
|
id: coerce.string().optional(),
|
||||||
});
|
});
|
||||||
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
type Payload = Static<typeof SchemaData>;
|
|
||||||
|
|
||||||
export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
||||||
messages: OB11Message[] | undefined;
|
messages: OB11Message[] | undefined;
|
||||||
@@ -53,19 +53,21 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async _handle(payload: Payload) {
|
async _handle(payload: Payload) {
|
||||||
|
// 1. 检查消息ID是否存在
|
||||||
const msgId = payload.message_id || payload.id;
|
const msgId = payload.message_id || payload.id;
|
||||||
if (!msgId) {
|
if (!msgId) {
|
||||||
throw new Error('message_id is required');
|
throw new Error('message_id is required');
|
||||||
}
|
}
|
||||||
|
|
||||||
const fakeForwardMsg = (res_id: string) => {
|
// 2. 定义辅助函数 - 创建伪转发消息对象
|
||||||
|
const createFakeForwardMsg = (resId: string): RawMessage => {
|
||||||
return {
|
return {
|
||||||
chatType: ChatType.KCHATTYPEGROUP,
|
chatType: ChatType.KCHATTYPEGROUP,
|
||||||
elements: [{
|
elements: [{
|
||||||
elementType: ElementType.MULTIFORWARD,
|
elementType: ElementType.MULTIFORWARD,
|
||||||
elementId: '',
|
elementId: '',
|
||||||
multiForwardMsgElement: {
|
multiForwardMsgElement: {
|
||||||
resId: res_id,
|
resId: resId,
|
||||||
fileName: '',
|
fileName: '',
|
||||||
xmlContent: '',
|
xmlContent: '',
|
||||||
}
|
}
|
||||||
@@ -96,8 +98,9 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
|||||||
} as RawMessage;
|
} as RawMessage;
|
||||||
};
|
};
|
||||||
|
|
||||||
const protocolFallbackLogic = async (res_id: string) => {
|
// 3. 定义协议回退逻辑函数
|
||||||
const ob = (await this.obContext.apis.MsgApi.parseMessageV2(fakeForwardMsg(res_id)))?.arrayMsg;
|
const protocolFallbackLogic = async (resId: string) => {
|
||||||
|
const ob = (await this.obContext.apis.MsgApi.parseMessageV2(createFakeForwardMsg(resId)))?.arrayMsg;
|
||||||
if (ob) {
|
if (ob) {
|
||||||
return {
|
return {
|
||||||
messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
|
messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
|
||||||
@@ -105,31 +108,37 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
|
|||||||
}
|
}
|
||||||
throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
|
throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
|
||||||
};
|
};
|
||||||
|
// 4. 尝试通过正常渠道获取消息
|
||||||
|
// 如果是数字ID,优先使用getMsgsByMsgId获取
|
||||||
|
if (!isNumeric(msgId)) {
|
||||||
|
let ret = await protocolFallbackLogic(msgId);
|
||||||
|
if (ret.messages) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
throw new Error('ResId无效: 找不到相关的聊天记录');
|
||||||
|
}
|
||||||
const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
|
const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
|
||||||
const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
|
const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
|
||||||
if (!rootMsg) {
|
|
||||||
return await protocolFallbackLogic(msgId.toString());
|
if (rootMsg) {
|
||||||
}
|
// 5. 获取消息内容
|
||||||
const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
|
const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
|
||||||
|
|
||||||
if (!data || data.result !== 0) {
|
if (data && data.result === 0 && data.msgList.length > 0) {
|
||||||
return await protocolFallbackLogic(msgId.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
const singleMsg = data.msgList[0];
|
const singleMsg = data.msgList[0];
|
||||||
if (!singleMsg) {
|
if (!singleMsg) {
|
||||||
return await protocolFallbackLogic(msgId.toString());
|
throw new Error('消息不存在或已过期');
|
||||||
}
|
}
|
||||||
const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;//强制array 以便处理
|
// 6. 解析消息内容
|
||||||
if (!(resMsg?.message?.[0] as OB11MessageForward)?.data?.content) {
|
const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;
|
||||||
return await protocolFallbackLogic(msgId.toString());
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
messages: (resMsg?.message?.[0] as OB11MessageForward)?.data?.content
|
|
||||||
};
|
|
||||||
//}
|
|
||||||
|
|
||||||
// return { message: resMsg };
|
const forwardContent = (resMsg?.message?.[0] as OB11MessageForward)?.data?.content;
|
||||||
|
if (forwardContent) {
|
||||||
|
return { messages: forwardContent };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 说明消息已过期或者为内层消息 NapCat 一次返回不处理内层消息
|
||||||
|
throw new Error('消息已过期或者为内层消息,无法获取转发消息');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -3,22 +3,22 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
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: coerce.string(),
|
||||||
message_seq: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
message_seq: coerce.string().optional(),
|
||||||
count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
|
count: coerce.number().default(20),
|
||||||
reverseOrder: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
|
reverseOrder: coerce.boolean().default(false)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
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;
|
||||||
@@ -27,18 +27,14 @@ export default class GetFriendMsgHistory extends OneBotAction<Payload, Response>
|
|||||||
async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
|
async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
|
||||||
//处理参数
|
//处理参数
|
||||||
const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
|
||||||
|
|
||||||
const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
|
|
||||||
if (!uid) throw new Error(`记录${payload.user_id}不存在`);
|
if (!uid) throw new Error(`记录${payload.user_id}不存在`);
|
||||||
const friend = await this.core.apis.FriendApi.isBuddy(uid);
|
const friend = await this.core.apis.FriendApi.isBuddy(uid);
|
||||||
const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid };
|
const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid };
|
||||||
const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
|
const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
|
||||||
const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
|
const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
|
||||||
const msgList = hasMessageSeq ?
|
const msgList = hasMessageSeq ?
|
||||||
(await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
|
(await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
|
||||||
if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
|
if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
|
||||||
//翻转消息
|
|
||||||
if (isReverseOrder) msgList.reverse();
|
|
||||||
//转换序号
|
//转换序号
|
||||||
await Promise.all(msgList.map(async msg => {
|
await Promise.all(msgList.map(async msg => {
|
||||||
msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
|
msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()])
|
group_id: coerce.string()
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()])
|
group_id: coerce.string()
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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,
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
folder_id: Type.Optional(Type.String()),
|
folder_id: coerce.string().optional(),
|
||||||
folder: Type.Optional(Type.String()),
|
folder: coerce.string().optional(),
|
||||||
file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
|
file_count: coerce.number().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>[],
|
||||||
|
@@ -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';
|
import { coerce } from '@/common/coerce';
|
||||||
|
const SchemaData = z.object({
|
||||||
const SchemaData = Type.Object({
|
group_id: coerce.string(),
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
type: z.nativeEnum(WebHonorType).optional()
|
||||||
type: Type.Optional(Type.Enum(WebHonorType))
|
|
||||||
});
|
});
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
@@ -3,22 +3,23 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
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: coerce.string(),
|
||||||
message_seq: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
message_seq: coerce.string().optional(),
|
||||||
count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
|
count: coerce.number().default(20),
|
||||||
reverseOrder: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
|
reverseOrder: coerce.boolean().default(false)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
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> {
|
||||||
@@ -26,17 +27,13 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
|
|||||||
override payloadSchema = SchemaData;
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
|
async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
|
||||||
//处理参数
|
|
||||||
const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
|
|
||||||
const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
|
const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
|
||||||
const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
|
const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
|
||||||
//拉取消息
|
//拉取消息
|
||||||
const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
|
const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
|
||||||
const msgList = hasMessageSeq ?
|
const msgList = hasMessageSeq ?
|
||||||
(await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
|
(await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count, payload.reverseOrder)).msgList : (await this.core.apis.MsgApi.getAioFirstViewLatestMsgs(peer, +payload.count)).msgList;
|
||||||
if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
|
if (msgList.length === 0) throw new Error(`消息${payload.message_seq}不存在`);
|
||||||
//翻转消息
|
|
||||||
if (isReverseOrder) msgList.reverse();
|
|
||||||
//转换序号
|
//转换序号
|
||||||
await Promise.all(msgList.map(async msg => {
|
await Promise.all(msgList.map(async msg => {
|
||||||
msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
|
msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file_count: Type.Union([Type.Number(), Type.String()], { default: 50 }),
|
file_count: coerce.number().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[],
|
||||||
|
@@ -3,14 +3,15 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
|
no_cache: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
url: Type.String(),
|
url: coerce.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;
|
||||||
|
@@ -1,15 +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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
friend_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
friend_id: coerce.string().optional(),
|
||||||
user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
user_id: coerce.string().optional(),
|
||||||
temp_block: Type.Optional(Type.Boolean()),
|
temp_block: coerce.boolean().optional(),
|
||||||
temp_both_del: Type.Optional(Type.Boolean()),
|
temp_both_del: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
model: Type.String(),
|
model: coerce.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: {
|
||||||
|
@@ -4,18 +4,13 @@ import { ActionName } from '@/onebot/action/router';
|
|||||||
|
|
||||||
// 未验证
|
// 未验证
|
||||||
export class GoCQHTTPSendForwardMsgBase extends SendMsgBase {
|
export class GoCQHTTPSendForwardMsgBase extends SendMsgBase {
|
||||||
protected override async check(payload: OB11PostSendMsg) {
|
override async _handle(payload: OB11PostSendMsg) {
|
||||||
if (payload.messages) payload.message = normalize(payload.messages);
|
if (payload.messages) payload.message = normalize(payload.messages);
|
||||||
return super.check(payload);
|
return super._handle(payload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class GoCQHTTPSendForwardMsg extends GoCQHTTPSendForwardMsgBase {
|
export class GoCQHTTPSendForwardMsg extends GoCQHTTPSendForwardMsgBase {
|
||||||
override actionName = ActionName.GoCQHTTP_SendForwardMsg;
|
override actionName = ActionName.GoCQHTTP_SendForwardMsg;
|
||||||
|
|
||||||
protected override async check(payload: OB11PostSendMsg) {
|
|
||||||
if (payload.messages) payload.message = normalize(payload.messages);
|
|
||||||
return super.check(payload);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsgBase {
|
export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsgBase {
|
||||||
override actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
|
override actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
content: Type.String(),
|
content: coerce.string(),
|
||||||
image: Type.Optional(Type.String()),
|
image: coerce.string().optional(),
|
||||||
pinned: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
pinned: coerce.number().default(0),
|
||||||
type: Type.Union([Type.Number(), Type.String()], { default: 1 }),
|
type: coerce.number().default(1),
|
||||||
confirm_required: Type.Union([Type.Number(), Type.String()], { default: 1 }),
|
confirm_required: coerce.number().default(1),
|
||||||
is_show_edit_card: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
is_show_edit_card: coerce.number().default(0),
|
||||||
tip_window_type: Type.Union([Type.Number(), Type.String()], { default: 0 })
|
tip_window_type: coerce.number().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;
|
||||||
|
@@ -1,15 +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 { 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({
|
import { coerce } from '@/common/coerce';
|
||||||
file: Type.String(),
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()])
|
file: coerce.string(),
|
||||||
|
group_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
nickname: Type.String(),
|
nickname: coerce.string(),
|
||||||
personal_note: Type.Optional(Type.String()),
|
personal_note: coerce.string().optional(),
|
||||||
sex: Type.Optional(Type.Union([Type.Number(), Type.String()])), // 传Sex值?建议传0
|
sex: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
file: Type.String(),
|
file: coerce.string(),
|
||||||
name: Type.String(),
|
name: coerce.string(),
|
||||||
folder: Type.Optional(Type.String()),
|
folder: coerce.string().optional(),
|
||||||
folder_id: Type.Optional(Type.String()),//临时扩展
|
folder_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
file: Type.String(),
|
file: coerce.string(),
|
||||||
name: Type.String(),
|
name: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
notice_id: Type.String()
|
notice_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
character: Type.String(),
|
character: coerce.string(),
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
text: Type.String(),
|
text: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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;
|
||||||
|
@@ -2,13 +2,14 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
no_cache: coerce.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;
|
||||||
|
@@ -2,15 +2,16 @@ 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 { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
no_cache: coerce.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;
|
||||||
|
@@ -2,15 +2,16 @@ 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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
no_cache: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
|
no_cache: coerce.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;
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
interface GroupNotice {
|
interface GroupNotice {
|
||||||
sender_id: number;
|
sender_id: number;
|
||||||
publish_time: number;
|
publish_time: number;
|
||||||
@@ -16,11 +17,11 @@ interface GroupNotice {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
|
type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
|
||||||
|
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = 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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
character: Type.String(),
|
character: coerce.string(),
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
text: Type.String(),
|
text: coerce.string(),
|
||||||
});
|
});
|
||||||
|
|
||||||
type Payload = Static<typeof SchemaData>;
|
type Payload = z.infer<typeof SchemaData>;
|
||||||
|
|
||||||
|
|
||||||
export class SendGroupAiRecord extends GetPacketStatusDepends<Payload, {
|
export class SendGroupAiRecord extends GetPacketStatusDepends<Payload, {
|
||||||
|
@@ -1,16 +1,15 @@
|
|||||||
import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
|
import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
|
||||||
import { ActionName, BaseCheckResult } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OB11PostSendMsg } from '@/onebot/types';
|
import { OB11PostSendMsg } from '@/onebot/types';
|
||||||
|
|
||||||
// 未检测参数
|
// 未检测参数
|
||||||
class SendGroupMsg extends SendMsgBase {
|
class SendGroupMsg extends SendMsgBase {
|
||||||
override actionName = ActionName.SendGroupMsg;
|
override actionName = ActionName.SendGroupMsg;
|
||||||
override contextMode: ContextMode = ContextMode.Group;
|
override contextMode: ContextMode = ContextMode.Group;
|
||||||
|
override async _handle(payload: OB11PostSendMsg) {
|
||||||
protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
|
|
||||||
delete payload.user_id;
|
delete payload.user_id;
|
||||||
payload.message_type = 'group';
|
payload.message_type = 'group';
|
||||||
return super.check(payload);
|
return super._handle(payload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.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;
|
||||||
|
@@ -1,15 +1,16 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
flag: Type.Union([Type.String(), Type.Number()]),
|
flag: coerce.string(),
|
||||||
approve: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
approve: coerce.boolean().default(true),
|
||||||
reason: Type.Optional(Type.Union([Type.String({ default: ' ' }), Type.Null()])),
|
reason: coerce.string().nullable().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;
|
||||||
|
@@ -1,15 +1,16 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
enable: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
duration: Type.Union([Type.Number(), Type.String()], { default: 0 }),
|
duration: coerce.number().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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
card: Type.Optional(Type.String())
|
card: coerce.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;
|
||||||
|
@@ -1,14 +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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
user_id: Type.Union([Type.Number(), Type.String()]),
|
user_id: coerce.string(),
|
||||||
reject_add_request: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
reject_add_request: coerce.boolean().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;
|
||||||
|
@@ -1,13 +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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
is_dismiss: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
is_dismiss: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
group_name: Type.String(),
|
group_name: coerce.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;
|
||||||
|
@@ -1,13 +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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
group_id: Type.Union([Type.Number(), Type.String()]),
|
group_id: coerce.string(),
|
||||||
enable: Type.Optional(Type.Union([Type.Boolean(), Type.String()])),
|
enable: coerce.boolean().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;
|
||||||
|
@@ -1,13 +1,14 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.string(),
|
||||||
group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
group_id: coerce.string().optional(),
|
||||||
user_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
|
user_id: coerce.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> {
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
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: coerce.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;
|
||||||
|
@@ -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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
user_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
user_id: coerce.string().optional(),
|
||||||
group_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
group_id: coerce.string().optional(),
|
||||||
message_id: Type.Optional(Type.Union([Type.String(), Type.Number()])),
|
message_id: coerce.string().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> {
|
||||||
|
@@ -91,7 +91,7 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
|
|||||||
export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
|
export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
|
||||||
contextMode = ContextMode.Normal;
|
contextMode = ContextMode.Normal;
|
||||||
|
|
||||||
protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
|
protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult & { parsedPayload?: OB11PostSendMsg }> {
|
||||||
const messages = normalize(payload.message);
|
const messages = normalize(payload.message);
|
||||||
const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node);
|
const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node);
|
||||||
if (nodeElementLength > 0 && nodeElementLength != messages.length) {
|
if (nodeElementLength > 0 && nodeElementLength != messages.length) {
|
||||||
@@ -100,7 +100,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
|
|||||||
message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
|
message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return { valid: true };
|
return { valid: true , parsedPayload: payload };
|
||||||
}
|
}
|
||||||
|
|
||||||
async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
|
async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
|
||||||
|
@@ -1,15 +1,14 @@
|
|||||||
import { ContextMode, SendMsgBase } from './SendMsg';
|
import { ContextMode, SendMsgBase } from './SendMsg';
|
||||||
import { ActionName, BaseCheckResult } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
import { OB11PostSendMsg } from '@/onebot/types';
|
import { OB11PostSendMsg } from '@/onebot/types';
|
||||||
|
|
||||||
// 未检测参数
|
// 未检测参数
|
||||||
class SendPrivateMsg extends SendMsgBase {
|
class SendPrivateMsg extends SendMsgBase {
|
||||||
override actionName = ActionName.SendPrivateMsg;
|
override actionName = ActionName.SendPrivateMsg;
|
||||||
override contextMode: ContextMode = ContextMode.Private;
|
override contextMode: ContextMode = ContextMode.Private;
|
||||||
|
override async _handle(payload: OB11PostSendMsg) {
|
||||||
protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
|
if (payload.messages) payload.message = payload.messages;
|
||||||
payload.message_type = 'private';
|
return super._handle(payload);
|
||||||
return super.check(payload);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,15 +1,16 @@
|
|||||||
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';
|
||||||
|
import { coerce } from '@/common/coerce';
|
||||||
|
|
||||||
const SchemaData = Type.Object({
|
const SchemaData = z.object({
|
||||||
message_id: Type.Union([Type.Number(), Type.String()]),
|
message_id: coerce.string(),
|
||||||
emoji_id: Type.Union([Type.Number(), Type.String()]),
|
emoji_id: coerce.string(),
|
||||||
set: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
|
set: coerce.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;
|
||||||
|
@@ -1,9 +1,9 @@
|
|||||||
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
import { ActionName, BaseCheckResult } from '@/onebot/action/router';
|
import { ActionName } from '@/onebot/action/router';
|
||||||
|
|
||||||
|
|
||||||
export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
|
export abstract class GetPacketStatusDepends<PT, RT> extends OneBotAction<PT, RT> {
|
||||||
protected override async check(payload: PT): Promise<BaseCheckResult>{
|
protected override async check(payload: PT) {
|
||||||
if (!this.core.apis.PacketApi.available) {
|
if (!this.core.apis.PacketApi.available) {
|
||||||
return {
|
return {
|
||||||
valid: false,
|
valid: false,
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user