fix: event

This reverts commit 9c534f8afd.

.editorconfig

@@ -17,5 +17,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
+[*.bat]
+charset = latin1
+
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.eslintrc.cjs

@@ -1,64 +0,0 @@
-module.exports = {
-    'env': {
-        'browser': true,
-        'es2021': true,
-        'node': true
-    },
-    'ignorePatterns': ['src/proto/'],
-    'extends': [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended'
-    ],
-    'overrides': [
-        {
-            'env': {
-                'node': true
-            },
-            'files': [
-                '.eslintrc.{js,cjs}'
-            ],
-            'parserOptions': {
-                'sourceType': 'script'
-            }
-        }
-    ],
-    'parser': '@typescript-eslint/parser',
-    'parserOptions': {
-        'ecmaVersion': 'latest',
-        'sourceType': 'module'
-    },
-    'plugins': [
-        '@typescript-eslint',
-        'import'
-    ],
-    'settings': {
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts']
-        },
-        'import/resolver': {
-            'typescript': {
-                'alwaysTryTypes': true
-            }
-        }
-    },
-    'rules': {
-        'indent': [
-            'error',
-            4
-        ],
-        'linebreak-style': [
-            'error',
-            'unix'
-        ],
-        'semi': [
-            'error',
-            'always'
-        ],
-        'no-unused-vars': 'off',
-        'no-async-promise-executor': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-var-requires': 'off',
-        'object-curly-spacing': ['error', 'always'],
-    }
-};

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,7 @@ body:
         在提交新的 Bug 反馈前，请确保您：
         * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
         * 不与现有的某一 issue 重复
+        * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码
   - type: input
     id: system-version
     attributes:
@@ -78,4 +79,4 @@ body:
     attributes:
       label: OneBot 客户端运行日志
       description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell

.github/workflows/build.yml

@@ -1,66 +1,47 @@
 name: "Build Action"
 on:
-  workflow_dispatch:
   push:
-    branches:
-      - main
+  pull_request:
+  workflow_dispatch:
 
 permissions: write-all
 
 jobs:
   Build-LiteLoader:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
-    - name: Clone Main Repository
-      uses: actions/checkout@v4
-      with:
-          repository: 'NapNeko/NapCatQQ'
-          submodules: true
-          ref: main
-          token: ${{ secrets.NAPCAT_BUILD }}
-    - name: Use Node.js 20.X
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-    - name: Build NuCat Framework
-      run: |
-          npm i
-          npm run build:framework
-          cd dist
-          npm i --omit=dev 
+      - name: Clone Main Repository
+        uses: actions/checkout@v4
+      - name: Use Node.js 20.X
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Build NapCat.Framework
+        run: |
+          npm i && cd napcat.webui && npm i && cd ..
+          npm run build:framework && npm run depend
           rm package-lock.json
-          cd ..
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: NapCat.Framework
-        path: dist
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NapCat.Framework
+          path: dist
   Build-Shell:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
-        - name: Clone Main Repository
-          uses: actions/checkout@v4
-          with:
-                repository: 'NapNeko/NapCatQQ'
-                submodules: true
-                ref: main
-                token: ${{ secrets.NAPCAT_BUILD }}
-        - name: Use Node.js 20.X
-          uses: actions/setup-node@v4
-          with:
-              node-version: 20.x
-        - name: Build NuCat LiteLoader
-          run: |
-                npm i
-                npm run build:shell
-                cd dist
-                npm i --omit=dev
-                rm package-lock.json
-                cd ..
-        - name: Upload Artifact
-          uses: actions/upload-artifact@v4
-          with:
-              name: NapCat.Shell
-              path: dist
+      - name: Clone Main Repository
+        uses: actions/checkout@v4
+      - name: Use Node.js 20.X
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Build NapCat.Shell
+        run: |
+          npm i && cd napcat.webui && npm i && cd ..
+          npm run build:shell && npm run depend
+          rm package-lock.json
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NapCat.Shell
+          path: dist

.github/workflows/release.yml

@@ -49,6 +49,9 @@ jobs:
     - name: Build NuCat Framework
       run: |
           npm i
+          cd napcat.webui
+          npm i
+          cd ..
           npm run build:framework
           cd dist
           npm i --omit=dev
@@ -78,6 +81,9 @@ jobs:
         - name: Build NuCat Shell
           run: |
                 npm i 
+                cd napcat.webui
+                npm i
+                cd ..
                 npm run build:shell
                 cd dist
                 npm i --omit=dev
@@ -93,9 +99,18 @@ jobs:
     needs: [Build-LiteLoader,Build-Shell]
     runs-on: ubuntu-latest
     steps:
+
+    - name: Clone Main Repository
+      uses: actions/checkout@v4
+      with:
+            repository: 'NapNeko/NapCatQQ'
+            submodules: true
+            ref: main
+            token: ${{ secrets.NAPCAT_BUILD }}
+
     - name: Download All Artifact
       uses: actions/download-artifact@v4
-    
+      
     - name: Compress subdirectories
       run: |
         cd ./NapCat.Shell/
@@ -108,6 +123,16 @@ jobs:
         rm ./NapCat.Framework.zip -rf
         mv ./NapCat.Shell/NapCat.Shell.zip ./
         mv ./NapCat.Framework/NapCat.Framework.zip ./
+
+        mkdir ./NapCat.Framework.Windows.Once
+        unzip -q ./external/LiteLoaderWrapper.zip -d ./NapCat.Framework.Windows.Once
+        cd ./NapCat.Framework.Windows.Once
+        ls 
+        mkdir -p ./LL/plugins/NapCatQQ
+        unzip -q ../NapCat.Framework.zip -d ./LL/plugins/NapCatQQ
+        zip -q -r NapCat.Framework.Windows.Once.zip *
+        cd ..
+        mv ./NapCat.Framework.Windows.Once/NapCat.Framework.Windows.Once.zip ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -123,4 +148,5 @@ jobs:
         files: |
           NapCat.Framework.zip
           NapCat.Shell.zip
+          NapCat.Framework.Windows.Once.zip
         draft: true

LICENSE

@@ -1,4 +1,4 @@
-                    GNU GENERAL PUBLIC LICENSE
+   GNU GENERAL PUBLIC Without Social media promotion LICENSE 
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
@@ -111,6 +111,10 @@ above, provided that you also meet all of these conditions:
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
 
+    d）You may use this software in accordance with the above terms, 
+    but you are not allowed to promote this project or your projects
+    based on this project on any public social media.
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in

README.md

@@ -1,35 +1,59 @@
 <div align="center">
-  <img src="https://socialify.git.ci/NapNeko/NapCatQQ/image?description=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2FNapNeko%2FNapCatQQ%2Fmain%2Flogo.png&name=1&stargazers=1&theme=Auto" alt="NapCatQQ" width="640" height="320" />
+  
+  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
+  
 </div>
 
 ---
+## 欢迎回家
+NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 项目介绍
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。
+## 特性介绍
+- [x] **安装简单**：就算是笨蛋也能使用
+- [x] **性能友好**：就算是低内存也能使用
+- [x] **接口丰富**：就算是没有也能使用
+- [x] **稳定好用**：就算是被捉也能使用
 
-## 项目优势
-- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
-- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
-- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
-
-## 如何使用
+## 使用框架
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
+**首次使用**请务必查看如下文档看使用教程
 
-## 相关链接
+### 文档地址
+
+[Cloudflare.Worker](https://doc.napneko.icu/)
+
+[Cloudflare.HKServer](https://napcat.napneko.icu/)
+
+[Github.IO](https://napneko.github.io/)
+
+[Cloudflare.Pages](https://napneko.pages.dev/)
+
+[Server.China](https://napneko.com/)
+
+[Server.Other](https://napcat.cyou/)
+
+
+## 回家旅途
 [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
 
-[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
+## 感谢他们
+感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-## 鸣谢名单
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
+感谢 Tencent Tdesign / Vue3 强力驱动 NapCat.WebUi
 
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
+不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 使用许可
+## 延缓Native模块与NapCat对新版QQ适配
+为未来持续与高效的使用Native模块 模块代码转为完全非Git仓库的本地保存源码 并进行相关重构
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 [core](./src/core) 部分代码开发。**
+同时为了保证稳定 NapCat 本体通常会在3 Week+的周期进行新版本适配
+
+因此此时推荐使用release指定版本
+
+## 开源附加
+
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。**

eslint.config.mjs

@@ -0,0 +1,70 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const compat = new FlatCompat({
+    baseDirectory: dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["src/core/proto/"],
+}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        import: fixupPluginRules(_import),
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+        },
+
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    settings: {
+        "import/parsers": {
+            "@typescript-eslint/parser": [".ts"],
+        },
+
+        "import/resolver": {
+            typescript: {
+                alwaysTryTypes: true,
+            },
+        },
+    },
+
+    rules: {
+        indent: ["error", 4],
+        semi: ["error", "always"],
+        "no-unused-vars": "off",
+        "no-async-promise-executor": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "object-curly-spacing": ["error", "always"],
+    },
+}, {
+    files: ["**/.eslintrc.{js,cjs}"],
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+        ecmaVersion: 5,
+        sourceType: "commonjs",
+    },
+}];

launcher/launcher-user.bat

@@ -0,0 +1,32 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+pause

launcher/launcher-win10-user.bat

@@ -0,0 +1,33 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456
+
+pause

launcher/launcher-win10.bat

@@ -0,0 +1,40 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs" 
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/launcher.bat

@@ -0,0 +1,39 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs"
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1

launcher/loadNapCat.js

@@ -0,0 +1,5 @@
+const path = require('path');
+const CurrentPath = path.dirname(__filename);
+(async () => {
+    await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+})();

launcher/qqnt.json

@@ -0,0 +1,26 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.16-29456",
+  "verHash": "dd395162",
+  "linuxVersion": "3.2.13-29456",
+  "linuxVerHash": "e379390a",
+  "type": "module",
+  "private": true,
+  "description": "QQ",
+  "productName": "QQ",
+  "author": {
+    "name": "Tencent",
+    "email": "QQ-Team@tencent.com"
+  },
+  "homepage": "https://im.qq.com",
+  "sideEffects": true,
+  "bin": {
+    "qd": "externals/devtools/cli/index.js"
+  },
+  "main": "./loadNapCat.js",
+  "buildVersion": "29456",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}

launcher/quickLoginExample.bat

@@ -0,0 +1,4 @@
+@echo off
+REM ./launcher.bat 123456
+REM ./launcher-win10.bat 123456
+REM 带有REM的为注释 删掉你需要的系统的那行REM这三个单词 修改QQ本脚本启动即可

manifest.json

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

napcat.webui/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

napcat.webui/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar"]
+}

napcat.webui/README.md

@@ -0,0 +1,5 @@
+# Vue 3 + TypeScript + Vite
+
+This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+Learn more about the recommended Project Setup and IDE Support in the [Vue Docs TypeScript Guide](https://vuejs.org/guide/typescript/overview.html#project-setup).

napcat.webui/eslint.config.mjs

@@ -0,0 +1,52 @@
+import globals from 'globals';
+import ts from 'typescript-eslint';
+import vue from 'eslint-plugin-vue';
+import prettier from 'eslint-plugin-prettier/recommended';
+
+export default [
+    {
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.node,
+            },
+        },
+    },
+    ...ts.configs.recommended,
+    {
+        rules: {
+            '@typescript-eslint/no-explicit-any': 'warn',
+            '@typescript-eslint/no-var-requires': 'warn',
+        },
+    },
+    ...vue.configs['flat/base'],
+    {
+        files: ['*.vue', '**/*.vue'],
+        languageOptions: {
+            parserOptions: {
+                parser: ts.parser,
+            },
+        },
+    },
+    {
+        rules: {
+            indent: ['error', 4],
+            semi: ['error', 'always'],
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-explicit-any': 'warn',
+            '@typescript-eslint/no-unused-vars': 'warn',
+            '@typescript-eslint/no-var-requires': 'warn',
+            'object-curly-spacing': ['error', 'always'],
+            'vue/v-for-delimiter-style': ['error', 'in'],
+            'vue/require-name-property': 'warn',
+            'vue/prefer-true-attribute-shorthand': 'warn',
+            'prefer-arrow-callback': 'warn',
+        },
+    },
+    prettier,
+    {
+        rules: {
+            'prettier/prettier': 'warn',
+        },
+    },
+];

napcat.webui/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="./vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>NapCat WebUI</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="./src/main.ts"></script>
+  </body>
+</html>

napcat.webui/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "napcat.webui",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "scripts": {
+    "webui:lint": "eslint --fix src/**/*.{js,ts,vue}",
+    "webui:dev": "vite",
+    "webui:build": "vue-tsc -b && vite build",
+    "webui:preview": "vite preview"
+  },
+  "dependencies": {
+    "eslint-plugin-prettier": "^5.2.1",
+    "qrcode": "^1.5.4",
+    "tdesign-vue-next": "^1.10.3",
+    "vue": "^3.5.12",
+    "vue-router": "^4.4.5"
+  },
+  "devDependencies": {
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
+    "@types/qrcode": "^1.5.5",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.31.0",
+    "globals": "^15.12.0",
+    "typescript": "~5.6.2",
+    "vite": "^5.4.10",
+    "vue-tsc": "^2.1.8"
+  }
+}

napcat.webui/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

napcat.webui/src/App.vue

@@ -0,0 +1,7 @@
+<template>
+    <div id="app">
+        <router-view />
+    </div>
+</template>
+
+<script setup lang="ts"></script>

napcat.webui/src/assets/vue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

napcat.webui/src/backend/shell.ts

@@ -0,0 +1,185 @@
+import { OneBotConfig } from '../../../src/onebot/config/config';
+
+export class QQLoginManager {
+    private retCredential: string;
+    private readonly apiPrefix: string;
+
+    //调试时http://127.0.0.1:6099/api 打包时 ../api
+    constructor(retCredential: string, apiPrefix: string = '../api') {
+        this.retCredential = retCredential;
+        this.apiPrefix = apiPrefix;
+    }
+
+    // TODO:
+    public async GetOB11Config(): Promise<OneBotConfig> {
+        try {
+            const ConfigResponse = await fetch(`${this.apiPrefix}/OB11Config/GetConfig`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (ConfigResponse.status == 200) {
+                const ConfigResponseJson = await ConfigResponse.json();
+                if (ConfigResponseJson.code == 0) {
+                    return ConfigResponseJson?.data as OneBotConfig;
+                }
+            }
+        } catch (error) {
+            console.error('Error getting OB11 config:', error);
+        }
+        return {} as OneBotConfig;
+    }
+
+    public async SetOB11Config(config: OneBotConfig): Promise<boolean> {
+        try {
+            const ConfigResponse = await fetch(`${this.apiPrefix}/OB11Config/SetConfig`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ config: JSON.stringify(config) }),
+            });
+            if (ConfigResponse.status == 200) {
+                const ConfigResponseJson = await ConfigResponse.json();
+                if (ConfigResponseJson.code == 0) {
+                    return true;
+                }
+            }
+        } catch (error) {
+            console.error('Error setting OB11 config:', error);
+        }
+        return false;
+    }
+
+    public async checkQQLoginStatus(): Promise<boolean> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data.isLogin;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking QQ login status:', error);
+        }
+        return false;
+    }
+
+    public async checkWebUiLogined(): Promise<boolean> {
+        try {
+            const LoginResponse = await fetch(`${this.apiPrefix}/auth/check`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (LoginResponse.status == 200) {
+                const LoginResponseJson = await LoginResponse.json();
+                if (LoginResponseJson.code == 0) {
+                    return true;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking web UI login status:', error);
+        }
+        return false;
+    }
+
+    public async loginWithToken(token: string): Promise<string | null> {
+        try {
+            const loginResponse = await fetch(`${this.apiPrefix}/auth/login`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ token: token }),
+            });
+            const loginResponseJson = await loginResponse.json();
+            const retCode = loginResponseJson.code;
+            if (retCode === 0) {
+                this.retCredential = loginResponseJson.data.Credential;
+                return this.retCredential;
+            }
+        } catch (error) {
+            console.error('Error logging in with token:', error);
+        }
+        return null;
+    }
+
+    public async getQQLoginQrcode(): Promise<string> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/GetQQLoginQrcode`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data.qrcode || '';
+                }
+            }
+        } catch (error) {
+            console.error('Error getting QQ login QR code:', error);
+        }
+        return '';
+    }
+
+    public async getQQQuickLoginList(): Promise<string[]> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/GetQuickLoginList`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data || [];
+                }
+            }
+        } catch (error) {
+            console.error('Error getting QQ quick login list:', error);
+        }
+        return [];
+    }
+
+    public async setQuickLogin(uin: string): Promise<{ result: boolean; errMsg: string }> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/SetQuickLogin`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ uin: uin }),
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return { result: true, errMsg: '' };
+                } else {
+                    return { result: false, errMsg: QQLoginResponseJson.message };
+                }
+            }
+        } catch (error) {
+            console.error('Error setting quick login:', error);
+        }
+        return { result: false, errMsg: '接口异常' };
+    }
+}

napcat.webui/src/components/Dashboard.vue

@@ -0,0 +1,55 @@
+<template>
+    <div class="dashboard-container">
+        <SidebarMenu :menu-items="menuItems" class="sidebar-menu" />
+        <div class="content">
+            <router-view />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import SidebarMenu from './webui/Nav.vue';
+
+interface MenuItem {
+    value: string;
+    icon: string;
+    label: string;
+    route: string;
+}
+
+const menuItems = ref<MenuItem[]>([
+    { value: 'item1', icon: 'dashboard', label: '基础信息', route: '/dashboard/basic-info' },
+    { value: 'item3', icon: 'wifi-1', label: '网络配置', route: '/dashboard/network-config' },
+    { value: 'item4', icon: 'setting', label: '其余配置', route: '/dashboard/other-config' },
+    { value: 'item5', icon: 'system-log', label: '日志查看', route: '/dashboard/log-view' },
+    { value: 'item6', icon: 'info-circle', label: '关于我们', route: '/dashboard/about-us' },
+]);
+</script>
+
+<style scoped>
+.dashboard-container {
+    display: flex;
+    flex-direction: row;
+    height: 100vh;
+}
+
+.sidebar-menu {
+    position: relative;
+    z-index: 2;
+}
+
+.content {
+    flex: 1;
+    /* padding: 20px; */
+    overflow: auto;
+    position: relative;
+    z-index: 1;
+}
+
+@media (max-width: 768px) {
+    .content {
+        padding: 10px;
+    }
+}
+</style>

napcat.webui/src/components/QQLogin.vue

@@ -0,0 +1,167 @@
+<template>
+    <div class="login-container">
+        <h2 class="sotheby-font">QQ Login</h2>
+        <div class="login-methods">
+            <t-button
+                id="quick-login"
+                class="login-method"
+                :class="{ active: loginMethod === 'quick' }"
+                @click="loginMethod = 'quick'"
+                >Quick Login</t-button
+            >
+            <t-button
+                id="qrcode-login"
+                class="login-method"
+                :class="{ active: loginMethod === 'qrcode' }"
+                @click="loginMethod = 'qrcode'"
+                >QR Code</t-button
+            >
+        </div>
+        <div v-show="loginMethod === 'quick'" id="quick-login-dropdown" class="login-form">
+            <t-select
+                id="quick-login-select"
+                v-model="selectedAccount"
+                placeholder="Select Account"
+                @change="selectAccount"
+            >
+                <t-option v-for="account in quickLoginList" :key="account" :value="account">{{ account }}</t-option>
+            </t-select>
+        </div>
+        <div v-show="loginMethod === 'qrcode'" id="qrcode" class="qrcode">
+            <canvas ref="qrcodeCanvas"></canvas>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import * as QRCode from 'qrcode';
+import { useRouter } from 'vue-router';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { QQLoginManager } from '@/backend/shell';
+
+const router = useRouter();
+const loginMethod = ref<'quick' | 'qrcode'>('quick');
+const quickLoginList = ref<string[]>([]);
+const selectedAccount = ref<string>('');
+const qrcodeCanvas = ref<HTMLCanvasElement | null>(null);
+const qqLoginManager = new QQLoginManager(localStorage.getItem('auth') || '');
+let heartBeatTimer: number | null = null;
+
+const selectAccount = async (accountName: string): Promise<void> => {
+    const { result, errMsg } = await qqLoginManager.setQuickLogin(accountName);
+    if (result) {
+        await MessagePlugin.success('登录成功即将跳转');
+        await router.push({ path: '/dashboard/basic-info' });
+    } else {
+        await MessagePlugin.error('登录失败,' + errMsg);
+    }
+};
+
+const generateQrCode = (data: string, canvas: HTMLCanvasElement | null): void => {
+    if (!canvas) {
+        console.error('Canvas element not found');
+        return;
+    }
+    QRCode.toCanvas(canvas, data, function (error: Error | null | undefined) {
+        if (error) {
+            console.error('Error generating QR Code:', error);
+        } else {
+            console.log('QR Code generated!');
+        }
+    });
+};
+
+const HeartBeat = async (): Promise<void> => {
+    const isLogined = await qqLoginManager.checkQQLoginStatus();
+    if (isLogined) {
+        if (heartBeatTimer) {
+            clearInterval(heartBeatTimer);
+        }
+        await router.push({ path: '/dashboard/basic-info' });
+    }
+};
+
+const InitPages = async (): Promise<void> => {
+    quickLoginList.value = await qqLoginManager.getQQQuickLoginList();
+    const qrcodeData = await qqLoginManager.getQQLoginQrcode();
+    generateQrCode(qrcodeData, qrcodeCanvas.value);
+    heartBeatTimer = window.setInterval(HeartBeat, 3000);
+};
+
+onMounted(() => {
+    InitPages();
+});
+</script>
+
+<style scoped>
+.login-container {
+    padding: 20px;
+    border-radius: 5px;
+    background-color: white;
+    max-width: 400px;
+    min-width: 300px;
+    position: relative;
+    margin: 0 auto;
+}
+
+@media (max-width: 600px) {
+    .login-container {
+        width: 90%;
+        min-width: unset;
+    }
+}
+
+.login-methods {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+}
+
+.login-method {
+    padding: 10px 15px;
+    font-size: 16px;
+    cursor: pointer;
+    transition: all 0.3s;
+}
+
+.login-method.active {
+    background-color: #e6f0ff;
+    color: #007bff;
+}
+
+.login-form,
+.qrcode {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+.qrcode {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 15px;
+    text-align: center;
+}
+
+.sotheby-font {
+    font-family: Sotheby, Helvetica, monospace;
+    font-size: 3.125rem;
+    line-height: 1.2;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.footer {
+    text-align: center;
+    margin: 0;
+    font-size: 0.875rem;
+    color: #888;
+    position: fixed;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+    width: 100%;
+    background-color: white;
+}
+</style>

napcat.webui/src/components/WebUiLogin.vue

@@ -0,0 +1,151 @@
+<template>
+    <div class="login-container">
+        <h2 class="sotheby-font">WebUi Login</h2>
+        <t-form ref="form" :data="formData" colon :label-width="0" @submit="onSubmit">
+            <t-form-item name="password">
+                <t-input v-model="formData.token" type="password" clearable placeholder="请输入Token">
+                    <template #prefix-icon>
+                        <lock-on-icon />
+                    </template>
+                </t-input>
+            </t-form-item>
+            <t-form-item>
+                <t-button theme="primary" type="submit" block>登录</t-button>
+            </t-form-item>
+        </t-form>
+    </div>
+    <div class="footer">Power By NapCat.WebUi</div>
+</template>
+
+<script setup lang="ts">
+import '../css/style.css';
+import '../css/font.css';
+import { reactive, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { LockOnIcon } from 'tdesign-icons-vue-next';
+import { useRouter } from 'vue-router';
+import { QQLoginManager } from '@/backend/shell';
+
+const router = useRouter();
+
+interface FormData {
+    token: string;
+}
+
+const formData: FormData = reactive({
+    token: '',
+});
+
+const handleLoginSuccess = async (credential: string) => {
+    localStorage.setItem('auth', credential);
+    await checkLoginStatus();
+};
+
+const handleLoginFailure = (message: string) => {
+    MessagePlugin.error(message);
+};
+
+const checkLoginStatus = async () => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        return;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    const isWenUiLoggedIn = await loginManager.checkWebUiLogined();
+    console.log('isWenUiLoggedIn', isWenUiLoggedIn);
+    if (!isWenUiLoggedIn) {
+        return;
+    }
+
+    const isQQLoggedIn = await loginManager.checkQQLoginStatus();
+    if (isQQLoggedIn) {
+        await router.push({ path: '/dashboard/basic-info' });
+    } else {
+        await router.push({ path: '/qqlogin' });
+    }
+};
+
+const loginWithToken = async (token: string) => {
+    const loginManager = new QQLoginManager('');
+    const credential = await loginManager.loginWithToken(token);
+    if (credential) {
+        await handleLoginSuccess(credential);
+    } else {
+        handleLoginFailure('登录失败，请检查Token');
+    }
+};
+
+onMounted(() => {
+    const url = new URL(window.location.href);
+    const token = url.searchParams.get('token');
+    if (token) {
+        loginWithToken(token);
+    }
+    checkLoginStatus();
+});
+
+const onSubmit = async ({ validateResult }: { validateResult: boolean }) => {
+    if (validateResult) {
+        await loginWithToken(formData.token);
+    } else {
+        handleLoginFailure('请填写Token');
+    }
+};
+</script>
+
+<style scoped>
+.login-container {
+    padding: 20px;
+    border-radius: 5px;
+    background-color: white;
+    max-width: 400px;
+    min-width: 300px;
+    position: relative;
+    margin: 0 auto;
+}
+
+@media (max-width: 600px) {
+    .login-container {
+        width: 90%;
+        min-width: unset;
+    }
+}
+
+.tdesign-demo-block-column {
+    display: flex;
+    flex-direction: column;
+    row-gap: 16px;
+}
+
+.tdesign-demo-block-column-large {
+    display: flex;
+    flex-direction: column;
+    row-gap: 32px;
+}
+
+.tdesign-demo-block-row {
+    display: flex;
+    column-gap: 16px;
+    align-items: center;
+}
+
+.sotheby-font {
+    font-family: Sotheby, Helvetica, monospace;
+    font-size: 3.125rem;
+    line-height: 1.2;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.footer {
+    text-align: center;
+    margin: 0;
+    font-size: 0.875rem;
+    color: #888;
+    position: fixed;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+    width: 100%;
+    background-color: white;
+}
+</style>

napcat.webui/src/components/webui/Nav.vue

@@ -0,0 +1,71 @@
+<template>
+    <t-menu theme="light" default-value="2-1" :collapsed="collapsed" class="sidebar-menu">
+        <template #logo> </template>
+        <router-link v-for="item in menuItems" :key="item.value" :to="item.route">
+            <t-menu-item :value="item.value" :disabled="item.disabled" class="menu-item">
+                <template #icon>
+                    <t-icon :name="item.icon" />
+                </template>
+                {{ item.label }}
+            </t-menu-item>
+        </router-link>
+        <template #operations>
+            <t-button class="t-demo-collapse-btn" variant="text" shape="square" @click="changeCollapsed">
+                <template #icon><t-icon :name="iconName" /></template>
+            </t-button>
+        </template>
+    </t-menu>
+</template>
+
+<script setup lang="ts">
+import { ref, defineProps } from 'vue';
+
+type MenuItem = {
+    value: string;
+    label: string;
+    route: string;
+    icon?: string;
+    disabled?: boolean;
+};
+
+defineProps<{
+    menuItems: MenuItem[];
+}>();
+
+const collapsed = ref<boolean>(localStorage.getItem('sidebar-collapsed') === 'true');
+const iconName = ref<string>(collapsed.value ? 'menu-unfold' : 'menu-fold');
+
+const changeCollapsed = (): void => {
+    collapsed.value = !collapsed.value;
+    iconName.value = collapsed.value ? 'menu-unfold' : 'menu-fold';
+    localStorage.setItem('sidebar-collapsed', collapsed.value.toString());
+};
+</script>
+
+<style scoped>
+.sidebar-menu {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 200px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+@media (max-width: 768px) {
+    .sidebar-menu {
+        width: 100px; /* 移动端侧边栏宽度 */
+    }
+}
+
+.logo-text {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.menu-item {
+    margin-bottom: 10px;
+}
+</style>

napcat.webui/src/css/font.css

@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'Sotheby';
+  src: url('../assets/Sotheby.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}

napcat.webui/src/css/style.css

@@ -0,0 +1,84 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+
+button:hover {
+  border-color: #646cff;
+}
+
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+
+  a:hover {
+    color: #747bff;
+  }
+
+  button {
+    background-color: #f9f9f9;
+  }
+}

napcat.webui/src/main.ts

@@ -0,0 +1,62 @@
+import { createApp } from 'vue';
+import App from './App.vue';
+import {
+    Button as TButton,
+    Input as TInput,
+    Form as TForm,
+    FormItem as TFormItem,
+    Select as TSelect,
+    Option as TOption,
+    Menu as TMenu,
+    MenuItem as TMenuItem,
+    Icon as TIcon,
+    Submenu as TSubmenu,
+    Col as TCol,
+    Row as TRow,
+    Card as TCard,
+    Divider as TDivider,
+    Link as TLink,
+    List as TList,
+    Alert as TAlert,
+    Tag as TTag,
+    ListItem as TListItem,
+    Tabs as TTabs,
+    TabPanel as TTabPanel,
+    Space as TSpace,
+    Checkbox as TCheckbox,
+    Popup as TPopup,
+    Dialog as TDialog,
+    Switch as TSwitch,
+} from 'tdesign-vue-next';
+import { router } from './router';
+import 'tdesign-vue-next/es/style/index.css';
+
+const app = createApp(App);
+app.use(router);
+app.use(TButton);
+app.use(TInput);
+app.use(TForm);
+app.use(TFormItem);
+app.use(TSelect);
+app.use(TOption);
+app.use(TMenu);
+app.use(TMenuItem);
+app.use(TIcon);
+app.use(TSubmenu);
+app.use(TCol);
+app.use(TRow);
+app.use(TCard);
+app.use(TDivider);
+app.use(TLink);
+app.use(TList);
+app.use(TAlert);
+app.use(TTag);
+app.use(TListItem);
+app.use(TTabs);
+app.use(TTabPanel);
+app.use(TSpace);
+app.use(TCheckbox);
+app.use(TPopup);
+app.use(TDialog);
+app.use(TSwitch);
+app.mount('#app');

napcat.webui/src/pages/AboutUs.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="about-us">
+        <div>
+            <t-divider content="面板关于信息" align="left" />
+            <t-alert theme="success" message="NapCat.WebUi is running" />
+            <t-list class="list">
+                <t-list-item class="list-item">
+                    <span class="item-label">开发人员:</span>
+                    <span class="item-content">
+                        <t-link href="mailto:nanaeonn@outlook.com">Mlikiowa</t-link>
+                    </span>
+                </t-list-item>
+                <t-list-item class="list-item">
+                    <span class="item-label">版本信息:</span>
+                    <span class="item-content">
+                        <t-tag class="tag-item" theme="success"> WebUi: {{ pkg.version }} </t-tag>
+                        <t-tag class="tag-item" theme="success"> NapCat: {{ napCatVersion }} </t-tag>
+                        <t-tag class="tag-item" theme="success">
+                            TDesign: {{ pkg.dependencies['tdesign-vue-next'] }}
+                        </t-tag>
+                    </span>
+                </t-list-item>
+            </t-list>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import pkg from '../../package.json';
+import { napCatVersion } from '../../../src/common/version';
+</script>
+
+<style scoped>
+.about-us {
+    padding: 20px;
+    text-align: left;
+}
+
+.list {
+    display: flex;
+    flex-direction: column;
+}
+
+.list-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.item-label {
+    flex: 1;
+    font-weight: bold;
+}
+
+.item-content {
+    flex: 2;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+}
+
+.tag-item {
+    margin-right: 10px;
+    margin-bottom: 10px;
+}
+</style>

napcat.webui/src/pages/BasicInfo.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="basic-info">
+        <h1>面板基础信息</h1>
+        <p>这里显示面板的基础信息。</p>
+    </div>
+</template>

napcat.webui/src/pages/Log.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="log-view">
+        <h1>面板日志信息</h1>
+        <p>这里显示面板的日志信息。</p>
+    </div>
+</template>

napcat.webui/src/pages/NetWork.vue

@@ -0,0 +1,249 @@
+<template>
+    <t-space class="full-space">
+        <template v-if="clientPanelData.length > 0">
+            <t-tabs
+                v-model="activeTab"
+                :addable="true"
+                theme="card"
+                @add="showAddTabDialog"
+                @remove="removeTab"
+                class="full-tabs"
+            >
+                <t-tab-panel
+                    v-for="(config, idx) in clientPanelData"
+                    :key="idx"
+                    :label="config.name"
+                    :removable="true"
+                    :value="idx"
+                    class="full-tab-panel"
+                >
+                    <component :is="resolveDynamicComponent(getComponent(config.key))" :config="config.data" />
+                    <div class="button-container">
+                        <t-button @click="saveConfig" style="width: 100px; height: 40px">保存</t-button>
+                    </div>
+                </t-tab-panel>
+            </t-tabs>
+        </template>
+        <template v-else>
+            <EmptyStateComponent :showAddTabDialog="showAddTabDialog" />
+        </template>
+        <t-dialog
+            v-model:visible="isDialogVisible"
+            header="添加网络配置"
+            @close="isDialogVisible = false"
+            @confirm="addTab"
+        >
+            <t-form ref="form" :model="newTab">
+                <t-form-item :rules="[{ required: true, message: '请输入名称' }]" label="名称" name="name">
+                    <t-input v-model="newTab.name" />
+                </t-form-item>
+                <t-form-item :rules="[{ required: true, message: '请选择类型' }]" label="类型" name="type">
+                    <t-select v-model="newTab.type">
+                        <t-option value="httpServers">HTTP 服务器</t-option>
+                        <t-option value="httpClients">HTTP 客户端</t-option>
+                        <t-option value="websocketServers">WebSocket 服务器</t-option>
+                        <t-option value="websocketClients">WebSocket 客户端</t-option>
+                    </t-select>
+                </t-form-item>
+            </t-form>
+        </t-dialog>
+    </t-space>
+</template>
+
+<script setup lang="ts">
+import { ref, resolveDynamicComponent, nextTick, Ref, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import {
+    httpServerDefaultConfigs,
+    httpClientDefaultConfigs,
+    websocketServerDefaultConfigs,
+    websocketClientDefaultConfigs,
+    HttpClientConfig,
+    HttpServerConfig,
+    WebsocketClientConfig,
+    WebsocketServerConfig,
+    NetworkConfig,
+    OneBotConfig,
+    mergeOneBotConfigs,
+} from '../../../src/onebot/config/config';
+import { QQLoginManager } from '@/backend/shell';
+import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
+import HttpClientComponent from '@/pages/network/HttpClientComponent.vue';
+import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.vue';
+import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
+import EmptyStateComponent from '@/pages/network/EmptyStateComponent.vue';
+
+type ConfigKey = 'httpServers' | 'httpClients' | 'websocketServers' | 'websocketClients';
+type ConfigUnion = HttpClientConfig | HttpServerConfig | WebsocketServerConfig | WebsocketClientConfig;
+type ComponentUnion =
+    | typeof HttpServerComponent
+    | typeof HttpClientComponent
+    | typeof WebsocketServerComponent
+    | typeof WebsocketClientComponent;
+
+const componentMap: Record<ConfigKey, ComponentUnion> = {
+    httpServers: HttpServerComponent,
+    httpClients: HttpClientComponent,
+    websocketServers: WebsocketServerComponent,
+    websocketClients: WebsocketClientComponent,
+};
+
+const defaultConfigMap: Record<ConfigKey, ConfigUnion> = {
+    httpServers: httpServerDefaultConfigs,
+    httpClients: httpClientDefaultConfigs,
+    websocketServers: websocketServerDefaultConfigs,
+    websocketClients: websocketClientDefaultConfigs,
+};
+
+interface ConfigMap {
+    httpServers: HttpServerConfig;
+    httpClients: HttpClientConfig;
+    websocketServers: WebsocketServerConfig;
+    websocketClients: WebsocketClientConfig;
+}
+
+interface ClientPanel<K extends ConfigKey = ConfigKey> {
+    name: string;
+    key: K;
+    data: ConfigMap[K];
+}
+
+const activeTab = ref<number>(0);
+const isDialogVisible = ref(false);
+const newTab = ref<{ name: string; type: ConfigKey }>({ name: '', type: 'httpServers' });
+const clientPanelData: Ref<ClientPanel[]> = ref([]);
+
+const getComponent = (type: ConfigKey) => {
+    return componentMap[type];
+};
+
+const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        console.error('No stored credential found');
+        return;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    return await loginManager.GetOB11Config();
+};
+
+const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        console.error('No stored credential found');
+        return false;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    return await loginManager.SetOB11Config(config);
+};
+
+const addToPanel = <K extends ConfigKey>(configs: ConfigMap[K][], key: K) => {
+    configs.forEach((config) => clientPanelData.value.push({ name: config.name, data: config, key }));
+};
+
+const addConfigDataToPanel = (data: NetworkConfig) => {
+    (Object.keys(data) as ConfigKey[]).forEach((key) => {
+        addToPanel(data[key], key);
+    });
+};
+
+const parsePanelData = (): NetworkConfig => {
+    const result: NetworkConfig = {
+        httpServers: [],
+        httpClients: [],
+        websocketServers: [],
+        websocketClients: [],
+    };
+    clientPanelData.value.forEach((panel) => {
+        (result[panel.key] as Array<typeof panel.data>).push(panel.data);
+    });
+    return result;
+};
+
+const loadConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (!userConfig) return;
+        const mergedConfig = mergeOneBotConfigs(userConfig);
+        addConfigDataToPanel(mergedConfig.network);
+    } catch (error) {
+        console.error('Error loading config:', error);
+    }
+};
+
+const saveConfig = async () => {
+    const config = parsePanelData();
+    const userConfig = await getOB11Config();
+    if (!userConfig) {
+        await MessagePlugin.error('无法获取配置！');
+        return;
+    }
+    userConfig.network = config;
+    const success = await setOB11Config(userConfig);
+    if (success) {
+        await MessagePlugin.success('配置保存成功');
+    } else {
+        await MessagePlugin.error('配置保存失败');
+    }
+};
+
+const showAddTabDialog = () => {
+    newTab.value = { name: '', type: 'httpServers' };
+    isDialogVisible.value = true;
+};
+
+const addTab = async () => {
+    const { name, type } = newTab.value;
+    if (clientPanelData.value.some((panel) => panel.name === name)) {
+        await MessagePlugin.error('选项卡名称已存在');
+        return;
+    }
+    const defaultConfig = structuredClone(defaultConfigMap[type]);
+    defaultConfig.name = name;
+    clientPanelData.value.push({ name, data: defaultConfig, key: type });
+    isDialogVisible.value = false;
+    await nextTick();
+    activeTab.value = clientPanelData.value.length - 1;
+    await MessagePlugin.success('选项卡添加成功');
+};
+
+const removeTab = async (payload: { value: string; index: number; e: PointerEvent }) => {
+    clientPanelData.value.splice(payload.index, 1);
+    activeTab.value = Math.max(0, activeTab.value - 1);
+    await saveConfig();
+};
+
+onMounted(() => {
+    loadConfig();
+});
+</script>
+
+<style scoped>
+.full-space {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+}
+
+.full-tabs {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.full-tab-panel {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.button-container {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+}
+</style>

napcat.webui/src/pages/OtherConfig.vue

@@ -0,0 +1,134 @@
+<template>
+    <div>
+        <t-divider content="其余配置" align="left" />
+    </div>
+    <div class="other-config-container">
+        <div class="other-config">
+            <t-form ref="form" :model="otherConfig" class="form">
+                <t-form-item label="音乐签名地址" name="musicSignUrl" class="form-item">
+                    <t-input v-model="otherConfig.musicSignUrl" />
+                </t-form-item>
+                <t-form-item label="启用本地文件到URL" name="enableLocalFile2Url" class="form-item">
+                    <t-switch v-model="otherConfig.enableLocalFile2Url" />
+                </t-form-item>
+            </t-form>
+            <div class="button-container">
+                <t-button @click="saveConfig">保存</t-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { OneBotConfig } from '../../../src/onebot/config/config';
+import { QQLoginManager } from '@/backend/shell';
+
+const otherConfig = ref<Partial<OneBotConfig>>({
+    musicSignUrl: '',
+    enableLocalFile2Url: false,
+});
+
+const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        console.error('No stored credential found');
+        return;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    return await loginManager.GetOB11Config();
+};
+
+const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        console.error('No stored credential found');
+        return false;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    return await loginManager.SetOB11Config(config);
+};
+
+const loadConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (userConfig) {
+            otherConfig.value.musicSignUrl = userConfig.musicSignUrl;
+            otherConfig.value.enableLocalFile2Url = userConfig.enableLocalFile2Url;
+        }
+    } catch (error) {
+        console.error('Error loading config:', error);
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (userConfig) {
+            userConfig.musicSignUrl = otherConfig.value.musicSignUrl || '';
+            userConfig.enableLocalFile2Url = otherConfig.value.enableLocalFile2Url ?? false;
+            const success = await setOB11Config(userConfig);
+            if (success) {
+                MessagePlugin.success('配置保存成功');
+            } else {
+                MessagePlugin.error('配置保存失败');
+            }
+        }
+    } catch (error) {
+        console.error('Error saving config:', error);
+        MessagePlugin.error('配置保存失败');
+    }
+};
+
+onMounted(() => {
+    loadConfig();
+});
+</script>
+
+<style scoped>
+.other-config-container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 20px;
+    box-sizing: border-box;
+}
+
+.other-config {
+    width: 100%;
+    max-width: 600px;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+}
+
+.form {
+    display: flex;
+    flex-direction: column;
+}
+
+.form-item {
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 20px;
+}
+
+.button-container {
+    display: flex;
+    justify-content: center;
+}
+
+@media (min-width: 768px) {
+    .form-item {
+        flex-direction: row;
+        align-items: center;
+    }
+
+    .form-item t-input,
+    .form-item t-switch {
+        flex: 1;
+        margin-left: 20px;
+    }
+}
+</style>

napcat.webui/src/pages/network/EmptyStateComponent.vue

@@ -0,0 +1,22 @@
+<template>
+    <div class="empty-state">
+        <p>当前没有网络配置</p>
+        <t-button @click="showAddTabDialog">添加网络配置</t-button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps } from 'vue';
+defineProps<{ showAddTabDialog: () => void }>();
+</script>
+
+<style scoped>
+.empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    text-align: center;
+}
+</style>

napcat.webui/src/pages/network/HttpClientComponent.vue

@@ -0,0 +1,68 @@
+<template>
+    <div class="container">
+        <div class="form-container">
+            <h3>HTTP Client 配置</h3>
+            <t-form>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
+                <t-form-item label="URL">
+                    <t-input v-model="config.url" />
+                </t-form-item>
+                <t-form-item label="消息格式">
+                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                </t-form-item>
+                <t-form-item label="报告自身消息">
+                    <t-checkbox v-model="config.reportSelfMessage" />
+                </t-form-item>
+                <t-form-item label="Token">
+                    <t-input v-model="config.token" />
+                </t-form-item>
+                <t-form-item label="调试模式">
+                    <t-checkbox v-model="config.debug" />
+                </t-form-item>
+            </t-form>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { HttpClientConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: HttpClientConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped>
+.container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 20px;
+    box-sizing: border-box;
+}
+
+.form-container {
+    width: 100%;
+    max-width: 600px;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+}
+</style>

napcat.webui/src/pages/network/HttpServerComponent.vue

@@ -0,0 +1,74 @@
+<template>
+    <div class="container">
+        <div class="form-container">
+            <h3>HTTP Server 配置</h3>
+            <t-form>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
+                <t-form-item label="端口">
+                    <t-input v-model.number="config.port" type="number" />
+                </t-form-item>
+                <t-form-item label="主机">
+                    <t-input v-model="config.host" type="text" />
+                </t-form-item>
+                <t-form-item label="启用 CORS">
+                    <t-checkbox v-model="config.enableCors" />
+                </t-form-item>
+                <t-form-item label="启用 WS">
+                    <t-checkbox v-model="config.enableWebsocket" />
+                </t-form-item>
+                <t-form-item label="消息格式">
+                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                </t-form-item>
+                <t-form-item label="Token">
+                    <t-input v-model="config.token" type="text" />
+                </t-form-item>
+                <t-form-item label="调试模式">
+                    <t-checkbox v-model="config.debug" />
+                </t-form-item>
+            </t-form>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { HttpServerConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: HttpServerConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped>
+.container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 20px;
+    box-sizing: border-box;
+}
+
+.form-container {
+    width: 100%;
+    max-width: 600px;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+}
+</style>

napcat.webui/src/pages/network/WebsocketClientComponent.vue

@@ -0,0 +1,71 @@
+<template>
+    <div class="container">
+        <div class="form-container">
+            <h3>WebSocket Client 配置</h3>
+            <t-form>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
+                <t-form-item label="URL">
+                    <t-input v-model="config.url" />
+                </t-form-item>
+                <t-form-item label="消息格式">
+                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                </t-form-item>
+                <t-form-item label="报告自身消息">
+                    <t-checkbox v-model="config.reportSelfMessage" />
+                </t-form-item>
+                <t-form-item label="Token">
+                    <t-input v-model="config.token" />
+                </t-form-item>
+                <t-form-item label="调试模式">
+                    <t-checkbox v-model="config.debug" />
+                </t-form-item>
+                <t-form-item label="心跳间隔">
+                    <t-input v-model.number="config.heartInterval" type="number" />
+                </t-form-item>
+            </t-form>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { WebsocketClientConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: WebsocketClientConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped>
+.container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 20px;
+    box-sizing: border-box;
+}
+
+.form-container {
+    width: 100%;
+    max-width: 600px;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+}
+</style>

napcat.webui/src/pages/network/WebsocketServerComponent.vue

@@ -0,0 +1,77 @@
+<template>
+    <div class="container">
+        <div class="form-container">
+            <h3>WebSocket Server 配置</h3>
+            <t-form>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
+                <t-form-item label="主机">
+                    <t-input v-model="config.host" />
+                </t-form-item>
+                <t-form-item label="端口">
+                    <t-input v-model.number="config.port" type="number" />
+                </t-form-item>
+                <t-form-item label="消息格式">
+                    <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+                </t-form-item>
+                <t-form-item label="上报自身消息">
+                    <t-checkbox v-model="config.reportSelfMessage" />
+                </t-form-item>
+                <t-form-item label="Token">
+                    <t-input v-model="config.token" />
+                </t-form-item>
+                <t-form-item label="强制推送事件">
+                    <t-checkbox v-model="config.enableForcePushEvent" />
+                </t-form-item>
+                <t-form-item label="调试模式">
+                    <t-checkbox v-model="config.debug" />
+                </t-form-item>
+                <t-form-item label="心跳间隔">
+                    <t-input v-model.number="config.heartInterval" type="number" />
+                </t-form-item>
+            </t-form>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: WebsocketServerConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped>
+.container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 20px;
+    box-sizing: border-box;
+}
+
+.form-container {
+    width: 100%;
+    max-width: 600px;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+}
+</style>

napcat.webui/src/router/index.ts

@@ -0,0 +1,32 @@
+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
+import Dashboard from '../components/Dashboard.vue';
+import BasicInfo from '../pages/BasicInfo.vue';
+import AboutUs from '../pages/AboutUs.vue';
+import LogView from '../pages/Log.vue';
+import NetWork from '../pages/NetWork.vue';
+import QQLogin from '../components/QQLogin.vue';
+import WebUiLogin from '../components/WebUiLogin.vue';
+import OtherConfig from '../pages/OtherConfig.vue';
+
+const routes: Array<RouteRecordRaw> = [
+    { path: '/', redirect: '/webui' },
+    { path: '/webui', component: WebUiLogin, name: 'WebUiLogin' },
+    { path: '/qqlogin', component: QQLogin, name: 'QQLogin' },
+    {
+        path: '/dashboard',
+        component: Dashboard,
+        children: [
+            { path: '', redirect: 'basic-info' },
+            { path: 'basic-info', component: BasicInfo, name: 'BasicInfo' },
+            { path: 'network-config', component: NetWork, name: 'NetWork' },
+            { path: 'log-view', component: LogView, name: 'LogView' },
+            { path: 'other-config', component: OtherConfig, name: 'OtherConfig' },
+            { path: 'about-us', component: AboutUs, name: 'AboutUs' },
+        ],
+    },
+];
+
+export const router = createRouter({
+    history: createWebHashHistory(),
+    routes,
+});

napcat.webui/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

napcat.webui/tsconfig.json

@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "target": "ESNext",
+        "jsx": "preserve",
+        "jsxImportSource": "vue",
+        "lib": [
+            "DOM",
+            "DOM.Iterable"
+        ],
+        "baseUrl": ".",
+        "module": "esnext",
+        "moduleResolution": "bundler",
+        "paths": {
+            "@/*": [
+                "src/*"
+            ]
+        },
+        "resolveJsonModule": true,
+        "types": [
+            "vite/client"
+        ],
+        "strict": true,
+        "strictNullChecks": true,
+        "noUnusedLocals": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true,
+        "isolatedModules": true,
+        "experimentalDecorators": true,
+        "useDefineForClassFields": true
+    },
+    "include": ["src"],
+    "exclude": ["node_modules"],
+    "references": [{"path": "./tsconfig.node.json"}]
+}

napcat.webui/tsconfig.node.json

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "composite": true,
+        "skipLibCheck": true,
+        "module": "ESNext",
+        "moduleResolution": "bundler",
+        "allowSyntheticDefaultImports": true,
+        "strictNullChecks": true
+    },
+    "include": ["vite.config.ts"]
+}

napcat.webui/vite.config.ts

@@ -0,0 +1,30 @@
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import path from 'path';
+
+// https://vite.dev/config/
+export default defineConfig({
+    plugins: [vue()],
+    base: './',
+    resolve: {
+        alias: {
+            '@': path.resolve(__dirname, 'src'),
+        },
+    },
+    server: {
+        proxy: {
+            '/api': 'http://localhost:6099',
+        },
+    },
+    build: {
+        rollupOptions: {
+            output: {
+                manualChunks(id) {
+                    if (id.includes('node_modules')) {
+                        return id.toString().split('node_modules/')[1].split('/')[0].toString();
+                    }
+                }
+            }
+        }
+    }
+});

package.json

@@ -1,65 +1,60 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "2.0.23",
-  "scripts": {
-    "build:framework": "vite build --mode framework",
-    "build:shell": "vite build --mode shell",
-    "build:webui": "cd ./src/webui && vite build",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/plugin": "^2.9.4",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.1",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-babel": "^1.2.0",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "ajv": "^8.13.0",
-    "async-mutex": "^0.5.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "json-schema-to-ts": "^3.1.0",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
-    "ws": "^8.18.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "4.1.5",
+  "scripts": {
+    "build:framework": "npm run build:webui && vite build --mode framework",
+    "build:shell": "npm run build:webui && vite build --mode shell",
+    "build:webui": "cd napcat.webui && vite build",
+    "dev:framework": "vite build --mode framework",
+    "dev:shell": "vite build --mode shell",
+    "dev:webui": "cd napcat.webui && npm run webui:dev",
+    "lint": "eslint --fix src/**/*.{js,ts,vue}",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@babel/preset-typescript": "^7.24.7",
+    "@eslint/compat": "^1.2.2",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@napneko/nap-proto-core": "^0.0.4",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^22.0.1",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "ajv": "^8.13.0",
+    "async-mutex": "^0.5.0",
+    "commander": "^12.1.0",
+    "cors": "^2.8.5",
+    "eslint": "^9.14.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "fast-xml-parser": "^4.3.6",
+    "file-type": "^19.0.0",
+    "globals": "^15.12.0",
+    "image-size": "^1.1.1",
+    "json-schema-to-ts": "^3.1.1",
+    "typescript": "^5.3.3",
+    "typescript-eslint": "^8.13.0",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-tsconfig-paths": "^5.1.0",
+    "winston": "^3.17.0"
+  },
+  "dependencies": {
+    "express": "^5.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "qrcode-terminal": "^0.12.0",
+    "silk-wasm": "^3.6.1",
+    "ws": "^8.18.0",
+    "piscina": "^4.7.0"
+  }
+}

script/BootWay.03.ps1

@@ -1,45 +0,0 @@
-# Dont Use This Script
-# 2024.7.3
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-
-if (!(Test-Path $QQpath)) {
-    throw "provided QQ path is invalid: $QQpath"
-}
-
-$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging }"

script/BootWay05.bat

@@ -1,90 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-where wt >nul 2>nul
-if %errorlevel% equ 0 (
-    wt "cmd" /c "%QQPath%" --enable-logging  %* 
-) else (
-    "%QQPath%" --enable-logging  %*
-)

script/BootWay05.ps1

@@ -1,123 +0,0 @@
-# 检查当前会话是否具有管理员权限
-function Test-Administrator {
-    $user = [Security.Principal.WindowsIdentity]::GetCurrent()
-    (New-Object Security.Principal.WindowsPrincipal $user).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
-}
-
-if (-not (Test-Administrator)) {
-    # 如果不是管理员，则重新启动脚本以管理员模式运行
-    $scriptPath = $myInvocation.MyCommand.Path
-    if (-not $scriptPath) {
-        $scriptPath = $PSCommandPath
-    }
-    $newProcess = New-Object System.Diagnostics.ProcessStartInfo "powershell";
-    $newProcess.Arguments = "-File `"$scriptPath`" $args"
-    $newProcess.Verb = "runas";
-    [System.Diagnostics.Process]::Start($newProcess);
-    exit
-}
-
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-# 设置当前工作目录
-$scriptDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-Set-Location $scriptDirectory
-
-# 获取当前目录路径
-$currentPath = Get-Location
-
-# 替换\为/
-$currentPath = $currentPath -replace '\\', '/'
-
-# 生成JavaScript代码
-$jsCode = @"
-(async () => {
-    await import('file:///$currentPath/napcat.mjs');
-})();
-"@
-
-# 将JavaScript代码保存到文件中
-$jsFilePath = Join-Path $currentPath "loadScript.js"
-$jsCode | Out-File -FilePath $jsFilePath -Encoding UTF8
-
-Write-Output "JavaScript code has been generated and saved to $jsFilePath"
-# 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-$env:NAPCAT_PATH = $jsFilePath
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-# 拿不到QQ路径则退出
-if (!(Test-Path $QQpath)) {
-    Write-Output "provided QQ path is invalid: $QQpath"
-    Read-Host "Press any key to continue..."
-    exit
-}
-
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-
-# 收集dbghelp.dll路径和HASH信息
-$QQpath = Split-Path $QQpath
-$oldDllPath = Join-Path $QQpath "dbghelp.dll"
-$oldDllHash = Get-FileHash $oldDllPath -Algorithm MD5
-$newDllPath = Join-Path $currentPath "dbghelp.dll"
-$newDllHash = Get-FileHash $newDllPath -Algorithm MD5
-# 如果文件一致则跳过
-if ($oldDllHash.Hash -ne $newDllHash.Hash) {
-    $processes = Get-Process -Name QQ -ErrorAction SilentlyContinue
-    if ($processes) {
-        # 文件占用则退出
-        Write-Output "dbghelp.dll is in use by the following processes:"
-        $processes | ForEach-Object { Write-Output "$($_.Id) $($_.Name) $($_.Path)" }
-        Write-Output "dbghelp.dll is in use, cannot continue."
-        Read-Host "Press any key to continue..."
-        exit
-    } else {
-        # 文件未占用则尝试覆盖
-        try {
-            Copy-Item -Path "$newDllPath" -Destination "$oldDllPath" -Force
-            Write-Output "dbghelp.dll has been copied to $QQpath"
-        } catch {
-            Write-Output "Failed to copy dbghelp.dll: $_"
-            Read-Host "Press any key to continue..."
-            exit
-        }
-    }
-}
-
-# 带参数启动QQ
-try {
-    Start-Process powershell -ArgumentList '-noexit', '-noprofile', "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging $params}" -NoNewWindow -ErrorAction Stop
-} catch {
-    Write-Output "Failed to start process as administrator: $_"
-    Read-Host "Press any key to continue..."
-}

script/BootWay05.utf8.bat

@@ -1,93 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    where wt >nul 2>nul
-    if %errorlevel% equ 0 (
-        powershell -Command "Start-Process cmd -ArgumentList ' /c %~f0 %*' -Verb RunAs"
-    ) else (
-        powershell -Command "Start-Process wt -ArgumentList 'cmd /c %~f0 %*' -Verb RunAs"
-    )
-
-    REM wt "cmd" /c  "%~f0 %*"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-chcp 65001
-"%QQPath%" --enable-logging  %*

script/BootWay05_init.bat

@@ -1,77 +0,0 @@
-@echo off
-REM Check if the script is running as administrator
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM If not, restart the script in administrator mode
-    echo Requesting administrator privileges...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-cd /d %~dp0
-
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM Generate JavaScript code
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM Save JavaScript code to a file
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM Set NAPCAT_PATH environment variable to the address of loadScript.js in the current directory
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Get QQ path and cache it
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%b"
-)
-
-set "pathWithoutUninstall=%RetString:Uninstall.exe=%"
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-echo %QQPath%>qq_path_cache.txt
-echo QQ path %QQPath% has been cached to qq_path_cache.txt
-
-REM Exit if QQ path is invalid
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM Collect dbghelp.dll path and HASH information
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM Compare the HASH of the old and new dbghelp.dll, and replace the old one if they are different
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM If the file is in use, prompt the user to close QQ
-        echo dbghelp.dll is in use, please close QQ first.
-    ) else (
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Copy dbghelp.dll failed, please check and try again.
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been updated.
-            echo Please run BootWay05_run.bat to start QQ.
-            echo If you update QQ in the future, please run BootWay05_init.bat again.
-            pause
-            exit /b
-        )
-    )
-)

script/BootWay05_run.bat

@@ -1,10 +0,0 @@
-@echo off
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*

script/BootWay05_run.utf8.bat

@@ -1,13 +0,0 @@
-@echo off
-
-chcp 65001
-
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*

script/KillQQ.bat

@@ -0,0 +1,2 @@
+@echo off
+taskkill /f /im QQ.exe

script/checkVersion.cjs

@@ -4,16 +4,27 @@ const process = require("process");
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
 try {
   const packageJson = require("../package.json");
+  const manifsetJson = require("../manifest.json");
+
   const currentVersion = packageJson.version;
   const targetVersion = process.env.VERSION;
 
+  const manifestCurrentVersion = manifsetJson.version;
+  const manifestTargetVersion = process.env.VERSION;
+
   console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+  console.log("[NapCat] [CheckVersion] manifestCurrentVersion:", manifestCurrentVersion, "manifestTargetVersion:", manifestTargetVersion);
 
   // 验证 targetVersion 格式
   if (!targetVersion || typeof targetVersion !== 'string') {
     console.log("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
     return;
   }
+  // 验证 manifestTargetVersion 格式
+  if (!manifestTargetVersion || typeof manifestTargetVersion !== 'string') {
+    console.log("[NapCat] [CheckVersion] manifest目标版本格式不正确或未设置！");
+    return;
+  }
 
   // 写入脚本文件的统一函数
   const writeScriptToFile = (content) => {
@@ -21,7 +32,7 @@ try {
     console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
   };
 
-  if (currentVersion === targetVersion) {
+  if (currentVersion === targetVersion && manifestCurrentVersion === manifestTargetVersion) {
     // 不需要更新版本，写入一个简单的脚本
     const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
     writeScriptToFile(simpleScript);
@@ -29,11 +40,13 @@ try {
     // 更新版本，构建安全的sed命令
     const safeScriptContent = `
     #!/bin/bash
-    git config --global user.email "bot@test.wumiao.wang"
-    git config --global user.name "Version"
-    sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
+    git config --global user.email "nanaeonn@outlook.com"
+    git config --global user.name "Mlikiowa"
+    sed -i "s/\\"version\\": \\"${currentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" package.json
+    sed -i "s/\\"version\\": \\"${manifestCurrentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" manifest.json
+    sed -i "s/napCatVersion = '.*'/napCatVersion = '${targetVersion}'/g" ./src/common/version.ts
     git add .
-    git commit -m "chore:version change"
+    git commit -m "release: v${targetVersion}"
     git push -u origin main`;
     writeScriptToFile(safeScriptContent);
   }

src/common/audio-worker.ts

@@ -0,0 +1,9 @@
+import { encode } from "silk-wasm";
+
+export interface EncodeArgs {
+    input: ArrayBufferView | ArrayBuffer
+    sampleRate: number
+}
+export default async ({ input, sampleRate }: EncodeArgs) => {
+    return await encode(input, sampleRate);
+};

src/common/audio.ts

@@ -0,0 +1,102 @@
+import Piscina from 'piscina';
+import fsPromise from 'fs/promises';
+import path from 'node:path';
+import { randomUUID } from 'crypto';
+import { spawn } from 'node:child_process';
+import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
+import { LogWrapper } from './log';
+import { EncodeArgs } from "@/common/audio-worker";
+
+const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
+const EXIT_CODES = [0, 255];
+const FFMPEG_PATH = process.env.FFMPEG_PATH ?? 'ffmpeg';
+
+async function getWorkerPath() {
+    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+}
+
+const piscina = new Piscina<EncodeArgs, EncodeResult>({
+    filename: await getWorkerPath(),
+});
+
+async function guessDuration(pttPath: string, logger: LogWrapper) {
+    const pttFileInfo = await fsPromise.stat(pttPath);
+    const duration = Math.max(1, Math.floor(pttFileInfo.size / 1024 / 3));  // 3kb/s
+    logger.log('通过文件大小估算语音的时长:', duration);
+    return duration;
+}
+
+async function convert(filePath: string, pcmPath: string, logger: LogWrapper): Promise<Buffer> {
+    return new Promise<Buffer>((resolve, reject) => {
+        const cp = spawn(FFMPEG_PATH, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
+        cp.on('error', (err: Error) => {
+            logger.log('FFmpeg处理转换出错: ', err.message);
+            reject(err);
+        });
+        cp.on('exit', async (code, signal) => {
+            if (code == null || EXIT_CODES.includes(code)) {
+                try {
+                    const data = await fsPromise.readFile(pcmPath);
+                    await fsPromise.unlink(pcmPath);
+                    resolve(data);
+                } catch (err) {
+                    reject(err);
+                }
+            } else {
+                logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
+                reject(new Error('FFmpeg处理转换失败'));
+            }
+        });
+    });
+}
+
+async function handleWavFile(
+    file: Buffer,
+    filePath: string,
+    pcmPath: string,
+    logger: LogWrapper
+): Promise<{ input: Buffer; sampleRate: number }> {
+    const { fmt } = getWavFileInfo(file);
+    if (!ALLOW_SAMPLE_RATE.includes(fmt.sampleRate)) {
+        return { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
+    }
+    return { input: file, sampleRate: fmt.sampleRate };
+}
+
+export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
+    try {
+        const file = await fsPromise.readFile(filePath);
+        const pttPath = path.join(TEMP_DIR, randomUUID());
+        if (!isSilk(file)) {
+            logger.log(`语音文件${filePath}需要转换成silk`);
+            const pcmPath = `${pttPath}.pcm`;
+            const { input, sampleRate } = isWav(file)
+                ? (await handleWavFile(file, filePath, pcmPath, logger))
+                : { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
+            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
+            logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
+            return {
+                converted: true,
+                path: pttPath,
+                duration: silk.duration / 1000,
+            };
+        } else {
+            let duration = 0;
+            try {
+                duration = getDuration(file) / 1000;
+            } catch (e: any) {
+                logger.log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
+                duration = await guessDuration(filePath, logger);
+            }
+            return {
+                converted: false,
+                path: filePath,
+                duration,
+            };
+        }
+    } catch (error: any) {
+        logger.logError.bind(logger)('convert silk failed', error.stack);
+        return {};
+    }
+}

src/common/config-base.ts

@@ -0,0 +1,74 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import type { NapCatCore } from '@/core';
+
+export abstract class ConfigBase<T> {
+    name: string;
+    core: NapCatCore;
+    configPath: string;
+    configData: T = {} as T;
+
+    protected constructor(name: string, core: NapCatCore, configPath: string, copy_default: boolean = true) {
+        this.name = name;
+        this.core = core;
+        this.configPath = configPath;
+        fs.mkdirSync(this.configPath, { recursive: true });
+        this.read(copy_default);
+    }
+
+    protected getKeys(): string[] | null {
+        // 决定 key 在json配置文件中的顺序
+        return null;
+    }
+
+    getConfigPath(pathName: string | undefined): string {
+        if (!pathName) {
+            const filename = `${this.name}.json`;
+            const mainPath = this.core.context.pathWrapper.binaryPath;
+            return path.join(mainPath, 'config', filename);
+        } else {
+            const filename = `${this.name}_${pathName}.json`;
+            return path.join(this.configPath, filename);
+        }
+    }
+
+    read(copy_default: boolean = true): T {
+        const logger = this.core.context.logger;
+        const configPath = this.getConfigPath(this.core.selfInfo.uin);
+        if (!fs.existsSync(configPath) && copy_default) {
+            try {
+                fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
+                logger.log(`[Core] [Config] 配置文件创建成功!\n`);
+            } catch (e: any) {
+                logger.logError.bind(logger)(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+            }
+        } else if (!fs.existsSync(configPath) && !copy_default) {
+            fs.writeFileSync(configPath, '{}');
+        }
+        try {
+            this.configData = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+            logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
+            return this.configData;
+        } catch (e: any) {
+            if (e instanceof SyntaxError) {
+                logger.logError.bind(logger)(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
+            } else {
+                logger.logError.bind(logger)(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
+            }
+            return {} as T;
+        }
+    }
+
+
+    save(newConfigData: T = this.configData) {
+        const logger = this.core.context.logger;
+        const selfInfo = this.core.selfInfo;
+        this.configData = newConfigData;
+        const configPath = this.getConfigPath(selfInfo.uin);
+        try {
+            fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
+        } catch (e: any) {
+            logger.logError.bind(logger)(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+        }
+    }
+}

src/common/event.ts

@@ -0,0 +1,267 @@
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+import { ListenerNamingMapping, ServiceNamingMapping } from '@/core';
+
+interface InternalMapKey {
+    timeout: number;
+    createtime: number;
+    func: (...arg: any[]) => any;
+    checker: ((...args: any[]) => boolean) | undefined;
+}
+
+type EnsureFunc<T> = T extends (...args: any) => any ? T : never;
+
+type FuncKeys<T> = Extract<
+    {
+        [K in keyof T]: EnsureFunc<T[K]> extends never ? never : K;
+    }[keyof T],
+    string
+>;
+
+export type ListenerClassBase = Record<string, string>;
+
+export class NTEventWrapper {
+    private readonly WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
+    private readonly listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+    private readonly EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+
+    constructor(
+        wrapperSession: NodeIQQNTWrapperSession,
+    ) {
+        this.WrapperSession = wrapperSession;
+    }
+
+    createProxyDispatch(ListenerMainName: string) {
+        const dispatcherListenerFunc = this.dispatcherListener.bind(this);
+        return new Proxy(
+            {},
+            {
+                get(target: any, prop: any, receiver: any) {
+                    if (typeof target[prop] === 'undefined') {
+                        // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+                        return (...args: any[]) => {
+                            dispatcherListenerFunc(ListenerMainName, prop, ...args).then();
+                        };
+                    }
+                    // 如果方法存在，正常返回
+                    return Reflect.get(target, prop, receiver);
+                },
+            },
+        );
+    }
+
+    createEventFunction<
+        Service extends keyof ServiceNamingMapping,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
+        T extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
+    >(eventName: `${Service}/${ServiceMethod}`): T | undefined {
+        const eventNameArr = eventName.split('/');
+        type eventType = {
+            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> };
+        };
+        if (eventNameArr.length > 1) {
+            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+            const eventName = eventNameArr[1];
+            const services = (this.WrapperSession as unknown as eventType)[serviceName]();
+            let event = services[eventName];
+            //重新绑定this
+            event = event.bind(services);
+            if (event) {
+                return event as T;
+            }
+            return undefined;
+        }
+    }
+
+    createListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+        const existListener = this.listenerManager.get(listenerMainName + uniqueCode);
+        if (!existListener) {
+            const Listener = this.createProxyDispatch(listenerMainName);
+            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
+            const Service = `NodeIKernel${ServiceSubName}Service/addKernel${ServiceSubName}Listener`;
+            // eslint-disable-next-line
+            // @ts-ignore
+            this.createEventFunction(Service)(Listener as T);
+            this.listenerManager.set(listenerMainName + uniqueCode, Listener);
+            return Listener as T;
+        }
+        return existListener as T;
+    }
+
+    //统一回调清理事件
+    async dispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+        this.EventTask.get(ListenerMainName)
+            ?.get(ListenerSubName)
+            ?.forEach((task, uuid) => {
+                if (task.createtime + task.timeout < Date.now()) {
+                    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
+                    return;
+                }
+                if (task?.checker?.(...args)) {
+                    task.func(...args);
+                }
+            });
+    }
+
+    async callNoListenerEvent<
+        Service extends keyof ServiceNamingMapping,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
+    >(
+        serviceAndMethod: `${Service}/${ServiceMethod}`,
+        ...args: Parameters<EventType>
+    ): Promise<Awaited<ReturnType<EventType>>> {
+        return (this.createEventFunction(serviceAndMethod))!(...args);
+    }
+
+    async registerListen<
+        Listener extends keyof ListenerNamingMapping,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>,
+    >(
+        listenerAndMethod: `${Listener}/${ListenerMethod}`,
+        checker: (...args: Parameters<ListenerType>) => boolean,
+        waitTimes = 1,
+        timeout = 5000,
+    ) {
+        return new Promise<Parameters<ListenerType>>((resolve, reject) => {
+            const ListenerNameList = listenerAndMethod.split('/');
+            const ListenerMainName = ListenerNameList[0];
+            const ListenerSubName = ListenerNameList[1];
+            const id = randomUUID();
+            let complete = 0;
+            let retData: Parameters<ListenerType> | undefined = undefined;
+
+            function sendDataCallback() {
+                if (complete == 0) {
+                    reject(new Error(' ListenerName:' + listenerAndMethod + ' timeout'));
+                } else {
+                    resolve(retData!);
+                }
+            }
+
+            const timeoutRef = setTimeout(sendDataCallback, timeout);
+            const eventCallback = {
+                timeout: timeout,
+                createtime: Date.now(),
+                checker: checker,
+                func: (...args: Parameters<ListenerType>) => {
+                    complete++;
+                    retData = args;
+                    if (complete >= waitTimes) {
+                        clearTimeout(timeoutRef);
+                        sendDataCallback();
+                    }
+                },
+            };
+            if (!this.EventTask.get(ListenerMainName)) {
+                this.EventTask.set(ListenerMainName, new Map());
+            }
+            if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
+                this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+            }
+            this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
+            this.createListenerFunction(ListenerMainName);
+        });
+    }
+
+    async callNormalEventV2<
+        Service extends keyof ServiceNamingMapping,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
+        Listener extends keyof ListenerNamingMapping,
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>
+    >(
+        serviceAndMethod: `${Service}/${ServiceMethod}`,
+        listenerAndMethod: `${Listener}/${ListenerMethod}`,
+        args: Parameters<EventType>,
+        checkerEvent: (ret: Awaited<ReturnType<EventType>>) => boolean = () => true,
+        checkerListener: (...args: Parameters<ListenerType>) => boolean = () => true,
+        callbackTimesToWait = 1,
+        timeout = 5000,
+    ) {
+        const id = randomUUID();
+        let complete = 0;
+        let retData: Parameters<ListenerType> | undefined = undefined;
+        let retEvent: any = {};
+
+        function sendDataCallback(resolve: any, reject: any) {
+            if (complete == 0) {
+                reject(
+                    new Error(
+                        'Timeout: NTEvent serviceAndMethod:' +
+                        serviceAndMethod +
+                        ' ListenerName:' +
+                        listenerAndMethod +
+                        ' EventRet:\n' +
+                        JSON.stringify(retEvent, null, 4) +
+                        '\n',
+                    ),
+                );
+            } else {
+                resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+            }
+        }
+
+        const ListenerNameList = listenerAndMethod.split('/');
+        const ListenerMainName = ListenerNameList[0];
+        const ListenerSubName = ListenerNameList[1];
+
+        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
+            (resolve, reject) => {
+                const timeoutRef = setTimeout(() => sendDataCallback(resolve, reject), timeout);
+
+                const eventCallback = {
+                    timeout: timeout,
+                    createtime: Date.now(),
+                    checker: checkerListener,
+                    func: (...args: any[]) => {
+                        complete++;
+                        retData = args as Parameters<ListenerType>;
+                        if (complete >= callbackTimesToWait) {
+                            clearTimeout(timeoutRef);
+                            sendDataCallback(resolve, reject);
+                        }
+                    },
+                };
+                if (!this.EventTask.get(ListenerMainName)) {
+                    this.EventTask.set(ListenerMainName, new Map());
+                }
+                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
+                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+                }
+                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
+                this.createListenerFunction(ListenerMainName);
+
+                let eventResult = this.createEventFunction(serviceAndMethod)!(...(args));
+
+                const eventRetHandle = (eventData: any) => {
+                    retEvent = eventData;
+                    if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
+                        clearTimeout(timeoutRef);
+                        reject(
+                            new Error(
+                                'EventChecker Failed: NTEvent serviceAndMethod:' +
+                                serviceAndMethod +
+                                ' ListenerName:' +
+                                listenerAndMethod +
+                                ' EventRet:\n' +
+                                JSON.stringify(retEvent, null, 4) +
+                                '\n',
+                            ),
+                        );
+                    }
+                }
+                if (eventResult instanceof Promise) {
+                    eventResult.then((eventResult: any) => {
+                        eventRetHandle(eventResult);
+                    })
+                        .catch(reject);
+                } else {
+                    eventRetHandle(eventResult);
+                }
+            },
+        );
+    }
+}

src/common/file.ts

@@ -1,10 +1,10 @@
 import fs from 'fs';
-import fsPromise, { stat } from 'fs/promises';
+import { stat } from 'fs/promises';
 import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import * as fileType from 'file-type';
-import { LogWrapper } from './log';
+import { solveProblem } from './helper';
 
 export function isGIF(path: string) {
     const buffer = Buffer.alloc(4);
@@ -94,7 +94,6 @@ export async function file2base64(path: string) {
     return result;
 }
 
-
 export function calculateFileMD5(filePath: string): Promise<string> {
     return new Promise((resolve, reject) => {
         // 创建一个流式读取器
@@ -124,16 +123,15 @@ export interface HttpDownloadOptions {
     headers?: Record<string, string> | string;
 }
 
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-    const chunks: Buffer[] = [];
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
+    // const chunks: Buffer[] = [];
     let url: string;
     let headers: Record<string, string> = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
     };
     if (typeof options === 'string') {
         url = options;
-        const host = new URL(url).hostname;
-        headers['Host'] = host;
+        headers['Host'] = new URL(url).hostname;
     } else {
         url = options.url;
         if (options.headers) {
@@ -144,15 +142,26 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
             }
         }
     }
+    if (useReferer && !headers['Referer']) {
+        headers['Referer'] = url;
+    }
     const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
         throw err;
     });
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
+    return fetchRes;
+}
 
-    const blob = await fetchRes.blob();
+export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+    const useReferer = typeof options === 'string';
+    let resp = await tryDownload(options);
+    if (resp.status === 403 && useReferer) {
+        resp = await tryDownload(options, true);
+    }
+    if (!resp.ok) throw new Error(`下载文件失败: ${resp.statusText}`);
+    const blob = await resp.blob();
     const buffer = await blob.arrayBuffer();
     return Buffer.from(buffer);
 }
@@ -162,9 +171,9 @@ type Uri2LocalRes = {
     errMsg: string,
     fileName: string,
     ext: string,
-    path: string,
-    isLocal: boolean
+    path: string
 }
+
 export async function checkFileV2(filePath: string) {
     try {
         const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
@@ -178,67 +187,92 @@ export async function checkFileV2(filePath: string) {
     }
     return { success: false, ext: '', path: filePath };
 }
+
 export enum FileUriType {
     Unknown = 0,
     Local = 1,
     Remote = 2,
     Base64 = 3
 }
+
 export async function checkUriType(Uri: string) {
-    //先判断是否是本地文件
-    try {
-        if (fs.existsSync(Uri)) return { Uri: Uri, Type: FileUriType.Local };
-    } catch (error) {
-    }
-    try {
+
+    const LocalFileRet = await solveProblem((uri: string) => {
+        if (fs.existsSync(uri)) {
+            return { Uri: uri, Type: FileUriType.Local };
+        }
+        return undefined;
+    }, Uri);
+    if (LocalFileRet) return LocalFileRet;
+    const OtherFileRet = await solveProblem((uri: string) => {
         //再判断是否是Http
-        if (Uri.startsWith('http://') || Uri.startsWith('https://')) {
-            return { Uri: Uri, Type: FileUriType.Remote };
+        if (uri.startsWith('http://') || uri.startsWith('https://')) {
+            return { Uri: uri, Type: FileUriType.Remote };
         }
         //再判断是否是Base64
-        if (Uri.startsWith('base64://')) {
-            return { Uri: Uri, Type: FileUriType.Base64 };
+        if (uri.startsWith('base64://')) {
+            return { Uri: uri, Type: FileUriType.Base64 };
         }
-        if (Uri.startsWith('file://')) {
-            let pathname: string;
+        if (uri.startsWith('file://')) {
             let filePath: string;
-            // await fs.copyFile(url.pathname, filePath);
-            pathname = decodeURIComponent(new URL(Uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname + new URL(uri).hash);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {
                 filePath = pathname;
             }
+
             return { Uri: filePath, Type: FileUriType.Local };
         }
-    } catch (error) {
-    }
+        if (uri.startsWith('data:')) {
+            const data = uri.split(',')[1];
+            if (data) return { Uri: data, Type: FileUriType.Base64 };
+        }
+    }, Uri);
+    if (OtherFileRet) return OtherFileRet;
+
     return { Uri: Uri, Type: FileUriType.Unknown };
 }
+
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
-    let { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
+    const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
     //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议
 
     if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+        return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
     }
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
-        const filename = path.basename(HandledUri, fileExt);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+        let filename = path.basename(HandledUri, fileExt);
+        filename += fileExt;
+        //复制文件到临时文件并保持后缀
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //接下来都要有文件名
-    if (!filename) filename = randomUUID();
-    //解析Http和Https协议
-    if (UriType == FileUriType.Remote) {
-        const fileExt = path.extname(HandledUri);
 
-        const fileName = filename + fileExt;
-        const filePath = path.join(dir, fileName);
+    if (UriType == FileUriType.Remote) {
+        const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
+        if (pathInfo.name) {
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
+            if (pathInfo.ext) {
+                filename += pathInfo.ext;
+            }
+        }
+        filename = filename.replace(/[/\\:*?"<>|]/g, '_');
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
         const buffer = await httpDownload(HandledUri);
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: fileName, ext: fileExt, path: filePath, isLocal: true };
+        //没有文件就创建
+        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
     //解析Base64
     if (UriType == FileUriType.Base64) {
@@ -251,31 +285,9 @@ export async function uri2local(dir: string, uri: string, filename: string | und
         if (success) {
             filePath = fileTypePath;
             fileExt = ext;
-            filename = path.basename(filePath, fileExt);
+            filename = filename + '.' + ext;
         }
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
-    }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
-}
-export async function copyFolder(sourcePath: string, destPath: string, logger: LogWrapper) {
-    try {
-        const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true });
-        await fsPromise.mkdir(destPath, { recursive: true });
-        for (const entry of entries) {
-            const srcPath = path.join(sourcePath, entry.name);
-            const dstPath = path.join(destPath, entry.name);
-            if (entry.isDirectory()) {
-                await copyFolder(srcPath, dstPath, logger);
-            } else {
-                try {
-                    await fsPromise.copyFile(srcPath, dstPath);
-                } catch (error) {
-                    logger.logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
-                    // 这里可以决定是否要继续复制其他文件
-                }
-            }
-        }
-    } catch (error) {
-        logger.logError('复制文件夹时出错:', error);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
+    return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
 }

src/common/forward-msg-builder.ts

@@ -0,0 +1,114 @@
+import * as crypto from "node:crypto";
+import { PacketMsg } from "@/core/packet/message/message";
+
+interface ForwardMsgJson {
+    app: string
+    config: ForwardMsgJsonConfig,
+    desc: string,
+    extra: ForwardMsgJsonExtra,
+    meta: ForwardMsgJsonMeta,
+    prompt: string,
+    ver: string,
+    view: string
+}
+
+interface ForwardMsgJsonConfig {
+    autosize: number,
+    forward: number,
+    round: number,
+    type: string,
+    width: number
+}
+
+interface ForwardMsgJsonExtra {
+    filename: string,
+    tsum: number,
+}
+
+interface ForwardMsgJsonMeta {
+    detail: ForwardMsgJsonMetaDetail
+}
+
+interface ForwardMsgJsonMetaDetail {
+    news: {
+        text: string
+    }[],
+    resid: string,
+    source: string,
+    summary: string,
+    uniseq: string
+}
+
+interface ForwardAdaptMsg {
+    senderName?: string;
+    isGroupMsg?: boolean;
+    msg?: ForwardAdaptMsgElement[];
+}
+
+interface ForwardAdaptMsgElement {
+    preview?: string;
+}
+
+export class ForwardMsgBuilder {
+    private static build(resId: string, msg: ForwardAdaptMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        const id = crypto.randomUUID();
+        const isGroupMsg = msg.some(m => m.isGroupMsg);
+        if (!source) {
+            source = isGroupMsg ? "群聊的聊天记录" : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+        }
+        if (!news) {
+            news = msg.length === 0 ? [{
+                text: "Nya~ This message is send from NapCat.Packet!",
+            }] : msg.map(m => ({
+                text: `${m.senderName}: ${m.msg?.map(msg => msg.preview).join('')}`,
+            }));
+        }
+        if (!summary) {
+            summary = `查看${msg.length}条转发消息`;
+        }
+        if (!prompt) {
+            prompt = "[聊天记录]";
+        }
+        return {
+            app: "com.tencent.multimsg",
+            config: {
+                autosize: 1,
+                forward: 1,
+                round: 1,
+                type: "normal",
+                width: 300
+            },
+            desc: prompt,
+            extra: {
+                filename: id,
+                tsum: msg.length,
+            },
+            meta: {
+                detail: {
+                    news,
+                    resid: resId,
+                    source,
+                    summary,
+                    uniseq: id,
+                }
+            },
+            prompt,
+            ver: "0.0.0.5",
+            view: "contact",
+        };
+    }
+
+    static fromResId(resId: string): ForwardMsgJson {
+        return this.build(resId, []);
+    }
+
+    static fromPacketMsg(resId: string, packetMsg: PacketMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        return this.build(resId, packetMsg.map(msg => ({
+            senderName: msg.senderName,
+            isGroupMsg: msg.groupId !== undefined,
+            msg: msg.msg.map(m => ({
+                preview: m.valid ? m.toPreview() : "[该消息类型暂不支持查看]",
+            }))
+        })), source, news, summary, prompt);
+    }
+}

src/common/framework/event-legacy.ts

@@ -1,263 +0,0 @@
-import { NodeIQQNTWrapperSession } from '@/core/wrapper/wrapper';
-import { randomUUID } from 'crypto';
-
-interface Internal_MapKey {
-    timeout: number;
-    createtime: number;
-    func: (...arg: any[]) => any;
-    checker: ((...args: any[]) => boolean) | undefined;
-}
-
-export type ListenerClassBase = Record<string, string>;
-
-export interface ListenerIBase {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: any): ListenerClassBase;
-}
-
-export class LegacyNTEventWrapper {
-    private listenerMapping: Record<string, ListenerIBase>; //ListenerName-Unique -> Listener构造函数
-    private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
-    private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
-    private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
-
-    constructor(
-        listenerMapping: Record<string, ListenerIBase>,
-        wrapperSession: NodeIQQNTWrapperSession,
-    ) {
-        this.listenerMapping = listenerMapping;
-        this.WrapperSession = wrapperSession;
-    }
-
-    createProxyDispatch(ListenerMainName: string) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const current = this;
-        return new Proxy(
-            {},
-            {
-                get(target: any, prop: any, receiver: any) {
-                    // console.log('get', prop, typeof target[prop]);
-                    if (typeof target[prop] === 'undefined') {
-                        // 如果方法不存在，返回一个函数，这个函数调用existentMethod
-                        return (...args: any[]) => {
-                            current.dispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
-                        };
-                    }
-                    // 如果方法存在，正常返回
-                    return Reflect.get(target, prop, receiver);
-                },
-            },
-        );
-    }
-
-    createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-        const eventNameArr = eventName.split('/');
-        type eventType = {
-            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> };
-        };
-        if (eventNameArr.length > 1) {
-            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
-            const eventName = eventNameArr[1];
-            //getNodeIKernelGroupListener,GroupService
-            //console.log('2', eventName);
-            const services = (this.WrapperSession as unknown as eventType)[serviceName]();
-            let event = services[eventName];
-            //重新绑定this
-            event = event.bind(services);
-            if (event) {
-                return event as T;
-            }
-            return undefined;
-        }
-    }
-
-    createListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
-        const ListenerType = this.listenerMapping![listenerMainName];
-        let Listener = this.listenerManager.get(listenerMainName + uniqueCode);
-        if (!Listener && ListenerType) {
-            Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
-            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
-            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
-            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
-            addfunc!(Listener as T);
-            //console.log(addfunc!(Listener as T));
-            this.listenerManager.set(listenerMainName + uniqueCode, Listener);
-        }
-        return Listener as T;
-    }
-
-    //统一回调清理事件
-    async dispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-        //console.log("[EventDispatcher]",ListenerMainName, ListenerSubName, ...args);
-        this.EventTask.get(ListenerMainName)
-            ?.get(ListenerSubName)
-            ?.forEach((task, uuid) => {
-                //console.log(task.func, uuid, task.createtime, task.timeout);
-                if (task.createtime + task.timeout < Date.now()) {
-                    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
-                    return;
-                }
-                if (task.checker && task.checker(...args)) {
-                    task.func(...args);
-                }
-            });
-    }
-
-    async callNoListenerEvent<EventType extends (...args: any[]) => Promise<any> | any>(
-        EventName = '',
-        timeout: number = 3000,
-        ...args: Parameters<EventType>
-    ) {
-        return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            let complete = false;
-            setTimeout(() => {
-                if (!complete) {
-                    reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
-                }
-            }, timeout);
-            const retData = await EventFunc!(...args);
-            complete = true;
-            resolve(retData);
-        });
-    }
-
-    async RegisterListen<ListenerType extends (...args: any[]) => void>(
-        ListenerName = '',
-        waitTimes = 1,
-        timeout = 5000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-    ) {
-        return new Promise<Parameters<ListenerType>>((resolve, reject) => {
-            const ListenerNameList = ListenerName.split('/');
-            const ListenerMainName = ListenerNameList[0];
-            const ListenerSubName = ListenerNameList[1];
-            const id = randomUUID();
-            let complete = 0;
-            let retData: Parameters<ListenerType> | undefined = undefined;
-            const databack = () => {
-                if (complete == 0) {
-                    reject(new Error(' ListenerName:' + ListenerName + ' timeout'));
-                } else {
-                    resolve(retData!);
-                }
-            };
-            const timeoutRef = setTimeout(databack, timeout);
-            const eventCallbak = {
-                timeout: timeout,
-                createtime: Date.now(),
-                checker: checker,
-                func: (...args: Parameters<ListenerType>) => {
-                    complete++;
-                    retData = args;
-                    if (complete >= waitTimes) {
-                        clearTimeout(timeoutRef);
-                        databack();
-                    }
-                },
-            };
-            if (!this.EventTask.get(ListenerMainName)) {
-                this.EventTask.set(ListenerMainName, new Map());
-            }
-            if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
-                this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
-            }
-            this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
-            this.createListenerFunction(ListenerMainName);
-        });
-    }
-
-    async CallNormalEvent<
-        EventType extends (...args: any[]) => Promise<any>,
-        ListenerType extends (...args: any[]) => void
-    >(
-        EventName = '',
-        ListenerName = '',
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...args: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
-            async (resolve, reject) => {
-                const id = randomUUID();
-                let complete = 0;
-                let retData: Parameters<ListenerType> | undefined = undefined;
-                let retEvent: any = {};
-                const databack = () => {
-                    if (complete == 0) {
-                        reject(
-                            new Error(
-                                'Timeout: NTEvent EventName:' +
-                                EventName +
-                                ' ListenerName:' +
-                                ListenerName +
-                                ' EventRet:\n' +
-                                JSON.stringify(retEvent, null, 4) +
-                                '\n',
-                            ),
-                        );
-                    } else {
-                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                    }
-                };
-
-                const ListenerNameList = ListenerName.split('/');
-                const ListenerMainName = ListenerNameList[0];
-                const ListenerSubName = ListenerNameList[1];
-
-                const Timeouter = setTimeout(databack, timeout);
-
-                const eventCallbak = {
-                    timeout: timeout,
-                    createtime: Date.now(),
-                    checker: checker,
-                    func: (...args: any[]) => {
-                        complete++;
-                        //console.log('func', ...args);
-                        retData = args as Parameters<ListenerType>;
-                        if (complete >= waitTimes) {
-                            clearTimeout(Timeouter);
-                            databack();
-                        }
-                    },
-                };
-                if (!this.EventTask.get(ListenerMainName)) {
-                    this.EventTask.set(ListenerMainName, new Map());
-                }
-                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
-                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
-                }
-                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
-                this.createListenerFunction(ListenerMainName);
-                const EventFunc = this.createEventFunction<EventType>(EventName);
-                retEvent = await EventFunc!(...(args as any[]));
-            },
-        );
-    }
-}
-
-// 示例代码 快速创建事件
-// let NTEvent = new NTEventWrapper();
-// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest');
-// if (TestEvent) {
-//     TestEvent(true);
-// }
-
-// 示例代码 快速创建监听Listener类
-// let NTEvent = new NTEventWrapper();
-// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
-
-// 调用接口
-//let NTEvent = new NTEventWrapper();
-//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true);
-
-// 注册监听 解除监听
-// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb);
-// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core');
-
-// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode);
-// GetTest('test');
-
-// always模式
-// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) });

src/common/framework/event.ts

@@ -1,140 +0,0 @@
-import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper/wrapper';
-import EventEmitter from 'node:events';
-
-export type ListenerClassBase = Record<string, string>;
-
-export interface ListenerIBase {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: any): ListenerClassBase;
-}
-
-export class NTEventChannel extends EventEmitter {
-    private wrapperApi: WrapperNodeApi;
-    private wrapperSession: NodeIQQNTWrapperSession;
-    private listenerRefStorage = new Map<string, ListenerIBase>();
-
-    constructor(WrapperApi: WrapperNodeApi, WrapperSession: NodeIQQNTWrapperSession) {
-        super();
-        this.on('error', () => {
-        });
-        this.wrapperApi = WrapperApi;
-        this.wrapperSession = WrapperSession;
-    }
-
-    dispatcherListener(ListenerEvent: string, ...args: any[]) {
-        this.emit(ListenerEvent, ...args);
-    }
-
-    createProxyDispatch(ListenerMainName: string) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const current = this;
-        return new Proxy({}, {
-            get(_target: any, prop: any, _receiver: any) {
-                return (...args: any[]) => {
-                    current.dispatcherListener.apply(current, [ListenerMainName + '/' + prop, ...args]);
-                };
-            },
-        });
-    }
-
-    async getOrInitListener<T>(listenerMainName: string): Promise<T> {
-        const ListenerType = this.wrapperApi[listenerMainName];
-        //获取NTQQ 外部 Listener包装
-        if (!ListenerType) throw new Error('Init Listener not found');
-        let Listener = this.listenerRefStorage.get(listenerMainName);
-        //判断是否已创建 创建则跳过
-        if (!Listener && ListenerType) {
-            Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
-            if (!Listener) throw new Error('Init Listener failed');
-            //实例化NTQQ Listener外包装
-            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
-            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
-            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
-            //添加Listener到NTQQ
-            addfunc!(Listener as T);
-            this.listenerRefStorage.set(listenerMainName, Listener);
-            //保存Listener实例
-        }
-        return Listener as T;
-    }
-
-    async createEventWithListener<EventType extends (...args: any) => any, ListenerType extends (...args: any) => any>
-    (
-        eventName: string,
-        listenerName: string,
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...eventArg: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
-            const ListenerNameList = listenerName.split('/');
-            const ListenerMainName = ListenerNameList[0];
-            //const ListenerSubName = ListenerNameList[1];
-            this.getOrInitListener<ListenerType>(ListenerMainName);
-            let complete = 0;
-            const retData: Parameters<ListenerType> | undefined = undefined;
-            let retEvent: any = {};
-            const databack = () => {
-                if (complete == 0) {
-                    reject(new Error('Timeout: NTEvent EventName:' + eventName + ' ListenerName:' + listenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n'));
-                } else {
-                    resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                }
-            };
-            const Timeouter = setTimeout(databack, timeout);
-            const callback = (...args: Parameters<ListenerType>) => {
-                if (checker(...args)) {
-                    complete++;
-                    if (complete >= waitTimes) {
-                        clearTimeout(Timeouter);
-                        this.removeListener(listenerName, callback);
-                        databack();
-                    }
-                }
-            };
-            this.on(listenerName, callback);
-            const EventFunc = this.createEventFunction<EventType>(eventName);
-            retEvent = await EventFunc!(...(eventArg as any[]));
-        });
-    }
-
-    private createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-        const eventNameArr = eventName.split('/');
-        type eventType = {
-            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
-        }
-        if (eventNameArr.length > 1) {
-            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
-            const eventName = eventNameArr[1];
-            //getNodeIKernelGroupListener,GroupService
-            //console.log('2', eventName);
-            const services = (this.wrapperSession as unknown as eventType)[serviceName]();
-            const event = services[eventName]
-                //重新绑定this
-                .bind(services);
-            if (event) {
-                return event as T;
-            }
-            return undefined;
-        }
-    }
-
-    async callEvent<EventType extends (...args: any[]) => Promise<any> | any>(
-        EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-        return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            let complete = false;
-            const Timeouter = setTimeout(() => {
-                if (!complete) {
-                    reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
-                }
-            }, timeout);
-            const retData = await EventFunc!(...args);
-            complete = true;
-            resolve(retData);
-        });
-    }
-}
-
-//NTEvent2.0

src/common/helper.ts

@@ -0,0 +1,280 @@
+import path from 'node:path';
+import fs from 'fs';
+import os from 'node:os';
+import { Peer, QQLevel } from '@/core';
+
+export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
+    return new Promise<ReturnType<T> | undefined>((resolve) => {
+        try {
+            const result = func(...args);
+            resolve(result);
+        } catch (e) {
+            resolve(undefined);
+        }
+    });
+}
+
+export async function solveAsyncProblem<T extends (...args: any[]) => Promise<any>>(func: T, ...args: Parameters<T>): Promise<Awaited<ReturnType<T>> | undefined> {
+    return new Promise<Awaited<ReturnType<T>> | undefined>((resolve) => {
+        func(...args).then((result) => {
+            resolve(result);
+        }).catch(() => {
+            resolve(undefined);
+        });
+    });
+}
+
+export class FileNapCatOneBotUUID {
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = ""): string {
+        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}|${fileUUID}`;
+        //前四个字节塞data长度
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
+        length.write(data, 4);
+        return length.toString('hex') + endString;
+    }
+
+    static decodeModelId(uuid: string): undefined | {
+        peer: Peer,
+        modelId: string,
+        fileId: string,
+        fileUUID?: string
+    } {
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
+        return {
+            peer: {
+                chatType: +chatType,
+                peerUid: peerUid,
+            },
+            modelId,
+            fileId,
+            fileUUID
+        };
+    }
+
+    static encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", endString: string = ""): string {
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}|${fileUUID}`;
+        //前四个字节塞data长度
+        //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
+    }
+
+    static decode(uuid: string): undefined | {
+        peer: Peer,
+        msgId: string,
+        elementId: string,
+        fileUUID?: string
+    } {
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
+        return {
+            peer: {
+                chatType: +chatType,
+                peerUid: peerUid,
+            },
+            msgId,
+            elementId,
+            fileUUID
+        };
+    }
+}
+
+export function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
+    const timeoutPromise = new Promise<T>((_, reject) =>
+        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
+    );
+    return Promise.race([promise, timeoutPromise]);
+}
+
+export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
+    const wrappedTasks = tasks.map((task) =>
+        PromiseTimer(task, timeout).then(
+            (result) => ({ status: 'fulfilled', value: result }),
+            (error) => ({ status: 'rejected', reason: error }),
+        ),
+    );
+    const results = await Promise.all(wrappedTasks);
+    return results
+        .filter((result) => result.status === 'fulfilled')
+        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
+}
+
+export function isNull(value: any) {
+    return value === undefined || value === null;
+}
+
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+
+export function truncateString(obj: any, maxLength = 500) {
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach((key) => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
+export function isEqual(obj1: any, obj2: any) {
+    if (obj1 === obj2) return true;
+    if (obj1 == null || obj2 == null) return false;
+    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
+
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+
+    if (keys1.length !== keys2.length) return false;
+
+    for (const key of keys1) {
+        if (!isEqual(obj1[key], obj2[key])) return false;
+    }
+    return true;
+}
+
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+    if (os.platform() === 'linux') {
+        return {
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
+        };
+    }
+    return {
+        baseVersion: '9.9.15-28131',
+        curVersion: '9.9.15-28131',
+        prevVersion: '',
+        onErrorVersions: [],
+        buildId: '28131',
+    };
+}
+
+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
+    if (os.platform() === 'darwin') {
+        packagePath = path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        packagePath = path.join(path.dirname(exePath), './resources/app/package.json');
+    } else {
+        packagePath = path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
+    }
+    //下面是老版本兼容 未来去掉
+    if (!fs.existsSync(packagePath)) {
+        packagePath = path.join(path.dirname(exePath), './resources/app/versions/' + version + '/package.json');
+    }
+    return packagePath;
+}
+
+export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
+    let configVersionInfoPath;
+    if (os.platform() === 'win32') {
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
+    } else if (os.platform() === 'darwin') {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    } else {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './.config/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    }
+    if (typeof configVersionInfoPath !== 'string') {
+        return undefined;
+    }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(configVersionInfoPath)) {
+        configVersionInfoPath = path.join(path.dirname(exePath), './resources/app/versions/config.json');
+    }
+    if (!fs.existsSync(configVersionInfoPath)) {
+        return undefined;
+    }
+    return configVersionInfoPath;
+}
+
+export function calcQQLevel(level?: QQLevel) {
+    if (!level) return 0;
+    const { crownNum, sunNum, moonNum, starNum } = level;
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
+}
+
+export function stringifyWithBigInt(obj: any) {
+    return JSON.stringify(obj, (key, value) =>
+        typeof value === 'bigint' ? value.toString() : value
+    );
+}
+
+export function parseAppidFromMajor(nodeMajor: string): string | undefined {
+    const hexSequence = "A4 09 00 00 00 35";
+    const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ""), "hex");
+    const filePath = path.resolve(nodeMajor);
+    const fileContent = fs.readFileSync(filePath);
+
+    let searchPosition = 0;
+    while (true) {
+        const index = fileContent.indexOf(sequenceBytes, searchPosition);
+        if (index === -1) {
+            break;
+        }
+
+        const start = index + sequenceBytes.length - 1;
+        const end = fileContent.indexOf(0x00, start);
+        if (end === -1) {
+            break;
+        }
+        const content = fileContent.subarray(start, end);
+        if (!content.every(byte => byte === 0x00)) {
+            try {
+                return content.toString("utf-8");
+            } catch (error) {
+                break;
+            }
+        }
+
+        searchPosition = end + 1;
+    }
+
+    return undefined;
+}

src/common/log.ts

@@ -0,0 +1,294 @@
+import winston, { format, transports } from 'winston';
+import { truncateString } from '@/common/helper';
+import path from 'node:path';
+import fs from 'node:fs';
+import { AtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';
+
+export enum LogLevel {
+    DEBUG = 'debug',
+    INFO = 'info',
+    WARN = 'warn',
+    ERROR = 'error',
+    FATAL = 'fatal',
+}
+
+function getFormattedTimestamp() {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+    const day = now.getDate().toString().padStart(2, '0');
+    const hours = now.getHours().toString().padStart(2, '0');
+    const minutes = now.getMinutes().toString().padStart(2, '0');
+    const seconds = now.getSeconds().toString().padStart(2, '0');
+    const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
+    return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
+}
+
+export class LogWrapper {
+    fileLogEnabled = true;
+    consoleLogEnabled = true;
+    logger: winston.Logger;
+
+    constructor(logDir: string) {
+        const filename = `${getFormattedTimestamp()}.log`;
+        const logPath = path.join(logDir, filename);
+
+        this.logger = winston.createLogger({
+            level: 'debug',
+            format: format.combine(
+                format.timestamp({ format: 'MM-DD HH:mm:ss' }),
+                format.printf(({ timestamp, level, message, ...meta }) => {
+                    const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
+                    return `${timestamp} [${level}] ${userInfo}${message}`;
+                })
+            ),
+            transports: [
+                new transports.File({
+                    filename: logPath,
+                    level: 'debug',
+                    maxsize: 5 * 1024 * 1024, // 5MB
+                    maxFiles: 5
+                }),
+                new transports.Console({
+                    format: format.combine(
+                        format.colorize(),
+                        format.printf(({ timestamp, level, message, ...meta }) => {
+                            const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
+                            return `${timestamp} [${level}] ${userInfo}${message}`;
+                        })
+                    )
+                })
+            ]
+        });
+
+        this.setLogSelfInfo({ nick: '', uid: '' });
+        this.cleanOldLogs(logDir);
+    }
+
+    cleanOldLogs(logDir: string) {
+        const oneWeekAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+        fs.readdir(logDir, (err, files) => {
+            if (err) {
+                this.logger.error('Failed to read log directory', err);
+                return;
+            }
+            files.forEach(file => {
+                const filePath = path.join(logDir, file);
+                this.deleteOldLogFile(filePath, oneWeekAgo);
+            });
+        });
+    }
+
+    private deleteOldLogFile(filePath: string, oneWeekAgo: number) {
+        fs.stat(filePath, (err, stats) => {
+            if (err) {
+                this.logger.error('Failed to get file stats', err);
+                return;
+            }
+            if (stats.mtime.getTime() < oneWeekAgo) {
+                fs.unlink(filePath, err => {
+                    if (err) {
+                        if (err.code === 'ENOENT') {
+                            this.logger.warn(`File already deleted: ${filePath}`);
+                        } else {
+                            this.logger.error('Failed to delete old log file', err);
+                        }
+                    } else {
+                        this.logger.info(`Deleted old log file: ${filePath}`);
+                    }
+                });
+            }
+        });
+    }
+
+    setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.File) {
+                transport.level = fileLogLevel;
+            } else if (transport instanceof transports.Console) {
+                transport.level = consoleLogLevel;
+            }
+        });
+    }
+
+    setLogSelfInfo(selfInfo: { nick: string, uid: string }) {
+        const userInfo = `${selfInfo.nick}`;
+        this.logger.defaultMeta = { userInfo };
+    }
+
+    setFileLogEnabled(isEnabled: boolean) {
+        this.fileLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.File) {
+                transport.silent = !isEnabled;
+            }
+        });
+    }
+
+    setConsoleLogEnabled(isEnabled: boolean) {
+        this.consoleLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.Console) {
+                transport.silent = !isEnabled;
+            }
+        });
+    }
+
+    formatMsg(msg: any[]) {
+        return msg.map(msgItem => {
+            if (msgItem instanceof Error) {
+                return msgItem.stack;
+            } else if (typeof msgItem === 'object') {
+                return JSON.stringify(truncateString(JSON.parse(JSON.stringify(msgItem, null, 2))));
+            }
+            return msgItem;
+        }).join(' ');
+    }
+
+    _log(level: LogLevel, ...args: any[]) {
+        const message = this.formatMsg(args);
+        if (this.consoleLogEnabled && this.fileLogEnabled) {
+            this.logger.log(level, message);
+        } else if (this.consoleLogEnabled) {
+            this.logger.log(level, message);
+        } else if (this.fileLogEnabled) {
+            // eslint-disable-next-line no-control-regex
+            this.logger.log(level, message.replace(/\x1B[@-_][0-?]*[ -/]*[@-~]/g, ''));
+        }
+    }
+
+    log(...args: any[]) {
+        this._log(LogLevel.INFO, ...args);
+    }
+
+    logDebug(...args: any[]) {
+        this._log(LogLevel.DEBUG, ...args);
+    }
+
+    logError(...args: any[]) {
+        this._log(LogLevel.ERROR, ...args);
+    }
+
+    logWarn(...args: any[]) {
+        this._log(LogLevel.WARN, ...args);
+    }
+
+    logFatal(...args: any[]) {
+        this._log(LogLevel.FATAL, ...args);
+    }
+
+    logMessage(msg: RawMessage, selfInfo: SelfInfo) {
+        const isSelfSent = msg.senderUin === selfInfo.uin;
+
+        if (msg.elements[0]?.elementType === ElementType.GreyTip) {
+            return;
+        }
+
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-'} ${rawMessageToText(msg)}`);
+    }
+}
+
+export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
+    if (recursiveLevel > 2) {
+        return '...';
+    }
+
+    const tokens: string[] = [];
+
+    if (msg.chatType == ChatType.KCHATTYPEC2C) {
+        tokens.push(`私聊 (${msg.peerUin})`);
+    } else if (msg.chatType == ChatType.KCHATTYPEGROUP) {
+        if (recursiveLevel < 1) {
+            tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
+        }
+        if (msg.senderUin !== '0') {
+            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+        }
+    } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
+        tokens.push('移动设备');
+    } else {
+        tokens.push(`临时消息 (${msg.peerUin})`);
+    }
+
+    for (const element of msg.elements) {
+        tokens.push(msgElementToText(element, msg, recursiveLevel));
+    }
+
+    return tokens.join(' ');
+}
+
+function msgElementToText(element: MessageElement, msg: RawMessage, recursiveLevel: number): string {
+    if (element.textElement) {
+        return textElementToText(element.textElement);
+    }
+
+    if (element.replyElement) {
+        return replyElementToText(element.replyElement, msg, recursiveLevel);
+    }
+
+    if (element.picElement) {
+        return '[图片]';
+    }
+
+    if (element.fileElement) {
+        return `[文件 ${element.fileElement.fileName}]`;
+    }
+
+    if (element.videoElement) {
+        return '[视频]';
+    }
+
+    if (element.pttElement) {
+        return `[语音 ${element.pttElement.duration}s]`;
+    }
+
+    if (element.arkElement) {
+        return '[卡片消息]';
+    }
+
+    if (element.faceElement) {
+        return `[表情 ${element.faceElement.faceText ?? ''}]`;
+    }
+
+    if (element.marketFaceElement) {
+        return element.marketFaceElement.faceName;
+    }
+
+    if (element.markdownElement) {
+        return '[Markdown 消息]';
+    }
+
+    if (element.multiForwardMsgElement) {
+        return '[转发消息]';
+    }
+
+    if (element.elementType === ElementType.GreyTip) {
+        return '[灰条消息]';
+    }
+
+    return `[未实现 (ElementType = ${element.elementType})]`;
+}
+
+function textElementToText(textElement: any): string {
+    if (textElement.atType === AtType.notAt) {
+        const originalContentLines = textElement.content.split('\n');
+        return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
+    } else if (textElement.atType === AtType.atAll) {
+        return `@全体成员`;
+    } else if (textElement.atType === AtType.atUser) {
+        return `${textElement.content} (${textElement.atUid})`;
+    }
+    return '';
+}
+
+function replyElementToText(replyElement: any, msg: RawMessage, recursiveLevel: number): string {
+    const recordMsgOrNull = msg.records.find(
+        record => replyElement.sourceMsgIdInRecords === record.msgId,
+    );
+    return `[回复消息 ${recordMsgOrNull &&
+        recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'
+        ?
+        rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+        `未找到消息记录 (MsgId = ${replyElement.sourceMsgIdInRecords})`
+    }]`;
+}

src/common/lru-cache.ts

@@ -1,6 +1,6 @@
 export class LRUCache<K, V> {
     private capacity: number;
-    private cache: Map<K, V>;
+    public cache: Map<K, V>;
 
     constructor(capacity: number) {
         this.capacity = capacity;
@@ -24,8 +24,19 @@ export class LRUCache<K, V> {
         } else if (this.cache.size >= this.capacity) {
             // If the cache is full, remove the least recently used key (the first one in the map)
             const firstKey = this.cache.keys().next().value;
-            this.cache.delete(firstKey);
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
         }
         this.cache.set(key, value);
     }
+    public resetCapacity(newCapacity: number): void {
+        this.capacity = newCapacity;
+        while (this.cache.size > this.capacity) {
+            const firstKey = this.cache.keys().next().value;
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
+        }
+    }
 }

src/common/message-unique.ts

@@ -2,8 +2,8 @@ import { Peer } from '@/core';
 import crypto from 'crypto';
 
 export class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map();
-    private valueToKey: Map<V, K> = new Map();
+    private readonly keyToValue: Map<K, V> = new Map();
+    private readonly valueToKey: Map<V, K> = new Map();
     private maxSize: number;
 
     constructor(maxSize: number) {
@@ -15,26 +15,18 @@ export class LimitedHashTable<K, V> {
     }
 
     set(key: K, value: V): void {
-        // const isExist = this.keyToValue.get(key);
-        // if (isExist && isExist === value) {
-        //   return;
-        // }
         this.keyToValue.set(key, value);
         this.valueToKey.set(value, key);
         while (this.keyToValue.size !== this.valueToKey.size) {
-            //console.log('keyToValue.size !== valueToKey.size Error Atom');
             this.keyToValue.clear();
             this.valueToKey.clear();
         }
-        // console.log('---------------');
-        // console.log(this.keyToValue);
-        // console.log(this.valueToKey);
-        // console.log('---------------');
         while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
-            //console.log(this.keyToValue.size > this.maxSize, this.valueToKey.size > this.maxSize);
             const oldestKey = this.keyToValue.keys().next().value;
-            this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
-            this.keyToValue.delete(oldestKey);
+            if (oldestKey !== undefined) {
+                this.valueToKey.delete(this.keyToValue.get(oldestKey) as V);
+                this.keyToValue.delete(oldestKey);
+            }
         }
     }
 
@@ -83,8 +75,8 @@ export class LimitedHashTable<K, V> {
 }
 
 class MessageUniqueWrapper {
-    private msgDataMap: LimitedHashTable<string, number>;
-    private msgIdMap: LimitedHashTable<string, number>;
+    private readonly msgDataMap: LimitedHashTable<string, number>;
+    private readonly msgIdMap: LimitedHashTable<string, number>;
 
     constructor(maxMap: number = 1000) {
         this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
@@ -101,17 +93,13 @@ class MessageUniqueWrapper {
         return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
     }
 
-    createMsg(peer: Peer, msgId: string): number | undefined {
+    createUniqueMsgId(peer: Peer, msgId: string) {
         const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
         const hash = crypto.createHash('md5').update(key).digest();
         //设置第一个bit为0 保证shortId为正数
         hash[0] &= 0x7f;
         const shortId = hash.readInt32BE(0);
         //减少性能损耗
-        // const isExist = this.msgIdMap.getKey(shortId);
-        // if (isExist && isExist === msgId) {
-        //   return shortId;
-        // }
         this.msgIdMap.set(msgId, shortId);
         this.msgDataMap.set(key, shortId);
         return shortId;

src/common/path.ts

@@ -1,8 +1,7 @@
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
-
-export const napcat_version = '2.0.23';
+import os from 'os';
 
 export class NapCatPathWrapper {
     binaryPath: string;
@@ -13,17 +12,23 @@ export class NapCatPathWrapper {
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
-        this.configPath = path.join(this.binaryPath, 'config');
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        let writePath: string;
+        if (os.platform() === 'darwin') {
+            writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
+        } else {
+            writePath = this.binaryPath;
+        }
+        this.logsPath = path.join(writePath, 'logs');
+        this.configPath = path.join(writePath, 'config');
+        this.cachePath = path.join(writePath, 'cache');
         this.staticPath = path.join(this.binaryPath, 'static');
-        if (fs.existsSync(this.logsPath)) {
+        if (!fs.existsSync(this.logsPath)) {
             fs.mkdirSync(this.logsPath, { recursive: true });
         }
-        if (fs.existsSync(this.configPath)) {
+        if (!fs.existsSync(this.configPath)) {
             fs.mkdirSync(this.configPath, { recursive: true });
         }
-        if (fs.existsSync(this.cachePath)) {
+        if (!fs.existsSync(this.cachePath)) {
             fs.mkdirSync(this.cachePath, { recursive: true });
         }
     }

src/common/proxy-handler.ts

@@ -3,7 +3,6 @@ import { LogWrapper } from './log';
 export function proxyHandlerOf(logger: LogWrapper) {
     return {
         get(target: any, prop: any, receiver: any) {
-            // console.log('get', prop, typeof target[prop]);
             if (typeof target[prop] === 'undefined') {
                 // 如果方法不存在，返回一个函数，这个函数调用existentMethod
                 return (..._args: unknown[]) => {

src/common/qq-basic-info.ts

@@ -0,0 +1,106 @@
+import fs from 'node:fs';
+import { systemPlatform } from '@/common/system';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath, parseAppidFromMajor } from './helper';
+import AppidTable from '@/core/external/appid.json';
+import { LogWrapper } from './log';
+import { getMajorPath } from '@/core';
+
+export class QQBasicInfoWrapper {
+    QQMainPath: string | undefined;
+    QQPackageInfoPath: string | undefined;
+    QQVersionConfigPath: string | undefined;
+    isQuickUpdate: boolean | undefined;
+    QQVersionConfig: QQVersionConfigType | undefined;
+    QQPackageInfo: QQPackageInfoType | undefined;
+    QQVersionAppid: string | undefined;
+    QQVersionQua: string | undefined;
+    context: { logger: LogWrapper };
+
+    constructor(context: { logger: LogWrapper }) {
+        //基础目录获取
+        this.context = context;
+        this.QQMainPath = process.execPath;
+        this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
+
+
+        //基础信息获取 无快更则启用默认模板填充
+        this.isQuickUpdate = !!this.QQVersionConfigPath;
+        this.QQVersionConfig = this.isQuickUpdate
+            ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
+            : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
+        this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
+        const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
+        this.QQVersionAppid = IQQVersionAppid;
+        this.QQVersionQua = IQQVersionQua;
+    }
+
+    //基础函数
+    getQQBuildStr() {
+        return this.isQuickUpdate ? this.QQVersionConfig?.buildId : this.QQPackageInfo?.buildVersion;
+    }
+
+    getFullQQVesion() {
+        const version = this.isQuickUpdate ? this.QQVersionConfig?.curVersion : this.QQPackageInfo?.version;
+        if (!version) throw new Error('QQ版本获取失败');
+        return version;
+    }
+
+    requireMinNTQQBuild(buildStr: string) {
+        const currentBuild = +(this.getQQBuildStr() ?? '0');
+        if (currentBuild == 0) throw new Error('QQBuildStr获取失败');
+        return currentBuild >= parseInt(buildStr);
+    }
+
+    //此方法不要直接使用
+    getQUAFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+        };
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
+    }
+
+    getAppIdFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: '537246092',
+            darwin: '537246140',
+            linux: '537246140',
+        };
+        return platformMapping[systemPlatform] ?? '537246092';
+    }
+
+    getAppidV2(): { appid: string; qua: string } {
+        // 通过已有表 性能好
+        const appidTbale = AppidTable as unknown as QQAppidTableType;
+        const fullVersion = this.getFullQQVesion();
+        if (fullVersion) {
+            const data = appidTbale[fullVersion];
+            if (data) {
+                return data;
+            }
+        }
+        // 通过Major拉取 性能差
+        try {
+            const majorAppid = this.getAppidV2ByMajor(fullVersion);
+            if (majorAppid) {
+                this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`);
+                return { appid: majorAppid, qua: this.getQUAFallback() };
+            }
+        } catch (error) {
+            this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        }
+        // 最终兜底为老版本
+        this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
+    }
+    getAppidV2ByMajor(QQVersion: string) {
+        const majorPath = getMajorPath(QQVersion);
+        const appid = parseAppidFromMajor(majorPath);
+        return appid;
+    }
+
+}

src/common/request.ts

@@ -0,0 +1,135 @@
+import https from 'node:https';
+import http from 'node:http';
+import { readFileSync } from 'node:fs';
+
+export class RequestUtil {
+    // 适用于获取服务器下发cookies时获取，仅GET
+    static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
+        const client = url.startsWith('https') ? https : http;
+        return new Promise((resolve, reject) => {
+            const req = client.get(url, (res) => {
+                const cookies: { [key: string]: string } = {};
+
+                res.on('data', () => { }); // Necessary to consume the stream
+                res.on('end', () => {
+                    this.handleRedirect(res, url, cookies)
+                        .then(resolve)
+                        .catch(reject);
+                });
+
+                if (res.headers['set-cookie']) {
+                    this.extractCookies(res.headers['set-cookie'], cookies);
+                }
+            });
+
+            req.on('error', (error: Error) => {
+                reject(error);
+            });
+        });
+    }
+
+    private static async handleRedirect(res: http.IncomingMessage, url: string, cookies: { [key: string]: string }): Promise<{ [key: string]: string }> {
+        if (res.statusCode === 301 || res.statusCode === 302) {
+            if (res.headers.location) {
+                const redirectUrl = new URL(res.headers.location, url);
+                const redirectCookies = await this.HttpsGetCookies(redirectUrl.href);
+                // 合并重定向过程中的cookies
+                return { ...cookies, ...redirectCookies };
+            }
+        }
+        return cookies;
+    }
+
+    private static extractCookies(setCookieHeaders: string[], cookies: { [key: string]: string }) {
+        setCookieHeaders.forEach((cookie) => {
+            const parts = cookie.split(';')[0].split('=');
+            const key = parts[0];
+            const value = parts[1];
+            if (key && value && key.length > 0 && value.length > 0) {
+                cookies[key] = value;
+            }
+        });
+    }
+
+    // 请求和回复都是JSON data传原始内容 自动编码json
+    static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: {
+        [key: string]: string
+    } = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+        const option = new URL(url);
+        const protocol = url.startsWith('https://') ? https : http;
+        const options = {
+            hostname: option.hostname,
+            port: option.port,
+            path: option.pathname + option.search,
+            method: method,
+            headers: headers,
+        };
+        // headers: {
+        //       'Content-Type': 'application/json',
+        //       'Content-Length': Buffer.byteLength(postData),
+        //     },
+        return new Promise((resolve, reject) => {
+            const req = protocol.request(options, (res: any) => {
+                let responseBody = '';
+                res.on('data', (chunk: string | Buffer) => {
+                    responseBody += chunk.toString();
+                });
+
+                res.on('end', () => {
+                    try {
+                        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                            if (isJsonRet) {
+                                const responseJson = JSON.parse(responseBody);
+                                resolve(responseJson as T);
+                            } else {
+                                resolve(responseBody as T);
+                            }
+                        } else {
+                            reject(new Error(`Unexpected status code: ${res.statusCode}`));
+                        }
+                    } catch (parseError: unknown) {
+                        reject(new Error((parseError as Error).message));
+                    }
+                });
+            });
+
+            req.on('error', (error: Error) => {
+                reject(error);
+            });
+            if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+                if (isArgJson) {
+                    req.write(JSON.stringify(data));
+                } else {
+                    req.write(data);
+                }
+
+            }
+            req.end();
+        });
+    }
+
+    // 请求返回都是原始内容
+    static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
+        return this.HttpGetJson<string>(url, method, data, headers, false, false);
+    }
+
+    static async createFormData(boundary: string, filePath: string): Promise<Buffer> {
+        let type = 'image/png';
+        if (filePath.endsWith('.jpg')) {
+            type = 'image/jpeg';
+        }
+        const formDataParts = [
+            `------${boundary}\r\n`,
+            `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
+            'Content-Type: ' + type + '\r\n\r\n',
+        ];
+
+        const fileContent = readFileSync(filePath);
+        const footer = `\r\n------${boundary}--`;
+        return Buffer.concat([
+            Buffer.from(formDataParts.join(''), 'utf8'),
+            fileContent,
+            Buffer.from(footer, 'utf8'),
+        ]);
+    }
+}

src/common/system.ts

@@ -0,0 +1,21 @@
+import os from 'node:os';
+import path from 'node:path';
+
+// 缓解Win7设备兼容性问题
+let osName: string;
+
+try {
+    osName = os.hostname();
+} catch (e) {
+    osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
+}
+
+
+const homeDir = os.homedir();
+
+export const systemPlatform = os.platform();
+export const cpuArch = os.arch();
+export const systemVersion = os.release();
+export const hostname = osName;
+export const downloadsPath = path.join(homeDir, 'Downloads');
+export const systemName = os.type();

src/common/utils/ConfigBase.ts

@@ -1,67 +0,0 @@
-import path from 'node:path';
-import fs from 'node:fs';
-import type { NapCatCore } from '@/core';
-
-export abstract class ConfigBase<T> {
-    name: string;
-    coreContext: NapCatCore;
-    configPath: string;
-    configData: T = {} as T;
-
-    protected constructor(name: string, coreContext: NapCatCore, configPath: string) {
-        this.name = name;
-        this.coreContext = coreContext;
-        this.configPath = configPath;
-        fs.mkdirSync(this.configPath, { recursive: true });
-        this.read();
-    }
-
-    protected getKeys(): string[] | null {
-        // 决定 key 在json配置文件中的顺序
-        return null;
-    }
-
-    getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
-        const filename = `${this.name}${suffix}.json`;
-        return path.join(this.configPath, filename);
-    }
-
-    read(): T {
-        const logger = this.coreContext.context.logger;
-        const configPath = this.getConfigPath(this.coreContext.selfInfo.uin);
-        if (!fs.existsSync(configPath)) {
-            try {
-                fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
-                logger.log(`[Core] [Config] 配置文件创建成功!\n`);
-            } catch (e: any) {
-                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
-            }
-        }
-        try {
-            this.configData = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-            logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
-            return this.configData;
-        } catch (e: any) {
-            if (e instanceof SyntaxError) {
-                logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
-            } else {
-                logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
-            }
-            return {} as T;
-        }
-    }
-
-
-    save(newConfigData: T = this.configData as T) {
-        const logger = this.coreContext.context.logger;
-        const selfInfo = this.coreContext.selfInfo;
-        this.configData = newConfigData;
-        const configPath = this.getConfigPath(selfInfo.uin);
-        try {
-            fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
-        } catch (e: any) {
-            logger.logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
-        }
-    }
-}

src/common/utils/QQBasicInfo.ts

@@ -1,81 +0,0 @@
-import path from 'node:path';
-import fs from 'node:fs';
-import { systemPlatform } from '@/common/utils/system';
-import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
-import AppidTable from '@/core/external/appid.json';
-import { LogWrapper } from './log';
-
-export class QQBasicInfoWrapper {
-    QQMainPath: string | undefined;
-    QQPackageInfoPath: string | undefined;
-    QQVersionConfigPath: string | undefined;
-    isQuickUpdate: boolean | undefined;
-    QQVersionConfig: QQVersionConfigType | undefined;
-    QQPackageInfo: QQPackageInfoType | undefined;
-    QQVersionAppid: string | undefined;
-    QQVersionQua: string | undefined;
-    context: { logger: LogWrapper };
-
-    constructor(context: { logger: LogWrapper }) {
-        //基础目录获取
-        this.context = context;
-        this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
-        this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
-
-        //基础信息获取 无快更则启用默认模板填充
-        this.isQuickUpdate = !!this.QQVersionConfigPath;
-        this.QQVersionConfig = this.isQuickUpdate
-            ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
-            : getDefaultQQVersionConfigInfo();
-        this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
-        const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
-        this.QQVersionAppid = IQQVersionAppid;
-        this.QQVersionQua = IQQVersionQua;
-    }
-
-    //基础函数
-    getQQBuildStr() {
-        return this.isQuickUpdate ? this.QQVersionConfig?.buildId : this.QQPackageInfo?.buildVersion;
-    }
-
-    getFullQQVesion() {
-        const version = this.isQuickUpdate ? this.QQVersionConfig?.curVersion : this.QQPackageInfo?.version;
-        if (!version) throw new Error('QQ版本获取失败');
-        return version;
-    }
-
-    requireMinNTQQBuild(buildStr: string) {
-        const currentBuild = parseInt(this.getQQBuildStr() || '0');
-        if (currentBuild == 0) throw new Error('QQBuildStr获取失败');
-        return currentBuild >= parseInt(buildStr);
-    }
-
-    //此方法不要直接使用
-    getQUAInternal() {
-        return systemPlatform === 'linux'
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
-    }
-
-    getAppidV2(): { appid: string; qua: string } {
-        const appidTbale = AppidTable as unknown as QQAppidTableType;
-        try {
-            const fullVersion = this.getFullQQVesion();
-            if (!fullVersion) throw new Error('QQ版本获取失败');
-            const data = appidTbale[fullVersion];
-            if (data) {
-                return data;
-            }
-        } catch (e) {
-            this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
-        }
-        // 以下是兜底措施
-        this.context.logger.log(
-            `[QQ版本兼容性检测] ${this.getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`,
-        );
-        return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: this.getQUAInternal() };
-    }
-}
-
-export let QQBasicInfo: QQBasicInfoWrapper | undefined;

src/common/utils/audio.ts

@@ -1,90 +0,0 @@
-import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
-import fsPromise from 'fs/promises';
-import path from 'node:path';
-import { randomUUID } from 'crypto';
-import { spawn } from 'node:child_process';
-import { LogWrapper } from './log';
-
-export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
-    async function guessDuration(pttPath: string) {
-        const pttFileInfo = await fsPromise.stat(pttPath);
-        let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
-        duration = Math.floor(duration);
-        duration = Math.max(1, duration);
-        logger.log('通过文件大小估算语音的时长:', duration);
-        return duration;
-    }
-
-    try {
-        const file = await fsPromise.readFile(filePath);
-        const pttPath = path.join(TEMP_DIR, randomUUID());
-        if (!isSilk(file)) {
-            logger.log(`语音文件${filePath}需要转换成silk`);
-            const _isWav = isWav(file);
-            const pcmPath = pttPath + '.pcm';
-            let sampleRate = 0;
-            const convert = () => {
-                return new Promise<Buffer>((resolve, reject) => {
-                    // todo: 通过配置文件获取ffmpeg路径
-                    const ffmpegPath = process.env.FFMPEG_PATH || 'ffmpeg';
-                    const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
-                    cp.on('error', err => {
-                        logger.log('FFmpeg处理转换出错: ', err.message);
-                        return reject(err);
-                    });
-                    cp.on('exit', (code, signal) => {
-                        const EXIT_CODES = [0, 255];
-                        if (code == null || EXIT_CODES.includes(code)) {
-                            sampleRate = 24000;
-                            const data = fs.readFileSync(pcmPath);
-                            fs.unlink(pcmPath, (err) => {
-                            });
-                            return resolve(data);
-                        }
-                        logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
-                        reject(Error('FFmpeg处理转换失败'));
-                    });
-                });
-            };
-            let input: Buffer;
-            if (!_isWav) {
-                input = await convert();
-            } else {
-                input = file;
-                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
-                const { fmt } = getWavFileInfo(input);
-                // log(`wav文件信息`, fmt)
-                if (!allowSampleRate.includes(fmt.sampleRate)) {
-                    input = await convert();
-                }
-            }
-            const silk = await encode(input, sampleRate);
-            fs.writeFileSync(pttPath, silk.data);
-            logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
-            return {
-                converted: true,
-                path: pttPath,
-                duration: silk.duration / 1000,
-            };
-        } else {
-            const silk = file;
-            let duration = 0;
-            try {
-                duration = getDuration(silk) / 1000;
-            } catch (e: any) {
-                logger.log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
-                duration = await guessDuration(filePath);
-            }
-
-            return {
-                converted: false,
-                path: filePath,
-                duration,
-            };
-        }
-    } catch (error: any) {
-        logger.logError('convert silk failed', error.stack);
-        return {};
-    }
-}

src/common/utils/helper.ts

@@ -1,165 +0,0 @@
-import crypto from 'node:crypto';
-import path from 'node:path';
-import fs from 'fs';
-import * as fsPromise from 'node:fs/promises';
-import os from 'node:os';
-import { QQLevel } from '@/core';
-
-//下面这个类是用于将uid+msgid合并的类
-
-export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
-        const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
-        const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-            12,
-            16,
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
-        return uuid;
-    }
-
-    static decode(uuid: string): { high: string; low: string } {
-        const hex = uuid.replace(/-/g, '');
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
-    }
-}
-
-export function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
-    const timeoutPromise = new Promise<T>((_, reject) =>
-        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
-    );
-    return Promise.race([promise, timeoutPromise]);
-}
-
-export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
-    const wrappedTasks = tasks.map((task) =>
-        PromiseTimer(task, timeout).then(
-            (result) => ({ status: 'fulfilled', value: result }),
-            (error) => ({ status: 'rejected', reason: error }),
-        ),
-    );
-    const results = await Promise.all(wrappedTasks);
-    return results
-        .filter((result) => result.status === 'fulfilled')
-        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
-}
-
-export function getMd5(s: string) {
-    const h = crypto.createHash('md5');
-    h.update(s);
-    return h.digest('hex');
-}
-
-export function isNull(value: any) {
-    return value === undefined || value === null;
-}
-
-export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
-}
-
-export function truncateString(obj: any, maxLength = 500) {
-    if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach((key) => {
-            if (typeof obj[key] === 'string') {
-                // 如果是字符串且超过指定长度，则截断
-                if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
-                }
-            } else if (typeof obj[key] === 'object') {
-                // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
-            }
-        });
-    }
-    return obj;
-}
-
-export function isEqual(obj1: any, obj2: any) {
-    if (obj1 === obj2) return true;
-    if (obj1 == null || obj2 == null) return false;
-    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
-
-    const keys1 = Object.keys(obj1);
-    const keys2 = Object.keys(obj2);
-
-    if (keys1.length !== keys2.length) return false;
-
-    for (const key of keys1) {
-        if (!isEqual(obj1[key], obj2[key])) return false;
-    }
-    return true;
-}
-
-export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
-    if (os.platform() === 'linux') {
-        return {
-            baseVersion: '3.2.12-26702',
-            curVersion: '3.2.12-26702',
-            prevVersion: '',
-            onErrorVersions: [],
-            buildId: '26702',
-        };
-    }
-    return {
-        baseVersion: '9.9.15-26702',
-        curVersion: '9.9.15-26702',
-        prevVersion: '',
-        onErrorVersions: [],
-        buildId: '26702',
-    };
-}
-
-export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
-    let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
-    } else {
-        const userPath = os.homedir();
-        const appDataPath = path.resolve(userPath, './.config/QQ');
-        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
-    }
-    if (typeof configVersionInfoPath !== 'string') {
-        return undefined;
-    }
-    if (!fs.existsSync(configVersionInfoPath)) {
-        return undefined;
-    }
-    return configVersionInfoPath;
-}
-
-export async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
-    try {
-        const files = await fsPromise.readdir(directoryPath);
-
-        for (const file of files) {
-            const filePath = path.join(directoryPath, file);
-            const stats = await fsPromise.stat(filePath);
-            const lastModifiedTime = stats.mtimeMs;
-            const currentTime = Date.now();
-            const timeDifference = currentTime - lastModifiedTime;
-            const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
-
-            if (daysDifference > daysThreshold) {
-                await fsPromise.unlink(filePath); // Delete the file
-                //console.log(`Deleted: ${filePath}`);
-            }
-        }
-    } catch (error) {
-        //console.error('Error deleting files:', error);
-    }
-}
-
-export function calcQQLevel(level: QQLevel) {
-    const { crownNum, sunNum, moonNum, starNum } = level;
-    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
-}

src/common/utils/log.ts

@@ -1,239 +0,0 @@
-import log4js, { Configuration } from 'log4js';
-import { truncateString } from '@/common/utils/helper';
-import path from 'node:path';
-import chalk from 'chalk';
-import { AtType, ChatType, ElementType, ElementWrapper, RawMessage, SelfInfo } from '@/core';
-
-export enum LogLevel {
-    DEBUG = 'debug',
-    INFO = 'info',
-    WARN = 'warn',
-    ERROR = 'error',
-    FATAL = 'fatal',
-}
-
-function getFormattedTimestamp() {
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = (now.getMonth() + 1).toString().padStart(2, '0');
-    const day = now.getDate().toString().padStart(2, '0');
-    const hours = now.getHours().toString().padStart(2, '0');
-    const minutes = now.getMinutes().toString().padStart(2, '0');
-    const seconds = now.getSeconds().toString().padStart(2, '0');
-    const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
-    return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
-}
-
-export class LogWrapper {
-    fileLogEnabled = true;
-    consoleLogEnabled = true;
-    logConfig: Configuration;
-    loggerConsole: log4js.Logger;
-    loggerFile: log4js.Logger;
-    loggerDefault: log4js.Logger;
-    // eslint-disable-next-line no-control-regex
-    colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
-
-    constructor(logDir: string) {
-        const filename = `${getFormattedTimestamp()}.log`;
-        const logPath = path.join(logDir, filename);
-        this.logConfig = {
-            appenders: {
-                FileAppender: { // 输出到文件的appender
-                    type: 'file',
-                    filename: logPath, // 指定日志文件的位置和文件名
-                    maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
-                    layout: {
-                        type: 'pattern',
-                        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m',
-                    },
-                },
-                ConsoleAppender: { // 输出到控制台的appender
-                    type: 'console',
-                    layout: {
-                        type: 'pattern',
-                        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`,
-                    },
-                },
-            },
-            categories: {
-                default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
-                file: { appenders: ['FileAppender'], level: 'debug' },
-                console: { appenders: ['ConsoleAppender'], level: 'debug' },
-            },
-        };
-        log4js.configure(this.logConfig);
-        this.loggerConsole = log4js.getLogger('console');
-        this.loggerFile = log4js.getLogger('file');
-        this.loggerDefault = log4js.getLogger('default');
-        this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
-    }
-
-    setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
-        this.logConfig.categories.file.level = fileLogLevel;
-        this.logConfig.categories.console.level = consoleLogLevel;
-        log4js.configure(this.logConfig);
-    }
-
-    setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
-        const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
-        this.loggerConsole.addContext('userInfo', userInfo);
-        this.loggerFile.addContext('userInfo', userInfo);
-        this.loggerDefault.addContext('userInfo', userInfo);
-    }
-
-    setFileLogEnabled(isEnabled: boolean) {
-        this.fileLogEnabled = isEnabled;
-    }
-
-    setConsoleLogEnabled(isEnabled: boolean) {
-        this.consoleLogEnabled = isEnabled;
-    }
-
-    formatMsg(msg: any[]) {
-        let logMsg = '';
-        for (const msgItem of msg) {
-            if (msgItem instanceof Error) { // 判断是否是错误
-                logMsg += msgItem.stack + ' ';
-                continue;
-            } else if (typeof msgItem === 'object') { // 判断是否是对象
-                const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
-                logMsg += JSON.stringify(truncateString(obj)) + ' ';
-                continue;
-            }
-            logMsg += msgItem + ' ';
-        }
-        return logMsg;
-    }
-
-
-    _log(level: LogLevel, ...args: any[]) {
-        if (this.consoleLogEnabled) {
-            this.loggerConsole[level](this.formatMsg(args));
-        }
-        if (this.fileLogEnabled) {
-            this.loggerFile[level](this.formatMsg(args).replace(this.colorEscape, ''));
-        }
-    }
-
-    log(...args: any[]) {
-        // info 等级
-        this._log(LogLevel.INFO, ...args);
-    }
-
-    logDebug(...args: any[]) {
-        this._log(LogLevel.DEBUG, ...args);
-    }
-
-    logError(...args: any[]) {
-        this._log(LogLevel.ERROR, ...args);
-    }
-
-    logWarn(...args: any[]) {
-        this._log(LogLevel.WARN, ...args);
-    }
-
-    logFatal(...args: any[]) {
-        this._log(LogLevel.FATAL, ...args);
-    }
-
-    logMessage(msg: RawMessage, selfInfo: SelfInfo) {
-        const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
-            isSelfSent ? '发送 ->' : '接收 <-'
-        } ${rawMessageToText(msg)}`);
-    }
-}
-
-export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
-    if (recursiveLevel > 2) {
-        return '...';
-    }
-
-    const tokens: string[] = [];
-
-    if (msg.chatType == ChatType.friend) {
-        tokens.push(`私聊 (${msg.peerUin})`);
-    } else if (msg.chatType == ChatType.group) {
-        tokens.push(`群聊 (群 ${msg.peerUin} 的 ${msg.senderUin})`);
-    } else if (msg.chatType == ChatType.chatDevice) {
-        tokens.push('移动设备');
-    } else /* temp */ {
-        tokens.push(`临时消息 (${msg.peerUin})`);
-    }
-
-    // message content
-
-    function msgElementToText(element: ElementWrapper) {
-        if (element.textElement) {
-            if (element.textElement.atType === AtType.notAt) {
-                return element.textElement.content;
-            } else if (element.textElement.atType === AtType.atAll) {
-                return `@全体成员`;
-            } else if (element.textElement.atType === AtType.atUser) {
-                return `${element.textElement.content} (${element.textElement.atUid})`;
-            }
-        }
-
-        if (element.replyElement) {
-            const recordMsgOrNull = msg.records.find(
-                record => element.replyElement!.sourceMsgIdInRecords === record.msgId
-            );
-            return `[回复消息 ${
-                recordMsgOrNull &&
-                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
-                    ? 
-                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
-                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
-            }]`;
-        }
-
-        if (element.picElement) {
-            return `[图片 ${element.picElement.fileName}]`;
-        }
-
-        if (element.fileElement) {
-            return `[文件 ${element.fileElement.fileName}]`;
-        }
-
-        if (element.videoElement) {
-            return `[视频 ${element.videoElement.fileName}]`;
-        }
-
-        if (element.pttElement) {
-            return `[语音 ${element.pttElement.duration}s]`;
-        }
-
-        if (element.arkElement) {
-            return `[卡片消息 ${element.arkElement.bytesData}]`;
-        }
-
-        if (element.faceElement) {
-            return `[表情 ${element.faceElement.faceText ?? ''}]`;
-        }
-
-        if (element.marketFaceElement) {
-            return `[商城表情 ${element.marketFaceElement.faceName}]`;
-        }
-
-        if (element.markdownElement) {
-            return `[Markdown ${element.markdownElement.content}]`;
-        }
-
-        if (element.multiForwardMsgElement) {
-            return `[转发消息]`;
-        }
-
-        if (element.elementType === ElementType.GreyTip) {
-            return `[灰条消息]`; // TODO: resolve the text
-        }
-
-        return `[未实现 (ElementType = ${element.elementType})]`;
-    }
-
-    for (const element of msg.elements) {
-        tokens.push(msgElementToText(element));
-    }
-
-    return tokens.join(' ');
-}

src/common/utils/request.ts

@@ -1,194 +0,0 @@
-import https from 'node:https';
-import http from 'node:http';
-import { readFileSync } from 'node:fs';
-
-export class RequestUtil {
-    // 适用于获取服务器下发cookies时获取，仅GET
-    static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
-        const client = url.startsWith('https') ? https : http;
-        return new Promise((resolve, reject) => {
-            const req = client.get(url, (res) => {
-                let cookies: { [key: string]: string } = {};
-                const handleRedirect = (res: http.IncomingMessage) => {
-                    //console.log(res.headers.location);
-                    if (res.statusCode === 301 || res.statusCode === 302) {
-                        if (res.headers.location) {
-                            const redirectUrl = new URL(res.headers.location, url);
-                            RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
-                                // 合并重定向过程中的cookies
-                                cookies = { ...cookies, ...redirectCookies };
-                                resolve(cookies);
-                            }).catch((err) => {
-                                reject(err);
-                            });
-                        } else {
-                            resolve(cookies);
-                        }
-                    } else {
-                        resolve(cookies);
-                    }
-                };
-                res.on('data', () => {
-                }); // Necessary to consume the stream
-                res.on('end', () => {
-                    handleRedirect(res);
-                });
-                if (res.headers['set-cookie']) {
-                    //console.log(res.headers['set-cookie']);
-                    res.headers['set-cookie'].forEach((cookie) => {
-                        const parts = cookie.split(';')[0].split('=');
-                        const key = parts[0];
-                        const value = parts[1];
-                        if (key && value && key.length > 0 && value.length > 0) {
-                            cookies[key] = value;
-                        }
-                    });
-                }
-            });
-            req.on('error', (error: any) => {
-                reject(error);
-            });
-        });
-    }
-
-
-    // 请求和回复都是JSON data传原始内容 自动编码json
-    static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: {
-        [key: string]: string
-    } = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
-        const option = new URL(url);
-        const protocol = url.startsWith('https://') ? https : http;
-        const options = {
-            hostname: option.hostname,
-            port: option.port,
-            path: option.href,
-            method: method,
-            headers: headers,
-        };
-        // headers: {
-        //       'Content-Type': 'application/json',
-        //       'Content-Length': Buffer.byteLength(postData),
-        //     },
-        return new Promise((resolve, reject) => {
-            const req = protocol.request(options, (res: any) => {
-                let responseBody = '';
-                res.on('data', (chunk: string | Buffer) => {
-                    responseBody += chunk.toString();
-                });
-
-                res.on('end', () => {
-                    try {
-                        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-                            if (isJsonRet) {
-                                const responseJson = JSON.parse(responseBody);
-                                resolve(responseJson as T);
-                            } else {
-                                resolve(responseBody as T);
-                            }
-                        } else {
-                            reject(new Error(`Unexpected status code: ${res.statusCode}`));
-                        }
-                    } catch (parseError) {
-                        reject(parseError);
-                    }
-                });
-            });
-
-            req.on('error', (error: any) => {
-                reject(error);
-            });
-            if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
-                if (isArgJson) {
-                    req.write(JSON.stringify(data));
-                } else {
-                    req.write(data);
-                }
-
-            }
-            req.end();
-        });
-    }
-
-    // 请求返回都是原始内容
-    static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
-        return this.HttpGetJson<string>(url, method, data, headers, false, false);
-    }
-
-    static async createFormData(boundary: string, filePath: string): Promise<Buffer> {
-        let type = 'image/png';
-        if (filePath.endsWith('.jpg')) {
-            type = 'image/jpeg';
-        }
-        const formDataParts = [
-            `------${boundary}\r\n`,
-            `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
-            'Content-Type: ' + type + '\r\n\r\n',
-        ];
-
-        const fileContent = readFileSync(filePath);
-        const footer = `\r\n------${boundary}--`;
-        return Buffer.concat([
-            Buffer.from(formDataParts.join(''), 'utf8'),
-            fileContent,
-            Buffer.from(footer, 'utf8'),
-        ]);
-    }
-
-    static async uploadImageForOpenPlatform(filePath: string, cookies: string): Promise<string> {
-        return new Promise(async (resolve, reject) => {
-            type retType = { retcode: number, result?: { url: string } };
-            try {
-                const options = {
-                    hostname: 'cgi.connect.qq.com',
-                    port: 443,
-                    path: '/qqconnectopen/upload_share_image',
-                    method: 'POST',
-                    headers: {
-                        'Referer': 'https://cgi.connect.qq.com',
-                        'Cookie': cookies,
-                        'Accept': '*/*',
-                        'Connection': 'keep-alive',
-                        'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW',
-                    },
-                };
-                const req = https.request(options, async (res) => {
-                    let responseBody = '';
-
-                    res.on('data', (chunk: string | Buffer) => {
-                        responseBody += chunk.toString();
-                    });
-
-                    res.on('end', () => {
-                        try {
-                            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-                                const responseJson = JSON.parse(responseBody) as retType;
-                                resolve(responseJson.result!.url!);
-                            } else {
-                                reject(new Error(`Unexpected status code: ${res.statusCode}`));
-                            }
-                        } catch (parseError) {
-                            reject(parseError);
-                        }
-
-                    });
-
-                });
-
-                req.on('error', (error) => {
-                    reject(error);
-                    console.log('Error during upload:', error);
-                });
-
-                const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
-                // req.setHeader('Content-Length', Buffer.byteLength(body));
-                // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
-                req.write(body);
-                req.end();
-                return;
-            } catch (error) {
-                reject(error);
-            }
-            return undefined;
-        });
-    }
-}

src/common/utils/system.ts

@@ -1,73 +0,0 @@
-import os from 'node:os';
-import path from 'node:path';
-import { networkInterfaces } from 'os';
-import { randomUUID } from 'crypto';
-
-// 缓解Win7设备兼容性问题
-let osName: string;
-// 设备ID
-let machineId: Promise<string>;
-
-try {
-    osName = os.hostname();
-} catch (e) {
-    osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
-}
-
-const invalidMacAddresses = new Set([
-    '00:00:00:00:00:00',
-    'ff:ff:ff:ff:ff:ff',
-    'ac:de:48:00:11:22',
-]);
-
-function validateMacAddress(candidate: string): boolean {
-    // eslint-disable-next-line no-useless-escape
-    const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
-    return !invalidMacAddresses.has(tempCandidate);
-}
-
-export async function getMachineId(): Promise<string> {
-    if (!machineId) {
-        machineId = (async () => {
-            const id = await getMacMachineId();
-            return id || randomUUID(); // fallback, generate a UUID
-        })();
-    }
-
-    return machineId;
-}
-
-export function getMac(): string {
-    const ifaces = networkInterfaces();
-    for (const name in ifaces) {
-        const networkInterface = ifaces[name];
-        if (networkInterface) {
-            for (const { mac } of networkInterface) {
-                if (validateMacAddress(mac)) {
-                    return mac;
-                }
-            }
-        }
-    }
-
-    throw new Error('Unable to retrieve mac address (unexpected format)');
-}
-
-async function getMacMachineId(): Promise<string | undefined> {
-    try {
-        const crypto = await import('crypto');
-        const macAddress = getMac();
-        return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
-    } catch (err) {
-        return undefined;
-    }
-}
-
-const homeDir = os.homedir();
-
-export const systemPlatform = os.platform();
-export const cpuArch = os.arch();
-export const systemVersion = os.release();
-export const hostname = osName;
-export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();

src/common/utils/video.ts

@@ -1,59 +0,0 @@
-import ffmpeg, { FfprobeStream } from 'fluent-ffmpeg';
-import fs from 'fs';
-import type { LogWrapper } from './log';
-
-export async function getVideoInfo(filePath: string, logger: LogWrapper) {
-    const size = fs.statSync(filePath).size;
-    return new Promise<{
-        width: number,
-        height: number,
-        time: number,
-        format: string,
-        size: number,
-        filePath: string
-    }>((resolve, reject) => {
-        const ffmpegPath = process.env.FFMPEG_PATH;
-        ffmpegPath && ffmpeg.setFfmpegPath(ffmpegPath);
-        ffmpeg(filePath).ffprobe((err: any, metadata: ffmpeg.FfprobeData) => {
-            if (err) {
-                reject(err);
-            } else {
-                const videoStream = metadata.streams.find((s: FfprobeStream) => s.codec_type === 'video');
-                if (videoStream) {
-                    logger.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
-                } else {
-                    return reject('未找到视频流信息。');
-                }
-                resolve({
-                    width: videoStream.width!, height: videoStream.height!,
-                    time: parseInt(videoStream.duration!),
-                    format: metadata.format.format_name!,
-                    size,
-                    filePath,
-                });
-            }
-        });
-    });
-}
-
-export function checkFfmpeg(newPath: string | null = null, logger: LogWrapper): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-        logger.log('开始检查ffmpeg', newPath);
-        if (newPath) {
-            ffmpeg.setFfmpegPath(newPath);
-        }
-        try {
-            ffmpeg.getAvailableFormats((err: any, formats: any) => {
-                if (err) {
-                    logger.log('ffmpeg is not installed or not found in PATH:', err);
-                    resolve(false);
-                } else {
-                    logger.log('ffmpeg is installed.');
-                    resolve(true);
-                }
-            });
-        } catch (e) {
-            resolve(false);
-        }
-    });
-}

src/common/version.ts

@@ -0,0 +1 @@
+export const napCatVersion = '4.1.5';

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,27 +1,15 @@
-interface IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number): void;
+import { MsfChangeReasonType, MsfStatusType } from "../entities/adapter";
 
-    onMSFSsoError(args: unknown): void;
+export class NodeIDependsAdapter {
+    onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {
 
-    getGroupCode(args: unknown): void;
-}
-
-export interface NodeIDependsAdapter extends IDependsAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDependsAdapter): NodeIDependsAdapter;
-}
-
-export class DependsAdapter implements IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
     }
 
     onMSFSsoError(args: unknown) {
+
     }
 
     getGroupCode(args: unknown) {
+
     }
 }

src/core/adapters/NodeIDispatcherAdapter.ts

@@ -1,17 +1,4 @@
-interface IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-
-    dispatchCall(arg: unknown): void;
-
-    dispatchCallWithJson(arg: unknown): void;
-}
-
-export interface NodeIDispatcherAdapter extends IDispatcherAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDispatcherAdapter): NodeIDispatcherAdapter;
-}
-
-export class DispatcherAdapter implements IDispatcherAdapter {
+export class NodeIDispatcherAdapter {
     dispatchRequest(arg: unknown) {
     }
 

src/core/adapters/NodeIGlobalAdapter.ts

@@ -1,27 +1,4 @@
-interface IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-
-    onGetSrvCalTime(...args: unknown[]): void;
-
-    onShowErrUITips(...args: unknown[]): void;
-
-    fixPicImgType(...args: unknown[]): void;
-
-    getAppSetting(...args: unknown[]): void;
-
-    onInstallFinished(...args: unknown[]): void;
-
-    onUpdateGeneralFlag(...args: unknown[]): void;
-
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-
-export interface NodeIGlobalAdapter extends IGlobalAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-
-export class GlobalAdapter implements IGlobalAdapter {
+export class NodeIGlobalAdapter {
     onLog(...args: unknown[]) {
     }
 

src/core/apis/collection.ts

@@ -10,7 +10,7 @@ export class NTQQCollectionApi {
     }
 
     async createCollection(authorUin: string, authorUid: string, authorName: string, brief: string, rawData: string) {
-        const param = {
+        return this.context.session.getCollectionService().createNewCollectionItem({
             commInfo: {
                 bid: 1,
                 category: 2,
@@ -43,12 +43,11 @@ export class NTQQCollectionApi {
                 fileList: [],
             },
             need_share_url: false,
-        };
-        return this.context.session.getCollectionService().createNewCollectionItem(param);
+        });
     }
 
     async getAllCollection(category: number = 0, count: number = 50) {
-        const param = {
+        return this.context.session.getCollectionService().getCollectionItemList({
             category: category,
             groupId: -1,
             forceSync: true,
@@ -56,7 +55,6 @@ export class NTQQCollectionApi {
             timeStamp: '0',
             count: count,
             searchDown: true,
-        };
-        return this.context.session.getCollectionService().getCollectionItemList(param);
+        });
     }
 }

src/core/apis/file.ts

@@ -1,39 +1,42 @@
 import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
     ChatType,
     ElementType,
     IMAGE_HTTP_HOST,
     IMAGE_HTTP_HOST_NT,
     Peer,
     PicElement,
+    PicType,
+    RawMessage,
+    SendFileElement,
+    SendPicElement,
+    SendPttElement,
+    SendVideoElement,
 } from '@/core/entities';
 import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
-import { InstanceContext, NapCatCore, OnRichMediaDownloadCompleteParams } from '@/core';
+import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
 import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5 } from '@/common/utils/file';
-
+import { calculateFileMD5, isGIF } from '@/common/file';
+import pathLib from 'node:path';
+import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
+import ffmpeg from 'fluent-ffmpeg';
+import { encodeSilk } from '@/common/audio';
+import { MessageContext } from '@/onebot/api';
 
 export class NTQQFileApi {
     context: InstanceContext;
     core: NapCatCore;
     rkeyManager: RkeyManager;
+    packetRkey: Array<{ rkey: string; time: number; type: number; ttl: bigint }> | undefined;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
-    }
-
-    async getFileType(filePath: string) {
-        return fileType.fileTypeFromFile(filePath);
+        this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
     }
 
     async copyFile(filePath: string, destPath: string) {
@@ -51,18 +54,15 @@ export class NTQQFileApi {
         })).urlResult.domainUrl;
     }
 
-    // 上传文件到QQ的文件夹
     async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        // napCatCore.wrapper.util.
         const fileMd5 = await calculateFileMD5(filePath);
-        let ext: string = (await this.getFileType(filePath))?.ext as string || '';
-        if (ext) {
-            ext = '.' + ext;
-        }
+        const extOrEmpty = (await fileType.fileTypeFromFile(filePath))?.ext;
+        const ext = extOrEmpty ? `.${extOrEmpty}` : '';
         let fileName = `${path.basename(filePath)}`;
         if (fileName.indexOf('.') === -1) {
             fileName += ext;
         }
+
         const mediaPath = this.context.session.getMsgService().getRichMediaFilePathForGuild({
             md5HexStr: fileMd5,
             fileName: fileName,
@@ -73,7 +73,8 @@ export class NTQQFileApi {
             downloadType: 1,
             file_uuid: '',
         });
-        await this.copyFile(filePath, mediaPath!);
+
+        await this.copyFile(filePath, mediaPath);
         const fileSize = await this.getFileSize(filePath);
         return {
             md5: fileMd5,
@@ -84,12 +85,241 @@ export class NTQQFileApi {
         };
     }
 
-    async downloadMediaByUuid() {
-        //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
+    async createValidSendFileElement(context: MessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
+        const {
+            fileName: _fileName,
+            path,
+            fileSize,
+        } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.FILE);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        context.deleteAfterSentFiles.push(path);
+        return {
+            elementType: ElementType.FILE,
+            elementId: '',
+            fileElement: {
+                fileName: fileName || _fileName,
+                folderId: folderId,
+                filePath: path,
+                fileSize: (fileSize).toString(),
+            },
+        };
+    }
+
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+        const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        context.deleteAfterSentFiles.push(path);
+        return {
+            elementType: ElementType.PIC,
+            elementId: '',
+            picElement: {
+                md5HexStr: md5,
+                fileSize: fileSize.toString(),
+                picWidth: imageSize.width,
+                picHeight: imageSize.height,
+                fileName: fileName,
+                sourcePath: path,
+                original: true,
+                picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+                picSubType: subType,
+                fileUuid: '',
+                fileSubId: '',
+                thumbFileSize: 0,
+                summary,
+            } as PicElement,
+        };
+    }
+
+    async createValidSendVideoElement(context: MessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+        const logger = this.core.context.logger;
+        let videoInfo = {
+            width: 1920, height: 1080,
+            time: 15,
+            format: 'mp4',
+            size: 0,
+            filePath,
+        };
+        try {
+            videoInfo = await getVideoInfo(filePath, logger);
+        } catch (e) {
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
+        }
+
+        let fileExt = 'mp4';
+        try {
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (tempExt) fileExt = tempExt;
+        } catch (e) {
+            this.context.logger.logError.bind(logger)('获取文件类型失败', e);
+        }
+        const newFilePath = filePath + '.' + fileExt;
+        fs.copyFileSync(filePath, newFilePath);
+        context.deleteAfterSentFiles.push(newFilePath);
+        filePath = newFilePath;
+        const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        videoInfo.size = fileSize;
+        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
+        thumb = pathLib.dirname(thumb);
+
+        const thumbPath = new Map();
+        const _thumbPath = await new Promise<string | undefined>((resolve, reject) => {
+            const thumbFileName = `${md5}_0.png`;
+            const thumbPath = pathLib.join(thumb, thumbFileName);
+            ffmpeg(filePath)
+                .on('error', (err) => {
+                    try {
+                        logger.logDebug('获取视频封面失败，使用默认封面', err);
+                        if (diyThumbPath) {
+                            fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                                resolve(thumbPath);
+                            }).catch(reject);
+                        } else {
+                            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
+                            resolve(thumbPath);
+                        }
+                    } catch (error) {
+                        logger.logError.bind(logger)('获取视频封面失败，使用默认封面失败', error);
+                    }
+                })
+                .screenshots({
+                    timestamps: [0],
+                    filename: thumbFileName,
+                    folder: thumb,
+                    size: videoInfo.width + 'x' + videoInfo.height,
+                })
+                .on('end', () => {
+                    resolve(thumbPath);
+                });
+        });
+        const thumbSize = _thumbPath ? (await fsPromises.stat(_thumbPath)).size : 0;
+        thumbPath.set(0, _thumbPath);
+        const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
+        context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
+        return {
+            elementType: ElementType.VIDEO,
+            elementId: '',
+            videoElement: {
+                fileName: uploadName,
+                filePath: path,
+                videoMd5: md5,
+                thumbMd5,
+                fileTime: videoInfo.time,
+                thumbPath: thumbPath,
+                thumbSize,
+                thumbWidth: videoInfo.width,
+                thumbHeight: videoInfo.height,
+                fileSize: '' + fileSize,
+            },
+        };
+    }
+
+    async createValidSendPttElement(pttPath: string): Promise<SendPttElement> {
+        const { converted, path: silkPath, duration } = await encodeSilk(pttPath, this.core.NapCatTempPath, this.core.context.logger);
+        if (!silkPath) {
+            throw new Error('语音转换失败, 请检查语音文件是否正常');
+        }
+        const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(silkPath, ElementType.PTT);
+        if (fileSize === 0) {
+            throw new Error('文件异常，大小为0');
+        }
+        if (converted) {
+            fsPromises.unlink(silkPath).then().catch(
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
+            );
+        }
+        return {
+            elementType: ElementType.PTT,
+            elementId: '',
+            pttElement: {
+                fileName: fileName,
+                filePath: path,
+                md5HexStr: md5,
+                fileSize: fileSize.toString(),
+                duration: duration ?? 1,
+                formatType: 1,
+                voiceType: 1,
+                voiceChangeType: 0,
+                canConvert2Text: true,
+                waveAmplitudes: [
+                    0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17,
+                ],
+                fileSubId: '',
+                playState: 1,
+                autoConvertText: 0,
+            },
+        };
+    }
+
+    async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) {
+        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/downloadFileForModelId',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [peer, [modelId], unknown],
+            () => true,
+            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
+            1,
+            timeout,
+        );
+        return fileTransNotifyInfo.filePath;
+    }
+
+    async downloadRawMsgMedia(msg: RawMessage[]) {
+        const res = await Promise.all(
+            msg.map(m =>
+                Promise.all(
+                    m.elements
+                        .filter(element =>
+                            element.elementType === ElementType.PIC ||
+                            element.elementType === ElementType.VIDEO ||
+                            element.elementType === ElementType.PTT ||
+                            element.elementType === ElementType.FILE
+                        )
+                        .map(element =>
+                            this.downloadMedia(m.msgId, m.chatType, m.peerUid, element.elementId, '', '', 1000 * 60 * 2, true)
+                        )
+                )
+            )
+        );
+        msg.forEach((m, msgIndex) => {
+            const elementResults = res[msgIndex];
+            let elementIndex = 0;
+            m.elements.forEach(element => {
+                if (
+                    element.elementType === ElementType.PIC ||
+                    element.elementType === ElementType.VIDEO ||
+                    element.elementType === ElementType.PTT ||
+                    element.elementType === ElementType.FILE
+                ) {
+                    switch (element.elementType) {
+                    case ElementType.PIC:
+                            element.picElement!.sourcePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.VIDEO:
+                            element.videoElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.PTT:
+                            element.pttElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.FILE:
+                            element.fileElement!.filePath = elementResults[elementIndex];
+                        break;
+                    }
+                    elementIndex++;
+                }
+            });
+        });
     }
 
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等
         if (sourcePath && fs.existsSync(sourcePath)) {
             if (force) {
@@ -102,73 +332,36 @@ export class NTQQFileApi {
                 return sourcePath;
             }
         }
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (
-                params: {
-                    fileModelId: string,
-                    downloadSourceType: number,
-                    triggerType: number,
-                    msgId: string,
-                    chatType: ChatType,
-                    peerUid: string,
-                    elementId: string,
-                    thumbSize: number,
-                    downloadType: number,
-                    filePath: string
-                }) => Promise<unknown>,
-            (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-                >(
-                'NodeIKernelMsgService/downloadRichMedia',
-                'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-                1,
-                timeout,
-                (arg: OnRichMediaDownloadCompleteParams) => {
-                    if (arg.msgId === msgId) {
-                        return true;
-                    }
-                    return false;
-                },
-                {
-                    fileModelId: '0',
-                    downloadSourceType: 0,
-                    triggerType: 1,
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
-                    thumbSize: 0,
-                    downloadType: 1,
-                    filePath: thumbPath,
-                },
-                );
-        const msg = await this.core.apis.MsgApi.getMsgsByMsgId({
-            guildId: '',
-            chatType: chatType,
-            peerUid: peerUid,
-        }, [msgId]);
-        if (msg.msgList.length === 0) {
-            return data[1].filePath;
-        }
-        //获取原始消息
-        const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
-        if (!FileElements) {
-            //失败则就乱来 Todo
-            return data[1].filePath;
-        }
-        //从原始消息获取文件路径
-        const filePath =
-            FileElements?.fileElement?.filePath ||
-            FileElements?.pttElement?.filePath ||
-            FileElements?.videoElement?.filePath ||
-            FileElements?.picElement?.sourcePath;
-        return filePath;
+        const [, completeRetData] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/downloadRichMedia',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [{
+                fileModelId: '0',
+                downloadSourceType: 0,
+                triggerType: 1,
+                msgId: msgId,
+                chatType: chatType,
+                peerUid: peerUid,
+                elementId: elementId,
+                thumbSize: 0,
+                downloadType: 1,
+                filePath: thumbPath,
+            }],
+            () => true,
+            (arg) => arg.msgElementId === elementId && arg.msgId === msgId,
+            1,
+            timeout,
+        );
+        return completeRetData.filePath;
     }
 
-    async getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined> {
+    async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
         return new Promise((resolve, reject) => {
-            imageSize(filePath, (err, dimensions) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
                 if (err) {
-                    reject(err);
+                    reject(new Error(err.message));
+                } else if (!dimensions) {
+                    reject(new Error('获取图片尺寸失败'));
                 } else {
                     resolve(dimensions);
                 }
@@ -176,205 +369,121 @@ export class NTQQFileApi {
         });
     }
 
-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.group) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.friend) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
+    async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
+        const randomResultId = 100000 + Math.floor(Math.random() * 10000);
+        let searchId = 0;
+        const [, searchResult] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/searchFile',
+            'NodeIKernelFileAssistantListener/onFileSearch',
+            [
+                keys,
+                { resultType: 2, pageLimit: 1 },
+                randomResultId,
             ],
-        });
+            (ret) => {
+                searchId = ret;
+                return true;
+            },
+            result => result.searchId === searchId && result.resultId === randomResultId,
+        );
+        return searchResult.resultItems[0];
     }
 
-    async searchfile(keys: string[]) {
-        type EventType = NodeIKernelSearchService['searchFileWithKeywords'];
-
-        interface OnListener {
-            searchId: string,
-            hasMore: boolean,
-            resultItems: {
-                chatType: ChatType,
-                buddyChatInfo: any[],
-                discussChatInfo: any[],
-                groupChatInfo:
-                {
-                    groupCode: string,
-                    isConf: boolean,
-                    hasModifyConfGroupFace: boolean,
-                    hasModifyConfGroupName: boolean,
-                    groupName: string,
-                    remark: string
-                }[],
-                dataLineChatInfo: any[],
-                tmpChatInfo: any[],
-                msgId: string,
-                msgSeq: string,
-                msgTime: string,
-                senderUid: string,
-                senderNick: string,
-                senderRemark: string,
-                senderCard: string,
-                elemId: string,
-                elemType: number,
-                fileSize: string,
-                filePath: string,
-                fileName: string,
-                hits:
-                {
-                    start: number,
-                    end: number
-                }[]
-            }[]
-        }
-
-        const Event = this.core.eventWrapper.createEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords');
-        let id = '';
-        const Listener = this.core.eventWrapper.RegisterListen<(params: OnListener) => void>
-            (
-            'NodeIKernelSearchListener/onSearchFileKeywordsResult',
+    async downloadFileById(
+        fileId: string,
+        fileSize: number = 1024576,
+        estimatedTime: number = (fileSize * 1000 / 1024576) + 5000,
+    ) {
+        const [, fileData] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/downloadFile',
+            'NodeIKernelFileAssistantListener/onFileStatusChanged',
+            [[fileId]],
+            ret => ret.result === 0,
+            status => status.fileStatus === 2 && status.fileProgress === '0',
             1,
-            20000,
-            (params) => id !== '' && params.searchId == id,
-            );
-        id = await Event!(keys, 12);
-        const [ret] = (await Listener);
-        return ret;
+            estimatedTime, // estimate 1MB/s
+        );
+        return fileData.filePath!;
     }
 
-    async getImageUrl(element: PicElement) {
+    async getImageUrl(element: PicElement): Promise<string> {
         if (!element) {
             return '';
         }
-        const url: string = element.originImageUrl!;  // 没有域名
+
+        const url: string = element.originImageUrl ?? '';
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
-        const fileUuid = element.fileUuid;
 
         if (url) {
-            const UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
-            const imageAppid = UrlParse.searchParams.get('appid');
-            const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNewPic) {
-                let UrlRkey = UrlParse.searchParams.get('rkey');
-                if (UrlRkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
-                }
-                const rkeyData = await this.rkeyManager.getRkey();
-                UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-                return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`;
-            } else {
-                // 老的图片url，不需要rkey
-                return IMAGE_HTTP_HOST + url;
-            }
-        } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
-            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 || md5HexStr)!.toUpperCase()}/0`;
+            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+            const rkeyData = await this.getRkeyData();
+            return this.getImageUrlFromParsedUrl(parsedUrl, rkeyData);
         }
-        this.context.logger.logDebug('图片url获取失败', element);
+
+        return this.getImageUrlFromMd5(fileMd5, md5HexStr);
+    }
+
+    private async getRkeyData() {
+        const rkeyData = {
+            private_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qEc3Rbib9LP4',
+            group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
+            online_rkey: false
+        };
+
+        try {
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                if (rkey_expired_private || rkey_expired_group) {
+                    this.packetRkey = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
+                }
+                if (this.packetRkey && this.packetRkey.length > 0) {
+                    rkeyData.group_rkey = this.packetRkey[1].rkey.slice(6);
+                    rkeyData.private_rkey = this.packetRkey[0].rkey.slice(6);
+                    rkeyData.online_rkey = true;
+                }
+            }
+        } catch (error: any) {
+            this.context.logger.logError.bind(this.context.logger)('获取rkey失败', error.message);
+        }
+
+        if (!rkeyData.online_rkey) {
+            try {
+                const tempRkeyData = await this.rkeyManager.getRkey();
+                rkeyData.group_rkey = tempRkeyData.group_rkey;
+                rkeyData.private_rkey = tempRkeyData.private_rkey;
+                rkeyData.online_rkey = tempRkeyData.expired_time > Date.now() / 1000;
+            } catch (e) {
+                this.context.logger.logError.bind(this.context.logger)('获取rkey失败 Fallback Old Mode', e);
+            }
+        }
+
+        return rkeyData;
+    }
+
+    private getImageUrlFromParsedUrl(parsedUrl: URL, rkeyData: any): string {
+        const imageAppid = parsedUrl.searchParams.get('appid');
+        const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+        const imageFileId = parsedUrl.searchParams.get('fileid');
+        if (isNTV2 && rkeyData.online_rkey) {
+            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+            return IMAGE_HTTP_HOST_NT + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
+        } else if (isNTV2 && imageFileId) {
+            const rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+            return IMAGE_HTTP_HOST + `/download?appid=${imageAppid}&fileid=${imageFileId}&rkey=${rkey}`;
+        }
+
+        return '';
+    }
+
+    private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {
+        if (fileMd5 || md5HexStr) {
+            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr ?? '').toUpperCase()}/0`;
+        }
+
+        this.context.logger.logDebug('图片url获取失败', { fileMd5, md5HexStr });
         return '';
     }
 }
 
-export class NTQQFileCacheApi {
-    context: InstanceContext;
-    core: NapCatCore;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-    }
-
-    async setCacheSilentScan(isSilent: boolean = true) {
-        return '';
-    }
-
-    getCacheSessionPathList() {
-        return '';
-    }
-
-    clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        // 参数未验证
-        return this.context.session.getStorageCleanService().clearCacheDataByKeys(cacheKeys);
-    }
-
-    addCacheScannedPaths(pathMap: object = {}) {
-        return this.context.session.getStorageCleanService().addCacheScanedPaths(pathMap);
-    }
-
-    scanCache() {
-        //return (await this.context.session.getStorageCleanService().scanCache()).size;
-    }
-
-    getHotUpdateCachePath() {
-        // 未实现
-        return '';
-    }
-
-    getDesktopTmpPath() {
-        // 未实现
-        return '';
-    }
-
-    getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return this.context.session.getStorageCleanService().getChatCacheInfo(type, pageSize, 1, pageIndex);
-    }
-
-    getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
-        //需要五个参数
-        //return napCatCore.session.getStorageCleanService().getFileCacheInfo();
-    }
-
-    async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return this.context.session.getStorageCleanService().clearChatCacheInfo(chats, fileKeys);
-    }
-}

src/core/apis/friend.ts

@@ -1,61 +1,56 @@
-import { Friend, FriendV2, User } from '@/core/entities';
-import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService, OnBuddyChangeParams } from '@/core';
-import { LimitedHashTable } from '@/common/utils/MessageUnique';
+import { FriendV2 } from '@/core/entities';
+import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core';
+import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQFriendApi {
     context: InstanceContext;
     core: NapCatCore;
-    //friends: Map<string, Friend> = new Map<string, FriendV2>();
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-        //     this.getFriends(true);
-        // }
+    }
+    async setBuddyRemark(uid: string, remark: string) {
+        return this.context.session.getBuddyService().setBuddyRemark({ uid, remark });
+    }
+    async getBuddyV2SimpleInfoMap(refresh = false) {
+        const buddyService = this.context.session.getBuddyService();
+        const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
+        const uids = buddyListV2.data.flatMap(item => item.buddyUids);
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
     }
 
     async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-        const uids: string[] = [];
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
-        );
-        return Array.from(data.values());
+        return Array.from((await this.getBuddyV2SimpleInfoMap(refresh)).values());
     }
 
     async getBuddyIdMap(refresh = false): Promise<LimitedHashTable<string, string>> {
-        const uids: string[] = [];
         const retMap: LimitedHashTable<string, string> = new LimitedHashTable<string, string>(5000);
-        const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-        uids.push(...buddyListV2.data.flatMap(item => item.buddyUids));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
-        );
-        data.forEach((value, key) => {
-            retMap.set(value.uin!, value.uid!);
-        });
-        //console.log('getBuddyIdMap', retMap.getValue);
+        const data = await this.getBuddyV2SimpleInfoMap(refresh);
+        data.forEach((value) => retMap.set(value.uin!, value.uid!));
         return retMap;
     }
-
-    async getBuddyV2ExWithCate(refresh = false) {
-        const uids: string[] = [];
-        const categoryMap: Map<string, any> = new Map();
+    async delBuudy(uid: string, tempBlock = false, tempBothDel = false) {
+        return this.context.session.getBuddyService().delBuddy({
+            friendUid: uid,
+            tempBlock: tempBlock,
+            tempBothDel: tempBothDel
+        });
+    }
+    async getBuddyV2ExWithCate() {
         const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
-        uids.push(
-            ...buddyListV2.flatMap(item => {
-                item.buddyUids.forEach(uid => {
-                    categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
-                });
-                return item.buddyUids;
-            }));
-        const data = await this.core.eventWrapper.callNoListenerEvent<NodeIKernelProfileService['getCoreAndBaseInfo']>(
-            'NodeIKernelProfileService/getCoreAndBaseInfo', 5000, 'nodeStore', uids,
+        const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
+        const uids = buddyListV2.flatMap(item => {
+            return item.buddyUids;
+        });
+        const data = await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
         );
         return buddyListV2.map(category => ({
             categoryId: category.categoryId,
@@ -71,28 +66,17 @@ export class NTQQFriendApi {
         return this.context.session.getBuddyService().isBuddy(uid);
     }
 
-    /**
-     * @deprecated
-     * @param forced
-     * @returns
-     */
-    async getFriends(forced = false): Promise<User[]> {
-        const [_retData, _BuddyArg] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise<any>, (arg: OnBuddyChangeParams) => void>
-            (
-            'NodeIKernelBuddyService/getBuddyList',
-            'NodeIKernelBuddyListener/onBuddyListChange',
-            1,
-            5000,
-            () => true,
-            forced,
-            );
-        const friends: User[] = [];
-        for (const categoryItem of _BuddyArg) {
-            for (const friend of categoryItem.buddyList) {
-                friends.push(friend);
-            }
-        }
-        return friends;
+    async clearBuddyReqUnreadCnt() {
+        return this.context.session.getBuddyService().clearBuddyReqUnreadCnt();
+    }
+
+    async getBuddyReq() {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelBuddyService/getBuddyReq',
+            'NodeIKernelBuddyListener/onBuddyReqChange',
+            [],
+        );
+        return ret;
     }
 
     async handleFriendRequest(flag: string, accept: boolean) {