fix: error

build(deps-dev): bump @types/uuid from 9.0.8 to 10.0.0

.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

docs/changelogs/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.4.4.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

docs/develop/Android.md

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

docs/develop/GetMemberExt.md

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

docs/develop/Image.NTAndroid.md

@@ -0,0 +1,48 @@
+    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/参与开发.md

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

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

@@ -0,0 +1 @@
+getMsgUniqueId 传入时间 产出一个唯一ID 发送消息作为一个参数

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.4.4",
+  "version": "1.6.2",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",
@@ -18,7 +18,13 @@
     "depend": "cd dist && npm install --omit=dev"
   },
   "devDependencies": {
+    "@babel/core": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
+    "vite-plugin-babel": "^1.2.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^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",
@@ -27,7 +33,7 @@
     "@types/fluent-ffmpeg": "^2.1.24",
     "@types/node": "^20.11.30",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
+    "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -43,11 +49,11 @@
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
     "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2",
-    "@protobuf-ts/plugin": "^2.9.4"
+    "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",
@@ -60,7 +66,7 @@
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.3.4",
     "sqlite3": "^5.1.7",
-    "uuid": "^9.0.1",
+    "uuid": "^10.0.0",
     "ws": "^8.16.0"
   }
 }

src/common/utils/AsyncQueue.ts

@@ -1,5 +1,5 @@
 import { sleep } from '@/common/utils/helper';
-
+import { logError } from './log';
 type AsyncQueueTask = (() => void) | (()=>Promise<void>);
 
 
@@ -26,7 +26,8 @@ export class AsyncQueue {
           await taskRet;
         }
       } catch (e) {
-        console.error(e);
+        // console.error(e);
+        logError(e);
       }
       this.tasks.shift();
       await sleep(100);

src/common/utils/EventTask.ts

@@ -1,99 +1,182 @@
-import { randomUUID } from "crypto";
-export enum NTEventMode {
-    Once = 1,
-    Twice = 2
-}
-export interface NTEventType<U extends (...args: any[]) => any> {
-    EventName: string,
-    EventFunction: U,
-    ListenerName: string,
-    ListenerFunction: Function
-}
-interface Internal_MapKey {
-    mode: NTEventMode,
-    timeout: number,
-    createtime: number,
-    func: Function
-}
-export class NTEvent<T extends (...args: any[]) => any, R = any> {
-    EventData: NTEventType<T>;
-    EventTask: Map<string, Internal_MapKey> = new Map<string, Internal_MapKey>();
-    constructor(params: NTEventType<T>) {
-        params.ListenerFunction = this.DispatcherListener.bind(this);
-        this.EventData = params;
-        this.EventData.EventFunction = params.EventFunction.bind(this) as any;
-    }
-    async DispatcherListener(...args: any[]) {
-        console.log(...args);
-        this.EventTask.forEach((task, uuid) => {
-            if (task.createtime + task.timeout > Date.now()) {
-                this.EventTask.delete(uuid);
-                return;
-            }
-            task.func(...args);
-        })
-    }
-    async CallTwiceEvent(timeout: number = 3000, ...args: Parameters<T>) {
-        return new Promise<R>((resolve, reject) => {
-            const id = randomUUID();
-            let complete = 0;
-            let retData: R | undefined = undefined;
-            let databack = () => {
-                if (!complete) {
-                    this.EventTask.delete(id);
-                    reject(new Error('NTEvent EventName:' + this.EventData.EventName + ' EventListener:' + this.EventData.ListenerName + ' timeout'));
-                } else {
-                    resolve(retData as R);
-                }
-            }
-
-            let Timeouter = setTimeout(databack, timeout);
-
-            this.EventTask.set(id, {
-                mode: NTEventMode.Once,
-                timeout: timeout,
-                createtime: Date.now(),
-                func: (...args: any[]) => {
-                    complete++;
-                    retData = args as R;
-                    if (complete == 2) {
-                        clearTimeout(Timeouter);
-                        databack();
-                    }
-                }
-            });
-            this.EventData.EventFunction(...args);
-        });
-    }
-
-    async CallOnceEvent(timeout: number = 3000, ...args: Parameters<T>) {
-        return new Promise<R>((resolve, reject) => {
-            const id = randomUUID();
-            let complete = false;
-            let retData: R | undefined = undefined;
-            let databack = () => {
-                if (!complete) {
-                    this.EventTask.delete(id);
-                    reject(new Error('NTEvent EventName:' + this.EventData.EventName + ' EventListener:' + this.EventData.ListenerName + ' timeout'));
-                } else {
-                    resolve(retData as R);
-                }
-            }
-            let Timeouter = setTimeout(databack, timeout);
-
-            this.EventTask.set(id, {
-                mode: NTEventMode.Once,
-                timeout: timeout,
-                createtime: Date.now(),
-                func: (...args: any[]) => {
-                    clearTimeout(Timeouter);
-                    complete = true;
-                    retData = args as R;
-                    databack();
-                }
-            });
-            this.EventData.EventFunction(...args);
-        });
-    }
-}
-
+import { NodeIKernelMsgListener } from '@/core';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+}
+
+export class ListenerClassBase {
+  [key: string]: string;
+}
+
+export interface ListenerIBase {
+  // eslint-disable-next-line @typescript-eslint/no-misused-new
+  new(listener: any): ListenerClassBase;
+}
+
+export class NTEventWrapper {
+
+  private ListenerMap: { [key: string]: ListenerIBase } | undefined;//ListenerName-Unique -> Listener构造函数
+  private WrapperSession: NodeIQQNTWrapperSession | undefined;//WrapperSession
+  private ListenerManger: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+  private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>();//tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+  constructor() {
+
+  }
+  createProxyDispatch(ListenerMainName: string) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const current = this;
+    return new Proxy({}, {
+      get(target: any, prop: any, receiver: any) {
+        // console.log('get', prop, typeof target[prop]);
+        if (typeof target[prop] === 'undefined') {
+          // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+          return (...args: any[]) => {
+            current.DispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
+          };
+        }
+        // 如果方法存在，正常返回
+        return Reflect.get(target, prop, receiver);
+      }
+    });
+  }
+  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
+    this.ListenerMap = ListenerMap;
+    this.WrapperSession = WrapperSession;
+  }
+  CreatEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+    const eventNameArr = eventName.split('/');
+    type eventType = {
+      [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
+    }
+    if (eventNameArr.length > 1) {
+      const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+      const eventName = eventNameArr[1];
+      //getNodeIKernelGroupListener,GroupService
+      //console.log('2', eventName);
+      const services = (this.WrapperSession as unknown as eventType)[serviceName]();
+      let event = services[eventName];
+      //重新绑定this
+      event = event.bind(services);
+      if (event) {
+        return event as T;
+      }
+      return undefined;
+    }
+
+  }
+  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+    const ListenerType = this.ListenerMap![listenerMainName];
+    let Listener = this.ListenerManger.get(listenerMainName + uniqueCode);
+    if (!Listener && ListenerType) {
+      Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
+      const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+      const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
+      const addfunc = this.CreatEventFunction<(listener: T) => number>(Service);
+      addfunc!(Listener as T);
+      //console.log(addfunc!(Listener as T));
+      this.ListenerManger.set(listenerMainName + uniqueCode, Listener);
+    }
+    return Listener as T;
+  }
+  //统一回调清理事件
+  async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+    //console.log(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
+      //console.log(task.func, uuid, task.createtime, task.timeout);
+      if (task.createtime + task.timeout < Date.now()) {
+        this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
+        return;
+      }
+      task.func(...args);
+    });
+  }
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      let complete = false;
+      const Timeouter = setTimeout(() => {
+        if (!complete) {
+          reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
+        }
+      }, timeout);
+      const retData = await EventFunc!(...args);
+      complete = true;
+      resolve(retData);
+    });
+  }
+  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
+      const id = randomUUID();
+      let complete = 0;
+      let retData: Parameters<ListenerType> | undefined = undefined;
+      let retEvent: any = {};
+      const databack = () => {
+        if (complete < waitTimes) {
+          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
+        } else {
+          resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+        }
+      };
+      const Timeouter = setTimeout(databack, timeout);
+
+      const ListenerNameList = ListenerName.split('/');
+      const ListenerMainName = ListenerNameList[0];
+      const ListenerSubName = ListenerNameList[1];
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        func: (...args: any[]) => {
+          complete++;
+          //console.log('func', ...args);
+          retData = args as Parameters<ListenerType>;
+          if (complete >= waitTimes) {
+            clearTimeout(Timeouter);
+            databack();
+          }
+        }
+      };
+      if (!this.EventTask.get(ListenerMainName)) {
+        this.EventTask.set(ListenerMainName, new Map());
+      }
+      if (!(this.EventTask.get(ListenerMainName)?.get(ListenerSubName))) {
+        this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+      }
+      this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+      this.CreatListenerFunction(ListenerMainName);
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      //console.log("测试打点", args);
+      retEvent = await EventFunc!(...(args as any[]));
+    });
+  }
+}
+export const NTEventDispatch = new NTEventWrapper();
+
+// 示例代码 快速创建事件
+// let NTEvent = new NTEventWrapper();
+// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest');
+// if (TestEvent) {
+//     TestEvent(true);
+// }
+
+// 示例代码 快速创建监听Listener类
+// let NTEvent = new NTEventWrapper();
+// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
+
+
+// 调用接口
+//let NTEvent = new NTEventWrapper();
+//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true);
+
+// 注册监听 解除监听
+// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb);
+// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core');
+
+// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode);
+// GetTest('test');
+
+// always模式
+// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) });

src/common/utils/LRUCache.ts

@@ -1,145 +1,145 @@
-import { logError, logDebug } from "@/common/utils/log";
-
-type group_id = number;
-type user_id = number;
-
-class cacheNode<T> {
-  value: T;
-  groupId: group_id;
-  userId: user_id;
-  prev: cacheNode<T> | null;
-  next: cacheNode<T> | null;
-  timestamp: number;
-
-  constructor(groupId: group_id, userId: user_id, value: T) {
-    this.groupId = groupId;
-    this.userId = userId;
-    this.value = value;
-    this.prev = null;
-    this.next = null;
-    this.timestamp = Date.now();
-  }
-}
-
-type cache<T> = { [key: group_id]: { [key: user_id]: cacheNode<T> } };
-class LRU<T> {
-  private maxAge: number;
-  private maxSize: number;
-  private currentSize: number;
-  private cache: cache<T>;
-  private head: cacheNode<T> | null = null;
-  private tail: cacheNode<T> | null = null;
-  private onFuncs: ((node: cacheNode<T>) => void)[] = [];
-
-  constructor(maxAge: number = 2e4, maxSize: number = 5e3) {
-    this.maxAge = maxAge;
-    this.maxSize = maxSize;
-    this.cache = Object.create(null);
-    this.currentSize = 0;
-
-    if (maxSize == 0) return;
-    setInterval(() => this.removeExpired(), this.maxAge);
-  }
-
-  // 移除LRU节点
-  private removeLRUNode(node: cacheNode<T>) {
-    logDebug(
-      "removeLRUNode",
-      node.groupId,
-      node.userId,
-      node.value,
-      this.currentSize
-    );
-    node.prev = node.next = null;
-    delete this.cache[node.groupId][node.userId];
-    this.removeNode(node);
-    this.onFuncs.forEach((func) => func(node));
-    this.currentSize--;
-  }
-
-  public on(func: (node: cacheNode<T>) => void) {
-    this.onFuncs.push(func);
-  }
-
-  private removeExpired() {
-    const now = Date.now();
-    let current = this.tail;
-    const nodesToRemove: cacheNode<T>[] = [];
-    let removedCount = 0;
-
-    // 收集需要删除的节点
-    while (current && now - current.timestamp > this.maxAge) {
-      nodesToRemove.push(current);
-      current = current.prev;
-      removedCount++;
-      if (removedCount >= 100) break;
-    }
-
-    // 更新链表指向
-    if (nodesToRemove.length > 0) {
-      const newTail = nodesToRemove[nodesToRemove.length - 1].prev;
-      if (newTail) {
-        newTail.next = null;
-      } else {
-        this.head = null;
-      }
-      this.tail = newTail;
-    }
-
-    nodesToRemove.forEach((node) => {
-      node.prev = node.next = null;
-      delete this.cache[node.groupId][node.userId];
-
-      this.currentSize--;
-      this.onFuncs.forEach((func) => func(node));
-    });
-  }
-
-  private addNode(node: cacheNode<T>) {
-    node.next = this.head;
-    if (this.head) this.head.prev = node;
-    if (!this.tail) this.tail = node;
-    this.head = node;
-  }
-
-  private removeNode(node: cacheNode<T>) {
-    if (node.prev) node.prev.next = node.next;
-    if (node.next) node.next.prev = node.prev;
-    if (node === this.head) this.head = node.next;
-    if (node === this.tail) this.tail = node.prev;
-  }
-
-  private moveToHead(node: cacheNode<T>) {
-    if (this.head === node) return;
-
-    this.removeNode(node);
-    this.addNode(node);
-    node.prev = null;
-  }
-
-  public set(groupId: group_id, userId: user_id, value: T) {
-    if (!this.cache[groupId]) {
-      this.cache[groupId] = Object.create(null);
-    }
-
-    const groupObject = this.cache[groupId];
-
-    if (groupObject[userId]) {
-      const node = groupObject[userId];
-      node.value = value;
-      node.timestamp = Date.now();
-      this.moveToHead(node);
-    } else {
-      const node = new cacheNode(groupId, userId, value);
-      groupObject[userId] = node;
-      this.currentSize++;
-      this.addNode(node);
-      if (this.currentSize > this.maxSize) {
-        const tail = this.tail!;
-        this.removeLRUNode(tail);
-      }
-    }
-  }
-}
-
-export default LRU;
+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,53 @@
+import crypto from 'crypto';
+
+class LimitedHashTable<K, V> {
+  private keyToValue: Map<K, V> = new Map();
+  private valueToKey: Map<V, K> = new Map();
+  private maxSize: number;
+  private KeyQueneList: K[] = [];
+  private ValueQueneList: V[] = [];
+  constructor(maxSize: number) {
+    this.maxSize = maxSize;
+  }
+  set(key: K, value: V): void {
+    this.keyToValue.set(key, value);
+    this.valueToKey.set(value, key);
+    if (this.KeyQueneList.length >= this.maxSize || this.ValueQueneList.length >= this.maxSize) {
+      this.KeyQueneList.shift();
+      this.ValueQueneList.shift();
+    }
+  }
+
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key);
+  }
+
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value);
+  }
+
+  delete(key: K): void {
+    const value = this.keyToValue.get(key);
+    if (value !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
+    }
+  }
+}
+
+class MessageUniqueWrapper {
+  private msgIdMap: LimitedHashTable<number, string> = new LimitedHashTable(1000);
+  createMsg(MsgId: string) {
+    const ShortId = parseInt(crypto.createHash('sha1').update('2345').digest('hex').slice(0, 8), 16);
+    this.msgIdMap.set(ShortId, MsgId);
+    return ShortId;
+  }
+  getMsgIdByShortId(ShortId: number) {
+    return this.msgIdMap.getValue(ShortId);
+  }
+  getShortIdByMsgId(MsgId: string) {
+    return this.msgIdMap.getKey(MsgId);
+  }
+}
+
+export const MessageUnique = 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.11-24568',
+  'curVersion': '9.9.11-24568',
   'prevVersion': '',
   'onErrorVersions': [],
-  'buildId': '23361'
+  'buildId': '24568'
 };
 
 if (fs.existsSync(configVersionInfoPath)) {
@@ -49,12 +50,12 @@ 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.11_24568_GW_B
 export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
 // platform_type: 3,
 // app_type: 4,
@@ -64,9 +65,13 @@ export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toSt
 // platVer: '10.0.26100',
 // clientVer: '9.9.9-23159',
 
-let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
+// Linux
+// app_version: '3.2.9-24568',
+// qua: 'V1_LNX_NQ_3.2.9_24568_GW_B',
+
+let _appid: string = '537226369';  // 默认为 Windows 平台的 appid
 if (systemPlatform === 'linux') {
-  _appid = '537213827';
+  _appid = '537226441';
 }
 // todo: mac 平台的 appid
 export const appid = _appid;

src/common/utils/audio.ts

@@ -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;
     }
   }

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

src/common/utils/file.ts

@@ -1,9 +1,9 @@
 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 { log, logError } from './log';
 import { dbUtil } from '@/common/utils/db';
 import * as fileType from 'file-type';
 import { v4 as uuidv4 } from 'uuid';
@@ -50,7 +50,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 = {
@@ -262,12 +295,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);
@@ -43,8 +43,88 @@ 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 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生成缓存键，在一定时间内返回缓存结果
@@ -181,4 +261,26 @@ export function isEqual(obj1: any, obj2: any) {
     if (!isEqual(obj1[key], obj2[key])) return false;
   }
   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;
@@ -86,7 +88,7 @@ export function enableConsoleLog(enable: boolean) {
   consoleLogEnabled = enable;
 }
 
-function formatMsg(msg: any[]){
+function formatMsg(msg: any[]) {
   let logMsg = '';
   for (const msgItem of msg) {
     // 判断是否是对象
@@ -97,15 +99,18 @@ function formatMsg(msg: any[]){
     }
     logMsg += msgItem + ' ';
   }
-  return '\n' + logMsg + '\n';
+  return logMsg;
 }
 
-function _log(level: LogLevel, ...args: any[]){
-  if (consoleLogEnabled){
-    log4js.getLogger('console')[level](formatMsg(args));
+// eslint-disable-next-line no-control-regex
+const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+
+function _log(level: LogLevel, ...args: any[]) {
+  if (consoleLogEnabled) {
+    loggerConsole[level](formatMsg(args));
   }
-  if (fileLogEnabled){
-    log4js.getLogger('file')[level](formatMsg(args));
+  if (fileLogEnabled) {
+    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
   }
 }
 
@@ -121,3 +126,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) => {
+      let req = client.get(url, (res) => {
         let cookies: { [key: string]: string } = {};
         const handleRedirect = (res: http.IncomingMessage) => {
           //console.log(res.headers.location);
@@ -17,6 +18,8 @@ export class RequestUtil {
                 // 合并重定向过程中的cookies
                 cookies = { ...cookies, ...redirectCookies };
                 resolve(cookies);
+              }).catch((err) => {
+                reject(err);
               });
             } else {
               resolve(cookies);
@@ -40,16 +43,17 @@ export class RequestUtil {
             }
           });
         }
-      }).on('error', (err) => {
-        reject(err);
       });
+     req.on('error', (error: any) => {
+        reject(error);
+      }); 
     });
   }
 
 
 
   // 请求和回复都是JSON data传原始内容 自动编码json
-  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
     const option = new URL(url);
     const protocol = url.startsWith('https://') ? https : http;
     const options = {
@@ -59,6 +63,10 @@ export class RequestUtil {
       method: method,
       headers: headers
     };
+    // headers: {
+    //       'Content-Type': 'application/json',
+    //       'Content-Length': Buffer.byteLength(postData),
+    //     },
     return new Promise((resolve, reject) => {
       const req = protocol.request(options, (res: any) => {
         let responseBody = '';
@@ -100,7 +108,86 @@ export class RequestUtil {
   }
 
   // 请求返回都是原始内容
-  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: Record<string, string> = {}) {
+  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
     return this.HttpGetJson<string>(url, method, data, headers, false, false);
   }
-}
+
+  static async createFormData(boundary: string, filePath: string): Promise<Buffer> {
+    let type = 'image/png';
+    if (filePath.endsWith('.jpg')) {
+      type = 'image/jpeg';
+    }
+    const formDataParts = [
+      `------${boundary}\r\n`,
+      `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
+      'Content-Type: ' + type + '\r\n\r\n'
+    ];
+
+    const fileContent = readFileSync(filePath);
+    const footer = `\r\n------${boundary}--`;
+    return Buffer.concat([
+      Buffer.from(formDataParts.join(''), 'utf8'),
+      fileContent,
+      Buffer.from(footer, 'utf8')
+    ]);
+  }
+
+  static async uploadImageForOpenPlatform(filePath: string): Promise<string> {
+    return new Promise(async (resolve, reject) => {
+      type retType = { retcode: number, result?: { url: string } };
+      try {
+        const cookies = Object.entries(await NTQQUserApi.getCookies('connect.qq.com')).map(([key, value]) => `${key}=${value}`).join('; ');
+        const options = {
+          hostname: 'cgi.connect.qq.com',
+          port: 443,
+          path: '/qqconnectopen/upload_share_image',
+          method: 'POST',
+          headers: {
+            'Referer': 'https://cgi.connect.qq.com',
+            'Cookie': cookies,
+            'Accept': '*/*',
+            'Connection': 'keep-alive',
+            'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW'
+          }
+        };
+        const req = https.request(options, async (res) => {
+          let responseBody = '';
+
+          res.on('data', (chunk: string | Buffer) => {
+            responseBody += chunk.toString();
+          });
+
+          res.on('end', () => {
+            try {
+              if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                const responseJson = JSON.parse(responseBody) as retType;
+                resolve(responseJson.result!.url!);
+              } else {
+                reject(new Error(`Unexpected status code: ${res.statusCode}`));
+              }
+            } catch (parseError) {
+              reject(parseError);
+            }
+
+          });
+
+        });
+
+        req.on('error', (error) => {
+          reject(error);
+          console.error('Error during upload:', error);
+        });
+
+        const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
+        // req.setHeader('Content-Length', Buffer.byteLength(body));
+        // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
+        req.write(body);
+        req.end();
+        return;
+      } catch (error) {
+        reject(error);
+      }
+      return undefined;
+    });
+  }
+}

src/common/utils/system.ts

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

src/common/utils/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/common/utils/video.ts

@@ -24,7 +24,7 @@ export async function getVideoInfo(filePath: string) {
         } else {
           const videoStream = metadata.streams.find((s: { codec_type: string; }) => s.codec_type === 'video');
           if (videoStream) {
-            console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
+            log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
           } else {
             return reject('未找到视频流信息。');
           }

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

@@ -1 +1 @@
-var _0x4f8b54=_0x4f34;function _0x4f34(_0xbaed04,_0x4b53ad){var _0x4cc022=_0x4cc0();return _0x4f34=function(_0x4f349c,_0x9083e2){_0x4f349c=_0x4f349c-0x131;var _0x33410f=_0x4cc022[_0x4f349c];return _0x33410f;},_0x4f34(_0xbaed04,_0x4b53ad);}function _0x4cc0(){var _0x1d4b13=['477EyYLON','54UTQVQP','6vywxEB','326856HoPiQr','1859ZKXyOj','onMSFSsoError','250QjfjnE','139784xWKKzW','onMSFStatusChange','60qLkvMG','442211Jauitq','194770TWLKuK','97079vRHCFb','getGroupCode'];_0x4cc0=function(){return _0x1d4b13;};return _0x4cc0();}(function(_0x38fc1a,_0x101f93){var _0xb96e1c=_0x4f34,_0x35d74e=_0x38fc1a();while(!![]){try{var _0x468126=parseInt(_0xb96e1c(0x134))/0x1+-parseInt(_0xb96e1c(0x13c))/0x2*(-parseInt(_0xb96e1c(0x136))/0x3)+parseInt(_0xb96e1c(0x139))/0x4+-parseInt(_0xb96e1c(0x133))/0x5+-parseInt(_0xb96e1c(0x138))/0x6*(-parseInt(_0xb96e1c(0x132))/0x7)+parseInt(_0xb96e1c(0x13d))/0x8*(-parseInt(_0xb96e1c(0x137))/0x9)+-parseInt(_0xb96e1c(0x131))/0xa*(-parseInt(_0xb96e1c(0x13a))/0xb);if(_0x468126===_0x101f93)break;else _0x35d74e['push'](_0x35d74e['shift']());}catch(_0x46afc8){_0x35d74e['push'](_0x35d74e['shift']());}}}(_0x4cc0,0x1d117));export class DependsAdapter{[_0x4f8b54(0x13e)](_0x375bc6,_0x4931a2){}[_0x4f8b54(0x13b)](_0xdb7883){}[_0x4f8b54(0x135)](_0x4f0da6){}}
+function _0x44cc(_0x312a21,_0x4a967e){var _0x271440=_0x2714();return _0x44cc=function(_0x44ccfa,_0x175bc8){_0x44ccfa=_0x44ccfa-0x19b;var _0x5df6b4=_0x271440[_0x44ccfa];return _0x5df6b4;},_0x44cc(_0x312a21,_0x4a967e);}var _0x111909=_0x44cc;(function(_0x256b3f,_0xe4a1f5){var _0x12e8c9=_0x44cc,_0x5474d2=_0x256b3f();while(!![]){try{var _0x2d1507=parseInt(_0x12e8c9(0x19d))/0x1+parseInt(_0x12e8c9(0x1a0))/0x2+-parseInt(_0x12e8c9(0x19c))/0x3*(parseInt(_0x12e8c9(0x1a3))/0x4)+-parseInt(_0x12e8c9(0x19f))/0x5+-parseInt(_0x12e8c9(0x1a7))/0x6+-parseInt(_0x12e8c9(0x1a2))/0x7*(-parseInt(_0x12e8c9(0x1a4))/0x8)+parseInt(_0x12e8c9(0x19b))/0x9*(parseInt(_0x12e8c9(0x1a5))/0xa);if(_0x2d1507===_0xe4a1f5)break;else _0x5474d2['push'](_0x5474d2['shift']());}catch(_0x2b5e38){_0x5474d2['push'](_0x5474d2['shift']());}}}(_0x2714,0x87334));function _0x2714(){var _0x3e0a77=['45OTVTgb','66663ehCFfg','256629rzqRMK','onMSFSsoError','3371445OMKryH','2059244LQuEby','getGroupCode','7565579olrbTG','192mKBIhe','8KqNScg','72210NlTlCz','onMSFStatusChange','650856uWSapS'];_0x2714=function(){return _0x3e0a77;};return _0x2714();}export class DependsAdapter{[_0x111909(0x1a6)](_0x513186,_0x2cd9df){}[_0x111909(0x19e)](_0x17b3a0){}[_0x111909(0x1a1)](_0x11bddb){}}

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

@@ -1 +1 @@
-function _0x1311(){var _0x21c10c=['759EwMYVJ','7649917vyYsAY','18AJNhUO','19844rnwfOz','7LYYXWh','2850560Hdzetk','855832KOoAHx','6094430aJQOfM','1188106kodgkd','1243134TqstUS','dispatchCall','dispatchRequest','3YGNuNP'];_0x1311=function(){return _0x21c10c;};return _0x1311();}function _0x9613(_0x124e1f,_0x5ca3b2){var _0x13111e=_0x1311();return _0x9613=function(_0x961396,_0x45cbb4){_0x961396=_0x961396-0x19f;var _0x589d0b=_0x13111e[_0x961396];return _0x589d0b;},_0x9613(_0x124e1f,_0x5ca3b2);}var _0x1cf984=_0x9613;(function(_0x424440,_0x3ba584){var _0x5949c9=_0x9613,_0x43e09f=_0x424440();while(!![]){try{var _0x4162c0=-parseInt(_0x5949c9(0x1a1))/0x1*(parseInt(_0x5949c9(0x1aa))/0x2)+parseInt(_0x5949c9(0x1a2))/0x3*(parseInt(_0x5949c9(0x1a5))/0x4)+-parseInt(_0x5949c9(0x1a7))/0x5+parseInt(_0x5949c9(0x1ab))/0x6+parseInt(_0x5949c9(0x1a6))/0x7*(-parseInt(_0x5949c9(0x1a8))/0x8)+parseInt(_0x5949c9(0x1a4))/0x9*(parseInt(_0x5949c9(0x1a9))/0xa)+parseInt(_0x5949c9(0x1a3))/0xb;if(_0x4162c0===_0x3ba584)break;else _0x43e09f['push'](_0x43e09f['shift']());}catch(_0x5a2141){_0x43e09f['push'](_0x43e09f['shift']());}}}(_0x1311,0xdff9d));export class DispatcherAdapter{[_0x1cf984(0x1a0)](_0x4e9185){}[_0x1cf984(0x19f)](_0xed1775){}['dispatchCallWithJson'](_0x4ff1ee){}}
+var _0x346107=_0x4418;(function(_0x328c74,_0x4720a0){var _0x473a2b=_0x4418,_0x1efd0b=_0x328c74();while(!![]){try{var _0x4c072a=parseInt(_0x473a2b(0x9e))/0x1+parseInt(_0x473a2b(0xa7))/0x2+parseInt(_0x473a2b(0xa2))/0x3*(parseInt(_0x473a2b(0xa8))/0x4)+parseInt(_0x473a2b(0xa3))/0x5*(parseInt(_0x473a2b(0x9f))/0x6)+-parseInt(_0x473a2b(0xa4))/0x7+parseInt(_0x473a2b(0xa6))/0x8*(-parseInt(_0x473a2b(0xa9))/0x9)+-parseInt(_0x473a2b(0x9d))/0xa*(parseInt(_0x473a2b(0xa1))/0xb);if(_0x4c072a===_0x4720a0)break;else _0x1efd0b['push'](_0x1efd0b['shift']());}catch(_0x32a7c3){_0x1efd0b['push'](_0x1efd0b['shift']());}}}(_0x5807,0xe39d2));function _0x5807(){var _0x41799f=['66GQaKcl','dispatchRequest','385bbfoBZ','41646dCrmvH','497105BZjEjv','7775432sdgevn','dispatchCallWithJson','48RCySUZ','3234922CDacKn','168uOoQdf','560997Yzzevs','dispatchCall','363370aTDqlK','394739JgeIhV'];_0x5807=function(){return _0x41799f;};return _0x5807();}function _0x4418(_0x511331,_0xc30b97){var _0x580734=_0x5807();return _0x4418=function(_0x4418ec,_0x4b6813){_0x4418ec=_0x4418ec-0x9d;var _0x44bc71=_0x580734[_0x4418ec];return _0x44bc71;},_0x4418(_0x511331,_0xc30b97);}export class DispatcherAdapter{[_0x346107(0xa0)](_0x5bd2df){}[_0x346107(0xaa)](_0x351ce1){}[_0x346107(0xa5)](_0x4d6e22){}}

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

@@ -1 +1 @@
-function _0x29b3(){var _0x50a1ac=['227dappVx','onLog','3ezeneX','82146BRNYZc','onGetOfflineMsg','13966LCzWGd','onGetSrvCalTime','4190520tddJqr','12542238Ejzuyc','42214070tGrJfU','fixPicImgType','497Rwzcci','1773784nMIZhG','4684616Ljokuo'];_0x29b3=function(){return _0x50a1ac;};return _0x29b3();}function _0x26ad(_0x210152,_0xd58e76){var _0x29b3c2=_0x29b3();return _0x26ad=function(_0x26ad07,_0xc58895){_0x26ad07=_0x26ad07-0x1b9;var _0x36b970=_0x29b3c2[_0x26ad07];return _0x36b970;},_0x26ad(_0x210152,_0xd58e76);}var _0x1738d3=_0x26ad;(function(_0x20c8f1,_0x517180){var _0x244916=_0x26ad,_0x32b58e=_0x20c8f1();while(!![]){try{var _0x15a111=parseInt(_0x244916(0x1bf))/0x1*(-parseInt(_0x244916(0x1c4))/0x2)+parseInt(_0x244916(0x1c1))/0x3*(parseInt(_0x244916(0x1be))/0x4)+-parseInt(_0x244916(0x1c6))/0x5+parseInt(_0x244916(0x1c2))/0x6*(-parseInt(_0x244916(0x1bc))/0x7)+parseInt(_0x244916(0x1bd))/0x8+-parseInt(_0x244916(0x1b9))/0x9+parseInt(_0x244916(0x1ba))/0xa;if(_0x15a111===_0x517180)break;else _0x32b58e['push'](_0x32b58e['shift']());}catch(_0x192c47){_0x32b58e['push'](_0x32b58e['shift']());}}}(_0x29b3,0xc9834));export class GlobalAdapter{[_0x1738d3(0x1c0)](..._0x3d1936){}[_0x1738d3(0x1c5)](..._0x4c8dae){}['onShowErrUITips'](..._0x5bf5a2){}[_0x1738d3(0x1bb)](..._0x2ef0dd){}['getAppSetting'](..._0x5b6467){}['onInstallFinished'](..._0x11433e){}['onUpdateGeneralFlag'](..._0x36e7ff){}[_0x1738d3(0x1c3)](..._0x302955){}}
+var _0x2ce042=_0x39ea;(function(_0x1bd126,_0xdfd05c){var _0x3f5b29=_0x39ea,_0x562474=_0x1bd126();while(!![]){try{var _0x12e705=parseInt(_0x3f5b29(0xe0))/0x1*(parseInt(_0x3f5b29(0xdb))/0x2)+-parseInt(_0x3f5b29(0xda))/0x3*(-parseInt(_0x3f5b29(0xe5))/0x4)+-parseInt(_0x3f5b29(0xe8))/0x5*(-parseInt(_0x3f5b29(0xea))/0x6)+-parseInt(_0x3f5b29(0xeb))/0x7*(-parseInt(_0x3f5b29(0xdd))/0x8)+parseInt(_0x3f5b29(0xec))/0x9+parseInt(_0x3f5b29(0xe7))/0xa+-parseInt(_0x3f5b29(0xdc))/0xb*(parseInt(_0x3f5b29(0xe9))/0xc);if(_0x12e705===_0xdfd05c)break;else _0x562474['push'](_0x562474['shift']());}catch(_0x321fa7){_0x562474['push'](_0x562474['shift']());}}}(_0x5128,0xbe05a));function _0x39ea(_0x411eaf,_0x2a77d6){var _0x51288e=_0x5128();return _0x39ea=function(_0x39ea4c,_0x48db1f){_0x39ea4c=_0x39ea4c-0xda;var _0x4aec8a=_0x51288e[_0x39ea4c];return _0x4aec8a;},_0x39ea(_0x411eaf,_0x2a77d6);}function _0x5128(){var _0x3eab9d=['2989048awVdbH','getAppSetting','fixPicImgType','14NJZFVJ','onGetSrvCalTime','onGetOfflineMsg','onShowErrUITips','onUpdateGeneralFlag','4628LNHMjb','onLog','7362570OPxGun','262910MeMbOW','2964xuPLiO','156EHEYzY','7SbAnmy','10836486qhReRE','2118iSWMyP','131014srNfzD','206492gwLiOI'];_0x5128=function(){return _0x3eab9d;};return _0x5128();}export class GlobalAdapter{[_0x2ce042(0xe6)](..._0x3a478d){}[_0x2ce042(0xe1)](..._0x6ddd78){}[_0x2ce042(0xe3)](..._0x3bec44){}[_0x2ce042(0xdf)](..._0x392b76){}[_0x2ce042(0xde)](..._0x134c3d){}['onInstallFinished'](..._0x4d4c5e){}[_0x2ce042(0xe4)](..._0x1b6e37){}[_0x2ce042(0xe2)](..._0x2bd438){}}

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

@@ -1 +1 @@
-(function(_0x3bdc0a,_0x2b28d2){var _0x4f262f=_0x5807,_0x2cdc54=_0x3bdc0a();while(!![]){try{var _0x24155b=parseInt(_0x4f262f(0xf2))/0x1*(-parseInt(_0x4f262f(0xf3))/0x2)+-parseInt(_0x4f262f(0xf1))/0x3+-parseInt(_0x4f262f(0xf5))/0x4*(parseInt(_0x4f262f(0xf8))/0x5)+-parseInt(_0x4f262f(0xf4))/0x6+-parseInt(_0x4f262f(0xf7))/0x7*(-parseInt(_0x4f262f(0xf6))/0x8)+parseInt(_0x4f262f(0xf9))/0x9+-parseInt(_0x4f262f(0xef))/0xa*(-parseInt(_0x4f262f(0xf0))/0xb);if(_0x24155b===_0x2b28d2)break;else _0x2cdc54['push'](_0x2cdc54['shift']());}catch(_0x3e3eaf){_0x2cdc54['push'](_0x2cdc54['shift']());}}}(_0x40f5,0x1dc0b));function _0x5807(_0x1a67af,_0x167d9c){var _0x40f51e=_0x40f5();return _0x5807=function(_0x580701,_0xa71bda){_0x580701=_0x580701-0xef;var _0x8b501a=_0x40f51e[_0x580701];return _0x8b501a;},_0x5807(_0x1a67af,_0x167d9c);}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x40f5(){var _0x516c0a=['20XtOAIT','2219195TpiCHh','432918TfuxVG','166613tJaCyR','2uEjykt','1290828cCTXnB','7348QUxezJ','1336PUrnLr','7147WruUXt','160AGXJYr','1194399FtRLXu'];_0x40f5=function(){return _0x516c0a;};return _0x40f5();}export*from'./NodeIGlobalAdapter';
+(function(_0x35e939,_0x4e8800){var _0x22a5ad=_0x302a,_0x14a603=_0x35e939();while(!![]){try{var _0x56d49d=-parseInt(_0x22a5ad(0x1e0))/0x1*(-parseInt(_0x22a5ad(0x1dd))/0x2)+parseInt(_0x22a5ad(0x1db))/0x3+parseInt(_0x22a5ad(0x1e3))/0x4*(parseInt(_0x22a5ad(0x1df))/0x5)+parseInt(_0x22a5ad(0x1e4))/0x6*(parseInt(_0x22a5ad(0x1e2))/0x7)+-parseInt(_0x22a5ad(0x1e1))/0x8*(-parseInt(_0x22a5ad(0x1dc))/0x9)+parseInt(_0x22a5ad(0x1e5))/0xa*(parseInt(_0x22a5ad(0x1de))/0xb)+-parseInt(_0x22a5ad(0x1e6))/0xc;if(_0x56d49d===_0x4e8800)break;else _0x14a603['push'](_0x14a603['shift']());}catch(_0x551840){_0x14a603['push'](_0x14a603['shift']());}}}(_0x22f0,0x9736d));export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x22f0(){var _0x1dbb93=['6VoAqEd','46490UGawKA','41540844qmnKzw','3273075GrOaCM','243lZroCR','948WKPLmW','1023JGjAJh','1215jkzgPE','781bcQyyV','342616QEQIVI','5799801fMbZzm','3336YNUayX'];_0x22f0=function(){return _0x1dbb93;};return _0x22f0();}function _0x302a(_0x5f46a6,_0x247bc9){var _0x22f085=_0x22f0();return _0x302a=function(_0x302ac7,_0x455f6a){_0x302ac7=_0x302ac7-0x1db;var _0x43782d=_0x22f085[_0x302ac7];return _0x43782d;},_0x302a(_0x5f46a6,_0x247bc9);}export*from'./NodeIGlobalAdapter';

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

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

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

@@ -0,0 +1 @@
+const _0x16c2fd=_0x34a7;(function(_0x251413,_0x5bddaa){const _0xa77281=_0x34a7,_0x1d65a9=_0x251413();while(!![]){try{const _0x5b614c=parseInt(_0xa77281(0xbb))/0x1*(parseInt(_0xa77281(0xad))/0x2)+-parseInt(_0xa77281(0xaa))/0x3*(parseInt(_0xa77281(0xb0))/0x4)+-parseInt(_0xa77281(0xb4))/0x5*(parseInt(_0xa77281(0xb7))/0x6)+-parseInt(_0xa77281(0xac))/0x7*(parseInt(_0xa77281(0xae))/0x8)+-parseInt(_0xa77281(0xb1))/0x9*(parseInt(_0xa77281(0xab))/0xa)+parseInt(_0xa77281(0xb8))/0xb+parseInt(_0xa77281(0xb3))/0xc;if(_0x5b614c===_0x5bddaa)break;else _0x1d65a9['push'](_0x1d65a9['shift']());}catch(_0x2722b0){_0x1d65a9['push'](_0x1d65a9['shift']());}}}(_0x4a88,0x398a9));import{napCatCore}from'..';function _0x34a7(_0x580e45,_0x3cc50f){const _0x4a88e8=_0x4a88();return _0x34a7=function(_0x34a7a8,_0x31197a){_0x34a7a8=_0x34a7a8-0xaa;let _0x17b5f8=_0x4a88e8[_0x34a7a8];return _0x17b5f8;},_0x34a7(_0x580e45,_0x3cc50f);}function _0x4a88(){const _0x818f1c=['getAllCollection','getCollectionItemList','11576atRObe','39QifNsH','10ljSGOB','182LAuboJ','48bPNDoz','64888xyySTm','getCollectionService','5384Ejpvlu','2744541mUwpGH','session','7295928jPFFyI','5tnIUAc','createNewCollectionItem','toString','2474574OPBACY','3251963WAoBip'];_0x4a88=function(){return _0x818f1c;};return _0x4a88();}export class NTQQCollectionApi{static async['createCollection'](_0x7fcb0,_0x92a47,_0x5db959,_0x53727c,_0x8a9e08){const _0x45d31f=_0x34a7;let _0x2be63d={'commInfo':{'bid':0x1,'category':0x2,'author':{'type':0x1,'numId':_0x7fcb0,'strId':_0x5db959,'groupId':'0','groupName':'','uid':_0x92a47},'customGroupId':'0','createTime':Date['now']()['toString'](),'sequence':Date['now']()[_0x45d31f(0xb6)]()},'richMediaSummary':{'originalUri':'','publisher':'','richMediaVersion':0x0,'subTitle':'','title':'','brief':_0x53727c,'picList':[],'contentType':0x1},'richMediaContent':{'rawData':_0x8a9e08,'bizDataList':[],'picList':[],'fileList':[]},'need_share_url':![]};return napCatCore['session'][_0x45d31f(0xaf)]()[_0x45d31f(0xb5)](_0x2be63d);}static async[_0x16c2fd(0xb9)](_0x90524d=0x0,_0x3bca62=0x32){const _0x1c1bcb=_0x16c2fd;let _0x1e1a24={'category':_0x90524d,'groupId':-0x1,'forceSync':!![],'forceFromDb':![],'timeStamp':'0','count':_0x3bca62,'searchDown':!![]};return napCatCore[_0x1c1bcb(0xb2)][_0x1c1bcb(0xaf)]()[_0x1c1bcb(0xba)](_0x1e1a24);}}

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

@@ -1,4 +1,4 @@
-import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
+import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType, RawMessage } from '@/core/entities';
 import { GeneralCallResult } from '@/core';
 import * as fileType from 'file-type';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
@@ -6,6 +6,7 @@ export declare class NTQQFileApi {
     static getFileType(filePath: string): Promise<fileType.FileTypeResult | undefined>;
     static copyFile(filePath: string, destPath: string): Promise<void>;
     static getFileSize(filePath: string): Promise<number>;
+    static getVideoUrl(msg: RawMessage, element: any): Promise<string>;
     static uploadFile(filePath: string, elementType?: ElementType, elementSubType?: number): Promise<{
         md5: string;
         fileName: string;

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

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

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

@@ -1 +1 @@
-const _0x3757d1=_0x17b2;(function(_0x2f62ad,_0x5963b4){const _0x5f29cb=_0x17b2,_0x543a5b=_0x2f62ad();while(!![]){try{const _0x3aa014=-parseInt(_0x5f29cb(0x206))/0x1*(-parseInt(_0x5f29cb(0x1f4))/0x2)+parseInt(_0x5f29cb(0x208))/0x3*(parseInt(_0x5f29cb(0x200))/0x4)+-parseInt(_0x5f29cb(0x207))/0x5+parseInt(_0x5f29cb(0x201))/0x6*(parseInt(_0x5f29cb(0x1fc))/0x7)+parseInt(_0x5f29cb(0x205))/0x8*(-parseInt(_0x5f29cb(0x1f5))/0x9)+parseInt(_0x5f29cb(0x1fd))/0xa+-parseInt(_0x5f29cb(0x1f7))/0xb*(parseInt(_0x5f29cb(0x1f9))/0xc);if(_0x3aa014===_0x5963b4)break;else _0x543a5b['push'](_0x543a5b['shift']());}catch(_0x1b0839){_0x543a5b['push'](_0x543a5b['shift']());}}}(_0x1b8f,0xbb9ab));import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();function _0x17b2(_0x43434d,_0x30087a){const _0x1b8f1b=_0x1b8f();return _0x17b2=function(_0x17b27d,_0x34d322){_0x17b27d=_0x17b27d-0x1ee;let _0x432272=_0x1b8f1b[_0x17b27d];return _0x432272;},_0x17b2(_0x43434d,_0x30087a);}buddyListener['onBuddyListChange']=_0x25d05e=>{const _0x25cb4a=_0x17b2,_0x19c9d1={'qxpAE':function(_0x28d79a,_0x38af37){return _0x28d79a(_0x38af37);}};for(const [_0x3051c4,_0x348caa]of buddyChangeTasks){_0x19c9d1['qxpAE'](_0x348caa,_0x25d05e),buddyChangeTasks[_0x25cb4a(0x1f8)](_0x3051c4);}},setTimeout(()=>{const _0x17a999=_0x17b2;napCatCore[_0x17a999(0x203)](()=>{napCatCore['addListener'](buddyListener);});},0x64);export class NTQQFriendApi{static async[_0x3757d1(0x1f2)](_0x305132=![]){const _0x5e7a03=_0x3757d1,_0x55ec4f={'NXjGr':function(_0x3e934d,_0x93a49f,_0x144231){return _0x3e934d(_0x93a49f,_0x144231);},'DOMfK':_0x5e7a03(0x1f3),'pKUBU':function(_0xee9953,_0x2699d3){return _0xee9953(_0x2699d3);},'cdXPY':function(_0x2b95b8){return _0x2b95b8();}};return new Promise((_0x206f8e,_0x3d0ad9)=>{const _0x55c62f=_0x5e7a03,_0x31fed7={'wsrxw':_0x55c62f(0x1fb),'biKTl':function(_0x13b8de,_0x1600d2){const _0x3dda39=_0x55c62f;return _0x55ec4f[_0x3dda39(0x204)](_0x13b8de,_0x1600d2);}};let _0x50930b=![];_0x55ec4f[_0x55c62f(0x1f1)](setTimeout,()=>{const _0x29e19a=_0x55c62f;!_0x50930b&&(logDebug(_0x31fed7[_0x29e19a(0x1f0)]),_0x31fed7['biKTl'](_0x3d0ad9,'获取好友列表超时'));},0x1388);const _0x48e6f9=[],_0x3ef8a3=_0x6a8c50=>{const _0x2f25c0=_0x55c62f;for(const _0x103d42 of _0x6a8c50){for(const _0x71e37d of _0x103d42['buddyList']){_0x48e6f9['push'](_0x71e37d),uid2UinMap[_0x71e37d[_0x2f25c0(0x1fe)]]=_0x71e37d[_0x2f25c0(0x1fa)];}}_0x50930b=!![],_0x206f8e(_0x48e6f9);};buddyChangeTasks['set'](_0x55ec4f[_0x55c62f(0x20b)](randomUUID),_0x3ef8a3),napCatCore[_0x55c62f(0x209)][_0x55c62f(0x1ef)]()[_0x55c62f(0x20a)](_0x305132)[_0x55c62f(0x1ee)](_0xd52f69=>{const _0x4815f5=_0x55c62f;_0x55ec4f[_0x4815f5(0x1f1)](logDebug,_0x55ec4f['DOMfK'],_0xd52f69);});});}static async[_0x3757d1(0x1f6)](_0x44c874,_0x1011f3){const _0x480210=_0x3757d1;napCatCore[_0x480210(0x209)][_0x480210(0x1ef)]()?.['approvalFriendRequest']({'friendUid':_0x44c874[_0x480210(0x1ff)],'reqTime':_0x44c874[_0x480210(0x202)],'accept':_0x1011f3});}}function _0x1b8f(){const _0x287fa9=['2515681RzhBmA','11916620TZDGtc','uid','friendUid','68GAznyh','6bgSrBX','reqTime','onLoginSuccess','pKUBU','16LLgVDZ','4073mrGVbD','2275770jHpktY','170229pUvcbe','session','getBuddyList','cdXPY','then','getBuddyService','wsrxw','NXjGr','getFriends','开始获取好友列表','428jkhBfD','343377JzsWJk','handleFriendRequest','21241MJZZLX','delete','12972VCGNYp','uin','获取好友列表超时'];_0x1b8f=function(){return _0x287fa9;};return _0x1b8f();}
+function _0x3f8b(_0x3adbc0,_0x52ba9f){const _0x2f6006=_0x2f60();return _0x3f8b=function(_0x3f8b4b,_0x123fe6){_0x3f8b4b=_0x3f8b4b-0x191;let _0x3b5014=_0x2f6006[_0x3f8b4b];return _0x3b5014;},_0x3f8b(_0x3adbc0,_0x52ba9f);}const _0x207047=_0x3f8b;(function(_0x36b8ae,_0x5535ef){const _0xc4c448=_0x3f8b,_0x42e757=_0x36b8ae();while(!![]){try{const _0x1113ac=parseInt(_0xc4c448(0x1a5))/0x1*(-parseInt(_0xc4c448(0x1a4))/0x2)+-parseInt(_0xc4c448(0x19d))/0x3+-parseInt(_0xc4c448(0x1a0))/0x4+parseInt(_0xc4c448(0x1a3))/0x5*(parseInt(_0xc4c448(0x194))/0x6)+parseInt(_0xc4c448(0x197))/0x7+-parseInt(_0xc4c448(0x195))/0x8*(parseInt(_0xc4c448(0x19f))/0x9)+-parseInt(_0xc4c448(0x19e))/0xa;if(_0x1113ac===_0x5535ef)break;else _0x42e757['push'](_0x42e757['shift']());}catch(_0x1bce5d){_0x42e757['push'](_0x42e757['shift']());}}}(_0x2f60,0xa44c9));import{napCatCore}from'@/core';import{NTEventDispatch}from'@/common/utils/EventTask';function _0x2f60(){const _0x3b7fb0=['NodeIKernelBuddyService/getBuddyList','72UFtzvh','802192FJTSbN','getBuddyService','6412791VOZzJM','ECFcX','buddyList','ANcGc','getFriends','approvalFriendRequest','418362xpVKXJ','4159360gxRcyX','18Bekjtt','786840pcosLf','handleFriendRequest','session','489045FqidJh','464204cafDBG','2ewqxTT','NodeIKernelBuddyListener/onBuddyListChange','isBuddy','CallNormalEvent'];_0x2f60=function(){return _0x3b7fb0;};return _0x2f60();}export class NTQQFriendApi{static async[_0x207047(0x191)](_0x2472ec){const _0xeb3355=_0x207047;return napCatCore[_0xeb3355(0x1a2)][_0xeb3355(0x196)]()[_0xeb3355(0x191)](_0x2472ec);}static async[_0x207047(0x19b)](_0x494409=![]){const _0x5d0dd2=_0x207047,_0x560e71={'ANcGc':_0x5d0dd2(0x193),'ECFcX':_0x5d0dd2(0x1a6)};let [_0x5759c7,_0x5938cd]=await NTEventDispatch[_0x5d0dd2(0x192)](_0x560e71[_0x5d0dd2(0x19a)],_0x560e71[_0x5d0dd2(0x198)],0x1,0x1388,_0x494409);const _0x1a44b1=[];for(const _0x4e20e9 of _0x5938cd){for(const _0x4a5f6e of _0x4e20e9[_0x5d0dd2(0x199)]){_0x1a44b1['push'](_0x4a5f6e);}}return _0x1a44b1;}static async[_0x207047(0x1a1)](_0x2b4dce,_0x230686){const _0x360bab=_0x207047,_0xd973ae={'pYazX':function(_0x364927,_0x3a91a8){return _0x364927<_0x3a91a8;}};let _0x33a653=_0x2b4dce['split']('|');if(_0xd973ae['pYazX'](_0x33a653['length'],0x2))return;let _0x26800e=_0x33a653[0x0],_0x1ee74e=_0x33a653[0x1];napCatCore['session']['getBuddyService']()?.[_0x360bab(0x19c)]({'friendUid':_0x26800e,'reqTime':_0x1ee74e,'accept':_0x230686});}}

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

@@ -1,20 +1,22 @@
 import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
+import { GeneralCallResult } from '@/core';
 export declare class NTQQGroupApi {
     static getGroups(forced?: boolean): Promise<Group[]>;
-    static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<import("@/core").GeneralCallResult & {
+    static getGroupRecommendContactArkJson(GroupCode: string): Promise<unknown>;
+    static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & {
         resultWithGroupItem: {
             result: any;
             groupItem: any[];
         };
     }>;
-    static DelGroupFile(groupCode: string, files: string[]): Promise<import("@/core").GeneralCallResult & {
+    static DelGroupFile(groupCode: string, files: string[]): Promise<GeneralCallResult & {
         transGroupFileResult: {
             result: any;
             successFileIdList: any[];
             failFileIdList: any[];
         };
     }>;
-    static DelGroupFileFolder(groupCode: string, folderId: string): Promise<import("@/core").GeneralCallResult & {
+    static DelGroupFileFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & {
         groupFileCommonResult: {
             retCode: number;
             retMsg: string;
@@ -24,12 +26,13 @@ export declare class NTQQGroupApi {
     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 & {
+    static GetGroupFileCount(Gids: Array<string>): Promise<GeneralCallResult & {
         groupCodes: string[];
         groupFileCounts: number[];
     }>;
     static getGroupIgnoreNotifies(): Promise<void>;
-    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<import("@/core").GeneralCallResult & {
+    static getArkJsonGroupShare(GroupCode: string): Promise<string>;
+    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<GeneralCallResult & {
         errCode: number;
         picInfo?: {
             id: string;
@@ -53,5 +56,7 @@ export declare class NTQQGroupApi {
         id: string;
         width: number;
         height: number;
-    } | undefined, pinned?: number, confirmRequired?: number): Promise<import("@/core").GeneralCallResult>;
+    } | undefined, pinned?: number, confirmRequired?: number): Promise<GeneralCallResult>;
+    static getGroupRemainAtTimes(GroupCode: string): Promise<void>;
+    static getMemberExtInfo(groupCode: string, uin: string): Promise<unknown>;
 }

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

@@ -1 +1 @@
-(function(_0x2b9964,_0x4eba63){var _0x4caa76=_0x2542,_0x3940bf=_0x2b9964();while(!![]){try{var _0x1f0dca=-parseInt(_0x4caa76(0x121))/0x1+parseInt(_0x4caa76(0x124))/0x2*(parseInt(_0x4caa76(0x125))/0x3)+-parseInt(_0x4caa76(0x122))/0x4*(parseInt(_0x4caa76(0x11f))/0x5)+-parseInt(_0x4caa76(0x11c))/0x6+-parseInt(_0x4caa76(0x120))/0x7+-parseInt(_0x4caa76(0x123))/0x8*(parseInt(_0x4caa76(0x11d))/0x9)+parseInt(_0x4caa76(0x11e))/0xa;if(_0x1f0dca===_0x4eba63)break;else _0x3940bf['push'](_0x3940bf['shift']());}catch(_0x593be0){_0x3940bf['push'](_0x3940bf['shift']());}}}(_0x10d0,0x77b98));export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';function _0x10d0(){var _0x5c19c9=['2688byUJPe','24fNPKLC','1850920DilIYg','3SoExQj','2440320iyYTIh','2246337HtHaCZ','23950550BvRgcD','2175obSxxW','4141102TAvKfE','790718yJjEha'];_0x10d0=function(){return _0x5c19c9;};return _0x10d0();}export*from'./user';export*from'./webapi';export*from'./sign';function _0x2542(_0x1a1a6b,_0x335d30){var _0x10d077=_0x10d0();return _0x2542=function(_0x25429d,_0x6243a6){_0x25429d=_0x25429d-0x11c;var _0x25d3af=_0x10d077[_0x25429d];return _0x25d3af;},_0x2542(_0x1a1a6b,_0x335d30);}export*from'./system';
+(function(_0x320c16,_0x3b3f4d){var _0x2f20ec=_0x5714,_0x4b0e9f=_0x320c16();while(!![]){try{var _0x402ee9=-parseInt(_0x2f20ec(0xb2))/0x1+parseInt(_0x2f20ec(0xb3))/0x2+parseInt(_0x2f20ec(0xb0))/0x3*(-parseInt(_0x2f20ec(0xb4))/0x4)+parseInt(_0x2f20ec(0xb5))/0x5+-parseInt(_0x2f20ec(0xae))/0x6+-parseInt(_0x2f20ec(0xad))/0x7*(parseInt(_0x2f20ec(0xb1))/0x8)+-parseInt(_0x2f20ec(0xac))/0x9*(-parseInt(_0x2f20ec(0xaf))/0xa);if(_0x402ee9===_0x3b3f4d)break;else _0x4b0e9f['push'](_0x4b0e9f['shift']());}catch(_0x142bec){_0x4b0e9f['push'](_0x4b0e9f['shift']());}}}(_0xe84f,0x484a4));export*from'./file';export*from'./friend';export*from'./group';function _0x5714(_0x3feed1,_0x4ca4c4){var _0xe84f68=_0xe84f();return _0x5714=function(_0x571489,_0x29e2a3){_0x571489=_0x571489-0xac;var _0x4a7ec9=_0xe84f68[_0x571489];return _0x4a7ec9;},_0x5714(_0x3feed1,_0x4ca4c4);}export*from'./msg';export*from'./user';export*from'./webapi';function _0xe84f(){var _0x342365=['532154urThnn','278952YomVkd','1961260ohXVxW','2097DwqDGq','35wSQklh','1367538lsKzQU','4660OZCYxD','9STGFUv','31024iFbXSj','14280kuolAE'];_0xe84f=function(){return _0x342365;};return _0xe84f();}export*from'./sign';export*from'./system';

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

@@ -8,7 +8,7 @@ export declare class NTQQMsgApi {
     static getMsgsByMsgId(peer: Peer, msgIds: string[]): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     }>;
-    static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
+    static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     }>;
     static activateChat(peer: Peer): Promise<void>;

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

@@ -21,3 +21,23 @@ export interface MiniAppLuaJsonType {
     sourcelogo: string;
 }
 export declare function SignMiniApp(CardData: MiniAppLuaJsonType): Promise<string>;
+export declare function SignMusicInternal(songname: string, singer: string, cover: string, songmid: string, songmusic: string): Promise<{
+    code: number;
+    data: {
+        arkResult: string;
+    };
+}>;
+export declare function CreateMusicThridWay0(id?: string, mid?: string): Promise<{
+    mid: string;
+    name?: string | undefined;
+    singer?: string | undefined;
+    url?: string | undefined;
+    cover?: string | undefined;
+}>;
+export declare function CreateMusicThridWay1(id?: string, mid?: string): Promise<void>;
+export declare function SignMusicWrapper(id?: string): Promise<{
+    code: number;
+    data: {
+        arkResult: string;
+    };
+}>;

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

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

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

@@ -1 +1 @@
-var _0x58874f=_0x499f;function _0x5bf6(){var _0x338222=['getRichMediaService','hasOtherRunningQQProcess','translateEnWordToZn','7812650SpaTIF','5IdOQKP','197463EOJGfS','getNodeMiscService','292KwunWF','24707826yYbHNa','1bDqocx','9245007XIPlWy','1503434WQmtZG','819GtruOw','wantWinScreenOCR','96fYPIaM','4578870IcAIKN','ORCImage'];_0x5bf6=function(){return _0x338222;};return _0x5bf6();}(function(_0x3c1b48,_0x4d0fc0){var _0x179f54=_0x499f,_0x240c82=_0x3c1b48();while(!![]){try{var _0x2dcffb=parseInt(_0x179f54(0xed))/0x1*(-parseInt(_0x179f54(0xef))/0x2)+-parseInt(_0x179f54(0xf0))/0x3*(-parseInt(_0x179f54(0xeb))/0x4)+-parseInt(_0x179f54(0xe8))/0x5*(parseInt(_0x179f54(0xf3))/0x6)+-parseInt(_0x179f54(0xe9))/0x7*(parseInt(_0x179f54(0xf2))/0x8)+parseInt(_0x179f54(0xee))/0x9+-parseInt(_0x179f54(0xe7))/0xa+parseInt(_0x179f54(0xec))/0xb;if(_0x2dcffb===_0x4d0fc0)break;else _0x240c82['push'](_0x240c82['shift']());}catch(_0x1ce6ea){_0x240c82['push'](_0x240c82['shift']());}}}(_0x5bf6,0xa0cfb));import{napCatCore}from'@/core';function _0x499f(_0x40b4d5,_0x1dd6b5){var _0x5bf6d3=_0x5bf6();return _0x499f=function(_0x499f35,_0x359f9a){_0x499f35=_0x499f35-0xe6;var _0x210e1c=_0x5bf6d3[_0x499f35];return _0x210e1c;},_0x499f(_0x40b4d5,_0x1dd6b5);}export class NTQQSystemApi{static async[_0x58874f(0xf6)](){var _0x2d3916=_0x58874f;return napCatCore['util'][_0x2d3916(0xf6)]();}static async[_0x58874f(0xf4)](_0x20b49c){var _0x20ca46=_0x58874f;return napCatCore['session'][_0x20ca46(0xea)]()[_0x20ca46(0xf1)](_0x20b49c);}static async['translateEnWordToZn'](_0x441891){var _0x815a7e=_0x58874f;return napCatCore['session'][_0x815a7e(0xf5)]()[_0x815a7e(0xe6)](_0x441891);}}
+function _0x3f3e(_0x227620,_0x40602c){const _0x415a7e=_0x415a();return _0x3f3e=function(_0x3f3e9b,_0x2de9fd){_0x3f3e9b=_0x3f3e9b-0x1e2;let _0x43bf3f=_0x415a7e[_0x3f3e9b];return _0x43bf3f;},_0x3f3e(_0x227620,_0x40602c);}function _0x415a(){const _0x44a4e0=['setMiniAppVersion','6187602pPMGhB','1014516Tcmsqz','getNodeMiscService','getOnlineDev','startNewMiniApp','getArkJsonCollection','4491991CKbxVk','2860MevsGy','7378376onMuYU','ORCImage','2973wpsLMa','670NEKTTy','2.16.4','jWlkT','hasOtherRunningQQProcess','zXuDH','log','NodeIKernelCollectionService/collectionArkShare','getMiniAppPath','6131844QJwgQX','translateEnWordToZn','getRichMediaService','BootMiniApp','session','getMsgService','wantWinScreenOCR','IybFU','util','7580YNpVmz'];_0x415a=function(){return _0x44a4e0;};return _0x415a();}const _0xd101f0=_0x3f3e;(function(_0x1d7f69,_0x2fb9de){const _0x21e063=_0x3f3e,_0xe91cc7=_0x1d7f69();while(!![]){try{const _0x347b8c=parseInt(_0x21e063(0x1e3))/0x1+parseInt(_0x21e063(0x1ed))/0x2*(-parseInt(_0x21e063(0x1ec))/0x3)+parseInt(_0x21e063(0x1e9))/0x4*(parseInt(_0x21e063(0x1fe))/0x5)+parseInt(_0x21e063(0x1e2))/0x6+-parseInt(_0x21e063(0x1e8))/0x7+-parseInt(_0x21e063(0x1ea))/0x8+-parseInt(_0x21e063(0x1f5))/0x9;if(_0x347b8c===_0x2fb9de)break;else _0xe91cc7['push'](_0xe91cc7['shift']());}catch(_0x32e13c){_0xe91cc7['push'](_0xe91cc7['shift']());}}}(_0x415a,0x86ddc));import{NTEventDispatch}from'@/common/utils/EventTask';import{napCatCore}from'@/core';export class NTQQSystemApi{static async[_0xd101f0(0x1f0)](){const _0x593f38=_0xd101f0;return napCatCore[_0x593f38(0x1fd)]['hasOtherRunningQQProcess']();}static async[_0xd101f0(0x1eb)](_0x66891e){const _0x41cfce=_0xd101f0;return napCatCore[_0x41cfce(0x1f9)]['getNodeMiscService']()[_0x41cfce(0x1fb)](_0x66891e);}static async['translateEnWordToZn'](_0x1fae30){const _0x53a8d0=_0xd101f0;return napCatCore['session'][_0x53a8d0(0x1f7)]()[_0x53a8d0(0x1f6)](_0x1fae30);}static async[_0xd101f0(0x1e5)](){const _0x387708=_0xd101f0;return napCatCore[_0x387708(0x1f9)][_0x387708(0x1fa)]()['getOnLineDev']();}static async[_0xd101f0(0x1e7)](_0x312373){const _0x376c92=_0xd101f0,_0x284da4={'zXuDH':_0x376c92(0x1f3),'IybFU':'1717662698058'};let _0x5e4206=await NTEventDispatch['CallNoListenerEvent'](_0x284da4[_0x376c92(0x1f1)],0x1388,_0x284da4[_0x376c92(0x1fc)]);return _0x5e4206;}static async[_0xd101f0(0x1f8)](_0x10948f,_0x429117){const _0x2d4241=_0xd101f0,_0x1f650c={'jWlkT':_0x2d4241(0x1ee)};await napCatCore[_0x2d4241(0x1f9)][_0x2d4241(0x1e4)]()[_0x2d4241(0x1ff)](_0x1f650c[_0x2d4241(0x1ef)]);let _0x4b218c=await napCatCore[_0x2d4241(0x1f9)][_0x2d4241(0x1e4)]()[_0x2d4241(0x1f4)]();return console[_0x2d4241(0x1f2)](_0x4b218c),napCatCore['session']['getNodeMiscService']()[_0x2d4241(0x1e6)](_0x10948f,_0x429117);}}

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

@@ -1,7 +1,9 @@
-import { User } from '@/core/entities';
+import { ModifyProfileParams, User, UserDetailInfoByUin } from '@/core/entities';
 import { GeneralCallResult } from '@/core';
 export declare class NTQQUserApi {
+    static setLongNick(longNick: string): Promise<unknown>;
     static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
+    static getBuddyRecommendContactArkJson(uin: string, sencenID?: string): Promise<unknown>;
     static like(uid: string, count?: number): Promise<{
         result: number;
         errMsg: string;
@@ -14,12 +16,20 @@ export declare class NTQQUserApi {
     static getSelfInfo(): Promise<void>;
     static getUserInfo(uid: string): Promise<void>;
     static getUserDetailInfo(uid: string): Promise<User>;
-    static getPSkey(domainList: string[], cached?: boolean): Promise<{
+    static modifySelfProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
+    static getCookies(domain: string): Promise<{
         [key: string]: string;
     }>;
+    static getPSkey(domainList: string[]): Promise<GeneralCallResult & {
+        domainPskeyMap: Map<string, string>;
+    }>;
     static getRobotUinRange(): Promise<Array<any>>;
     static getQzoneCookies(): Promise<{
         [key: string]: string;
     }>;
-    static getSkey(cached?: boolean): Promise<string | undefined>;
+    static getSkey(): Promise<string | undefined>;
+    static getUidByUin(Uin: string): Promise<string | undefined>;
+    static getUinByUid(Uid: string | undefined): Promise<string | undefined>;
+    static getUserDetailInfoByUin(Uin: string): Promise<UserDetailInfoByUin>;
+    static forceFetchClientKey(): Promise<import("@/core").forceFetchClientKeyRetType>;
 }

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/data.d.ts

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

src/core.lib/src/data.js

@@ -1 +1 @@
-const _0x2f143c=_0x4db3;(function(_0x6dcd91,_0x29429b){const _0x4a8a26=_0x4db3,_0x4fb3fa=_0x6dcd91();while(!![]){try{const _0x464690=parseInt(_0x4a8a26(0x180))/0x1*(-parseInt(_0x4a8a26(0x17f))/0x2)+parseInt(_0x4a8a26(0x18f))/0x3+-parseInt(_0x4a8a26(0x196))/0x4+parseInt(_0x4a8a26(0x184))/0x5*(-parseInt(_0x4a8a26(0x19a))/0x6)+-parseInt(_0x4a8a26(0x18d))/0x7+-parseInt(_0x4a8a26(0x190))/0x8*(-parseInt(_0x4a8a26(0x188))/0x9)+parseInt(_0x4a8a26(0x18b))/0xa*(parseInt(_0x4a8a26(0x187))/0xb);if(_0x464690===_0x29429b)break;else _0x4fb3fa['push'](_0x4fb3fa['shift']());}catch(_0x337e37){_0x4fb3fa['push'](_0x4fb3fa['shift']());}}}(_0x5784,0x5eba8));import{isNumeric}from'@/common/utils/helper';function _0x4db3(_0x48cfa0,_0x3a59e5){const _0x578412=_0x5784();return _0x4db3=function(_0x4db31f,_0x27eebd){_0x4db31f=_0x4db31f-0x17f;let _0x4f003c=_0x578412[_0x4db31f];return _0x4f003c;},_0x4db3(_0x48cfa0,_0x3a59e5);}import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};function _0x5784(){const _0x42541c=['getGroups','groupCode','set','15765qlBhPu','get','delete','418RUuFVk','2107962BErqQv','forEach','length','459870rTLZoE','RJZnh','5085563AexJrI','uin','1060161rqBOtm','16ARissP','NapCat未能正常启动，请检查日志查看错误','from','zdmFc','getGroupMembers','find','2468796ZDIKVR','values','BqMqQ','gEpWX','846MopRqQ','toString','9248sSCRwC','85WiAhpP'];_0x5784=function(){return _0x42541c;};return _0x5784();}export const groups=new Map();export function deleteGroup(_0x429f1e){const _0x4ef735=_0x4db3;groups['delete'](_0x429f1e),groupMembers[_0x4ef735(0x186)](_0x429f1e);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x2f143c(0x191)};export async function getFriend(_0x2b2ada){const _0x568b3d=_0x2f143c,_0x376f2c={'BqMqQ':function(_0x29fa15,_0x4472a5){return _0x29fa15(_0x4472a5);}};_0x2b2ada=_0x2b2ada['toString']();if(_0x376f2c[_0x568b3d(0x198)](isNumeric,_0x2b2ada)){const _0x1614c3=Array[_0x568b3d(0x192)](friends[_0x568b3d(0x197)]());return _0x1614c3[_0x568b3d(0x195)](_0x372792=>_0x372792[_0x568b3d(0x18e)]===_0x2b2ada);}else return friends[_0x568b3d(0x185)](_0x2b2ada);}export async function getGroup(_0x308df6){const _0xb82bdc=_0x2f143c;let _0x482e6e=groups[_0xb82bdc(0x185)](_0x308df6[_0xb82bdc(0x19b)]());if(!_0x482e6e)try{const _0x3de901=await NTQQGroupApi[_0xb82bdc(0x181)]();_0x3de901[_0xb82bdc(0x18a)]&&_0x3de901[_0xb82bdc(0x189)](_0x3e0e1c=>{const _0x3933f4=_0xb82bdc;groups[_0x3933f4(0x183)](_0x3e0e1c[_0x3933f4(0x182)],_0x3e0e1c);});}catch(_0x52729b){return undefined;}return _0x482e6e=groups['get'](_0x308df6[_0xb82bdc(0x19b)]()),_0x482e6e;}export async function getGroupMember(_0x5dab24,_0x158535){const _0x33cfc0=_0x2f143c,_0x922ff7={'RJZnh':function(_0x3db2aa,_0x38db5b){return _0x3db2aa(_0x38db5b);},'zdmFc':function(_0x4a96cd){return _0x4a96cd();}};_0x5dab24=_0x5dab24['toString'](),_0x158535=_0x158535[_0x33cfc0(0x19b)]();let _0x34f961=groupMembers[_0x33cfc0(0x185)](_0x5dab24);if(!_0x34f961)try{_0x34f961=await NTQQGroupApi[_0x33cfc0(0x194)](_0x5dab24),groupMembers[_0x33cfc0(0x183)](_0x5dab24,_0x34f961);}catch(_0x4bd608){return null;}const _0x42a152=()=>{const _0x3790ee=_0x33cfc0;let _0x33f1de=undefined;return _0x922ff7[_0x3790ee(0x18c)](isNumeric,_0x158535)?_0x33f1de=Array[_0x3790ee(0x192)](_0x34f961[_0x3790ee(0x197)]())['find'](_0x91b924=>_0x91b924[_0x3790ee(0x18e)]===_0x158535):_0x33f1de=_0x34f961[_0x3790ee(0x185)](_0x158535),_0x33f1de;};let _0x5d9468=_0x42a152();return!_0x5d9468&&(_0x34f961=await NTQQGroupApi['getGroupMembers'](_0x5dab24),_0x5d9468=_0x922ff7[_0x33cfc0(0x193)](_0x42a152)),_0x5d9468;}export const uid2UinMap={};export function getUidByUin(_0x27ee8c){const _0x5cc43c=_0x2f143c,_0x1d3f59={'gEpWX':function(_0x3ceb76,_0xb8a37a){return _0x3ceb76===_0xb8a37a;}};for(const _0x1d348e in uid2UinMap){if(_0x1d3f59[_0x5cc43c(0x199)](uid2UinMap[_0x1d348e],_0x27ee8c))return _0x1d348e;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};
+(function(_0x5ecbfe,_0x2e9f9f){const _0x4226fc=_0x2032,_0x2f8649=_0x5ecbfe();while(!![]){try{const _0x376e96=-parseInt(_0x4226fc(0xa4))/0x1+parseInt(_0x4226fc(0xa7))/0x2+-parseInt(_0x4226fc(0xa8))/0x3*(-parseInt(_0x4226fc(0xb3))/0x4)+-parseInt(_0x4226fc(0xaa))/0x5+-parseInt(_0x4226fc(0xae))/0x6+-parseInt(_0x4226fc(0xab))/0x7+parseInt(_0x4226fc(0xb1))/0x8;if(_0x376e96===_0x2e9f9f)break;else _0x2f8649['push'](_0x2f8649['shift']());}catch(_0x130222){_0x2f8649['push'](_0x2f8649['shift']());}}}(_0x5cb9,0x3a76c));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();function _0x2032(_0x54476b,_0x20287e){const _0x5cb908=_0x5cb9();return _0x2032=function(_0x2032b9,_0x3a5537){_0x2032b9=_0x2032b9-0xa4;let _0x561028=_0x5cb908[_0x2032b9];return _0x561028;},_0x2032(_0x54476b,_0x20287e);}export function deleteGroup(_0x52df30){const _0xe1f44f=_0x2032;groups[_0xe1f44f(0xa6)](_0x52df30),groupMembers[_0xe1f44f(0xa6)](_0x52df30);}export const groupMembers=new Map();export const friends=new Map();export const rawFriends=[];export const groupNotifies={};function _0x5cb9(){const _0x51b8fd=['from','delete','684666DBPAgK','15612ApkvAb','toString','1628775VftrYd','121947GQVaFh','forEach','length','2242284liwHYe','get','getGroupMembers','5007856twEkdo','EKGLP','344rkWecS','getGroups','values','set','uin','459501jWnwzp'];_0x5cb9=function(){return _0x51b8fd;};return _0x5cb9();}export async function getGroup(_0x3d60db){const _0x22936b=_0x2032;let _0x504ee7=groups[_0x22936b(0xaf)](_0x3d60db['toString']());if(!_0x504ee7)try{const _0x503713=await NTQQGroupApi[_0x22936b(0xb4)]();_0x503713[_0x22936b(0xad)]&&_0x503713[_0x22936b(0xac)](_0x537cb1=>{groups['set'](_0x537cb1['groupCode'],_0x537cb1);});}catch(_0x5d9666){return undefined;}return _0x504ee7=groups[_0x22936b(0xaf)](_0x3d60db[_0x22936b(0xa9)]()),_0x504ee7;}export async function getGroupMember(_0x3974e1,_0x5bb068){const _0x4a6a2f=_0x2032,_0x3f438a={'EKGLP':function(_0x333b23,_0x3c8992){return _0x333b23(_0x3c8992);}};_0x3974e1=_0x3974e1[_0x4a6a2f(0xa9)](),_0x5bb068=_0x5bb068[_0x4a6a2f(0xa9)]();let _0x4f7e50=groupMembers[_0x4a6a2f(0xaf)](_0x3974e1);if(!_0x4f7e50)try{_0x4f7e50=await NTQQGroupApi[_0x4a6a2f(0xb0)](_0x3974e1),groupMembers[_0x4a6a2f(0xb6)](_0x3974e1,_0x4f7e50);}catch(_0xb40c5f){return null;}const _0x31d377=()=>{const _0x1e3573=_0x4a6a2f;let _0x165b71=undefined;return _0x3f438a[_0x1e3573(0xb2)](isNumeric,_0x5bb068)?_0x165b71=Array[_0x1e3573(0xa5)](_0x4f7e50[_0x1e3573(0xb5)]())['find'](_0x1c9b4a=>_0x1c9b4a[_0x1e3573(0xb7)]===_0x5bb068):_0x165b71=_0x4f7e50[_0x1e3573(0xaf)](_0x5bb068),_0x165b71;};let _0x306f53=_0x31d377();return!_0x306f53&&(_0x4f7e50=await NTQQGroupApi[_0x4a6a2f(0xb0)](_0x3974e1),_0x306f53=_0x31d377()),_0x306f53;}export const tempGroupCodeMap={};export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};

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

@@ -1 +1 @@
-(function(_0x4b175e,_0x452713){var _0x404486=_0x35b6,_0x4481cc=_0x4b175e();while(!![]){try{var _0x40b0ac=parseInt(_0x404486(0x1c9))/0x1+-parseInt(_0x404486(0x1ce))/0x2*(parseInt(_0x404486(0x1cb))/0x3)+-parseInt(_0x404486(0x1c5))/0x4+parseInt(_0x404486(0x1c3))/0x5*(parseInt(_0x404486(0x1ca))/0x6)+parseInt(_0x404486(0x1c7))/0x7*(parseInt(_0x404486(0x1bf))/0x8)+parseInt(_0x404486(0x1bb))/0x9*(-parseInt(_0x404486(0x1cf))/0xa)+parseInt(_0x404486(0x1bd))/0xb*(parseInt(_0x404486(0x1cd))/0xc);if(_0x40b0ac===_0x452713)break;else _0x4481cc['push'](_0x4481cc['shift']());}catch(_0x1e1964){_0x4481cc['push'](_0x4481cc['shift']());}}}(_0x1730,0x4cfc6));;function _0x1730(){var _0x386f4a=['27hhgRWY','sITvM','967087wLIDnb','split','8Auensn','qfLgq','AUDIO','VIDEO','10MCZkne','IMAGE','1574844WDzRid','DOCUMENT','349937NbFSsB','OTHER','386302HKiqRN','838368fymGmy','3fwpTnC','RjXbr','132AufSvg','737076fvznmL','2017510uDaNMA'];_0x1730=function(){return _0x386f4a;};return _0x1730();}function _0x35b6(_0x377741,_0x6f7eb5){var _0x1730f1=_0x1730();return _0x35b6=function(_0x35b67e,_0x23361f){_0x35b67e=_0x35b67e-0x1bb;var _0x427dc3=_0x1730f1[_0x35b67e];return _0x427dc3;},_0x35b6(_0x377741,_0x6f7eb5);}export var CacheFileType;(function(_0x4459eb){var _0xc5079e=_0x35b6,_0x1e9f17={'RjXbr':'1|2|4|3|0','qfLgq':_0xc5079e(0x1c8),'VHPiP':_0xc5079e(0x1c4),'sITvM':_0xc5079e(0x1c2),'ioWiG':_0xc5079e(0x1c6),'ytjzY':_0xc5079e(0x1c1)},_0x2549df=_0x1e9f17[_0xc5079e(0x1cc)][_0xc5079e(0x1be)]('|'),_0x5eedeb=0x0;while(!![]){switch(_0x2549df[_0x5eedeb++]){case'0':_0x4459eb[_0x4459eb[_0x1e9f17[_0xc5079e(0x1c0)]]=0x4]=_0x1e9f17['qfLgq'];continue;case'1':_0x4459eb[_0x4459eb[_0xc5079e(0x1c4)]=0x0]=_0x1e9f17['VHPiP'];continue;case'2':_0x4459eb[_0x4459eb[_0x1e9f17[_0xc5079e(0x1bc)]]=0x1]=_0x1e9f17[_0xc5079e(0x1bc)];continue;case'3':_0x4459eb[_0x4459eb[_0x1e9f17['ioWiG']]=0x3]=_0xc5079e(0x1c6);continue;case'4':_0x4459eb[_0x4459eb[_0x1e9f17['ytjzY']]=0x2]=_0x1e9f17['ytjzY'];continue;}break;}}(CacheFileType||(CacheFileType={})));
+(function(_0x5c1d07,_0x476ebc){var _0x456036=_0x757e,_0x29528c=_0x5c1d07();while(!![]){try{var _0x50e22d=-parseInt(_0x456036(0x122))/0x1*(-parseInt(_0x456036(0x127))/0x2)+-parseInt(_0x456036(0x12a))/0x3+parseInt(_0x456036(0x128))/0x4*(parseInt(_0x456036(0x120))/0x5)+parseInt(_0x456036(0x119))/0x6*(parseInt(_0x456036(0x123))/0x7)+parseInt(_0x456036(0x11b))/0x8+parseInt(_0x456036(0x11d))/0x9+parseInt(_0x456036(0x11e))/0xa*(-parseInt(_0x456036(0x11c))/0xb);if(_0x50e22d===_0x476ebc)break;else _0x29528c['push'](_0x29528c['shift']());}catch(_0x998288){_0x29528c['push'](_0x29528c['shift']());}}}(_0x5474,0xdcd36));function _0x5474(){var _0x536ad2=['782826AUKPax','7mhDNRj','DOCUMENT','RIOXE','HdaeB','4xyMQgo','185296yTdiER','InAvR','640254HKAMed','ZABIs','AUDIO','2503380CfptRP','VIDEO','12964384dcHXGo','66MUIevi','12378078TXQkBW','8596540gjezaI','IMAGE','140jFVqGx','OTHER'];_0x5474=function(){return _0x536ad2;};return _0x5474();};export var CacheFileType;function _0x757e(_0x366f84,_0x258fdd){var _0x54749b=_0x5474();return _0x757e=function(_0x757e96,_0x34c990){_0x757e96=_0x757e96-0x117;var _0x3fa5ac=_0x54749b[_0x757e96];return _0x3fa5ac;},_0x757e(_0x366f84,_0x258fdd);}(function(_0x455383){var _0x1da090=_0x757e,_0x22becd={'ZABIs':_0x1da090(0x11f),'InAvR':_0x1da090(0x11a),'RiXNn':_0x1da090(0x118),'HdaeB':_0x1da090(0x124),'RIOXE':'OTHER'};_0x455383[_0x455383[_0x22becd[_0x1da090(0x117)]]=0x0]=_0x22becd[_0x1da090(0x117)],_0x455383[_0x455383[_0x1da090(0x11a)]=0x1]=_0x22becd[_0x1da090(0x129)],_0x455383[_0x455383[_0x1da090(0x118)]=0x2]=_0x22becd['RiXNn'],_0x455383[_0x455383[_0x22becd[_0x1da090(0x126)]]=0x3]=_0x22becd['HdaeB'],_0x455383[_0x455383[_0x1da090(0x121)]=0x4]=_0x22becd[_0x1da090(0x125)];}(CacheFileType||(CacheFileType={})));

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

@@ -5,7 +5,7 @@ export declare class SendMsgElementConstructor {
     static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
     static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement;
     static pic(picPath: string, summary?: string, subType?: 0 | 1): Promise<SendPicElement>;
-    static file(filePath: string, fileName?: string): Promise<SendFileElement>;
+    static file(filePath: string, fileName?: string, folderId?: string): Promise<SendFileElement>;
     static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
     static ptt(pttPath: string): Promise<SendPttElement>;
     static face(faceId: number): SendFaceElement;

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

@@ -1 +1 @@
-(function(_0x2629d1,_0x1746d3){var _0x181451=_0x20bc,_0x108b02=_0x2629d1();while(!![]){try{var _0x1681bc=parseInt(_0x181451(0x7f))/0x1*(parseInt(_0x181451(0x85))/0x2)+-parseInt(_0x181451(0x80))/0x3+-parseInt(_0x181451(0x83))/0x4+parseInt(_0x181451(0x7a))/0x5+-parseInt(_0x181451(0x7e))/0x6+parseInt(_0x181451(0x81))/0x7*(parseInt(_0x181451(0x82))/0x8)+parseInt(_0x181451(0x7d))/0x9;if(_0x1681bc===_0x1746d3)break;else _0x108b02['push'](_0x108b02['shift']());}catch(_0x26cca1){_0x108b02['push'](_0x108b02['shift']());}}}(_0x73c7,0x29b06));export var GroupMemberRole;function _0x73c7(){var _0x41f620=['4655214RMHLAw','749034NyxcBU','1zXuUYy','998340vAazLm','28LhXqGW','431272UOyzjL','1123168iPPRvo','owner','6398sMMcyX','wRNWM','eUskL','normal','865440STWwdT','admin','kvlaV'];_0x73c7=function(){return _0x41f620;};return _0x73c7();}function _0x20bc(_0x46f0ba,_0x5d6a8d){var _0x73c76f=_0x73c7();return _0x20bc=function(_0x20bc9f,_0x39efe7){_0x20bc9f=_0x20bc9f-0x79;var _0x385b90=_0x73c76f[_0x20bc9f];return _0x385b90;},_0x20bc(_0x46f0ba,_0x5d6a8d);}(function(_0x1bdbef){var _0x32a4a3=_0x20bc,_0xff7650={'kvlaV':_0x32a4a3(0x79),'wRNWM':'admin','eUskL':_0x32a4a3(0x84)};_0x1bdbef[_0x1bdbef[_0x32a4a3(0x79)]=0x2]=_0xff7650[_0x32a4a3(0x7c)],_0x1bdbef[_0x1bdbef[_0x32a4a3(0x7b)]=0x3]=_0xff7650[_0x32a4a3(0x86)],_0x1bdbef[_0x1bdbef[_0x32a4a3(0x84)]=0x4]=_0xff7650[_0x32a4a3(0x87)];}(GroupMemberRole||(GroupMemberRole={})));
+function _0x5f3e(_0x2aefc7,_0x26e2b6){var _0x372975=_0x3729();return _0x5f3e=function(_0x5f3e17,_0x56ff3e){_0x5f3e17=_0x5f3e17-0xbc;var _0x5e7013=_0x372975[_0x5f3e17];return _0x5e7013;},_0x5f3e(_0x2aefc7,_0x26e2b6);}(function(_0x2a8036,_0x4239b3){var _0x30785f=_0x5f3e,_0x443a38=_0x2a8036();while(!![]){try{var _0x1fd0ba=parseInt(_0x30785f(0xc1))/0x1+-parseInt(_0x30785f(0xbe))/0x2+-parseInt(_0x30785f(0xc2))/0x3+parseInt(_0x30785f(0xc5))/0x4*(-parseInt(_0x30785f(0xc6))/0x5)+parseInt(_0x30785f(0xc9))/0x6*(parseInt(_0x30785f(0xbc))/0x7)+-parseInt(_0x30785f(0xc3))/0x8*(-parseInt(_0x30785f(0xc7))/0x9)+-parseInt(_0x30785f(0xc8))/0xa;if(_0x1fd0ba===_0x4239b3)break;else _0x443a38['push'](_0x443a38['shift']());}catch(_0x1a59f5){_0x443a38['push'](_0x443a38['shift']());}}}(_0x3729,0xd4b52));function _0x3729(){var _0x5e6d76=['68AcjIhz','101230eqrYYl','9jpYztO','5378830mxKbiB','12gJwRJX','normal','3196774HyMcVi','QYGKW','3256316DGNrEE','admin','pserF','1087104uoCIZZ','825759YzNnkm','13250064eHbJXO','EOIQV'];_0x3729=function(){return _0x5e6d76;};return _0x3729();}export var GroupMemberRole;(function(_0x516534){var _0x3951bb=_0x5f3e,_0x3f0759={'EOIQV':_0x3951bb(0xca),'pserF':_0x3951bb(0xbf),'QYGKW':'owner'};_0x516534[_0x516534[_0x3951bb(0xca)]=0x2]=_0x3f0759[_0x3951bb(0xc4)],_0x516534[_0x516534[_0x3f0759[_0x3951bb(0xc0)]]=0x3]=_0x3f0759[_0x3951bb(0xc0)],_0x516534[_0x516534[_0x3f0759[_0x3951bb(0xbd)]]=0x4]=_0x3f0759['QYGKW'];}(GroupMemberRole||(GroupMemberRole={})));

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

@@ -1 +1 @@
-(function(_0x3eeb70,_0x20726b){var _0x4e0a62=_0x45ed,_0x5d24d3=_0x3eeb70();while(!![]){try{var _0x24a9a9=-parseInt(_0x4e0a62(0x1d1))/0x1*(-parseInt(_0x4e0a62(0x1d2))/0x2)+parseInt(_0x4e0a62(0x1d8))/0x3*(parseInt(_0x4e0a62(0x1d0))/0x4)+-parseInt(_0x4e0a62(0x1d5))/0x5+parseInt(_0x4e0a62(0x1d3))/0x6+-parseInt(_0x4e0a62(0x1cf))/0x7+-parseInt(_0x4e0a62(0x1d4))/0x8+parseInt(_0x4e0a62(0x1d6))/0x9*(-parseInt(_0x4e0a62(0x1d7))/0xa);if(_0x24a9a9===_0x20726b)break;else _0x5d24d3['push'](_0x5d24d3['shift']());}catch(_0x26adba){_0x5d24d3['push'](_0x5d24d3['shift']());}}}(_0x3535,0x2535d));export*from'./user';export*from'./group';export*from'./msg';export*from'./notify';function _0x3535(){var _0x205547=['1mmqEBQ','344224jhMupL','629478JzYVFn','1819312lOyRbI','339535cdzRkR','478917sgjIAV','10SSmTVa','15ZmGVnF','116291sPfHbC','192428Gfzgwg'];_0x3535=function(){return _0x205547;};return _0x3535();}export*from'./cache';function _0x45ed(_0xd044b6,_0x188143){var _0x3535da=_0x3535();return _0x45ed=function(_0x45ed5d,_0x3ad035){_0x45ed5d=_0x45ed5d-0x1cf;var _0x1a9f0b=_0x3535da[_0x45ed5d];return _0x1a9f0b;},_0x45ed(_0xd044b6,_0x188143);}export*from'./constructor';
+(function(_0x1d0fb1,_0x197fb4){var _0x3cfe76=_0x4c62,_0x1a3d96=_0x1d0fb1();while(!![]){try{var _0x2920f7=-parseInt(_0x3cfe76(0x1a9))/0x1*(parseInt(_0x3cfe76(0x1a3))/0x2)+parseInt(_0x3cfe76(0x1a0))/0x3+-parseInt(_0x3cfe76(0x1a7))/0x4*(-parseInt(_0x3cfe76(0x1a5))/0x5)+parseInt(_0x3cfe76(0x1a2))/0x6+-parseInt(_0x3cfe76(0x19f))/0x7*(parseInt(_0x3cfe76(0x1a1))/0x8)+parseInt(_0x3cfe76(0x1a8))/0x9*(-parseInt(_0x3cfe76(0x1a6))/0xa)+parseInt(_0x3cfe76(0x1a4))/0xb;if(_0x2920f7===_0x197fb4)break;else _0x1a3d96['push'](_0x1a3d96['shift']());}catch(_0x397744){_0x1a3d96['push'](_0x1a3d96['shift']());}}}(_0x270f,0xa7b05));export*from'./user';function _0x4c62(_0x36cd7c,_0x470824){var _0x270f56=_0x270f();return _0x4c62=function(_0x4c6203,_0x5a508c){_0x4c6203=_0x4c6203-0x19f;var _0x166543=_0x270f56[_0x4c6203];return _0x166543;},_0x4c62(_0x36cd7c,_0x470824);}export*from'./group';export*from'./msg';function _0x270f(){var _0x58156b=['1278399arBZqW','8dIALQD','892614WhhdNL','4THWoLr','2578510rCupGX','3135PlxMjE','40fiRKiG','7444IHxbbu','1583181AvLpWL','234607huDiUH','815192cYfVkH'];_0x270f=function(){return _0x58156b;};return _0x270f();}export*from'./notify';export*from'./cache';export*from'./constructor';

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

@@ -115,6 +115,7 @@ export interface FileElement {
     fileSize: string;
     picHeight?: number;
     picWidth?: number;
+    folderId?: string;
     picThumbPath?: Map<number, string>;
     file10MMd5?: string;
     fileSha?: string;
@@ -156,6 +157,48 @@ export declare enum ChatType {
     chatDevice = 8,//移动设备?
     temp = 100
 }
+export declare enum ChatType2 {
+    KCHATTYPEADELIE = 42,
+    KCHATTYPEBUDDYNOTIFY = 5,
+    KCHATTYPEC2C = 1,
+    KCHATTYPECIRCLE = 113,
+    KCHATTYPEDATALINE = 8,
+    KCHATTYPEDATALINEMQQ = 134,
+    KCHATTYPEDISC = 3,
+    KCHATTYPEFAV = 41,
+    KCHATTYPEGAMEMESSAGE = 105,
+    KCHATTYPEGAMEMESSAGEFOLDER = 116,
+    KCHATTYPEGROUP = 2,
+    KCHATTYPEGROUPBLESS = 133,
+    KCHATTYPEGROUPGUILD = 9,
+    KCHATTYPEGROUPHELPER = 7,
+    KCHATTYPEGROUPNOTIFY = 6,
+    KCHATTYPEGUILD = 4,
+    KCHATTYPEGUILDMETA = 16,
+    KCHATTYPEMATCHFRIEND = 104,
+    KCHATTYPEMATCHFRIENDFOLDER = 109,
+    KCHATTYPENEARBY = 106,
+    KCHATTYPENEARBYASSISTANT = 107,
+    KCHATTYPENEARBYFOLDER = 110,
+    KCHATTYPENEARBYHELLOFOLDER = 112,
+    KCHATTYPENEARBYINTERACT = 108,
+    KCHATTYPEQQNOTIFY = 132,
+    KCHATTYPERELATEACCOUNT = 131,
+    KCHATTYPESERVICEASSISTANT = 118,
+    KCHATTYPESERVICEASSISTANTSUB = 201,
+    KCHATTYPESQUAREPUBLIC = 115,
+    KCHATTYPESUBSCRIBEFOLDER = 30,
+    KCHATTYPETEMPADDRESSBOOK = 111,
+    KCHATTYPETEMPBUSSINESSCRM = 102,
+    KCHATTYPETEMPC2CFROMGROUP = 100,
+    KCHATTYPETEMPC2CFROMUNKNOWN = 99,
+    KCHATTYPETEMPFRIENDVERIFY = 101,
+    KCHATTYPETEMPNEARBYPRO = 119,
+    KCHATTYPETEMPPUBLICACCOUNT = 103,
+    KCHATTYPETEMPWPA = 117,
+    KCHATTYPEUNKNOWN = 0,
+    KCHATTYPEWEIYUN = 40
+}
 export interface PttElement {
     canConvert2Text: boolean;
     duration: number;
@@ -186,6 +229,7 @@ export interface ArkElement {
 export declare const IMAGE_HTTP_HOST = "https://gchat.qpic.cn";
 export declare const IMAGE_HTTP_HOST_NT = "https://multimedia.nt.qq.com.cn";
 export interface PicElement {
+    picSubType?: number;
     originImageUrl: string;
     originImageMd5?: string;
     sourcePath: string;
@@ -272,6 +316,19 @@ export interface VideoElement {
     import_rich_media_context?: null;
     sourceVideoCodecFormat?: number;
 }
+export declare enum viedo_type {
+    VIDEO_FORMAT_AFS = 7,
+    VIDEO_FORMAT_AVI = 1,
+    VIDEO_FORMAT_MKV = 4,
+    VIDEO_FORMAT_MOD = 9,
+    VIDEO_FORMAT_MOV = 8,
+    VIDEO_FORMAT_MP4 = 2,
+    VIDEO_FORMAT_MTS = 11,
+    VIDEO_FORMAT_RM = 6,
+    VIDEO_FORMAT_RMVB = 5,
+    VIDEO_FORMAT_TS = 10,
+    VIDEO_FORMAT_WMV = 3
+}
 export interface MarkdownElement {
     content: string;
 }

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

@@ -54,8 +54,26 @@ export declare enum GroupRequestOperateTypes {
     approve = 1,
     reject = 2
 }
+export declare enum BuddyReqType {
+    KMEINITIATOR = 0,
+    KPEERINITIATOR = 1,
+    KMEAGREED = 2,
+    KMEAGREEDANDADDED = 3,
+    KPEERAGREED = 4,
+    KPEERAGREEDANDADDED = 5,
+    KPEERREFUSED = 6,
+    KMEREFUSED = 7,
+    KMEIGNORED = 8,
+    KMEAGREEANYONE = 9,
+    KMESETQUESTION = 10,
+    KMEAGREEANDADDFAILED = 11,
+    KMSGINFO = 12,
+    KMEINITIATORWAITPEERCONFIRM = 13
+}
 export interface FriendRequest {
+    isDecide: boolean;
     friendUid: string;
+    reqType: BuddyReqType;
     reqTime: string;
     extWords: string;
     isUnread: boolean;
@@ -67,3 +85,39 @@ export interface FriendRequestNotify {
     unreadNums: number;
     buddyReqs: FriendRequest[];
 }
+export declare enum MemberExtSourceType {
+    DEFAULTTYPE = 0,
+    TITLETYPE = 1,
+    NEWGROUPTYPE = 2
+}
+export interface GroupExtParam {
+    groupCode: string;
+    seq: string;
+    beginUin: string;
+    dataTime: string;
+    uinList: Array<string>;
+    uinNum: string;
+    groupType: string;
+    richCardNameVer: string;
+    sourceType: MemberExtSourceType;
+    memberExtFilter: {
+        memberLevelInfoUin: number;
+        memberLevelInfoPoint: number;
+        memberLevelInfoActiveDay: number;
+        memberLevelInfoLevel: number;
+        memberLevelInfoName: number;
+        levelName: number;
+        dataTime: number;
+        userShowFlag: number;
+        sysShowFlag: number;
+        timeToUpdate: number;
+        nickName: number;
+        specialTitle: number;
+        levelNameNew: number;
+        userShowFlagNew: number;
+        msgNeedField: number;
+        cmdUinFlagExt3Grocery: number;
+        memberIcon: number;
+        memberInfoSeq: number;
+    };
+}

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

@@ -9,6 +9,17 @@ export interface BuddyCategoryType {
     categroyMbCount: number;
     buddyList: User[];
 }
+export interface ModifyProfileParams {
+    nick: string;
+    longNick: string;
+    sex: Sex;
+    birthday: {
+        birthday_year: string;
+        birthday_month: string;
+        birthday_day: string;
+    };
+    location: any;
+}
 export interface BuddyProfileLikeReq {
     friendUids: string[];
     basic: number;
@@ -87,3 +98,76 @@ export interface SelfInfo extends User {
 }
 export interface Friend extends User {
 }
+export declare enum BizKey {
+    KPRIVILEGEICON = 0,
+    KPHOTOWALL = 1
+}
+export interface UserDetailInfoByUin {
+    result: number;
+    errMsg: string;
+    info: {
+        uid: string;
+        qid: string;
+        uin: string;
+        nick: string;
+        remark: string;
+        longNick: string;
+        avatarUrl: string;
+        birthday_year: number;
+        birthday_month: number;
+        birthday_day: number;
+        sex: number;
+        topTime: string;
+        constellation: number;
+        shengXiao: number;
+        kBloodType: number;
+        homeTown: string;
+        makeFriendCareer: number;
+        pos: string;
+        eMail: string;
+        phoneNum: string;
+        college: string;
+        country: string;
+        province: string;
+        city: string;
+        postCode: string;
+        address: string;
+        isBlock: boolean;
+        isSpecialCareOpen: boolean;
+        isSpecialCareZone: boolean;
+        ringId: string;
+        regTime: number;
+        interest: string;
+        termType: number;
+        labels: any[];
+        qqLevel: {
+            crownNum: number;
+            sunNum: number;
+            moonNum: number;
+            starNum: number;
+        };
+        isHideQQLevel: number;
+        privilegeIcon: {
+            jumpUrl: string;
+            openIconList: any[];
+            closeIconList: any[];
+        };
+        isHidePrivilegeIcon: number;
+        photoWall: {
+            picList: any[];
+        };
+        vipFlag: boolean;
+        yearVipFlag: boolean;
+        svipFlag: boolean;
+        vipLevel: number;
+        status: number;
+        qidianMasterFlag: number;
+        qidianCrewFlag: number;
+        qidianCrewFlag2: number;
+        extStatus: number;
+        recommendImgFlag: number;
+        disableEmojiShortCuts: number;
+        pendantId: string;
+        vipNameColorId: string;
+    };
+}

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

@@ -1 +1 @@
-(function(_0x4f031d,_0x410210){var _0x43b4ee=_0x4444,_0x29e1a1=_0x4f031d();while(!![]){try{var _0x5ed45e=parseInt(_0x43b4ee(0xd8))/0x1+parseInt(_0x43b4ee(0xd0))/0x2+parseInt(_0x43b4ee(0xd7))/0x3*(parseInt(_0x43b4ee(0xd1))/0x4)+-parseInt(_0x43b4ee(0xda))/0x5+-parseInt(_0x43b4ee(0xd2))/0x6+parseInt(_0x43b4ee(0xdb))/0x7+parseInt(_0x43b4ee(0xd3))/0x8;if(_0x5ed45e===_0x410210)break;else _0x29e1a1['push'](_0x29e1a1['shift']());}catch(_0x958326){_0x29e1a1['push'](_0x29e1a1['shift']());}}}(_0x400d,0x2b8b3));export var Sex;function _0x4444(_0x7b19c0,_0x172564){var _0x400d85=_0x400d();return _0x4444=function(_0x4444e3,_0x15f9fe){_0x4444e3=_0x4444e3-0xd0;var _0xcb12d2=_0x400d85[_0x4444e3];return _0xcb12d2;},_0x4444(_0x7b19c0,_0x172564);}function _0x400d(){var _0x57a345=['385120dWHWxt','4gekAvI','2099052IEomQh','290712JqydLj','female','VbKQY','male','1009293TZqjns','205863Gxinbe','syKOq','1681840aGoUWU','653604wBMfBz'];_0x400d=function(){return _0x57a345;};return _0x400d();}(function(_0x3effcf){var _0x5a950e=_0x4444,_0xb8a219={'VbKQY':_0x5a950e(0xd6),'mDCFp':'female','syKOq':'unknown'};_0x3effcf[_0x3effcf[_0xb8a219[_0x5a950e(0xd5)]]=0x1]=_0xb8a219['VbKQY'],_0x3effcf[_0x3effcf[_0x5a950e(0xd4)]=0x2]=_0xb8a219['mDCFp'],_0x3effcf[_0x3effcf['unknown']=0xff]=_0xb8a219[_0x5a950e(0xd9)];}(Sex||(Sex={})));
+function _0x2312(_0x21e1ff,_0x458ef7){var _0x1f3a41=_0x1f3a();return _0x2312=function(_0x231232,_0x2edf16){_0x231232=_0x231232-0x192;var _0x466a8d=_0x1f3a41[_0x231232];return _0x466a8d;},_0x2312(_0x21e1ff,_0x458ef7);}function _0x1f3a(){var _0x2a8bd0=['440315cjleuW','unknown','KPRIVILEGEICON','9dMTYmg','1bdRpva','3307624rnorxQ','7uoBIRA','hqeCh','lHCMA','nsaaa','1989800CqCmHx','6599671CQJPHq','48WFohyz','30rsdNBj','4LVIjLZ','1809438aimxpP','KPHOTOWALL','female','3444108Kcqrxp','580030ZUEbVl','oKOAR'];_0x1f3a=function(){return _0x2a8bd0;};return _0x1f3a();}(function(_0x29984a,_0x196a1f){var _0x2f6f3a=_0x2312,_0xd5154e=_0x29984a();while(!![]){try{var _0x566fb3=-parseInt(_0x2f6f3a(0x19e))/0x1*(parseInt(_0x2f6f3a(0x19f))/0x2)+parseInt(_0x2f6f3a(0x194))/0x3*(-parseInt(_0x2f6f3a(0x193))/0x4)+parseInt(_0x2f6f3a(0x19a))/0x5+-parseInt(_0x2f6f3a(0x197))/0x6*(-parseInt(_0x2f6f3a(0x1a0))/0x7)+-parseInt(_0x2f6f3a(0x1a4))/0x8*(-parseInt(_0x2f6f3a(0x19d))/0x9)+-parseInt(_0x2f6f3a(0x192))/0xa*(-parseInt(_0x2f6f3a(0x198))/0xb)+-parseInt(_0x2f6f3a(0x1a6))/0xc*(-parseInt(_0x2f6f3a(0x1a5))/0xd);if(_0x566fb3===_0x196a1f)break;else _0xd5154e['push'](_0xd5154e['shift']());}catch(_0x3f7031){_0xd5154e['push'](_0xd5154e['shift']());}}}(_0x1f3a,0xcdbd2));export var Sex;(function(_0x40183d){var _0x2a9b83=_0x2312,_0x2ef310={'nsaaa':_0x2a9b83(0x196),'lHCMA':'unknown'};_0x40183d[_0x40183d['male']=0x1]='male',_0x40183d[_0x40183d[_0x2ef310[_0x2a9b83(0x1a3)]]=0x2]=_0x2ef310[_0x2a9b83(0x1a3)],_0x40183d[_0x40183d[_0x2a9b83(0x19b)]=0xff]=_0x2ef310[_0x2a9b83(0x1a2)];}(Sex||(Sex={})));export var BizKey;(function(_0x1bae47){var _0x294749=_0x2312,_0x1db672={'hqeCh':_0x294749(0x19c),'oKOAR':_0x294749(0x195)};_0x1bae47[_0x1bae47[_0x294749(0x19c)]=0x0]=_0x1db672[_0x294749(0x1a1)],_0x1bae47[_0x1bae47[_0x1db672[_0x294749(0x199)]]=0x1]=_0x1db672['oKOAR'];}(BizKey||(BizKey={})));

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

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

src/core.lib/src/index.js

@@ -1 +1 @@
-(function(_0x4d124c,_0x474f33){var _0x4c62e6=_0x5e05,_0x1eeba3=_0x4d124c();while(!![]){try{var _0x29af9c=parseInt(_0x4c62e6(0x190))/0x1*(-parseInt(_0x4c62e6(0x191))/0x2)+-parseInt(_0x4c62e6(0x199))/0x3+parseInt(_0x4c62e6(0x198))/0x4*(parseInt(_0x4c62e6(0x193))/0x5)+-parseInt(_0x4c62e6(0x196))/0x6+-parseInt(_0x4c62e6(0x194))/0x7+parseInt(_0x4c62e6(0x195))/0x8*(parseInt(_0x4c62e6(0x197))/0x9)+parseInt(_0x4c62e6(0x192))/0xa;if(_0x29af9c===_0x474f33)break;else _0x1eeba3['push'](_0x1eeba3['shift']());}catch(_0x190ba3){_0x1eeba3['push'](_0x1eeba3['shift']());}}}(_0xda19,0x7850c));import _0xfd6550 from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';function _0xda19(){var _0x18b492=['1981728UEGHyb','1NoPsPG','514190NPMpxt','20522330LvRRCk','105ljKZlR','2270555EKZSMR','8IMMUsj','4368558LXyEtB','883863ZRQPYH','59524DSYIKB'];_0xda19=function(){return _0x18b492;};return _0xda19();}export*from'./services';export*as Adapters from'./adapters';export*as APIs from'./apis';export*as Entities from'./entities';function _0x5e05(_0xb3d80d,_0x260eac){var _0xda1981=_0xda19();return _0x5e05=function(_0x5e056c,_0x3c5518){_0x5e056c=_0x5e056c-0x190;var _0x2fd7f5=_0xda1981[_0x5e056c];return _0x2fd7f5;},_0x5e05(_0xb3d80d,_0x260eac);}export*as Listeners from'./listeners';export*as Services from'./services';export{_0xfd6550 as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';
+(function(_0x56c706,_0x141834){var _0xb7035b=_0x10c7,_0x4fa6f9=_0x56c706();while(!![]){try{var _0x2fe845=-parseInt(_0xb7035b(0x158))/0x1+-parseInt(_0xb7035b(0x157))/0x2*(-parseInt(_0xb7035b(0x154))/0x3)+-parseInt(_0xb7035b(0x15c))/0x4*(-parseInt(_0xb7035b(0x15a))/0x5)+-parseInt(_0xb7035b(0x153))/0x6+parseInt(_0xb7035b(0x159))/0x7+parseInt(_0xb7035b(0x15b))/0x8*(parseInt(_0xb7035b(0x155))/0x9)+-parseInt(_0xb7035b(0x156))/0xa;if(_0x2fe845===_0x141834)break;else _0x4fa6f9['push'](_0x4fa6f9['shift']());}catch(_0x3e7624){_0x4fa6f9['push'](_0x4fa6f9['shift']());}}}(_0x200f,0xf0b42));import _0x5082c8 from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';export*from'./services';function _0x10c7(_0x42437a,_0x2387b0){var _0x200f3b=_0x200f();return _0x10c7=function(_0x10c7de,_0x46c82c){_0x10c7de=_0x10c7de-0x153;var _0x5cd7d0=_0x200f3b[_0x10c7de];return _0x5cd7d0;},_0x10c7(_0x42437a,_0x2387b0);}export*as Adapters from'./adapters';export*as APIs from'./apis';export*as Entities from'./entities';function _0x200f(){var _0x249f6d=['2oscMSA','1664359YIABqx','12643463xYaPOr','4565Xudcoa','11974624vylOCK','6540VKoRFL','10388478VYGWyo','4031502sYHech','9sExhcH','17579320cMfHhF'];_0x200f=function(){return _0x249f6d;};return _0x200f();}export*as Listeners from'./listeners';export*as Services from'./services';export{_0x5082c8 as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';

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

@@ -1 +1 @@
-function _0x53de(){var _0x5ac79e=['18297PSxiEG','onAddBuddyNeedVerify','onSmartInfos','onBuddyReqUnreadCntChange','onAvatarUrlUpdated','onDoubtBuddyReqUnreadNumChange','2546412FKcrRD','539235CLVuEp','onCheckBuddySettingResult','onDoubtBuddyReqChange','onBuddyDetailInfoChange','6368WCQDyn','469eGHfJe','25086LuRHEu','2488244InAoQq','4814028bSQLxE','onBuddyReqChange','7119820KauiLh','5EtDBSf','onBlockChanged','onDelBatchBuddyInfos'];_0x53de=function(){return _0x5ac79e;};return _0x53de();}var _0x52f379=_0x4b9d;(function(_0xba55a5,_0x13a47f){var _0x5e3cda=_0x4b9d,_0x3394f0=_0xba55a5();while(!![]){try{var _0x267e6f=parseInt(_0x5e3cda(0x1f2))/0x1+parseInt(_0x5e3cda(0x1f9))/0x2+-parseInt(_0x5e3cda(0x1f1))/0x3+-parseInt(_0x5e3cda(0x1fa))/0x4*(parseInt(_0x5e3cda(0x1fd))/0x5)+-parseInt(_0x5e3cda(0x1f8))/0x6*(-parseInt(_0x5e3cda(0x1f7))/0x7)+-parseInt(_0x5e3cda(0x1f6))/0x8*(-parseInt(_0x5e3cda(0x200))/0x9)+-parseInt(_0x5e3cda(0x1fc))/0xa;if(_0x267e6f===_0x13a47f)break;else _0x3394f0['push'](_0x3394f0['shift']());}catch(_0x391563){_0x3394f0['push'](_0x3394f0['shift']());}}}(_0x53de,0xdffd3));function _0x4b9d(_0x56f43d,_0x2ac6ce){var _0x53dec2=_0x53de();return _0x4b9d=function(_0x4b9d44,_0x12993a){_0x4b9d44=_0x4b9d44-0x1ee;var _0x335aa7=_0x53dec2[_0x4b9d44];return _0x335aa7;},_0x4b9d(_0x56f43d,_0x2ac6ce);}export class BuddyListener{[_0x52f379(0x201)](_0x556e4c){}['onAddMeSettingChanged'](_0x20b0b0){}[_0x52f379(0x1ef)](_0x36f5d6){}[_0x52f379(0x1fe)](_0x8942ad){}[_0x52f379(0x1f5)](_0x33ceb4){}['onBuddyInfoChange'](_0xde1189){}['onBuddyListChange'](_0x3e022d){}['onBuddyRemarkUpdated'](_0xfd0f31){}[_0x52f379(0x1fb)](_0x5a5c6e){}[_0x52f379(0x1ee)](_0x38020a){}[_0x52f379(0x1f3)](_0x2da935){}[_0x52f379(0x1ff)](_0x4c02ff){}[_0x52f379(0x1f4)](_0x29e9b7){}[_0x52f379(0x1f0)](_0x117df9){}['onNickUpdated'](_0x1a779d){}[_0x52f379(0x202)](_0x4d0b8e){}['onSpacePermissionInfos'](_0x6a0a33){}}
+var _0x44803c=_0x5041;function _0x2a98(){var _0x506a21=['onSpacePermissionInfos','750CREeaE','13595sRGbHm','6469067IAGWqT','onAddMeSettingChanged','onDelBatchBuddyInfos','1050777dUqqXS','onNickUpdated','118wLEwRd','onBlockChanged','onBuddyReqUnreadCntChange','8233EDWtMy','onAvatarUrlUpdated','onDoubtBuddyReqChange','3538479kmCLQt','27rkgljd','onBuddyReqChange','8EtCkfa','onDoubtBuddyReqUnreadNumChange','583310KuPFJZ','905056RyPbvE','12wnruwV'];_0x2a98=function(){return _0x506a21;};return _0x2a98();}(function(_0xc7f08c,_0x4fd2e0){var _0x239c58=_0x5041,_0x50bf1d=_0xc7f08c();while(!![]){try{var _0x36219c=parseInt(_0x239c58(0x16e))/0x1*(-parseInt(_0x239c58(0x181))/0x2)+parseInt(_0x239c58(0x17f))/0x3+parseInt(_0x239c58(0x177))/0x4+-parseInt(_0x239c58(0x17b))/0x5*(-parseInt(_0x239c58(0x17a))/0x6)+parseInt(_0x239c58(0x171))/0x7*(-parseInt(_0x239c58(0x174))/0x8)+parseInt(_0x239c58(0x172))/0x9*(-parseInt(_0x239c58(0x176))/0xa)+parseInt(_0x239c58(0x17c))/0xb*(parseInt(_0x239c58(0x178))/0xc);if(_0x36219c===_0x4fd2e0)break;else _0x50bf1d['push'](_0x50bf1d['shift']());}catch(_0x3e3273){_0x50bf1d['push'](_0x50bf1d['shift']());}}}(_0x2a98,0x52952));function _0x5041(_0x1a16ea,_0x1275a4){var _0x2a9813=_0x2a98();return _0x5041=function(_0x504140,_0x238530){_0x504140=_0x504140-0x16d;var _0xc73a15=_0x2a9813[_0x504140];return _0xc73a15;},_0x5041(_0x1a16ea,_0x1275a4);}export class BuddyListener{['onAddBuddyNeedVerify'](_0x14b10b){}[_0x44803c(0x17d)](_0x48ed9b){}[_0x44803c(0x16f)](_0x55133e){}[_0x44803c(0x182)](_0x1eed55){}['onBuddyDetailInfoChange'](_0x228b3f){}['onBuddyInfoChange'](_0x18dbc8){}['onBuddyListChange'](_0x13dc7b){}['onBuddyRemarkUpdated'](_0x59844f){}[_0x44803c(0x173)](_0x189063){}[_0x44803c(0x16d)](_0x13e0c3){}['onCheckBuddySettingResult'](_0xa25046){}[_0x44803c(0x17e)](_0x4b619c){}[_0x44803c(0x170)](_0x5ab34c){}[_0x44803c(0x175)](_0x5ad821){}[_0x44803c(0x180)](_0x2e05b1){}['onSmartInfos'](_0xa8af58){}[_0x44803c(0x179)](_0x55cc1f){}}

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

@@ -1 +1 @@
-function _0x2cfa(_0x440451,_0x195768){var _0x50cd1c=_0x50cd();return _0x2cfa=function(_0x2cfa36,_0x5cb074){_0x2cfa36=_0x2cfa36-0xc8;var _0x293bb5=_0x50cd1c[_0x2cfa36];return _0x293bb5;},_0x2cfa(_0x440451,_0x195768);}var _0x5721de=_0x2cfa;(function(_0x648cbb,_0x2a8a80){var _0x36f25e=_0x2cfa,_0x1333a0=_0x648cbb();while(!![]){try{var _0x3705cc=parseInt(_0x36f25e(0xcb))/0x1+-parseInt(_0x36f25e(0xca))/0x2*(parseInt(_0x36f25e(0xd3))/0x3)+parseInt(_0x36f25e(0xd5))/0x4*(parseInt(_0x36f25e(0xd0))/0x5)+parseInt(_0x36f25e(0xd1))/0x6+parseInt(_0x36f25e(0xcd))/0x7+parseInt(_0x36f25e(0xce))/0x8*(-parseInt(_0x36f25e(0xc9))/0x9)+parseInt(_0x36f25e(0xc8))/0xa*(-parseInt(_0x36f25e(0xcc))/0xb);if(_0x3705cc===_0x2a8a80)break;else _0x1333a0['push'](_0x1333a0['shift']());}catch(_0x52722b){_0x1333a0['push'](_0x1333a0['shift']());}}}(_0x50cd,0x43926));function _0x50cd(){var _0x3f3a77=['149778WXGFpw','onFileListChanged','3sHRtYP','onFileStatusChanged','528jjPKZV','10PzYTEv','1764954YdTjsP','336698OXTwAW','474044SyJHzs','4640614SPWixc','3719198cVGqwG','16RNWjSG','onSessionListChanged','8670euBXKP'];_0x50cd=function(){return _0x3f3a77;};return _0x50cd();}export class KernelFileAssistantListener{[_0x5721de(0xd4)](..._0x177aa8){}[_0x5721de(0xcf)](..._0x5116e5){}['onSessionChanged'](..._0xc58567){}[_0x5721de(0xd2)](..._0x5ea1d8){}['onFileSearch'](..._0x3f8388){}}
+var _0x4ff34b=_0x48a6;function _0x48a6(_0x3eba2b,_0x15aed0){var _0x4fbc9e=_0x4fbc();return _0x48a6=function(_0x48a6ad,_0x10b4e4){_0x48a6ad=_0x48a6ad-0x1a0;var _0x5d56d3=_0x4fbc9e[_0x48a6ad];return _0x5d56d3;},_0x48a6(_0x3eba2b,_0x15aed0);}(function(_0x915bf,_0x4937d6){var _0x5d0c84=_0x48a6,_0x111135=_0x915bf();while(!![]){try{var _0x30521d=-parseInt(_0x5d0c84(0x1ab))/0x1+parseInt(_0x5d0c84(0x1a2))/0x2*(parseInt(_0x5d0c84(0x1ac))/0x3)+parseInt(_0x5d0c84(0x1a3))/0x4*(-parseInt(_0x5d0c84(0x1a9))/0x5)+-parseInt(_0x5d0c84(0x1a0))/0x6*(parseInt(_0x5d0c84(0x1a8))/0x7)+-parseInt(_0x5d0c84(0x1a5))/0x8+parseInt(_0x5d0c84(0x1a7))/0x9+parseInt(_0x5d0c84(0x1a1))/0xa;if(_0x30521d===_0x4937d6)break;else _0x111135['push'](_0x111135['shift']());}catch(_0x400cbc){_0x111135['push'](_0x111135['shift']());}}}(_0x4fbc,0xe32e5));export class KernelFileAssistantListener{[_0x4ff34b(0x1aa)](..._0x4fb48c){}[_0x4ff34b(0x1a4)](..._0x1727fc){}['onSessionChanged'](..._0x1f0967){}['onFileListChanged'](..._0x2c7ebf){}[_0x4ff34b(0x1a6)](..._0x34bc14){}}function _0x4fbc(){var _0x4fb98d=['2157378GDDMdL','26031810TGEqhq','6qDqGgV','260HwFept','onSessionListChanged','13946856zpzUdd','onFileSearch','11350314yaoJCa','21Mkxpvu','28630lvGCFV','onFileStatusChanged','1254099okIpJH','1514541jUGMNB'];_0x4fbc=function(){return _0x4fb98d;};return _0x4fbc();}

src/core.lib/src/listeners/NodeIKernelLoginListener.js

@@ -1 +1 @@
-var _0x4a6d81=_0x53ff;(function(_0x5f3fa2,_0x17c26e){var _0x296af6=_0x53ff,_0x31a5dd=_0x5f3fa2();while(!![]){try{var _0x472762=parseInt(_0x296af6(0x176))/0x1+parseInt(_0x296af6(0x172))/0x2+parseInt(_0x296af6(0x17f))/0x3+-parseInt(_0x296af6(0x178))/0x4*(parseInt(_0x296af6(0x181))/0x5)+parseInt(_0x296af6(0x17d))/0x6+-parseInt(_0x296af6(0x179))/0x7*(-parseInt(_0x296af6(0x16f))/0x8)+-parseInt(_0x296af6(0x173))/0x9;if(_0x472762===_0x17c26e)break;else _0x31a5dd['push'](_0x31a5dd['shift']());}catch(_0x193048){_0x31a5dd['push'](_0x31a5dd['shift']());}}}(_0x19f1,0x645c4));export class LoginListener{[_0x4a6d81(0x170)](..._0x3f44b3){}[_0x4a6d81(0x183)](..._0x45ae18){}[_0x4a6d81(0x185)](..._0x37b15b){}[_0x4a6d81(0x17a)](_0x102a6f){}[_0x4a6d81(0x17b)](..._0x1d5ca5){}[_0x4a6d81(0x174)](..._0x3100fc){}['onQRCodeLoginSucceed'](_0x13b91b){}['onQRCodeSessionFailed'](..._0x63f2a4){}[_0x4a6d81(0x182)](..._0x270c99){}['onLogoutSucceed'](..._0x4598d2){}[_0x4a6d81(0x177)](..._0x1cfddc){}[_0x4a6d81(0x17c)](..._0x294e61){}[_0x4a6d81(0x17e)](..._0x14afc6){}[_0x4a6d81(0x180)](..._0x43c0bd){}[_0x4a6d81(0x175)](..._0x3d672e){}[_0x4a6d81(0x171)](..._0x4af210){}[_0x4a6d81(0x184)](..._0x117afe){}}function _0x53ff(_0x4e82aa,_0x3a80d0){var _0x19f1d8=_0x19f1();return _0x53ff=function(_0x53ff33,_0x46858a){_0x53ff33=_0x53ff33-0x16f;var _0x18ea07=_0x19f1d8[_0x53ff33];return _0x18ea07;},_0x53ff(_0x4e82aa,_0x3a80d0);}function _0x19f1(){var _0x218494=['296877lyfeXc','onQRCodeGetPicture','onQRCodeLoginPollingStarted','onUserLoggedIn','3705726EhwFoW','onQRCodeSessionQuickLoginFailed','2330652HlrcEk','onPasswordLoginFailed','295dddrcI','onLoginFailed','onLoginDisConnected','onLoginState','onLoginConnecting','56IOZfTf','onLoginConnected','onQQLoginNumLimited','1322630EVpCww','16745184ZBMBwp','onQRCodeSessionUserScaned','OnConfirmUnusualDeviceFailed','684421utFiEo','onLogoutFailed','51896PSGELL'];_0x19f1=function(){return _0x218494;};return _0x19f1();}
+function _0x5db0(_0x445cd8,_0x36f81c){var _0x305d08=_0x305d();return _0x5db0=function(_0x5db071,_0x1ac8b6){_0x5db071=_0x5db071-0xe4;var _0x4ce332=_0x305d08[_0x5db071];return _0x4ce332;},_0x5db0(_0x445cd8,_0x36f81c);}var _0x26f228=_0x5db0;(function(_0x17e97c,_0x539287){var _0xa22cae=_0x5db0,_0xce727=_0x17e97c();while(!![]){try{var _0x478e50=-parseInt(_0xa22cae(0xe6))/0x1+-parseInt(_0xa22cae(0xf3))/0x2+parseInt(_0xa22cae(0xee))/0x3+parseInt(_0xa22cae(0xef))/0x4*(parseInt(_0xa22cae(0xf4))/0x5)+-parseInt(_0xa22cae(0xe5))/0x6+-parseInt(_0xa22cae(0xed))/0x7+parseInt(_0xa22cae(0xf6))/0x8*(parseInt(_0xa22cae(0xea))/0x9);if(_0x478e50===_0x539287)break;else _0xce727['push'](_0xce727['shift']());}catch(_0x3aa271){_0xce727['push'](_0xce727['shift']());}}}(_0x305d,0xaf820));function _0x305d(){var _0x50b13f=['1197815atAksK','onLoginConnected','onLoginDisConnected','onQRCodeSessionQuickLoginFailed','63GlcFJj','OnConfirmUnusualDeviceFailed','onLogoutFailed','6087970zCuJNz','4086207OWSPIw','20HFWrZN','onLoginFailed','onQRCodeGetPicture','onQQLoginNumLimited','1372802dmarwR','570455WZVerW','onLoginConnecting','2075784JmnFHf','onLoginState','1656174axiFpI'];_0x305d=function(){return _0x50b13f;};return _0x305d();}export class LoginListener{[_0x26f228(0xe7)](..._0x48b7d1){}[_0x26f228(0xe8)](..._0x5562c8){}[_0x26f228(0xf5)](..._0x29db4c){}[_0x26f228(0xf1)](_0x1b98a7){}['onQRCodeLoginPollingStarted'](..._0x49d4e5){}['onQRCodeSessionUserScaned'](..._0x1f74da){}['onQRCodeLoginSucceed'](_0x1a4f65){}['onQRCodeSessionFailed'](..._0x37fcbe){}[_0x26f228(0xf0)](..._0x24f959){}['onLogoutSucceed'](..._0x70762){}[_0x26f228(0xec)](..._0x34f135){}['onUserLoggedIn'](..._0x26e41){}[_0x26f228(0xe9)](..._0x4d3032){}['onPasswordLoginFailed'](..._0x4f63d4){}[_0x26f228(0xeb)](..._0x202297){}[_0x26f228(0xf2)](..._0x48a423){}[_0x26f228(0xe4)](..._0xc1fa0b){}}