release: 1.5.8

build(deps): bump uuid from 9.0.1 to 10.0.0

.editorconfig

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

.env.production

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

.eslintrc.cjs

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

.github/workflows/build.yml

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

@@ -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
@@ -121,7 +121,7 @@ jobs:
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
     - name: Clone Changes Log
-      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/CHANGELOG.md
+      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/docs/changelogs/CHANGELOG.v${{ env.VERSION }}.md
         
     - name: Create Release Draft and Upload Artifacts
       uses: softprops/action-gh-release@v1

.gitignore

@@ -4,8 +4,8 @@ package-lock.json
 pnpm-lock.yaml
 out/
 dist/
-src/core.lib/common/
-test
+/src/core.lib/common/
+/localdebug/
 
 # Editor
 .vscode/*
@@ -14,4 +14,4 @@ test
 
 # Build
 *.db
-checkVersion.sh
+checkVersion.sh

CHANGELOG.md

@@ -1,13 +0,0 @@
-# v1.3.2
-
-QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
-
-## 修复与优化
-* 重置Rkey获取机制,使用接口分发Rkey
-* 尝试修复启动时消息处理需要等待过长时间
-* 修复多图情况为同一张图片的问题
-
-## 新增与调整
-* 新增扩展获取好友分类列表 Api /get_friends_with_category
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,17 @@
+# v1.3.3
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 尝试修复多开崩溃问题
+* 修复群列表更新问题
+* 修复兼容性问题支持Win7
+* 修复下载 http 资源缺少UA
+* 优化少量消息合并转发速度
+* 修复加载群通知时出现 getUserDetailInfo timeout 导致程序崩溃
+  
+## 新增与调整
+* 新增设置群公告 Api: /_send_group_notice
+* 新增重启实现 包括重启快速登录/普通重启 副作用: 原进程 无法清理
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,18 @@
+# v1.3.5
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化启动脚本
+* 修复非管理时群成员减少事件上报 **无法获取操作者与操作类型**
+* 修复快速重启进程清理问题
+* 优化配置文件格式 支持自动更新配置 但仍然建议 **备份配置**
+* 修复正向反向ws多个客户端周期多次心跳问题
+
+## 新增与调整
+* 支持WebUi热重载
+* 新增启动输出WEBUI秘钥
+* 新增群荣誉信息 /get_group_honor_info
+* 支持获取群系统消息 /get_group_system_msg
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,11 @@
+# v1.3.6
+
+QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复戳一戳多次上报问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,15 @@
+# v1.3.8
+
+QQ Version: Windows 9.9.9-23873 / Linux 3.2.7-23361
+
+## 修复与优化
+* 优化打包后体积问题
+* 修复QQ等级获取
+* 兼容 9.7.x 版本换行符 统一为 \n
+* 修复处理加群请求 字段异常情况
+* 修复退群通知问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,11 @@
+# v1.3.9
+
+QQ Version: Windows 9.9.10-23873 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复QQ等级获取与兼容性问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,12 @@
+# v1.4.0
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+
+## 新增与调整
+* 支持空间Cookies获取
+* 支持获取在线设备 API /get_online_clients
+* 支持图片OCR API： /.ocr_image /ocr_image
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,14 @@
+# v1.4.1
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 提高部分Api兼容性
+* 优化日志膨胀问题
+* 在线状态刷新问题修复
+## 新增与调整
+* 支持非管理群 本地记录时间数据 (建议 **备份配置 清空配置 重新配置**)
+* 新增英译中接口 Api: /translate_en2zh
+* 新增群文件管理相关扩展接口 Api: /get_group_file_count /get_group_file_list /set_group_file_folder /del_group_file /del_group_file_folder
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,12 @@
+# v1.4.2
+
+QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
+
+## 修复与优化
+* 修复获取群文件列表Api
+* 修复退群通知问题
+
+## 新增与调整
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

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

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

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

docs/changelogs/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/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调用流程

package.json

@@ -1,65 +1,72 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "1.3.2",
-  "scripts": {
-    "watch:dev": "vite --mode development",
-    "watch:prod": "vite --mode production",
-    "build:dev": "vite build --mode development",
-    "build:prod": "vite build --mode production",
-    "build": "npm run build:dev",
-    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
-    "build:webui": "cd ./src/webui && vite build",
-    "watch": "npm run watch:dev",
-    "debug-win": "powershell dist/napcat.ps1",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "release": "npm run build:prod",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.30",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
-    "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "protobufjs-cli": "^1.1.2",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "commander": "^12.0.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.3.4",
-    "sqlite3": "^5.1.7",
-    "uuid": "^9.0.1",
-    "ws": "^8.16.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "1.5.8",
+  "scripts": {
+    "watch:dev": "vite --mode development",
+    "watch:prod": "vite --mode production",
+    "build:dev": "vite build --mode development",
+    "build:prod": "vite build --mode production",
+    "build": "npm run build:dev",
+    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
+    "build:webui": "cd ./src/webui && vite build",
+    "watch": "npm run watch:dev",
+    "debug-win": "powershell dist/napcat.ps1",
+    "lint": "eslint --fix src/**/*.{js,ts}",
+    "release": "npm run build:prod",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@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",
+    "@types/express": "^4.17.21",
+    "@types/figlet": "^1.5.8",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^20.11.30",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/uuid": "^9.0.8",
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "i": "^0.3.7",
+    "javascript-obfuscator": "^4.1.0",
+    "rollup": "^4.13.2",
+    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-obfuscator": "^1.1.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.2.6",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-dts": "^3.8.2",
+    "vite-tsconfig-paths": "^4.3.2"
+  },
+  "dependencies": {
+    "ajv": "^8.13.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.0.0",
+    "cors": "^2.8.5",
+    "express": "^5.0.0-beta.2",
+    "fast-xml-parser": "^4.3.6",
+    "file-type": "^19.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "image-size": "^1.1.1",
+    "json-schema-to-ts": "^3.1.0",
+    "log4js": "^6.9.1",
+    "qrcode-terminal": "^0.12.0",
+    "silk-wasm": "^3.3.4",
+    "sqlite3": "^5.1.7",
+    "uuid": "^10.0.0",
+    "ws": "^8.16.0"
+  }
+}

script/checkVersion.cjs

@@ -1,13 +1,42 @@
-let fs = require("fs");
-let process = require("process")
+const fs = require("fs");
+const process = require("process");
+
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
-let currentVersion = require("../package.json").version;
-let targetVersion = process.env.VERSION;
-console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, " targetVersion:", targetVersion);
-// fs.mkdirSync("./dist");
-if (currentVersion === targetVersion) {
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"")
-} else {
-    let runscript = "sed -i 's/\"version\": \"" + currentVersion + "\"/\"version\": \"" + targetVersion + "\"/g' package.json";
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit config --global user.email \"bot@test.wumiao.wang\"\n git config --global user.name \"Version\"\n" + runscript + "\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main")
-}
+try {
+  const packageJson = require("../package.json");
+  const currentVersion = packageJson.version;
+  const targetVersion = process.env.VERSION;
+
+  console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+
+  // 验证 targetVersion 格式
+  if (!targetVersion || typeof targetVersion !== 'string') {
+    console.error("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
+    return;
+  }
+
+  // 写入脚本文件的统一函数
+  const writeScriptToFile = (content) => {
+    fs.writeFileSync("./checkVersion.sh", content, { flag: 'w' });
+    console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
+  };
+
+  if (currentVersion === targetVersion) {
+    // 不需要更新版本，写入一个简单的脚本
+    const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
+    writeScriptToFile(simpleScript);
+  } else {
+    // 更新版本，构建安全的sed命令
+    const safeScriptContent = `
+    #!/bin/bash
+    git config --global user.email "bot@test.wumiao.wang"
+    git config --global user.name "Version"
+    sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
+    git add .
+    git commit -m "chore:version change"
+    git push -u origin main`;
+    writeScriptToFile(safeScriptContent);
+  }
+} catch (error) {
+  console.error("[NapCat] [CheckVersion] 检测过程中发生错误：", error);
+}

script/napcat-utf8.bat

@@ -15,4 +15,4 @@ for %%a in ("!RetString!") do (
 set "QQPath=!pathWithoutUninstall!QQ.exe"
 set ELECTRON_RUN_AS_NODE=1
 echo !QQPath!
-"!QQPath!" ./napcat.cjs %*
+"!QQPath!" ./napcat.mjs %*

script/napcat-utf8.ps1

@@ -5,11 +5,39 @@ function Get-QQpath {
         return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
     }
     catch {
-        return "D:\QQ.exe"
+        throw "get QQ path error: $_"
     }
 }
+function Select-QQPath {
+    Add-Type -AssemblyName System.Windows.Forms
+    [System.Windows.Forms.Application]::EnableVisualStyles()
+
+    $dialogTitle = "Select QQ.exe"
+
+    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
+    $filePicker.Title = $dialogTitle
+    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
+    $filePicker.FilterIndex = 1
+    $null = $filePicker.ShowDialog()
+    if (-not ($filePicker.FileName)) {
+        throw "User did not select an .exe file."
+    }
+    return $filePicker.FileName
+}
+
 $params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
+Try {
+    $QQpath = Get-QQpath
+}
+Catch {
+    $QQpath = Select-QQPath
+}
+
+if (!(Test-Path $QQpath)) {
+    throw "provided QQ path is invalid: $QQpath"
+}
+
+$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
 $env:ELECTRON_RUN_AS_NODE = 1
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$QQpath' $Bootfile $params}"
+$commandInfo = Get-Command $QQpath -ErrorAction Stop
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' $Bootfile $params}"

script/napcat.bat

@@ -14,4 +14,4 @@ for %%a in ("!RetString!") do (
 set "QQPath=!pathWithoutUninstall!QQ.exe"
 set ELECTRON_RUN_AS_NODE=1
 echo !QQPath!
-"!QQPath!" ./napcat.cjs %*
+"!QQPath!" ./napcat.mjs %*

script/napcat.ps1

@@ -5,11 +5,39 @@ function Get-QQpath {
         return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
     }
     catch {
-        return "D:\QQ.exe"
+        throw "get QQ path error: $_"
     }
 }
+function Select-QQPath {
+    Add-Type -AssemblyName System.Windows.Forms
+    [System.Windows.Forms.Application]::EnableVisualStyles()
+
+    $dialogTitle = "Select QQ.exe"
+
+    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
+    $filePicker.Title = $dialogTitle
+    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
+    $filePicker.FilterIndex = 1
+    $null = $filePicker.ShowDialog()
+    if (-not ($filePicker.FileName)) {
+        throw "User did not select an .exe file."
+    }
+    return $filePicker.FileName
+}
+
 $params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
+Try {
+    $QQpath = Get-QQpath
+}
+Catch {
+    $QQpath = Select-QQPath
+}
+
+if (!(Test-Path $QQpath)) {
+    throw "provided QQ path is invalid: $QQpath"
+}
+
+$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
 $env:ELECTRON_RUN_AS_NODE = 1
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$QQpath' $Bootfile $params}"
+$commandInfo = Get-Command $QQpath -ErrorAction Stop
+Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$($commandInfo.Path)' $Bootfile $params}"

script/napcat.sh

@@ -1,4 +1,21 @@
 #!/bin/bash
-SCRIPT_DIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+
+get_script_dir() {
+  local script_path="${1:-$0}"
+  local script_dir
+  script_path=$(readlink -f "$script_path")
+  script_dir=$(dirname "$script_path")
+
+  echo "$script_dir"
+}
+
+SCRIPT_DIR=$(get_script_dir)
+
 export ELECTRON_RUN_AS_NODE=1
-/opt/QQ/qq ${SCRIPT_DIR}/napcat.cjs $@
+
+if ! [ -x /opt/QQ/qq ]; then
+    echo "Error: /opt/QQ/qq is not executable or does not exist." >&2
+    exit 1
+fi
+
+/opt/QQ/qq "${SCRIPT_DIR}/napcat.mjs" "$@"

src/common/server/http.ts

@@ -37,14 +37,14 @@ export abstract class HttpServerBase {
     const authHeader = req.get('authorization');
     if (authHeader) {
       clientToken = authHeader.split('Bearer ').pop() || '';
-      logDebug('receive http header token', clientToken);
+      //logDebug('receive http header token', clientToken);
     } else if (req.query.access_token) {
       if (Array.isArray(req.query.access_token)) {
         clientToken = req.query.access_token[0].toString();
       } else {
         clientToken = req.query.access_token.toString();
       }
-      logDebug('receive http url token', clientToken);
+      //logDebug('receive http url token', clientToken);
     }
 
     if (serverToken && clientToken != serverToken) {
@@ -61,12 +61,12 @@ export abstract class HttpServerBase {
       this.listen(port, host);
     } catch (e: any) {
       logError('HTTP服务启动失败', e.toString());
-      // llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
+      // httpServerError = "HTTP服务启动失败, " + e.toString()
     }
   }
 
   stop() {
-    // llonebotError.httpServerError = ""
+    // httpServerError = ""
     if (this.server) {
       this.server.close();
       this.server = null;
@@ -114,8 +114,10 @@ export abstract class HttpServerBase {
       this.server = this.expressAPP.listen(port, host, () => {
         const info = `${this.name} started ${host}:${port}`;
         log(info);
+      }).on('error', (err) => {
+        logError('HTTP服务启动失败', err.toString());
       });
-    }catch (e: any) {
+    } catch (e: any) {
       logError('HTTP服务启动失败, 请检查监听的ip地址和端口', e.stack.toString());
     }
   }

src/common/server/websocket.ts

@@ -30,9 +30,10 @@ export class WebsocketServerBase {
   start(port: number, host: string = '') {
     try {
       this.ws = new WebSocketServer({
-        port ,
+        port,
         host: '',
         maxPayload: 1024 * 1024 * 1024
+      }).on('error', () => {
       });
       log(`ws服务启动成功, ${host}:${port}`);
     } catch (e: any) {

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/ConfigBase.ts

@@ -1,6 +1,12 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import { log, logDebug, logError } from '@/common/utils/log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 const configDir = path.resolve(__dirname, 'config');
 fs.mkdirSync(configDir, { recursive: true });

src/common/utils/EventTask.ts

@@ -0,0 +1,182 @@
+import { NodeIKernelMsgListener } from '@/core';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+}
+
+export class ListenerClassBase {
+  [key: string]: string;
+}
+
+export interface ListenerIBase {
+  // eslint-disable-next-line @typescript-eslint/no-misused-new
+  new(listener: any): ListenerClassBase;
+}
+
+export class NTEventWrapper {
+
+  private ListenerMap: { [key: string]: ListenerIBase } | undefined;//ListenerName-Unique -> Listener构造函数
+  private WrapperSession: NodeIQQNTWrapperSession | undefined;//WrapperSession
+  private ListenerManger: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+  private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>();//tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+  constructor() {
+
+  }
+  createProxyDispatch(ListenerMainName: string) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const current = this;
+    return new Proxy({}, {
+      get(target: any, prop: any, receiver: any) {
+        // console.log('get', prop, typeof target[prop]);
+        if (typeof target[prop] === 'undefined') {
+          // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+          return (...args: any[]) => {
+            current.DispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
+          };
+        }
+        // 如果方法存在，正常返回
+        return Reflect.get(target, prop, receiver);
+      }
+    });
+  }
+  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
+    this.ListenerMap = ListenerMap;
+    this.WrapperSession = WrapperSession;
+  }
+  CreatEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+    const eventNameArr = eventName.split('/');
+    type eventType = {
+      [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
+    }
+    if (eventNameArr.length > 1) {
+      const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+      const eventName = eventNameArr[1];
+      //getNodeIKernelGroupListener,GroupService
+      //console.log('2', eventName);
+      const services = (this.WrapperSession as unknown as eventType)[serviceName]();
+      let event = services[eventName];
+      //重新绑定this
+      event = event.bind(services);
+      if (event) {
+        return event as T;
+      }
+      return undefined;
+    }
+
+  }
+  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+    const ListenerType = this.ListenerMap![listenerMainName];
+    let Listener = this.ListenerManger.get(listenerMainName + uniqueCode);
+    if (!Listener && ListenerType) {
+      Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
+      const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+      const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
+      const addfunc = this.CreatEventFunction<(listener: T) => number>(Service);
+      addfunc!(Listener as T);
+      //console.log(addfunc!(Listener as T));
+      this.ListenerManger.set(listenerMainName + uniqueCode, Listener);
+    }
+    return Listener as T;
+  }
+  //统一回调清理事件
+  async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+    //console.log(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
+    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.forEach((task, uuid) => {
+      //console.log(task.func, uuid, task.createtime, task.timeout);
+      if (task.createtime + task.timeout < Date.now()) {
+        this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
+        return;
+      }
+      task.func(...args);
+    });
+  }
+  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
+    return new Promise<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

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

src/common/utils/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) {
+        let 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,13 +50,13 @@ 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;
-
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
+//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,
 // app_version: '9.9.9-23159',
@@ -64,9 +65,13 @@ export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
 // 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

@@ -1,7 +1,11 @@
 import * as os from 'os';
 import path from 'node:path';
 import fs from 'fs';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 export function getModuleWithArchName(moduleName: string) {
   const systemPlatform = os.platform();
   const cpuArch = os.arch();
@@ -14,6 +18,6 @@ export function cpModule(moduleName: string) {
   try {
     fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
   } catch (e) {
-
+    console.error(e);
   }
 }

src/common/utils/db.ts

@@ -0,0 +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);
+      }
+    });
+  }
+
+  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,10 +1,10 @@
 import fs from 'fs';
-import fsPromise from 'fs/promises';
+import fsPromise, { stat } from 'fs/promises';
 import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
-import { log } from './log';
-import { dbUtil } from '@/core/utils/db';
+import { log, logError } from './log';
+import { dbUtil } from '@/common/utils/db';
 import * as fileType from 'file-type';
 import { v4 as uuidv4 } from 'uuid';
 import { napCatCore } from '@/core';
@@ -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 = {
@@ -125,7 +158,7 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, headers);
+  const fetchRes = await fetch(url, { headers });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -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

@@ -1,5 +1,13 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'fs/promises';
+import { log, logDebug } from './log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import * as fsPromise from 'node:fs/promises';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -35,3 +43,244 @@ 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生成缓存键，在一定时间内返回缓存结果
+ * @param ttl 超时时间，单位毫秒
+ * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
+ * @returns 处理后缓存或调用原方法的结果
+ */
+export function cacheFunc(ttl: number, customKey: string = '') {
+  const cache = new Map<string, { expiry: number; value: any }>();
+
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
+    const originalMethod = descriptor.value;
+    const className = target.constructor.name;  // 获取类名
+    const methodName = propertyKey;             // 获取方法名
+    descriptor.value = async function (...args: any[]) {
+      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
+      const cached = cache.get(cacheKey);
+      if (cached && cached.expiry > Date.now()) {
+        return cached.value;
+      } else {
+        const result = await originalMethod.apply(this, args);
+        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
+        return result;
+      }
+    };
+
+    return descriptor;
+  };
+}
+export function isValidOldConfig(config: any) {
+  if (typeof config !== 'object') {
+    return false;
+  }
+  const requiredKeys = [
+    'httpHost', 'httpPort', 'httpPostUrls', 'httpSecret',
+    'wsHost', 'wsPort', 'wsReverseUrls', 'enableHttp',
+    'enableHttpHeart', 'enableHttpPost', 'enableWs', 'enableWsReverse',
+    'messagePostFormat', 'reportSelfMessage', 'enableLocalFile2Url',
+    'debug', 'heartInterval', 'token', 'musicSignUrl'
+  ];
+  for (const key of requiredKeys) {
+    if (!(key in config)) {
+      return false;
+    }
+  }
+  if (!Array.isArray(config.httpPostUrls) || !Array.isArray(config.wsReverseUrls)) {
+    return false;
+  }
+  if (config.httpPostUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (config.wsReverseUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (typeof config.httpPort !== 'number' || typeof config.wsPort !== 'number' || typeof config.heartInterval !== 'number') {
+    return false;
+  }
+  if (
+    typeof config.enableHttp !== 'boolean' ||
+    typeof config.enableHttpHeart !== 'boolean' ||
+    typeof config.enableHttpPost !== 'boolean' ||
+    typeof config.enableWs !== 'boolean' ||
+    typeof config.enableWsReverse !== 'boolean' ||
+    typeof config.enableLocalFile2Url !== 'boolean' ||
+    typeof config.reportSelfMessage !== 'boolean'
+  ) {
+    return false;
+  }
+  if (config.messagePostFormat !== 'array' && config.messagePostFormat !== 'string') {
+    return false;
+  }
+  return true;
+}
+export function migrateConfig(oldConfig: any) {
+  const newConfig = {
+    http: {
+      enable: oldConfig.enableHttp,
+      host: oldConfig.httpHost,
+      port: oldConfig.httpPort,
+      secret: oldConfig.httpSecret,
+      enableHeart: oldConfig.enableHttpHeart,
+      enablePost: oldConfig.enableHttpPost,
+      postUrls: oldConfig.httpPostUrls,
+    },
+    ws: {
+      enable: oldConfig.enableWs,
+      host: oldConfig.wsHost,
+      port: oldConfig.wsPort,
+    },
+    reverseWs: {
+      enable: oldConfig.enableWsReverse,
+      urls: oldConfig.wsReverseUrls,
+    },
+    GroupLocalTime: {
+      Record: false,
+      RecordList: []
+    },
+    debug: oldConfig.debug,
+    heartInterval: oldConfig.heartInterval,
+    messagePostFormat: oldConfig.messagePostFormat,
+    enableLocalFile2Url: oldConfig.enableLocalFile2Url,
+    musicSignUrl: oldConfig.musicSignUrl,
+    reportSelfMessage: oldConfig.reportSelfMessage,
+    token: oldConfig.token,
+
+  };
+  return newConfig;
+}
+// 升级旧的配置到新的
+export async function UpdateConfig() {
+  const configFiles = await fs.readdir(path.join(__dirname, 'config'));
+  for (const file of configFiles) {
+    if (file.match(/^onebot11_\d+.json$/)) {
+      const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      if (isValidOldConfig(CurrentConfig)) {
+        log('正在迁移旧配置到新配置 File:', file);
+        const NewConfig = migrateConfig(CurrentConfig);
+        await fs.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
+      }
+    }
+  }
+}
+export function isEqual(obj1: any, obj2: any) {
+  if (obj1 === obj2) return true;
+  if (obj1 == null || obj2 == null) return false;
+  if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
+
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+
+  if (keys1.length !== keys2.length) return false;
+
+  for (const key of keys1) {
+    if (!isEqual(obj1[key], obj2[key])) return false;
+  }
+  return true;
+}
+
+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

@@ -2,6 +2,12 @@ import log4js, { Configuration } from 'log4js';
 import { truncateString } from '@/common/utils/helper';
 import path from 'node:path';
 import { SelfInfo } from '@/core';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import chalk from 'chalk';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 export enum LogLevel {
   DEBUG = 'debug',
@@ -21,7 +27,8 @@ function getFormattedTimestamp() {
   const hours = now.getHours().toString().padStart(2, '0');
   const minutes = now.getMinutes().toString().padStart(2, '0');
   const seconds = now.getSeconds().toString().padStart(2, '0');
-  return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
+  const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
+  return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
 }
 
 const filename = `${getFormattedTimestamp()}.log`;
@@ -32,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`
       }
     }
   },
@@ -54,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;
@@ -63,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;
@@ -79,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) {
     // 判断是否是对象
@@ -90,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, ''));
   }
 }
 
@@ -114,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/qqlevel.ts

@@ -1,5 +1,5 @@
 // QQ等级换算
-import { QQLevel } from '../../core/src/entities';
+import { QQLevel } from '@/core/entities';
 
 export function calcQQLevel(level: QQLevel) {
   const { crownNum, sunNum, moonNum, starNum } = level;

src/common/utils/reboot.ts

@@ -1,15 +1,44 @@
-import { exit } from "process";
-import { resolve } from "path";
-async function reboot() {
-    let batScript = resolve(__dirname, './napcat.bat');
-    let batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
-    let bashScript = resolve(__dirname, './napcat.sh');
-    //如果是win系统写出 5s延迟启动 默认batUtf8Script启动
-    // 如果是linux系统写出 5s延迟启动 默认bashScript启动
-    if (process.platform === 'win32') {
-        // console.log('正在重启...');
-    } else if (process.platform === 'linux') {
-        //console.log('正在重启...');
-    }
+import { resolve } from 'node:path';
+import { spawn } from 'node:child_process';
+import { pid, ppid, exit } from 'node:process';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export async function rebootWithQuickLogin(uin: string) {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    //还没兼容
+    subProcess.unref();
     exit(0);
+  }
+  //exit(0);
+}
+export async function rebootWithNormolLogin() {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} `, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
+    subProcess.unref();
+    exit(0);
+  }
 }

src/common/utils/request.ts

@@ -1,57 +1,192 @@
-const https = require('node:https');
-export async function HttpGetCookies(url: string): Promise<Map<string, string>> {
-  return new Promise((resolve, reject) => {
-    const result: Map<string, string> = new Map<string, string>();
-    const req = https.get(url, (res: any) => {
-      res.on('data', (data: any) => {
-      });
-      res.on('end', () => {
-        try {
-          const responseCookies = res.headers['set-cookie'];
-          for (const line of responseCookies) {
-            const parts = line.split(';');
-            const [key, value] = parts[0].split('=');
-            result.set(key, value);
+import https from 'node:https';
+import http from 'node:http';
+import fs, { readFileSync } from 'node:fs';
+import { NTQQUserApi } from '@/core';
+import path from 'node:path';
+import { request } from 'node:http';
+export class RequestUtil {
+  // 适用于获取服务器下发cookies时获取，仅GET
+  static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
+    const client = url.startsWith('https') ? https : http;
+    return new Promise((resolve, reject) => {
+      client.get(url, (res) => {
+        let cookies: { [key: string]: string } = {};
+        const handleRedirect = (res: http.IncomingMessage) => {
+          //console.log(res.headers.location);
+          if (res.statusCode === 301 || res.statusCode === 302) {
+            if (res.headers.location) {
+              const redirectUrl = new URL(res.headers.location, url);
+              RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
+                // 合并重定向过程中的cookies
+                cookies = { ...cookies, ...redirectCookies };
+                resolve(cookies);
+              });
+            } else {
+              resolve(cookies);
+            }
+          } else {
+            resolve(cookies);
           }
-        } catch (e) {
+        };
+        res.on('data', () => { }); // Necessary to consume the stream
+        res.on('end', () => {
+          handleRedirect(res);
+        });
+        if (res.headers['set-cookie']) {
+          //console.log(res.headers['set-cookie']);
+          res.headers['set-cookie'].forEach((cookie) => {
+            const parts = cookie.split(';')[0].split('=');
+            const key = parts[0];
+            const value = parts[1];
+            if (key && value && key.length > 0 && value.length > 0) {
+              cookies[key] = value;
+            }
+          });
         }
-        resolve(result);
-
+      }).on('error', (err) => {
+        reject(err);
       });
     });
-    req.on('error', (error: any) => {
-      resolve(result);
-      // console.log(error)
-    });
-    req.end();
-  });
+  }
 
-}
-export async function HttpPostCookies(url: string): Promise<Map<string, string>> {
-  return new Promise((resolve, reject) => {
-    const result: Map<string, string> = new Map<string, string>();
-    const req = https.get(url, (res: any) => {
-      res.on('data', (data: any) => {
-      });
-      res.on('end', () => {
-        try {
-          const responseCookies = res.headers['set-cookie'];
-          for (const line of responseCookies) {
-            const parts = line.split(';');
-            const [key, value] = parts[0].split('=');
-            result.set(key, value);
+
+
+  // 请求和回复都是JSON data传原始内容 自动编码json
+  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 = {
+      hostname: option.hostname,
+      port: option.port,
+      path: option.href,
+      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 = '';
+        res.on('data', (chunk: string | Buffer) => {
+          responseBody += chunk.toString();
+        });
+
+        res.on('end', () => {
+          try {
+            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+              if (isJsonRet) {
+                const responseJson = JSON.parse(responseBody);
+                resolve(responseJson as T);
+              } else {
+                resolve(responseBody as T);
+              }
+            } else {
+              reject(new Error(`Unexpected status code: ${res.statusCode}`));
+            }
+          } catch (parseError) {
+            reject(parseError);
           }
-        } catch (e) {
-        }
-        resolve(result);
-
+        });
       });
-    });
-    req.on('error', (error: any) => {
-      resolve(result);
-      // console.log(error)
-    });
-    req.end();
-  });
 
+      req.on('error', (error: any) => {
+        reject(error);
+      });
+      if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+        if (isArgJson) {
+          req.write(JSON.stringify(data));
+        } else {
+          req.write(data);
+        }
+
+      }
+      req.end();
+    });
+  }
+
+  // 请求返回都是原始内容
+  static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [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) => {
+          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,10 +1,74 @@
 import os from 'node:os';
 import path from 'node:path';
+import { networkInterfaces } from 'os';
+import { v4 as uuidv4 } from 'uuid';
+
+// 缓解Win7设备兼容性问题
+let osName: string;
+// 设备ID
+let machineId: Promise<string>;
+
+try {
+  osName = os.hostname();
+} catch (e) {
+  osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
+}
+
+const invalidMacAddresses = new Set([
+  '00:00:00:00:00:00',
+  'ff:ff:ff:ff:ff:ff',
+  'ac:de:48:00:11:22'
+]);
+
+function validateMacAddress(candidate: string): boolean {
+  // eslint-disable-next-line no-useless-escape
+  const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
+  return !invalidMacAddresses.has(tempCandidate);
+}
+
+export async function getMachineId(): Promise<string> {
+  if (!machineId) {
+    machineId = (async () => {
+      const id = await getMacMachineId();
+      return id || uuidv4(); // fallback, generate a UUID
+    })();
+  }
+
+  return machineId;
+}
+
+export function getMac(): string {
+  const ifaces = networkInterfaces();
+  for (const name in ifaces) {
+    const networkInterface = ifaces[name];
+    if (networkInterface) {
+      for (const { mac } of networkInterface) {
+        if (validateMacAddress(mac)) {
+          return mac;
+        }
+      }
+    }
+  }
+
+  throw new Error('Unable to retrieve mac address (unexpected format)');
+}
+
+async function getMacMachineId(): Promise<string | undefined> {
+  try {
+    const crypto = await import('crypto');
+    const macAddress = getMac();
+    return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
+  } catch (err) {
+    return undefined;
+  }
+}
+
+const homeDir = os.homedir();
+
 
 export const systemPlatform = os.platform();
 export const cpuArch = os.arch();
 export const systemVersion = os.release();
-export const hostname = os.hostname();
-const homeDir = os.homedir();
+export const hostname = osName;
 export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();
+export const systemName = os.type();

src/common/utils/type.ts

@@ -0,0 +1,31 @@
+/**
+ * 运行时类型转换与检查类
+ */
+export class TypeCheck {
+  static isEmpty(value: any): boolean {
+    return value === null || value === undefined || value === '' ||
+            (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
+  }
+}
+
+export class TypeConvert {
+  static toNumber(value: any): number {
+    const num = Number(value);
+    if (isNaN(num)) {
+      throw new Error(`无法将输入转换为数字: ${value}`);
+    }
+    return num;
+  }
+
+  static toString(value: any): string {
+    return String(value);
+  }
+
+  static toBoolean(value: any): boolean {
+    return Boolean(value);
+  }
+
+  static toArray(value: any): any[] {
+    return Array.isArray(value) ? value : [value];
+  }
+}

src/common/utils/umami.ts

@@ -1,44 +0,0 @@
-import { request } from 'node:https';
-export function postLoginStatus() {
-  const req = request(
-    {
-      hostname: 'napcat.wumiao.wang',
-      path: '/api/send',
-      port: 443,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0'
-      }
-    },
-    (res) => {
-      //let data = '';
-      res.on('data', (chunk) => {
-        //data += chunk;
-      });
-      res.on('error', (err) => {
-      });
-      res.on('end', () => {
-        //console.log('Response:', data);
-      });
-    }
-  );
-  req.on('error', (e) => {
-    // console.error('Request error:', e);
-  });
-  const StatesData = {
-    type: 'event',
-    payload: {
-      'website': '952bf82f-8f49-4456-aec5-e17db5f27f7e',
-      'hostname': 'napcat.demo.cn',
-      'screen': '1920x1080',
-      'language': 'zh-CN',
-      'title': 'OneBot.Login',
-      'url': '/login/onebot11/1.3.2',
-      'referrer': 'https://napcat.demo.cn/login?type=onebot11'
-    }
-  };
-  req.write(JSON.stringify(StatesData));
-
-  req.end();
-}

src/common/utils/version.ts

@@ -1,40 +1,21 @@
-import { get as httpsGet } from 'node:https';
-function requestMirror(url: string): Promise<string | undefined> {
-  return new Promise((resolve, reject) => {
-    httpsGet(url, (response) => {
-      let data = '';
-      response.on('data', (chunk) => {
-        data += chunk;
-      });
-
-      response.on('end', () => {
-        try {
-          const parsedData = JSON.parse(data);
-          const version = parsedData.version;
-          resolve(version);
-        } catch (error) {
-          // 解析失败或无法访问域名，跳过
-          resolve(undefined);
-        }
-      });
-    }).on('error', (error) => {
-      // 请求失败，跳过
-      resolve(undefined);
-    });
-  });
-}
-
+import { logDebug } from './log';
+import { RequestUtil } from './request';
 export async function checkVersion(): Promise<string> {
   return new Promise(async (resolve, reject) => {
     const MirrorList =
-            [
-              'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
-            ];
+      [
+        'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
+      ];
+    let version = undefined;
     for (const url of MirrorList) {
-      const version = await requestMirror(url);
+      try {
+        version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
+      } catch (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 @@
-function _0x2447(){var _0x40715d=['767928djIDKx','2613555LtFJNB','88880ITNkwU','4272LXSycu','getGroupCode','7731ImFEuE','63sfXUOj','119514rxaZvL','6MAtdxI','5478560FwCVSe','3257401IvFXNP'];_0x2447=function(){return _0x40715d;};return _0x2447();}var _0x255d07=_0x41cd;function _0x41cd(_0x5cef73,_0x12e48d){var _0x24471d=_0x2447();return _0x41cd=function(_0x41cd42,_0xac0095){_0x41cd42=_0x41cd42-0x152;var _0x389d9=_0x24471d[_0x41cd42];return _0x389d9;},_0x41cd(_0x5cef73,_0x12e48d);}(function(_0x57a7ff,_0x3c0999){var _0x5414e6=_0x41cd,_0x591d70=_0x57a7ff();while(!![]){try{var _0x4d1a4a=parseInt(_0x5414e6(0x158))/0x1*(-parseInt(_0x5414e6(0x157))/0x2)+-parseInt(_0x5414e6(0x156))/0x3*(-parseInt(_0x5414e6(0x152))/0x4)+-parseInt(_0x5414e6(0x15c))/0x5+parseInt(_0x5414e6(0x15b))/0x6+parseInt(_0x5414e6(0x15a))/0x7+-parseInt(_0x5414e6(0x153))/0x8*(parseInt(_0x5414e6(0x155))/0x9)+parseInt(_0x5414e6(0x159))/0xa;if(_0x4d1a4a===_0x3c0999)break;else _0x591d70['push'](_0x591d70['shift']());}catch(_0x1503d5){_0x591d70['push'](_0x591d70['shift']());}}}(_0x2447,0x41648));export class DependsAdapter{['onMSFStatusChange'](_0x2e5ba0,_0x5859ee){}['onMSFSsoError'](_0x540230){}[_0x255d07(0x154)](_0x341797){}}
+var _0x5d45ba=_0x45f4;function _0x45f4(_0x44e490,_0x38aec7){var _0x5deaca=_0x5dea();return _0x45f4=function(_0x45f456,_0x523741){_0x45f456=_0x45f456-0x1e4;var _0x3d1278=_0x5deaca[_0x45f456];return _0x3d1278;},_0x45f4(_0x44e490,_0x38aec7);}function _0x5dea(){var _0x5e735a=['onMSFStatusChange','2RIaAEC','29480eRCTKF','getGroupCode','987KrMoNx','623040RfwnOX','7007900oHOLDG','1531677nVKMUZ','1196928xWXwkP','4734whVRoh','885912SGCfCF','onMSFSsoError','3075smPsjw'];_0x5dea=function(){return _0x5e735a;};return _0x5dea();}(function(_0x545333,_0x220bfc){var _0xccd8c7=_0x45f4,_0x397e66=_0x545333();while(!![]){try{var _0x1670ce=parseInt(_0xccd8c7(0x1ee))/0x1+-parseInt(_0xccd8c7(0x1ea))/0x2*(parseInt(_0xccd8c7(0x1f0))/0x3)+-parseInt(_0xccd8c7(0x1e6))/0x4+parseInt(_0xccd8c7(0x1e8))/0x5*(-parseInt(_0xccd8c7(0x1e5))/0x6)+parseInt(_0xccd8c7(0x1ed))/0x7*(parseInt(_0xccd8c7(0x1eb))/0x8)+-parseInt(_0xccd8c7(0x1e4))/0x9+parseInt(_0xccd8c7(0x1ef))/0xa;if(_0x1670ce===_0x220bfc)break;else _0x397e66['push'](_0x397e66['shift']());}catch(_0x14bdbf){_0x397e66['push'](_0x397e66['shift']());}}}(_0x5dea,0x7865f));export class DependsAdapter{[_0x5d45ba(0x1e9)](_0x233c16,_0x171c24){}[_0x5d45ba(0x1e7)](_0x4352a7){}[_0x5d45ba(0x1ec)](_0x1f0d4d){}}

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

@@ -1 +1 @@
-var _0x3de2e4=_0x2540;function _0x232a(){var _0xfaa861=['13366TCpArG','114600bzkmxJ','12222dloHSn','217HnnbDg','2462142PwpkNp','2751925DTqjRJ','1511320MYXSpE','910szgNEo','dispatchCall','88swNYuM','63630fOvCkS','4GQwgLe'];_0x232a=function(){return _0xfaa861;};return _0x232a();}function _0x2540(_0x45ccb8,_0x573f47){var _0x232a07=_0x232a();return _0x2540=function(_0x2540df,_0x80e83c){_0x2540df=_0x2540df-0xd7;var _0x3c6216=_0x232a07[_0x2540df];return _0x3c6216;},_0x2540(_0x45ccb8,_0x573f47);}(function(_0x2f493a,_0x3c1636){var _0x241720=_0x2540,_0x37f272=_0x2f493a();while(!![]){try{var _0x44217c=-parseInt(_0x241720(0xdd))/0x1*(parseInt(_0x241720(0xde))/0x2)+parseInt(_0x241720(0xdc))/0x3*(parseInt(_0x241720(0xdb))/0x4)+parseInt(_0x241720(0xd8))/0x5+parseInt(_0x241720(0xe2))/0x6+-parseInt(_0x241720(0xe1))/0x7*(parseInt(_0x241720(0xdf))/0x8)+parseInt(_0x241720(0xe0))/0x9*(-parseInt(_0x241720(0xd9))/0xa)+-parseInt(_0x241720(0xd7))/0xb;if(_0x44217c===_0x3c1636)break;else _0x37f272['push'](_0x37f272['shift']());}catch(_0x169507){_0x37f272['push'](_0x37f272['shift']());}}}(_0x232a,0x51b59));export class DispatcherAdapter{['dispatchRequest'](_0xf06f3){}[_0x3de2e4(0xda)](_0x5d3ee4){}['dispatchCallWithJson'](_0x41bc9c){}}
+var _0x2ad13b=_0x5ad7;function _0x4abb(){var _0x537a7a=['960EgeVWp','dispatchRequest','408695KXFapV','2884005wZkLBy','9770MtJYqU','3jaaltY','20005qnGMxX','dispatchCall','56796vkJMjW','3515132HgWJlD','2nhLcWD','8063UAUcTe','595567GFPAyM','8uWYFGt','dispatchCallWithJson','91OzMSBM'];_0x4abb=function(){return _0x537a7a;};return _0x4abb();}function _0x5ad7(_0x4429e8,_0x54b55a){var _0x4abbee=_0x4abb();return _0x5ad7=function(_0x5ad780,_0x16ed60){_0x5ad780=_0x5ad780-0xdc;var _0x271b7d=_0x4abbee[_0x5ad780];return _0x271b7d;},_0x5ad7(_0x4429e8,_0x54b55a);}(function(_0x100fff,_0x190d9d){var _0x4b5ca9=_0x5ad7,_0x5b7594=_0x100fff();while(!![]){try{var _0x22741a=parseInt(_0x4b5ca9(0xe5))/0x1*(-parseInt(_0x4b5ca9(0xdd))/0x2)+parseInt(_0x4b5ca9(0xe8))/0x3*(parseInt(_0x4b5ca9(0xdc))/0x4)+-parseInt(_0x4b5ca9(0xe9))/0x5*(-parseInt(_0x4b5ca9(0xe3))/0x6)+parseInt(_0x4b5ca9(0xdf))/0x7*(parseInt(_0x4b5ca9(0xe0))/0x8)+parseInt(_0x4b5ca9(0xe6))/0x9+-parseInt(_0x4b5ca9(0xe7))/0xa*(parseInt(_0x4b5ca9(0xde))/0xb)+-parseInt(_0x4b5ca9(0xeb))/0xc*(-parseInt(_0x4b5ca9(0xe2))/0xd);if(_0x22741a===_0x190d9d)break;else _0x5b7594['push'](_0x5b7594['shift']());}catch(_0x4590fd){_0x5b7594['push'](_0x5b7594['shift']());}}}(_0x4abb,0xcb4fc));export class DispatcherAdapter{[_0x2ad13b(0xe4)](_0x5dfd5e){}[_0x2ad13b(0xea)](_0x403d38){}[_0x2ad13b(0xe1)](_0x4cbb31){}}

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

@@ -1 +1 @@
-function _0x4bec(){var _0x2affc4=['onShowErrUITips','6689450DqNZBP','34ZMyCSv','12LePUbj','1207507NfdXrz','1104025dBWvym','46614SyguOc','4zBaAhp','onInstallFinished','4959cKBJdo','11957682EFPufC','16003etUzGt','fixPicImgType','6704rugBBT','onGetSrvCalTime','onGetOfflineMsg'];_0x4bec=function(){return _0x2affc4;};return _0x4bec();}var _0x35d759=_0x4d9b;(function(_0x4bb643,_0x132819){var _0x50e673=_0x4d9b,_0x3322ef=_0x4bb643();while(!![]){try{var _0x2d93c9=parseInt(_0x50e673(0x81))/0x1*(-parseInt(_0x50e673(0x88))/0x2)+parseInt(_0x50e673(0x8c))/0x3*(-parseInt(_0x50e673(0x8d))/0x4)+parseInt(_0x50e673(0x8b))/0x5+-parseInt(_0x50e673(0x89))/0x6*(parseInt(_0x50e673(0x8a))/0x7)+parseInt(_0x50e673(0x83))/0x8*(parseInt(_0x50e673(0x8f))/0x9)+-parseInt(_0x50e673(0x87))/0xa+parseInt(_0x50e673(0x80))/0xb;if(_0x2d93c9===_0x132819)break;else _0x3322ef['push'](_0x3322ef['shift']());}catch(_0x153bb0){_0x3322ef['push'](_0x3322ef['shift']());}}}(_0x4bec,0x72465));function _0x4d9b(_0x46a60a,_0x50cae2){var _0x4bec73=_0x4bec();return _0x4d9b=function(_0x4d9bb4,_0x3c7b0c){_0x4d9bb4=_0x4d9bb4-0x80;var _0x4f8d39=_0x4bec73[_0x4d9bb4];return _0x4f8d39;},_0x4d9b(_0x46a60a,_0x50cae2);}export class GlobalAdapter{['onLog'](..._0x19b37e){}[_0x35d759(0x84)](..._0x4af973){}[_0x35d759(0x86)](..._0x2760d6){}[_0x35d759(0x82)](..._0x1a1083){}['getAppSetting'](..._0x19d531){}[_0x35d759(0x8e)](..._0x1771c2){}['onUpdateGeneralFlag'](..._0xf2cd68){}[_0x35d759(0x85)](..._0x50ea80){}}
+function _0x2bb3(_0x267c6d,_0x1247a3){var _0x3def98=_0x3def();return _0x2bb3=function(_0x2bb39d,_0x325723){_0x2bb39d=_0x2bb39d-0x78;var _0x3faebe=_0x3def98[_0x2bb39d];return _0x3faebe;},_0x2bb3(_0x267c6d,_0x1247a3);}function _0x3def(){var _0x56165c=['4mqqXzq','getAppSetting','onShowErrUITips','337mJmBvt','27410ZqvQxp','24087KDNYIC','onUpdateGeneralFlag','1128325DTaioB','2165184TLeQPz','1322VfwLGi','onGetOfflineMsg','7qNgjyy','fixPicImgType','651620itOfyS','1206IJQKhl','onInstallFinished','onLog','1867832vyYIfb','onGetSrvCalTime'];_0x3def=function(){return _0x56165c;};return _0x3def();}var _0x36a2bd=_0x2bb3;(function(_0x52181f,_0x516809){var _0x192a57=_0x2bb3,_0x12551c=_0x52181f();while(!![]){try{var _0x64e0a8=-parseInt(_0x192a57(0x7f))/0x1*(-parseInt(_0x192a57(0x85))/0x2)+-parseInt(_0x192a57(0x81))/0x3*(-parseInt(_0x192a57(0x7c))/0x4)+-parseInt(_0x192a57(0x89))/0x5+parseInt(_0x192a57(0x84))/0x6+-parseInt(_0x192a57(0x87))/0x7*(-parseInt(_0x192a57(0x7a))/0x8)+parseInt(_0x192a57(0x8a))/0x9*(-parseInt(_0x192a57(0x80))/0xa)+-parseInt(_0x192a57(0x83))/0xb;if(_0x64e0a8===_0x516809)break;else _0x12551c['push'](_0x12551c['shift']());}catch(_0x4d98de){_0x12551c['push'](_0x12551c['shift']());}}}(_0x3def,0x36ea8));export class GlobalAdapter{[_0x36a2bd(0x79)](..._0xdfd026){}[_0x36a2bd(0x7b)](..._0x566313){}[_0x36a2bd(0x7e)](..._0xc632c7){}[_0x36a2bd(0x88)](..._0x93abce){}[_0x36a2bd(0x7d)](..._0x40986f){}[_0x36a2bd(0x78)](..._0x1aee90){}[_0x36a2bd(0x82)](..._0xe07080){}[_0x36a2bd(0x86)](..._0x5efbe9){}}

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

@@ -1 +1 @@
-(function(_0x121fc4,_0x513dc8){var _0x382b5f=_0x3eed,_0x1eeb82=_0x121fc4();while(!![]){try{var _0x42bf76=parseInt(_0x382b5f(0x1e1))/0x1*(parseInt(_0x382b5f(0x1e7))/0x2)+parseInt(_0x382b5f(0x1e5))/0x3+parseInt(_0x382b5f(0x1e3))/0x4+-parseInt(_0x382b5f(0x1e6))/0x5+-parseInt(_0x382b5f(0x1e2))/0x6+parseInt(_0x382b5f(0x1e0))/0x7*(parseInt(_0x382b5f(0x1df))/0x8)+-parseInt(_0x382b5f(0x1e8))/0x9*(parseInt(_0x382b5f(0x1e4))/0xa);if(_0x42bf76===_0x513dc8)break;else _0x1eeb82['push'](_0x1eeb82['shift']());}catch(_0x5568d5){_0x1eeb82['push'](_0x1eeb82['shift']());}}}(_0x5362,0x4b025));export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';function _0x5362(){var _0x5b8bb7=['2THrPyg','1204386qfLplf','81480LImlGI','74180WqyIyV','1546866ulozHJ','2985150zgfAhJ','90782mGRkJd','99ynFAmP','14128MfeylH','2219nBCbLB'];_0x5362=function(){return _0x5b8bb7;};return _0x5362();}function _0x3eed(_0xa277b3,_0x154c17){var _0x5362a8=_0x5362();return _0x3eed=function(_0x3eed41,_0x2772a6){_0x3eed41=_0x3eed41-0x1df;var _0x461db4=_0x5362a8[_0x3eed41];return _0x461db4;},_0x3eed(_0xa277b3,_0x154c17);}export*from'./NodeIGlobalAdapter';
+function _0x5650(_0x1ae3cc,_0xf41a1d){var _0x32cec8=_0x32ce();return _0x5650=function(_0x565038,_0x1dd77a){_0x565038=_0x565038-0x10f;var _0x48a686=_0x32cec8[_0x565038];return _0x48a686;},_0x5650(_0x1ae3cc,_0xf41a1d);}(function(_0x27376f,_0x108381){var _0x257d8f=_0x5650,_0x10125b=_0x27376f();while(!![]){try{var _0x39d84b=parseInt(_0x257d8f(0x116))/0x1+-parseInt(_0x257d8f(0x111))/0x2*(parseInt(_0x257d8f(0x10f))/0x3)+parseInt(_0x257d8f(0x113))/0x4+parseInt(_0x257d8f(0x112))/0x5+-parseInt(_0x257d8f(0x110))/0x6+parseInt(_0x257d8f(0x114))/0x7+-parseInt(_0x257d8f(0x115))/0x8;if(_0x39d84b===_0x108381)break;else _0x10125b['push'](_0x10125b['shift']());}catch(_0x30eb3a){_0x10125b['push'](_0x10125b['shift']());}}}(_0x32ce,0x9b19d));function _0x32ce(){var _0x37dd4a=['5793970WlAjAs','3839372UEjMdl','7728679XLaFvA','17582952XMHnzs','401437IoCDZG','17307ePnYWk','2703828CHwOtm','118kJgsBd'];_0x32ce=function(){return _0x37dd4a;};return _0x32ce();}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';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 _0x189a92=_0x4589;function _0x1c40(){const _0x22d397=['session','createCollection','7vhsioZ','createNewCollectionItem','2642538IEvuig','3072JEqEdD','getCollectionService','3172113CqMSNp','180728qrKzDB','getCollectionItemList','toString','getAllCollection','323682tgaZrF','5580632bhdpZI','1585900OqieMx','now','156yoclJK'];_0x1c40=function(){return _0x22d397;};return _0x1c40();}function _0x4589(_0x4e863b,_0x5193ac){const _0x1c40df=_0x1c40();return _0x4589=function(_0x458974,_0x5e0863){_0x458974=_0x458974-0x168;let _0x118746=_0x1c40df[_0x458974];return _0x118746;},_0x4589(_0x4e863b,_0x5193ac);}(function(_0x14e4b6,_0x35ad18){const _0xd58459=_0x4589,_0x300a98=_0x14e4b6();while(!![]){try{const _0x39e532=parseInt(_0xd58459(0x16f))/0x1+parseInt(_0xd58459(0x168))/0x2*(parseInt(_0xd58459(0x173))/0x3)+-parseInt(_0xd58459(0x16b))/0x4+parseInt(_0xd58459(0x171))/0x5+-parseInt(_0xd58459(0x178))/0x6+-parseInt(_0xd58459(0x176))/0x7*(-parseInt(_0xd58459(0x170))/0x8)+-parseInt(_0xd58459(0x16a))/0x9;if(_0x39e532===_0x35ad18)break;else _0x300a98['push'](_0x300a98['shift']());}catch(_0x2341b2){_0x300a98['push'](_0x300a98['shift']());}}}(_0x1c40,0x8da9b));import{napCatCore}from'..';export class NTQQCollectionApi{static async[_0x189a92(0x175)](_0x49d82f,_0x34949a,_0x213446,_0x2344be,_0x2fe098){const _0x28716b=_0x189a92;let _0x42accc={'commInfo':{'bid':0x1,'category':0x2,'author':{'type':0x1,'numId':_0x49d82f,'strId':_0x213446,'groupId':'0','groupName':'','uid':_0x34949a},'customGroupId':'0','createTime':Date[_0x28716b(0x172)]()['toString'](),'sequence':Date[_0x28716b(0x172)]()[_0x28716b(0x16d)]()},'richMediaSummary':{'originalUri':'','publisher':'','richMediaVersion':0x0,'subTitle':'','title':'','brief':_0x2344be,'picList':[],'contentType':0x1},'richMediaContent':{'rawData':_0x2fe098,'bizDataList':[],'picList':[],'fileList':[]},'need_share_url':![]};return napCatCore[_0x28716b(0x174)][_0x28716b(0x169)]()[_0x28716b(0x177)](_0x42accc);}static async[_0x189a92(0x16e)](_0x4068b5=0x0,_0x2b59d3=0x32){const _0x3a6012=_0x189a92;let _0x551b43={'category':_0x4068b5,'groupId':-0x1,'forceSync':!![],'forceFromDb':![],'timeStamp':'0','count':_0x2b59d3,'searchDown':!![]};return napCatCore[_0x3a6012(0x174)][_0x3a6012(0x169)]()[_0x3a6012(0x16c)](_0x551b43);}}

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

@@ -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;
@@ -15,7 +16,11 @@ export declare class NTQQFileApi {
     }>;
     static downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout?: number, force?: boolean): Promise<string>;
     static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
-    static getImageUrl(msg: RawMessage): Promise<string>;
+    static getImageUrl(element: {
+        originImageUrl: any;
+        md5HexStr?: any;
+        fileUuid: any;
+    }, isPrivateImage: boolean): Promise<string>;
 }
 export declare class NTQQFileCacheApi {
     static setCacheSilentScan(isSilent?: boolean): Promise<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 _0x4d4c43=_0x2778;(function(_0x183776,_0x42bef1){const _0x56a198=_0x2778,_0x3b6fff=_0x183776();while(!![]){try{const _0x24db58=parseInt(_0x56a198(0x1ca))/0x1+-parseInt(_0x56a198(0x1cf))/0x2+parseInt(_0x56a198(0x1ce))/0x3*(-parseInt(_0x56a198(0x1d5))/0x4)+parseInt(_0x56a198(0x1dd))/0x5+-parseInt(_0x56a198(0x1de))/0x6*(parseInt(_0x56a198(0x1c4))/0x7)+parseInt(_0x56a198(0x1dc))/0x8*(parseInt(_0x56a198(0x1c5))/0x9)+parseInt(_0x56a198(0x1d8))/0xa*(parseInt(_0x56a198(0x1c3))/0xb);if(_0x24db58===_0x42bef1)break;else _0x3b6fff['push'](_0x3b6fff['shift']());}catch(_0x50bc18){_0x3b6fff['push'](_0x3b6fff['shift']());}}}(_0xc522,0x18a21));function _0x2778(_0x21c30d,_0x5d73fb){const _0xc522b8=_0xc522();return _0x2778=function(_0x2778ed,_0x53d7bd){_0x2778ed=_0x2778ed-0x1c0;let _0x59639a=_0xc522b8[_0x2778ed];return _0x59639a;},_0x2778(_0x21c30d,_0x5d73fb);}import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';function _0xc522(){const _0x10080d=['then','gypoU','set','57128ZKBmzF','172180eYRSZr','181296gCRMUe','TALgs','NvFtG','push','onLoginSuccess','uin','approvalFriendRequest','bpTlm','PpDSa','friendUid','6578IcUpWS','14chqcTJ','189FrAXcq','getBuddyService','uid','获取好友列表超时','mtUxK','90174eydiTf','onBuddyListChange','WZUFd','delete','351EExoEu','215850PGYYWm','session','getBuddyList','开始获取好友列表','reqTime','wrqQB','1572lpsolk','handleFriendRequest','buddyList','680GaQskZ'];_0xc522=function(){return _0x10080d;};return _0xc522();}const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();buddyListener[_0x4d4c43(0x1cb)]=_0x1e7aef=>{const _0x216c31=_0x4d4c43,_0x415631={'TALgs':function(_0x26b2c3,_0x2bff74){return _0x26b2c3(_0x2bff74);}};for(const [_0x37e750,_0x260fd0]of buddyChangeTasks){_0x415631[_0x216c31(0x1df)](_0x260fd0,_0x1e7aef),buddyChangeTasks[_0x216c31(0x1cd)](_0x37e750);}},setTimeout(()=>{const _0x1dcc60=_0x4d4c43;napCatCore[_0x1dcc60(0x1e2)](()=>{napCatCore['addListener'](buddyListener);});},0x64);export class NTQQFriendApi{static async['getFriends'](_0x4d9cae=![]){const _0x2c82b8=_0x4d4c43,_0x35b2f3={'NvFtG':function(_0x3041ae,_0x867464){return _0x3041ae(_0x867464);},'wrqQB':_0x2c82b8(0x1c8),'bpTlm':function(_0x30ff1a,_0x16b3f3,_0x6ff4af){return _0x30ff1a(_0x16b3f3,_0x6ff4af);},'PpDSa':_0x2c82b8(0x1d2),'gypoU':'获取好友列表完成'};return new Promise((_0x30171a,_0xa22d68)=>{const _0x2bd9c7=_0x2c82b8,_0x868233={'mtUxK':function(_0x301d49,_0x137194,_0x444d52){return _0x35b2f3['bpTlm'](_0x301d49,_0x137194,_0x444d52);},'WZUFd':_0x35b2f3[_0x2bd9c7(0x1da)]};let _0x2f9f09=![];_0x35b2f3[_0x2bd9c7(0x1c0)](setTimeout,()=>{const _0x5633bd=_0x2bd9c7;!_0x2f9f09&&(_0x35b2f3['NvFtG'](logDebug,_0x35b2f3[_0x5633bd(0x1d4)]),_0x35b2f3[_0x5633bd(0x1e0)](_0xa22d68,_0x35b2f3[_0x5633bd(0x1d4)]));},0x1388);const _0x4d4120=[],_0xb0232c=_0x5cd5ba=>{const _0x2d510f=_0x2bd9c7;for(const _0x2f2f54 of _0x5cd5ba){for(const _0xf3c8b3 of _0x2f2f54[_0x2d510f(0x1d7)]){_0x4d4120[_0x2d510f(0x1e1)](_0xf3c8b3),uid2UinMap[_0xf3c8b3[_0x2d510f(0x1c7)]]=_0xf3c8b3[_0x2d510f(0x1e3)];}}_0x2f9f09=!![],_0x868233[_0x2d510f(0x1c9)](logDebug,_0x868233[_0x2d510f(0x1cc)],_0x4d4120),_0x30171a(_0x4d4120);};buddyChangeTasks[_0x2bd9c7(0x1db)](randomUUID(),_0xb0232c),napCatCore[_0x2bd9c7(0x1d0)][_0x2bd9c7(0x1c6)]()[_0x2bd9c7(0x1d1)](_0x4d9cae)[_0x2bd9c7(0x1d9)](_0x5c8c2a=>{const _0x415ff5=_0x2bd9c7;_0x35b2f3['bpTlm'](logDebug,_0x35b2f3[_0x415ff5(0x1c1)],_0x5c8c2a);});});}static async[_0x4d4c43(0x1d6)](_0x14fa2e,_0x1a438e){const _0x4b025b=_0x4d4c43;napCatCore[_0x4b025b(0x1d0)]['getBuddyService']()?.[_0x4b025b(0x1e4)]({'friendUid':_0x14fa2e[_0x4b025b(0x1c2)],'reqTime':_0x14fa2e[_0x4b025b(0x1d3)],'accept':_0x1a438e});}}
+const _0x38b9dd=_0x6742;function _0x6742(_0x5f4119,_0x4603f9){const _0xf6cb48=_0xf6cb();return _0x6742=function(_0x674253,_0x3e29bb){_0x674253=_0x674253-0xf6;let _0x2c38a2=_0xf6cb48[_0x674253];return _0x2c38a2;},_0x6742(_0x5f4119,_0x4603f9);}(function(_0x519bdf,_0x17a257){const _0x475c25=_0x6742,_0x27c58b=_0x519bdf();while(!![]){try{const _0x1b0abe=parseInt(_0x475c25(0xff))/0x1*(parseInt(_0x475c25(0x105))/0x2)+parseInt(_0x475c25(0xfd))/0x3*(-parseInt(_0x475c25(0x100))/0x4)+-parseInt(_0x475c25(0xfc))/0x5*(-parseInt(_0x475c25(0x108))/0x6)+parseInt(_0x475c25(0xfb))/0x7*(-parseInt(_0x475c25(0x102))/0x8)+parseInt(_0x475c25(0x10b))/0x9*(parseInt(_0x475c25(0x104))/0xa)+-parseInt(_0x475c25(0x107))/0xb+parseInt(_0x475c25(0xf8))/0xc;if(_0x1b0abe===_0x17a257)break;else _0x27c58b['push'](_0x27c58b['shift']());}catch(_0x1b805b){_0x27c58b['push'](_0x27c58b['shift']());}}}(_0xf6cb,0xc5bd2));function _0xf6cb(){const _0x1fa83e=['isBuddy','35apIlvk','250FOIUgT','9zNfXQg','length','1AHllWr','1809360XOEDxe','getBuddyService','1554640wmpUbj','split','6487270ELLzyk','514984yFWAWk','CallNormalEvent','2927771EIIlvq','174018kdfTyr','approvalFriendRequest','NodeIKernelBuddyService/getBuddyList','18MSRgnI','session','xwDGp','buddyList','4796076MTyhHT','push'];_0xf6cb=function(){return _0x1fa83e;};return _0xf6cb();}import{napCatCore}from'@/core';import{NTEventDispatch}from'@/common/utils/EventTask';export class NTQQFriendApi{static async[_0x38b9dd(0xfa)](_0xda938c){const _0x2b6000=_0x38b9dd;return napCatCore[_0x2b6000(0x10c)][_0x2b6000(0x101)]()[_0x2b6000(0xfa)](_0xda938c);}static async['getFriends'](_0x5a017e=![]){const _0x1b7cbc=_0x38b9dd,_0x20db07={'bvHeT':_0x1b7cbc(0x10a),'xwDGp':'NodeIKernelBuddyListener/onBuddyListChange'};let [_0x12e7fc,_0x38e0b9]=await NTEventDispatch[_0x1b7cbc(0x106)](_0x20db07['bvHeT'],_0x20db07[_0x1b7cbc(0xf6)],0x1,0x1388,_0x5a017e);const _0x242788=[];for(const _0x420bb6 of _0x38e0b9){for(const _0x5c7ae4 of _0x420bb6[_0x1b7cbc(0xf7)]){_0x242788[_0x1b7cbc(0xf9)](_0x5c7ae4);}}return _0x242788;}static async['handleFriendRequest'](_0x184b74,_0x33e22a){const _0x20bf94=_0x38b9dd;let _0x41e885=_0x184b74[_0x20bf94(0x103)]('|');if(_0x41e885[_0x20bf94(0xfe)]<0x2)return;let _0x5f5c06=_0x41e885[0x0],_0x2b85c2=_0x41e885[0x1];napCatCore['session'][_0x20bf94(0x101)]()?.[_0x20bf94(0x109)]({'friendUid':_0x5f5c06,'reqTime':_0x2b85c2,'accept':_0x33e22a});}}

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

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

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

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

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

@@ -1 +1 @@
-(function(_0x2e1c33,_0x2ce6ae){var _0x5724f4=_0x25f4,_0x44291e=_0x2e1c33();while(!![]){try{var _0x5af712=parseInt(_0x5724f4(0xb2))/0x1*(-parseInt(_0x5724f4(0xb4))/0x2)+-parseInt(_0x5724f4(0xae))/0x3+-parseInt(_0x5724f4(0xb0))/0x4*(-parseInt(_0x5724f4(0xb8))/0x5)+parseInt(_0x5724f4(0xb3))/0x6*(-parseInt(_0x5724f4(0xb1))/0x7)+-parseInt(_0x5724f4(0xb9))/0x8*(parseInt(_0x5724f4(0xb7))/0x9)+parseInt(_0x5724f4(0xb5))/0xa*(-parseInt(_0x5724f4(0xaf))/0xb)+parseInt(_0x5724f4(0xb6))/0xc;if(_0x5af712===_0x2ce6ae)break;else _0x44291e['push'](_0x44291e['shift']());}catch(_0x44e279){_0x44291e['push'](_0x44291e['shift']());}}}(_0xe13c,0x96439));function _0x25f4(_0x3a545d,_0x50d262){var _0xe13ceb=_0xe13c();return _0x25f4=function(_0x25f40c,_0x192405){_0x25f40c=_0x25f40c-0xae;var _0x581ba9=_0xe13ceb[_0x25f40c];return _0x581ba9;},_0x25f4(_0x3a545d,_0x50d262);}export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';export*from'./user';export*from'./webapi';function _0xe13c(){var _0x3ef3a8=['3776340sjPwyn','7mpYUHQ','1jxwnlP','3409326QWKrFG','352470EAJUej','386790ywMqSw','34106520OKFuJB','81513DrsDkk','5cnXlCy','1016DihFfe','1971765RJThzk','176eInPyD'];_0xe13c=function(){return _0x3ef3a8;};return _0xe13c();}
+(function(_0xf43e1d,_0xfe3510){var _0x156f83=_0x8d4f,_0x2318e8=_0xf43e1d();while(!![]){try{var _0x444f23=-parseInt(_0x156f83(0x1d7))/0x1+-parseInt(_0x156f83(0x1d2))/0x2*(-parseInt(_0x156f83(0x1d5))/0x3)+parseInt(_0x156f83(0x1db))/0x4*(parseInt(_0x156f83(0x1d4))/0x5)+parseInt(_0x156f83(0x1d3))/0x6+-parseInt(_0x156f83(0x1da))/0x7+-parseInt(_0x156f83(0x1d8))/0x8+parseInt(_0x156f83(0x1d6))/0x9*(-parseInt(_0x156f83(0x1d9))/0xa);if(_0x444f23===_0xfe3510)break;else _0x2318e8['push'](_0x2318e8['shift']());}catch(_0xdb940e){_0x2318e8['push'](_0x2318e8['shift']());}}}(_0x5588,0x5300d));function _0x8d4f(_0x17f65c,_0x471b53){var _0x558833=_0x5588();return _0x8d4f=function(_0x8d4f25,_0x9c09b0){_0x8d4f25=_0x8d4f25-0x1d2;var _0x1bace1=_0x558833[_0x8d4f25];return _0x1bace1;},_0x8d4f(_0x17f65c,_0x471b53);}export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';function _0x5588(){var _0x58c4f1=['1754052ixDstc','11444Yeedri','3314820dEuNab','5SzRtVq','69umNHua','466209seGaaZ','82564ssMTBq','1289448IbYljA','30WuGlZO','2684220zQkQaU'];_0x5588=function(){return _0x58c4f1;};return _0x5588();}export*from'./user';export*from'./webapi';export*from'./sign';export*from'./system';

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

@@ -1,4 +1,4 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { GetFileListParam, Peer, RawMessage, SendMessageElement } from '@/core/entities';
 import { GeneralCallResult } from '@/core/services/common';
 export declare class NTQQMsgApi {
     static setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set?: boolean): Promise<unknown>;
@@ -8,12 +8,13 @@ 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>;
     static activateChatAndGetHistory(peer: Peer): Promise<void>;
     static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
+    static getGroupFileList(GroupCode: string, params: GetFileListParam): Promise<any[]>;
     static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     }>;

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

@@ -10,8 +10,34 @@ export interface CustomMusicSignPostData {
     image?: string;
     singer?: string;
 }
-export declare class MusicSign {
-    private readonly url;
-    constructor(url: string);
-    sign(postData: CustomMusicSignPostData | IdMusicSignPostData): Promise<any>;
+export interface MiniAppLuaJsonType {
+    prompt: string;
+    title: string;
+    preview: string;
+    jumpUrl: string;
+    tag: string;
+    tagIcon: string;
+    source: string;
+    sourcelogo: string;
 }
+export declare function SignMiniApp(CardData: MiniAppLuaJsonType): Promise<string>;
+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

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

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

@@ -0,0 +1 @@
+const _0x33dd3d=_0x3a97;function _0x28e2(){const _0x164e45=['CallNoListenerEvent','NodeIKernelCollectionService/collectionArkShare','4foThXL','99ebrlzD','OOnit','session','406160vqhQjG','setMiniAppVersion','7IbPiBX','ORCImage','215xdwQqd','5026020TXVwHn','hasOtherRunningQQProcess','53322OFAlZg','getOnlineDev','1717662698058','1777755tRJzGK','getMsgService','69308kDwtXo','LSdeq','2522748engcxw','getNodeMiscService','log','261192QWNnjv','translateEnWordToZn','getRichMediaService','121GaYrXW','WOORN','getMiniAppPath'];_0x28e2=function(){return _0x164e45;};return _0x28e2();}(function(_0x1f8625,_0x2a44ad){const _0x3afac4=_0x3a97,_0x3094b3=_0x1f8625();while(!![]){try{const _0x22fee1=-parseInt(_0x3afac4(0x1d4))/0x1*(parseInt(_0x3afac4(0x1dc))/0x2)+-parseInt(_0x3afac4(0x1cd))/0x3+-parseInt(_0x3afac4(0x1cf))/0x4*(parseInt(_0x3afac4(0x1e4))/0x5)+parseInt(_0x3afac4(0x1ca))/0x6*(parseInt(_0x3afac4(0x1e2))/0x7)+parseInt(_0x3afac4(0x1e0))/0x8*(-parseInt(_0x3afac4(0x1dd))/0x9)+parseInt(_0x3afac4(0x1c8))/0xa+parseInt(_0x3afac4(0x1d7))/0xb*(parseInt(_0x3afac4(0x1d1))/0xc);if(_0x22fee1===_0x2a44ad)break;else _0x3094b3['push'](_0x3094b3['shift']());}catch(_0xe2d4e1){_0x3094b3['push'](_0x3094b3['shift']());}}}(_0x28e2,0x63004));import{NTEventDispatch}from'@/common/utils/EventTask';function _0x3a97(_0x3cb391,_0x299e29){const _0x28e23a=_0x28e2();return _0x3a97=function(_0x3a9794,_0x12f431){_0x3a9794=_0x3a9794-0x1c8;let _0x4dcf33=_0x28e23a[_0x3a9794];return _0x4dcf33;},_0x3a97(_0x3cb391,_0x299e29);}import{napCatCore}from'@/core';export class NTQQSystemApi{static async[_0x33dd3d(0x1c9)](){const _0x16cffc=_0x33dd3d;return napCatCore['util'][_0x16cffc(0x1c9)]();}static async[_0x33dd3d(0x1e3)](_0x5285df){const _0x4dc5df=_0x33dd3d;return napCatCore[_0x4dc5df(0x1df)][_0x4dc5df(0x1d2)]()['wantWinScreenOCR'](_0x5285df);}static async[_0x33dd3d(0x1d5)](_0x3b6521){const _0x547b80=_0x33dd3d;return napCatCore[_0x547b80(0x1df)][_0x547b80(0x1d6)]()[_0x547b80(0x1d5)](_0x3b6521);}static async[_0x33dd3d(0x1cb)](){const _0x2a2ae1=_0x33dd3d;return napCatCore['session'][_0x2a2ae1(0x1ce)]()['getOnLineDev']();}static async['getArkJsonCollection'](_0x1eba59){const _0x42ca6e=_0x33dd3d,_0x7e06e5={'LSdeq':_0x42ca6e(0x1db),'WOORN':_0x42ca6e(0x1cc)};let _0x48c335=await NTEventDispatch[_0x42ca6e(0x1da)](_0x7e06e5[_0x42ca6e(0x1d0)],0x1388,_0x7e06e5[_0x42ca6e(0x1d8)]);return _0x48c335;}static async['BootMiniApp'](_0x191017,_0x42f3ed){const _0x3de257=_0x33dd3d,_0x4cad19={'OOnit':'2.16.4'};await napCatCore[_0x3de257(0x1df)][_0x3de257(0x1d2)]()[_0x3de257(0x1e1)](_0x4cad19[_0x3de257(0x1de)]);let _0x932500=await napCatCore[_0x3de257(0x1df)][_0x3de257(0x1d2)]()[_0x3de257(0x1d9)]();return console[_0x3de257(0x1d3)](_0x932500),napCatCore[_0x3de257(0x1df)]['getNodeMiscService']()['startNewMiniApp'](_0x191017,_0x42f3ed);}}

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,7 +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<any>;
+    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 getSkey(cached?: boolean): Promise<string | undefined>;
+    static getQzoneCookies(): Promise<{
+        [key: string]: string;
+    }>;
+    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/webapi.d.ts

@@ -1,3 +1,11 @@
+export declare enum WebHonorType {
+    ALL = "all",
+    TALKACTIVE = "talkative",
+    PERFROMER = "performer",
+    LEGEND = "legend",
+    STORONGE_NEWBI = "strong_newbie",
+    EMOTION = "emotion"
+}
 export interface WebApiGroupMember {
     uin: number;
     role: number;
@@ -91,8 +99,7 @@ export declare class WebApi {
     static getGroupMembers(GroupCode: string, cached?: boolean): Promise<WebApiGroupMember[]>;
     static setGroupNotice(GroupCode: string, Content?: string): Promise<any>;
     static getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet>;
-    static httpDataText(url?: string, method?: string, data?: string, CookiesValue?: string): Promise<string>;
-    static httpDataJson<T>(url?: string, method?: string, data?: string, CookiesValue?: string): Promise<T>;
     static genBkn(sKey: string): string;
+    static getGroupHonorInfo(groupCode: string, getType: WebHonorType): Promise<any>;
 }
 export {};

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
+import { NodeIQQNTWrapperEngine, NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
 import { QuickLoginResult } from '@/core/services';
 import { BuddyListener, GroupListener, MsgListener, ProfileListener } from '@/core/listeners';
 export interface OnLoginSuccess {
@@ -8,9 +8,9 @@ export interface OnLoginSuccess {
 export declare class NapCatCore {
     readonly session: NodeIQQNTWrapperSession;
     readonly util: NodeQQNTWrapperUtil;
-    private engine;
-    private loginService;
+    readonly engine: NodeIQQNTWrapperEngine;
     private readonly loginListener;
+    private loginService;
     private onLoginSuccessFuncList;
     private proxyHandler;
     constructor();

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

@@ -1,35 +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;
-    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 _0x2d6aac=_0x544d;(function(_0x1fca09,_0x1f4cbe){const _0x28bb4b=_0x544d,_0x4b01d8=_0x1fca09();while(!![]){try{const _0x173e1d=parseInt(_0x28bb4b(0x144))/0x1*(-parseInt(_0x28bb4b(0x142))/0x2)+-parseInt(_0x28bb4b(0x13a))/0x3+-parseInt(_0x28bb4b(0x131))/0x4*(-parseInt(_0x28bb4b(0x139))/0x5)+parseInt(_0x28bb4b(0x148))/0x6*(parseInt(_0x28bb4b(0x13d))/0x7)+parseInt(_0x28bb4b(0x141))/0x8*(parseInt(_0x28bb4b(0x137))/0x9)+-parseInt(_0x28bb4b(0x138))/0xa*(-parseInt(_0x28bb4b(0x146))/0xb)+-parseInt(_0x28bb4b(0x136))/0xc;if(_0x173e1d===_0x1f4cbe)break;else _0x4b01d8['push'](_0x4b01d8['shift']());}catch(_0x713681){_0x4b01d8['push'](_0x4b01d8['shift']());}}}(_0x4934,0x49778));import{isNumeric}from'@/common/utils/helper';function _0x544d(_0x3ff1a7,_0x3d9592){const _0x49343d=_0x4934();return _0x544d=function(_0x544d36,_0x44f925){_0x544d36=_0x544d36-0x130;let _0x511bca=_0x49343d[_0x544d36];return _0x511bca;},_0x544d(_0x3ff1a7,_0x3d9592);}function _0x4934(){const _0x18a6ef=['toString','18UAfkdH','getGroupMembers','delete','rTamj','from','4jtEtZN','find','values','uin','get','1065480crFqrw','18aCQlnH','110qkokpP','1279185eMSDBa','1033308VAPsnw','NapCat未能正常启动，请检查日志查看错误','getGroups','1277927eUBmVY','length','set','iqHLH','70728RoSdEy','78598xzbXIW','scilL','5eqyiDB','groupCode','109439NXKjmJ'];_0x4934=function(){return _0x18a6ef;};return _0x4934();}import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x4c3d01){const _0x4480a7=_0x544d;groups[_0x4480a7(0x14a)](_0x4c3d01),groupMembers['delete'](_0x4c3d01);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x2d6aac(0x13b)};export async function getFriend(_0x25fc47){const _0x269cb6=_0x2d6aac,_0x29d265={'iqHLH':function(_0x51e01b,_0x4427c0){return _0x51e01b(_0x4427c0);}};_0x25fc47=_0x25fc47[_0x269cb6(0x147)]();if(_0x29d265[_0x269cb6(0x140)](isNumeric,_0x25fc47)){const _0xdfb45c=Array[_0x269cb6(0x130)](friends[_0x269cb6(0x133)]());return _0xdfb45c['find'](_0x4ce639=>_0x4ce639[_0x269cb6(0x134)]===_0x25fc47);}else return friends[_0x269cb6(0x135)](_0x25fc47);}export async function getGroup(_0x588c2c){const _0x479346=_0x2d6aac;let _0x51326f=groups[_0x479346(0x135)](_0x588c2c[_0x479346(0x147)]());if(!_0x51326f)try{const _0x2bbc81=await NTQQGroupApi[_0x479346(0x13c)]();_0x2bbc81[_0x479346(0x13e)]&&_0x2bbc81['forEach'](_0x369ea7=>{const _0x25eec5=_0x479346;groups[_0x25eec5(0x13f)](_0x369ea7[_0x25eec5(0x145)],_0x369ea7);});}catch(_0x291bf1){return undefined;}return _0x51326f=groups[_0x479346(0x135)](_0x588c2c[_0x479346(0x147)]()),_0x51326f;}export async function getGroupMember(_0x30533d,_0x15644f){const _0x552be2=_0x2d6aac,_0x5d3591={'rTamj':function(_0x58d0fa,_0x27f871){return _0x58d0fa(_0x27f871);},'scilL':function(_0x2fba63){return _0x2fba63();}};_0x30533d=_0x30533d[_0x552be2(0x147)](),_0x15644f=_0x15644f[_0x552be2(0x147)]();let _0x5289cc=groupMembers[_0x552be2(0x135)](_0x30533d);if(!_0x5289cc)try{_0x5289cc=await NTQQGroupApi[_0x552be2(0x149)](_0x30533d),groupMembers[_0x552be2(0x13f)](_0x30533d,_0x5289cc);}catch(_0x50cc8a){return null;}const _0x43aa11=()=>{const _0x199bc7=_0x552be2;let _0x5c8a6c=undefined;return _0x5d3591[_0x199bc7(0x14b)](isNumeric,_0x15644f)?_0x5c8a6c=Array['from'](_0x5289cc[_0x199bc7(0x133)]())[_0x199bc7(0x132)](_0x302a23=>_0x302a23[_0x199bc7(0x134)]===_0x15644f):_0x5c8a6c=_0x5289cc['get'](_0x15644f),_0x5c8a6c;};let _0x25d10e=_0x5d3591['scilL'](_0x43aa11);return!_0x25d10e&&(_0x5289cc=await NTQQGroupApi[_0x552be2(0x149)](_0x30533d),_0x25d10e=_0x5d3591[_0x552be2(0x143)](_0x43aa11)),_0x25d10e;}export const uid2UinMap={};export function getUidByUin(_0x77d83f){for(const _0x4737ff in uid2UinMap){if(uid2UinMap[_0x4737ff]===_0x77d83f)return _0x4737ff;}}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(_0x3e0b7e,_0x147a30){const _0x3f5dd4=_0x4e96,_0x22dca3=_0x3e0b7e();while(!![]){try{const _0x23e17c=-parseInt(_0x3f5dd4(0x1a7))/0x1*(parseInt(_0x3f5dd4(0x1a0))/0x2)+parseInt(_0x3f5dd4(0x1a8))/0x3+parseInt(_0x3f5dd4(0x19b))/0x4*(-parseInt(_0x3f5dd4(0x199))/0x5)+parseInt(_0x3f5dd4(0x1a9))/0x6+parseInt(_0x3f5dd4(0x19a))/0x7*(parseInt(_0x3f5dd4(0x197))/0x8)+parseInt(_0x3f5dd4(0x19f))/0x9*(parseInt(_0x3f5dd4(0x1a2))/0xa)+-parseInt(_0x3f5dd4(0x1aa))/0xb;if(_0x23e17c===_0x147a30)break;else _0x22dca3['push'](_0x22dca3['shift']());}catch(_0x34d35c){_0x22dca3['push'](_0x22dca3['shift']());}}}(_0x4bf2,0x951c7));import{isNumeric}from'@/common/utils/helper';function _0x4e96(_0x140ff5,_0xe359ed){const _0x4bf22f=_0x4bf2();return _0x4e96=function(_0x4e968a,_0x274234){_0x4e968a=_0x4e968a-0x197;let _0x3d658b=_0x4bf22f[_0x4e968a];return _0x3d658b;},_0x4e96(_0x140ff5,_0xe359ed);}import{NTQQGroupApi}from'@/core/apis';export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x2c04ce){const _0x140060=_0x4e96;groups[_0x140060(0x1a1)](_0x2c04ce),groupMembers[_0x140060(0x1a1)](_0x2c04ce);}export const groupMembers=new Map();function _0x4bf2(){const _0xf07b45=['21nBOWUl','1498996tmQMqK','toString','ccfbU','get','45xgBokf','34UjwHyK','delete','2110510tPiPNL','values','find','set','BcVWg','61117rSrtOX','486258UByiuQ','4780368EgDcvn','849849ZPBWQI','WjJwz','getGroupMembers','233832vXqPzR','forEach','5PwpqyF'];_0x4bf2=function(){return _0xf07b45;};return _0x4bf2();}export const friends=new Map();export const rawFriends=[];export const groupNotifies={};export async function getGroup(_0x42ff07){const _0x1bd3a0=_0x4e96;let _0x34ef8a=groups[_0x1bd3a0(0x19e)](_0x42ff07[_0x1bd3a0(0x19c)]());if(!_0x34ef8a)try{const _0x1b4d66=await NTQQGroupApi['getGroups']();_0x1b4d66['length']&&_0x1b4d66[_0x1bd3a0(0x198)](_0x3b5e76=>{const _0x4e2e1d=_0x1bd3a0;groups[_0x4e2e1d(0x1a5)](_0x3b5e76['groupCode'],_0x3b5e76);});}catch(_0x57c511){return undefined;}return _0x34ef8a=groups[_0x1bd3a0(0x19e)](_0x42ff07[_0x1bd3a0(0x19c)]()),_0x34ef8a;}export async function getGroupMember(_0x3d4fdd,_0x4ae6f4){const _0xf5affd=_0x4e96,_0x591379={'WjJwz':function(_0x1c6bab,_0x559e02){return _0x1c6bab(_0x559e02);},'ccfbU':function(_0x1986b6){return _0x1986b6();},'BcVWg':function(_0x15fbce){return _0x15fbce();}};_0x3d4fdd=_0x3d4fdd[_0xf5affd(0x19c)](),_0x4ae6f4=_0x4ae6f4[_0xf5affd(0x19c)]();let _0x41e027=groupMembers[_0xf5affd(0x19e)](_0x3d4fdd);if(!_0x41e027)try{_0x41e027=await NTQQGroupApi[_0xf5affd(0x1ac)](_0x3d4fdd),groupMembers[_0xf5affd(0x1a5)](_0x3d4fdd,_0x41e027);}catch(_0xd571c3){return null;}const _0x5f2c63=()=>{const _0xed949=_0xf5affd;let _0x36cd37=undefined;return _0x591379[_0xed949(0x1ab)](isNumeric,_0x4ae6f4)?_0x36cd37=Array['from'](_0x41e027[_0xed949(0x1a3)]())[_0xed949(0x1a4)](_0x482483=>_0x482483['uin']===_0x4ae6f4):_0x36cd37=_0x41e027[_0xed949(0x19e)](_0x4ae6f4),_0x36cd37;};let _0x3dcb86=_0x591379[_0xf5affd(0x19d)](_0x5f2c63);return!_0x3dcb86&&(_0x41e027=await NTQQGroupApi[_0xf5affd(0x1ac)](_0x3d4fdd),_0x3dcb86=_0x591379[_0xf5affd(0x1a6)](_0x5f2c63)),_0x3dcb86;}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 _0xba8a(){var _0x20f693=['7367244mXEVxV','4710cJocPO','uTDng','357897gXIOzN','4DDPQoN','871416IKcyZF','DOCUMENT','muxkU','AjKNb','94zTtmrt','9oNhhrj','742248TVQvrv','1|2|0|3|4','OTHER','VIDEO','AUDIO','914dGorUb','33KQwYZR','DKZTo','VlfAT','1060dUzuDA','958090ChPUsh'];_0xba8a=function(){return _0x20f693;};return _0xba8a();}(function(_0x55a1e8,_0x169950){var _0x139f96=_0x14e1,_0x295222=_0x55a1e8();while(!![]){try{var _0x357c52=parseInt(_0x139f96(0x1bf))/0x1*(parseInt(_0x139f96(0x1c6))/0x2)+-parseInt(_0x139f96(0x1b9))/0x3*(parseInt(_0x139f96(0x1ba))/0x4)+parseInt(_0x139f96(0x1ca))/0x5*(parseInt(_0x139f96(0x1b7))/0x6)+-parseInt(_0x139f96(0x1bb))/0x7+parseInt(_0x139f96(0x1c1))/0x8*(-parseInt(_0x139f96(0x1c0))/0x9)+-parseInt(_0x139f96(0x1cb))/0xa*(parseInt(_0x139f96(0x1c7))/0xb)+parseInt(_0x139f96(0x1cc))/0xc;if(_0x357c52===_0x169950)break;else _0x295222['push'](_0x295222['shift']());}catch(_0x18d025){_0x295222['push'](_0x295222['shift']());}}}(_0xba8a,0x30a98));;export var CacheFileType;function _0x14e1(_0x2c5c7c,_0xbc69bc){var _0xba8a78=_0xba8a();return _0x14e1=function(_0x14e121,_0xa17195){_0x14e121=_0x14e121-0x1b7;var _0x30c7ee=_0xba8a78[_0x14e121];return _0x30c7ee;},_0x14e1(_0x2c5c7c,_0xbc69bc);}(function(_0x35259c){var _0x3fe19d=_0x14e1,_0x22c8e7={'DKZTo':_0x3fe19d(0x1c2),'uTDng':_0x3fe19d(0x1c5),'AjKNb':'IMAGE','VlfAT':_0x3fe19d(0x1c4),'muxkU':'DOCUMENT','ntTyr':_0x3fe19d(0x1c3)},_0x156e60=_0x22c8e7[_0x3fe19d(0x1c8)]['split']('|'),_0x20b97a=0x0;while(!![]){switch(_0x156e60[_0x20b97a++]){case'0':_0x35259c[_0x35259c[_0x22c8e7[_0x3fe19d(0x1b8)]]=0x2]=_0x22c8e7[_0x3fe19d(0x1b8)];continue;case'1':_0x35259c[_0x35259c[_0x22c8e7['AjKNb']]=0x0]=_0x22c8e7[_0x3fe19d(0x1be)];continue;case'2':_0x35259c[_0x35259c[_0x22c8e7[_0x3fe19d(0x1c9)]]=0x1]=_0x22c8e7['VlfAT'];continue;case'3':_0x35259c[_0x35259c[_0x3fe19d(0x1bc)]=0x3]=_0x22c8e7[_0x3fe19d(0x1bd)];continue;case'4':_0x35259c[_0x35259c[_0x22c8e7['ntTyr']]=0x4]=_0x3fe19d(0x1c3);continue;}break;}}(CacheFileType||(CacheFileType={})));
+(function(_0x3a2cfb,_0x21dd1a){var _0x10dcc6=_0xa239,_0x5d1828=_0x3a2cfb();while(!![]){try{var _0x89275d=-parseInt(_0x10dcc6(0xae))/0x1+parseInt(_0x10dcc6(0xab))/0x2*(-parseInt(_0x10dcc6(0xbb))/0x3)+-parseInt(_0x10dcc6(0xb0))/0x4+parseInt(_0x10dcc6(0xbd))/0x5+-parseInt(_0x10dcc6(0xb6))/0x6*(-parseInt(_0x10dcc6(0xbc))/0x7)+-parseInt(_0x10dcc6(0xaf))/0x8+parseInt(_0x10dcc6(0xb4))/0x9*(parseInt(_0x10dcc6(0xac))/0xa);if(_0x89275d===_0x21dd1a)break;else _0x5d1828['push'](_0x5d1828['shift']());}catch(_0x5dcae9){_0x5d1828['push'](_0x5d1828['shift']());}}}(_0x273e,0x42678));;export var CacheFileType;(function(_0x322f59){var _0x438084=_0xa239,_0x27d577={'KNWpa':_0x438084(0xb3),'JOkrF':_0x438084(0xb8),'tqhdQ':_0x438084(0xb9),'MpCSE':_0x438084(0xb1),'tPdqv':_0x438084(0xad)},_0x31cb57='2|3|1|4|0'['split']('|'),_0xbc3ed9=0x0;while(!![]){switch(_0x31cb57[_0xbc3ed9++]){case'0':_0x322f59[_0x322f59['OTHER']=0x4]=_0x27d577['KNWpa'];continue;case'1':_0x322f59[_0x322f59[_0x27d577[_0x438084(0xba)]]=0x2]=_0x27d577[_0x438084(0xba)];continue;case'2':_0x322f59[_0x322f59[_0x27d577[_0x438084(0xb2)]]=0x0]=_0x27d577['tqhdQ'];continue;case'3':_0x322f59[_0x322f59[_0x27d577[_0x438084(0xb7)]]=0x1]=_0x438084(0xb1);continue;case'4':_0x322f59[_0x322f59[_0x27d577[_0x438084(0xb5)]]=0x3]=_0x27d577[_0x438084(0xb5)];continue;}break;}}(CacheFileType||(CacheFileType={})));function _0xa239(_0x435a9a,_0x4a5957){var _0x273ed5=_0x273e();return _0xa239=function(_0xa23963,_0x4dc6ec){_0xa23963=_0xa23963-0xab;var _0x3b1c05=_0x273ed5[_0xa23963];return _0x3b1c05;},_0xa239(_0x435a9a,_0x4a5957);}function _0x273e(){var _0x4c0228=['DOCUMENT','432014mUOnzQ','99288RSmDdt','841916Zrskrw','VIDEO','tqhdQ','OTHER','1704465YfjskY','tPdqv','4656ROsKpT','MpCSE','AUDIO','IMAGE','JOkrF','429585kITsfQ','4102QFTtOH','5050jFraSg','4FaIOqb','40OnWvvC'];_0x273e=function(){return _0x4c0228;};return _0x273e();}

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;
@@ -14,4 +14,5 @@ export declare class SendMsgElementConstructor {
     static rps(resultId: number | null): SendFaceElement;
     static ark(data: any): SendArkElement;
     static markdown(content: string): SendMarkdownElement;
+    static miniapp(): Promise<SendArkElement>;
 }