fix: 177

修复webui快捷登录失败

.eslintrc.cjs

@@ -1,9 +1,10 @@
 module.exports = {
   'env': {
+    'browser': true,
     'es2021': true,
     'node': true
   },
-  'ignorePatterns': ['src/core/', 'src/core.lib/'],
+  'ignorePatterns': ['src/core/', 'src/core.lib/','src/proto/'],
   'extends': [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended'

.github/workflows/build.yml

@@ -1,5 +1,6 @@
-name: "Build"
+name: "Build Action"
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -13,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
@@ -21,7 +22,8 @@ jobs:
       with:
           repository: 'NapNeko/NapCatQQ'
           submodules: true
-          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: main
+          token: ${{ secrets.NAPCAT_BUILD }}
     - name: Use Node.js 20.X
       uses: actions/setup-node@v4
       with:
@@ -45,14 +47,15 @@ jobs:
       fail-fast: false
       matrix:
         target_platform: [win32]
-        target_arch: [x64]
+        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
           with:
                 repository: 'NapNeko/NapCatQQ'
                 submodules: true
-                token: ${{ secrets.GITHUB_TOKEN }}
+                ref: main
+                token: ${{ secrets.NAPCAT_BUILD }}
         - name: Use Node.js 20.X
           uses: actions/setup-node@v4
           with:

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: "release"
+name: "Build Release"
 
 on:
   push:
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
@@ -53,6 +53,8 @@ jobs:
 
     - name: Build NuCat Linux
       run: |
+          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
           npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
           npm run build:prod
           cd dist
@@ -70,7 +72,7 @@ jobs:
       fail-fast: false
       matrix:
         target_platform: [win32]
-        target_arch: [x64]
+        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -87,6 +89,8 @@ jobs:
           
         - name: Build NuCat Linux
           run: |
+                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
                 npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
                 npm run build:prod
                 cd dist
@@ -116,12 +120,17 @@ jobs:
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
+    - name: Clone Changes Log
+      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/docs/changelogs/CHANGELOG.v${{ env.VERSION }}.md
+        
     - name: Create Release Draft and Upload Artifacts
       uses: softprops/action-gh-release@v1
       with:
         name: NapCat V${{ env.VERSION }}
         token: ${{ secrets.GITHUB_TOKEN }}
+        body_path: CHANGELOG.md
         files: |
+          NapCat.win32.ia32.zip
           NapCat.win32.x64.zip
           NapCat.linux.x64.zip
           NapCat.linux.arm64.zip

.github/workflows/test.yml

@@ -0,0 +1,69 @@
+name: "Build Test"
+on:
+  workflow_dispatch:
+
+permissions: write-all
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target_platform: [linux]
+        target_arch: [x64, arm64]
+    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 Linux
+      run: |
+          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm run build:prod
+          cd dist
+          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          cd ..
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        path: dist
+  build-win32:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target_platform: [win32]
+        target_arch: [x64,ia32]
+    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 Linux
+          run: |
+                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm run build:prod
+                cd dist
+                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                cd ..
+        - name: Upload Artifact
+          uses: actions/upload-artifact@v4
+          with:
+              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+              path: dist

.gitignore

@@ -1,11 +1,11 @@
-# Logs
-
 # Develop
 node_modules/
 package-lock.json
+pnpm-lock.yaml
 out/
 dist/
-src/core.lib/common/
+/src/core.lib/common/
+/localdebug/
 
 # Editor
 .vscode/*
@@ -15,3 +15,4 @@ src/core.lib/common/
 # Build
 *.db
 checkVersion.sh
+bun.lockb

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "src/core"]
-	path = src/core
-	url = https://github.com/NapNeko/core.git
-	branch = master

README.md

@@ -4,164 +4,30 @@
 
 ## 项目介绍
 
-NapCatQQ（瞌睡猫QQ，不准叫我NCQQ！），像睡着了一样在后台低占用运行的无头(没有界面)的NTQQ
+NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
 
-目前测试在 Windows 上表现优秀，最低可达只占用内存 **20M**左右
+名字寓意 瞌睡猫QQ，像睡着了一样在后台低占用运行的无需GUI界面的NTQQ。
 
-由于 Linux 上的 QQ 图形依赖较多，会导致内存占用小高，大约 **100+M**，目前正在研究如何优化
+## 如何使用
 
-具体占用会因人而异，QQ 群、好友越多占用越高
+可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-## 下载
+**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
 
-前往 Release 页面下载最新版本
 
-## 启动
-
-NapCat 是基于 官方NTQQ 实现的Bot框架，因此先需要安装官方QQ，**注意同个账号不能同时登录原版 QQ 和 NapCatQQ**
-
-*如果没有安装 QQ 请往后翻查看安装方法*
-
-修改 `config/onebot11.json`内容，并重名为 `onebot11_<你的QQ号>.json`，如`onebot11_1234567.json`
-
-json 配置内容参数解释：
-
-```json5
-{
-  // 是否启用http服务, true为启动，false为禁用，如果启用，可以通过http接口发送消息
-  "enableHttp": false,
-  // http服务端口
-  "httpPort": 3000,
-  // 是否启用正向websocket服务
-  "enableWs": false,
-  // 正向websocket服务端口
-  "wsPort": 3001,
-  // 是否启用反向websocket服务
-  "enableWsReverse": false,
-  // 反向websocket对接的地址, 如["ws://127.0.0.1:8080/onebot/v11/ws"]
-  "wsReverseUrls": [],
-  // 是否启用http上报服务
-  "enableHttpPost": false,
-  // http上报地址, 如["http://127.0.0.1:8080/onebot/v11/http"]
-  "httpPostUrls": [],
-  // 是否启用http心跳
-  "enableHttpHeart": false,
-  // http上报密钥，可为空
-  "httpSecret": "",
-  // 消息上报格式，array为消息组，string为cq码字符串
-  "messagePostFormat": "array",
-  // 是否上报自己发送的消息
-  "reportSelfMessage": false,
-  // 是否开启调试模式，开启后上报消息会携带一个raw字段，为原始消息内容
-  "debug": false,
-  // 调用get_file接口时如果获取不到url则使用base64字段返回文件内容
-  "enableLocalFile2Url": true,
-  // ws心跳间隔，单位毫秒
-  "heartInterval": 30000,
-  // access_token，可以为空
-  "token": ""
-}
-
-```
-
-### Windows 启动
-
-运行`powershell ./napcat.ps1`, 或者 `napcat.bat`，如果出现乱码，可以尝试运行`napcat-utf8.ps1` 或 `napcat-utf8.bat`
-
-*如果出现 powershell 运行不了，以管理员身份打开 powershell，输入 `Set-ExecutionPolicy RemoteSigned`*
-
-### Linux 启动
-
-运行`napcat.sh`
-
-## 使用无需扫码快速登录
-
-前提是你已经成功登录过QQ，可以加参数` -q <你的QQ>` 进行登录，如`napcat.sh -q 1234567`
-
-## 安装
-
-### Linux安装
-
-#### 安装 Linux QQ(22741)，已经安装了的可以跳过
-
-目前还在研究怎么精简安装，暂时只能安装官方QQ整体依赖
-
-下载QQ
- 
-[deb x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_amd64_01.deb)
-[deb arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_arm64_01.deb)
-
-[rpm x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_x86_64_01.rpm)
-[rpm arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_aarch64_01.rpm)
-
-```bash
-sudo apt install ./qq.deb
-```
-
-```bash
-安装QQ的依赖
-sudo apt install libgbm1 libasound2
-```
-
-### Windows 安装
-
-#### 安装Windows QQ(22741)，已经安装了的可以跳过
-
-[Windows版本QQ下载](https://dldir1.qq.com/qqfile/qq/QQNT/Windows/QQ_9.9.9_240403_x64_01.exe)
-
-### 编译安装 NapCat
-
-**如果你是直接下载编译好的版本，可以跳过这一步**
-
-准备环境 [node18.18](https://nodejs.org/download/release/v18.18.2/)
-
-```
-export NODE_ENV=production
-npm install
-```
-
-## 常见问题
-
-### 二维码无法扫描
-
-NapCat 会自动保存二维码到目录，可以手动打开图片扫描
-
-如果没有条件访问本地目录，可以将二维码解析的 url 复制到二维码生成网站上生成二维码，然后手机QQ扫描
-
-### 语音、视频发送失败
-
-需要配置 ffmpeg，将 ffmpeg 目录加入环境变量，如果仍未生效，可以修改 napcat 启动脚本加入 FFMPEG_PATH 变量指定到 ffmpeg
-程序的完整路径
-
-如 Windows 上修改 napcat.ps1，在第一行加入
-
-```powershell
-$env:FFMPEG_PATH="d:\ffmpeg\bin\ffmpeg.exe"
-```
-
-### 出现 error code v2:-1 之类的提示
-
-不用管，这是正常现象，是因为 QQ 本身的问题，不影响使用
-
-## API 文档
-
-参考 [LLOneBot](https://llonebot.github.io/zh-CN/develop/api) 的文档
-
-<!-- 
-QQ群：545402644
--->
-
-## 声明
+## 项目声明
 
 * 请不要在无关地方宣传NapCatQQ，本项目只是用于学习 node 相关知识，切勿用于违法用途
 
 * NapCat 不会收集用户隐私信息，但是未来可能会为了更好的利于 NapCat 的优化会收集一些设备信息，如 cpu 架构，系统版本等
   
 ## 相关链接
-
-[TG群](https://t.me/+nLZEnpne-pQ1OWFl)
+[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
 ## 鸣谢名单
-[OpenShamrock]()
 
-[Lagrange]()
+[Lagrange](https://github.com/LagrangeDev/Lagrange.Core)
+
+<!-- 
+QQ群：545402644
+-->

docs/changelogs/CHANGELOG.v1.7.7.md

@@ -0,0 +1,11 @@
+# v1.7.7
+
+QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
+
+## 启动的方式
+Way03/Way05
+
+## 新增与调整
+1. 支持 9.9.15/3.2.12 版本QQ
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.3.md

@@ -0,0 +1,17 @@
+# v1.3.3
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 尝试修复多开崩溃问题
+* 修复群列表更新问题
+* 修复兼容性问题支持Win7
+* 修复下载 http 资源缺少UA
+* 优化少量消息合并转发速度
+* 修复加载群通知时出现 getUserDetailInfo timeout 导致程序崩溃
+  
+## 新增与调整
+* 新增设置群公告 Api: /_send_group_notice
+* 新增重启实现 包括重启快速登录/普通重启 副作用: 原进程 无法清理
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.5.md

@@ -0,0 +1,18 @@
+# v1.3.5
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化启动脚本
+* 修复非管理时群成员减少事件上报 **无法获取操作者与操作类型**
+* 修复快速重启进程清理问题
+* 优化配置文件格式 支持自动更新配置 但仍然建议 **备份配置**
+* 修复正向反向ws多个客户端周期多次心跳问题
+
+## 新增与调整
+* 支持WebUi热重载
+* 新增启动输出WEBUI秘钥
+* 新增群荣誉信息 /get_group_honor_info
+* 支持获取群系统消息 /get_group_system_msg
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.6.md

@@ -0,0 +1,11 @@
+# v1.3.6
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复戳一戳多次上报问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.8.md

@@ -0,0 +1,15 @@
+# v1.3.8
+
+QQ Version: Windows 9.9.9-23873 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化打包后体积问题
+* 修复QQ等级获取
+* 兼容 9.7.x 版本换行符 统一为 \n
+* 修复处理加群请求 字段异常情况
+* 修复退群通知问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.9.md

@@ -0,0 +1,11 @@
+# v1.3.9
+
+QQ Version: Windows 9.9.10-23873 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复QQ等级获取与兼容性问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.0.md

@@ -0,0 +1,12 @@
+# v1.4.0
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+
+## 新增与调整
+* 支持空间Cookies获取
+* 支持获取在线设备 API /get_online_clients
+* 支持图片OCR API： /.ocr_image /ocr_image
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.1.md

@@ -0,0 +1,14 @@
+# v1.4.1
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 提高部分Api兼容性
+* 优化日志膨胀问题
+* 在线状态刷新问题修复
+## 新增与调整
+* 支持非管理群 本地记录时间数据 (建议 **备份配置 清空配置 重新配置**)
+* 新增英译中接口 Api: /translate_en2zh
+* 新增群文件管理相关扩展接口 Api: /get_group_file_count /get_group_file_list /set_group_file_folder /del_group_file /del_group_file_folder
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.2.md

@@ -0,0 +1,12 @@
+# v1.4.2
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复获取群文件列表Api
+* 修复退群通知问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.3.md

@@ -0,0 +1,11 @@
+# v1.4.3
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复名片通知
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.4.md

@@ -0,0 +1,10 @@
+# v1.4.4
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 更新
+* **重大更新：**更新了版本号
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.5.md

@@ -0,0 +1,12 @@
+# v1.4.5
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 紧急修复二维扫码问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.6.md

@@ -0,0 +1,12 @@
+# v1.4.6
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化整体稳定性
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
+

docs/changelogs/old/CHANGELOG.v1.4.7.md

@@ -0,0 +1,11 @@
+# v1.4.7
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 临时扩展 Api: GoCQHTTPUploadGroupFile folder_id字段 用于选择文件夹
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.8.md

@@ -0,0 +1,12 @@
+# v1.4.8
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化Guid的生成方式
+* 支持临时消息获取群来源
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.9.md

@@ -0,0 +1,11 @@
+# v1.4.9
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复接口调用问题 接口标准化 API：set_group_add_request
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.0.md

@@ -0,0 +1,11 @@
+# v1.5.0
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修正各Api默认值
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.1.md

@@ -0,0 +1,12 @@
+# v1.5.1
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 支持 新Api: set_self_profile 可设置个性签名
+* 修复 Api: get_group_system_msg
+* 整理日志、添加颜色、使用统一的日志函数以提高日志可读性
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.2.md

@@ -0,0 +1,13 @@
+# v1.5.2
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 替换Uid/Uin为内部实现
+* 增加HttpApi调用稳定性
+* 修复 GetMsg 兼容性
+
+## 新增与调整
+* 支持真正意义上的陌生人信息获取 Api: GoCQHTTP_GetStrangerInfo
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.3.md

@@ -0,0 +1,15 @@
+# v1.5.3
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
+
+## 修复与优化
+* 修复引用消息id问题
+* 修复添加好友的通知
+
+## 新增与调整
+* 扩展群分享Json生成
+* 扩展关于收藏的一系列接口
+* 支持专属群头衔获取
+* 支持视频获取直链
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.4.md

@@ -0,0 +1,11 @@
+# v1.5.4
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
+
+## 修复与优化
+* 紧急修复视频与文件问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.5.md

@@ -0,0 +1,11 @@
+# v1.5.5
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
+
+## 修复与优化
+* 紧急修复一些问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.6.md

@@ -0,0 +1,11 @@
+# v1.5.6
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
+
+## 修复与优化
+* 修复一些问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.7.md

@@ -0,0 +1,11 @@
+# v1.5.7
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
+
+## 修复与优化
+* 修复一些问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.8.md

@@ -0,0 +1,14 @@
+# v1.5.8
+
+QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
+
+## 修复与优化
+* 修复视频文件残留问题
+* 重构 getcookies接口 支持大部分常见域 
+
+## 新增与调整
+* 日志大小限制
+* 支持 QQ音乐 卡片 无签名支持时 启用内置方法（缺点没有封面 限速1min/条）
+* 支持Window X86-32机器
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.9.md

@@ -0,0 +1,12 @@
+# v1.5.9
+
+QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
+
+## 修复与优化
+* 优化缓存问题
+* 修复poke异常上报
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.0.md

@@ -0,0 +1,11 @@
+# v1.6.0
+
+QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
+
+## 修复与优化
+
+
+## 新增与调整
+* 新增图片subtype属性 区分表情图片与商城图片
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.1.md

@@ -0,0 +1,11 @@
+# v1.6.1
+
+QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
+
+## 修复与优化
+
+
+## 新增与调整
+* 修复poke异常事件
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.2.md

@@ -0,0 +1,13 @@
+# v1.6.2
+
+QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
+
+## 修复与优化
+* 修复获取Cookies异常崩溃问题
+* 尝试修复成员退群缓存问题
+* 修复自身退群后群缓存清理问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.3.md

@@ -0,0 +1,13 @@
+# v1.6.3
+
+QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
+
+## 修复与优化
+* 修复带有groupid的私聊消息异常发送到群聊消息
+* 尝试修复rws热重载失效问题
+* 尝试修复进群事件无法正常获取uin
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.4.md

@@ -0,0 +1,18 @@
+# v1.6.4
+
+QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
+## 使用前警告
+1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
+2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
+3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
+## 其余·备注
+启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
+
+## 修复与优化
+1. 支持Win平台 9.9.12
+2. 修复部分发送图片下载异常情况
+
+## 新增与调整
+没有哦
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.5.md

@@ -0,0 +1,18 @@
+# v1.6.5
+
+QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
+## 使用前警告
+1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
+2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
+3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
+## 其余·备注
+启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
+
+## 修复与优化
+1. 优化了WrapperNative载入代码
+2. 优化缓存
+
+## 新增与调整
+没有哦
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.6.md

@@ -0,0 +1,17 @@
+# v1.6.6
+
+QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
+## 使用前警告
+1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
+2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
+3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
+## 其余·备注
+启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
+
+## 修复与优化
+1. 修复了一些问题
+
+## 新增与调整
+没有哦
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/develop/Image.NTAndroid.md

@@ -0,0 +1,49 @@
+
+    public static final int C2C_PIC_DOWNLOAD = 1004;
+    public static final String C2C_PIC_DOWNLOAD_DOMAIN = "c2cpicdw.qpic.cn";
+    public static final String C2C_PIC_DOWNLOAD_QUIC_DOMAIN = "c2cpicdw.quic.qpic.cn";
+    public static final int FLAG_NOT_UPLOAD = 3;
+    public static final int FLAG_UPLOADINFO_ERROR = 4;
+    public static final int GROUP_PIC_DOWNLOAD = 1000;
+    public static final String GROUP_PIC_DOWNLOAD_DOMAIN = "gchat.qpic.cn";
+    public static final String GROUP_PIC_DOWNLOAD_QUIC_DOMAIN = "gchat.quic.qpic.cn";
+    public static final String GUILD_PIC_DOWNLOAD_DOMAIN = "gchat.qpic.cn/qmeetpic";
+    public static final boolean NEW_STORE_FLAG = true;
+    public static final String PTT_VIDEO_DOWNLOAD_DOMAIN = "grouptalk.c2c.qq.com";
+
+     protected static final int AVIF_DECODE_EXCEPTION = 4;
+    protected static final int AVIF_DECODE_FAIL = 1;
+    protected static final int AVIF_DECODE_FAIL_SO_FAIL = 2;
+    protected static final int AVIF_DECODE_FAIL_UNKNOWN = 6;
+    protected static final int AVIF_DECODE_FILETYPE_ERROR = 5;
+    protected static final int AVIF_DECODE_OOM = 3;
+    protected static final int AVIF_DECODE_RENAME_FAIL = 7;
+    protected static final int AVIF_DECODE_SUC = 0;
+    public static final String AVIF_FILE_SUFFIX = ".avif";
+    public static final int AVIF_REQ_APPRUNTIME_NULL = 12;
+    public static final int AVIF_REQ_CODEC_UNSURPPORT = 5;
+    protected static final int AVIF_REQ_DENSITY_UNSURPPORT = 10;
+    protected static final int AVIF_REQ_FLASH_PHOTO = 9;
+    protected static final int AVIF_REQ_HAS_TMP_AVIF = 7;
+    protected static final int AVIF_REQ_INVALID_MSG_RECORD = 2;
+    protected static final int AVIF_REQ_IS_RAW_PHOTO = 3;
+    protected static final int AVIF_REQ_OUTPUTSTREAM_UNSURPPORT = 11;
+    protected static final int AVIF_REQ_OVERSIZE = 6;
+    protected static final int AVIF_REQ_RETRY = 1;
+    public static final int AVIF_REQ_SO_DOWNLOAD_FAILED = 8;
+    protected static final int AVIF_REQ_SUC = 0;
+    public static final int AVIF_REQ_SWITCH_CLOSE = 4;
+    public static final String C2C_PIC_DOWNLOAD_ERROR_CODE = "C2CPicDownloadErrorCode";
+    static final int DOWNLOAD_ST_COMPLETE = 1;
+    static final int DOWNLOAD_ST_HEAD = 2;
+    static final int DOWNLOAD_ST_LEFT = 4;
+    static final int DOWNLOAD_ST_PART = 3;
+    private static final int ENCRYPT_APPID = 1600000226;
+    public static final String GROUP_PIC_DOWNLOAD_ERROR_CODE = "GroupPicDownloadErrorCode";
+    public static final String KEY_PIC_DOWNLOAD_ERROR_CODE = "param_detail_code";
+    protected static final int QUIC_FAIL_IP_LIST_EMPTY = 1;
+    protected static final int QUIC_FAIL_REQUEST_HTTPS = 3;
+    protected static final int QUIC_FAIL_REQUEST_QUIC = 2;
+    protected static final int QUIC_FAIL_SO_LOAD = 4;
+    public static final String REPORT_TAG_DIRECT_DOWNLOAD_FAIL = "report_direct_download_fail";
+    public static final String REQ_PARAM_AVIF = "tp=avif";

docs/develop/Msg常量NTAndroid.md

@@ -0,0 +1,444 @@
+```java
+MsgConstant
+ int ARKSTRUCTELEMENTSUBTYPETENCENTDOCFROMMINIAPP = 1;
+ int ARKSTRUCTELEMENTSUBTYPETENCENTDOCFROMPLUSPANEL = 2;
+ int ARKSTRUCTELEMENTSUBTYPEUNKNOWN = 0;
+ int ATTYPEALL = 1;
+ int ATTYPECATEGORY = 512;
+ int ATTYPECHANNEL = 16;
+ int ATTYPEME = 4;
+ int ATTYPEONE = 2;
+ int ATTYPEONLINE = 64;
+ int ATTYPEROLE = 8;
+ int ATTYPESUMMON = 32;
+ int ATTYPESUMMONONLINE = 128;
+ int ATTYPESUMMONROLE = 256;
+ int ATTYPEUNKNOWN = 0;
+ int CALENDARELEMSUBTYPECOMMON = 3;
+ int CALENDARELEMSUBTYPESTRONG = 1;
+ int CALENDARELEMSUBTYPEUNKNOWN = 0;
+ int CALENDARELEMSUBTYPEWEAK = 2;
+ int FACEBUBBLEELEMSUBTYPENORMAL = 1;
+ int FACEBUBBLEELEMSUBTYPEUNKNOWN = 0;
+ int FETCHLONGMSGERRCODEMSGEXPIRED = 196;
+ int FILEELEMENTSUBTYPEAI = 16;
+ int FILEELEMENTSUBTYPEAPP = 11;
+ int FILEELEMENTSUBTYPEAUDIO = 3;
+ int FILEELEMENTSUBTYPEDOC = 4;
+ int FILEELEMENTSUBTYPEEMOTICON = 15;
+ int FILEELEMENTSUBTYPEEXCEL = 6;
+ int FILEELEMENTSUBTYPEFOLDER = 13;
+ int FILEELEMENTSUBTYPEHTML = 10;
+ int FILEELEMENTSUBTYPEIPA = 14;
+ int FILEELEMENTSUBTYPENORMAL = 0;
+ int FILEELEMENTSUBTYPEPDF = 7;
+ int FILEELEMENTSUBTYPEPIC = 1;
+ int FILEELEMENTSUBTYPEPPT = 5;
+ int FILEELEMENTSUBTYPEPSD = 12;
+ int FILEELEMENTSUBTYPETXT = 8;
+ int FILEELEMENTSUBTYPEVIDEO = 2;
+ int FILEELEMENTSUBTYPEZIP = 9;
+ int GRAYTIPELEMENTSUBTYPEAIOOP = 15;
+ int GRAYTIPELEMENTSUBTYPEBLOCK = 14;
+ int GRAYTIPELEMENTSUBTYPEBUDDY = 5;
+ int GRAYTIPELEMENTSUBTYPEBUDDYNOTIFY = 9;
+ int GRAYTIPELEMENTSUBTYPEEMOJIREPLY = 3;
+ int GRAYTIPELEMENTSUBTYPEESSENCE = 7;
+ int GRAYTIPELEMENTSUBTYPEFEED = 6;
+ int GRAYTIPELEMENTSUBTYPEFEEDCHANNELMSG = 11;
+ int GRAYTIPELEMENTSUBTYPEFILE = 10;
+ int GRAYTIPELEMENTSUBTYPEGROUP = 4;
+ int GRAYTIPELEMENTSUBTYPEGROUPNOTIFY = 8;
+ int GRAYTIPELEMENTSUBTYPEJSON = 17;
+ int GRAYTIPELEMENTSUBTYPELOCALMSG = 13;
+ int GRAYTIPELEMENTSUBTYPEPROCLAMATION = 2;
+ int GRAYTIPELEMENTSUBTYPEREVOKE = 1;
+ int GRAYTIPELEMENTSUBTYPEUNKNOWN = 0;
+ int GRAYTIPELEMENTSUBTYPEWALLET = 16;
+ int GRAYTIPELEMENTSUBTYPEXMLMSG = 12;
+ int INLINEKEYBOARDBUTTONRENDERSTYLEBLUEBLACKGROUND = 4;
+ int INLINEKEYBOARDBUTTONRENDERSTYLEBLUEBORDER = 1;
+ int INLINEKEYBOARDBUTTONRENDERSTYLEGRAYBORDER = 0;
+ int INLINEKEYBOARDBUTTONRENDERSTYLENOBORDER = 2;
+ int INLINEKEYBOARDBUTTONRENDERSTYLEREDCHARACTER = 3;
+ int INPUTSTATUSTYPECANCEL = 2;
+ int INPUTSTATUSTYPESPEAK = 3;
+ int INPUTSTATUSTYPETEXT = 1;
+ int KACTIVITYMSG = 22;
+ int KADDLOCALMSGEXTINFOTYPEPROLOGUEMSG = 1;
+ int KANONYMOUSATMEMSGTYPEINMSGBOX = 1001;
+ int KANONYMOUSFLAGFROMOTHERPEOPLE = 1;
+ int KANONYMOUSFLAGFROMOWN = 2;
+ int KANONYMOUSFLAGINVALID = 0;
+ int KAPPCHANNELMSG = 16;
+ int KATALLMSGTYPEINMSGBOX = 2000;
+ int KATMEMSGTYPEINMSGBOX = 1000;
+ int KATTRIBUTETYPEADELIEMSG = 16;
+ int KATTRIBUTETYPEEXTENDBUSINESS = 13;
+ int KATTRIBUTETYPEFEEDBACKSTATE = 17;
+ int KATTRIBUTETYPEGROUPHONOR = 2;
+ int KATTRIBUTETYPEKINGHONOR = 3;
+ int KATTRIBUTETYPELONGMSG = 8;
+ int KATTRIBUTETYPEMEMORYSTATEMSGINFO = 18;
+ int KATTRIBUTETYPEMSG = 0;
+ int KATTRIBUTETYPEMSGBOXEVENTTYPE = 14;
+ int KATTRIBUTETYPEPERSONAL = 1;
+ int KATTRIBUTETYPEPUBLICACCOUNT = 4;
+ int KATTRIBUTETYPEQQCONNECT = 12;
+ int KATTRIBUTETYPESENDMSGRSPTRANSSVRINFO = 15;
+ int KATTRIBUTETYPESHAREDMSGINFO = 5;
+ int KATTRIBUTETYPETEMPCHATGAMESESSION = 6;
+ int KATTRIBUTETYPETOROBOTMSG = 9;
+ int KATTRIBUTETYPEUININFO = 7;
+ int KATTRIBUTETYPEZPLAN = 11;
+ int KAUTOREPLYTEXTNONEINDEX = -1;
+ int KAVRECORDMSG = 19;
+ int KBUSINESSTYPGUILD = 1;
+ int KBUSINESSTYPNT = 0;
+ int KCHATTYPEADELIE = 42;
+ int KCHATTYPEBUDDYNOTIFY = 5;
+ int KCHATTYPEC2C = 1;
+ int KCHATTYPECIRCLE = 113;
+ int KCHATTYPEDATALINE = 8;
+ int KCHATTYPEDATALINEMQQ = 134;
+ int KCHATTYPEDISC = 3;
+ int KCHATTYPEFAV = 41;
+ int KCHATTYPEGAMEMESSAGE = 105;
+ int KCHATTYPEGAMEMESSAGEFOLDER = 116;
+ int KCHATTYPEGROUP = 2;
+ int KCHATTYPEGROUPBLESS = 133;
+ int KCHATTYPEGROUPGUILD = 9;
+ int KCHATTYPEGROUPHELPER = 7;
+ int KCHATTYPEGROUPNOTIFY = 6;
+ int KCHATTYPEGUILD = 4;
+ int KCHATTYPEGUILDMETA = 16;
+ int KCHATTYPEMATCHFRIEND = 104;
+ int KCHATTYPEMATCHFRIENDFOLDER = 109;
+ int KCHATTYPENEARBY = 106;
+ int KCHATTYPENEARBYASSISTANT = 107;
+ int KCHATTYPENEARBYFOLDER = 110;
+ int KCHATTYPENEARBYHELLOFOLDER = 112;
+ int KCHATTYPENEARBYINTERACT = 108;
+ int KCHATTYPEQQNOTIFY = 132;
+ int KCHATTYPERELATEACCOUNT = 131;
+ int KCHATTYPESERVICEASSISTANT = 118;
+ int KCHATTYPESERVICEASSISTANTSUB = 201;
+ int KCHATTYPESQUAREPUBLIC = 115;
+ int KCHATTYPESUBSCRIBEFOLDER = 30;
+ int KCHATTYPETEMPADDRESSBOOK = 111;
+ int KCHATTYPETEMPBUSSINESSCRM = 102;
+ int KCHATTYPETEMPC2CFROMGROUP = 100;
+ int KCHATTYPETEMPC2CFROMUNKNOWN = 99;
+ int KCHATTYPETEMPFRIENDVERIFY = 101;
+ int KCHATTYPETEMPNEARBYPRO = 119;
+ int KCHATTYPETEMPPUBLICACCOUNT = 103;
+ int KCHATTYPETEMPWPA = 117;
+ int KCHATTYPEUNKNOWN = 0;
+ int KCHATTYPEWEIYUN = 40;
+ int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007;
+ int KDOWNSOURCETYPEAIOINNER = 1;
+ int KDOWNSOURCETYPEBIGSCREEN = 2;
+ int KDOWNSOURCETYPEHISTORY = 3;
+ int KDOWNSOURCETYPEUNKNOWN = 0;
+ int KELEMTYPEACTIVITY = 25;
+ int KELEMTYPEACTIVITYSTATE = 41;
+ int KELEMTYPEACTIVITYSUBTYPECREATEMOBATEAM = 12;
+ int KELEMTYPEACTIVITYSUBTYPEDISBANDMOBATEAM = 11;
+ int KELEMTYPEACTIVITYSUBTYPEFEEDSQUARE = 10001;
+ int KELEMTYPEACTIVITYSUBTYPEFINISHGAME = 16;
+ int KELEMTYPEACTIVITYSUBTYPEFINISHMATCHTEAM = 14;
+ int KELEMTYPEACTIVITYSUBTYPEHOTCHAT = 10000;
+ int KELEMTYPEACTIVITYSUBTYPEMINIGAME = 18;
+ int KELEMTYPEACTIVITYSUBTYPEMUSICPLAY = 17;
+ int KELEMTYPEACTIVITYSUBTYPENEWSMOBA = 9;
+ int KELEMTYPEACTIVITYSUBTYPENOLIVE = 2;
+ int KELEMTYPEACTIVITYSUBTYPENOSCREENSHARE = 7;
+ int KELEMTYPEACTIVITYSUBTYPENOVOICE = 3;
+ int KELEMTYPEACTIVITYSUBTYPEONLIVE = 1;
+ int KELEMTYPEACTIVITYSUBTYPEONSCREENSHARE = 6;
+ int KELEMTYPEACTIVITYSUBTYPEONVOICE = 4;
+ int KELEMTYPEACTIVITYSUBTYPESTARTMATCHTEAM = 13;
+ int KELEMTYPEACTIVITYSUBTYPETARTGAME = 15;
+ int KELEMTYPEACTIVITYSUBTYPEUNKNOWN = 0;
+ int KELEMTYPEADELIEACTIONBAR = 44;
+ int KELEMTYPEADELIERECOMMENDEDMSG = 43;
+ int KELEMTYPEARKSTRUCT = 10;
+ int KELEMTYPEAVRECORD = 21;
+ int KELEMTYPECALENDAR = 19;
+ int KELEMTYPEFACE = 6;
+ int KELEMTYPEFACEBUBBLE = 27;
+ int KELEMTYPEFEED = 22;
+ int KELEMTYPEFILE = 3;
+ int KELEMTYPEGIPHY = 15;
+ int KELEMTYPEGRAYTIP = 8;
+ int KELEMTYPEINLINEKEYBOARD = 17;
+ int KELEMTYPEINTEXTGIFT = 18;
+ int KELEMTYPELIVEGIFT = 12;
+ int KELEMTYPEMARKDOWN = 14;
+ int KELEMTYPEMARKETFACE = 11;
+ int KELEMTYPEMULTIFORWARD = 16;
+ int KELEMTYPEONLINEFILE = 23;
+ int KELEMTYPEPIC = 2;
+ int KELEMTYPEPROLOGUE = 46;
+ int KELEMTYPEPTT = 4;
+ int KELEMTYPEREPLY = 7;
+ int KELEMTYPESHARELOCATION = 28;
+ int KELEMTYPESTRUCTLONGMSG = 13;
+ int KELEMTYPETASKTOPMSG = 29;
+ int KELEMTYPETEXT = 1;
+ int KELEMTYPETOFU = 26;
+ int KELEMTYPEUNKNOWN = 0;
+ int KELEMTYPEVIDEO = 5;
+ int KELEMTYPEWALLET = 9;
+ int KELEMTYPEYOLOGAMERESULT = 20;
+ int KENTERAIO = 1;
+ int KEXITAIO = 2;
+ int KFEEDBACKBUTTONTYPEDISLIKE = 2;
+ int KFEEDBACKBUTTONTYPELIKE = 1;
+ int KFEEDBACKBUTTONTYPEPROMPTCLICK = 5;
+ int KFEEDBACKBUTTONTYPEREGENERATE = 4;
+ int KFEEDBACKBUTTONTYPEUNKNOWN = 0;
+ int KFEEDBACKOPTLIKE = 1;
+ int KFEEDBACKOPTUNKNOWN = 0;
+ int KFEEDBACKOPTUNLIKE = 2;
+ int KFRIENDNEWADDEDMSGTYPEINMSGBOX = 1008;
+ int KGAMEBOXNEWMSGTYPEINMSGBOX = 3000;
+ int KGIFTATMEMSGTYPEINMSGBOX = 1005;
+ int KGROUPFILEATALLMSGTYPEINMSGBOX = 2001;
+ int KGROUPHOMEWORK = 20000;
+ int KGROUPHOMEWORKTASK = 20001;
+ int KGROUPKEYWORDMSGTYPEINMSGBOX = 2006;
+ int KGROUPMANNOUNCEATALLMSGTYPEINMSGBOX = 2004;
+ int KGROUPTASKATALLMSGTYPEINMSGBOX = 2003;
+ int KGROUPUNREADTYPEINMSGBOX = 2007;
+ int KGUILDCHANNELLIST = 10;
+ int KHIGHLIGHTWORDINTEMPCHATTYPEINMSGBOX = 1009;
+ int KHOMEWORKREMINDER = 10000;
+ int KLIKEORDISLIKESTATEDISLIKE = 2;
+ int KLIKEORDISLIKESTATELIKE = 1;
+ int KLIKEORDISLIKESTATENONESELECTED = 0;
+ int KMARKETFACE = 17;
+ int KMEMORYSTATEMSGTYPEADELIEWELCOME = 1;
+ int KMEMORYSTATEMSGTYPEUNKNOWN = 0;
+ int KMINIPROGRAMNOTICE = 114;
+ int KMSGSUBTYPEARKGROUPANNOUNCE = 3;
+ int KMSGSUBTYPEARKGROUPANNOUNCECONFIRMREQUIRED = 4;
+ int KMSGSUBTYPEARKGROUPGIFTATME = 5;
+ int KMSGSUBTYPEARKGROUPTASKATALL = 6;
+ int KMSGSUBTYPEARKMULTIMSG = 7;
+ int KMSGSUBTYPEARKNORMAL = 0;
+ int KMSGSUBTYPEARKTENCENTDOCFROMMINIAPP = 1;
+ int KMSGSUBTYPEARKTENCENTDOCFROMPLUSPANEL = 2;
+ int KMSGSUBTYPEEMOTICON = 15;
+ int KMSGSUBTYPEFILEAPP = 11;
+ int KMSGSUBTYPEFILEAUDIO = 3;
+ int KMSGSUBTYPEFILEDOC = 4;
+ int KMSGSUBTYPEFILEEXCEL = 6;
+ int KMSGSUBTYPEFILEFOLDER = 13;
+ int KMSGSUBTYPEFILEHTML = 10;
+ int KMSGSUBTYPEFILEIPA = 14;
+ int KMSGSUBTYPEFILENORMAL = 0;
+ int KMSGSUBTYPEFILEPDF = 7;
+ int KMSGSUBTYPEFILEPIC = 1;
+ int KMSGSUBTYPEFILEPPT = 5;
+ int KMSGSUBTYPEFILEPSD = 12;
+ int KMSGSUBTYPEFILETXT = 8;
+ int KMSGSUBTYPEFILEVIDEO = 2;
+ int KMSGSUBTYPEFILEZIP = 9;
+ int KMSGSUBTYPELINK = 5;
+ int KMSGSUBTYPEMARKETFACE = 1;
+ int KMSGSUBTYPEMIXEMOTICON = 7;
+ int KMSGSUBTYPEMIXFACE = 3;
+ int KMSGSUBTYPEMIXMARKETFACE = 2;
+ int KMSGSUBTYPEMIXPIC = 1;
+ int KMSGSUBTYPEMIXREPLY = 4;
+ int KMSGSUBTYPEMIXTEXT = 0;
+ int KMSGSUBTYPETENCENTDOC = 6;
+ int KMSGTYPEARKSTRUCT = 11;
+ int KMSGTYPEFACEBUBBLE = 24;
+ int KMSGTYPEFILE = 3;
+ int KMSGTYPEGIFT = 14;
+ int KMSGTYPEGIPHY = 13;
+ int KMSGTYPEGRAYTIPS = 5;
+ int KMSGTYPEMIX = 2;
+ int KMSGTYPEMULTIMSGFORWARD = 8;
+ int KMSGTYPENULL = 1;
+ int KMSGTYPEONLINEFILE = 21;
+ int KMSGTYPEONLINEFOLDER = 27;
+ int KMSGTYPEPROLOGUE = 29;
+ int KMSGTYPEPTT = 6;
+ int KMSGTYPEREPLY = 9;
+ int KMSGTYPESHARELOCATION = 25;
+ int KMSGTYPESTRUCT = 4;
+ int KMSGTYPESTRUCTLONGMSG = 12;
+ int KMSGTYPETEXTGIFT = 15;
+ int KMSGTYPEUNKNOWN = 0;
+ int KMSGTYPEVIDEO = 7;
+ int KMSGTYPEWALLET = 10;
+ int KNEEDCONFIRMGROUPMANNOUNCEATALLMSGTYPEINMSGBOX = 2005;
+ int KNOTPASSTHROUGHEVENTTYPEUPPERBOUNDARY = 9999;
+ int KPTTFORMATTYPEAMR = 0;
+ int KPTTFORMATTYPESILK = 1;
+ int KPTTTRANSLATESTATUSFAIL = 3;
+ int KPTTTRANSLATESTATUSSUC = 2;
+ int KPTTTRANSLATESTATUSTRANSLATING = 1;
+ int KPTTTRANSLATESTATUSUNKNOWN = 0;
+ int KPTTVIPLEVELTYPENONE = 0;
+ int KPTTVIPLEVELTYPEQQVIP = 0;
+ int KPTTVIPLEVELTYPESVIP = 0;
+ int KPTTVOICECHANGETYPEBEASTMACHINE = 7;
+ int KPTTVOICECHANGETYPEBOY = 2;
+ int KPTTVOICECHANGETYPECATCHCOLD = 13;
+ int KPTTVOICECHANGETYPEECHO = 5;
+ int KPTTVOICECHANGETYPEFATGUY = 16;
+ int KPTTVOICECHANGETYPEFLASHING = 9;
+ int KPTTVOICECHANGETYPEGIRL = 1;
+ int KPTTVOICECHANGETYPEHORRIBLE = 3;
+ int KPTTVOICECHANGETYPEKINDERGARTEN = 6;
+ int KPTTVOICECHANGETYPEMEDAROT = 15;
+ int KPTTVOICECHANGETYPENONE = 0;
+ int KPTTVOICECHANGETYPEOPTIMUSPRIME = 8;
+ int KPTTVOICECHANGETYPEOUTOFDATE = 14;
+ int KPTTVOICECHANGETYPEPAPI = 11;
+ int KPTTVOICECHANGETYPEQUICK = 4;
+ int KPTTVOICECHANGETYPESTUTTER = 10;
+ int KPTTVOICECHANGETYPETRAPPEDBEAST = 12;
+ int KPTTVOICETYPEINTERCOM = 1;
+ int KPTTVOICETYPESOUNDRECORD = 2;
+ int KPTTVOICETYPEUNKNOW = 0;
+ int KPTTVOICETYPEVOICECHANGE = 3;
+ int KPUBLICACCOUNTTIANSHUHIGHLIGHTWORDTYPEINMSGBOX = 1010;
+ int KREPLYABSELEMTYPEFACE = 2;
+ int KREPLYABSELEMTYPEPIC = 3;
+ int KREPLYABSELEMTYPETEXT = 1;
+ int KREPLYABSELEMTYPEUNKNOWN = 0;
+ int KREPLYATMEMSGTYPEINMSGBOX = 1002;
+ int KRMDOWNTYPEORIG = 1;
+ int KRMDOWNTYPETHUMB = 2;
+ int KRMDOWNTYPEUNKNOWN = 0;
+ int KRMFILETHUMBSIZE128 = 128;
+ int KRMFILETHUMBSIZE320 = 320;
+ int KRMFILETHUMBSIZE384 = 384;
+ int KRMFILETHUMBSIZE750 = 750;
+ int KRMPICAIOTHUMBSIZE = 0;
+ int KRMPICTHUMBSIZE198 = 198;
+ int KRMPICTHUMBSIZE720 = 720;
+ int KRMPICTYPEBMP = 3;
+ int KRMPICTYPECHECKOTHER = 900;
+ int KRMPICTYPEGIF = 2;
+ int KRMPICTYPEJPG = 0;
+ int KRMPICTYPENEWPICAPNG = 2001;
+ int KRMPICTYPENEWPICBMP = 1005;
+ int KRMPICTYPENEWPICGIF = 2000;
+ int KRMPICTYPENEWPICJPEG = 1000;
+ int KRMPICTYPENEWPICPNG = 1001;
+ int KRMPICTYPENEWPICPROGERSSIVJPEG = 1003;
+ int KRMPICTYPENEWPICSHARPP = 1004;
+ int KRMPICTYPENEWPICWEBP = 1002;
+ int KRMPICTYPEPNG = 1;
+ int KRMPICTYPEUNKOWN = 0;
+ int KRMTHUMBSIZEZERO = 0;
+ int KRMTRNASFERSTATUSDOWNLOADING = 3;
+ int KRMTRNASFERSTATUSFAIL = 5;
+ int KRMTRNASFERSTATUSINIT = 1;
+ int KRMTRNASFERSTATUSSUC = 4;
+ int KRMTRNASFERSTATUSUNKOW = 0;
+ int KRMTRNASFERSTATUSUPLOADING = 2;
+ int KRMTRNASFERSTATUSUSERCANCEL = 6;
+ int KSEEKINGPARTNERFLAGSEEKING = 1;
+ int KSEEKINGPARTNERFLAGUNKNOWN = 0;
+ int KSENDSTATUSFAILED = 0;
+ int KSENDSTATUSSENDING = 1;
+ int KSENDSTATUSSUCCESS = 2;
+ int KSENDSTATUSSUCCESSNOSEQ = 3;
+ int KSENDTYPEDROPPED = 6;
+ int KSENDTYPELOCAL = 3;
+ int KSENDTYPEOTHERDEVICE = 2;
+ int KSENDTYPERECV = 0;
+ int KSENDTYPESELF = 1;
+ int KSENDTYPESELFFORWARD = 4;
+ int KSENDTYPESELFMULTIFORWARD = 5;
+ int KSESSIONTYPEADDRESSBOOK = 5;
+ int KSESSIONTYPEC2C = 1;
+ int KSESSIONTYPEDISC = 3;
+ int KSESSIONTYPEFAV = 41;
+ int KSESSIONTYPEGROUP = 2;
+ int KSESSIONTYPEGROUPBLESS = 52;
+ int KSESSIONTYPEGUILD = 4;
+ int KSESSIONTYPEGUILDMETA = 16;
+ int KSESSIONTYPENEARBYPRO = 54;
+ int KSESSIONTYPEQQNOTIFY = 51;
+ int KSESSIONTYPERELATEACCOUNT = 50;
+ int KSESSIONTYPESERVICEASSISTANT = 19;
+ int KSESSIONTYPESUBSCRIBEFOLDER = 30;
+ int KSESSIONTYPETYPEBUDDYNOTIFY = 7;
+ int KSESSIONTYPETYPEGROUPHELPER = 9;
+ int KSESSIONTYPETYPEGROUPNOTIFY = 8;
+ int KSESSIONTYPEUNKNOWN = 0;
+ int KSESSIONTYPEWEIYUN = 40;
+ int KSPECIALCAREMSGTYPEINMSGBOX = 1006;
+ int KSPECIFIEDREDENVELOPEATMEMSGTYPEINMSGBOX = 1004;
+ int KSPECIFIEDREDENVELOPEATONEMSGTYPEINMSGBOX = 1003;
+ int KTENCENTDOCTYPEADDON = 110;
+ int KTENCENTDOCTYPEDOC = 0;
+ int KTENCENTDOCTYPEDRAWING = 89;
+ int KTENCENTDOCTYPEDRIVE = 101;
+ int KTENCENTDOCTYPEFILE = 100;
+ int KTENCENTDOCTYPEFLOWCHART = 91;
+ int KTENCENTDOCTYPEFOLDER = 3;
+ int KTENCENTDOCTYPEFORM = 2;
+ int KTENCENTDOCTYPEMIND = 90;
+ int KTENCENTDOCTYPENOTES = 5;
+ int KTENCENTDOCTYPEPDF = 6;
+ int KTENCENTDOCTYPEPROGRAM = 7;
+ int KTENCENTDOCTYPESHEET = 1;
+ int KTENCENTDOCTYPESLIDE = 4;
+ int KTENCENTDOCTYPESMARTCANVAS = 8;
+ int KTENCENTDOCTYPESMARTSHEET = 9;
+ int KTENCENTDOCTYPESPEECH = 102;
+ int KTENCENTDOCTYPEUNKNOWN = 10;
+ int KTOFURECORDMSG = 23;
+ int KTOPMSGTYPETASK = 1;
+ int KTOPMSGTYPEUNKNOWN = 0;
+ int KTRIGGERTYPEAUTO = 1;
+ int KTRIGGERTYPEMANUAL = 0;
+ int KUNKNOWN = 0;
+ int KUNKNOWNTYPEINMSGBOX = 0;
+ int KUNREADCNTUPTYPEALLDIRECTSESSION = 4;
+ int KUNREADCNTUPTYPEALLFEEDSINGUILD = 6;
+ int KUNREADCNTUPTYPEALLGUILD = 3;
+ int KUNREADCNTUPTYPECATEGORY = 5;
+ int KUNREADCNTUPTYPECHANNEL = 1;
+ int KUNREADCNTUPTYPECONTACT = 0;
+ int KUNREADCNTUPTYPEGUILD = 2;
+ int KUNREADCNTUPTYPEGUILDGROUP = 7;
+ int KUNREADSHOWTTYPEGRAYPOINT = 2;
+ int KUNREADSHOWTYPEREDPOINT = 1;
+ int KUNREADSHOWTYPESMALLGRAYPOINT = 4;
+ int KUNREADSHOWTYPESMALLREDPOINT = 3;
+ int KUNREADSHOWTYPEUNKNOWN = 0;
+ int KVASGIFTCOINTYPECOIN = 0;
+ int KVASGIFTCOINTYPEMARKETCOIN = 1;
+ int KYOLOGAMERESULTMSG = 18;
+ int PIC_800_RECOMMENDED = 7;
+ int PIC_AIGC_EMOJI = 14;
+ int PIC_ALBUM_GIF = 11;
+ int PIC_COMMERCIAL_ADVERTISING = 9;
+ int PIC_FIND = 10;
+ int PIC_HOT = 2;
+ int PIC_HOT_EMOJI = 13;
+ int PIC_NORMAL = 0;
+ int PIC_PK = 3;
+ int PIC_QQZONE = 5;
+ int PIC_SELFIE_GIF = 8;
+ int PIC_SEND_FROM_TAB_SEARCH_BOX = 12;
+ int PIC_USER = 1;
+ int PIC_WISDOM_FIGURE = 4;
+ int REPLYORIGINALMSGSTATEHASRECALL = 1;
+ int REPLYORIGINALMSGSTATEUNKNOWN = 0;
+ int SHARELOCATIONELEMSUBTYPENORMAL = 1;
+ int SHARELOCATIONELEMSUBTYPEUNKNOWN = 0;
+ int TEXTELEMENTSUBTYPELINK = 1;
+ int TEXTELEMENTSUBTYPETENCENTDOC = 2;
+ int TEXTELEMENTSUBTYPEUNKNOWN = 0;
+```

docs/develop/NC 1.6.X的计划.md

@@ -0,0 +1,16 @@
+# 开发方向
+方向一 NativeCall/Hook:
+1. 崩溃检测机制的实现
+2. Api_Caller 的Hook 可以拿到Event/Handler 进一步提升NC 即时的拦截与处理一些事件比如ReCall拦截
+3. Node包装层 进一步分析，拿到脱离自带Listener/Adapter，可以拿到一些更加底层的数据变动 或许包括更多二进制数据
+
+方向二 全新的无头启动 Way01
+1. 基于Node启动原理，借助导出符号获取函数地址 再次还原NodeMain
+
+方向三 发包与收包
+1. 参考 方向一/3 大概可以收包
+2. 发包 （暂时没有计划）
+
+方向四 版本控制
+1. 根据不同版本进行逻辑控制
+2. 某些参数的自动提取

docs/develop/碎碎的研究记录.md

@@ -0,0 +1,8 @@
+# Api方向
+## getMsgUniqueId √ 已应用
+getMsgUniqueId 传入时间 产出一个唯一ID 发送消息作为一个参数
+
+# Native方向
+## magic_load
+## api_caller
+## NodeMain

package.json

@@ -2,14 +2,15 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.7.7",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
     "build:dev": "vite build --mode development",
     "build:prod": "vite build --mode production",
     "build": "npm run build:dev",
-    "build:core": "cd ./src/core && vite build --mode production",
+    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
+    "build:webui": "cd ./src/webui && vite build",
     "watch": "npm run watch:dev",
     "debug-win": "powershell dist/napcat.ps1",
     "lint": "eslint --fix src/**/*.{js,ts}",
@@ -17,17 +18,21 @@
     "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",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@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/node": "^20.11.30",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.0.0",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -36,30 +41,30 @@
     "eslint-plugin-import": "^2.29.1",
     "i": "^0.3.7",
     "javascript-obfuscator": "^4.1.0",
-    "protobufjs-cli": "^1.1.2",
     "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",
+    "chalk": "^5.3.0",
     "commander": "^12.0.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",
-    "protobufjs": "^7.2.6",
     "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.3.4",
-    "sqlite3": "^5.1.7",
-    "uuid": "^9.0.1",
-    "ws": "^8.16.0",
-    "yaml": "^2.4.1"
+    "silk-wasm": "^3.6.1",
+    "ws": "^8.16.0"
   }
 }

script/BootWay.03.ps1

@@ -0,0 +1,45 @@
+# 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.ps1

@@ -0,0 +1,123 @@
+# 检查当前会话是否具有管理员权限
+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/NapCat.164.bat

@@ -0,0 +1,28 @@
+@echo off
+chcp 65001
+:: 检查是否有管理员权限
+net session >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 请求管理员权限...
+    powershell -Command "Start-Process '%~f0' -Verb runAs"
+    exit /b
+)
+:: 如果有管理员权限，继续执行
+setlocal enabledelayedexpansion
+: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"
+
+echo !QQPath!
+"!QQPath!" --enable-logging  %*
+
+pause

script/NapCat.Way01.bat

@@ -0,0 +1,3 @@
+REM 全新启动脚本 基于 Hook Native 预计版本1.6.0左右发布
+@echo off
+pause

script/checkVersion.cjs

@@ -1,13 +1,42 @@
-let fs = require("fs");
-let process = require("process")
+const fs = require("fs");
+const process = require("process");
+
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
-let currentVersion = require("../package.json").version;
-let targetVersion = process.env.VERSION;
-console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, " targetVersion:", targetVersion);
-// fs.mkdirSync("./dist");
-if (currentVersion === targetVersion) {
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"")
-} else {
-    let runscript = "sed -i 's/\"version\": \"" + currentVersion + "\"/\"version\": \"" + targetVersion + "\"/g' package.json";
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit config --global user.email \"bot@test.nanaeo.cn\"\n git config --global user.name \"Version\"\n" + runscript + "\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main")
+try {
+  const packageJson = require("../package.json");
+  const currentVersion = packageJson.version;
+  const targetVersion = process.env.VERSION;
+
+  console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+
+  // 验证 targetVersion 格式
+  if (!targetVersion || typeof targetVersion !== 'string') {
+    console.error("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
+    return;
+  }
+
+  // 写入脚本文件的统一函数
+  const writeScriptToFile = (content) => {
+    fs.writeFileSync("./checkVersion.sh", content, { flag: 'w' });
+    console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
+  };
+
+  if (currentVersion === targetVersion) {
+    // 不需要更新版本，写入一个简单的脚本
+    const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
+    writeScriptToFile(simpleScript);
+  } else {
+    // 更新版本，构建安全的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 add .
+    git commit -m "chore:version change"
+    git push -u origin main`;
+    writeScriptToFile(safeScriptContent);
+  }
+} catch (error) {
+  console.error("[NapCat] [CheckVersion] 检测过程中发生错误：", error);
 }

script/copy-core.cjs

@@ -0,0 +1,32 @@
+let fs = require('fs');
+let path = require('path');
+
+const coreDistDir = path.join(path.resolve(__dirname, '../'), 'src/core/dist/core/src');
+const coreLibDir = path.join(path.resolve(__dirname, '../'), 'src/core.lib/src');
+
+function copyDir(currentPath, outputDir) {
+  fs.readdir(currentPath, { withFileTypes: true }, (err, entries) => {
+    if (err?.errno === -4058) return;
+
+    entries.forEach(entry => {
+      const localBasePath = path.join(currentPath, entry.name);
+      const outputLocalBasePath = path.join(outputDir, entry.name);
+
+      if (entry.isDirectory()) {
+        // 如果是目录，递归调用
+        if (!fs.existsSync(outputLocalBasePath)) {
+          fs.mkdirSync(outputLocalBasePath, { recursive: true });
+        }
+        copyDir(localBasePath, outputLocalBasePath);
+      }
+      else{
+        // 如果是文件，直接复制
+        fs.copyFile(localBasePath, outputLocalBasePath, (err) => {
+          if (err) throw err;
+        });
+      }
+    });
+  });
+}
+
+copyDir(coreDistDir, coreLibDir);

script/index.js

@@ -0,0 +1,20 @@
+// --------------------
+// 2024.7.3 9.9.12 BootWay.03 其余方法暂不公开（此方案为临时方案 Win平台已验证）
+// 缺陷 （已知）
+// 1.与非入侵式不同 现在破坏本体代码
+// 2.重启代码与正常启动代码失效 
+// 3.Win需要补丁
+// 4.更新后丢失内容 需要重写此文件
+// 5.安装难度上升与周围基础设施失效
+// --------------------
+
+const path = require('path');
+const CurrentPath = path.dirname(__filename)
+const hasNapcatParam = process.argv.includes('--enable-logging');
+if (hasNapcatParam) {
+    (async () => {
+        await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+    })();
+} else {
+    require('./launcher.node').load('external_index', module);
+}

script/napcat-9912-utf8.bat

@@ -0,0 +1,18 @@
+@echo off
+setlocal enabledelayedexpansion
+chcp 65001
+: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!"
+cd /d !QQPath!
+echo !QQPath!
+QQ.exe --enable-logging %*

script/napcat-9912-utf8.ps1

@@ -0,0 +1,41 @@
+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) + "\"
+    }
+    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"
+}
+
+Set-Location -Path $QQpath
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& ./QQ.exe --enable-logging $params}"

script/napcat-9912.bat

@@ -0,0 +1,17 @@
+@echo off
+setlocal enabledelayedexpansion
+: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!
+cd /d !QQPath!
+echo !QQPath!
+QQ.exe --enable-logging %*

script/napcat-9912.ps1

@@ -0,0 +1,41 @@
+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) + "\"
+    }
+    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"
+}
+
+Set-Location -Path $QQpath
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& ./QQ.exe --enable-logging $params}"

script/napcat-utf8.bat

@@ -15,4 +15,4 @@ for %%a in ("!RetString!") do (
 set "QQPath=!pathWithoutUninstall!QQ.exe"
 set ELECTRON_RUN_AS_NODE=1
 echo !QQPath!
-"!QQPath!" ./napcat.cjs %*
+"!QQPath!" ./napcat.mjs %*

script/napcat-utf8.ps1

@@ -5,11 +5,39 @@ function Get-QQpath {
         return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
     }
     catch {
-        return "D:\QQ.exe"
+        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 " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
+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
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$QQpath' $Bootfile $params}"
+$commandInfo = Get-Command $QQpath -ErrorAction Stop
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' $Bootfile $params}"

script/napcat.bat

@@ -14,4 +14,4 @@ for %%a in ("!RetString!") do (
 set "QQPath=!pathWithoutUninstall!QQ.exe"
 set ELECTRON_RUN_AS_NODE=1
 echo !QQPath!
-"!QQPath!" ./napcat.cjs %*
+"!QQPath!" ./napcat.mjs %*

script/napcat.ps1

@@ -5,11 +5,39 @@ function Get-QQpath {
         return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
     }
     catch {
-        return "D:\QQ.exe"
+        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 " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
+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
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$QQpath' $Bootfile $params}"
+$commandInfo = Get-Command $QQpath -ErrorAction Stop
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$($commandInfo.Path)' $Bootfile $params}"

script/napcat.sh

@@ -1,4 +1,21 @@
 #!/bin/bash
-SCRIPT_DIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+
+get_script_dir() {
+  local script_path="${1:-$0}"
+  local script_dir
+  script_path=$(readlink -f "$script_path")
+  script_dir=$(dirname "$script_path")
+
+  echo "$script_dir"
+}
+
+SCRIPT_DIR=$(get_script_dir)
+
 export ELECTRON_RUN_AS_NODE=1
-/opt/QQ/qq ${SCRIPT_DIR}/napcat.cjs $@
+
+if ! [ -x /opt/QQ/qq ]; then
+    echo "Error: /opt/QQ/qq is not executable or does not exist." >&2
+    exit 1
+fi
+
+/opt/QQ/qq "${SCRIPT_DIR}/napcat.mjs" "$@"

src/common/data.ts

@@ -1,90 +0,0 @@
-import {
-  type Friend,
-  type FriendRequest,
-  type Group,
-  type GroupMember, GroupNotify,
-  type SelfInfo
-} from '@/core/qqnt/entities';
-import { isNumeric } from './utils/helper';
-import { log } from '@/common/utils/log';
-
-export const selfInfo: SelfInfo = {
-  uid: '',
-  uin: '',
-  nick: '',
-  online: true
-};
-
-// groupCode -> Group
-export const groups: Map<string, Group> = new Map<string, Group>();
-
-export function deleteGroup(groupQQ: string) {
-  groups.delete(groupQQ);
-  groupMembers.delete(groupQQ);
-}
-
-// 群号 -> 群成员map(uid=>GroupMember)
-export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
-
-// uid -> Friend
-export const friends: Map<string, Friend> = new Map<string, Friend>();
-
-export const friendRequests: Record<string, FriendRequest> = {}; // flag->FriendRequest
-export const groupNotifies: Record<string, GroupNotify> = {}; // flag->GroupNotify
-
-export const napCatError = {
-  ffmpegError: '',
-  httpServerError: '',
-  wsServerError: '',
-  otherError: 'NapCat未能正常启动，请检查日志查看错误'
-};
-
-export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-  uinOrUid = uinOrUid.toString();
-  if (isNumeric(uinOrUid)) {
-    const friendList = Array.from(friends.values());
-    return friendList.find(friend => friend.uin === uinOrUid);
-  } else {
-    return friends.get(uinOrUid);
-  }
-}
-
-export async function getGroup(qq: string): Promise<Group | undefined> {
-  const group = groups.get(qq.toString());
-  return group;
-}
-
-export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
-  groupQQ = groupQQ.toString();
-  memberUinOrUid = memberUinOrUid.toString();
-  const members = groupMembers.get(groupQQ);
-  if (!members) {
-    return null;
-  }
-  // log('getGroupMember', members);
-  if (isNumeric(memberUinOrUid)) {
-    return Array.from(members.values()).find(member => member.uin === memberUinOrUid);
-  } else {
-    return members.get(memberUinOrUid);
-  }
-}
-
-export async function refreshGroupMembers(groupQQ: string) {
-  // const group = groups.find(group => group.groupCode === groupQQ)
-  // if (group) {
-  //     group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
-  // }
-}
-
-export const uid2UinMap: Record<string, string> = {}; // 一串加密的字符串(uid) -> qq号
-
-export function getUidByUin(uin: string) {
-  for (const uid in uid2UinMap) {
-    if (uid2UinMap[uid] === uin) {
-      return uid;
-    }
-  }
-}
-
-export const tempGroupCodeMap: Record<string, string> = {};  // peerUid => 群号
-

src/common/server/http.ts

@@ -1,15 +1,23 @@
 import express, { Express, Request, Response } from 'express';
 import cors from 'cors';
 import http from 'http';
-import { log } from '../utils/log';
+import { log, logDebug, logError } from '../utils/log';
 import { ob11Config } from '@/onebot11/config';
 
 type RegisterHandler = (res: Response, payload: any) => Promise<any>
 
 export abstract class HttpServerBase {
-  name: string = 'LLOneBot';
+  name: string = 'NapCatQQ';
   private readonly expressAPP: Express;
-  private server: http.Server | null = null;
+  private _server: http.Server | null = null;
+
+  public get server(): http.Server | null {
+    return this._server;
+  }
+
+  private set server(value: http.Server | null) {
+    this._server = value;
+  }
 
   constructor() {
     this.expressAPP = express();
@@ -23,7 +31,7 @@ export abstract class HttpServerBase {
       // 调用原始的express.json()处理器
       originalJson(req, res, (err) => {
         if (err) {
-          log('Error parsing JSON:', err);
+          logError('Error parsing JSON:', err);
           return res.status(400).send('Invalid JSON');
         }
         next();
@@ -37,14 +45,14 @@ export abstract class HttpServerBase {
     const authHeader = req.get('authorization');
     if (authHeader) {
       clientToken = authHeader.split('Bearer ').pop() || '';
-      log('receive http header token', clientToken);
+      //logDebug('receive http header token', clientToken);
     } else if (req.query.access_token) {
       if (Array.isArray(req.query.access_token)) {
         clientToken = req.query.access_token[0].toString();
       } else {
         clientToken = req.query.access_token.toString();
       }
-      log('receive http url token', clientToken);
+      //logDebug('receive http url token', clientToken);
     }
 
     if (serverToken && clientToken != serverToken) {
@@ -53,32 +61,32 @@ export abstract class HttpServerBase {
     next();
   }
 
-  start(port: number) {
+  start(port: number, host: string) {
     try {
       this.expressAPP.get('/', (req: Request, res: Response) => {
         res.send(`${this.name}已启动`);
       });
-      this.listen(port);
+      this.listen(port, host);
     } catch (e: any) {
-      log('HTTP服务启动失败', e.toString());
-      // llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
+      logError('HTTP服务启动失败', e.toString());
+      // httpServerError = "HTTP服务启动失败, " + e.toString()
     }
   }
 
   stop() {
-    // llonebotError.httpServerError = ""
+    // httpServerError = ""
     if (this.server) {
       this.server.close();
       this.server = null;
     }
   }
 
-  restart(port: number) {
+  restart(port: number, host: string) {
     this.stop();
-    this.start(port);
+    this.start(port, host);
   }
 
-  abstract handleFailed(res: Response, payload: any, err: any): void
+  abstract handleFailed(res: Response, payload: any, err: Error): void
 
   registerRouter(method: 'post' | 'get' | string, url: string, handler: RegisterHandler) {
     if (!url.startsWith('/')) {
@@ -88,7 +96,7 @@ export abstract class HttpServerBase {
     // @ts-expect-error wait fix
     if (!this.expressAPP[method]) {
       const err = `${this.name} register router failed，${method} not exist`;
-      log(err);
+      logError(err);
       throw err;
     }
     // @ts-expect-error wait fix
@@ -99,19 +107,26 @@ export abstract class HttpServerBase {
       } else if (req.query) {
         payload = { ...req.query, ...req.body };
       }
-      log('收到http请求', url, payload);
+      logDebug('收到http请求', url, payload);
       try {
         res.send(await handler(res, payload));
       } catch (e: any) {
-        this.handleFailed(res, payload, e.stack.toString());
+        this.handleFailed(res, payload, e);
       }
     });
   }
 
-  protected listen(port: number) {
-    this.server = this.expressAPP.listen(port, '0.0.0.0', () => {
-      const info = `${this.name} started 0.0.0.0:${port}`;
-      log(info);
-    });
+  protected listen(port: number, host: string = '0.0.0.0') {
+    host = host || '0.0.0.0';
+    try {
+      this.server = this.expressAPP.listen(port, host, () => {
+        const info = `${this.name} started ${host}:${port}`;
+        log(info);
+      }).on('error', (err) => {
+        logError('HTTP服务启动失败', err.toString());
+      });
+    } catch (e: any) {
+      logError('HTTP服务启动失败, 请检查监听的ip地址和端口', e.stack.toString());
+    }
   }
 }

src/common/server/websocket.ts

@@ -1,4 +1,5 @@
 import { WebSocket, WebSocketServer } from 'ws';
+import http from 'http';
 import urlParse from 'url';
 import { IncomingMessage } from 'node:http';
 import { log } from '@/common/utils/log';
@@ -27,14 +28,36 @@ export class WebsocketServerBase {
   constructor() {
   }
 
-  start(port: number) {
-    try {
-      this.ws = new WebSocketServer({
-        port ,
-        maxPayload: 1024 * 1024 * 1024
-      });
-    } catch (e: any) {
-      throw Error('ws服务启动失败, ' + e.toString());
+  start(port: number | http.Server, host: string = '') {
+    if (port instanceof http.Server) {
+      try {
+        const wss = new WebSocketServer({
+          noServer: true,
+          maxPayload: 1024 * 1024 * 1024
+        }).on('error', () => {
+        });
+        this.ws = wss;
+        port.on('upgrade', function upgrade(request, socket, head) {
+          wss.handleUpgrade(request, socket, head, function done(ws) {
+            wss.emit('connection', ws, request);
+          });
+        });
+        log('ws服务启动成功, 绑定到HTTP服务');
+      } catch (e: any) {
+        throw Error('ws服务启动失败, 可能是绑定的HTTP服务异常' + e.toString());
+      }
+    } else {
+      try {
+        this.ws = new WebSocketServer({
+          port,
+          host: '',
+          maxPayload: 1024 * 1024 * 1024
+        }).on('error', () => {
+        });
+        log(`ws服务启动成功, ${host}:${port}`);
+      } catch (e: any) {
+        throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
+      }
     }
     this.ws.on('connection', (wsClient, req) => {
       const url: string = req.url!.split('?').shift() || '/';
@@ -47,10 +70,12 @@ export class WebsocketServerBase {
   }
 
   stop() {
-    this.ws && this.ws.close((err) => {
-      log('ws server close failed!', err);
-    });
-    this.ws = null;
+    if (this.ws) {
+      this.ws.close((err) => {
+        if (err) log('ws server close failed!', err);
+      });
+      this.ws = null;
+    }
   }
 
   restart(port: number) {

src/common/utils/ConfigBase.ts

@@ -0,0 +1,89 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import { log, logDebug, logError } from '@/common/utils/log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { selfInfo } from '@/core/data';
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const configDir = path.resolve(__dirname, 'config');
+fs.mkdirSync(configDir, { recursive: true });
+
+
+export class ConfigBase<T> {
+  public name: string = 'default_config';
+  private pathName: string | null = null; // 本次读取的文件路径
+  constructor() {
+  }
+
+  protected getKeys(): string[] | null {
+    // 决定 key 在json配置文件中的顺序
+    return null;
+  }
+
+  getConfigDir() {
+    const configDir = path.resolve(__dirname, 'config');
+    fs.mkdirSync(configDir, { recursive: true });
+    return configDir;
+  }
+  getConfigPath(pathName: string | null): string {
+    const suffix = pathName ? `_${pathName}` : '';
+    const filename = `${this.name}${suffix}.json`;
+    return path.join(this.getConfigDir(), filename);
+  }
+  read() {
+    // 尝试加载当前账号配置
+    if (this.read_from_file(selfInfo.uin, false)) return this;
+    // 尝试加载默认配置
+    return this.read_from_file('', true);
+  }
+  read_from_file(pathName: string, createIfNotExist: boolean) {
+    const configPath = this.getConfigPath(pathName);
+    if (!fs.existsSync(configPath)) {
+      if (!createIfNotExist) return null;
+      this.pathName = pathName; // 记录有效的设置文件
+      try {
+        fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
+        log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
+      }
+      catch (e: any) {
+        logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
+      }
+      return this;
+    }
+
+    try {
+      const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      logDebug(`配置文件${configPath}已加载`, data);
+      Object.assign(this, data);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      this.save(this); // 保存一次，让新版本的字段写入
+      return this;
+    } catch (e: any) {
+      if (e instanceof SyntaxError) {
+        logError(`配置文件 ${configPath} 格式错误，请检查配置文件:`, e.message);
+      } else {
+        logError(`读取配置文件 ${configPath} 时发生错误:`, e.message);
+      }
+      return this;
+    }
+  }
+
+  save(config: T, overwrite: boolean = false) {
+    Object.assign(this, config);
+    if (overwrite) {
+      // 用户要求强制写入，则变更当前文件为目标文件
+      this.pathName = `${selfInfo.uin}`;
+    }
+    const configPath = this.getConfigPath(this.pathName);
+    try {
+      fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
+    } catch (e: any) {
+      logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+    }
+  }
+}

src/common/utils/EventTask.ts

@@ -0,0 +1,227 @@
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+  checker: ((...args: any[]) => boolean) | undefined,
+}
+
+export class ListenerClassBase {
+  [key: string]: string;
+}
+
+export interface ListenerIBase {
+  // eslint-disable-next-line @typescript-eslint/no-misused-new
+  new(listener: any): ListenerClassBase;
+}
+
+export class NTEventWrapper {
+
+  private ListenerMap: { [key: string]: ListenerIBase } | undefined;//ListenerName-Unique -> Listener构造函数
+  private WrapperSession: NodeIQQNTWrapperSession | undefined;//WrapperSession
+  private ListenerManger: 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() {
+
+  }
+  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);
+      }
+    });
+  }
+  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
+    this.ListenerMap = ListenerMap;
+    this.WrapperSession = WrapperSession;
+  }
+  CreatEventFunction<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;
+    }
+
+  }
+  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+    const ListenerType = this.ListenerMap![listenerMainName];
+    let Listener = this.ListenerManger.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.CreatEventFunction<(listener: T) => number>(Service);
+      addfunc!(Listener as T);
+      //console.log(addfunc!(Listener as T));
+      this.ListenerManger.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.CreatEventFunction<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);
+    });
+  }
+  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 Timeouter = setTimeout(databack, timeout);
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        checker: checker,
+        func: (...args: Parameters<ListenerType>) => {
+          complete++;
+          retData = args;
+          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.CreatListenerFunction(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.CreatListenerFunction(ListenerMainName);
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      retEvent = await EventFunc!(...(args as any[]));
+    });
+  }
+}
+export const NTEventDispatch = new NTEventWrapper();
+
+// 示例代码 快速创建事件
+// 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/utils/MessageUnique.ts

@@ -0,0 +1,142 @@
+import { Peer } from '@/core';
+import crypto, { randomInt, randomUUID } from 'crypto';
+import { logError } from './log';
+
+export class LimitedHashTable<K, V> {
+  private keyToValue: Map<K, V> = new Map();
+  private valueToKey: Map<V, K> = new Map();
+  private maxSize: number;
+
+  constructor(maxSize: number) {
+    this.maxSize = maxSize;
+  }
+  resize(count: number) {
+    this.maxSize = count;
+  }
+
+  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);
+    }
+  }
+
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key);
+  }
+
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value);
+  }
+
+  deleteByValue(value: V): void {
+    const key = this.valueToKey.get(value);
+    if (key !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+
+  deleteByKey(key: K): void {
+    const value = this.keyToValue.get(key);
+    if (value !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+
+  getKeyList(): K[] {
+    return Array.from(this.keyToValue.keys());
+  }
+  //获取最近刚写入的几个值
+  getHeads(size: number): { key: K; value: V }[] | undefined {
+    const keyList = this.getKeyList();
+    if (keyList.length === 0) {
+      return undefined;
+    }
+    const result: { key: K; value: V }[] = [];
+    const listSize = Math.min(size, keyList.length);
+    for (let i = 0; i < listSize; i++) {
+      const key = keyList[listSize - i];
+      result.push({ key, value: this.keyToValue.get(key)! });
+    }
+    return result;
+  }
+}
+
+class MessageUniqueWrapper {
+  private msgDataMap: LimitedHashTable<string, number>;
+  private msgIdMap: LimitedHashTable<string, number>;
+  constructor(maxMap: number = 1000) {
+    this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+    this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
+  }
+  getRecentMsgIds(Peer: Peer, size: number): string[] {
+    const heads = this.msgIdMap.getHeads(size);
+    if (!heads) {
+      return [];
+    }
+    const data = heads.map((t) => MessageUnique.getMsgIdAndPeerByShortId(t.value));
+    const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid);
+    return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
+  }
+  createMsg(peer: Peer, msgId: string): number | undefined {
+    const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+    const hash = crypto.createHash('md5').update(key);
+    const shortId = hash.digest().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;
+  }
+
+  getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
+    const data = this.msgDataMap.getKey(shortId);
+    if (data) {
+      const [msgId, chatTypeStr, peerUid] = data.split('|');
+      const peer: Peer = {
+        chatType: parseInt(chatTypeStr),
+        peerUid,
+        guildId: '',
+      };
+      return { MsgId: msgId, Peer: peer };
+    }
+    return undefined;
+  }
+
+  getShortIdByMsgId(msgId: string): number | undefined {
+    return this.msgIdMap.getValue(msgId);
+  }
+  getPeerByMsgId(msgId: string) {
+    const shortId = this.msgIdMap.getValue(msgId);
+    if (!shortId) return undefined;
+    return this.getMsgIdAndPeerByShortId(shortId);
+  }
+  resize(maxSize: number): void {
+    this.msgIdMap.resize(maxSize);
+    this.msgDataMap.resize(maxSize);
+  }
+}
+
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/Packet.ts

@@ -0,0 +1,17 @@
+// 方案一 MiniApp发包方案
+// 前置条件： 处于GUI环境 存在MiniApp
+
+import { NTQQSystemApi } from '@/core';
+
+// 前排提示： 开发验证仅Win平台开展
+export class MiniAppUtil {
+  static async RunMiniAppWithGUI() {
+    //process.env.ELECTRON_RUN_AS_NODE = undefined;//没用还是得自己用cpp之类的语言写个程序转发参数
+    return NTQQSystemApi.BootMiniApp(process.execPath, 'miniapp://open/1007?url=https%3A%2F%2Fm.q.qq.com%2Fa%2Fs%2Fedd0a83d3b8afe233dfa07adaaf8033f%3Fscene%3D1007%26min_refer%3D10001');
+  }
+}
+// 方案二 MiniApp发包方案 替代MiniApp方案
+// 前置条件： 无
+export class MojoMiniAppUtil{
+
+}

src/common/utils/QQBasicInfo.ts

@@ -1,60 +1,56 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import os from 'node:os';
 import { systemPlatform } from '@/common/utils/system';
+import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import AppidTable from '@/core/external/appid.json';
+import { log } from './log';
 
-export const exePath = process.execPath;
+//基础目录获取
+export let QQMainPath = process.execPath;
+export let QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
+export let QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
 
-export const pkgInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
-let configVersionInfoPath;
+//基础信息获取 无快更则启用默认模板填充
+export let isQuickUpdate: boolean = !!QQVersionConfigPath;
+export let QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
+export let QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
+export let { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
 
-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');
+//基础函数
+export function getQQBuildStr() {
+  return isQuickUpdate ? QQVersionConfig.buildId : QQPackageInfo.buildVersion;
 }
-
-if (typeof configVersionInfoPath !== 'string') {
-  throw new Error('Something went wrong when load QQ info path');
+export function getFullQQVesion() {
+  return isQuickUpdate ? QQVersionConfig.curVersion : QQPackageInfo.version;
 }
-
-export { configVersionInfoPath };
-
-type QQPkgInfo = {
-  version: string;
-  buildVersion: string;
-  platform: string;
-  eleArch: string;
+export function requireMinNTQQBuild(buildStr: string) {
+  return parseInt(getQQBuildStr()) >= parseInt(buildStr);
 }
-type QQVersionConfigInfo = {
-  baseVersion: string;
-  curVersion: string;
-  prevVersion: string;
-  onErrorVersions: Array<any>;
-  buildId: string;
+//此方法不要直接使用
+export function getQUAInternal() {
+  return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`;
 }
-
-let _qqVersionConfigInfo: QQVersionConfigInfo = {
-  'baseVersion': '9.9.9-22578',
-  'curVersion': '9.9.9-22578',
-  'prevVersion': '',
-  'onErrorVersions': [],
-  'buildId': '22578'
-};
-
-if (fs.existsSync(configVersionInfoPath)) {
-  _qqVersionConfigInfo = JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+export function getAppidV2(): { appid: string, qua: string } {
+  let appidTbale = AppidTable as unknown as QQAppidTableType;
+  try {
+    let data = appidTbale[getFullQQVesion()];
+    if (data) {
+      return data;
+    }
+  }
+  catch (e) {
+    log('[QQ版本兼容性检测] 版本兼容性不佳，可能会导致一些功能无法正常使用', e);
+  }
+  // 以下是兜底措施
+  return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: getQUAInternal() };
 }
-
-export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
-
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
-
-let _appid: string = '537213335';  // 默认为 Windows 平台的 appid
-if (systemPlatform === 'linux') {
-  _appid = '537213710';
-}
-// todo: mac 平台的 appid
-export const appid = _appid;
+// platform_type: 3,
+// app_type: 4,
+// app_version: '9.9.12-25765',
+// qua: 'V1_WIN_NQ_9.9.12_25765_GW_B',
+// appid: '537234702',
+// platVer: '10.0.26100',
+// clientVer: '9.9.9-25765',
+// Linux
+// app_version: '3.2.9-25765',
+// qua: 'V1_LNX_NQ_3.2.10_25765_GW_B',

src/common/utils/audio.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm';
+import { encode, getDuration, getWavFileInfo, isWav, isSilk } from 'silk-wasm';
 import fsPromise from 'fs/promises';
-import { log } from './log';
+import { log, logError } from './log';
 import path from 'node:path';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
 import { getTempDir } from '@/common/utils/file';
 
@@ -24,7 +24,7 @@ export async function encodeSilk(filePath: string) {
       const fileHeader = buffer.toString('hex', 0, bytesToRead);
       return fileHeader;
     } catch (err) {
-      console.error('读取文件错误:', err);
+      logError('读取文件错误:', err);
       return;
     }
   }
@@ -63,10 +63,11 @@ export async function encodeSilk(filePath: string) {
   // }
 
   try {
-    const pttPath = path.join(TEMP_DIR, uuidv4());
-    if (getFileHeader(filePath) !== '02232153494c4b') {
+    const file = await fsPromise.readFile(filePath);
+    const pttPath = path.join(TEMP_DIR, randomUUID());
+    if (!isSilk(file)) {
       log(`语音文件${filePath}需要转换成silk`);
-      const _isWav = await isWavFile(filePath);
+      const _isWav = isWav(file);
       const pcmPath = pttPath + '.pcm';
       let sampleRate = 0;
       const convert = () => {
@@ -96,7 +97,7 @@ export async function encodeSilk(filePath: string) {
       if (!_isWav) {
         input = await convert();
       } else {
-        input = fs.readFileSync(filePath);
+        input = file;
         const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
         const { fmt } = getWavFileInfo(input);
         // log(`wav文件信息`, fmt)
@@ -113,7 +114,7 @@ export async function encodeSilk(filePath: string) {
         duration: silk.duration / 1000
       };
     } else {
-      const silk = fs.readFileSync(filePath);
+      const silk = file;
       let duration = 0;
       try {
         duration = getDuration(silk) / 1000;
@@ -129,7 +130,7 @@ export async function encodeSilk(filePath: string) {
       };
     }
   } catch (error: any) {
-    log('convert silk failed', error.stack);
+    logError('convert silk failed', error.stack);
     return {};
   }
 }

src/common/utils/cpmodule.ts

@@ -0,0 +1,23 @@
+import * as os from 'os';
+import path from 'node:path';
+import fs from 'fs';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+export function getModuleWithArchName(moduleName: string) {
+  const systemPlatform = os.platform();
+  const cpuArch = os.arch();
+  return `${moduleName}-${systemPlatform}-${cpuArch}.node`;
+}
+
+export function cpModule(moduleName: string) {
+  const currentDir = path.resolve(__dirname);
+  const fileName = `./${getModuleWithArchName(moduleName)}`;
+  try {
+    fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
+  } catch (e) {
+    console.error(e);
+  }
+}

src/common/utils/db.ts

@@ -1,323 +0,0 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
-
-import sqlite3 from 'sqlite3';
-import { log } from '@/common/utils/log';
-
-type DBMsg = {
-  id: number,
-  longId: string,
-  seq: number,
-  peerUid: string,
-  msg: string
-}
-
-type DBFile = {
-  name: string;  // 文件名
-  path: string;
-  url: string;
-  size: number;
-  uuid: string;
-  msgId: string;
-  elementId: string;
-  element: PicElement | VideoElement | FileElement | PttElement;
-  elementType: ElementType.PIC | ElementType.VIDEO | ElementType.FILE | ElementType.PTT;
-}
-
-
-class DBUtilBase {
-  protected db: sqlite3.Database | undefined;
-
-  createConnection(dbPath: string) {
-    if (this.db) {
-      return;
-    }
-    this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
-      if (err) {
-        log('Could not connect to database', err);
-        return;
-      }
-      this.createTable();
-    });
-  }
-
-  protected createTable() {
-    throw new Error('Method not implemented.');
-  }
-
-  close() {
-    this.db?.close();
-  }
-}
-
-class DBUtil extends DBUtilBase {
-  private msgCache: Map<string, RawMessage> = new Map<string, RawMessage>();
-
-  constructor() {
-    super();
-    const interval = 1000 * 60 * 10;  // 10分钟清理一次缓存
-    setInterval(() => {
-      log('清理消息缓存');
-      this.msgCache.forEach((msg, key) => {
-        if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
-          this.msgCache.delete(key);
-        }
-      });
-    }, interval);
-  }
-
-
-  protected createTable() {
-    // 消息记录
-    const createTableSQL = `
-            CREATE TABLE IF NOT EXISTS msgs (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                long_id TEXT NOT NULL UNIQUE,
-                seq INTEGER NOT NULL,
-                peer_uid TEXT NOT NULL,
-                msg TEXT NOT NULL
-            )`;
-    this.db!.run(createTableSQL, function (err) {
-      if (err) {
-        log('Could not create table', err);
-      }
-    });
-
-    // 文件缓存
-    const createFileTableSQL = `
-            CREATE TABLE IF NOT EXISTS files (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                name TEXT NOT NULL,
-                path TEXT NOT NULL,
-                url TEXT,
-                size INTEGER NOT NULL,
-                uuid TEXT,
-                elementType INTEGER,
-                element TEXT NOT NULL,
-                elementId TEXT NOT NULL,
-                msgId TEXT NOT NULL
-            )`;
-    this.db!.run(createFileTableSQL, function (err) {
-      if (err) {
-        log('Could not create table files', err);
-      }
-    });
-
-    // 接收到的临时会话消息uid
-    const createTempUinTableSQL = `
-            CREATE TABLE IF NOT EXISTS temp_uins (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                uid TEXT,
-                uin TEXT
-            )`;
-    this.db!.run(createTempUinTableSQL, function (err) {
-      if (err) {
-        log('Could not create table temp_uins', err);
-      }
-    });
-  }
-
-  private async getMsg(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<RawMessage | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBMsg) => {
-        // log("getMsg", row, err);
-        if (err) {
-          log('Could not get msg by short id', err);
-          resolve(null);
-        }
-        try {
-          const msg = JSON.parse(row.msg);
-          msg.id = row.id;
-          return resolve(msg);
-        } catch (e) {
-          return resolve(null);
-        }
-      });
-    });
-  }
-
-  async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
-    const getStmt = 'SELECT * FROM msgs WHERE id = ?';
-    return this.getMsg(getStmt, [shortId]);
-  }
-
-  async getMsgByLongId(longId: string): Promise<RawMessage | null> {
-    if (this.msgCache.has(longId)) {
-      return this.msgCache.get(longId)!;
-    }
-    return this.getMsg('SELECT * FROM msgs WHERE long_id = ?', [longId]);
-  }
-
-  async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
-    const stmt = 'SELECT * FROM msgs WHERE peer_uid = ? AND seq = ?';
-    return this.getMsg(stmt, [peerUid, seq]);
-  }
-
-  async addMsg(msg: RawMessage, update = true): Promise<number> {
-    log('正在记录消息到数据库', msg.msgId);
-    const existMsg = await this.getMsgByLongId(msg.msgId);
-    if (existMsg) {
-      // log('消息已存在，更新数据库', msg.msgId);
-      if (update) this.updateMsg(msg).then();
-      return existMsg.id!;
-    }
-    const stmt = this.db!.prepare('INSERT INTO msgs (long_id, seq, peer_uid, msg) VALUES (?, ?, ?, ?)');
-
-    // const runAsync = promisify(stmt.run.bind(stmt));
-    return new Promise((resolve, reject) => {
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      const dbInstance = this;
-      stmt.run(msg.msgId, msg.msgSeq, msg.peerUid, JSON.stringify(msg), function (err: any) {
-        if (err) {
-          if (err.errno === 19) {
-            // log('消息已存在，更新数据库', msg.msgId);
-            dbInstance.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
-              if (msg) {
-                dbInstance.msgCache.set(msg.msgId, msg);
-                // log('获取消息短id成功', msg.id);
-                resolve(msg.id!);
-              } else {
-                log('db could not get msg by long id', err);
-                resolve(-1);
-              }
-            });
-          } else {
-            log('db could not add msg', err);
-            resolve(-1);
-          }
-        } else {
-          // log("addMsg", this);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          msg.id = this.lastID;
-          dbInstance.msgCache.set(msg.msgId, msg);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // log('获取消息短id成功', this.lastID);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          resolve(this.lastID);
-        }
-      });
-    });
-  }
-
-  async updateMsg(msg: RawMessage) {
-    const existMsg = this.msgCache.get(msg.msgId);
-    if (existMsg) {
-      Object.assign(existMsg, msg);
-    }
-    const stmt = this.db!.prepare('UPDATE msgs SET msg = ?, seq = ? WHERE long_id = ?');
-    try {
-      stmt.run(JSON.stringify(msg), msg.msgSeq, msg.msgId);
-    } catch (e) {
-      log('updateMsg db error', e);
-    }
-  }
-
-  async addFileCache(file: DBFile) {
-    const stmt = this.db!.prepare('INSERT INTO files (name, path, url, size, uuid, elementType ,element, elementId, msgId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)');
-    return new Promise((resolve, reject) => {
-      stmt.run(file.name, file.path, file.url, file.size, file.uuid,
-        file.elementType,
-        JSON.stringify(file.element),
-        file.elementId,
-        file.msgId,
-        function (err: any) {
-          if (err) {
-            log('db could not add file', err);
-            reject(err);
-          }
-          resolve(null);
-        });
-    });
-  }
-
-  private async getFileCache(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<DBFile | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBFile & { element: string }) => {
-        if (err) {
-          log('db could not get file cache', err);
-          reject(err);
-        }
-        if (row) {
-          row.element = JSON.parse(row.element);
-        }
-        resolve(row);
-      });
-    });
-  }
-
-  async getFileCacheByName(name: string): Promise<DBFile | null> {
-    return this.getFileCache('SELECT * FROM files WHERE name = ?', [name]);
-  }
-
-  async getFileCacheByUuid(uuid: string): Promise<DBFile | null> {
-    return this.getFileCache('SELECT * FROM files WHERE uuid = ?', [uuid]);
-  }
-
-  // todo: 是否所有的文件都有uuid？语音消息有没有uuid？
-  async updateFileCache(file: DBFile) {
-    const stmt = this.db!.prepare('UPDATE files SET path = ?, url = ? WHERE uuid = ?');
-    return new Promise((resolve, reject) => {
-      stmt.run(file.path, file.url, function (err: any) {
-        if (err) {
-          log('db could not update file cache', err);
-          reject(err);
-        }
-        resolve(null);
-      });
-    });
-  }
-
-  // 被动收到的临时会话消息uin->uid
-  async getReceivedTempUinMap() {
-    const stmt = 'SELECT * FROM temp_uins';
-    return new Promise<Record<string, string>>((resolve, reject) => {
-      this.db!.all(stmt, (err, rows: { uin: string, uid: string }[]) => {
-        if (err) {
-          log('db could not get temp uin map', err);
-          reject(err);
-        }
-        const map: Record<string, string> = {};
-        rows.forEach(row => {
-          map[row.uin] = row.uid;
-        });
-        resolve(map);
-      });
-    });
-  }
-
-  // 通过uin获取临时会话消息uid
-  async getUidByTempUin(uid: string) {
-    const stmt = 'SELECT * FROM temp_uins WHERE uin = ?';
-    return new Promise<string>((resolve, reject) => {
-      this.db!.get(stmt, [uid], (err, row: { uin: string, uid: string }) => {
-        if (err) {
-          log('db could not get temp uin map', err);
-          reject(err);
-        }
-        resolve(row?.uid);
-      });
-    });
-  }
-
-  async addTempUin(uin: string, uid: string) {
-    const existUid = await this.getUidByTempUin(uin);
-    if (!existUid) {
-      const stmt = this.db!.prepare('INSERT INTO temp_uins (uin, uid) VALUES (?, ?)');
-      return new Promise((resolve, reject) => {
-        stmt.run(uin, uid, function (err: any) {
-          if (err) {
-            log('db could not add temp uin', err);
-            reject(err);
-          }
-          resolve(null);
-        });
-      });
-    }
-  }
-}
-
-
-export const dbUtil = new DBUtil();

src/common/utils/file.ts

@@ -1,16 +1,15 @@
 import fs from 'fs';
-import fsPromise from 'fs/promises';
+import fsPromise, { stat } from 'fs/promises';
 import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
-import { log } from './log';
-import { dbUtil } from './db';
+import { log, logError } from './log';
 import * as fileType from 'file-type';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
-  const p = path.join(napCatCore.wrapper.dataPath, 'NapCat');
+  const p = path.join(napCatCore.dataPath, 'NapCat');
   fs.mkdirSync(p, { recursive: true });
   return p;
 };
@@ -50,7 +49,40 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
     check();
   });
 }
+// 定义一个异步函数来检查文件是否存在
+export async function checkFileReceived2(path: string, timeout: number = 3000): Promise<void> {
+  // 使用 Promise.race 来同时进行文件状态检查和超时计时
+  // Promise.race 会返回第一个解决（resolve）或拒绝（reject）的 Promise
+  await Promise.race([
+    checkFile(path),
+    timeoutPromise(timeout, `文件不存在: ${path}`),
+  ]);
+}
 
+// 转换超时时间至 Promise
+function timeoutPromise(timeout: number, errorMsg: string): Promise<void> {
+  return new Promise((_, reject) => {
+    setTimeout(() => {
+      reject(new Error(errorMsg));
+    }, timeout);
+  });
+}
+
+// 异步检查文件是否存在
+async function checkFile(path: string): Promise<void> {
+  try {
+    await stat(path);
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      // 如果文件不存在，则抛出一个错误
+      throw new Error(`文件不存在: ${path}`);
+    } else {
+      // 对于 stat 调用的其他错误，重新抛出
+      throw error;
+    }
+  }
+  // 如果文件存在，则无需做任何事情，Promise 解决（resolve）自身
+}
 export async function file2base64(path: string) {
   const readFile = util.promisify(fs.readFile);
   const result = {
@@ -115,6 +147,8 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
   };
   if (typeof options === 'string') {
     url = options;
+    const host = new URL(url).hostname;
+    headers['Host'] = host;
   } else {
     url = options.url;
     if (options.headers) {
@@ -125,7 +159,12 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, headers);
+  const fetchRes = await fetch(url, { headers }).catch((err) => {
+    if (err.cause) {
+      throw err.cause;
+    }
+    throw err;
+  });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -152,7 +191,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     isLocal: false
   };
   if (!fileName) {
-    fileName = uuidv4();
+    fileName = randomUUID();
   }
   let filePath = path.join(getTempDir(), fileName);
   let url = null;
@@ -193,8 +232,9 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
           // res.ext = pathInfo.ext
         }
       }
+      fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
       res.fileName = fileName;
-      filePath = path.join(getTempDir(), uuidv4() + fileName);
+      filePath = path.join(getTempDir(), randomUUID() + fileName);
       fs.writeFileSync(filePath, buffer);
     } catch (e: any) {
       res.errMsg = `${url}下载失败,` + e.toString();
@@ -210,13 +250,14 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       } else {
         filePath = pathname;
       }
-    } else {
-      const cache = await dbUtil.getFileCacheByName(uri);
-      if (cache) {
-        filePath = cache.path;
-      } else {
-        filePath = uri;
-      }
+    }
+    else {
+      // const cache = await dbUtil.getFileCacheByName(uri);
+      // if (cache) {
+      //   filePath = cache.path;
+      // } else {
+      //   filePath = uri;
+      // }
     }
 
     res.isLocal = true;
@@ -261,12 +302,12 @@ export async function copyFolder(sourcePath: string, destPath: string) {
         try {
           await fsPromise.copyFile(srcPath, dstPath);
         } catch (error) {
-          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
+          logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
           // 这里可以决定是否要继续复制其他文件
         }
       }
     }
   } catch (error) {
-    console.error('复制文件夹时出错:', error);
+    logError('复制文件夹时出错:', error);
   }
 }

src/common/utils/helper.ts

@@ -1,9 +1,58 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'fs';
+import { log, logDebug } from './log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import * as fsPromise from 'node:fs/promises';
+import os from 'node:os';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+//下面这个类是用于将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');
@@ -18,3 +67,339 @@ export function isNull(value: any) {
 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 simpleDecorator(target: any, context: any) {
+}
+
+// export function CacheClassFunc(ttl: number = 3600 * 1000, customKey: string = '') {
+//   const cache = new Map<string, { expiry: number; value: any }>();
+//   return function CacheClassFuncDecorator(originalMethod: Function, context: ClassMethodDecoratorContext) {
+//     async function CacheClassFuncDecoratorInternal(this: any, ...args: any[]) {
+//       const key = `${customKey}${String(context.name)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+//       const cachedValue = cache.get(key);
+//       if (cachedValue && cachedValue.expiry > Date.now()) {
+//         return cachedValue.value;
+//       }
+//       const result = originalMethod.call(this, ...args);
+//       cache.set(key, { expiry: Date.now() + ttl, value: result });
+//       return result;
+//     }
+//     return CacheClassFuncDecoratorInternal;
+//   }
+// }
+export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = '') {
+  //console.log('CacheClassFuncAsync', ttl, customKey);
+  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
+    //console.log('logExecutionTime', target, methodName, descriptor);
+    const cache = new Map<string, { expiry: number; value: any }>();
+    const originalMethod = descriptor.value;
+    descriptor.value = async function (...args: any[]) {
+      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+      cache.forEach((value, key) => {
+        if (value.expiry < Date.now()) {
+          cache.delete(key);
+        }
+      });
+      const cachedValue = cache.get(key);
+      if (cachedValue && cachedValue.expiry > Date.now()) {
+        return cachedValue.value;
+      }
+      // const start = Date.now();
+      const result = await originalMethod.apply(this, args);
+      // const end = Date.now();
+      // console.log(`Method ${methodName} executed in ${end - start} ms.`);
+      cache.set(key, { expiry: Date.now() + ttl, value: result });
+      return result;
+    };
+  }
+  return logExecutionTime;
+}
+export function CacheClassFuncAsyncExtend(ttl: number = 3600 * 1000, customKey: string = '', checker: any = (...data: any[]) => { return true; }) {
+  //console.log('CacheClassFuncAsync', ttl, customKey);
+  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
+    //console.log('logExecutionTime', target, methodName, descriptor);
+    const cache = new Map<string, { expiry: number; value: any }>();
+    const originalMethod = descriptor.value;
+    descriptor.value = async function (...args: any[]) {
+      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+      cache.forEach((value, key) => {
+        if (value.expiry < Date.now()) {
+          cache.delete(key);
+        }
+      });
+      const cachedValue = cache.get(key);
+      if (cachedValue && cachedValue.expiry > Date.now()) {
+        return cachedValue.value;
+      }
+      // const start = Date.now();
+      const result = await originalMethod.apply(this, args);
+      if (!checker(...args, result)) {
+        return result;//丢弃缓存
+      }
+      // const end = Date.now();
+      // console.log(`Method ${methodName} executed in ${end - start} ms.`);
+      cache.set(key, { expiry: Date.now() + ttl, value: result });
+      return result;
+    };
+  }
+  return logExecutionTime;
+}
+// export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = ''): any {
+//   const cache = new Map<string, { expiry: number; value: any }>();
+
+//   // 注意：在JavaScript装饰器中，我们通常不直接处理ClassMethodDecoratorContext这样的类型，
+//   // 因为装饰器的参数通常是目标类（对于类装饰器）、属性名（对于属性装饰器）等。
+//   // 对于方法装饰器，我们关注的是方法本身及其描述符。
+//   // 但这里我们维持原逻辑，假设有一个自定义的处理上下文的方式。
+
+//   return function (originalMethod: Function): any {
+//     console.log(originalMethod);
+//     // 由于JavaScript装饰器原生不支持异步直接定义，我们保持async定义以便处理异步方法。
+//     async function decoratorWrapper(this: any, ...args: any[]): Promise<any> {
+//       console.log(...args);
+//       const key = `${customKey}${originalMethod.name}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+//       const cachedValue = cache.get(key);
+//       // 遍历cache 清除expiry内容
+//       cache.forEach((value, key) => {
+//         if (value.expiry < Date.now()) {
+//           cache.delete(key);
+//         }
+//       });
+//       if (cachedValue && cachedValue.expiry > Date.now()) {
+//         return cachedValue.value;
+//       }
+
+//       // 直接await异步方法的结果
+//       const result = await originalMethod.apply(this, args);
+//       cache.set(key, { expiry: Date.now() + ttl, value: result });
+//       return result;
+//     }
+
+//     // 返回装饰后的方法，保持与原方法相同的名称和描述符（如果需要更精细的控制，可以考虑使用Object.getOwnPropertyDescriptor等）
+//     return decoratorWrapper;
+//   };
+// }
+
+/**
+ * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
+ * @param ttl 超时时间，单位毫秒
+ * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
+ * @returns 处理后缓存或调用原方法的结果
+ */
+export function cacheFunc(ttl: number, customKey: string = '') {
+  const cache = new Map<string, { expiry: number; value: any }>();
+
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
+    const originalMethod = descriptor.value;
+    const className = target.constructor.name;  // 获取类名
+    const methodName = propertyKey;             // 获取方法名
+    descriptor.value = async function (...args: any[]) {
+      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
+      const cached = cache.get(cacheKey);
+      if (cached && cached.expiry > Date.now()) {
+        return cached.value;
+      } else {
+        const result = await originalMethod.apply(this, args);
+        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
+        return result;
+      }
+    };
+
+    return descriptor;
+  };
+}
+export function isValidOldConfig(config: any) {
+  if (typeof config !== 'object') {
+    return false;
+  }
+  const requiredKeys = [
+    'httpHost', 'httpPort', 'httpPostUrls', 'httpSecret',
+    'wsHost', 'wsPort', 'wsReverseUrls', 'enableHttp',
+    'enableHttpHeart', 'enableHttpPost', 'enableWs', 'enableWsReverse',
+    'messagePostFormat', 'reportSelfMessage', 'enableLocalFile2Url',
+    'debug', 'heartInterval', 'token', 'musicSignUrl'
+  ];
+  for (const key of requiredKeys) {
+    if (!(key in config)) {
+      return false;
+    }
+  }
+  if (!Array.isArray(config.httpPostUrls) || !Array.isArray(config.wsReverseUrls)) {
+    return false;
+  }
+  if (config.httpPostUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (config.wsReverseUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (typeof config.httpPort !== 'number' || typeof config.wsPort !== 'number' || typeof config.heartInterval !== 'number') {
+    return false;
+  }
+  if (
+    typeof config.enableHttp !== 'boolean' ||
+    typeof config.enableHttpHeart !== 'boolean' ||
+    typeof config.enableHttpPost !== 'boolean' ||
+    typeof config.enableWs !== 'boolean' ||
+    typeof config.enableWsReverse !== 'boolean' ||
+    typeof config.enableLocalFile2Url !== 'boolean' ||
+    typeof config.reportSelfMessage !== 'boolean'
+  ) {
+    return false;
+  }
+  if (config.messagePostFormat !== 'array' && config.messagePostFormat !== 'string') {
+    return false;
+  }
+  return true;
+}
+export function migrateConfig(oldConfig: any) {
+  const newConfig = {
+    http: {
+      enable: oldConfig.enableHttp,
+      host: oldConfig.httpHost,
+      port: oldConfig.httpPort,
+      secret: oldConfig.httpSecret,
+      enableHeart: oldConfig.enableHttpHeart,
+      enablePost: oldConfig.enableHttpPost,
+      postUrls: oldConfig.httpPostUrls,
+    },
+    ws: {
+      enable: oldConfig.enableWs,
+      host: oldConfig.wsHost,
+      port: oldConfig.wsPort,
+    },
+    reverseWs: {
+      enable: oldConfig.enableWsReverse,
+      urls: oldConfig.wsReverseUrls,
+    },
+    GroupLocalTime: {
+      Record: false,
+      RecordList: []
+    },
+    debug: oldConfig.debug,
+    heartInterval: oldConfig.heartInterval,
+    messagePostFormat: oldConfig.messagePostFormat,
+    enableLocalFile2Url: oldConfig.enableLocalFile2Url,
+    musicSignUrl: oldConfig.musicSignUrl,
+    reportSelfMessage: oldConfig.reportSelfMessage,
+    token: oldConfig.token,
+
+  };
+  return newConfig;
+}
+// 升级旧的配置到新的
+export async function UpdateConfig() {
+  const configFiles = await fsPromise.readdir(path.join(__dirname, 'config'));
+  for (const file of configFiles) {
+    if (file.match(/^onebot11_\d+.json$/)) {
+      const CurrentConfig = JSON.parse(await fsPromise.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      if (isValidOldConfig(CurrentConfig)) {
+        log('正在迁移旧配置到新配置 File:', file);
+        const NewConfig = migrateConfig(CurrentConfig);
+        await fsPromise.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
+      }
+    }
+  }
+}
+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 async function promisePipeline(promises: Promise<any>[], callback: (result: any) => boolean): Promise<void> {
+  let callbackCalled = false;
+  for (const promise of promises) {
+    if (callbackCalled) break;
+    try {
+      const result = await promise;
+      if (!callbackCalled) {
+        callbackCalled = callback(result);
+      }
+    } catch (error) {
+      console.error("Error in promise pipeline:", error);
+    }
+  }
+}
+
+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);
+  }
+}

src/common/utils/log.ts

@@ -1,4 +1,138 @@
+import log4js, { Configuration } from 'log4js';
+import { truncateString } from '@/common/utils/helper';
+import path from 'node:path';
+import { SelfInfo } from '@/core';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import chalk from 'chalk';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export enum LogLevel {
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error',
+  FATAL = 'fatal',
+}
+
+const logDir = path.join(path.resolve(__dirname), 'logs');
+
+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}`;
+}
+
+const filename = `${getFormattedTimestamp()}.log`;
+const logPath = path.join(logDir, filename);
+
+const logConfig: Configuration = {
+  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(logConfig);
+const loggerConsole = log4js.getLogger('console');
+const loggerFile = log4js.getLogger('file');
+const loggerDefault = log4js.getLogger('default');
+
+export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+  logConfig.categories.file.level = fileLogLevel;
+  logConfig.categories.console.level = consoleLogLevel;
+  log4js.configure(logConfig);
+}
+
+export function setLogSelfInfo(selfInfo: SelfInfo) {
+  const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+  loggerConsole.addContext('userInfo', userInfo);
+  loggerFile.addContext('userInfo', userInfo);
+  loggerDefault.addContext('userInfo', userInfo);
+}
+setLogSelfInfo({ nick: '', uin: '', uid: '' });
+
+let fileLogEnabled = true;
+let consoleLogEnabled = true;
+export function enableFileLog(enable: boolean) {
+  fileLogEnabled = enable;
+}
+export function enableConsoleLog(enable: boolean) {
+  consoleLogEnabled = enable;
+}
+
+function 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;
+}
+
+// eslint-disable-next-line no-control-regex
+const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+
+function _log(level: LogLevel, ...args: any[]) {
+  if (consoleLogEnabled) {
+    loggerConsole[level](formatMsg(args));
+  }
+  if (fileLogEnabled) {
+    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
+  }
+}
 
 export function log(...args: any[]) {
-  console.log(...args);
+  // info 等级
+  _log(LogLevel.INFO, ...args);
+}
+
+export function logDebug(...args: any[]) {
+  _log(LogLevel.DEBUG, ...args);
+}
+
+export function logError(...args: any[]) {
+  _log(LogLevel.ERROR, ...args);
+}
+
+export function logWarn(...args: any[]) {
+  _log(LogLevel.WARN, ...args);
+}
+
+export function logFatal(...args: any[]) {
+  _log(LogLevel.FATAL, ...args);
 }

src/common/utils/qqlevel.ts

@@ -1,5 +1,5 @@
 // QQ等级换算
-import { QQLevel } from '@/core/qqnt/entities';
+import { QQLevel } from '@/core/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;

src/common/utils/reboot.ts

@@ -0,0 +1,44 @@
+import { resolve } from 'node:path';
+import { spawn } from 'node:child_process';
+import { pid, ppid, exit } from 'node:process';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export async function rebootWithQuickLogin(uin: string) {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    //还没兼容
+    subProcess.unref();
+    exit(0);
+  }
+  //exit(0);
+}
+export async function rebootWithNormolLogin() {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} `, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
+    subProcess.unref();
+    exit(0);
+  }
+}

src/common/utils/request.ts

@@ -0,0 +1,193 @@
+import https from 'node:https';
+import http from 'node:http';
+import { readFileSync } from 'node:fs';
+import { NTQQUserApi } from '@/core';
+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): Promise<string> {
+    return new Promise(async (resolve, reject) => {
+      type retType = { retcode: number, result?: { url: string } };
+      try {
+        const cookies = Object.entries(await NTQQUserApi.getCookies('connect.qq.com')).map(([key, value]) => `${key}=${value}`).join('; ');
+        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.error('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,9 +1,74 @@
 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 = os.hostname();
-const homeDir = os.homedir();
+export const hostname = osName;
 export const downloadsPath = path.join(homeDir, 'Downloads');
 export const systemName = os.type();

src/common/utils/type.ts

@@ -0,0 +1,17 @@
+//QQVersionType
+type QQPackageInfoType = {
+  version: string;
+  buildVersion: string;
+  platform: string;
+  eleArch: string;
+}
+type QQVersionConfigType = {
+  baseVersion: string;
+  curVersion: string;
+  prevVersion: string;
+  onErrorVersions: Array<any>;
+  buildId: string;
+}
+type QQAppidTableType = {
+  [key: string]: { appid: string, qua: string };
+}

src/common/utils/umami.ts

@@ -1,44 +0,0 @@
-import { request } from 'https';
-export function postLoginStatus() {
-  const req = request(
-    {
-      hostname: 'napcat.wumiao.wang',
-      path: '/api/send',
-      port: 443,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0'
-      }
-    },
-    (res) => {
-      //let data = '';
-      res.on('data', (chunk) => {
-        //data += chunk;
-      });
-      res.on('error', (err) => {
-      });
-      res.on('end', () => {
-        //console.log('Response:', data);
-      });
-    }
-  );
-  req.on('error', (e) => {
-    // console.error('Request error:', e);
-  });
-  const StatesData = {
-    type: 'event',
-    payload: {
-      'website': '952bf82f-8f49-4456-aec5-e17db5f27f7e',
-      'hostname': 'napcat.demo.cn',
-      'screen': '1920x1080',
-      'language': 'zh-CN',
-      'title': 'OneBot.Login',
-      'url': '/login/onebot11',
-      'referrer': 'https://napcat.demo.cn/login?type=onebot11'
-    }
-  };
-  req.write(JSON.stringify(StatesData));
-
-  req.end();
-}

src/common/utils/version.ts

@@ -1,40 +1,21 @@
-import { get as httpsGet } from 'node:https';
-function requestMirror(url: string): Promise<string | undefined> {
-  return new Promise((resolve, reject) => {
-    httpsGet(url, (response) => {
-      let data = '';
-      response.on('data', (chunk) => {
-        data += chunk;
-      });
-
-      response.on('end', () => {
-        try {
-          const parsedData = JSON.parse(data);
-          const version = parsedData.version;
-          resolve(version);
-        } catch (error) {
-          // 解析失败或无法访问域名，跳过
-          resolve(undefined);
-        }
-      });
-    }).on('error', (error) => {
-      // 请求失败，跳过
-      resolve(undefined);
-    });
-  });
-}
-
+import { logDebug } from './log';
+import { RequestUtil } from './request';
 export async function checkVersion(): Promise<string> {
   return new Promise(async (resolve, reject) => {
     const MirrorList =
-            [
-              'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
-            ];
+      [
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
+      ];
+    let version = undefined;
     for (const url of MirrorList) {
-      const version = await requestMirror(url);
+      try {
+        version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
+      } catch (e) {
+        logDebug('检测更新异常',e);
+      }
       if (version) {
         resolve(version);
       }

src/core.lib/src/index.d.ts

@@ -1,27 +0,0 @@
-/// <reference types="node" />
-import { GlobalAdapter } from './qqnt/adapters';
-import { QRCodeLoginSucceedType } from './qqnt/services';
-import { NapCatCoreWrapper } from './wrapper';
-import { NapCatCoreLogin } from './login';
-import { NapCatCoreSession } from './session';
-import { NapCatCoreService } from './service';
-import { EventEmitter } from 'node:events';
-import * as log4js from '@log4js-node/log4js-api';
-export interface LoginSuccessCallback {
-    (): void | Promise<void>;
-}
-export declare class NapCatCore extends EventEmitter {
-    readonly log: log4js.Logger;
-    readonly adapter: GlobalAdapter;
-    readonly wrapper: NapCatCoreWrapper;
-    readonly login: NapCatCoreLogin;
-    readonly session: NapCatCoreSession;
-    readonly service: NapCatCoreService;
-    private loginSuccessCbList;
-    constructor();
-    initPostLogin(args: QRCodeLoginSucceedType): Promise<void>;
-    private onLoginSuccess;
-    private onMessage;
-    addLoginSuccessCallback(cb: LoginSuccessCallback): void;
-}
-export declare const napCatCore: NapCatCore;

src/core.lib/src/login.d.ts

@@ -1,48 +0,0 @@
-import { LoginListener } from './qqnt/listeners';
-import { LoginInitConfig, NodeIKernelLoginService } from './qqnt/services';
-import { NapCatCore } from '.';
-/**
- * NapCat 登录相关核心类
- *
- * **【注意】**：只有在调用 `init` 方法后才会被真正初始化！
- */
-export declare class NapCatCoreLogin {
-    readonly core: NapCatCore;
-    readonly service: NodeIKernelLoginService;
-    readonly listener: LoginListener;
-    constructor(core: NapCatCore);
-    /**
-     * 初始化 `NodeIKernelLoginService`
-     * @param {LoginInitConfig} config `NodeIKernelLoginService` 初始化配置
-     * @returns {void}
-     */
-    init(config: LoginInitConfig): void;
-    /**
-     * 初始化监听器，用于向父级 `NapCatCore` 发送事件
-     */
-    private initListener;
-    /**
-     * 获取在此客户端上登录过的账号列表
-     * @returns {Promise<{ result: number, LocalLoginInfoList: LoginListItem[] }>}
-     */
-    private getLoginList;
-    /**
-     * 使用二维码方式登录账号，获取到的二维码链接可通过 `system.login.qrcode` 事件获取。
-     */
-    qrcode(): Promise<void>;
-    /**
-     * 使用快速登录方式登录账号，欲登录的账号必须在此客户端上登录过
-     * @param {string} uin 欲登录账户的 Uin
-     * @returns {Promise<void>}
-     */
-    quick(uin: string): Promise<void>;
-    /**
-     * 使用账号密码方式登录，需要滑块验证会发送 `system.login.slider` 事件，登录错误会发送 `system.login.error` 事件。
-     * @param {string} uin 登录账号
-     * @param {string} password 登录密码
-     * @param {string} [proofSig] 验证码返回的 ticket
-     * @param {string} [proofRand] 验证码返回的随机字符串值
-     * @param {string} [proofSid] 验证码的 sid
-     */
-    password(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
-}

src/core.lib/src/qqnt/adapters/NodeIDependsAdapter.d.ts

@@ -1,14 +0,0 @@
-interface IDependsAdapter {
-    onMSFStatusChange(args: unknown): void;
-    onMSFSsoError(args: unknown): void;
-    getGroupCode(args: unknown): void;
-}
-export interface NodeIDependsAdapter extends IDependsAdapter {
-    new (adapter: IDependsAdapter): NodeIDependsAdapter;
-}
-export declare class DependsAdapter implements IDependsAdapter {
-    onMSFStatusChange(args: unknown): void;
-    onMSFSsoError(args: unknown): void;
-    getGroupCode(args: unknown): void;
-}
-export {};

src/core.lib/src/qqnt/adapters/NodeIDependsAdapter.js

@@ -1 +0,0 @@
-function _0xf120(_0xb970ba,_0xf7d893){var _0x4f9c7e=_0x4f9c();return _0xf120=function(_0xf12079,_0x131120){_0xf12079=_0xf12079-0xc6;var _0x3ddf5a=_0x4f9c7e[_0xf12079];return _0x3ddf5a;},_0xf120(_0xb970ba,_0xf7d893);}function _0x4f9c(){var _0x3d6dfa=['25760410sccxYa','6078224aJOjSq','6608637GGRCHx','30WjSudP','1263184GdIuXA','7jJbzkS','692352hUSolA','45928jbuIps','39RTDEhx','307669SAAUvZ'];_0x4f9c=function(){return _0x3d6dfa;};return _0x4f9c();}(function(_0x2d8616,_0x3a0482){var _0xf9b7aa=_0xf120,_0x189e1a=_0x2d8616();while(!![]){try{var _0x4e7d5b=parseInt(_0xf9b7aa(0xc8))/0x1+parseInt(_0xf9b7aa(0xcd))/0x2+-parseInt(_0xf9b7aa(0xc7))/0x3*(parseInt(_0xf9b7aa(0xc6))/0x4)+parseInt(_0xf9b7aa(0xcc))/0x5*(parseInt(_0xf9b7aa(0xcf))/0x6)+-parseInt(_0xf9b7aa(0xce))/0x7*(-parseInt(_0xf9b7aa(0xca))/0x8)+parseInt(_0xf9b7aa(0xcb))/0x9+-parseInt(_0xf9b7aa(0xc9))/0xa;if(_0x4e7d5b===_0x3a0482)break;else _0x189e1a['push'](_0x189e1a['shift']());}catch(_0x309c1d){_0x189e1a['push'](_0x189e1a['shift']());}}}(_0x4f9c,0x61bf9));export class DependsAdapter{['onMSFStatusChange'](_0x2f8187){}['onMSFSsoError'](_0x576690){}['getGroupCode'](_0x3bae35){}}

src/core.lib/src/qqnt/adapters/NodeIDispatcherAdapter.d.ts

@@ -1,14 +0,0 @@
-interface IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-    dispatchCall(arg: unknown): void;
-    dispatchCallWithJson(arg: unknown): void;
-}
-export interface NodeIDispatcherAdapter extends IDispatcherAdapter {
-    new (adapter: IDispatcherAdapter): NodeIDispatcherAdapter;
-}
-export declare class DispatcherAdapter implements IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-    dispatchCall(arg: unknown): void;
-    dispatchCallWithJson(arg: unknown): void;
-}
-export {};

src/core.lib/src/qqnt/adapters/NodeIDispatcherAdapter.js

@@ -1 +0,0 @@
-var _0x5727b9=_0x2df7;function _0x2df7(_0x3971d8,_0x4c585e){var _0x4305f0=_0x4305();return _0x2df7=function(_0x2df780,_0x2fb009){_0x2df780=_0x2df780-0x19f;var _0x53e652=_0x4305f0[_0x2df780];return _0x53e652;},_0x2df7(_0x3971d8,_0x4c585e);}function _0x4305(){var _0x6cc688=['6488664ifSUlU','4178262LHiEOG','2nksJLr','8271480HkXfar','102498wlqXHm','12040029SSuaKe','3539620lzrEJI','dispatchCallWithJson','355yQEArS','995282mYiXUB'];_0x4305=function(){return _0x6cc688;};return _0x4305();}(function(_0x467d0a,_0x503a75){var _0x4d4195=_0x2df7,_0x3f2080=_0x467d0a();while(!![]){try{var _0x1922e8=-parseInt(_0x4d4195(0x19f))/0x1*(-parseInt(_0x4d4195(0x1a2))/0x2)+-parseInt(_0x4d4195(0x1a1))/0x3+parseInt(_0x4d4195(0x1a6))/0x4+-parseInt(_0x4d4195(0x1a8))/0x5*(-parseInt(_0x4d4195(0x1a4))/0x6)+parseInt(_0x4d4195(0x1a3))/0x7+-parseInt(_0x4d4195(0x1a0))/0x8+-parseInt(_0x4d4195(0x1a5))/0x9;if(_0x1922e8===_0x503a75)break;else _0x3f2080['push'](_0x3f2080['shift']());}catch(_0x364f26){_0x3f2080['push'](_0x3f2080['shift']());}}}(_0x4305,0xb2fae));export class DispatcherAdapter{['dispatchRequest'](_0x310115){}['dispatchCall'](_0x175ade){}[_0x5727b9(0x1a7)](_0x2773d9){}}

src/core.lib/src/qqnt/adapters/NodeIGlobalAdapter.d.ts

@@ -1,24 +0,0 @@
-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 {
-    new (adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-export declare class GlobalAdapter implements 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 {};

src/core.lib/src/qqnt/adapters/NodeIGlobalAdapter.js

@@ -1 +0,0 @@
-function _0x2f88(_0x1eba24,_0x5ef2fd){var _0x352bbc=_0x352b();return _0x2f88=function(_0x2f8861,_0x28226b){_0x2f8861=_0x2f8861-0xba;var _0x360fea=_0x352bbc[_0x2f8861];return _0x360fea;},_0x2f88(_0x1eba24,_0x5ef2fd);}var _0x1829c2=_0x2f88;(function(_0x104ed5,_0x2d7c97){var _0x4ca004=_0x2f88,_0x36426e=_0x104ed5();while(!![]){try{var _0x38918e=-parseInt(_0x4ca004(0xc2))/0x1+-parseInt(_0x4ca004(0xc8))/0x2*(-parseInt(_0x4ca004(0xca))/0x3)+-parseInt(_0x4ca004(0xc9))/0x4+-parseInt(_0x4ca004(0xc5))/0x5*(-parseInt(_0x4ca004(0xcb))/0x6)+-parseInt(_0x4ca004(0xc4))/0x7*(-parseInt(_0x4ca004(0xbd))/0x8)+parseInt(_0x4ca004(0xbf))/0x9+parseInt(_0x4ca004(0xbb))/0xa*(-parseInt(_0x4ca004(0xbe))/0xb);if(_0x38918e===_0x2d7c97)break;else _0x36426e['push'](_0x36426e['shift']());}catch(_0x506caa){_0x36426e['push'](_0x36426e['shift']());}}}(_0x352b,0xa7ce0));export class GlobalAdapter{[_0x1829c2(0xc0)](..._0x36b0eb){}[_0x1829c2(0xba)](..._0x59de75){}[_0x1829c2(0xc1)](..._0x1b006c){}['fixPicImgType'](..._0xec6527){}[_0x1829c2(0xbc)](..._0x11ca5b){}[_0x1829c2(0xc7)](..._0x1c4a6f){}[_0x1829c2(0xc6)](..._0x3eb04a){}[_0x1829c2(0xc3)](..._0x144190){}}function _0x352b(){var _0x158f1c=['onUpdateGeneralFlag','onInstallFinished','2eRLDVa','5263128qtWkCV','1499370RbKusH','1164UwpnmO','onGetSrvCalTime','8110010wrCpUj','getAppSetting','4856lpyxQN','11wbemXL','11831211GEkruI','onLog','onShowErrUITips','374095AStjyy','onGetOfflineMsg','7259LZzDYB','19185UKFTEW'];_0x352b=function(){return _0x158f1c;};return _0x352b();}

src/core.lib/src/qqnt/adapters/index.js

@@ -1 +0,0 @@
-(function(_0x2c82f1,_0x15a7f9){var _0x1f4fc5=_0x552e,_0x120ca7=_0x2c82f1();while(!![]){try{var _0x4c6d1c=parseInt(_0x1f4fc5(0x15c))/0x1+-parseInt(_0x1f4fc5(0x15e))/0x2*(-parseInt(_0x1f4fc5(0x162))/0x3)+parseInt(_0x1f4fc5(0x15b))/0x4*(parseInt(_0x1f4fc5(0x161))/0x5)+parseInt(_0x1f4fc5(0x164))/0x6+parseInt(_0x1f4fc5(0x163))/0x7*(parseInt(_0x1f4fc5(0x15f))/0x8)+-parseInt(_0x1f4fc5(0x160))/0x9+parseInt(_0x1f4fc5(0x165))/0xa*(-parseInt(_0x1f4fc5(0x15d))/0xb);if(_0x4c6d1c===_0x15a7f9)break;else _0x120ca7['push'](_0x120ca7['shift']());}catch(_0x3aefd3){_0x120ca7['push'](_0x120ca7['shift']());}}}(_0xd80b,0x20563));export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x552e(_0x39eb72,_0x4dbf66){var _0xd80bdc=_0xd80b();return _0x552e=function(_0x552ee6,_0x13fdea){_0x552ee6=_0x552ee6-0x15b;var _0x3a61fe=_0xd80bdc[_0x552ee6];return _0x3a61fe;},_0x552e(_0x39eb72,_0x4dbf66);}export*from'./NodeIGlobalAdapter';function _0xd80b(){var _0x1bbbcb=['6fGUKmf','16WwftsI','1932201moPtem','107665lzVkdY','44268zTNceZ','823004HAclpT','369624MwMTRi','34250lRnGss','24RIiZmT','185176eqCtHc','990mKKIXr'];_0xd80b=function(){return _0x1bbbcb;};return _0xd80b();}

src/core.lib/src/qqnt/apis/file.d.ts

@@ -1,17 +0,0 @@
-import { ChatType, ElementType } from '@/core/qqnt/entities';
-import * as fileType from 'file-type';
-import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-export declare class NTQQFileApi {
-    static getFileType(filePath: string): Promise<fileType.FileTypeResult | undefined>;
-    static copyFile(filePath: string, destPath: string): Promise<void>;
-    static getFileSize(filePath: string): Promise<number>;
-    static uploadFile(filePath: string, elementType?: ElementType, elementSubType?: number): Promise<{
-        md5: string;
-        fileName: string;
-        path: string;
-        fileSize: number;
-        ext: string;
-    }>;
-    static downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout?: number): Promise<string>;
-    static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
-}

src/core.lib/src/qqnt/apis/friend.d.ts

@@ -1,5 +0,0 @@
-import { FriendRequest } from '@/core/qqnt/entities';
-export declare class NTQQFriendApi {
-    static getFriends(forced?: boolean): Promise<void>;
-    static handleFriendRequest(request: FriendRequest, accept: boolean): Promise<void>;
-}