fix: search file

fix[config]support overwrite by user #145

.editorconfig

@@ -5,7 +5,7 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
-end_of_line = lf|crlf
+end_of_line = lf
 insert_final_newline = true
 
 # Matches multiple files with brace expansion notation

.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

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

.gitmodules

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

docs/changelogs/CHANGELOG.v1.6.8.md

@@ -0,0 +1,20 @@
+# v1.6.8
+
+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. 移除数据库文件读写 ~ 优化性能
+2. 重构消息发送 极限速度优化 ~ 优化性能
+3. WebUi配置热重载优化 ~ 修复问题
+4. 修复偶现崩溃问题 ~ 修复问题
+
+## 新增与调整
+1. 最后发言时间重构 入群时间失效 ~ 替换功能
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

docs/develop/Image.NTAndroid.md

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

docs/develop/Msg常量NTAndroid.md

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

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

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

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

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.4.6",
+  "version": "1.6.8",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
@@ -18,16 +18,21 @@
     "depend": "cd dist && npm install --omit=dev"
   },
   "devDependencies": {
+    "@babel/core": "^7.24.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
     "@log4js-node/log4js-api": "^1.0.2",
+    "@protobuf-ts/plugin": "^2.9.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.30",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -41,13 +46,14 @@
     "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",
-    "@protobuf-ts/plugin": "^2.9.4"
+    "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
     "ajv": "^8.13.0",
+    "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "cors": "^2.8.5",
     "express": "^5.0.0-beta.2",
@@ -58,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 $params}"

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();

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,7 +28,25 @@ export class WebsocketServerBase {
   constructor() {
   }
 
-  start(port: number, host: string = '') {
+  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,
@@ -39,6 +58,7 @@ export class WebsocketServerBase {
       } catch (e: any) {
         throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
       }
+    }
     this.ws.on('connection', (wsClient, req) => {
       const url: string = req.url!.split('?').shift() || '/';
       this.authorize(wsClient, req);
@@ -50,11 +70,13 @@ export class WebsocketServerBase {
   }
 
   stop() {
-    this.ws && this.ws.close((err) => {
-      log('ws server close failed!', err);
+    if (this.ws) {
+      this.ws.close((err) => {
+        if (err) log('ws server close failed!', err);
       });
       this.ws = null;
     }
+  }
 
   restart(port: number) {
     this.stop();

src/common/utils/AsyncQueue.ts

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

src/common/utils/ConfigBase.ts

@@ -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);
@@ -13,7 +14,8 @@ fs.mkdirSync(configDir, { recursive: true });
 
 
 export class ConfigBase<T> {
-
+  public name: string = 'default_config'
+  private pathName: string | null = null // 本次读取的文件路径
   constructor() {
   }
 
@@ -27,13 +29,22 @@ export class ConfigBase<T>{
     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)) {
+      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,11 +1,11 @@
-import { NodeIKernelMsgListener } from "@/core";
-import { NodeIQQNTWrapperSession } from "@/core/wrapper";
-import { randomUUID } from "crypto";
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
 
 interface Internal_MapKey {
   timeout: number,
   createtime: number,
-    func: Function
+  func: (...arg: any[]) => any,
+  checker: ((...args: any[]) => boolean) | undefined,
 }
 
 export class ListenerClassBase {
@@ -27,7 +27,8 @@ export class NTEventWrapper {
 
   }
   createProxyDispatch(ListenerMainName: string) {
-        let current = this;
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const current = this;
     return new Proxy({}, {
       get(target: any, prop: any, receiver: any) {
         // console.log('get', prop, typeof target[prop]);
@@ -47,16 +48,16 @@ export class NTEventWrapper {
     this.WrapperSession = WrapperSession;
   }
   CreatEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-        let eventNameArr = eventName.split('/');
+    const eventNameArr = eventName.split('/');
     type eventType = {
       [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
     }
     if (eventNameArr.length > 1) {
-            let serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
-            let eventName = eventNameArr[1];
+      const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+      const eventName = eventNameArr[1];
       //getNodeIKernelGroupListener,GroupService
       //console.log('2', eventName);
-            let services = (this.WrapperSession as unknown as eventType)[serviceName]();
+      const services = (this.WrapperSession as unknown as eventType)[serviceName]();
       let event = services[eventName];
       //重新绑定this
       event = event.bind(services);
@@ -67,14 +68,14 @@ export class NTEventWrapper {
     }
 
   }
-    CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ""): T {
-        let ListenerType = this.ListenerMap![listenerMainName];
+  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+    const ListenerType = this.ListenerMap![listenerMainName];
     let Listener = this.ListenerManger.get(listenerMainName + uniqueCode);
     if (!Listener && ListenerType) {
       Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
-            let ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
-            let Service = "NodeIKernel" + ServiceSubName + "Service/addKernel" + ServiceSubName + "Listener";
-            let addfunc = this.CreatEventFunction<(listener: T) => number>(Service);
+      const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+      const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
+      const addfunc = this.CreatEventFunction<(listener: T) => number>(Service);
       addfunc!(Listener as T);
       //console.log(addfunc!(Listener as T));
       this.ListenerManger.set(listenerMainName + uniqueCode, Listener);
@@ -83,62 +84,65 @@ 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(ListenerMainName, ListenerSubName, ...args,this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
     this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
       //console.log(task.func, uuid, task.createtime, task.timeout);
       if (task.createtime + task.timeout < Date.now()) {
         this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
         return;
       }
+      if (task.checker && task.checker(...args)) {
         task.func(...args);
-        })
       }
-    async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-        return new Promise<ReturnType<EventType>>(async (resolve, reject) => {
-            let EventFunc = this.CreatEventFunction<EventType>(EventName);
+    });
+  }
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<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;
-            let Timeouter = setTimeout(() => {
+      const Timeouter = setTimeout(() => {
         if (!complete) {
           reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
         }
       }, timeout);
-            let retData = await EventFunc!(...args);
+      const retData = await EventFunc!(...args);
       complete = true;
       resolve(retData);
     });
   }
-    async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...args: Parameters<EventType>) {
+  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: ArrayLike<Parameters<ListenerType>> | undefined = undefined;
+      let retData: Parameters<ListenerType> | undefined = undefined;
       let retEvent: any = {};
-            let databack = () => {
-                if (complete < waitTimes) {
+      const databack = () => {
+        if (complete == 0) {
           reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
         } else {
-
-                    resolve([retEvent as Awaited<ReturnType<EventType>>, ...(retData as Parameters<ListenerType>)]);
+          resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
         }
-            }
-            let Timeouter = setTimeout(databack, timeout);
+      };
+      const Timeouter = setTimeout(databack, timeout);
 
-            let ListenerNameList = ListenerName.split('/');
-            let ListenerMainName = ListenerNameList[0];
-            let ListenerSubName = ListenerNameList[1];
-            let eventCallbak = {
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const eventCallbak = {
         timeout: timeout,
         createtime: Date.now(),
+        checker: checker,
         func: (...args: any[]) => {
           complete++;
           //console.log('func', ...args);
-                    retData = args as ArrayLike<Parameters<ListenerType>>;
+          retData = args as Parameters<ListenerType>;
           if (complete >= waitTimes) {
             clearTimeout(Timeouter);
             databack();
           }
         }
-            }
+      };
       if (!this.EventTask.get(ListenerMainName)) {
         this.EventTask.set(ListenerMainName, new Map());
       }
@@ -147,8 +151,9 @@ export class NTEventWrapper {
       }
       this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
       this.CreatListenerFunction(ListenerMainName);
-            let EventFunc = this.CreatEventFunction<EventType>(EventName);
-            retEvent = await EventFunc!(...args);
+      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

@@ -0,0 +1,116 @@
+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;
+
+  constructor(maxSize: number) {
+    this.maxSize = maxSize;
+  }
+  resize(count: number) {
+    this.maxSize = count;
+  }
+
+  set(key: K, value: V): void {
+    const isExist = this.keyToValue.get(key);
+    if (isExist && isExist === value) {
+      return;
+    }
+    this.keyToValue.set(key, value);
+    this.valueToKey.set(value, key);
+    while (this.keyToValue.size !== this.valueToKey.size) {
+      console.log('keyToValue.size !== valueToKey.size Error Atom');
+      this.keyToValue.clear();
+      this.valueToKey.clear();
+    }
+    // console.log('---------------');
+    // console.log(this.keyToValue);
+    // console.log(this.valueToKey);
+    // console.log('---------------');
+    while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
+      //console.log(this.keyToValue.size > this.maxSize, this.valueToKey.size > this.maxSize);
+      const oldestKey = this.keyToValue.keys().next().value;
+      this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+      this.keyToValue.delete(oldestKey);
+    }
+  }
+
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key);
+  }
+
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value);
+  }
+
+  deleteByValue(value: V): void {
+    const key = this.valueToKey.get(value);
+    if (key !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+
+  deleteByKey(key: K): void {
+    const value = this.keyToValue.get(key);
+    if (value !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+}
+
+class MessageUniqueWrapper {
+  private msgDataMap: LimitedHashTable<string, number>;
+  private msgIdMap: LimitedHashTable<string, number>;
+  constructor(maxMap: number = 1000) {
+    this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+    this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
+  }
+
+  createMsg(peer: Peer, msgId: string): number | undefined {
+    const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+    const hash = crypto.createHash('sha1').update(key);
+    const shortId = parseInt(hash.digest('hex').slice(0, 8), 16);
+    const isExist = this.msgIdMap.getKey(shortId);
+    //console.log(`${peer.peerUid} ${msgId} ------- ${shortId}`);
+    if (isExist && isExist === msgId) {
+      return shortId;
+    }
+    this.msgIdMap.set(msgId, shortId);
+    this.msgDataMap.set(key, shortId);
+    return shortId;
+  }
+
+  getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
+    const data = this.msgDataMap.getKey(shortId);
+    if (data) {
+      const [msgId, chatTypeStr, peerUid] = data.split('|');
+      const peer: Peer = {
+        chatType: parseInt(chatTypeStr),
+        peerUid,
+        guildId: '',
+      };
+      return { MsgId: msgId, Peer: peer };
+    }
+    return undefined;
+  }
+
+  getShortIdByMsgId(msgId: string): number | undefined {
+    return this.msgIdMap.getValue(msgId);
+  }
+  getPeerByMsgId(msgId: string) {
+    const shortId = this.msgIdMap.getValue(msgId);
+    if (!shortId) return undefined;
+    return this.getMsgIdAndPeerByShortId(shortId);
+  }
+  resize(maxSize: number): void {
+    this.msgIdMap.resize(maxSize);
+    this.msgDataMap.resize(maxSize);
+  }
+}
+
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/Packet.ts

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

src/common/utils/QQBasicInfo.ts

@@ -2,6 +2,7 @@ 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';
 
 export const exePath = process.execPath;
 
@@ -37,11 +38,11 @@ type QQVersionConfigInfo = {
 }
 
 let _qqVersionConfigInfo: QQVersionConfigInfo = {
-  'baseVersion': '9.9.9-23361',
-  'curVersion': '9.9.9-23361',
+  'baseVersion': '9.9.12-25765',
+  'curVersion': '9.9.12-25765',
   'prevVersion': '',
   'onErrorVersions': [],
-  'buildId': '23361'
+  'buildId': '25765'
 };
 
 if (fs.existsSync(configVersionInfoPath)) {
@@ -49,24 +50,28 @@ if (fs.existsSync(configVersionInfoPath)) {
     const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
     _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
   } catch (e) {
-    console.error('Load QQ version config info failed, Use default version', e);
+    logError('Load QQ version config info failed, Use default version', e);
   }
 }
 
 export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
-
+//V1_WIN_NQ_9.9.12_25765_GW_B
 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',
+// clientVer: '9.9.9-25765',
 
-let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
+// Linux
+// app_version: '3.2.9-25765',
+// qua: 'V1_LNX_NQ_3.2.10_25765_GW_B',
+
+let _appid: string = '537234702';  // 默认为 Windows 平台的 appid
 if (systemPlatform === 'linux') {
-  _appid = '537213827';
+  _appid = '537234773';
 }
 // todo: mac 平台的 appid
 export const appid = _appid;

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';
 
@@ -24,7 +24,7 @@ export async function encodeSilk(filePath: string) {
       const fileHeader = buffer.toString('hex', 0, bytesToRead);
       return fileHeader;
     } catch (err) {
-      console.error('读取文件错误:', err);
+      logError('读取文件错误:', err);
       return;
     }
   }
@@ -63,10 +63,11 @@ export async function encodeSilk(filePath: string) {
   // }
 
   try {
-    const pttPath = path.join(TEMP_DIR, uuidv4());
-    if (getFileHeader(filePath) !== '02232153494c4b') {
+    const file = await fsPromise.readFile(filePath);
+    const pttPath = path.join(TEMP_DIR, randomUUID());
+    if (!isSilk(file)) {
       log(`语音文件${filePath}需要转换成silk`);
-      const _isWav = await isWavFile(filePath);
+      const _isWav = isWav(file);
       const pcmPath = pttPath + '.pcm';
       let sampleRate = 0;
       const convert = () => {
@@ -96,7 +97,7 @@ export async function encodeSilk(filePath: string) {
       if (!_isWav) {
         input = await convert();
       } else {
-        input = fs.readFileSync(filePath);
+        input = file;
         const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
         const { fmt } = getWavFileInfo(input);
         // log(`wav文件信息`, fmt)
@@ -113,7 +114,7 @@ export async function encodeSilk(filePath: string) {
         duration: silk.duration / 1000
       };
     } else {
-      const silk = fs.readFileSync(filePath);
+      const silk = file;
       let duration = 0;
       try {
         duration = getDuration(silk) / 1000;

src/common/utils/cpmodule.ts

@@ -4,7 +4,6 @@ import fs from 'fs';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 export function getModuleWithArchName(moduleName: string) {

src/common/utils/db.ts

@@ -1,509 +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);
-      }
-    });
-
-    // 接收到的临时会话消息uid
-    const createTempUinTableSQL = `
-            CREATE TABLE IF NOT EXISTS temp_uins (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                uid TEXT,
-                uin TEXT
-            )`;
-    this.db!.run(createTempUinTableSQL, function (err) {
-      if (err) {
-        logError('Could not create table temp_uins', err);
-      }
-    });
-  }
-
-  private async getCurrentMaxShortId() {
-    return new Promise<number>((resolve, reject) => {
-      this.db!.get('SELECT MAX(shortId) as maxId FROM msgs', (err, row: { maxId: number }) => {
-        if (err) {
-          logDebug('Could not get max short id, Use default -2147483640', err);
-          return resolve(-2147483640);
-        }
-        logDebug('数据库中消息最大短id', row?.maxId);
-        resolve(row?.maxId ?? -2147483640);
-      });
-    });
-  }
-
-  private async getMsg(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<RawMessage | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBMsg) => {
-        // log("getMsg", row, err);
-        if (err) {
-          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);
-      });
-    });
-  }
-
-  // 被动收到的临时会话消息uin->uid
-  async getReceivedTempUinMap() {
-    const stmt = 'SELECT * FROM temp_uins';
-    return new Promise<Record<string, string>>((resolve, reject) => {
-      this.db!.all(stmt, (err, rows: { uin: string, uid: string }[]) => {
-        if (err) {
-          logError('db could not get temp uin map', err);
-          reject(err);
-        }
-        const map: Record<string, string> = {};
-        rows.forEach(row => {
-          map[row.uin] = row.uid;
-        });
-        resolve(map);
-      });
-    });
-  }
-
-  // 通过uin获取临时会话消息uid
-  async getUidByTempUin(uid: string) {
-    const stmt = 'SELECT * FROM temp_uins WHERE uin = ?';
-    return new Promise<string>((resolve, reject) => {
-      this.db!.get(stmt, [uid], (err, row: { uin: string, uid: string }) => {
-        if (err) {
-          logError('db could not get temp uin map', err);
-          reject(err);
-        }
-        resolve(row?.uid);
-      });
-    });
-  }
-
-  async addTempUin(uin: string, uid: string) {
-    const existUid = await this.getUidByTempUin(uin);
-    if (!existUid) {
-      const stmt = this.db!.prepare('INSERT INTO temp_uins (uin, uid) VALUES (?, ?)');
-      return new Promise((resolve, reject) => {
-        stmt.run(uin, uid, function (err: any) {
-          if (err) {
-            logError('db could not add temp uin', 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(),
-            console.log("插入入群时间失败", 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 } from './log';
-import { dbUtil } from '@/common/utils/db';
+import { log, logError } from './log';
 import * as fileType from 'file-type';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
@@ -50,7 +49,40 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
     check();
   });
 }
+// 定义一个异步函数来检查文件是否存在
+export async function checkFileReceived2(path: string, timeout: number = 3000): Promise<void> {
+  // 使用 Promise.race 来同时进行文件状态检查和超时计时
+  // Promise.race 会返回第一个解决（resolve）或拒绝（reject）的 Promise
+  await Promise.race([
+    checkFile(path),
+    timeoutPromise(timeout, `文件不存在: ${path}`),
+  ]);
+}
 
+// 转换超时时间至 Promise
+function timeoutPromise(timeout: number, errorMsg: string): Promise<void> {
+  return new Promise((_, reject) => {
+    setTimeout(() => {
+      reject(new Error(errorMsg));
+    }, timeout);
+  });
+}
+
+// 异步检查文件是否存在
+async function checkFile(path: string): Promise<void> {
+  try {
+    await stat(path);
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      // 如果文件不存在，则抛出一个错误
+      throw new Error(`文件不存在: ${path}`);
+    } else {
+      // 对于 stat 调用的其他错误，重新抛出
+      throw error;
+    }
+  }
+  // 如果文件存在，则无需做任何事情，Promise 解决（resolve）自身
+}
 export async function file2base64(path: string) {
   const readFile = util.promisify(fs.readFile);
   const result = {
@@ -115,6 +147,8 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
   };
   if (typeof options === 'string') {
     url = options;
+    const host = new URL(url).hostname;
+    headers['Host'] = host;
   } else {
     url = options.url;
     if (options.headers) {
@@ -125,7 +159,12 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, { headers });
+  const fetchRes = await fetch(url, { headers }).catch((err) => {
+    if (err.cause) {
+      throw err.cause;
+    }
+    throw err;
+  });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -152,7 +191,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
     isLocal: false
   };
   if (!fileName) {
-    fileName = uuidv4();
+    fileName = randomUUID();
   }
   let filePath = path.join(getTempDir(), fileName);
   let url = null;
@@ -195,7 +234,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,13 +250,14 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
       } else {
         filePath = pathname;
       }
-    } else {
-      const cache = await dbUtil.getFileCacheByName(uri);
-      if (cache) {
-        filePath = cache.path;
-      } else {
-        filePath = uri;
     }
+    else {
+      // const cache = await dbUtil.getFileCacheByName(uri);
+      // if (cache) {
+      //   filePath = cache.path;
+      // } else {
+      //   filePath = uri;
+      // }
     }
 
     res.isLocal = true;
@@ -262,12 +302,12 @@ export async function copyFolder(sourcePath: string, destPath: string) {
         try {
           await fsPromise.copyFile(srcPath, dstPath);
         } catch (error) {
-          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
+          logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
           // 这里可以决定是否要继续复制其他文件
         }
       }
     }
   } catch (error) {
-    console.error('复制文件夹时出错:', error);
+    logError('复制文件夹时出错:', error);
   }
 }

src/common/utils/helper.ts

@@ -4,7 +4,7 @@ import fs from 'fs/promises';
 import { log, logDebug } from './log';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-
+import * as fsPromise from 'node:fs/promises';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -12,6 +12,25 @@ 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 +62,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生成缓存键，在一定时间内返回缓存结果
@@ -182,3 +310,25 @@ export function isEqual(obj1: any, obj2: any) {
   }
   return true;
 }
+
+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

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { SelfInfo } from '@/core';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-
+import chalk from 'chalk';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -39,17 +39,17 @@ 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] - %m'
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m'
       }
     },
     ConsoleAppender: { // 输出到控制台的appender
       type: 'console',
       layout: {
         type: 'pattern',
-        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`
       }
     }
   },
@@ -61,7 +61,9 @@ const logConfig: Configuration = {
 };
 
 log4js.configure(logConfig);
-
+const loggerConsole = log4js.getLogger('console');
+const loggerFile = log4js.getLogger('file');
+const loggerDefault = log4js.getLogger('default');
 
 export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
   logConfig.categories.file.level = fileLogLevel;
@@ -70,12 +72,12 @@ export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
 }
 
 export function setLogSelfInfo(selfInfo: SelfInfo) {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
-  logConfig.appenders.FileAppender.layout.pattern = logConfig.appenders.ConsoleAppender.layout.pattern =
-    `%d{yyyy-MM-dd hh:mm:ss} [%p] ${selfInfo.nick}(${selfInfo.uin}) %m`;
-  log4js.configure(logConfig);
+  const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+  loggerConsole.addContext('userInfo', userInfo);
+  loggerFile.addContext('userInfo', userInfo);
+  loggerDefault.addContext('userInfo', userInfo);
 }
+setLogSelfInfo({ nick: '', uin: '', uid: '' });
 
 let fileLogEnabled = true;
 let consoleLogEnabled = true;
@@ -89,23 +91,28 @@ 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;
     }
     logMsg += msgItem + ' ';
   }
-  return '\n' + logMsg + '\n';
+  return logMsg;
 }
 
+// eslint-disable-next-line no-control-regex
+const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+
 function _log(level: LogLevel, ...args: any[]) {
   if (consoleLogEnabled) {
-    log4js.getLogger('console')[level](formatMsg(args));
+    loggerConsole[level](formatMsg(args));
   }
   if (fileLogEnabled) {
-    log4js.getLogger('file')[level](formatMsg(args));
+    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
   }
 }
 
@@ -121,3 +128,11 @@ export function logDebug(...args: any[]) {
 export function logError(...args: any[]) {
   _log(LogLevel.ERROR, ...args);
 }
+
+export function logWarn(...args: any[]) {
+  _log(LogLevel.WARN, ...args);
+}
+
+export function logFatal(...args: any[]) {
+  _log(LogLevel.FATAL, ...args);
+}

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

src/common/utils/version.ts

@@ -14,7 +14,7 @@ export async function checkVersion(): Promise<string> {
       try {
         version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
       } catch (e) {
-        logDebug("检测更新异常",e);
+        logDebug('检测更新异常',e);
       }
       if (version) {
         resolve(version);

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 _0x5222(){var _0x3091f8=['6273aTfWba','9981447HMXcwA','2890585oSjsvJ','8TdYIWz','3243588DGNCtB','getGroupCode','43803705QezSUk','1200309ykLrjF','1770620oiFLFj','6070xVmufr','18IROTnB','4AICfZO'];_0x5222=function(){return _0x3091f8;};return _0x5222();}var _0x5fba51=_0x5d34;(function(_0x4bf11c,_0x14198d){var _0x2fd03f=_0x5d34,_0x4d6419=_0x4bf11c();while(!![]){try{var _0x4850c9=parseInt(_0x2fd03f(0xf8))/0x1+-parseInt(_0x2fd03f(0xed))/0x2+-parseInt(_0x2fd03f(0xf5))/0x3*(-parseInt(_0x2fd03f(0xf0))/0x4)+-parseInt(_0x2fd03f(0xf3))/0x5*(-parseInt(_0x2fd03f(0xef))/0x6)+-parseInt(_0x2fd03f(0xf2))/0x7*(-parseInt(_0x2fd03f(0xf4))/0x8)+-parseInt(_0x2fd03f(0xf1))/0x9*(-parseInt(_0x2fd03f(0xee))/0xa)+-parseInt(_0x2fd03f(0xf7))/0xb;if(_0x4850c9===_0x14198d)break;else _0x4d6419['push'](_0x4d6419['shift']());}catch(_0xba978e){_0x4d6419['push'](_0x4d6419['shift']());}}}(_0x5222,0xf380f));function _0x5d34(_0x5ef46e,_0x5e79b3){var _0x522282=_0x5222();return _0x5d34=function(_0x5d3489,_0x588abc){_0x5d3489=_0x5d3489-0xed;var _0x48f8f8=_0x522282[_0x5d3489];return _0x48f8f8;},_0x5d34(_0x5ef46e,_0x5e79b3);}export class DependsAdapter{['onMSFStatusChange'](_0x358442,_0x58882d){}['onMSFSsoError'](_0xfb5a9){}[_0x5fba51(0xf6)](_0x260bf6){}}

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 _0x446bc4=_0x23d3;(function(_0x29f86c,_0x5c4b14){var _0x248c41=_0x23d3,_0x2d6705=_0x29f86c();while(!![]){try{var _0x492b46=-parseInt(_0x248c41(0x1e6))/0x1*(parseInt(_0x248c41(0x1f1))/0x2)+parseInt(_0x248c41(0x1ea))/0x3*(-parseInt(_0x248c41(0x1e5))/0x4)+parseInt(_0x248c41(0x1e7))/0x5*(-parseInt(_0x248c41(0x1e4))/0x6)+parseInt(_0x248c41(0x1ee))/0x7*(-parseInt(_0x248c41(0x1e8))/0x8)+-parseInt(_0x248c41(0x1ef))/0x9*(-parseInt(_0x248c41(0x1ec))/0xa)+parseInt(_0x248c41(0x1eb))/0xb+parseInt(_0x248c41(0x1ed))/0xc;if(_0x492b46===_0x5c4b14)break;else _0x2d6705['push'](_0x2d6705['shift']());}catch(_0x19c0ed){_0x2d6705['push'](_0x2d6705['shift']());}}}(_0x31c0,0x869c3));function _0x23d3(_0x4975dd,_0x15298b){var _0x31c0be=_0x31c0();return _0x23d3=function(_0x23d3fb,_0x3a72cc){_0x23d3fb=_0x23d3fb-0x1e3;var _0x3c86b0=_0x31c0be[_0x23d3fb];return _0x3c86b0;},_0x23d3(_0x4975dd,_0x15298b);}export class DispatcherAdapter{[_0x446bc4(0x1f0)](_0x29d72b){}[_0x446bc4(0x1e3)](_0x2e1f1a){}[_0x446bc4(0x1e9)](_0x65ccb0){}}function _0x31c0(){var _0x3b66c2=['11163240gZXndg','418210TdxHIv','24745548UBUMrc','6461469ZxcrWQ','9xVzuwt','dispatchRequest','9686KBUNcw','dispatchCall','1287066gmiUyH','4Yfdlzd','180wspPyu','5lktlSW','8uPKQfS','dispatchCallWithJson','1674327qyXtIY'];_0x31c0=function(){return _0x3b66c2;};return _0x31c0();}

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 _0x57f683=_0x159c;(function(_0xd6f12e,_0xd56e15){var _0x2105d2=_0x159c,_0x1a3224=_0xd6f12e();while(!![]){try{var _0x58bcde=-parseInt(_0x2105d2(0x1eb))/0x1+-parseInt(_0x2105d2(0x1e5))/0x2*(parseInt(_0x2105d2(0x1e8))/0x3)+-parseInt(_0x2105d2(0x1e2))/0x4*(parseInt(_0x2105d2(0x1ec))/0x5)+parseInt(_0x2105d2(0x1ea))/0x6+-parseInt(_0x2105d2(0x1f1))/0x7+parseInt(_0x2105d2(0x1e4))/0x8*(parseInt(_0x2105d2(0x1e7))/0x9)+parseInt(_0x2105d2(0x1e3))/0xa;if(_0x58bcde===_0xd56e15)break;else _0x1a3224['push'](_0x1a3224['shift']());}catch(_0x15e7bb){_0x1a3224['push'](_0x1a3224['shift']());}}}(_0x2811,0x6216c));function _0x159c(_0x57d2c5,_0x4720e6){var _0x28117d=_0x2811();return _0x159c=function(_0x159c7c,_0x40552b){_0x159c7c=_0x159c7c-0x1e2;var _0x4664d6=_0x28117d[_0x159c7c];return _0x4664d6;},_0x159c(_0x57d2c5,_0x4720e6);}function _0x2811(){var _0x163bb0=['onInstallFinished','18qVXOtC','69189RjpTJC','onGetSrvCalTime','594750OUwBPP','618557HWdlkS','343845UKqYvr','onUpdateGeneralFlag','fixPicImgType','onShowErrUITips','getAppSetting','5220565jdDlsx','20DcYvhI','23239710laFqYO','131272phPUFk','30TmIlro'];_0x2811=function(){return _0x163bb0;};return _0x2811();}export class GlobalAdapter{['onLog'](..._0x523c0b){}[_0x57f683(0x1e9)](..._0x2bf536){}[_0x57f683(0x1ef)](..._0x485cd2){}[_0x57f683(0x1ee)](..._0x12aa96){}[_0x57f683(0x1f0)](..._0x303573){}[_0x57f683(0x1e6)](..._0x52a026){}[_0x57f683(0x1ed)](..._0x59ab7f){}['onGetOfflineMsg'](..._0x5bc331){}}

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

@@ -1 +0,0 @@
-(function(_0x459b6c,_0xbe8aba){var _0x5f4bbd=_0x3502,_0x44fc04=_0x459b6c();while(!![]){try{var _0x54afcd=-parseInt(_0x5f4bbd(0x1ca))/0x1+-parseInt(_0x5f4bbd(0x1d0))/0x2+parseInt(_0x5f4bbd(0x1ce))/0x3+parseInt(_0x5f4bbd(0x1c9))/0x4*(-parseInt(_0x5f4bbd(0x1cf))/0x5)+-parseInt(_0x5f4bbd(0x1d1))/0x6+parseInt(_0x5f4bbd(0x1cc))/0x7*(parseInt(_0x5f4bbd(0x1cb))/0x8)+parseInt(_0x5f4bbd(0x1cd))/0x9;if(_0x54afcd===_0xbe8aba)break;else _0x44fc04['push'](_0x44fc04['shift']());}catch(_0x5739de){_0x44fc04['push'](_0x44fc04['shift']());}}}(_0x5d6f,0x1d0e2));export*from'./NodeIDependsAdapter';function _0x3502(_0x51e4e7,_0x739e67){var _0x5d6f78=_0x5d6f();return _0x3502=function(_0x350229,_0x130029){_0x350229=_0x350229-0x1c9;var _0x3c3026=_0x5d6f78[_0x350229];return _0x3c3026;},_0x3502(_0x51e4e7,_0x739e67);}export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';function _0x5d6f(){var _0x3610ea=['52vRScrw','25856oiAZCW','1368344RjJglV','7Jcuwfz','939915xTemSD','663786JOdCmy','51905luPwgg','109624OShybw','972654VhkBIU'];_0x5d6f=function(){return _0x3610ea;};return _0x5d6f();}

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

@@ -1,37 +0,0 @@
-import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
-import { GeneralCallResult } from '@/core';
-import * as fileType from 'file-type';
-import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-export declare class NTQQFileApi {
-    static getFileType(filePath: string): Promise<fileType.FileTypeResult | undefined>;
-    static copyFile(filePath: string, destPath: string): Promise<void>;
-    static getFileSize(filePath: string): Promise<number>;
-    static uploadFile(filePath: string, elementType?: ElementType, elementSubType?: number): Promise<{
-        md5: string;
-        fileName: string;
-        path: string;
-        fileSize: number;
-        ext: string;
-    }>;
-    static downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout?: number, force?: boolean): Promise<string>;
-    static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
-    static getImageUrl(element: {
-        originImageUrl: any;
-        md5HexStr?: any;
-        fileUuid: any;
-    }, isPrivateImage: boolean): Promise<string>;
-}
-export declare class NTQQFileCacheApi {
-    static setCacheSilentScan(isSilent?: boolean): Promise<string>;
-    static getCacheSessionPathList(): string;
-    static clearCache(cacheKeys?: Array<string>): unknown;
-    static addCacheScannedPaths(pathMap?: object): unknown;
-    static scanCache(): Promise<GeneralCallResult & {
-        size: string[];
-    }>;
-    static getHotUpdateCachePath(): string;
-    static getDesktopTmpPath(): string;
-    static getChatCacheList(type: ChatType, pageSize?: number, pageIndex?: number): unknown;
-    static getFileCacheInfo(fileType: CacheFileType, pageSize?: number, lastRecord?: CacheFileListItem): void;
-    static clearChatCache(chats?: ChatCacheListItemBasic[], fileKeys?: string[]): Promise<unknown>;
-}

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

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

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

@@ -1 +0,0 @@
-function _0x16e3(_0x2cac3f,_0x3950e4){const _0x5d91a3=_0x5d91();return _0x16e3=function(_0x16e37f,_0x41e584){_0x16e37f=_0x16e37f-0x108;let _0x3d98b3=_0x5d91a3[_0x16e37f];return _0x3d98b3;},_0x16e3(_0x2cac3f,_0x3950e4);}const _0x64ac8=_0x16e3;(function(_0x37e875,_0x53b9da){const _0x34f5e9=_0x16e3,_0x1125cc=_0x37e875();while(!![]){try{const _0xfe587f=parseInt(_0x34f5e9(0x109))/0x1+-parseInt(_0x34f5e9(0x10a))/0x2+-parseInt(_0x34f5e9(0x115))/0x3+-parseInt(_0x34f5e9(0x111))/0x4*(-parseInt(_0x34f5e9(0x11b))/0x5)+parseInt(_0x34f5e9(0x116))/0x6+parseInt(_0x34f5e9(0x114))/0x7+-parseInt(_0x34f5e9(0x113))/0x8;if(_0xfe587f===_0x53b9da)break;else _0x1125cc['push'](_0x1125cc['shift']());}catch(_0x4d1972){_0x1125cc['push'](_0x1125cc['shift']());}}}(_0x5d91,0x20979));import{napCatCore}from'@/core';function _0x5d91(){const _0x325d8b=['1356866JiZmvw','410358GYbZyu','1138656WGuhKJ','NodeIKernelBuddyListener/onBuddyListChange','friendUid','zlzYv','getFriends','3590uMjIMR','session','139807KQwyoc','33122ikfAGj','approvalFriendRequest','buddyList','uid','handleFriendRequest','uin','getBuddyService','320HrBzKd','NodeIKernelBuddyService/getBuddyList','2352136fLPXwu'];_0x5d91=function(){return _0x325d8b;};return _0x5d91();}import{uid2UinMap}from'@/core/data';import{NTEventDispatch}from'@/common/utils/EventTask';export class NTQQFriendApi{static async[_0x64ac8(0x11a)](_0x53e4b8=![]){const _0x4e4c14=_0x64ac8,_0x5e5549={'zlzYv':_0x4e4c14(0x112),'dANZY':_0x4e4c14(0x117)};let [_0x477ee8,_0x1ba15b]=await NTEventDispatch['CallNormalEvent'](_0x5e5549[_0x4e4c14(0x119)],_0x5e5549['dANZY'],0x1,0x1388,_0x53e4b8);const _0x5643f1=[];for(const _0x3bd7ad of _0x1ba15b){for(const _0x5e8771 of _0x3bd7ad[_0x4e4c14(0x10c)]){_0x5643f1['push'](_0x5e8771),uid2UinMap[_0x5e8771[_0x4e4c14(0x10d)]]=_0x5e8771[_0x4e4c14(0x10f)];}}return _0x5643f1;}static async[_0x64ac8(0x10e)](_0x243564,_0x13e0f7){const _0x682b79=_0x64ac8;napCatCore[_0x682b79(0x108)][_0x682b79(0x110)]()?.[_0x682b79(0x10b)]({'friendUid':_0x243564[_0x682b79(0x118)],'reqTime':_0x243564['reqTime'],'accept':_0x13e0f7});}}

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

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

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

@@ -1 +0,0 @@
-(function(_0x2b687f,_0x36155e){var _0x2a495c=_0x5e8b,_0x1af3d6=_0x2b687f();while(!![]){try{var _0x57bc47=parseInt(_0x2a495c(0x6d))/0x1+-parseInt(_0x2a495c(0x74))/0x2*(-parseInt(_0x2a495c(0x6e))/0x3)+-parseInt(_0x2a495c(0x75))/0x4+parseInt(_0x2a495c(0x72))/0x5+-parseInt(_0x2a495c(0x6c))/0x6*(-parseInt(_0x2a495c(0x71))/0x7)+-parseInt(_0x2a495c(0x6f))/0x8*(parseInt(_0x2a495c(0x70))/0x9)+-parseInt(_0x2a495c(0x76))/0xa*(parseInt(_0x2a495c(0x73))/0xb);if(_0x57bc47===_0x36155e)break;else _0x1af3d6['push'](_0x1af3d6['shift']());}catch(_0x4a0474){_0x1af3d6['push'](_0x1af3d6['shift']());}}}(_0x28b0,0x8098f));export*from'./file';export*from'./friend';function _0x5e8b(_0x4dbf5e,_0x40ff6a){var _0x28b071=_0x28b0();return _0x5e8b=function(_0x5e8bd0,_0x398021){_0x5e8bd0=_0x5e8bd0-0x6c;var _0x416fc4=_0x28b071[_0x5e8bd0];return _0x416fc4;},_0x5e8b(_0x4dbf5e,_0x40ff6a);}export*from'./group';export*from'./msg';export*from'./user';export*from'./webapi';export*from'./sign';function _0x28b0(){var _0x4863b3=['30StkYjn','1135768WXsnad','9CwEkei','133hhFQQI','3556650vFJLxQ','11gXuNxp','102074fiGDhE','1009820BNwrhv','19514420WHHuFL','200778uMPPKC','1015106FJwFaR'];_0x28b0=function(){return _0x4863b3;};return _0x28b0();}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, unknownArg: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static activateChat(peer: Peer): Promise<void>;
-    static activateChatAndGetHistory(peer: Peer): Promise<void>;
-    static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
-    static getGroupFileList(GroupCode: string, params: GetFileListParam): Promise<any[]>;
-    static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static fetchRecentContact(): Promise<void>;
-    static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
-    static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
-    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<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(_0x57745a,_0x1a3c84){const _0x2277fc=_0x1a0e,_0x2d9c64=_0x57745a();while(!![]){try{const _0x1effcc=-parseInt(_0x2277fc(0x164))/0x1*(parseInt(_0x2277fc(0x157))/0x2)+parseInt(_0x2277fc(0x180))/0x3*(-parseInt(_0x2277fc(0x160))/0x4)+parseInt(_0x2277fc(0x183))/0x5*(parseInt(_0x2277fc(0x182))/0x6)+parseInt(_0x2277fc(0x17a))/0x7+-parseInt(_0x2277fc(0x16c))/0x8+-parseInt(_0x2277fc(0x16e))/0x9+parseInt(_0x2277fc(0x168))/0xa*(parseInt(_0x2277fc(0x161))/0xb);if(_0x1effcc===_0x1a3c84)break;else _0x2d9c64['push'](_0x2d9c64['shift']());}catch(_0x5e1791){_0x2d9c64['push'](_0x2d9c64['shift']());}}}(_0x21f4,0xacd09));import{logDebug}from'@/common/utils/log';function _0x21f4(){const _0x42bb31=['p_skey','sourcelogo','skey','353454PwuBmL','&ark=','6fnKqAa','1557445ceixFn','bvqVR','getQzoneCookies','\x5c/\x5c/','6WsmDjc',';\x20p_uin=o','getSkey','UWGgQ',';\x20uin=o','dqQFX','vKtNy','prompt','GET','24tkOImJ','364749mNlpAs','jumpUrl','GIZPu','127661YWBBmO','mGSXm','stringify','signed_ark','710gCpWvv','tianxuan.imgJumpArk','title','preview','535984KtRFYr','source','9009027RNpBAr','MiniApp\x20JSON\x20消息生成失败','tag','replace','gMdSV','FpoJe','MOTyE','XRUAa','genBkn','HouMH','miniapp','XvEMd','1399741aFLNRy','https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','uin'];_0x21f4=function(){return _0x42bb31;};return _0x21f4();}import{NTQQUserApi}from'./user';function _0x1a0e(_0x10c532,_0x2cda74){const _0x21f438=_0x21f4();return _0x1a0e=function(_0x1a0e4c,_0xeae817){_0x1a0e4c=_0x1a0e4c-0x157;let _0x39783d=_0x21f438[_0x1a0e4c];return _0x39783d;},_0x1a0e(_0x10c532,_0x2cda74);}import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';export async function SignMiniApp(_0x562e1a){const _0x11c92b=_0x1a0e,_0x36180b={'XRUAa':_0x11c92b(0x169),'mGSXm':_0x11c92b(0x178),'GIZPu':'normal','MOTyE':_0x11c92b(0x186),'XvEMd':function(_0x2c07ff,_0x95d6fc){return _0x2c07ff+_0x95d6fc;},'UWGgQ':function(_0x55f76f,_0x382560){return _0x55f76f+_0x382560;},'vKtNy':'p_skey=','FpoJe':';\x20skey=','gMdSV':_0x11c92b(0x158),'lnlLx':_0x11c92b(0x15b),'HouMH':function(_0x399641,_0x317dc2){return _0x399641+_0x317dc2;},'ilxji':function(_0x11d6fb,_0x35d8cf){return _0x11d6fb+_0x35d8cf;},'xaIfm':function(_0x464a77,_0x5cf494){return _0x464a77(_0x5cf494);},'bvqVR':_0x11c92b(0x15f),'dqQFX':_0x11c92b(0x16f)};let _0x50da80={'app':'com.tencent.miniapp.lua','bizsrc':_0x36180b[_0x11c92b(0x175)],'view':_0x36180b[_0x11c92b(0x165)],'prompt':_0x562e1a[_0x11c92b(0x15e)],'config':{'type':_0x36180b[_0x11c92b(0x163)],'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0x562e1a[_0x11c92b(0x16a)],'preview':_0x562e1a[_0x11c92b(0x16b)][_0x11c92b(0x171)](/\\/g,_0x36180b[_0x11c92b(0x174)]),'jumpUrl':_0x562e1a[_0x11c92b(0x162)]['replace'](/\\/g,_0x11c92b(0x186)),'tag':_0x562e1a[_0x11c92b(0x170)],'tagIcon':_0x562e1a['tagIcon'][_0x11c92b(0x171)](/\\/g,_0x36180b[_0x11c92b(0x174)]),'source':_0x562e1a[_0x11c92b(0x16d)],'sourcelogo':_0x562e1a[_0x11c92b(0x17e)][_0x11c92b(0x171)](/\\/g,_0x11c92b(0x186))}}};const _0x19a52a=await NTQQUserApi[_0x11c92b(0x159)]();let _0x5c56b0=await NTQQUserApi[_0x11c92b(0x185)]();const _0x148dab=WebApi[_0x11c92b(0x176)](_0x5c56b0[_0x11c92b(0x17d)]),_0x577015=_0x36180b['XvEMd'](_0x36180b['XvEMd'](_0x36180b[_0x11c92b(0x15a)](_0x36180b[_0x11c92b(0x179)](_0x36180b[_0x11c92b(0x15a)](_0x36180b['XvEMd'](_0x36180b[_0x11c92b(0x179)](_0x36180b[_0x11c92b(0x15d)],_0x5c56b0['p_skey']),_0x36180b[_0x11c92b(0x173)]),_0x5c56b0[_0x11c92b(0x17f)]),_0x36180b[_0x11c92b(0x172)]),selfInfo[_0x11c92b(0x17c)]),_0x36180b['lnlLx']),selfInfo[_0x11c92b(0x17c)]);let _0x5765c6=_0x36180b[_0x11c92b(0x177)](_0x36180b['ilxji'](_0x11c92b(0x17b)+_0x148dab,_0x11c92b(0x181)),_0x36180b['xaIfm'](encodeURIComponent,JSON[_0x11c92b(0x166)](_0x50da80))),_0x47ae97='';try{let _0x3f0e2f=await RequestUtil['HttpGetJson'](_0x5765c6,_0x36180b[_0x11c92b(0x184)],undefined,{'Cookie':_0x577015});_0x47ae97=_0x3f0e2f['data'][_0x11c92b(0x167)];}catch(_0x5c0005){logDebug(_0x36180b[_0x11c92b(0x15c)],_0x5c0005);}return _0x47ae97;}

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

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

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

@@ -1 +0,0 @@
-var _0x46f4c6=_0x5595;(function(_0x44dd50,_0x3b947d){var _0x490293=_0x5595,_0x36a92f=_0x44dd50();while(!![]){try{var _0xe91141=-parseInt(_0x490293(0x1b7))/0x1+parseInt(_0x490293(0x1b5))/0x2+-parseInt(_0x490293(0x1bc))/0x3*(-parseInt(_0x490293(0x1b4))/0x4)+-parseInt(_0x490293(0x1b3))/0x5+parseInt(_0x490293(0x1ba))/0x6*(parseInt(_0x490293(0x1be))/0x7)+-parseInt(_0x490293(0x1c0))/0x8+parseInt(_0x490293(0x1b6))/0x9*(parseInt(_0x490293(0x1b9))/0xa);if(_0xe91141===_0x3b947d)break;else _0x36a92f['push'](_0x36a92f['shift']());}catch(_0x301625){_0x36a92f['push'](_0x36a92f['shift']());}}}(_0x208f,0x77b48));import{napCatCore}from'@/core';function _0x208f(){var _0x173e6f=['203538HburDh','session','2072955IZgqrb','util','182ZHpPcJ','translateEnWordToZn','7188528oMkiTL','getRichMediaService','wantWinScreenOCR','getNodeMiscService','3149375lfaGAY','4wyaoob','1814032hTGpsF','9ZJfcNu','666193IiHbMy','ORCImage','2049470ufpuRa'];_0x208f=function(){return _0x173e6f;};return _0x208f();}function _0x5595(_0x4385e4,_0x290d58){var _0x208f62=_0x208f();return _0x5595=function(_0x55954f,_0x1e15da){_0x55954f=_0x55954f-0x1b2;var _0x3c1fc1=_0x208f62[_0x55954f];return _0x3c1fc1;},_0x5595(_0x4385e4,_0x290d58);}export class NTQQSystemApi{static async['hasOtherRunningQQProcess'](){var _0x1c1b60=_0x5595;return napCatCore[_0x1c1b60(0x1bd)]['hasOtherRunningQQProcess']();}static async[_0x46f4c6(0x1b8)](_0x847f46){var _0x3690a4=_0x46f4c6;return napCatCore[_0x3690a4(0x1bb)][_0x3690a4(0x1b2)]()[_0x3690a4(0x1c2)](_0x847f46);}static async[_0x46f4c6(0x1bf)](_0x5ec62f){var _0x4775af=_0x46f4c6;return napCatCore[_0x4775af(0x1bb)][_0x4775af(0x1c1)]()[_0x4775af(0x1bf)](_0x5ec62f);}}

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

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

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

@@ -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/apis/window.d.ts

@@ -1,11 +0,0 @@
-export interface NTQQWindow {
-    windowName: string;
-    windowUrlHash: string;
-}
-export declare class NTQQWindows {
-    static GroupHomeWorkWindow: NTQQWindow;
-    static GroupNotifyFilterWindow: NTQQWindow;
-    static GroupEssenceWindow: NTQQWindow;
-}
-export declare class NTQQWindowApi {
-}

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;