Update SendMsg.ts

This reverts commit 45d6ebf084.

README.md

@@ -37,7 +37,7 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
 |:-:|:-:|:-:|:-:|
 
-| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://docs.napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
+| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
 | Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
@@ -47,8 +47,6 @@ _Modern protocol-side framework implemented based on NTQQ._
 
 + [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).
 
 **本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+
+## Warnings
+
+[某框架抄袭部分分析](https://napneko.github.io/other/about-copy)

manifest.json

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

napcat.webui/package.json

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

napcat.webui/src/controllers/webui_manager.ts

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

napcat.webui/src/pages/web_login.tsx

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.13",
+  "version": "4.7.33",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -21,7 +21,6 @@
     "@eslint/compat": "^1.2.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
-    "@ffmpeg.wasm/main": "^0.13.1",
     "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
@@ -57,14 +56,13 @@
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.13.0",
     "vite": "^6.0.1",
-    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-cp": "^6.0.0",
     "vite-tsconfig-paths": "^5.1.0",
     "napcat.protobuf": "^1.1.4",
     "winston": "^3.17.0",
     "compressing": "^1.10.1"
   },
   "dependencies": {
-    "@ffmpeg.wasm/core-mt": "^0.13.2",
     "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"

src/common/download-ffmpeg.ts

@@ -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
+    }
+}

src/common/ffmpeg-worker.ts

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

src/common/ffmpeg.ts

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.13';
+export const napCatVersion = '4.7.33';

src/core/apis/file.ts

@@ -41,8 +41,8 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://ss.xingzhige.com/music_card/rkey', // 国内
-            'https://secret-service.bietiaop.com/rkeys',//国内
+            'https://secret-service.bietiaop.com/rkeys',
+            'http://ss.xingzhige.com/music_card/rkey',
         ],
             this.context.logger
         );

src/core/apis/group.ts

@@ -218,6 +218,10 @@ export class NTQQGroupApi {
         return this.context.session.getRichMediaService().deleteGroupFolder(groupCode, folderId);
     }
 
+    async transGroupFile(groupCode: string, fileId: string) {
+        return this.context.session.getRichMediaService().transGroupFile(groupCode, fileId);
+    }
+
     async addGroupEssence(groupCode: string, msgId: string) {
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,

src/core/apis/msg.ts

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

src/core/external/appid.json

@@ -234,5 +234,29 @@
     "3.2.16-33800": {
         "appid": 537274009,
         "qua": "V1_LNX_NQ_3.2.16_33800_GW_B"
+    },
+    "9.9.19-34231": {
+        "appid": 537279209,
+        "qua": "V1_WIN_NQ_9.9.19_34231_GW_B"
+    },
+    "3.2.17-34231": {
+        "appid": 537279245,
+        "qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
+    },
+    "9.9.19-34362": {
+        "appid": 537279260,
+        "qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
+    },
+    "3.2.17-34362": {
+        "appid": 537279296,
+        "qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
+    },
+    "9.9.19-34467": {
+        "appid": 537282256,
+        "qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
+    },
+    "3.2.17-34467": {
+        "appid": 537282292,
+        "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
     }
 }

src/core/external/offset.json

@@ -314,5 +314,25 @@
     "3.2.16-33800-arm64": {
         "send": "7262BB0",
         "recv": "72664E0"
+    },
+    "9.9.19-34231-x64": {
+        "send": "3BD73D0",
+        "recv": "3BDBBD0"
+    },
+    "3.2.17-34231-x64": {
+        "send": "AD787E0",
+        "recv": "AD7C200"
+    },
+    "3.2.17-34231-arm64": {
+        "send": "770CDC0",
+        "recv": "77106F0"
+    },
+    "9.9.19-34362-x64":{
+        "send": "3BD80D0",
+        "recv": "3BDC8D0"
+    },
+    "9.9.19-34467-x64": {
+        "send": "3BD8690",
+        "recv": "3BDCE90"
     }
 }

src/core/helper/rkey.ts

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

src/core/packet/context/operationContext.ts

@@ -154,6 +154,20 @@ export class PacketOperationContext {
         return res.result.resId;
     }
 
+    async MoveGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string) {
+        const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.MoveGroupFile.parse(resp);
+        return res.move.retCode;
+    }
+
+    async RenameGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, newName: string) {
+        const req = trans.RenameGroupFile.build(groupUin, fileUUID, currentParentDirectory, newName);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.RenameGroupFile.parse(resp);
+        return res.rename.retCode;
+    }
+
     async GetGroupFileUrl(groupUin: number, fileUUID: string) {
         const req = trans.DownloadGroupFile.build(groupUin, fileUUID);
         const resp = await this.context.client.sendOidbPacket(req, true);

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

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

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

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

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

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

src/core/services/NodeIKernelProfileService.ts

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

src/core/services/NodeIKernelRichMediaService.ts

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

src/core/types/webapi.ts

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

src/framework/napcat.ts

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

src/onebot/action/extends/MoveGroupFile.ts

@@ -0,0 +1,33 @@
+import { ActionName } from '@/onebot/action/router';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    file_id: Type.String(),
+    current_parent_directory: Type.String(),
+    target_parent_directory: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+interface MoveGroupFileResponse {
+    ok: boolean;
+}
+
+export class MoveGroupFile extends GetPacketStatusDepends<Payload, MoveGroupFileResponse> {
+    override actionName = ActionName.MoveGroupFile;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
+        if (contextMsgFile?.fileUUID) {
+            await this.core.apis.PacketApi.pkt.operation.MoveGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.target_parent_directory);
+            return {
+                ok: true,
+            };
+        }
+        throw new Error('real fileUUID not found!');
+    }
+}

src/onebot/action/extends/RenameGroupFile.ts

@@ -0,0 +1,33 @@
+import { ActionName } from '@/onebot/action/router';
+import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.Union([Type.Number(), Type.String()]),
+    file_id: Type.String(),
+    current_parent_directory: Type.String(),
+    new_name: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+interface RenameGroupFileResponse {
+    ok: boolean;
+}
+
+export class RenameGroupFile extends GetPacketStatusDepends<Payload, RenameGroupFileResponse> {
+    override actionName = ActionName.RenameGroupFile;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file_id) || FileNapCatOneBotUUID.decodeModelId(payload.file_id);
+        if (contextMsgFile?.fileUUID) {
+            await this.core.apis.PacketApi.pkt.operation.RenameGroupFile(+payload.group_id, contextMsgFile.fileUUID, payload.current_parent_directory, payload.new_name);
+            return {
+                ok: true,
+            };
+        }
+        throw new Error('real fileUUID not found!');
+    }
+}

src/onebot/action/extends/TransGroupFile.ts

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

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

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

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

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

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

@@ -11,10 +11,10 @@ interface Response {
 }
 
 const SchemaData = Type.Object({
-    group_id: Type.Union([Type.Number(), Type.String()]),
-    message_seq: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-    count: Type.Union([Type.Number(), Type.String()], { default: 20 }),
-    reverseOrder: Type.Optional(Type.Union([Type.Boolean(), Type.String()]))
+    group_id: Type.String(),
+    message_seq: Type.Optional(Type.String()),
+    count: Type.Number({ default: 20 }),
+    reverseOrder: Type.Boolean({ default: false })
 });
 
 
@@ -26,17 +26,13 @@ export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Re
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload, _adapter: string, config: NetworkAdapterConfig): Promise<Response> {
-        //处理参数
-        const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
         const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
         const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
         const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
         const msgList = hasMessageSeq ?
-            (await this.core.apis.MsgApi.getMsgHistory(peer, startMsgId, +payload.count)).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 (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);

src/onebot/action/group/GetGroupInfo.ts

@@ -20,6 +20,7 @@ class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
             const data = await this.core.apis.GroupApi.fetchGroupDetail(payload.group_id.toString());
             return {
                 ...data,
+                group_all_shut: data.shutUpAllTimestamp > 0 ? -1 : 0,
                 group_remark: '',
                 group_id: +payload.group_id,
                 group_name: data.groupName,

src/onebot/action/index.ts

@@ -109,10 +109,18 @@ import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
 import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
 import { GetUnidirectionalFriendList } from './extends/GetUnidirectionalFriendList';
 import SetGroupRemark from './extends/SetGroupRemark';
+import { MoveGroupFile } from './extends/MoveGroupFile';
+import { TransGroupFile } from './extends/TransGroupFile';
+import { RenameGroupFile } from './extends/RenameGroupFile';
+import { GetRkeyServer } from './packet/GetRkeyServer';
+import { GetRkeyEx } from './packet/GetRkeyEx';
+import { CleanCache } from './system/CleanCache';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
+        new GetRkeyEx(obContext, core),
+        new GetRkeyServer(obContext, core),
         new SetGroupRemark(obContext, core),
         new GetGroupInfoEx(obContext, core),
         new FetchEmojiLike(obContext, core),
@@ -132,6 +140,9 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new SetGroupSign(obContext, core),
         new SendGroupSign(obContext, core),
         new GetClientkey(obContext, core),
+        new MoveGroupFile(obContext, core),
+        new RenameGroupFile(obContext, core),
+        new TransGroupFile(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),
@@ -231,6 +242,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new ClickInlineKeyboardButton(obContext, core),
         new GetPrivateFileUrl(obContext, core),
         new GetUnidirectionalFriendList(obContext, core),
+        new CleanCache(obContext, core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/msg/SendMsg.ts

@@ -1,6 +1,7 @@
 import {
     OB11MessageData,
     OB11MessageDataType,
+    OB11MessageForward,
     OB11MessageMixType,
     OB11MessageNode,
     OB11PostContext,
@@ -12,7 +13,7 @@ import { MessageUnique } from '@/common/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
-import { stringifyWithBigInt } from '@/common/helper';
+import { isNumeric, stringifyWithBigInt } from '@/common/helper';
 import { PacketMsg } from '@/core/packet/message/message';
 import { rawMsgWithSendMsg } from '@/core/packet/message/converter';
 
@@ -38,7 +39,7 @@ export function normalize(message: OB11MessageMixType, autoEscape = false): OB11
 
 export async function createContext(core: NapCatCore, payload: OB11PostContext | undefined, contextMode: ContextMode = ContextMode.Normal): Promise<Peer> {
     if (!payload) {
-        throw new Error('请指定 group_id 或 user_id');
+        throw new Error('请传递请求内容');
     }
     if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) {
         return {
@@ -48,7 +49,16 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
     }
     if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
         const Uid = await core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-        if (!Uid) throw new Error('无法获取用户信息');
+        if (!Uid) {
+            if (payload.group_id) {
+                return {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: payload.group_id.toString(),
+                    guildId: ''
+                }
+            }
+            throw new Error('无法获取用户信息');
+        }
         const isBuddy = await core.apis.FriendApi.isBuddy(Uid);
         if (!isBuddy) {
             const ret = await core.apis.MsgApi.getTempChatInfo(ChatType.KCHATTYPETEMPC2CFROMGROUP, Uid);
@@ -78,7 +88,13 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
             guildId: '',
         };
     }
-    throw new Error('请指定 group_id 或 user_id');
+    if (contextMode === ContextMode.Private && payload.group_id) {
+        throw new Error('当前私聊发送,请指定 user_id 而不是 group_id');
+    }
+    if (contextMode === ContextMode.Group && payload.user_id) {
+        throw new Error('当前群聊发送,请指定 group_id 而不是 user_id');
+    }
+    throw new Error('请指定正确的 group_id 或 user_id');
 }
 
 function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
@@ -137,21 +153,25 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
             } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) {
                 throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`);
             }
-        } else {
-            // if (getSpecialMsgNum(payload, OB11MessageDataType.music)) {
-            //   const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic;
-            //   if (music) {
-            //   }
-            // }
+        } else if (await this.getIsFowardOneMsg(messages)) {
+            let onebot_inner_forward = await this.getIsFowardOneMsg(messages);
+            if (!onebot_inner_forward) throw Error('转发消息失败，未找到消息');
+            const real_msgid = MessageUnique.getMsgIdAndPeerByShortId(+onebot_inner_forward.data.id)?.MsgId || onebot_inner_forward.data.id;
+            await this.core.apis.MsgApi.forwardMsg(peer,
+                peer,
+                [real_msgid]
+            );
+            // 暂时没办法筛选的委屈办法
+            return { message_id: +onebot_inner_forward.data.id };
         }
-        // log("send msg:", peer, sendElements)
-
         const { sendElements, deleteAfterSentFiles } = await this.obContext.apis.MsgApi
             .createSendElements(messages, peer);
         const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles);
         return { message_id: returnMsg.id! };
     }
-
+    private async getIsFowardOneMsg(message: OB11MessageData[]): Promise<OB11MessageForward | undefined> {
+        return message.find(msg => msg.type === OB11MessageDataType.forward && isNumeric(msg.data.id)) as OB11MessageForward | undefined;
+    }
     private async uploadForwardedNodesPacket(msgPeer: Peer, messageNodes: OB11MessageNode[], source?: string, news?: {
         text: string
     }[], summary?: string, prompt?: string, parentMeta?: {

src/onebot/action/packet/GetRkeyEx.ts

@@ -0,0 +1,18 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+
+export class GetRkeyEx extends GetPacketStatusDepends<void, unknown> {
+    override actionName = ActionName.GetRkeyEx;
+
+    async _handle() {
+        let rkeys = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
+        return rkeys.map(rkey => {
+            return {
+                type: rkey.type === 10 ? "private" : "group",
+                rkey: rkey.rkey,
+                created_at: rkey.time,
+                ttl: rkey.ttl,
+            };
+        });
+    }
+}

src/onebot/action/packet/GetRkeyServer.ts

@@ -0,0 +1,38 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+
+export class GetRkeyServer extends GetPacketStatusDepends<void, { private_rkey?: string; group_rkey?: string; expired_time?: number; name: string }> {
+    override actionName = ActionName.GetRkeyServer;
+
+    private rkeyCache: {
+        private_rkey?: string;
+        group_rkey?: string;
+        expired_time?: number;
+        name: string;
+    } | null = null;
+    private expiryTime: number | null = null;
+
+    async _handle() {
+        // 检查缓存是否有效
+        if (this.expiryTime && this.expiryTime > Math.floor(Date.now() / 1000) && this.rkeyCache) {
+            return this.rkeyCache;
+        }
+
+        // 获取新的 Rkey
+        let rkeys = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
+        let privateRkeyItem = rkeys.filter(rkey => rkey.type === 10)[0];
+        let groupRkeyItem = rkeys.filter(rkey => rkey.type === 20)[0];
+
+        this.expiryTime = Math.floor(Date.now() / 1000) + Math.min(+groupRkeyItem!.ttl.toString(),+privateRkeyItem!.ttl.toString());
+
+        // 更新缓存
+        this.rkeyCache = {
+            private_rkey: privateRkeyItem ? privateRkeyItem.rkey : undefined,
+            group_rkey: groupRkeyItem ? groupRkeyItem.rkey : undefined,
+            expired_time: this.expiryTime,
+            name: "NapCat 4"
+        };
+
+        return this.rkeyCache;
+    }
+}

src/onebot/action/router.ts

@@ -10,6 +10,8 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
+    GetRkeyEx: 'get_rkey',
+    GetRkeyServer: 'get_rkey_server',
     SetGroupRemark: 'set_group_remark',
     NapCat_GetPrivateFileUrl: 'get_private_file_url',
     ClickInlineKeyboardButton: 'click_inline_keyboard_button',
@@ -52,7 +54,7 @@ export const ActionName = {
     GetStatus: 'get_status',
     GetVersionInfo: 'get_version_info',
     // Reboot : 'set_restart',
-    // CleanCache : 'clean_cache',
+    CleanCache : 'clean_cache',
     Exit: 'bot_exit',
     // go-cqhttp
     SetQQProfile: 'set_qq_profile',
@@ -130,6 +132,10 @@ export const ActionName = {
     GetRkey: 'nc_get_rkey',
     GetGroupShutList: 'get_group_shut_list',
 
+    MoveGroupFile: 'move_group_file',
+    TransGroupFile: 'trans_group_file',
+    RenameGroupFile: 'rename_group_file',
+
     GetGuildList: 'get_guild_list',
     GetGuildProfile: 'get_guild_service_profile',
 

src/onebot/action/system/CleanCache.ts

@@ -0,0 +1,38 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { unlink, readdir } from 'fs/promises';
+import { join } from 'path';
+
+export class CleanCache extends OneBotAction<void, void> {
+    override actionName = ActionName.CleanCache;
+
+    async _handle() {
+        try {
+            // 获取临时文件夹路径
+            const tempPath = this.core.NapCatTempPath;
+
+            // 读取文件夹中的所有文件
+            const files = await readdir(tempPath);
+
+            // 删除每个文件
+            const deletePromises = files.map(async (file) => {
+                const filePath = join(tempPath, file);
+                try {
+                    await unlink(filePath);
+                    this.core.context.logger.log(`已删除文件: ${filePath}`);
+                } catch (err: unknown) {
+                    this.core.context.logger.log(`删除文件 ${filePath} 失败: ${(err as Error).message}`);
+
+                }
+            });
+
+            // 等待所有删除操作完成
+            await Promise.all(deletePromises);
+
+            this.core.context.logger.log(`临时文件夹清理完成: ${tempPath}`);
+        } catch (err: unknown) {
+            this.core.context.logger.log(`清理缓存失败: ${(err as Error).message}`);
+            throw err;
+        }
+    }
+}

src/onebot/api/group.ts

@@ -114,7 +114,6 @@ export class OneBotGroupApi {
     async parseCardChangedEvent(msg: RawMessage) {
         if (msg.senderUin && msg.senderUin !== '0') {
             const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
-            await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
             if (member && member.cardName !== msg.sendMemberName) {
                 const newCardName = msg.sendMemberName ?? '';
                 const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
@@ -130,7 +129,6 @@ export class OneBotGroupApi {
 
     async parsePaiYiPai(msg: RawMessage, jsonStr: string) {
         const json = JSON.parse(jsonStr);
-
         //判断业务类型
         //Poke事件
         const pokedetail: Array<{ uid: string }> = json.items;

src/onebot/api/msg.ts

@@ -1105,6 +1105,8 @@ export class OneBotMsgApi {
                 return 'kick';
             case 3:
                 return 'kick_me';
+            case 129:
+                return 'disband';
             default:
                 return 'kick';
         }

src/onebot/event/notice/OB11GroupDecreaseEvent.ts

@@ -1,7 +1,7 @@
 import { OB11GroupNoticeEvent } from './OB11GroupNoticeEvent';
 import { NapCatCore } from '@/core';
 
-export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me';
+export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me' | 'disband';
 
 export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
     notice_type = 'group_decrease';
@@ -11,7 +11,7 @@ export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
     constructor(core: NapCatCore, groupId: number, userId: number, operatorId: number, subType: GroupDecreaseSubType = 'leave') {
         super(core, groupId, userId);
         this.group_id = groupId;
-        this.operator_id = operatorId; 
+        this.operator_id = operatorId;
         this.user_id = userId;
         this.sub_type = subType;
     }

src/onebot/helper/data.ts

@@ -93,6 +93,7 @@ export class OB11Construct {
 
     static group(group: Group): OB11Group {
         return {
+            group_all_shut: (+group.groupShutupExpireTime > 0 )? -1 : 0,
             group_remark: group.remarkName,
             group_id: +group.groupCode,
             group_name: group.groupName,

src/onebot/types/data.ts

@@ -63,6 +63,7 @@ export interface OB11GroupMember {
 }
 
 export interface OB11Group {
+    group_all_shut: number; // 群全员禁言
     group_remark: string; // 群备注
     group_id: number; // 群ID
     group_name: string; // 群名称

src/shell/base.ts

@@ -31,7 +31,9 @@ import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
 import { sleep } from '@/common/helper';
-
+import { downloadFFmpegIfNotExists } from '@/common/download-ffmpeg';
+import { FFmpegService } from '@/common/ffmpeg';
+import { connectToNamedPipe } from '@/shell/pipe';
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
@@ -311,6 +313,16 @@ export async function NCoreInitShell() {
     const pathWrapper = new NapCatPathWrapper();
     const logger = new LogWrapper(pathWrapper.logsPath);
     handleUncaughtExceptions(logger);
+    await connectToNamedPipe(logger).catch(e => logger.logError('命名管道连接失败', e));
+    if (!process.env['NAPCAT_DISABLE_FFMPEG_DOWNLOAD']) {
+        downloadFFmpegIfNotExists(logger).then(({ path, reset }) => {
+            if (reset && path) {
+                FFmpegService.setFfmpegPath(path, logger);
+            }
+        }).catch(e => {
+            logger.logError('[Ffmpeg] Error:', e);
+        });
+    }
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
 

src/shell/pipe.ts

@@ -0,0 +1,74 @@
+import { LogWrapper } from '@/common/log';
+import * as net from 'net';
+import * as process from 'process';
+
+/**
+ * 连接到命名管道并重定向stdout
+ * @param logger 日志记录器
+ * @param timeoutMs 连接超时时间(毫秒)，默认5000ms
+ * @returns Promise，连接成功时resolve，失败时reject
+ */
+export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000): Promise<{ disconnect: () => void }> {
+    return new Promise((resolve, reject) => {
+        if (process.platform !== 'win32') {
+            logger.log('只有Windows平台支持命名管道');
+            // 非Windows平台不reject，而是返回一个空的disconnect函数
+            return resolve({ disconnect: () => { } });
+        }
+
+        const pid = process.pid;
+        const pipePath = `\\\\.\\pipe\\NapCat_${pid}`;
+
+        // 设置连接超时
+        const timeoutId = setTimeout(() => {
+            reject(new Error(`连接命名管道超时: ${pipePath}`));
+        }, timeoutMs);
+
+        try {
+            let originalStdoutWrite = process.stdout.write.bind(process.stdout);
+            const pipeSocket = net.connect(pipePath, () => {
+                // 清除超时
+                clearTimeout(timeoutId);
+
+                logger.log(`[StdOut] 已重定向到命名管道: ${pipePath}`);
+                process.stdout.write = (
+                    chunk: any,
+                    encoding?: BufferEncoding | (() => void),
+                    cb?: () => void
+                ): boolean => {
+                    if (typeof encoding === 'function') {
+                        cb = encoding;
+                        encoding = undefined;
+                    }
+                    return pipeSocket.write(chunk, encoding as BufferEncoding, cb);
+                };
+                // 提供断开连接的方法
+                const disconnect = () => {
+                    process.stdout.write = originalStdoutWrite;
+                    pipeSocket.end();
+                    logger.log(`已手动断开命名管道连接: ${pipePath}`);
+                };
+
+                // 返回成功和断开连接的方法
+                resolve({ disconnect });
+            });
+
+            pipeSocket.on('error', (err) => {
+                clearTimeout(timeoutId);
+                process.stdout.write = originalStdoutWrite;
+                logger.log(`连接命名管道 ${pipePath} 时出错:`, err);
+                reject(err);
+            });
+
+            pipeSocket.on('end', () => {
+                process.stdout.write = originalStdoutWrite;
+                logger.log('命名管道连接已关闭');
+            });
+
+        } catch (error) {
+            clearTimeout(timeoutId);
+            logger.log(`尝试连接命名管道 ${pipePath} 时发生异常:`, error);
+            reject(error);
+        }
+    });
+}

src/webui/index.ts

@@ -4,6 +4,7 @@
 
 import express from 'express';
 import { createServer } from 'http';
+import { createServer as createHttpsServer } from 'https';
 import { LogWrapper } from '@/common/log';
 import { NapCatPathWrapper } from '@/common/path';
 import { WebUiConfigWrapper } from '@webapi/helper/config';
@@ -13,11 +14,10 @@ import { createUrl } from '@webapi/utils/url';
 import { sendError } from '@webapi/utils/response';
 import { join } from 'node:path';
 import { terminalManager } from '@webapi/terminal/terminal_manager';
-import multer from 'multer'; // 新增：引入multer用于错误捕获
+import multer from 'multer'; // 引入multer用于错误捕获
 
 // 实例化Express
 const app = express();
-const server = createServer(app);
 /**
  * 初始化并启动WebUI服务。
  * 该函数配置了Express服务器以支持JSON解析和静态文件服务，并监听6099端口。
@@ -29,6 +29,7 @@ export let webUiPathWrapper: NapCatPathWrapper;
 const MAX_PORT_TRY = 100;
 import * as net from 'node:net';
 import { WebUiDataRuntime } from './src/helper/Data';
+import { existsSync, readFileSync } from 'node:fs';
 export let webUiRuntimePort = 6099;
 export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string, number, string]> {
     try {
@@ -40,7 +41,23 @@ export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string,
         return ['', 0, ''];
     }
 }
+async function checkCertificates(logger: LogWrapper): Promise<{ key: string, cert: string } | null> {
+    try {
+        const certPath = join(webUiPathWrapper.configPath, 'cert.pem');
+        const keyPath = join(webUiPathWrapper.configPath, 'key.pem');
 
+        if (existsSync(certPath) && existsSync(keyPath)) {
+            const cert = readFileSync(certPath, 'utf8');
+            const key = readFileSync(keyPath, 'utf8');
+            logger.log('[NapCat] [WebUi] 找到SSL证书，将启用HTTPS模式');
+            return { cert, key };
+        }
+        return null;
+    } catch (error) {
+        logger.log('[NapCat] [WebUi] 检查SSL证书时出错: ' + error);
+        return null;
+    }
+}
 export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapper) {
     webUiPathWrapper = pathWrapper;
     WebUiConfig = new WebUiConfigWrapper();
@@ -107,6 +124,9 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
     // 挂载静态路由（前端），路径为 /webui
     app.use('/webui', express.static(pathWrapper.staticPath));
     // 初始化WebSocket服务器
+    const sslCerts = await checkCertificates(logger);
+    const isHttps = !!sslCerts;
+    let server = isHttps && sslCerts ? createHttpsServer(sslCerts, app) : createServer(app);
     server.on('upgrade', (request, socket, head) => {
         terminalManager.initialize(request, socket, head, logger);
     });

src/webui/src/api/Auth.ts

@@ -20,25 +20,26 @@ export const CheckDefaultTokenHandler: RequestHandler = async (_, res) => {
 export const LoginHandler: RequestHandler = async (req, res) => {
     // 获取WebUI配置
     const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
-    // 获取请求体中的token
-    const { token } = req.body;
+    // 获取请求体中的hash
+    const { hash } = req.body;
     // 获取客户端IP
     const clientIP = req.ip || req.socket.remoteAddress || '';
 
     // 如果token为空，返回错误信息
-    if (isEmpty(token)) {
+    if (isEmpty(hash)) {
         return sendError(res, 'token is empty');
     }
     // 检查登录频率
     if (!WebUiDataRuntime.checkLoginRate(clientIP, WebUiConfigData.loginRate)) {
         return sendError(res, 'login rate limit');
     }
-    //验证config.token是否等于token
-    if (WebUiConfigData.token !== token) {
+    //验证config.token hash是否等于token hash
+    if (!AuthHelper.comparePasswordHash(WebUiConfigData.token, hash)) {
         return sendError(res, 'token is invalid');
     }
+
     // 签发凭证
-    const signCredential = Buffer.from(JSON.stringify(AuthHelper.signCredential(WebUiConfigData.token))).toString(
+    const signCredential = Buffer.from(JSON.stringify(AuthHelper.signCredential(hash))).toString(
         'base64'
     );
     // 返回成功信息

src/webui/src/helper/SignToken.ts

@@ -5,13 +5,13 @@ export class AuthHelper {
 
     /**
      * 签名凭证方法。
-     * @param token 待签名的凭证字符串。
+     * @param hash 待签名的凭证字符串。
      * @returns 签名后的凭证对象。
      */
-    public static signCredential(token: string): WebUiCredentialJson {
+    public static signCredential(hash: string): WebUiCredentialJson {
         const innerJson: WebUiCredentialInnerJson = {
             CreatedTime: Date.now(),
-            TokenEncoded: token,
+            HashEncoded: hash,
         };
         const jsonString = JSON.stringify(innerJson);
         const hmac = crypto.createHmac('sha256', AuthHelper.secretKey).update(jsonString, 'utf8').digest('hex');
@@ -57,8 +57,7 @@ export class AuthHelper {
         const currentTime = Date.now() / 1000;
         const createdTime = credentialJson.Data.CreatedTime;
         const timeDifference = currentTime - createdTime;
-
-        return timeDifference <= 3600 && credentialJson.Data.TokenEncoded === token;
+        return timeDifference <= 3600 && credentialJson.Data.HashEncoded === AuthHelper.generatePasswordHash(token);
     }
 
     /**
@@ -85,4 +84,23 @@ export class AuthHelper {
 
         return store.exists(`revoked:${hmac}`) > 0;
     }
+
+    /**
+     * 生成密码Hash
+     * @param password 密码
+     * @returns 生成的Hash值
+     */
+    public static generatePasswordHash(password: string): string {
+        return crypto.createHash('sha256').update(password + '.napcat').digest().toString('hex')
+    }
+
+    /**
+     * 对比密码和Hash值
+     * @param password 密码
+     * @param hash Hash值
+     * @returns 布尔值，表示密码是否匹配Hash值
+     */
+    public static comparePasswordHash(password: string, hash: string): boolean {
+        return this.generatePasswordHash(password) === hash;
+    }
 }

src/webui/src/middleware/auth.ts

@@ -21,17 +21,18 @@ export async function auth(req: Request, res: Response, next: NextFunction) {
             return sendError(res, 'Unauthorized');
         }
         // 获取token
-        const token = authorization[1];
+        const hash = authorization[1];
+        if(!hash) return sendError(res, 'Unauthorized');
         // 解析token
         let Credential: WebUiCredentialJson;
         try {
-            Credential = JSON.parse(Buffer.from(token, 'base64').toString('utf-8'));
+            Credential = JSON.parse(Buffer.from(hash, 'base64').toString('utf-8'));
         } catch (e) {
             return sendError(res, 'Unauthorized');
         }
         // 获取配置
         const config = await WebUiConfig.GetWebUIConfig();
-        // 验证凭证在1小时内有效且token与原始token相同
+        // 验证凭证在1小时内有效
         const credentialJson = AuthHelper.validateCredentialWithinOneHour(config.token, Credential);
         if (credentialJson) {
             // 通过验证

src/webui/src/types/sign_token.d.ts

@@ -1,6 +1,6 @@
 interface WebUiCredentialInnerJson {
     CreatedTime: number;
-    TokenEncoded: string;
+    HashEncoded: string;
 }
 
 interface WebUiCredentialJson {

vite.config.ts

@@ -7,8 +7,7 @@ import { builtinModules } from 'module';
 const external = [
     'silk-wasm',
     'ws',
-    'express',
-    '@ffmpeg.wasm/core-mt'
+    'express'
 ];
 const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();
 
@@ -97,7 +96,6 @@ const UniversalBaseConfig = () =>
                 entry: {
                     napcat: 'src/universal/napcat.ts',
                     'audio-worker': 'src/common/audio-worker.ts',
-                    'ffmpeg-worker': 'src/common/ffmpeg-worker.ts',
                     'worker/conoutSocketWorker': 'src/pty/worker/conoutSocketWorker.ts',
                 },
                 formats: ['es'],
@@ -127,7 +125,6 @@ const ShellBaseConfig = () =>
                 entry: {
                     napcat: 'src/shell/napcat.ts',
                     'audio-worker': 'src/common/audio-worker.ts',
-                    'ffmpeg-worker': 'src/common/ffmpeg-worker.ts',
                     'worker/conoutSocketWorker': 'src/pty/worker/conoutSocketWorker.ts',
                 },
                 formats: ['es'],
@@ -157,7 +154,6 @@ const FrameworkBaseConfig = () =>
                 entry: {
                     napcat: 'src/framework/napcat.ts',
                     'audio-worker': 'src/common/audio-worker.ts',
-                    'ffmpeg-worker': 'src/common/ffmpeg-worker.ts',
                     'worker/conoutSocketWorker': 'src/pty/worker/conoutSocketWorker.ts',
                 },
                 formats: ['es'],