Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

fix: 整理日志、添加颜色、使用统一的日志函数以提高日志可读性

.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/release.yml

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

@@ -1,11 +1,11 @@
-# Logs
-
 # Develop
 node_modules/
 package-lock.json
+pnpm-lock.yaml
 out/
 dist/
-src/core.lib/common/
+/src/core.lib/common/
+/localdebug/
 
 # Editor
 .vscode/*

CHANGELOG.md

@@ -1,28 +0,0 @@
-# v1.2.0
-
-QQ Version: Windows 9.9.9-23361 / Linux 3.2.7-23361
-
-## 修复与优化
-
-* 修复图片URL,支持 Win/Linux X64 获取Rkey，暂时不支持arm64
-* 适配最新版 Windows 9.9.9-23361 / Linux 3.2.7-23361 提升了兼容性 - 修复 SYS: Listener Proxy
-* 修复群成员加入时间 上次活跃 活跃等级字段 - 影响 API: /get_group_member_info /get_group_member_list
-* 修复视频所需的 ffmpeg 路径不正确导致视频封面和时长获取失败 - 影响 Event/API
-* 优化数据库对消息储存，消耗储存减少 - 影响 Sys: OneBot
-* 修复他人管理员被撤销时没有上报
-
-## 新增与调整
-* 支持商城表情发送和上报 url
-* 支持获取群公告 - 新增 API： /_get_group_notice
-* 支持了设置已读群/私聊消息接口 - 新增 API: /mark_private_msg_as_read /mark_group_msg_as_read
-* 支持了好友添加上报事件 - 新增 Event: AddFriend
-* 支持wsHost和httpHost配置
-* 支持获取官方Bot账号范围 - 新增 API: /get_robot_uin_range
-* 支持设置自身在线状态 - 新增 API： /set_online_status
-* 支持表情回应api和上报 - 新增 Event/API
-* 支持获取Cookies 实现更加稳定 且支持Skey缓存3600S Pskey每次刷新 - 新增 API: /get_cookies
-* 支持 服务端踢下线 / 其它设备上线 / 重复登录 / 自身在线状态变更 日志 - 新增 Sys: Log
-* 支持了消息统计 - API: /get_status
-* 支持单条消息转发 - API /forward_friend_single_msg、/forward_group_single_msg
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

README.md

@@ -26,9 +26,7 @@ NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
 
 ## 鸣谢名单
 
-[OpenShamrock]()
-
-[Lagrange]()
+[Lagrange](https://github.com/LagrangeDev/Lagrange.Core)
 
 <!-- 
 QQ群：545402644

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

package.json

@@ -1,64 +1,67 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "1.2.0",
-  "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",
-    "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.1",
+  "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",
+    "@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": "^9.0.1",
+    "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,6 +1,6 @@
 import { sleep } from '@/common/utils/helper';
-
-type AsyncQueueTask = (() => void) | Promise<void> ;
+import { logError } from './log';
+type AsyncQueueTask = (() => void) | (()=>Promise<void>);
 
 
 export class AsyncQueue {
@@ -8,23 +8,26 @@ export class AsyncQueue {
 
   public addTask(task: AsyncQueueTask) {
     this.tasks.push(task);
+    // console.log('addTask', this.tasks.length);
     if (this.tasks.length === 1) {
       this.runQueue().then().catch(()=>{});
     }
   }
 
   private async runQueue() {
+    // console.log('runQueue', this.tasks.length);
     while (this.tasks.length > 0) {
       const task = this.tasks[0];
+      // console.log('typeof task', typeof task);
       try {
-        if (task instanceof Promise) {
-          await task;
-        }
-        else{
-          task();
+        const taskRet = task();
+        // console.log('type of taskRet', typeof taskRet, taskRet);
+        if (taskRet instanceof Promise) {
+          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<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/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;
 
@@ -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);
+export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
 // platform_type: 3,
 // app_type: 4,
 // app_version: '9.9.9-23159',

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

src/common/utils/file.ts

@@ -3,8 +3,8 @@ import fsPromise 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';
@@ -125,7 +125,7 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
       }
     }
   }
-  const fetchRes = await fetch(url, headers);
+  const fetchRes = await fetch(url, { headers });
   if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
   const blob = await fetchRes.blob();
@@ -193,6 +193,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
           // res.ext = pathInfo.ext
         }
       }
+      fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
       res.fileName = fileName;
       filePath = path.join(getTempDir(), uuidv4() + fileName);
       fs.writeFileSync(filePath, buffer);
@@ -261,12 +262,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';
 
+
+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,142 @@ export function truncateString(obj: any, maxLength = 500) {
   }
   return obj;
 }
+
+
+
+/**
+ * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
+ * @param ttl 超时时间，单位毫秒
+ * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
+ * @returns 处理后缓存或调用原方法的结果
+ */
+export function cacheFunc(ttl: number, customKey: string = '') {
+  const cache = new Map<string, { expiry: number; value: any }>();
+
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
+    const originalMethod = descriptor.value;
+    const className = target.constructor.name;  // 获取类名
+    const methodName = propertyKey;             // 获取方法名
+    descriptor.value = async function (...args: any[]) {
+      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
+      const cached = cache.get(cacheKey);
+      if (cached && cached.expiry > Date.now()) {
+        return cached.value;
+      } else {
+        const result = await originalMethod.apply(this, args);
+        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
+        return result;
+      }
+    };
+
+    return descriptor;
+  };
+}
+export function isValidOldConfig(config: any) {
+  if (typeof config !== 'object') {
+    return false;
+  }
+  const requiredKeys = [
+    'httpHost', 'httpPort', 'httpPostUrls', 'httpSecret',
+    'wsHost', 'wsPort', 'wsReverseUrls', 'enableHttp',
+    'enableHttpHeart', 'enableHttpPost', 'enableWs', 'enableWsReverse',
+    'messagePostFormat', 'reportSelfMessage', 'enableLocalFile2Url',
+    'debug', 'heartInterval', 'token', 'musicSignUrl'
+  ];
+  for (const key of requiredKeys) {
+    if (!(key in config)) {
+      return false;
+    }
+  }
+  if (!Array.isArray(config.httpPostUrls) || !Array.isArray(config.wsReverseUrls)) {
+    return false;
+  }
+  if (config.httpPostUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (config.wsReverseUrls.some((url: any) => typeof url !== 'string')) {
+    return false;
+  }
+  if (typeof config.httpPort !== 'number' || typeof config.wsPort !== 'number' || typeof config.heartInterval !== 'number') {
+    return false;
+  }
+  if (
+    typeof config.enableHttp !== 'boolean' ||
+    typeof config.enableHttpHeart !== 'boolean' ||
+    typeof config.enableHttpPost !== 'boolean' ||
+    typeof config.enableWs !== 'boolean' ||
+    typeof config.enableWsReverse !== 'boolean' ||
+    typeof config.enableLocalFile2Url !== 'boolean' ||
+    typeof config.reportSelfMessage !== 'boolean'
+  ) {
+    return false;
+  }
+  if (config.messagePostFormat !== 'array' && config.messagePostFormat !== 'string') {
+    return false;
+  }
+  return true;
+}
+export function migrateConfig(oldConfig: any) {
+  const newConfig = {
+    http: {
+      enable: oldConfig.enableHttp,
+      host: oldConfig.httpHost,
+      port: oldConfig.httpPort,
+      secret: oldConfig.httpSecret,
+      enableHeart: oldConfig.enableHttpHeart,
+      enablePost: oldConfig.enableHttpPost,
+      postUrls: oldConfig.httpPostUrls,
+    },
+    ws: {
+      enable: oldConfig.enableWs,
+      host: oldConfig.wsHost,
+      port: oldConfig.wsPort,
+    },
+    reverseWs: {
+      enable: oldConfig.enableWsReverse,
+      urls: oldConfig.wsReverseUrls,
+    },
+    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;
+}

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`;
@@ -35,14 +42,14 @@ const logConfig: Configuration = {
       maxLoogSize: 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

@@ -0,0 +1,44 @@
+import { resolve } from 'node:path';
+import { spawn } from 'node:child_process';
+import { pid, ppid, exit } from 'node:process';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export async function rebootWithQuickLogin(uin: string) {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    //还没兼容
+    subProcess.unref();
+    exit(0);
+  }
+  //exit(0);
+}
+export async function rebootWithNormolLogin() {
+  const batScript = resolve(__dirname, './napcat.bat');
+  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
+  const bashScript = resolve(__dirname, './napcat.sh');
+  if (process.platform === 'win32') {
+    const subProcess = spawn(`start ${batUtf8Script} `, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
+    subProcess.unref();
+    // 子父进程一起送走 有点效果
+    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
+  } else if (process.platform === 'linux') {
+    const subProcess = spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
+    subProcess.unref();
+    exit(0);
+  }
+}

src/common/utils/request.ts

@@ -1,57 +1,106 @@
-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';
+
+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: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+    const option = new URL(url);
+    const protocol = url.startsWith('https://') ? https : http;
+    const options = {
+      hostname: option.hostname,
+      port: option.port,
+      path: option.href,
+      method: method,
+      headers: headers
+    };
+    return new Promise((resolve, reject) => {
+      const req = protocol.request(options, (res: any) => {
+        let responseBody = '';
+        res.on('data', (chunk: string | Buffer) => {
+          responseBody += chunk.toString();
+        });
+
+        res.on('end', () => {
+          try {
+            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+              if (isJsonRet) {
+                const responseJson = JSON.parse(responseBody);
+                resolve(responseJson as T);
+              } else {
+                resolve(responseBody as T);
+              }
+            } else {
+              reject(new Error(`Unexpected status code: ${res.statusCode}`));
+            }
+          } catch (parseError) {
+            reject(parseError);
           }
-        } 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: Record<string, string> = {}) {
+    return this.HttpGetJson<string>(url, method, data, headers, false, false);
+  }
 }

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.2.0',
-      '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 @@
-var _0x19cca1=_0x3b67;function _0x3b67(_0x4e2d62,_0x2b703c){var _0x43da95=_0x43da();return _0x3b67=function(_0x3b6794,_0x5e2486){_0x3b6794=_0x3b6794-0x186;var _0x30a87a=_0x43da95[_0x3b6794];return _0x30a87a;},_0x3b67(_0x4e2d62,_0x2b703c);}function _0x43da(){var _0x485bdb=['onMSFSsoError','2718873aSehtg','46326dbXYaL','13KNQOpC','getGroupCode','500FKyOoW','2825766sIjvqf','2443SNCuSJ','onMSFStatusChange','5149530LDXDOT','28430WpXmXq','6928nFtyJZ','25344720iHJUOk'];_0x43da=function(){return _0x485bdb;};return _0x43da();}(function(_0x503e40,_0x4b232d){var _0x5cda5a=_0x3b67,_0xa74c3b=_0x503e40();while(!![]){try{var _0x3b6569=-parseInt(_0x5cda5a(0x192))/0x1*(-parseInt(_0x5cda5a(0x191))/0x2)+-parseInt(_0x5cda5a(0x190))/0x3+parseInt(_0x5cda5a(0x187))/0x4*(-parseInt(_0x5cda5a(0x18c))/0x5)+-parseInt(_0x5cda5a(0x188))/0x6+parseInt(_0x5cda5a(0x189))/0x7*(parseInt(_0x5cda5a(0x18d))/0x8)+-parseInt(_0x5cda5a(0x18b))/0x9+parseInt(_0x5cda5a(0x18e))/0xa;if(_0x3b6569===_0x4b232d)break;else _0xa74c3b['push'](_0xa74c3b['shift']());}catch(_0x55844b){_0xa74c3b['push'](_0xa74c3b['shift']());}}}(_0x43da,0x749d5));export class DependsAdapter{[_0x19cca1(0x18a)](_0x1d14d4,_0x4f88a6){}[_0x19cca1(0x18f)](_0x156ded){}[_0x19cca1(0x186)](_0x4766d7){}}
+var _0x3f82b3=_0x22dd;function _0x22dd(_0x57fb9f,_0x29c8f7){var _0x27d81f=_0x27d8();return _0x22dd=function(_0x22dd9a,_0x236d49){_0x22dd9a=_0x22dd9a-0xb1;var _0x688351=_0x27d81f[_0x22dd9a];return _0x688351;},_0x22dd(_0x57fb9f,_0x29c8f7);}(function(_0x721ecc,_0x256ba3){var _0x22350d=_0x22dd,_0x1120eb=_0x721ecc();while(!![]){try{var _0x17283f=parseInt(_0x22350d(0xb3))/0x1+-parseInt(_0x22350d(0xb9))/0x2+-parseInt(_0x22350d(0xb4))/0x3+-parseInt(_0x22350d(0xba))/0x4*(-parseInt(_0x22350d(0xb6))/0x5)+parseInt(_0x22350d(0xb8))/0x6*(parseInt(_0x22350d(0xb5))/0x7)+-parseInt(_0x22350d(0xb7))/0x8+parseInt(_0x22350d(0xb2))/0x9;if(_0x17283f===_0x256ba3)break;else _0x1120eb['push'](_0x1120eb['shift']());}catch(_0x37aa46){_0x1120eb['push'](_0x1120eb['shift']());}}}(_0x27d8,0xabd2e));function _0x27d8(){var _0x4731f0=['302115EVHqky','49SrRYMd','325rbNSYW','4494344GRWKRp','1001514hnIbbs','1467374CEWAdQ','1048BsLaKG','getGroupCode','7466850IUbYlJ','84862ALbAcM'];_0x27d8=function(){return _0x4731f0;};return _0x27d8();}export class DependsAdapter{['onMSFStatusChange'](_0x3b272e,_0x12a362){}['onMSFSsoError'](_0x37047d){}[_0x3f82b3(0xb1)](_0x263af0){}}

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

@@ -1 +1 @@
-function _0x5373(_0x2b9ce7,_0xffbb7d){var _0x2366ad=_0x2366();return _0x5373=function(_0x537331,_0x559829){_0x537331=_0x537331-0xd4;var _0x1f83da=_0x2366ad[_0x537331];return _0x1f83da;},_0x5373(_0x2b9ce7,_0xffbb7d);}var _0x278f04=_0x5373;(function(_0x367efd,_0x3f1bf7){var _0x384670=_0x5373,_0x565677=_0x367efd();while(!![]){try{var _0x26beb0=-parseInt(_0x384670(0xdf))/0x1*(parseInt(_0x384670(0xe1))/0x2)+parseInt(_0x384670(0xd5))/0x3*(parseInt(_0x384670(0xdd))/0x4)+-parseInt(_0x384670(0xda))/0x5*(parseInt(_0x384670(0xe0))/0x6)+-parseInt(_0x384670(0xd7))/0x7+-parseInt(_0x384670(0xdb))/0x8*(parseInt(_0x384670(0xde))/0x9)+-parseInt(_0x384670(0xd6))/0xa*(-parseInt(_0x384670(0xd4))/0xb)+parseInt(_0x384670(0xd9))/0xc;if(_0x26beb0===_0x3f1bf7)break;else _0x565677['push'](_0x565677['shift']());}catch(_0x4de050){_0x565677['push'](_0x565677['shift']());}}}(_0x2366,0x57694));export class DispatcherAdapter{[_0x278f04(0xd8)](_0x2a639c){}[_0x278f04(0xdc)](_0x3df573){}['dispatchCallWithJson'](_0x6e6a4c){}}function _0x2366(){var _0xc6638c=['1898568MMlxTI','dispatchCall','1799812jXdYXo','27pZjsRH','6007PSOqrs','625128YiqIDj','6meDdBF','362461TnDcTN','3EkkoSG','70NqnjQm','663054oxnAYm','dispatchRequest','13527120ltVhkv','30ruWnzX'];_0x2366=function(){return _0xc6638c;};return _0x2366();}
+var _0x4c2a17=_0x185b;(function(_0x3a242d,_0x321c4b){var _0xa97144=_0x185b,_0x435d20=_0x3a242d();while(!![]){try{var _0x453a9a=parseInt(_0xa97144(0x19a))/0x1+parseInt(_0xa97144(0x1a4))/0x2+-parseInt(_0xa97144(0x19f))/0x3+-parseInt(_0xa97144(0x19e))/0x4+-parseInt(_0xa97144(0x1a1))/0x5*(-parseInt(_0xa97144(0x1a2))/0x6)+-parseInt(_0xa97144(0x1a3))/0x7+parseInt(_0xa97144(0x1a0))/0x8*(parseInt(_0xa97144(0x19d))/0x9);if(_0x453a9a===_0x321c4b)break;else _0x435d20['push'](_0x435d20['shift']());}catch(_0xb294d1){_0x435d20['push'](_0x435d20['shift']());}}}(_0x5701,0x2b8dd));export class DispatcherAdapter{['dispatchRequest'](_0x4860de){}[_0x4c2a17(0x19c)](_0x3bc209){}[_0x4c2a17(0x19b)](_0x2837ab){}}function _0x185b(_0x742677,_0x5c30a9){var _0x5701d8=_0x5701();return _0x185b=function(_0x185bb3,_0x427dd5){_0x185bb3=_0x185bb3-0x19a;var _0x4c71bf=_0x5701d8[_0x185bb3];return _0x4c71bf;},_0x185b(_0x742677,_0x5c30a9);}function _0x5701(){var _0xe65c8f=['10zFJgtE','666654FEXrQO','1613570uMuAkM','27436mLgyFg','170753HkFFqH','dispatchCallWithJson','dispatchCall','171378JbeOfg','212092JBbkyw','576915UWobAl','104ynzZuI'];_0x5701=function(){return _0xe65c8f;};return _0x5701();}

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

@@ -1 +1 @@
-var _0x507796=_0x4dd4;(function(_0x5d8a39,_0x2e8960){var _0x151ed0=_0x4dd4,_0x5c0894=_0x5d8a39();while(!![]){try{var _0x412819=-parseInt(_0x151ed0(0x9a))/0x1+-parseInt(_0x151ed0(0x99))/0x2+parseInt(_0x151ed0(0x9c))/0x3*(parseInt(_0x151ed0(0xa4))/0x4)+-parseInt(_0x151ed0(0x9f))/0x5+-parseInt(_0x151ed0(0xa2))/0x6*(parseInt(_0x151ed0(0xa0))/0x7)+-parseInt(_0x151ed0(0x9d))/0x8*(-parseInt(_0x151ed0(0x9b))/0x9)+parseInt(_0x151ed0(0xa3))/0xa;if(_0x412819===_0x2e8960)break;else _0x5c0894['push'](_0x5c0894['shift']());}catch(_0x1543ea){_0x5c0894['push'](_0x5c0894['shift']());}}}(_0x1fbf,0x7ea3f));function _0x4dd4(_0x5acf60,_0x5e2498){var _0x1fbfa9=_0x1fbf();return _0x4dd4=function(_0x4dd4ed,_0x493fef){_0x4dd4ed=_0x4dd4ed-0x98;var _0xe69a6f=_0x1fbfa9[_0x4dd4ed];return _0xe69a6f;},_0x4dd4(_0x5acf60,_0x5e2498);}function _0x1fbf(){var _0x46492c=['726755BvXnhR','21eovJev','fixPicImgType','946908fciiBt','10083230HbWaVK','8wfvDYM','onGetOfflineMsg','onShowErrUITips','getAppSetting','1566992IQpUwL','299110syqAMD','27NHBruA','1243551NyRWug','1020728hSDVQy','onInstallFinished'];_0x1fbf=function(){return _0x46492c;};return _0x1fbf();}export class GlobalAdapter{['onLog'](..._0x5dfe5f){}['onGetSrvCalTime'](..._0x42ea71){}[_0x507796(0xa6)](..._0x1e2771){}[_0x507796(0xa1)](..._0x43eacc){}[_0x507796(0x98)](..._0x4fad89){}[_0x507796(0x9e)](..._0x3d6570){}['onUpdateGeneralFlag'](..._0x233bc3){}[_0x507796(0xa5)](..._0x13035d){}}
+function _0x275e(){var _0x3e20d6=['fixPicImgType','346456AgfTja','927216RGmngc','4605084HeUpRA','onGetOfflineMsg','370eNCBsi','546290deLSYq','1312143FFHPIJ','1127dRkIEP','68280WuUXyh','onInstallFinished','40zkWsrA'];_0x275e=function(){return _0x3e20d6;};return _0x275e();}function _0x16de(_0x38e95c,_0x4a1aa8){var _0x275e8c=_0x275e();return _0x16de=function(_0x16de29,_0x51ad25){_0x16de29=_0x16de29-0xb8;var _0x856b25=_0x275e8c[_0x16de29];return _0x856b25;},_0x16de(_0x38e95c,_0x4a1aa8);}var _0x2df007=_0x16de;(function(_0x39b367,_0x1f01be){var _0x5cacef=_0x16de,_0x59bc9e=_0x39b367();while(!![]){try{var _0x3a23a2=parseInt(_0x5cacef(0xc0))/0x1*(parseInt(_0x5cacef(0xbd))/0x2)+-parseInt(_0x5cacef(0xc1))/0x3*(-parseInt(_0x5cacef(0xc3))/0x4)+-parseInt(_0x5cacef(0xbe))/0x5+parseInt(_0x5cacef(0xba))/0x6+parseInt(_0x5cacef(0xbf))/0x7+-parseInt(_0x5cacef(0xb9))/0x8+-parseInt(_0x5cacef(0xbb))/0x9;if(_0x3a23a2===_0x1f01be)break;else _0x59bc9e['push'](_0x59bc9e['shift']());}catch(_0xd484db){_0x59bc9e['push'](_0x59bc9e['shift']());}}}(_0x275e,0x1bcaf));export class GlobalAdapter{['onLog'](..._0x390fcc){}['onGetSrvCalTime'](..._0xdcf846){}['onShowErrUITips'](..._0x5f5817){}[_0x2df007(0xb8)](..._0x2005e4){}['getAppSetting'](..._0x23ae95){}[_0x2df007(0xc2)](..._0x4b6ed8){}['onUpdateGeneralFlag'](..._0x21cc0e){}[_0x2df007(0xbc)](..._0x5dcff5){}}

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

@@ -1 +1 @@
-(function(_0x3ddc3c,_0x2196c4){var _0x19e16a=_0x18ea,_0x1b8482=_0x3ddc3c();while(!![]){try{var _0x4c96bb=-parseInt(_0x19e16a(0x1f5))/0x1*(parseInt(_0x19e16a(0x1f6))/0x2)+-parseInt(_0x19e16a(0x1fc))/0x3*(-parseInt(_0x19e16a(0x1f8))/0x4)+-parseInt(_0x19e16a(0x1fa))/0x5+-parseInt(_0x19e16a(0x1f3))/0x6*(-parseInt(_0x19e16a(0x1f9))/0x7)+-parseInt(_0x19e16a(0x1fb))/0x8*(parseInt(_0x19e16a(0x1f4))/0x9)+parseInt(_0x19e16a(0x1f7))/0xa+-parseInt(_0x19e16a(0x1f2))/0xb;if(_0x4c96bb===_0x2196c4)break;else _0x1b8482['push'](_0x1b8482['shift']());}catch(_0x5704d2){_0x1b8482['push'](_0x1b8482['shift']());}}}(_0x50c1,0x5914c));function _0x18ea(_0x59a999,_0xa62c8b){var _0x50c133=_0x50c1();return _0x18ea=function(_0x18eaf4,_0x5b2dd8){_0x18eaf4=_0x18eaf4-0x1f2;var _0xdb4126=_0x50c133[_0x18eaf4];return _0xdb4126;},_0x18ea(_0x59a999,_0xa62c8b);}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';function _0x50c1(){var _0x25f92a=['244svyoWI','18956RxJdBu','866245nHgMjv','40RonzIC','3126noqWuq','408672rSzKzb','864zoStvL','104022dAaYDi','260044qjwCVq','2UiMGjy','4395970MYGRWb'];_0x50c1=function(){return _0x25f92a;};return _0x50c1();}
+(function(_0x4453b5,_0x26728a){var _0x2e552d=_0x1eba,_0x32fa15=_0x4453b5();while(!![]){try{var _0x36a0ad=-parseInt(_0x2e552d(0x87))/0x1*(-parseInt(_0x2e552d(0x7e))/0x2)+parseInt(_0x2e552d(0x89))/0x3*(-parseInt(_0x2e552d(0x82))/0x4)+-parseInt(_0x2e552d(0x86))/0x5+-parseInt(_0x2e552d(0x7f))/0x6*(-parseInt(_0x2e552d(0x80))/0x7)+parseInt(_0x2e552d(0x83))/0x8*(-parseInt(_0x2e552d(0x88))/0x9)+-parseInt(_0x2e552d(0x7d))/0xa*(parseInt(_0x2e552d(0x81))/0xb)+parseInt(_0x2e552d(0x85))/0xc*(parseInt(_0x2e552d(0x84))/0xd);if(_0x36a0ad===_0x26728a)break;else _0x32fa15['push'](_0x32fa15['shift']());}catch(_0x598cda){_0x32fa15['push'](_0x32fa15['shift']());}}}(_0x20f1,0x4be00));function _0x1eba(_0x2b8e1f,_0x5d4a06){var _0x20f1dd=_0x20f1();return _0x1eba=function(_0x1ebac2,_0x2256f3){_0x1ebac2=_0x1ebac2-0x7d;var _0x5c98cb=_0x20f1dd[_0x1ebac2];return _0x5c98cb;},_0x1eba(_0x2b8e1f,_0x5d4a06);}export*from'./NodeIDependsAdapter';export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';function _0x20f1(){var _0xbac62b=['3Fuvswm','24530YHpReu','238rfHdAz','358374DkVMsw','7XRtDSv','242MXbmjT','1641196IBLAVy','632936jNsZvb','2642757LfPMze','72xUPMnc','2336610LBWyAt','1018oNZJdI','18jDPtKk'];_0x20f1=function(){return _0xbac62b;};return _0x20f1();}

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

@@ -1,4 +1,4 @@
-import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType, RawMessage } from '@/core/entities';
+import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
 import { GeneralCallResult } from '@/core';
 import * as fileType from 'file-type';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
@@ -15,7 +15,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.js

@@ -1 +1 @@
-const _0x327915=_0x564b;(function(_0x2e46de,_0x32429){const _0x25e762=_0x564b,_0x54d6c9=_0x2e46de();while(!![]){try{const _0x4d804f=parseInt(_0x25e762(0x141))/0x1+parseInt(_0x25e762(0x148))/0x2*(-parseInt(_0x25e762(0x12f))/0x3)+parseInt(_0x25e762(0x132))/0x4*(parseInt(_0x25e762(0x12d))/0x5)+parseInt(_0x25e762(0x136))/0x6+-parseInt(_0x25e762(0x142))/0x7+parseInt(_0x25e762(0x149))/0x8+parseInt(_0x25e762(0x138))/0x9;if(_0x4d804f===_0x32429)break;else _0x54d6c9['push'](_0x54d6c9['shift']());}catch(_0x3a2885){_0x54d6c9['push'](_0x54d6c9['shift']());}}}(_0x5b8c,0xeef4e));function _0x5b8c(){const _0x3261b2=['JpBwQ','friendUid','349292rZMGNe','reqTime','uid','Bltxv','3198366VaHWrP','rEjUL','4904334BJWSZt','getBuddyService','push','NSGct','approvalFriendRequest','addListener','uin','delete','onBuddyListChange','1782105sxSTUD','8412243LcAaMR','getBuddyList','erKVn','开始获取好友列表','getFriends','获取好友列表超时','2197058AvBzFy','557280jXZTqm','ysELY','rbzhB','onLoginSuccess','then','buddyList','session','20UKwLKb','获取好友列表完成','3vYxReh'];_0x5b8c=function(){return _0x3261b2;};return _0x5b8c();}import{BuddyListener,napCatCore}from'@/core';function _0x564b(_0x347121,_0x4157c3){const _0x5b8ce7=_0x5b8c();return _0x564b=function(_0x564b28,_0x4847e6){_0x564b28=_0x564b28-0x128;let _0x35e1df=_0x5b8ce7[_0x564b28];return _0x35e1df;},_0x564b(_0x347121,_0x4157c3);}import{logDebug}from'@/common/utils/log';import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();buddyListener[_0x327915(0x140)]=_0x37416c=>{const _0x50bfe2=_0x327915,_0x529cf1={'EArLC':function(_0x3676f4,_0x2762b7){return _0x3676f4(_0x2762b7);}};for(const [_0x22967e,_0x11e636]of buddyChangeTasks){_0x529cf1['EArLC'](_0x11e636,_0x37416c),buddyChangeTasks[_0x50bfe2(0x13f)](_0x22967e);}},setTimeout(()=>{const _0xa7114d=_0x327915;napCatCore[_0xa7114d(0x129)](()=>{const _0x988e4=_0xa7114d;napCatCore[_0x988e4(0x13d)](buddyListener);});},0x64);export class NTQQFriendApi{static async[_0x327915(0x146)](_0x87cae5=![]){const _0x3d612f=_0x327915,_0x383a4a={'ysELY':function(_0x377aef,_0x630508){return _0x377aef(_0x630508);},'Bltxv':function(_0x302a07,_0x739814,_0x47d689){return _0x302a07(_0x739814,_0x47d689);},'erKVn':_0x3d612f(0x145),'NSGct':function(_0x9fad3f,_0x1428b9){return _0x9fad3f(_0x1428b9);},'rEjUL':_0x3d612f(0x147),'xkKTE':function(_0xfa4d95){return _0xfa4d95();}};return new Promise((_0xb5ffe5,_0x53cb63)=>{const _0xd25d1f=_0x3d612f,_0x4db5ff={'JpBwQ':function(_0x46165b,_0x23dcb3){const _0x17f1ef=_0x564b;return _0x383a4a[_0x17f1ef(0x13b)](_0x46165b,_0x23dcb3);},'rbzhB':_0x383a4a[_0xd25d1f(0x137)]};let _0x4e386c=![];_0x383a4a[_0xd25d1f(0x135)](setTimeout,()=>{const _0x25b6a5=_0xd25d1f;!_0x4e386c&&(_0x4db5ff[_0x25b6a5(0x130)](logDebug,_0x4db5ff[_0x25b6a5(0x128)]),_0x4db5ff['JpBwQ'](_0x53cb63,_0x4db5ff['rbzhB']));},0x1388);const _0x59b5fb=[],_0x4020d5=_0x1158ce=>{const _0x5d7db9=_0xd25d1f;for(const _0x2405ca of _0x1158ce){for(const _0x527fe3 of _0x2405ca[_0x5d7db9(0x12b)]){_0x59b5fb[_0x5d7db9(0x13a)](_0x527fe3),uid2UinMap[_0x527fe3[_0x5d7db9(0x134)]]=_0x527fe3[_0x5d7db9(0x13e)];}}_0x4e386c=!![],logDebug(_0x5d7db9(0x12e),_0x59b5fb),_0x383a4a[_0x5d7db9(0x14a)](_0xb5ffe5,_0x59b5fb);};buddyChangeTasks['set'](_0x383a4a['xkKTE'](randomUUID),_0x4020d5),napCatCore[_0xd25d1f(0x12c)][_0xd25d1f(0x139)]()[_0xd25d1f(0x143)](_0x87cae5)[_0xd25d1f(0x12a)](_0x248b5d=>{const _0x59fb5e=_0xd25d1f;_0x383a4a[_0x59fb5e(0x135)](logDebug,_0x383a4a[_0x59fb5e(0x144)],_0x248b5d);});});}static async['handleFriendRequest'](_0x1cf1f1,_0x5252ac){const _0x33a2ff=_0x327915;napCatCore[_0x33a2ff(0x12c)][_0x33a2ff(0x139)]()?.[_0x33a2ff(0x13c)]({'friendUid':_0x1cf1f1[_0x33a2ff(0x131)],'reqTime':_0x1cf1f1[_0x33a2ff(0x133)],'accept':_0x5252ac});}}
+const _0x27c185=_0x5a4c;function _0xeae3(){const _0x38369c=['3462lrkGcC','session','3312845FOGBuE','approvalFriendRequest','17669349pjbnjo','push','getFriends','532akEmam','3000662ArRTbp','buddyList','36VnpcwZ','reqTime','53956mLqVtB','uin','1943888WYaMyC','NodeIKernelBuddyListener/onBuddyListChange','10ESRPDm','CallNormalEvent','2947404WYeVmS','friendUid'];_0xeae3=function(){return _0x38369c;};return _0xeae3();}(function(_0x54f7bd,_0x1156fb){const _0x41a76c=_0x5a4c,_0x5e145=_0x54f7bd();while(!![]){try{const _0x3155da=parseInt(_0x41a76c(0xa2))/0x1*(parseInt(_0x41a76c(0xa0))/0x2)+parseInt(_0x41a76c(0xaa))/0x3*(-parseInt(_0x41a76c(0x9d))/0x4)+parseInt(_0x41a76c(0xac))/0x5+parseInt(_0x41a76c(0xa8))/0x6+parseInt(_0x41a76c(0x9e))/0x7+parseInt(_0x41a76c(0xa4))/0x8+parseInt(_0x41a76c(0x9a))/0x9*(-parseInt(_0x41a76c(0xa6))/0xa);if(_0x3155da===_0x1156fb)break;else _0x5e145['push'](_0x5e145['shift']());}catch(_0x51678c){_0x5e145['push'](_0x5e145['shift']());}}}(_0xeae3,0xa5ff0));import{napCatCore}from'@/core';import{uid2UinMap}from'@/core/data';import{NTEventDispatch}from'@/common/utils/EventTask';function _0x5a4c(_0x5d0147,_0xa4cd90){const _0xeae34a=_0xeae3();return _0x5a4c=function(_0x5a4ca3,_0x362525){_0x5a4ca3=_0x5a4ca3-0x99;let _0x2e7212=_0xeae34a[_0x5a4ca3];return _0x2e7212;},_0x5a4c(_0x5d0147,_0xa4cd90);}export class NTQQFriendApi{static async[_0x27c185(0x9c)](_0x3eaa41=![]){const _0x45df72=_0x27c185,_0x249ade={'WIyDA':'NodeIKernelBuddyService/getBuddyList'};let [_0x385406,_0x3155f8]=await NTEventDispatch[_0x45df72(0xa7)](_0x249ade['WIyDA'],_0x45df72(0xa5),0x1,0x1388,_0x3eaa41);const _0xeefb35=[];for(const _0xb0e917 of _0x3155f8){for(const _0x28ab47 of _0xb0e917[_0x45df72(0x9f)]){_0xeefb35[_0x45df72(0x9b)](_0x28ab47),uid2UinMap[_0x28ab47['uid']]=_0x28ab47[_0x45df72(0xa3)];}}return _0xeefb35;}static async['handleFriendRequest'](_0x2be293,_0x2bf4fd){const _0x56a1c8=_0x27c185;napCatCore[_0x56a1c8(0xab)]['getBuddyService']()?.[_0x56a1c8(0x99)]({'friendUid':_0x2be293[_0x56a1c8(0xa9)],'reqTime':_0x2be293[_0x56a1c8(0xa1)],'accept':_0x2bf4fd});}}

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

@@ -1,9 +1,42 @@
 import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
 export declare class NTQQGroupApi {
     static getGroups(forced?: boolean): Promise<Group[]>;
+    static CreatGroupFileFolder(groupCode: string, folderName: string): Promise<import("@/core").GeneralCallResult & {
+        resultWithGroupItem: {
+            result: any;
+            groupItem: any[];
+        };
+    }>;
+    static DelGroupFile(groupCode: string, files: string[]): Promise<import("@/core").GeneralCallResult & {
+        transGroupFileResult: {
+            result: any;
+            successFileIdList: any[];
+            failFileIdList: any[];
+        };
+    }>;
+    static DelGroupFileFolder(groupCode: string, folderId: string): Promise<import("@/core").GeneralCallResult & {
+        groupFileCommonResult: {
+            retCode: number;
+            retMsg: string;
+            clientWording: string;
+        };
+    }>;
+    static getSingleScreenNotifies(num: number): Promise<GroupNotify[]>;
     static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
     static getGroupNotifies(): Promise<void>;
+    static GetGroupFileCount(Gids: Array<string>): Promise<import("@/core").GeneralCallResult & {
+        groupCodes: string[];
+        groupFileCounts: number[];
+    }>;
     static getGroupIgnoreNotifies(): Promise<void>;
+    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<import("@/core").GeneralCallResult & {
+        errCode: number;
+        picInfo?: {
+            id: string;
+            width: number;
+            height: number;
+        } | undefined;
+    }>;
     static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void>;
     static quitGroup(groupQQ: string): Promise<void>;
     static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void>;
@@ -16,5 +49,9 @@ 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<import("@/core").GeneralCallResult>;
 }

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 _0xbc1b(_0x3e9440,_0x4dd314){var _0x328cfa=_0x328c();return _0xbc1b=function(_0xbc1b91,_0x21cbab){_0xbc1b91=_0xbc1b91-0x139;var _0x23d317=_0x328cfa[_0xbc1b91];return _0x23d317;},_0xbc1b(_0x3e9440,_0x4dd314);}(function(_0x2a9ad9,_0x105444){var _0x4df036=_0xbc1b,_0x4404de=_0x2a9ad9();while(!![]){try{var _0xd6ff50=-parseInt(_0x4df036(0x13a))/0x1*(parseInt(_0x4df036(0x13e))/0x2)+-parseInt(_0x4df036(0x142))/0x3*(-parseInt(_0x4df036(0x143))/0x4)+-parseInt(_0x4df036(0x13b))/0x5*(parseInt(_0x4df036(0x140))/0x6)+-parseInt(_0x4df036(0x13d))/0x7+parseInt(_0x4df036(0x13c))/0x8+parseInt(_0x4df036(0x13f))/0x9+parseInt(_0x4df036(0x141))/0xa*(parseInt(_0x4df036(0x139))/0xb);if(_0xd6ff50===_0x105444)break;else _0x4404de['push'](_0x4404de['shift']());}catch(_0x5225ed){_0x4404de['push'](_0x4404de['shift']());}}}(_0x328c,0xcd7fc));export*from'./file';function _0x328c(){var _0x5319a9=['722LahlVI','55GwkVRA','13245072IDasaX','10379320ajSNYf','2086ucOfUp','1829565losmEC','315870NhUrBy','20LjcJxA','152457babiKn','120kEUETL','1502248smLhhN'];_0x328c=function(){return _0x5319a9;};return _0x328c();}export*from'./friend';export*from'./group';export*from'./msg';export*from'./user';export*from'./webapi';
+(function(_0x20bc9f,_0x1a17d7){var _0xdb4180=_0x3f7b,_0xedd61f=_0x20bc9f();while(!![]){try{var _0x5c9507=parseInt(_0xdb4180(0x98))/0x1*(-parseInt(_0xdb4180(0x95))/0x2)+parseInt(_0xdb4180(0x9a))/0x3+parseInt(_0xdb4180(0x9b))/0x4*(parseInt(_0xdb4180(0x96))/0x5)+parseInt(_0xdb4180(0x99))/0x6+-parseInt(_0xdb4180(0x9c))/0x7+-parseInt(_0xdb4180(0x97))/0x8+parseInt(_0xdb4180(0x9d))/0x9;if(_0x5c9507===_0x1a17d7)break;else _0xedd61f['push'](_0xedd61f['shift']());}catch(_0x725596){_0xedd61f['push'](_0xedd61f['shift']());}}}(_0x41db,0x225c2));export*from'./file';function _0x3f7b(_0x351df5,_0x4a8f78){var _0x41db22=_0x41db();return _0x3f7b=function(_0x3f7bb4,_0x282761){_0x3f7bb4=_0x3f7bb4-0x95;var _0x1546dc=_0x41db22[_0x3f7bb4];return _0x1546dc;},_0x3f7b(_0x351df5,_0x4a8f78);}export*from'./friend';export*from'./group';export*from'./msg';export*from'./user';function _0x41db(){var _0x81c157=['8hExUeY','454200RhUAZn','498996tIfZPe','4BqjXpg','937223YWNcPO','1462995jgliWA','51438gQeQaD','1119105FbhabX','1184232Zuzdho'];_0x41db=function(){return _0x81c157;};return _0x41db();}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>;
@@ -14,6 +14,7 @@ export declare class NTQQMsgApi {
     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,14 @@ 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>;

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

@@ -1 +1 @@
-function _0x1371(){var _0x4793ef=['zKNvo','POST','ylWlE','stringify','eGSZb','音乐消息生成成功','3842573ClTNPl','789790VQiXFB','42HWpbgl','then','10594112XlxlcW','url','Ehaay','sign','KUOdv','450792VRcmRa','974330rJPbvV','HmDrc','catch','840192kopfJB','json','418401ubuxyj'];_0x1371=function(){return _0x4793ef;};return _0x1371();}var _0x23b3aa=_0x4d96;(function(_0x53b1e4,_0x349af7){var _0xb4b8ef=_0x4d96,_0x2e6a39=_0x53b1e4();while(!![]){try{var _0x96ce6=parseInt(_0xb4b8ef(0x18f))/0x1+parseInt(_0xb4b8ef(0x190))/0x2+-parseInt(_0xb4b8ef(0x195))/0x3+parseInt(_0xb4b8ef(0x193))/0x4+parseInt(_0xb4b8ef(0x187))/0x5*(-parseInt(_0xb4b8ef(0x188))/0x6)+-parseInt(_0xb4b8ef(0x186))/0x7+parseInt(_0xb4b8ef(0x18a))/0x8;if(_0x96ce6===_0x349af7)break;else _0x2e6a39['push'](_0x2e6a39['shift']());}catch(_0x75665f){_0x2e6a39['push'](_0x2e6a39['shift']());}}}(_0x1371,0xa590d));function _0x4d96(_0x3d1c2f,_0x5c7b66){var _0x137148=_0x1371();return _0x4d96=function(_0x4d9690,_0x1aac65){_0x4d9690=_0x4d9690-0x181;var _0xe5dfb0=_0x137148[_0x4d9690];return _0xe5dfb0;},_0x4d96(_0x3d1c2f,_0x5c7b66);}import{logDebug}from'@/common/utils/log';export class MusicSign{[_0x23b3aa(0x18b)];constructor(_0x53fa4b){this['url']=_0x53fa4b;}[_0x23b3aa(0x18d)](_0x43cb2a){var _0x185715=_0x23b3aa,_0x37a66b={'ylWlE':function(_0x52b843,_0x53d245){return _0x52b843(_0x53d245);},'ZMnTO':_0x185715(0x185),'eGSZb':function(_0x548de7,_0x2137eb){return _0x548de7(_0x2137eb);},'HmDrc':function(_0xdbdb5a,_0x36baf9,_0x2dac2d){return _0xdbdb5a(_0x36baf9,_0x2dac2d);},'KUOdv':'application/json'};return new Promise((_0xed5963,_0x4f4aff)=>{var _0x233bc5=_0x185715,_0x334c4c={'zKNvo':function(_0x2417cf,_0xc697f6,_0x27c27f){return _0x2417cf(_0xc697f6,_0x27c27f);},'VNabJ':_0x37a66b['ZMnTO'],'Ehaay':function(_0x37993f,_0x5255ca){var _0x4d6b29=_0x4d96;return _0x37a66b[_0x4d6b29(0x184)](_0x37993f,_0x5255ca);}};_0x37a66b[_0x233bc5(0x191)](fetch,this[_0x233bc5(0x18b)],{'method':_0x233bc5(0x181),'headers':{'Content-Type':_0x37a66b[_0x233bc5(0x18e)]},'body':JSON[_0x233bc5(0x183)](_0x43cb2a)})[_0x233bc5(0x189)](_0x678827=>{var _0xce56=_0x233bc5;return!_0x678827['ok']&&_0x37a66b[_0xce56(0x182)](_0x4f4aff,_0x678827['statusText']),_0x678827[_0xce56(0x194)]();})[_0x233bc5(0x189)](_0x2dead6=>{var _0x2c7c00=_0x233bc5;_0x334c4c[_0x2c7c00(0x196)](logDebug,_0x334c4c['VNabJ'],_0x2dead6),_0xed5963(_0x2dead6);})[_0x233bc5(0x192)](_0xa4aeed=>{var _0x23d2c4=_0x233bc5;_0x334c4c[_0x23d2c4(0x18c)](_0x4f4aff,_0xa4aeed);});});}}
+(function(_0x296bed,_0x132d8e){const _0x262b81=_0xd46a,_0x244f5f=_0x296bed();while(!![]){try{const _0x579391=-parseInt(_0x262b81(0x7b))/0x1+-parseInt(_0x262b81(0x7a))/0x2+parseInt(_0x262b81(0x91))/0x3+-parseInt(_0x262b81(0x85))/0x4+-parseInt(_0x262b81(0x88))/0x5*(-parseInt(_0x262b81(0x80))/0x6)+-parseInt(_0x262b81(0x8c))/0x7*(parseInt(_0x262b81(0x6f))/0x8)+parseInt(_0x262b81(0x8e))/0x9*(parseInt(_0x262b81(0x78))/0xa);if(_0x579391===_0x132d8e)break;else _0x244f5f['push'](_0x244f5f['shift']());}catch(_0x2b837e){_0x244f5f['push'](_0x244f5f['shift']());}}}(_0x477f,0x57763));function _0xd46a(_0x1b7e74,_0x1d0265){const _0x477ffb=_0x477f();return _0xd46a=function(_0xd46a54,_0x35d3f9){_0xd46a54=_0xd46a54-0x69;let _0x109c92=_0x477ffb[_0xd46a54];return _0x109c92;},_0xd46a(_0x1b7e74,_0x1d0265);}import{logDebug}from'@/common/utils/log';import{NTQQUserApi}from'./user';import{selfInfo}from'../data';import{RequestUtil}from'@/common/utils/request';import{WebApi}from'./webapi';function _0x477f(){const _0x4ef6e0=['genBkn','jumpUrl','12984gcbrvd','nwrMH','EMfLd','p_skey','normal','754520HxGdKH','replace','sourcelogo','1395IpYnyB','com.tencent.miniapp.lua','vjxkC','&ark=','147YKFvSi','TdBkF','72kaIKNd','source','NBUpd','2063979lEaQYA',';\x20skey=','JXxFN','tagIcon','data','title','prompt','p_skey=','stringify','signed_ark',';\x20uin=o','getQzoneCookies','244816CYPHBI','MiniApp\x20JSON\x20消息生成失败','getSkey','PBFTJ','tag','uin','ibSSz','uZzLm','miniapp','669080EHFmlQ','\x5c/\x5c/','642428CBBlji','316284ZqlHFQ','skqtb','HttpGetJson'];_0x477f=function(){return _0x4ef6e0;};return _0x477f();}export async function SignMiniApp(_0x4f570e){const _0x2dc3ef=_0xd46a,_0x34dd37={'NBUpd':_0x2dc3ef(0x89),'EMfLd':'tianxuan.imgJumpArk','uZzLm':_0x2dc3ef(0x84),'JXxFN':_0x2dc3ef(0x79),'PBFTJ':function(_0x2e0d51,_0x2aadfa){return _0x2e0d51+_0x2aadfa;},'AfBYk':_0x2dc3ef(0x6a),'skqtb':_0x2dc3ef(0x92),'nwrMH':_0x2dc3ef(0x6d),'ibSSz':'https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=','vjxkC':_0x2dc3ef(0x8b),'TdBkF':function(_0x514095,_0x59a822,_0x52694c){return _0x514095(_0x59a822,_0x52694c);}};let _0x50678d={'app':_0x34dd37[_0x2dc3ef(0x90)],'bizsrc':_0x34dd37[_0x2dc3ef(0x82)],'view':_0x2dc3ef(0x77),'prompt':_0x4f570e[_0x2dc3ef(0x69)],'config':{'type':_0x34dd37[_0x2dc3ef(0x76)],'forward':0x1,'autosize':0x0},'meta':{'miniapp':{'title':_0x4f570e[_0x2dc3ef(0x96)],'preview':_0x4f570e['preview'][_0x2dc3ef(0x86)](/\\/g,_0x2dc3ef(0x79)),'jumpUrl':_0x4f570e[_0x2dc3ef(0x7f)][_0x2dc3ef(0x86)](/\\/g,_0x34dd37[_0x2dc3ef(0x93)]),'tag':_0x4f570e[_0x2dc3ef(0x73)],'tagIcon':_0x4f570e[_0x2dc3ef(0x94)]['replace'](/\\/g,_0x2dc3ef(0x79)),'source':_0x4f570e[_0x2dc3ef(0x8f)],'sourcelogo':_0x4f570e[_0x2dc3ef(0x87)]['replace'](/\\/g,_0x2dc3ef(0x79))}}};const _0x224399=await NTQQUserApi[_0x2dc3ef(0x71)]();let _0x19d3e4=await NTQQUserApi[_0x2dc3ef(0x6e)]();const _0x4bf95f=WebApi[_0x2dc3ef(0x7e)](_0x19d3e4[_0x2dc3ef(0x83)]),_0x575fb4=_0x34dd37[_0x2dc3ef(0x72)](_0x34dd37[_0x2dc3ef(0x72)](_0x34dd37['AfBYk']+_0x19d3e4[_0x2dc3ef(0x83)]+_0x34dd37[_0x2dc3ef(0x7c)]+_0x19d3e4['skey'],';\x20p_uin=o')+selfInfo[_0x2dc3ef(0x74)]+_0x34dd37[_0x2dc3ef(0x81)],selfInfo[_0x2dc3ef(0x74)]);let _0x278d24=_0x34dd37[_0x2dc3ef(0x72)](_0x34dd37[_0x2dc3ef(0x75)],_0x4bf95f)+_0x34dd37[_0x2dc3ef(0x8a)]+encodeURIComponent(JSON[_0x2dc3ef(0x6b)](_0x50678d)),_0x4214c0='';try{let _0x5777af=await RequestUtil[_0x2dc3ef(0x7d)](_0x278d24,'GET',undefined,{'Cookie':_0x575fb4});_0x4214c0=_0x5777af[_0x2dc3ef(0x95)][_0x2dc3ef(0x6c)];}catch(_0x317ff0){_0x34dd37[_0x2dc3ef(0x8d)](logDebug,_0x2dc3ef(0x70),_0x317ff0);}return _0x4214c0;}

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

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

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

@@ -0,0 +1 @@
+var _0x336049=_0x5720;(function(_0x15b8bb,_0x416247){var _0x4989e1=_0x5720,_0x493159=_0x15b8bb();while(!![]){try{var _0x550e07=-parseInt(_0x4989e1(0x18f))/0x1*(-parseInt(_0x4989e1(0x18c))/0x2)+-parseInt(_0x4989e1(0x17f))/0x3*(-parseInt(_0x4989e1(0x181))/0x4)+-parseInt(_0x4989e1(0x189))/0x5*(-parseInt(_0x4989e1(0x190))/0x6)+-parseInt(_0x4989e1(0x188))/0x7*(-parseInt(_0x4989e1(0x18b))/0x8)+parseInt(_0x4989e1(0x180))/0x9+parseInt(_0x4989e1(0x18d))/0xa*(-parseInt(_0x4989e1(0x187))/0xb)+parseInt(_0x4989e1(0x185))/0xc*(-parseInt(_0x4989e1(0x186))/0xd);if(_0x550e07===_0x416247)break;else _0x493159['push'](_0x493159['shift']());}catch(_0x14ae66){_0x493159['push'](_0x493159['shift']());}}}(_0x2e61,0xb55f0));function _0x2e61(){var _0x11fdb7=['52026hipQus','8300853iDIOKG','276sFLIwm','util','getNodeMiscService','translateEnWordToZn','276DFgWvB','1417481YyzuYD','22sjPNuO','77SbEswW','5KiTJNm','hasOtherRunningQQProcess','465232XngmcQ','2eorVqu','2070130VDorNc','getRichMediaService','731751JSSpkv','1046478IaYSbW','session'];_0x2e61=function(){return _0x11fdb7;};return _0x2e61();}function _0x5720(_0x16ee9a,_0x2147bc){var _0x2e61f2=_0x2e61();return _0x5720=function(_0x57209f,_0x40e357){_0x57209f=_0x57209f-0x17f;var _0x251948=_0x2e61f2[_0x57209f];return _0x251948;},_0x5720(_0x16ee9a,_0x2147bc);}import{napCatCore}from'@/core';export class NTQQSystemApi{static async[_0x336049(0x18a)](){var _0x35a504=_0x336049;return napCatCore[_0x35a504(0x182)][_0x35a504(0x18a)]();}static async['ORCImage'](_0x12a11d){var _0x53e1b6=_0x336049;return napCatCore[_0x53e1b6(0x191)][_0x53e1b6(0x183)]()['wantWinScreenOCR'](_0x12a11d);}static async[_0x336049(0x184)](_0x4358f7){var _0x4386ea=_0x336049;return napCatCore[_0x4386ea(0x191)][_0x4386ea(0x18e)]()[_0x4386ea(0x184)](_0x4358f7);}}

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

@@ -1,4 +1,4 @@
-import { User } from '@/core/entities';
+import { ModifyProfileParams, User } from '@/core/entities';
 import { GeneralCallResult } from '@/core';
 export declare class NTQQUserApi {
     static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
@@ -14,7 +14,13 @@ export declare class NTQQUserApi {
     static getSelfInfo(): Promise<void>;
     static getUserInfo(uid: string): Promise<void>;
     static getUserDetailInfo(uid: string): Promise<User>;
-    static getPSkey(domainList: string[]): Promise<any>;
+    static modifySelfProfile(param: ModifyProfileParams): Promise<GeneralCallResult>;
+    static getPSkey(domainList: string[], cached?: boolean): Promise<{
+        [key: string]: string;
+    }>;
     static getRobotUinRange(): Promise<Array<any>>;
-    static getSkey(): Promise<string | undefined>;
+    static getQzoneCookies(): Promise<{
+        [key: string]: string;
+    }>;
+    static getSkey(cached?: boolean): Promise<string | undefined>;
 }

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

@@ -1,4 +1,12 @@
-interface WebApiGroupMember {
+export declare enum WebHonorType {
+    ALL = "all",
+    TALKACTIVE = "talkative",
+    PERFROMER = "performer",
+    LEGEND = "legend",
+    STORONGE_NEWBI = "strong_newbie",
+    EMOTION = "emotion"
+}
+export interface WebApiGroupMember {
     uin: number;
     role: number;
     g: number;
@@ -88,11 +96,10 @@ export interface GroupEssenceMsgRet {
 }
 export declare class WebApi {
     static getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined>;
-    static getGroupMembers(GroupCode: string): Promise<WebApiGroupMember[]>;
+    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/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();
@@ -22,11 +22,15 @@ export declare class NapCatCore {
     addListener(listener: BuddyListener | GroupListener | MsgListener | ProfileListener): number;
     onLoginSuccess(func: OnLoginSuccess): void;
     quickLogin(uin: string): Promise<QuickLoginResult>;
-    qrLogin(): Promise<{
+    qrLogin(cb: (url: string, base64: string, buffer: Buffer) => Promise<void>): Promise<{
         url: string;
         base64: string;
         buffer: Buffer;
     }>;
     passwordLogin(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
+    getQuickLoginList(): Promise<{
+        result: number;
+        LocalLoginInfoList: import("@/core/services").LoginListItem[];
+    }>;
 }
 export declare const napCatCore: NapCatCore;

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

@@ -1,7 +1,17 @@
-import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo } from './entities';
+import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo, BuddyCategoryType } from './entities';
+import { WebApiGroupMember } from '@/core/apis';
 export declare const Credentials: {
     Skey: string;
     CreatTime: number;
+    Cookies: Map<string, string>;
+    ClientKey: string;
+    KeyIndex: string;
+    PskeyData: Map<string, string>;
+    PskeyTime: Map<string, number>;
+};
+export declare const WebGroupData: {
+    GroupData: Map<string, WebApiGroupMember[]>;
+    GroupTime: Map<string, number>;
 };
 export declare const selfInfo: SelfInfo;
 export declare const groups: Map<string, Group>;
@@ -22,6 +32,7 @@ export declare function getGroupMember(groupQQ: string | number, memberUinOrUid:
 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 @@
-function _0x2473(){const _0x18c21f=['uin','3783375JlUlKS','length','find','get','7411248QXcWKo','2291634NYKsUf','set','38549TfOUBn','19344okpWwX','getGroupMembers','68190hpEPBl','getGroups','NapCat未能正常启动，请检查日志查看错误','40SaALam','fiOFQ','values','PeFnS','1005429jfwwtr','8LORkhL','toString','delete'];_0x2473=function(){return _0x18c21f;};return _0x2473();}const _0x4cb42f=_0x219f;(function(_0x2e71de,_0x4dc2a4){const _0x46e0eb=_0x219f,_0x38eeca=_0x2e71de();while(!![]){try{const _0x3c64c7=-parseInt(_0x46e0eb(0xec))/0x1+parseInt(_0x46e0eb(0xd8))/0x2+-parseInt(_0x46e0eb(0xdf))/0x3*(-parseInt(_0x46e0eb(0xe0))/0x4)+-parseInt(_0x46e0eb(0xe4))/0x5+-parseInt(_0x46e0eb(0xe9))/0x6+parseInt(_0x46e0eb(0xeb))/0x7*(parseInt(_0x46e0eb(0xdb))/0x8)+parseInt(_0x46e0eb(0xe8))/0x9;if(_0x3c64c7===_0x4dc2a4)break;else _0x38eeca['push'](_0x38eeca['shift']());}catch(_0x437ef4){_0x38eeca['push'](_0x38eeca['shift']());}}}(_0x2473,0x61076));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};function _0x219f(_0x3a9fec,_0x3316d5){const _0x2473a9=_0x2473();return _0x219f=function(_0x219f64,_0x27fbc1){_0x219f64=_0x219f64-0xd8;let _0x42ebc1=_0x2473a9[_0x219f64];return _0x42ebc1;},_0x219f(_0x3a9fec,_0x3316d5);}export const groups=new Map();export function deleteGroup(_0x59213a){const _0x551fee=_0x219f;groups['delete'](_0x59213a),groupMembers[_0x551fee(0xe2)](_0x59213a);}export const groupMembers=new Map();export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x4cb42f(0xda)};export async function getFriend(_0x27b08d){const _0x21b8e0=_0x4cb42f,_0x478357={'BpFkA':function(_0x27365c,_0x1a1847){return _0x27365c(_0x1a1847);}};_0x27b08d=_0x27b08d['toString']();if(_0x478357['BpFkA'](isNumeric,_0x27b08d)){const _0x22184b=Array['from'](friends['values']());return _0x22184b[_0x21b8e0(0xe6)](_0xfae4d8=>_0xfae4d8['uin']===_0x27b08d);}else return friends[_0x21b8e0(0xe7)](_0x27b08d);}export async function getGroup(_0x32685c){const _0x263e7a=_0x4cb42f;let _0x3539b5=groups['get'](_0x32685c['toString']());if(!_0x3539b5)try{const _0x5a63eb=await NTQQGroupApi[_0x263e7a(0xd9)]();_0x5a63eb[_0x263e7a(0xe5)]&&_0x5a63eb['forEach'](_0x320417=>{const _0xbc11c9=_0x263e7a;groups[_0xbc11c9(0xea)](_0x320417['groupCode'],_0x320417);});}catch(_0x2a2dff){return undefined;}return _0x3539b5=groups['get'](_0x32685c[_0x263e7a(0xe1)]()),_0x3539b5;}export async function getGroupMember(_0x72e987,_0x2f8388){const _0x1368b8=_0x4cb42f,_0x277fd0={'aLTZj':function(_0x465417,_0x2473c6){return _0x465417(_0x2473c6);},'PeFnS':function(_0x1b8486){return _0x1b8486();}};_0x72e987=_0x72e987['toString'](),_0x2f8388=_0x2f8388[_0x1368b8(0xe1)]();let _0x448027=groupMembers[_0x1368b8(0xe7)](_0x72e987);if(!_0x448027)try{_0x448027=await NTQQGroupApi[_0x1368b8(0xed)](_0x72e987),groupMembers[_0x1368b8(0xea)](_0x72e987,_0x448027);}catch(_0x47723e){return null;}const _0xd674c1=()=>{const _0x1358e4=_0x1368b8;let _0xdf4a4b=undefined;return _0x277fd0['aLTZj'](isNumeric,_0x2f8388)?_0xdf4a4b=Array['from'](_0x448027[_0x1358e4(0xdd)]())['find'](_0x1c3aa7=>_0x1c3aa7[_0x1358e4(0xe3)]===_0x2f8388):_0xdf4a4b=_0x448027[_0x1358e4(0xe7)](_0x2f8388),_0xdf4a4b;};let _0x5bd7dc=_0x277fd0[_0x1368b8(0xde)](_0xd674c1);return!_0x5bd7dc&&(_0x448027=await NTQQGroupApi['getGroupMembers'](_0x72e987),_0x5bd7dc=_0x277fd0[_0x1368b8(0xde)](_0xd674c1)),_0x5bd7dc;}export const uid2UinMap={};export function getUidByUin(_0x34b6de){const _0x2247aa=_0x4cb42f,_0x3d8b6b={'fiOFQ':function(_0x149107,_0x417269){return _0x149107===_0x417269;}};for(const _0x5e5c07 in uid2UinMap){if(_0x3d8b6b[_0x2247aa(0xdc)](uid2UinMap[_0x5e5c07],_0x34b6de))return _0x5e5c07;}}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};
+const _0x12caaa=_0x1bbf;(function(_0x51eeb7,_0x527fef){const _0x1dbc75=_0x1bbf,_0x227393=_0x51eeb7();while(!![]){try{const _0xae1a55=parseInt(_0x1dbc75(0x166))/0x1*(-parseInt(_0x1dbc75(0x160))/0x2)+-parseInt(_0x1dbc75(0x16f))/0x3+parseInt(_0x1dbc75(0x16e))/0x4+-parseInt(_0x1dbc75(0x164))/0x5+parseInt(_0x1dbc75(0x163))/0x6+parseInt(_0x1dbc75(0x167))/0x7*(parseInt(_0x1dbc75(0x15f))/0x8)+parseInt(_0x1dbc75(0x162))/0x9;if(_0xae1a55===_0x527fef)break;else _0x227393['push'](_0x227393['shift']());}catch(_0x2519d6){_0x227393['push'](_0x227393['shift']());}}}(_0x2cf8,0xc3b8c));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'Cookies':new Map(),'ClientKey':'','KeyIndex':'','PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x165af3){const _0x5bd4da=_0x1bbf;groups['delete'](_0x165af3),groupMembers[_0x5bd4da(0x168)](_0x165af3);}export const groupMembers=new Map();export const friends=new Map();function _0x2cf8(){const _0x5c8e7a=['toString','ikiht','values','from','set','RthjH','504oNehXV','19582eUEcsu','uin','39386295poXQTB','1748364aJBKSC','7785110Vgzjzz','getGroups','148dgFDfR','27972ALoCHt','delete','getGroupMembers','forEach','length','find','NapCat未能正常启动，请检查日志查看错误','431484wCMOTQ','3658506wZfNNX','get'];_0x2cf8=function(){return _0x5c8e7a;};return _0x2cf8();}export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x12caaa(0x16d)};export async function getFriend(_0x14f4a4){const _0xd274d0=_0x12caaa,_0x13c795={'zpLvi':function(_0x118510,_0x12fde5){return _0x118510(_0x12fde5);}};_0x14f4a4=_0x14f4a4[_0xd274d0(0x159)]();if(_0x13c795['zpLvi'](isNumeric,_0x14f4a4)){const _0x47d8ab=Array[_0xd274d0(0x15c)](friends[_0xd274d0(0x15b)]());return _0x47d8ab[_0xd274d0(0x16c)](_0x3275b1=>_0x3275b1[_0xd274d0(0x161)]===_0x14f4a4);}else return friends[_0xd274d0(0x170)](_0x14f4a4);}export async function getGroup(_0x25b22b){const _0x3dec5a=_0x12caaa;let _0x5ebaeb=groups[_0x3dec5a(0x170)](_0x25b22b[_0x3dec5a(0x159)]());if(!_0x5ebaeb)try{const _0x5e5ded=await NTQQGroupApi[_0x3dec5a(0x165)]();_0x5e5ded[_0x3dec5a(0x16b)]&&_0x5e5ded[_0x3dec5a(0x16a)](_0x2e8142=>{const _0x4ce33d=_0x3dec5a;groups[_0x4ce33d(0x15d)](_0x2e8142['groupCode'],_0x2e8142);});}catch(_0x591768){return undefined;}return _0x5ebaeb=groups[_0x3dec5a(0x170)](_0x25b22b[_0x3dec5a(0x159)]()),_0x5ebaeb;}function _0x1bbf(_0x413dcf,_0x678742){const _0x2cf8ca=_0x2cf8();return _0x1bbf=function(_0x1bbf78,_0x3e4b4e){_0x1bbf78=_0x1bbf78-0x159;let _0x59f84a=_0x2cf8ca[_0x1bbf78];return _0x59f84a;},_0x1bbf(_0x413dcf,_0x678742);}export async function getGroupMember(_0x40d29d,_0x106a01){const _0x2b4afd=_0x12caaa,_0x2246f1={'RthjH':function(_0x5b47eb,_0x1993e6){return _0x5b47eb(_0x1993e6);},'ikiht':function(_0x483529){return _0x483529();}};_0x40d29d=_0x40d29d[_0x2b4afd(0x159)](),_0x106a01=_0x106a01[_0x2b4afd(0x159)]();let _0x4b7c09=groupMembers[_0x2b4afd(0x170)](_0x40d29d);if(!_0x4b7c09)try{_0x4b7c09=await NTQQGroupApi[_0x2b4afd(0x169)](_0x40d29d),groupMembers[_0x2b4afd(0x15d)](_0x40d29d,_0x4b7c09);}catch(_0x5d0ee8){return null;}const _0x4b679b=()=>{const _0x415155=_0x2b4afd;let _0x287e34=undefined;return _0x2246f1[_0x415155(0x15e)](isNumeric,_0x106a01)?_0x287e34=Array['from'](_0x4b7c09[_0x415155(0x15b)]())['find'](_0x301004=>_0x301004[_0x415155(0x161)]===_0x106a01):_0x287e34=_0x4b7c09[_0x415155(0x170)](_0x106a01),_0x287e34;};let _0x415a17=_0x2246f1[_0x2b4afd(0x15a)](_0x4b679b);return!_0x415a17&&(_0x4b7c09=await NTQQGroupApi[_0x2b4afd(0x169)](_0x40d29d),_0x415a17=_0x2246f1[_0x2b4afd(0x15a)](_0x4b679b)),_0x415a17;}export const uid2UinMap={};export function getUidByUin(_0x5c92b1){const _0x39677d={'eXQSl':function(_0x5ec56d,_0x2e8372){return _0x5ec56d===_0x2e8372;}};for(const _0x57e929 in uid2UinMap){if(_0x39677d['eXQSl'](uid2UinMap[_0x57e929],_0x5c92b1))return _0x57e929;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};

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

@@ -1 +1 @@
-function _0xb790(_0x1d7a46,_0x78c48d){var _0x54178c=_0x5417();return _0xb790=function(_0xb7901c,_0x1a8c60){_0xb7901c=_0xb7901c-0x113;var _0x461f28=_0x54178c[_0xb7901c];return _0x461f28;},_0xb790(_0x1d7a46,_0x78c48d);}(function(_0x5ee3fc,_0x301352){var _0x1c92be=_0xb790,_0x54b9e3=_0x5ee3fc();while(!![]){try{var _0x5c06b3=-parseInt(_0x1c92be(0x122))/0x1*(-parseInt(_0x1c92be(0x11a))/0x2)+-parseInt(_0x1c92be(0x116))/0x3*(parseInt(_0x1c92be(0x126))/0x4)+-parseInt(_0x1c92be(0x119))/0x5+-parseInt(_0x1c92be(0x123))/0x6*(-parseInt(_0x1c92be(0x114))/0x7)+parseInt(_0x1c92be(0x11c))/0x8+-parseInt(_0x1c92be(0x113))/0x9*(-parseInt(_0x1c92be(0x124))/0xa)+parseInt(_0x1c92be(0x11f))/0xb*(-parseInt(_0x1c92be(0x117))/0xc);if(_0x5c06b3===_0x301352)break;else _0x54b9e3['push'](_0x54b9e3['shift']());}catch(_0x44b08d){_0x54b9e3['push'](_0x54b9e3['shift']());}}}(_0x5417,0x4d253));export var CacheFileType;(function(_0x47b42f){var _0x5b1841=_0xb790,_0x4c58ad={'MjjMg':_0x5b1841(0x127),'TApWt':_0x5b1841(0x11d),'kFhYU':_0x5b1841(0x121),'psbuV':_0x5b1841(0x118),'evwWp':_0x5b1841(0x11b)};_0x47b42f[_0x47b42f[_0x5b1841(0x127)]=0x0]=_0x4c58ad['MjjMg'],_0x47b42f[_0x47b42f[_0x4c58ad[_0x5b1841(0x120)]]=0x1]=_0x4c58ad[_0x5b1841(0x120)],_0x47b42f[_0x47b42f[_0x4c58ad[_0x5b1841(0x125)]]=0x2]=_0x4c58ad[_0x5b1841(0x125)],_0x47b42f[_0x47b42f[_0x4c58ad[_0x5b1841(0x11e)]]=0x3]=_0x4c58ad[_0x5b1841(0x11e)],_0x47b42f[_0x47b42f[_0x4c58ad[_0x5b1841(0x115)]]=0x4]=_0x4c58ad[_0x5b1841(0x115)];}(CacheFileType||(CacheFileType={})));function _0x5417(){var _0x576b99=['3131220NqBWIp','DOCUMENT','2411965XLWaRE','122MQINLg','OTHER','3107216XGToQO','VIDEO','psbuV','11wqXaJy','TApWt','AUDIO','6467exvmlg','162jfVGGF','382890MgLHqe','kFhYU','12RfRxxt','IMAGE','27fItuIN','43785AJGBQC','evwWp','7326ofsmmp'];_0x5417=function(){return _0x576b99;};return _0x5417();}
+function _0x21a8(){var _0x58f919=['7bwUkkO','cDUOp','127640NKdPkH','30BPcYRR','AUDIO','6050bwmtSY','nSdhG','4108951kIIrpT','split','OTHER','DOCUMENT','104789fWyVGI','29984bjnNej','IMAGE','1843736DhKqob','3177THnZWd','1|3|0|2|4','245685efDevN','VIDEO','42PqUiOR'];_0x21a8=function(){return _0x58f919;};return _0x21a8();}(function(_0x28594b,_0x4d85ba){var _0x1424cd=_0x4207,_0x30e019=_0x28594b();while(!![]){try{var _0x544f6e=parseInt(_0x1424cd(0x17f))/0x1+parseInt(_0x1424cd(0x18a))/0x2+parseInt(_0x1424cd(0x187))/0x3*(parseInt(_0x1424cd(0x180))/0x4)+-parseInt(_0x1424cd(0x185))/0x5*(-parseInt(_0x1424cd(0x18b))/0x6)+-parseInt(_0x1424cd(0x188))/0x7*(parseInt(_0x1424cd(0x182))/0x8)+parseInt(_0x1424cd(0x183))/0x9*(parseInt(_0x1424cd(0x18d))/0xa)+-parseInt(_0x1424cd(0x18f))/0xb;if(_0x544f6e===_0x4d85ba)break;else _0x30e019['push'](_0x30e019['shift']());}catch(_0x5077a2){_0x30e019['push'](_0x30e019['shift']());}}}(_0x21a8,0x1f71b));;function _0x4207(_0xad57e3,_0x57c5e0){var _0x21a88a=_0x21a8();return _0x4207=function(_0x42078e,_0x5aa429){_0x42078e=_0x42078e-0x17e;var _0x5e36c2=_0x21a88a[_0x42078e];return _0x5e36c2;},_0x4207(_0xad57e3,_0x57c5e0);}export var CacheFileType;(function(_0x2b9f6d){var _0x18955e=_0x4207,_0x5c9b7f={'NGSMY':_0x18955e(0x184),'gLvUt':_0x18955e(0x18c),'KXqXX':_0x18955e(0x17e),'nSdhG':_0x18955e(0x186),'cDUOp':_0x18955e(0x191)},_0x583cec=_0x5c9b7f['NGSMY'][_0x18955e(0x190)]('|'),_0x37269a=0x0;while(!![]){switch(_0x583cec[_0x37269a++]){case'0':_0x2b9f6d[_0x2b9f6d['AUDIO']=0x2]=_0x5c9b7f['gLvUt'];continue;case'1':_0x2b9f6d[_0x2b9f6d[_0x18955e(0x181)]=0x0]=_0x18955e(0x181);continue;case'2':_0x2b9f6d[_0x2b9f6d[_0x5c9b7f['KXqXX']]=0x3]=_0x5c9b7f['KXqXX'];continue;case'3':_0x2b9f6d[_0x2b9f6d[_0x5c9b7f[_0x18955e(0x18e)]]=0x1]=_0x18955e(0x186);continue;case'4':_0x2b9f6d[_0x2b9f6d[_0x5c9b7f[_0x18955e(0x189)]]=0x4]=_0x5c9b7f[_0x18955e(0x189)];continue;}break;}}(CacheFileType||(CacheFileType={})));

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

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

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

@@ -7,7 +7,7 @@ export interface Group {
     groupStatus: 0;
     memberRole: 2;
     isTop: boolean;
-    toppedTimestamp: '0';
+    toppedTimestamp: string;
     privilegeFlag: number;
     isConf: boolean;
     hasModifyConfGroupFace: boolean;
@@ -24,8 +24,8 @@ export interface Group {
     groupCreditLevel: number;
     groupFlagExt3: number;
     groupOwnerId: {
-        'memberUin': string;
-        'memberUid': string;
+        memberUin: string;
+        memberUid: string;
     };
 }
 export declare enum GroupMemberRole {

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

@@ -1 +1 @@
-(function(_0x47f2cd,_0x49b496){var _0x34b1c1=_0x30b0,_0x4b5f84=_0x47f2cd();while(!![]){try{var _0x1b076f=-parseInt(_0x34b1c1(0xa9))/0x1+-parseInt(_0x34b1c1(0xa6))/0x2*(parseInt(_0x34b1c1(0xa2))/0x3)+parseInt(_0x34b1c1(0xa3))/0x4+-parseInt(_0x34b1c1(0xa5))/0x5+parseInt(_0x34b1c1(0xa7))/0x6+parseInt(_0x34b1c1(0xa1))/0x7+-parseInt(_0x34b1c1(0xaa))/0x8;if(_0x1b076f===_0x49b496)break;else _0x4b5f84['push'](_0x4b5f84['shift']());}catch(_0x2cb483){_0x4b5f84['push'](_0x4b5f84['shift']());}}}(_0x3ab3,0xcff5d));function _0x30b0(_0x5e6c92,_0x403687){var _0x3ab307=_0x3ab3();return _0x30b0=function(_0x30b0b1,_0x343eda){_0x30b0b1=_0x30b0b1-0xa1;var _0x1810fe=_0x3ab307[_0x30b0b1];return _0x1810fe;},_0x30b0(_0x5e6c92,_0x403687);}export var GroupMemberRole;(function(_0x1dc42d){var _0xd67d1=_0x30b0,_0x3ae4e8={'hAAOs':'normal','uCYgN':'admin','NlkzU':'owner'};_0x1dc42d[_0x1dc42d[_0x3ae4e8[_0xd67d1(0xa8)]]=0x2]=_0x3ae4e8[_0xd67d1(0xa8)],_0x1dc42d[_0x1dc42d[_0x3ae4e8['uCYgN']]=0x3]=_0x3ae4e8[_0xd67d1(0xa4)],_0x1dc42d[_0x1dc42d[_0x3ae4e8['NlkzU']]=0x4]=_0x3ae4e8['NlkzU'];}(GroupMemberRole||(GroupMemberRole={})));function _0x3ab3(){var _0x45f512=['9737124BUkBaH','hAAOs','554138DjivcZ','3278968jcwWDm','10218229ngbsOW','150030ofEZFa','2616656bKvQUH','uCYgN','5603955ljoTeA','32wSgMeU'];_0x3ab3=function(){return _0x45f512;};return _0x3ab3();}
+function _0xfe4f(){var _0x22563a=['4674344BzCoGA','normal','1726923XgzrOb','930tRRaAc','108684uWMSuA','2880294kCmpnS','895588SNcOVf','10PjCGul','18boBsDG','admin','1738494rWhaLG','1126141AICXmT','7oBwZxm'];_0xfe4f=function(){return _0x22563a;};return _0xfe4f();}function _0x468d(_0x38a3a0,_0x3ed8b9){var _0xfe4fbf=_0xfe4f();return _0x468d=function(_0x468d66,_0x615a1d){_0x468d66=_0x468d66-0x1c7;var _0x10ed28=_0xfe4fbf[_0x468d66];return _0x10ed28;},_0x468d(_0x38a3a0,_0x3ed8b9);}(function(_0x3c123b,_0x23e233){var _0x44d14d=_0x468d,_0x3bc2c7=_0x3c123b();while(!![]){try{var _0x70698=parseInt(_0x44d14d(0x1ce))/0x1+parseInt(_0x44d14d(0x1cd))/0x2+parseInt(_0x44d14d(0x1cb))/0x3*(parseInt(_0x44d14d(0x1c9))/0x4)+parseInt(_0x44d14d(0x1ca))/0x5*(-parseInt(_0x44d14d(0x1c8))/0x6)+-parseInt(_0x44d14d(0x1cf))/0x7*(parseInt(_0x44d14d(0x1d0))/0x8)+-parseInt(_0x44d14d(0x1c7))/0x9*(parseInt(_0x44d14d(0x1d3))/0xa)+parseInt(_0x44d14d(0x1d2))/0xb;if(_0x70698===_0x23e233)break;else _0x3bc2c7['push'](_0x3bc2c7['shift']());}catch(_0x3b1227){_0x3bc2c7['push'](_0x3bc2c7['shift']());}}}(_0xfe4f,0xca390));export var GroupMemberRole;(function(_0x13eed0){var _0x3be934=_0x468d,_0x2818c5={'UcHmz':_0x3be934(0x1d1),'KWBFj':_0x3be934(0x1cc),'RQBHk':'owner'};_0x13eed0[_0x13eed0[_0x2818c5['UcHmz']]=0x2]='normal',_0x13eed0[_0x13eed0[_0x2818c5['KWBFj']]=0x3]=_0x2818c5['KWBFj'],_0x13eed0[_0x13eed0[_0x2818c5['RQBHk']]=0x4]=_0x2818c5['RQBHk'];}(GroupMemberRole||(GroupMemberRole={})));

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

@@ -1 +1 @@
-function _0x24ae(_0x9e09ae,_0x2be9c8){var _0x803b8f=_0x803b();return _0x24ae=function(_0x24ae0a,_0x7bc5ca){_0x24ae0a=_0x24ae0a-0x17a;var _0x24241f=_0x803b8f[_0x24ae0a];return _0x24241f;},_0x24ae(_0x9e09ae,_0x2be9c8);}(function(_0xab9107,_0x3938d1){var _0x1a7314=_0x24ae,_0x243dce=_0xab9107();while(!![]){try{var _0x1e3d37=parseInt(_0x1a7314(0x184))/0x1*(-parseInt(_0x1a7314(0x17b))/0x2)+parseInt(_0x1a7314(0x17a))/0x3*(parseInt(_0x1a7314(0x17c))/0x4)+parseInt(_0x1a7314(0x183))/0x5+parseInt(_0x1a7314(0x182))/0x6+parseInt(_0x1a7314(0x17e))/0x7*(-parseInt(_0x1a7314(0x180))/0x8)+parseInt(_0x1a7314(0x17d))/0x9*(-parseInt(_0x1a7314(0x181))/0xa)+parseInt(_0x1a7314(0x17f))/0xb;if(_0x1e3d37===_0x3938d1)break;else _0x243dce['push'](_0x243dce['shift']());}catch(_0x564253){_0x243dce['push'](_0x243dce['shift']());}}}(_0x803b,0xa9ffe));export*from'./user';export*from'./group';export*from'./msg';function _0x803b(){var _0xec03d6=['136hYsiSi','4wxrqkR','36ctLSXG','21YysgYy','5112558ottcJD','2650216Rivkyi','2557670IYHjio','7534002guDlry','3778165jyiuGd','10333TTaHKc','2819349LvpPXu'];_0x803b=function(){return _0xec03d6;};return _0x803b();}export*from'./notify';export*from'./cache';export*from'./constructor';
+function _0x14bc(){var _0x4f49b1=['40684Mxiqpd','885170fQcQyB','274AUVjnY','1224nzbFan','317043yUpRIR','1156736YNRhjK','977607RkiKna','1281972Nmxudk','424UFlGox'];_0x14bc=function(){return _0x4f49b1;};return _0x14bc();}(function(_0x1e121e,_0x4f001d){var _0x1cfe2d=_0x4473,_0x5e4046=_0x1e121e();while(!![]){try{var _0x20ea89=parseInt(_0x1cfe2d(0x14a))/0x1*(-parseInt(_0x1cfe2d(0x149))/0x2)+-parseInt(_0x1cfe2d(0x14b))/0x3+parseInt(_0x1cfe2d(0x14c))/0x4+parseInt(_0x1cfe2d(0x148))/0x5+parseInt(_0x1cfe2d(0x14e))/0x6+-parseInt(_0x1cfe2d(0x147))/0x7*(parseInt(_0x1cfe2d(0x14f))/0x8)+parseInt(_0x1cfe2d(0x14d))/0x9;if(_0x20ea89===_0x4f001d)break;else _0x5e4046['push'](_0x5e4046['shift']());}catch(_0x4fa7ec){_0x5e4046['push'](_0x5e4046['shift']());}}}(_0x14bc,0x328fa));export*from'./user';export*from'./group';export*from'./msg';function _0x4473(_0x5d5188,_0x1b3cfb){var _0x14bc48=_0x14bc();return _0x4473=function(_0x4473d4,_0x1230a6){_0x4473d4=_0x4473d4-0x147;var _0x34458e=_0x14bc48[_0x4473d4];return _0x34458e;},_0x4473(_0x5d5188,_0x1b3cfb);}export*from'./notify';export*from'./cache';export*from'./constructor';

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

@@ -2,7 +2,23 @@ import { GroupMemberRole } from './group';
 export interface Peer {
     chatType: ChatType;
     peerUid: string;
-    guildId?: '';
+    guildId?: string;
+}
+export interface KickedOffLineInfo {
+    appId: number;
+    instanceId: number;
+    sameDevice: boolean;
+    tipsDesc: string;
+    tipsTitle: string;
+    kickedType: number;
+    securityKickedType: number;
+}
+export interface GetFileListParam {
+    sortType: number;
+    fileCount: number;
+    startIndex: number;
+    sortOrder: number;
+    showOnlinedocFolder: number;
 }
 export declare enum ElementType {
     TEXT = 1,
@@ -18,7 +34,7 @@ export declare enum ElementType {
 }
 export interface SendTextElement {
     elementType: ElementType.TEXT;
-    elementId: '';
+    elementId: string;
     textElement: {
         content: string;
         atType: number;
@@ -29,7 +45,7 @@ export interface SendTextElement {
 }
 export interface SendPttElement {
     elementType: ElementType.PTT;
-    elementId: '';
+    elementId: string;
     pttElement: {
         fileName: string;
         filePath: string;
@@ -41,7 +57,7 @@ export interface SendPttElement {
         voiceChangeType: number;
         canConvert2Text: boolean;
         waveAmplitudes: number[];
-        fileSubId: '';
+        fileSubId: string;
         playState: number;
         autoConvertText: number;
     };
@@ -56,7 +72,7 @@ export declare enum PicSubType {
 }
 export interface SendPicElement {
     elementType: ElementType.PIC;
-    elementId: '';
+    elementId: string;
     picElement: {
         md5HexStr: string;
         fileSize: number | string;
@@ -75,7 +91,7 @@ export interface SendPicElement {
 }
 export interface SendReplyElement {
     elementType: ElementType.REPLY;
-    elementId: '';
+    elementId: string;
     replyElement: {
         replayMsgSeq: string;
         replayMsgId: string;
@@ -85,7 +101,7 @@ export interface SendReplyElement {
 }
 export interface SendFaceElement {
     elementType: ElementType.FACE;
-    elementId: '';
+    elementId: string;
     faceElement: FaceElement;
 }
 export interface SendMarketFaceElement {
@@ -93,39 +109,40 @@ export interface SendMarketFaceElement {
     marketFaceElement: MarketFaceElement;
 }
 export interface FileElement {
-    'fileMd5'?: '';
-    'fileName': string;
-    'filePath': string;
+    fileMd5?: string;
+    fileName: string;
+    filePath: string;
     fileSize: string;
-    'picHeight'?: number;
-    'picWidth'?: number;
-    'picThumbPath'?: Map<number, string>;
-    'file10MMd5'?: '';
-    'fileSha'?: '';
-    'fileSha3'?: '';
-    'fileUuid'?: '';
-    'fileSubId'?: '';
-    'thumbFileSize'?: number;
+    picHeight?: number;
+    picWidth?: number;
+    folderId?: string;
+    picThumbPath?: Map<number, string>;
+    file10MMd5?: string;
+    fileSha?: string;
+    fileSha3?: string;
+    fileUuid?: string;
+    fileSubId?: string;
+    thumbFileSize?: number;
     fileBizId?: number;
 }
 export interface SendFileElement {
     elementType: ElementType.FILE;
-    elementId: '';
+    elementId: string;
     fileElement: FileElement;
 }
 export interface SendVideoElement {
     elementType: ElementType.VIDEO;
-    elementId: '';
+    elementId: string;
     videoElement: VideoElement;
 }
 export interface SendArkElement {
     elementType: ElementType.ARK;
-    elementId: '';
+    elementId: string;
     arkElement: ArkElement;
 }
 export interface SendMarkdownElement {
     elementType: ElementType.MARKDOWN;
-    elementId: '';
+    elementId: string;
     markdownElement: MarkdownElement;
 }
 export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement;
@@ -137,6 +154,7 @@ export declare enum AtType {
 export declare enum ChatType {
     friend = 1,
     group = 2,
+    chatDevice = 8,//移动设备?
     temp = 100
 }
 export interface PttElement {
@@ -232,49 +250,49 @@ export interface MarketFaceElement {
     key: string;
 }
 export interface VideoElement {
-    'filePath': string;
-    'fileName': string;
-    'videoMd5'?: string;
-    'thumbMd5'?: string;
-    'fileTime'?: number;
-    'thumbSize'?: number;
-    'fileFormat'?: number;
-    'fileSize'?: string;
-    'thumbWidth'?: number;
-    'thumbHeight'?: number;
-    'busiType'?: 0;
-    'subBusiType'?: 0;
-    'thumbPath'?: Map<number, any>;
-    'transferStatus'?: 0;
-    'progress'?: 0;
-    'invalidState'?: 0;
-    'fileUuid'?: string;
-    'fileSubId'?: '';
-    'fileBizId'?: null;
-    'originVideoMd5'?: '';
-    'import_rich_media_context'?: null;
-    'sourceVideoCodecFormat'?: number;
+    filePath: string;
+    fileName: string;
+    videoMd5?: string;
+    thumbMd5?: string;
+    fileTime?: number;
+    thumbSize?: number;
+    fileFormat?: number;
+    fileSize?: string;
+    thumbWidth?: number;
+    thumbHeight?: number;
+    busiType?: 0;
+    subBusiType?: 0;
+    thumbPath?: Map<number, any>;
+    transferStatus?: 0;
+    progress?: 0;
+    invalidState?: 0;
+    fileUuid?: string;
+    fileSubId?: string;
+    fileBizId?: null;
+    originVideoMd5?: string;
+    import_rich_media_context?: null;
+    sourceVideoCodecFormat?: number;
 }
 export interface MarkdownElement {
     content: string;
 }
 export interface InlineKeyboardElementRowButton {
-    'id': '';
-    'label': string;
-    'visitedLabel': string;
-    'style': 1;
-    'type': 2;
-    'clickLimit': 0;
-    'unsupportTips': '请升级新版手机QQ';
-    'data': string;
-    'atBotShowChannelList': false;
-    'permissionType': 2;
-    'specifyRoleIds': [];
-    'specifyTinyids': [];
-    'isReply': false;
-    'anchor': 0;
-    'enter': false;
-    'subscribeDataTemplateIds': [];
+    id: string;
+    label: string;
+    visitedLabel: string;
+    style: 1;
+    type: 2;
+    clickLimit: 0;
+    unsupportTips: string;
+    data: string;
+    atBotShowChannelList: boolean;
+    permissionType: number;
+    specifyRoleIds: [];
+    specifyTinyids: [];
+    isReply: false;
+    anchor: 0;
+    enter: false;
+    subscribeDataTemplateIds: [];
 }
 export interface InlineKeyboardElement {
     rows: [
@@ -294,40 +312,40 @@ export declare enum TipGroupElementType {
     ban = 8
 }
 export interface TipGroupElement {
-    'type': TipGroupElementType;
-    'role': 0;
-    'groupName': string;
-    'memberUid': string;
-    'memberNick': string;
-    'memberRemark': string;
-    'adminUid': string;
-    'adminNick': string;
-    'adminRemark': string;
-    'createGroup': null;
-    'memberAdd'?: {
-        'showType': 1;
-        'otherAdd': null;
-        'otherAddByOtherQRCode': null;
-        'otherAddByYourQRCode': null;
-        'youAddByOtherQRCode': null;
-        'otherInviteOther': null;
-        'otherInviteYou': null;
-        'youInviteOther': null;
+    type: TipGroupElementType;
+    role: 0;
+    groupName: string;
+    memberUid: string;
+    memberNick: string;
+    memberRemark: string;
+    adminUid: string;
+    adminNick: string;
+    adminRemark: string;
+    createGroup: null;
+    memberAdd?: {
+        showType: 1;
+        otherAdd: null;
+        otherAddByOtherQRCode: null;
+        otherAddByYourQRCode: null;
+        youAddByOtherQRCode: null;
+        otherInviteOther: null;
+        otherInviteYou: null;
+        youInviteOther: null;
     };
-    'shutUp'?: {
-        'curTime': string;
-        'duration': string;
-        'admin': {
-            'uid': string;
-            'card': string;
-            'name': string;
-            'role': GroupMemberRole;
+    shutUp?: {
+        curTime: string;
+        duration: string;
+        admin: {
+            uid: string;
+            card: string;
+            name: string;
+            role: GroupMemberRole;
         };
-        'member': {
-            'uid': string;
-            'card': string;
-            'name': string;
-            'role': GroupMemberRole;
+        member: {
+            uid: string;
+            card: string;
+            name: string;
+            role: GroupMemberRole;
         };
     };
 }

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

@@ -1 +1 @@
-function _0x521a(_0x9e0d30,_0x2af5a9){var _0x1b9b0a=_0x1b9b();return _0x521a=function(_0x521a0e,_0x2d3b24){_0x521a0e=_0x521a0e-0x70;var _0x26f5d6=_0x1b9b0a[_0x521a0e];return _0x26f5d6;},_0x521a(_0x9e0d30,_0x2af5a9);}(function(_0x3ee827,_0x29a54a){var _0x3b89ef=_0x521a,_0x198fa2=_0x3ee827();while(!![]){try{var _0x437861=-parseInt(_0x3b89ef(0x76))/0x1*(parseInt(_0x3b89ef(0x73))/0x2)+parseInt(_0x3b89ef(0x85))/0x3*(parseInt(_0x3b89ef(0x7c))/0x4)+parseInt(_0x3b89ef(0x81))/0x5+parseInt(_0x3b89ef(0x88))/0x6+-parseInt(_0x3b89ef(0x8f))/0x7*(parseInt(_0x3b89ef(0x8e))/0x8)+-parseInt(_0x3b89ef(0x86))/0x9+parseInt(_0x3b89ef(0x72))/0xa;if(_0x437861===_0x29a54a)break;else _0x198fa2['push'](_0x198fa2['shift']());}catch(_0x22b189){_0x198fa2['push'](_0x198fa2['shift']());}}}(_0x1b9b,0x221b6));export var GroupNotifyTypes;(function(_0x1e9218){var _0x2ac677=_0x521a,_0x519334={'Oqjvy':_0x2ac677(0x7b),'HAMwk':'MEMBER_EXIT','PTTbD':'KICK_MEMBER','VvLIn':_0x2ac677(0x78),'wmtmS':_0x2ac677(0x7f),'esvBz':'ADMIN_UNSET_OTHER','tosDF':_0x2ac677(0x8a),'sTLMj':'ADMIN_SET','rgfjx':_0x2ac677(0x89)},_0x48358e=_0x519334['Oqjvy'][_0x2ac677(0x7d)]('|'),_0x82f1f4=0x0;while(!![]){switch(_0x48358e[_0x82f1f4++]){case'0':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x70)]]=0xb]=_0x519334[_0x2ac677(0x70)];continue;case'1':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x80)]]=0x9]=_0x519334[_0x2ac677(0x80)];continue;case'2':_0x1e9218[_0x1e9218[_0x519334['VvLIn']]=0x4]=_0x519334[_0x2ac677(0x71)];continue;case'3':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x84)]]=0xc]=_0x519334[_0x2ac677(0x84)];continue;case'4':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x75)]]=0xd]=_0x519334['esvBz'];continue;case'5':_0x1e9218[_0x1e9218[_0x519334['tosDF']]=0x1]=_0x2ac677(0x8a);continue;case'6':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x83)]]=0x8]=_0x519334[_0x2ac677(0x83)];continue;case'7':_0x1e9218[_0x1e9218[_0x519334[_0x2ac677(0x8b)]]=0x7]=_0x519334[_0x2ac677(0x8b)];continue;}break;}}(GroupNotifyTypes||(GroupNotifyTypes={})));function _0x1b9b(){var _0x12ff97=['408163qyuhQu','HAMwk','VvLIn','1911070nsvCQO','8sQYbIn','APPROVE','esvBz','36767quZqnp','mfwow','INVITED_JOIN','ZVRFw','sxbzd','5|2|7|6|1|0|3|4','158660puVDlU','split','WAIT_HANDLE','ADMIN_UNSET','PTTbD','1352375USrHmu','approve','sTLMj','wmtmS','3RLJiVA','1160496CWHgiO','reject','186510wzbZJy','JOIN_REQUEST','INVITE_ME','rgfjx','IGNORE','REJECT','16gGsXcT'];_0x1b9b=function(){return _0x12ff97;};return _0x1b9b();}export var GroupNotifyStatus;(function(_0x3948c1){var _0x832b66=_0x521a,_0x5a5de0={'mfwow':_0x832b66(0x7e),'ZVRFw':_0x832b66(0x74),'sxbzd':_0x832b66(0x8d)};_0x3948c1[_0x3948c1[_0x832b66(0x8c)]=0x0]='IGNORE',_0x3948c1[_0x3948c1[_0x5a5de0[_0x832b66(0x77)]]=0x1]=_0x5a5de0[_0x832b66(0x77)],_0x3948c1[_0x3948c1[_0x5a5de0[_0x832b66(0x79)]]=0x2]=_0x5a5de0[_0x832b66(0x79)],_0x3948c1[_0x3948c1[_0x5a5de0[_0x832b66(0x7a)]]=0x3]=_0x5a5de0['sxbzd'];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0xba5dac){var _0x52cfce=_0x521a,_0x5cc00e={'JtMBU':_0x52cfce(0x82)};_0xba5dac[_0xba5dac[_0x5cc00e['JtMBU']]=0x1]=_0x52cfce(0x82),_0xba5dac[_0xba5dac[_0x52cfce(0x87)]=0x2]=_0x52cfce(0x87);}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));
+(function(_0x19adaa,_0x56a38f){var _0x22c269=_0xe6a3,_0x4d1ed1=_0x19adaa();while(!![]){try{var _0x4f42a1=-parseInt(_0x22c269(0x1b5))/0x1*(parseInt(_0x22c269(0x1b4))/0x2)+parseInt(_0x22c269(0x1b0))/0x3*(parseInt(_0x22c269(0x19f))/0x4)+parseInt(_0x22c269(0x19d))/0x5*(parseInt(_0x22c269(0x195))/0x6)+parseInt(_0x22c269(0x1a4))/0x7*(-parseInt(_0x22c269(0x1b3))/0x8)+parseInt(_0x22c269(0x1a8))/0x9+-parseInt(_0x22c269(0x1ad))/0xa+parseInt(_0x22c269(0x1ae))/0xb;if(_0x4f42a1===_0x56a38f)break;else _0x4d1ed1['push'](_0x4d1ed1['shift']());}catch(_0xb738c2){_0x4d1ed1['push'](_0x4d1ed1['shift']());}}}(_0x2b6d,0x9f8e0));export var GroupNotifyTypes;function _0xe6a3(_0x4af4aa,_0x19eda9){var _0x2b6d36=_0x2b6d();return _0xe6a3=function(_0xe6a34,_0x340ef2){_0xe6a34=_0xe6a34-0x193;var _0x263a9c=_0x2b6d36[_0xe6a34];return _0x263a9c;},_0xe6a3(_0x4af4aa,_0x19eda9);}(function(_0x4847c5){var _0x4d0343=_0xe6a3,_0x174d9b={'PRoCv':'JOIN_REQUEST','curNx':_0x4d0343(0x197),'PpLhV':_0x4d0343(0x1a1),'EZAOo':_0x4d0343(0x196),'DdWWY':_0x4d0343(0x19a),'koXXq':'ADMIN_UNSET'},_0x59ba1c=_0x4d0343(0x1ab)['split']('|'),_0xecf760=0x0;while(!![]){switch(_0x59ba1c[_0xecf760++]){case'0':_0x4847c5[_0x4847c5[_0x4d0343(0x193)]=0xd]=_0x4d0343(0x193);continue;case'1':_0x4847c5[_0x4847c5[_0x174d9b[_0x4d0343(0x19e)]]=0x7]=_0x174d9b[_0x4d0343(0x19e)];continue;case'2':_0x4847c5[_0x4847c5[_0x174d9b[_0x4d0343(0x1b1)]]=0x4]=_0x174d9b[_0x4d0343(0x1b1)];continue;case'3':_0x4847c5[_0x4847c5[_0x174d9b[_0x4d0343(0x19b)]]=0x8]=_0x174d9b[_0x4d0343(0x19b)];continue;case'4':_0x4847c5[_0x4847c5[_0x174d9b[_0x4d0343(0x1af)]]=0x9]='KICK_MEMBER';continue;case'5':_0x4847c5[_0x4847c5[_0x4d0343(0x19a)]=0x1]=_0x174d9b[_0x4d0343(0x19c)];continue;case'6':_0x4847c5[_0x4847c5[_0x4d0343(0x1a9)]=0xc]=_0x174d9b['koXXq'];continue;case'7':_0x4847c5[_0x4847c5[_0x4d0343(0x1a3)]=0xb]='MEMBER_EXIT';continue;}break;}}(GroupNotifyTypes||(GroupNotifyTypes={})));export var GroupNotifyStatus;function _0x2b6d(){var _0x53a903=['approve','REJECT','APPROVE','5482062Heixji','ADMIN_UNSET','LczLZ','5|2|1|3|4|7|6|0','XWKXi','4792400ySuoEl','6268229eyujnE','EZAOo','12vLgAOJ','curNx','HdsbK','280CtpltI','675362GKDhHf','2VSJtMd','ADMIN_UNSET_OTHER','YWYwW','816npOrDS','KICK_MEMBER','INVITED_JOIN','lyfuO','JxSKa','INVITE_ME','PpLhV','DdWWY','30640CFAUGu','PRoCv','108428cimJFa','reject','ADMIN_SET','IGNORE','MEMBER_EXIT','62531OeKwRq'];_0x2b6d=function(){return _0x53a903;};return _0x2b6d();}(function(_0x11adf2){var _0xcfc64b=_0xe6a3,_0x403d8b={'LczLZ':_0xcfc64b(0x1a2),'JxSKa':'WAIT_HANDLE','HdsbK':_0xcfc64b(0x1a7),'lyfuO':_0xcfc64b(0x1a6)};_0x11adf2[_0x11adf2[_0x403d8b[_0xcfc64b(0x1aa)]]=0x0]='IGNORE',_0x11adf2[_0x11adf2[_0x403d8b['JxSKa']]=0x1]=_0x403d8b[_0xcfc64b(0x199)],_0x11adf2[_0x11adf2[_0xcfc64b(0x1a7)]=0x2]=_0x403d8b[_0xcfc64b(0x1b2)],_0x11adf2[_0x11adf2[_0x403d8b[_0xcfc64b(0x198)]]=0x3]=_0x403d8b['lyfuO'];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0xd75311){var _0x325bbd=_0xe6a3,_0x301890={'XWKXi':_0x325bbd(0x1a5),'YWYwW':_0x325bbd(0x1a0)};_0xd75311[_0xd75311[_0x301890[_0x325bbd(0x1ac)]]=0x1]=_0x325bbd(0x1a5),_0xd75311[_0xd75311[_0x301890[_0x325bbd(0x194)]]=0x2]=_0x301890[_0x325bbd(0x194)];}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));

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

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

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

@@ -1 +1 @@
-(function(_0x43febf,_0x26cc5d){var _0x5a3ecf=_0x6a15,_0x577e8b=_0x43febf();while(!![]){try{var _0x312291=parseInt(_0x5a3ecf(0x64))/0x1*(-parseInt(_0x5a3ecf(0x66))/0x2)+parseInt(_0x5a3ecf(0x69))/0x3*(parseInt(_0x5a3ecf(0x71))/0x4)+-parseInt(_0x5a3ecf(0x65))/0x5*(-parseInt(_0x5a3ecf(0x6f))/0x6)+parseInt(_0x5a3ecf(0x6d))/0x7+-parseInt(_0x5a3ecf(0x72))/0x8*(parseInt(_0x5a3ecf(0x6a))/0x9)+-parseInt(_0x5a3ecf(0x74))/0xa*(parseInt(_0x5a3ecf(0x67))/0xb)+parseInt(_0x5a3ecf(0x6c))/0xc*(parseInt(_0x5a3ecf(0x70))/0xd);if(_0x312291===_0x26cc5d)break;else _0x577e8b['push'](_0x577e8b['shift']());}catch(_0x310ece){_0x577e8b['push'](_0x577e8b['shift']());}}}(_0x4077,0x66c73));function _0x4077(){var _0x325b58=['209ZREICU','xtsbZ','21danwfU','5013irDAtx','unknown','12TDknnS','1893549JYoJIE','ekyxd','1919370oWorId','12725193URyyLH','120532QQnsVJ','9400bgoZWF','male','281130UtUHNs','5503tfbscQ','5hnquPE','62ZQzKVd'];_0x4077=function(){return _0x325b58;};return _0x4077();}function _0x6a15(_0x335dbf,_0x5013a1){var _0x40776e=_0x4077();return _0x6a15=function(_0x6a15ee,_0x200ab1){_0x6a15ee=_0x6a15ee-0x64;var _0xfd942f=_0x40776e[_0x6a15ee];return _0xfd942f;},_0x6a15(_0x335dbf,_0x5013a1);}export var Sex;(function(_0x6d3970){var _0x5b3239=_0x6a15,_0x4d96cd={'PIzup':_0x5b3239(0x73),'ekyxd':'female','xtsbZ':_0x5b3239(0x6b)};_0x6d3970[_0x6d3970[_0x5b3239(0x73)]=0x1]=_0x4d96cd['PIzup'],_0x6d3970[_0x6d3970[_0x4d96cd[_0x5b3239(0x6e)]]=0x2]=_0x4d96cd[_0x5b3239(0x6e)],_0x6d3970[_0x6d3970[_0x4d96cd['xtsbZ']]=0xff]=_0x4d96cd[_0x5b3239(0x68)];}(Sex||(Sex={})));
+(function(_0x425abd,_0x1e888d){var _0x176f22=_0x3a30,_0x4eb957=_0x425abd();while(!![]){try{var _0x55b3d4=-parseInt(_0x176f22(0x68))/0x1*(-parseInt(_0x176f22(0x69))/0x2)+-parseInt(_0x176f22(0x6a))/0x3+-parseInt(_0x176f22(0x67))/0x4*(-parseInt(_0x176f22(0x6e))/0x5)+parseInt(_0x176f22(0x6d))/0x6*(parseInt(_0x176f22(0x6f))/0x7)+parseInt(_0x176f22(0x65))/0x8*(-parseInt(_0x176f22(0x6c))/0x9)+parseInt(_0x176f22(0x6b))/0xa*(parseInt(_0x176f22(0x70))/0xb)+-parseInt(_0x176f22(0x71))/0xc;if(_0x55b3d4===_0x1e888d)break;else _0x4eb957['push'](_0x4eb957['shift']());}catch(_0x301dbf){_0x4eb957['push'](_0x4eb957['shift']());}}}(_0x10d9,0xc0c6b));export var Sex;function _0x10d9(){var _0x45bd45=['24TPufBz','female','61524PPefuR','30274SgfYql','2wYyaKc','2551476BRiunw','1069530XXNJIz','2371527aHKuUV','174Ewznuh','135ujiScL','364847LFBbAu','77YfwsAT','3301548qQopWo','male','zQdhj'];_0x10d9=function(){return _0x45bd45;};return _0x10d9();}function _0x3a30(_0x3ec91f,_0x599ffb){var _0x10d945=_0x10d9();return _0x3a30=function(_0x3a3089,_0x1ccb2f){_0x3a3089=_0x3a3089-0x64;var _0x28741a=_0x10d945[_0x3a3089];return _0x28741a;},_0x3a30(_0x3ec91f,_0x599ffb);}(function(_0x59140d){var _0x4927b5=_0x3a30,_0x5741d0={'zQdhj':'male','OFEli':'female','VYGsK':'unknown'};_0x59140d[_0x59140d[_0x4927b5(0x72)]=0x1]=_0x5741d0[_0x4927b5(0x64)],_0x59140d[_0x59140d[_0x5741d0['OFEli']]=0x2]=_0x4927b5(0x66),_0x59140d[_0x59140d[_0x5741d0['VYGsK']]=0xff]=_0x5741d0['VYGsK'];}(Sex||(Sex={})));

src/core.lib/src/index.js

@@ -1 +1 @@
-(function(_0x5c07f4,_0x2006a2){var _0x102273=_0x33d4,_0x1b2e4c=_0x5c07f4();while(!![]){try{var _0x4b36e1=-parseInt(_0x102273(0x11a))/0x1*(parseInt(_0x102273(0x119))/0x2)+parseInt(_0x102273(0x117))/0x3+-parseInt(_0x102273(0x118))/0x4+-parseInt(_0x102273(0x11d))/0x5*(-parseInt(_0x102273(0x11b))/0x6)+-parseInt(_0x102273(0x114))/0x7*(-parseInt(_0x102273(0x11c))/0x8)+-parseInt(_0x102273(0x115))/0x9*(parseInt(_0x102273(0x116))/0xa)+parseInt(_0x102273(0x113))/0xb;if(_0x4b36e1===_0x2006a2)break;else _0x1b2e4c['push'](_0x1b2e4c['shift']());}catch(_0xe443dc){_0x1b2e4c['push'](_0x1b2e4c['shift']());}}}(_0x7174,0xdf2ae));import _0x5a447f from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';export*from'./services';export*as Adapters from'./adapters';function _0x7174(){var _0x4a9f2f=['7137280AHahjf','2SUZpYc','1426793iDSEok','186RrJIqb','14182024amFcHA','265xByRHE','30218584CtUJcy','7bgSnpW','5867460PHClRV','10IByhyg','766821Mkhnob'];_0x7174=function(){return _0x4a9f2f;};return _0x7174();}export*as APIs from'./apis';export*as Entities from'./entities';export*as Listeners from'./listeners';export*as Services from'./services';function _0x33d4(_0x2d407e,_0x521e3f){var _0x717458=_0x7174();return _0x33d4=function(_0x33d449,_0x2ab6ef){_0x33d449=_0x33d449-0x113;var _0x345d1a=_0x717458[_0x33d449];return _0x345d1a;},_0x33d4(_0x2d407e,_0x521e3f);}export{_0x5a447f as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';
+(function(_0x319fd4,_0x36ebc7){var _0x16c645=_0x1d55,_0x598f2d=_0x319fd4();while(!![]){try{var _0x100f53=-parseInt(_0x16c645(0x9e))/0x1+parseInt(_0x16c645(0x9b))/0x2*(-parseInt(_0x16c645(0x9f))/0x3)+parseInt(_0x16c645(0x9d))/0x4+-parseInt(_0x16c645(0x9a))/0x5*(-parseInt(_0x16c645(0x98))/0x6)+-parseInt(_0x16c645(0xa1))/0x7+parseInt(_0x16c645(0x99))/0x8*(parseInt(_0x16c645(0x9c))/0x9)+parseInt(_0x16c645(0xa0))/0xa*(parseInt(_0x16c645(0x97))/0xb);if(_0x100f53===_0x36ebc7)break;else _0x598f2d['push'](_0x598f2d['shift']());}catch(_0x545faa){_0x598f2d['push'](_0x598f2d['shift']());}}}(_0xf987,0x45f64));import _0x3295a6 from'./wrapper';export*from'./adapters';export*from'./apis';export*from'./entities';export*from'./listeners';export*from'./services';export*as Adapters from'./adapters';function _0x1d55(_0x492aeb,_0x2def52){var _0xf987b4=_0xf987();return _0x1d55=function(_0x1d55bf,_0x3366cc){_0x1d55bf=_0x1d55bf-0x97;var _0x289d93=_0xf987b4[_0x1d55bf];return _0x289d93;},_0x1d55(_0x492aeb,_0x2def52);}function _0xf987(){var _0x18f69e=['3798pPzyMr','1107212bUtfwn','488277OidVGU','3ZknyDF','590NcbPFy','3117562glWUQw','123409TtdMvU','2182044MHUfbL','424iilEix','5UPtXMP','209114WOuxTa'];_0xf987=function(){return _0x18f69e;};return _0xf987();}export*as APIs from'./apis';export*as Entities from'./entities';export*as Listeners from'./listeners';export*as Services from'./services';export{_0x3295a6 as Wrapper};export*as WrapperInterface from'./wrapper';export*as SessionConfig from'./sessionConfig';export{napCatCore}from'./core';

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

@@ -1,10 +1,5 @@
-import { FriendRequestNotify, User } from '@/core/entities';
-export type OnBuddyChangeParams = {
-    categoryId: number;
-    categroyName: string;
-    categroyMbCount: number;
-    buddyList: User[];
-}[];
+import { BuddyCategoryType, FriendRequestNotify } from '@/core/entities';
+export type OnBuddyChangeParams = BuddyCategoryType[];
 interface IBuddyListener {
     onBuddyListChange(arg: OnBuddyChangeParams): void;
     onBuddyInfoChange(arg: unknown): void;

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

@@ -1 +1 @@
-var _0x43ffb8=_0x34a5;function _0x34a5(_0xbd6dc2,_0x5e4dfa){var _0x41cd48=_0x41cd();return _0x34a5=function(_0x34a5e1,_0x31d0bf){_0x34a5e1=_0x34a5e1-0x131;var _0x40146c=_0x41cd48[_0x34a5e1];return _0x40146c;},_0x34a5(_0xbd6dc2,_0x5e4dfa);}(function(_0x173523,_0x27f329){var _0x3edae6=_0x34a5,_0x38f4ed=_0x173523();while(!![]){try{var _0x2f0166=-parseInt(_0x3edae6(0x13d))/0x1+parseInt(_0x3edae6(0x140))/0x2+-parseInt(_0x3edae6(0x134))/0x3+parseInt(_0x3edae6(0x133))/0x4*(parseInt(_0x3edae6(0x136))/0x5)+parseInt(_0x3edae6(0x139))/0x6+-parseInt(_0x3edae6(0x13c))/0x7+-parseInt(_0x3edae6(0x132))/0x8;if(_0x2f0166===_0x27f329)break;else _0x38f4ed['push'](_0x38f4ed['shift']());}catch(_0x1ebbfa){_0x38f4ed['push'](_0x38f4ed['shift']());}}}(_0x41cd,0x4b33c));export class BuddyListener{[_0x43ffb8(0x137)](_0x3546ad){}[_0x43ffb8(0x13a)](_0x2f915f){}[_0x43ffb8(0x142)](_0x19088e){}['onBlockChanged'](_0x2a2dbf){}[_0x43ffb8(0x13f)](_0x5138c1){}[_0x43ffb8(0x144)](_0x1a649d){}[_0x43ffb8(0x13e)](_0x150e9e){}[_0x43ffb8(0x141)](_0x2b2343){}[_0x43ffb8(0x145)](_0x4ed4aa){}[_0x43ffb8(0x143)](_0x38b740){}[_0x43ffb8(0x131)](_0x5bfe1b){}[_0x43ffb8(0x13b)](_0x2e6578){}[_0x43ffb8(0x146)](_0x270578){}[_0x43ffb8(0x135)](_0x2c6a86){}[_0x43ffb8(0x138)](_0x29ab96){}['onSmartInfos'](_0x1a0652){}['onSpacePermissionInfos'](_0x1f2099){}}function _0x41cd(){var _0x3354a4=['450732vgcdDz','onAddMeSettingChanged','onDelBatchBuddyInfos','385973tJLKHu','22734WLnzcD','onBuddyListChange','onBuddyDetailInfoChange','1216870dfRbOD','onBuddyRemarkUpdated','onAvatarUrlUpdated','onBuddyReqUnreadCntChange','onBuddyInfoChange','onBuddyReqChange','onDoubtBuddyReqChange','onCheckBuddySettingResult','2099928MmSdbx','32mSfgTF','1662663nqzweX','onDoubtBuddyReqUnreadNumChange','324410gWpuWt','onAddBuddyNeedVerify','onNickUpdated'];_0x41cd=function(){return _0x3354a4;};return _0x41cd();}
+var _0x23ddb8=_0x2807;function _0x2807(_0x50bec3,_0x3a2f12){var _0x37a4a0=_0x37a4();return _0x2807=function(_0x280733,_0x4ca479){_0x280733=_0x280733-0x166;var _0x2b7184=_0x37a4a0[_0x280733];return _0x2b7184;},_0x2807(_0x50bec3,_0x3a2f12);}(function(_0x57b081,_0xcf01f0){var _0x3ea7e8=_0x2807,_0x359b72=_0x57b081();while(!![]){try{var _0x5a72db=parseInt(_0x3ea7e8(0x16d))/0x1+-parseInt(_0x3ea7e8(0x175))/0x2+-parseInt(_0x3ea7e8(0x168))/0x3*(parseInt(_0x3ea7e8(0x166))/0x4)+-parseInt(_0x3ea7e8(0x16a))/0x5+parseInt(_0x3ea7e8(0x16c))/0x6*(-parseInt(_0x3ea7e8(0x174))/0x7)+parseInt(_0x3ea7e8(0x16b))/0x8+parseInt(_0x3ea7e8(0x178))/0x9;if(_0x5a72db===_0xcf01f0)break;else _0x359b72['push'](_0x359b72['shift']());}catch(_0x25c4bb){_0x359b72['push'](_0x359b72['shift']());}}}(_0x37a4,0x56836));function _0x37a4(){var _0x44b3e3=['onSmartInfos','1981011zGKrTe','onAddBuddyNeedVerify','3052675KXxGXu','2443040qOTpUi','33204EgNaVL','181209BklYDD','onDoubtBuddyReqChange','onDelBatchBuddyInfos','onBuddyReqUnreadCntChange','onBuddyRemarkUpdated','onSpacePermissionInfos','onCheckBuddySettingResult','532IUDSdU','147526DehJlD','onNickUpdated','onBuddyInfoChange','14696892FSrlvj','4nGTPMa'];_0x37a4=function(){return _0x44b3e3;};return _0x37a4();}export class BuddyListener{[_0x23ddb8(0x169)](_0x4921b8){}['onAddMeSettingChanged'](_0x29d5ce){}['onAvatarUrlUpdated'](_0x1e1697){}['onBlockChanged'](_0x326261){}['onBuddyDetailInfoChange'](_0x263d09){}[_0x23ddb8(0x177)](_0x326756){}['onBuddyListChange'](_0x1395e7){}[_0x23ddb8(0x171)](_0x8597ba){}['onBuddyReqChange'](_0x313e76){}[_0x23ddb8(0x170)](_0x3d4ac9){}[_0x23ddb8(0x173)](_0x3f8ad8){}[_0x23ddb8(0x16f)](_0x4dac3c){}[_0x23ddb8(0x16e)](_0x33d605){}['onDoubtBuddyReqUnreadNumChange'](_0x51e2e4){}[_0x23ddb8(0x176)](_0x2004d4){}[_0x23ddb8(0x167)](_0x67b91d){}[_0x23ddb8(0x172)](_0x163501){}}

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

@@ -1 +1 @@
-var _0x4853c7=_0x5e88;(function(_0x1898cd,_0x574fb4){var _0x4005ed=_0x5e88,_0xb95379=_0x1898cd();while(!![]){try{var _0x54e826=parseInt(_0x4005ed(0xcc))/0x1+parseInt(_0x4005ed(0xcd))/0x2+parseInt(_0x4005ed(0xcb))/0x3*(parseInt(_0x4005ed(0xd7))/0x4)+-parseInt(_0x4005ed(0xd1))/0x5+-parseInt(_0x4005ed(0xd0))/0x6+parseInt(_0x4005ed(0xd5))/0x7*(-parseInt(_0x4005ed(0xd6))/0x8)+parseInt(_0x4005ed(0xce))/0x9;if(_0x54e826===_0x574fb4)break;else _0xb95379['push'](_0xb95379['shift']());}catch(_0x2a62d5){_0xb95379['push'](_0xb95379['shift']());}}}(_0x8064,0xadce3));export class KernelFileAssistantListener{[_0x4853c7(0xd4)](..._0x7829be){}[_0x4853c7(0xcf)](..._0x5a79a1){}['onSessionChanged'](..._0x1aed20){}[_0x4853c7(0xd3)](..._0x448c87){}[_0x4853c7(0xd2)](..._0x33c424){}}function _0x5e88(_0xb274cd,_0x3b853d){var _0x806412=_0x8064();return _0x5e88=function(_0x5e887f,_0x1546d6){_0x5e887f=_0x5e887f-0xcb;var _0x27a304=_0x806412[_0x5e887f];return _0x27a304;},_0x5e88(_0xb274cd,_0x3b853d);}function _0x8064(){var _0xafb6f5=['4236030MCvGNt','3401230gZIaNq','onFileSearch','onFileListChanged','onFileStatusChanged','184499SqhNVq','424HGNNQv','399648AxnVMu','15KnNaQh','272807XcaZGW','418436HfaDTG','22621446HbBvrG','onSessionListChanged'];_0x8064=function(){return _0xafb6f5;};return _0x8064();}
+var _0x432220=_0x5630;(function(_0xb122d2,_0x46fb6a){var _0x8ddffd=_0x5630,_0x6e08d6=_0xb122d2();while(!![]){try{var _0xe651f2=parseInt(_0x8ddffd(0x10d))/0x1*(parseInt(_0x8ddffd(0x11a))/0x2)+-parseInt(_0x8ddffd(0x113))/0x3+parseInt(_0x8ddffd(0x10c))/0x4*(parseInt(_0x8ddffd(0x119))/0x5)+-parseInt(_0x8ddffd(0x114))/0x6*(parseInt(_0x8ddffd(0x118))/0x7)+-parseInt(_0x8ddffd(0x116))/0x8*(-parseInt(_0x8ddffd(0x10b))/0x9)+-parseInt(_0x8ddffd(0x10e))/0xa*(parseInt(_0x8ddffd(0x10f))/0xb)+parseInt(_0x8ddffd(0x110))/0xc*(parseInt(_0x8ddffd(0x117))/0xd);if(_0xe651f2===_0x46fb6a)break;else _0x6e08d6['push'](_0x6e08d6['shift']());}catch(_0x18ac53){_0x6e08d6['push'](_0x6e08d6['shift']());}}}(_0x5cbd,0x8a0e7));function _0x5cbd(){var _0x10d8d5=['3042964gjsjka','12gjKcjb','70SbsBmZ','1211210BFgWNP','12BXOQDj','onFileStatusChanged','onFileSearch','2102988SWouMz','66YhQlqd','onFileListChanged','51568XMiGBC','17939077EJaUxG','552503dZkVib','5RzvUww','115648yQsBhK','99XRZHir'];_0x5cbd=function(){return _0x10d8d5;};return _0x5cbd();}function _0x5630(_0x5d5623,_0x36bebd){var _0x5cbd15=_0x5cbd();return _0x5630=function(_0x5630c1,_0x26aee4){_0x5630c1=_0x5630c1-0x10b;var _0x50110c=_0x5cbd15[_0x5630c1];return _0x50110c;},_0x5630(_0x5d5623,_0x36bebd);}export class KernelFileAssistantListener{[_0x432220(0x111)](..._0x1ae1b1){}['onSessionListChanged'](..._0x1687e5){}['onSessionChanged'](..._0x4fad0f){}[_0x432220(0x115)](..._0x2cf65c){}[_0x432220(0x112)](..._0x53d0d8){}}

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

@@ -2,7 +2,7 @@ import { Group, GroupMember, GroupNotify } from '@/core/entities';
 interface IGroupListener {
     onGroupListUpdate(updateType: number, groupList: Group[]): void;
     onGroupExtListUpdate(...args: unknown[]): void;
-    onGroupSingleScreenNotifies(...args: unknown[]): void;
+    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void;
     onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): void;
     onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void;
     onGroupDetailInfoChange(...args: unknown[]): void;
@@ -50,7 +50,7 @@ export declare class GroupListener implements IGroupListener {
     onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): void;
     onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): void;
     onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void;
-    onGroupSingleScreenNotifies(...args: unknown[]): void;
+    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void;
     onGroupsMsgMaskResult(...args: unknown[]): void;
     onGroupStatisticInfoChange(...args: unknown[]): void;
     onJoinGroupNotify(...args: unknown[]): void;
@@ -82,7 +82,7 @@ export declare class DebugGroupListener implements IGroupListener {
     onGroupNotifiesUpdated(...args: unknown[]): void;
     onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): void;
     onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void;
-    onGroupSingleScreenNotifies(...args: unknown[]): void;
+    onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void;
     onGroupsMsgMaskResult(...args: unknown[]): void;
     onGroupStatisticInfoChange(...args: unknown[]): void;
     onJoinGroupNotify(...args: unknown[]): void;