fix

feat: statistic sent receive msg count by api get_status

.github/workflows/build.yml

@@ -1,6 +1,11 @@
 name: "Build"
 on:
+  workflow_dispatch:
   push:
+    branches:
+      - main
+
+permissions: write-all
 
 jobs:
   build-linux:
@@ -9,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
@@ -17,6 +22,7 @@ jobs:
       with:
           repository: 'NapNeko/NapCatQQ'
           submodules: true
+          ref: main
           token: ${{ secrets.NAPCAT_BUILD }}
     - name: Use Node.js 20.X
       uses: actions/setup-node@v4
@@ -48,6 +54,7 @@ jobs:
           with:
                 repository: 'NapNeko/NapCatQQ'
                 submodules: true
+                ref: main
                 token: ${{ secrets.NAPCAT_BUILD }}
         - name: Use Node.js 20.X
           uses: actions/setup-node@v4
@@ -64,4 +71,4 @@ jobs:
           uses: actions/upload-artifact@v4
           with:
               name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-              path: dist
+              path: dist

.github/workflows/release.yml

@@ -14,6 +14,7 @@ jobs:
       - name: Clone Repository
         uses: actions/checkout@v4
         with:
+          ref: main
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract version from tag
@@ -27,14 +28,15 @@ jobs:
       - name: Check Version
         run: | 
               ls
-              node ./script/checkVersion.js
+              node ./script/checkVersion.cjs
               sh ./checkVersion.sh
   build-linux:
+    needs: [check-version]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target_platform: [linux,darwin]
+        target_platform: [linux]
         target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
@@ -42,6 +44,7 @@ jobs:
       with:
           repository: 'NapNeko/NapCatQQ'
           submodules: true
+          ref: main
           token: ${{ secrets.NAPCAT_BUILD }}
     - name: Use Node.js 20.X
       uses: actions/setup-node@v4
@@ -50,6 +53,8 @@ jobs:
 
     - name: Build NuCat Linux
       run: |
+          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
           npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
           npm run build:prod
           cd dist
@@ -62,6 +67,7 @@ jobs:
         path: dist
   build-win32:
     runs-on: ubuntu-latest
+    needs: [check-version]
     strategy:
       fail-fast: false
       matrix:
@@ -73,6 +79,7 @@ jobs:
           with:
                 repository: 'NapNeko/NapCatQQ'
                 submodules: true
+                ref: main
                 token: ${{ secrets.NAPCAT_BUILD }}
 
         - name: Use Node.js 20.X
@@ -82,6 +89,8 @@ jobs:
           
         - name: Build NuCat Linux
           run: |
+                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
+                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
                 npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
                 npm run build:prod
                 cd dist
@@ -107,16 +116,23 @@ jobs:
           base=$(basename "$dir")
           zip -r "${base}.zip" "$dir"
         done 
+    
+    - name: Extract version from tag
+      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
         
     - name: Create Release Draft and Upload Artifacts
       uses: softprops/action-gh-release@v1
       with:
-        name: NapCat V0.0.0
-        token: ${{ secrets.NAPCAT_BUILD }}
+        name: NapCat V${{ env.VERSION }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        body_path: CHANGELOG.md
         files: |
           NapCat.win32.x64.zip
           NapCat.linux.x64.zip
           NapCat.linux.arm64.zip
-          NapCat.darwin.x64.zip
-          NapCat.darwin.arm64.zip
+#          NapCat.darwin.x64.zip
+#          NapCat.darwin.arm64.zip
         draft: true

.gitignore

@@ -14,3 +14,4 @@ src/core.lib/common/
 
 # Build
 *.db
+checkVersion.sh

CHANGELOG.md

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

@@ -4,162 +4,32 @@
 
 ## 项目介绍
 
-NapCatQQ（瞌睡猫QQ，不准叫我NCQQ！），像睡着了一样在后台低占用运行的无头(没有界面)的NTQQ
+NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
 
-目前测试在 Windows 上表现优秀，最低可达只占用内存 **20M**左右
+名字寓意 瞌睡猫QQ，像睡着了一样在后台低占用运行的无需GUI界面的NTQQ。
 
-由于 Linux 上的 QQ 图形依赖较多，会导致内存占用小高，大约 **100+M**，目前正在研究如何优化
+## 如何使用
 
-具体占用会因人而异，QQ 群、好友越多占用越高
+可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-## 下载
+**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
 
-前往 Release 页面下载最新版本
 
-## 启动
-
-NapCat 是基于 官方NTQQ 实现的Bot框架，因此先需要安装官方QQ，**注意同个账号不能同时登录原版 QQ 和 NapCatQQ**
-
-*如果没有安装 QQ 请往后翻查看安装方法*
-
-修改 `config/onebot11.json`内容，并重名为 `onebot11_<你的QQ号>.json`，如`onebot11_1234567.json`
-
-json 配置内容参数解释：
-
-```json5
-{
-  // 是否启用http服务，如果启用，可以通过http接口发送消息
-  "enableHttp": false,
-  // http服务端口
-  "httpPort": 3000,
-  // 是否启用正向websocket服务
-  "enableWs": false,
-  // 正向websocket服务端口
-  "wsPort": 3001,
-  // 是否启用反向websocket服务
-  "enableWsReverse": false,
-  // 反向websocket对接的地址, 如["ws://127.0.0.1:8080/onebot/v11/ws"]
-  "wsReverseUrls": [],
-  // 是否启用http上报服务
-  "enableHttpPost": false,
-  // http上报地址, 如["http://127.0.0.1:8080/onebot/v11/http"]
-  "httpPostUrls": [],
-  // http上报密钥，可为空
-  "httpSecret": "",
-  // 消息上报格式，array为消息组，string为cq码字符串
-  "messagePostFormat": "array",
-  // 是否上报自己发送的消息
-  "reportSelfMessage": false,
-  // 是否开启调试模式，开启后上报消息会携带一个raw字段，为原始消息内容
-  "debug": false,
-  // 调用get_file接口时如果获取不到url则使用base64字段返回文件内容
-  "enableLocalFile2Url": true,
-  // ws心跳间隔，单位毫秒
-  "heartInterval": 30000,
-  // access_token，可以为空
-  "token": ""
-}
-
-```
-
-### Windows 启动
-
-运行`powershell ./napcat.ps1`, 或者 `napcat.bat`，如果出现乱码，可以尝试运行`napcat-utf8.ps1` 或 `napcat-utf8.bat`
-
-*如果出现 powershell 运行不了，以管理员身份打开 powershell，输入 `Set-ExecutionPolicy RemoteSigned`*
-
-### Linux 启动
-
-运行`napcat.sh`
-
-## 使用无需扫码快速登录
-
-前提是你已经成功登录过QQ，可以加参数` -q <你的QQ>` 进行登录，如`napcat.sh -q 1234567`
-
-## 安装
-
-### Linux安装
-
-#### 安装 Linux QQ(22741)，已经安装了的可以跳过
-
-目前还在研究怎么精简安装，暂时只能安装官方QQ整体依赖
-
-下载QQ
- 
-[deb x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_amd64_01.deb)
-[deb arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_arm64_01.deb)
-
-[rpm x86版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_x86_64_01.rpm)
-[rpm arm版本](https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.7_240403_aarch64_01.rpm)
-
-```bash
-sudo apt install ./qq.deb
-```
-
-```bash
-安装QQ的依赖
-sudo apt install libgbm1 libasound2
-```
-
-### Windows 安装
-
-#### 安装Windows QQ(22741)，已经安装了的可以跳过
-
-[Windows版本QQ下载](https://dldir1.qq.com/qqfile/qq/QQNT/Windows/QQ_9.9.9_240403_x64_01.exe)
-
-### 编译安装 NapCat
-
-**如果你是直接下载编译好的版本，可以跳过这一步**
-
-准备环境 [node18.18](https://nodejs.org/download/release/v18.18.2/)
-
-```
-export NODE_ENV=production
-npm install
-```
-
-## 常见问题
-
-### 二维码无法扫描
-
-NapCat 会自动保存二维码到目录，可以手动打开图片扫描
-
-如果没有条件访问本地目录，可以将二维码解析的 url 复制到二维码生成网站上生成二维码，然后手机QQ扫描
-
-### 语音、视频发送失败
-
-需要配置 ffmpeg，将 ffmpeg 目录加入环境变量，如果仍未生效，可以修改 napcat 启动脚本加入 FFMPEG_PATH 变量指定到 ffmpeg
-程序的完整路径
-
-如 Windows 上修改 napcat.ps1，在第一行加入
-
-```powershell
-$env:FFMPEG_PATH="d:\ffmpeg\bin\ffmpeg.exe"
-```
-
-### 出现 error code v2:-1 之类的提示
-
-不用管，这是正常现象，是因为 QQ 本身的问题，不影响使用
-
-## API 文档
-
-参考 [LLOneBot](https://llonebot.github.io/zh-CN/develop/api) 的文档
-
-<!-- 
-QQ群：545402644
--->
-
-## 声明
+## 项目声明
 
 * 请不要在无关地方宣传NapCatQQ，本项目只是用于学习 node 相关知识，切勿用于违法用途
 
 * NapCat 不会收集用户隐私信息，但是未来可能会为了更好的利于 NapCat 的优化会收集一些设备信息，如 cpu 架构，系统版本等
   
 ## 相关链接
-
-[TG群](https://t.me/+nLZEnpne-pQ1OWFl)
+[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
 ## 鸣谢名单
+
 [OpenShamrock]()
 
 [Lagrange]()
+
+<!-- 
+QQ群：545402644
+-->

package.json

@@ -2,14 +2,14 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.0.2",
+  "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 && vite build --mode production",
+    "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}",
@@ -21,6 +21,7 @@
     "@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",
@@ -47,17 +48,17 @@
   },
   "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",
-    "protobufjs": "^7.2.6",
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.3.4",
     "sqlite3": "^5.1.7",
     "uuid": "^9.0.1",
-    "ws": "^8.16.0",
-    "yaml": "^2.4.1"
+    "ws": "^8.16.0"
   }
 }

script/checkVersion.cjs

@@ -0,0 +1,13 @@
+let fs = require("fs");
+let 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")
+}

script/checkVersion.js

@@ -1,16 +0,0 @@
-let fs = require("fs");
-let 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);
-// 借用dist目录输出脚本
-fs.mkdir("./dist");
-if (currentVersion === targetVersion) {
-    fs.appendFileSync("./checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"")
-} else {
-    let packageJson = JSON.parse(fs.readFileSync("./package.json"));
-    packageJson.version = targetVersion;
-    fs.writeFileSync("./package.json", JSON.stringify(packageJson));
-    fs.appendFileSync("./checkVersion.sh", "#!/bin/bashe\ngit add .\n git commit -m \"chore:version change\"\n git push")
-}

script/copy-core.cjs

@@ -0,0 +1,32 @@
+let fs = require('fs');
+let path = require('path');
+
+const coreDistDir = path.join(path.resolve(__dirname, '../'), 'src/core/dist/core/src');
+const coreLibDir = path.join(path.resolve(__dirname, '../'), 'src/core.lib/src');
+
+function copyDir(currentPath, outputDir) {
+  fs.readdir(currentPath, { withFileTypes: true }, (err, entries) => {
+    if (err?.errno === -4058) return;
+
+    entries.forEach(entry => {
+      const localBasePath = path.join(currentPath, entry.name);
+      const outputLocalBasePath = path.join(outputDir, entry.name);
+
+      if (entry.isDirectory()) {
+        // 如果是目录，递归调用
+        if (!fs.existsSync(outputLocalBasePath)) {
+          fs.mkdirSync(outputLocalBasePath, { recursive: true });
+        }
+        copyDir(localBasePath, outputLocalBasePath);
+      }
+      else{
+        // 如果是文件，直接复制
+        fs.copyFile(localBasePath, outputLocalBasePath, (err) => {
+          if (err) throw err;
+        });
+      }
+    });
+  });
+}
+
+copyDir(coreDistDir, coreLibDir);

src/common/data.ts

@@ -1,85 +0,0 @@
-import {
-  type Friend,
-  type FriendRequest,
-  type Group,
-  type GroupMember, GroupNotify,
-  type SelfInfo
-} from '@/core/qqnt/entities';
-import { isNumeric } from './utils/helper';
-import { log } from '@/common/utils/log';
-
-export const selfInfo: SelfInfo = {
-  uid: '',
-  uin: '',
-  nick: '',
-  online: true
-};
-
-// groupCode -> Group
-export const groups: Map<string, Group> = new Map<string, Group>();
-
-// 群号 -> 群成员map(uid=>GroupMember)
-export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
-
-// uid -> Friend
-export const friends: Map<string, Friend> = new Map<string, Friend>();
-
-export const friendRequests: Record<string, FriendRequest> = {}; // flag->FriendRequest
-export const groupNotifies: Record<string, GroupNotify> = {}; // flag->GroupNotify
-
-export const napCatError = {
-  ffmpegError: '',
-  httpServerError: '',
-  wsServerError: '',
-  otherError: 'NapCat未能正常启动，请检查日志查看错误'
-};
-
-export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-  uinOrUid = uinOrUid.toString();
-  if (isNumeric(uinOrUid)) {
-    const friendList = Array.from(friends.values());
-    return friendList.find(friend => friend.uin === uinOrUid);
-  } else {
-    return friends.get(uinOrUid);
-  }
-}
-
-export async function getGroup(qq: string): Promise<Group | undefined> {
-  const group = groups.get(qq.toString());
-  return group;
-}
-
-export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
-  groupQQ = groupQQ.toString();
-  memberUinOrUid = memberUinOrUid.toString();
-  const members = groupMembers.get(groupQQ);
-  if (!members) {
-    return null;
-  }
-  // log('getGroupMember', members);
-  if (isNumeric(memberUinOrUid)) {
-    return Array.from(members.values()).find(member => member.uin === memberUinOrUid);
-  } else {
-    return members.get(memberUinOrUid);
-  }
-}
-
-export async function refreshGroupMembers(groupQQ: string) {
-  // const group = groups.find(group => group.groupCode === groupQQ)
-  // if (group) {
-  //     group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
-  // }
-}
-
-export const uid2UinMap: Record<string, string> = {}; // 一串加密的字符串(uid) -> qq号
-
-export function getUidByUin(uin: string) {
-  for (const uid in uid2UinMap) {
-    if (uid2UinMap[uid] === uin) {
-      return uid;
-    }
-  }
-}
-
-export const tempGroupCodeMap: Record<string, string> = {};  // peerUid => 群号
-

src/common/server/http.ts

@@ -1,17 +1,19 @@
 import express, { Express, Request, Response } from 'express';
+import cors from 'cors';
 import http from 'http';
-import { log } from '../utils/log';
+import { log, logDebug, logError } from '../utils/log';
 import { ob11Config } from '@/onebot11/config';
 
 type RegisterHandler = (res: Response, payload: any) => Promise<any>
 
 export abstract class HttpServerBase {
-  name: string = 'LLOneBot';
+  name: string = 'NapCatQQ';
   private readonly expressAPP: Express;
   private server: http.Server | null = null;
 
   constructor() {
     this.expressAPP = express();
+    this.expressAPP.use(cors());
     this.expressAPP.use(express.urlencoded({ extended: true, limit: '5000mb' }));
     this.expressAPP.use((req, res, next) => {
       // 兼容处理没有带content-type的请求
@@ -21,7 +23,7 @@ export abstract class HttpServerBase {
       // 调用原始的express.json()处理器
       originalJson(req, res, (err) => {
         if (err) {
-          log('Error parsing JSON:', err);
+          logError('Error parsing JSON:', err);
           return res.status(400).send('Invalid JSON');
         }
         next();
@@ -35,14 +37,14 @@ export abstract class HttpServerBase {
     const authHeader = req.get('authorization');
     if (authHeader) {
       clientToken = authHeader.split('Bearer ').pop() || '';
-      log('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();
       }
-      log('receive http url token', clientToken);
+      logDebug('receive http url token', clientToken);
     }
 
     if (serverToken && clientToken != serverToken) {
@@ -51,14 +53,14 @@ export abstract class HttpServerBase {
     next();
   }
 
-  start(port: number) {
+  start(port: number, host: string) {
     try {
       this.expressAPP.get('/', (req: Request, res: Response) => {
         res.send(`${this.name}已启动`);
       });
-      this.listen(port);
+      this.listen(port, host);
     } catch (e: any) {
-      log('HTTP服务启动失败', e.toString());
+      logError('HTTP服务启动失败', e.toString());
       // llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
     }
   }
@@ -71,9 +73,9 @@ export abstract class HttpServerBase {
     }
   }
 
-  restart(port: number) {
+  restart(port: number, host: string) {
     this.stop();
-    this.start(port);
+    this.start(port, host);
   }
 
   abstract handleFailed(res: Response, payload: any, err: any): void
@@ -86,7 +88,7 @@ export abstract class HttpServerBase {
     // @ts-expect-error wait fix
     if (!this.expressAPP[method]) {
       const err = `${this.name} register router failed，${method} not exist`;
-      log(err);
+      logError(err);
       throw err;
     }
     // @ts-expect-error wait fix
@@ -94,8 +96,10 @@ export abstract class HttpServerBase {
       let payload = req.body;
       if (method == 'get') {
         payload = req.query;
+      } else if (req.query) {
+        payload = { ...req.query, ...req.body };
       }
-      log('收到http请求', url, payload);
+      logDebug('收到http请求', url, payload);
       try {
         res.send(await handler(res, payload));
       } catch (e: any) {
@@ -104,10 +108,15 @@ export abstract class HttpServerBase {
     });
   }
 
-  protected listen(port: number) {
-    this.server = this.expressAPP.listen(port, '0.0.0.0', () => {
-      const info = `${this.name} started 0.0.0.0:${port}`;
-      log(info);
-    });
+  protected listen(port: number, host: string = '0.0.0.0') {
+    host = host || '0.0.0.0';
+    try {
+      this.server = this.expressAPP.listen(port, host, () => {
+        const info = `${this.name} started ${host}:${port}`;
+        log(info);
+      });
+    }catch (e: any) {
+      logError('HTTP服务启动失败, 请检查监听的ip地址和端口', e.stack.toString());
+    }
   }
 }

src/common/server/websocket.ts

@@ -27,11 +27,16 @@ export class WebsocketServerBase {
   constructor() {
   }
 
-  start(port: number) {
+  start(port: number, host: string = '') {
     try {
-      this.ws = new WebSocketServer({ port });
+      this.ws = new WebSocketServer({
+        port ,
+        host: '',
+        maxPayload: 1024 * 1024 * 1024
+      });
+      log(`ws服务启动成功, ${host}:${port}`);
     } catch (e: any) {
-      throw Error('ws服务启动失败, ' + e.toString());
+      throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
     }
     this.ws.on('connection', (wsClient, req) => {
       const url: string = req.url!.split('?').shift() || '/';

src/common/utils/AsyncQueue.ts

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

src/common/utils/ConfigBase.ts

@@ -0,0 +1,67 @@
+import path from 'node:path';
+import fs from 'node:fs';
+import { log, logDebug, logError } from '@/common/utils/log';
+
+const configDir = path.resolve(__dirname, 'config');
+fs.mkdirSync(configDir, { recursive: true });
+
+
+export class ConfigBase<T>{
+
+  constructor() {
+  }
+
+  protected getKeys(): string[] | null {
+    // 决定 key 在json配置文件中的顺序
+    return null;
+  }
+
+  getConfigDir(){
+    const configDir = path.resolve(__dirname, 'config');
+    fs.mkdirSync(configDir, { recursive: true });
+    return configDir;
+  }
+  getConfigPath(): string {
+    throw new Error('Method not implemented.');
+  }
+
+  read() {
+    const configPath = this.getConfigPath();
+    if (!fs.existsSync(configPath)) {
+      try{
+        fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
+        log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
+      }
+      catch (e: any) {
+        logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
+      }
+      return this;
+    }
+    try {
+      const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      logDebug(`配置文件${configPath}已加载`, data);
+      Object.assign(this, data);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      this.save(this); // 保存一次，让新版本的字段写入
+      return this;
+    } catch (e: any) {
+      if (e instanceof SyntaxError) {
+        logError(`配置文件 ${configPath} 格式错误，请检查配置文件:`, e.message);
+      } else {
+        logError(`读取配置文件 ${configPath} 时发生错误:`, e.message);
+      }
+      return this;
+    }
+  }
+
+  save(config: T) {
+    Object.assign(this, config);
+    const configPath = this.getConfigPath();
+    try {
+      fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
+    } catch (e: any) {
+      logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+    }
+  }
+}

src/common/utils/QQBasicInfo.ts

@@ -37,24 +37,36 @@ type QQVersionConfigInfo = {
 }
 
 let _qqVersionConfigInfo: QQVersionConfigInfo = {
-  'baseVersion': '9.9.9-22578',
-  'curVersion': '9.9.9-22578',
+  'baseVersion': '9.9.9-23361',
+  'curVersion': '9.9.9-23361',
   'prevVersion': '',
   'onErrorVersions': [],
-  'buildId': '22578'
+  'buildId': '23361'
 };
 
 if (fs.existsSync(configVersionInfoPath)) {
-  _qqVersionConfigInfo = JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
+  try {
+    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);
+  }
 }
 
 export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
 
 export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
+// platform_type: 3,
+// app_type: 4,
+// app_version: '9.9.9-23159',
+// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
+// appid: '537213764',
+// platVer: '10.0.26100',
+// clientVer: '9.9.9-23159',
 
-let _appid: string = '537213335';  // 默认为 Windows 平台的 appid
+let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
 if (systemPlatform === 'linux') {
-  _appid = '537213710';
+  _appid = '537213827';
 }
 // todo: mac 平台的 appid
 export const appid = _appid;

src/common/utils/audio.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm';
 import fsPromise from 'fs/promises';
-import { log } from './log';
+import { log, logError } from './log';
 import path from 'node:path';
 import { v4 as uuidv4 } from 'uuid';
 import { spawn } from 'node:child_process';
@@ -129,7 +129,7 @@ export async function encodeSilk(filePath: string) {
       };
     }
   } catch (error: any) {
-    log('convert silk failed', error.stack);
+    logError('convert silk failed', error.stack);
     return {};
   }
 }

src/common/utils/cpmodule.ts

@@ -0,0 +1,19 @@
+import * as os from 'os';
+import path from 'node:path';
+import fs from 'fs';
+
+export function getModuleWithArchName(moduleName: string) {
+  const systemPlatform = os.platform();
+  const cpuArch = os.arch();
+  return `${moduleName}-${systemPlatform}-${cpuArch}.node`;
+}
+
+export function cpModule(moduleName: string) {
+  const currentDir = path.resolve(__dirname);
+  const fileName = `./${getModuleWithArchName(moduleName)}`;
+  try {
+    fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
+  } catch (e) {
+
+  }
+}

src/common/utils/db.ts

@@ -1,323 +0,0 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '@/core/qqnt/entities';
-
-import sqlite3 from 'sqlite3';
-import { log } from '@/common/utils/log';
-
-type DBMsg = {
-  id: number,
-  longId: string,
-  seq: number,
-  peerUid: string,
-  msg: string
-}
-
-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;
-
-  createConnection(dbPath: string) {
-    if (this.db) {
-      return;
-    }
-    this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
-      if (err) {
-        log('Could not connect to database', err);
-        return;
-      }
-      this.createTable();
-    });
-  }
-
-  protected createTable() {
-    throw new Error('Method not implemented.');
-  }
-
-  close() {
-    this.db?.close();
-  }
-}
-
-class DBUtil extends DBUtilBase {
-  private msgCache: Map<string, RawMessage> = new Map<string, RawMessage>();
-
-  constructor() {
-    super();
-    const interval = 1000 * 60 * 10;  // 10分钟清理一次缓存
-    setInterval(() => {
-      log('清理消息缓存');
-      this.msgCache.forEach((msg, key) => {
-        if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
-          this.msgCache.delete(key);
-        }
-      });
-    }, interval);
-  }
-
-
-  protected createTable() {
-    // 消息记录
-    const createTableSQL = `
-            CREATE TABLE IF NOT EXISTS msgs (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                long_id TEXT NOT NULL UNIQUE,
-                seq INTEGER NOT NULL,
-                peer_uid TEXT NOT NULL,
-                msg TEXT NOT NULL
-            )`;
-    this.db!.run(createTableSQL, function (err) {
-      if (err) {
-        log('Could not create table', err);
-      }
-    });
-
-    // 文件缓存
-    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) {
-        log('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) {
-        log('Could not create table temp_uins', err);
-      }
-    });
-  }
-
-  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) {
-          log('Could not get msg by short id', err);
-          resolve(null);
-        }
-        try {
-          const msg = JSON.parse(row.msg);
-          msg.id = row.id;
-          return resolve(msg);
-        } catch (e) {
-          return resolve(null);
-        }
-      });
-    });
-  }
-
-  async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
-    const getStmt = 'SELECT * FROM msgs WHERE id = ?';
-    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 long_id = ?', [longId]);
-  }
-
-  async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
-    const stmt = 'SELECT * FROM msgs WHERE peer_uid = ? AND seq = ?';
-    return this.getMsg(stmt, [peerUid, seq]);
-  }
-
-  async addMsg(msg: RawMessage, update = true): Promise<number> {
-    log('正在记录消息到数据库', msg.msgId);
-    const existMsg = await this.getMsgByLongId(msg.msgId);
-    if (existMsg) {
-      // log('消息已存在，更新数据库', msg.msgId);
-      if (update) this.updateMsg(msg).then();
-      return existMsg.id!;
-    }
-    const stmt = this.db!.prepare('INSERT INTO msgs (long_id, seq, peer_uid, msg) VALUES (?, ?, ?, ?)');
-
-    // const runAsync = promisify(stmt.run.bind(stmt));
-    return new Promise((resolve, reject) => {
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      const dbInstance = this;
-      stmt.run(msg.msgId, msg.msgSeq, msg.peerUid, JSON.stringify(msg), function (err: any) {
-        if (err) {
-          if (err.errno === 19) {
-            // log('消息已存在，更新数据库', msg.msgId);
-            dbInstance.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
-              if (msg) {
-                dbInstance.msgCache.set(msg.msgId, msg);
-                // log('获取消息短id成功', msg.id);
-                resolve(msg.id!);
-              } else {
-                log('db could not get msg by long id', err);
-                resolve(-1);
-              }
-            });
-          } else {
-            log('db could not add msg', err);
-            resolve(-1);
-          }
-        } else {
-          // log("addMsg", this);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          msg.id = this.lastID;
-          dbInstance.msgCache.set(msg.msgId, msg);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // log('获取消息短id成功', this.lastID);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          resolve(this.lastID);
-        }
-      });
-    });
-  }
-
-  async updateMsg(msg: RawMessage) {
-    const existMsg = this.msgCache.get(msg.msgId);
-    if (existMsg) {
-      Object.assign(existMsg, msg);
-    }
-    const stmt = this.db!.prepare('UPDATE msgs SET msg = ?, seq = ? WHERE long_id = ?');
-    try {
-      stmt.run(JSON.stringify(msg), msg.msgSeq, msg.msgId);
-    } catch (e) {
-      log('updateMsg db error', e);
-    }
-  }
-
-  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) {
-            log('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) {
-          log('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, function (err: any) {
-        if (err) {
-          log('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) {
-          log('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) {
-          log('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) {
-            log('db could not add temp uin', err);
-            reject(err);
-          }
-          resolve(null);
-        });
-      });
-    }
-  }
-}
-
-
-export const dbUtil = new DBUtil();

src/common/utils/file.ts

@@ -4,13 +4,13 @@ import crypto from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import { log } from './log';
-import { dbUtil } from './db';
+import { dbUtil } from '@/core/utils/db';
 import * as fileType from 'file-type';
 import { v4 as uuidv4 } from 'uuid';
 import { napCatCore } from '@/core';
 
 export const getNapCatDir = () => {
-  const p = path.join(napCatCore.wrapper.dataPath, 'NapCat');
+  const p = path.join(napCatCore.dataPath, 'NapCat');
   fs.mkdirSync(p, { recursive: true });
   return p;
 };

src/common/utils/helper.ts

@@ -18,3 +18,20 @@ export function isNull(value: any) {
 export function isNumeric(str: string) {
   return /^\d+$/.test(str);
 }
+
+export function truncateString(obj: any, maxLength = 500) {
+  if (obj !== null && typeof obj === 'object') {
+    Object.keys(obj).forEach(key => {
+      if (typeof obj[key] === 'string') {
+        // 如果是字符串且超过指定长度，则截断
+        if (obj[key].length > maxLength) {
+          obj[key] = obj[key].substring(0, maxLength) + '...';
+        }
+      } else if (typeof obj[key] === 'object') {
+        // 如果是对象或数组，则递归调用
+        truncateString(obj[key], maxLength);
+      }
+    });
+  }
+  return obj;
+}

src/common/utils/log.ts

@@ -1,4 +1,116 @@
+import log4js, { Configuration } from 'log4js';
+import { truncateString } from '@/common/utils/helper';
+import path from 'node:path';
+import { SelfInfo } from '@/core';
+
+export enum LogLevel {
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error',
+  FATAL = 'fatal',
+}
+
+const logDir = path.join(path.resolve(__dirname), 'logs');
+
+function getFormattedTimestamp() {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = (now.getMonth() + 1).toString().padStart(2, '0');
+  const day = now.getDate().toString().padStart(2, '0');
+  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 filename = `${getFormattedTimestamp()}.log`;
+const logPath = path.join(logDir, filename);
+
+const logConfig: Configuration = {
+  appenders: {
+    FileAppender: { // 输出到文件的appender
+      type: 'file',
+      filename: logPath, // 指定日志文件的位置和文件名
+      maxLoogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+      layout: {
+        type: 'pattern',
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+      }
+    },
+    ConsoleAppender: { // 输出到控制台的appender
+      type: 'console',
+      layout: {
+        type: 'pattern',
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
+      }
+    }
+  },
+  categories: {
+    default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
+    file: { appenders: ['FileAppender'], level: 'debug' },
+    console: { appenders: ['ConsoleAppender'], level: 'debug' }
+  }
+};
+
+log4js.configure(logConfig);
+
+
+export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+  logConfig.categories.file.level = fileLogLevel;
+  logConfig.categories.console.level = consoleLogLevel;
+  log4js.configure(logConfig);
+}
+
+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);
+}
+
+let fileLogEnabled = true;
+let consoleLogEnabled = true;
+export function enableFileLog(enable: boolean) {
+  fileLogEnabled = enable;
+}
+export function enableConsoleLog(enable: boolean) {
+  consoleLogEnabled = enable;
+}
+
+function formatMsg(msg: any[]){
+  let logMsg = '';
+  for (const msgItem of msg) {
+    // 判断是否是对象
+    if (typeof msgItem === 'object') {
+      const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
+      logMsg += JSON.stringify(truncateString(obj)) + ' ';
+      continue;
+    }
+    logMsg += msgItem + ' ';
+  }
+  return '\n' + logMsg + '\n';
+}
+
+function _log(level: LogLevel, ...args: any[]){
+  if (consoleLogEnabled){
+    log4js.getLogger('console')[level](formatMsg(args));
+  }
+  if (fileLogEnabled){
+    log4js.getLogger('file')[level](formatMsg(args));
+  }
+}
 
 export function log(...args: any[]) {
-  console.log(...args);
-}
+  // info 等级
+  _log(LogLevel.INFO, ...args);
+}
+
+export function logDebug(...args: any[]) {
+  _log(LogLevel.DEBUG, ...args);
+}
+
+export function logError(...args: any[]) {
+  _log(LogLevel.ERROR, ...args);
+}

src/common/utils/qqlevel.ts

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

src/common/utils/request.ts

@@ -0,0 +1,57 @@
+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);
+          }
+        } catch (e) {
+        }
+        resolve(result);
+
+      });
+    });
+    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);
+          }
+        } catch (e) {
+        }
+        resolve(result);
+
+      });
+    });
+    req.on('error', (error: any) => {
+      resolve(result);
+      // console.log(error)
+    });
+    req.end();
+  });
+
+}

src/common/utils/system.ts

@@ -2,8 +2,9 @@ import os from 'node:os';
 import path from 'node:path';
 
 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 downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();
+export const systemName = os.type();

src/common/utils/umami.ts

@@ -1,5 +1,5 @@
-import { request } from 'https';
-export function noifyLoginStatus() {
+import { request } from 'node:https';
+export function postLoginStatus() {
   const req = request(
     {
       hostname: 'napcat.wumiao.wang',
@@ -16,11 +16,16 @@ export function noifyLoginStatus() {
       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: {
@@ -29,10 +34,11 @@ export function noifyLoginStatus() {
       'screen': '1920x1080',
       'language': 'zh-CN',
       'title': 'OneBot.Login',
-      'url': '/login/onebot11',
+      '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

@@ -41,4 +41,4 @@ export async function checkVersion(): Promise<string> {
     }
     reject('get verison error!');
   });
-}
+}

src/common/utils/video.ts

@@ -16,8 +16,7 @@ export async function getVideoInfo(filePath: string) {
         size: number,
         filePath: string
     }>((resolve, reject) => {
-      // todo: 从配置文件中读取ffmpeg路径
-      const ffmpegPath = './ffmpeg';
+      const ffmpegPath = process.env.FFMPEG_PATH;
       ffmpegPath && ffmpeg.setFfmpegPath(ffmpegPath);
       ffmpeg(filePath).ffprobe((err: any, metadata: any) => {
         if (err) {
@@ -27,7 +26,7 @@ export async function getVideoInfo(filePath: string) {
           if (videoStream) {
             console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
           } else {
-            console.log('未找到视频流信息。');
+            return reject('未找到视频流信息。');
           }
           resolve({
             width: videoStream.width, height: videoStream.height,
@@ -85,4 +84,4 @@ export function checkFfmpeg(newPath: string | null = null): Promise<boolean> {
       resolve(false);
     }
   });
-}
+}

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

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

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

@@ -0,0 +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){}}

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

@@ -0,0 +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();}

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

@@ -0,0 +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){}}

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

@@ -0,0 +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();}

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

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

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

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

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

@@ -0,0 +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});}}

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

@@ -1,20 +1,20 @@
-import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify } from '../entities';
+import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
 export declare class NTQQGroupApi {
-    static getGroups(forced?: boolean): Promise<void>;
-    static getGroupMembers(groupQQ: string, num?: number): Promise<void | GroupMember[]>;
+    static getGroups(forced?: boolean): Promise<Group[]>;
+    static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
     static getGroupNotifies(): Promise<void>;
     static getGroupIgnoreNotifies(): Promise<void>;
-    static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void | undefined>;
-    static quitGroup(groupQQ: string): Promise<void | undefined>;
-    static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void | undefined>;
+    static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void>;
+    static quitGroup(groupQQ: string): Promise<void>;
+    static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void>;
     static banMember(groupQQ: string, memList: Array<{
         uid: string;
         timeStamp: number;
-    }>): Promise<void | undefined>;
-    static banGroup(groupQQ: string, shutUp: boolean): Promise<void | undefined>;
-    static setMemberCard(groupQQ: string, memberUid: string, cardName: string): Promise<void | undefined>;
-    static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole): Promise<void | undefined>;
-    static setGroupName(groupQQ: string, groupName: string): Promise<void | undefined>;
+    }>): Promise<void>;
+    static banGroup(groupQQ: string, shutUp: boolean): Promise<void>;
+    static setMemberCard(groupQQ: string, memberUid: string, cardName: string): Promise<void>;
+    static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole): Promise<void>;
+    static setGroupName(groupQQ: string, groupName: string): Promise<void>;
     static setGroupTitle(groupQQ: string, uid: string, title: string): Promise<void>;
     static publishGroupBulletin(groupQQ: string, title: string, content: string): void;
 }

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

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

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

@@ -0,0 +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';

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

@@ -1,19 +1,25 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/qqnt/entities';
-import { NapCatCore } from '@/core';
-import { GeneralCallResult } from '@/core/qqnt/services/common';
+import { Peer, RawMessage, SendMessageElement } from '@/core/entities';
+import { GeneralCallResult } from '@/core/services/common';
 export declare class NTQQMsgApi {
-    static napCatCore: NapCatCore | null;
+    static setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set?: boolean): Promise<unknown>;
     static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     } | undefined>;
+    static getMsgsByMsgId(peer: Peer, msgIds: string[]): Promise<GeneralCallResult & {
+        msgList: RawMessage[];
+    }>;
+    static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
+        msgList: RawMessage[];
+    }>;
     static activateChat(peer: Peer): Promise<void>;
     static activateChatAndGetHistory(peer: Peer): Promise<void>;
+    static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
     static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
         msgList: RawMessage[];
     }>;
     static fetchRecentContact(): Promise<void>;
     static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
     static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
-    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<void>;
+    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
     static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage>;
 }

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

@@ -0,0 +1,17 @@
+export interface IdMusicSignPostData {
+    type: 'qq' | '163';
+    id: string | number;
+}
+export interface CustomMusicSignPostData {
+    type: 'custom';
+    url: string;
+    audio: string;
+    title: string;
+    image?: string;
+    singer?: string;
+}
+export declare class MusicSign {
+    private readonly url;
+    constructor(url: string);
+    sign(postData: CustomMusicSignPostData | IdMusicSignPostData): Promise<any>;
+}

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

@@ -0,0 +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);});});}}

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

@@ -1,5 +1,7 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '@/core/entities';
+import { GeneralCallResult } from '@/core';
 export declare class NTQQUserApi {
+    static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
     static like(uid: string, count?: number): Promise<{
         result: number;
         errMsg: string;
@@ -12,8 +14,7 @@ export declare class NTQQUserApi {
     static getSelfInfo(): Promise<void>;
     static getUserInfo(uid: string): Promise<void>;
     static getUserDetailInfo(uid: string): Promise<User>;
-    static getPSkey(): Promise<void>;
-    static getSkey(groupName: string, groupCode: string): Promise<void | {
-        data: string;
-    }>;
+    static getPSkey(domainList: string[]): Promise<any>;
+    static getRobotUinRange(): Promise<Array<any>>;
+    static getSkey(): Promise<string | undefined>;
 }

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

@@ -0,0 +1,98 @@
+interface WebApiGroupMember {
+    uin: number;
+    role: number;
+    g: number;
+    join_time: number;
+    last_speak_time: number;
+    lv: {
+        point: number;
+        level: number;
+    };
+    card: string;
+    tags: string;
+    flag: number;
+    nick: string;
+    qage: number;
+    rm: number;
+}
+export interface WebApiGroupNoticeFeed {
+    u: number;
+    fid: string;
+    pubt: number;
+    msg: {
+        text: string;
+        text_face: string;
+        title: string;
+        pics?: {
+            id: string;
+            w: string;
+            h: string;
+        }[];
+    };
+    type: number;
+    fn: number;
+    cn: number;
+    vn: number;
+    settings: {
+        is_show_edit_card: number;
+        remind_ts: number;
+        tip_window_type: number;
+        confirm_required: number;
+    };
+    read_num: number;
+    is_read: number;
+    is_all_confirm: number;
+}
+export interface WebApiGroupNoticeRet {
+    ec: number;
+    em: string;
+    ltsm: number;
+    srv_code: number;
+    read_only: number;
+    role: number;
+    feeds: WebApiGroupNoticeFeed[];
+    group: {
+        group_id: number;
+        class_ext: number;
+    };
+    sta: number;
+    gln: number;
+    tst: number;
+    ui: any;
+    server_time: number;
+    svrt: number;
+    ad: number;
+}
+interface GroupEssenceMsg {
+    group_code: string;
+    msg_seq: number;
+    msg_random: number;
+    sender_uin: string;
+    sender_nick: string;
+    sender_time: number;
+    add_digest_uin: string;
+    add_digest_nick: string;
+    add_digest_time: number;
+    msg_content: any[];
+    can_be_removed: true;
+}
+export interface GroupEssenceMsgRet {
+    retcode: number;
+    retmsg: string;
+    data: {
+        msg_list: GroupEssenceMsg[];
+        is_end: boolean;
+        group_role: number;
+        config_page_url: string;
+    };
+}
+export declare class WebApi {
+    static getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined>;
+    static getGroupMembers(GroupCode: string): 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;
+}
+export {};

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

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+import { NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
+import { QuickLoginResult } from '@/core/services';
+import { BuddyListener, GroupListener, MsgListener, ProfileListener } from '@/core/listeners';
+export interface OnLoginSuccess {
+    (uin: string, uid: string): void | Promise<void>;
+}
+export declare class NapCatCore {
+    readonly session: NodeIQQNTWrapperSession;
+    readonly util: NodeQQNTWrapperUtil;
+    private engine;
+    private loginService;
+    private readonly loginListener;
+    private onLoginSuccessFuncList;
+    private proxyHandler;
+    constructor();
+    get dataPath(): string;
+    get dataPathGlobal(): string;
+    private initConfig;
+    private initSession;
+    private initDataListener;
+    addListener(listener: BuddyListener | GroupListener | MsgListener | ProfileListener): number;
+    onLoginSuccess(func: OnLoginSuccess): void;
+    quickLogin(uin: string): Promise<QuickLoginResult>;
+    qrLogin(): Promise<{
+        url: string;
+        base64: string;
+        buffer: Buffer;
+    }>;
+    passwordLogin(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
+}
+export declare const napCatCore: NapCatCore;

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

@@ -0,0 +1,34 @@
+import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo } from './entities';
+export declare const Credentials: {
+    Skey: string;
+    CreatTime: number;
+};
+export declare const selfInfo: SelfInfo;
+export declare const groups: Map<string, Group>;
+export declare function deleteGroup(groupQQ: string): void;
+export declare const groupMembers: Map<string, Map<string, GroupMember>>;
+export declare const friends: Map<string, Friend>;
+export declare const friendRequests: Record<string, FriendRequest>;
+export declare const groupNotifies: Record<string, GroupNotify>;
+export declare const napCatError: {
+    ffmpegError: string;
+    httpServerError: string;
+    wsServerError: string;
+    otherError: string;
+};
+export declare function getFriend(uinOrUid: string): Promise<Friend | undefined>;
+export declare function getGroup(qq: string | number): Promise<Group | undefined>;
+export declare function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number): Promise<GroupMember | null | undefined>;
+export declare const uid2UinMap: Record<string, string>;
+export declare function getUidByUin(uin: string): string | undefined;
+export declare const tempGroupCodeMap: Record<string, string>;
+export declare const stat: {
+    packet_received: number;
+    packet_sent: number;
+    message_received: number;
+    message_sent: number;
+    last_message_time: number;
+    disconnect_times: number;
+    lost_times: number;
+    packet_lost: number;
+};

src/core.lib/src/data.js

@@ -0,0 +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};

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

@@ -0,0 +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();}

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

@@ -1,4 +1,5 @@
-import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from '../entities';
+import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendMarkdownElement, SendMarketFaceElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from './index';
+export declare const mFaceCache: Map<string, string>;
 export declare class SendMsgElementConstructor {
     static text(content: string): SendTextElement;
     static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
@@ -8,5 +9,9 @@ export declare class SendMsgElementConstructor {
     static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
     static ptt(pttPath: string): Promise<SendPttElement>;
     static face(faceId: number): SendFaceElement;
+    static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement;
+    static dice(resultId: number | null): SendFaceElement;
+    static rps(resultId: number | null): SendFaceElement;
     static ark(data: any): SendArkElement;
+    static markdown(content: string): SendMarkdownElement;
 }

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

@@ -0,0 +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();}

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

@@ -0,0 +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';

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

@@ -12,7 +12,9 @@ export declare enum ElementType {
     VIDEO = 5,
     FACE = 6,
     REPLY = 7,
-    ARK = 10
+    ARK = 10,
+    MFACE = 11,
+    MARKDOWN = 14
 }
 export interface SendTextElement {
     elementType: ElementType.TEXT;
@@ -86,6 +88,10 @@ export interface SendFaceElement {
     elementId: '';
     faceElement: FaceElement;
 }
+export interface SendMarketFaceElement {
+    elementType: ElementType.MFACE;
+    marketFaceElement: MarketFaceElement;
+}
 export interface FileElement {
     'fileMd5'?: '';
     'fileName': string;
@@ -117,7 +123,12 @@ export interface SendArkElement {
     elementId: '';
     arkElement: ArkElement;
 }
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement;
+export interface SendMarkdownElement {
+    elementType: ElementType.MARKDOWN;
+    elementId: '';
+    markdownElement: MarkdownElement;
+}
+export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement;
 export declare enum AtType {
     notAt = 0,
     atAll = 1,
@@ -187,52 +198,38 @@ export interface GrayTipElement {
     groupElement: TipGroupElement;
     xmlElement: {
         content: string;
+        templId: string;
     };
     jsonGrayTipElement: {
         jsonStr: string;
     };
 }
+export declare enum FaceType {
+    normal = 1,// 小黄脸
+    normal2 = 2,// 新小黄脸, 从faceIndex 222开始？
+    dice = 3
+}
+export declare enum FaceIndex {
+    dice = 358,
+    RPS = 359
+}
 export interface FaceElement {
     faceIndex: number;
-    faceType: 1;
+    faceType: FaceType;
+    faceText?: string;
+    packId?: string;
+    stickerId?: string;
+    sourceType?: number;
+    stickerType?: number;
+    resultId?: string;
+    surpriseId?: string;
+    randomType?: number;
 }
 export interface MarketFaceElement {
-    'itemType': 6;
-    'faceInfo': 1;
-    'emojiPackageId': 203875;
-    'subType': 3;
-    'mediaType': 0;
-    'imageWidth': 200;
-    'imageHeight': 200;
-    'faceName': string;
-    'emojiId': '094d53bd1c9ac5d35d04b08e8a6c992c';
-    'key': 'a8b1dd0aebc8d910';
-    'param': null;
-    'mobileParam': null;
-    'sourceType': null;
-    'startTime': null;
-    'endTime': null;
-    'emojiType': 1;
-    'hasIpProduct': null;
-    'voiceItemHeightArr': null;
-    'sourceName': null;
-    'sourceJumpUrl': null;
-    'sourceTypeName': null;
-    'backColor': null;
-    'volumeColor': null;
-    'staticFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png';
-    'dynamicFacePath': 'E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c';
-    'supportSize': [
-        {
-            'width': 300;
-            'height': 300;
-        },
-        {
-            'width': 200;
-            'height': 200;
-        }
-    ];
-    'apngSupportSize': null;
+    emojiPackageId: number;
+    faceName: string;
+    emojiId: string;
+    key: string;
 }
 export interface VideoElement {
     'filePath': string;
@@ -344,6 +341,8 @@ export interface RawMessage {
     msgId: string;
     msgTime: string;
     msgSeq: string;
+    msgType: number;
+    subMsgType: number;
     senderUid: string;
     senderUin: string;
     peerUid: string;

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

@@ -5,7 +5,8 @@ export declare enum GroupNotifyTypes {
     ADMIN_SET = 8,
     KICK_MEMBER = 9,
     MEMBER_EXIT = 11,// 主动退出
-    ADMIN_UNSET = 12
+    ADMIN_UNSET = 12,
+    ADMIN_UNSET_OTHER = 13
 }
 export interface GroupNotifies {
     doubt: boolean;

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

@@ -0,0 +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={})));

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

@@ -0,0 +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={})));

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

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

src/core.lib/src/external/hook.js

@@ -0,0 +1 @@
+const _0x531e70=_0xbb31;function _0x341f(){const _0x1a68fe=['MoeHoo','isAvailable','moeHook','VOqyi','kDyDl','4233678IuPUYT','209312eRILao','8771301nIMFbR','150aMTqnF','jYZqH','GetRkey','10HKKyDh','HookRkey','1764AqxeGn','getRKey','1807164oOIgUp','24699450wQoLcR','3130cyyIGP','26776DvDxtl','加载\x20moehoo\x20失败'];_0x341f=function(){return _0x1a68fe;};return _0x341f();}(function(_0x4b9b89,_0x17ca43){const _0x302118=_0xbb31,_0x37a98a=_0x4b9b89();while(!![]){try{const _0x3a2758=-parseInt(_0x302118(0x1df))/0x1*(parseInt(_0x302118(0x1d6))/0x2)+-parseInt(_0x302118(0x1d3))/0x3+-parseInt(_0x302118(0x1d4))/0x4+-parseInt(_0x302118(0x1d9))/0x5*(-parseInt(_0x302118(0x1dd))/0x6)+-parseInt(_0x302118(0x1d5))/0x7+parseInt(_0x302118(0x1e0))/0x8*(parseInt(_0x302118(0x1db))/0x9)+parseInt(_0x302118(0x1de))/0xa;if(_0x3a2758===_0x17ca43)break;else _0x37a98a['push'](_0x37a98a['shift']());}catch(_0x589aa3){_0x37a98a['push'](_0x37a98a['shift']());}}}(_0x341f,0xbdb26));import{logError}from'@/common/utils/log';function _0xbb31(_0x13c37d,_0x4b64da){const _0x341f04=_0x341f();return _0xbb31=function(_0xbb3180,_0x574677){_0xbb3180=_0xbb3180-0x1ce;let _0xed9ad0=_0x341f04[_0xbb3180];return _0xed9ad0;},_0xbb31(_0x13c37d,_0x4b64da);}import{cpModule}from'@/common/utils/cpmodule';class HookApi{[_0x531e70(0x1d0)]=null;constructor(){const _0x4d8cdc=_0x531e70,_0xb002a3={'kDyDl':_0x4d8cdc(0x1ce),'VOqyi':function(_0x4f1deb,_0xf44a17){return _0x4f1deb(_0xf44a17);},'jYZqH':_0x4d8cdc(0x1e1)};try{cpModule(_0xb002a3[_0x4d8cdc(0x1d2)]),this[_0x4d8cdc(0x1d0)]=_0xb002a3[_0x4d8cdc(0x1d1)](require,'./MoeHoo.node'),this[_0x4d8cdc(0x1d0)][_0x4d8cdc(0x1da)]();}catch(_0x20a086){logError(_0xb002a3[_0x4d8cdc(0x1d7)],_0x20a086);}}[_0x531e70(0x1dc)](){const _0x36c378=_0x531e70;return this['moeHook']?.[_0x36c378(0x1d8)]()||'';}[_0x531e70(0x1cf)](){const _0x23a108=_0x531e70;return!!this[_0x23a108(0x1d0)];}}export const hookApi=new HookApi();

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

@@ -1,27 +1,15 @@
-/// <reference types="node" />
-import { GlobalAdapter } from './qqnt/adapters';
-import { QRCodeLoginSucceedType } from './qqnt/services';
-import { NapCatCoreWrapper } from './wrapper';
-import { NapCatCoreLogin } from './login';
-import { NapCatCoreSession } from './session';
-import { NapCatCoreService } from './service';
-import { EventEmitter } from 'node:events';
-import * as log4js from '@log4js-node/log4js-api';
-export interface LoginSuccessCallback {
-    (): void | Promise<void>;
-}
-export declare class NapCatCore extends EventEmitter {
-    readonly log: log4js.Logger;
-    readonly adapter: GlobalAdapter;
-    readonly wrapper: NapCatCoreWrapper;
-    readonly login: NapCatCoreLogin;
-    readonly session: NapCatCoreSession;
-    readonly service: NapCatCoreService;
-    private loginSuccessCbList;
-    constructor();
-    initPostLogin(args: QRCodeLoginSucceedType): Promise<void>;
-    private onLoginSuccess;
-    private onMessage;
-    addLoginSuccessCallback(cb: LoginSuccessCallback): void;
-}
-export declare const napCatCore: NapCatCore;
+import QQWrapper from './wrapper';
+export * from './adapters';
+export * from './apis';
+export * from './entities';
+export * from './listeners';
+export * from './services';
+export * as Adapters from './adapters';
+export * as APIs from './apis';
+export * as Entities from './entities';
+export * as Listeners from './listeners';
+export * as Services from './services';
+export { QQWrapper 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,11 +1,12 @@
-import { FriendRequestNotify, User } from '@/core/qqnt/entities';
+import { FriendRequestNotify, User } from '@/core/entities';
+export type OnBuddyChangeParams = {
+    categoryId: number;
+    categroyName: string;
+    categroyMbCount: number;
+    buddyList: User[];
+}[];
 interface IBuddyListener {
-    onBuddyListChange(arg: {
-        categoryId: number;
-        categroyName: string;
-        categroyMbCount: number;
-        buddyList: User[];
-    }[]): void;
+    onBuddyListChange(arg: OnBuddyChangeParams): void;
     onBuddyInfoChange(arg: unknown): void;
     onBuddyDetailInfoChange(arg: unknown): void;
     onNickUpdated(arg: unknown): void;
@@ -33,12 +34,7 @@ export declare class BuddyListener implements IBuddyListener {
     onBlockChanged(arg: unknown): void;
     onBuddyDetailInfoChange(arg: unknown): void;
     onBuddyInfoChange(arg: unknown): void;
-    onBuddyListChange(arg: {
-        categoryId: number;
-        categroyName: string;
-        categroyMbCount: number;
-        buddyList: User[];
-    }[]): void;
+    onBuddyListChange(arg: OnBuddyChangeParams): void;
     onBuddyRemarkUpdated(arg: unknown): void;
     onBuddyReqChange(arg: FriendRequestNotify): void;
     onBuddyReqUnreadCntChange(arg: unknown): void;

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

@@ -0,0 +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();}

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

@@ -0,0 +1,17 @@
+export interface IKernelFileAssistantListener {
+    onFileStatusChanged(...args: unknown[]): unknown;
+    onSessionListChanged(...args: unknown[]): unknown;
+    onSessionChanged(...args: unknown[]): unknown;
+    onFileListChanged(...args: unknown[]): unknown;
+    onFileSearch(...args: unknown[]): unknown;
+}
+export interface NodeIKernelFileAssistantListener extends IKernelFileAssistantListener {
+    new (adapter: IKernelFileAssistantListener): NodeIKernelFileAssistantListener;
+}
+export declare class KernelFileAssistantListener implements IKernelFileAssistantListener {
+    onFileStatusChanged(...args: unknown[]): void;
+    onSessionListChanged(...args: unknown[]): void;
+    onSessionChanged(...args: unknown[]): void;
+    onFileListChanged(...args: unknown[]): void;
+    onFileSearch(...args: unknown[]): void;
+}

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

@@ -0,0 +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();}

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

@@ -1,4 +1,4 @@
-import { Group, GroupMember, GroupNotify } from '@/core/qqnt/entities';
+import { Group, GroupMember, GroupNotify } from '@/core/entities';
 interface IGroupListener {
     onGroupListUpdate(updateType: number, groupList: Group[]): void;
     onGroupExtListUpdate(...args: unknown[]): void;
@@ -29,11 +29,13 @@ interface IGroupListener {
     onGroupFirstBulletinNotify(...args: unknown[]): void;
     onJoinGroupNoVerifyFlag(...args: unknown[]): void;
     onGroupArkInviteStateResult(...args: unknown[]): void;
+    onGroupMemberLevelInfoChange(...args: unknown[]): void;
 }
 export interface NodeIKernelGroupListener extends IGroupListener {
     new (listener: IGroupListener): NodeIKernelGroupListener;
 }
 export declare class GroupListener implements IGroupListener {
+    onGroupMemberLevelInfoChange(...args: unknown[]): void;
     onGetGroupBulletinListResult(...args: unknown[]): void;
     onGroupAllInfoChange(...args: unknown[]): void;
     onGroupBulletinChange(...args: unknown[]): void;
@@ -65,6 +67,7 @@ export declare class GroupListener implements IGroupListener {
     onShutUpMemberListChanged(...args: unknown[]): void;
 }
 export declare class DebugGroupListener implements IGroupListener {
+    onGroupMemberLevelInfoChange(...args: unknown[]): void;
     onGetGroupBulletinListResult(...args: unknown[]): void;
     onGroupAllInfoChange(...args: unknown[]): void;
     onGroupBulletinChange(...args: unknown[]): void;

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

@@ -30,7 +30,7 @@ export declare class LoginListener implements IKernelLoginListener {
     }): void;
     onQRCodeLoginPollingStarted(...args: any[]): void;
     onQRCodeSessionUserScaned(...args: any[]): void;
-    onQRCodeLoginSucceed(...args: any[]): void;
+    onQRCodeLoginSucceed(arg: QRCodeLoginSucceedResult): void;
     onQRCodeSessionFailed(...args: any[]): void;
     onLoginFailed(...args: any[]): void;
     onLogoutSucceed(...args: any[]): void;
@@ -42,3 +42,13 @@ export declare class LoginListener implements IKernelLoginListener {
     onQQLoginNumLimited(...args: any[]): void;
     onLoginState(...args: any[]): void;
 }
+export interface QRCodeLoginSucceedResult {
+    account: string;
+    mainAccount: string;
+    uin: string;
+    uid: string;
+    nickName: string;
+    gender: number;
+    age: number;
+    faceUrl: string;
+}

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

@@ -0,0 +1 @@
+var _0x2c2191=_0x57cf;function _0x57cf(_0x1324ed,_0x1af608){var _0x1e621b=_0x1e62();return _0x57cf=function(_0x57cf4f,_0x89d541){_0x57cf4f=_0x57cf4f-0xa1;var _0x7d6835=_0x1e621b[_0x57cf4f];return _0x7d6835;},_0x57cf(_0x1324ed,_0x1af608);}(function(_0x356fe1,_0x443ea9){var _0x382dfc=_0x57cf,_0x4a9b78=_0x356fe1();while(!![]){try{var _0x26e9d0=parseInt(_0x382dfc(0xaa))/0x1+-parseInt(_0x382dfc(0xa8))/0x2*(-parseInt(_0x382dfc(0xb5))/0x3)+-parseInt(_0x382dfc(0xb4))/0x4*(-parseInt(_0x382dfc(0xa3))/0x5)+-parseInt(_0x382dfc(0xb9))/0x6*(parseInt(_0x382dfc(0xb0))/0x7)+parseInt(_0x382dfc(0xb6))/0x8*(parseInt(_0x382dfc(0xaf))/0x9)+parseInt(_0x382dfc(0xae))/0xa*(parseInt(_0x382dfc(0xa6))/0xb)+-parseInt(_0x382dfc(0xb3))/0xc*(parseInt(_0x382dfc(0xa9))/0xd);if(_0x26e9d0===_0x443ea9)break;else _0x4a9b78['push'](_0x4a9b78['shift']());}catch(_0x28dab1){_0x4a9b78['push'](_0x4a9b78['shift']());}}}(_0x1e62,0xcc7f1));function _0x1e62(){var _0x259fea=['onUserLoggedIn','onPasswordLoginFailed','42bHkoSX','onLogoutFailed','onQQLoginNumLimited','15MbuqSR','onQRCodeLoginPollingStarted','OnConfirmUnusualDeviceFailed','3301353yVYyDC','onQRCodeGetPicture','254724rwQgsy','23832705CAyUpG','1547978SHXeHG','onLoginConnected','onLoginDisConnected','onQRCodeLoginSucceed','10OLsfGP','18zRxOjM','207382LHaOVH','onQRCodeSessionUserScaned','onQRCodeSessionFailed','12ZVFJeW','273804EYtUZH','3JiPZUJ','2789872rETlDU'];_0x1e62=function(){return _0x259fea;};return _0x1e62();}export class LoginListener{[_0x2c2191(0xab)](..._0x140a64){}[_0x2c2191(0xac)](..._0x3bcbc1){}['onLoginConnecting'](..._0xd0d306){}[_0x2c2191(0xa7)](_0x1c0929){}[_0x2c2191(0xa4)](..._0x24cac1){}[_0x2c2191(0xb1)](..._0x360dc8){}[_0x2c2191(0xad)](_0x3a9880){}[_0x2c2191(0xb2)](..._0x2b64a5){}['onLoginFailed'](..._0x567a84){}['onLogoutSucceed'](..._0x5e108f){}[_0x2c2191(0xa1)](..._0x2c631a){}[_0x2c2191(0xb7)](..._0xbfe86){}['onQRCodeSessionQuickLoginFailed'](..._0x3fbdf2){}[_0x2c2191(0xb8)](..._0x23f439){}[_0x2c2191(0xa5)](..._0x2b4043){}[_0x2c2191(0xa2)](..._0x41415b){}['onLoginState'](..._0x1a4bdc){}}

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

@@ -1,4 +1,4 @@
-import { RawMessage } from '@/core/qqnt/entities';
+import { RawMessage } from '@/core/entities';
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string;
     msgElementId: string;
@@ -90,6 +90,7 @@ export interface IKernelMsgListener {
     onUserSecQualityChanged(...args: unknown[]): void;
     onMsgWithRichLinkInfoUpdate(...args: unknown[]): void;
     onRedTouchChanged(...args: unknown[]): void;
+    onBroadcastHelperProgerssUpdate(...args: unknown[]): void;
 }
 export interface NodeIKernelMsgListener {
     new (listener: IKernelMsgListener): NodeIKernelMsgListener;
@@ -163,4 +164,5 @@ export declare class MsgListener implements IKernelMsgListener {
     onUserSecQualityChanged(...args: unknown[]): void;
     onMsgWithRichLinkInfoUpdate(...args: unknown[]): void;
     onRedTouchChanged(...args: unknown[]): void;
+    onBroadcastHelperProgerssUpdate(...args: unknown[]): void;
 }

src/core.lib/src/listeners/NodeIKernelMsgListener.js

@@ -0,0 +1 @@
+function _0x20e7(_0x428e24,_0xc70b29){var _0x2fdce0=_0x2fdc();return _0x20e7=function(_0x20e770,_0x59667c){_0x20e770=_0x20e770-0x1ca;var _0x566d75=_0x2fdce0[_0x20e770];return _0x566d75;},_0x20e7(_0x428e24,_0xc70b29);}var _0x5988e5=_0x20e7;(function(_0x5c73a6,_0x36a829){var _0xf46355=_0x20e7,_0x5bc38b=_0x5c73a6();while(!![]){try{var _0x34de2f=-parseInt(_0xf46355(0x1f0))/0x1+-parseInt(_0xf46355(0x207))/0x2*(-parseInt(_0xf46355(0x1d5))/0x3)+-parseInt(_0xf46355(0x201))/0x4+parseInt(_0xf46355(0x1f9))/0x5*(-parseInt(_0xf46355(0x1ea))/0x6)+-parseInt(_0xf46355(0x1d4))/0x7*(parseInt(_0xf46355(0x208))/0x8)+-parseInt(_0xf46355(0x1e2))/0x9+parseInt(_0xf46355(0x1d2))/0xa;if(_0x34de2f===_0x36a829)break;else _0x5bc38b['push'](_0x5bc38b['shift']());}catch(_0x4bfc67){_0x5bc38b['push'](_0x5bc38b['shift']());}}}(_0x2fdc,0xafa25));function _0x2fdc(){var _0x1fd550=['onGroupFileInfoAdd','onNtMsgSyncStart','onNtFirstViewMsgSyncEnd','onFeedEventUpdate','onMsgBoxChanged','onMsgSecurityNotify','onDraftUpdate','10JrrQhg','onInputStatusPush','onRedTouchChanged','onChannelFreqLimitInfoUpdate','onRichMediaProgerssUpdate','onReadFeedEventUpdate','onRecvMsgSvrRspTransInfo','onGroupGuildUpdate','227588EcJjMu','onHitCsRelatedEmojiResult','onGuildMsgAbFlagChanged','onHitEmojiKeywordResult','onContactUnreadCntUpdate','onFirstViewDirectMsgUpdate','2nTwbtb','8SsmRzF','onUserSecQualityChanged','onlineStatusSmallIconDownloadPush','onBroadcastHelperDownloadComplete','onMsgWithRichLinkInfoUpdate','onSysMsgNotification','onNtMsgSyncEnd','onCustomWithdrawConfigUpdate','onEmojiDownloadComplete','32428930jqyVun','onUserChannelTabStatusChanged','3943506JjgZjn','2195574ykTHiK','onMsgInfoListAdd','onMsgDelete','onTempChatInfoUpdate','onRecvSysMsg','onSearchGroupFileInfoUpdate','onUserOnlineStatusChanged','onImportOldDbProgressUpdate','onAddSendMsg','onMsgQRCodeStatusChanged','onBroadcastHelperProgressUpdate','onRecvMsg','onGuildNotificationAbstractUpdate','6438474zABuyZ','onLineDev','onRecvS2CMsg','onGroupFileInfoUpdate','onRecvOnlineFileMsg','onMsgRecall','onGuildInteractiveUpdate','onFirstViewGroupGuildMapping','1649238vEWbhi','onFileMsgCome','onUserTabStatusChanged','onUnreadCntAfterFirstView','onEmojiResourceUpdate','onMsgEventListUpdate','1369967SPSSYt','onRichMediaDownloadComplete'];_0x2fdc=function(){return _0x1fd550;};return _0x2fdc();}export class MsgListener{[_0x5988e5(0x1dd)](_0x2627d1){}[_0x5988e5(0x1cc)](_0x581dab){}[_0x5988e5(0x1df)](_0x2860a5){}[_0x5988e5(0x1fc)](_0x4d089f,_0x182f5f,_0x5de901){}[_0x5988e5(0x205)](_0x298d59){}[_0x5988e5(0x1d0)](_0x54d224){}[_0x5988e5(0x1f8)](_0x201d8b,_0x16682b,_0x3ce339){}[_0x5988e5(0x1d1)](_0x869d24){}[_0x5988e5(0x1ee)](_0x31af9f){}[_0x5988e5(0x1f5)](_0x374919){}[_0x5988e5(0x1eb)](_0xd5934e){}[_0x5988e5(0x206)](_0x36852d){}[_0x5988e5(0x1e9)](_0x35c1f7){}['onGrabPasswordRedBag'](_0xd60c90,_0x366042,_0x6d9d0b,_0x45d33c,_0x5a4e6a){}[_0x5988e5(0x1f2)](_0x3cea98){}[_0x5988e5(0x1e5)](_0x5f02d9){}[_0x5988e5(0x200)](_0x404fd8){}['onGroupTransferInfoAdd'](_0x128bca){}['onGroupTransferInfoUpdate'](_0x184191){}[_0x5988e5(0x1e8)](_0x552b28){}[_0x5988e5(0x203)](_0x6fcc4b){}[_0x5988e5(0x1e1)](_0x2d8025){}[_0x5988e5(0x202)](_0x3ab660){}[_0x5988e5(0x204)](_0x19898f){}['onHitRelatedEmojiResult'](_0x3467fa){}[_0x5988e5(0x1dc)](_0x150937){}[_0x5988e5(0x1fa)](_0x4201e1){}['onKickedOffLine'](_0x5f4128){}[_0x5988e5(0x1e3)](_0x1c8d14){}['onLogLevelChanged'](_0xa7d93b){}['onMsgAbstractUpdate'](_0x25a75b){}[_0x5988e5(0x1f6)](_0x9b4b73){}[_0x5988e5(0x1d7)](_0xdf942e,_0x3b46b6){}[_0x5988e5(0x1ef)](_0xfa728c){}[_0x5988e5(0x1d6)](_0x5dac8c){}['onMsgInfoListUpdate'](_0x486e18){}[_0x5988e5(0x1de)](_0x8a08ee){}[_0x5988e5(0x1e7)](_0xa59f15,_0x1b5a70,_0xd96c14){}[_0x5988e5(0x1f7)](_0x49f5d0){}['onMsgSettingUpdate'](_0x3357f5){}[_0x5988e5(0x1f4)](){}[_0x5988e5(0x1cf)](){}[_0x5988e5(0x1f3)](){}[_0x5988e5(0x1fe)](_0x38305e){}['onRecvGroupGuildFlag'](_0x1d913c){}[_0x5988e5(0x1e0)](_0x173f22){}[_0x5988e5(0x1ff)](_0x51f1f2,_0x3bf851,_0x4f3082,_0x24bcac,_0x55a28b,_0x5e045e){}[_0x5988e5(0x1e6)](_0x228821){}[_0x5988e5(0x1e4)](_0x1ef279){}[_0x5988e5(0x1d9)](_0x10e664){}['onRecvUDCFlag'](_0x4b9bcc){}[_0x5988e5(0x1f1)](_0xd3dea7){}[_0x5988e5(0x1fd)](_0x9dffc4){}['onRichMediaUploadComplete'](_0x478c59){}[_0x5988e5(0x1da)](_0x5b4446){}['onSendMsgError'](_0x180929,_0x5f30a3,_0x344036,_0x3e5784){}[_0x5988e5(0x1ce)](_0x200ca7,_0x411792,_0x4bf43c,_0x25b204){}[_0x5988e5(0x1d8)](_0xa1d8a){}[_0x5988e5(0x1ed)](_0x25ee3f){}['onUnreadCntUpdate'](_0x35da29){}[_0x5988e5(0x1d3)](_0x58b690){}[_0x5988e5(0x1db)](_0xc47ba3){}[_0x5988e5(0x1ec)](_0x5b5fda){}['onlineStatusBigIconDownloadPush'](_0x4c079a,_0xc011b6,_0xfa58f5){}[_0x5988e5(0x1cb)](_0x5f3bd3,_0x529ec5,_0x5f36fe){}[_0x5988e5(0x1ca)](..._0x9517ee){}[_0x5988e5(0x1cd)](..._0xddadba){}[_0x5988e5(0x1fb)](..._0x31dca2){}['onBroadcastHelperProgerssUpdate'](..._0x116a78){}}

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

@@ -1,4 +1,4 @@
-import { User } from '@/core/qqnt/entities';
+import { User } from '@/core/entities';
 interface IProfileListener {
     onProfileSimpleChanged(...args: unknown[]): void;
     onProfileDetailInfoChanged(profile: User): void;

src/core.lib/src/listeners/NodeIKernelProfileListener.js

@@ -0,0 +1 @@
+function _0x126f(_0x24bd9e,_0x5af36b){var _0x50ec22=_0x50ec();return _0x126f=function(_0x126f24,_0x2f48f4){_0x126f24=_0x126f24-0x8d;var _0x476815=_0x50ec22[_0x126f24];return _0x476815;},_0x126f(_0x24bd9e,_0x5af36b);}var _0x27707c=_0x126f;function _0x50ec(){var _0x2a38e9=['2792321YnOPpl','2LKBTnS','onSelfStatusChanged','897723VRpDmE','4557088EXHWdW','onProfileDetailInfoChanged','226876ViCJTN','346916lRmOuW','onStatusUpdate','54qTfZNl','12gwlpPp','onStrangerRemarkChanged','onProfileSimpleChanged','4328115kXUcgm','43018500WeaFvG'];_0x50ec=function(){return _0x2a38e9;};return _0x50ec();}(function(_0x5083d5,_0x15b8aa){var _0x5b85e7=_0x126f,_0x3728da=_0x5083d5();while(!![]){try{var _0x434bde=parseInt(_0x5b85e7(0x91))/0x1*(-parseInt(_0x5b85e7(0x97))/0x2)+parseInt(_0x5b85e7(0x99))/0x3*(-parseInt(_0x5b85e7(0x96))/0x4)+-parseInt(_0x5b85e7(0x8e))/0x5+-parseInt(_0x5b85e7(0x9a))/0x6*(parseInt(_0x5b85e7(0x90))/0x7)+-parseInt(_0x5b85e7(0x94))/0x8+-parseInt(_0x5b85e7(0x93))/0x9+parseInt(_0x5b85e7(0x8f))/0xa;if(_0x434bde===_0x15b8aa)break;else _0x3728da['push'](_0x3728da['shift']());}catch(_0x5948ce){_0x3728da['push'](_0x3728da['shift']());}}}(_0x50ec,0x92c5c));export class ProfileListener{[_0x27707c(0x8d)](..._0x4199c5){}[_0x27707c(0x95)](_0x23cc3c){}[_0x27707c(0x98)](..._0x584f39){}[_0x27707c(0x92)](..._0x49957d){}[_0x27707c(0x9b)](..._0x132c8b){}}

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

@@ -0,0 +1,13 @@
+export interface IKernelRobotListener {
+    onRobotFriendListChanged(...args: unknown[]): void;
+    onRobotListChanged(...args: unknown[]): void;
+    onRobotProfileChanged(...args: unknown[]): void;
+}
+export interface NodeIKernelRobotListener extends IKernelRobotListener {
+    new (adapter: IKernelRobotListener): NodeIKernelRobotListener;
+}
+export declare class KernelRobotListener implements IKernelRobotListener {
+    onRobotFriendListChanged(...args: unknown[]): void;
+    onRobotListChanged(...args: unknown[]): void;
+    onRobotProfileChanged(...args: unknown[]): void;
+}

src/core.lib/src/listeners/NodeIKernelRobotListener.js

@@ -0,0 +1 @@
+function _0x3f73(){var _0x43fcff=['onRobotProfileChanged','205106EnguQn','4847059PfkNeq','387047yeYDsj','1862260MruHfa','22584xrfWLm','3GtXWPi','369BvPiti','70bbuEtR','onRobotFriendListChanged','2567118BaPhAm','491086FeXLae','5hQlSpz'];_0x3f73=function(){return _0x43fcff;};return _0x3f73();}var _0x257027=_0x6a51;function _0x6a51(_0x2c9957,_0x4f2f68){var _0x3f73fb=_0x3f73();return _0x6a51=function(_0x6a5135,_0x330e8d){_0x6a5135=_0x6a5135-0xe3;var _0x469a32=_0x3f73fb[_0x6a5135];return _0x469a32;},_0x6a51(_0x2c9957,_0x4f2f68);}(function(_0x46cac2,_0x2259df){var _0x48cff1=_0x6a51,_0x23b9b7=_0x46cac2();while(!![]){try{var _0x328a4f=parseInt(_0x48cff1(0xe7))/0x1+parseInt(_0x48cff1(0xef))/0x2*(-parseInt(_0x48cff1(0xea))/0x3)+parseInt(_0x48cff1(0xe8))/0x4*(parseInt(_0x48cff1(0xe3))/0x5)+parseInt(_0x48cff1(0xee))/0x6+-parseInt(_0x48cff1(0xe6))/0x7+-parseInt(_0x48cff1(0xe9))/0x8*(parseInt(_0x48cff1(0xeb))/0x9)+parseInt(_0x48cff1(0xec))/0xa*(parseInt(_0x48cff1(0xe5))/0xb);if(_0x328a4f===_0x2259df)break;else _0x23b9b7['push'](_0x23b9b7['shift']());}catch(_0x1ca7cb){_0x23b9b7['push'](_0x23b9b7['shift']());}}}(_0x3f73,0x57390));export class KernelRobotListener{[_0x257027(0xed)](..._0x9e6013){}['onRobotListChanged'](..._0x597224){}[_0x257027(0xe4)](..._0x6ed318){}}

src/core.lib/src/listeners/NodeIKernelSessionListener.js

@@ -0,0 +1 @@
+var _0x5087c3=_0x4531;function _0x4531(_0x34042d,_0x19f8ec){var _0x12f2fb=_0x12f2();return _0x4531=function(_0x453176,_0x2d0164){_0x453176=_0x453176-0xb9;var _0x1e0379=_0x12f2fb[_0x453176];return _0x1e0379;},_0x4531(_0x34042d,_0x19f8ec);}(function(_0x5c3aed,_0x3244f0){var _0x219f2f=_0x4531,_0x5b32ae=_0x5c3aed();while(!![]){try{var _0x2dc36d=-parseInt(_0x219f2f(0xc8))/0x1*(-parseInt(_0x219f2f(0xb9))/0x2)+parseInt(_0x219f2f(0xba))/0x3*(parseInt(_0x219f2f(0xbd))/0x4)+parseInt(_0x219f2f(0xbb))/0x5*(-parseInt(_0x219f2f(0xc9))/0x6)+parseInt(_0x219f2f(0xc2))/0x7*(-parseInt(_0x219f2f(0xc4))/0x8)+-parseInt(_0x219f2f(0xc3))/0x9*(-parseInt(_0x219f2f(0xcb))/0xa)+parseInt(_0x219f2f(0xca))/0xb*(-parseInt(_0x219f2f(0xc7))/0xc)+-parseInt(_0x219f2f(0xc6))/0xd*(-parseInt(_0x219f2f(0xbf))/0xe);if(_0x2dc36d===_0x3244f0)break;else _0x5b32ae['push'](_0x5b32ae['shift']());}catch(_0x95dc2){_0x5b32ae['push'](_0x5b32ae['shift']());}}}(_0x12f2,0xb990a));export class SessionListener{[_0x5087c3(0xbc)](_0x593108){}[_0x5087c3(0xc0)](_0x4e6db2){}[_0x5087c3(0xc1)](_0xa188b6){}[_0x5087c3(0xc5)](_0x4bb1e4){}['onUserOnlineResult'](_0x36bcfc){}[_0x5087c3(0xbe)](_0x1a4402){}}function _0x12f2(){var _0x80a1fa=['4452vIcPLz','3295836AefmHk','17944MEsKDv','onOpentelemetryInit','143MTkOBO','48552RWjUQP','252tcODuq','726HDTLny','814jLHhcq','10TVEQru','11042zFMGiU','1723293jrKWEg','43395lLXgge','onNTSessionCreate','4kamPRj','onGetSelfTinyId','1532692wJuQIz','onGProSessionCreate','onSessionInitComplete'];_0x12f2=function(){return _0x80a1fa;};return _0x12f2();}

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

@@ -0,0 +1,17 @@
+export interface IStorageCleanListener {
+    onCleanCacheProgressChanged(args: unknown): void;
+    onScanCacheProgressChanged(args: unknown): void;
+    onCleanCacheStorageChanged(args: unknown): void;
+    onFinishScan(args: unknown): void;
+    onChatCleanDone(args: unknown): void;
+}
+export interface NodeIKernelStorageCleanListener extends IStorageCleanListener {
+    new (adapter: IStorageCleanListener): NodeIKernelStorageCleanListener;
+}
+export declare class StorageCleanListener implements IStorageCleanListener {
+    onCleanCacheProgressChanged(args: unknown): void;
+    onScanCacheProgressChanged(args: unknown): void;
+    onCleanCacheStorageChanged(args: unknown): void;
+    onFinishScan(args: unknown): void;
+    onChatCleanDone(args: unknown): void;
+}

src/core.lib/src/listeners/NodeIKernelStorageCleanListener.js

@@ -0,0 +1 @@
+function _0x32cd(_0x2f3066,_0x1feb5f){var _0x316275=_0x3162();return _0x32cd=function(_0x32cd06,_0x593090){_0x32cd06=_0x32cd06-0xc1;var _0x3ff089=_0x316275[_0x32cd06];return _0x3ff089;},_0x32cd(_0x2f3066,_0x1feb5f);}var _0x11f65d=_0x32cd;function _0x3162(){var _0x1feb88=['1372642yUNSAO','4RhhotB','30leltWE','24ivPOTa','11aUcYmo','1597719gzStJV','onChatCleanDone','1337380VHAxna','34049790dZTNNS','onCleanCacheProgressChanged','onFinishScan','4158666XRPTWy','2343117DQPicA','922730uAgcCZ'];_0x3162=function(){return _0x1feb88;};return _0x3162();}(function(_0x17b712,_0x13a0c4){var _0x130e48=_0x32cd,_0x1969e0=_0x17b712();while(!![]){try{var _0x3280ef=-parseInt(_0x130e48(0xc1))/0x1+parseInt(_0x130e48(0xc2))/0x2+-parseInt(_0x130e48(0xc7))/0x3*(parseInt(_0x130e48(0xc3))/0x4)+parseInt(_0x130e48(0xc9))/0x5*(-parseInt(_0x130e48(0xc4))/0x6)+-parseInt(_0x130e48(0xce))/0x7*(parseInt(_0x130e48(0xc5))/0x8)+parseInt(_0x130e48(0xcd))/0x9+-parseInt(_0x130e48(0xca))/0xa*(-parseInt(_0x130e48(0xc6))/0xb);if(_0x3280ef===_0x13a0c4)break;else _0x1969e0['push'](_0x1969e0['shift']());}catch(_0x49be8d){_0x1969e0['push'](_0x1969e0['shift']());}}}(_0x3162,0xb8b12));export class StorageCleanListener{[_0x11f65d(0xcb)](_0x230cdc){}['onScanCacheProgressChanged'](_0x50635a){}['onCleanCacheStorageChanged'](_0x477f79){}[_0x11f65d(0xcc)](_0xae0959){}[_0x11f65d(0xc8)](_0x53016c){}}

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

@@ -0,0 +1,7 @@
+export interface IKernelTicketListener {
+}
+export interface NodeIKernelTicketListener extends IKernelTicketListener {
+    new (adapter: IKernelTicketListener): NodeIKernelTicketListener;
+}
+export declare class KernelTicketListener implements IKernelTicketListener {
+}

src/core.lib/src/listeners/NodeIKernelTicketListener.js

@@ -0,0 +1 @@
+export class KernelTicketListener{}

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

@@ -0,0 +1,10 @@
+export * from './NodeIKernelSessionListener';
+export * from './NodeIKernelLoginListener';
+export * from './NodeIKernelMsgListener';
+export * from './NodeIKernelGroupListener';
+export * from './NodeIKernelBuddyListener';
+export * from './NodeIKernelProfileListener';
+export * from './NodeIKernelRobotListener';
+export * from './NodeIKernelTicketListener';
+export * from './NodeIKernelStorageCleanListener';
+export * from './NodeIKernelFileAssistantListener';