fix: 清理文件

This reverts commit 79aa1dc67f.

.vscode/settings.json

@@ -6,5 +6,7 @@
         "tsconfig.json": "tsconfig.*.json, env.d.ts, vite.config.ts",
         "package.json": "package-lock.json, eslint*, .prettier*, .editorconfig, manifest.json, logo.png, .gitignore, LICENSE"
     },
-    "css.customData": [".vscode/tailwindcss.json"],
+    "css.customData": [
+        ".vscode/tailwindcss.json"
+    ],
 }

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+nanaeonn@outlook.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -1,67 +1,62 @@
 <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._
+
+> 云起兮风生，心向远方兮路未曾至.
+
 </div>
 
 ---
-## 欢迎回家
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 特性介绍
-- [x] **安装简单**：就算是笨蛋也能使用
-- [x] **性能友好**：就算是低内存也能使用
-- [x] **接口丰富**：就算是没有也能使用
-- [x] **稳定好用**：就算是被捉也能使用
+## Welcome
++ NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
+  - NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 使用框架
+## Feature
+
++ **Easy to Use**
+  - 作为初学者能够轻松使用.
++ **Quick and Efficient**
+  - 在低内存操作系统长时运行.
++ **Rich API Interface**
+  - 完整实现了大部分标准接口.
++ **Stable and Reliable**
+  - 持续稳定的开发与维护.
+## Quick Start
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
 **首次使用**请务必查看如下文档看使用教程
 
-### 文档地址
+## Link
 
-[Cloudflare.Worker](https://doc.napneko.icu/)
+| 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/) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.HKServer](https://napcat.napneko.icu/)
+| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://docs.napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
+|:-:|:-:|:-:|:-:|
 
-[Github.IO](https://napneko.github.io/)
+| 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) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.Pages](https://napneko.pages.dev/)
+## Thanks
 
-[Server.Other](https://docs.napcat.cyou/)
++ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-[NapCat.Wiki](https://www.napcat.wiki)
++ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
 
-## 回家旅途
-[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
-
-[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
-
-[Telegram](https://t.me/MelodicMoonlight)
-
-> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
-
-## 性能设计/协议标准
-NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
-
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。
-
-NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
-
-## 感谢他们
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
-
-感谢 React 强力驱动 NapCat.WebUi
-
-不过最最重要的 还是需要感谢屏幕前的你哦~
++ 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 特殊感谢
-[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
+## License
+本项目采用 混合协议 开源，因此使用本项目时，你需要注意以下几点：
+1. 第三方库代码或修改部分遵循其原始开源许可.
+2. 本项目获取部分项目授权而不受部分约束
+2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
-## 开源附加
-
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| > 4.0   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+you should open an issue

launcher/launcher-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10-user.bat

@@ -19,7 +19,7 @@ for %%a in ("%RetString%") do (
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
 if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher-win10.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/launcher.bat

@@ -27,8 +27,8 @@ for %%a in ("%RetString%") do (
 
 SET QQPath=%pathWithoutUninstall%QQ.exe
 
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
+if not exist "%QQPath%" (
+    echo provided QQ path is invalid
     pause
     exit /b
 )

launcher/qqnt.json

@@ -1,10 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
-  "verHash": "ececf273",
-  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "63c751e8",
-  "type": "module",
+  "version": "9.9.18-32869",
+  "verHash": "e735296c",
+  "linuxVersion": "3.2.16-32869",
+  "linuxVerHash": "4c192ba9",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -17,8 +16,25 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "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": "32869",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",

manifest.json

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

napcat.webui/src/components/onebot/api/debug.tsx

@@ -136,7 +136,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
       </div>
       <Card
         shadow="sm"
-        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible z-20"
+        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible"
       >
         <CardHeader className="font-bold text-lg gap-1 pb-0">
           <span className="mr-2">请求体</span>

napcat.webui/src/pages/web_login.tsx

@@ -79,6 +79,7 @@ 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.6.1",
+  "version": "4.7.12",
   "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",
@@ -45,7 +45,7 @@
     "cors": "^2.8.5",
     "esbuild": "0.25.0",
     "eslint": "^9.14.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^4.0.0",
     "eslint-plugin-import": "^2.29.1",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",

src/common/clean-task.ts

@@ -0,0 +1,229 @@
+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/ffmpeg-worker.ts

@@ -16,6 +16,9 @@ export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
         }
     });
 }
+export function sendLog(_log: string) {
+    //parentPort?.postMessage({ log });
+}
 class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
         const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
@@ -107,35 +110,175 @@ class FFmpegService {
             }
         }
     }
-
     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;
+        const startTime = Date.now();
+        sendLog(`开始获取视频信息: ${videoPath}`);
+
+        // 创建一个超时包装函数
+        const withTimeout = <T>(promise: Promise<T>, timeoutMs: number, taskName: string): Promise<T> => {
+            return Promise.race([
+                promise,
+                new Promise<T>((_, reject) => {
+                    setTimeout(() => reject(new Error(`任务超时: ${taskName} (${timeoutMs}ms)`)), timeoutMs);
+                })
+            ]);
+        };
+
+        // 并行执行多个任务
+        const [fileInfo, durationInfo] = await Promise.all([
+            // 任务1: 获取文件信息和提取缩略图
+            (async () => {
+                sendLog(`开始任务1: 获取文件信息和提取缩略图`);
+
+                // 获取文件信息 (并行)
+                const fileInfoStartTime = Date.now();
+                const [fileType, fileSize] = await Promise.all([
+                    withTimeout(fileTypeFromFile(videoPath), 10000, '获取文件类型')
+                        .then(result => {
+                            sendLog(`获取文件类型完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
+                            return result;
+                        }),
+                    (async () => {
+                        const result = statSync(videoPath).size;
+                        sendLog(`获取文件大小完成，耗时: ${Date.now() - fileInfoStartTime}ms`);
+                        return result;
+                    })()
+                ]);
+
+                // 直接实现缩略图提取 (不调用extractThumbnail方法)
+                const thumbStartTime = Date.now();
+                sendLog(`开始提取缩略图`);
+
+                const ffmpegInstance = await withTimeout(
+                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
+                    15000,
+                    '创建FFmpeg实例(缩略图)'
+                );
+
+                const videoFileName = `${randomUUID()}.mp4`;
+                const outputFileName = `${randomUUID()}.jpg`;
+
+                try {
+                    // 写入视频文件到FFmpeg
+                    const writeFileStartTime = Date.now();
+                    ffmpegInstance.fs.writeFile(videoFileName, readFileSync(videoPath));
+                    sendLog(`写入视频文件到FFmpeg完成，耗时: ${Date.now() - writeFileStartTime}ms`);
+
+                    // 提取缩略图
+                    const extractStartTime = Date.now();
+                    const code = await withTimeout(
+                        ffmpegInstance.run('-i', videoFileName, '-ss', '00:00:01.000', '-vframes', '1', outputFileName),
+                        30000,
+                        '提取缩略图'
+                    );
+                    sendLog(`FFmpeg提取缩略图命令执行完成，耗时: ${Date.now() - extractStartTime}ms`);
+
+                    if (code !== 0) {
+                        throw new Error('Error extracting thumbnail: FFmpeg process exited with code ' + code);
+                    }
+
+                    // 读取并保存缩略图
+                    const saveStartTime = Date.now();
+                    const thumbnail = ffmpegInstance.fs.readFile(outputFileName);
+                    writeFileSync(thumbnailPath, thumbnail);
+                    sendLog(`读取并保存缩略图完成，耗时: ${Date.now() - saveStartTime}ms`);
+
+                    // 获取缩略图尺寸
+                    const imageSizeStartTime = Date.now();
+                    const image = imageSize(thumbnailPath);
+                    sendLog(`获取缩略图尺寸完成，耗时: ${Date.now() - imageSizeStartTime}ms`);
+
+                    sendLog(`提取缩略图完成，总耗时: ${Date.now() - thumbStartTime}ms`);
+
+                    return {
+                        format: fileType?.ext ?? 'mp4',
+                        size: fileSize,
+                        width: image.width ?? 100,
+                        height: image.height ?? 100
+                    };
+                } finally {
+                    // 清理资源
+                    try {
+                        ffmpegInstance.fs.unlink(outputFileName);
+                    } catch (error) {
+                        sendLog(`清理输出文件失败: ${(error as Error).message}`);
+                    }
+
+                    try {
+                        ffmpegInstance.fs.unlink(videoFileName);
+                    } catch (error) {
+                        sendLog(`清理视频文件失败: ${(error as Error).message}`);
+                    }
+                }
+            })(),
+
+            // 任务2: 获取视频时长
+            (async () => {
+                const task2StartTime = Date.now();
+                sendLog(`开始任务2: 获取视频时长`);
+
+                // 创建FFmpeg实例
+                const ffmpegCreateStartTime = Date.now();
+                const ffmpegInstance = await withTimeout(
+                    FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' }),
+                    15000,
+                    '创建FFmpeg实例(时长)'
+                );
+                sendLog(`创建FFmpeg实例完成，耗时: ${Date.now() - ffmpegCreateStartTime}ms`);
+
+                const inputFileName = `${randomUUID()}.mp4`;
+
+                try {
+                    // 写入文件
+                    const writeStartTime = Date.now();
+                    ffmpegInstance.fs.writeFile(inputFileName, readFileSync(videoPath));
+                    sendLog(`写入文件到FFmpeg完成，耗时: ${Date.now() - writeStartTime}ms`);
+
+                    ffmpegInstance.setLogging(true);
+                    let duration = 60; // 默认值
+
+                    ffmpegInstance.setLogger((_level, ...msg) => {
+                        const message = msg.join(' ');
+                        const durationMatch = message.match(/Duration: (\d+):(\d+):(\d+\.\d+)/);
+                        if (durationMatch) {
+                            const hours = parseInt(durationMatch[1] ?? '0', 10);
+                            const minutes = parseInt(durationMatch[2] ?? '0', 10);
+                            const seconds = parseFloat(durationMatch[3] ?? '0');
+                            duration = hours * 3600 + minutes * 60 + seconds;
+                        }
+                    });
+
+                    // 执行FFmpeg
+                    const runStartTime = Date.now();
+                    await withTimeout(
+                        ffmpegInstance.run('-i', inputFileName),
+                        20000,
+                        '获取视频时长'
+                    );
+                    sendLog(`执行FFmpeg命令完成，耗时: ${Date.now() - runStartTime}ms`);
+
+                    sendLog(`任务2(获取视频时长)完成，总耗时: ${Date.now() - task2StartTime}ms`);
+                    return { time: duration };
+                } finally {
+                    try {
+                        ffmpegInstance.fs.unlink(inputFileName);
+                    } catch (error) {
+                        sendLog(`清理输入文件失败: ${(error as Error).message}`);
+                    }
+                }
+            })()
+        ]);
+
+        // 合并结果并返回
+        const totalDuration = Date.now() - startTime;
+        sendLog(`获取视频信息完成，总耗时: ${totalDuration}ms`);
+
         return {
-            width: image.width ?? 100,
-            height: image.height ?? 100,
-            time: duration,
-            format: fileType,
-            size: fileSize,
+            width: fileInfo.width,
+            height: fileInfo.height,
+            time: durationInfo.time,
+            format: fileInfo.format,
+            size: fileInfo.size,
             filePath: videoPath
         };
     }

src/common/ffmpeg.ts

@@ -30,7 +30,7 @@ export class FFmpegService {
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
         return result;
     }
 }

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: Buffer) => {
+        stream.on('data', (data) => {
             // 当读取到数据时，更新哈希对象的状态
             hash.update(data);
         });
@@ -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.6.1';
+export const napCatVersion = '4.7.12';

src/common/worker.ts

@@ -5,6 +5,12 @@ 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

@@ -42,9 +42,9 @@ export class NTQQFileApi {
         this.core = core;
         this.rkeyManager = new RkeyManager([
             'https://ss.xingzhige.com/music_card/rkey', // 国内
-            'https://rkey.napneko.icu/rkeys' // Cloudflare
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
-        this.context.logger
+            this.context.logger
         );
     }
 
@@ -182,23 +182,30 @@ 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;
@@ -224,7 +231,7 @@ export class NTQQFileApi {
             },
         };
     }
-    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
+    async createValidSendPttElement(context: SendMessageContext, pttPath: string): Promise<SendPttElement> {
 
         const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
         if (!silkPath) {
@@ -301,18 +308,18 @@ 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++;
                 }

src/core/apis/group.ts

@@ -27,6 +27,9 @@ export class NTQQGroupApi {
         this.core = core;
     }
 
+    async setGroupRemark(groupCode: string, remark: string) {
+        return this.context.session.getGroupService().modifyGroupRemark(groupCode, remark);
+    }
     async fetchGroupDetail(groupCode: string) {
         const [, detailInfo] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getGroupDetailInfo',
@@ -345,9 +348,9 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().uploadGroupBulletinPic(groupCode, _Pskey, imageurl);
     }
 
-    async handleGroupRequest(notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
+    async handleGroupRequest(doubt: boolean, notify: GroupNotify, operateType: NTGroupRequestOperateTypes, reason?: string) {
         return this.context.session.getGroupService().operateSysNotify(
-            false,
+            doubt,
             {
                 operateType: operateType,
                 targetMsg: {

src/core/apis/msg.ts

@@ -136,6 +136,20 @@ export class NTQQMsgApi {
         });
     }
 
+    async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
+        console.log(peer, SendersUid);
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/apis/user.ts

@@ -90,7 +90,30 @@ export class NTQQUserApi {
             () => true,
             (profile) => profile.uid === uid,
         );
-        const RetUser: User = {
+        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 {
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -101,33 +124,6 @@ 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

@@ -202,5 +202,37 @@
     "3.2.16-32721": {
         "appid": 537271229,
         "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
+    },
+    "9.9.18-32793": {
+        "appid": 537271244,
+        "qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
+    },
+    "3.2.16-32793": {
+        "appid": 537271279,
+        "qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
+    },
+    "3.2.16-32869": {
+        "appid": 537271329,
+        "qua": "V1_LNX_NQ_3.2.16_32869_GW_B"
+    },
+    "9.9.18-32869": {
+        "appid": 537271294,
+        "qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
+    },
+    "3.2.16-33139": {
+        "appid": 537273909,
+        "qua": "V1_LNX_NQ_3.2.16_33139_GW_B"
+    },
+    "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"
     }
 }

src/core/external/napcat.json

@@ -4,5 +4,6 @@
     "fileLogLevel": "debug",
     "consoleLogLevel": "info",
     "packetBackend": "auto",
-    "packetServer": ""
-}
+    "packetServer": "",
+    "o3HookMode": 1
+  }

src/core/external/offset.json

@@ -266,5 +266,53 @@
     "3.2.16-32721-arm64": {
         "send": "7226630",
         "recv": "7229F60"
+    },
+    "9.9.18-32793-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32793-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32793-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32869-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32869-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32869-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-33139-x64": {
+        "send": "39F5870",
+        "recv": "39FA070"
+    },
+    "3.2.16-33139-x64": {
+        "send": "A634F60",
+        "recv": "A638980"
+    },
+    "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"
     }
 }

src/core/helper/config.ts

@@ -10,6 +10,7 @@ export const NapcatConfigSchema = Type.Object({
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
     packetServer: Type.String({ default: '' }),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/listeners/NodeIKernelLoginListener.ts

@@ -1,5 +1,5 @@
 export class NodeIKernelLoginListener {
-    onLoginConnected(...args: any[]): any {
+    onLoginConnected(): Promise<void> | void {
     }
 
     onLoginDisConnected(...args: any[]): any {

src/core/listeners/NodeIKernelSearchListener.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core';
+import { ChatType, RawMessage } from '@/core';
 export interface SearchGroupInfo {
     groupCode: string;
     ownerUid: string;
@@ -56,7 +56,7 @@ export interface GroupSearchResult {
     nextPos: number;
 }
 export interface NodeIKernelSearchListener {
-    
+
     onSearchGroupResult(params: GroupSearchResult): any;
 
     onSearchFileKeywordsResult(params: {
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
             }[]
         }[]
     }): any;
+
+    onSearchMsgKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: Array<{
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderUin: string,
+            senderNick: string,
+            senderNickHits: unknown[],
+            senderRemark: string,
+            senderRemarkHits: unknown[],
+            senderCard: string,
+            senderCardHits: unknown[],
+            fieldType: number,
+            fieldText: string,
+            msgRecord: RawMessage;
+            hitsInfo: Array<unknown>,
+            msgAbstract: unknown,
+        }>
+    }): void | Promise<void>;
 }

src/core/packet/client/nativeClient.ts

@@ -11,7 +11,7 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
 
 // 0 send 1 recv
 export interface NativePacketExportType {
-    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
+    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
     SendPacket?: (cmd: string, data: string, trace_id: string) => void;
 }
 
@@ -38,11 +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
@@ -55,7 +56,7 @@ export class NativePacketClient extends IPacketClient {
                 // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
-        });
+        }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 

src/core/packet/client/wsClient.ts

@@ -1,113 +0,0 @@
-import { Data, WebSocket, ErrorEvent } from 'ws';
-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 = (event) => this.handleMessage(event.data).catch(err => {
-                this.logger.error(`处理消息时出错: ${err}`);
-            });
-            this.websocket.onerror = (event: ErrorEvent) => {
-                this.available = false;
-                this.logger.error(`WebSocket 出错: ${event.message}`);
-                this.websocket?.close();
-                reject(new Error(`WebSocket 出错: ${event.message}`));
-            };
-        });
-    }
-
-    private delay(ms: number): Promise<void> {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
-    private async handleMessage(message: Data): Promise<void> {
-        try {
-            const json: RecvPacket = JSON.parse(message.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,6 +1,5 @@
 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';
@@ -10,8 +9,7 @@ type clientPriorityType = {
 }
 
 const clientPriority: clientPriorityType = {
-    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack),
-    1: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new WsPacketClient(napCore, logger, logStack),
+    10: (napCore: NapCoreContext, logger: PacketLogger, logStack: LogStack) => new NativePacketClient(napCore, logger, logStack)
 };
 
 export class LogStack {
@@ -88,10 +86,6 @@ 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/transformer/action/SetSpecialTitle.ts

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

src/core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts

@@ -4,12 +4,12 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 //设置群头衔 OidbSvcTrpcTcp.0x8fc_2
 export const OidbSvcTrpcTcp0X8FC_2_Body = {
     targetUid: ProtoField(1, ScalarType.STRING),
-    specialTitle: ProtoField(5, ScalarType.STRING),
-    expiredTime: ProtoField(6, ScalarType.SINT32),
-    uinName: ProtoField(7, ScalarType.STRING),
+    specialTitle: ProtoField(5, ScalarType.STRING, true),
+    expiredTime: ProtoField(6, ScalarType.INT32),
+    uinName: ProtoField(7, ScalarType.STRING, true),
     targetName: ProtoField(8, ScalarType.STRING),
 };
 export const OidbSvcTrpcTcp0X8FC_2 = {
     groupUin: ProtoField(1, ScalarType.UINT32),
-    body: ProtoField(3, ScalarType.BYTES),
+    body: ProtoField(3, () => OidbSvcTrpcTcp0X8FC_2_Body),
 };

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,//不懂

src/core/services/NodeIKernelGroupService.ts

@@ -165,7 +165,7 @@ export interface NodeIKernelGroupService {
 
     modifyGroupName(groupCode: string, groupName: string, isNormalMember: boolean): Promise<GeneralCallResult>;
 
-    modifyGroupRemark(groupCode: string, remark: string): void;
+    modifyGroupRemark(groupCode: string, remark: string): Promise<GeneralCallResult>;
 
     modifyGroupDetailInfo(groupCode: string, arg: unknown): void;
 

src/core/services/NodeIKernelLoginService.ts

@@ -60,7 +60,10 @@ export interface QuickLoginResult {
 }
 
 export interface NodeIKernelLoginService {
+    getMsfStatus: () => number;
+
     setLoginMiscData(arg0: string, value: string): unknown;
+    
     getMachineGuid(): string;
 
     get(): NodeIKernelLoginService;

src/core/services/NodeIKernelSearchService.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core/types';
+import { ChatType, Peer } from '@/core/types';
 import { GeneralCallResult } from './common';
 
 export interface NodeIKernelSearchService {
@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
 
     cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
 
-    searchMsgWithKeywords(...args: unknown[]): unknown;// needs 2 arguments
+    searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
 
     searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
 

src/core/types/user.ts

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

src/framework/napcat.ts

@@ -7,13 +7,13 @@ import { SelfInfo } from '@/core/types';
 import { NodeIKernelLoginListener } from '@/core/listeners';
 import { NodeIKernelLoginService } from '@/core/services';
 import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
-import { InitWebUi, WebUiConfig } from '@/webui';
+import { InitWebUi, WebUiConfig, webUiRuntimePort } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
 
 //Framework ES入口文件
 export async function getWebUiUrl() {
     const WebUiConfigData = (await WebUiConfig.GetWebUIConfig());
-    return 'http://127.0.0.1:' + WebUiConfigData.port + '/webui/?token=' + WebUiConfigData.token;
+    return 'http://127.0.0.1:' + webUiRuntimePort + '/webui/?token=' + WebUiConfigData.token;
 }
 
 export async function NCoreInitFramework(

src/onebot/action/extends/SetGroupRemark.ts

@@ -0,0 +1,22 @@
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { Static, Type } from '@sinclair/typebox';
+
+const SchemaData = Type.Object({
+    group_id: Type.String(),
+    remark: Type.String(),
+});
+
+type Payload = Static<typeof SchemaData>;
+
+export default class SetGroupRemark extends OneBotAction<Payload, null> {
+    override actionName = ActionName.SetGroupRemark;
+    override payloadSchema = SchemaData;
+    async _handle(payload: Payload): Promise<null> {
+        let ret = await this.core.apis.GroupApi.setGroupRemark(payload.group_id, payload.remark);
+        if (ret.result != 0) {
+            throw new Error(`设置群备注失败, ${ret.result}:${ret.errMsg}`);
+        }
+        return null;
+    }
+}

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

@@ -7,6 +7,7 @@ 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>;
@@ -16,10 +17,11 @@ 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));
+        const info = (await this.core.apis.UserApi.getUserDetailInfo(uid, isNocache));
         return {
             ...extendData.detail.simpleInfo.coreInfo,
             ...extendData.detail.commonExt ?? {},

src/onebot/action/group/GetGroupInfo.ts

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

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),
+            this.core.apis.UserApi.getUserDetailInfo(uid, isNocache),
         ]);
 
         if (!member || !groupMember) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);

src/onebot/action/group/SetGroupAddRequest.ts

@@ -20,11 +20,12 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         const approve = payload.approve?.toString() !== 'false';
         const reason = payload.reason ?? ' ';
         const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(flag);
-        const notify = invite_notify ?? await this.findNotify(flag);
+        const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(flag);
         if (!notify) {
             throw new Error('No such request');
         }
         await this.core.apis.GroupApi.handleGroupRequest(
+            doubt,
             notify,
             approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
             reason,
@@ -36,7 +37,8 @@ export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
         let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
         if (!notify) {
             notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+            return { doubt: true, notify };
         }
-        return notify;
+        return { doubt: false, notify };
     }
 }

src/onebot/action/group/SetGroupBan.ts

@@ -18,7 +18,6 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
         if (!uid) throw new Error('uid error');
         let member_role = (await this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, true))?.role;
         if (member_role === 4) throw new Error('cannot ban owner');
-        if (member_role === 3) throw new Error('cannot ban admin');
         // 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
         let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
             [{ uid: uid, timeStamp: +payload.duration }]);

src/onebot/action/index.ts

@@ -108,10 +108,12 @@ 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';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
     const actionHandlers = [
+        new SetGroupRemark(obContext, core),
         new GetGroupInfoEx(obContext, core),
         new FetchEmojiLike(obContext, core),
         new GetFile(obContext, core),
@@ -227,8 +229,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupSystemMsg(obContext, core),
         new BotExit(obContext, core),
         new ClickInlineKeyboardButton(obContext, core),
-        new GetPrivateFileUrl(obContext,core),
-        new GetUnidirectionalFriendList(obContext,core),
+        new GetPrivateFileUrl(obContext, core),
+        new GetUnidirectionalFriendList(obContext, core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/action/router.ts

@@ -10,6 +10,7 @@ export interface InvalidCheckResult {
 }
 
 export const ActionName = {
+    SetGroupRemark: 'set_group_remark',
     NapCat_GetPrivateFileUrl: 'get_private_file_url',
     ClickInlineKeyboardButton: 'click_inline_keyboard_button',
     GetUnidirectionalFriendList: 'get_unidirectional_friend_list',

src/onebot/action/user/GetFriendList.ts

@@ -14,8 +14,22 @@ export default class GetFriendList extends OneBotAction<Payload, OB11User[]> {
     override actionName = ActionName.GetFriendList;
     override payloadSchema = SchemaData;
 
-    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));
+    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()));
     }
-}
+}

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, { constants } from 'node:fs/promises';
+import fsPromise 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,6 +45,7 @@ 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]: (
@@ -554,7 +555,7 @@ export class OneBotMsgApi {
         },
 
         [OB11MessageDataType.voice]: async (sendMsg, context) =>
-            this.core.apis.FileApi.createValidSendPttElement(
+            this.core.apis.FileApi.createValidSendPttElement(context,
                 (await this.handleOb11FileLikeMessage(sendMsg, context)).path),
 
         [OB11MessageDataType.json]: async ({ data: { data } }) => ({
@@ -809,6 +810,7 @@ export class OneBotMsgApi {
             message_id: msg.id!,
             message_seq: msg.id!,
             real_id: msg.id!,
+            real_seq: msg.msgSeq,
             message_type: msg.chatType == ChatType.KCHATTYPEGROUP ? 'group' : 'private',
             sender: {
                 user_id: +(msg.senderUin ?? 0),
@@ -969,7 +971,6 @@ 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('发送消息失败');
@@ -982,18 +983,19 @@ export class OneBotMsgApi {
         } catch (error) {
             throw new Error((error as Error).message);
         } finally {
-            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);
+            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);
         }
     }
 

src/onebot/api/quick-action.ts

@@ -84,17 +84,19 @@ export class OneBotQuickActionApi {
         let notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(false, 100)).find(e => e.seq == flag);
         if (!notify) {
             notify = (await this.core.apis.GroupApi.getSingleScreenNotifies(true, 100)).find(e => e.seq == flag);
+            return { doubt: true, notify };
         }
-        return notify;
+        return { doubt: false, notify };
     }
 
     async handleGroupRequest(request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) {
 
         const invite_notify = this.obContext.apis.MsgApi.notifyGroupInvite.get(request.flag);
-        const notify = invite_notify ?? await this.findNotify(request.flag);
+        const { doubt, notify } = invite_notify ? { doubt: false, notify: invite_notify } : await this.findNotify(request.flag);
 
         if (!isNull(quickAction.approve) && notify) {
             this.core.apis.GroupApi.handleGroupRequest(
+                doubt,
                 notify,
                 quickAction.approve ? NTGroupRequestOperateTypes.KAGREE : NTGroupRequestOperateTypes.KREFUSE,
                 quickAction.reason,

src/onebot/helper/data.ts

@@ -20,16 +20,36 @@ export class OB11Construct {
 
     static friends(friends: FriendV2[]): OB11User[] {
         return friends.map(rawFriend => ({
-            ...rawFriend.baseInfo,
-            ...rawFriend.coreInfo,
+            birthday_year: rawFriend.baseInfo.birthday_year,
+            birthday_month: rawFriend.baseInfo.birthday_month,
+            birthday_day: rawFriend.baseInfo.birthday_day,
             user_id: parseInt(rawFriend.coreInfo.uin),
+            age: rawFriend.baseInfo.age,
+            phone_num: rawFriend.baseInfo.phoneNum,
+            email: rawFriend.baseInfo.eMail,
+            category_id: rawFriend.baseInfo.categoryId,
             nickname: rawFriend.coreInfo.nick ?? '',
             remark: rawFriend.coreInfo.remark ?? rawFriend.coreInfo.nick,
             sex: this.sex(rawFriend.baseInfo.sex),
-            level: 0,
+            level: rawFriend.qqLevel && calcQQLevel(rawFriend.qqLevel) || 0,
         }));
     }
-
+    static friend(friends: FriendV2): OB11User {
+        return {
+            birthday_year: friends.baseInfo.birthday_year,
+            birthday_month: friends.baseInfo.birthday_month,
+            birthday_day: friends.baseInfo.birthday_day,
+            user_id: parseInt(friends.coreInfo.uin),
+            age: friends.baseInfo.age,
+            phone_num: friends.baseInfo.phoneNum,
+            email: friends.baseInfo.eMail,
+            category_id: friends.baseInfo.categoryId,
+            nickname: friends.coreInfo.nick ?? '',
+            remark: friends.coreInfo.remark ?? friends.coreInfo.nick,
+            sex: this.sex(friends.baseInfo.sex),
+            level: 0,
+        };
+    }
     static groupMemberRole(role: number): OB11GroupMemberRole | undefined {
         return {
             4: OB11GroupMemberRole.owner,
@@ -73,6 +93,7 @@ export class OB11Construct {
 
     static group(group: Group): OB11Group {
         return {
+            group_remark: group.remarkName,
             group_id: +group.groupCode,
             group_name: group.groupName,
             member_count: group.memberCount,

src/onebot/index.ts

@@ -100,7 +100,7 @@ export class NapCatOneBot11Adapter {
         const selfInfo = this.core.selfInfo;
         const ob11Config = this.configLoader.configData;
 
-        this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid)
+        this.core.apis.UserApi.getUserDetailInfo(selfInfo.uid, false)
             .then((user) => {
                 selfInfo.nick = user.nick;
                 this.context.logger.setLogSelfInfo(selfInfo);

src/onebot/network/websocket-client.ts

@@ -37,7 +37,13 @@ export class OB11WebSocketClientAdapter extends IOB11NetworkAdapter<WebsocketCli
             }, this.config.heartInterval);
         }
         this.isEnable = true;
-        await this.tryConnect();
+        try {
+            await this.tryConnect();
+        } catch (error) {
+            this.logger.logError('[OneBot] [WebSocket Client] TryConnect Error , info -> ', error);
+
+        }
+
     }
 
     close() {

src/onebot/types/data.ts

@@ -1,4 +1,10 @@
 export interface OB11User {
+    birthday_year?: number; // 生日
+    birthday_month?: number; // 生日
+    birthday_day?: number; // 生日
+    phone_num?: string; // 手机号
+    email?: string; // 邮箱
+    category_id?: number; // 分组ID
     user_id: number; // 用户ID
     nickname: string; // 昵称
     remark?: string; // 备注
@@ -57,6 +63,7 @@ export interface OB11GroupMember {
 }
 
 export interface OB11Group {
+    group_remark: string; // 群备注
     group_id: number; // 群ID
     group_name: string; // 群名称
     member_count?: number; // 成员数量

src/onebot/types/message.ts

@@ -10,6 +10,7 @@ export enum OB11MessageType {
 
 // 消息接口定义
 export interface OB11Message {
+    real_seq?: string;// 自行扩展
     temp_source?: number;
     message_sent_type?: string;
     target_id?: number;  // 自己发送消息/私聊消息

src/shell/base.ts

@@ -30,6 +30,8 @@ import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { napCatVersion } from '@/common/version';
 import { NodeIO3MiscListener } from '@/core/listeners/NodeIO3MiscListener';
+import { sleep } from '@/common/helper';
+
 // NapCat Shell App ES 入口文件
 async function handleUncaughtExceptions(logger: LogWrapper) {
     process.on('uncaughtException', (err) => {
@@ -113,120 +115,126 @@ async function handleLogin(
     quickLoginUin: string | undefined,
     historyLoginList: LoginListItem[]
 ): Promise<SelfInfo> {
-    return new Promise<SelfInfo>((resolve) => {
-        const loginListener = new NodeIKernelLoginListener();
-        let isLogined = false;
+    let context = { isLogined: false };
+    let inner_resolve: (value: SelfInfo) => void;
+    let selfInfo: Promise<SelfInfo> = new Promise((resolve) => {
+        inner_resolve = resolve;
+    });
+    // 连接服务
 
-        loginListener.onUserLoggedIn = (userid: string) => {
-            logger.logError(`当前账号(${userid})已登录,无法重复登录`);
-        };
-
-        loginListener.onQRCodeLoginSucceed = async (loginResult) => {
-            isLogined = true;
-            resolve({
-                uid: loginResult.uid,
-                uin: loginResult.uin,
-                nick: '',
-                online: true,
-            });
-        };
-
-        loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
-            WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
-
-            const realBase64 = pngBase64QrcodeData.replace(/^data:image\/\w+;base64,/, '');
-            const buffer = Buffer.from(realBase64, 'base64');
-            logger.logWarn('请扫描下面的二维码，然后在手Q上授权登录：');
-            const qrcodePath = path.join(pathWrapper.cachePath, 'qrcode.png');
-            qrcode.generate(qrcodeUrl, { small: true }, (res) => {
-                logger.logWarn([
-                    '\n',
-                    res,
-                    '二维码解码URL: ' + qrcodeUrl,
-                    '如果控制台二维码无法扫码，可以复制解码url到二维码生成网站生成二维码再扫码，也可以打开下方的二维码路径图片进行扫码。',
-                ].join('\n'));
-                fs.writeFile(qrcodePath, buffer, {}, () => {
-                    logger.logWarn('二维码已保存到', qrcodePath);
-                });
-            });
-        };
-
-        loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
-            if (!isLogined) {
-                logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
-                if (errType == 1 && errCode == 3) {
-                    // 二维码过期刷新
-                }
-                loginService.getQRCodePicture();
-            }
-        };
-
-        loginListener.onLoginFailed = (...args) => {
-            logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
-        };
-
-        loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
-        const isConnect = loginService.connect();
-        if (!isConnect) {
-            logger.logError('核心登录服务连接失败!');
-            return;
-        }
-
-        logger.log('核心登录服务连接成功!');
-
-        loginService.getLoginList().then((res) => {
-            // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
-            const list = res.LocalLoginInfoList.filter((item) => item.isQuickLogin);
-            WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
-            WebUiDataRuntime.setQQNewLoginList(list);
+    const loginListener = new NodeIKernelLoginListener();
+    loginListener.onUserLoggedIn = (userid: string) => {
+        logger.logError(`当前账号(${userid})已登录,无法重复登录`);
+    };
+    loginListener.onQRCodeLoginSucceed = async (loginResult) => {
+        context.isLogined = true;
+        inner_resolve({
+            uid: loginResult.uid,
+            uin: loginResult.uin,
+            nick: '',
+            online: true,
         });
 
-        WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
-            return await new Promise((resolve) => {
-                if (uin) {
-                    logger.log('正在快速登录 ', uin);
-                    loginService.quickLoginWithUin(uin).then(res => {
-                        if (res.loginErrorInfo.errMsg) {
-                            resolve({ result: false, message: res.loginErrorInfo.errMsg });
-                        }
-                        resolve({ result: true, message: '' });
-                    }).catch((e) => {
-                        logger.logError(e);
-                        resolve({ result: false, message: '快速登录发生错误' });
-                    });
-                } else {
-                    resolve({ result: false, message: '快速登录失败' });
-                }
+    };
+    loginListener.onLoginConnected = () => {
+        waitForNetworkConnection(loginService, logger).then(() => {
+            handleLoginInner(context, logger, loginService, quickLoginUin, historyLoginList).then().catch(e => logger.logError(e));
+            loginListener.onLoginConnected = () => { };
+        });
+    }
+    loginListener.onQRCodeGetPicture = ({ pngBase64QrcodeData, qrcodeUrl }) => {
+        WebUiDataRuntime.setQQLoginQrcodeURL(qrcodeUrl);
+
+        const realBase64 = pngBase64QrcodeData.replace(/^data:image\/\w+;base64,/, '');
+        const buffer = Buffer.from(realBase64, 'base64');
+        logger.logWarn('请扫描下面的二维码，然后在手Q上授权登录：');
+        const qrcodePath = path.join(pathWrapper.cachePath, 'qrcode.png');
+        qrcode.generate(qrcodeUrl, { small: true }, (res) => {
+            logger.logWarn([
+                '\n',
+                res,
+                '二维码解码URL: ' + qrcodeUrl,
+                '如果控制台二维码无法扫码，可以复制解码url到二维码生成网站生成二维码再扫码，也可以打开下方的二维码路径图片进行扫码。',
+            ].join('\n'));
+            fs.writeFile(qrcodePath, buffer, {}, () => {
+                logger.logWarn('二维码已保存到', qrcodePath);
             });
         });
+    };
 
-        if (quickLoginUin) {
-            if (historyLoginList.some(u => u.uin === quickLoginUin)) {
-                logger.log('正在快速登录 ', quickLoginUin);
-                setTimeout(() => {
-                    loginService.quickLoginWithUin(quickLoginUin)
-                        .then(result => {
-                            if (result.loginErrorInfo.errMsg) {
-                                logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
-                                if (!isLogined) loginService.getQRCodePicture();
-                            }
-                        })
-                        .catch();
-                }, 1000);
-            } else {
-                logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
-                if (!isLogined) loginService.getQRCodePicture();
-            }
-        } else {
-            logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
-            if (historyLoginList.length > 0) {
-                logger.log(`可用于快速登录的 QQ：\n${historyLoginList
-                    .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
-                    .join('\n')
-                    }`);
+    loginListener.onQRCodeSessionFailed = (errType: number, errCode: number) => {
+        if (!context.isLogined) {
+            logger.logError('[Core] [Login] Login Error,ErrType: ', errType, ' ErrCode:', errCode);
+            if (errType == 1 && errCode == 3) {
+                // 二维码过期刷新
             }
             loginService.getQRCodePicture();
         }
+    };
+
+    loginListener.onLoginFailed = (...args) => {
+        logger.logError('[Core] [Login] Login Error , ErrInfo: ', JSON.stringify(args));
+    };
+
+    loginService.addKernelLoginListener(proxiedListenerOf(loginListener, logger));
+    loginService.connect();
+    return await selfInfo;
+}
+async function handleLoginInner(context: { isLogined: boolean }, logger: LogWrapper, loginService: NodeIKernelLoginService, quickLoginUin: string | undefined, historyLoginList: LoginListItem[]) {
+    WebUiDataRuntime.setQuickLoginCall(async (uin: string) => {
+        return await new Promise((resolve) => {
+            if (uin) {
+                logger.log('正在快速登录 ', uin);
+                loginService.quickLoginWithUin(uin).then(res => {
+                    if (res.loginErrorInfo.errMsg) {
+                        resolve({ result: false, message: res.loginErrorInfo.errMsg });
+                    }
+                    resolve({ result: true, message: '' });
+                }).catch((e) => {
+                    logger.logError(e);
+                    resolve({ result: false, message: '快速登录发生错误' });
+                });
+            } else {
+                resolve({ result: false, message: '快速登录失败' });
+            }
+        });
+    });
+    if (quickLoginUin) {
+        if (historyLoginList.some(u => u.uin === quickLoginUin)) {
+            logger.log('正在快速登录 ', quickLoginUin);
+            loginService.quickLoginWithUin(quickLoginUin)
+                .then(result => {
+                    if (result.loginErrorInfo.errMsg) {
+                        logger.logError('快速登录错误：', result.loginErrorInfo.errMsg);
+                        if (!context.isLogined) loginService.getQRCodePicture();
+                    }
+                })
+                .catch();
+        } else {
+            logger.logError('快速登录失败，未找到该 QQ 历史登录记录，将使用二维码登录方式');
+            if (!context.isLogined) loginService.getQRCodePicture();
+        }
+    } else {
+        logger.log('没有 -q 指令指定快速登录，将使用二维码登录方式');
+        if (historyLoginList.length > 0) {
+            logger.log(`可用于快速登录的 QQ：\n${historyLoginList
+                .map((u, index) => `${index + 1}. ${u.uin} ${u.nickName}`)
+                .join('\n')
+                }`);
+        }
+        loginService.getQRCodePicture();
+        try {
+            await WebUiDataRuntime.runWebUiConfigQuickFunction();
+        } catch (error) {
+            logger.logError('WebUi 快速登录失败 执行失败', error);
+        }
+    }
+
+    loginService.getLoginList().then((res) => {
+        // 遍历 res.LocalLoginInfoList[x].isQuickLogin是否可以 res.LocalLoginInfoList[x].uin 转为string 加入string[] 最后遍历完成调用WebUiDataRuntime.setQQQuickLoginList
+        const list = res.LocalLoginInfoList.filter((item) => item.isQuickLogin);
+        WebUiDataRuntime.setQQQuickLoginList(list.map((item) => item.uin.toString()));
+        WebUiDataRuntime.setQQNewLoginList(list);
     });
 }
 
@@ -284,6 +292,20 @@ async function handleProxy(session: NodeIQQNTWrapperSession, logger: LogWrapper)
         });
     }
 }
+
+async function waitForNetworkConnection(loginService: NodeIKernelLoginService, logger: LogWrapper) {
+    let network_ok = false;
+    let tryCount = 0;
+    while (!network_ok) {
+        network_ok = loginService.getMsfStatus() !== 3;// win 11 0连接 1未连接
+        logger.log('等待网络连接...');
+        await sleep(500);
+        tryCount++;
+    }
+    logger.log('网络已连接');
+    return network_ok;
+}
+
 export async function NCoreInitShell() {
     console.log('NapCat Shell App Loading...');
     const pathWrapper = new NapCatPathWrapper();

src/webui/index.ts

@@ -29,7 +29,7 @@ export let webUiPathWrapper: NapCatPathWrapper;
 const MAX_PORT_TRY = 100;
 import * as net from 'node:net';
 import { WebUiDataRuntime } from './src/helper/Data';
-
+export let webUiRuntimePort = 6099;
 export async function InitPort(parsedConfig: WebUiConfigType): Promise<[string, number, string]> {
     try {
         await tryUseHost(parsedConfig.host);
@@ -45,24 +45,26 @@ export async function InitWebUi(logger: LogWrapper, pathWrapper: NapCatPathWrapp
     webUiPathWrapper = pathWrapper;
     WebUiConfig = new WebUiConfigWrapper();
     const [host, port, token] = await InitPort(await WebUiConfig.GetWebUIConfig());
+    webUiRuntimePort = port;
     if (port == 0) {
         logger.log('[NapCat] [WebUi] Current WebUi is not run.');
         return;
     }
-    setTimeout(async () => {
-        let autoLoginAccount = process.env['NAPCAT_QUICK_ACCOUNT'] || WebUiConfig.getAutoLoginAccount();
-        if (autoLoginAccount) {
-            try {
-                const { result, message } = await WebUiDataRuntime.requestQuickLogin(autoLoginAccount);
-                if (!result) {
-                    throw new Error(message);
+    WebUiDataRuntime.setWebUiConfigQuickFunction(
+        async () => {
+            let autoLoginAccount = process.env['NAPCAT_QUICK_ACCOUNT'] || WebUiConfig.getAutoLoginAccount();
+            if (autoLoginAccount) {
+                try {
+                    const { result, message } = await WebUiDataRuntime.requestQuickLogin(autoLoginAccount);
+                    if (!result) {
+                        throw new Error(message);
+                    }
+                    console.log(`[NapCat] [WebUi] Auto login account: ${autoLoginAccount}`);
+                } catch (error) {
+                    console.log(`[NapCat] [WebUi] Auto login account failed.` + error);
                 }
-                console.log(`[NapCat] [WebUi] Auto login account: ${autoLoginAccount}`);
-            } catch (error) {
-                console.log(`[NapCat] [WebUi] Auto login account failed.` + error);
             }
-        }
-    }, 30000);
+        });
     // ------------注册中间件------------
     // 使用express的json中间件
     app.use(express.json());

src/webui/src/helper/Data.ts

@@ -25,6 +25,9 @@ const LoginRuntime: LoginRuntimeType = {
         NewQQLoginList: [],
     },
     packageJson: packageJson,
+    WebUiConfigQuickFunction: async () => {
+        return;
+    }
 };
 
 export const WebUiDataRuntime = {
@@ -118,4 +121,11 @@ export const WebUiDataRuntime = {
     getQQVersion() {
         return LoginRuntime.QQVersion;
     },
+
+    setWebUiConfigQuickFunction(func: LoginRuntimeType['WebUiConfigQuickFunction']): void {
+        LoginRuntime.WebUiConfigQuickFunction = func;
+    },
+    runWebUiConfigQuickFunction: async function () {
+        await LoginRuntime.WebUiConfigQuickFunction();
+    }
 };

src/webui/src/types/data.d.ts

@@ -9,6 +9,7 @@ interface LoginRuntimeType {
     QQLoginUin: string;
     QQLoginInfo: SelfInfo;
     QQVersion: string;
+    WebUiConfigQuickFunction: () => Promise<void>;
     NapCatHelper: {
         onQuickLoginRequested: (uin: string) => Promise<{ result: boolean; message: string }>;
         onOB11ConfigChanged: (ob11: OneBotConfig) => Promise<void>;