release: 1.8.6

Fix typo in eventType field name

.editorconfig

@@ -1,21 +1,21 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf|crlf
-insert_final_newline = true
-
-# Matches multiple files with brace expansion notation
-# Set default charset
-charset = utf-8
-
-# 2 space indentation
-[*.{cjs,mjs,js,jsx,ts,tsx,css,scss,sass,html,json}]
-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.
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+charset = utf-8
+
+# 2 space indentation
+[*.{cjs,mjs,js,jsx,ts,tsx,css,scss,sass,html,json}]
+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.

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: "Build"
+name: "Build Action"
 on:
   workflow_dispatch:
   push:
@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       matrix:
         target_platform: [win32]
-        target_arch: [x64]
+        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: "release"
+name: "Build Release"
 
 on:
   push:
@@ -72,7 +72,7 @@ jobs:
       fail-fast: false
       matrix:
         target_platform: [win32]
-        target_arch: [x64]
+        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -130,6 +130,7 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         body_path: CHANGELOG.md
         files: |
+          NapCat.win32.ia32.zip
           NapCat.win32.x64.zip
           NapCat.linux.x64.zip
           NapCat.linux.arm64.zip

.github/workflows/test.yml

@@ -0,0 +1,69 @@
+name: "Build Test"
+on:
+  workflow_dispatch:
+
+permissions: write-all
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target_platform: [linux]
+        target_arch: [x64, arm64]
+    steps:
+    - name: Clone Main Repository
+      uses: actions/checkout@v4
+      with:
+          repository: 'NapNeko/NapCatQQ'
+          submodules: true
+          ref: main
+          token: ${{ secrets.NAPCAT_BUILD }}
+    - name: Use Node.js 20.X
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+    - name: Build NuCat Linux
+      run: |
+          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm run build:prod
+          cd dist
+          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          cd ..
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        path: dist
+  build-win32:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target_platform: [win32]
+        target_arch: [x64,ia32]
+    steps:
+        - name: Clone Main Repository
+          uses: actions/checkout@v4
+          with:
+                repository: 'NapNeko/NapCatQQ'
+                submodules: true
+                ref: main
+                token: ${{ secrets.NAPCAT_BUILD }}
+        - name: Use Node.js 20.X
+          uses: actions/setup-node@v4
+          with:
+              node-version: 20.x
+        - name: Build NuCat Linux
+          run: |
+                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm run build:prod
+                cd dist
+                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                cd ..
+        - name: Upload Artifact
+          uses: actions/upload-artifact@v4
+          with:
+              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+              path: dist

.gitignore

@@ -14,4 +14,5 @@ dist/
 
 # Build
 *.db
-checkVersion.sh
+checkVersion.sh
+bun.lockb

.gitmodules

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

LICENSE

@@ -1,21 +1,24 @@
-MIT License
+BSD 2-Clause License
 
-Copyright (c) 2024 NapCatQQ
+Copyright (c) 2024, NapNeko
 
-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:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-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.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/changelogs/CHANGELOG.v1.8.3.md

@@ -0,0 +1,13 @@
+# v1.8.3
+
+QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
+
+## 启动的方式
+Way03/Way05
+
+## 新增与调整
+1. 输入状态变更事件加入
+2. Way05 支持Bat启动
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

docs/develop/Android.md

@@ -1,2 +0,0 @@
-# 开始
-jadx 跳转于 `com.tencent.qqnt.kernel.*` 

docs/develop/GetMemberExt.md

@@ -1,42 +0,0 @@
- # Android
- ```java
-            GroupMemberExtReq groupMemberExtReq = new GroupMemberExtReq();
-            groupMemberExtReq.sourceType = MemberExtSourceType.TITLETYPE.ordinal();
-            groupMemberExtReq.groupCode = longOrNull.longValue();
-            groupMemberExtReq.beginUin = "0";
-            groupMemberExtReq.dataTime = "0";
-            Long[] lArr = new Long[1];
-            AppInterface a2 = dVar.a();
-            lArr[0] = Long.valueOf(a2 != null ? a2.getLongAccountUin() : 0L);
-            arrayListOf = CollectionsKt__CollectionsKt.arrayListOf(lArr);
-            groupMemberExtReq.uinList = arrayListOf;
-            MemberExtInfoFilter memberExtInfoFilter = new MemberExtInfoFilter();
-            memberExtInfoFilter.memberLevelInfoUin = 1;
-            memberExtInfoFilter.memberLevelInfoPoint = 1;
-            memberExtInfoFilter.memberLevelInfoActiveDay = 1;
-            memberExtInfoFilter.memberLevelInfoLevel = 1;
-            memberExtInfoFilter.levelName = 1;
-            memberExtInfoFilter.dataTime = 1;
-            memberExtInfoFilter.sysShowFlag = 1;
-            memberExtInfoFilter.userShowFlag = 1;
-            memberExtInfoFilter.userShowFlagNew = 1;
-            memberExtInfoFilter.levelNameNew = 1;
-            Unit unit = Unit.INSTANCE;
-            groupMemberExtReq.memberExtFilter = memberExtInfoFilter;
-            troopLevelFrequencyControl.f(troopUin, new TroopListRepo$fetchTroopLevelInfo$2(b2, groupMemberExtReq, troopUin, new com.tencent.qqnt.troopmemberlist.report.c("fetchTroopLevelInfo")));
-```
-# Win
-参数解析位于 sub_181456A10(24108) -> wrapper.node(24108)+1456A10
-IGroupService.GetMemberExt(param: object);
-param展开如下
-```
-groupCode string
-beginUin string
-dataTime string
-uinList Array<string>
-uinNum string
-groupType string
-richCardNameVer string
-sourceType number
-memberExtFilter object// 参数解析位于 sub_18145A6D0(24108) -> wrapper.node(24108)+145A6D0 
-```

docs/develop/Image.NTAndroid.md

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

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

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

docs/develop/参与开发.md

@@ -1,24 +0,0 @@
-# 前排提示
-由于Core未处于开源，非组织人员无法参与Core开发，此处为Core开发提示
-
-# 准备工具
-frida ida-pro jadx x64dbg ce 内部调试脚本
-
-## ida-pro
-1. 用于快速分析入参和返回类型
-2. 通过静态QLog推测语义
-3. 提取Listener与Service （常用）
-## frida
-1. 用于动态获取QLog推测语义
-2. 捕捉Native函数 实际入参与数据 分析中间流程
-
-## jadx
-1. 通过其它平台实现 静态获取QLog推测语义
-2. 提供部分未调用代码 参考
-
-## x64dbg
-1. 验证IDA的Hook点
-
-## 内部脚本
-1. 提取Listener与Service （不调用无类型 不推荐）
-2. 获取NT调用流程

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

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.5.3",
+  "version": "1.8.6",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
@@ -18,6 +18,10 @@
     "depend": "cd dist && npm install --omit=dev"
   },
   "devDependencies": {
+    "@babel/core": "^7.24.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
     "@log4js-node/log4js-api": "^1.0.2",
     "@protobuf-ts/plugin": "^2.9.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -26,9 +30,9 @@
     "@types/express": "^4.17.21",
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.30",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.0.0",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -42,6 +46,7 @@
     "rollup-plugin-obfuscator": "^1.1.0",
     "typescript": "^5.3.3",
     "vite": "^5.2.6",
+    "vite-plugin-babel": "^1.2.0",
     "vite-plugin-cp": "^4.0.8",
     "vite-plugin-dts": "^3.8.2",
     "vite-tsconfig-paths": "^4.3.2"
@@ -59,9 +64,7 @@
     "json-schema-to-ts": "^3.1.0",
     "log4js": "^6.9.1",
     "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.3.4",
-    "sqlite3": "^5.1.7",
-    "uuid": "^9.0.1",
+    "silk-wasm": "^3.6.1",
     "ws": "^8.16.0"
   }
 }

script/BootWay.03.ps1

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

script/BootWay05.bat

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

script/BootWay05.ps1

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

script/BootWay05.utf8.bat

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

script/NapCat.164.bat

@@ -0,0 +1,28 @@
+@echo off
+chcp 65001
+:: 检查是否有管理员权限
+net session >nul 2>&1
+if %errorlevel% neq 0 (
+    echo 请求管理员权限...
+    powershell -Command "Start-Process '%~f0' -Verb runAs"
+    exit /b
+)
+:: 如果有管理员权限，继续执行
+setlocal enabledelayedexpansion
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set "RetString=%%b"
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("!RetString!") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+set "QQPath=!pathWithoutUninstall!QQ.exe"
+
+echo !QQPath!
+"!QQPath!" --enable-logging  %*
+
+pause

script/NapCat.Way01.bat

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

script/index.js

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

script/napcat-9912-utf8.bat

@@ -0,0 +1,18 @@
+@echo off
+setlocal enabledelayedexpansion
+chcp 65001
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set "RetString=%%b"
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("!RetString!") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+set "QQPath=!pathWithoutUninstall!"
+cd /d !QQPath!
+echo !QQPath!
+QQ.exe --enable-logging %*

script/napcat-9912-utf8.ps1

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

script/napcat-9912.bat

@@ -0,0 +1,17 @@
+@echo off
+setlocal enabledelayedexpansion
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set "RetString=%%b"
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("!RetString!") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+set QQPath=!pathWithoutUninstall!
+cd /d !QQPath!
+echo !QQPath!
+QQ.exe --enable-logging %*

script/napcat-9912.ps1

@@ -0,0 +1,41 @@
+function Get-QQpath {
+    try {
+        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
+        $uninstallString = $key.UninstallString
+        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\"
+    }
+    catch {
+        throw "get QQ path error: $_"
+    }
+}
+function Select-QQPath {
+    Add-Type -AssemblyName System.Windows.Forms
+    [System.Windows.Forms.Application]::EnableVisualStyles()
+
+    $dialogTitle = "Select QQ.exe"
+
+    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
+    $filePicker.Title = $dialogTitle
+    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
+    $filePicker.FilterIndex = 1
+    $null = $filePicker.ShowDialog()
+    if (-not ($filePicker.FileName)) {
+        throw "User did not select an .exe file."
+    }
+    return $filePicker.FileName
+}
+
+$params = $args -join " "
+Try {
+    $QQpath = Get-QQpath
+}
+Catch {
+    $QQpath = Select-QQPath
+}
+
+if (!(Test-Path $QQpath)) {
+    throw "provided QQ path is invalid: $QQpath"
+}
+
+Set-Location -Path $QQpath
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& ./QQ.exe --enable-logging $params}"

src/common/server/http.ts

@@ -9,7 +9,15 @@ type RegisterHandler = (res: Response, payload: any) => Promise<any>
 export abstract class HttpServerBase {
   name: string = 'NapCatQQ';
   private readonly expressAPP: Express;
-  private server: http.Server | null = null;
+  private _server: http.Server | null = null;
+
+  public get server(): http.Server | null {
+    return this._server;
+  }
+
+  private set server(value: http.Server | null) {
+    this._server = value;
+  }
 
   constructor() {
     this.expressAPP = express();
@@ -78,7 +86,7 @@ export abstract class HttpServerBase {
     this.start(port, host);
   }
 
-  abstract handleFailed(res: Response, payload: any, err: any): void
+  abstract handleFailed(res: Response, payload: any, err: Error): void
 
   registerRouter(method: 'post' | 'get' | string, url: string, handler: RegisterHandler) {
     if (!url.startsWith('/')) {
@@ -103,7 +111,7 @@ export abstract class HttpServerBase {
       try {
         res.send(await handler(res, payload));
       } catch (e: any) {
-        this.handleFailed(res, payload, e.stack.toString());
+        this.handleFailed(res, payload, e);
       }
     });
   }

src/common/server/websocket.ts

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

src/common/utils/AsyncQueue.ts

@@ -1,36 +0,0 @@
-import { sleep } from '@/common/utils/helper';
-import { logError } from './log';
-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);
-        logError(e);
-      }
-      this.tasks.shift();
-      await sleep(100);
-    }
-  }
-}

src/common/utils/ConfigBase.ts

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import { log, logDebug, logError } from '@/common/utils/log';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { selfInfo } from '@/core/data';
 
 
 const __filename = fileURLToPath(import.meta.url);
@@ -12,8 +13,9 @@ const configDir = path.resolve(__dirname, 'config');
 fs.mkdirSync(configDir, { recursive: true });
 
 
-export class ConfigBase<T>{
-
+export class ConfigBase<T> {
+  public name: string = 'default_config';
+  private pathName: string | null = null; // 本次读取的文件路径
   constructor() {
   }
 
@@ -22,19 +24,28 @@ export class ConfigBase<T>{
     return null;
   }
 
-  getConfigDir(){
+  getConfigDir() {
     const configDir = path.resolve(__dirname, 'config');
     fs.mkdirSync(configDir, { recursive: true });
     return configDir;
   }
-  getConfigPath(): string {
-    throw new Error('Method not implemented.');
+  getConfigPath(pathName: string | null): string {
+    const suffix = pathName ? `_${pathName}` : '';
+    const filename = `${this.name}${suffix}.json`;
+    return path.join(this.getConfigDir(), filename);
   }
-
   read() {
-    const configPath = this.getConfigPath();
+    // 尝试加载当前账号配置
+    if (this.read_from_file(selfInfo.uin, false)) return this;
+    // 尝试加载默认配置
+    return this.read_from_file('', true);
+  }
+  read_from_file(pathName: string, createIfNotExist: boolean) {
+    const configPath = this.getConfigPath(pathName);
     if (!fs.existsSync(configPath)) {
-      try{
+      if (!createIfNotExist) return null;
+      this.pathName = pathName; // 记录有效的设置文件
+      try {
         fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
         log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
       }
@@ -43,6 +54,7 @@ export class ConfigBase<T>{
       }
       return this;
     }
+
     try {
       const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
       logDebug(`配置文件${configPath}已加载`, data);
@@ -61,9 +73,13 @@ export class ConfigBase<T>{
     }
   }
 
-  save(config: T) {
+  save(config: T, overwrite: boolean = false) {
     Object.assign(this, config);
-    const configPath = this.getConfigPath();
+    if (overwrite) {
+      // 用户要求强制写入，则变更当前文件为目标文件
+      this.pathName = `${selfInfo.uin}`;
+    }
+    const configPath = this.getConfigPath(this.pathName);
     try {
       fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
     } catch (e: any) {

src/common/utils/EventTask.ts

@@ -1,4 +1,3 @@
-import { NodeIKernelMsgListener } from '@/core';
 import { NodeIQQNTWrapperSession } from '@/core/wrapper';
 import { randomUUID } from 'crypto';
 
@@ -6,6 +5,7 @@ interface Internal_MapKey {
   timeout: number,
   createtime: number,
   func: (...arg: any[]) => any,
+  checker: ((...args: any[]) => boolean) | undefined,
 }
 
 export class ListenerClassBase {
@@ -84,17 +84,19 @@ export class NTEventWrapper {
   }
   //统一回调清理事件
   async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-    //console.log(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    //console.log("[EventDispatcher]",ListenerMainName, ListenerSubName, ...args);
     this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
       //console.log(task.func, uuid, task.createtime, task.timeout);
       if (task.createtime + task.timeout < Date.now()) {
         this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
         return;
       }
-      task.func(...args);
+      if (task.checker && task.checker(...args)) {
+        task.func(...args);
+      }
     });
   }
-  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any> | any>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
     return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
       const EventFunc = this.CreatEventFunction<EventType>(EventName);
       let complete = false;
@@ -108,27 +110,71 @@ export class NTEventWrapper {
       resolve(retData);
     });
   }
-  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...args: Parameters<EventType>) {
+  async RegisterListen<ListenerType extends (...args: any[]) => void>(ListenerName = '', waitTimes = 1, timeout = 5000, checker: (...args: Parameters<ListenerType>) => boolean) {
+    return new Promise<Parameters<ListenerType>>((resolve, reject) => {
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const id = randomUUID();
+      let complete = 0;
+      let retData: Parameters<ListenerType> | undefined = undefined;
+      const databack = () => {
+        if (complete == 0) {
+          reject(new Error(' ListenerName:' + ListenerName + ' timeout'));
+        } else {
+          resolve(retData!);
+        }
+      };
+      const Timeouter = setTimeout(databack, timeout);
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        checker: checker,
+        func: (...args: Parameters<ListenerType>) => {
+          complete++;
+          retData = args;
+          if (complete >= waitTimes) {
+            clearTimeout(Timeouter);
+            databack();
+          }
+        }
+      };
+      if (!this.EventTask.get(ListenerMainName)) {
+        this.EventTask.set(ListenerMainName, new Map());
+      }
+      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
+        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+      }
+      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+      this.CreatListenerFunction(ListenerMainName);
+    });
+  }
+  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>
+  (EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, checker: (...args: Parameters<ListenerType>) => boolean, ...args: Parameters<EventType>) {
     return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
       const id = randomUUID();
       let complete = 0;
       let retData: Parameters<ListenerType> | undefined = undefined;
       let retEvent: any = {};
       const databack = () => {
-        if (complete < waitTimes) {
-          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
+        if (complete == 0) {
+          reject(new Error('Timeout: NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n'));
         } else {
           resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
         }
       };
-      const Timeouter = setTimeout(databack, timeout);
+
 
       const ListenerNameList = ListenerName.split('/');
       const ListenerMainName = ListenerNameList[0];
       const ListenerSubName = ListenerNameList[1];
+
+      const Timeouter = setTimeout(databack, timeout);
+
       const eventCallbak = {
         timeout: timeout,
         createtime: Date.now(),
+        checker: checker,
         func: (...args: any[]) => {
           complete++;
           //console.log('func', ...args);
@@ -148,7 +194,6 @@ export class NTEventWrapper {
       this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
       this.CreatListenerFunction(ListenerMainName);
       const EventFunc = this.CreatEventFunction<EventType>(EventName);
-      //console.log("测试打点", args);
       retEvent = await EventFunc!(...(args as any[]));
     });
   }

src/common/utils/LRUCache.ts

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

src/common/utils/MessageUnique.ts

@@ -1,53 +1,144 @@
-import crypto from 'crypto';
+import { Peer } from '@/core';
+import crypto, { randomInt, randomUUID } from 'crypto';
+import { logError } from './log';
 
-class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map();
-    private valueToKey: Map<V, K> = new Map();
-    private maxSize: number;
-    private KeyQueneList: K[] = [];
-    private ValueQueneList: V[] = [];
-    constructor(maxSize: number) {
-        this.maxSize = maxSize;
-    }
-    set(key: K, value: V): void {
-        this.keyToValue.set(key, value);
-        this.valueToKey.set(value, key);
-        if (this.KeyQueneList.length >= this.maxSize || this.ValueQueneList.length >= this.maxSize) {
-            this.KeyQueneList.shift();
-            this.ValueQueneList.shift();
-        }
-    }
+export class LimitedHashTable<K, V> {
+  private keyToValue: Map<K, V> = new Map();
+  private valueToKey: Map<V, K> = new Map();
+  private maxSize: number;
 
-    getValue(key: K): V | undefined {
-        return this.keyToValue.get(key);
-    }
+  constructor(maxSize: number) {
+    this.maxSize = maxSize;
+  }
+  resize(count: number) {
+    this.maxSize = count;
+  }
 
-    getKey(value: V): K | undefined {
-        return this.valueToKey.get(value);
+  set(key: K, value: V): void {
+    // const isExist = this.keyToValue.get(key);
+    // if (isExist && isExist === value) {
+    //   return;
+    // }
+    this.keyToValue.set(key, value);
+    this.valueToKey.set(value, key);
+    while (this.keyToValue.size !== this.valueToKey.size) {
+      console.log('keyToValue.size !== valueToKey.size Error Atom');
+      this.keyToValue.clear();
+      this.valueToKey.clear();
     }
+    // console.log('---------------');
+    // console.log(this.keyToValue);
+    // console.log(this.valueToKey);
+    // console.log('---------------');
+    while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
+      //console.log(this.keyToValue.size > this.maxSize, this.valueToKey.size > this.maxSize);
+      const oldestKey = this.keyToValue.keys().next().value;
+      this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+      this.keyToValue.delete(oldestKey);
+    }
+  }
 
-    delete(key: K): void {
-        const value = this.keyToValue.get(key);
-        if (value !== undefined) {
-            this.keyToValue.delete(key);
-            this.valueToKey.delete(value);
-        }
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key);
+  }
+
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value);
+  }
+
+  deleteByValue(value: V): void {
+    const key = this.valueToKey.get(value);
+    if (key !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
     }
+  }
+
+  deleteByKey(key: K): void {
+    const value = this.keyToValue.get(key);
+    if (value !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+
+  getKeyList(): K[] {
+    return Array.from(this.keyToValue.keys());
+  }
+  //获取最近刚写入的几个值
+  getHeads(size: number): { key: K; value: V }[] | undefined {
+    const keyList = this.getKeyList();
+    if (keyList.length === 0) {
+      return undefined;
+    }
+    const result: { key: K; value: V }[] = [];
+    const listSize = Math.min(size, keyList.length);
+    for (let i = 0; i < listSize; i++) {
+      const key = keyList[listSize - i];
+      result.push({ key, value: this.keyToValue.get(key)! });
+    }
+    return result;
+  }
 }
 
 class MessageUniqueWrapper {
-    private msgIdMap: LimitedHashTable<number, string> = new LimitedHashTable(1000);
-    createMsg(MsgId: string) {
-        let ShortId = parseInt(crypto.createHash('sha1').update('2345').digest('hex').slice(0, 8), 16);
-        this.msgIdMap.set(ShortId, MsgId);
-        return ShortId;
+  private msgDataMap: LimitedHashTable<string, number>;
+  private msgIdMap: LimitedHashTable<string, number>;
+  constructor(maxMap: number = 1000) {
+    this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+    this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
+  }
+  getRecentMsgIds(Peer: Peer, size: number): string[] {
+    const heads = this.msgIdMap.getHeads(size);
+    if (!heads) {
+      return [];
     }
-    getMsgIdByShortId(ShortId: number) {
-        return this.msgIdMap.getValue(ShortId);
-    }
-    getShortIdByMsgId(MsgId: string) {
-        return this.msgIdMap.getKey(MsgId);
+    const data = heads.map((t) => MessageUnique.getMsgIdAndPeerByShortId(t.value));
+    const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid);
+    return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
+  }
+  createMsg(peer: Peer, msgId: string): number | undefined {
+    const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+    const hash = crypto.createHash('md5').update(key).digest();
+    //设置第一个bit为0 保证shortId为正数
+    hash[0] &= 0x7f;
+    const shortId = hash.readInt32BE(0);
+    //减少性能损耗
+    // const isExist = this.msgIdMap.getKey(shortId);
+    // if (isExist && isExist === msgId) {
+    //   return shortId;
+    // }
+    this.msgIdMap.set(msgId, shortId);
+    this.msgDataMap.set(key, shortId);
+    return shortId;
+  }
+
+  getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
+    const data = this.msgDataMap.getKey(shortId);
+    if (data) {
+      const [msgId, chatTypeStr, peerUid] = data.split('|');
+      const peer: Peer = {
+        chatType: parseInt(chatTypeStr),
+        peerUid,
+        guildId: '',
+      };
+      return { MsgId: msgId, Peer: peer };
     }
+    return undefined;
+  }
+
+  getShortIdByMsgId(msgId: string): number | undefined {
+    return this.msgIdMap.getValue(msgId);
+  }
+  getPeerByMsgId(msgId: string) {
+    const shortId = this.msgIdMap.getValue(msgId);
+    if (!shortId) return undefined;
+    return this.getMsgIdAndPeerByShortId(shortId);
+  }
+  resize(maxSize: number): void {
+    this.msgIdMap.resize(maxSize);
+    this.msgDataMap.resize(maxSize);
+  }
 }
 
-export const MessageUnique = new MessageUniqueWrapper();
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/Packet.ts

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

src/common/utils/QQBasicInfo.ts

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

src/common/utils/audio.ts

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

src/common/utils/db.ts

@@ -1,449 +0,0 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
-
-import sqlite3 from 'sqlite3';
-import { log, logDebug, logError } from '@/common/utils/log';
-import { NTQQMsgApi } from '@/core';
-import LRU from '@/common/utils/LRUCache';
-
-export interface IRember {
-  last_sent_time: number;
-  join_time: number;
-  user_id: number;
-}
-
-
-type DBMsg = {
-  id: number,
-  shortId: number,
-  longId: string,
-  seq: number,
-  peerUid: string,
-  chatType: number,
-}
-
-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;
-
-  async init(dbPath: string) {
-    if (this.db) {
-      return;
-    }
-    return new Promise<void>((resolve, reject) => {
-      this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
-        if (err) {
-          logError('Could not connect to database', err);
-          reject(err);
-          return;
-        }
-        this.createTable();
-        resolve();
-      });
-    });
-  }
-
-  protected createTable() {
-    throw new Error('Method not implemented.');
-  }
-
-  close() {
-    this.db?.close();
-  }
-}
-
-class DBUtil extends DBUtilBase {
-  private msgCache: Map<string | number, RawMessage> = new Map<string | number, RawMessage>();
-  private globalMsgShortId = -2147483640;
-  private groupIds: number[] = [];
-  private LURCache = new LRU<number>();
-  private LastSentCache = new (class {
-    private cache: { gid: number; uid: number }[] = [];
-    private maxSize: number;
-
-    constructor(maxSize: number = 5000) {
-      this.maxSize = maxSize;
-    }
-
-    get(gid: number, uid: number): boolean {
-      const exists = this.cache.some(
-        (entry) => entry.gid === gid && entry.uid === uid
-      );
-      if (!exists) {
-        this.cache.push({ gid, uid });
-        if (this.cache.length > this.maxSize) {
-          this.cache.shift();
-        }
-      }
-
-      return exists;
-    }
-  })();
-
-  constructor() {
-    super();
-    const interval = 1000 * 60 * 10;  // 10分钟清理一次缓存
-    setInterval(() => {
-      logDebug('清理消息缓存');
-      this.msgCache.forEach((msg, key) => {
-        if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
-          this.msgCache.delete(key);
-        }
-      });
-    }, interval);
-  }
-
-  async init(dbPath: string) {
-    await super.init(dbPath);
-    this.globalMsgShortId = await this.getCurrentMaxShortId();
-
-
-    // 初始化群缓存列表
-    this.db!.serialize(() => {
-      const sql = 'SELECT * FROM sqlite_master WHERE type=\'table\'';
-      this.db!.all(sql, [], (err, rows: { name: string }[]) => {
-        if (err) return logError(err);
-        rows.forEach((row) => this.groupIds.push(parseInt(row.name)));
-        //logDebug(`已加载 ${groupIds.length} 个群`);
-      });
-    });
-
-
-    this.LURCache.on(async (node) => {
-      const { value: time, groupId, userId } = node;
-
-      logDebug('插入发言时间', userId, groupId);
-      await this.createGroupInfoTimeTableIfNotExist(groupId);
-
-      const method = await this.getDataSetMethod(groupId, userId);
-      logDebug('插入发言时间方法判断', userId, groupId, method);
-
-      const sql =
-        method == 'update'
-          ? `UPDATE "${groupId}" SET last_sent_time = ? WHERE user_id = ?`
-          : `INSERT INTO "${groupId}" (last_sent_time, user_id)  VALUES (?, ?)`;
-
-      this.db!.all(sql, [time, userId], (err) => {
-        if (err) {
-          return logError('插入/更新发言时间失败', userId, groupId);
-        }
-        logDebug('插入/更新发言时间成功', userId, groupId);
-      });
-
-    });
-  }
-  async getDataSetMethod(groupId: number, userId: number) {
-    // 缓存记录
-    if (this.LastSentCache.get(groupId, userId)) {
-      logDebug('缓存命中', userId, groupId);
-      return 'update';
-    }
-
-    // 数据库判断
-    return new Promise<'insert' | 'update'>((resolve, reject) => {
-      this.db!.all(
-        `SELECT * FROM "${groupId}" WHERE user_id = ?`,
-        [userId],
-        (err, rows) => {
-          if (err) {
-            logError('查询发言时间存在失败', userId, groupId, err);
-            return logError('插入发言时间失败', userId, groupId, err);
-          }
-
-          if (rows.length === 0) {
-            logDebug('查询发言时间不存在', userId, groupId);
-            return resolve('insert');
-          }
-
-          logDebug('查询发言时间存在', userId, groupId);
-          resolve('update');
-        }
-      );
-    });
-  }
-  async createGroupInfoTimeTableIfNotExist(groupId: number) {
-    const createTableSQL = (groupId: number) =>
-      `CREATE TABLE IF NOT EXISTS "${groupId}" (
-            user_id INTEGER,
-            last_sent_time INTEGER,
-            join_time INTEGER,
-            PRIMARY KEY (user_id)
-        );`;
-
-    if (this.groupIds.includes(groupId)) {
-      return;
-    }
-    return new Promise((resolve, reject) => {
-      const sql = createTableSQL(groupId);
-      this.db!.all(sql, (err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        this.groupIds.push(groupId);
-        resolve(true);
-      });
-    });
-  }
-  protected createTable() {
-    // 消息记录
-    const createTableSQL = `
-            CREATE TABLE IF NOT EXISTS msgs (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                shortId INTEGER NOT NULL UNIQUE,
-                longId TEXT NOT NULL UNIQUE,
-                seq INTEGER NOT NULL,
-                peerUid TEXT NOT NULL,
-                chatType INTEGER NOT NULL
-            )`;
-    this.db!.run(createTableSQL, function (err) {
-      if (err) {
-        logError('Could not create table msgs', err.stack);
-      }
-    });
-
-    // 文件缓存
-    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) {
-        logError('Could not create table files', err);
-      }
-    });
-  }
-
-  private async getCurrentMaxShortId() {
-    return new Promise<number>((resolve, reject) => {
-      this.db!.get('SELECT MAX(shortId) as maxId FROM msgs', (err, row: { maxId: number }) => {
-        if (err) {
-          logDebug('Could not get max short id, Use default -2147483640', err);
-          return resolve(-2147483640);
-        }
-        logDebug('数据库中消息最大短id', row?.maxId);
-        resolve(row?.maxId ?? -2147483640);
-      });
-    });
-  }
-
-  private async getMsg(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<RawMessage | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBMsg) => {
-        // log("getMsg", row, err);
-        if (err) {
-          logError('Could not get msg', err, query, params);
-          return resolve(null);
-        }
-        if (!row) {
-          // logDebug('不存在数据库中的消息，不进行处理', query, params);
-          resolve(null);
-          return;
-        }
-        const msgId = row.longId;
-        NTQQMsgApi.getMsgsByMsgId({ peerUid: row.peerUid, chatType: row.chatType }, [msgId]).then(res => {
-          const msg = res.msgList[0];
-          if (!msg) {
-            resolve(null);
-            return;
-          }
-          msg.id = row.shortId;
-          resolve(msg);
-        }).catch(e => {
-          resolve(null);
-        });
-      });
-    });
-  }
-
-  async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
-    if (this.msgCache.has(shortId)) {
-      return this.msgCache.get(shortId)!;
-    }
-    const getStmt = 'SELECT * FROM msgs WHERE shortId = ?';
-    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 longId = ?', [longId]);
-  }
-
-  async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
-    const stmt = 'SELECT * FROM msgs WHERE peerUid = ? AND seq = ?';
-    return this.getMsg(stmt, [peerUid, seq]);
-  }
-
-  async addMsg(msg: RawMessage, update = true): Promise<number> {
-    const existMsg = await this.getMsgByLongId(msg.msgId);
-    if (existMsg) {
-      // logDebug('消息已存在，更新数据库', msg.msgId);
-      if (update) this.updateMsg(msg).then();
-      return existMsg.id!;
-    }
-    const stmt = this.db!.prepare('INSERT INTO msgs (shortId, longId, seq, peerUid, chatType) VALUES (?, ?, ?, ?, ?)');
-    // const runAsync = promisify(stmt.run.bind(stmt));
-    const shortId = ++this.globalMsgShortId;
-    msg.id = shortId;
-    //logDebug(`记录消息到数据库, 消息长id: ${msg.msgId}, 短id: ${msg.id}`);
-    this.msgCache.set(shortId, msg);
-    this.msgCache.set(msg.msgId, msg);
-    stmt.run(this.globalMsgShortId, msg.msgId, msg.msgSeq.toString(), msg.peerUid, msg.chatType, (err: any) => {
-      if (err) {
-        if (err.errno === 19) {
-          this.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
-            if (msg) {
-              this.msgCache.set(shortId, msg);
-              this.msgCache.set(msg.msgId, msg);
-              // logDebug('获取消息短id成功', msg.id);
-            } else {
-              logError('db could not get msg by long id', err);
-            }
-          }).catch(e => logError('db getMsgByLongId error', e));
-        } else {
-          logError('db could not add msg', err);
-        }
-      }
-    });
-    return shortId;
-  }
-
-  async updateMsg(msg: RawMessage) {
-    const existMsg = this.msgCache.get(msg.msgId);
-    if (existMsg) {
-      Object.assign(existMsg, msg);
-    }
-    //logDebug(`更新消息, shortId:${msg.id}, seq: ${msg.msgSeq}, msgId: ${msg.msgId}`);
-    const stmt = this.db!.prepare('UPDATE msgs SET seq=? WHERE longId=?');
-    stmt.run(msg.msgSeq, msg.msgId, (err: any) => {
-      if (err) {
-        logError('updateMsg db error', err);
-      }
-    });
-
-  }
-
-  async addFileCache(file: DBFile) {
-    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) {
-            logError('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) {
-          logError('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, file.uuid, function (err: any) {
-        if (err) {
-          logError('db could not update file cache', err);
-          reject(err);
-        }
-        resolve(null);
-      });
-    });
-  }
-
-  async getLastSentTimeAndJoinTime(
-    groupId: number
-  ): Promise<IRember[]> {
-    logDebug('读取发言时间', groupId);
-    return new Promise<IRember[]>((resolve, reject) => {
-      this.db!.all(`SELECT * FROM "${groupId}" `, (err, rows: IRember[]) => {
-        if (err) {
-          logError('查询发言时间失败', groupId);
-          return resolve([]);
-        }
-        logDebug('查询发言时间成功', groupId, rows);
-        resolve(rows);
-      });
-    });
-  }
-
-  insertLastSentTime(
-    groupId: number,
-    userId: number,
-    time: number
-  ) {
-    this.LURCache.set(groupId, userId, time);
-  }
-  async insertJoinTime(
-    groupId: number,
-    userId: number,
-    time: number
-  ) {
-    await this.createGroupInfoTimeTableIfNotExist(groupId);
-    this.db!.all(
-      `INSERT OR REPLACE INTO "${groupId}"  (user_id, last_sent_time, join_time) VALUES (?,?,?)`,
-      [userId, time, time],
-      (err) => {
-        if (err)
-          logError(err),
-          Promise.reject(),
-          logError('插入入群时间失败', userId, groupId);
-      }
-    );
-
-  }
-}
-
-
-export const dbUtil = new DBUtil();

src/common/utils/file.ts

@@ -1,12 +1,11 @@
 import fs from 'fs';
-import fsPromise from 'fs/promises';
+import fsPromise, { stat } from 'fs/promises';
 import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import { log, logError } from './log';
-import { dbUtil } from '@/common/utils/db';
 import * as fileType from 'file-type';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
@@ -50,7 +49,40 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
     check();
   });
 }
+// 定义一个异步函数来检查文件是否存在
+export async function checkFileReceived2(path: string, timeout: number = 3000): Promise<void> {
+  // 使用 Promise.race 来同时进行文件状态检查和超时计时
+  // Promise.race 会返回第一个解决（resolve）或拒绝（reject）的 Promise
+  await Promise.race([
+    checkFile(path),
+    timeoutPromise(timeout, `文件不存在: ${path}`),
+  ]);
+}
 
+// 转换超时时间至 Promise
+function timeoutPromise(timeout: number, errorMsg: string): Promise<void> {
+  return new Promise((_, reject) => {
+    setTimeout(() => {
+      reject(new Error(errorMsg));
+    }, timeout);
+  });
+}
+
+// 异步检查文件是否存在
+async function checkFile(path: string): Promise<void> {
+  try {
+    await stat(path);
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      // 如果文件不存在，则抛出一个错误
+      throw new Error(`文件不存在: ${path}`);
+    } else {
+      // 对于 stat 调用的其他错误，重新抛出
+      throw error;
+    }
+  }
+  // 如果文件存在，则无需做任何事情，Promise 解决（resolve）自身
+}
 export async function file2base64(path: string) {
   const readFile = util.promisify(fs.readFile);
   const result = {
@@ -115,6 +147,8 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
   };
   if (typeof options === 'string') {
     url = options;
+    const host = new URL(url).hostname;
+    headers['Host'] = host;
   } else {
     url = options.url;
     if (options.headers) {
@@ -125,7 +159,12 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, { headers });
+  const fetchRes = await fetch(url, { headers }).catch((err) => {
+    if (err.cause) {
+      throw err.cause;
+    }
+    throw err;
+  });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -142,7 +181,7 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, fileName: string | null = null): Promise<Uri2LocalRes> {
+export async function uri2local(UriOrPath: string, fileName: string | null = null): Promise<Uri2LocalRes> {
   const res = {
     success: false,
     errMsg: '',
@@ -151,26 +190,29 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     path: '',
     isLocal: false
   };
-  if (!fileName) {
-    fileName = uuidv4();
-  }
-  let filePath = path.join(getTempDir(), fileName);
+  if (!fileName) fileName = randomUUID();
+  let filePath = path.join(getTempDir(), fileName);//临时目录
   let url = null;
+  //区分path和uri
   try {
-    url = new URL(uri);
-  } catch (e: any) {
-    res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`;
+    if (fs.existsSync(UriOrPath)) url = new URL('file://' + UriOrPath);
+  } catch (error: any) { }
+  try {
+    url = new URL(UriOrPath);
+  } catch (error: any) { }
+
+  //验证url
+  if (!url) {
+    res.errMsg = `UriOrPath ${UriOrPath} 解析失败,可能${UriOrPath}不存在`;
     return res;
   }
 
-  // log("uri protocol", url.protocol, uri);
   if (url.protocol == 'base64:') {
     // base64转成文件
-    const base64Data = uri.split('base64://')[1];
+    const base64Data = UriOrPath.split('base64://')[1];
     try {
       const buffer = Buffer.from(base64Data, 'base64');
       fs.writeFileSync(filePath, buffer);
-
     } catch (e: any) {
       res.errMsg = 'base64文件下载失败,' + e.toString();
       return res;
@@ -179,7 +221,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     // 下载文件
     let buffer: Buffer | null = null;
     try {
-      buffer = await httpDownload(uri);
+      buffer = await httpDownload(UriOrPath);
     } catch (e: any) {
       res.errMsg = `${url}下载失败,` + e.toString();
       return res;
@@ -195,7 +237,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       }
       fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
       res.fileName = fileName;
-      filePath = path.join(getTempDir(), uuidv4() + fileName);
+      filePath = path.join(getTempDir(), randomUUID() + fileName);
       fs.writeFileSync(filePath, buffer);
     } catch (e: any) {
       res.errMsg = `${url}下载失败,` + e.toString();
@@ -211,15 +253,16 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       } else {
         filePath = pathname;
       }
-    } else {
-      const cache = await dbUtil.getFileCacheByName(uri);
-      if (cache) {
-        filePath = cache.path;
-      } else {
-        filePath = uri;
-      }
     }
-
+    else {
+      // 26702执行forword file文件操作 不应该在这里乱来
+      // const cache = await dbUtil.getFileCacheByName(uri);
+      // if (cache) {
+      //   filePath = cache.path;
+      // } else {
+      //   filePath = uri;
+      // }
+    }
     res.isLocal = true;
   }
   // else{

src/common/utils/helper.ts

@@ -1,17 +1,58 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import fs from 'fs/promises';
+import fs from 'fs';
 import { log, logDebug } from './log';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-
+import * as fsPromise from 'node:fs/promises';
+import os from 'node:os';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+
+//下面这个类是用于将uid+msgid合并的类
+export class UUIDConverter {
+  static encode(highStr: string, lowStr: string): string {
+    const high = BigInt(highStr);
+    const low = BigInt(lowStr);
+    const highHex = high.toString(16).padStart(16, '0');
+    const lowHex = low.toString(16).padStart(16, '0');
+    const combinedHex = highHex + lowHex;
+    const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(12, 16)}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+    return uuid;
+  }
+  static decode(uuid: string): { high: string, low: string } {
+    const hex = uuid.replace(/-/g, '');
+    const high = BigInt('0x' + hex.substring(0, 16));
+    const low = BigInt('0x' + hex.substring(16));
+    return { high: high.toString(), low: low.toString() };
+  }
+}
+
+
 export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
+  const timeoutPromise = new Promise<T>((_, reject) =>
+    setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms)
+  );
+  return Promise.race([promise, timeoutPromise]);
+}
+export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
+  const wrappedTasks = tasks.map(task =>
+    PromiseTimer(task, timeout).then(
+      result => ({ status: 'fulfilled', value: result }),
+      error => ({ status: 'rejected', reason: error })
+    )
+  );
+  const results = await Promise.all(wrappedTasks);
+  return results
+    .filter(result => result.status === 'fulfilled')
+    .map(result => (result as { status: 'fulfilled'; value: T }).value);
+}
+
 export function getMd5(s: string) {
 
   const h = crypto.createHash('md5');
@@ -43,8 +84,117 @@ export function truncateString(obj: any, maxLength = 500) {
   }
   return obj;
 }
+export function simpleDecorator(target: any, context: any) {
+}
 
+// export function CacheClassFunc(ttl: number = 3600 * 1000, customKey: string = '') {
+//   const cache = new Map<string, { expiry: number; value: any }>();
+//   return function CacheClassFuncDecorator(originalMethod: Function, context: ClassMethodDecoratorContext) {
+//     async function CacheClassFuncDecoratorInternal(this: any, ...args: any[]) {
+//       const key = `${customKey}${String(context.name)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+//       const cachedValue = cache.get(key);
+//       if (cachedValue && cachedValue.expiry > Date.now()) {
+//         return cachedValue.value;
+//       }
+//       const result = originalMethod.call(this, ...args);
+//       cache.set(key, { expiry: Date.now() + ttl, value: result });
+//       return result;
+//     }
+//     return CacheClassFuncDecoratorInternal;
+//   }
+// }
+export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = '') {
+  //console.log('CacheClassFuncAsync', ttl, customKey);
+  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
+    //console.log('logExecutionTime', target, methodName, descriptor);
+    const cache = new Map<string, { expiry: number; value: any }>();
+    const originalMethod = descriptor.value;
+    descriptor.value = async function (...args: any[]) {
+      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+      cache.forEach((value, key) => {
+        if (value.expiry < Date.now()) {
+          cache.delete(key);
+        }
+      });
+      const cachedValue = cache.get(key);
+      if (cachedValue && cachedValue.expiry > Date.now()) {
+        return cachedValue.value;
+      }
+      // const start = Date.now();
+      const result = await originalMethod.apply(this, args);
+      // const end = Date.now();
+      // console.log(`Method ${methodName} executed in ${end - start} ms.`);
+      cache.set(key, { expiry: Date.now() + ttl, value: result });
+      return result;
+    };
+  }
+  return logExecutionTime;
+}
+export function CacheClassFuncAsyncExtend(ttl: number = 3600 * 1000, customKey: string = '', checker: any = (...data: any[]) => { return true; }) {
+  //console.log('CacheClassFuncAsync', ttl, customKey);
+  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
+    //console.log('logExecutionTime', target, methodName, descriptor);
+    const cache = new Map<string, { expiry: number; value: any }>();
+    const originalMethod = descriptor.value;
+    descriptor.value = async function (...args: any[]) {
+      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+      cache.forEach((value, key) => {
+        if (value.expiry < Date.now()) {
+          cache.delete(key);
+        }
+      });
+      const cachedValue = cache.get(key);
+      if (cachedValue && cachedValue.expiry > Date.now()) {
+        return cachedValue.value;
+      }
+      // const start = Date.now();
+      const result = await originalMethod.apply(this, args);
+      if (!checker(...args, result)) {
+        return result;//丢弃缓存
+      }
+      // const end = Date.now();
+      // console.log(`Method ${methodName} executed in ${end - start} ms.`);
+      cache.set(key, { expiry: Date.now() + ttl, value: result });
+      return result;
+    };
+  }
+  return logExecutionTime;
+}
+// export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = ''): any {
+//   const cache = new Map<string, { expiry: number; value: any }>();
 
+//   // 注意：在JavaScript装饰器中，我们通常不直接处理ClassMethodDecoratorContext这样的类型，
+//   // 因为装饰器的参数通常是目标类（对于类装饰器）、属性名（对于属性装饰器）等。
+//   // 对于方法装饰器，我们关注的是方法本身及其描述符。
+//   // 但这里我们维持原逻辑，假设有一个自定义的处理上下文的方式。
+
+//   return function (originalMethod: Function): any {
+//     console.log(originalMethod);
+//     // 由于JavaScript装饰器原生不支持异步直接定义，我们保持async定义以便处理异步方法。
+//     async function decoratorWrapper(this: any, ...args: any[]): Promise<any> {
+//       console.log(...args);
+//       const key = `${customKey}${originalMethod.name}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
+//       const cachedValue = cache.get(key);
+//       // 遍历cache 清除expiry内容
+//       cache.forEach((value, key) => {
+//         if (value.expiry < Date.now()) {
+//           cache.delete(key);
+//         }
+//       });
+//       if (cachedValue && cachedValue.expiry > Date.now()) {
+//         return cachedValue.value;
+//       }
+
+//       // 直接await异步方法的结果
+//       const result = await originalMethod.apply(this, args);
+//       cache.set(key, { expiry: Date.now() + ttl, value: result });
+//       return result;
+//     }
+
+//     // 返回装饰后的方法，保持与原方法相同的名称和描述符（如果需要更精细的控制，可以考虑使用Object.getOwnPropertyDescriptor等）
+//     return decoratorWrapper;
+//   };
+// }
 
 /**
  * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
@@ -155,14 +305,14 @@ export function migrateConfig(oldConfig: any) {
 }
 // 升级旧的配置到新的
 export async function UpdateConfig() {
-  const configFiles = await fs.readdir(path.join(__dirname, 'config'));
+  const configFiles = await fsPromise.readdir(path.join(__dirname, 'config'));
   for (const file of configFiles) {
     if (file.match(/^onebot11_\d+.json$/)) {
-      const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      const CurrentConfig = JSON.parse(await fsPromise.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));
+        await fsPromise.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
       }
     }
   }
@@ -181,4 +331,75 @@ export function isEqual(obj1: any, obj2: any) {
     if (!isEqual(obj1[key], obj2[key])) return false;
   }
   return true;
-}
+}
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+  if (os.platform() === 'linux') {
+    return {
+      baseVersion: '3.2.12-26702',
+      curVersion: '3.2.12-26702',
+      prevVersion: '',
+      onErrorVersions: [],
+      buildId: '26702'
+    };
+  }
+  return {
+    baseVersion: '9.9.15-26702',
+    curVersion: '9.9.15-26702',
+    prevVersion: '',
+    onErrorVersions: [],
+    buildId: '26702'
+  };
+}
+export async function promisePipeline(promises: Promise<any>[], callback: (result: any) => boolean): Promise<void> {
+  let callbackCalled = false;
+  for (const promise of promises) {
+    if (callbackCalled) break;
+    try {
+      const result = await promise;
+      if (!callbackCalled) {
+        callbackCalled = callback(result);
+      }
+    } catch (error) {
+      console.error('Error in promise pipeline:', error);
+    }
+  }
+}
+
+export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
+  let configVersionInfoPath;
+  if (os.platform() !== 'linux') {
+    configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+  } else {
+    const userPath = os.homedir();
+    const appDataPath = path.resolve(userPath, './.config/QQ');
+    configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+  }
+  if (typeof configVersionInfoPath !== 'string') {
+    return undefined;
+  }
+  if (!fs.existsSync(configVersionInfoPath)) {
+    return undefined;
+  }
+  return configVersionInfoPath;
+}
+export async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
+  try {
+    const files = await fsPromise.readdir(directoryPath);
+
+    for (const file of files) {
+      const filePath = path.join(directoryPath, file);
+      const stats = await fsPromise.stat(filePath);
+      const lastModifiedTime = stats.mtimeMs;
+      const currentTime = Date.now();
+      const timeDifference = currentTime - lastModifiedTime;
+      const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
+
+      if (daysDifference > daysThreshold) {
+        await fsPromise.unlink(filePath); // Delete the file
+        //console.log(`Deleted: ${filePath}`);
+      }
+    }
+  } catch (error) {
+    //console.error('Error deleting files:', error);
+  }
+}

src/common/utils/log.ts

@@ -39,7 +39,7 @@ const logConfig: Configuration = {
     FileAppender: { // 输出到文件的appender
       type: 'file',
       filename: logPath, // 指定日志文件的位置和文件名
-      maxLoogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+      maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
       layout: {
         type: 'pattern',
         pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m'
@@ -91,8 +91,10 @@ export function enableConsoleLog(enable: boolean) {
 function formatMsg(msg: any[]) {
   let logMsg = '';
   for (const msgItem of msg) {
-    // 判断是否是对象
-    if (typeof msgItem === 'object') {
+    if (msgItem instanceof Error) { // 判断是否是错误
+      logMsg += msgItem.stack + ' ';
+      continue;
+    } else if (typeof msgItem === 'object') { // 判断是否是对象
       const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
       logMsg += JSON.stringify(truncateString(obj)) + ' ';
       continue;

src/common/utils/request.ts

@@ -1,12 +1,13 @@
 import https from 'node:https';
 import http from 'node:http';
-
+import { readFileSync } from 'node:fs';
+import { NTQQUserApi } from '@/core';
 export class RequestUtil {
   // 适用于获取服务器下发cookies时获取，仅GET
   static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
     const client = url.startsWith('https') ? https : http;
     return new Promise((resolve, reject) => {
-      client.get(url, (res) => {
+      const req = client.get(url, (res) => {
         let cookies: { [key: string]: string } = {};
         const handleRedirect = (res: http.IncomingMessage) => {
           //console.log(res.headers.location);
@@ -17,6 +18,8 @@ export class RequestUtil {
                 // 合并重定向过程中的cookies
                 cookies = { ...cookies, ...redirectCookies };
                 resolve(cookies);
+              }).catch((err) => {
+                reject(err);
               });
             } else {
               resolve(cookies);
@@ -40,16 +43,17 @@ export class RequestUtil {
             }
           });
         }
-      }).on('error', (err) => {
-        reject(err);
       });
+      req.on('error', (error: any) => {
+        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> {
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
     const option = new URL(url);
     const protocol = url.startsWith('https://') ? https : http;
     const options = {
@@ -59,6 +63,10 @@ export class RequestUtil {
       method: method,
       headers: headers
     };
+    // headers: {
+    //       'Content-Type': 'application/json',
+    //       'Content-Length': Buffer.byteLength(postData),
+    //     },
     return new Promise((resolve, reject) => {
       const req = protocol.request(options, (res: any) => {
         let responseBody = '';
@@ -100,7 +108,86 @@ export class RequestUtil {
   }
 
   // 请求返回都是原始内容
-  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}) {
+  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
     return this.HttpGetJson<string>(url, method, data, headers, false, false);
   }
-}
+
+  static async createFormData(boundary: string, filePath: string): Promise<Buffer> {
+    let type = 'image/png';
+    if (filePath.endsWith('.jpg')) {
+      type = 'image/jpeg';
+    }
+    const formDataParts = [
+      `------${boundary}\r\n`,
+      `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
+      'Content-Type: ' + type + '\r\n\r\n'
+    ];
+
+    const fileContent = readFileSync(filePath);
+    const footer = `\r\n------${boundary}--`;
+    return Buffer.concat([
+      Buffer.from(formDataParts.join(''), 'utf8'),
+      fileContent,
+      Buffer.from(footer, 'utf8')
+    ]);
+  }
+
+  static async uploadImageForOpenPlatform(filePath: string): Promise<string> {
+    return new Promise(async (resolve, reject) => {
+      type retType = { retcode: number, result?: { url: string } };
+      try {
+        const cookies = Object.entries(await NTQQUserApi.getCookies('connect.qq.com')).map(([key, value]) => `${key}=${value}`).join('; ');
+        const options = {
+          hostname: 'cgi.connect.qq.com',
+          port: 443,
+          path: '/qqconnectopen/upload_share_image',
+          method: 'POST',
+          headers: {
+            'Referer': 'https://cgi.connect.qq.com',
+            'Cookie': cookies,
+            'Accept': '*/*',
+            'Connection': 'keep-alive',
+            'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW'
+          }
+        };
+        const req = https.request(options, async (res) => {
+          let responseBody = '';
+
+          res.on('data', (chunk: string | Buffer) => {
+            responseBody += chunk.toString();
+          });
+
+          res.on('end', () => {
+            try {
+              if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                const responseJson = JSON.parse(responseBody) as retType;
+                resolve(responseJson.result!.url!);
+              } else {
+                reject(new Error(`Unexpected status code: ${res.statusCode}`));
+              }
+            } catch (parseError) {
+              reject(parseError);
+            }
+
+          });
+
+        });
+
+        req.on('error', (error) => {
+          reject(error);
+          console.error('Error during upload:', error);
+        });
+
+        const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
+        // req.setHeader('Content-Length', Buffer.byteLength(body));
+        // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
+        req.write(body);
+        req.end();
+        return;
+      } catch (error) {
+        reject(error);
+      }
+      return undefined;
+    });
+  }
+}

src/common/utils/system.ts

@@ -1,7 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 import { networkInterfaces } from 'os';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 
 // 缓解Win7设备兼容性问题
 let osName: string;
@@ -30,7 +30,7 @@ export async function getMachineId(): Promise<string> {
   if (!machineId) {
     machineId = (async () => {
       const id = await getMacMachineId();
-      return id || uuidv4(); // fallback, generate a UUID
+      return id || randomUUID(); // fallback, generate a UUID
     })();
   }
 

src/common/utils/type.ts

@@ -1,31 +1,17 @@
-/**
- * 运行时类型转换与检查类
- */
-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);
-  }
+//QQVersionType
+type QQPackageInfoType = {
+  version: string;
+  buildVersion: string;
+  platform: string;
+  eleArch: string;
 }
-
-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];
-  }
+type QQVersionConfigType = {
+  baseVersion: string;
+  curVersion: string;
+  prevVersion: string;
+  onErrorVersions: Array<any>;
+  buildId: string;
+}
+type QQAppidTableType = {
+  [key: string]: { appid: string, qua: string };
 }

src/common/utils/version.ts

@@ -4,10 +4,10 @@ export async function checkVersion(): Promise<string> {
   return new Promise(async (resolve, reject) => {
     const MirrorList =
       [
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
         'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
         'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-        'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
-        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
+        'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
       ];
     let version = undefined;
     for (const url of MirrorList) {

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

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

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

@@ -1 +0,0 @@
-function _0x2e29(){var _0x3f9d7f=['157053weZnyn','2pMtgjx','771432FIXglJ','1736820uhFOHF','964264PkpyVz','248XNmvWS','61137tNliPv','67501Oripge','getGroupCode','165575WShzhi','630HUlSaF'];_0x2e29=function(){return _0x3f9d7f;};return _0x2e29();}var _0x147761=_0x55a7;(function(_0x1f294a,_0x1c841d){var _0x1bcce1=_0x55a7,_0xe2330b=_0x1f294a();while(!![]){try{var _0xa7c05b=-parseInt(_0x1bcce1(0x1ee))/0x1+-parseInt(_0x1bcce1(0x1ed))/0x2*(parseInt(_0x1bcce1(0x1ec))/0x3)+parseInt(_0x1bcce1(0x1f0))/0x4+parseInt(_0x1bcce1(0x1f5))/0x5+parseInt(_0x1bcce1(0x1ef))/0x6+parseInt(_0x1bcce1(0x1f3))/0x7*(parseInt(_0x1bcce1(0x1f1))/0x8)+-parseInt(_0x1bcce1(0x1f2))/0x9*(-parseInt(_0x1bcce1(0x1eb))/0xa);if(_0xa7c05b===_0x1c841d)break;else _0xe2330b['push'](_0xe2330b['shift']());}catch(_0x332356){_0xe2330b['push'](_0xe2330b['shift']());}}}(_0x2e29,0x71f48));function _0x55a7(_0x628295,_0x4d9860){var _0x2e29b2=_0x2e29();return _0x55a7=function(_0x55a725,_0x1342b0){_0x55a725=_0x55a725-0x1eb;var _0x7f31b9=_0x2e29b2[_0x55a725];return _0x7f31b9;},_0x55a7(_0x628295,_0x4d9860);}export class DependsAdapter{['onMSFStatusChange'](_0x7fcf75,_0x3fc92f){}['onMSFSsoError'](_0x2d84fb){}[_0x147761(0x1f4)](_0x4eae47){}}

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

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

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

@@ -1 +0,0 @@
-var _0x428404=_0x3ddd;function _0x3ddd(_0x20963f,_0x5bd082){var _0x67c18=_0x67c1();return _0x3ddd=function(_0x3ddd66,_0x21959e){_0x3ddd66=_0x3ddd66-0x10e;var _0x43f343=_0x67c18[_0x3ddd66];return _0x43f343;},_0x3ddd(_0x20963f,_0x5bd082);}(function(_0x15e797,_0x41e172){var _0x3136f9=_0x3ddd,_0x4e73ed=_0x15e797();while(!![]){try{var _0x462ff5=parseInt(_0x3136f9(0x10f))/0x1*(-parseInt(_0x3136f9(0x112))/0x2)+-parseInt(_0x3136f9(0x117))/0x3*(-parseInt(_0x3136f9(0x114))/0x4)+parseInt(_0x3136f9(0x116))/0x5*(parseInt(_0x3136f9(0x118))/0x6)+parseInt(_0x3136f9(0x11a))/0x7*(-parseInt(_0x3136f9(0x113))/0x8)+-parseInt(_0x3136f9(0x110))/0x9*(parseInt(_0x3136f9(0x119))/0xa)+parseInt(_0x3136f9(0x10e))/0xb+parseInt(_0x3136f9(0x115))/0xc;if(_0x462ff5===_0x41e172)break;else _0x4e73ed['push'](_0x4e73ed['shift']());}catch(_0x53b9bc){_0x4e73ed['push'](_0x4e73ed['shift']());}}}(_0x67c1,0x91b53));function _0x67c1(){var _0x580e22=['10769693YQsZbr','6xWJxOR','9OmMNTI','dispatchCallWithJson','118540cLEoZl','4146616rtGYyv','8LIOqhx','6321276swLwSx','20QMlloS','498063uEoMXF','363522ufOASE','911330LXASnV','14HXtWyK'];_0x67c1=function(){return _0x580e22;};return _0x67c1();}export class DispatcherAdapter{['dispatchRequest'](_0x10b32a){}['dispatchCall'](_0x2af1fa){}[_0x428404(0x111)](_0x5ae585){}}

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

@@ -1,24 +0,0 @@
-interface IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-    onGetSrvCalTime(...args: unknown[]): void;
-    onShowErrUITips(...args: unknown[]): void;
-    fixPicImgType(...args: unknown[]): void;
-    getAppSetting(...args: unknown[]): void;
-    onInstallFinished(...args: unknown[]): void;
-    onUpdateGeneralFlag(...args: unknown[]): void;
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-export interface NodeIGlobalAdapter extends IGlobalAdapter {
-    new (adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-export declare class GlobalAdapter implements IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-    onGetSrvCalTime(...args: unknown[]): void;
-    onShowErrUITips(...args: unknown[]): void;
-    fixPicImgType(...args: unknown[]): void;
-    getAppSetting(...args: unknown[]): void;
-    onInstallFinished(...args: unknown[]): void;
-    onUpdateGeneralFlag(...args: unknown[]): void;
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-export {};

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

@@ -1 +0,0 @@
-var _0x12331c=_0x1b89;(function(_0x13d288,_0xc82705){var _0x27590a=_0x1b89,_0x39e81b=_0x13d288();while(!![]){try{var _0x78b2ad=-parseInt(_0x27590a(0x87))/0x1*(parseInt(_0x27590a(0x8b))/0x2)+parseInt(_0x27590a(0x94))/0x3*(parseInt(_0x27590a(0x8d))/0x4)+-parseInt(_0x27590a(0x84))/0x5+parseInt(_0x27590a(0x91))/0x6*(parseInt(_0x27590a(0x93))/0x7)+parseInt(_0x27590a(0x8a))/0x8*(parseInt(_0x27590a(0x88))/0x9)+-parseInt(_0x27590a(0x86))/0xa+parseInt(_0x27590a(0x95))/0xb;if(_0x78b2ad===_0xc82705)break;else _0x39e81b['push'](_0x39e81b['shift']());}catch(_0x2c8a82){_0x39e81b['push'](_0x39e81b['shift']());}}}(_0x3f52,0xd8537));function _0x1b89(_0x47fe65,_0x16511d){var _0x3f524b=_0x3f52();return _0x1b89=function(_0x1b895e,_0x35ca06){_0x1b895e=_0x1b895e-0x84;var _0x5cf9a9=_0x3f524b[_0x1b895e];return _0x5cf9a9;},_0x1b89(_0x47fe65,_0x16511d);}function _0x3f52(){var _0x52071e=['5954365uXmOGc','getAppSetting','6172970gqCqji','285148GXjAZv','81QCmJYQ','onGetSrvCalTime','34280OyVxgG','2loyWem','onInstallFinished','1236588LIbVlp','onGetOfflineMsg','onUpdateGeneralFlag','onLog','12naixoE','onShowErrUITips','5904458QojAPh','3lytwYt','10391579SHGTUz'];_0x3f52=function(){return _0x52071e;};return _0x3f52();}export class GlobalAdapter{[_0x12331c(0x90)](..._0x539419){}[_0x12331c(0x89)](..._0xa6fee8){}[_0x12331c(0x92)](..._0x19ebf6){}['fixPicImgType'](..._0x26f154){}[_0x12331c(0x85)](..._0x100aa9){}[_0x12331c(0x8c)](..._0x3ac4a2){}[_0x12331c(0x8f)](..._0x421558){}[_0x12331c(0x8e)](..._0x441583){}}

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

@@ -1 +0,0 @@
-(function(_0x2b5310,_0x59cdd4){var _0x3cddae=_0x2990,_0x478f72=_0x2b5310();while(!![]){try{var _0x22bdd2=parseInt(_0x3cddae(0x1d2))/0x1*(parseInt(_0x3cddae(0x1d3))/0x2)+-parseInt(_0x3cddae(0x1d5))/0x3*(-parseInt(_0x3cddae(0x1d8))/0x4)+-parseInt(_0x3cddae(0x1db))/0x5+-parseInt(_0x3cddae(0x1d4))/0x6*(parseInt(_0x3cddae(0x1d7))/0x7)+-parseInt(_0x3cddae(0x1d6))/0x8+-parseInt(_0x3cddae(0x1d9))/0x9+-parseInt(_0x3cddae(0x1da))/0xa*(-parseInt(_0x3cddae(0x1dc))/0xb);if(_0x22bdd2===_0x59cdd4)break;else _0x478f72['push'](_0x478f72['shift']());}catch(_0x5bfb27){_0x478f72['push'](_0x478f72['shift']());}}}(_0x29a1,0xaa850));function _0x2990(_0x468e49,_0x26c3b0){var _0x29a191=_0x29a1();return _0x2990=function(_0x29900d,_0x4ac60a){_0x29900d=_0x29900d-0x1d2;var _0x254939=_0x29a191[_0x29900d];return _0x254939;},_0x2990(_0x468e49,_0x26c3b0);}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x29a1(){var _0x44f37e=['9084131KlPxxQ','2777384hXKQkx','4632111wKYddt','1330NfPSJo','3737995TmsusY','192885juDJtu','77815wPWdYj','20nTlfsq','6YMvloe','3cCSDLO','4369536uFniCZ'];_0x29a1=function(){return _0x44f37e;};return _0x29a1();}export*from'./NodeIGlobalAdapter';

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

@@ -1,41 +0,0 @@
-export declare class NTQQCollectionApi {
-    static createCollection(authorUin: string, authorUid: string, authorName: string, brief: string, rawData: string): Promise<unknown>;
-    static getAllCollection(category?: number, count?: number): Promise<import("..").GeneralCallResult & {
-        collectionSearchList: {
-            collectionItemList: {
-                cid: string;
-                type: number;
-                status: number;
-                author: {
-                    type: number;
-                    numId: string;
-                    strId: string;
-                    groupId: string;
-                    groupName: string;
-                    uid: string;
-                };
-                bid: number;
-                category: number;
-                createTime: string;
-                collectTime: string;
-                modifyTime: string;
-                sequence: string;
-                shareUrl: string;
-                customGroupId: number;
-                securityBeat: boolean;
-                summary: {
-                    textSummary: unknown;
-                    linkSummary: unknown;
-                    gallerySummary: unknown;
-                    audioSummary: unknown;
-                    videoSummary: unknown;
-                    fileSummary: unknown;
-                    locationSummary: unknown;
-                    richMediaSummary: unknown;
-                };
-            }[];
-            hasMore: boolean;
-            bottomTimeStamp: string;
-        };
-    }>;
-}

src/core.lib/src/apis/collection.js

@@ -1 +0,0 @@
-const _0x31a1aa=_0x2e9c;function _0x2e9c(_0x4a5a11,_0x8a8f57){const _0x185e0b=_0x185e();return _0x2e9c=function(_0x2e9cf2,_0x5360b7){_0x2e9cf2=_0x2e9cf2-0x16e;let _0x4cedc9=_0x185e0b[_0x2e9cf2];return _0x4cedc9;},_0x2e9c(_0x4a5a11,_0x8a8f57);}(function(_0x1223c1,_0x36630f){const _0x37843f=_0x2e9c,_0x1298ec=_0x1223c1();while(!![]){try{const _0x27c51c=parseInt(_0x37843f(0x17c))/0x1+-parseInt(_0x37843f(0x173))/0x2+-parseInt(_0x37843f(0x175))/0x3+parseInt(_0x37843f(0x179))/0x4*(parseInt(_0x37843f(0x174))/0x5)+-parseInt(_0x37843f(0x17b))/0x6*(parseInt(_0x37843f(0x178))/0x7)+parseInt(_0x37843f(0x172))/0x8+parseInt(_0x37843f(0x17a))/0x9;if(_0x27c51c===_0x36630f)break;else _0x1298ec['push'](_0x1298ec['shift']());}catch(_0x2b319d){_0x1298ec['push'](_0x1298ec['shift']());}}}(_0x185e,0x1f560));function _0x185e(){const _0xeed159=['getAllCollection','createCollection','164488DsahmG','464118zROPrg','5AxnOzS','224145ewJWAU','session','getCollectionService','389977dlYMoi','336092bREVAB','2684376UnQGIE','12pYLQXF','143700SAIsfI','toString','createNewCollectionItem','now'];_0x185e=function(){return _0xeed159;};return _0x185e();}import{napCatCore}from'..';export class NTQQCollectionApi{static async[_0x31a1aa(0x171)](_0x38838c,_0x3c7fd7,_0x315cb3,_0x47d4c6,_0x546355){const _0x5b80b6=_0x31a1aa;let _0x4167aa={'commInfo':{'bid':0x1,'category':0x2,'author':{'type':0x1,'numId':_0x38838c,'strId':_0x315cb3,'groupId':'0','groupName':'','uid':_0x3c7fd7},'customGroupId':'0','createTime':Date['now']()[_0x5b80b6(0x17d)](),'sequence':Date[_0x5b80b6(0x16f)]()['toString']()},'richMediaSummary':{'originalUri':'','publisher':'','richMediaVersion':0x0,'subTitle':'','title':'','brief':_0x47d4c6,'picList':[],'contentType':0x1},'richMediaContent':{'rawData':_0x546355,'bizDataList':[],'picList':[],'fileList':[]},'need_share_url':![]};return napCatCore['session'][_0x5b80b6(0x177)]()[_0x5b80b6(0x16e)](_0x4167aa);}static async[_0x31a1aa(0x170)](_0xf05388=0x0,_0x4268b2=0x32){const _0x440634=_0x31a1aa;let _0xe3b2cc={'category':_0xf05388,'groupId':-0x1,'forceSync':!![],'forceFromDb':![],'timeStamp':'0','count':_0x4268b2,'searchDown':!![]};return napCatCore[_0x440634(0x176)]['getCollectionService']()['getCollectionItemList'](_0xe3b2cc);}}

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

@@ -1,38 +0,0 @@
-import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType, RawMessage } 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 getVideoUrl(msg: RawMessage, element: any): Promise<string>;
-    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 +0,0 @@
-import { User } from '@/core/entities';
-export declare class NTQQFriendApi {
-    static getFriends(forced?: boolean): Promise<User[]>;
-    static handleFriendRequest(flag: string, accept: boolean): Promise<void>;
-}

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

@@ -1 +0,0 @@
-function _0x23a3(_0x4b2b49,_0x4ef523){const _0x220079=_0x2200();return _0x23a3=function(_0x23a3b3,_0x3e015f){_0x23a3b3=_0x23a3b3-0x13f;let _0x4fa70a=_0x220079[_0x23a3b3];return _0x4fa70a;},_0x23a3(_0x4b2b49,_0x4ef523);}const _0x4f16f9=_0x23a3;function _0x2200(){const _0x349cf2=['3519uiKckB','handleFriendRequest','1312yAoeka','approvalFriendRequest','481150aVcAeQ','337249EOOZGH','split','3416dUjWMC','buddyList','CallNormalEvent','length','521388ECQlIm','kDEPP','241959zNmSPu','3530OWVGgw','1555014kUdrkm','getBuddyService','getFriends','NodeIKernelBuddyService/getBuddyList','8FQdBDH','bifRx'];_0x2200=function(){return _0x349cf2;};return _0x2200();}(function(_0xe2852a,_0x46568a){const _0x41eb76=_0x23a3,_0x2531aa=_0xe2852a();while(!![]){try{const _0x5c9caa=parseInt(_0x41eb76(0x146))/0x1+parseInt(_0x41eb76(0x14c))/0x2+parseInt(_0x41eb76(0x14e))/0x3*(parseInt(_0x41eb76(0x13f))/0x4)+-parseInt(_0x41eb76(0x145))/0x5+-parseInt(_0x41eb76(0x150))/0x6+parseInt(_0x41eb76(0x148))/0x7*(-parseInt(_0x41eb76(0x143))/0x8)+-parseInt(_0x41eb76(0x141))/0x9*(parseInt(_0x41eb76(0x14f))/0xa);if(_0x5c9caa===_0x46568a)break;else _0x2531aa['push'](_0x2531aa['shift']());}catch(_0x2860fc){_0x2531aa['push'](_0x2531aa['shift']());}}}(_0x2200,0x2d5c3));import{napCatCore}from'@/core';import{NTEventDispatch}from'@/common/utils/EventTask';export class NTQQFriendApi{static async[_0x4f16f9(0x152)](_0x537318=![]){const _0x201fca=_0x4f16f9,_0x36eb54={'FsHNj':_0x201fca(0x153),'kDEPP':'NodeIKernelBuddyListener/onBuddyListChange'};let [_0x2386a6,_0x184898]=await NTEventDispatch[_0x201fca(0x14a)](_0x36eb54['FsHNj'],_0x36eb54[_0x201fca(0x14d)],0x1,0x1388,_0x537318);const _0x335c65=[];for(const _0x2401f1 of _0x184898){for(const _0x2ee6bc of _0x2401f1[_0x201fca(0x149)]){_0x335c65['push'](_0x2ee6bc);}}return _0x335c65;}static async[_0x4f16f9(0x142)](_0x35da73,_0x833223){const _0x393db3=_0x4f16f9,_0x1e3a25={'bifRx':function(_0x37132e,_0x3d6d59){return _0x37132e<_0x3d6d59;}};let _0x1fd439=_0x35da73[_0x393db3(0x147)]('|');if(_0x1e3a25[_0x393db3(0x140)](_0x1fd439[_0x393db3(0x14b)],0x2))return;let _0x1ef202=_0x1fd439[0x0],_0x2ae89b=_0x1fd439[0x1];napCatCore['session'][_0x393db3(0x151)]()?.[_0x393db3(0x144)]({'friendUid':_0x1ef202,'reqTime':_0x2ae89b,'accept':_0x833223});}}

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

@@ -1,62 +0,0 @@
-import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
-import { GeneralCallResult } from '@/core';
-export declare class NTQQGroupApi {
-    static getGroups(forced?: boolean): Promise<Group[]>;
-    static getGroupRecommendContactArkJson(GroupCode: string): Promise<unknown>;
-    static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & {
-        resultWithGroupItem: {
-            result: any;
-            groupItem: any[];
-        };
-    }>;
-    static DelGroupFile(groupCode: string, files: string[]): Promise<GeneralCallResult & {
-        transGroupFileResult: {
-            result: any;
-            successFileIdList: any[];
-            failFileIdList: any[];
-        };
-    }>;
-    static DelGroupFileFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & {
-        groupFileCommonResult: {
-            retCode: number;
-            retMsg: string;
-            clientWording: string;
-        };
-    }>;
-    static getSingleScreenNotifies(num: number): Promise<GroupNotify[]>;
-    static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
-    static getGroupNotifies(): Promise<void>;
-    static GetGroupFileCount(Gids: Array<string>): Promise<GeneralCallResult & {
-        groupCodes: string[];
-        groupFileCounts: number[];
-    }>;
-    static getGroupIgnoreNotifies(): Promise<void>;
-    static getArkJsonGroupShare(GroupCode: string): Promise<string>;
-    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<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<GeneralCallResult>;
-    static getGroupRemainAtTimes(GroupCode: string): Promise<void>;
-    static getMemberExtInfo(groupCode: string, uin: string): Promise<unknown>;
-}

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

@@ -1 +0,0 @@
-(function(_0x56b802,_0x3068d4){var _0x433896=_0x34e7,_0x4b969f=_0x56b802();while(!![]){try{var _0x4597ba=-parseInt(_0x433896(0x1e9))/0x1*(-parseInt(_0x433896(0x1e3))/0x2)+parseInt(_0x433896(0x1e8))/0x3*(parseInt(_0x433896(0x1e1))/0x4)+-parseInt(_0x433896(0x1e4))/0x5*(-parseInt(_0x433896(0x1e0))/0x6)+parseInt(_0x433896(0x1e7))/0x7*(parseInt(_0x433896(0x1de))/0x8)+parseInt(_0x433896(0x1e2))/0x9*(-parseInt(_0x433896(0x1e6))/0xa)+parseInt(_0x433896(0x1e5))/0xb+-parseInt(_0x433896(0x1df))/0xc;if(_0x4597ba===_0x3068d4)break;else _0x4b969f['push'](_0x4b969f['shift']());}catch(_0x49bd24){_0x4b969f['push'](_0x4b969f['shift']());}}}(_0x5963,0xca7ca));export*from'./file';function _0x5963(){var _0x1fe349=['9782366mUkwaI','470IAMPKa','1322762htTQHt','3057HLvTxv','57wavOrP','40yZValc','27784044GLpyYN','492HCRHfV','1128BMaqfF','176535OkFDSk','26836dhRTsx','71970NvqLRN'];_0x5963=function(){return _0x1fe349;};return _0x5963();}export*from'./friend';export*from'./group';function _0x34e7(_0x56e151,_0x1ae8eb){var _0x596369=_0x5963();return _0x34e7=function(_0x34e773,_0x5bac2a){_0x34e773=_0x34e773-0x1de;var _0x5134f4=_0x596369[_0x34e773];return _0x5134f4;},_0x34e7(_0x56e151,_0x1ae8eb);}export*from'./msg';export*from'./user';export*from'./webapi';export*from'./sign';export*from'./system';

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

@@ -1,26 +0,0 @@
-import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
-import { GeneralCallResult } from '@/core/services/common';
-export declare class NTQQMsgApi {
-    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, z: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static activateChat(peer: Peer): Promise<void>;
-    static activateChatAndGetHistory(peer: Peer): Promise<void>;
-    static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
-    static getGroupFileList(GroupCode: string, params: GetFileListParam): Promise<any[]>;
-    static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static fetchRecentContact(): Promise<void>;
-    static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
-    static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
-    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
-    static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage>;
-}

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

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

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

@@ -1 +0,0 @@
-(function(_0x20e53,_0x44a671){const _0x3c4950=_0x36eb,_0x34461c=_0x20e53();while(!![]){try{const _0x5c8240=parseInt(_0x3c4950(0x1a0))/0x1*(parseInt(_0x3c4950(0x188))/0x2)+parseInt(_0x3c4950(0x180))/0x3*(parseInt(_0x3c4950(0x195))/0x4)+parseInt(_0x3c4950(0x186))/0x5+parseInt(_0x3c4950(0x1a4))/0x6+-parseInt(_0x3c4950(0x1ae))/0x7*(-parseInt(_0x3c4950(0x182))/0x8)+-parseInt(_0x3c4950(0x1aa))/0x9*(-parseInt(_0x3c4950(0x1a6))/0xa)+-parseInt(_0x3c4950(0x19f))/0xb;if(_0x5c8240===_0x44a671)break;else _0x34461c['push'](_0x34461c['shift']());}catch(_0x189fca){_0x34461c['push'](_0x34461c['shift']());}}}(_0x4e6a,0xafa06));import{logDebug}from'@/common/utils/log';function _0x36eb(_0x4f2b63,_0x26b195){const _0x4e6abf=_0x4e6a();return _0x36eb=function(_0x36eb97,_0x448a37){_0x36eb97=_0x36eb97-0x17e;let _0x3d85e5=_0x4e6abf[_0x36eb97];return _0x3d85e5;},_0x36eb(_0x4f2b63,_0x26b195);}function _0x4e6a(){const _0x2407c8=['caVLb','replace','Doxbh','4994395yxEciI','HttpGetJson','897902VHIRjp','&ark=','cPgyb','data','sourcelogo','genBkn','prompt','source','LzxyR','preview','MiniApp\x20JSON\x20消息生成失败','ymhUG',';\x20uin=o','4ivyqQP','tagIcon','rZcqb','JIdUf','lWUDk','GET','TxxNO','uin','getSkey','normal','26352326maANsU','2pcjBml','getQzoneCookies','NJbwP','signed_ark','1030902keiGdM','IzSFN','100pDSLId','tianxuan.imgJumpArk','com.tencent.miniapp.lua','\x5c/\x5c/','899523cMjMjb','tag','p_skey=','p_skey','3633dEAzgY','title','https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','49029afxtrc',';\x20p_uin=o','472ixjTBQ'];_0x4e6a=function(){return _0x2407c8;};return _0x4e6a();}import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';export async function SignMiniApp(_0xa48656){const _0x554623=_0x36eb,_0x43d22d={'NJbwP':_0x554623(0x1a8),'ymhUG':_0x554623(0x1a7),'jpHwD':_0x554623(0x19e),'rZcqb':_0x554623(0x1a9),'Doxbh':function(_0x44e41f,_0x22ebd6){return _0x44e41f+_0x22ebd6;},'mhWEc':_0x554623(0x1ac),'TxxNO':_0x554623(0x181),'lWUDk':_0x554623(0x194),'IzSFN':function(_0x50fd9f,_0x18c451){return _0x50fd9f+_0x18c451;},'JIdUf':_0x554623(0x17f),'PfhiY':_0x554623(0x189),'LzxyR':_0x554623(0x19a),'cPgyb':function(_0x3ac952,_0xc9d6a1,_0x3ff25b){return _0x3ac952(_0xc9d6a1,_0x3ff25b);},'caVLb':_0x554623(0x192)};let _0xf9d472={'app':_0x43d22d[_0x554623(0x1a2)],'bizsrc':_0x43d22d[_0x554623(0x193)],'view':'miniapp','prompt':_0xa48656[_0x554623(0x18e)],'config':{'type':_0x43d22d['jpHwD'],'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0xa48656[_0x554623(0x17e)],'preview':_0xa48656[_0x554623(0x191)][_0x554623(0x184)](/\\/g,'\x5c/\x5c/'),'jumpUrl':_0xa48656['jumpUrl'][_0x554623(0x184)](/\\/g,_0x43d22d[_0x554623(0x197)]),'tag':_0xa48656[_0x554623(0x1ab)],'tagIcon':_0xa48656[_0x554623(0x196)]['replace'](/\\/g,_0x43d22d[_0x554623(0x197)]),'source':_0xa48656[_0x554623(0x18f)],'sourcelogo':_0xa48656[_0x554623(0x18c)][_0x554623(0x184)](/\\/g,_0x43d22d[_0x554623(0x197)])}}};const _0x38ea06=await NTQQUserApi[_0x554623(0x19d)]();let _0x5c8356=await NTQQUserApi[_0x554623(0x1a1)]();const _0x211a50=WebApi[_0x554623(0x18d)](_0x5c8356[_0x554623(0x1ad)]),_0x48828b=_0x43d22d['Doxbh'](_0x43d22d[_0x554623(0x185)](_0x43d22d[_0x554623(0x185)](_0x43d22d[_0x554623(0x185)](_0x43d22d['mhWEc'],_0x5c8356['p_skey'])+';\x20skey=',_0x5c8356['skey']),_0x43d22d[_0x554623(0x19b)]),selfInfo['uin'])+_0x43d22d[_0x554623(0x199)]+selfInfo[_0x554623(0x19c)];let _0x508e46=_0x43d22d[_0x554623(0x185)](_0x43d22d['IzSFN'](_0x43d22d[_0x554623(0x1a5)](_0x43d22d[_0x554623(0x198)],_0x211a50),_0x43d22d['PfhiY']),encodeURIComponent(JSON['stringify'](_0xf9d472))),_0x35bdbd='';try{let _0x480b61=await RequestUtil[_0x554623(0x187)](_0x508e46,_0x43d22d[_0x554623(0x190)],undefined,{'Cookie':_0x48828b});_0x35bdbd=_0x480b61[_0x554623(0x18b)][_0x554623(0x1a3)];}catch(_0x5a463b){_0x43d22d[_0x554623(0x18a)](logDebug,_0x43d22d[_0x554623(0x183)],_0x5a463b);}return _0x35bdbd;}

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

@@ -1,12 +0,0 @@
-import { GeneralCallResult } from '@/core';
-export declare class NTQQSystemApi {
-    static hasOtherRunningQQProcess(): Promise<boolean>;
-    static ORCImage(filePath: string): Promise<GeneralCallResult>;
-    static translateEnWordToZn(words: string[]): Promise<GeneralCallResult & {
-        words: string[];
-    }>;
-    static getOnlineDev(): Promise<any>;
-    static getArkJsonCollection(cid: string): Promise<GeneralCallResult & {
-        arkJson: string;
-    }>;
-}

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

@@ -1 +0,0 @@
-function _0x1aa2(_0x50b9f0,_0x206954){const _0x2b3adb=_0x2b3a();return _0x1aa2=function(_0x1aa265,_0xd1bee5){_0x1aa265=_0x1aa265-0x1ef;let _0x2a8504=_0x2b3adb[_0x1aa265];return _0x2a8504;},_0x1aa2(_0x50b9f0,_0x206954);}const _0x5a5a43=_0x1aa2;(function(_0x43b903,_0x3abc81){const _0x1a7a83=_0x1aa2,_0x472404=_0x43b903();while(!![]){try{const _0x178a18=-parseInt(_0x1a7a83(0x1f0))/0x1*(-parseInt(_0x1a7a83(0x200))/0x2)+parseInt(_0x1a7a83(0x1f5))/0x3*(parseInt(_0x1a7a83(0x203))/0x4)+parseInt(_0x1a7a83(0x1f1))/0x5*(parseInt(_0x1a7a83(0x1f8))/0x6)+parseInt(_0x1a7a83(0x1f6))/0x7+-parseInt(_0x1a7a83(0x1fc))/0x8+parseInt(_0x1a7a83(0x201))/0x9*(-parseInt(_0x1a7a83(0x1f4))/0xa)+-parseInt(_0x1a7a83(0x1f9))/0xb;if(_0x178a18===_0x3abc81)break;else _0x472404['push'](_0x472404['shift']());}catch(_0x33b0f3){_0x472404['push'](_0x472404['shift']());}}}(_0x2b3a,0xd1349));import{NTEventDispatch}from'@/common/utils/EventTask';import{napCatCore}from'@/core';function _0x2b3a(){const _0x4920a9=['7099220IKmlna','5685HCyRrC','6314497XoDxyG','NodeIKernelCollectionService/collectionArkShare','2106FdNUXd','18051473GpEGII','CallNoListenerEvent','session','3424472KUllEx','util','ORCImage','getRichMediaService','1136334uICroi','9nOjnyb','hasOtherRunningQQProcess','2280ZMDaUl','getArkJsonCollection','translateEnWordToZn','2OqYySn','7370VVUjOo','wantWinScreenOCR','1717662698058'];_0x2b3a=function(){return _0x4920a9;};return _0x2b3a();}export class NTQQSystemApi{static async[_0x5a5a43(0x202)](){const _0xef17d5=_0x5a5a43;return napCatCore[_0xef17d5(0x1fd)][_0xef17d5(0x202)]();}static async[_0x5a5a43(0x1fe)](_0x12308a){const _0x36f1de=_0x5a5a43;return napCatCore[_0x36f1de(0x1fb)]['getNodeMiscService']()[_0x36f1de(0x1f2)](_0x12308a);}static async[_0x5a5a43(0x1ef)](_0x463fd3){const _0x3cdf28=_0x5a5a43;return napCatCore[_0x3cdf28(0x1fb)][_0x3cdf28(0x1ff)]()[_0x3cdf28(0x1ef)](_0x463fd3);}static async['getOnlineDev'](){const _0x3a2be7=_0x5a5a43;return napCatCore[_0x3a2be7(0x1fb)]['getMsgService']()['getOnLineDev']();}static async[_0x5a5a43(0x204)](_0xa29db4){const _0x1037a4=_0x5a5a43,_0x2362a9={'fZuJZ':_0x1037a4(0x1f7),'Udofx':_0x1037a4(0x1f3)};let _0x4dae41=await NTEventDispatch[_0x1037a4(0x1fa)](_0x2362a9['fZuJZ'],0x1388,_0x2362a9['Udofx']);return _0x4dae41;}}

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

@@ -1,31 +0,0 @@
-import { ModifyProfileParams, User, UserDetailInfoByUin } from '@/core/entities';
-import { GeneralCallResult } from '@/core';
-export declare class NTQQUserApi {
-    static setLongNick(longNick: string): Promise<unknown>;
-    static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
-    static getBuddyRecommendContactArkJson(uin: string, sencenID?: string): Promise<unknown>;
-    static like(uid: string, count?: number): Promise<{
-        result: number;
-        errMsg: string;
-        succCounts: number;
-    }>;
-    static setQQAvatar(filePath: string): Promise<{
-        result: number;
-        errMsg: string;
-    }>;
-    static getSelfInfo(): Promise<void>;
-    static getUserInfo(uid: string): Promise<void>;
-    static getUserDetailInfo(uid: string): Promise<User>;
-    static modifySelfProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
-    static getPSkey(domainList: string[], cached?: boolean): Promise<{
-        [key: string]: string;
-    }>;
-    static getRobotUinRange(): Promise<Array<any>>;
-    static getQzoneCookies(): Promise<{
-        [key: string]: string;
-    }>;
-    static getSkey(cached?: boolean): Promise<string | undefined>;
-    static getUidByUin(Uin: string): Promise<string | undefined>;
-    static getUinByUid(Uid: string | undefined): Promise<string | undefined>;
-    static getUserDetailInfoByUin(Uin: string): Promise<UserDetailInfoByUin>;
-}

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

@@ -1,105 +0,0 @@
-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

@@ -1,36 +0,0 @@
-/// <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

@@ -1,36 +0,0 @@
-import { type Friend, type Group, type GroupMember, GroupNotify, type SelfInfo, BuddyCategoryType } from './entities';
-import { WebApiGroupMember } from '@/core/apis';
-export declare const Credentials: {
-    Skey: string;
-    CreatTime: number;
-    Cookies: Map<string, string>;
-    ClientKey: string;
-    KeyIndex: string;
-    PskeyData: Map<string, string>;
-    PskeyTime: Map<string, number>;
-};
-export declare const WebGroupData: {
-    GroupData: Map<string, WebApiGroupMember[]>;
-    GroupTime: Map<string, number>;
-};
-export declare const selfInfo: SelfInfo;
-export declare const groups: Map<string, Group>;
-export declare function deleteGroup(groupQQ: string): void;
-export declare const groupMembers: Map<string, Map<string, GroupMember>>;
-export declare const friends: Map<string, Friend>;
-export declare const groupNotifies: Record<string, GroupNotify>;
-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 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

@@ -1 +0,0 @@
-(function(_0x27c2f6,_0x11d2ca){const _0x1836bf=_0x5db4,_0x10cbe0=_0x27c2f6();while(!![]){try{const _0x731586=-parseInt(_0x1836bf(0x19b))/0x1+parseInt(_0x1836bf(0x19e))/0x2*(parseInt(_0x1836bf(0x19f))/0x3)+-parseInt(_0x1836bf(0x1af))/0x4+parseInt(_0x1836bf(0x1a5))/0x5*(parseInt(_0x1836bf(0x1a0))/0x6)+parseInt(_0x1836bf(0x1aa))/0x7+parseInt(_0x1836bf(0x1a6))/0x8*(parseInt(_0x1836bf(0x1a9))/0x9)+-parseInt(_0x1836bf(0x1a3))/0xa*(parseInt(_0x1836bf(0x1ae))/0xb);if(_0x731586===_0x11d2ca)break;else _0x10cbe0['push'](_0x10cbe0['shift']());}catch(_0x258254){_0x10cbe0['push'](_0x10cbe0['shift']());}}}(_0x3cbb,0x7e5d6));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';function _0x3cbb(){const _0xe5d8fc=['3791709jQAmBt','4842915aHTYqb','toString','forEach','VXcxB','11pIVxfi','960136YhEOsB','get','mfDiD','delete','from','179856pKxjNF','set','length','18oHuPLS','232590lpKZBs','6cZtPjX','getGroupMembers','getGroups','12063530CcnjtC','values','1664585SBfDsv','8ljlqHt','find','uin'];_0x3cbb=function(){return _0xe5d8fc;};return _0x3cbb();}export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x322074){const _0x415f93=_0x5db4;groups[_0x415f93(0x199)](_0x322074),groupMembers[_0x415f93(0x199)](_0x322074);}export const groupMembers=new Map();export const friends=new Map();export const groupNotifies={};export async function getFriend(_0x473e79){const _0x53d80f=_0x5db4;_0x473e79=_0x473e79[_0x53d80f(0x1ab)]();if(isNumeric(_0x473e79)){const _0x1431c4=Array[_0x53d80f(0x19a)](friends[_0x53d80f(0x1a4)]());return _0x1431c4[_0x53d80f(0x1a7)](_0x4ebe66=>_0x4ebe66['uin']===_0x473e79);}else return friends[_0x53d80f(0x197)](_0x473e79);}export async function getGroup(_0x517675){const _0x35805a=_0x5db4;let _0x107e87=groups['get'](_0x517675[_0x35805a(0x1ab)]());if(!_0x107e87)try{const _0x55c042=await NTQQGroupApi[_0x35805a(0x1a2)]();_0x55c042[_0x35805a(0x19d)]&&_0x55c042[_0x35805a(0x1ac)](_0x6a1203=>{groups['set'](_0x6a1203['groupCode'],_0x6a1203);});}catch(_0x3c74a8){return undefined;}return _0x107e87=groups['get'](_0x517675[_0x35805a(0x1ab)]()),_0x107e87;}export async function getGroupMember(_0x1c4b88,_0x1ae479){const _0x148d29=_0x5db4,_0xcb04f6={'mfDiD':function(_0x34d378,_0x2bbc53){return _0x34d378(_0x2bbc53);},'VXcxB':function(_0x2452b3){return _0x2452b3();}};_0x1c4b88=_0x1c4b88[_0x148d29(0x1ab)](),_0x1ae479=_0x1ae479['toString']();let _0x42f835=groupMembers['get'](_0x1c4b88);if(!_0x42f835)try{_0x42f835=await NTQQGroupApi['getGroupMembers'](_0x1c4b88),groupMembers[_0x148d29(0x19c)](_0x1c4b88,_0x42f835);}catch(_0x774301){return null;}const _0x1f381e=()=>{const _0x24b812=_0x148d29;let _0x53e789=undefined;return _0xcb04f6[_0x24b812(0x198)](isNumeric,_0x1ae479)?_0x53e789=Array[_0x24b812(0x19a)](_0x42f835[_0x24b812(0x1a4)]())[_0x24b812(0x1a7)](_0x353f12=>_0x353f12[_0x24b812(0x1a8)]===_0x1ae479):_0x53e789=_0x42f835[_0x24b812(0x197)](_0x1ae479),_0x53e789;};let _0x10cc4a=_0xcb04f6['VXcxB'](_0x1f381e);return!_0x10cc4a&&(_0x42f835=await NTQQGroupApi[_0x148d29(0x1a1)](_0x1c4b88),_0x10cc4a=_0xcb04f6[_0x148d29(0x1ad)](_0x1f381e)),_0x10cc4a;}function _0x5db4(_0x66df28,_0x127c58){const _0x3cbb10=_0x3cbb();return _0x5db4=function(_0x5db406,_0x3ef3b8){_0x5db406=_0x5db406-0x197;let _0xf2eaf3=_0x3cbb10[_0x5db406];return _0xf2eaf3;},_0x5db4(_0x66df28,_0x127c58);}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

@@ -1 +0,0 @@
-(function(_0x5d59d3,_0x2e8fae){var _0x1bf3ff=_0x5cdf,_0x5a7576=_0x5d59d3();while(!![]){try{var _0x4e9f46=parseInt(_0x1bf3ff(0x137))/0x1*(parseInt(_0x1bf3ff(0x136))/0x2)+parseInt(_0x1bf3ff(0x133))/0x3+-parseInt(_0x1bf3ff(0x131))/0x4+parseInt(_0x1bf3ff(0x13a))/0x5+-parseInt(_0x1bf3ff(0x12f))/0x6*(-parseInt(_0x1bf3ff(0x139))/0x7)+-parseInt(_0x1bf3ff(0x12e))/0x8*(parseInt(_0x1bf3ff(0x129))/0x9)+-parseInt(_0x1bf3ff(0x12d))/0xa*(parseInt(_0x1bf3ff(0x13c))/0xb);if(_0x4e9f46===_0x2e8fae)break;else _0x5a7576['push'](_0x5a7576['shift']());}catch(_0x246536){_0x5a7576['push'](_0x5a7576['shift']());}}}(_0x4c16,0x9fab4));function _0x5cdf(_0x34552e,_0x47c61e){var _0x4c163d=_0x4c16();return _0x5cdf=function(_0x5cdf66,_0x1acbc9){_0x5cdf66=_0x5cdf66-0x129;var _0x5eadee=_0x4c163d[_0x5cdf66];return _0x5eadee;},_0x5cdf(_0x34552e,_0x47c61e);};function _0x4c16(){var _0x52c86c=['AUDIO','431211TtKEDe','OCOHq','DOCUMENT','8832834UEuRDk','IMAGE','OTHER','2|0|1|4|3','370nIEzXE','8oRNUuI','7662LZqKXA','VIDEO','1833312rfAyUE','XsgJx','2414547ZeNUBg','YGggh','rNNrm','6nBrXeG','203493kboEFa','qNfvT','7035VkweyR','4227410CkGzUV'];_0x4c16=function(){return _0x52c86c;};return _0x4c16();}export var CacheFileType;(function(_0x37c57a){var _0xf6bd6c=_0x5cdf,_0x25e57b={'rNNrm':_0xf6bd6c(0x12c),'baxRs':_0xf6bd6c(0x130),'OCOHq':_0xf6bd6c(0x13b),'XsgJx':_0xf6bd6c(0x12a),'YGggh':_0xf6bd6c(0x12b),'qNfvT':_0xf6bd6c(0x13e)},_0x4cd544=_0x25e57b[_0xf6bd6c(0x135)]['split']('|'),_0x4147b1=0x0;while(!![]){switch(_0x4cd544[_0x4147b1++]){case'0':_0x37c57a[_0x37c57a[_0xf6bd6c(0x130)]=0x1]=_0x25e57b['baxRs'];continue;case'1':_0x37c57a[_0x37c57a[_0x25e57b[_0xf6bd6c(0x13d)]]=0x2]=_0xf6bd6c(0x13b);continue;case'2':_0x37c57a[_0x37c57a[_0x25e57b['XsgJx']]=0x0]=_0x25e57b[_0xf6bd6c(0x132)];continue;case'3':_0x37c57a[_0x37c57a[_0x25e57b[_0xf6bd6c(0x134)]]=0x4]=_0xf6bd6c(0x12b);continue;case'4':_0x37c57a[_0x37c57a[_0x25e57b[_0xf6bd6c(0x138)]]=0x3]=_0x25e57b['qNfvT'];continue;}break;}}(CacheFileType||(CacheFileType={})));

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

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

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

@@ -1,52 +0,0 @@
-import { QQLevel, Sex } from './user';
-export interface Group {
-    groupCode: string;
-    maxMember: number;
-    memberCount: number;
-    groupName: string;
-    groupStatus: 0;
-    memberRole: 2;
-    isTop: boolean;
-    toppedTimestamp: string;
-    privilegeFlag: number;
-    isConf: boolean;
-    hasModifyConfGroupFace: boolean;
-    hasModifyConfGroupName: boolean;
-    remarkName: string;
-    hasMemo: boolean;
-    groupShutupExpireTime: string;
-    personShutupExpireTime: string;
-    discussToGroupUin: string;
-    discussToGroupMaxMsgSeq: number;
-    discussToGroupTime: number;
-    groupFlagExt: number;
-    authGroupType: number;
-    groupCreditLevel: number;
-    groupFlagExt3: number;
-    groupOwnerId: {
-        memberUin: string;
-        memberUid: string;
-    };
-}
-export declare enum GroupMemberRole {
-    normal = 2,
-    admin = 3,
-    owner = 4
-}
-export interface GroupMember {
-    memberSpecialTitle?: string;
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: GroupMemberRole;
-    shutUpTime: number;
-    uid: string;
-    uin: string;
-    isRobot: boolean;
-    sex?: Sex;
-    qqLevel?: QQLevel;
-}

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

@@ -1 +0,0 @@
-(function(_0x1a11d1,_0x31b858){var _0x1aa00c=_0x45c9,_0x519dea=_0x1a11d1();while(!![]){try{var _0x2d14b1=parseInt(_0x1aa00c(0x1bd))/0x1+-parseInt(_0x1aa00c(0x1b6))/0x2*(parseInt(_0x1aa00c(0x1b7))/0x3)+parseInt(_0x1aa00c(0x1bb))/0x4+-parseInt(_0x1aa00c(0x1ba))/0x5+-parseInt(_0x1aa00c(0x1b9))/0x6*(-parseInt(_0x1aa00c(0x1ae))/0x7)+parseInt(_0x1aa00c(0x1b2))/0x8*(-parseInt(_0x1aa00c(0x1b5))/0x9)+-parseInt(_0x1aa00c(0x1b0))/0xa*(-parseInt(_0x1aa00c(0x1b3))/0xb);if(_0x2d14b1===_0x31b858)break;else _0x519dea['push'](_0x519dea['shift']());}catch(_0x1b203b){_0x519dea['push'](_0x519dea['shift']());}}}(_0x358c,0x53f4f));function _0x358c(){var _0x53b6b8=['63ZMapDa','OalwL','2710yVQfke','hSEiv','48320jVQztk','40733YAaZfg','owner','864KfKuln','30dpcGBL','132495wGCTOc','NPyIP','114066dnysbl','1662105CaSVoO','739904gDQDuY','normal','559035MFaXqE'];_0x358c=function(){return _0x53b6b8;};return _0x358c();}function _0x45c9(_0x2bbc5a,_0x118dc4){var _0x358c46=_0x358c();return _0x45c9=function(_0x45c98b,_0x284f66){_0x45c98b=_0x45c98b-0x1ae;var _0x456dbe=_0x358c46[_0x45c98b];return _0x456dbe;},_0x45c9(_0x2bbc5a,_0x118dc4);}export var GroupMemberRole;(function(_0x33a765){var _0x2be560=_0x45c9,_0x11c1fc={'hSEiv':_0x2be560(0x1bc),'NPyIP':'admin','OalwL':_0x2be560(0x1b4)};_0x33a765[_0x33a765[_0x11c1fc[_0x2be560(0x1b1)]]=0x2]=_0x11c1fc[_0x2be560(0x1b1)],_0x33a765[_0x33a765['admin']=0x3]=_0x11c1fc[_0x2be560(0x1b8)],_0x33a765[_0x33a765[_0x11c1fc[_0x2be560(0x1af)]]=0x4]=_0x2be560(0x1b4);}(GroupMemberRole||(GroupMemberRole={})));

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

@@ -1 +0,0 @@
-function _0x88da(_0x3855ae,_0x2a3933){var _0x593c32=_0x593c();return _0x88da=function(_0x88da6,_0xdae7b1){_0x88da6=_0x88da6-0x7f;var _0x1b165e=_0x593c32[_0x88da6];return _0x1b165e;},_0x88da(_0x3855ae,_0x2a3933);}(function(_0x1a4961,_0x240a4a){var _0x1a9e38=_0x88da,_0x3a6455=_0x1a4961();while(!![]){try{var _0x425026=parseInt(_0x1a9e38(0x86))/0x1*(parseInt(_0x1a9e38(0x89))/0x2)+-parseInt(_0x1a9e38(0x82))/0x3*(parseInt(_0x1a9e38(0x87))/0x4)+-parseInt(_0x1a9e38(0x7f))/0x5+-parseInt(_0x1a9e38(0x88))/0x6*(parseInt(_0x1a9e38(0x84))/0x7)+parseInt(_0x1a9e38(0x85))/0x8*(parseInt(_0x1a9e38(0x81))/0x9)+-parseInt(_0x1a9e38(0x80))/0xa+parseInt(_0x1a9e38(0x83))/0xb;if(_0x425026===_0x240a4a)break;else _0x3a6455['push'](_0x3a6455['shift']());}catch(_0x3de0fa){_0x3a6455['push'](_0x3a6455['shift']());}}}(_0x593c,0xea5ab));export*from'./user';export*from'./group';export*from'./msg';export*from'./notify';function _0x593c(){var _0xde6bc0=['7284936tfUPog','197781yfVQTr','7796OwdHow','6UKCzyU','18Gaibsv','1566745nBHsnb','16110570ngQMQI','9jKyJUN','237kuJOnR','5940583FftUwa','1346849DSsRYz'];_0x593c=function(){return _0xde6bc0;};return _0x593c();}export*from'./cache';export*from'./constructor';

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

@@ -1,455 +0,0 @@
-import { GroupMemberRole } from './group';
-export interface Peer {
-    chatType: ChatType;
-    peerUid: string;
-    guildId?: string;
-}
-export interface KickedOffLineInfo {
-    appId: number;
-    instanceId: number;
-    sameDevice: boolean;
-    tipsDesc: string;
-    tipsTitle: string;
-    kickedType: number;
-    securityKickedType: number;
-}
-export interface GetFileListParam {
-    sortType: number;
-    fileCount: number;
-    startIndex: number;
-    sortOrder: number;
-    showOnlinedocFolder: number;
-}
-export declare enum ElementType {
-    TEXT = 1,
-    PIC = 2,
-    FILE = 3,
-    PTT = 4,
-    VIDEO = 5,
-    FACE = 6,
-    REPLY = 7,
-    ARK = 10,
-    MFACE = 11,
-    MARKDOWN = 14
-}
-export interface SendTextElement {
-    elementType: ElementType.TEXT;
-    elementId: string;
-    textElement: {
-        content: string;
-        atType: number;
-        atUid: string;
-        atTinyId: string;
-        atNtUid: string;
-    };
-}
-export interface SendPttElement {
-    elementType: ElementType.PTT;
-    elementId: string;
-    pttElement: {
-        fileName: string;
-        filePath: string;
-        md5HexStr: string;
-        fileSize: number;
-        duration: number;
-        formatType: number;
-        voiceType: number;
-        voiceChangeType: number;
-        canConvert2Text: boolean;
-        waveAmplitudes: number[];
-        fileSubId: string;
-        playState: number;
-        autoConvertText: number;
-    };
-}
-export declare enum PicType {
-    gif = 2000,
-    jpg = 1000
-}
-export declare enum PicSubType {
-    normal = 0,// 普通图片，大图
-    face = 1
-}
-export interface SendPicElement {
-    elementType: ElementType.PIC;
-    elementId: string;
-    picElement: {
-        md5HexStr: string;
-        fileSize: number | string;
-        picWidth: number;
-        picHeight: number;
-        fileName: string;
-        sourcePath: string;
-        original: boolean;
-        picType: PicType;
-        picSubType: PicSubType;
-        fileUuid: string;
-        fileSubId: string;
-        thumbFileSize: number;
-        summary: string;
-    };
-}
-export interface SendReplyElement {
-    elementType: ElementType.REPLY;
-    elementId: string;
-    replyElement: {
-        replayMsgSeq: string;
-        replayMsgId: string;
-        senderUin: string;
-        senderUinStr: string;
-    };
-}
-export interface SendFaceElement {
-    elementType: ElementType.FACE;
-    elementId: string;
-    faceElement: FaceElement;
-}
-export interface SendMarketFaceElement {
-    elementType: ElementType.MFACE;
-    marketFaceElement: MarketFaceElement;
-}
-export interface FileElement {
-    fileMd5?: string;
-    fileName: string;
-    filePath: string;
-    fileSize: string;
-    picHeight?: number;
-    picWidth?: number;
-    folderId?: string;
-    picThumbPath?: Map<number, string>;
-    file10MMd5?: string;
-    fileSha?: string;
-    fileSha3?: string;
-    fileUuid?: string;
-    fileSubId?: string;
-    thumbFileSize?: number;
-    fileBizId?: number;
-}
-export interface SendFileElement {
-    elementType: ElementType.FILE;
-    elementId: string;
-    fileElement: FileElement;
-}
-export interface SendVideoElement {
-    elementType: ElementType.VIDEO;
-    elementId: string;
-    videoElement: VideoElement;
-}
-export interface SendArkElement {
-    elementType: ElementType.ARK;
-    elementId: string;
-    arkElement: ArkElement;
-}
-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,
-    atUser = 2
-}
-export declare enum ChatType {
-    friend = 1,
-    group = 2,
-    chatDevice = 8,//移动设备?
-    temp = 100
-}
-export declare enum ChatType2 {
-    KCHATTYPEADELIE = 42,
-    KCHATTYPEBUDDYNOTIFY = 5,
-    KCHATTYPEC2C = 1,
-    KCHATTYPECIRCLE = 113,
-    KCHATTYPEDATALINE = 8,
-    KCHATTYPEDATALINEMQQ = 134,
-    KCHATTYPEDISC = 3,
-    KCHATTYPEFAV = 41,
-    KCHATTYPEGAMEMESSAGE = 105,
-    KCHATTYPEGAMEMESSAGEFOLDER = 116,
-    KCHATTYPEGROUP = 2,
-    KCHATTYPEGROUPBLESS = 133,
-    KCHATTYPEGROUPGUILD = 9,
-    KCHATTYPEGROUPHELPER = 7,
-    KCHATTYPEGROUPNOTIFY = 6,
-    KCHATTYPEGUILD = 4,
-    KCHATTYPEGUILDMETA = 16,
-    KCHATTYPEMATCHFRIEND = 104,
-    KCHATTYPEMATCHFRIENDFOLDER = 109,
-    KCHATTYPENEARBY = 106,
-    KCHATTYPENEARBYASSISTANT = 107,
-    KCHATTYPENEARBYFOLDER = 110,
-    KCHATTYPENEARBYHELLOFOLDER = 112,
-    KCHATTYPENEARBYINTERACT = 108,
-    KCHATTYPEQQNOTIFY = 132,
-    KCHATTYPERELATEACCOUNT = 131,
-    KCHATTYPESERVICEASSISTANT = 118,
-    KCHATTYPESERVICEASSISTANTSUB = 201,
-    KCHATTYPESQUAREPUBLIC = 115,
-    KCHATTYPESUBSCRIBEFOLDER = 30,
-    KCHATTYPETEMPADDRESSBOOK = 111,
-    KCHATTYPETEMPBUSSINESSCRM = 102,
-    KCHATTYPETEMPC2CFROMGROUP = 100,
-    KCHATTYPETEMPC2CFROMUNKNOWN = 99,
-    KCHATTYPETEMPFRIENDVERIFY = 101,
-    KCHATTYPETEMPNEARBYPRO = 119,
-    KCHATTYPETEMPPUBLICACCOUNT = 103,
-    KCHATTYPETEMPWPA = 117,
-    KCHATTYPEUNKNOWN = 0,
-    KCHATTYPEWEIYUN = 40
-}
-export interface PttElement {
-    canConvert2Text: boolean;
-    duration: number;
-    fileBizId: null;
-    fileId: number;
-    fileName: string;
-    filePath: string;
-    fileSize: string;
-    fileSubId: string;
-    fileUuid: string;
-    formatType: string;
-    invalidState: number;
-    md5HexStr: string;
-    playState: number;
-    progress: number;
-    text: string;
-    transferStatus: number;
-    translateStatus: number;
-    voiceChangeType: number;
-    voiceType: number;
-    waveAmplitudes: number[];
-}
-export interface ArkElement {
-    bytesData: string;
-    linkInfo: null;
-    subElementType: null;
-}
-export declare const IMAGE_HTTP_HOST = "https://gchat.qpic.cn";
-export declare const IMAGE_HTTP_HOST_NT = "https://multimedia.nt.qq.com.cn";
-export interface PicElement {
-    originImageUrl: string;
-    originImageMd5?: string;
-    sourcePath: string;
-    thumbPath: Map<number, string>;
-    picWidth: number;
-    picHeight: number;
-    fileSize: number;
-    fileName: string;
-    fileUuid: string;
-    md5HexStr?: string;
-}
-export declare enum GrayTipElementSubType {
-    INVITE_NEW_MEMBER = 12,
-    MEMBER_NEW_TITLE = 17
-}
-export interface GrayTipElement {
-    subElementType: GrayTipElementSubType;
-    revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;
-    };
-    aioOpGrayTipElement: TipAioOpGrayTipElement;
-    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: FaceType;
-    faceText?: string;
-    packId?: string;
-    stickerId?: string;
-    sourceType?: number;
-    stickerType?: number;
-    resultId?: string;
-    surpriseId?: string;
-    randomType?: number;
-}
-export interface MarketFaceElement {
-    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?: string;
-    fileBizId?: null;
-    originVideoMd5?: string;
-    import_rich_media_context?: null;
-    sourceVideoCodecFormat?: number;
-}
-export declare enum viedo_type {
-    VIDEO_FORMAT_AFS = 7,
-    VIDEO_FORMAT_AVI = 1,
-    VIDEO_FORMAT_MKV = 4,
-    VIDEO_FORMAT_MOD = 9,
-    VIDEO_FORMAT_MOV = 8,
-    VIDEO_FORMAT_MP4 = 2,
-    VIDEO_FORMAT_MTS = 11,
-    VIDEO_FORMAT_RM = 6,
-    VIDEO_FORMAT_RMVB = 5,
-    VIDEO_FORMAT_TS = 10,
-    VIDEO_FORMAT_WMV = 3
-}
-export interface MarkdownElement {
-    content: string;
-}
-export interface InlineKeyboardElementRowButton {
-    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: [
-        {
-            buttons: InlineKeyboardElementRowButton[];
-        }
-    ];
-}
-export interface TipAioOpGrayTipElement {
-    operateType: number;
-    peerUid: string;
-    fromGrpCodeOfTmpChat: string;
-}
-export declare enum TipGroupElementType {
-    memberIncrease = 1,
-    kicked = 3,// 被移出群
-    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;
-    };
-    shutUp?: {
-        curTime: string;
-        duration: string;
-        admin: {
-            uid: string;
-            card: string;
-            name: string;
-            role: GroupMemberRole;
-        };
-        member: {
-            uid: string;
-            card: string;
-            name: string;
-            role: GroupMemberRole;
-        };
-    };
-}
-export interface MultiForwardMsgElement {
-    xmlContent: string;
-    resId: string;
-    fileName: string;
-}
-export interface RawMessage {
-    id?: number;
-    msgId: string;
-    msgTime: string;
-    msgSeq: string;
-    msgType: number;
-    subMsgType: number;
-    senderUid: string;
-    senderUin: string;
-    peerUid: string;
-    peerUin: string;
-    sendNickName: string;
-    sendMemberName?: string;
-    chatType: ChatType;
-    sendStatus?: number;
-    recallTime: string;
-    elements: {
-        elementId: string;
-        elementType: ElementType;
-        replyElement: {
-            senderUid: string;
-            sourceMsgIsIncPic: boolean;
-            sourceMsgText: string;
-            replayMsgSeq: string;
-        };
-        textElement: {
-            atType: AtType;
-            atUid: string;
-            content: string;
-            atNtUid: string;
-        };
-        picElement: PicElement;
-        pttElement: PttElement;
-        arkElement: ArkElement;
-        grayTipElement: GrayTipElement;
-        faceElement: FaceElement;
-        videoElement: VideoElement;
-        fileElement: FileElement;
-        marketFaceElement: MarketFaceElement;
-        inlineKeyboardElement: InlineKeyboardElement;
-        markdownElement: MarkdownElement;
-        multiForwardMsgElement: MultiForwardMsgElement;
-    }[];
-}