release: 1.3.8

This reverts commit 8101d17482.

.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,22 +77,62 @@ 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
+    steps:
+    - name: Download All Artifact
+      uses: actions/download-artifact@v4
+    
+    - name: Compress subdirectories
+      run: |
+       for dir in */; do
+          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 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
+        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**，目前正在研究如何优化
+## 如何使用
 
-## 下载
+可前往 [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
-
-```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)

package.json

@@ -2,14 +2,15 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.3.8",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
     "build:dev": "vite build --mode development",
     "build:prod": "vite build --mode production",
     "build": "npm run build:dev",
-    "build:core": "cd ./src/core && vite build --mode production",
+    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
+    "build:webui": "cd ./src/webui && vite build",
     "watch": "npm run watch:dev",
     "debug-win": "powershell dist/napcat.ps1",
     "lint": "eslint --fix src/**/*.{js,ts}",
@@ -18,9 +19,9 @@
   },
   "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/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
@@ -35,7 +36,6 @@
     "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",
@@ -43,21 +43,24 @@
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
     "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.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",
-    "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"
+    "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

@@ -2,21 +2,17 @@
 setlocal enabledelayedexpansion
 chcp 65001
 :loop_read
-for /f "tokens=3" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%a"
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set "RetString=%%b"
     goto :napcat_boot
 )
 
-goto :loop_read
-
 :napcat_boot
 for %%a in ("!RetString!") do (
     set "pathWithoutUninstall=%%~dpa"
-    set "fileName=%%~na"
-    set "extension=%%~xa"
 )
 
 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

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

src/common/utils/file.ts

@@ -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 '@/core/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,154 @@ 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,
+    },
+    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,87 @@
+import https from 'node:https';
+import http from 'node:http';
+
+export class RequestUtil {
+  // 适用于获取服务器下发cookies时获取，仅GET
+  static async HttpsGetCookies(url: string): Promise<Map<string, string>> {
+    return new Promise<Map<string, string>>((resolve, reject) => {
+      const protocol = url.startsWith('https://') ? https : http;
+      protocol.get(url, (res) => {
+        const cookiesHeader = res.headers['set-cookie'];
+        if (!cookiesHeader) {
+          resolve(new Map<string, string>());
+        } else {
+          const cookiesMap = new Map<string, string>();
+          cookiesHeader.forEach((cookieStr) => {
+            cookieStr.split(';').forEach((cookiePart) => {
+              const trimmedPart = cookiePart.trim();
+              if (trimmedPart.includes('=')) {
+                const [key, value] = trimmedPart.split('=').map(part => part.trim());
+                cookiesMap.set(key, decodeURIComponent(value)); // 解码cookie值
+              }
+            });
+          });
+          resolve(cookiesMap);
+        }
+      }).on('error', (error) => {
+        reject(error);
+      });
+    });
+  }
+
+  // 请求和回复都是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,17 @@
 import os from 'node:os';
 import path from 'node:path';
 
+// 缓解Win7设备兼容性问题
+let osName: string;
+try {
+  osName = os.hostname();
+} catch (e) {
+  osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
+}
 export const systemPlatform = os.platform();
+export const cpuArch = os.arch();
 export const systemVersion = os.release();
-export const hostname = os.hostname();
+export const hostname = osName;
 const homeDir = os.homedir();
 export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();
+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 @@
+function _0x201b(){var _0x2b4fc4=['616tYGRlF','11XkhEXj','5tvHPqu','1TJnXlY','339600ywIDdH','10290RxANja','163276NVhEfu','onMSFSsoError','3179930XmQKaN','206637KEYrOU','1997744mrggFI','3695742kPmxRj','onMSFStatusChange'];_0x201b=function(){return _0x2b4fc4;};return _0x201b();}var _0xc0b873=_0x544b;(function(_0x332a1b,_0x2b8851){var _0x37a37a=_0x544b,_0x300a9a=_0x332a1b();while(!![]){try{var _0x3871d0=parseInt(_0x37a37a(0x1ca))/0x1*(parseInt(_0x37a37a(0x1cd))/0x2)+-parseInt(_0x37a37a(0x1c3))/0x3+-parseInt(_0x37a37a(0x1c4))/0x4+-parseInt(_0x37a37a(0x1c9))/0x5*(parseInt(_0x37a37a(0x1cb))/0x6)+parseInt(_0x37a37a(0x1cc))/0x7*(parseInt(_0x37a37a(0x1c7))/0x8)+parseInt(_0x37a37a(0x1c5))/0x9+-parseInt(_0x37a37a(0x1cf))/0xa*(-parseInt(_0x37a37a(0x1c8))/0xb);if(_0x3871d0===_0x2b8851)break;else _0x300a9a['push'](_0x300a9a['shift']());}catch(_0x9f9de4){_0x300a9a['push'](_0x300a9a['shift']());}}}(_0x201b,0x48e30));function _0x544b(_0x53730d,_0x8455a8){var _0x201bf2=_0x201b();return _0x544b=function(_0x544bc9,_0x5870b7){_0x544bc9=_0x544bc9-0x1c3;var _0x259aed=_0x201bf2[_0x544bc9];return _0x259aed;},_0x544b(_0x53730d,_0x8455a8);}export class DependsAdapter{[_0xc0b873(0x1c6)](_0x321ed0,_0x2594d7){}[_0xc0b873(0x1ce)](_0x186df0){}['getGroupCode'](_0x5bb868){}}

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

@@ -0,0 +1 @@
+var _0x21dadd=_0x40b8;(function(_0x10a18d,_0x4ae609){var _0x59df0d=_0x40b8,_0x3c56e6=_0x10a18d();while(!![]){try{var _0x31fdfa=-parseInt(_0x59df0d(0x1d3))/0x1*(parseInt(_0x59df0d(0x1ce))/0x2)+-parseInt(_0x59df0d(0x1cd))/0x3+parseInt(_0x59df0d(0x1ca))/0x4*(parseInt(_0x59df0d(0x1d2))/0x5)+parseInt(_0x59df0d(0x1d1))/0x6+-parseInt(_0x59df0d(0x1cf))/0x7+parseInt(_0x59df0d(0x1c8))/0x8+parseInt(_0x59df0d(0x1c9))/0x9;if(_0x31fdfa===_0x4ae609)break;else _0x3c56e6['push'](_0x3c56e6['shift']());}catch(_0x4cb115){_0x3c56e6['push'](_0x3c56e6['shift']());}}}(_0xf9fb,0xf41b6));function _0xf9fb(){var _0x334c3e=['3091416IKpRSJ','16814358eyEUFb','2152lpDUrA','dispatchCallWithJson','dispatchRequest','177744ZUzNoZ','4SufjbE','6013385nIUesq','dispatchCall','6169248PBFZfS','1105RuTOAO','741815dPjrCZ'];_0xf9fb=function(){return _0x334c3e;};return _0xf9fb();}function _0x40b8(_0x3760a9,_0x202153){var _0xf9fb6a=_0xf9fb();return _0x40b8=function(_0x40b897,_0x375ee2){_0x40b897=_0x40b897-0x1c8;var _0x416357=_0xf9fb6a[_0x40b897];return _0x416357;},_0x40b8(_0x3760a9,_0x202153);}export class DispatcherAdapter{[_0x21dadd(0x1cc)](_0x84c9ef){}[_0x21dadd(0x1d0)](_0x3a3b37){}[_0x21dadd(0x1cb)](_0x13176f){}}

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

@@ -0,0 +1 @@
+var _0x2492ef=_0x1abe;function _0xa491(){var _0x2bb6a5=['27uqoEkY','2089598vRULYp','36LYeTDM','356024gbmJKJ','3PHyUct','145FNmTJZ','onUpdateGeneralFlag','5052CIWyYs','548408moGsYL','onInstallFinished','9033040UUQDGg','637gngiNP','onLog','50688zTGKHr','2944403McpWQX'];_0xa491=function(){return _0x2bb6a5;};return _0xa491();}function _0x1abe(_0x4549ff,_0x4b4a51){var _0xa491a3=_0xa491();return _0x1abe=function(_0x1abe41,_0x161295){_0x1abe41=_0x1abe41-0x8e;var _0x5bad2b=_0xa491a3[_0x1abe41];return _0x5bad2b;},_0x1abe(_0x4549ff,_0x4b4a51);}(function(_0x573f0b,_0x24140a){var _0x31869e=_0x1abe,_0x15bcbe=_0x573f0b();while(!![]){try{var _0x3fb875=parseInt(_0x31869e(0x9b))/0x1+-parseInt(_0x31869e(0x99))/0x2*(-parseInt(_0x31869e(0x9c))/0x3)+-parseInt(_0x31869e(0x90))/0x4*(-parseInt(_0x31869e(0x8e))/0x5)+-parseInt(_0x31869e(0x96))/0x6*(-parseInt(_0x31869e(0x94))/0x7)+parseInt(_0x31869e(0x91))/0x8*(parseInt(_0x31869e(0x98))/0x9)+-parseInt(_0x31869e(0x93))/0xa+parseInt(_0x31869e(0x97))/0xb*(-parseInt(_0x31869e(0x9a))/0xc);if(_0x3fb875===_0x24140a)break;else _0x15bcbe['push'](_0x15bcbe['shift']());}catch(_0x373a28){_0x15bcbe['push'](_0x15bcbe['shift']());}}}(_0xa491,0xac40c));export class GlobalAdapter{[_0x2492ef(0x95)](..._0x4ed74a){}['onGetSrvCalTime'](..._0x447fbc){}['onShowErrUITips'](..._0xde50b7){}['fixPicImgType'](..._0x178050){}['getAppSetting'](..._0x567d8c){}[_0x2492ef(0x92)](..._0x55001b){}[_0x2492ef(0x8f)](..._0x1ee30a){}['onGetOfflineMsg'](..._0x1f1bbd){}}

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

@@ -0,0 +1 @@
+function _0x5515(_0xec437d,_0x146dac){var _0x2b3ace=_0x2b3a();return _0x5515=function(_0x5515b6,_0x1905fc){_0x5515b6=_0x5515b6-0x197;var _0x51cfc8=_0x2b3ace[_0x5515b6];return _0x51cfc8;},_0x5515(_0xec437d,_0x146dac);}function _0x2b3a(){var _0x35c9e3=['104xSJCiU','6113220bQmOis','2398hRcVLl','830zXUMUy','275694JsBSyq','1394358SaGxEv','58KJmGWJ','390FGWDTp','9059ohCfEF','130002EnValB','12amPgvn','363069aaorcv'];_0x2b3a=function(){return _0x35c9e3;};return _0x2b3a();}(function(_0x37a1a6,_0x36c8b5){var _0x43754c=_0x5515,_0x42e5f5=_0x37a1a6();while(!![]){try{var _0x1f7df1=parseInt(_0x43754c(0x1a0))/0x1*(-parseInt(_0x43754c(0x19e))/0x2)+-parseInt(_0x43754c(0x19c))/0x3*(-parseInt(_0x43754c(0x1a2))/0x4)+-parseInt(_0x43754c(0x19f))/0x5*(-parseInt(_0x43754c(0x1a1))/0x6)+parseInt(_0x43754c(0x19d))/0x7+parseInt(_0x43754c(0x198))/0x8*(-parseInt(_0x43754c(0x197))/0x9)+parseInt(_0x43754c(0x19b))/0xa*(parseInt(_0x43754c(0x19a))/0xb)+-parseInt(_0x43754c(0x199))/0xc;if(_0x1f7df1===_0x36c8b5)break;else _0x42e5f5['push'](_0x42e5f5['shift']());}catch(_0x3e0445){_0x42e5f5['push'](_0x42e5f5['shift']());}}}(_0x2b3a,0xd869d));export*from'./NodeIDependsAdapter';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 _0x5305(_0x4234a0,_0x3c14f5){const _0x12b425=_0x12b4();return _0x5305=function(_0x5305d9,_0x4fcec8){_0x5305d9=_0x5305d9-0xff;let _0x5d86b9=_0x12b425[_0x5305d9];return _0x5d86b9;},_0x5305(_0x4234a0,_0x3c14f5);}const _0x9aa6ca=_0x5305;(function(_0x4507b1,_0x1ecd56){const _0x3c79c8=_0x5305,_0x43ab69=_0x4507b1();while(!![]){try{const _0x313bf9=parseInt(_0x3c79c8(0x10e))/0x1*(-parseInt(_0x3c79c8(0x120))/0x2)+-parseInt(_0x3c79c8(0x115))/0x3+-parseInt(_0x3c79c8(0x108))/0x4+parseInt(_0x3c79c8(0x102))/0x5*(-parseInt(_0x3c79c8(0x10b))/0x6)+parseInt(_0x3c79c8(0x116))/0x7*(parseInt(_0x3c79c8(0x107))/0x8)+parseInt(_0x3c79c8(0x110))/0x9*(-parseInt(_0x3c79c8(0x11c))/0xa)+parseInt(_0x3c79c8(0x104))/0xb;if(_0x313bf9===_0x1ecd56)break;else _0x43ab69['push'](_0x43ab69['shift']());}catch(_0x17e0b7){_0x43ab69['push'](_0x43ab69['shift']());}}}(_0x12b4,0x6317a));function _0x12b4(){const _0x24ddd9=['getFriends','30sRXDSH','buddyList','approvalFriendRequest','41879jZSspG','KwlBp','9BWBHnQ','getBuddyService','uin','TlQkn','XOQdT','41973ZAqiMK','217aNacjU','NxjVh','onBuddyListChange','reqTime','YFSdW','UKDLL','7513290hmZyoK','push','yBqoA','getBuddyList','14qILoEw','获取好友列表超时','session','FCMqh','156795PvRDgG','then','19724859KipXUr','delete','set','4496mxCNhK','757764KIuNmI','uid'];_0x12b4=function(){return _0x24ddd9;};return _0x12b4();}import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();buddyListener[_0x9aa6ca(0x118)]=_0x35016d=>{const _0x54e1db=_0x9aa6ca,_0x5cf8da={'FCMqh':function(_0x521182,_0x402dae){return _0x521182(_0x402dae);}};for(const [_0x29b0df,_0x2fec11]of buddyChangeTasks){_0x5cf8da[_0x54e1db(0x101)](_0x2fec11,_0x35016d),buddyChangeTasks[_0x54e1db(0x105)](_0x29b0df);}},setTimeout(()=>{napCatCore['onLoginSuccess'](()=>{napCatCore['addListener'](buddyListener);});},0x64);export class NTQQFriendApi{static async[_0x9aa6ca(0x10a)](_0x5a84f2=![]){const _0x53c2d2=_0x9aa6ca,_0x53b045={'TlQkn':function(_0x5601d4,_0x414a5f){return _0x5601d4(_0x414a5f);},'NxjVh':_0x53c2d2(0xff),'RhLos':function(_0x13371f,_0x4cbc07,_0x5aa361){return _0x13371f(_0x4cbc07,_0x5aa361);},'rMiwi':'获取好友列表完成','yBqoA':'开始获取好友列表','XOQdT':function(_0x5482cb){return _0x5482cb();}};return new Promise((_0x218a32,_0x1ee5f9)=>{const _0x2a6b4e=_0x53c2d2,_0x38ad26={'YFSdW':function(_0xe6b8b6,_0x4bd8f6,_0x26d26d){return _0x53b045['RhLos'](_0xe6b8b6,_0x4bd8f6,_0x26d26d);},'KwlBp':_0x53b045['rMiwi'],'UKDLL':_0x53b045[_0x2a6b4e(0x11e)]};let _0x36b6b8=![];setTimeout(()=>{const _0x237265=_0x2a6b4e;!_0x36b6b8&&(_0x53b045[_0x237265(0x113)](logDebug,_0x53b045[_0x237265(0x117)]),_0x53b045[_0x237265(0x113)](_0x1ee5f9,_0x53b045[_0x237265(0x117)]));},0x1388);const _0x2a5711=[],_0xd76275=_0x149cc0=>{const _0x56f7a2=_0x2a6b4e;for(const _0x2855a3 of _0x149cc0){for(const _0x2d7aa2 of _0x2855a3[_0x56f7a2(0x10c)]){_0x2a5711[_0x56f7a2(0x11d)](_0x2d7aa2),uid2UinMap[_0x2d7aa2[_0x56f7a2(0x109)]]=_0x2d7aa2[_0x56f7a2(0x112)];}}_0x36b6b8=!![],_0x38ad26[_0x56f7a2(0x11a)](logDebug,_0x38ad26[_0x56f7a2(0x10f)],_0x2a5711),_0x218a32(_0x2a5711);};buddyChangeTasks[_0x2a6b4e(0x106)](_0x53b045[_0x2a6b4e(0x114)](randomUUID),_0xd76275),napCatCore[_0x2a6b4e(0x100)]['getBuddyService']()[_0x2a6b4e(0x11f)](_0x5a84f2)[_0x2a6b4e(0x103)](_0x3cca42=>{const _0x21773a=_0x2a6b4e;_0x38ad26['YFSdW'](logDebug,_0x38ad26[_0x21773a(0x11b)],_0x3cca42);});});}static async['handleFriendRequest'](_0x225a2e,_0x182c2b){const _0x200e2e=_0x9aa6ca;napCatCore[_0x200e2e(0x100)][_0x200e2e(0x111)]()?.[_0x200e2e(0x10d)]({'friendUid':_0x225a2e['friendUid'],'reqTime':_0x225a2e[_0x200e2e(0x119)],'accept':_0x182c2b});}}

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

@@ -0,0 +1,33 @@
+import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
+export declare class NTQQGroupApi {
+    static getGroups(forced?: boolean): Promise<Group[]>;
+    static getSingleScreenNotifies(num: number): Promise<GroupNotify[]>;
+    static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
+    static getGroupNotifies(): Promise<void>;
+    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(_0x7df16d,_0x40dd30){var _0x27d423=_0x21b0,_0x470eb6=_0x7df16d();while(!![]){try{var _0x17b757=parseInt(_0x27d423(0x180))/0x1+parseInt(_0x27d423(0x17a))/0x2*(-parseInt(_0x27d423(0x17f))/0x3)+parseInt(_0x27d423(0x17b))/0x4*(parseInt(_0x27d423(0x17e))/0x5)+parseInt(_0x27d423(0x17c))/0x6+parseInt(_0x27d423(0x17d))/0x7+-parseInt(_0x27d423(0x182))/0x8+-parseInt(_0x27d423(0x181))/0x9;if(_0x17b757===_0x40dd30)break;else _0x470eb6['push'](_0x470eb6['shift']());}catch(_0x36afb2){_0x470eb6['push'](_0x470eb6['shift']());}}}(_0x5ca7,0x4fe29));function _0x21b0(_0x78f1a2,_0x4e7997){var _0x5ca7d6=_0x5ca7();return _0x21b0=function(_0x21b0ba,_0x43cf03){_0x21b0ba=_0x21b0ba-0x17a;var _0x48101f=_0x5ca7d6[_0x21b0ba];return _0x48101f;},_0x21b0(_0x78f1a2,_0x4e7997);}export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';function _0x5ca7(){var _0x2293bf=['38ffLWVH','32996SFbSjm','122262dEFbUA','4539220geklDp','130ZHPdEr','7725rxlmkO','373687VxywCO','6877107SWQLrY','933928YcZZvx'];_0x5ca7=function(){return _0x2293bf;};return _0x5ca7();}export*from'./user';export*from'./webapi';export*from'./sign';export*from'./system';

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

@@ -1,19 +1,25 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
-import { NapCatCore } from '@/core';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { 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 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,12 @@
+export interface IdMusicSignPostData {
+    type: 'qq' | '163';
+    id: string | number;
+}
+export interface CustomMusicSignPostData {
+    type: 'custom';
+    url: string;
+    audio: string;
+    title: string;
+    image?: string;
+    singer?: string;
+}

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

@@ -0,0 +1,3 @@
+export declare class NTQQSystemApi {
+    static hasOtherRunningQQProcess(): Promise<boolean>;
+}

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

@@ -0,0 +1 @@
+var _0x2d57de=_0x17be;function _0x2236(){var _0x135738=['1RVJTVj','163942IFsQFB','hasOtherRunningQQProcess','3861180sIgVjq','820nPgqVw','5088141JvHGWm','34078dmmowL','1182lMRIxE','util','19119QeJMbA','8NYZhWn','76CaLxeM','4454961fZNRjv'];_0x2236=function(){return _0x135738;};return _0x2236();}function _0x17be(_0x4c7f7b,_0x8af039){var _0x223628=_0x2236();return _0x17be=function(_0x17be05,_0x265987){_0x17be05=_0x17be05-0x1bc;var _0x50b1c0=_0x223628[_0x17be05];return _0x50b1c0;},_0x17be(_0x4c7f7b,_0x8af039);}(function(_0x28b22a,_0x51488d){var _0x1f622b=_0x17be,_0x1782d7=_0x28b22a();while(!![]){try{var _0x31ff17=-parseInt(_0x1f622b(0x1c2))/0x1*(parseInt(_0x1f622b(0x1c3))/0x2)+parseInt(_0x1f622b(0x1be))/0x3*(parseInt(_0x1f622b(0x1c0))/0x4)+-parseInt(_0x1f622b(0x1c6))/0x5*(-parseInt(_0x1f622b(0x1bc))/0x6)+-parseInt(_0x1f622b(0x1c1))/0x7+-parseInt(_0x1f622b(0x1bf))/0x8*(-parseInt(_0x1f622b(0x1c7))/0x9)+parseInt(_0x1f622b(0x1c5))/0xa+-parseInt(_0x1f622b(0x1c8))/0xb;if(_0x31ff17===_0x51488d)break;else _0x1782d7['push'](_0x1782d7['shift']());}catch(_0x380f0b){_0x1782d7['push'](_0x1782d7['shift']());}}}(_0x2236,0x5d98a));import{napCatCore}from'@/core';export class NTQQSystemApi{static async[_0x2d57de(0x1c4)](){var _0x8eb3e0=_0x2d57de;return napCatCore[_0x8eb3e0(0x1bd)]['hasOtherRunningQQProcess']();}}

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

@@ -1,5 +1,7 @@
-import { User } from '@/core/qqnt/entities';
+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;
@@ -12,8 +14,9 @@ export declare class NTQQUserApi {
     static getSelfInfo(): Promise<void>;
     static getUserInfo(uid: string): Promise<void>;
     static getUserDetailInfo(uid: string): Promise<User>;
-    static getPSkey(): Promise<void>;
-    static getSkey(groupName: string, groupCode: string): Promise<void | {
-        data: string;
+    static getPSkey(domainList: string[], cached?: boolean): Promise<{
+        [key: string]: string;
     }>;
+    static getRobotUinRange(): Promise<Array<any>>;
+    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,42 @@
+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;
+    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 _0x2735a1=_0x7d0e;(function(_0x48b44f,_0x37f6d7){const _0x5bce74=_0x7d0e,_0x51e476=_0x48b44f();while(!![]){try{const _0x1e2289=-parseInt(_0x5bce74(0x79))/0x1*(parseInt(_0x5bce74(0x65))/0x2)+-parseInt(_0x5bce74(0x66))/0x3*(parseInt(_0x5bce74(0x67))/0x4)+-parseInt(_0x5bce74(0x78))/0x5*(-parseInt(_0x5bce74(0x6c))/0x6)+-parseInt(_0x5bce74(0x82))/0x7*(parseInt(_0x5bce74(0x6f))/0x8)+parseInt(_0x5bce74(0x76))/0x9+-parseInt(_0x5bce74(0x68))/0xa*(parseInt(_0x5bce74(0x7a))/0xb)+parseInt(_0x5bce74(0x72))/0xc*(parseInt(_0x5bce74(0x7c))/0xd);if(_0x1e2289===_0x37f6d7)break;else _0x51e476['push'](_0x51e476['shift']());}catch(_0x58b8bb){_0x51e476['push'](_0x51e476['shift']());}}}(_0x5ea6,0x9b181));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'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(_0x2de053){const _0x1809e5=_0x7d0e;groups[_0x1809e5(0x7d)](_0x2de053),groupMembers[_0x1809e5(0x7d)](_0x2de053);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};function _0x7d0e(_0x1bdf9b,_0x178f47){const _0x5ea60a=_0x5ea6();return _0x7d0e=function(_0x7d0e53,_0x46770b){_0x7d0e53=_0x7d0e53-0x65;let _0x1bd909=_0x5ea60a[_0x7d0e53];return _0x1bd909;},_0x7d0e(_0x1bdf9b,_0x178f47);}export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x2735a1(0x6d)};export async function getFriend(_0x3d749c){const _0x591bcc=_0x2735a1,_0x532fc7={'XyglG':function(_0x2b13ca,_0xaaa7a6){return _0x2b13ca(_0xaaa7a6);}};_0x3d749c=_0x3d749c[_0x591bcc(0x71)]();if(_0x532fc7['XyglG'](isNumeric,_0x3d749c)){const _0x1e1444=Array[_0x591bcc(0x6a)](friends[_0x591bcc(0x6e)]());return _0x1e1444[_0x591bcc(0x80)](_0x428547=>_0x428547[_0x591bcc(0x7b)]===_0x3d749c);}else return friends[_0x591bcc(0x81)](_0x3d749c);}export async function getGroup(_0x3d54c4){const _0x3b5493=_0x2735a1;let _0x2d8287=groups[_0x3b5493(0x81)](_0x3d54c4['toString']());if(!_0x2d8287)try{const _0xf0d704=await NTQQGroupApi[_0x3b5493(0x73)]();_0xf0d704[_0x3b5493(0x75)]&&_0xf0d704[_0x3b5493(0x74)](_0x4fcdef=>{const _0x442155=_0x3b5493;groups[_0x442155(0x7e)](_0x4fcdef[_0x442155(0x77)],_0x4fcdef);});}catch(_0x4b7a1f){return undefined;}return _0x2d8287=groups[_0x3b5493(0x81)](_0x3d54c4[_0x3b5493(0x71)]()),_0x2d8287;}function _0x5ea6(){const _0x4198da=['NapCat未能正常启动，请检查日志查看错误','values','5216264ciBYHK','cmOZj','toString','5172CMtJzt','getGroups','forEach','length','1677042uHaYVo','groupCode','4540885xEjwmt','25QNYZHR','4752refAfW','uin','60073IfEORt','delete','set','huywW','find','get','7HonMKK','74330naoPBe','1414317jqJcAN','4jmGLED','9220KMOAdx','getGroupMembers','from','maTjZ','6Mtqaty'];_0x5ea6=function(){return _0x4198da;};return _0x5ea6();}export async function getGroupMember(_0x472671,_0x2d725d){const _0x1f4735=_0x2735a1,_0x5a1111={'cmOZj':function(_0x2175f9,_0x2d953f){return _0x2175f9(_0x2d953f);},'maTjZ':function(_0x15c4c6){return _0x15c4c6();}};_0x472671=_0x472671[_0x1f4735(0x71)](),_0x2d725d=_0x2d725d['toString']();let _0x5f5d20=groupMembers[_0x1f4735(0x81)](_0x472671);if(!_0x5f5d20)try{_0x5f5d20=await NTQQGroupApi[_0x1f4735(0x69)](_0x472671),groupMembers['set'](_0x472671,_0x5f5d20);}catch(_0x2fae15){return null;}const _0x5825f5=()=>{const _0x3dd941=_0x1f4735;let _0x5ac10d=undefined;return _0x5a1111[_0x3dd941(0x70)](isNumeric,_0x2d725d)?_0x5ac10d=Array[_0x3dd941(0x6a)](_0x5f5d20[_0x3dd941(0x6e)]())[_0x3dd941(0x80)](_0x23692a=>_0x23692a[_0x3dd941(0x7b)]===_0x2d725d):_0x5ac10d=_0x5f5d20[_0x3dd941(0x81)](_0x2d725d),_0x5ac10d;};let _0x1abef0=_0x5a1111[_0x1f4735(0x6b)](_0x5825f5);return!_0x1abef0&&(_0x5f5d20=await NTQQGroupApi[_0x1f4735(0x69)](_0x472671),_0x1abef0=_0x5a1111[_0x1f4735(0x6b)](_0x5825f5)),_0x1abef0;}export const uid2UinMap={};export function getUidByUin(_0x124b9e){const _0x112722=_0x2735a1,_0x1de3c0={'huywW':function(_0x10247a,_0x262b4f){return _0x10247a===_0x262b4f;}};for(const _0x13a430 in uid2UinMap){if(_0x1de3c0[_0x112722(0x7f)](uid2UinMap[_0x13a430],_0x124b9e))return _0x13a430;}}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(_0x575e0e,_0x630d){var _0x49b0d5=_0x3c77,_0x2e9cb2=_0x575e0e();while(!![]){try{var _0x139568=-parseInt(_0x49b0d5(0x88))/0x1+-parseInt(_0x49b0d5(0x80))/0x2+-parseInt(_0x49b0d5(0x85))/0x3*(parseInt(_0x49b0d5(0x83))/0x4)+-parseInt(_0x49b0d5(0x7f))/0x5+-parseInt(_0x49b0d5(0x7e))/0x6+-parseInt(_0x49b0d5(0x77))/0x7+parseInt(_0x49b0d5(0x82))/0x8;if(_0x139568===_0x630d)break;else _0x2e9cb2['push'](_0x2e9cb2['shift']());}catch(_0x289741){_0x2e9cb2['push'](_0x2e9cb2['shift']());}}}(_0x3e74,0xcd85b));function _0x3e74(){var _0x2d4076=['IMAGE','42dFWcZY','VIDEO','OTHER','473302lTxRxi','7445830SEvJrC','nsbYk','iEuVm','AUDIO','WwqPh','FIlAA','FhCbc','7158126cKzkon','313150kCdAmt','1367238sDWkUM','DOCUMENT','36583720IuYLDp','72824UIQUFn'];_0x3e74=function(){return _0x2d4076;};return _0x3e74();};function _0x3c77(_0x2257a2,_0x3052b1){var _0x3e74bf=_0x3e74();return _0x3c77=function(_0x3c77b8,_0x27fef7){_0x3c77b8=_0x3c77b8-0x77;var _0x5f3d51=_0x3e74bf[_0x3c77b8];return _0x5f3d51;},_0x3c77(_0x2257a2,_0x3052b1);}export var CacheFileType;(function(_0x218e74){var _0xc308c1=_0x3c77,_0x3e95a4={'nsbYk':'IMAGE','iEuVm':_0xc308c1(0x86),'FhCbc':_0xc308c1(0x7a),'FIlAA':_0xc308c1(0x81),'WwqPh':'OTHER'};_0x218e74[_0x218e74[_0x3e95a4[_0xc308c1(0x78)]]=0x0]=_0xc308c1(0x84),_0x218e74[_0x218e74[_0x3e95a4['iEuVm']]=0x1]=_0x3e95a4[_0xc308c1(0x79)],_0x218e74[_0x218e74[_0x3e95a4['FhCbc']]=0x2]=_0x3e95a4[_0xc308c1(0x7d)],_0x218e74[_0x218e74[_0x3e95a4[_0xc308c1(0x7c)]]=0x3]='DOCUMENT',_0x218e74[_0x218e74[_0xc308c1(0x87)]=0x4]=_0x3e95a4[_0xc308c1(0x7b)];}(CacheFileType||(CacheFileType={})));

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

@@ -1,4 +1,5 @@
-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;
@@ -8,5 +9,9 @@ export declare class SendMsgElementConstructor {
     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;
 }

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 _0xb298(_0x541189,_0x4108a7){var _0x55906e=_0x5590();return _0xb298=function(_0xb298a9,_0x55eddd){_0xb298a9=_0xb298a9-0x1cf;var _0x26d1ee=_0x55906e[_0xb298a9];return _0x26d1ee;},_0xb298(_0x541189,_0x4108a7);}(function(_0x493093,_0x1cea70){var _0x26c178=_0xb298,_0x4e73a5=_0x493093();while(!![]){try{var _0x4cdd5e=parseInt(_0x26c178(0x1d0))/0x1*(parseInt(_0x26c178(0x1d4))/0x2)+-parseInt(_0x26c178(0x1dc))/0x3+parseInt(_0x26c178(0x1d7))/0x4*(parseInt(_0x26c178(0x1d9))/0x5)+parseInt(_0x26c178(0x1de))/0x6+parseInt(_0x26c178(0x1db))/0x7+-parseInt(_0x26c178(0x1d1))/0x8+parseInt(_0x26c178(0x1d2))/0x9*(-parseInt(_0x26c178(0x1d3))/0xa);if(_0x4cdd5e===_0x1cea70)break;else _0x4e73a5['push'](_0x4e73a5['shift']());}catch(_0x1a2c17){_0x4e73a5['push'](_0x4e73a5['shift']());}}}(_0x5590,0x495aa));function _0x5590(){var _0x44c664=['399009htGgTz','xxheT','1602600NLGZnY','kxlWs','12503oHsNqh','409400bWbePM','3447eBDOFi','28430hHTEdW','42LGzfPA','owner','admin','12eXqkWU','xSfOf','860785SDERqW','normal','3691597xEklGI'];_0x5590=function(){return _0x44c664;};return _0x5590();}export var GroupMemberRole;(function(_0x5dd3f1){var _0xe69db7=_0xb298,_0x2a9ace={'xSfOf':_0xe69db7(0x1da),'xxheT':_0xe69db7(0x1d6),'kxlWs':'owner'};_0x5dd3f1[_0x5dd3f1[_0x2a9ace[_0xe69db7(0x1d8)]]=0x2]=_0x2a9ace[_0xe69db7(0x1d8)],_0x5dd3f1[_0x5dd3f1[_0x2a9ace['xxheT']]=0x3]=_0x2a9ace[_0xe69db7(0x1dd)],_0x5dd3f1[_0x5dd3f1[_0x2a9ace[_0xe69db7(0x1cf)]]=0x4]=_0xe69db7(0x1d5);}(GroupMemberRole||(GroupMemberRole={})));

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

@@ -0,0 +1 @@
+(function(_0x610bda,_0x36b670){var _0x4dd94e=_0xe97e,_0x318982=_0x610bda();while(!![]){try{var _0x480648=-parseInt(_0x4dd94e(0x14e))/0x1*(parseInt(_0x4dd94e(0x14b))/0x2)+-parseInt(_0x4dd94e(0x153))/0x3+-parseInt(_0x4dd94e(0x154))/0x4*(parseInt(_0x4dd94e(0x14c))/0x5)+-parseInt(_0x4dd94e(0x14d))/0x6+-parseInt(_0x4dd94e(0x152))/0x7+parseInt(_0x4dd94e(0x150))/0x8+parseInt(_0x4dd94e(0x151))/0x9*(parseInt(_0x4dd94e(0x14f))/0xa);if(_0x480648===_0x36b670)break;else _0x318982['push'](_0x318982['shift']());}catch(_0x50c875){_0x318982['push'](_0x318982['shift']());}}}(_0x5eac,0x4bfdf));export*from'./user';export*from'./group';export*from'./msg';export*from'./notify';export*from'./cache';function _0x5eac(){var _0x206033=['90lRkHNL','5ufVbqV','427074gsKIfY','4486suYqPD','10JxSiTs','3781920BCGVGp','8623305HyBbnE','400001dDkpLg','1704864IcCmmk','884568uhwWmC'];_0x5eac=function(){return _0x206033;};return _0x5eac();}function _0xe97e(_0x39257f,_0x12caf6){var _0x5eac34=_0x5eac();return _0xe97e=function(_0xe97e95,_0x22e357){_0xe97e95=_0xe97e95-0x14b;var _0x151438=_0x5eac34[_0xe97e95];return _0x151438;},_0xe97e(_0x39257f,_0x12caf6);}export*from'./constructor';

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

@@ -2,7 +2,16 @@ 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 declare enum ElementType {
     TEXT = 1,
@@ -12,11 +21,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 +38,7 @@ export interface SendTextElement {
 }
 export interface SendPttElement {
     elementType: ElementType.PTT;
-    elementId: '';
+    elementId: string;
     pttElement: {
         fileName: string;
         filePath: string;
@@ -39,7 +50,7 @@ export interface SendPttElement {
         voiceChangeType: number;
         canConvert2Text: boolean;
         waveAmplitudes: number[];
-        fileSubId: '';
+        fileSubId: string;
         playState: number;
         autoConvertText: number;
     };
@@ -54,7 +65,7 @@ export declare enum PicSubType {
 }
 export interface SendPicElement {
     elementType: ElementType.PIC;
-    elementId: '';
+    elementId: string;
     picElement: {
         md5HexStr: string;
         fileSize: number | string;
@@ -73,7 +84,7 @@ export interface SendPicElement {
 }
 export interface SendReplyElement {
     elementType: ElementType.REPLY;
-    elementId: '';
+    elementId: string;
     replyElement: {
         replayMsgSeq: string;
         replayMsgId: string;
@@ -83,41 +94,50 @@ 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;
+    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 +146,7 @@ export declare enum AtType {
 export declare enum ChatType {
     friend = 1,
     group = 2,
+    chatDevice = 8,//移动设备?
     temp = 100
 }
 export interface PttElement {
@@ -187,97 +208,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 +304,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 +351,8 @@ export interface RawMessage {
     msgId: string;
     msgTime: string;
     msgSeq: string;
+    msgType: number;
+    subMsgType: number;
     senderUid: string;
     senderUin: string;
     peerUid: string;

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

@@ -5,7 +5,8 @@ export declare enum GroupNotifyTypes {
     ADMIN_SET = 8,
     KICK_MEMBER = 9,
     MEMBER_EXIT = 11,// 主动退出
-    ADMIN_UNSET = 12
+    ADMIN_UNSET = 12,
+    ADMIN_UNSET_OTHER = 13
 }
 export interface GroupNotifies {
     doubt: boolean;

src/core.lib/src/entities/notify.js

@@ -0,0 +1 @@
+(function(_0x3fe2c2,_0x177afd){var _0x4e3d42=_0x2cdc,_0x17bce5=_0x3fe2c2();while(!![]){try{var _0x45ab12=-parseInt(_0x4e3d42(0x1b4))/0x1*(parseInt(_0x4e3d42(0x19e))/0x2)+parseInt(_0x4e3d42(0x1ad))/0x3*(parseInt(_0x4e3d42(0x1b1))/0x4)+parseInt(_0x4e3d42(0x1a6))/0x5*(parseInt(_0x4e3d42(0x1b0))/0x6)+parseInt(_0x4e3d42(0x19f))/0x7*(-parseInt(_0x4e3d42(0x1ab))/0x8)+parseInt(_0x4e3d42(0x1a3))/0x9*(parseInt(_0x4e3d42(0x195))/0xa)+-parseInt(_0x4e3d42(0x1ac))/0xb*(-parseInt(_0x4e3d42(0x1ae))/0xc)+-parseInt(_0x4e3d42(0x1a0))/0xd;if(_0x45ab12===_0x177afd)break;else _0x17bce5['push'](_0x17bce5['shift']());}catch(_0x49e233){_0x17bce5['push'](_0x17bce5['shift']());}}}(_0x4339,0x4458c));export var GroupNotifyTypes;function _0x2cdc(_0x347df2,_0x171085){var _0x4339d2=_0x4339();return _0x2cdc=function(_0x2cdc02,_0x557817){_0x2cdc02=_0x2cdc02-0x190;var _0x273284=_0x4339d2[_0x2cdc02];return _0x273284;},_0x2cdc(_0x347df2,_0x171085);}(function(_0x529fd7){var _0x1f3b7d=_0x2cdc,_0x1fec4d={'cbVxW':_0x1f3b7d(0x1a7),'leEdA':_0x1f3b7d(0x1af),'YklSr':_0x1f3b7d(0x193),'ENPCe':'MEMBER_EXIT','PLKak':'ADMIN_UNSET_OTHER','jQfna':_0x1f3b7d(0x1a1),'JRYjd':_0x1f3b7d(0x196),'BcEgu':_0x1f3b7d(0x1b5),'XKkst':_0x1f3b7d(0x19b)},_0x4954fb=_0x1fec4d[_0x1f3b7d(0x19c)]['split']('|'),_0x6882d7=0x0;while(!![]){switch(_0x4954fb[_0x6882d7++]){case'0':_0x529fd7[_0x529fd7[_0x1fec4d[_0x1f3b7d(0x197)]]=0x4]=_0x1fec4d['leEdA'];continue;case'1':_0x529fd7[_0x529fd7[_0x1fec4d[_0x1f3b7d(0x19a)]]=0xc]=_0x1fec4d[_0x1f3b7d(0x19a)];continue;case'2':_0x529fd7[_0x529fd7['MEMBER_EXIT']=0xb]=_0x1fec4d[_0x1f3b7d(0x1a9)];continue;case'3':_0x529fd7[_0x529fd7[_0x1f3b7d(0x1a5)]=0xd]=_0x1fec4d[_0x1f3b7d(0x1b3)];continue;case'4':_0x529fd7[_0x529fd7[_0x1fec4d[_0x1f3b7d(0x1a4)]]=0x8]=_0x1fec4d['jQfna'];continue;case'5':_0x529fd7[_0x529fd7[_0x1fec4d['JRYjd']]=0x9]=_0x1fec4d[_0x1f3b7d(0x190)];continue;case'6':_0x529fd7[_0x529fd7[_0x1fec4d[_0x1f3b7d(0x19d)]]=0x7]=_0x1f3b7d(0x1b5);continue;case'7':_0x529fd7[_0x529fd7[_0x1fec4d[_0x1f3b7d(0x1a8)]]=0x1]=_0x1fec4d[_0x1f3b7d(0x1a8)];continue;}break;}}(GroupNotifyTypes||(GroupNotifyTypes={})));function _0x4339(){var _0x464d59=['cbVxW','BcEgu','4znipdY','7BBGTfV','446927nRwFPh','ADMIN_SET','fwlsN','119277WyHhpw','jQfna','ADMIN_UNSET_OTHER','4415qjAukh','7|0|6|4|5|2|1|3','XKkst','ENPCe','biNCI','3982696lHlnyp','11ZpguAY','1839StLElO','74424bijLaZ','INVITED_JOIN','3738kHaJfH','1820sNvoHf','PCgyl','PLKak','64543tkblBE','JOIN_REQUEST','JRYjd','DdIaO','approve','ADMIN_UNSET','BSnDM','80knpeyt','KICK_MEMBER','leEdA','WAIT_HANDLE','reject','YklSr','INVITE_ME'];_0x4339=function(){return _0x464d59;};return _0x4339();}export var GroupNotifyStatus;(function(_0x55c376){var _0x5e707d=_0x2cdc,_0x15cd8c={'DdIaO':'IGNORE','PCgyl':_0x5e707d(0x198),'BSnDM':'APPROVE','biNCI':'REJECT'};_0x55c376[_0x55c376['IGNORE']=0x0]=_0x15cd8c[_0x5e707d(0x191)],_0x55c376[_0x55c376[_0x15cd8c[_0x5e707d(0x1b2)]]=0x1]=_0x15cd8c['PCgyl'],_0x55c376[_0x55c376[_0x15cd8c[_0x5e707d(0x194)]]=0x2]=_0x15cd8c[_0x5e707d(0x194)],_0x55c376[_0x55c376[_0x15cd8c[_0x5e707d(0x1aa)]]=0x3]=_0x15cd8c['biNCI'];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0xa87390){var _0x953ad1=_0x2cdc,_0xd3eaab={'VioIW':_0x953ad1(0x192),'fwlsN':_0x953ad1(0x199)};_0xa87390[_0xa87390[_0xd3eaab['VioIW']]=0x1]=_0xd3eaab['VioIW'],_0xa87390[_0xa87390[_0xd3eaab[_0x953ad1(0x1a2)]]=0x2]=_0xd3eaab['fwlsN'];}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));

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

@@ -0,0 +1,89 @@
+export declare enum Sex {
+    male = 1,
+    female = 2,
+    unknown = 255
+}
+export interface BuddyCategoryType {
+    categoryId: number;
+    categroyName: string;
+    categroyMbCount: number;
+    buddyList: User[];
+}
+export interface BuddyProfileLikeReq {
+    friendUids: string[];
+    basic: number;
+    vote: number;
+    favorite: number;
+    userProfile: number;
+    type: number;
+    start: number;
+    limit: number;
+}
+export interface QQLevel {
+    crownNum: number;
+    sunNum: number;
+    moonNum: number;
+    starNum: number;
+}
+export interface User {
+    uid: string;
+    uin: string;
+    nick: string;
+    avatarUrl?: string;
+    longNick?: string;
+    remark?: string;
+    sex?: Sex;
+    qqLevel?: QQLevel;
+    qid?: string;
+    birthday_year?: number;
+    birthday_month?: number;
+    birthday_day?: number;
+    topTime?: string;
+    constellation?: number;
+    shengXiao?: number;
+    kBloodType?: number;
+    homeTown?: string;
+    makeFriendCareer?: number;
+    pos?: string;
+    eMail?: string;
+    phoneNum?: string;
+    college?: string;
+    country?: string;
+    province?: string;
+    city?: string;
+    postCode?: string;
+    address?: string;
+    isBlock?: boolean;
+    isSpecialCareOpen?: boolean;
+    isSpecialCareZone?: boolean;
+    ringId?: string;
+    regTime?: number;
+    interest?: string;
+    labels?: string[];
+    isHideQQLevel?: number;
+    privilegeIcon?: {
+        jumpUrl: string;
+        openIconList: unknown[];
+        closeIconList: unknown[];
+    };
+    photoWall?: {
+        picList: unknown[];
+    };
+    vipFlag?: boolean;
+    yearVipFlag?: boolean;
+    svipFlag?: boolean;
+    vipLevel?: number;
+    status?: number;
+    qidianMasterFlag?: number;
+    qidianCrewFlag?: number;
+    qidianCrewFlag2?: number;
+    extStatus?: number;
+    recommendImgFlag?: number;
+    disableEmojiShortCuts?: number;
+    pendantId?: string;
+}
+export interface SelfInfo extends User {
+    online?: boolean;
+}
+export interface Friend extends User {
+}

src/core.lib/src/entities/user.js

@@ -0,0 +1 @@
+function _0x316d(){var _0x449373=['1087872iVtaHB','GgcUP','LutGY','385TENAjo','1160qwNiDI','389984BckPbS','female','966420TtCbXz','1699686ieLwNX','6cVzElU','16236fvxNBx','2447711ttmzqt','ZrXQS','722GmHuUA'];_0x316d=function(){return _0x449373;};return _0x316d();}function _0x4f28(_0x72db32,_0x167fb4){var _0x316df4=_0x316d();return _0x4f28=function(_0x4f28b1,_0x11a628){_0x4f28b1=_0x4f28b1-0x1d5;var _0x16222a=_0x316df4[_0x4f28b1];return _0x16222a;},_0x4f28(_0x72db32,_0x167fb4);}(function(_0x5a10ac,_0x22fa85){var _0x1316fe=_0x4f28,_0x537b6=_0x5a10ac();while(!![]){try{var _0x59735c=-parseInt(_0x1316fe(0x1de))/0x1*(parseInt(_0x1316fe(0x1da))/0x2)+-parseInt(_0x1316fe(0x1d6))/0x3*(-parseInt(_0x1316fe(0x1db))/0x4)+parseInt(_0x1316fe(0x1e2))/0x5+-parseInt(_0x1316fe(0x1d5))/0x6+parseInt(_0x1316fe(0x1d8))/0x7+-parseInt(_0x1316fe(0x1e0))/0x8+parseInt(_0x1316fe(0x1d7))/0x9*(parseInt(_0x1316fe(0x1df))/0xa);if(_0x59735c===_0x22fa85)break;else _0x537b6['push'](_0x537b6['shift']());}catch(_0x5af758){_0x537b6['push'](_0x537b6['shift']());}}}(_0x316d,0xc9737));export var Sex;(function(_0x46a55d){var _0x4f687d=_0x4f28,_0x144aa9={'LutGY':'male','GgcUP':_0x4f687d(0x1e1),'ZrXQS':'unknown'};_0x46a55d[_0x46a55d[_0x144aa9[_0x4f687d(0x1dd)]]=0x1]=_0x144aa9['LutGY'],_0x46a55d[_0x46a55d[_0x144aa9[_0x4f687d(0x1dc)]]=0x2]=_0x144aa9[_0x4f687d(0x1dc)],_0x46a55d[_0x46a55d[_0x144aa9[_0x4f687d(0x1d9)]]=0xff]=_0x144aa9[_0x4f687d(0x1d9)];}(Sex||(Sex={})));

src/core.lib/src/external/hook.d.ts

@@ -0,0 +1,8 @@
+declare class HookApi {
+    private readonly moeHook;
+    constructor();
+    getRKey(): string;
+    isAvailable(): boolean;
+}
+export declare const hookApi: HookApi;
+export {};

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

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

src/core.lib/src/listeners/NodeIKernelBuddyListener.d.ts

@@ -1,11 +1,7 @@
-import { FriendRequestNotify, User } from '@/core/qqnt/entities';
+import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
+export type OnBuddyChangeParams = BuddyCategoryType[];
 interface IBuddyListener {
-    onBuddyListChange(arg: {
-        categoryId: number;
-        categroyName: string;
-        categroyMbCount: number;
-        buddyList: User[];
-    }[]): void;
+    onBuddyListChange(arg: OnBuddyChangeParams): void;
     onBuddyInfoChange(arg: unknown): void;
     onBuddyDetailInfoChange(arg: unknown): void;
     onNickUpdated(arg: unknown): void;
@@ -33,12 +29,7 @@ export declare class BuddyListener implements IBuddyListener {
     onBlockChanged(arg: unknown): void;
     onBuddyDetailInfoChange(arg: unknown): void;
     onBuddyInfoChange(arg: unknown): void;
-    onBuddyListChange(arg: {
-        categoryId: number;
-        categroyName: string;
-        categroyMbCount: number;
-        buddyList: User[];
-    }[]): void;
+    onBuddyListChange(arg: OnBuddyChangeParams): void;
     onBuddyRemarkUpdated(arg: unknown): void;
     onBuddyReqChange(arg: FriendRequestNotify): void;
     onBuddyReqUnreadCntChange(arg: unknown): void;

src/core.lib/src/listeners/NodeIKernelBuddyListener.js

@@ -0,0 +1 @@
+var _0xf618ff=_0xd205;(function(_0x193f0f,_0x290b58){var _0x2b55ff=_0xd205,_0x3ab299=_0x193f0f();while(!![]){try{var _0x515898=-parseInt(_0x2b55ff(0x146))/0x1+-parseInt(_0x2b55ff(0x142))/0x2+parseInt(_0x2b55ff(0x151))/0x3*(-parseInt(_0x2b55ff(0x140))/0x4)+-parseInt(_0x2b55ff(0x155))/0x5+-parseInt(_0x2b55ff(0x145))/0x6*(-parseInt(_0x2b55ff(0x153))/0x7)+parseInt(_0x2b55ff(0x14c))/0x8*(-parseInt(_0x2b55ff(0x14b))/0x9)+-parseInt(_0x2b55ff(0x14d))/0xa*(-parseInt(_0x2b55ff(0x148))/0xb);if(_0x515898===_0x290b58)break;else _0x3ab299['push'](_0x3ab299['shift']());}catch(_0x469483){_0x3ab299['push'](_0x3ab299['shift']());}}}(_0x2f48,0x4bbd5));export class BuddyListener{['onAddBuddyNeedVerify'](_0x462404){}['onAddMeSettingChanged'](_0x1cb933){}[_0xf618ff(0x144)](_0x773995){}[_0xf618ff(0x14a)](_0x8d039c){}[_0xf618ff(0x147)](_0x71348){}[_0xf618ff(0x14f)](_0x186588){}[_0xf618ff(0x154)](_0x3ccae2){}[_0xf618ff(0x14e)](_0x1b3ac7){}[_0xf618ff(0x152)](_0x373dbc){}['onBuddyReqUnreadCntChange'](_0x39bc45){}[_0xf618ff(0x150)](_0x58ead8){}['onDelBatchBuddyInfos'](_0x9615c6){}[_0xf618ff(0x143)](_0x3dd5c4){}['onDoubtBuddyReqUnreadNumChange'](_0x4303da){}[_0xf618ff(0x141)](_0x546ed6){}['onSmartInfos'](_0x58eee7){}[_0xf618ff(0x149)](_0x2ef290){}}function _0xd205(_0x42fb93,_0x1c1402){var _0x2f48bf=_0x2f48();return _0xd205=function(_0xd20520,_0x3d00a0){_0xd20520=_0xd20520-0x140;var _0x4220c8=_0x2f48bf[_0xd20520];return _0x4220c8;},_0xd205(_0x42fb93,_0x1c1402);}function _0x2f48(){var _0x2314c9=['651ydeQGR','onBuddyListChange','765375bowWlv','743900LFuLLM','onNickUpdated','1158926PbLtFo','onDoubtBuddyReqChange','onAvatarUrlUpdated','8724CKMXBm','176074xeFQJR','onBuddyDetailInfoChange','33rQuRpx','onSpacePermissionInfos','onBlockChanged','1629CGYlkL','17912zGEkqx','6202760WfbPlI','onBuddyRemarkUpdated','onBuddyInfoChange','onCheckBuddySettingResult','6MovlIo','onBuddyReqChange'];_0x2f48=function(){return _0x2314c9;};return _0x2f48();}

src/core.lib/src/listeners/NodeIKernelFileAssistantListener.d.ts

@@ -0,0 +1,17 @@
+export interface IKernelFileAssistantListener {
+    onFileStatusChanged(...args: unknown[]): unknown;
+    onSessionListChanged(...args: unknown[]): unknown;
+    onSessionChanged(...args: unknown[]): unknown;
+    onFileListChanged(...args: unknown[]): unknown;
+    onFileSearch(...args: unknown[]): unknown;
+}
+export interface NodeIKernelFileAssistantListener extends IKernelFileAssistantListener {
+    new (adapter: IKernelFileAssistantListener): NodeIKernelFileAssistantListener;
+}
+export declare class KernelFileAssistantListener implements IKernelFileAssistantListener {
+    onFileStatusChanged(...args: unknown[]): void;
+    onSessionListChanged(...args: unknown[]): void;
+    onSessionChanged(...args: unknown[]): void;
+    onFileListChanged(...args: unknown[]): void;
+    onFileSearch(...args: unknown[]): void;
+}

src/core.lib/src/listeners/NodeIKernelFileAssistantListener.js

@@ -0,0 +1 @@
+function _0x46ea(){var _0x5ba0c6=['7LUZHcy','808GNJAIB','onFileSearch','17355240bQSdnw','onSessionListChanged','220SuOPrN','onSessionChanged','2392605qpQRsx','18138soWnAN','1805826aPCljL','730851ibFNMR','onFileStatusChanged','53230CVZXWS','4wezmfc','31905PrbcHV','90ygVakj'];_0x46ea=function(){return _0x5ba0c6;};return _0x46ea();}var _0x4f0f07=_0x5587;(function(_0xbed386,_0xe660ca){var _0x289945=_0x5587,_0x2ecd3b=_0xbed386();while(!![]){try{var _0x443333=-parseInt(_0x289945(0x1ca))/0x1*(-parseInt(_0x289945(0x1c5))/0x2)+parseInt(_0x289945(0x1c4))/0x3+-parseInt(_0x289945(0x1c2))/0x4*(-parseInt(_0x289945(0x1c9))/0x5)+parseInt(_0x289945(0x1c6))/0x6*(parseInt(_0x289945(0x1cd))/0x7)+parseInt(_0x289945(0x1ce))/0x8*(-parseInt(_0x289945(0x1cb))/0x9)+parseInt(_0x289945(0x1cc))/0xa*(parseInt(_0x289945(0x1c7))/0xb)+-parseInt(_0x289945(0x1c0))/0xc;if(_0x443333===_0xe660ca)break;else _0x2ecd3b['push'](_0x2ecd3b['shift']());}catch(_0x19007d){_0x2ecd3b['push'](_0x2ecd3b['shift']());}}}(_0x46ea,0x7d7ae));function _0x5587(_0xcd83ea,_0x2a921e){var _0x46ea5e=_0x46ea();return _0x5587=function(_0x55871c,_0x21ec2f){_0x55871c=_0x55871c-0x1c0;var _0x942891=_0x46ea5e[_0x55871c];return _0x942891;},_0x5587(_0xcd83ea,_0x2a921e);}export class KernelFileAssistantListener{[_0x4f0f07(0x1c8)](..._0x43bb8e){}[_0x4f0f07(0x1c1)](..._0x69a704){}[_0x4f0f07(0x1c3)](..._0x1dbd1a){}['onFileListChanged'](..._0x22f2dc){}[_0x4f0f07(0x1cf)](..._0x2ecf61){}}