style: lint

Update GetGroupMemberList.ts

.editorconfig

@@ -5,7 +5,7 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
-end_of_line = lf
+end_of_line = lf|crlf
 insert_final_newline = true
 
 # Matches multiple files with brace expansion notation
@@ -18,4 +18,4 @@ indent_style = space
 indent_size = 2
 
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
-# You'll need to rely on your linter/formatter like ESLint or Prettier for that.
+# You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.env.production

@@ -1 +1 @@
-VITE_BUILD_TYPE = Production
+VITE_BUILD_TYPE = Production

.eslintrc.cjs

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,81 @@
+name: Bug 反馈
+description: 报告可能的 NapCat 异常行为
+title: '[BUG] '
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        欢迎来到 NapCat 的 Issue Tracker！请填写以下表格来提交 Bug。
+        在提交新的 Bug 反馈前，请确保您：
+        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
+        * 不与现有的某一 issue 重复
+  - type: input
+    id: system-version
+    attributes:
+      label: 系统版本
+      description: 运行 QQNT 的系统版本
+      placeholder: Windows 10 Pro Workstation 22H2
+    validations:
+      required: true
+  - type: input
+    id: qqnt-version
+    attributes:
+      label: QQNT 版本
+      description: 可在 QQNT 的「关于」的设置页中找到
+      placeholder: 9.9.7-21804
+    validations:
+      required: true
+  - type: input
+    id: napcat-version
+    attributes:
+      label: NapCat 版本
+      description: 可在 LiteLoaderQQNT 的设置页或是 QQNT 的设置页侧栏中找到
+      placeholder: 1.0.0
+    validations:
+      required: true
+  - type: input
+    id: onebot-client-version
+    attributes:
+      label: OneBot 客户端
+      description: 连接至 NapCat 的客户端版本信息
+      placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: 发生了什么?
+      description: 填写你认为的 NapCat 的不正常行为
+    validations:
+      required: true
+  - type: textarea
+    id: how-reproduce
+    attributes:
+      label: 如何复现
+      description: 填写应当如何操作才能触发这个不正常行为
+      placeholder: |
+        1. xxx
+        2. xxx
+        3. xxx
+    validations:
+      required: true
+  - type: textarea
+    id: what-expected
+    attributes:
+      label: 期望的结果?
+      description: 填写你认为 NapCat 应当执行的正常行为
+    validations:
+      required: true
+  - type: textarea
+    id: napcat-log
+    attributes:
+      label: NapCat 运行日志
+      description: 粘贴相关日志内容到此处
+      render: shell
+  - type: textarea
+    id: onebot-client-log
+    attributes:
+      label: OneBot 客户端运行日志
+      description: 粘贴 OneBot 客户端的相关日志内容到此处
+      render: shell

.github/workflows/build.yml

@@ -0,0 +1,74 @@
+name: "Build"
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+permissions: write-all
+
+jobs:
+  build-linux:
+    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
+    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:
+    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target_platform: [win32]
+        target_arch: [x64]
+    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

.github/workflows/release.yml

@@ -1,30 +1,60 @@
 name: "release"
+
 on:
   push:
     tags:
       - "v*"
 
+permissions: write-all
+
 jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version from tag
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+
+      - name: Use Node.js 20.X
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+
+      - name: Check Version
+        run: | 
+              ls
+              node ./script/checkVersion.cjs
+              sh ./checkVersion.sh
   build-linux:
+    needs: [check-version]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
       uses: actions/checkout@v4
       with:
-          repository: 'NapNeko/NapCat'
+          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
+          node-version: 20.x
+
     - 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
@@ -37,6 +67,7 @@ jobs:
         path: dist
   build-win32:
     runs-on: ubuntu-latest
+    needs: [check-version]
     strategy:
       fail-fast: false
       matrix:
@@ -46,25 +77,32 @@ jobs:
         - name: Clone Main Repository
           uses: actions/checkout@v4
           with:
-                repository: 'NapNeko/NapCat'
+                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: |
+                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
                 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
+
   release-napcat:
     needs: [build-win32,build-linux]
     runs-on: ubuntu-latest
@@ -78,15 +116,23 @@ jobs:
           base=$(basename "$dir")
           zip -r "${base}.zip" "$dir"
         done 
+    
+    - 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 V0.0.0
-        token: ${{ secrets.NAPCAT_BUILD }}
+        name: NapCat V${{ env.VERSION }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        body_path: CHANGELOG.md
         files: |
           NapCat.win32.x64.zip
           NapCat.linux.x64.zip
           NapCat.linux.arm64.zip
-          NapCat.darwin.x64.zip
-          NapCat.darwin.arm64.zip
+#          NapCat.darwin.x64.zip
+#          NapCat.darwin.arm64.zip
         draft: true

.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/*
@@ -14,3 +14,4 @@ src/core.lib/common/
 
 # Build
 *.db
+checkVersion.sh

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 NapCatQQ
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -4,159 +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/) 页面下载最新版本
 
-## 下载
-
-前往 Release 页面下载最新版本
-
-## 启动
-
-NapCat 是基于 官方NTQQ 实现的Bot框架，因此先需要安装官方QQ
-
-*如果没有安装 QQ 请往后翻查看安装方法*
-
-修改 `config/onebot11.json`内容，并重名为 `onebot11_<你的QQ号>.json`，如`onebot11_1234567.json`
-
-json 配置内容参数解释：
-
-```json5
-{
-  // 是否启用http服务，如果启用，可以通过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上报密钥，可为空
-  "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`
-
-### Linux 启动
-
-运行`napcat.sh`
-
-## 使用无需扫码快速登录
-
-前提是你已经成功登录过QQ，可以加参数` -q <你的QQ>` 进行登录，如`napcat.sh -q 1234567`
-
-## 安装
-
-### Linux安装
-
-#### 安装 Linux QQ(22741)，已经安装了的可以跳过
-
-目前还在研究怎么精简安装，暂时只能安装官方QQ整体依赖
-
-```bash
-下载QQ的deb包
- 
-[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 本身的问题，不影响使用
+**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
 
 
-<!-- 
-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.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/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/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/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/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/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/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/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/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/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/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/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/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/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)

package.json

@@ -1,63 +1,66 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "1.0.1",
-  "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",
-    "watch": "npm run watch:dev",
-    "debug-win": "powershell dist/napcat.ps1",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "release": "npm run build:prod",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.30",
-    "@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",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "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-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "commander": "^12.0.0",
-    "express": "^5.0.0-beta.2",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "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"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "1.4.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 && 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}",
+    "release": "npm run build:prod",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@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/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",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "i": "^0.3.7",
+    "javascript-obfuscator": "^4.1.0",
+    "rollup": "^4.13.2",
+    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-obfuscator": "^1.1.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-dts": "^3.8.2",
+    "vite-tsconfig-paths": "^4.3.2",
+    "@protobuf-ts/plugin": "^2.9.4"
+  },
+  "dependencies": {
+    "ajv": "^8.13.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",
+    "qrcode-terminal": "^0.12.0",
+    "silk-wasm": "^3.3.4",
+    "sqlite3": "^5.1.7",
+    "uuid": "^9.0.1",
+    "ws": "^8.16.0"
+  }
+}

script/checkVersion.cjs

@@ -0,0 +1,42 @@
+const fs = require("fs");
+const process = require("process");
+
+console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
+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/gen-version.ts

@@ -0,0 +1,21 @@
+import fs from 'fs'
+import path from 'path'
+import { version } from '../src/onebot11/version'
+
+const manifestPath = path.join(__dirname, '../package.json')
+
+function readManifest (): any {
+    if (fs.existsSync(manifestPath)) {
+        return JSON.parse(fs.readFileSync(manifestPath, 'utf-8'))
+    }
+}
+
+function writeManifest (manifest: any) {
+    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2))
+}
+
+const manifest = readManifest()
+if (version !== manifest.version) {
+    manifest.version = version
+    writeManifest(manifest)
+}

script/napcat-custom.bat

@@ -0,0 +1,3 @@
+chcp 65001
+set ELECTRON_RUN_AS_NODE=1
+"H:\Program Files\QQNT最新版\QQ.exe" %~dp0/napcat.cjs %*

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,85 +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>();
-
-// 群号 -> 群成员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,17 +1,19 @@
 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;
 
   constructor() {
     this.expressAPP = express();
+    this.expressAPP.use(cors());
     this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }));
     this.expressAPP.use((req, res, next) => {
       // 兼容处理没有带content-type的请求
@@ -21,7 +23,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();
@@ -35,14 +37,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) {
@@ -51,29 +53,29 @@ 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
@@ -86,7 +88,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
@@ -94,8 +96,10 @@ export abstract class HttpServerBase {
       let payload = req.body;
       if (method == 'get') {
         payload = req.query;
+      } 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) {
@@ -104,10 +108,17 @@ export abstract class HttpServerBase {
     });
   }
 
-  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

@@ -27,11 +27,17 @@ export class WebsocketServerBase {
   constructor() {
   }
 
-  start(port: number) {
+  start(port: number, host: string = '') {
     try {
-      this.ws = new WebSocketServer({ port });
+      this.ws = new WebSocketServer({
+        port,
+        host: '',
+        maxPayload: 1024 * 1024 * 1024
+      }).on('error', () => {
+      });
+      log(`ws服务启动成功, ${host}:${port}`);
     } catch (e: any) {
-      throw Error('ws服务启动失败, ' + e.toString());
+      throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
     }
     this.ws.on('connection', (wsClient, req) => {
       const url: string = req.url!.split('?').shift() || '/';

src/common/utils/AsyncQueue.ts

@@ -0,0 +1,35 @@
+import { sleep } from '@/common/utils/helper';
+
+type AsyncQueueTask = (() => void) | (()=>Promise<void>);
+
+
+export class AsyncQueue {
+  private tasks: (AsyncQueueTask)[] = [];
+
+  public addTask(task: AsyncQueueTask) {
+    this.tasks.push(task);
+    // console.log('addTask', this.tasks.length);
+    if (this.tasks.length === 1) {
+      this.runQueue().then().catch(()=>{});
+    }
+  }
+
+  private async runQueue() {
+    // console.log('runQueue', this.tasks.length);
+    while (this.tasks.length > 0) {
+      const task = this.tasks[0];
+      // console.log('typeof task', typeof task);
+      try {
+        const taskRet = task();
+        // console.log('type of taskRet', typeof taskRet, taskRet);
+        if (taskRet instanceof Promise) {
+          await taskRet;
+        }
+      } catch (e) {
+        console.error(e);
+      }
+      this.tasks.shift();
+      await sleep(100);
+    }
+  }
+}

src/common/utils/ConfigBase.ts

@@ -0,0 +1,73 @@
+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';
+
+
+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>{
+
+  constructor() {
+  }
+
+  protected getKeys(): string[] | null {
+    // 决定 key 在json配置文件中的顺序
+    return null;
+  }
+
+  getConfigDir(){
+    const configDir = path.resolve(__dirname, 'config');
+    fs.mkdirSync(configDir, { recursive: true });
+    return configDir;
+  }
+  getConfigPath(): string {
+    throw new Error('Method not implemented.');
+  }
+
+  read() {
+    const configPath = this.getConfigPath();
+    if (!fs.existsSync(configPath)) {
+      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) {
+    Object.assign(this, config);
+    const configPath = this.getConfigPath();
+    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,182 @@
+import { NodeIKernelMsgListener } from '@/core';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+}
+
+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(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    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;
+      }
+      task.func(...args);
+    });
+  }
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<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 CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
+      const id = randomUUID();
+      let complete = 0;
+      let retData: ArrayLike<Parameters<ListenerType>> | undefined = undefined;
+      let retEvent: any = {};
+      const databack = () => {
+        if (complete < waitTimes) {
+          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
+        } else {
+
+          resolve([retEvent as Awaited<ReturnType<EventType>>, ...(retData as Parameters<ListenerType>)]);
+        }
+      };
+      const Timeouter = setTimeout(databack, timeout);
+
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        func: (...args: any[]) => {
+          complete++;
+          //console.log('func', ...args);
+          retData = args as ArrayLike<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);
+    });
+  }
+}
+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/LRUCache.ts

@@ -0,0 +1,145 @@
+import { logError, logDebug } from '@/common/utils/log';
+
+type group_id = number;
+type user_id = number;
+
+class cacheNode<T> {
+  value: T;
+  groupId: group_id;
+  userId: user_id;
+  prev: cacheNode<T> | null;
+  next: cacheNode<T> | null;
+  timestamp: number;
+
+  constructor(groupId: group_id, userId: user_id, value: T) {
+    this.groupId = groupId;
+    this.userId = userId;
+    this.value = value;
+    this.prev = null;
+    this.next = null;
+    this.timestamp = Date.now();
+  }
+}
+
+type cache<T> = { [key: group_id]: { [key: user_id]: cacheNode<T> } };
+class LRU<T> {
+  private maxAge: number;
+  private maxSize: number;
+  private currentSize: number;
+  private cache: cache<T>;
+  private head: cacheNode<T> | null = null;
+  private tail: cacheNode<T> | null = null;
+  private onFuncs: ((node: cacheNode<T>) => void)[] = [];
+
+  constructor(maxAge: number = 2e4, maxSize: number = 5e3) {
+    this.maxAge = maxAge;
+    this.maxSize = maxSize;
+    this.cache = Object.create(null);
+    this.currentSize = 0;
+
+    if (maxSize == 0) return;
+    setInterval(() => this.removeExpired(), this.maxAge);
+  }
+
+  // 移除LRU节点
+  private removeLRUNode(node: cacheNode<T>) {
+    logDebug(
+      'removeLRUNode',
+      node.groupId,
+      node.userId,
+      node.value,
+      this.currentSize
+    );
+    node.prev = node.next = null;
+    delete this.cache[node.groupId][node.userId];
+    this.removeNode(node);
+    this.onFuncs.forEach((func) => func(node));
+    this.currentSize--;
+  }
+
+  public on(func: (node: cacheNode<T>) => void) {
+    this.onFuncs.push(func);
+  }
+
+  private removeExpired() {
+    const now = Date.now();
+    let current = this.tail;
+    const nodesToRemove: cacheNode<T>[] = [];
+    let removedCount = 0;
+
+    // 收集需要删除的节点
+    while (current && now - current.timestamp > this.maxAge) {
+      nodesToRemove.push(current);
+      current = current.prev;
+      removedCount++;
+      if (removedCount >= 100) break;
+    }
+
+    // 更新链表指向
+    if (nodesToRemove.length > 0) {
+      const newTail = nodesToRemove[nodesToRemove.length - 1].prev;
+      if (newTail) {
+        newTail.next = null;
+      } else {
+        this.head = null;
+      }
+      this.tail = newTail;
+    }
+
+    nodesToRemove.forEach((node) => {
+      node.prev = node.next = null;
+      delete this.cache[node.groupId][node.userId];
+
+      this.currentSize--;
+      this.onFuncs.forEach((func) => func(node));
+    });
+  }
+
+  private addNode(node: cacheNode<T>) {
+    node.next = this.head;
+    if (this.head) this.head.prev = node;
+    if (!this.tail) this.tail = node;
+    this.head = node;
+  }
+
+  private removeNode(node: cacheNode<T>) {
+    if (node.prev) node.prev.next = node.next;
+    if (node.next) node.next.prev = node.prev;
+    if (node === this.head) this.head = node.next;
+    if (node === this.tail) this.tail = node.prev;
+  }
+
+  private moveToHead(node: cacheNode<T>) {
+    if (this.head === node) return;
+
+    this.removeNode(node);
+    this.addNode(node);
+    node.prev = null;
+  }
+
+  public set(groupId: group_id, userId: user_id, value: T) {
+    if (!this.cache[groupId]) {
+      this.cache[groupId] = Object.create(null);
+    }
+
+    const groupObject = this.cache[groupId];
+
+    if (groupObject[userId]) {
+      const node = groupObject[userId];
+      node.value = value;
+      node.timestamp = Date.now();
+      this.moveToHead(node);
+    } else {
+      const node = new cacheNode(groupId, userId, value);
+      groupObject[userId] = node;
+      this.currentSize++;
+      this.addNode(node);
+      if (this.currentSize > this.maxSize) {
+        const tail = this.tail!;
+        this.removeLRUNode(tail);
+      }
+    }
+  }
+}
+
+export default LRU;

src/common/utils/QQBasicInfo.ts

@@ -37,24 +37,36 @@ type QQVersionConfigInfo = {
 }
 
 let _qqVersionConfigInfo: QQVersionConfigInfo = {
-  'baseVersion': '9.9.9-22578',
-  'curVersion': '9.9.9-22578',
+  'baseVersion': '9.9.9-23361',
+  'curVersion': '9.9.9-23361',
   'prevVersion': '',
   'onErrorVersions': [],
-  'buildId': '22578'
+  'buildId': '23361'
 };
 
 if (fs.existsSync(configVersionInfoPath)) {
-  _qqVersionConfigInfo = JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+  try {
+    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
+  } catch (e) {
+    console.error('Load QQ version config info failed, Use default version', e);
+  }
 }
 
 export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
 
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
+export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
+// platform_type: 3,
+// app_type: 4,
+// app_version: '9.9.9-23159',
+// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
+// appid: '537213764',
+// platVer: '10.0.26100',
+// clientVer: '9.9.9-23159',
 
-let _appid: string = '537213335';  // 默认为 Windows 平台的 appid
+let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
 if (systemPlatform === 'linux') {
-  _appid = '537213710';
+  _appid = '537213827';
 }
 // todo: mac 平台的 appid
 export const appid = _appid;

src/common/utils/audio.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { encode, getDuration, getWavFileInfo, isWav } 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 { spawn } from 'node:child_process';
@@ -129,7 +129,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,24 @@
+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,14 +1,24 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
+import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
 
 import sqlite3 from 'sqlite3';
-import { log } from '@/common/utils/log';
+import { log, logDebug, logError } from '@/common/utils/log';
+import { NTQQMsgApi } from '@/core';
+import LRU from '@/common/utils/LRUCache';
+
+export interface IRember {
+  last_sent_time: number;
+  join_time: number;
+  user_id: number;
+}
+
 
 type DBMsg = {
   id: number,
+  shortId: number,
   longId: string,
   seq: number,
   peerUid: string,
-  msg: string
+  chatType: number,
 }
 
 type DBFile = {
@@ -27,16 +37,20 @@ type DBFile = {
 class DBUtilBase {
   protected db: sqlite3.Database | undefined;
 
-  createConnection(dbPath: string) {
+  async init(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();
+    return new Promise<void>((resolve, reject) => {
+      this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
+        if (err) {
+          logError('Could not connect to database', err);
+          reject(err);
+          return;
+        }
+        this.createTable();
+        resolve();
+      });
     });
   }
 
@@ -50,13 +64,38 @@ class DBUtilBase {
 }
 
 class DBUtil extends DBUtilBase {
-  private msgCache: Map<string, RawMessage> = new Map<string, RawMessage>();
+  private msgCache: Map<string | number, RawMessage> = new Map<string | number, RawMessage>();
+  private globalMsgShortId = -2147483640;
+  private groupIds: number[] = [];
+  private LURCache = new LRU<number>();
+  private LastSentCache = new (class {
+    private cache: { gid: number; uid: number }[] = [];
+    private maxSize: number;
+
+    constructor(maxSize: number = 5000) {
+      this.maxSize = maxSize;
+    }
+
+    get(gid: number, uid: number): boolean {
+      const exists = this.cache.some(
+        (entry) => entry.gid === gid && entry.uid === uid
+      );
+      if (!exists) {
+        this.cache.push({ gid, uid });
+        if (this.cache.length > this.maxSize) {
+          this.cache.shift();
+        }
+      }
+
+      return exists;
+    }
+  })();
 
   constructor() {
     super();
     const interval = 1000 * 60 * 10;  // 10分钟清理一次缓存
     setInterval(() => {
-      log('清理消息缓存');
+      logDebug('清理消息缓存');
       this.msgCache.forEach((msg, key) => {
         if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
           this.msgCache.delete(key);
@@ -65,20 +104,112 @@ class DBUtil extends DBUtilBase {
     }, interval);
   }
 
+  async init(dbPath: string) {
+    await super.init(dbPath);
+    this.globalMsgShortId = await this.getCurrentMaxShortId();
 
+
+    // 初始化群缓存列表
+    this.db!.serialize(() => {
+      const sql = 'SELECT * FROM sqlite_master WHERE type=\'table\'';
+      this.db!.all(sql, [], (err, rows: { name: string }[]) => {
+        if (err) return logError(err);
+        rows.forEach((row) => this.groupIds.push(parseInt(row.name)));
+        //logDebug(`已加载 ${groupIds.length} 个群`);
+      });
+    });
+
+
+    this.LURCache.on(async (node) => {
+      const { value: time, groupId, userId } = node;
+
+      logDebug('插入发言时间', userId, groupId);
+      await this.createGroupInfoTimeTableIfNotExist(groupId);
+
+      const method = await this.getDataSetMethod(groupId, userId);
+      logDebug('插入发言时间方法判断', userId, groupId, method);
+
+      const sql =
+        method == 'update'
+          ? `UPDATE "${groupId}" SET last_sent_time = ? WHERE user_id = ?`
+          : `INSERT INTO "${groupId}" (last_sent_time, user_id)  VALUES (?, ?)`;
+
+      this.db!.all(sql, [time, userId], (err) => {
+        if (err) {
+          return logError('插入/更新发言时间失败', userId, groupId);
+        }
+        logDebug('插入/更新发言时间成功', userId, groupId);
+      });
+
+    });
+  }
+  async getDataSetMethod(groupId: number, userId: number) {
+    // 缓存记录
+    if (this.LastSentCache.get(groupId, userId)) {
+      logDebug('缓存命中', userId, groupId);
+      return 'update';
+    }
+
+    // 数据库判断
+    return new Promise<'insert' | 'update'>((resolve, reject) => {
+      this.db!.all(
+        `SELECT * FROM "${groupId}" WHERE user_id = ?`,
+        [userId],
+        (err, rows) => {
+          if (err) {
+            logError('查询发言时间存在失败', userId, groupId, err);
+            return logError('插入发言时间失败', userId, groupId, err);
+          }
+
+          if (rows.length === 0) {
+            logDebug('查询发言时间不存在', userId, groupId);
+            return resolve('insert');
+          }
+
+          logDebug('查询发言时间存在', userId, groupId);
+          resolve('update');
+        }
+      );
+    });
+  }
+  async createGroupInfoTimeTableIfNotExist(groupId: number) {
+    const createTableSQL = (groupId: number) =>
+      `CREATE TABLE IF NOT EXISTS "${groupId}" (
+            user_id INTEGER,
+            last_sent_time INTEGER,
+            join_time INTEGER,
+            PRIMARY KEY (user_id)
+        );`;
+
+    if (this.groupIds.includes(groupId)) {
+      return;
+    }
+    return new Promise((resolve, reject) => {
+      const sql = createTableSQL(groupId);
+      this.db!.all(sql, (err) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        this.groupIds.push(groupId);
+        resolve(true);
+      });
+    });
+  }
   protected createTable() {
     // 消息记录
     const createTableSQL = `
             CREATE TABLE IF NOT EXISTS msgs (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
-                long_id TEXT NOT NULL UNIQUE,
+                shortId INTEGER NOT NULL UNIQUE,
+                longId TEXT NOT NULL UNIQUE,
                 seq INTEGER NOT NULL,
-                peer_uid TEXT NOT NULL,
-                msg TEXT NOT NULL
+                peerUid TEXT NOT NULL,
+                chatType INTEGER NOT NULL
             )`;
     this.db!.run(createTableSQL, function (err) {
       if (err) {
-        log('Could not create table', err);
+        logError('Could not create table msgs', err.stack);
       }
     });
 
@@ -98,7 +229,7 @@ class DBUtil extends DBUtilBase {
             )`;
     this.db!.run(createFileTableSQL, function (err) {
       if (err) {
-        log('Could not create table files', err);
+        logError('Could not create table files', err);
       }
     });
 
@@ -111,33 +242,59 @@ class DBUtil extends DBUtilBase {
             )`;
     this.db!.run(createTempUinTableSQL, function (err) {
       if (err) {
-        log('Could not create table temp_uins', err);
+        logError('Could not create table temp_uins', err);
       }
     });
   }
 
+  private async getCurrentMaxShortId() {
+    return new Promise<number>((resolve, reject) => {
+      this.db!.get('SELECT MAX(shortId) as maxId FROM msgs', (err, row: { maxId: number }) => {
+        if (err) {
+          logDebug('Could not get max short id, Use default -2147483640', err);
+          return resolve(-2147483640);
+        }
+        logDebug('数据库中消息最大短id', row?.maxId);
+        resolve(row?.maxId ?? -2147483640);
+      });
+    });
+  }
+
   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) {
+          logError('Could not get msg', err, query, params);
           return resolve(null);
         }
+        if (!row) {
+          // logDebug('不存在数据库中的消息，不进行处理', query, params);
+          resolve(null);
+          return;
+        }
+        const msgId = row.longId;
+        NTQQMsgApi.getMsgsByMsgId({ peerUid: row.peerUid, chatType: row.chatType }, [msgId]).then(res => {
+          const msg = res.msgList[0];
+          if (!msg) {
+            resolve(null);
+            return;
+          }
+          msg.id = row.shortId;
+          resolve(msg);
+        }).catch(e => {
+          resolve(null);
+        });
       });
     });
   }
 
   async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
-    const getStmt = 'SELECT * FROM msgs WHERE id = ?';
+    if (this.msgCache.has(shortId)) {
+      return this.msgCache.get(shortId)!;
+    }
+    const getStmt = 'SELECT * FROM msgs WHERE shortId = ?';
     return this.getMsg(getStmt, [shortId]);
   }
 
@@ -145,60 +302,46 @@ class DBUtil extends DBUtilBase {
     if (this.msgCache.has(longId)) {
       return this.msgCache.get(longId)!;
     }
-    return this.getMsg('SELECT * FROM msgs WHERE long_id = ?', [longId]);
+    return this.getMsg('SELECT * FROM msgs WHERE longId = ?', [longId]);
   }
 
   async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
-    const stmt = 'SELECT * FROM msgs WHERE peer_uid = ? AND seq = ?';
+    const stmt = 'SELECT * FROM msgs WHERE peerUid = ? 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);
+      // logDebug('消息已存在，更新数据库', 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 stmt = this.db!.prepare('INSERT INTO msgs (shortId, longId, seq, peerUid, chatType) 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);
-          }
+    const shortId = ++this.globalMsgShortId;
+    msg.id = shortId;
+    //logDebug(`记录消息到数据库, 消息长id: ${msg.msgId}, 短id: ${msg.id}`);
+    this.msgCache.set(shortId, msg);
+    this.msgCache.set(msg.msgId, msg);
+    stmt.run(this.globalMsgShortId, msg.msgId, msg.msgSeq.toString(), msg.peerUid, msg.chatType, (err: any) => {
+      if (err) {
+        if (err.errno === 19) {
+          this.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
+            if (msg) {
+              this.msgCache.set(shortId, msg);
+              this.msgCache.set(msg.msgId, msg);
+              // logDebug('获取消息短id成功', msg.id);
+            } else {
+              logError('db could not get msg by long id', err);
+            }
+          }).catch(e => logError('db getMsgByLongId error', e));
         } 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);
+          logError('db could not add msg', err);
         }
-      });
+      }
     });
+    return shortId;
   }
 
   async updateMsg(msg: RawMessage) {
@@ -206,12 +349,14 @@ class DBUtil extends DBUtilBase {
     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);
-    }
+    //logDebug(`更新消息, shortId:${msg.id}, seq: ${msg.msgSeq}, msgId: ${msg.msgId}`);
+    const stmt = this.db!.prepare('UPDATE msgs SET seq=? WHERE longId=?');
+    stmt.run(msg.msgSeq, msg.msgId, (err: any) => {
+      if (err) {
+        logError('updateMsg db error', err);
+      }
+    });
+
   }
 
   async addFileCache(file: DBFile) {
@@ -224,7 +369,7 @@ class DBUtil extends DBUtilBase {
         file.msgId,
         function (err: any) {
           if (err) {
-            log('db could not add file', err);
+            logError('db could not add file', err);
             reject(err);
           }
           resolve(null);
@@ -237,7 +382,7 @@ class DBUtil extends DBUtilBase {
     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);
+          logError('db could not get file cache', err);
           reject(err);
         }
         if (row) {
@@ -260,9 +405,9 @@ class DBUtil extends DBUtilBase {
   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) {
+      stmt.run(file.path, file.url, file.uuid, function (err: any) {
         if (err) {
-          log('db could not update file cache', err);
+          logError('db could not update file cache', err);
           reject(err);
         }
         resolve(null);
@@ -276,7 +421,7 @@ class DBUtil extends DBUtilBase {
     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);
+          logError('db could not get temp uin map', err);
           reject(err);
         }
         const map: Record<string, string> = {};
@@ -294,7 +439,7 @@ class DBUtil extends DBUtilBase {
     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);
+          logError('db could not get temp uin map', err);
           reject(err);
         }
         resolve(row?.uid);
@@ -309,7 +454,7 @@ class DBUtil extends DBUtilBase {
       return new Promise((resolve, reject) => {
         stmt.run(uin, uid, function (err: any) {
           if (err) {
-            log('db could not add temp uin', err);
+            logError('db could not add temp uin', err);
             reject(err);
           }
           resolve(null);
@@ -317,6 +462,47 @@ class DBUtil extends DBUtilBase {
       });
     }
   }
+  async getLastSentTimeAndJoinTime(
+    groupId: number
+  ): Promise<IRember[]> {
+    logDebug('读取发言时间', groupId);
+    return new Promise<IRember[]>((resolve, reject) => {
+      this.db!.all(`SELECT * FROM "${groupId}" `, (err, rows: IRember[]) => {
+        if (err) {
+          logError('查询发言时间失败', groupId);
+          return resolve([]);
+        }
+        logDebug('查询发言时间成功', groupId, rows);
+        resolve(rows);
+      });
+    });
+  }
+
+  insertLastSentTime(
+    groupId: number,
+    userId: number,
+    time: number
+  ) {
+    this.LURCache.set(groupId, userId, time);
+  }
+  async insertJoinTime(
+    groupId: number,
+    userId: number,
+    time: number
+  ) {
+    await this.createGroupInfoTimeTableIfNotExist(groupId);
+    this.db!.all(
+      `INSERT OR REPLACE INTO "${groupId}"  (user_id, last_sent_time, join_time) VALUES (?,?,?)`,
+      [userId, time, time],
+      (err) => {
+        if (err)
+          logError(err),
+          Promise.reject(),
+          console.log('插入入群时间失败', userId, groupId);
+      }
+    );
+
+  }
 }
 
 

src/common/utils/file.ts

@@ -4,14 +4,13 @@ import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import { log } from './log';
-import { dbUtil } from './db';
+import { dbUtil } from '@/common/utils/db';
 import * as fileType from 'file-type';
 import { v4 as uuidv4 } from 'uuid';
 import { napCatCore } from '@/core';
-import os from 'node:os';
 
 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;
 };
@@ -126,7 +125,7 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, headers);
+  const fetchRes = await fetch(url, { headers });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -194,6 +193,7 @@ 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);
       fs.writeFileSync(filePath, buffer);

src/common/utils/helper.ts

@@ -1,6 +1,13 @@
 import crypto from 'node:crypto';
-import { resolve } from 'dns';
+import path from 'node:path';
+import fs from 'fs/promises';
+import { log, logDebug } from './log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -19,3 +26,159 @@ 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;
+}
+
+
+
+/**
+ * 函数缓存装饰器，根据方法名、参数、自定义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 fs.readdir(path.join(__dirname, 'config'));
+  for (const file of configFiles) {
+    if (file.match(/^onebot11_\d+.json$/)) {
+      const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      if (isValidOldConfig(CurrentConfig)) {
+        log('正在迁移旧配置到新配置 File:', file);
+        const NewConfig = migrateConfig(CurrentConfig);
+        await fs.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;
+}

src/common/utils/log.ts

@@ -1,4 +1,123 @@
+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';
+
+
+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, // 指定日志文件的位置和文件名
+      maxLoogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+      layout: {
+        type: 'pattern',
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+      }
+    },
+    ConsoleAppender: { // 输出到控制台的appender
+      type: 'console',
+      layout: {
+        type: 'pattern',
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+      }
+    }
+  },
+  categories: {
+    default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
+    file: { appenders: ['FileAppender'], level: 'debug' },
+    console: { appenders: ['ConsoleAppender'], level: 'debug' }
+  }
+};
+
+log4js.configure(logConfig);
+
+
+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) {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  logConfig.appenders.FileAppender.layout.pattern = logConfig.appenders.ConsoleAppender.layout.pattern =
+    `%d{yyyy-MM-dd hh:mm:ss} [%p] ${selfInfo.nick}(${selfInfo.uin}) %m`;
+  log4js.configure(logConfig);
+}
+
+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 (typeof msgItem === 'object') {
+      const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
+      logMsg += JSON.stringify(truncateString(obj)) + ' ';
+      continue;
+    }
+    logMsg += msgItem + ' ';
+  }
+  return '\n' + logMsg + '\n';
+}
+
+function _log(level: LogLevel, ...args: any[]){
+  if (consoleLogEnabled){
+    log4js.getLogger('console')[level](formatMsg(args));
+  }
+  if (fileLogEnabled){
+    log4js.getLogger('file')[level](formatMsg(args));
+  }
+}
 
 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);
+}

src/common/utils/qqlevel.ts

@@ -1,7 +1,7 @@
 // QQ等级换算
-import { QQLevel } from '../../ntqqapi/types';
+import { QQLevel } from '@/core/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;
   return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
-}
+}

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,106 @@
+import https from 'node:https';
+import http from 'node:http';
+
+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) => {
+      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);
+              });
+            } 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;
+            }
+          });
+        }
+      }).on('error', (err) => {
+        reject(err);
+      });
+    });
+  }
+
+
+
+  // 请求和回复都是JSON data传原始内容 自动编码json
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: Record<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
+    };
+    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: Record<string, string> = {}) {
+    return this.HttpGetJson<string>(url, method, data, headers, false, false);
+  }
+}

src/common/utils/system.ts

@@ -1,9 +1,74 @@
 import os from 'node:os';
 import path from 'node:path';
+import { networkInterfaces } from 'os';
+import { v4 as uuidv4 } from 'uuid';
+
+// 缓解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 || uuidv4(); // 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,31 @@
+/**
+ * 运行时类型转换与检查类
+ */
+export class TypeCheck {
+  static isEmpty(value: any): boolean {
+    return value === null || value === undefined || value === '' ||
+            (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
+  }
+}
+
+export class TypeConvert {
+  static toNumber(value: any): number {
+    const num = Number(value);
+    if (isNaN(num)) {
+      throw new Error(`无法将输入转换为数字: ${value}`);
+    }
+    return num;
+  }
+
+  static toString(value: any): string {
+    return String(value);
+  }
+
+  static toBoolean(value: any): boolean {
+    return Boolean(value);
+  }
+
+  static toArray(value: any): any[] {
+    return Array.isArray(value) ? value : [value];
+  }
+}

src/common/utils/umami.ts

@@ -1,38 +0,0 @@
-import { request } from "https";
-export function noifyLoginStatus() {
-    let 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('end', () => {
-                //console.log('Response:', data);
-            });
-        }
-    );
-    let 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,44 +1,25 @@
-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"
-            ];
-        for (const url of MirrorList) {
-            const version = await requestMirror(url);
-            if (version) {
-                resolve(version);
-            }
-        }
-        reject("get verison error!");
-    });
-}
+  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'
+      ];
+    let version = undefined;
+    for (const url of MirrorList) {
+      try {
+        version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
+      } catch (e) {
+        logDebug('检测更新异常',e);
+      }
+      if (version) {
+        resolve(version);
+      }
+    }
+    reject('get verison error!');
+  });
+}

src/common/utils/video.ts

@@ -16,8 +16,7 @@ export async function getVideoInfo(filePath: string) {
         size: number,
         filePath: string
     }>((resolve, reject) => {
-      // todo: 从配置文件中读取ffmpeg路径
-      const ffmpegPath = './ffmpeg';
+      const ffmpegPath = process.env.FFMPEG_PATH;
       ffmpegPath && ffmpeg.setFfmpegPath(ffmpegPath);
       ffmpeg(filePath).ffprobe((err: any, metadata: any) => {
         if (err) {
@@ -27,7 +26,7 @@ export async function getVideoInfo(filePath: string) {
           if (videoStream) {
             console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
           } else {
-            console.log('未找到视频流信息。');
+            return reject('未找到视频流信息。');
           }
           resolve({
             width: videoStream.width, height: videoStream.height,
@@ -85,4 +84,4 @@ export function checkFfmpeg(newPath: string | null = null): Promise<boolean> {
       resolve(false);
     }
   });
-}
+}

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

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

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

@@ -0,0 +1 @@
+var _0x1061d1=_0x4744;(function(_0x2a10e0,_0x258add){var _0x50331b=_0x4744,_0x314614=_0x2a10e0();while(!![]){try{var _0x527921=-parseInt(_0x50331b(0x19c))/0x1+parseInt(_0x50331b(0x197))/0x2+-parseInt(_0x50331b(0x196))/0x3+-parseInt(_0x50331b(0x19a))/0x4+parseInt(_0x50331b(0x19d))/0x5+parseInt(_0x50331b(0x193))/0x6*(parseInt(_0x50331b(0x199))/0x7)+-parseInt(_0x50331b(0x198))/0x8*(-parseInt(_0x50331b(0x19b))/0x9);if(_0x527921===_0x258add)break;else _0x314614['push'](_0x314614['shift']());}catch(_0x1d7995){_0x314614['push'](_0x314614['shift']());}}}(_0x4a07,0x4d856));function _0x4744(_0x4cb419,_0x5a62cc){var _0x4a0770=_0x4a07();return _0x4744=function(_0x47440c,_0x11aabb){_0x47440c=_0x47440c-0x193;var _0x4b16cf=_0x4a0770[_0x47440c];return _0x4b16cf;},_0x4744(_0x4cb419,_0x5a62cc);}export class DependsAdapter{[_0x1061d1(0x194)](_0x18e985,_0x5071cd){}[_0x1061d1(0x195)](_0x4caa94){}['getGroupCode'](_0x29d708){}}function _0x4a07(){var _0x1b4f91=['onMSFStatusChange','onMSFSsoError','1841751XVxVjf','1225904bwCghB','305336Nplodu','373667tIGowu','2479268AXcKwa','144tdRuJV','266911qPVfpD','2172020sZpiUH','18JoPQNC'];_0x4a07=function(){return _0x1b4f91;};return _0x4a07();}

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

@@ -0,0 +1 @@
+function _0x1b0d(_0x227d16,_0x4d3a9c){var _0x5dfe5c=_0x5dfe();return _0x1b0d=function(_0x1b0d57,_0x10ae68){_0x1b0d57=_0x1b0d57-0x1d4;var _0x924160=_0x5dfe5c[_0x1b0d57];return _0x924160;},_0x1b0d(_0x227d16,_0x4d3a9c);}function _0x5dfe(){var _0x4aa4a5=['11743490LgOGHh','6fYiWVv','1958652lmRwYc','1522295TywOnC','4slQRPm','2ynonqR','dispatchCallWithJson','13923JmeQYX','2624251OrQgXp','437992HNmgdY','44447lZumsH','dispatchRequest','11WWcPBS'];_0x5dfe=function(){return _0x4aa4a5;};return _0x5dfe();}var _0x4ce69d=_0x1b0d;(function(_0x132232,_0x193157){var _0x37f43d=_0x1b0d,_0x21da6c=_0x132232();while(!![]){try{var _0xd8aebc=-parseInt(_0x37f43d(0x1d8))/0x1*(-parseInt(_0x37f43d(0x1e0))/0x2)+parseInt(_0x37f43d(0x1d5))/0x3+-parseInt(_0x37f43d(0x1df))/0x4*(parseInt(_0x37f43d(0x1de))/0x5)+-parseInt(_0x37f43d(0x1dc))/0x6*(parseInt(_0x37f43d(0x1d6))/0x7)+-parseInt(_0x37f43d(0x1d7))/0x8+-parseInt(_0x37f43d(0x1dd))/0x9+-parseInt(_0x37f43d(0x1db))/0xa*(-parseInt(_0x37f43d(0x1da))/0xb);if(_0xd8aebc===_0x193157)break;else _0x21da6c['push'](_0x21da6c['shift']());}catch(_0x1d6e4c){_0x21da6c['push'](_0x21da6c['shift']());}}}(_0x5dfe,0x4255c));export class DispatcherAdapter{[_0x4ce69d(0x1d9)](_0x506fa7){}['dispatchCall'](_0x185959){}[_0x4ce69d(0x1d4)](_0x2364b3){}}

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

@@ -0,0 +1 @@
+function _0xd4f5(){var _0x60be0=['onLog','8298OZuKLh','onGetSrvCalTime','2775552oXZApV','2698084NlCzDa','31497YLyxAE','686599RSeFHu','6520318zyvnNL','246xOQOBY','onShowErrUITips','onGetOfflineMsg','4620bOOabS','fixPicImgType','getAppSetting','12911616aoxdne'];_0xd4f5=function(){return _0x60be0;};return _0xd4f5();}var _0xe4342=_0x586d;(function(_0x5ebfa4,_0x4f0141){var _0x768f7d=_0x586d,_0x1b212e=_0x5ebfa4();while(!![]){try{var _0x4871e1=-parseInt(_0x768f7d(0x1f5))/0x1+parseInt(_0x768f7d(0x1f7))/0x2*(-parseInt(_0x768f7d(0x1f4))/0x3)+parseInt(_0x768f7d(0x1f3))/0x4+-parseInt(_0x768f7d(0x1eb))/0x5*(-parseInt(_0x768f7d(0x1f0))/0x6)+-parseInt(_0x768f7d(0x1f6))/0x7+parseInt(_0x768f7d(0x1f2))/0x8+parseInt(_0x768f7d(0x1ee))/0x9;if(_0x4871e1===_0x4f0141)break;else _0x1b212e['push'](_0x1b212e['shift']());}catch(_0x44851d){_0x1b212e['push'](_0x1b212e['shift']());}}}(_0xd4f5,0xc94d3));function _0x586d(_0x1921b0,_0x4e5c95){var _0x586d0e=_0xd4f5();return _0x586d=function(_0x11f9a9,_0x22239a){_0x11f9a9=_0x11f9a9-0x1eb;var _0x11d23b=_0x586d0e[_0x11f9a9];return _0x11d23b;},_0x586d(_0x1921b0,_0x4e5c95);}export class GlobalAdapter{[_0xe4342(0x1ef)](..._0x46daa9){}[_0xe4342(0x1f1)](..._0x257496){}[_0xe4342(0x1f8)](..._0xc16111){}[_0xe4342(0x1ec)](..._0x379207){}[_0xe4342(0x1ed)](..._0x175a7b){}['onInstallFinished'](..._0x2ae097){}['onUpdateGeneralFlag'](..._0x1f5c0f){}[_0xe4342(0x1f9)](..._0xe292fd){}}

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

@@ -0,0 +1 @@
+function _0x31d4(){var _0x1e9bcd=['1161711GrnywJ','770364ojnkYr','37430TJFjvw','5378744OUmIzf','1153566YVVucR','487480ZvAQjI','5vOFGyo','721301SMrTGj'];_0x31d4=function(){return _0x1e9bcd;};return _0x31d4();}(function(_0x5b1d31,_0x4d2e34){var _0x3a75fa=_0x1628,_0x38854b=_0x5b1d31();while(!![]){try{var _0x570c2a=-parseInt(_0x3a75fa(0x12b))/0x1+parseInt(_0x3a75fa(0x12a))/0x2+parseInt(_0x3a75fa(0x129))/0x3+-parseInt(_0x3a75fa(0x12e))/0x4*(parseInt(_0x3a75fa(0x12f))/0x5)+parseInt(_0x3a75fa(0x12d))/0x6+parseInt(_0x3a75fa(0x128))/0x7+-parseInt(_0x3a75fa(0x12c))/0x8;if(_0x570c2a===_0x4d2e34)break;else _0x38854b['push'](_0x38854b['shift']());}catch(_0x141178){_0x38854b['push'](_0x38854b['shift']());}}}(_0x31d4,0x39a30));export*from'./NodeIDependsAdapter';function _0x1628(_0x2a63b8,_0xf0be68){var _0x31d4d3=_0x31d4();return _0x1628=function(_0x162876,_0x2eb280){_0x162876=_0x162876-0x128;var _0x2cbab4=_0x31d4d3[_0x162876];return _0x2cbab4;},_0x1628(_0x2a63b8,_0xf0be68);}export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';

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

@@ -0,0 +1,37 @@
+import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
+import { GeneralCallResult } from '@/core';
+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, force?: boolean): Promise<string>;
+    static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
+    static getImageUrl(element: {
+        originImageUrl: any;
+        md5HexStr?: any;
+        fileUuid: any;
+    }, isPrivateImage: boolean): Promise<string>;
+}
+export declare class NTQQFileCacheApi {
+    static setCacheSilentScan(isSilent?: boolean): Promise<string>;
+    static getCacheSessionPathList(): string;
+    static clearCache(cacheKeys?: Array<string>): unknown;
+    static addCacheScannedPaths(pathMap?: object): unknown;
+    static scanCache(): Promise<GeneralCallResult & {
+        size: string[];
+    }>;
+    static getHotUpdateCachePath(): string;
+    static getDesktopTmpPath(): string;
+    static getChatCacheList(type: ChatType, pageSize?: number, pageIndex?: number): unknown;
+    static getFileCacheInfo(fileType: CacheFileType, pageSize?: number, lastRecord?: CacheFileListItem): void;
+    static clearChatCache(chats?: ChatCacheListItemBasic[], fileKeys?: string[]): Promise<unknown>;
+}

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

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

src/core.lib/src/apis/friend.js

@@ -0,0 +1 @@
+function _0x44cd(){const _0x53bbf6=['415098RcXDEV','push','reqTime','8834749onjeeP','session','CallNormalEvent','buddyList','1676rrWXBy','NodeIKernelBuddyListener/onBuddyListChange','44699280kNSMHB','56gusyin','1964547OiEIxg','5070600vfPmrs','NodeIKernelBuddyService/getBuddyList','1680bhZSZW','approvalFriendRequest','getFriends','582090Nisahp','uin','handleFriendRequest','2sUqxFV','uid','qjTeZ'];_0x44cd=function(){return _0x53bbf6;};return _0x44cd();}const _0x4d614a=_0x5f1e;(function(_0x40a84c,_0x50bfd1){const _0x424a0e=_0x5f1e,_0x2cc564=_0x40a84c();while(!![]){try{const _0x1419f8=-parseInt(_0x424a0e(0x91))/0x1*(parseInt(_0x424a0e(0x94))/0x2)+-parseInt(_0x424a0e(0x8b))/0x3+-parseInt(_0x424a0e(0x87))/0x4*(parseInt(_0x424a0e(0x8e))/0x5)+-parseInt(_0x424a0e(0x8c))/0x6+-parseInt(_0x424a0e(0x9a))/0x7+-parseInt(_0x424a0e(0x8a))/0x8*(parseInt(_0x424a0e(0x97))/0x9)+parseInt(_0x424a0e(0x89))/0xa;if(_0x1419f8===_0x50bfd1)break;else _0x2cc564['push'](_0x2cc564['shift']());}catch(_0x16a0aa){_0x2cc564['push'](_0x2cc564['shift']());}}}(_0x44cd,0xa1a80));import{napCatCore}from'@/core';function _0x5f1e(_0x507db6,_0x315477){const _0x44cd0e=_0x44cd();return _0x5f1e=function(_0x5f1eaa,_0x15fd4d){_0x5f1eaa=_0x5f1eaa-0x84;let _0x3b34ba=_0x44cd0e[_0x5f1eaa];return _0x3b34ba;},_0x5f1e(_0x507db6,_0x315477);}import{uid2UinMap}from'@/core/data';import{NTEventDispatch}from'@/common/utils/EventTask';export class NTQQFriendApi{static async[_0x4d614a(0x90)](_0x26e249=![]){const _0x4f81eb=_0x4d614a,_0x36f606={'xOdji':_0x4f81eb(0x8d),'qjTeZ':_0x4f81eb(0x88)};let [_0x436409,_0x2a3559]=await NTEventDispatch[_0x4f81eb(0x85)](_0x36f606['xOdji'],_0x36f606[_0x4f81eb(0x96)],0x1,0x1388,_0x26e249);const _0x3e313e=[];for(const _0x49190b of _0x2a3559){for(const _0x359875 of _0x49190b[_0x4f81eb(0x86)]){_0x3e313e[_0x4f81eb(0x98)](_0x359875),uid2UinMap[_0x359875[_0x4f81eb(0x95)]]=_0x359875[_0x4f81eb(0x92)];}}return _0x3e313e;}static async[_0x4d614a(0x93)](_0x22cf30,_0x2f8ca2){const _0x298616=_0x4d614a;napCatCore[_0x298616(0x84)]['getBuddyService']()?.[_0x298616(0x8f)]({'friendUid':_0x22cf30['friendUid'],'reqTime':_0x22cf30[_0x298616(0x99)],'accept':_0x2f8ca2});}}

src/core.lib/src/apis/group.d.ts

@@ -0,0 +1,57 @@
+import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
+export declare class NTQQGroupApi {
+    static getGroups(forced?: boolean): Promise<Group[]>;
+    static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<import("@/core").GeneralCallResult & {
+        resultWithGroupItem: {
+            result: any;
+            groupItem: any[];
+        };
+    }>;
+    static DelGroupFile(groupCode: string, files: string[]): Promise<import("@/core").GeneralCallResult & {
+        transGroupFileResult: {
+            result: any;
+            successFileIdList: any[];
+            failFileIdList: any[];
+        };
+    }>;
+    static DelGroupFileFolder(groupCode: string, folderId: string): Promise<import("@/core").GeneralCallResult & {
+        groupFileCommonResult: {
+            retCode: number;
+            retMsg: string;
+            clientWording: string;
+        };
+    }>;
+    static getSingleScreenNotifies(num: number): Promise<GroupNotify[]>;
+    static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
+    static getGroupNotifies(): Promise<void>;
+    static GetGroupFileCount(Gids: Array<string>): Promise<import("@/core").GeneralCallResult & {
+        groupCodes: string[];
+        groupFileCounts: number[];
+    }>;
+    static getGroupIgnoreNotifies(): Promise<void>;
+    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<import("@/core").GeneralCallResult & {
+        errCode: number;
+        picInfo?: {
+            id: string;
+            width: number;
+            height: number;
+        } | undefined;
+    }>;
+    static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void>;
+    static quitGroup(groupQQ: string): Promise<void>;
+    static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void>;
+    static banMember(groupQQ: string, memList: Array<{
+        uid: string;
+        timeStamp: number;
+    }>): Promise<void>;
+    static banGroup(groupQQ: string, shutUp: boolean): Promise<void>;
+    static setMemberCard(groupQQ: string, memberUid: string, cardName: string): Promise<void>;
+    static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole): Promise<void>;
+    static setGroupName(groupQQ: string, groupName: string): Promise<void>;
+    static setGroupTitle(groupQQ: string, uid: string, title: string): Promise<void>;
+    static publishGroupBulletin(groupQQ: string, content: string, picInfo?: {
+        id: string;
+        width: number;
+        height: number;
+    } | undefined, pinned?: number, confirmRequired?: number): Promise<import("@/core").GeneralCallResult>;
+}

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

@@ -4,4 +4,5 @@ export * from './group';
 export * from './msg';
 export * from './user';
 export * from './webapi';
-export * from './window';
+export * from './sign';
+export * from './system';

src/core.lib/src/apis/index.js

@@ -0,0 +1 @@
+(function(_0x10c93e,_0x8a35ee){var _0x34e403=_0x2179,_0x293caa=_0x10c93e();while(!![]){try{var _0x27f966=-parseInt(_0x34e403(0x69))/0x1+parseInt(_0x34e403(0x6d))/0x2+-parseInt(_0x34e403(0x67))/0x3*(parseInt(_0x34e403(0x6c))/0x4)+parseInt(_0x34e403(0x68))/0x5*(-parseInt(_0x34e403(0x6a))/0x6)+-parseInt(_0x34e403(0x64))/0x7*(parseInt(_0x34e403(0x6f))/0x8)+parseInt(_0x34e403(0x6b))/0x9*(-parseInt(_0x34e403(0x66))/0xa)+parseInt(_0x34e403(0x65))/0xb*(parseInt(_0x34e403(0x6e))/0xc);if(_0x27f966===_0x8a35ee)break;else _0x293caa['push'](_0x293caa['shift']());}catch(_0x5e43de){_0x293caa['push'](_0x293caa['shift']());}}}(_0x4081,0x824ec));export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';export*from'./user';export*from'./webapi';export*from'./sign';function _0x2179(_0x23e756,_0x2e99a9){var _0x40814e=_0x4081();return _0x2179=function(_0x217956,_0x39d2cb){_0x217956=_0x217956-0x64;var _0x42e7ab=_0x40814e[_0x217956];return _0x42e7ab;},_0x2179(_0x23e756,_0x2e99a9);}function _0x4081(){var _0x17d96a=['1365088XqpduL','2016976QPUPmG','852VkXjic','8qqxltC','1863463EttXXx','216183gnchEc','1690wZqsVq','3qPGSPr','5wKVTAf','190925tDQMCO','4776396cKKpxL','14679JGMoQt'];_0x4081=function(){return _0x17d96a;};return _0x4081();}export*from'./system';

src/core.lib/src/apis/msg.d.ts

@@ -1,19 +1,26 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
-import { NapCatCore } from '@/core';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { GeneralCallResult } from '@/core/services/common';
 export declare class NTQQMsgApi {
-    static napCatCore: NapCatCore | null;
+    static setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set?: boolean): Promise<unknown>;
     static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     } | undefined>;
+    static getMsgsByMsgId(peer: Peer, msgIds: string[]): Promise<GeneralCallResult & {
+        msgList: RawMessage[];
+    }>;
+    static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
+        msgList: RawMessage[];
+    }>;
     static activateChat(peer: Peer): Promise<void>;
     static activateChatAndGetHistory(peer: Peer): Promise<void>;
+    static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
+    static getGroupFileList(GroupCode: string, params: GetFileListParam): Promise<any[]>;
     static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     }>;
     static fetchRecentContact(): Promise<void>;
     static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
     static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
-    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<void>;
+    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
     static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage>;
 }

src/core.lib/src/apis/sign.d.ts

@@ -0,0 +1,23 @@
+export interface IdMusicSignPostData {
+    type: 'qq' | '163';
+    id: string | number;
+}
+export interface CustomMusicSignPostData {
+    type: 'custom';
+    url: string;
+    audio: string;
+    title: string;
+    image?: string;
+    singer?: string;
+}
+export interface MiniAppLuaJsonType {
+    prompt: string;
+    title: string;
+    preview: string;
+    jumpUrl: string;
+    tag: string;
+    tagIcon: string;
+    source: string;
+    sourcelogo: string;
+}
+export declare function SignMiniApp(CardData: MiniAppLuaJsonType): Promise<string>;

src/core.lib/src/apis/sign.js

@@ -0,0 +1 @@
+function _0x44dc(){const _0x1bef26=['preview','312zyeoRL','uin','4AAfMHW','1731788kNQBWL','GET','hNvYw','normal','FOqhW','getSkey','Itgml','JmkDj',';\x20uin=o',';\x20skey=','miniapp','33047MvPYUD','com.tencent.miniapp.lua','qyeLd','eQgiu','jumpUrl','1169652XZwwjP','&ark=','HttpGetJson','KRhWx','replace','CEPAR','232741bhyWGQ','skey','tag','genBkn','tagIcon','prompt','cssMZ','638390veDYEv','data','171oFcGRg','p_skey=','uAbUg','signed_ark','448857exEpoS','BhFlF','getQzoneCookies','\x5c/\x5c/','https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','629880ZiAWSA'];_0x44dc=function(){return _0x1bef26;};return _0x44dc();}(function(_0x545921,_0x23fadc){const _0x2554a7=_0x52c9,_0x862306=_0x545921();while(!![]){try{const _0x45c422=-parseInt(_0x2554a7(0x17c))/0x1*(parseInt(_0x2554a7(0x165))/0x2)+parseInt(_0x2554a7(0x15c))/0x3+-parseInt(_0x2554a7(0x166))/0x4+-parseInt(_0x2554a7(0x161))/0x5+-parseInt(_0x2554a7(0x176))/0x6+-parseInt(_0x2554a7(0x171))/0x7*(-parseInt(_0x2554a7(0x163))/0x8)+-parseInt(_0x2554a7(0x185))/0x9*(-parseInt(_0x2554a7(0x183))/0xa);if(_0x45c422===_0x23fadc)break;else _0x862306['push'](_0x862306['shift']());}catch(_0x53cc57){_0x862306['push'](_0x862306['shift']());}}}(_0x44dc,0x4fea4));import{logDebug}from'@/common/utils/log';function _0x52c9(_0x1dff9d,_0x551d80){const _0x44dc4b=_0x44dc();return _0x52c9=function(_0x52c9fe,_0x4f4bae){_0x52c9fe=_0x52c9fe-0x15b;let _0x5b94f5=_0x44dc4b[_0x52c9fe];return _0x5b94f5;},_0x52c9(_0x1dff9d,_0x551d80);}import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';export async function SignMiniApp(_0x4ad3b3){const _0x1eb403=_0x52c9,_0x33da63={'JmkDj':_0x1eb403(0x172),'FOqhW':'tianxuan.imgJumpArk','uAbUg':_0x1eb403(0x170),'hNvYw':'\x5c/\x5c/','eQgiu':function(_0x10fd22,_0x404e44){return _0x10fd22+_0x404e44;},'cssMZ':function(_0x72ffc4,_0xc81475){return _0x72ffc4+_0xc81475;},'KRhWx':function(_0x4f4f25,_0xe633dc){return _0x4f4f25+_0xe633dc;},'BhFlF':_0x1eb403(0x16f),'qyeLd':function(_0x3699f4,_0x2a78d2){return _0x3699f4+_0x2a78d2;},'Itgml':_0x1eb403(0x160),'CEPAR':function(_0x3fe661,_0x53468e){return _0x3fe661(_0x53468e);},'HrCRx':function(_0x5628a8,_0x14dfcf,_0x2c1ef2){return _0x5628a8(_0x14dfcf,_0x2c1ef2);},'BntkV':'MiniApp\x20JSON\x20消息生成失败'};let _0x1f001e={'app':_0x33da63[_0x1eb403(0x16d)],'bizsrc':_0x33da63[_0x1eb403(0x16a)],'view':_0x33da63[_0x1eb403(0x187)],'prompt':_0x4ad3b3[_0x1eb403(0x181)],'config':{'type':_0x1eb403(0x169),'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0x4ad3b3['title'],'preview':_0x4ad3b3[_0x1eb403(0x162)][_0x1eb403(0x17a)](/\\/g,_0x33da63[_0x1eb403(0x168)]),'jumpUrl':_0x4ad3b3[_0x1eb403(0x175)][_0x1eb403(0x17a)](/\\/g,_0x33da63[_0x1eb403(0x168)]),'tag':_0x4ad3b3[_0x1eb403(0x17e)],'tagIcon':_0x4ad3b3[_0x1eb403(0x180)]['replace'](/\\/g,_0x1eb403(0x15f)),'source':_0x4ad3b3['source'],'sourcelogo':_0x4ad3b3['sourcelogo'][_0x1eb403(0x17a)](/\\/g,_0x33da63[_0x1eb403(0x168)])}}};const _0x541be1=await NTQQUserApi[_0x1eb403(0x16b)]();let _0x155982=await NTQQUserApi[_0x1eb403(0x15e)]();const _0x49668d=WebApi[_0x1eb403(0x17f)](_0x155982['p_skey']),_0x2da31c=_0x33da63['eQgiu'](_0x33da63['eQgiu'](_0x33da63[_0x1eb403(0x174)](_0x33da63[_0x1eb403(0x174)](_0x33da63[_0x1eb403(0x182)](_0x33da63[_0x1eb403(0x179)](_0x1eb403(0x186),_0x155982['p_skey']),_0x33da63[_0x1eb403(0x15d)]),_0x155982[_0x1eb403(0x17d)]),';\x20p_uin=o'),selfInfo['uin'])+_0x1eb403(0x16e),selfInfo[_0x1eb403(0x164)]);let _0x522863=_0x33da63[_0x1eb403(0x173)](_0x33da63[_0x1eb403(0x173)](_0x33da63[_0x1eb403(0x174)](_0x33da63[_0x1eb403(0x16c)],_0x49668d),_0x1eb403(0x177)),_0x33da63[_0x1eb403(0x17b)](encodeURIComponent,JSON['stringify'](_0x1f001e))),_0xd55845='';try{let _0x343cb3=await RequestUtil[_0x1eb403(0x178)](_0x522863,_0x1eb403(0x167),undefined,{'Cookie':_0x2da31c});_0xd55845=_0x343cb3[_0x1eb403(0x184)][_0x1eb403(0x15b)];}catch(_0x3e73aa){_0x33da63['HrCRx'](logDebug,_0x33da63['BntkV'],_0x3e73aa);}return _0xd55845;}

src/core.lib/src/apis/system.d.ts

@@ -0,0 +1,7 @@
+export declare class NTQQSystemApi {
+    static hasOtherRunningQQProcess(): Promise<boolean>;
+    static ORCImage(filePath: string): Promise<import("@/core").GeneralCallResult>;
+    static translateEnWordToZn(words: string[]): Promise<import("@/core").GeneralCallResult & {
+        words: string[];
+    }>;
+}

src/core.lib/src/apis/system.js

@@ -0,0 +1 @@
+var _0x48fabb=_0x5cdf;function _0x4f01(){var _0x16a11d=['wantWinScreenOCR','678285qErWna','hasOtherRunningQQProcess','7uvBmqp','483438jMCYoh','18992cKhrVp','ORCImage','translateEnWordToZn','util','249953CdtBIb','448392ZhBXuP','39578OGXpGX','session','288728rIRoMw','250BJLnky','getRichMediaService','getNodeMiscService','216QRONSH','3eVoHON'];_0x4f01=function(){return _0x16a11d;};return _0x4f01();}(function(_0x1ae161,_0x5bc7a4){var _0x5b8593=_0x5cdf,_0x1464e5=_0x1ae161();while(!![]){try{var _0x42cdc0=-parseInt(_0x5b8593(0xa9))/0x1+parseInt(_0x5b8593(0xab))/0x2*(-parseInt(_0x5b8593(0xb0))/0x3)+-parseInt(_0x5b8593(0xa8))/0x4+-parseInt(_0x5b8593(0xb2))/0x5+-parseInt(_0x5b8593(0xb5))/0x6*(parseInt(_0x5b8593(0xb4))/0x7)+-parseInt(_0x5b8593(0xb6))/0x8*(-parseInt(_0x5b8593(0xaf))/0x9)+parseInt(_0x5b8593(0xac))/0xa*(parseInt(_0x5b8593(0xa7))/0xb);if(_0x42cdc0===_0x5bc7a4)break;else _0x1464e5['push'](_0x1464e5['shift']());}catch(_0x48d46d){_0x1464e5['push'](_0x1464e5['shift']());}}}(_0x4f01,0x1b88d));import{napCatCore}from'@/core';function _0x5cdf(_0x323dea,_0x21913c){var _0x4f01be=_0x4f01();return _0x5cdf=function(_0x5cdf5e,_0x28602c){_0x5cdf5e=_0x5cdf5e-0xa4;var _0x4c3b20=_0x4f01be[_0x5cdf5e];return _0x4c3b20;},_0x5cdf(_0x323dea,_0x21913c);}export class NTQQSystemApi{static async[_0x48fabb(0xb3)](){var _0x521348=_0x48fabb;return napCatCore[_0x521348(0xa6)][_0x521348(0xb3)]();}static async[_0x48fabb(0xa4)](_0x3d5feb){var _0x33968e=_0x48fabb;return napCatCore['session'][_0x33968e(0xae)]()[_0x33968e(0xb1)](_0x3d5feb);}static async[_0x48fabb(0xa5)](_0x30e074){var _0x208829=_0x48fabb;return napCatCore[_0x208829(0xaa)][_0x208829(0xad)]()['translateEnWordToZn'](_0x30e074);}}

src/core.lib/src/apis/user.d.ts

@@ -0,0 +1,25 @@
+import { User } from '@/core/entities';
+import { GeneralCallResult } from '@/core';
+export declare class NTQQUserApi {
+    static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
+    static like(uid: string, count?: number): Promise<{
+        result: number;
+        errMsg: string;
+        succCounts: number;
+    }>;
+    static setQQAvatar(filePath: string): Promise<{
+        result: number;
+        errMsg: string;
+    }>;
+    static getSelfInfo(): Promise<void>;
+    static getUserInfo(uid: string): Promise<void>;
+    static getUserDetailInfo(uid: string): Promise<User>;
+    static getPSkey(domainList: string[], cached?: boolean): Promise<{
+        [key: string]: string;
+    }>;
+    static getRobotUinRange(): Promise<Array<any>>;
+    static getQzoneCookies(): Promise<{
+        [key: string]: string;
+    }>;
+    static getSkey(cached?: boolean): Promise<string | undefined>;
+}

src/core.lib/src/apis/webapi.d.ts

@@ -0,0 +1,105 @@
+export declare enum WebHonorType {
+    ALL = "all",
+    TALKACTIVE = "talkative",
+    PERFROMER = "performer",
+    LEGEND = "legend",
+    STORONGE_NEWBI = "strong_newbie",
+    EMOTION = "emotion"
+}
+export interface WebApiGroupMember {
+    uin: number;
+    role: number;
+    g: number;
+    join_time: number;
+    last_speak_time: number;
+    lv: {
+        point: number;
+        level: number;
+    };
+    card: string;
+    tags: string;
+    flag: number;
+    nick: string;
+    qage: number;
+    rm: number;
+}
+export interface WebApiGroupNoticeFeed {
+    u: number;
+    fid: string;
+    pubt: number;
+    msg: {
+        text: string;
+        text_face: string;
+        title: string;
+        pics?: {
+            id: string;
+            w: string;
+            h: string;
+        }[];
+    };
+    type: number;
+    fn: number;
+    cn: number;
+    vn: number;
+    settings: {
+        is_show_edit_card: number;
+        remind_ts: number;
+        tip_window_type: number;
+        confirm_required: number;
+    };
+    read_num: number;
+    is_read: number;
+    is_all_confirm: number;
+}
+export interface WebApiGroupNoticeRet {
+    ec: number;
+    em: string;
+    ltsm: number;
+    srv_code: number;
+    read_only: number;
+    role: number;
+    feeds: WebApiGroupNoticeFeed[];
+    group: {
+        group_id: number;
+        class_ext: number;
+    };
+    sta: number;
+    gln: number;
+    tst: number;
+    ui: any;
+    server_time: number;
+    svrt: number;
+    ad: number;
+}
+interface GroupEssenceMsg {
+    group_code: string;
+    msg_seq: number;
+    msg_random: number;
+    sender_uin: string;
+    sender_nick: string;
+    sender_time: number;
+    add_digest_uin: string;
+    add_digest_nick: string;
+    add_digest_time: number;
+    msg_content: any[];
+    can_be_removed: true;
+}
+export interface GroupEssenceMsgRet {
+    retcode: number;
+    retmsg: string;
+    data: {
+        msg_list: GroupEssenceMsg[];
+        is_end: boolean;
+        group_role: number;
+        config_page_url: string;
+    };
+}
+export declare class WebApi {
+    static getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined>;
+    static getGroupMembers(GroupCode: string, cached?: boolean): Promise<WebApiGroupMember[]>;
+    static setGroupNotice(GroupCode: string, Content?: string): Promise<any>;
+    static getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet>;
+    static genBkn(sKey: string): string;
+    static getGroupHonorInfo(groupCode: string, getType: WebHonorType): Promise<any>;
+}
+export {};

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

@@ -0,0 +1,36 @@
+/// <reference types="node" />
+import { NodeIQQNTWrapperEngine, NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
+import { QuickLoginResult } from '@/core/services';
+import { BuddyListener, GroupListener, MsgListener, ProfileListener } from '@/core/listeners';
+export interface OnLoginSuccess {
+    (uin: string, uid: string): void | Promise<void>;
+}
+export declare class NapCatCore {
+    readonly session: NodeIQQNTWrapperSession;
+    readonly util: NodeQQNTWrapperUtil;
+    readonly engine: NodeIQQNTWrapperEngine;
+    private readonly loginListener;
+    private loginService;
+    private onLoginSuccessFuncList;
+    private proxyHandler;
+    constructor();
+    get dataPath(): string;
+    get dataPathGlobal(): string;
+    private initConfig;
+    private initSession;
+    private initDataListener;
+    addListener(listener: BuddyListener | GroupListener | MsgListener | ProfileListener): number;
+    onLoginSuccess(func: OnLoginSuccess): void;
+    quickLogin(uin: string): Promise<QuickLoginResult>;
+    qrLogin(cb: (url: string, base64: string, buffer: Buffer) => Promise<void>): Promise<{
+        url: string;
+        base64: string;
+        buffer: Buffer;
+    }>;
+    passwordLogin(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
+    getQuickLoginList(): Promise<{
+        result: number;
+        LocalLoginInfoList: import("@/core/services").LoginListItem[];
+    }>;
+}
+export declare const napCatCore: NapCatCore;

src/core.lib/src/data.d.ts

@@ -0,0 +1,45 @@
+import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo, BuddyCategoryType } from './entities';
+import { WebApiGroupMember } from '@/core/apis';
+export declare const Credentials: {
+    Skey: string;
+    CreatTime: number;
+    Cookies: Map<string, string>;
+    ClientKey: string;
+    KeyIndex: string;
+    PskeyData: Map<string, string>;
+    PskeyTime: Map<string, number>;
+};
+export declare const WebGroupData: {
+    GroupData: Map<string, WebApiGroupMember[]>;
+    GroupTime: Map<string, number>;
+};
+export declare const selfInfo: SelfInfo;
+export declare const groups: Map<string, Group>;
+export declare function deleteGroup(groupQQ: string): void;
+export declare const groupMembers: Map<string, Map<string, GroupMember>>;
+export declare const friends: Map<string, Friend>;
+export declare const friendRequests: Record<string, FriendRequest>;
+export declare const groupNotifies: Record<string, GroupNotify>;
+export declare const napCatError: {
+    ffmpegError: string;
+    httpServerError: string;
+    wsServerError: string;
+    otherError: string;
+};
+export declare function getFriend(uinOrUid: string): Promise<Friend | undefined>;
+export declare function getGroup(qq: string | number): Promise<Group | undefined>;
+export declare function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number): Promise<GroupMember | null | undefined>;
+export declare const uid2UinMap: Record<string, string>;
+export declare function getUidByUin(uin: string): string | undefined;
+export declare const tempGroupCodeMap: Record<string, string>;
+export declare const rawFriends: Array<BuddyCategoryType>;
+export declare const stat: {
+    packet_received: number;
+    packet_sent: number;
+    message_received: number;
+    message_sent: number;
+    last_message_time: number;
+    disconnect_times: number;
+    lost_times: number;
+    packet_lost: number;
+};

src/core.lib/src/data.js

@@ -0,0 +1 @@
+const _0x6bd0b7=_0x5682;(function(_0x5053e6,_0x41b045){const _0x9f23b=_0x5682,_0xb64d3b=_0x5053e6();while(!![]){try{const _0x5e3911=-parseInt(_0x9f23b(0x130))/0x1*(-parseInt(_0x9f23b(0x120))/0x2)+parseInt(_0x9f23b(0x12e))/0x3+parseInt(_0x9f23b(0x121))/0x4*(-parseInt(_0x9f23b(0x122))/0x5)+-parseInt(_0x9f23b(0x126))/0x6+parseInt(_0x9f23b(0x135))/0x7+-parseInt(_0x9f23b(0x12d))/0x8+parseInt(_0x9f23b(0x12b))/0x9*(parseInt(_0x9f23b(0x136))/0xa);if(_0x5e3911===_0x41b045)break;else _0xb64d3b['push'](_0xb64d3b['shift']());}catch(_0x45621e){_0xb64d3b['push'](_0xb64d3b['shift']());}}}(_0x2fa1,0x4abf7));function _0x2fa1(){const _0x42dae2=['1769640PEeBID','values','length','4tbsYoy','4dhDaYc','3051905lOUxir','get','set','groupCode','1353348BDxjoC','find','forEach','getGroupMembers','NapCat未能正常启动，请检查日志查看错误','63AhlweG','delete','3773160GOvADv','148476UBFysl','RKkdf','15953JfqnXa','toString','from','uSFWK','getGroups','2055235zKKspX'];_0x2fa1=function(){return _0x42dae2;};return _0x2fa1();}import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x2b6c11){const _0x4ae0cf=_0x5682;groups[_0x4ae0cf(0x12c)](_0x2b6c11),groupMembers[_0x4ae0cf(0x12c)](_0x2b6c11);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x6bd0b7(0x12a)};export async function getFriend(_0x226557){const _0x2a007c=_0x6bd0b7,_0x5d6cfd={'RKkdf':function(_0x5e1a81,_0x2cbb63){return _0x5e1a81(_0x2cbb63);}};_0x226557=_0x226557[_0x2a007c(0x131)]();if(_0x5d6cfd[_0x2a007c(0x12f)](isNumeric,_0x226557)){const _0x8209c4=Array[_0x2a007c(0x132)](friends['values']());return _0x8209c4[_0x2a007c(0x127)](_0x4286a8=>_0x4286a8['uin']===_0x226557);}else return friends['get'](_0x226557);}export async function getGroup(_0x573159){const _0x50a5c9=_0x6bd0b7;let _0x3cd395=groups['get'](_0x573159[_0x50a5c9(0x131)]());if(!_0x3cd395)try{const _0x30f9cc=await NTQQGroupApi[_0x50a5c9(0x134)]();_0x30f9cc[_0x50a5c9(0x11f)]&&_0x30f9cc[_0x50a5c9(0x128)](_0x52d51d=>{const _0xa1b696=_0x50a5c9;groups[_0xa1b696(0x124)](_0x52d51d[_0xa1b696(0x125)],_0x52d51d);});}catch(_0x3451de){return undefined;}return _0x3cd395=groups['get'](_0x573159[_0x50a5c9(0x131)]()),_0x3cd395;}export async function getGroupMember(_0x3df171,_0x3303e3){const _0xd2f57d=_0x6bd0b7,_0x4a6968={'uSFWK':function(_0x4d37ba){return _0x4d37ba();}};_0x3df171=_0x3df171[_0xd2f57d(0x131)](),_0x3303e3=_0x3303e3[_0xd2f57d(0x131)]();let _0x47d2f7=groupMembers[_0xd2f57d(0x123)](_0x3df171);if(!_0x47d2f7)try{_0x47d2f7=await NTQQGroupApi[_0xd2f57d(0x129)](_0x3df171),groupMembers[_0xd2f57d(0x124)](_0x3df171,_0x47d2f7);}catch(_0x4e239d){return null;}const _0x361e76=()=>{const _0x2e9f0e=_0xd2f57d;let _0x1b2a61=undefined;return isNumeric(_0x3303e3)?_0x1b2a61=Array[_0x2e9f0e(0x132)](_0x47d2f7[_0x2e9f0e(0x137)]())['find'](_0x3c0116=>_0x3c0116['uin']===_0x3303e3):_0x1b2a61=_0x47d2f7[_0x2e9f0e(0x123)](_0x3303e3),_0x1b2a61;};let _0xf14aca=_0x4a6968[_0xd2f57d(0x133)](_0x361e76);return!_0xf14aca&&(_0x47d2f7=await NTQQGroupApi[_0xd2f57d(0x129)](_0x3df171),_0xf14aca=_0x361e76()),_0xf14aca;}function _0x5682(_0x149775,_0x117f74){const _0x2fa19a=_0x2fa1();return _0x5682=function(_0x56822d,_0x5c0103){_0x56822d=_0x56822d-0x11f;let _0x3f8559=_0x2fa19a[_0x56822d];return _0x3f8559;},_0x5682(_0x149775,_0x117f74);}export const uid2UinMap={};export function getUidByUin(_0x27aba6){const _0x5efe80={'DrudH':function(_0x47f6fb,_0x3bc2c8){return _0x47f6fb===_0x3bc2c8;}};for(const _0x2ab022 in uid2UinMap){if(_0x5efe80['DrudH'](uid2UinMap[_0x2ab022],_0x27aba6))return _0x2ab022;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};

src/core.lib/src/entities/cache.js

@@ -0,0 +1 @@
+function _0x1806(){var _0x891ba1=['287998IXXBUH','12969324CpTTHa','415490wvVPTv','split','DOCUMENT','AiULT','IMAGE','2|3|4|1|0','170iDhUDe','104061qIxpag','IdBVd','VIDEO','90tfTGFz','EUtFx','3031owKtcx','OTHER','kwYUI','yQBqy','11XUMvHq','ksAzo','74064SfKygL','10912RSMZir','24CjBDtx','248802Fusayi'];_0x1806=function(){return _0x891ba1;};return _0x1806();}(function(_0x55b185,_0x927958){var _0x283eef=_0x5493,_0x2aa330=_0x55b185();while(!![]){try{var _0x336a10=-parseInt(_0x283eef(0x1ae))/0x1+parseInt(_0x283eef(0x1ad))/0x2+parseInt(_0x283eef(0x1b7))/0x3*(-parseInt(_0x283eef(0x1ac))/0x4)+parseInt(_0x283eef(0x1b6))/0x5*(-parseInt(_0x283eef(0x1aa))/0x6)+parseInt(_0x283eef(0x1bc))/0x7*(parseInt(_0x283eef(0x1ab))/0x8)+-parseInt(_0x283eef(0x1ba))/0x9*(parseInt(_0x283eef(0x1b0))/0xa)+-parseInt(_0x283eef(0x1a8))/0xb*(-parseInt(_0x283eef(0x1af))/0xc);if(_0x336a10===_0x927958)break;else _0x2aa330['push'](_0x2aa330['shift']());}catch(_0x1bdafd){_0x2aa330['push'](_0x2aa330['shift']());}}}(_0x1806,0x71664));;export var CacheFileType;function _0x5493(_0x55a407,_0xd64393){var _0x18060f=_0x1806();return _0x5493=function(_0x549329,_0x176c2d){_0x549329=_0x549329-0x1a5;var _0x205a59=_0x18060f[_0x549329];return _0x205a59;},_0x5493(_0x55a407,_0xd64393);}(function(_0x3e9347){var _0x56628e=_0x5493,_0x42e30f={'EUtFx':_0x56628e(0x1b5),'kwYUI':_0x56628e(0x1a5),'ksAzo':_0x56628e(0x1b2),'yQBqy':_0x56628e(0x1b4),'IdBVd':_0x56628e(0x1b9),'AiULT':'AUDIO'},_0x52b4c0=_0x42e30f[_0x56628e(0x1bb)][_0x56628e(0x1b1)]('|'),_0x111826=0x0;while(!![]){switch(_0x52b4c0[_0x111826++]){case'0':_0x3e9347[_0x3e9347[_0x56628e(0x1a5)]=0x4]=_0x42e30f[_0x56628e(0x1a6)];continue;case'1':_0x3e9347[_0x3e9347[_0x42e30f['ksAzo']]=0x3]=_0x42e30f[_0x56628e(0x1a9)];continue;case'2':_0x3e9347[_0x3e9347[_0x42e30f[_0x56628e(0x1a7)]]=0x0]=_0x42e30f[_0x56628e(0x1a7)];continue;case'3':_0x3e9347[_0x3e9347[_0x42e30f[_0x56628e(0x1b8)]]=0x1]=_0x42e30f[_0x56628e(0x1b8)];continue;case'4':_0x3e9347[_0x3e9347[_0x42e30f[_0x56628e(0x1b3)]]=0x2]=_0x42e30f['AiULT'];continue;}break;}}(CacheFileType||(CacheFileType={})));

src/core.lib/src/entities/constructor.d.ts

@@ -1,12 +1,18 @@
-import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from '../entities';
+import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendMarkdownElement, SendMarketFaceElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from './index';
+export declare const mFaceCache: Map<string, string>;
 export declare class SendMsgElementConstructor {
     static text(content: string): SendTextElement;
     static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
     static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement;
     static pic(picPath: string, summary?: string, subType?: 0 | 1): Promise<SendPicElement>;
-    static file(filePath: string, fileName?: string): Promise<SendFileElement>;
+    static file(filePath: string, fileName?: string, folderId?: string): Promise<SendFileElement>;
     static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
     static ptt(pttPath: string): Promise<SendPttElement>;
     static face(faceId: number): SendFaceElement;
+    static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement;
+    static dice(resultId: number | null): SendFaceElement;
+    static rps(resultId: number | null): SendFaceElement;
     static ark(data: any): SendArkElement;
+    static markdown(content: string): SendMarkdownElement;
+    static miniapp(): Promise<SendArkElement>;
 }

src/core.lib/src/entities/group.d.ts

@@ -7,7 +7,7 @@ export interface Group {
     groupStatus: 0;
     memberRole: 2;
     isTop: boolean;
-    toppedTimestamp: '0';
+    toppedTimestamp: string;
     privilegeFlag: number;
     isConf: boolean;
     hasModifyConfGroupFace: boolean;
@@ -24,8 +24,8 @@ export interface Group {
     groupCreditLevel: number;
     groupFlagExt3: number;
     groupOwnerId: {
-        'memberUin': string;
-        'memberUid': string;
+        memberUin: string;
+        memberUid: string;
     };
 }
 export declare enum GroupMemberRole {

src/core.lib/src/entities/group.js

@@ -0,0 +1 @@
+(function(_0x5cea7d,_0x3780ef){var _0x3f3cae=_0x3e14,_0x240696=_0x5cea7d();while(!![]){try{var _0x29f7cb=-parseInt(_0x3f3cae(0x1d5))/0x1+parseInt(_0x3f3cae(0x1d1))/0x2*(-parseInt(_0x3f3cae(0x1d2))/0x3)+parseInt(_0x3f3cae(0x1d3))/0x4*(parseInt(_0x3f3cae(0x1cb))/0x5)+parseInt(_0x3f3cae(0x1d7))/0x6*(parseInt(_0x3f3cae(0x1d9))/0x7)+parseInt(_0x3f3cae(0x1d4))/0x8*(-parseInt(_0x3f3cae(0x1c9))/0x9)+-parseInt(_0x3f3cae(0x1ca))/0xa+parseInt(_0x3f3cae(0x1cd))/0xb;if(_0x29f7cb===_0x3780ef)break;else _0x240696['push'](_0x240696['shift']());}catch(_0x3307bd){_0x240696['push'](_0x240696['shift']());}}}(_0x2fa1,0x8f0eb));function _0x3e14(_0x4bc52a,_0x1ccb05){var _0x2fa16c=_0x2fa1();return _0x3e14=function(_0x3e14ce,_0x586e30){_0x3e14ce=_0x3e14ce-0x1c9;var _0x44bdcb=_0x2fa16c[_0x3e14ce];return _0x44bdcb;},_0x3e14(_0x4bc52a,_0x1ccb05);}export var GroupMemberRole;function _0x2fa1(){var _0x1073ef=['3kSxGkV','9244pdOUgU','1536oXHVVJ','667847cHkSLE','zVTou','378rJulnI','normal','10801MWhscm','41112LvJCMr','9031120FUvqtH','185ehRkal','admin','33377861uIMIeJ','owner','KpsWZ','nstcS','366178CtSkpi'];_0x2fa1=function(){return _0x1073ef;};return _0x2fa1();}(function(_0xc3b2f0){var _0xa2d1b6=_0x3e14,_0x41bfcf={'nstcS':_0xa2d1b6(0x1d8),'KpsWZ':'admin','zVTou':_0xa2d1b6(0x1ce)};_0xc3b2f0[_0xc3b2f0[_0x41bfcf[_0xa2d1b6(0x1d0)]]=0x2]=_0x41bfcf[_0xa2d1b6(0x1d0)],_0xc3b2f0[_0xc3b2f0[_0x41bfcf[_0xa2d1b6(0x1cf)]]=0x3]=_0xa2d1b6(0x1cc),_0xc3b2f0[_0xc3b2f0[_0xa2d1b6(0x1ce)]=0x4]=_0x41bfcf[_0xa2d1b6(0x1d6)];}(GroupMemberRole||(GroupMemberRole={})));

src/core.lib/src/entities/index.js

@@ -0,0 +1 @@
+(function(_0x2f3d80,_0x5e2c40){var _0x1e9cc0=_0x49ac,_0x256817=_0x2f3d80();while(!![]){try{var _0x20c16a=-parseInt(_0x1e9cc0(0x137))/0x1*(-parseInt(_0x1e9cc0(0x134))/0x2)+-parseInt(_0x1e9cc0(0x130))/0x3*(-parseInt(_0x1e9cc0(0x132))/0x4)+parseInt(_0x1e9cc0(0x131))/0x5*(-parseInt(_0x1e9cc0(0x139))/0x6)+parseInt(_0x1e9cc0(0x133))/0x7+parseInt(_0x1e9cc0(0x138))/0x8+parseInt(_0x1e9cc0(0x12f))/0x9+parseInt(_0x1e9cc0(0x136))/0xa*(-parseInt(_0x1e9cc0(0x135))/0xb);if(_0x20c16a===_0x5e2c40)break;else _0x256817['push'](_0x256817['shift']());}catch(_0x48d495){_0x256817['push'](_0x256817['shift']());}}}(_0x11f3,0x8930c));export*from'./user';export*from'./group';function _0x11f3(){var _0x3c7b3a=['4939730aJzutA','181520vBdkvb','8548984oPtrRp','42YCKroo','7846002HqqhMb','3GMVmSV','46615SAJfgJ','956924jibyfN','1339422NvAFsC','8NgNzOW','55JYhmYJ'];_0x11f3=function(){return _0x3c7b3a;};return _0x11f3();}export*from'./msg';export*from'./notify';function _0x49ac(_0x45c297,_0x3aa09b){var _0x11f380=_0x11f3();return _0x49ac=function(_0x49aca0,_0xb40376){_0x49aca0=_0x49aca0-0x12f;var _0x543c4e=_0x11f380[_0x49aca0];return _0x543c4e;},_0x49ac(_0x45c297,_0x3aa09b);}export*from'./cache';export*from'./constructor';

src/core.lib/src/entities/msg.d.ts

@@ -2,7 +2,23 @@ import { GroupMemberRole } from './group';
 export interface Peer {
     chatType: ChatType;
     peerUid: string;
-    guildId?: '';
+    guildId?: string;
+}
+export interface KickedOffLineInfo {
+    appId: number;
+    instanceId: number;
+    sameDevice: boolean;
+    tipsDesc: string;
+    tipsTitle: string;
+    kickedType: number;
+    securityKickedType: number;
+}
+export interface GetFileListParam {
+    sortType: number;
+    fileCount: number;
+    startIndex: number;
+    sortOrder: number;
+    showOnlinedocFolder: number;
 }
 export declare enum ElementType {
     TEXT = 1,
@@ -12,11 +28,13 @@ export declare enum ElementType {
     VIDEO = 5,
     FACE = 6,
     REPLY = 7,
-    ARK = 10
+    ARK = 10,
+    MFACE = 11,
+    MARKDOWN = 14
 }
 export interface SendTextElement {
     elementType: ElementType.TEXT;
-    elementId: '';
+    elementId: string;
     textElement: {
         content: string;
         atType: number;
@@ -27,7 +45,7 @@ export interface SendTextElement {
 }
 export interface SendPttElement {
     elementType: ElementType.PTT;
-    elementId: '';
+    elementId: string;
     pttElement: {
         fileName: string;
         filePath: string;
@@ -39,7 +57,7 @@ export interface SendPttElement {
         voiceChangeType: number;
         canConvert2Text: boolean;
         waveAmplitudes: number[];
-        fileSubId: '';
+        fileSubId: string;
         playState: number;
         autoConvertText: number;
     };
@@ -54,7 +72,7 @@ export declare enum PicSubType {
 }
 export interface SendPicElement {
     elementType: ElementType.PIC;
-    elementId: '';
+    elementId: string;
     picElement: {
         md5HexStr: string;
         fileSize: number | string;
@@ -73,7 +91,7 @@ export interface SendPicElement {
 }
 export interface SendReplyElement {
     elementType: ElementType.REPLY;
-    elementId: '';
+    elementId: string;
     replyElement: {
         replayMsgSeq: string;
         replayMsgId: string;
@@ -83,41 +101,51 @@ export interface SendReplyElement {
 }
 export interface SendFaceElement {
     elementType: ElementType.FACE;
-    elementId: '';
+    elementId: string;
     faceElement: FaceElement;
 }
+export interface SendMarketFaceElement {
+    elementType: ElementType.MFACE;
+    marketFaceElement: MarketFaceElement;
+}
 export interface FileElement {
-    'fileMd5'?: '';
-    'fileName': string;
-    'filePath': string;
+    fileMd5?: string;
+    fileName: string;
+    filePath: string;
     fileSize: string;
-    'picHeight'?: number;
-    'picWidth'?: number;
-    'picThumbPath'?: Map<number, string>;
-    'file10MMd5'?: '';
-    'fileSha'?: '';
-    'fileSha3'?: '';
-    'fileUuid'?: '';
-    'fileSubId'?: '';
-    'thumbFileSize'?: number;
+    picHeight?: number;
+    picWidth?: number;
+    folderId?: string;
+    picThumbPath?: Map<number, string>;
+    file10MMd5?: string;
+    fileSha?: string;
+    fileSha3?: string;
+    fileUuid?: string;
+    fileSubId?: string;
+    thumbFileSize?: number;
     fileBizId?: number;
 }
 export interface SendFileElement {
     elementType: ElementType.FILE;
-    elementId: '';
+    elementId: string;
     fileElement: FileElement;
 }
 export interface SendVideoElement {
     elementType: ElementType.VIDEO;
-    elementId: '';
+    elementId: string;
     videoElement: VideoElement;
 }
 export interface SendArkElement {
     elementType: ElementType.ARK;
-    elementId: '';
+    elementId: string;
     arkElement: ArkElement;
 }
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement;
+export interface SendMarkdownElement {
+    elementType: ElementType.MARKDOWN;
+    elementId: string;
+    markdownElement: MarkdownElement;
+}
+export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement;
 export declare enum AtType {
     notAt = 0,
     atAll = 1,
@@ -126,6 +154,7 @@ export declare enum AtType {
 export declare enum ChatType {
     friend = 1,
     group = 2,
+    chatDevice = 8,//移动设备?
     temp = 100
 }
 export interface PttElement {
@@ -187,97 +216,83 @@ export interface GrayTipElement {
     groupElement: TipGroupElement;
     xmlElement: {
         content: string;
+        templId: string;
     };
     jsonGrayTipElement: {
         jsonStr: string;
     };
 }
+export declare enum FaceType {
+    normal = 1,// 小黄脸
+    normal2 = 2,// 新小黄脸, 从faceIndex 222开始？
+    dice = 3
+}
+export declare enum FaceIndex {
+    dice = 358,
+    RPS = 359
+}
 export interface FaceElement {
     faceIndex: number;
-    faceType: 1;
+    faceType: FaceType;
+    faceText?: string;
+    packId?: string;
+    stickerId?: string;
+    sourceType?: number;
+    stickerType?: number;
+    resultId?: string;
+    surpriseId?: string;
+    randomType?: number;
 }
 export interface MarketFaceElement {
-    'itemType': 6;
-    'faceInfo': 1;
-    'emojiPackageId': 203875;
-    'subType': 3;
-    'mediaType': 0;
-    'imageWidth': 200;
-    'imageHeight': 200;
-    'faceName': string;
-    'emojiId': '094d53bd1c9ac5d35d04b08e8a6c992c';
-    'key': 'a8b1dd0aebc8d910';
-    'param': null;
-    'mobileParam': null;
-    'sourceType': null;
-    'startTime': null;
-    'endTime': null;
-    'emojiType': 1;
-    'hasIpProduct': null;
-    'voiceItemHeightArr': null;
-    'sourceName': null;
-    'sourceJumpUrl': null;
-    'sourceTypeName': null;
-    'backColor': null;
-    'volumeColor': null;
-    'staticFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png';
-    'dynamicFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c';
-    'supportSize': [
-        {
-            'width': 300;
-            'height': 300;
-        },
-        {
-            'width': 200;
-            'height': 200;
-        }
-    ];
-    'apngSupportSize': null;
+    emojiPackageId: number;
+    faceName: string;
+    emojiId: string;
+    key: string;
 }
 export interface VideoElement {
-    'filePath': string;
-    'fileName': string;
-    'videoMd5'?: string;
-    'thumbMd5'?: string;
-    'fileTime'?: number;
-    'thumbSize'?: number;
-    'fileFormat'?: number;
-    'fileSize'?: string;
-    'thumbWidth'?: number;
-    'thumbHeight'?: number;
-    'busiType'?: 0;
-    'subBusiType'?: 0;
-    'thumbPath'?: Map<number, any>;
-    'transferStatus'?: 0;
-    'progress'?: 0;
-    'invalidState'?: 0;
-    'fileUuid'?: string;
-    'fileSubId'?: '';
-    'fileBizId'?: null;
-    'originVideoMd5'?: '';
-    'import_rich_media_context'?: null;
-    'sourceVideoCodecFormat'?: number;
+    filePath: string;
+    fileName: string;
+    videoMd5?: string;
+    thumbMd5?: string;
+    fileTime?: number;
+    thumbSize?: number;
+    fileFormat?: number;
+    fileSize?: string;
+    thumbWidth?: number;
+    thumbHeight?: number;
+    busiType?: 0;
+    subBusiType?: 0;
+    thumbPath?: Map<number, any>;
+    transferStatus?: 0;
+    progress?: 0;
+    invalidState?: 0;
+    fileUuid?: string;
+    fileSubId?: string;
+    fileBizId?: null;
+    originVideoMd5?: string;
+    import_rich_media_context?: null;
+    sourceVideoCodecFormat?: number;
 }
 export interface MarkdownElement {
     content: string;
 }
 export interface InlineKeyboardElementRowButton {
-    'id': '';
-    'label': string;
-    'visitedLabel': string;
-    'style': 1;
-    'type': 2;
-    'clickLimit': 0;
-    'unsupportTips': '请升级新版手机QQ';
-    'data': string;
-    'atBotShowChannelList': false;
-    'permissionType': 2;
-    'specifyRoleIds': [];
-    'specifyTinyids': [];
-    'isReply': false;
-    'anchor': 0;
-    'enter': false;
-    'subscribeDataTemplateIds': [];
+    id: string;
+    label: string;
+    visitedLabel: string;
+    style: 1;
+    type: 2;
+    clickLimit: 0;
+    unsupportTips: string;
+    data: string;
+    atBotShowChannelList: boolean;
+    permissionType: number;
+    specifyRoleIds: [];
+    specifyTinyids: [];
+    isReply: false;
+    anchor: 0;
+    enter: false;
+    subscribeDataTemplateIds: [];
 }
 export interface InlineKeyboardElement {
     rows: [
@@ -297,40 +312,40 @@ export declare enum TipGroupElementType {
     ban = 8
 }
 export interface TipGroupElement {
-    'type': TipGroupElementType;
-    'role': 0;
-    'groupName': string;
-    'memberUid': string;
-    'memberNick': string;
-    'memberRemark': string;
-    'adminUid': string;
-    'adminNick': string;
-    'adminRemark': string;
-    'createGroup': null;
-    'memberAdd'?: {
-        'showType': 1;
-        'otherAdd': null;
-        'otherAddByOtherQRCode': null;
-        'otherAddByYourQRCode': null;
-        'youAddByOtherQRCode': null;
-        'otherInviteOther': null;
-        'otherInviteYou': null;
-        'youInviteOther': null;
+    type: TipGroupElementType;
+    role: 0;
+    groupName: string;
+    memberUid: string;
+    memberNick: string;
+    memberRemark: string;
+    adminUid: string;
+    adminNick: string;
+    adminRemark: string;
+    createGroup: null;
+    memberAdd?: {
+        showType: 1;
+        otherAdd: null;
+        otherAddByOtherQRCode: null;
+        otherAddByYourQRCode: null;
+        youAddByOtherQRCode: null;
+        otherInviteOther: null;
+        otherInviteYou: null;
+        youInviteOther: null;
     };
-    'shutUp'?: {
-        'curTime': string;
-        'duration': string;
-        'admin': {
-            'uid': string;
-            'card': string;
-            'name': string;
-            'role': GroupMemberRole;
+    shutUp?: {
+        curTime: string;
+        duration: string;
+        admin: {
+            uid: string;
+            card: string;
+            name: string;
+            role: GroupMemberRole;
         };
-        'member': {
-            'uid': string;
-            'card': string;
-            'name': string;
-            'role': GroupMemberRole;
+        member: {
+            uid: string;
+            card: string;
+            name: string;
+            role: GroupMemberRole;
         };
     };
 }
@@ -344,6 +359,8 @@ export interface RawMessage {
     msgId: string;
     msgTime: string;
     msgSeq: string;
+    msgType: number;
+    subMsgType: number;
     senderUid: string;
     senderUin: string;
     peerUid: string;