fix: can't get qq of the at member

# Conflicts:
#	src/onebot11/action/index.ts

README.md

@@ -1,175 +1,25 @@
 
 # LLOneBot API
-LiteLoaderQQNT的OneBot11协议插件
+LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发
 
 TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
-*注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
-
-*V3之后不再需要LLAPI*
-
 ## 安装方法
 
-### 通用手动安装方法
+见 <https://llonebot.github.io/zh-CN/guide/getting-started>
 
-1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
+## 设置界面
 
-2.安装本项目插件[LLOneBot](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本
+<img src="./doc/image/setting.png" width="500px" alt="图片名称"/>
 
-*关于插件的安装方法: 下载后解压复制到插件目录*
+## HTTP 调用示例
-
-*插件目录:`LiteLoaderQQNT/plugins`*
-
-安装后的目录结构如下
-```
-├── plugins
-│   ├── LLOneBot
-│   │   └── main/
-│   │   └── preload/
-│   │   └── renderer/
-│   │   └── manifest.json
-│   │   └── node_modules/...
-```
-
-### Linux 容器化快速安装
-
-执行以下任意脚本，按照提示设置NoVnc密码，即可运行，脚本问题与异常参考 [llonebot-docker](https://github.com/MliKiowa/llonebot-docker) 项目。
-
- ```bash
-curl https://cdn.jsdelivr.net/gh/LLOneBot/llonebot-docker/fastboot.sh -o fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
- ```
- ```bash
-wget -O fastboot.sh https://cdn.jsdelivr.net/gh/LLOneBot/llonebot-docker/fastboot.sh & chmod +x fastboot.sh & sudo sh fastboot.sh
- ```
-
-### 使用termux安装
-
-具体安装过程与教程,参考 [llonebot-termux](https://github.com/LLOneBot/llonebot-termux) 项目。
-
-## 支持的功能
-
-目前支持的协议
-- [x] http调用api
-- [x] http事件上报，不支持快捷回复等快捷操作
-- [x] 正向websocket
-- [x] 反向websocket
-
-主要功能:
-- [x] 发送好友消息
-- [x] 发送群消息
-- [x] 获取好友列表
-- [x] 获取群列表
-- [x] 获取群成员列表
-- [x] 撤回消息
-- [x] 处理添加好友请求
-- [x] 处理加群请求
-- [x] 退群
-- [x] 上报好友消息
-- [x] 上报添加好友请求
-- [x] 上报群消息
-- [x] 上报好友、群消息撤回
-- [x] 上报加群请求
-- [x] 上报群员人数变动（尚不支持识别群员人数变动原因）
-- [x] 设置群管理员
-- [x] 群禁言/全体禁言
-- [x] 群踢人
-- [x] 群改群成员名片
-- [x] 修改群名
-
-消息格式支持:
-- [x] cq码
-- [x] 文字
-- [x] 表情
-- [x] 图片
-- [x] 引用消息
-- [x] @群成员
-- [x] 语音(支持mp3、wav等多种音频格式直接发送)
-- [x] json消息(只上报)
-- [x] 转发消息记录(目前只能发不能收)
-- [x] 视频(上报时暂时只有个空的file)
-- [x] 文件(上报时暂时只有个空的file), type为file, data为{file: uri}, 发送时uri支持http://, file://, base64://
-    ```
-    {
-        "type": "file",
-        "data": {
-            "file": "file:///D:/1.txt",
-            "name": "自定义显示的文件名"  // 此字段不是必须的
-        }
-    }
-    ```
-- [ ] 发送音乐卡片
-- [ ] 红包（没有计划支持）
-- [ ] xml (没有计划支持)
-
-## 示例
 
 ![](doc/image/example.jpg)
 
-## 一些坑
+## 支持的 api 和功能详情
 
-<details>
+见 <https://llonebot.github.io/zh-CN/develop/api>
-    <summary>下载了插件但是没有看到在NTQQ中生效</summary>
-<br/>
-    检查是否下载的是插件release的版本，如果是源码的话需要自行编译。依然不生效请查阅<a href="https://liteloaderqqnt.github.io/guide/plugins.html">LiteLoaderQQNT的文档</a>
-</details>
-<br/>
 
-<details>
-    <summary>调用接口报404</summary>
-<br/>
-    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口
-- 
-</details>
-<br/>
-
-<details>
-    <summary>发送不了图片和语音</summary>
-<br/>
-    检查当前操作用户是否有LiteLoaderQQNT/data/LLOneBot的写入权限，如Windows把QQ上安装到C盘有可能会出现无权限导致发送失败
-</details>
-<br/>
-
-<details>
-    <summary>QQ变得很卡</summary>
-<br/>
-    这是你的群特别多导致的，因为启动后会批量获取群成员列表，获取完之后就正常了
-</details>
-<br/>
-
-## 支持的onebot v11 api:
-- [x] get_login_info
-- [x] send_msg
-- [x] send_group_msg
-- [x] send_private_msg
-- [x] delete_msg
-- [x] get_group_list
-- [x] get_group_info
-- [x] get_group_member_list
-- [x] get_group_member_info
-- [x] get_friend_list
-- [x] set_friend_add_request
-- [x] get_msg
-- [x] send_like
-- [x] set_group_add_request
-- [x] set_group_leave
-- [x] set_group_kick
-- [x] set_group_ban
-- [x] set_group_whole_ban
-- [x] set_group_kick
-- [x] set_group_admin
-- [x] set_group_card
-- [x] set_group_name
-- [x] get_version_info
-- [x] get_status
-- [x] can_send_image
-- [x] can_send_record
-- [x] get_image
-- [x] get_record
-
-### 支持的go-cqhtp api:
-- [x] send_private_forward_msg
-- [x] send_group_forward_msg
-- [x] get_stranger_info
 
 ## TODO
 - [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
@@ -179,14 +29,24 @@ wget -O fastboot.sh https://cdn.jsdelivr.net/gh/LLOneBot/llonebot-docker/fastboo
 - [x] 群管理功能，禁言、踢人，改群名片等
 - [x] 视频消息
 - [x] 文件消息
-- [ ] 音乐卡片
+- [x] 群禁言事件上报
+- [x] 优化加群成功事件上报
+- [x] 清理缓存api
 - [ ] 无头模式
+- [ ] 框架对接文档
 
 ## onebot11文档
 <https://11.onebot.dev/>
 
+## Stargazers over time
+[![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
+
+
 ## 鸣谢
 * [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
 * [LLAPI](https://github.com/Night-stars-1/LiteLoaderQQNT-Plugin-LLAPI)
-* chronocat
+* [chronocat](https://github.com/chrononeko/chronocat/)
 * [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
+
+## 友链
+* [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架

electron.vite.config.ts

@@ -28,7 +28,9 @@ let config = {
                 './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg'
             },
         },
-        plugins: [cp({ targets: [...external.map(genCpModule), { src: './manifest.json', dest: 'dist' }] })]
+        plugins: [cp({ targets: [...external.map(genCpModule),
+                { src: './manifest.json', dest: 'dist' }, {src: './icon.jpg', dest: 'dist' }]
+        })]
     },
     preload: {
         // vite config options

manifest.json

@@ -1,11 +1,11 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.13.9",
+  "name": "LLOneBot v3.15.1",
   "slug": "LLOneBot",
-  "description": "LiteLoaderQQNT的OneBotApi",
+  "description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新",
-  "version": "3.13.9",
+  "version": "3.15.1",
-  "thumbnail": "./icon.png",
+  "icon": "./icon.jpg",
   "authors": [
     {
       "name": "linyuchen",

package.json

@@ -9,7 +9,7 @@
     "build-mac": "npm run build && npm run deploy-mac",
     "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
     "build-win": "npm run build && npm run deploy-win",
-    "deploy-win": "cmd /c \"xcopy /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
+    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
   },
   "author": "",
   "license": "ISC",

scripts/test/test_db.ts

@@ -0,0 +1,17 @@
+import {Level} from "level"
+
+const db = new Level(process.env["level_db_path"], {valueEncoding: 'json'});
+
+async function getGroupNotify() {
+    let keys = await db.keys().all();
+    let result = []
+    for (const key of keys) {
+        // console.log(key)
+        if (key.startsWith("group_notify_")) {
+            result.push(key)
+        }
+    }
+    return result
+}
+
+getGroupNotify().then(console.log)

src/common/data.ts

@@ -11,7 +11,7 @@ import {
 import {type FileCache, type LLOneBotError} from './types'
 import {dbUtil} from "./db";
 import {raw} from "express";
-import {log} from "./utils";
+import {isNumeric, log} from "./utils";
 
 export const selfInfo: SelfInfo = {
     uid: '',
@@ -21,7 +21,6 @@ export const selfInfo: SelfInfo = {
 }
 export let groups: Group[] = []
 export let friends: Friend[] = []
-export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>()
 export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
 export const llonebotError: LLOneBotError = {
     ffmpegError: '',
@@ -29,9 +28,9 @@ export const llonebotError: LLOneBotError = {
 }
 
 
-export async function getFriend(qq: string, uid: string = ""): Promise<Friend | undefined> {
+export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-    let filterKey = uid ? "uid" : "uin"
+    let filterKey = isNumeric(uinOrUid) ? "uin" : "uid"
-    let filterValue = uid ? uid : qq
+    let filterValue = uinOrUid
     let friend = friends.find(friend => friend[filterKey] === filterValue.toString())
     // if (!friend) {
     //     try {
@@ -60,15 +59,13 @@ export async function getGroup(qq: string): Promise<Group | undefined> {
     return group
 }
 
-export async function getGroupMember(groupQQ: string | number, memberQQ: string | number, memberUid: string = null) {
+export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
     groupQQ = groupQQ.toString()
-    if (memberQQ) {
+    memberUinOrUid = memberUinOrUid.toString()
-        memberQQ = memberQQ.toString()
-    }
     const group = await getGroup(groupQQ)
     if (group) {
-        const filterKey = memberQQ ? "uin" : "uid"
+        const filterKey = isNumeric(memberUinOrUid) ? "uin" : "uid"
-        const filterValue = memberQQ ? memberQQ : memberUid
+        const filterValue = memberUinOrUid
         let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
         let member = group.members?.find(filterFunc)
         if (!member) {

src/common/db.ts

@@ -1,17 +1,18 @@
 import {Level} from "level";
-import {RawMessage} from "../ntqqapi/types";
+import {type GroupNotify, RawMessage} from "../ntqqapi/types";
 import {DATA_DIR, log} from "./utils";
 import {selfInfo} from "./data";
 import {FileCache} from "./types";
 
 
 class DBUtil {
-    private readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
+    public readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
-    private readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
+    public readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
-    private readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
+    public readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
-    private readonly DB_KEY_PREFIX_FILE = "file_";
+    public readonly DB_KEY_PREFIX_FILE = "file_";
-    private db: Level;
+    public readonly DB_KEY_PREFIX_GROUP_NOTIFY = "group_notify_";
-    private cache: Record<string, RawMessage | string | FileCache> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
+    public db: Level;
+    public cache: Record<string, RawMessage | string | FileCache | GroupNotify> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
     private currentShortId: number;
 
     /*
@@ -47,9 +48,23 @@ class DBUtil {
             }
             initDB();
         }).then()
+
+        const expiredMilliSecond = 1000 * 60 * 60;
+
         setInterval(() => {
-            this.cache = {}
+            // this.cache = {}
-        }, 1000 * 60 * 10)
+            // 清理时间较久的缓存
+            const now = Date.now()
+            for (let key in this.cache) {
+                let message: RawMessage = this.cache[key] as RawMessage;
+                if (message?.msgTime){
+                    if ((now - (parseInt(message.msgTime) * 1000)) > expiredMilliSecond) {
+                        delete this.cache[key]
+                        // log("clear cache", key, message.msgTime);
+                    }
+                }
+            }
+        }, expiredMilliSecond)
     }
 
     private addCache(msg: RawMessage) {
@@ -59,15 +74,24 @@ class DBUtil {
         this.cache[longIdKey] = this.cache[shortIdKey] = msg
     }
 
+    public clearCache() {
+        this.cache = {}
+    }
+
     async getMsgByShortId(shortMsgId: number): Promise<RawMessage> {
         const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
         if (this.cache[shortMsgIdKey]) {
+            // log("getMsgByShortId cache", shortMsgIdKey, this.cache[shortMsgIdKey])
             return this.cache[shortMsgIdKey] as RawMessage
         }
-        const longId = await this.db.get(shortMsgIdKey);
+        try {
-        const msg = await this.getMsgByLongId(longId)
+            const longId = await this.db.get(shortMsgIdKey);
-        this.addCache(msg)
+            const msg = await this.getMsgByLongId(longId)
-        return msg
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            log("getMsgByShortId db error", e.stack.toString())
+        }
     }
 
     async getMsgByLongId(longId: string): Promise<RawMessage> {
@@ -75,10 +99,14 @@ class DBUtil {
         if (this.cache[longIdKey]) {
             return this.cache[longIdKey] as RawMessage
         }
-        const data = await this.db.get(longIdKey)
+        try {
-        const msg = JSON.parse(data)
+            const data = await this.db.get(longIdKey)
-        this.addCache(msg)
+            const msg = JSON.parse(data)
-        return msg
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            // log("getMsgByLongId db error", e.stack.toString())
+        }
     }
 
     async getMsgBySeqId(seqId: string): Promise<RawMessage> {
@@ -86,10 +114,14 @@ class DBUtil {
         if (this.cache[seqIdKey]) {
             return this.cache[seqIdKey] as RawMessage
         }
-        const longId = await this.db.get(seqIdKey);
+        try {
-        const msg = await this.getMsgByLongId(longId)
+            const longId = await this.db.get(seqIdKey);
-        this.addCache(msg)
+            const msg = await this.getMsgByLongId(longId)
-        return msg
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            log("getMsgBySeqId db error", e.stack.toString())
+        }
     }
 
     async addMsg(msg: RawMessage) {
@@ -101,7 +133,7 @@ class DBUtil {
             try {
                 existMsg = await this.getMsgByLongId(msg.msgId)
             } catch (e) {
-
+                // log("addMsg getMsgByLongId error", e.stack.toString())
             }
         }
         if (existMsg) {
@@ -109,29 +141,26 @@ class DBUtil {
             this.updateMsg(msg).then()
             return existMsg.msgShortId
         }
+        this.addCache(msg);
 
         const shortMsgId = await this.genMsgShortId();
         const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
         const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
         msg.msgShortId = shortMsgId;
+        // log("新增消息记录", msg.msgId)
+        this.db.put(shortIdKey, msg.msgId).then().catch();
+        this.db.put(longIdKey, JSON.stringify(msg)).then().catch();
         try {
-            this.db.put(shortIdKey, msg.msgId).then();
+            await this.db.get(seqIdKey)
-            this.db.put(longIdKey, JSON.stringify(msg)).then();
-            try {
-                await this.db.get(seqIdKey)
-            } catch (e) {
-                // log("新的seqId", seqIdKey)
-                this.db.put(seqIdKey, msg.msgId).then();
-            }
-            this.cache[shortIdKey] = this.cache[longIdKey] = msg;
-            if (!this.cache[seqIdKey]) {
-                this.cache[seqIdKey] = msg;
-            }
-            // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
         } catch (e) {
-            // log("addMsg db error", e.stack.toString());
+            // log("新的seqId", seqIdKey)
+            this.db.put(seqIdKey, msg.msgId).then().catch();
+        }
+        if (!this.cache[seqIdKey]) {
+            this.cache[seqIdKey] = msg;
         }
         return shortMsgId
+        // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
     }
 
     async updateMsg(msg: RawMessage) {
@@ -146,17 +175,17 @@ class DBUtil {
         }
 
         Object.assign(existMsg, msg)
-        this.db.put(longIdKey, JSON.stringify(existMsg)).then();
+        this.db.put(longIdKey, JSON.stringify(existMsg)).then().catch();
         const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + existMsg.msgShortId;
         const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
         if (!this.cache[seqIdKey]) {
             this.cache[seqIdKey] = existMsg;
         }
-        this.db.put(shortIdKey, msg.msgId).then();
+        this.db.put(shortIdKey, msg.msgId).then().catch();
         try {
             await this.db.get(seqIdKey)
         } catch (e) {
-            this.db.put(seqIdKey, msg.msgId).then();
+            this.db.put(seqIdKey, msg.msgId).then().catch();
             // log("更新seqId error", e.stack, seqIdKey);
         }
         // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
@@ -175,7 +204,7 @@ class DBUtil {
         }
 
         this.currentShortId++;
-        await this.db.put(key, this.currentShortId.toString());
+        this.db.put(key, this.currentShortId.toString()).then().catch();
         return this.currentShortId;
     }
 
@@ -187,7 +216,11 @@ class DBUtil {
         let cacheDBData = {...data}
         delete cacheDBData['downloadFunc']
         this.cache[fileName] = data;
-        await this.db.put(key, JSON.stringify(cacheDBData));
+        try {
+            await this.db.put(key, JSON.stringify(cacheDBData));
+        } catch (e) {
+            log("addFileCache db error", e.stack.toString())
+        }
     }
 
     async getFileCache(fileName: string): Promise<FileCache | undefined> {
@@ -196,11 +229,33 @@ class DBUtil {
             return this.cache[key] as FileCache
         }
         try {
-
             let data = await this.db.get(key);
             return JSON.parse(data);
         } catch (e) {
+            // log("getFileCache db error", e.stack.toString())
+        }
+    }
 
+    async addGroupNotify(notify: GroupNotify) {
+        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + notify.seq;
+        let existNotify = this.cache[key] as GroupNotify
+        if (existNotify) {
+            return
+        }
+        this.cache[key] = notify;
+        this.db.put(key, JSON.stringify(notify)).then().catch();
+    }
+
+    async getGroupNotify(seq: string): Promise<GroupNotify | undefined> {
+        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + seq;
+        if (this.cache[key]) {
+            return this.cache[key] as GroupNotify
+        }
+        try {
+            let data = await this.db.get(key);
+            return JSON.parse(data);
+        } catch (e) {
+            // log("getGroupNotify db error", e.stack.toString())
         }
     }
 }

src/common/server/http.ts

@@ -11,8 +11,21 @@ export abstract class HttpServerBase {
 
     constructor() {
         this.expressAPP = express();
-        this.expressAPP.use(express.urlencoded({extended: true, limit: "500mb"}));
+        this.expressAPP.use(express.urlencoded({extended: true, limit: "5000mb"}));
-        this.expressAPP.use(json({limit: "500mb"}));
+        this.expressAPP.use((req, res, next) => {
+            // 兼容处理没有带content-type的请求
+            // log("req.headers['content-type']", req.headers['content-type'])
+            req.headers['content-type'] = 'application/json';
+            const originalJson = express.json({limit: "5000mb"});
+            // 调用原始的express.json()处理器
+            originalJson(req, res, (err) => {
+                if (err) {
+                    log("Error parsing JSON:", err);
+                    return res.status(400).send("Invalid JSON");
+                }
+                next();
+            });
+        });
     }
 
     authorize(req: Request, res: Response, next: () => void) {

src/common/utils.ts

@@ -4,6 +4,7 @@ import {ConfigUtil} from "./config";
 import util from "util";
 import {encode, getDuration, isWav} from "silk-wasm";
 import fs from 'fs';
+import * as crypto from 'crypto';
 import {v4 as uuidv4} from "uuid";
 import ffmpeg from "fluent-ffmpeg"
 
@@ -31,6 +32,11 @@ function truncateString(obj: any, maxLength = 500) {
     return obj;
 }
 
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+
+
 export function log(...msg: any[]) {
     if (!getConfigUtil().getConfig().log) {
         return //console.log(...msg);
@@ -205,7 +211,7 @@ export async function encodeSilk(filePath: string) {
                     if (ffmpegPath) {
                         ffmpeg.setFfmpegPath(ffmpegPath);
                     }
-                    ffmpeg(filePath).toFormat("wav").on('end', function () {
+                    ffmpeg(filePath).toFormat("wav").audioChannels(2).on('end', function () {
                         log('wav转换完成');
                     })
                         .on('error', function (err) {
@@ -220,11 +226,11 @@ export async function encodeSilk(filePath: string) {
                 })
             }
             // const sampleRate = await getAudioSampleRate(filePath) || 0;
+            // log("音频采样率", sampleRate)
             const pcm = fs.readFileSync(filePath);
             const silk = await encode(pcm, 0);
             fs.writeFileSync(pttPath, silk.data);
-            fs.unlink(wavPath, (err) => {
+            fs.unlink(wavPath, (err) => { });
-            });
             log(`语音文件${filePath}转换成功!`, pttPath)
             return {
                 converted: true,
@@ -234,9 +240,9 @@ export async function encodeSilk(filePath: string) {
         } else {
             const pcm = fs.readFileSync(filePath);
             let duration = 0;
-            try{
+            try {
                 duration = getDuration(pcm);
-            }catch (e) {
+            } catch (e) {
                 log("获取语音文件时长失败", filePath, e.stack)
                 duration = fs.statSync(filePath).size / 1024 / 3  // 每3kb大约1s
                 duration = Math.floor(duration)
@@ -256,6 +262,81 @@ export async function encodeSilk(filePath: string) {
     }
 }
 
+export async function getVideoInfo(filePath: string) {
+    const size = fs.statSync(filePath).size;
+    return new Promise<{ width: number, height: number, time: number, format: string, size: number, filePath: string }>((resolve, reject) => {
+        ffmpeg(filePath).ffprobe( (err, metadata) => {
+            if (err) {
+                reject(err);
+            } else {
+                const videoStream = metadata.streams.find(s => s.codec_type === 'video');
+                if (videoStream) {
+                    console.log(`视频尺寸: ${videoStream.width}x${videoStream.height}`);
+                } else {
+                    console.log('未找到视频流信息。');
+                }
+                resolve({
+                    width: videoStream.width, height: videoStream.height,
+                    time: parseInt(videoStream.duration),
+                    format: metadata.format.format_name,
+                    size,
+                    filePath
+                });
+            }
+        });
+    })
+}
+
+
+export async function encodeMp4(filePath: string) {
+    let videoInfo = await getVideoInfo(filePath);
+    log("视频信息", videoInfo)
+    if (videoInfo.format.indexOf("mp4") === -1) {
+        log("视频需要转换为MP4格式", filePath)
+        // 转成mp4
+        const newPath: string = await new Promise<string>((resolve, reject) => {
+            const newPath = filePath + ".mp4"
+            ffmpeg(filePath)
+                .toFormat('mp4')
+                .on('error', (err) => {
+                    reject(`转换视频格式失败: ${err.message}`);
+                })
+                .on('end', () => {
+                    log('视频转换为MP4格式完成');
+                    resolve(newPath); // 返回转换后的文件路径
+                })
+                .save(newPath);
+        });
+        return await getVideoInfo(newPath)
+    }
+    return videoInfo
+}
+
 export function isNull(value: any) {
     return value === undefined || value === null;
-}
+}
+
+
+export function calculateFileMD5(filePath: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        // 创建一个流式读取器
+        const stream = fs.createReadStream(filePath);
+        const hash = crypto.createHash('md5');
+
+        stream.on('data', (data: Buffer) => {
+            // 当读取到数据时，更新哈希对象的状态
+            hash.update(data);
+        });
+
+        stream.on('end', () => {
+            // 文件读取完成，计算哈希
+            const md5 = hash.digest('hex');
+            resolve(md5);
+        });
+
+        stream.on('error', (err: Error) => {
+            // 处理可能的读取错误
+            reject(err);
+        });
+    });
+}

src/main/main.ts

@@ -13,35 +13,29 @@ import {
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
 import {checkFfmpeg, DATA_DIR, getConfigUtil, log} from "../common/utils";
 import {
-    friendRequests, getFriend,
+    friendRequests,
+    getFriend,
     getGroup,
     getGroupMember,
-    groupNotifies,
+    llonebotError,
-    llonebotError, refreshGroupMembers,
+    refreshGroupMembers,
     selfInfo
 } from "../common/data";
 import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
 import {OB11Constructor} from "../onebot11/constructor";
 import {NTQQApi} from "../ntqqapi/ntcall";
-import {
+import {ChatType, FriendRequestNotify, GroupNotifies, GroupNotifyTypes, RawMessage} from "../ntqqapi/types";
-    ChatType,
-    FriendRequestNotify,
-    GroupMember,
-    GroupNotifies,
-    GroupNotifyTypes,
-    RawMessage
-} from "../ntqqapi/types";
 import {ob11HTTPServer} from "../onebot11/server/http";
 import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
 import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
 import {postOB11Event} from "../onebot11/server/postOB11Event";
 import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
 import {OB11GroupAdminNoticeEvent} from "../onebot11/event/notice/OB11GroupAdminNoticeEvent";
-import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
 import {OB11GroupRequestEvent} from "../onebot11/event/request/OB11GroupRequest";
 import {OB11FriendRequestEvent} from "../onebot11/event/request/OB11FriendRequest";
 import * as path from "node:path";
 import {dbUtil} from "../common/db";
+import {setConfig} from "./setConfig";
 
 
 let running = false;
@@ -91,61 +85,8 @@ function onLoad() {
         const config = getConfigUtil().getConfig()
         return config;
     })
-    ipcMain.on(CHANNEL_SET_CONFIG, (event, arg: Config) => {
+    ipcMain.on(CHANNEL_SET_CONFIG, (event, config: Config) => {
-        let oldConfig = getConfigUtil().getConfig();
+        setConfig(config).then();
-        getConfigUtil().setConfig(arg)
-        if (arg.ob11.httpPort != oldConfig.ob11.httpPort && arg.ob11.enableHttp) {
-            ob11HTTPServer.restart(arg.ob11.httpPort);
-        }
-        // 判断是否启用或关闭HTTP服务
-        if (!arg.ob11.enableHttp) {
-            ob11HTTPServer.stop();
-        } else {
-            ob11HTTPServer.start(arg.ob11.httpPort);
-        }
-        // 正向ws端口变化，重启服务
-        if (arg.ob11.wsPort != oldConfig.ob11.wsPort) {
-            ob11WebsocketServer.restart(arg.ob11.wsPort);
-        }
-        // 判断是否启用或关闭正向ws
-        if (arg.ob11.enableWs != oldConfig.ob11.enableWs) {
-            if (arg.ob11.enableWs) {
-                ob11WebsocketServer.start(arg.ob11.wsPort);
-            } else {
-                ob11WebsocketServer.stop();
-            }
-        }
-        // 判断是否启用或关闭反向ws
-        if (arg.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
-            if (arg.ob11.enableWsReverse) {
-                ob11ReverseWebsockets.start();
-            } else {
-                ob11ReverseWebsockets.stop();
-            }
-        }
-        if (arg.ob11.enableWsReverse) {
-            // 判断反向ws地址有变化
-            if (arg.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
-                ob11ReverseWebsockets.restart();
-            } else {
-                for (const newHost of arg.ob11.wsHosts) {
-                    if (!oldConfig.ob11.wsHosts.includes(newHost)) {
-                        ob11ReverseWebsockets.restart();
-                        break;
-                    }
-                }
-            }
-        }
-
-        // 检查ffmpeg
-        if (arg.ffmpeg) {
-            checkFfmpeg(arg.ffmpeg).then(success => {
-                if (success) {
-                    llonebotError.ffmpegError = ''
-                }
-            })
-        }
-
     })
 
     ipcMain.on(CHANNEL_LOG, (event, arg) => {
@@ -155,8 +96,11 @@ function onLoad() {
     async function postReceiveMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
         for (let message of msgList) {
-            // log("收到新消息", message.msgSeq)
+
-            message.msgShortId = await dbUtil.addMsg(message)
+            // log("收到新消息", message.msgId, message.msgSeq)
+            // if (message.senderUin !== selfInfo.uin){
+            message.msgShortId = await dbUtil.addMsg(message);
+            // }
 
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
@@ -169,6 +113,12 @@ function onLoad() {
                 postOB11Event(msg);
                 // log("post msg", msg)
             }).catch(e => log("constructMessage error: ", e.stack.toString()));
+            OB11Constructor.GroupEvent(message).then(groupEvent => {
+                if (groupEvent) {
+                    // log("post group event", groupEvent);
+                    postOB11Event(groupEvent);
+                }
+            })
         }
     }
 
@@ -182,8 +132,8 @@ function onLoad() {
         })
         registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
             for (const message of payload.msgList) {
-                // log("message update", message.sendStatus, message)
+                // log("message update", message.sendStatus, message.msgId, message.msgSeq)
-                if (message.recallTime != "0") {
+                if (message.recallTime != "0") { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断
                     // 撤回消息上报
                     const oriMessage = await dbUtil.getMsgByLongId(message.msgId)
                     if (!oriMessage) {
@@ -198,7 +148,7 @@ function onLoad() {
                         let operatorId = message.senderUin
                         for (const element of message.elements) {
                             const operatorUid = element.grayTipElement?.revokeElement.operatorUid
-                            const operator = await getGroupMember(message.peerUin, null, operatorUid)
+                            const operator = await getGroupMember(message.peerUin, operatorUid)
                             operatorId = operator.uin
                         }
                         const groupRecallEvent = new OB11GroupRecallNoticeEvent(
@@ -249,25 +199,23 @@ function onLoad() {
                 for (const notify of notifies) {
                     try {
                         notify.time = Date.now();
-                        const notifyTime = parseInt(notify.seq) / 1000
+                        // const notifyTime = parseInt(notify.seq) / 1000
                         // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
                         // if (notifyTime < startTime) {
                         //     continue;
                         // }
-                        let existNotify = groupNotifies[notify.seq];
+                        let existNotify = await dbUtil.getGroupNotify(notify.seq);
                         if (existNotify) {
-                            if (Date.now() - existNotify.time < 3000) {
+                            continue
-                                continue
-                            }
                         }
                         log("收到群通知", notify);
-                        groupNotifies[notify.seq] = notify;
+                        await dbUtil.addGroupNotify(notify);
                         // let member2: GroupMember;
                         // if (notify.user2.uid) {
                         //     member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
                         // }
                         if ([GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET].includes(notify.type)) {
-                            const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                            const member1 = await getGroupMember(notify.group.groupCode, notify.user1.uid);
                             log("有管理员变动通知");
                             refreshGroupMembers(notify.group.groupCode).then()
                             let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
@@ -305,8 +253,8 @@ function onLoad() {
                             log("收到邀请我加群通知")
                             let groupInviteEvent = new OB11GroupRequestEvent();
                             groupInviteEvent.group_id = parseInt(notify.group.groupCode);
-                            let user_id = (await getFriend("", notify.user2.uid))?.uin
+                            let user_id = (await getFriend(notify.user2.uid))?.uin
-                            if (!user_id){
+                            if (!user_id) {
                                 user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
                             }
                             groupInviteEvent.user_id = parseInt(user_id);
@@ -347,6 +295,7 @@ function onLoad() {
     let startTime = 0;
 
     async function start() {
+        log("llonebot pid", process.pid)
         startTime = Date.now();
         startReceiveHook().then();
         NTQQApi.getGroups(true).then()
@@ -413,6 +362,10 @@ function onLoad() {
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
+    if (selfInfo.uid) {
+        return
+    }
+    log("window create", window.webContents.getURL().toString())
     try {
         hookNTQQApiCall(window);
         hookNTQQApiReceive(window);

src/main/setConfig.ts

@@ -0,0 +1,63 @@
+import {Config} from "../common/types";
+import {checkFfmpeg, getConfigUtil} from "../common/utils";
+import {ob11HTTPServer} from "../onebot11/server/http";
+import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
+import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
+import {llonebotError} from "../common/data";
+
+export async function setConfig(config: Config) {
+    let oldConfig = getConfigUtil().getConfig();
+    getConfigUtil().setConfig(config)
+    if (config.ob11.httpPort != oldConfig.ob11.httpPort && config.ob11.enableHttp) {
+        ob11HTTPServer.restart(config.ob11.httpPort);
+    }
+    // 判断是否启用或关闭HTTP服务
+    if (!config.ob11.enableHttp) {
+        ob11HTTPServer.stop();
+    } else {
+        ob11HTTPServer.start(config.ob11.httpPort);
+    }
+    // 正向ws端口变化，重启服务
+    if (config.ob11.wsPort != oldConfig.ob11.wsPort) {
+        ob11WebsocketServer.restart(config.ob11.wsPort);
+    }
+    // 判断是否启用或关闭正向ws
+    if (config.ob11.enableWs != oldConfig.ob11.enableWs) {
+        if (config.ob11.enableWs) {
+            ob11WebsocketServer.start(config.ob11.wsPort);
+        } else {
+            ob11WebsocketServer.stop();
+        }
+    }
+    // 判断是否启用或关闭反向ws
+    if (config.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
+        if (config.ob11.enableWsReverse) {
+            ob11ReverseWebsockets.start();
+        } else {
+            ob11ReverseWebsockets.stop();
+        }
+    }
+    if (config.ob11.enableWsReverse) {
+        // 判断反向ws地址有变化
+        if (config.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
+            ob11ReverseWebsockets.restart();
+        } else {
+            for (const newHost of config.ob11.wsHosts) {
+                if (!oldConfig.ob11.wsHosts.includes(newHost)) {
+                    ob11ReverseWebsockets.restart();
+                    break;
+                }
+            }
+        }
+    }
+
+    // 检查ffmpeg
+    if (config.ffmpeg) {
+        checkFfmpeg(config.ffmpeg).then(success => {
+            if (success) {
+                llonebotError.ffmpegError = ''
+            }
+        })
+    }
+
+}

src/ntqqapi/constructor.ts

@@ -1,16 +1,20 @@
 import {
     AtType,
-    ElementType, PicType, SendArkElement,
+    ElementType,
+    PicType,
+    SendArkElement,
     SendFaceElement,
     SendFileElement,
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendTextElement
+    SendTextElement,
+    SendVideoElement
 } from "./types";
 import {NTQQApi} from "./ntcall";
-import {encodeSilk, isGIF} from "../common/utils";
+import {calculateFileMD5, encodeSilk, getVideoInfo, isGIF, log, sleep} from "../common/utils";
-import * as fs from "node:fs";
+import {promises as fs} from "node:fs";
+import ffmpeg from "fluent-ffmpeg"
 
 
 export class SendMsgElementConstructor {
@@ -57,7 +61,7 @@ export class SendMsgElementConstructor {
 
     static async pic(picPath: string): Promise<SendPicElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath, ElementType.PIC);
-        if (fileSize === 0){
+        if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
         const imageSize = await NTQQApi.getImageSize(picPath);
@@ -84,15 +88,9 @@ export class SendMsgElementConstructor {
         };
     }
 
-    static async file(filePath: string, showPreview: boolean = false, fileName: string = ""): Promise<SendFileElement> {
+    static async file(filePath: string, fileName: string = ""): Promise<SendFileElement> {
-        let picHeight = 0;
-        let picWidth = 0;
-        if (showPreview) {
-            picHeight = 1024;
-            picWidth = 768;
-        }
         const {md5, fileName: _fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
-        if (fileSize === 0){
+        if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
         let element: SendFileElement = {
@@ -102,28 +100,89 @@ export class SendMsgElementConstructor {
                 fileName: fileName || _fileName,
                 "filePath": path,
                 "fileSize": (fileSize).toString(),
-                picHeight,
-                picWidth
             }
         }
 
         return element;
     }
 
-    static video(filePath: string, fileName: string=""): Promise<SendFileElement> {
+    static async video(filePath: string, fileName: string = ""): Promise<SendVideoElement> {
-        return SendMsgElementConstructor.file(filePath, true, fileName);
+        let {fileName: _fileName, path, fileSize, md5} = await NTQQApi.uploadFile(filePath, ElementType.VIDEO);
+        if (fileSize === 0) {
+            throw "文件异常，大小为0";
+        }
+        // const videoInfo = await encodeMp4(path);
+        // path = videoInfo.filePath
+        // md5 = videoInfo.md5;
+        // fileSize = videoInfo.size;
+        // log("上传视频", md5, path, fileSize, fileName || _fileName)
+        const pathLib = require("path");
+        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
+        thumb = pathLib.dirname(thumb)
+        // log("thumb 目录", thumb)
+        const videoInfo = await getVideoInfo(path);
+        log("视频信息", videoInfo)
+        const createThumb = new Promise<string>((resolve, reject) => {
+            const thumbFileName = `${md5}_0.png`
+            ffmpeg(filePath)
+                .on("end", () => {
+                })
+                .on("error", (err) => {
+                    reject(err);
+                })
+                .screenshots({
+                    timestamps: [0],
+                    filename: thumbFileName,
+                    folder: thumb,
+                    size: videoInfo.width + "x" + videoInfo.height
+                }).on("end", () => {
+                    resolve(pathLib.join(thumb, thumbFileName));
+            });
+        })
+        let thumbPath = new Map()
+        const _thumbPath = await createThumb;
+        const thumbSize = (await fs.stat(_thumbPath)).size;
+        // log("生成缩略图", _thumbPath)
+        thumbPath.set(0, _thumbPath)
+        const thumbMd5 = await calculateFileMD5(_thumbPath);
+        let element: SendVideoElement = {
+            elementType: ElementType.VIDEO,
+            elementId: "",
+            videoElement: {
+                fileName: fileName || _fileName,
+                filePath: path,
+                videoMd5: md5,
+                thumbMd5,
+                fileTime: videoInfo.time,
+                thumbPath: thumbPath,
+                thumbSize,
+                thumbWidth: videoInfo.width,
+                thumbHeight: videoInfo.height,
+                fileSize: "" + fileSize,
+                // fileUuid: "",
+                // transferStatus: 0,
+                // progress: 0,
+                // invalidState: 0,
+                // fileSubId: "",
+                // fileBizId: null,
+                // originVideoMd5: "",
+                // fileFormat: 2,
+                // import_rich_media_context: null,
+                // sourceVideoCodecFormat: 2
+            }
+        }
+        return element;
     }
 
     static async ptt(pttPath: string): Promise<SendPttElement> {
         const {converted, path: silkPath, duration} = await encodeSilk(pttPath);
         // log("生成语音", silkPath, duration);
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(silkPath, ElementType.PTT);
-        if (fileSize === 0){
+        if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
         if (converted) {
-            fs.unlink(silkPath, () => {
+            fs.unlink(silkPath).then();
-            });
         }
         return {
             elementType: ElementType.PTT,

src/ntqqapi/hook.ts

@@ -1,72 +1,74 @@
-import {type BrowserWindow} from 'electron'
+import {BrowserWindow} from 'electron';
-import {getConfigUtil, log, sleep} from '../common/utils'
+import {getConfigUtil, log, sleep} from "../common/utils";
-import {NTQQApi, type NTQQApiClass, sendMessagePool} from './ntcall'
+import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
-import {type Group, type RawMessage, type User} from './types'
+import {Group, RawMessage, User} from "./types";
-import {friends, groups, selfInfo, tempGroupCodeMap} from '../common/data'
+import {friends, groups, selfInfo, tempGroupCodeMap} from "../common/data";
-import {OB11GroupDecreaseEvent} from '../onebot11/event/notice/OB11GroupDecreaseEvent'
+import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
-import {OB11GroupIncreaseEvent} from '../onebot11/event/notice/OB11GroupIncreaseEvent'
+import {OB11GroupIncreaseEvent} from "../onebot11/event/notice/OB11GroupIncreaseEvent";
-import {v4 as uuidv4} from 'uuid'
+import {v4 as uuidv4} from "uuid"
-import {postOB11Event} from '../onebot11/server/postOB11Event'
+import {postOB11Event} from "../onebot11/server/postOB11Event";
-import {HOOK_LOG} from '../common/config'
+import {HOOK_LOG} from "../common/config";
-import fs from 'fs'
+import fs from "fs";
 import {dbUtil} from "../common/db";
 
-export const hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
+export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
 export enum ReceiveCmd {
-    UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+    UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+    NEW_MSG = "nodeIKernelMsgListener/onRecvMsg",
-    SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
+    SELF_SEND_MSG = "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
+    USER_INFO = "nodeIKernelProfileListener/onProfileSimpleChanged",
-    USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+    USER_DETAIL_INFO = "nodeIKernelProfileListener/onProfileDetailInfoChanged",
-    GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
+    GROUPS = "nodeIKernelGroupListener/onGroupListUpdate",
-    GROUPS_UNIX = 'onGroupListUpdate',
+    GROUPS_UNIX = "onGroupListUpdate",
-    FRIENDS = 'onBuddyListChange',
+    FRIENDS = "onBuddyListChange",
-    MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+    MEDIA_DOWNLOAD_COMPLETE = "nodeIKernelMsgListener/onRichMediaDownloadComplete",
-    UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+    UNREAD_GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
-    GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+    GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
-    FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
+    FRIEND_REQUEST = "nodeIKernelBuddyListener/onBuddyReqChange",
     SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+    CACHE_SCAN_FINISH = "nodeIKernelStorageCleanListener/onFinishScan",
+    MEDIA_UPLOAD_COMPLETE = "nodeIKernelMsgListener/onRichMediaUploadComplete",
 }
 
 interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
     0: {
-        'type': 'request'
+        "type": "request",
-        'eventName': NTQQApiClass
+        "eventName": NTQQApiClass,
-        'callbackId'?: string
+        "callbackId"?: string
-    }
+    },
     1:
-        Array<{
+        {
-            cmdName: ReceiveCmd
+            cmdName: ReceiveCmd,
-            cmdType: 'event'
+            cmdType: "event",
             payload: PayloadType
-        }>
+        }[]
 }
 
-const receiveHooks: Array<{
+let receiveHooks: Array<{
-    method: ReceiveCmd
+    method: ReceiveCmd,
     hookFunc: ((payload: any) => void | Promise<void>)
     id: string
 }> = []
 
 export function hookNTQQApiReceive(window: BrowserWindow) {
-    const originalSend = window.webContents.send
+    const originalSend = window.webContents.send;
     const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
         HOOK_LOG && log(`received ntqq api message: ${channel}`, JSON.stringify(args))
         if (args?.[1] instanceof Array) {
-            for (const receiveData of args?.[1]) {
+            for (let receiveData of args?.[1]) {
-                const ntQQApiMethodName = receiveData.cmdName
+                const ntQQApiMethodName = receiveData.cmdName;
                 // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-                for (const hook of receiveHooks) {
+                for (let hook of receiveHooks) {
                     if (hook.method === ntQQApiMethodName) {
                         new Promise((resolve, reject) => {
                             try {
-                                const _ = hook.hookFunc(receiveData.payload)
+                                let _ = hook.hookFunc(receiveData.payload)
-                                if (hook.hookFunc.constructor.name === 'AsyncFunction') {
+                                if (hook.hookFunc.constructor.name === "AsyncFunction") {
                                     (_ as Promise<void>).then()
                                 }
                             } catch (e) {
-                                log('hook error', e, receiveData.payload)
+                                log("hook error", e, receiveData.payload)
                             }
                         }).then()
                     }
@@ -75,35 +77,35 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
         }
         if (args[0]?.callbackId) {
             // log("hookApiCallback", hookApiCallbacks, args)
-            const callbackId = args[0].callbackId
+            const callbackId = args[0].callbackId;
             if (hookApiCallbacks[callbackId]) {
                 // log("callback found")
                 new Promise((resolve, reject) => {
-                    hookApiCallbacks[callbackId](args[1])
+                    hookApiCallbacks[callbackId](args[1]);
                 }).then()
-                delete hookApiCallbacks[callbackId]
+                delete hookApiCallbacks[callbackId];
             }
         }
-        return originalSend.call(window.webContents, channel, ...args)
+        return originalSend.call(window.webContents, channel, ...args);
     }
-    window.webContents.send = patchSend
+    window.webContents.send = patchSend;
 }
 
 export function hookNTQQApiCall(window: BrowserWindow) {
     // 监听调用NTQQApi
-    const webContents = window.webContents as any
+    let webContents = window.webContents as any;
-    const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
+    const ipc_message_proxy = webContents._events["-ipc-message"]?.[0] || webContents._events["-ipc-message"];
 
     const proxyIpcMsg = new Proxy(ipc_message_proxy, {
         apply(target, thisArg, args) {
-            HOOK_LOG && log('call NTQQ api', thisArg, args)
+            HOOK_LOG && log("call NTQQ api", thisArg, args);
-            return target.apply(thisArg, args)
+            return target.apply(thisArg, args);
-        }
+        },
-    })
+    });
-    if (webContents._events['-ipc-message']?.[0]) {
+    if (webContents._events["-ipc-message"]?.[0]) {
-        webContents._events['-ipc-message'][0] = proxyIpcMsg
+        webContents._events["-ipc-message"][0] = proxyIpcMsg;
     } else {
-        webContents._events['-ipc-message'] = proxyIpcMsg
+        webContents._events["-ipc-message"] = proxyIpcMsg;
     }
 }
 
@@ -114,29 +116,29 @@ export function registerReceiveHook<PayloadType>(method: ReceiveCmd, hookFunc: (
         hookFunc,
         id
     })
-    return id
+    return id;
 }
 
 export function removeReceiveHook(id: string) {
     const index = receiveHooks.findIndex(h => h.id === id)
-    receiveHooks.splice(index, 1)
+    receiveHooks.splice(index, 1);
 }
 
 async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
-    for (const group of _groups) {
+    for (let group of _groups) {
-        let existGroup = groups.find(g => g.groupCode == group.groupCode)
+        let existGroup = groups.find(g => g.groupCode == group.groupCode);
         if (existGroup) {
-            Object.assign(existGroup, group)
+            Object.assign(existGroup, group);
         } else {
-            groups.push(group)
+            groups.push(group);
-            existGroup = group
+            existGroup = group;
         }
 
         if (needUpdate) {
-            const members = await NTQQApi.getGroupMembers(group.groupCode)
+            const members = await NTQQApi.getGroupMembers(group.groupCode);
 
             if (members) {
-                existGroup.members = members
+                existGroup.members = members;
             }
         }
     }
@@ -144,83 +146,68 @@ async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
 
 async function processGroupEvent(payload) {
     try {
-        const newGroupList = payload.groupList
+        const newGroupList = payload.groupList;
         for (const group of newGroupList) {
-            const existGroup = groups.find(g => g.groupCode == group.groupCode)
+            let existGroup = groups.find(g => g.groupCode == group.groupCode);
             if (existGroup) {
                 if (existGroup.memberCount > group.memberCount) {
-                    const oldMembers = existGroup.members
+                    const oldMembers = existGroup.members;
 
-                    await sleep(200) // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
+                    await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-                    const newMembers = await NTQQApi.getGroupMembers(group.groupCode)
+                    const newMembers = await NTQQApi.getGroupMembers(group.groupCode);
 
-                    group.members = newMembers
+                    group.members = newMembers;
-                    const newMembersSet = new Set<string>() // 建立索引降低时间复杂度
+                    const newMembersSet = new Set<string>();  // 建立索引降低时间复杂度
 
                     for (const member of newMembers) {
-                        newMembersSet.add(member.uin)
+                        newMembersSet.add(member.uin);
                     }
 
                     for (const member of oldMembers) {
                         if (!newMembersSet.has(member.uin)) {
-                            postOB11Event(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)))
+                            postOB11Event(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
-                            break
+                            break;
-                        }
-                    }
-                } else if (existGroup.memberCount < group.memberCount) {
-                    const oldMembers = existGroup.members
-                    const oldMembersSet = new Set<string>()
-                    for (const member of oldMembers) {
-                        oldMembersSet.add(member.uin)
-                    }
-
-                    await sleep(200)
-                    const newMembers = await NTQQApi.getGroupMembers(group.groupCode)
-
-                    group.members = newMembers
-                    for (const member of newMembers) {
-                        if (!oldMembersSet.has(member.uin)) {
-                            postOB11Event(new OB11GroupIncreaseEvent(group.groupCode, parseInt(member.uin)))
-                            break
                         }
                     }
                 }
             }
         }
 
-        updateGroups(newGroupList, false).then()
+        updateGroups(newGroupList, false).then();
     } catch (e) {
-        updateGroups(payload.groupList).then()
+        updateGroups(payload.groupList).then();
-        console.log(e)
+        console.log(e);
     }
 }
 
+// 群列表变动
 registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS, (payload) => {
     if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then()
+        updateGroups(payload.groupList).then();
     } else {
-        if (process.platform == 'win32') {
+        if (process.platform == "win32") {
-            processGroupEvent(payload).then()
+            processGroupEvent(payload).then();
         }
     }
 })
 registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS_UNIX, (payload) => {
     if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then()
+        updateGroups(payload.groupList).then();
     } else {
-        if (process.platform != 'win32') {
+        if (process.platform != "win32") {
-            processGroupEvent(payload).then()
+            processGroupEvent(payload).then();
         }
     }
 })
 
+// 好友列表变动
 registerReceiveHook<{
-    data: Array<{ categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }>
+    data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
 }>(ReceiveCmd.FRIENDS, payload => {
     for (const fData of payload.data) {
-        const _friends = fData.buddyList
+        const _friends = fData.buddyList;
-        for (const friend of _friends) {
+        for (let friend of _friends) {
-            const existFriend = friends.find(f => f.uin == friend.uin)
+            let existFriend = friends.find(f => f.uin == friend.uin)
             if (!existFriend) {
                 friends.push(friend)
             } else {
@@ -230,20 +217,26 @@ registerReceiveHook<{
     }
 })
 
-registerReceiveHook<{ msgList: RawMessage[] }>(ReceiveCmd.NEW_MSG, (payload) => {
+// 新消息
-    const {autoDeleteFile, autoDeleteFileSecond} = getConfigUtil().getConfig()
+registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
+    const {autoDeleteFile} = getConfigUtil().getConfig();
+    if (!autoDeleteFile) {
+        return
+    }
     for (const message of payload.msgList) {
-        // log("收到新消息，push到历史记录", message.msgSeq)
+        // log("收到新消息，push到历史记录", message.msgId)
-        dbUtil.addMsg(message).then()
+        // dbUtil.addMsg(message).then()
         // 清理文件
-        if (!autoDeleteFile) {
+
-            continue
-        }
         for (const msgElement of message.elements) {
             setTimeout(() => {
                 const picPath = msgElement.picElement?.sourcePath
+                const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
                 const pttPath = msgElement.pttElement?.filePath
-                const pathList = [picPath, pttPath]
+                const filePath = msgElement.fileElement?.filePath
+                const videoPath = msgElement.videoElement?.filePath
+                const videoThumbPath: string[] = [...msgElement.videoElement?.thumbPath.values()]
+                const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
                 if (msgElement.picElement) {
                     pathList.push(...Object.values(msgElement.picElement.thumbPath))
                 }
@@ -251,31 +244,32 @@ registerReceiveHook<{ msgList: RawMessage[] }>(ReceiveCmd.NEW_MSG, (payload) =>
                 if (aioOpGrayTipElement){
                     tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat;
                 }
+
                 // log("需要清理的文件", pathList);
                 for (const path of pathList) {
                     if (path) {
                         fs.unlink(picPath, () => {
-                            log('删除文件成功', path)
+                            log("删除文件成功", path)
-                        })
+                        });
                     }
                 }
-            }, autoDeleteFileSecond * 1000)
+            }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
         }
     }
 })
 
 registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
-    const message = msgRecord
+    const message = msgRecord;
-    const peerUid = message.peerUid
+    const peerUid = message.peerUid;
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
-    // log("收到自己发送成功的消息", message);
+    // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
     dbUtil.addMsg(message).then()
     const sendCallback = sendMessagePool[peerUid]
     if (sendCallback) {
         try {
-            sendCallback(message)
+            sendCallback(message);
         } catch (e) {
-            log('receive self msg error', e.stack)
+            log("receive self msg error", e.stack)
         }
     }
 })

src/ntqqapi/ntcall.ts

@@ -1,25 +1,29 @@
-import {ipcMain} from 'electron'
+import {BrowserWindow, ipcMain} from "electron";
-import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from './hook'
+import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook";
-import {log, sleep} from '../common/utils'
+import {log, sleep} from "../common/utils";
 import {
-    type ChatType,
+    ChatType,
     ElementType,
-    type Friend,
+    Friend,
-    type FriendRequest,
+    FriendRequest,
-    type Group, GroupMember,
+    Group,
-    type GroupMemberRole,
+    GroupMember,
-    type GroupNotifies,
+    GroupMemberRole,
-    type GroupNotify,
+    GroupNotifies,
-    type GroupRequestOperateTypes,
+    GroupNotify,
-    type RawMessage,
+    GroupRequestOperateTypes,
-    type SelfInfo,
+    RawMessage,
-    type SendMessageElement,
+    SelfInfo,
-    type User
+    SendMessageElement,
-} from './types'
+    User,
-import * as fs from 'node:fs'
+    CacheScanResult,
-import {friendRequests, groupNotifies, selfInfo, uidMaps} from '../common/data'
+    ChatCacheList, ChatCacheListItemBasic,
-import {v4 as uuidv4} from 'uuid'
+    CacheFileList, CacheFileListItem, CacheFileType,
-import path from 'path'
+} from "./types";
+import * as fs from "fs";
+import {friendRequests, selfInfo, uidMaps} from "../common/data";
+import {v4 as uuidv4} from "uuid"
+import path from "path";
 import {dbUtil} from "../common/db";
 
 interface IPCReceiveEvent {
@@ -35,89 +39,111 @@ export type IPCReceiveDetail = [
 ]
 
 export enum NTQQApiClass {
-    NT_API = 'ns-ntApi',
+    NT_API = "ns-ntApi",
-    FS_API = 'ns-FsApi',
+    FS_API = "ns-FsApi",
-    GLOBAL_DATA = 'ns-GlobalDataApi'
+    OS_API = "ns-OsApi",
+    WINDOW_API = "ns-WindowApi",
+    HOTUPDATE_API = "ns-HotUpdateApi",
+    BUSINESS_API = "ns-BusinessApi",
+    GLOBAL_DATA = "ns-GlobalDataApi"
 }
 
 export enum NTQQApiMethod {
-    LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+    SET_HEADER = "nodeIKernelProfileService/setHeader",
-    SELF_INFO = 'fetchAuthData',
+    LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
-    FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
+    SELF_INFO = "fetchAuthData",
-    GROUPS = 'nodeIKernelGroupService/getGroupList',
+    FRIENDS = "nodeIKernelBuddyService/getBuddyList",
-    GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
+    GROUPS = "nodeIKernelGroupService/getGroupList",
-    GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
+    GROUP_MEMBER_SCENE = "nodeIKernelGroupService/createMemberListScene",
-    USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
+    GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
-    USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
+    USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
-    FILE_TYPE = 'getFileType',
+    USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
-    FILE_MD5 = 'getFileMd5',
+    FILE_TYPE = "getFileType",
-    FILE_COPY = 'copyFile',
+    FILE_MD5 = "getFileMd5",
-    IMAGE_SIZE = 'getImageSizeFromPath',
+    FILE_COPY = "copyFile",
-    FILE_SIZE = 'getFileSize',
+    IMAGE_SIZE = "getImageSizeFromPath",
-    MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+    FILE_SIZE = "getFileSize",
-    RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+    MEDIA_FILE_PATH = "nodeIKernelMsgService/getRichMediaFilePathForGuild",
-    SEND_MSG = 'nodeIKernelMsgService/sendMsg',
+    RECALL_MSG = "nodeIKernelMsgService/recallMsg",
-    DOWNLOAD_MEDIA = 'nodeIKernelMsgService/downloadRichMedia',
+    SEND_MSG = "nodeIKernelMsgService/sendMsg",
-    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",  // 逐条转发
+    DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia",
-    MULTI_FORWARD_MSG = 'nodeIKernelMsgService/multiForwardMsgWithComment', // 合并转发
+    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",
-    GET_GROUP_NOTICE = 'nodeIKernelGroupService/getSingleScreenNotifies',
+    MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment", // 合并转发
-    HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
+    GET_GROUP_NOTICE = "nodeIKernelGroupService/getSingleScreenNotifies",
-    QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
+    HANDLE_GROUP_REQUEST = "nodeIKernelGroupService/operateSysNotify",
+    QUIT_GROUP = "nodeIKernelGroupService/quitGroup",
     // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
-    HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
+    HANDLE_FRIEND_REQUEST = "nodeIKernelBuddyService/approvalFriendRequest",
-    KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
+    KICK_MEMBER = "nodeIKernelGroupService/kickMember",
-    MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
+    MUTE_MEMBER = "nodeIKernelGroupService/setMemberShutUp",
-    MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
+    MUTE_GROUP = "nodeIKernelGroupService/setGroupShutUp",
-    SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
+    SET_MEMBER_CARD = "nodeIKernelGroupService/modifyMemberCardName",
-    SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
+    SET_MEMBER_ROLE = "nodeIKernelGroupService/modifyMemberRole",
-    PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
+    PUBLISH_GROUP_BULLETIN = "nodeIKernelGroupService/publishGroupBulletinBulletin",
-    SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
+    SET_GROUP_NAME = "nodeIKernelGroupService/modifyGroupName",
+    SET_GROUP_TITLE = "nodeIKernelGroupService/modifyMemberSpecialTitle",
+
+    CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
+    CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
+    CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
+    CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
+    CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
+    CACHE_SCAN = 'nodeIKernelStorageCleanService/scanCache',
+    CACHE_CLEAR = 'nodeIKernelStorageCleanService/clearCacheDataByKeys',
+
+    CACHE_CHAT_GET = 'nodeIKernelStorageCleanService/getChatCacheInfo',
+    CACHE_FILE_GET = 'nodeIKernelStorageCleanService/getFileCacheInfo',
+    CACHE_CHAT_CLEAR = 'nodeIKernelStorageCleanService/clearChatCacheInfo',
+
+    OPEN_EXTRA_WINDOW = 'openExternalWindow',
+
+    SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader'
 }
 
 enum NTQQApiChannel {
-    IPC_UP_2 = 'IPC_UP_2',
+    IPC_UP_2 = "IPC_UP_2",
-    IPC_UP_3 = 'IPC_UP_3',
+    IPC_UP_3 = "IPC_UP_3",
-    IPC_UP_1 = 'IPC_UP_1',
+    IPC_UP_1 = "IPC_UP_1",
 }
 
 export interface Peer {
     chatType: ChatType
-    peerUid: string // 如果是群聊uid为群号，私聊uid就是加密的字符串
+    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ''
+    guildId?: ""
 }
 
 interface NTQQApiParams {
-    methodName: NTQQApiMethod | string
+    methodName: NTQQApiMethod | string,
-    className?: NTQQApiClass
+    className?: NTQQApiClass,
-    channel?: NTQQApiChannel
+    channel?: NTQQApiChannel,
     classNameIsRegister?: boolean
-    args?: unknown[]
+    args?: unknown[],
-    cbCmd?: ReceiveCmd | null
+    cbCmd?: ReceiveCmd | null,
-    cmdCB?: (payload: any) => boolean
+    cmdCB?: (payload: any) => boolean;
-    afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
+    afterFirstCmd?: boolean,  // 是否在methodName调用完之后再去hook cbCmd
-    timeoutSecond?: number
+    timeoutSecond?: number,
 }
 
-async function callNTQQApi<ReturnType>(params: NTQQApiParams) {
+function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     let {
         className, methodName, channel, args,
         cbCmd, timeoutSecond: timeout,
         classNameIsRegister, cmdCB, afterFirstCmd
-    } = params
+    } = params;
-    className = className ?? NTQQApiClass.NT_API
+    className = className ?? NTQQApiClass.NT_API;
-    channel = channel ?? NTQQApiChannel.IPC_UP_2
+    channel = channel ?? NTQQApiChannel.IPC_UP_2;
-    args = args ?? []
+    args = args ?? [];
-    timeout = timeout ?? 5
+    timeout = timeout ?? 5;
-    afterFirstCmd = afterFirstCmd ?? true
+    afterFirstCmd = afterFirstCmd ?? true;
-    const uuid = uuidv4()
+    const uuid = uuidv4();
     // log("callNTQQApi", channel, className, methodName, args, uuid)
-    return await new Promise((resolve: (data: ReturnType) => void, reject) => {
+    return new Promise((resolve: (data: ReturnType) => void, reject) => {
         // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
         const _timeout = timeout * 1000
         let success = false
-        let eventName = className + '-' + channel[channel.length - 1]
+        let eventName = className + "-" + channel[channel.length - 1];
         if (classNameIsRegister) {
-            eventName += '-register'
+            eventName += "-register";
         }
         const apiArgs = [methodName, ...args]
         if (!cbCmd) {
@@ -125,40 +151,40 @@ async function callNTQQApi<ReturnType>(params: NTQQApiParams) {
             hookApiCallbacks[uuid] = (r: ReturnType) => {
                 success = true
                 resolve(r)
-            }
+            };
         } else {
             // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
             const secondCallback = () => {
                 const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
                     // log(methodName, "second callback", cbCmd, payload, cmdCB);
-                    if (cmdCB) {
+                    if (!!cmdCB) {
                         if (cmdCB(payload)) {
-                            removeReceiveHook(hookId)
+                            removeReceiveHook(hookId);
                             success = true
-                            resolve(payload)
+                            resolve(payload);
                         }
                     } else {
-                        removeReceiveHook(hookId)
+                        removeReceiveHook(hookId);
                         success = true
-                        resolve(payload)
+                        resolve(payload);
                     }
                 })
             }
-            !afterFirstCmd && secondCallback()
+            !afterFirstCmd && secondCallback();
             hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
                 log(`${methodName} callback`, result)
                 if (result?.result == 0 || result === undefined) {
-                    afterFirstCmd && secondCallback()
+                    afterFirstCmd && secondCallback();
                 } else {
                     success = true
-                    reject(`ntqq api call failed, ${result.errMsg}`)
+                    reject(`ntqq api call failed, ${result.errMsg}`);
                 }
             }
         }
         setTimeout(() => {
             // log("ntqq api timeout", success, channel, className, methodName)
             if (!success) {
-                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs)
+                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs);
                 reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
             }
         }, _timeout)
@@ -172,15 +198,23 @@ async function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     })
 }
 
-export const sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
+
+export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
 
 interface GeneralCallResult {
-    result: number // 0: success
+    result: number,  // 0: success
     errMsg: string
 }
 
+
 export class NTQQApi {
-    // static likeFriend = defineNTQQApi<void>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.LIKE_FRIEND)
+    static async setHeader(path: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_HEADER,
+            args: [path]
+        })
+    }
+
     static async likeFriend(uid: string, count = 1) {
         return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.LIKE_FRIEND,
@@ -198,9 +232,7 @@ export class NTQQApi {
     static async getSelfInfo() {
         return await callNTQQApi<SelfInfo>({
             className: NTQQApiClass.GLOBAL_DATA,
-            // channel: NTQQApiChannel.IPC_UP_3,
+            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
-            methodName: NTQQApiMethod.SELF_INFO,
-            timeoutSecond: 2
         })
     }
 
@@ -230,24 +262,28 @@ export class NTQQApi {
                 null
             ]
         })
-        return result.info
+        const info = result.info
+        if (info?.uin) {
+            uidMaps[info.uid] = info.uin
+        }
+        return info
     }
 
     static async getFriends(forced = false) {
         const data = await callNTQQApi<{
-            data: Array<{
+            data: {
-                categoryId: number
+                categoryId: number,
-                categroyName: string
+                categroyName: string,
-                categroyMbCount: number
+                categroyMbCount: number,
                 buddyList: Friend[]
-            }>
+            }[]
         }>(
             {
                 methodName: NTQQApiMethod.FRIENDS,
                 args: [{force_update: forced}, undefined],
                 cbCmd: ReceiveCmd.FRIENDS
             })
-        const _friends: Friend[] = []
+        let _friends: Friend[] = [];
         for (const fData of data.data) {
             _friends.push(...fData.buddyList)
         }
@@ -256,11 +292,11 @@ export class NTQQApi {
 
     static async getGroups(forced = false) {
         let cbCmd = ReceiveCmd.GROUPS
-        if (process.platform != 'win32') {
+        if (process.platform != "win32") {
             cbCmd = ReceiveCmd.GROUPS_UNIX
         }
         const result = await callNTQQApi<{
-            updateType: number
+            updateType: number,
             groupList: Group[]
         }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
         return result.groupList
@@ -271,7 +307,7 @@ export class NTQQApi {
             methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
             args: [{
                 groupCode: groupQQ,
-                scene: 'groupMemberList_MainWindow'
+                scene: "groupMemberList_MainWindow"
             }]
         })
         // log("get group member sceneId", sceneId);
@@ -281,8 +317,8 @@ export class NTQQApi {
             }>({
                 methodName: NTQQApiMethod.GROUP_MEMBERS,
                 args: [{
-                    sceneId,
+                    sceneId: sceneId,
-                    num
+                    num: num
                 },
                     null
                 ]
@@ -343,35 +379,35 @@ export class NTQQApi {
 
     // 上传文件到QQ的文件夹
     static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC) {
-        const md5 = await NTQQApi.getFileMd5(filePath)
+        const md5 = await NTQQApi.getFileMd5(filePath);
         let ext = (await NTQQApi.getFileType(filePath))?.ext
         if (ext) {
-            ext = '.' + ext
+            ext = "." + ext
         } else {
-            ext = ''
+            ext = ""
         }
-        let fileName = `${path.basename(filePath)}`
+        let fileName = `${path.basename(filePath)}`;
-        if (!fileName.includes('.')) {
+        if (fileName.indexOf(".") === -1) {
-            fileName += ext
+            fileName += ext;
         }
         const mediaPath = await callNTQQApi<string>({
             methodName: NTQQApiMethod.MEDIA_FILE_PATH,
             args: [{
                 path_info: {
                     md5HexStr: md5,
-                    fileName,
+                    fileName: fileName,
-                    elementType,
+                    elementType: elementType,
                     elementSubType: 0,
                     thumbSize: 0,
                     needCreate: true,
                     downloadType: 1,
-                    file_uuid: ''
+                    file_uuid: ""
                 }
             }]
         })
-        log('media path', mediaPath)
+        log("media path", mediaPath)
-        await NTQQApi.copyFile(filePath, mediaPath)
+        await NTQQApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQApi.getFileSize(filePath)
+        const fileSize = await NTQQApi.getFileSize(filePath);
         return {
             md5,
             fileName,
@@ -388,16 +424,16 @@ export class NTQQApi {
         const apiParams = [
             {
                 getReq: {
-                    msgId,
+                    msgId: msgId,
-                    chatType,
+                    chatType: chatType,
-                    peerUid,
+                    peerUid: peerUid,
-                    elementId,
+                    elementId: elementId,
                     thumbSize: 0,
                     downloadType: 1,
-                    filePath: thumbPath
+                    filePath: thumbPath,
-                }
+                },
             },
-            undefined
+            undefined,
         ]
         // log("需要下载media", sourcePath);
         await callNTQQApi({
@@ -406,7 +442,7 @@ export class NTQQApi {
             cbCmd: ReceiveCmd.MEDIA_DOWNLOAD_COMPLETE,
             cmdCB: (payload: { notifyInfo: { filePath: string } }) => {
                 // log("media 下载完成判断", payload.notifyInfo.filePath, sourcePath);
-                return payload.notifyInfo.filePath == sourcePath
+                return payload.notifyInfo.filePath == sourcePath;
             }
         })
         return sourcePath
@@ -426,38 +462,37 @@ export class NTQQApi {
         const peerUid = peer.peerUid
 
         // 等待上一个相同的peer发送完
-        let checkLastSendUsingTime = 0
+        let checkLastSendUsingTime = 0;
         const waitLastSend = async () => {
             if (checkLastSendUsingTime > timeout) {
-                throw ('发送超时')
+                throw ("发送超时")
             }
-            const lastSending = sendMessagePool[peer.peerUid]
+            let lastSending = sendMessagePool[peer.peerUid]
             if (lastSending) {
                 // log("有正在发送的消息，等待中...")
-                await sleep(500)
+                await sleep(500);
-                checkLastSendUsingTime += 500
+                checkLastSendUsingTime += 500;
-                return await waitLastSend()
+                return await waitLastSend();
             } else {
-
+                return;
             }
         }
-        await waitLastSend()
+        await waitLastSend();
 
-        let sentMessage: RawMessage = null
+        let sentMessage: RawMessage = null;
         sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
-            delete sendMessagePool[peerUid]
+            delete sendMessagePool[peerUid];
-            sentMessage = rawMessage
+            sentMessage = rawMessage;
         }
 
-        let checkSendCompleteUsingTime = 0
+        let checkSendCompleteUsingTime = 0;
         const checkSendComplete = async (): Promise<RawMessage> => {
             if (sentMessage) {
                 if (waitComplete) {
                     if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
                         return sentMessage
                     }
-                }
+                } else {
-                else{
                     return sentMessage
                 }
                 // log(`给${peerUid}发送消息成功`)
@@ -469,14 +504,13 @@ export class NTQQApi {
             await sleep(500)
             return await checkSendComplete()
         }
-        log("开始发送消息", peer, msgElements)
+
         callNTQQApi({
             methodName: NTQQApiMethod.SEND_MSG,
             args: [{
-                msgId: '0',
+                msgId: "0",
-                peer,
+                peer, msgElements,
-                msgElements,
+                msgAttributeInfos: new Map(),
-                msgAttributeInfos: new Map()
             }, null]
         }).then()
         return await checkSendComplete()
@@ -485,7 +519,7 @@ export class NTQQApi {
     static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
         return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.FORWARD_MSG,
-            args:[
+            args: [
                 {
                     msgIds: msgIds,
                     srcContact: srcPeer,
@@ -500,6 +534,7 @@ export class NTQQApi {
         })
 
     }
+
     static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
         const msgInfos = msgIds.map(id => {
             return {msgId: id, senderShowName: selfInfo.nick}
@@ -512,13 +547,13 @@ export class NTQQApi {
                 commentElements: [],
                 msgAttributeInfos: new Map()
             },
-            null
+            null,
         ]
         return await new Promise<RawMessage>((resolve, reject) => {
             let complete = false
             setTimeout(() => {
                 if (!complete) {
-                    reject('转发消息超时')
+                    reject("转发消息超时");
                 }
             }, 5000)
             registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
@@ -544,10 +579,10 @@ export class NTQQApi {
                 methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
                 args: apiArgs
             }).then(result => {
-                log('转发消息结果:', result, apiArgs)
+                log("转发消息结果:", result, apiArgs)
                 if (result.result !== 0) {
-                    complete = true
+                    complete = true;
-                    reject('转发消息失败,' + JSON.stringify(result))
+                    reject("转发消息失败," + JSON.stringify(result));
                 }
             })
         })
@@ -558,56 +593,79 @@ export class NTQQApi {
         // 加群通知，退出通知，需要管理员权限
         callNTQQApi<GeneralCallResult>({
             methodName: ReceiveCmd.GROUP_NOTIFY,
-            classNameIsRegister: true
+            classNameIsRegister: true,
         }).then()
         return await callNTQQApi<GroupNotifies>({
             methodName: NTQQApiMethod.GET_GROUP_NOTICE,
             cbCmd: ReceiveCmd.GROUP_NOTIFY,
             afterFirstCmd: false,
             args: [
-                {doubt: false, startSeq: '', number: 14},
+                {"doubt": false, "startSeq": "", "number": 14},
                 null
             ]
+        });
+    }
+
+    static async getGroupIgnoreNotifies() {
+        await NTQQApi.getGroupNotifies();
+        const result = callNTQQApi<GroupNotifies>({
+            className: NTQQApiClass.WINDOW_API,
+            methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
+            cbCmd: ReceiveCmd.GROUP_NOTIFY,
+            afterFirstCmd: false,
+            args: [
+                "GroupNotifyFilterWindow"
+            ]
         })
+        // 关闭窗口
+        setTimeout(() => {
+            for (const w of BrowserWindow.getAllWindows()) {
+                // log("close window", w.webContents.getURL())
+                if (w.webContents.getURL().indexOf("#/notify-filter/") != -1) {
+                    w.close();
+                }
+            }
+        }, 2000);
+        return result;
     }
 
     static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
-        const notify: GroupNotify = groupNotifies[seq]
+        const notify: GroupNotify = await dbUtil.getGroupNotify(seq)
         if (!notify) {
             throw `${seq}对应的加群通知不存在`
         }
-        delete groupNotifies[seq]
+        // delete groupNotifies[seq];
         return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
             args: [
                 {
-                    doubt: false,
+                    "doubt": false,
-                    operateMsg: {
+                    "operateMsg": {
-                        operateType, // 2 拒绝
+                        "operateType": operateType, // 2 拒绝
-                        targetMsg: {
+                        "targetMsg": {
-                            seq, // 通知序列号
+                            "seq": seq,  // 通知序列号
-                            type: notify.type,
+                            "type": notify.type,
-                            groupCode: notify.group.groupCode,
+                            "groupCode": notify.group.groupCode,
-                            postscript: reason
+                            "postscript": reason
                         }
                     }
                 },
                 null
             ]
-        })
+        });
     }
 
     static async quitGroup(groupQQ: string) {
         await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.QUIT_GROUP,
             args: [
-                {groupCode: groupQQ},
+                {"groupCode": groupQQ},
                 null
             ]
         })
     }
 
-    static async handleFriendRequest(sourceId: number, accept: boolean) {
+    static async handleFriendRequest(sourceId: number, accept: boolean,) {
         const request: FriendRequest = friendRequests[sourceId]
         if (!request) {
             throw `sourceId ${sourceId}, 对应的好友请求不存在`
@@ -616,16 +674,16 @@ export class NTQQApi {
             methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
             args: [
                 {
-                    approvalInfo: {
+                    "approvalInfo": {
-                        friendUid: request.friendUid,
+                        "friendUid": request.friendUid,
-                        reqTime: request.reqTime,
+                        "reqTime": request.reqTime,
                         accept
                     }
                 }
             ]
         })
-        delete friendRequests[sourceId]
+        delete friendRequests[sourceId];
-        return result
+        return result;
     }
 
     static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
@@ -637,7 +695,7 @@ export class NTQQApi {
                         groupCode: groupQQ,
                         kickUids,
                         refuseForever,
-                        kickReason
+                        kickReason,
                     }
                 ]
             }
@@ -652,7 +710,7 @@ export class NTQQApi {
                 args: [
                     {
                         groupCode: groupQQ,
-                        memList
+                        memList,
                     }
                 ]
             }
@@ -709,7 +767,143 @@ export class NTQQApi {
         })
     }
 
+    static async call(className: NTQQApiClass, cmdName: string, args: any[],) {
+        return await callNTQQApi<GeneralCallResult>({
+            className,
+            methodName: cmdName,
+            args: [
+                ...args,
+            ]
+        })
+    }
+
+    static async setGroupTitle(groupQQ: string, uid: string, title: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_GROUP_TITLE,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid,
+                    title
+                }, null
+            ]
+        })
+    }
+
     static publishGroupBulletin(groupQQ: string, title: string, content: string) {
 
     }
-}
+
+    static async setCacheSilentScan(isSilent: boolean = true) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
+            args: [{
+                isSilent
+            }, null]
+        });
+    }
+
+    static addCacheScannedPaths(pathMap: object = {}) {
+        return callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
+            args: [{
+                pathMap: {...pathMap},
+            }, null]
+        });
+    }
+
+    static scanCache() {
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmd.CACHE_SCAN_FINISH,
+            classNameIsRegister: true,
+        }).then();
+        return callNTQQApi<CacheScanResult>({
+            methodName: NTQQApiMethod.CACHE_SCAN,
+            args: [null, null],
+            timeoutSecond: 300,
+        });
+    }
+
+    static getHotUpdateCachePath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.HOTUPDATE_API,
+            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
+        });
+    }
+
+    static getDesktopTmpPath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.BUSINESS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
+        });
+    }
+
+    static getCacheSessionPathList() {
+        return callNTQQApi<{
+            key: string,
+            value: string
+        }[]>({
+            className: NTQQApiClass.OS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_SESSION,
+        });
+    }
+
+    static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
+        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
+            methodName: NTQQApiMethod.CACHE_CLEAR,
+            args: [{
+                keys: cacheKeys
+            }, null]
+        });
+    }
+
+    static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
+        return new Promise<ChatCacheList>((res, rej) => {
+            callNTQQApi<ChatCacheList>({
+                methodName: NTQQApiMethod.CACHE_CHAT_GET,
+                args: [{
+                    chatType: type,
+                    pageSize,
+                    order: 1,
+                    pageIndex
+                }, null]
+            }).then(list => res(list))
+                .catch(e => rej(e));
+        });
+    }
+
+    static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
+        const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
+
+        return callNTQQApi<CacheFileList>({
+            methodName: NTQQApiMethod.CACHE_FILE_GET,
+            args: [{
+                fileType: fileType,
+                restart: true,
+                pageSize: pageSize,
+                order: 1,
+                lastRecord: _lastRecord,
+            }, null]
+        })
+    }
+
+    static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
+            args: [{
+                chats,
+                fileKeys
+            }, null]
+        });
+    }
+
+    static async setQQAvatar(filePath: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_QQ_AVATAR,
+            args: [{
+                path:filePath
+            }, null],
+            timeoutSecond: 10 // 10秒不一定够
+        });
+    }
+}

src/ntqqapi/types.ts

@@ -71,6 +71,7 @@ export enum ElementType {
     PIC = 2,
     FILE = 3,
     PTT = 4,
+    VIDEO = 5,
     FACE = 6,
     REPLY = 7,
     ARK = 10,
@@ -112,6 +113,7 @@ export enum PicType {
     gif = 2000,
     jpg = 1000
 }
+
 export interface SendPicElement {
     elementType: ElementType.PIC,
     elementId: "",
@@ -166,11 +168,16 @@ export interface FileElement {
 }
 
 export interface SendFileElement {
-    elementType: ElementType.FILE,
+    elementType: ElementType.FILE
     elementId: "",
     fileElement: FileElement
 }
 
+export interface SendVideoElement {
+    elementType: ElementType.VIDEO
+    elementId: "",
+    videoElement: VideoElement
+}
 export interface SendArkElement {
     elementType: ElementType.ARK,
     elementId: "",
@@ -179,7 +186,7 @@ export interface SendArkElement {
 }
 
 export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendArkElement
+    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement
 
 export enum AtType {
     notAt = 0,
@@ -218,8 +225,8 @@ export interface PttElement {
 
 export interface ArkElement {
     bytesData: string;
-    linkInfo:null,
+    linkInfo: null,
-    subElementType:null
+    subElementType: null
 }
 
 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
@@ -245,7 +252,8 @@ export interface GrayTipElement {
         operatorMemRemark?: string;
         wording: string;  // 自定义的撤回提示语
     }
-    aioOpGrayTipElement: TipAioOpGrayTipElement
+    aioOpGrayTipElement: TipAioOpGrayTipElement,
+    groupElement: TipGroupElement
 }
 
 export interface FaceElement {
@@ -256,37 +264,42 @@ export interface FaceElement {
 export interface VideoElement {
     "filePath": string,
     "fileName": string,
-    "videoMd5": string,
+    "videoMd5"?: string,
-    "thumbMd5": string
+    "thumbMd5"?: string
-    "fileTime": 87, // second
+    "fileTime"?: number, // second
-    "thumbSize": 314235, // byte
+    "thumbSize"?: number, // byte
-    "fileFormat": 2,  // 2表示mp4？
+    "fileFormat"?: number,  // 2表示mp4？
-    "fileSize": string,  // byte
+    "fileSize"?: string,  // byte
-    "thumbWidth": number,
+    "thumbWidth"?: number,
-    "thumbHeight": number,
+    "thumbHeight"?: number,
-    "busiType": 0, // 未知
+    "busiType"?: 0, // 未知
-    "subBusiType": 0, // 未知
+    "subBusiType"?: 0, // 未知
-    "thumbPath": Map<number, any>,
+    "thumbPath"?: Map<number, any>,
-    "transferStatus": 0, // 未知
+    "transferStatus"?: 0, // 未知
-    "progress": 0,  // 下载进度？
+    "progress"?: 0,  // 下载进度？
-    "invalidState": 0, // 未知
+    "invalidState"?: 0, // 未知
-    "fileUuid": string,  // 可以用于下载链接？
+    "fileUuid"?: string,  // 可以用于下载链接？
-    "fileSubId": "",
+    "fileSubId"?: "",
-    "fileBizId": null,
+    "fileBizId"?: null,
-    "originVideoMd5": "",
+    "originVideoMd5"?: "",
-    "import_rich_media_context": null,
+    "import_rich_media_context"?: null,
-    "sourceVideoCodecFormat": 0
+    "sourceVideoCodecFormat"?: number
 }
 
-export interface TipAioOpGrayTipElement{
+export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
     operateType: number,
     peerUid: string,
     fromGrpCodeOfTmpChat: string,
 }
 
+export enum TipGroupElementType {
+    memberIncrease = 1,
+    ban = 8
+}
+
 export interface TipGroupElement {
-    "type": 1,  // 1是表示有人加入群, 自己加入群也会收到这个
+    "type": TipGroupElementType,  // 1是表示有人加入群, 自己加入群也会收到这个
-    "role": 0,
+    "role": 0,  // 暂时不知
     "groupName": string,  // 暂时获取不到
     "memberUid": string,
     "memberNick": string,
@@ -295,7 +308,7 @@ export interface TipGroupElement {
     "adminNick": string,
     "adminRemark": string,
     "createGroup": null,
-    "memberAdd": {
+    "memberAdd"?: {
         "showType": 1,
         "otherAdd": null,
         "otherAddByOtherQRCode": null,
@@ -305,7 +318,22 @@ export interface TipGroupElement {
         "otherInviteYou": null,
         "youInviteOther": null
     },
-    "shutUp": null
+    "shutUp"?: {
+        "curTime": string,
+        "duration": string,  // 禁言时间，秒
+        "admin": {
+            "uid": string,
+            "card": string,
+            "name": string,
+            "role": GroupMemberRole
+        },
+        "member": {
+            "uid": string
+            "card": string,
+            "name": string,
+            "role": GroupMemberRole
+        }
+    }
 }
 
 
@@ -364,11 +392,17 @@ export interface GroupNotifies {
     notifies: GroupNotify[],
 }
 
+export enum GroupNotifyStatus {
+    IGNORE = 0,
+    WAIT_HANDLE = 1,
+    APPROVE = 2,
+    REJECT = 3
+}
 export interface GroupNotify {
     time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
-    seq: string, // 转成数字，再除以1000应该就是时间戳？
+    seq: string, // 唯一标识符，转成数字再除以1000应该就是时间戳？
     type: GroupNotifyTypes,
-    status: 0,  // 未知
+    status: GroupNotifyStatus,  // 0是已忽略？，1是未处理，2是已同意
     group: { groupCode: string, groupName: string },
     user1: { uid: string, nickName: string }, // 被设置管理员的人
     user2: { uid: string, nickName: string },  // 操作者
@@ -403,4 +437,68 @@ export interface FriendRequestNotify {
         unreadNums: number,
         buddyReqs: FriendRequest[]
     }
-}
+}
+
+export interface CacheScanResult {
+    result: number,
+    size: [ // 单位为字节
+        string, // 系统总存储空间
+        string, // 系统可用存储空间
+        string, // 系统已用存储空间
+        string, // QQ总大小
+        string, // 「聊天与文件」大小
+        string, // 未知
+        string, // 「缓存数据」大小
+        string, // 「其他数据」大小
+        string, // 未知
+    ]
+}
+
+export interface ChatCacheList {
+    pageCount: number,
+    infos: ChatCacheListItem[]
+}
+
+export interface ChatCacheListItem {
+    chatType: ChatType,
+    basicChatCacheInfo: ChatCacheListItemBasic,
+    guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
+}
+
+export interface ChatCacheListItemBasic {
+    chatSize: string,
+    chatTime: string,
+    uid: string,
+    uin: string,
+    remarkName: string,
+    nickName: string,
+    chatType?: ChatType,
+    isChecked?: boolean
+}
+
+export enum CacheFileType {
+    IMAGE = 0,
+    VIDEO = 1,
+    AUDIO = 2,
+    DOCUMENT = 3,
+    OTHER = 4,
+}
+
+export interface CacheFileList {
+    infos: CacheFileListItem[],
+}
+
+export interface CacheFileListItem {
+    fileSize: string,
+    fileTime: string,
+    fileKey: string,
+    elementId: string,
+    elementIdStr: string,
+    fileType: CacheFileType,
+    path: string,
+    fileName: string,
+    senderId: string,
+    previewPath: string,
+    senderName: string,
+    isChecked?: boolean,
+}

src/onebot11/action/BaseAction.ts

@@ -22,7 +22,7 @@ class BaseAction<PayloadType, ReturnDataType> {
             return OB11Response.ok(resData);
         } catch (e) {
             log("发生错误", e)
-            return OB11Response.error(e.toString(), 200);
+            return OB11Response.error(e?.toString() || e?.stack?.toString() || "未知错误，可能操作超时", 200);
         }
     }
 
@@ -36,7 +36,7 @@ class BaseAction<PayloadType, ReturnDataType> {
             return OB11Response.ok(resData, echo);
         } catch (e) {
             log("发生错误", e)
-            return OB11Response.error(e.toString(), 1200, echo)
+            return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo)
         }
     }
 

src/onebot11/action/CleanCache.ts

@@ -0,0 +1,105 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+import {NTQQApi} from "../../ntqqapi/ntcall";
+import fs from "fs";
+import Path from "path";
+import {
+    ChatType,
+    ChatCacheListItemBasic,
+    CacheFileType
+} from '../../ntqqapi/types';
+import {dbUtil} from "../../common/db";
+
+export default class CleanCache extends BaseAction<void, void> {
+    actionName = ActionName.CleanCache
+
+    protected _handle(): Promise<void> {
+        return new Promise<void>(async (res, rej) => {
+            try {
+                // dbUtil.clearCache();
+                const cacheFilePaths: string[] = [];
+
+                await NTQQApi.setCacheSilentScan(false);
+
+                cacheFilePaths.push((await NTQQApi.getHotUpdateCachePath()));
+                cacheFilePaths.push((await NTQQApi.getDesktopTmpPath()));
+                (await NTQQApi.getCacheSessionPathList()).forEach(e => cacheFilePaths.push(e.value));
+
+                // await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃，原因目前还未知
+                const cacheScanResult = await NTQQApi.scanCache();
+                const cacheSize = parseInt(cacheScanResult.size[6]);
+
+                if (cacheScanResult.result !== 0) {
+                    throw('Something went wrong while scanning cache. Code: ' + cacheScanResult.result);
+                }
+
+                await NTQQApi.setCacheSilentScan(true);
+                if (cacheSize > 0 && cacheFilePaths.length > 2) { // 存在缓存文件且大小不为 0 时执行清理动作
+                    // await NTQQApi.clearCache([ 'tmp', 'hotUpdate', ...cacheScanResult ]) // XXX: 也是调用就崩溃，调用 fs 删除得了
+                    deleteCachePath(cacheFilePaths);
+                }
+
+                // 获取聊天记录列表
+                // NOTE: 以防有人不需要删除聊天记录，暂时先注释掉，日后加个开关
+                // const privateChatCache = await getCacheList(ChatType.friend); // 私聊消息
+                // const groupChatCache = await getCacheList(ChatType.group); // 群聊消息
+                // const chatCacheList = [ ...privateChatCache, ...groupChatCache ];
+                const chatCacheList: ChatCacheListItemBasic[] = [];
+
+                // 获取聊天缓存文件列表
+                const cacheFileList: string[] = [];
+                
+                for (const name in CacheFileType) {
+                    if (!isNaN(parseInt(name))) continue;
+
+                    const fileTypeAny: any = CacheFileType[name];
+                    const fileType: CacheFileType = fileTypeAny;
+
+                    cacheFileList.push(...(await NTQQApi.getFileCacheInfo(fileType)).infos.map(file => file.fileKey));
+                }
+
+                // 一并清除
+                await NTQQApi.clearChatCache(chatCacheList, cacheFileList);
+                res();
+            } catch(e) {
+                console.error('清理缓存时发生了错误');
+                rej(e);
+            }
+        });
+    }
+}
+
+function deleteCachePath(pathList: string[]) {
+    const emptyPath = (path: string) => {
+        if (!fs.existsSync(path)) return;
+        const files = fs.readdirSync(path);
+        files.forEach(file => {
+            const filePath = Path.resolve(path, file);
+            const stats = fs.statSync(filePath);
+            if (stats.isDirectory()) emptyPath(filePath);
+            else fs.unlinkSync(filePath);
+        });
+        fs.rmdirSync(path);
+    }
+
+    for (const path of pathList) {
+        emptyPath(path);
+    }
+}
+
+function getCacheList(type: ChatType) { // NOTE: 做这个方法主要是因为目前还不支持针对频道消息的清理
+    return new Promise<Array<ChatCacheListItemBasic>>((res, rej) => {
+        NTQQApi.getChatCacheList(type, 1000, 0)
+            .then(data => {
+                const list = data.infos.filter(e => e.chatType === type && parseInt(e.basicChatCacheInfo.chatSize) > 0);
+                const result = list.map(e => {
+                    const result = { ...e.basicChatCacheInfo };
+                    result.chatType = type;
+                    result.isChecked = true;
+                    return result;
+                });
+                res(result);
+            })
+            .catch(e => rej(e));
+    });
+}

src/onebot11/action/GetMsg.ts

@@ -19,13 +19,14 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
         if (!payload.message_id) {
             throw ("参数message_id不能为空")
         }
-        const msg = await dbUtil.getMsgByShortId(payload.message_id)
+        let msg = await dbUtil.getMsgByShortId(payload.message_id)
-        if (msg) {
+        if(!msg) {
-            const msgData = await OB11Constructor.message(msg);
+            msg = await dbUtil.getMsgByLongId(payload.message_id.toString())
-            return msgData
+        }
-        } else {
+        if (!msg){
             throw ("消息不存在")
         }
+        return await OB11Constructor.message(msg)
     }
 }
 

src/onebot11/action/SendMsg.ts

@@ -1,4 +1,12 @@
-import {AtType, ChatType, Group, RawMessage, SendArkElement, SendMessageElement} from "../../ntqqapi/types";
+import {
+    AtType,
+    ChatType,
+    ElementType,
+    Group,
+    RawMessage,
+    SendArkElement,
+    SendMessageElement
+} from "../../ntqqapi/types";
 import {friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo,} from "../../common/data";
 import {
     OB11MessageCustomMusic,
@@ -14,11 +22,10 @@ import {uri2local} from "../utils";
 import BaseAction from "./BaseAction";
 import {ActionName, BaseCheckResult} from "./types";
 import * as fs from "node:fs";
-import {log} from "../../common/utils";
+import {log, sleep} from "../../common/utils";
 import {decodeCQCode} from "../cqcode";
 import {dbUtil} from "../../common/db";
 import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
-import {FileCache} from "../../common/types";
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
     function checkUri(uri: string): boolean {
@@ -93,6 +100,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     }
 
     protected async _handle(payload: OB11PostSendMsg) {
+
         const peer: Peer = {
             chatType: ChatType.friend,
             peerUid: ""
@@ -157,14 +165,10 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         }
         // log("send msg:", peer, sendElements)
         const {sendElements, deleteAfterSentFiles} = await this.createSendElements(messages, group)
-        try {
+        const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
-            const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
+        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-            deleteAfterSentFiles.map(f => fs.unlink(f, () => {}));
+        }));
-            return {message_id: returnMsg.msgShortId}
+        return {message_id: returnMsg.msgShortId}
-        } catch (e) {
-            log("发送消息失败", e.stack.toString())
-            throw (e.toString())
-        }
     }
 
     protected convertMessage2List(message: OB11MessageMixType) {
@@ -189,22 +193,58 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         return 0
     }
 
+    private async cloneMsg(msg: RawMessage): Promise<RawMessage> {
+        log("克隆的目标消息", msg)
+        let sendElements: SendMessageElement[] = [];
+        for (const ele of msg.elements) {
+            sendElements.push(ele as SendMessageElement)
+            // Object.keys(ele).forEach((eleKey) => {
+            //     if (eleKey.endsWith("Element")) {
+            //     }
+
+        }
+        if (sendElements.length === 0) {
+            log("需要clone的消息无法解析，将会忽略掉", msg)
+        }
+        log("克隆消息", sendElements)
+        try {
+            const nodeMsg = await NTQQApi.sendMsg({
+                chatType: ChatType.friend,
+                peerUid: selfInfo.uid
+            }, sendElements, true);
+            await sleep(500);
+            return nodeMsg
+        } catch (e) {
+            log(e, "克隆转发消息失败,将忽略本条消息", msg);
+        }
+
+    }
+
     // 返回一个合并转发的消息id
     private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined) {
-        const selfPeer: Peer = {
+
+        const selfPeer = {
             chatType: ChatType.friend,
             peerUid: selfInfo.uid
         }
-        let selfNodeMsgList: RawMessage[] = [];
+        let nodeMsgIds: string[] = []
-        let originalNodeMsgList: RawMessage[] = [];
+        // 先判断一遍是不是id和自定义混用
+        let needClone = messageNodes.filter(node => node.data.id).length && messageNodes.filter(node => !node.data.id).length
         for (const messageNode of messageNodes) {
             // 一个node表示一个人的消息
             let nodeId = messageNode.data.id;
             // 有nodeId表示一个子转发消息卡片
             if (nodeId) {
                 let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
-                if (nodeMsg) {
+                if (!needClone) {
-                    originalNodeMsgList.push(nodeMsg);
+                    nodeMsgIds.push(nodeMsg.msgId)
+                } else {
+                    if (nodeMsg.peerUid !== selfInfo.uid) {
+                        const cloneMsg = await this.cloneMsg(nodeMsg)
+                        if (cloneMsg) {
+                            nodeMsgIds.push(cloneMsg.msgId)
+                        }
+                    }
                 }
             } else {
                 // 自定义的消息
@@ -215,58 +255,82 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                         deleteAfterSentFiles
                     } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
                     log("开始生成转发节点", sendElements);
-                    const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true);
+                    let sendElementsSplit: SendMessageElement[][] = []
-                    selfNodeMsgList.push(nodeMsg);
+                    let splitIndex = 0;
-                    log("转发节点生成成功", nodeMsg.msgId);
+                    for (const ele of sendElements) {
+                        if (!sendElementsSplit[splitIndex]) {
+                            sendElementsSplit[splitIndex] = []
+                        }
+
+                        if (ele.elementType === ElementType.FILE || ele.elementType === ElementType.VIDEO) {
+                            if (sendElementsSplit[splitIndex].length > 0) {
+                                splitIndex++;
+                            }
+                            sendElementsSplit[splitIndex] = [ele]
+                            splitIndex++;
+                        } else {
+                            sendElementsSplit[splitIndex].push(ele)
+                        }
+                        log(sendElementsSplit)
+                    }
+                    // log("分割后的转发节点", sendElementsSplit)
+                    for (const eles of sendElementsSplit) {
+                        const nodeMsg = await this.send(selfPeer, eles, [], true);
+                        nodeMsgIds.push(nodeMsg.msgId)
+                        await sleep(500);
+                        log("转发节点生成成功", nodeMsg.msgId);
+                    }
+                    deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+                    }));
+
                 } catch (e) {
-                    log("生效转发消息节点失败", e)
+                    log("生成转发消息节点失败", e)
                 }
             }
         }
 
-        let nodeIds: string[] = []
+        // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
-        // 检查是否需要克隆直接引用消息id的节点
+        let nodeMsgArray: Array<RawMessage> = []
+        let srcPeer: Peer = null;
         let needSendSelf = false;
-        if (selfNodeMsgList.length) {
+        for (const [index, msgId] of nodeMsgIds.entries()) {
-            needSendSelf = true
+            const nodeMsg = await dbUtil.getMsgByLongId(msgId)
-        } else {
+            if (nodeMsg) {
-            needSendSelf = !originalNodeMsgList.every((msg, index) => msg.peerUid === originalNodeMsgList[0].peerUid && msg.recallTime.length < 2)
+                nodeMsgArray.push(nodeMsg)
+                if (!srcPeer) {
+                    srcPeer = {chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid}
+                } else if (srcPeer.peerUid !== nodeMsg.peerUid) {
+                    needSendSelf = true
+                    srcPeer = selfPeer
+                }
+            }
         }
+        log("nodeMsgArray", nodeMsgArray);
+        nodeMsgIds = nodeMsgArray.map(msg => msg.msgId);
         if (needSendSelf) {
-            nodeIds = selfNodeMsgList.map(msg => msg.msgId);
+            log("需要克隆转发消息");
-            for (const originalNodeMsg of originalNodeMsgList) {
+            for (const [index, msg] of nodeMsgArray.entries()) {
-                if (originalNodeMsg.peerUid === selfInfo.uid && originalNodeMsg.recallTime.length < 2) {
+                if (msg.peerUid !== selfInfo.uid) {
-                    nodeIds.push(originalNodeMsg.msgId)
+                    const cloneMsg = await this.cloneMsg(msg)
-                } else { // 需要进行克隆
+                    if (cloneMsg) {
-                    let sendElements: SendMessageElement[] = []
+                        nodeMsgIds[index] = cloneMsg.msgId
-                    Object.keys(originalNodeMsg.elements).forEach((eleKey) => {
-                        if (eleKey !== "elementId") {
-                            sendElements.push(originalNodeMsg.elements[eleKey])
-                        }
-                    })
-                    try {
-                        const nodeMsg = await NTQQApi.sendMsg(selfPeer, sendElements, true);
-                        nodeIds.push(nodeMsg.msgId)
-                        log("克隆转发消息成功")
-                    } catch (e) {
-                        log("克隆转发消息失败", e)
                     }
                 }
             }
-        } else {
-            nodeIds = originalNodeMsgList.map(msg => msg.msgId)
-        }
-
-        let srcPeer = selfPeer;
-        if (!needSendSelf) {
-            srcPeer = {
-                chatType: originalNodeMsgList[0].chatType === ChatType.group ? ChatType.group : ChatType.friend,
-                peerUid: originalNodeMsgList[0].peerUid
-            }
         }
+        // elements之间用换行符分隔
+        // let _sendForwardElements: SendMessageElement[] = []
+        // for(let i = 0; i < sendForwardElements.length; i++){
+        //     _sendForwardElements.push(sendForwardElements[i])
+        //     _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
+        // }
+        // const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
+        // nodeIds.push(nodeMsg.msgId)
+        // await sleep(500);
         // 开发转发
         try {
-            return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeIds)
+            log("开发转发", nodeMsgIds)
+            return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeMsgIds)
         } catch (e) {
             log("forward failed", e)
             return null;
@@ -289,7 +353,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 }
                     break;
                 case OB11MessageDataType.at: {
-                    if (!group){
+                    if (!group) {
                         continue
                     }
                     let atQQ = sendMsg.data?.qq;
@@ -333,18 +397,19 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     const payloadFileName = sendMsg.data?.name
                     if (file) {
                         const cache = await dbUtil.getFileCache(file)
-                        if (cache){
+                        if (cache) {
-                            if (fs.existsSync(cache.filePath)){
+                            if (fs.existsSync(cache.filePath)) {
                                 file = "file://" + cache.filePath
-                            }
+                            } else if (cache.downloadFunc) {
-                            else if (cache.downloadFunc){
                                 await cache.downloadFunc()
                                 file = cache.filePath;
-                                log("找到文件缓存", file);
+                            } else if (cache.url) {
+                                file = cache.url
                             }
+                            log("找到文件缓存", file);
                         }
                         const {path, isLocal, fileName, errMsg} = (await uri2local(file))
-                        if (errMsg){
+                        if (errMsg) {
                             throw errMsg
                         }
                         if (path) {
@@ -359,7 +424,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                             }
                             if (sendMsg.type === OB11MessageDataType.file) {
                                 log("发送文件", path, payloadFileName || fileName)
-                                sendElements.push(await SendMsgElementConstructor.file(path, false, payloadFileName || fileName));
+                                sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName));
                             } else if (sendMsg.type === OB11MessageDataType.video) {
                                 log("发送视频", path, payloadFileName || fileName)
                                 sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName));

src/onebot11/action/SetGroupAddRequest.ts

@@ -1,6 +1,5 @@
 import BaseAction from "./BaseAction";
-import {groupNotifies} from "../../common/data";
+import {GroupRequestOperateTypes} from "../../ntqqapi/types";
-import {GroupNotify, GroupRequestOperateTypes} from "../../ntqqapi/types";
 import {NTQQApi} from "../../ntqqapi/ntcall";
 import {ActionName} from "./types";
 
@@ -17,15 +16,10 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
 
     protected async _handle(payload: Payload): Promise<null> {
         const seq = payload.flag.toString();
-        const notify: GroupNotify = groupNotifies[seq]
+        await NTQQApi.handleGroupRequest(seq,
-        try {
+            payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-            await NTQQApi.handleGroupRequest(seq,
+            payload.reason
-                payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+        )
-                payload.reason
-            )
-        } catch (e) {
-            throw e
-        }
         return null
     }
 }

src/onebot11/action/go-cqhttp/UploadGroupFile.ts

@@ -0,0 +1,37 @@
+import BaseAction from "../BaseAction";
+import {getGroup} from "../../../common/data";
+import {ActionName} from "../types";
+import {SendMsgElementConstructor} from "../../../ntqqapi/constructor";
+import {ChatType, SendFileElement} from "../../../ntqqapi/types";
+import {NTQQApi} from "../../../ntqqapi/ntcall";
+import {uri2local} from "../../utils";
+import fs from "fs";
+
+interface Payload{
+    group_id: number
+    file: string
+    name: string
+    folder: string
+}
+
+export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
+    actionName = ActionName.GoCQHTTP_UploadGroupFile
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const group = await getGroup(payload.group_id.toString());
+        if (!group){
+            throw new Error(`群组${payload.group_id}不存在`)
+        }
+        let file = payload.file;
+        if (fs.existsSync(file)){
+            file = `file://${file}`
+        }
+        const downloadResult = await uri2local(file);
+        if (downloadResult.errMsg){
+            throw new Error(downloadResult.errMsg)
+        }
+        let sendFileEle: SendFileElement = await SendMsgElementConstructor.file(downloadResult.path, payload.name);
+        await NTQQApi.sendMsg({chatType: ChatType.group, peerUid: group.groupCode}, [sendFileEle]);
+        return null
+    }
+}

src/onebot11/action/index.ts

@@ -31,9 +31,19 @@ import SetGroupCard from "./SetGroupCard";
 import GetImage from "./GetImage";
 import GetRecord from "./GetRecord";
 import GoCQHTTPMarkMsgAsRead from "./MarkMsgAsRead";
+import CleanCache from "./CleanCache";
+import GoCQHTTPUploadGroupFile from "./go-cqhttp/UploadGroupFile";
+import {GetConfigAction, SetConfigAction} from "./llonebot/Config";
+import GetGroupAddRequest from "./llonebot/GetGroupAddRequest";
+import SetQQAvatar from './llonebot/SetQQAvatar'
 
 export const actionHandlers = [
     new Debug(),
+    new GetConfigAction(),
+    new SetConfigAction(),
+    new GetGroupAddRequest(),
+    new SetQQAvatar(),
+    // onebot11
     new SendLike(),
     new GetMsg(),
     new GetLoginInfo(),
@@ -56,6 +66,7 @@ export const actionHandlers = [
     new SetGroupCard(),
     new GetImage(),
     new GetRecord(),
+    new CleanCache(),
 
     //以下为go-cqhttp api
     new GoCQHTTPSendGroupForwardMsg(),
@@ -63,6 +74,7 @@ export const actionHandlers = [
     new GoCQHTTPGetStrangerInfo(),
     new GetGuildList(),
     new GoCQHTTPMarkMsgAsRead(),
+    new GoCQHTTPUploadGroupFile(),
 
 ]
 

src/onebot11/action/llonebot/Config.ts

@@ -0,0 +1,20 @@
+import BaseAction from "../BaseAction";
+import {Config} from "../../../common/types";
+import {getConfigUtil} from "../../../common/utils";
+import {ActionName} from "../types";
+import {setConfig} from "../../../main/setConfig";
+
+
+export class GetConfigAction extends BaseAction<null, Config> {
+    actionName = ActionName.GetConfig
+    protected async _handle(payload: null): Promise<Config> {
+        return getConfigUtil().getConfig()
+    }
+}
+
+export class SetConfigAction extends BaseAction<Config, void> {
+    actionName = ActionName.SetConfig
+    protected async _handle(payload: Config): Promise<void> {
+        setConfig(payload).then();
+    }
+}

src/onebot11/action/llonebot/GetGroupAddRequest.ts

@@ -0,0 +1,32 @@
+import {GroupNotify, GroupNotifyStatus} from "../../../ntqqapi/types";
+import BaseAction from "../BaseAction";
+import {ActionName} from "../types";
+import {NTQQApi} from "../../../ntqqapi/ntcall";
+import {uidMaps} from "../../../common/data";
+import {log} from "../../../common/utils";
+
+interface OB11GroupRequestNotify {
+    group_id: number,
+    user_id: number,
+    flag: string
+}
+
+export default class GetGroupAddRequest extends BaseAction<null, OB11GroupRequestNotify[]> {
+    actionName = ActionName.GetGroupIgnoreAddRequest
+
+    protected async _handle(payload: null): Promise<OB11GroupRequestNotify[]> {
+        const data = await NTQQApi.getGroupIgnoreNotifies()
+        log(data);
+        let notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
+        let returnData: OB11GroupRequestNotify[] = []
+        for (const notify of notifies) {
+            const uin = uidMaps[notify.user1.uid] || (await NTQQApi.getUserDetailInfo(notify.user1.uid))?.uin
+            returnData.push({
+                group_id: parseInt(notify.group.groupCode),
+                user_id: parseInt(uin),
+                flag: notify.seq
+            })
+        }
+        return returnData;
+    }
+}

src/onebot11/action/llonebot/SetQQAvatar.ts

@@ -0,0 +1,44 @@
+import BaseAction from "../BaseAction";
+import {NTQQApi} from "../../../ntqqapi/ntcall";
+import {ActionName} from "../types";
+import { uri2local } from "../../utils";
+import * as fs from "node:fs";
+import { checkFileReceived } from "../../../common/utils";
+// import { log } from "../../../common/utils";
+
+interface Payload {
+    file: string
+}
+
+export default class SetAvatar extends BaseAction<Payload, null> {
+    actionName = ActionName.SetQQAvatar
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const {path, isLocal, errMsg} = (await uri2local(payload.file))
+        if (errMsg){
+            throw `头像${payload.file}设置失败,file字段可能格式不正确`
+        }
+        if (path) {
+            await checkFileReceived(path, 5000); // 文件不存在QQ会崩溃，需要提前判断
+            const ret = await NTQQApi.setQQAvatar(path)
+            if (!isLocal){
+                fs.unlink(path, () => {})
+            }
+            if (!ret) {
+                throw `头像${payload.file}设置失败,api无返回`
+            }
+            // log(`头像设置返回：${JSON.stringify(ret)}`)
+            if (ret['result'] == 1004022) {
+                throw `头像${payload.file}设置失败，文件可能不是图片格式`
+            } else if(ret['result'] != 0) {
+                throw `头像${payload.file}设置失败,未知的错误,${ret['result']}:${ret['errMsg']}`
+            }
+        } else {
+            if (!isLocal){
+                fs.unlink(path, () => {})
+            }
+            throw `头像${payload.file}设置失败,无法获取头像,文件可能不存在`
+        } 
+        return null
+    }
+}

src/onebot11/action/types.ts

@@ -14,6 +14,10 @@ export interface InvalidCheckResult {
 }
 
 export enum ActionName {
+    GetGroupIgnoreAddRequest = "get_group_ignore_add_request",
+    SetQQAvatar = "set_qq_avatar",
+    GetConfig = "get_config",
+    SetConfig = "set_config",
     Debug = "llonebot_debug",
     SendLike = "send_like",
     GetLoginInfo = "get_login_info",
@@ -42,10 +46,12 @@ export enum ActionName {
     SetGroupName = "set_group_name",
     GetImage = "get_image",
     GetRecord = "get_record",
+    CleanCache = "clean_cache",
     // 以下为go-cqhttp api
     GoCQHTTP_SendGroupForwardMsg = "send_group_forward_msg",
     GoCQHTTP_SendPrivateForwardMsg = "send_private_forward_msg",
     GoCQHTTP_GetStrangerInfo = "get_stranger_info",
     GetGuildList = "get_guild_list",
     GoCQHTTP_MarkMsgAsRead = "mark_msg_as_read",
+    GoCQHTTP_UploadGroupFile = "upload_group_file",
 }

src/onebot11/constructor.ts

@@ -8,13 +8,27 @@ import {
     OB11User,
     OB11UserSex
 } from "./types";
-import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types';
+import {
-import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
+    AtType,
-import {getConfigUtil, log} from "../common/utils";
+    ChatType,
+    Group,
+    GroupMember,
+    IMAGE_HTTP_HOST,
+    RawMessage,
+    SelfInfo,
+    TipGroupElementType,
+    User
+} from '../ntqqapi/types';
+import {getFriend, getGroup, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
+import {getConfigUtil, log, sleep} from "../common/utils";
 import {NTQQApi} from "../ntqqapi/ntcall";
 import {EventType} from "./event/OB11BaseEvent";
 import {encodeCQCode} from "./cqcode";
 import {dbUtil} from "../common/db";
+import {OB11GroupIncreaseEvent} from "./event/notice/OB11GroupIncreaseEvent";
+import {OB11GroupBanEvent} from "./event/notice/OB11GroupBanEvent";
+import {OB11GroupUploadNoticeEvent} from "./event/notice/OB11GroupUploadNoticeEvent";
+import {OB11GroupNoticeEvent} from "./event/notice/OB11GroupNoticeEvent";
 
 
 export class OB11Constructor {
@@ -27,7 +41,7 @@ export class OB11Constructor {
             user_id: parseInt(msg.senderUin),
             time: parseInt(msg.msgTime) || Date.now(),
             message_id: msg.msgShortId,
-            real_id: msg.msgId,
+            real_id: msg.msgShortId,
             message_type: msg.chatType == ChatType.group ? "group" : "private",
             sender: {
                 user_id: parseInt(msg.senderUin),
@@ -77,7 +91,7 @@ export class OB11Constructor {
                     let atUid = element.textElement.atNtUid
                     let atQQ = element.textElement.atUid
                     if (!atQQ || atQQ === "0") {
-                        const atMember = await getGroupMember(msg.peerUin, null, atUid)
+                        const atMember = await getGroupMember(msg.peerUin, atUid)
                         if (atMember) {
                             atQQ = atMember.uin
                         }
@@ -97,7 +111,7 @@ export class OB11Constructor {
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
                 // log("收到回复消息", element.replyElement.replayMsgSeq)
-                try{
+                try {
                     const replyMsg = await dbUtil.getMsgBySeqId(element.replyElement.replayMsgSeq)
                     // log("找到回复消息", replyMsg.msgShortId, replyMsg.msgId)
                     if (replyMsg) {
@@ -105,7 +119,7 @@ export class OB11Constructor {
                     } else {
                         continue
                     }
-                }catch (e) {
+                } catch (e) {
                     log("获取不到引用的消息", e.stack, element.replyElement.replayMsgSeq)
                 }
 
@@ -116,10 +130,9 @@ export class OB11Constructor {
                 // message_data["data"]["path"] = element.picElement.sourcePath
                 const url = element.picElement.originImageUrl
                 const fileMd5 = element.picElement.md5HexStr
-                if (url){
+                if (url) {
                     message_data["data"]["url"] = IMAGE_HTTP_HOST + url
-                }
+                } else if (fileMd5 && element.picElement.fileUuid.indexOf("_") === -1) { // fileuuid有下划线的是Linux发送的，这个url是另外的格式，目前尚未得知如何组装
-                else if (fileMd5 && element.picElement.fileUuid.indexOf("_") === -1){ // fileuuid有下划线的是Linux发送的，这个url是另外的格式，目前尚未得知如何组装
                     message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${fileMd5.toUpperCase()}/0`
                 }
                 // message_data["data"]["file_id"] = element.picElement.fileUuid
@@ -193,7 +206,10 @@ export class OB11Constructor {
                 message_data["type"] = OB11MessageDataType.face;
                 message_data["data"]["id"] = element.faceElement.faceIndex.toString();
             }
-
+            // todo: 解析入群grayTipElement
+            else if (element.grayTipElement?.aioOpGrayTipElement) {
+                log("收到 group gray tip 消息", element.grayTipElement.aioOpGrayTipElement)
+            }
             // if (message_data.data.file) {
             //     let filePath: string = message_data.data.file;
             //     if (!enableLocalFile2Url) {
@@ -230,6 +246,60 @@ export class OB11Constructor {
         return resMsg;
     }
 
+    static async GroupEvent(msg: RawMessage): Promise<OB11GroupNoticeEvent> {
+        if (msg.chatType !== ChatType.group) {
+            return;
+        }
+        for (let element of msg.elements) {
+            const groupElement = element.grayTipElement?.groupElement
+            if (groupElement) {
+                // log("收到群提示消息", groupElement)
+                if (groupElement.type == TipGroupElementType.memberIncrease) {
+                    log("收到群成员增加消息", groupElement)
+                    await sleep(1000);
+                    const member = await getGroupMember(msg.peerUid, groupElement.memberUid);
+                    let memberUin = member?.uin;
+                    if (!memberUin) {
+                        memberUin = (await NTQQApi.getUserDetailInfo(groupElement.memberUid)).uin
+                    }
+                    // log("获取新群成员QQ", memberUin)
+                    const adminMember = await getGroupMember(msg.peerUid, groupElement.adminUid);
+                    // log("获取同意新成员入群的管理员", adminMember)
+                    if (memberUin) {
+                        const operatorUin = adminMember?.uin || memberUin
+                        let event = new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(operatorUin));
+                        // log("构造群增加事件", event)
+                        return event;
+                    }
+                }
+                else if (groupElement.type === TipGroupElementType.ban) {
+                    log("收到群群员禁言提示", groupElement)
+                    const memberUid = groupElement.shutUp.member.uid
+                    const adminUid = groupElement.shutUp.admin.uid
+                    let memberUin: string = ""
+                    let duration = parseInt(groupElement.shutUp.duration)
+                    let sub_type: "ban" | "lift_ban" = duration > 0 ? "ban" : "lift_ban"
+                    if (memberUid){
+                        memberUin = (await getGroupMember(msg.peerUid, memberUid))?.uin || (await NTQQApi.getUserDetailInfo(memberUid))?.uin
+                    }
+                    else {
+                        memberUin = "0";  // 0表示全员禁言
+                        if (duration > 0) {
+                            duration = -1
+                        }
+                    }
+                    const adminUin = (await getGroupMember(msg.peerUid, adminUid))?.uin || (await NTQQApi.getUserDetailInfo(adminUid))?.uin
+                    if (memberUin && adminUin) {
+                        return new OB11GroupBanEvent(parseInt(msg.peerUid), parseInt(memberUin), parseInt(adminUin), duration, sub_type);
+                    }
+                }
+            }
+            else if (element.fileElement){
+                return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), {id: element.fileElement.fileName, name: element.fileElement.fileName, size: parseInt(element.fileElement.fileSize)})
+            }
+        }
+    }
+
     static friend(friend: User): OB11User {
         return {
             user_id: parseInt(friend.uin),

src/onebot11/cqcode.ts

@@ -46,15 +46,22 @@ export function decodeCQCode(source: string): OB11MessageData[] {
 
 
 export function encodeCQCode(data: OB11MessageData) {
-    const CQCodeEscape = (text: string) => {
+    const CQCodeEscapeText = (text: string) => {
-        return text.replace(/\[/g, '[')
+        return text.replace(/\&/g, '&')
+            .replace(/\[/g, '[')
+            .replace(/\]/g, ']')
+            
+    };
+
+    const CQCodeEscape = (text: string) => {
+        return text.replace(/\&/g, '&')
+            .replace(/\[/g, '[')
             .replace(/\]/g, ']')
-            .replace(/\&/g, '&')
             .replace(/,/g, ',');
     };
 
     if (data.type === 'text') {
-        return CQCodeEscape(data.data.text);
+        return CQCodeEscapeText(data.data.text);
     }
 
     let result = '[CQ:' + data.type;
@@ -68,4 +75,4 @@ export function encodeCQCode(data: OB11MessageData) {
 
 // const result = parseCQCode("[CQ:at,qq=114514]早上好啊[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]")
 // const result = parseCQCode("好好好")
-// console.log(JSON.stringify(result))
+// console.log(JSON.stringify(result))

src/onebot11/event/notice/OB11GroupBanEvent.ts

@@ -0,0 +1,17 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export class OB11GroupBanEvent extends OB11GroupNoticeEvent {
+    notice_type = "group_ban";
+    operator_id: number;
+    duration: number;
+    sub_type: "ban" | "lift_ban";
+
+    constructor(groupId: number, userId: number, operatorId: number, duration: number, sub_type:  "ban" | "lift_ban") {
+        super();
+        this.group_id = groupId;
+        this.operator_id = operatorId;
+        this.user_id = userId;
+        this.duration = duration;
+        this.sub_type = sub_type;
+    }
+}

src/onebot11/event/notice/OB11GroupIncreaseEvent.ts

@@ -5,10 +5,10 @@ export class OB11GroupIncreaseEvent extends OB11GroupNoticeEvent {
     sub_type = "approve";  // TODO: 实现其他几种子类型的识别 ("approve" | "invite")
     operator_id: number;
 
-    constructor(groupId: number, userId: number) {
+    constructor(groupId: number, userId: number, operatorId: number) {
         super();
         this.group_id = groupId;
-        this.operator_id = userId;  // 实际上不应该这么实现，但是现在还没有办法识别用户是被邀请的，还是主动加入的
+        this.operator_id = operatorId;
         this.user_id = userId;
     }
 }

src/onebot11/event/notice/OB11GroupUploadNoticeEvent.ts

@@ -0,0 +1,19 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export interface GroupUploadFile{
+    id: string,
+    name: string,
+    size: number
+}
+
+export class OB11GroupUploadNoticeEvent extends OB11GroupNoticeEvent {
+    notice_type = "group_upload"
+    file: GroupUploadFile
+
+    constructor(groupId: number, userId: number, file: GroupUploadFile) {
+        super();
+        this.group_id = groupId;
+        this.user_id = userId;
+        this.file = file
+    }
+}

src/onebot11/server/http.ts

@@ -20,8 +20,10 @@ class OB11HTTPServer extends HttpServerBase {
 
 export const ob11HTTPServer = new OB11HTTPServer();
 
-for (const action of actionHandlers) {
+setTimeout(() => {
-    for (const method of ["post", "get"]) {
+    for (const action of actionHandlers) {
-        ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
+        for (const method of ["post", "get"]) {
+            ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
+        }
     }
-}
+}, 0)

src/onebot11/types.ts

@@ -67,7 +67,7 @@ export interface OB11Message {
     self_id?: number,
     time: number,
     message_id: number,
-    real_id: string,
+    real_id: number,
     user_id: number,
     group_id?: number,
     message_type: "private" | "group",

src/onebot11/utils.ts

@@ -6,12 +6,16 @@ import {dbUtil} from "../common/db";
 
 const fs = require("fs").promises;
 
-export async function uri2local(uri: string, fileName: string = null) {
+type Uri2LocalRes = {
-    if (!fileName) {
+    success: boolean,
-        fileName = uuidv4();
+    errMsg: string,
-    }
+    fileName: string,
-    let filePath = path.join(DATA_DIR, fileName)
+    ext: string,
-    let url = new URL(uri);
+    path: string,
+    isLocal: boolean
+}
+
+export async function uri2local(uri: string, fileName: string = null) : Promise<Uri2LocalRes>{
     let res = {
         success: false,
         errMsg: "",
@@ -20,6 +24,19 @@ export async function uri2local(uri: string, fileName: string = null) {
         path: "",
         isLocal: false
     }
+    if (!fileName) {
+        fileName = uuidv4();
+    }
+    let filePath = path.join(DATA_DIR, fileName)
+    let url = null;
+    try{
+        url = new URL(uri);
+    }catch (e) {
+        res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`
+        return res
+    }
+
+    // log("uri protocol", url.protocol, uri);
     if (url.protocol == "base64:") {
         // base64转成文件
         let base64Data = uri.split("base64://")[1]

src/renderer/index.ts

@@ -90,7 +90,7 @@ async function onSettingWindowCreated(view: Element) {
                 ], 'ob11.messagePostFormat', config.ob11.messagePostFormat),
             ),
             SettingItem(
-                'ffmpeg 路径', `<span id="config-ffmpeg-path-text">${!isEmpty(config.ffmpeg) ? config.ffmpeg : '未指定'}</span>`,
+                'ffmpeg 路径, 发送语音、视频需要，同时保证ffprobe和ffmpeg在一起', `<span id="config-ffmpeg-path-text">${!isEmpty(config.ffmpeg) ? config.ffmpeg : '未指定'}</span>`,
                 SettingButton('选择', 'config-ffmpeg-select'),
             ),
             SettingItem(
@@ -138,7 +138,7 @@ async function onSettingWindowCreated(view: Element) {
         ]),
         SettingList([
             SettingItem(
-                'GitHub',
+                'GitHub和文档',
                 `https://github.com/LLOneBot/LLOneBot`,
                 SettingButton('点个Star', 'open-github'),
             ),
@@ -167,17 +167,16 @@ async function onSettingWindowCreated(view: Element) {
         window.LiteLoader.api.openExternal('https://qm.qq.com/q/bDnHRG38aI')
     })
     // 生成反向地址列表
-    const buildHostListItem = (type: string, host: string, index: number) => {
+    const buildHostListItem = (type: string, host: string, index: number, inputAttrs: any={}) => {
         const dom = {
             container: document.createElement('setting-item'),
             input: document.createElement('input'),
             inputContainer: document.createElement('div'),
             deleteBtn: document.createElement('setting-button'),
         };
-
         dom.container.classList.add('setting-host-list-item');
         dom.container.dataset.direction = 'row';
-
+        Object.assign(dom.input, inputAttrs);
         dom.input.classList.add('q-input__inner');
         dom.input.type = 'url';
         dom.input.value = host;
@@ -200,18 +199,18 @@ async function onSettingWindowCreated(view: Element) {
 
         return dom.container;
     };
-    const buildHostList = (hosts: string[], type: string) => {
+    const buildHostList = (hosts: string[], type: string, inputAttr: any={}) => {
         const result: HTMLElement[] = [];
     
         hosts.forEach((host, index) => {
-            result.push(buildHostListItem(type, host, index));
+            result.push(buildHostListItem(type, host, index, inputAttr));
         });
     
         return result;
     };
-    const addReverseHost = (type: string, doc: Document = document) => {
+    const addReverseHost = (type: string, doc: Document = document, inputAttr: any={}) => {
         const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`);
-        hostContainerDom.appendChild(buildHostListItem(type, '', ob11Config[type].length));
+        hostContainerDom.appendChild(buildHostListItem(type, '', ob11Config[type].length, inputAttr));
         ob11Config[type].push('');
     };
     const initReverseHost = (type: string, doc: Document = document) => {
@@ -224,8 +223,8 @@ async function onSettingWindowCreated(view: Element) {
     initReverseHost('httpHosts', doc);
     initReverseHost('wsHosts', doc);
 
-    doc.querySelector('#config-ob11-httpHosts-add').addEventListener('click', () => addReverseHost('httpHosts'));
+    doc.querySelector('#config-ob11-httpHosts-add').addEventListener('click', () => addReverseHost('httpHosts', document, {'placeholder': '如：http://127.0.0.1:5140/onebot' }));
-    doc.querySelector('#config-ob11-wsHosts-add').addEventListener('click', () => addReverseHost('wsHosts'));
+    doc.querySelector('#config-ob11-wsHosts-add').addEventListener('click', () => addReverseHost('wsHosts', document, {'placeholder': '如：ws://127.0.0.1:5140/onebot' }));
 
     doc.querySelector('#config-ffmpeg-select').addEventListener('click', () => {
         window.llonebot.selectFile()

src/version.ts

@@ -1 +1 @@
-export const version = "3.13.9"
+export const version = "3.15.1"