feat: websocket server

README.md

@@ -1,9 +1,8 @@
-<img src="https://napneko.github.io/assets/newnewlogo.png" width = "305" height = "411" alt="NapCat" align=right />
 <div align="center">
 
 # NapCat
 
-
+![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
 
 _Modern protocol-side framework implemented based on NTQQ._
 
@@ -38,23 +37,18 @@ _Modern protocol-side framework implemented based on NTQQ._
 | Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
 |:-:|:-:|:-:|:-:|
 
-| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
+| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://docs.napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
 |:-:|:-:|:-:|:-:|
 
-| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
-|:-:|:-:|:-:|:-:|:-:|
-
-| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
-|:-:|:-:|
+| 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) |
+|:-:|:-:|:-:|:-:|
 
 ## Thanks
 
 + [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-+ [AstrBot](https://github.com/AstrBotDevs/AstrBot) 是完美适配本项目的LLM Bot框架 在此推荐一下
++ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
 
-+ [MaiBot](https://github.com/MaiM-with-u/MaiBot) 一只赛博群友 麦麦 Bot框架 在此推荐一下
-  
 + 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.19-34740",
-  "verHash": "f31348f2",
-  "linuxVersion": "3.2.17-34740",
-  "linuxVerHash": "5aa2d8d6",
+  "version": "9.9.18-32793",
+  "verHash": "d43f097e",
+  "linuxVersion": "3.2.16-32793",
+  "linuxVerHash": "ee4bd910",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -16,8 +16,25 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "34740",
+  "peerDependenciesMeta": {
+    "*": {
+      "optional": true
+    }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
+      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
+      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
+    }
+  },
+  "buildVersion": "32793",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

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

napcat.webui/package.json

@@ -55,7 +55,6 @@
     "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",
@@ -89,7 +88,6 @@
     "@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,10 +17,9 @@ 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',
-      { hash: sha256 }
+      { token }
     )
     return data.data.Credential
   }

napcat.webui/src/pages/web_login.tsx

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.63",
+  "version": "4.7.6",
   "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,9 @@
     "@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",
+    "@hono/node-server": "^1.13.8",
     "@log4js-node/log4js-api": "^1.0.2",
     "@napneko/nap-proto-core": "^0.0.4",
     "@rollup/plugin-node-resolve": "^16.0.0",
@@ -41,8 +43,9 @@
     "ajv": "^8.13.0",
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
+    "compressing": "^1.10.1",
     "cors": "^2.8.5",
-    "esbuild": "0.25.4",
+    "esbuild": "0.25.0",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
@@ -50,20 +53,20 @@
     "fast-xml-parser": "^4.3.6",
     "file-type": "^20.0.0",
     "globals": "^16.0.0",
+    "hono": "^4.7.2",
+    "image-size": "^1.1.1",
     "json5": "^2.2.3",
     "multer": "^1.4.5-lts.1",
+    "napcat.protobuf": "^1.1.3",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.13.0",
     "vite": "^6.0.1",
-    "vite-plugin-cp": "^6.0.0",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-wasm": "^3.4.1",
     "vite-tsconfig-paths": "^5.1.0",
-    "napcat.protobuf": "^1.1.4",
-    "winston": "^3.17.0",
-    "compressing": "^1.10.1"
-  },
-  "dependencies": {
-    "express": "^5.0.0",
     "silk-wasm": "^3.6.1",
-    "ws": "^8.18.0"
-  }
-}
+    "@hono/node-ws": "^1.1.0",
+    "winston": "^3.17.0"
+  },
+  "dependencies": {}
+}

src/common/clean-task.ts

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

src/common/download-ffmpeg.ts

@@ -1,360 +0,0 @@
-// 更正导入语句
-import * as fs from 'fs';
-import * as path from 'path';
-import * as https from 'https';
-import * as os from 'os';
-import * as compressing from 'compressing';  // 修正导入方式
-import { pipeline } from 'stream/promises';
-import { fileURLToPath } from 'url';
-import { LogWrapper } from './log';
-
-const downloadOri = "https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip"
-const urls = [
-    "https://github.moeyy.xyz/" + downloadOri,
-    "https://ghp.ci/" + downloadOri,
-    "https://gh.api.99988866.xyz/" + 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) {
-        let url = await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
-            log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
-        });
-        if (!url) {
-            log.log('[FFmpeg] [Error] 下载FFmpeg失败');
-            return {
-                path: null,
-                reset: false
-            };
-        }
-        return {
-            path: path.join(currentPath, 'ffmpeg'),
-            reset: true
-        }
-    }
-
-    return {
-        path: path.join(currentPath, 'ffmpeg'),
-        reset: true
-    }
-}

src/common/ffmpeg-worker.ts

@@ -0,0 +1,165 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { FFmpeg } from '@ffmpeg.wasm/main';
+import { randomUUID } from 'crypto';
+import { readFileSync, statSync, writeFileSync } from 'fs';
+import type { VideoInfo } from './video';
+import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
+import { parentPort } from 'worker_threads';
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
+class FFmpegService {
+    public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
+        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        const videoFileName = `${randomUUID()}.mp4`;
+        const outputFileName = `${randomUUID()}.jpg`;
+        try {
+            ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
+            const code = await ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName);
+            if (code !== 0) {
+                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
+            }
+            const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
+            writeFileSync(thumbnailPath, thumbnail);
+        } catch (error) {
+            console.error('Error extracting thumbnail:', error);
+            throw error;
+        } finally {
+            try {
+                ffmpegInstance.fs.unlink(outputFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking output file:', unlinkError);
+            }
+            try {
+                ffmpegInstance.fs.unlink(videoFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking video file:', unlinkError);
+            }
+        }
+    }
+
+    public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
+        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        const inputFileName = `${randomUUID()}.pcm`;
+        const outputFileName = `${randomUUID()}.${format}`;
+        try {
+            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(inputFile));
+            const params = format === 'amr'
+                ? ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, '-ar', '8000', '-b:a', '12.2k', outputFileName]
+                : ['-f', 's16le', '-ar', '24000', '-ac', '1', '-i', inputFileName, outputFileName];
+            const code = await ffmpegInstance.run(...params);
+            if (code !== 0) {
+                throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
+            }
+            const outputData = ffmpegInstance.fs.readFile(outputFileName);
+            writeFileSync(outputFile, outputData);
+        } catch (error) {
+            console.error('Error converting file:', error);
+            throw error;
+        } finally {
+            try {
+                ffmpegInstance.fs.unlink(outputFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking output file:', unlinkError);
+            }
+            try {
+                ffmpegInstance.fs.unlink(inputFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking input file:', unlinkError);
+            }
+        }
+    }
+
+    public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
+        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        const inputFileName = `${randomUUID()}.input`;
+        const outputFileName = `${randomUUID()}.pcm`;
+        try {
+            ffmpegInstance.fs.writeFile(inputFileName, readFileSync(filePath));
+            const params = ['-y', '-i', inputFileName, '-ar', '24000', '-ac', '1', '-f', 's16le', outputFileName];
+            const code = await ffmpegInstance.run(...params);
+            if (code !== 0) {
+                throw new Error('FFmpeg process exited with code ' + code);
+            }
+            const outputData = ffmpegInstance.fs.readFile(outputFileName);
+            writeFileSync(pcmPath, outputData);
+            return Buffer.from(outputData);
+        } catch (error: any) {
+            throw new Error('FFmpeg处理转换出错: ' + error.message);
+        } finally {
+            try {
+                ffmpegInstance.fs.unlink(outputFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking output file:', unlinkError);
+            }
+            try {
+                ffmpegInstance.fs.unlink(inputFileName);
+            } catch (unlinkError) {
+                console.error('Error unlinking output file:', unlinkError);
+            }
+        }
+    }
+
+    public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
+        await FFmpegService.extractThumbnail(videoPath, thumbnailPath);
+        const fileType = (await fileTypeFromFile(videoPath))?.ext ?? 'mp4';
+        const inputFileName = `${randomUUID()}.${fileType}`;
+        const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
+        ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
+        ffmpegInstance.setLogging(true);
+        let duration = 60;
+        ffmpegInstance.setLogger((_level, ...msg) => {
+            const message = msg.join(' ');
+            const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
+            if (durationMatch) {
+                const hours = parseInt(durationMatch[1] ?? '0', 10);
+                const minutes = parseInt(durationMatch[2] ?? '0', 10);
+                const seconds = parseFloat(durationMatch[3] ?? '0');
+                duration = hours * 3600 + minutes * 60 + seconds;
+            }
+        });
+        await ffmpegInstance.run('-i', inputFileName);
+        const image = imageSize(thumbnailPath);
+        ffmpegInstance.fs.unlink(inputFileName);
+        const fileSize = statSync(videoPath).size;
+        return {
+            width: image.width ?? 100,
+            height: image.height ?? 100,
+            time: duration,
+            format: fileType,
+            size: fileSize,
+            filePath: videoPath
+        };
+    }
+}
+type FFmpegMethod = 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
+
+interface FFmpegTask {
+    method: FFmpegMethod;
+    args: any[];
+}
+export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
+    switch (method) {
+        case 'extractThumbnail':
+            return await FFmpegService.extractThumbnail(...args as [string, string]);
+        case 'convertFile':
+            return await FFmpegService.convertFile(...args as [string, string, string]);
+        case 'convert':
+            return await FFmpegService.convert(...args as [string, string]);
+        case 'getVideoInfo':
+            return await FFmpegService.getVideoInfo(...args as [string, string]);
+        default:
+            throw new Error(`Unknown method: ${method}`);
+    }
+}
+recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
+    return await handleFFmpegTask({ method, args });
+});

src/common/ffmpeg.ts

@@ -1,195 +1,36 @@
-import { readFileSync, statSync, existsSync, mkdirSync } from 'fs';
-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 { fileURLToPath } from 'node:url';
-import { platform } from 'node:os';
-import { LogWrapper } from './log';
-import { imageSizeFallBack } from '@/image-size';
-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;
+/* 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[];
 };
-export let FFMPEG_CMD = getFFmpegPath('ffmpeg');
-export let FFPROBE_CMD = getFFmpegPath('ffprobe');
+
+type EncodeResult = any;
+
+function getWorkerPath() {
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
+}
+
 export class FFmpegService {
-    // 确保目标目录存在
-    public static setFfmpegPath(ffmpegPath: string,logger:LogWrapper): void {
-        if (platform() === 'win32') {
-            FFMPEG_CMD = path.join(ffmpegPath, 'ffmpeg.exe');
-            FFPROBE_CMD = path.join(ffmpegPath, 'ffprobe.exe');
-            logger.log('[Check] ffmpeg:', FFMPEG_CMD);
-            logger.log('[Check] ffprobe:', FFPROBE_CMD);
-        }
-    }
-    private static ensureDirExists(filePath: string): void {
-        const dir = dirname(filePath);
-        if (!existsSync(dir)) {
-            mkdirSync(dir, { recursive: true });
-        }
-    }
-
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        try {
-            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}`);
-        }
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        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}`);
-        }
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        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}`);
-        }
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
+        return result;
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        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;
-        }
+        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
+        return result;
     }
-
-    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 = await imageSizeFallBack(thumbnailPath);
-
-            return {
-                format: fileType?.ext ?? 'mp4',
-                size: fileSize,
-                width: dimensions.width ?? 100,
-                height: dimensions.height ?? 100
-            };
-        } catch (error) {
-            return {
-                format: fileType?.ext ?? 'mp4',
-                size: fileSize,
-                width: 100,
-                height: 100
-            };
-        }
-    }
-
-    private static async getVideoDuration(videoPath: string): Promise<number> {
-        try {
-            // 使用FFprobe获取时长
-            const { stdout } = await execFileAsync(FFPROBE_CMD, [
-                '-v', 'error',
-                '-show_entries', 'format=duration',
-                '-of', 'default=noprint_wrappers=1:nokey=1',
-                videoPath
-            ]);
-
-            const duration = parseFloat(stdout.trim());
-
-            return isNaN(duration) ? 60 : duration;
-        } catch (error) {
-            return 60; // 默认时长
-        }
-    }
-}
+}

src/common/file.ts

@@ -76,7 +76,7 @@ export function calculateFileMD5(filePath: string): Promise<string> {
         const stream = fs.createReadStream(filePath);
         const hash = crypto.createHash('md5');
 
-        stream.on('data', (data) => {
+        stream.on('data', (data: Buffer) => {
             // 当读取到数据时，更新哈希对象的状态
             hash.update(data);
         });
@@ -115,7 +115,7 @@ async function tryDownload(options: string | HttpDownloadOptions, useReferer: bo
     if (useReferer && !headers['Referer']) {
         headers['Referer'] = url;
     }
-    const fetchRes = await fetch(url, { headers, redirect: 'follow' }).catch((err) => {
+    const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
@@ -145,8 +145,8 @@ export enum FileUriType {
 
 export async function checkUriType(Uri: string) {
     const LocalFileRet = await solveProblem((uri: string) => {
-        if (fs.existsSync(path.normalize(uri))) {
-            return { Uri: path.normalize(uri), Type: FileUriType.Local };
+        if (fs.existsSync(uri)) {
+            return { Uri: uri, Type: FileUriType.Local };
         }
         return undefined;
     }, Uri);
@@ -182,28 +182,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-        case FileUriType.Local: {
-            const fileExt = path.extname(HandledUri);
-            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-            const tempFilePath = path.join(dir, filename + fileExt);
-            fs.copyFileSync(HandledUri, tempFilePath);
-            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-        }
+    case FileUriType.Local: {
+        const fileExt = path.extname(HandledUri);
+        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+        const tempFilePath = path.join(dir, filename + fileExt);
+        fs.copyFileSync(HandledUri, tempFilePath);
+        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+    }
 
-        case FileUriType.Remote: {
-            const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
-            fs.writeFileSync(filePath, buffer);
-            return { success: true, errMsg: '', fileName: filename, path: filePath };
-        }
+    case FileUriType.Remote: {
+        const buffer = await httpDownload({ url: HandledUri, headers: headers ?? {} });
+        fs.writeFileSync(filePath, buffer);
+        return { success: true, errMsg: '', fileName: filename, path: filePath };
+    }
 
-        case FileUriType.Base64: {
-            const base64 = HandledUri.replace(/^base64:\/\//, '');
-            const base64Buffer = Buffer.from(base64, 'base64');
-            fs.writeFileSync(filePath, base64Buffer);
-            return { success: true, errMsg: '', fileName: filename, path: filePath };
-        }
+    case FileUriType.Base64: {
+        const base64 = HandledUri.replace(/^base64:\/\//, '');
+        const base64Buffer = Buffer.from(base64, 'base64');
+        fs.writeFileSync(filePath, base64Buffer);
+        return { success: true, errMsg: '', fileName: filename, path: filePath };
+    }
 
-        default:
-            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+    default:
+        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.63';
+export const napCatVersion = '4.7.6';

src/common/worker.ts

@@ -5,12 +5,6 @@ export async function runTask<T, R>(workerScript: string, taskData: T): Promise<
     try {
         return await new Promise<R>((resolve, reject) => {
             worker.on('message', (result: R) => {
-                if ((result as any)?.log) {
-                    console.error('Worker Log--->:', (result as { log: string }).log);
-                }
-                if ((result as any)?.error) {
-                    reject(new Error("Worker error: " + (result as { error: string }).error));
-                }
                 resolve(result);
             });
 

src/core/apis/file.ts

@@ -17,6 +17,8 @@ import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import { fileTypeFromFile } from 'file-type';
+import imageSize from 'image-size';
+import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { RkeyManager } from '@/core/helper/rkey';
 import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
@@ -26,9 +28,6 @@ import { SendMessageContext } from '@/onebot/api';
 import { getFileTypeForSendType } from '../helper/msg';
 import { FFmpegService } from '@/common/ffmpeg';
 import { rkeyDataType } from '../types/file';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { FileId } from '../packet/transformer/proto/misc/fileid';
-import { imageSizeFallBack } from '@/image-size';
 
 export class NTQQFileApi {
     context: InstanceContext;
@@ -42,10 +41,10 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://secret-service.bietiaop.com/rkeys',
-            'http://ss.xingzhige.com/music_card/rkey',
+            'https://ss.xingzhige.com/music_card/rkey', // 国内
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
-            this.context.logger
+        this.context.logger
         );
     }
 
@@ -64,76 +63,6 @@ export class NTQQFileApi {
         }
     }
 
-    async getFileUrl(chatType: ChatType, peer: string, fileUUID?: string, file10MMd5?: string | undefined) {
-        if (this.core.apis.PacketApi.available) {
-            try {
-                if (chatType === ChatType.KCHATTYPEGROUP && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupFileUrl(+peer, fileUUID);
-                } else if (file10MMd5 && fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPrivateFileUrl(peer, fileUUID, file10MMd5);
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('fileUUID or file10MMd5 is undefined');
-    }
-
-    async getPttUrl(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1403) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupPttUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetPttUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get ptt url');
-    }
-
-    async getVideoUrlPacket(peer: string, fileUUID?: string) {
-        if (this.core.apis.PacketApi.available && fileUUID) {
-            let appid = new NapProtoMsg(FileId).decode(Buffer.from(fileUUID.replaceAll('-', '+').replaceAll('_', '/'), 'base64')).appid;
-            try {
-                if (appid && appid === 1415) {
-                    return this.core.apis.PacketApi.pkt.operation.GetGroupVideoUrl(+peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                } else if (fileUUID) {
-                    return this.core.apis.PacketApi.pkt.operation.GetVideoUrl(peer, {
-                        fileUuid: fileUUID,
-                        storeId: 1,
-                        uploadTime: 0,
-                        ttl: 0,
-                        subType: 0,
-                    });
-                }
-            } catch (error) {
-                this.context.logger.logError('获取文件URL失败', (error as Error).message);
-            }
-        }
-        throw new Error('packet cant get video url');
-    }
 
     async copyFile(filePath: string, destPath: string) {
         await this.core.util.copyFile(filePath, destPath);
@@ -208,7 +137,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
-        const imageSize = await imageSizeFallBack(picPath);
+        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
         context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
@@ -253,30 +182,23 @@ export class NTQQFileApi {
         filePath = newFilePath;
 
         const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
-        context.deleteAfterSentFiles.push(path);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
         const thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
         fs.mkdirSync(pathLib.dirname(thumbDir), { recursive: true });
         const thumbPath = pathLib.join(pathLib.dirname(thumbDir), `${md5}_0.png`);
+        try {
+            videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
+        } catch {
+            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+        }
         if (_diyThumbPath) {
             try {
                 await this.copyFile(_diyThumbPath, thumbPath);
             } catch (e) {
                 this.context.logger.logError('复制自定义缩略图失败', e);
             }
-        } else {
-            try {
-                videoInfo = await FFmpegService.getVideoInfo(filePath, thumbPath);
-                if (!fs.existsSync(thumbPath)) {
-                    this.context.logger.logError('获取视频缩略图失败', new Error('缩略图不存在'));
-                    throw new Error('获取视频缩略图失败');
-                }
-            } catch (e) {
-                this.context.logger.logError('获取视频信息失败', e);
-                fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-            }
         }
         context.deleteAfterSentFiles.push(thumbPath);
         const thumbSize = (await fsPromises.stat(thumbPath)).size;
@@ -302,7 +224,7 @@ export class NTQQFileApi {
             },
         };
     }
-    async createValidSendPttElement(_context: SendMessageContext, pttPath: string): Promise<SendPttElement> {
+    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
 
         const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
         if (!silkPath) {
@@ -379,24 +301,23 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }
             });
         });
-        return res.flat();
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
@@ -417,7 +338,6 @@ export class NTQQFileApi {
             'NodeIKernelMsgListener/onRichMediaDownloadComplete',
             [{
                 fileModelId: '0',
-                downSourceType: 0,
                 downloadSourceType: 0,
                 triggerType: 1,
                 msgId: msgId,
@@ -436,6 +356,19 @@ export class NTQQFileApi {
         return completeRetData.filePath;
     }
 
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
+        return new Promise((resolve, reject) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
+                if (err) {
+                    reject(new Error(err.message));
+                } else if (!dimensions) {
+                    reject(new Error('获取图片尺寸失败'));
+                } else {
+                    resolve(dimensions);
+                }
+            });
+        });
+    }
 
     async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
         const randomResultId = 100000 + Math.floor(Math.random() * 10000);

src/core/apis/friend.ts

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

src/core/apis/group.ts

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

src/core/apis/msg.ts

@@ -12,7 +12,7 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
-
+    
     async clickInlineKeyboardButton(...params: Parameters<NodeIKernelMsgService['clickInlineKeyboardButton']>) {
         return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
     }
@@ -71,7 +71,6 @@ export class NTQQMsgApi {
     async queryMsgsWithFilterExWithSeq(peer: Peer, msgSeq: string) {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
-            //searchFields: 3,
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
@@ -85,7 +84,6 @@ export class NTQQMsgApi {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
             filterMsgType: [],
-            //searchFields: 3,
             filterSendersUid: SendersUid,
             filterMsgToTime: MsgTime,
             filterMsgFromTime: MsgTime,
@@ -102,7 +100,6 @@ export class NTQQMsgApi {
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: false,
-            //searchFields: 3,
             isIncludeCurrent: true,
             pageLimit: 1,
         });
@@ -113,7 +110,6 @@ export class NTQQMsgApi {
             filterMsgType: [],
             filterSendersUid: [],
             filterMsgToTime: '0',
-            //searchFields: 3,
             filterMsgFromTime: '0',
             isReverseOrder: true,
             isIncludeCurrent: true,
@@ -132,7 +128,6 @@ export class NTQQMsgApi {
             chatInfo: peer,//此处为Peer 为关键查询参数 没有啥也没有 by mlik iowa
             filterMsgType: [],
             filterSendersUid: [],
-            //searchFields: 3,
             filterMsgToTime: filterMsgToTime,
             filterMsgFromTime: filterMsgFromTime,
             isReverseOrder: false,
@@ -147,7 +142,6 @@ export class NTQQMsgApi {
             chatInfo: peer,
             filterMsgType: [],
             filterSendersUid: SendersUid,
-            //searchFields: 3,
             filterMsgToTime: '0',
             filterMsgFromTime: '0',
             isReverseOrder: true,

src/core/apis/user.ts

@@ -90,30 +90,7 @@ export class NTQQUserApi {
             () => true,
             (profile) => profile.uid === uid,
         );
-        return profile;
-    }
-
-    async getUserDetailInfo(uid: string, no_cache: boolean = false): Promise<User> {
-        let profile = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, no_cache ? UserDetailSource.KSERVER : UserDetailSource.KDB), uid);
-        if (profile && profile.uin !== '0' && profile.commonExt) {
-            return {
-                ...profile.simpleInfo.status,
-                ...profile.simpleInfo.vasInfo,
-                ...profile.commonExt,
-                ...profile.simpleInfo.baseInfo,
-                ...profile.simpleInfo.coreInfo,
-                qqLevel: profile.commonExt?.qqLevel,
-                age: profile.simpleInfo.baseInfo.age,
-                pendantId: '',
-                nick: profile.simpleInfo.coreInfo.nick || '',
-            };
-        }
-        this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        profile = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
-        if (profile && profile.uin === '0') {
-            profile.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
-        }
-        return {
+        const RetUser: User = {
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -124,6 +101,33 @@ export class NTQQUserApi {
             pendantId: '',
             nick: profile.simpleInfo.coreInfo.nick || '',
         };
+        return RetUser;
+    }
+
+    async getUserDetailInfo(uid: string): Promise<User> {
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+        if (retUser && retUser.uin !== '0') {
+            return retUser;
+        }
+        this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
+        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (retUser && retUser.uin === '0') {
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return retUser;
+    }
+
+    async getUserDetailInfoV2(uid: string): Promise<User> {
+        const fallback = new Fallback<User>((user) => FallbackUtil.boolchecker(user, user !== undefined && user.uin !== '0'))
+            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KDB))
+            .add(() => this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER));
+        const retUser = await fallback.run().then(async (user) => {
+            if (user && user.uin === '0') {
+                user.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+            }
+            return user;
+        });
+        return retUser;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {

src/core/external/appid.json

@@ -226,73 +226,5 @@
     "9.9.18-33139": {
         "appid": 537273874,
         "qua": "V1_WIN_NQ_9.9.18_33139_GW_B"
-    },
-    "9.9.18-33800": {
-        "appid": 537273974,
-        "qua": "V1_WIN_NQ_9.9.18_33800_GW_B"
-    },
-    "3.2.16-33800": {
-        "appid": 537274009,
-        "qua": "V1_LNX_NQ_3.2.16_33800_GW_B"
-    },
-    "9.9.19-34231": {
-        "appid": 537279209,
-        "qua": "V1_WIN_NQ_9.9.19_34231_GW_B"
-    },
-    "3.2.17-34231": {
-        "appid": 537279245,
-        "qua": "V1_LNX_NQ_3.2.17_34231_GW_B"
-    },
-    "9.9.19-34362": {
-        "appid": 537279260,
-        "qua": "V1_WIN_NQ_9.9.19_34362_GW_B"
-    },
-    "3.2.17-34362": {
-        "appid": 537279296,
-        "qua": "V1_LNX_NQ_3.2.17_34362_GW_B"
-    },
-    "9.9.19-34467": {
-        "appid": 537282256,
-        "qua": "V1_WIN_NQ_9.9.19_34467_GW_B"
-    },
-    "3.2.17-34467": {
-        "appid": 537282292,
-        "qua": "V1_LNX_NQ_3.2.17_34467_GW_B"
-    },
-    "9.9.19-34566": {
-        "appid": 537282307,
-        "qua": "V1_WIN_NQ_9.9.19_34566_GW_B"
-    },
-    "3.2.17-34566": {
-        "appid": 537282343,
-        "qua": "V1_LNX_NQ_3.2.17_34566_GW_B"
-    },
-    "3.2.17-34606": {
-        "appid": 537282343,
-        "qua": "V1_LNX_NQ_3.2.17_34606_GW_B"
-    },
-    "9.9.19-34606": {
-        "appid": 537282307,
-        "qua": "V1_WIN_NQ_9.9.19_34606_GW_B"
-    },
-    "9.9.19-34740": {
-        "appid": 537290691,
-        "qua": "V1_WIN_NQ_9.9.19_34740_GW_B"
-    },
-    "3.2.17-34740": {
-        "appid": 537290727,
-        "qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
-    },
-    "9.9.19-34958": {
-        "appid": 537290742,
-        "qua": "V1_WIN_NQ_9.9.19_34958_GW_B"
-    },
-    "3.2.17-35184": {
-        "appid": 537291084,
-        "qua": "V1_LNX_NQ_3.2.17_35184_GW_B"
-    },
-    "9.9.19-35184": {
-        "appid": 537291048,
-        "qua": "V1_WIN_NQ_9.9.19_35184_GW_B"
     }
 }

src/core/external/offset.json

@@ -302,81 +302,5 @@
     "3.2.16-33139-arm64": {
         "send": "7262BB0",
         "recv": "72664E0"
-    },
-    "9.9.18-33800-x64": {
-        "send": "39F5870",
-        "recv": "39FA070"
-    },
-    "3.2.16-33800-x64": {
-        "send": "A634F60",
-        "recv": "A638980"
-    },
-    "3.2.16-33800-arm64": {
-        "send": "7262BB0",
-        "recv": "72664E0"
-    },
-    "9.9.19-34231-x64": {
-        "send": "3BD73D0",
-        "recv": "3BDBBD0"
-    },
-    "3.2.17-34231-x64": {
-        "send": "AD787E0",
-        "recv": "AD7C200"
-    },
-    "3.2.17-34231-arm64": {
-        "send": "770CDC0",
-        "recv": "77106F0"
-    },
-    "9.9.19-34362-x64": {
-        "send": "3BD80D0",
-        "recv": "3BDC8D0"
-    },
-    "9.9.19-34467-x64": {
-        "send": "3BD8690",
-        "recv": "3BDCE90"
-    },
-    "9.9.19-34566-x64": {
-        "send": "3BDA110",
-        "recv": "3BDE910"
-    },
-    "9.9.19-34606-x64": {
-        "send": "3BDA110",
-        "recv": "3BDE910"
-    },
-    "3.2.17-34606-x64": {
-        "send": "AD7DC60",
-        "recv": "AD81680"
-    },
-    "3.2.17-34606-arm64": {
-        "send": "7711270",
-        "recv": "7714BA0"
-    },
-    "9.9.19-34740-x64": {
-        "send": "3BDD8D0",
-        "recv": "3BE20D0"
-    },
-    "3.2.17-34740-x64": {
-        "send": "ADDF0A0",
-        "recv": "ADE2AC0"
-    },
-    "3.2.17-34740-arm64": {
-        "send": "7753BB8",
-        "recv": "77574E8"
-    },
-    "9.9.19-34958-x64": {
-        "send": "3BDD8D0",
-        "recv": "3BE20D0"
-    },
-    "3.2.17-35184-x64": {
-        "send": "AE0DDE0",
-        "recv": "AE11800"
-    },
-    "3.2.17-35184-arm64": {
-        "send": "7776028",
-        "recv": "7779958"
-    },
-    "9.9.19-35184-x64": {
-        "send": "3BE5A10",
-        "recv": "3BEA210"
     }
 }

src/core/helper/rkey.ts

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

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,75 +3,57 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(_arg: unknown): any {
+    onBuddyListChangedV2(arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(_arg: unknown): any {
+    onAddBuddyNeedVerify(arg: unknown): any {
     }
 
-    onAddMeSettingChanged(_arg: unknown): any {
+    onAddMeSettingChanged(arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(_arg: unknown): any {
+    onAvatarUrlUpdated(arg: unknown): any {
     }
 
-    onBlockChanged(_arg: unknown): any {
+    onBlockChanged(arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(_arg: unknown): any {
+    onBuddyDetailInfoChange(arg: unknown): any {
     }
 
-    onBuddyInfoChange(_arg: unknown): any {
+    onBuddyInfoChange(arg: unknown): any {
     }
 
-    onBuddyListChange(_arg: OnBuddyChangeParams): any {
+    onBuddyListChange(arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(_arg: unknown): any {
+    onBuddyRemarkUpdated(arg: unknown): any {
     }
 
-    onBuddyReqChange(_arg: FriendRequestNotify): any {
+    onBuddyReqChange(arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(_arg: unknown): any {
+    onBuddyReqUnreadCntChange(arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(_arg: unknown): any {
+    onCheckBuddySettingResult(arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(_arg: unknown): any {
-        console.log('onDelBatchBuddyInfos not implemented', ...arguments);
+    onDelBatchBuddyInfos(arg: unknown): any {
     }
 
-    onDoubtBuddyReqChange(_arg:
-        {
-            reqId: string;
-            cookie: string;
-            doubtList: Array<{
-                uid: string;
-                nick: string;
-                age: number,
-                sex: number;
-                commFriendNum: number;
-                reqTime: string;
-                msg: string;
-                source: string;
-                reason: string;
-                groupCode: string;
-                nameMore?: null;
-            }>;
-        }): void | Promise<void> {
+    onDoubtBuddyReqChange(arg: unknown): any {
     }
 
-    onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
+    onDoubtBuddyReqUnreadNumChange(arg: unknown): any {
     }
 
-    onNickUpdated(_arg: unknown): any {
+    onNickUpdated(arg: unknown): any {
     }
 
-    onSmartInfos(_arg: unknown): any {
+    onSmartInfos(arg: unknown): any {
     }
 
-    onSpacePermissionInfos(_arg: unknown): any {
+    onSpacePermissionInfos(arg: unknown): any {
     }
 }

src/core/listeners/NodeIKernelMsgListener.ts

@@ -21,8 +21,7 @@ export interface OnRichMediaDownloadCompleteParams {
     clientMsg: string,
     businessId: number,
     userTotalSpacePerDay: unknown,
-    userUsedSpacePerDay: unknown,
-    chatType: number,
+    userUsedSpacePerDay: unknown
 }
 
 export interface GroupFileInfoUpdateParamType {
@@ -98,112 +97,112 @@ export interface TempOnRecvParams {
 }
 
 export class NodeIKernelMsgListener {
-    onAddSendMsg(_msgRecord: RawMessage): any {
+    onAddSendMsg(msgRecord: RawMessage): any {
 
     }
 
-    onBroadcastHelperDownloadComplete(_broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onBroadcastHelperProgressUpdate(_broadcastHelperTransNotifyInfo: unknown): any {
+    onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): any {
 
     }
 
-    onChannelFreqLimitInfoUpdate(_contact: unknown, _z: unknown, _freqLimitInfo: unknown): any {
+    onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): any {
 
     }
 
-    onContactUnreadCntUpdate(_hashMap: unknown): any {
+    onContactUnreadCntUpdate(hashMap: unknown): any {
 
     }
 
-    onCustomWithdrawConfigUpdate(_customWithdrawConfig: unknown): any {
+    onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): any {
 
     }
 
-    onDraftUpdate(_contact: unknown, _arrayList: unknown, _j2: unknown): any {
+    onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): any {
 
     }
 
-    onEmojiDownloadComplete(_emojiNotifyInfo: unknown): any {
+    onEmojiDownloadComplete(emojiNotifyInfo: unknown): any {
 
     }
 
-    onEmojiResourceUpdate(_emojiResourceInfo: unknown): any {
+    onEmojiResourceUpdate(emojiResourceInfo: unknown): any {
 
     }
 
-    onFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
+    onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFileMsgCome(_arrayList: unknown): any {
+    onFileMsgCome(arrayList: unknown): any {
 
     }
 
-    onFirstViewDirectMsgUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
+    onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onFirstViewGroupGuildMapping(_arrayList: unknown): any {
+    onFirstViewGroupGuildMapping(arrayList: unknown): any {
 
     }
 
-    onGrabPasswordRedBag(_i2: unknown, _str: unknown, _i3: unknown, _recvdOrder: unknown, _msgRecord: unknown): any {
+    onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): any {
 
     }
 
-    onGroupFileInfoAdd(_groupItem: unknown): any {
+    onGroupFileInfoAdd(groupItem: unknown): any {
 
     }
 
-    onGroupFileInfoUpdate(_groupFileListResult: GroupFileInfoUpdateParamType): any {
+    onGroupFileInfoUpdate(groupFileListResult: GroupFileInfoUpdateParamType): any {
 
     }
 
-    onGroupGuildUpdate(_groupGuildNotifyInfo: unknown): any {
+    onGroupGuildUpdate(groupGuildNotifyInfo: unknown): any {
 
     }
 
 
-    onGroupTransferInfoAdd(_groupItem: unknown): any {
+    onGroupTransferInfoAdd(groupItem: unknown): any {
 
     }
 
-    onGroupTransferInfoUpdate(_groupFileListResult: unknown): any {
+    onGroupTransferInfoUpdate(groupFileListResult: unknown): any {
 
     }
 
-    onGuildInteractiveUpdate(_guildInteractiveNotificationItem: unknown): any {
+    onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): any {
 
     }
 
-    onGuildMsgAbFlagChanged(_guildMsgAbFlag: unknown): any {
+    onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): any {
 
     }
 
-    onGuildNotificationAbstractUpdate(_guildNotificationAbstractInfo: unknown): any {
+    onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): any {
 
     }
 
-    onHitCsRelatedEmojiResult(_downloadRelateEmojiResultInfo: unknown): any {
+    onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): any {
 
     }
 
-    onHitEmojiKeywordResult(_hitRelatedEmojiWordsResult: unknown): any {
+    onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): any {
 
     }
 
-    onHitRelatedEmojiResult(_relatedWordEmojiInfo: unknown): any {
+    onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): any {
 
     }
 
-    onImportOldDbProgressUpdate(_importOldDbMsgNotifyInfo: unknown): any {
+    onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): any {
 
     }
 
-    onInputStatusPush(_inputStatusInfo: {
+    onInputStatusPush(inputStatusInfo: {
         chatType: number;
         eventType: number;
         fromUin: string;
@@ -216,55 +215,55 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onKickedOffLine(_kickedInfo: KickedOffLineInfo): any {
+    onKickedOffLine(kickedInfo: KickedOffLineInfo): any {
 
     }
 
-    onLineDev(_arrayList: unknown): any {
+    onLineDev(arrayList: unknown): any {
 
     }
 
-    onLogLevelChanged(_j2: unknown): any {
+    onLogLevelChanged(j2: unknown): any {
 
     }
 
-    onMsgAbstractUpdate(_arrayList: unknown): any {
+    onMsgAbstractUpdate(arrayList: unknown): any {
 
     }
 
-    onMsgBoxChanged(_arrayList: unknown): any {
+    onMsgBoxChanged(arrayList: unknown): any {
 
     }
 
-    onMsgDelete(_contact: unknown, _arrayList: unknown): any {
+    onMsgDelete(contact: unknown, arrayList: unknown): any {
 
     }
 
-    onMsgEventListUpdate(_hashMap: unknown): any {
+    onMsgEventListUpdate(hashMap: unknown): any {
 
     }
 
-    onMsgInfoListAdd(_arrayList: unknown): any {
+    onMsgInfoListAdd(arrayList: unknown): any {
 
     }
 
-    onMsgInfoListUpdate(_msgList: RawMessage[]): any {
+    onMsgInfoListUpdate(msgList: RawMessage[]): any {
 
     }
 
-    onMsgQRCodeStatusChanged(_i2: unknown): any {
+    onMsgQRCodeStatusChanged(i2: unknown): any {
 
     }
 
-    onMsgRecall(_chatType: ChatType, _uid: string, _msgSeq: string): any {
+    onMsgRecall(chatType: ChatType, uid: string, msgSeq: string): any {
 
     }
 
-    onMsgSecurityNotify(_msgRecord: unknown): any {
+    onMsgSecurityNotify(msgRecord: unknown): any {
 
     }
 
-    onMsgSettingUpdate(_msgSetting: unknown): any {
+    onMsgSettingUpdate(msgSetting: unknown): any {
 
     }
 
@@ -280,108 +279,108 @@ export class NodeIKernelMsgListener {
 
     }
 
-    onReadFeedEventUpdate(_firstViewDirectMsgNotifyInfo: unknown): any {
+    onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): any {
 
     }
 
-    onRecvGroupGuildFlag(_i2: unknown): any {
+    onRecvGroupGuildFlag(i2: unknown): any {
 
     }
 
-    onRecvMsg(_arrayList: RawMessage[]): any {
+    onRecvMsg(arrayList: RawMessage[]): any {
 
     }
 
-    onRecvMsgSvrRspTransInfo(_j2: unknown, _contact: unknown, _i2: unknown, _i3: unknown, _str: unknown, _bArr: unknown): any {
+    onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): any {
 
     }
 
-    onRecvOnlineFileMsg(_arrayList: unknown): any {
+    onRecvOnlineFileMsg(arrayList: unknown): any {
 
     }
 
-    onRecvS2CMsg(_arrayList: unknown): any {
+    onRecvS2CMsg(arrayList: unknown): any {
 
     }
 
-    onRecvSysMsg(_arrayList: Array<number>): any {
+    onRecvSysMsg(arrayList: Array<number>): any {
 
     }
 
-    onRecvUDCFlag(_i2: unknown): any {
+    onRecvUDCFlag(i2: unknown): any {
 
     }
 
-    onRichMediaDownloadComplete(_fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
+    onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): any {
     }
 
-    onRichMediaProgerssUpdate(_fileTransNotifyInfo: unknown): any {
+    onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): any {
 
     }
 
-    onRichMediaUploadComplete(_fileTransNotifyInfo: unknown): any {
+    onRichMediaUploadComplete(fileTransNotifyInfo: unknown): any {
 
     }
 
-    onSearchGroupFileInfoUpdate(_searchGroupFileResult: unknown): any {
+    onSearchGroupFileInfoUpdate(searchGroupFileResult: unknown): any {
 
     }
 
-    onSendMsgError(_j2: unknown, _contact: unknown, _i2: unknown, _str: unknown): any {
+    onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): any {
 
     }
 
-    onSysMsgNotification(_i2: unknown, _j2: unknown, _j3: unknown, _arrayList: unknown): any {
+    onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): any {
 
     }
 
-    onTempChatInfoUpdate(_tempChatInfo: TempOnRecvParams): any {
+    onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): any {
 
     }
 
-    onUnreadCntAfterFirstView(_hashMap: unknown): any {
+    onUnreadCntAfterFirstView(hashMap: unknown): any {
 
     }
 
-    onUnreadCntUpdate(_hashMap: unknown): any {
+    onUnreadCntUpdate(hashMap: unknown): any {
 
     }
 
-    onUserChannelTabStatusChanged(_z: unknown): any {
+    onUserChannelTabStatusChanged(z: unknown): any {
 
     }
 
-    onUserOnlineStatusChanged(_z: unknown): any {
+    onUserOnlineStatusChanged(z: unknown): any {
 
     }
 
-    onUserTabStatusChanged(_arrayList: unknown): any {
+    onUserTabStatusChanged(arrayList: unknown): any {
 
     }
 
-    onlineStatusBigIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
+    onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
 
     }
 
-    onlineStatusSmallIconDownloadPush(_i2: unknown, _j2: unknown, _str: unknown): any {
+    onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): any {
 
     }
 
     // 第一次发现于Linux
-    onUserSecQualityChanged(..._args: unknown[]): any {
+    onUserSecQualityChanged(...args: unknown[]): any {
 
     }
 
-    onMsgWithRichLinkInfoUpdate(..._args: unknown[]): any {
+    onMsgWithRichLinkInfoUpdate(...args: unknown[]): any {
 
     }
 
-    onRedTouchChanged(..._args: unknown[]): any {
+    onRedTouchChanged(...args: unknown[]): any {
 
     }
 
     // 第一次发现于Win 9.9.9-23159
-    onBroadcastHelperProgerssUpdate(..._args: unknown[]): any {
+    onBroadcastHelperProgerssUpdate(...args: unknown[]): any {
 
     }
 }

src/core/packet/client/nativeClient.ts

@@ -38,12 +38,12 @@ export class NativePacketClient extends IPacketClient {
         return true;
     }
 
-    async init(_pid: number, recv: string, send: string): Promise<void> {
+    async init(pid: number, recv: string, send: string): Promise<void> {
         const platform = process.platform + '.' + process.arch;
         const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
         process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
-
-        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, _uin: string, cmd: string, seq: number, hex_data: string) => {
+        
+        this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
             const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
             if (type === 0 && this.cb.get(trace_id + 'recv')) {
                 //此时为send 提取seq

src/core/packet/client/wsClient.ts

@@ -0,0 +1,112 @@
+import { IPacketClient, RecvPacket } from '@/core/packet/client/baseClient';
+import { LogStack } from '@/core/packet/context/clientContext';
+import { NapCoreContext } from '@/core/packet/context/napCoreContext';
+import { PacketLogger } from '@/core/packet/context/loggerContext';
+
+export class WsPacketClient extends IPacketClient {
+    private websocket: WebSocket | null = null;
+    private reconnectAttempts: number = 0;
+    private readonly maxReconnectAttempts: number = 60; // 现在暂时不可配置
+    private readonly clientUrl: string;
+    private readonly clientUrlWrap: (url: string) => string = (url: string) => `ws://${url}/ws`;
+
+    private isInitialized: boolean = false;
+    private initPayload: { pid: number, recv: string, send: string } | null = null;
+
+    constructor(napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) {
+        super(napCore, logger, logStack);
+        this.clientUrl = this.napcore.config.packetServer
+            ? this.clientUrlWrap(this.napcore.config.packetServer)
+            : this.clientUrlWrap('127.0.0.1:8083');
+    }
+
+    check(): boolean {
+        if (!this.napcore.config.packetServer) {
+            this.logStack.pushLogWarn('wsPacketClient 未配置服务器地址');
+            return false;
+        }
+        return true;
+    }
+
+    async init(pid: number, recv: string, send: string): Promise<void> {
+        this.initPayload = { pid, recv, send };
+        await this.connectWithRetry();
+    }
+
+    sendCommandImpl(cmd: string, data: string, trace_id: string): void {
+        if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+            this.websocket.send(JSON.stringify({
+                action: 'send',
+                cmd,
+                data,
+                trace_id
+            }));
+        } else {
+            this.logStack.pushLogWarn(`WebSocket 未连接，无法发送命令: ${cmd}`);
+        }
+    }
+
+    private async connectWithRetry(): Promise<void> {
+        while (this.reconnectAttempts < this.maxReconnectAttempts) {
+            try {
+                await this.connect();
+                return;
+            } catch {
+                this.reconnectAttempts++;
+                this.logStack.pushLogWarn(`第 ${this.reconnectAttempts}/${this.maxReconnectAttempts} 次尝试重连失败！`);
+                await this.delay(5000);
+            }
+        }
+        this.logStack.pushLogError(`wsPacketClient 在 ${this.clientUrl} 达到最大重连次数 (${this.maxReconnectAttempts})！`);
+        throw new Error(`无法连接到 WebSocket 服务器：${this.clientUrl}`);
+    }
+
+    private connect(): Promise<void> {
+        return new Promise((resolve, reject) => {
+            this.websocket = new WebSocket(this.clientUrl);
+            this.websocket.onopen = () => {
+                this.available = true;
+                this.reconnectAttempts = 0;
+                this.logger.info(`wsPacketClient 已连接到 ${this.clientUrl}`);
+                if (!this.isInitialized && this.initPayload) {
+                    this.websocket!.send(JSON.stringify({
+                        action: 'init',
+                        ...this.initPayload
+                    }));
+                    this.isInitialized = true;
+                }
+                resolve();
+            };
+            this.websocket.onclose = () => {
+                this.available = false;
+                this.logger.warn('WebSocket 连接关闭，尝试重连...');
+                reject(new Error('WebSocket 连接关闭'));
+            };
+            this.websocket.onmessage = (ev: MessageEvent<any>) => this.handleMessage(ev).catch(err => {
+                this.logger.error(`处理消息时出错: ${err}`);
+            });
+            this.websocket.onerror = (event) => {
+                this.available = false;
+                this.logger.error(`WebSocket 出错: ${event}`);
+                this.websocket?.close();
+                reject(new Error(`WebSocket 出错: ${event}`));
+            };
+        });
+    }
+
+    private delay(ms: number): Promise<void> {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+
+    private async handleMessage(message: MessageEvent): Promise<void> {
+        try {
+            const json: RecvPacket = JSON.parse(message.data.toString());
+            const trace_id_md5 = json.trace_id_md5;
+            const action = json?.type ?? 'init';
+            const event = this.cb.get(`${trace_id_md5}${action}`);
+            if (event) await event(json.data);
+        } catch (error) {
+            this.logger.error(`解析ws消息时出错: ${(error as Error).message}`);
+        }
+    }
+}

src/core/packet/context/clientContext.ts

@@ -1,5 +1,6 @@
 import { IPacketClient } from '@/core/packet/client/baseClient';
 import { NativePacketClient } from '@/core/packet/client/nativeClient';
+import { WsPacketClient } from '@/core/packet/client/wsClient';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { PacketLogger } from '@/core/packet/context/loggerContext';
 import { NapCoreContext } from '@/core/packet/context/napCoreContext';
@@ -9,7 +10,8 @@ type clientPriorityType = {
 }
 
 const clientPriority: clientPriorityType = {
-    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack)
+    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack),
+    1: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new WsPacketClient(napCore, logger, logStack),
 };
 
 export class LogStack {
@@ -86,6 +88,10 @@ export class PacketClientContext {
             this.logger.info('使用指定的 NativePacketClient 作为后端');
             client = new NativePacketClient(this.napCore, this.logger, this.logStack);
             break;
+        case 'frida':
+            this.logger.info('[Core] [Packet] 使用指定的 FridaPacketClient 作为后端');
+            client = new WsPacketClient(this.napCore, this.logger, this.logStack);
+            break;
         case 'auto':
         case undefined:
             client = this.judgeClient();

src/core/packet/context/operationContext.ts

@@ -6,14 +6,13 @@ import {
     PacketMsgFileElement,
     PacketMsgPicElement,
     PacketMsgPttElement,
-    PacketMsgReplyElement,
-    PacketMsgVideoElement,
+    PacketMsgVideoElement
 } from '@/core/packet/message/element';
 import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
 import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
 import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/core/packet/transformer/proto';
+import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
 import { OidbPacket } from '@/core/packet/transformer/base';
 import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
 import { gunzipSync } from 'zlib';
@@ -30,18 +29,13 @@ export class PacketOperationContext {
         return await this.context.client.sendOidbPacket(pkt, rsp);
     }
 
-    async GroupPoke(peer: number, uin: number) {
-        const req = trans.SendPoke.build(true, peer, uin);
+    async GroupPoke(groupUin: number, uin: number) {
+        const req = trans.SendPoke.build(uin, groupUin);
         await this.context.client.sendOidbPacket(req);
     }
 
-    async FriendPoke(peer: number, target?: number) {
-        const req = trans.SendPoke.build(false, peer, target ?? peer);
-        await this.context.client.sendOidbPacket(req);
-    }
-
-    async SendPoke(is_group: boolean, peer: number, target?: number) {
-        const req = trans.SendPoke.build(is_group, peer, target ?? peer);
+    async FriendPoke(uin: number) {
+        const req = trans.SendPoke.build(uin);
         await this.context.client.sendOidbPacket(req);
     }
 
@@ -74,32 +68,30 @@ export class PacketOperationContext {
         }
     }
 
-    async SetGroupSpecialTitle(groupUin: number, uid: string, title: string) {
-        const req = trans.SetSpecialTitle.build(groupUin, uid, title);
+    async SetGroupSpecialTitle(groupUin: number, uid: string, tittle: string) {
+        const req = trans.SetSpecialTitle.build(groupUin, uid, tittle);
         await this.context.client.sendOidbPacket(req);
     }
 
     async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
         const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
         const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
-        const reqList = msg.flatMap((m) =>
-            m.msg
-                .map((e) => {
-                    if (e instanceof PacketMsgPicElement) {
-                        return this.context.highway.uploadImage({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgVideoElement) {
-                        return this.context.highway.uploadVideo({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgPttElement) {
-                        return this.context.highway.uploadPtt({ chatType, peerUid }, e);
-                    } else if (e instanceof PacketMsgFileElement) {
-                        return this.context.highway.uploadFile({ chatType, peerUid }, e);
-                    }
-                    return null;
-                })
-                .filter(Boolean)
+        const reqList = msg.flatMap(m =>
+            m.msg.map(e => {
+                if (e instanceof PacketMsgPicElement) {
+                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgVideoElement) {
+                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgPttElement) {
+                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                } else if (e instanceof PacketMsgFileElement) {
+                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                }
+                return null;
+            }).filter(Boolean)
         );
         const res = await Promise.allSettled(reqList);
-        this.context.logger.info(`上传资源${res.length}个，失败${res.filter((r) => r.status === 'rejected').length}个`);
+        this.context.logger.info(`上传资源${res.length}个，失败${res.filter(r => r.status === 'rejected').length}个`);
         res.forEach((result, index) => {
             if (result.status === 'rejected') {
                 this.context.logger.error(`上传第${index + 1}个资源失败：${result.reason.stack}`);
@@ -108,13 +100,10 @@ export class PacketOperationContext {
     }
 
     async UploadImage(img: PacketMsgPicElement) {
-        await this.context.highway.uploadImage(
-            {
-                chatType: ChatType.KCHATTYPEC2C,
-                peerUid: this.context.napcore.basicInfo.uid,
-            },
-            img
-        );
+        await this.context.highway.uploadImage({
+            chatType: ChatType.KCHATTYPEC2C,
+            peerUid: this.context.napcore.basicInfo.uid
+        }, img);
         const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
         if (!index) {
             throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
@@ -129,20 +118,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetPttUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadPtt.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadPtt.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetVideoUrl(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadVideo.build(selfUid, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadVideo.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
     async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
         const req = trans.DownloadGroupImage.build(groupUin, node);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -150,21 +125,6 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
-    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupPtt.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-    async GetGroupVideoUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
-        const req = trans.DownloadGroupVideo.build(groupUin, node);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.DownloadImage.parse(resp);
-        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
-    }
-
-
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -177,86 +137,29 @@ export class PacketOperationContext {
                     coordinates: item.polygon.coordinates.map((c) => {
                         return {
                             x: c.x,
-                            y: c.y,
+                            y: c.y
                         };
                     }),
                 };
             }),
-            language: res.ocrRspBody.language,
+            language: res.ocrRspBody.language
         } as ImageOcrResult;
     }
 
-    private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
-        const ps = msg.map((m) => {
-            return m.msg.map(async (e) => {
-                if (e instanceof PacketMsgReplyElement && !e.targetElems) {
-                    this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
-                    if (!e.targetPeer?.peerUid) {
-                        this.context.logger.error(`targetPeer is undefined!`);
-                    }
-                    let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
-                    if (e.isGroupReply) {
-                        targetMsg = await this.FetchGroupMessage(+(e.targetPeer?.peerUid ?? 0), e.targetMessageSeq, e.targetMessageSeq);
-                    } else {
-                        targetMsg = await this.FetchC2CMessage(await this.context.napcore.basicInfo.uin2uid(e.targetUin), e.targetMessageSeq, e.targetMessageSeq);
-                    }
-                    e.targetElems = targetMsg.at(0)?.body?.richText?.elems;
-                    e.targetSourceMsg = targetMsg.at(0);
-                }
-            });
-        }).flat();
-        await Promise.all(ps)
-        await this.UploadResources(msg, groupUin);
-    }
-
-    async FetchGroupMessage(groupUin: number, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
-        const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.FetchGroupMessage.parse(resp);
-        return res.body.messages
-    }
-
-    async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
-        const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
-        const resp = await this.context.client.sendOidbPacket(req, true);
-        const res = trans.FetchC2CMessage.parse(resp);
-        return res.messages
-    }
-
     async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
-        await this.SendPreprocess(msg, groupUin);
+        await this.UploadResources(msg, groupUin);
         const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
         const resp = await this.context.client.sendOidbPacket(req, true);
         const res = trans.UploadForwardMsg.parse(resp);
         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);
         const res = trans.DownloadGroupFile.parse(resp);
         return `https://${res.download.downloadDns}/ftn_handler/${Buffer.from(res.download.downloadUrl).toString('hex')}/?fname=`;
     }
-
     async GetPrivateFileUrl(self_id: string, fileUUID: string, md5: string) {
         const req = trans.DownloadPrivateFile.build(self_id, fileUUID, md5);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -264,6 +167,13 @@ export class PacketOperationContext {
         return `http://${res.body?.result?.server}:${res.body?.result?.port}${res.body?.result?.url?.slice(8)}&isthumb=0`;
     }
 
+    async GetGroupPttUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupPtt.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadGroupPtt.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async GetMiniAppAdaptShareInfo(param: MiniAppReqParams) {
         const req = trans.GetMiniAppAdaptShareInfo.build(param);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -279,17 +189,12 @@ export class PacketOperationContext {
         return res.content.map((item) => {
             return {
                 category: item.category,
-                voices: item.voices,
+                voices: item.voices
             };
         });
     }
 
-    async GetAiVoice(
-        groupUin: number,
-        voiceId: string,
-        text: string,
-        chatType: AIVoiceChatType
-    ): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
+    async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
         let reqTime = 0;
         const reqMaxTime = 30;
         const sessionId = crypto.randomBytes(4).readUInt32BE(0);
@@ -317,7 +222,6 @@ export class PacketOperationContext {
         if (!main?.actionData.msgBody) {
             throw new Error('msgBody is empty');
         }
-        this.context.logger.debug('rawChains ', inflate.toString('hex'));
 
         const messagesPromises = main.actionData.msgBody.map(async (msg) => {
             if (!msg?.body?.richText?.elems) {
@@ -333,12 +237,12 @@ export class PacketOperationContext {
                             const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!),
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
                             };
                         } else {
                             element.picElement = {
                                 ...element.picElement,
-                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!),
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
                             };
                         }
                         return element;
@@ -351,7 +255,7 @@ export class PacketOperationContext {
                 elements: elements,
                 guildId: '',
                 isOnlineMsg: false,
-                msgId: '7467703692092974645', // TODO: no necessary
+                msgId: '7467703692092974645',  // TODO: no necessary
                 msgRandom: '0',
                 msgSeq: String(msg.contentHead.sequence ?? 0),
                 msgTime: String(msg.contentHead.timeStamp ?? 0),

src/core/packet/message/builder.ts

@@ -24,15 +24,12 @@ export class PacketMsgBuilder {
             }
             return {
                 responseHead: {
-                    fromUin: node.senderUin,
-                    type: 0,
-                    sigMap: 0,
-                    toUin: 0,
                     fromUid: '',
+                    fromUin: node.senderUin,
+                    toUid: node.groupId ? undefined : selfUid,
                     forward: node.groupId ? undefined : {
                         friendName: node.senderName,
                     },
-                    toUid: node.groupId ? undefined : selfUid,
                     grp: node.groupId ? {
                         groupUin: node.groupId,
                         memberName: node.senderName,
@@ -43,13 +40,16 @@ export class PacketMsgBuilder {
                     type: node.groupId ? 82 : 9,
                     subType: node.groupId ? undefined : 4,
                     divSeq: node.groupId ? undefined : 4,
-                    autoReply: 0,
+                    msgId: crypto.randomBytes(4).readUInt32LE(0),
                     sequence: crypto.randomBytes(4).readUInt32LE(0),
                     timeStamp: +node.time.toString().substring(0, 10),
+                    field7: BigInt(1),
+                    field8: 0,
+                    field9: 0,
                     forward: {
                         field1: 0,
                         field2: 0,
-                        field3: node.groupId ? 1 : 2,
+                        field3: node.groupId ? 0 : 2,
                         unknownBase64: avatar,
                         avatar: avatar
                     }

src/core/packet/message/element.ts

@@ -10,7 +10,6 @@ import {
     MsgInfo,
     NotOnlineImage,
     OidbSvcTrpcTcp0XE37_800Response,
-    PushMsgBody,
     QBigFaceExtra,
     QSmallFaceExtra,
 } from '@/core/packet/transformer/proto';
@@ -30,8 +29,7 @@ import {
     SendReplyElement,
     SendMultiForwardMsgElement,
     SendTextElement,
-    SendVideoElement,
-    Peer
+    SendVideoElement
 } from '@/core';
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
@@ -148,40 +146,41 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
-    time: number;
-    targetMessageId: bigint;
-    targetMessageSeq: number;
-    targetMessageClientSeq: number;
+    messageId: bigint;
+    messageSeq: number;
+    messageClientSeq: number;
     targetUin: number;
     targetUid: string;
-    targetElems?: NapProtoEncodeStructType<typeof Elem>[];
-    targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
-    targetPeer?: Peer;
+    time: number;
+    elems: PacketMsg[];
 
     constructor(element: SendReplyElement) {
         super(element);
-        this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
-        this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
-        this.targetMessageSeq = +(element.replyElement.replayMsgSeq ?? 0);
-        this.targetMessageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
+        this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
+        this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
+        this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
         this.targetUin = +(element.replyElement.senderUin ?? 0);
         this.targetUid = element.replyElement.senderUidStr ?? '';
-        this.targetPeer = element.replyElement._replyMsgPeer;
+        this.time = +(element.replyElement.replyMsgTime ?? 0);
+        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
     }
 
     get isGroupReply(): boolean {
-        return this.targetMessageClientSeq === 0;
+        return this.messageClientSeq === 0;
     }
 
     override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
         return [{
             srcMsg: {
-                origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
+                origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
                 senderUin: BigInt(this.targetUin),
                 time: this.time,
-                elems: this.targetElems ?? [],
-                sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
-                toUin: BigInt(0),
+                elems: [], // TODO: in replyElement.sourceMsgTextElems
+                pbReserve: {
+                    messageId: this.messageId,
+                },
+                toUin: BigInt(this.targetUin),
+                type: 1,
             }
         }];
     }

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

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

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

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

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

@@ -8,18 +8,11 @@ class SendPoke extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
         super();
     }
 
-    build(is_group: boolean, peer: number, target: number): OidbPacket {
-        if (is_group) {
-            const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
-                uin: target,
-                groupUin: peer,
-                ext: 0
-            });
-            return OidbBase.build(0xED3, 1, data);
-        }
+    build(peer: number, group?: number): OidbPacket {
         const data = new NapProtoMsg(proto.OidbSvcTrpcTcp0XED3_1).encode({
-            uin: target,
-            friendUin: peer,
+            uin: peer,
+            groupUin: group,
+            friendUin: group ?? peer,
             ext: 0
         });
         return OidbBase.build(0xED3, 1, data);

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

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

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

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

src/core/packet/transformer/highway/DownloadGroupVideo.ts

@@ -1,50 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadGroupVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 2,
-                    group: {
-                        groupUin: groupUin
-                    }
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11EA, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadGroupVideo();

src/core/packet/transformer/highway/DownloadPtt.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadPtt extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 1,
-                    businessType: 3,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x126D, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadPtt();

src/core/packet/transformer/highway/DownloadVideo.ts

@@ -1,51 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
-import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
-import { IndexNode } from '@/core/packet/transformer/proto';
-
-class DownloadVideo extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
-    constructor() {
-        super();
-    }
-
-    build(selfUid: string, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
-        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
-            reqHead: {
-                common: {
-                    requestId: 1,
-                    command: 200
-                },
-                scene: {
-                    requestType: 2,
-                    businessType: 2,
-                    sceneType: 1,
-                    c2C: {
-                        accountType: 2,
-                        targetUid: selfUid
-                    },
-                },
-                client: {
-                    agentType: 2,
-                }
-            },
-            download: {
-                node: node,
-                download: {
-                    video: {
-                        busiType: 0,
-                        sceneType: 0
-                    }
-                }
-            }
-        });
-        return OidbBase.build(0x11E9, 200, body, true, false);
-    }
-
-    parse(data: Buffer) {
-        const oidbBody = OidbBase.parse(data).body;
-        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
-    }
-}
-
-export default new DownloadVideo();

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

@@ -13,6 +13,3 @@ export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
 export { default as DownloadGroupImage } from './DownloadGroupImage';
-export { default as DownloadVideo } from './DownloadVideo';
-export { default as DownloadGroupVideo } from './DownloadGroupVideo';
-export { default as DownloadPtt } from './DownloadPtt';

src/core/packet/transformer/message/FetchC2CMessage.ts

@@ -1,27 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
-
-class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
-    constructor() {
-        super();
-    }
-
-    build(targetUid: string, startSeq: number, endSeq: number): OidbPacket {
-        const req = new NapProtoMsg(proto.SsoGetC2cMsg).encode({
-            friendUid: targetUid,
-            startSequence: startSeq,
-            endSequence: endSeq,
-        });
-        return {
-            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
-            data: PacketHexStrBuilder(req)
-        };
-    }
-
-    parse(data: Buffer) {
-        return new NapProtoMsg(proto.SsoGetC2cMsgResponse).decode(data);
-    }
-}
-
-export default new FetchC2CMessage();

src/core/packet/transformer/message/FetchGroupMessage.ts

@@ -1,30 +0,0 @@
-import * as proto from '@/core/packet/transformer/proto';
-import { NapProtoMsg } from '@napneko/nap-proto-core';
-import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
-
-class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
-    constructor() {
-        super();
-    }
-
-    build(groupUin: number, startSeq: number, endSeq: number): OidbPacket {
-        const req = new NapProtoMsg(proto.SsoGetGroupMsg).encode({
-            info: {
-                groupUin: groupUin,
-                startSequence: startSeq,
-                endSequence: endSeq
-            },
-            direction: true
-        });
-        return {
-            cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
-            data: PacketHexStrBuilder(req)
-        };
-    }
-
-    parse(data: Buffer) {
-        return new NapProtoMsg(proto.SsoGetGroupMsgResponse).decode(data);
-    }
-}
-
-export default new FetchGroupMessage();

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

@@ -1,4 +1,2 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
-export { default as FetchGroupMessage } from './FetchGroupMessage';
-export { default as FetchC2CMessage } from './FetchC2CMessage';
-export { default as DownloadForwardMsg } from './DownloadForwardMsg';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/oidb/oidbBase.ts

@@ -7,7 +7,7 @@ class OidbBase extends PacketTransformer<typeof proto.OidbSvcTrpcTcpBase> {
         super();
     }
 
-    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, _isLafter: boolean = false): OidbPacket {
+    build(cmd: number, subCmd: number, body: Uint8Array, isUid: boolean = true, isLafter: boolean = false): OidbPacket {
         const data = new NapProtoMsg(proto.OidbSvcTrpcTcpBase).encode({
             command: cmd,
             subCommand: subCmd,

src/core/packet/transformer/proto/message/message.ts

@@ -13,15 +13,13 @@ import {
 export const ContentHead = {
     type: ProtoField(1, ScalarType.UINT32),
     subType: ProtoField(2, ScalarType.UINT32, true),
-    c2cCmd: ProtoField(3, ScalarType.UINT32, true),
-    ranDom: ProtoField(4, ScalarType.UINT32, true),
+    divSeq: ProtoField(3, ScalarType.UINT32, true),
+    msgId: ProtoField(4, ScalarType.UINT32, true),
     sequence: ProtoField(5, ScalarType.UINT32, true),
     timeStamp: ProtoField(6, ScalarType.UINT32, true),
-    pkgNum: ProtoField(7, ScalarType.UINT64, true),
-    pkgIndex: ProtoField(8, ScalarType.UINT32, true),
-    divSeq: ProtoField(9, ScalarType.UINT32, true),
-    autoReply: ProtoField(10, ScalarType.UINT32),
-    ntMsgSeq: ProtoField(10, ScalarType.UINT32, true),
+    field7: ProtoField(7, ScalarType.UINT64, true),
+    field8: ProtoField(8, ScalarType.UINT32, true),
+    field9: ProtoField(9, ScalarType.UINT32, true),
     newId: ProtoField(12, ScalarType.UINT64, true),
     forward: ProtoField(15, () => ForwardHead, true),
 };

src/core/packet/transformer/proto/misc/fileid.ts

@@ -1,6 +0,0 @@
-import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
-
-export const FileId = {
-    appid: ProtoField(4, ScalarType.UINT32, true),
-    ttl: ProtoField(10, ScalarType.UINT32, true),
-};

src/core/services/NodeIKernelBuddyService.ts

@@ -16,7 +16,7 @@ export interface NodeIKernelBuddyService {
 
     getBuddyListFromCache(reqType: BuddyListReqType): Promise<Array<
         {
-            categoryId: number,//9999为特别关心
+            categoryId: number,//9999应该跳过 那是兜底数据吧
             categorySortId: number,//排序方式
             categroyName: string,//分类名
             categroyMbCount: number,//不懂
@@ -106,15 +106,15 @@ export interface NodeIKernelBuddyService {
 
     getAddMeSetting(): unknown;
 
-    getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
+    getDoubtBuddyReq(): unknown;
 
     getDoubtBuddyUnreadNum(): number;
 
-    approvalDoubtBuddyReq(uid: string, str1: string, str2: string): void;
+    approvalDoubtBuddyReq(uid: number, isAgree: boolean): void;
 
     delDoubtBuddyReq(uid: number): void;
 
-    delAllDoubtBuddyReq(): Promise<GeneralCallResult>;
+    delAllDoubtBuddyReq(): void;
 
     reportDoubtBuddyReqUnread(): void;
 

src/core/services/NodeIKernelGroupService.ts

@@ -249,7 +249,7 @@ export interface NodeIKernelGroupService {
 
     reqToJoinGroup(groupCode: string, arg: unknown): void;
 
-    setGroupShutUp(groupCode: string, shutUp: boolean): Promise<GeneralCallResult>;
+    setGroupShutUp(groupCode: string, shutUp: boolean): void;
 
     getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 

src/core/services/NodeIKernelMsgService.ts

@@ -148,11 +148,10 @@ export interface NodeIKernelMsgService {
         msgList: RawMessage[]
     }>;
 
-    // getMsgService/getMsgs { chatType: 2, peerUid: '975206796', privilegeFlag: 336068800 } 0 20 true
-    getMsgs(peer: Peer & { privilegeFlag: number }, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[]
-    }>;
+    //@deprecated
+    getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
+    //@deprecated
     getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[]
     }>;
@@ -426,20 +425,7 @@ export interface NodeIKernelMsgService {
 
     switchToOfflineGetRichMediaElement(...args: unknown[]): unknown;
 
-    downloadRichMedia(args: {
-        fileModelId: string,
-        downSourceType: number,
-        triggerType: number,
-        msgId: string,
-        chatType: number,
-        peerUid: string,
-        elementId: string,
-        thumbSize: number,
-        downloadType: number,
-        filePath: string
-    } & {
-        downloadSourceType: number, //33800左右一下的老版本 新版34606已经完全上面格式
-    }): unknown;
+    downloadRichMedia(...args: unknown[]): unknown;
 
     getFirstUnreadMsgSeq(args: {
         peerUid: string

src/core/services/NodeIKernelProfileService.ts

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

src/core/services/NodeIKernelRichMediaService.ts

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

src/core/types/element.ts

@@ -1,15 +1,4 @@
-import {
-    ElementType,
-    MessageElement,
-    NTGrayTipElementSubTypeV2,
-    PicSubType,
-    PicType,
-    TipAioOpGrayTipElement,
-    TipGroupElement,
-    NTVideoType,
-    FaceType,
-    Peer
-} from './msg';
+import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg';
 
 type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
 
@@ -224,9 +213,6 @@ export interface ReplyElement {
     senderUidStr?: string;
     replyMsgTime?: string;
     replyMsgClientSeq?: string;
-    // HACK: Attributes that were not originally available,
-    // but were added due to NTQQ and NapCat's internal implementation, are used to supplement NapCat
-    _replyMsgPeer?: Peer;
 }
 
 export interface CalendarElement {

src/core/types/msg.ts

@@ -403,7 +403,7 @@ export interface NTGroupGrayMember {
 }
 /**
  * 群灰色提示邀请者和被邀请者接口
- *
+ * 
  * */
 export interface NTGroupGrayInviterAndInvite {
     invited: NTGroupGrayMember;
@@ -501,15 +501,13 @@ export interface RawMessage {
     elements: MessageElement[];// 消息元素
     sourceType: MsgSourceType;// 消息来源类型
     isOnlineMsg: boolean;// 是否为在线消息
-    clientSeq?: string;
 }
 
 /**
  * 查询消息参数接口
  */
 export interface QueryMsgsParams {
-    chatInfo: Peer & { privilegeFlag?: number };
-    //searchFields: number;
+    chatInfo: Peer;
     filterMsgType: Array<{ type: NTMsgType, subType: Array<number> }>;
     filterSendersUid: string[];
     filterMsgFromTime: string;
@@ -567,4 +565,4 @@ export enum FaceType {
     AniSticke = 3,  // 动画贴纸
     Lottie = 4,// 新格式表情
     Poke = 5  // 可变Poke
-}
+}

src/core/types/notify.ts

@@ -132,26 +132,18 @@ export enum BuddyReqType {
     KMEINITIATORWAITPEERCONFIRM = 13
 }
 
-// 其中 ? 代表新版本参数
 export interface FriendRequest {
+    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
     reqTime: string;  // 时间戳 秒
-    flag?: number;  // 0
-    preGroupingId?: number;  // 0
-    commFriendNum?: number;  // 共同好友数
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
-    isDoubt?: boolean;  // 是否是可疑的好友请求
-    nameMore?: string;
     friendNick: string;
     sourceId: number;
-    groupCode: string;
-    isBuddy?: boolean;
-    isAgreed?: boolean;
-    relation?: number;
+    groupCode: string
 }
 
 export interface FriendRequestNotify {

src/core/types/user.ts

@@ -207,7 +207,6 @@ interface PhotoWall {
 
 // 简单信息
 export interface SimpleInfo {
-    qqLevel?: QQLevel;//临时添加
     uid?: string;
     uin?: string;
     coreInfo: CoreInfo;

src/core/types/webapi.ts

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

src/framework/napcat.ts

@@ -7,15 +7,11 @@ import { SelfInfo } from '@/core/types';
 import { NodeIKernelLoginListener } from '@/core/listeners';
 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() {
-    const WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
-    return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + WebUiConfigData.token;
+    return 'http://127.0.0.1:' + 6099 + '/webui/?token=napcat';
 }
 
 export async function NCoreInitFramework(
@@ -38,15 +34,6 @@ 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();
@@ -69,8 +56,6 @@ export async function NCoreInitFramework(
     const loaderObject = new NapCatFramework(wrapper, session, logger, loginService, selfInfo, basicInfoWrapper, pathWrapper);
     await loaderObject.core.initCore();
 
-    //启动WebUi
-    InitWebUi(logger, pathWrapper).then().catch(e => logger.logError(e));
     //初始化LLNC的Onebot实现
     await new NapCatOneBot11Adapter(loaderObject.core, loaderObject.context, pathWrapper).InitOneBot();
 }

src/image-size/index.ts

@@ -1,426 +0,0 @@
-import * as fs from 'fs';
-import { ReadStream } from 'fs';
-
-export interface ImageSize {
-    width: number;
-    height: number;
-}
-
-export enum ImageType {
-    JPEG = 'jpeg',
-    PNG = 'png',
-    BMP = 'bmp',
-    GIF = 'gif',
-    WEBP = 'webp',
-    UNKNOWN = 'unknown',
-}
-
-interface ImageParser {
-    readonly type: ImageType;
-    canParse(buffer: Buffer): boolean;
-    parseSize(stream: ReadStream): Promise<ImageSize | undefined>;
-}
-
-// 魔术匹配
-function matchMagic(buffer: Buffer, magic: number[], offset = 0): boolean {
-    if (buffer.length < offset + magic.length) {
-        return false;
-    }
-
-    for (let i = 0; i < magic.length; i++) {
-        if (buffer[offset + i] !== magic[i]) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// PNG解析器
-class PngParser implements ImageParser {
-    readonly type = ImageType.PNG;
-    // PNG 魔术头：89 50 4E 47 0D 0A 1A 0A
-    private readonly PNG_SIGNATURE = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.PNG_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(24) as Buffer;
-                if (!buf || buf.length < 24) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32BE(16);
-                    const height = buf.readUInt32BE(20);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// JPEG解析器
-class JpegParser implements ImageParser {
-    readonly type = ImageType.JPEG;
-    // JPEG 魔术头：FF D8
-    private readonly JPEG_SIGNATURE = [0xFF, 0xD8];
-
-    // JPEG标记常量
-    private readonly SOF_MARKERS = {
-        SOF0: 0xC0, // 基线DCT
-        SOF1: 0xC1, // 扩展顺序DCT
-        SOF2: 0xC2, // 渐进式DCT
-        SOF3: 0xC3, // 无损
-    } as const;
-
-    // 非SOF标记
-    private readonly NON_SOF_MARKERS: number[] = [
-        0xC4, // DHT
-        0xC8, // JPEG扩展
-        0xCC, // DAC
-    ] as const;
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.JPEG_SIGNATURE);
-    }
-
-    isSOFMarker(marker: number): boolean {
-        return (
-            marker === this.SOF_MARKERS.SOF0 ||
-            marker === this.SOF_MARKERS.SOF1 ||
-            marker === this.SOF_MARKERS.SOF2 ||
-            marker === this.SOF_MARKERS.SOF3
-        );
-    }
-
-    isNonSOFMarker(marker: number): boolean {
-        return this.NON_SOF_MARKERS.includes(marker);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise<ImageSize | undefined>((resolve, reject) => {
-            const BUFFER_SIZE = 1024; // 读取块大小，可以根据需要调整
-            let buffer = Buffer.alloc(0);
-            let offset = 0;
-            let found = false;
-
-            // 处理错误
-            stream.on('error', (err) => {
-                stream.destroy();
-                reject(err);
-            });
-
-            // 处理数据块
-            stream.on('data', (chunk: Buffer | string) => {
-                // 追加新数据到缓冲区
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer.subarray(offset), chunkBuffer]);
-                offset = 0;
-
-                // 保持缓冲区在合理大小内，只保留最后的部分用于跨块匹配
-                const bufferSize = buffer.length;
-                const MIN_REQUIRED_BYTES = 10; // SOF段最低字节数
-
-                // 从JPEG头部后开始扫描
-                while (offset < bufferSize - MIN_REQUIRED_BYTES) {
-                    // 寻找FF标记
-                    if (buffer[offset] === 0xFF && buffer[offset + 1]! >= 0xC0 && buffer[offset + 1]! <= 0xCF) {
-                        const marker = buffer[offset + 1];
-                        if (!marker) {
-                            break;
-                        }
-                        // 跳过非SOF标记
-                        if (this.isNonSOFMarker(marker)) {
-                            offset += 2;
-                            continue;
-                        }
-
-                        // 处理SOF标记 (包含尺寸信息)
-                        if (this.isSOFMarker(marker)) {
-                            // 确保缓冲区中有足够数据读取尺寸
-                            if (offset + 9 < bufferSize) {
-                                // 解析尺寸: FF XX YY YY PP HH HH WW WW ...
-                                // XX = 标记, YY YY = 段长度, PP = 精度, HH HH = 高, WW WW = 宽
-                                const height = buffer.readUInt16BE(offset + 5);
-                                const width = buffer.readUInt16BE(offset + 7);
-
-                                found = true;
-                                stream.destroy();
-                                resolve({ width, height });
-                                return;
-                            } else {
-                                // 如果缓冲区内数据不够，保留当前位置等待更多数据
-                                break;
-                            }
-                        }
-                    }
-
-                    offset++;
-                }
-
-                // 缓冲区管理: 如果处理了许多数据但没找到标记，
-                // 保留最后N字节用于跨块匹配，丢弃之前的数据
-                if (offset > BUFFER_SIZE) {
-                    const KEEP_BYTES = 20; // 保留足够数据以处理跨块边界的情况
-                    if (offset > KEEP_BYTES) {
-                        buffer = buffer.subarray(offset - KEEP_BYTES);
-                        offset = KEEP_BYTES;
-                    }
-                }
-            });
-
-            // 处理流结束
-            stream.on('end', () => {
-                if (!found) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// BMP解析器
-class BmpParser implements ImageParser {
-    readonly type = ImageType.BMP;
-    // BMP 魔术头：42 4D (BM)
-    private readonly BMP_SIGNATURE = [0x42, 0x4D];
-
-    canParse(buffer: Buffer): boolean {
-        return matchMagic(buffer, this.BMP_SIGNATURE);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(26) as Buffer;
-                if (!buf || buf.length < 26) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt32LE(18);
-                    const height = buf.readUInt32LE(22);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// GIF解析器
-class GifParser implements ImageParser {
-    readonly type = ImageType.GIF;
-    // GIF87a 魔术头：47 49 46 38 37 61
-    private readonly GIF87A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x37, 0x61];
-    // GIF89a 魔术头：47 49 46 38 39 61
-    private readonly GIF89A_SIGNATURE = [0x47, 0x49, 0x46, 0x38, 0x39, 0x61];
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            matchMagic(buffer, this.GIF87A_SIGNATURE) ||
-            matchMagic(buffer, this.GIF89A_SIGNATURE)
-        );
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            stream.once('error', reject);
-            stream.once('readable', () => {
-                const buf = stream.read(10) as Buffer;
-                if (!buf || buf.length < 10) {
-                    return resolve(undefined);
-                }
-                if (this.canParse(buf)) {
-                    const width = buf.readUInt16LE(6);
-                    const height = buf.readUInt16LE(8);
-                    resolve({ width, height });
-                } else {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-// WEBP解析器 - 完整支持VP8, VP8L, VP8X格式
-class WebpParser implements ImageParser {
-    readonly type = ImageType.WEBP;
-    // WEBP RIFF 头：52 49 46 46 (RIFF)
-    private readonly RIFF_SIGNATURE = [0x52, 0x49, 0x46, 0x46];
-    // WEBP 魔术头：57 45 42 50 (WEBP)
-    private readonly WEBP_SIGNATURE = [0x57, 0x45, 0x42, 0x50];
-
-    // WEBP 块头
-    private readonly CHUNK_VP8 = [0x56, 0x50, 0x38, 0x20];  // "VP8 "
-    private readonly CHUNK_VP8L = [0x56, 0x50, 0x38, 0x4C]; // "VP8L"
-    private readonly CHUNK_VP8X = [0x56, 0x50, 0x38, 0x58]; // "VP8X"
-
-    canParse(buffer: Buffer): boolean {
-        return (
-            buffer.length >= 12 &&
-            matchMagic(buffer, this.RIFF_SIGNATURE, 0) &&
-            matchMagic(buffer, this.WEBP_SIGNATURE, 8)
-        );
-    }
-
-    isChunkType(buffer: Buffer, offset: number, chunkType: number[]): boolean {
-        return buffer.length >= offset + 4 && matchMagic(buffer, chunkType, offset);
-    }
-
-    async parseSize(stream: ReadStream): Promise<ImageSize | undefined> {
-        return new Promise((resolve, reject) => {
-            // 需要读取足够的字节来检测所有三种格式
-            const MAX_HEADER_SIZE = 32;
-            let totalBytes = 0;
-            let buffer = Buffer.alloc(0);
-
-            stream.on('error', reject);
-
-            stream.on('data', (chunk: Buffer | string) => {
-                const chunkBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-                buffer = Buffer.concat([buffer, chunkBuffer]);
-                totalBytes += chunk.length;
-
-                // 检查是否有足够的字节进行格式检测
-                if (totalBytes >= MAX_HEADER_SIZE) {
-                    stream.destroy();
-
-                    // 检查基本的WEBP签名
-                    if (!this.canParse(buffer)) {
-                        return resolve(undefined);
-                    }
-
-                    // 检查chunk头部，位于字节12-15
-                    if (this.isChunkType(buffer, 12, this.CHUNK_VP8)) {
-                        // VP8格式 - 标准WebP
-                        // 宽度和高度在帧头中
-                        const width = buffer.readUInt16LE(26) & 0x3FFF;
-                        const height = buffer.readUInt16LE(28) & 0x3FFF;
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8L)) {
-                        // VP8L格式 - 无损WebP
-                        // 1字节标记后是14位宽度和14位高度
-                        const bits = buffer.readUInt32LE(21);
-                        const width = 1 + (bits & 0x3FFF);
-                        const height = 1 + ((bits >> 14) & 0x3FFF);
-                        return resolve({ width, height });
-
-                    } else if (this.isChunkType(buffer, 12, this.CHUNK_VP8X)) {
-                        // VP8X格式 - 扩展WebP
-                        // 24位宽度和高度(减去1)
-                        if (!buffer[24] || !buffer[25] || !buffer[26] || !buffer[27] || !buffer[28] || !buffer[29]) {
-                            return resolve(undefined);
-                        }
-                        const width = 1 + ((buffer[24] | (buffer[25] << 8) | (buffer[26] << 16)) & 0xFFFFFF);
-                        const height = 1 + ((buffer[27] | (buffer[28] << 8) | (buffer[29] << 16)) & 0xFFFFFF);
-                        return resolve({ width, height });
-                    } else {
-                        // 未知的WebP子格式
-                        return resolve(undefined);
-                    }
-                }
-            });
-
-            stream.on('end', () => {
-                // 如果没有读到足够的字节
-                if (totalBytes < MAX_HEADER_SIZE) {
-                    resolve(undefined);
-                }
-            });
-        });
-    }
-}
-
-const parsers: ReadonlyArray<ImageParser> = [
-    new PngParser(),
-    new JpegParser(),
-    new BmpParser(),
-    new GifParser(),
-    new WebpParser(),
-];
-
-export async function detectImageType(filePath: string): Promise<ImageType> {
-    return new Promise((resolve, reject) => {
-        const stream = fs.createReadStream(filePath, {
-            highWaterMark: 64, // 优化读取buffer大小
-            start: 0,
-            end: 63
-        });
-
-        let buffer: Buffer | null = null;
-
-        stream.once('error', (err) => {
-            stream.destroy();
-            reject(err);
-        });
-
-        stream.once('readable', () => {
-            buffer = stream.read(64) as Buffer;
-            stream.destroy();
-
-            if (!buffer) {
-                return resolve(ImageType.UNKNOWN);
-            }
-
-            for (const parser of parsers) {
-                if (parser.canParse(buffer)) {
-                    return resolve(parser.type);
-                }
-            }
-
-            resolve(ImageType.UNKNOWN);
-        });
-
-        stream.once('end', () => {
-            if (!buffer) {
-                resolve(ImageType.UNKNOWN);
-            }
-        });
-    });
-}
-
-export async function imageSizeFromFile(filePath: string): Promise<ImageSize | undefined> {
-    try {
-        // 先检测类型
-        const type = await detectImageType(filePath);
-        const parser = parsers.find(p => p.type === type);
-        if (!parser) {
-            return undefined;
-        }
-
-        // 用流式方式解析尺寸
-        const stream = fs.createReadStream(filePath);
-        try {
-            return await parser.parseSize(stream);
-        } catch (err) {
-            console.error(`解析图片尺寸出错: ${err}`);
-            return undefined;
-        } finally {
-            if (!stream.destroyed) {
-                stream.destroy();
-            }
-        }
-    } catch (err) {
-        console.error(`检测图片类型出错: ${err}`);
-        return undefined;
-    }
-}
-
-export async function imageSizeFallBack(
-    filePath: string,
-    fallback: ImageSize = {
-        width: 1024,
-        height: 1024,
-    }
-): Promise<ImageSize> {
-    return await imageSizeFromFile(filePath) ?? fallback;
-}

src/onebot/action/OneBotAction.ts

@@ -3,7 +3,6 @@ import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
 import { NetworkAdapterConfig } from '../config/config';
-import { TSchema } from '@sinclair/typebox';
 
 export class OB11Response {
     private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: unknown = null): OB11Return<T> {
@@ -34,7 +33,7 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
     actionName: typeof ActionName[keyof typeof ActionName] = ActionName.Unknown;
     core: NapCatCore;
     private validate?: ValidateFunction<unknown> = undefined;
-    payloadSchema?: TSchema = undefined;
+    payloadSchema?: unknown = undefined;
     obContext: NapCatOneBot11Adapter;
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
@@ -44,7 +43,7 @@ export abstract class OneBotAction<PayloadType, ReturnDataType> {
 
     protected async check(payload: PayloadType): Promise<BaseCheckResult> {
         if (this.payloadSchema) {
-            this.validate = new Ajv({ allowUnionTypes: true, useDefaults: true, coerceTypes: true }).compile(this.payloadSchema);
+            this.validate = new Ajv({ allowUnionTypes: true, useDefaults: true }).compile(this.payloadSchema);
         }
         if (this.validate && !this.validate(payload)) {
             const errors = this.validate.errors as ErrorObject[];

src/onebot/action/extends/MoveGroupFile.ts

@@ -1,33 +0,0 @@
-import { ActionName } from '@/onebot/action/router';
-import { FileNapCatOneBotUUID } from '@/common/file-uuid';
-import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
-import { 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

@@ -1,33 +0,0 @@
-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/SetSpecialTittle.ts

@@ -10,8 +10,8 @@ const SchemaData = Type.Object({
 
 type Payload = Static<typeof SchemaData>;
 
-export class SetSpecialTitle extends GetPacketStatusDepends<Payload, void> {
-    override actionName = ActionName.SetSpecialTitle;
+export class SetSpecialTittle extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.SetSpecialTittle;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {

src/onebot/action/extends/TransGroupFile.ts

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

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

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

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

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

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

@@ -7,7 +7,6 @@ import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
     user_id: Type.Union([Type.Number(), Type.String()]),
-    no_cache: Type.Union([Type.Boolean(), Type.String()], { default: false }),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -17,11 +16,10 @@ export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11U
     override payloadSchema = SchemaData;
     async _handle(payload: Payload) {
         const user_id = payload.user_id.toString();
-        const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
         let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id));
         if (!uid) uid = extendData.detail.uid;
-        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid, isNocache));
+        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid));
         return {
             ...extendData.detail.simpleInfo.coreInfo,
             ...extendData.detail.commonExt ?? {},

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

@@ -3,7 +3,7 @@ import { ActionName } from '@/onebot/action/router';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    model: Type.Optional(Type.String()),
+    model: Type.String(),
 });
 
 type Payload = Static<typeof SchemaData>;

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

@@ -1,4 +1,4 @@
-import { ContextMode, normalize, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { normalize, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { OB11PostSendMsg } from '@/onebot/types';
 import { ActionName } from '@/onebot/action/router';
 
@@ -19,14 +19,8 @@ export class GoCQHTTPSendForwardMsg extends GoCQHTTPSendForwardMsgBase {
 }
 export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsgBase {
     override actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Private);
-    }
 }
 
 export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsgBase {
     override actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Group);
-    }
 }

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

@@ -38,7 +38,6 @@ export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null>
             deleteAfterSentFiles: []
         };
         const sendFileEle = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name, payload.folder ?? payload.folder_id);
-        msgContext.deleteAfterSentFiles.push(downloadResult.path);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, [sendFileEle], msgContext.deleteAfterSentFiles);
         return null;
     }

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

@@ -23,7 +23,7 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
         if (payload.user_id) {
             const peerUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
             if (!peerUid) {
-                throw new Error(`私聊${payload.user_id}不存在`);
+                throw new Error( `私聊${payload.user_id}不存在`);
             }
             const isBuddy = await this.core.apis.FriendApi.isBuddy(peerUid);
             return { chatType: isBuddy ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid };
@@ -48,7 +48,6 @@ export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, nul
             deleteAfterSentFiles: []
         };
         const sendFileEle: SendFileElement = await this.core.apis.FileApi.createValidSendFileElement(msgContext, downloadResult.path, payload.name);
-        msgContext.deleteAfterSentFiles.push(downloadResult.path);
         await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(await this.getPeer(payload), [sendFileEle], msgContext.deleteAfterSentFiles);
         return null;
     }

src/onebot/action/group/GetGroupInfo.ts

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

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -32,7 +32,7 @@ class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
 
         const [member, info] = await Promise.all([
             this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, isNocache),
-            this.core.apis.UserApi.getUserDetailInfo(uid, isNocache),
+            this.core.apis.UserApi.getUserDetailInfo(uid),
         ]);
 
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);

src/onebot/action/group/GroupPoke.ts

@@ -0,0 +1,19 @@
+import { ActionName } from '@/onebot/action/router';
+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()]),
+    user_id: Type.Union([Type.Number(), Type.String()]),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class GroupPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.GroupPoke;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+    }
+}

src/onebot/action/group/SendGroupMsg.ts

@@ -1,19 +1,17 @@
-import { ContextMode, ReturnDataType, SendMsgBase } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, SendMsgBase } from '@/onebot/action/msg/SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendGroupMsg extends SendMsgBase {
     override actionName = ActionName.SendGroupMsg;
+    override contextMode: ContextMode = ContextMode.Group;
 
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         delete payload.user_id;
         payload.message_type = 'group';
         return super.check(payload);
     }
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Group);
-    }
 }
 
 export default SendGroupMsg;

src/onebot/action/group/SetGroupWholeBan.ts

@@ -15,10 +15,7 @@ export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const enable = payload.enable?.toString() !== 'false';
-        let res = await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
-        if (res.result !== 0) {
-            throw new Error(`SetGroupWholeBan failed: ${res.errMsg} ${res.result}`);
-        }
+        await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
         return null;
     }
 }

src/onebot/action/index.ts

@@ -78,13 +78,15 @@ import { GetGroupFileSystemInfo } from '@/onebot/action/go-cqhttp/GetGroupFileSy
 import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
 import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
 import { GetGroupSystemMsg } from './system/GetSystemMsg';
+import { GroupPoke } from './group/GroupPoke';
 import { GetUserStatus } from './extends/GetUserStatus';
 import { GetRkey } from './extends/GetRkey';
-import { SetSpecialTitle } from './extends/SetSpecialTitle';
+import { SetSpecialTittle } from './extends/SetSpecialTittle';
 import { GetGroupShutList } from './group/GetGroupShutList';
 import { GetGroupMemberList } from './group/GetGroupMemberList';
 import { GetGroupFileUrl } from '@/onebot/action/file/GetGroupFileUrl';
 import { GetPacketStatus } from '@/onebot/action/packet/GetPacketStatus';
+import { FriendPoke } from '@/onebot/action/user/FriendPoke';
 import { GetCredentials } from './system/GetCredentials';
 import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign';
 import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain';
@@ -100,31 +102,17 @@ import { GetGuildList } from './guild/GetGuildList';
 import { GetGuildProfile } from './guild/GetGuildProfile';
 import { GetClientkey } from './extends/GetClientkey';
 import { SendPacket } from './extends/SendPacket';
-import { FriendPoke, GroupPoke, SendPoke } from '@/onebot/action/packet/SendPoke';
+import { SendPoke } from '@/onebot/action/packet/SendPoke';
 import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
 import { BotExit } from './extends/BotExit';
 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';
-import SetFriendRemark from './user/SetFriendRemark';
-import { SetDoubtFriendsAddRequest } from './new/SetDoubtFriendsAddRequest';
-import { GetDoubtFriendsAddRequest } from './new/GetDoubtFriendsAddRequest';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
-        new SetDoubtFriendsAddRequest(obContext, core),
-        new GetDoubtFriendsAddRequest(obContext, core),
-        new SetFriendRemark(obContext, core),
-        new GetRkeyEx(obContext, core),
-        new GetRkeyServer(obContext, core),
         new SetGroupRemark(obContext, core),
         new GetGroupInfoEx(obContext, core),
         new FetchEmojiLike(obContext, core),
@@ -144,9 +132,6 @@ 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),
@@ -230,7 +215,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new FriendPoke(obContext, core),
         new GetUserStatus(obContext, core),
         new GetRkey(obContext, core),
-        new SetSpecialTitle(obContext, core),
+        new SetSpecialTittle(obContext, core),
         new SetDiyOnlineStatus(obContext, core),
         // new UploadForwardMsg(obContext, core),
         new GetGroupShutList(obContext, core),
@@ -246,7 +231,6 @@ 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

@@ -38,7 +38,7 @@ export function normalize(message: OB11MessageMixType, autoEscape = false): OB11
 
 export async function createContext(core: NapCatCore, payload: OB11PostContext | undefined, contextMode: ContextMode = ContextMode.Normal): Promise<Peer> {
     if (!payload) {
-        throw new Error('请传递请求内容');
+        throw new Error('请指定 group_id 或 user_id');
     }
     if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) {
         return {
@@ -48,16 +48,7 @@ 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) {
-            if (payload.group_id) {
-                return {
-                    chatType: ChatType.KCHATTYPEGROUP,
-                    peerUid: payload.group_id.toString(),
-                    guildId: ''
-                }
-            }
-            throw new Error('无法获取用户信息');
-        }
+        if (!Uid) throw new Error('无法获取用户信息');
         const isBuddy = await core.apis.FriendApi.isBuddy(Uid);
         if (!isBuddy) {
             const ret = await core.apis.MsgApi.getTempChatInfo(ChatType.KCHATTYPETEMPC2CFROMGROUP, Uid);
@@ -87,13 +78,7 @@ export async function createContext(core: NapCatCore, payload: OB11PostContext |
             guildId: '',
         };
     }
-    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');
+    throw new Error('请指定 group_id 或 user_id');
 }
 
 function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
@@ -104,6 +89,8 @@ function getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType
 }
 
 export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
+    contextMode = ContextMode.Normal;
+
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         const messages = normalize(payload.message);
         const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node);
@@ -115,13 +102,12 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         }
         return { valid: true };
     }
+
     async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload);
-    }
-    async base_handle(payload: OB11PostSendMsg, contextMode: ContextMode = ContextMode.Normal): Promise<ReturnDataType> {
-        if (payload.message_type === 'group') contextMode = ContextMode.Group;
-        if (payload.message_type === 'private') contextMode = ContextMode.Private;
-        const peer = await createContext(this.core, payload, contextMode);
+        this.contextMode = ContextMode.Normal;
+        if (payload.message_type === 'group') this.contextMode = ContextMode.Group;
+        if (payload.message_type === 'private') this.contextMode = ContextMode.Private;
+        const peer = await createContext(this.core, payload, this.contextMode);
 
         const messages = normalize(
             payload.message,
@@ -173,11 +159,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         nickname: string,
     }, dp: number = 0): Promise<{
         finallySendElements: SendArkElement,
-        res_id?: string,
-        deleteAfterSentFiles: string[],
+        res_id?: string
     } | null> {
         const packetMsg: PacketMsg[] = [];
-        let delFiles: string[] = [];
         for (const node of messageNodes) {
             if (dp >= 3) {
                 this.core.context.logger.logWarn('转发消息深度超过3层，将停止解析！');
@@ -193,11 +177,9 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                         nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? 'QQ用户',
                     }, dp + 1);
                     sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
-                    delFiles.push(...(uploadReturnData?.deleteAfterSentFiles || []));
                 } else {
                     const sendElementsCreateReturn = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer);
                     sendElements = sendElementsCreateReturn.sendElements;
-                    delFiles.push(...sendElementsCreateReturn.deleteAfterSentFiles);
                 }
 
                 const packetMsgElements: rawMsgWithSendMsg = {
@@ -221,8 +203,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
                 const msg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsg.Peer, [nodeMsg.MsgId])).msgList[0];
                 this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 开始转换 ${stringifyWithBigInt(msg)}`);
                 if (msg) {
-                    let msgCache = await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
-                    delFiles.push(...msgCache);
+                    await this.core.apis.FileApi.downloadRawMsgMedia([msg]);
                     const transformedMsg = this.core.apis.PacketApi.pkt.msgConverter.rawMsgToPacketMsg(msg, msgPeer);
                     this.core.context.logger.logDebug(`handleForwardedNodesPacket[PureRaw] 转换为 ${stringifyWithBigInt(transformedMsg)}`);
                     packetMsg.push(transformedMsg);
@@ -238,7 +219,6 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const resid = await this.core.apis.PacketApi.pkt.operation.UploadForwardMsg(packetMsg, msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : 0);
         const forwardJson = ForwardMsgBuilder.fromPacketMsg(resid, packetMsg, source, news, summary, prompt);
         return {
-            deleteAfterSentFiles: delFiles,
             finallySendElements: {
                 elementType: ElementType.ARK,
                 elementId: '',
@@ -260,7 +240,7 @@ export class SendMsgBase extends OneBotAction<OB11PostSendMsg, ReturnDataType> {
         const res_id = uploadReturnData?.res_id;
         const finallySendElements = uploadReturnData?.finallySendElements;
         if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
-        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], uploadReturnData.deleteAfterSentFiles || []).catch(() => undefined);
+        const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], []).catch(() => undefined);
         return { message: returnMsg ?? null, res_id: res_id! };
     }
 

src/onebot/action/msg/SendPrivateMsg.ts

@@ -1,18 +1,16 @@
-import { ContextMode, ReturnDataType, SendMsgBase } from './SendMsg';
+import { ContextMode, SendMsgBase } from './SendMsg';
 import { ActionName, BaseCheckResult } from '@/onebot/action/router';
 import { OB11PostSendMsg } from '@/onebot/types';
 
 // 未检测参数
 class SendPrivateMsg extends SendMsgBase {
     override actionName = ActionName.SendPrivateMsg;
+    override contextMode: ContextMode = ContextMode.Private;
 
     protected override async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         payload.message_type = 'private';
         return super.check(payload);
     }
-    override async _handle(payload: OB11PostSendMsg): Promise<ReturnDataType> {
-        return this.base_handle(payload, ContextMode.Private);
-    }
 }
 
 export default SendPrivateMsg;

src/onebot/action/new/GetDoubtFriendsAddRequest.ts

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

src/onebot/action/new/SetDoubtFriendsAddRequest.ts

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

src/onebot/action/packet/GetRkeyEx.ts

@@ -1,18 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/packet/SendPoke.ts

@@ -3,33 +3,21 @@ import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
 import { Static, Type } from '@sinclair/typebox';
 
 const SchemaData = Type.Object({
-    group_id: Type.Optional(Type.String()),
-    user_id: Type.Optional(Type.String()),
-    target_id: Type.Optional(Type.String()),
+    group_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
+    user_id: Type.Union([Type.Number(), Type.String()]),
 });
 
 type Payload = Static<typeof SchemaData>;
-export class SendPokeBase extends GetPacketStatusDepends<Payload, void> {
+
+export class SendPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.SendPoke;
     override payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const target_id = payload.target_id ?? payload.user_id;
-        const peer_id = payload.group_id ?? payload.user_id;
-        const is_group = !!payload.group_id;
-        if (!target_id || !peer_id) {
-            throw new Error('请检查参数，缺少 user_id 或 group_id');
+        if (payload.group_id) {
+            await this.core.apis.PacketApi.pkt.operation.GroupPoke(+payload.group_id, +payload.user_id);
+        } else {
+            await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
         }
-        await this.core.apis.PacketApi.pkt.operation.SendPoke(is_group, +peer_id, +target_id);
     }
 }
-
-
-export class SendPoke extends SendPokeBase {
-    override actionName = ActionName.SendPoke;
-}
-export class GroupPoke extends SendPokeBase {
-    override actionName = ActionName.GroupPoke;
-}
-export class FriendPoke extends SendPokeBase {
-    override actionName = ActionName.FriendPoke;
-}

src/onebot/action/router.ts

@@ -10,12 +10,6 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
-    // new extends 完全差异OneBot类别
-    GetDoubtFriendsAddRequest: 'get_doubt_friends_add_request',
-    SetDoubtFriendsAddRequest: 'set_doubt_friends_add_request',
-    // napcat
-    GetRkeyEx: 'get_rkey',
-    GetRkeyServer: 'get_rkey_server',
     SetGroupRemark: 'set_group_remark',
     NapCat_GetPrivateFileUrl: 'get_private_file_url',
     ClickInlineKeyboardButton: 'click_inline_keyboard_button',
@@ -37,9 +31,8 @@ export const ActionName = {
     SetGroupCard: 'set_group_card',
     SetGroupName: 'set_group_name',
     SetGroupLeave: 'set_group_leave',
-    SetSpecialTitle: 'set_group_special_title',
+    SetSpecialTittle: 'set_group_special_title',
     SetFriendAddRequest: 'set_friend_add_request',
-    SetFriendRemark: 'set_friend_remark',
     SetGroupAddRequest: 'set_group_add_request',
     GetLoginInfo: 'get_login_info',
     GoCQHTTP_GetStrangerInfo: 'get_stranger_info',
@@ -59,7 +52,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',
@@ -137,10 +130,6 @@ 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

@@ -1,38 +0,0 @@
-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/action/user/FriendPoke.ts

@@ -0,0 +1,18 @@
+import { ActionName } from '@/onebot/action/router';
+import { GetPacketStatusDepends } from '@/onebot/action/packet/GetPacketStatus';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    user_id: Type.Union([Type.Number(), Type.String()])
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export class FriendPoke extends GetPacketStatusDepends<Payload, void> {
+    override actionName = ActionName.FriendPoke;
+    override payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        await this.core.apis.PacketApi.pkt.operation.FriendPoke(+payload.user_id);
+    }
+}

src/onebot/action/user/GetFriendList.ts

@@ -14,22 +14,8 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
     override actionName = ActionName.GetFriendList;
     override payloadSchema = SchemaData;
 
-    async _handle(_payload: Payload) {
-        const buddyMap = await this.core.apis.FriendApi.getBuddyV2SimpleInfoMap();
-        const isNocache = typeof _payload.no_cache === 'string' ? _payload.no_cache === 'true' : !!_payload.no_cache;
-        await Promise.all(
-            Array.from(buddyMap.values()).map(async (buddyInfo) => {
-                try {
-                    const userDetail = await this.core.apis.UserApi.getUserDetailInfo(buddyInfo.coreInfo.uid, isNocache);
-                    const data = buddyMap.get(buddyInfo.coreInfo.uid);
-                    if (data) {
-                        data.qqLevel = userDetail.qqLevel;
-                    }
-                } catch (error) {
-                    this.core.context.logger.logError('获取好友详细信息失败', error);
-                }
-            })
-        );
-        return OB11Construct.friends(Array.from(buddyMap.values()));
+    async _handle(payload: Payload) {
+        //全新逻辑
+        return OB11Construct.friends(await this.core.apis.FriendApi.getBuddy(typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache));
     }
-}
+}

src/onebot/action/user/SetFriendRemark.ts

@@ -1,25 +0,0 @@
-import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { ActionName } from '@/onebot/action/router';
-import { Static, Type } from '@sinclair/typebox';
-
-const SchemaData = Type.Object({
-    user_id: Type.String(),
-    remark: Type.String()
-});
-
-type Payload = Static<typeof SchemaData>;
-
-export default class SetFriendRemark extends OneBotAction<Payload, null> {
-    override actionName = ActionName.SetFriendRemark;
-    override payloadSchema = SchemaData;
-
-    async _handle(payload: Payload): Promise<null> {
-        let friendUid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id);
-        let is_friend = await this.core.apis.FriendApi.isBuddy(friendUid);
-        if (!is_friend) {
-            throw new Error(`用户 ${payload.user_id} 不是好友`);
-        }
-        await this.core.apis.FriendApi.setBuddyRemark(friendUid, payload.remark);
-        return null;
-    }
-}

src/onebot/api/group.ts

@@ -114,6 +114,7 @@ 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);
@@ -129,6 +130,7 @@ export class OneBotGroupApi {
 
     async parsePaiYiPai(msg: RawMessage, jsonStr: string) {
         const json = JSON.parse(jsonStr);
+
         //判断业务类型
         //Poke事件
         const pokedetail: Array<{ uid: string }> = json.items;
@@ -149,15 +151,14 @@ export class OneBotGroupApi {
     async parseOtherJsonEvent(msg: RawMessage, jsonStr: string, context: InstanceContext) {
         const json = JSON.parse(jsonStr);
         const type = json.items[json.items.length - 1]?.txt;
-        await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
         if (type === '头衔') {
             const memberUin = json.items[1].param[0];
             const title = json.items[3].txt;
             context.logger.logDebug('收到群成员新头衔消息', json);
             return new OB11GroupTitleEvent(
                 this.core,
-                +msg.peerUid,
-                +memberUin,
+                parseInt(msg.peerUid),
+                parseInt(memberUin),
                 title,
             );
         } else if (type === '移出') {
@@ -250,34 +251,7 @@ export class OneBotGroupApi {
             'invite'
         );
     }
-    async parse51TypeEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
-        // 神经腾讯 没了妈妈想出来的
-        // Warn 下面存在高并发危险
-        if (grayTipElement.jsonGrayTipElement.jsonStr) {
-            const json: {
-                align: string,
-                items: Array<{ txt: string, type: string }>
-            } = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr);
-            if (json.items.length === 1 && json.items[0]?.txt.endsWith('加入群')) {
-                let old_members = structuredClone(this.core.apis.GroupApi.groupMemberCache.get(msg.peerUid));
-                if (!old_members) return;
-                let new_members_map = await this.core.apis.GroupApi.refreshGroupMemberCache(msg.peerUid, true);
-                if (!new_members_map) return;
-                let new_members = Array.from(new_members_map.values());
-                // 对比members查找新成员
-                let new_member = new_members.find((member) => old_members.get(member.uid) == undefined);
-                if (!new_member) return;
-                return new OB11GroupIncreaseEvent(
-                    this.core,
-                    +msg.peerUid,
-                    +new_member.uin,
-                    0,
-                    'invite',
-                );
-            }
-        }
-        return;
-    }
+
     async parseGrayTipElement(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType === NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_GROUP) {
             // 解析群组事件 由sysmsg解析
@@ -309,9 +283,6 @@ export class OneBotGroupApi {
                 return await this.parsePaiYiPai(msg, grayTipElement.jsonGrayTipElement.jsonStr);
             } else if (grayTipElement.jsonGrayTipElement.busiId == JsonGrayBusiId.AIO_GROUP_ESSENCE_MSG_TIP) {
                 return await this.parseEssenceMsg(msg, grayTipElement.jsonGrayTipElement.jsonStr);
-            } else if (+(grayTipElement.jsonGrayTipElement.busiId ?? 0) == 51) {
-                // 51是什么？{"align":"center","items":[{"txt":"下一秒起床通过王者荣耀加入群","type":"nor"}]
-                return await this.parse51TypeEvent(msg, grayTipElement);
             } else {
                 return await this.parseOtherJsonEvent(msg, grayTipElement.jsonGrayTipElement.jsonStr, this.core.context);
             }

src/onebot/api/msg.ts

@@ -34,7 +34,7 @@ import { EventType } from '@/onebot/event/OneBotEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
 import { uriToLocalFile } from '@/common/file';
 import { RequestUtil } from '@/common/request';
-import fsPromise from 'node:fs/promises';
+import fsPromise, { constants } from 'node:fs/promises';
 import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
 import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
 import { NapProtoMsg } from '@napneko/nap-proto-core';
@@ -45,7 +45,6 @@ import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeE
 import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
 import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
 import { LRUCache } from '@/common/lru-cache';
-import { cleanTaskQueue } from '@/common/clean-task';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -85,6 +84,9 @@ export class OneBotMsgApi {
         textElement: async element => {
             if (element.atType === NTMsgAtType.ATTYPEUNKNOWN) {
                 let text = element.content;
+                if (!text.trim()) {
+                    return null;
+                }
                 // 兼容 9.7.x 换行符
                 if (text.indexOf('\n') === -1 && text.indexOf('\r\n') === -1) {
                     text = text.replace(/\r/g, '\n');
@@ -97,7 +99,7 @@ export class OneBotMsgApi {
                 let qq: string = 'all';
                 if (element.atType !== NTMsgAtType.ATTYPEALL) {
                     const { atNtUid, atUid } = element;
-                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : String(Number(atUid) >>> 0);
+                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : atUid;
                 }
                 return {
                     type: OB11MessageDataType.at,
@@ -147,31 +149,12 @@ export class OneBotMsgApi {
             };
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileUuid);
             FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
-            if (this.core.apis.PacketApi.available) {
-                let url;
-                try {
-                    url = await this.core.apis.FileApi.getFileUrl(msg.chatType, msg.peerUid, element.fileUuid, element.file10MMd5)
-                } catch (error) {
-                    url = '';
-                }
-                if (url) {
-                    return {
-                        type: OB11MessageDataType.file,
-                        data: {
-                            file: element.fileName,
-                            file_id: element.fileUuid,
-                            file_size: element.fileSize,
-                            url: url,
-                        },
-                    }
-                }
-            }
             return {
                 type: OB11MessageDataType.file,
                 data: {
                     file: element.fileName,
                     file_id: element.fileUuid,
-                    file_size: element.fileSize
+                    file_size: element.fileSize,
                 },
             };
         },
@@ -241,13 +224,17 @@ export class OneBotMsgApi {
         },
 
         replyElement: async (element, msg) => {
+            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
             const peer = {
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            if (!records || !element.replyMsgTime || !element.senderUidStr) {
+                this.core.context.logger.logError('似乎是旧版客户端,获取不到引用的消息', element.replayMsgSeq);
+                return null;
+            }
 
-            // 创建回复数据的通用方法
             const createReplyData = (msgId: string): OB11MessageData => ({
                 type: OB11MessageDataType.reply,
                 data: {
@@ -255,96 +242,48 @@ export class OneBotMsgApi {
                 },
             });
 
-            // 查找记录
-            const records = msg.records.find(msgRecord => msgRecord.msgId === element?.sourceMsgIdInRecords);
-
-            // 特定账号的特殊处理
-            if (records && (records.peerUin === '284840486' || records.peerUin === '1094950020')) {
+            if (records.peerUin === '284840486' || records.peerUin === '1094950020') {
                 return createReplyData(records.msgId);
             }
+            let replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, records.msgTime, [element.senderUidStr])).msgList;
+            let replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
 
-            // 获取消息的通用方法组
-            const tryFetchMethods = async (msgSeq: string, senderUid?: string, msgTime?: string, msgRandom?: string): Promise<RawMessage | undefined> => {
-                try {
-                    // 方法1：通过序号和时间筛选
-                    if (senderUid && msgTime) {
-                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(
-                            peer, msgSeq, msgTime, [senderUid]
-                        )).msgList;
-
-                        const replyMsg = msgRandom
-                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                        if (replyMsg) return replyMsg;
-
-                        this.core.context.logger.logWarn(`方法1查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-                    }
-
-                    // 方法2：直接通过序号获取
-                    const replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(
-                        peer, msgSeq, 1, true, true
-                    )).msgList;
-
-                    const replyMsg = msgRandom
-                        ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                        : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                    if (replyMsg) return replyMsg;
-
-                    this.core.context.logger.logWarn(`方法2查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-
-                    // 方法3：另一种筛选方式
-                    if (senderUid) {
-                        const replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(
-                            peer, msgSeq, [senderUid]
-                        )).msgList;
-
-                        const replyMsg = msgRandom
-                            ? replyMsgList.find(msg => msg.msgRandom === msgRandom)
-                            : replyMsgList.find(msg => msg.msgSeq === msgSeq);
-
-                        if (replyMsg) return replyMsg;
-
-                        this.core.context.logger.logWarn(`方法3查询失败，序号: ${msgSeq}, 消息数: ${replyMsgList.length}`);
-                    }
-
-                    return undefined;
-                } catch (error) {
-                    this.core.context.logger.logError('查询回复消息出错', error);
-                    return undefined;
-                }
-            };
-
-            // 有记录情况下，使用完整信息查询
-            if (records && element.replyMsgTime && element.senderUidStr) {
-                const replyMsg = await tryFetchMethods(
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logError(
+                    '筛选结果,筛选消息失败,将使用Fallback-1 Seq: ',
                     element.replayMsgSeq,
-                    element.senderUidStr,
-                    records.msgTime,
-                    records.msgRandom
+                    ',消息长度:',
+                    replyMsgList.length
                 );
-
-                if (replyMsg) {
-                    return createReplyData(replyMsg.msgId);
-                }
-
-                this.core.context.logger.logError('所有查找方法均失败，获取不到带记录的引用消息', element.replayMsgSeq);
-            } else {
-                // 旧版客户端或不完整记录的情况，也尝试使用相同流程
-                this.core.context.logger.logWarn('似乎是旧版客户端，尝试仅通过序号获取引用消息', element.replayMsgSeq);
-
-                const replyMsg = await tryFetchMethods(element.replayMsgSeq);
-
-                if (replyMsg) {
-                    return createReplyData(replyMsg.msgId);
-                }
-
-                this.core.context.logger.logError('所有查找方法均失败，获取不到旧客户端的引用消息', element.replayMsgSeq);
+                replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer, element.replayMsgSeq, 1, true, true)).msgList;
+                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
             }
 
-            return null;
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logWarn(
+                    '筛选消息失败,将使用Fallback-2 Seq:',
+                    element.replayMsgSeq,
+                    ',消息长度:',
+                    replyMsgList.length
+                );
+                replyMsgList = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV3(peer, element.replayMsgSeq, [element.senderUidStr])).msgList;
+                replyMsg = replyMsgList.find(msg => msg.msgRandom === records.msgRandom);
+            }
+
+
+            // 丢弃该消息段
+            if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
+                this.core.context.logger.logError(
+                    '最终筛选结果,筛选消息失败,获取不到引用的消息 Seq: ',
+                    element.replayMsgSeq,
+                    ',消息长度:',
+                    replyMsgList.length
+                );
+                return null;
+            }
+            return createReplyData(replyMsg.msgId);
         },
+
         videoElement: async (element, msg, elementWrapper) => {
             const peer = {
                 chatType: msg.chatType,
@@ -391,17 +330,7 @@ export class OneBotMsgApi {
 
             //开始兜底
             if (!videoDownUrl) {
-                if (this.core.apis.PacketApi.available) {
-                    try {
-                        videoDownUrl = await this.core.apis.FileApi.getVideoUrlPacket(msg.peerUid, element.fileUuid);
-                    } catch (e) {
-                        this.core.context.logger.logError('获取视频url失败', (e as Error).stack);
-                        videoDownUrl = element.filePath;
-                    }
-                } else {
-                    videoDownUrl = element.filePath;
-                }
-
+                videoDownUrl = element.filePath;
             }
             const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileUuid, element.fileName);
             return {
@@ -421,28 +350,6 @@ export class OneBotMsgApi {
                 guildId: '',
             };
             const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, '', element.fileName);
-            let pttUrl = '';
-            if (this.core.apis.PacketApi.available) {
-                try {
-                    pttUrl = await this.core.apis.FileApi.getPttUrl(msg.peerUid, element.fileUuid);
-                } catch (e) {
-                    this.core.context.logger.logError('获取语音url失败', (e as Error).stack);
-                    pttUrl = element.filePath;
-                }
-            } else {
-                pttUrl = element.filePath;
-            }
-            if (pttUrl) {
-                return {
-                    type: OB11MessageDataType.voice,
-                    data: {
-                        file: fileCode,
-                        path: element.filePath,
-                        url: pttUrl,
-                        file_size: element.fileSize,
-                    },
-                }
-            }
             return {
                 type: OB11MessageDataType.voice,
                 data: {
@@ -465,8 +372,7 @@ export class OneBotMsgApi {
                 try {
                     multiMsgs = await this.core.apis.PacketApi.pkt.operation.FetchForwardMsg(element.resId);
                 } catch (e) {
-                    this.core.context.logger.logError(`Protocol FetchForwardMsg fallback failed! 
-                    element = ${JSON.stringify(element)} , error=${e})`);
+                    this.core.context.logger.logError('Protocol FetchForwardMsg fallback failed!', e);
                     return null;
                 }
             }
@@ -559,8 +465,6 @@ export class OneBotMsgApi {
                         replayMsgId: replyMsg.msgId,  // raw.msgId
                         senderUin: replyMsg.senderUin,
                         senderUinStr: replyMsg.senderUin,
-                        replyMsgClientSeq: replyMsg.clientSeq,
-                        _replyMsgPeer: replyMsgM.Peer
                     },
                 } :
                 undefined;
@@ -650,7 +554,7 @@ export class OneBotMsgApi {
         },
 
         [OB11MessageDataType.voice]: async (sendMsg, context) =>
-            this.core.apis.FileApi.createValidSendPttElement(context,
+            this.core.apis.FileApi.createValidSendPttElement(
                 (await this.handleOb11FileLikeMessage(sendMsg, context)).path),
 
         [OB11MessageDataType.json]: async ({ data: { data } }) => ({
@@ -808,56 +712,6 @@ export class OneBotMsgApi {
         this.obContext = obContext;
         this.core = core;
     }
-    /**
-     * 解析带有JSON标记的文本
-     * @param text 要解析的文本
-     * @returns 解析后的结果数组，每个元素包含类型(text或json)和内容
-     */
-    parseTextWithJson(text: string) {
-        // 匹配<{...}>格式的JSON
-        const regex = /<(\{.*?\})>/g;
-        const parts: Array<{ type: 'text' | 'json', content: string | object }> = [];
-        let lastIndex = 0;
-        let match;
-
-        // 查找所有匹配项
-        while ((match = regex.exec(text)) !== null) {
-            // 添加匹配前的文本
-            if (match.index > lastIndex) {
-                parts.push({
-                    type: 'text',
-                    content: text.substring(lastIndex, match.index)
-                });
-            }
-
-            // 添加JSON部分
-            try {
-                const jsonContent = JSON.parse(match[1] ?? '');
-                parts.push({
-                    type: 'json',
-                    content: jsonContent
-                });
-            } catch (e) {
-                // 如果JSON解析失败，作为普通文本处理
-                parts.push({
-                    type: 'text',
-                    content: match[0]
-                });
-            }
-
-            lastIndex = regex.lastIndex;
-        }
-
-        // 添加最后一部分文本
-        if (lastIndex < text.length) {
-            parts.push({
-                type: 'text',
-                content: text.substring(lastIndex)
-            });
-        }
-
-        return parts;
-    }
 
     async parsePrivateMsgEvent(msg: RawMessage, grayTipElement: GrayTipElement) {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
@@ -1001,10 +855,10 @@ export class OneBotMsgApi {
             const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, msg.senderUin);
             resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode);
             resMsg.sender.nickname = member?.nick ?? member?.cardName ?? '临时会话';
-            resMsg.temp_source = 0;
+            resMsg.temp_source = resMsg.group_id;
         } else {
             resMsg.group_id = 284840486;
-            resMsg.temp_source = 0;
+            resMsg.temp_source = resMsg.group_id;
             resMsg.sender.nickname = '临时会话';
         }
     }
@@ -1116,6 +970,7 @@ export class OneBotMsgApi {
         });
 
         const timeout = 10000 + (totalSize / 1024 / 256 * 1000);
+
         try {
             const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, timeout);
             if (!returnMsg) throw new Error('发送消息失败');
@@ -1128,19 +983,18 @@ export class OneBotMsgApi {
         } catch (error) {
             throw new Error((error as Error).message);
         } finally {
-            cleanTaskQueue.addFiles(deleteAfterSentFiles, timeout);
-            // setTimeout(async () => {
-            //     const deletePromises = deleteAfterSentFiles.map(async file => {
-            //         try {
-            //             if (await fsPromise.access(file, constants.W_OK).then(() => true).catch(() => false)) {
-            //                 await fsPromise.unlink(file);
-            //             }
-            //         } catch (e) {
-            //             this.core.context.logger.logError('发送消息删除文件失败', e);
-            //         }
-            //     });
-            //     await Promise.all(deletePromises);
-            // }, 60000);
+            setTimeout(async () => {
+                const deletePromises = deleteAfterSentFiles.map(async file => {
+                    try {
+                        if (await fsPromise.access(file, constants.W_OK).then(() => true).catch(() => false)) {
+                            await fsPromise.unlink(file);
+                        }
+                    } catch (e) {
+                        this.core.context.logger.logError('发送消息删除文件失败', e);
+                    }
+                });
+                await Promise.all(deletePromises);
+            }, 60000);
         }
     }
 
@@ -1199,8 +1053,6 @@ export class OneBotMsgApi {
                 return 'kick';
             case 3:
                 return 'kick_me';
-            case 129:
-                return 'disband';
             default:
                 return 'kick';
         }
@@ -1361,41 +1213,6 @@ export class OneBotMsgApi {
         } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
             return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);
         }
-        // else if (SysMessage.contentHead.type == 732 && SysMessage.contentHead.subType == 16 && SysMessage.body?.msgContent) {
-        //     let data_wrap = PBString(2);
-        //     let user_wrap = PBUint64(5);
-        //     let group_wrap = PBUint64(4);
-
-        //     ProtoBuf(class extends ProtoBufBase {
-        //         group = group_wrap;
-        //         content = ProtoBufIn(5, { data: data_wrap, user: user_wrap });
-        //     }).decode(SysMessage.body?.msgContent.slice(7));
-        //     let xml_data = UnWrap(data_wrap);
-        //     let group = UnWrap(group_wrap).toString();
-        //     //let user = UnWrap(user_wrap).toString();
-        //     const parsedParts = this.parseTextWithJson(xml_data);
-        //     //解析JSON
-        //     if (parsedParts[1] && parsedParts[3]) {
-        //         let set_user_id: string = (parsedParts[1].content as { data: string }).data;
-        //         let uid = await this.core.apis.UserApi.getUidByUinV2(set_user_id);
-        //         let new_title: string = (parsedParts[3].content as { text: string }).text;
-        //         console.log(this.core.apis.GroupApi.groupMemberCache.get(group)?.get(uid)?.memberSpecialTitle, new_title)
-        //         if (this.core.apis.GroupApi.groupMemberCache.get(group)?.get(uid)?.memberSpecialTitle == new_title) {
-        //             return;
-        //         }
-        //         await this.core.apis.GroupApi.refreshGroupMemberCachePartial(group, uid);
-        //         //let json_data_1_url_search = new URL((parsedParts[3].content as { url: string }).url).searchParams;
-        //         //let is_new: boolean = json_data_1_url_search.get('isnew') === '1';
-
-        //         //console.log(group, set_user_id, is_new, new_title);
-        //         return new GroupMemberTitle(
-        //             this.core,
-        //             +group,
-        //             +set_user_id,
-        //             new_title
-        //         );
-        //     }
-        // }
         return undefined;
     }
 }

src/onebot/event/notice/OB11BaseNoticeEvent.ts

@@ -2,5 +2,4 @@ import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
 
 export abstract class OB11BaseNoticeEvent extends OneBotEvent {
     post_type = EventType.NOTICE;
-    abstract notice_type: string;
-}
+}

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' | 'disband';
+export type GroupDecreaseSubType = 'leave' | 'kick' | 'kick_me';
 
 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/event/request/OB11BaseRequestEvent.ts

@@ -1,6 +0,0 @@
-import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent';
-
-export abstract class OB11BaseRequestEvent extends OneBotEvent {
-    readonly post_type = EventType.REQUEST;
-    abstract request_type: string;
-}