fix merge conflict

# Conflicts:
#	src/main/main.ts
#	src/renderer/index.ts

.github/workflows/publish.yml

@@ -17,7 +17,9 @@ jobs:
         node-version: 18
 
     - name: install dependenies
-      run: npm install
+      run: |
+        export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+        npm install
 
     - name: build
       run: npm run build

.gitignore

@@ -1,4 +1,6 @@
 node_modules/
+package-lock.json
 dist/
+out/
 .idea/
 .DS_Store

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 LLOneBot
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,114 +1,52 @@
+
 # LLOneBot API
+LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发
 
-LiteLoaderQQNT的OneBot11协议插件
-
-*注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
-
-*V3之后不再需要LLAPI*
+TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 安装方法
 
-1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
+见 <https://llonebot.github.io/zh-CN/guide/getting-started>
 
-2.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本
+## 设置界面
 
-*关于插件的安装方法: 下载后解压复制到插件目录*
+<img src="./doc/image/setting.png" width="500px" alt="图片名称"/>
 
-*插件目录:`LiteLoaderQQNT/plugins`*
-
-## 支持的API
-
-目前支持的协议
-- [x] http调用api
-- [x] http事件上报
-- [x] 正向websocket
-- [x] 反向websocket
-
-主要功能:
-- [x] 发送好友消息
-- [x] 发送群消息
-- [x] 获取好友列表
-- [x] 获取群列表
-- [x] 获取群成员列表
-- [x] 撤回消息
-- [x] 上报好友消息
-- [x] 上报群消息
-- [x] 上报好友、群消息撤回
-
-消息格式支持:
-- [x] cq码
-- [x] 文字
-- [x] 表情
-- [x] 图片
-- [x] 引用消息
-- [x] @群成员
-- [x] 语音(支持mp3、wav等多种音频格式直接发送)
-- [x] json消息(只上报)
-- [x] 转发消息记录(目前只能发不能收)
-- [ ] 红包
-- [ ] xml
-
-支持的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] get_msg
-- [x] get_version_info
-- [x] get_status
-- [x] can_send_image
-- [x] can_send_record
-
-支持的go-cqhtp api:
-- [x] send_private_forward_msg
-- [x] send_group_forward_msg
-
-## 示例
+## HTTP 调用示例
 
 ![](doc/image/example.jpg)
 
-## 一些坑
+## 支持的 api 和功能详情
 
-<details>
-    <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/>
+见 <https://llonebot.github.io/zh-CN/develop/api>
 
 
 ## TODO
 - [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 - [x] 支持正、反向websocket（感谢@disymayufei的PR）
 - [x] 转发消息记录 
-- [ ] 好友点赞api
+- [x] 好友点赞api
+- [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](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

@@ -0,0 +1,73 @@
+import cp from 'vite-plugin-cp';
+import "./scripts/gen-version"
+
+const external = ["silk-wasm", "ws",
+    "level", "classic-level", "abstract-level", "level-supports", "level-transcoder",
+    "module-error", "catering", "node-gyp-build"];
+
+function genCpModule(module: string) {
+    return {src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false}
+}
+
+let config = {
+    main: {
+        build: {
+            outDir: "dist/main",
+            emptyOutDir: true,
+            lib: {
+                formats: ["cjs"],
+                entry: {"main": "src/main/main.ts"},
+            },
+            rollupOptions: {
+                external,
+                input: "src/main/main.ts",
+            }
+        },
+        resolve: {
+            alias: {
+                './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg'
+            },
+        },
+        plugins: [cp({
+            targets: [
+                ...external.map(genCpModule),
+                {src: './manifest.json', dest: 'dist'}, {src: './icon.jpg', dest: 'dist'},
+                {src: './src/ntqqapi/external/ccpoke/poke-win32-x64.node', dest: 'dist/main/ccpoke/'},
+            ]
+        })]
+    },
+    preload: {
+        // vite config options
+        build: {
+            outDir: "dist/preload",
+            emptyOutDir: true,
+            lib: {
+                formats: ["cjs"],
+                entry: {"preload": "src/preload.ts"},
+            },
+            rollupOptions: {
+                // external: externalAll,
+                input: "src/preload.ts",
+            }
+        },
+        resolve: {}
+    },
+    renderer: {
+        // vite config options
+        build: {
+            outDir: "dist/renderer",
+            emptyOutDir: true,
+            lib: {
+                formats: ["es"],
+                entry: {"renderer": "src/renderer/index.ts"},
+            },
+            rollupOptions: {
+                // external: externalAll,
+                input: "src/renderer/index.ts",
+            }
+        },
+        resolve: {}
+    }
+}
+
+export default config;

manifest.json

@@ -1,11 +1,11 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot",
+  "name": "LLOneBot v3.16.0",
   "slug": "LLOneBot",
-  "description": "LiteLoaderQQNT的OneBotApi",
-  "version": "3.5.0",
-  "thumbnail": "./icon.png",
+  "description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新",
+  "version": "3.16.0",
+  "icon": "./icon.jpg",
   "authors": [
     {
       "name": "linyuchen",
@@ -26,8 +26,8 @@
     "darwin"
   ],
   "injects": {
-    "renderer": "./renderer.js",
-    "main": "./main.js",
-    "preload": "./preload.js"
+    "renderer": "./renderer/index.js",
+    "main": "./main/main.cjs",
+    "preload": "./preload/preload.cjs"
   }
-}
+}

package.json

@@ -1,42 +1,45 @@
 {
   "name": "llonebot",
   "version": "1.0.0",
+  "type": "module",
   "description": "NTQQLiteLoaderOneBotApi",
   "main": "dist/main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "cross-env ELECTRON_SKIP_BINARY_DOWNLOAD=1 && npm install electron --no-save",
-    "build": "npm run build-main && npm run build-preload && npm run build-renderer",
-    "build-main": "webpack --config webpack.main.config.js",
-    "build-preload": "webpack --config webpack.preload.config.js",
-    "build-renderer": "webpack --config webpack.renderer.config.js",
-    "build-mac": "npm run build && cp manifest.json dist/ && npm run deploy-mac",
-    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOnebot/",
-    "build-win": "npm run build && cp manifest.json dist/ && npm run deploy-win",
-    "deploy-win": "cmd /c \"copy dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOnebot\\\""
+    "build": "electron-vite build",
+    "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 /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "express": "^4.18.2",
-    "json-bigint": "^1.0.0",
-    "music-metadata": "^8.1.4",
+    "file-type": "^19.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "level": "^8.0.1",
+    "node-stream-zip": "^1.15.0",
     "silk-wasm": "^3.2.3",
+    "utf-8-validate": "^6.0.3",
     "uuid": "^9.0.1",
     "ws": "^8.16.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.23.2",
     "@types/express": "^4.17.20",
-    "@types/node": "^20.11.19",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^20.11.24",
     "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.10",
-    "babel-loader": "^9.1.3",
-    "copy-webpack-plugin": "^12.0.2",
-    "cross-env": "^7.0.3",
-    "ts-loader": "^9.5.0",
-    "typescript": "^5.2.2",
-    "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4"
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "electron": "^29.0.1",
+    "electron-vite": "^2.0.0",
+    "eslint": "^8.0.1",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+    "eslint-plugin-promise": "^6.0.0",
+    "ts-node": "^10.9.2",
+    "typescript": "*",
+    "vite": "^5.1.4",
+    "vite-plugin-cp": "^4.0.8"
   }
 }

scripts/gen-version.ts

@@ -0,0 +1,22 @@
+import fs from 'fs'
+import path from 'path'
+import { version } from '../src/version'
+
+const manifestPath = path.join(__dirname, '../manifest.json')
+
+function readManifest (): any {
+    if (fs.existsSync(manifestPath)) {
+        return JSON.parse(fs.readFileSync(manifestPath, 'utf-8'))
+    }
+}
+
+function writeManifest (manifest: any) {
+    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2))
+}
+
+const manifest = readManifest()
+if (version !== manifest.version) {
+    manifest.version = version
+    manifest.name = `LLOneBot v${version}`
+    writeManifest(manifest)
+}

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

@@ -1,5 +1,7 @@
-import {Peer} from "../ntqqapi/ntcall";
-
-export const CHANNEL_GET_CONFIG = "llonebot_get_config"
-export const CHANNEL_SET_CONFIG = "llonebot_set_config"
-export const CHANNEL_LOG = "llonebot_log"
+export const CHANNEL_GET_CONFIG = 'llonebot_get_config'
+export const CHANNEL_SET_CONFIG = 'llonebot_set_config'
+export const CHANNEL_LOG = 'llonebot_log'
+export const CHANNEL_ERROR = 'llonebot_error'
+export const CHANNEL_UPDATE = 'llonebot_update'
+export const CHANNEL_CHECKVERSION = 'llonebot_checkversion'
+export const CHANNEL_SELECT_FILE = 'llonebot_select_ffmpeg'

src/common/config.ts

@@ -1,7 +1,11 @@
 import fs from "fs";
-import {Config, OB11Config} from "./types";
+import {Config, OB11Config} from './types';
 import {mergeNewProperties} from "./utils";
 
+export const HOOK_LOG = false;
+
+export const ALLOW_SEND_TEMP_MSG = false;
+
 export class ConfigUtil {
     private readonly configPath: string;
     private config: Config | null = null;
@@ -10,7 +14,7 @@ export class ConfigUtil {
         this.configPath = configPath;
     }
 
-    getConfig(cache=true) {
+    getConfig(cache = true) {
         if (this.config && cache) {
             return this.config;
         }
@@ -27,7 +31,8 @@ export class ConfigUtil {
             enableHttp: true,
             enableHttpPost: true,
             enableWs: true,
-            enableWsReverse: false
+            enableWsReverse: false,
+            messagePostFormat: "array",
         }
         let defaultConfig: Config = {
             ob11: ob11Default,
@@ -36,7 +41,9 @@ export class ConfigUtil {
             enableLocalFile2Url: false,
             debug: false,
             log: false,
-            reportSelfMessage: false
+            reportSelfMessage: false,
+            autoDeleteFile: false,
+            autoDeleteFileSecond: 60,
         };
 
         if (!fs.existsSync(this.configPath)) {

src/common/data.ts

@@ -1,90 +1,101 @@
-import {NTQQApi} from '../ntqqapi/ntcall';
-import {Friend, Group, GroupMember, RawMessage, SelfInfo} from "../ntqqapi/types";
+import {
+    type Friend,
+    type FriendRequest,
+    type Group,
+    type GroupMember,
+    type SelfInfo
+} from '../ntqqapi/types'
+import {type FileCache, type LLOneBotError} from './types'
+import {isNumeric, log} from "./utils";
+import {NTQQGroupApi} from "../ntqqapi/api/group";
 
+export const selfInfo: SelfInfo = {
+    uid: '',
+    uin: '',
+    nick: '',
+    online: true
+}
 export let groups: Group[] = []
 export let friends: Friend[] = []
-export let msgHistory: Record<string, RawMessage> = {}  // msgId: RawMessage
-
-let globalMsgId = Date.now()
-
-export function addHistoryMsg(msg: RawMessage): boolean{
-    let existMsg = msgHistory[msg.msgId]
-    if (existMsg){
-        Object.assign(existMsg, msg)
-        msg.msgShortId = existMsg.msgShortId;
-        return false
-    }
-    msg.msgShortId = ++globalMsgId
-    msgHistory[msg.msgId] = msg
-    return true
-}
-
-export function getHistoryMsgByShortId(shortId: number | string){
-    // log("getHistoryMsgByShortId", shortId, Object.values(msgHistory).map(m=>m.msgShortId))
-    return Object.values(msgHistory).find(msg => msg.msgShortId.toString() == shortId.toString())
+export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
+export const llonebotError: LLOneBotError = {
+    ffmpegError: '',
+    otherError: ''
 }
 
 
-export async function getFriend(qq: string): Promise<Friend | undefined> {
-    let friend = friends.find(friend => friend.uin === qq)
-    // if (!friend){
-    //     friends = (await NTQQApi.getFriends(true))
-    //     friend = friends.find(friend => friend.uin === qq)
+export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
+    let filterKey = isNumeric(uinOrUid) ? "uin" : "uid"
+    let filterValue = uinOrUid
+    let friend = friends.find(friend => friend[filterKey] === filterValue.toString())
+    // if (!friend) {
+    //     try {
+    //         friends = (await NTQQApi.getFriends(true))
+    //         friend = friends.find(friend => friend[filterKey] === filterValue.toString())
+    //     } catch (e) {
+    //         // log("刷新好友列表失败", e.stack.toString())
+    //     }
     // }
     return friend
 }
 
 export async function getGroup(qq: string): Promise<Group | undefined> {
-    let group = groups.find(group => group.groupCode === qq)
-    // if (!group){
-    //     groups = await NTQQApi.getGroups(true);
-    //     group = groups.find(group => group.groupCode === qq)
-    // }
+    let group = groups.find(group => group.groupCode === qq.toString())
+    if (!group) {
+        try {
+            const _groups = await NTQQGroupApi.getGroups(true);
+            group = _groups.find(group => group.groupCode === qq.toString())
+            if (group) {
+                groups.push(group)
+            }
+        } catch (e) {
+        }
+
+    }
     return group
 }
 
-export async function getGroupMember(groupQQ: string, memberQQ: string=null, memberUid: string=null) {
+export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
+    groupQQ = groupQQ.toString()
+    memberUinOrUid = memberUinOrUid.toString()
     const group = await getGroup(groupQQ)
     if (group) {
-        let filterFunc: (member: GroupMember) => boolean
-        if (memberQQ){
-            filterFunc = member => member.uin === memberQQ
-        }
-        else if (memberUid){
-            filterFunc = member => member.uid === memberUid
-        }
+        const filterKey = isNumeric(memberUinOrUid) ? "uin" : "uid"
+        const filterValue = memberUinOrUid
+        let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
         let member = group.members?.find(filterFunc)
-        if (!member){
-            const _members = await NTQQApi.getGroupMembers(groupQQ)
-            if (_members.length){
-                group.members = _members
+        if (!member) {
+            try {
+                const _members = await NTQQGroupApi.getGroupMembers(groupQQ)
+                if (_members.length > 0) {
+                    group.members = _members
+                }
+            } catch (e) {
+                // log("刷新群成员列表失败", e.stack.toString())
             }
+
             member = group.members?.find(filterFunc)
         }
         return member
     }
+    return null
 }
 
-export let selfInfo: SelfInfo = {
-    uid: "",
-    uin: "",
-    nick: "",
+export async function refreshGroupMembers(groupQQ: string) {
+    const group = groups.find(group => group.groupCode === groupQQ)
+    if (group) {
+        group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
+    }
 }
 
-
-export function getHistoryMsgBySeq(seq: string) {
-    return Object.values(msgHistory).find(msg => msg.msgSeq === seq)
-}
-
-
-export let uidMaps:Record<string, string> = {}  // 一串加密的字符串(uid) -> qq号
+export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
 
 export function getUidByUin(uin: string) {
     for (const key in uidMaps) {
         if (uidMaps[key] === uin) {
-            return key;
+            return key
         }
     }
 }
 
-export const version = "v3.5.0"
+export let tempGroupCodeMap: Record<string, string> = {}  // peerUid => 群号

src/common/db.ts

@@ -0,0 +1,263 @@
+import {Level} from "level";
+import {type GroupNotify, RawMessage} from "../ntqqapi/types";
+import {DATA_DIR, log} from "./utils";
+import {selfInfo} from "./data";
+import {FileCache} from "./types";
+
+
+class DBUtil {
+    public readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
+    public readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
+    public readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
+    public readonly DB_KEY_PREFIX_FILE = "file_";
+    public readonly DB_KEY_PREFIX_GROUP_NOTIFY = "group_notify_";
+    public db: Level;
+    public cache: Record<string, RawMessage | string | FileCache | GroupNotify> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
+    private currentShortId: number;
+
+    /*
+    * 数据库结构
+    * msg_id_101231230999: {} // 长id: RawMessage
+    * msg_short_id_1: 101231230999  // 短id: 长id
+    * msg_seq_id_1: 101231230999  // 序列id: 长id
+    * file_7827DBAFJFW2323.png: {} // 文件名: FileCache
+    * */
+
+    constructor() {
+        let initCount = 0;
+        new Promise((resolve, reject) => {
+            const initDB = () => {
+                initCount++;
+                // if (initCount > 50) {
+                //     return reject("init db fail")
+                // }
+
+                try {
+                    if (!selfInfo.uin) {
+                        setTimeout(initDB, 300);
+                        return
+                    }
+                    const DB_PATH = DATA_DIR + `/msg_${selfInfo.uin}`;
+                    this.db = new Level(DB_PATH, {valueEncoding: 'json'});
+                    console.log("llonebot init db success")
+                    resolve(null)
+                } catch (e) {
+                    console.log("init db fail", e.stack.toString())
+                    setTimeout(initDB, 300);
+                }
+            }
+            initDB();
+        }).then()
+
+        const expiredMilliSecond = 1000 * 60 * 60;
+
+        setInterval(() => {
+            // this.cache = {}
+            // 清理时间较久的缓存
+            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) {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + msg.msgShortId
+        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
+        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
+        }
+        try {
+            const longId = await this.db.get(shortMsgIdKey);
+            const msg = await this.getMsgByLongId(longId)
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            log("getMsgByShortId db error", e.stack.toString())
+        }
+    }
+
+    async getMsgByLongId(longId: string): Promise<RawMessage> {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId;
+        if (this.cache[longIdKey]) {
+            return this.cache[longIdKey] as RawMessage
+        }
+        try {
+            const data = await this.db.get(longIdKey)
+            const msg = JSON.parse(data)
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            // log("getMsgByLongId db error", e.stack.toString())
+        }
+    }
+
+    async getMsgBySeqId(seqId: string): Promise<RawMessage> {
+        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId;
+        if (this.cache[seqIdKey]) {
+            return this.cache[seqIdKey] as RawMessage
+        }
+        try {
+            const longId = await this.db.get(seqIdKey);
+            const msg = await this.getMsgByLongId(longId)
+            this.addCache(msg)
+            return msg
+        } catch (e) {
+            log("getMsgBySeqId db error", e.stack.toString())
+        }
+    }
+
+    async addMsg(msg: RawMessage) {
+        // 有则更新，无则添加
+        // log("addMsg", msg.msgId, msg.msgSeq, msg.msgShortId);
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        let existMsg = this.cache[longIdKey] as RawMessage
+        if (!existMsg) {
+            try {
+                existMsg = await this.getMsgByLongId(msg.msgId)
+            } catch (e) {
+                // log("addMsg getMsgByLongId error", e.stack.toString())
+            }
+        }
+        if (existMsg) {
+            // log("消息已存在", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId)
+            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 {
+            await this.db.get(seqIdKey)
+        } catch (e) {
+            // 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) {
+        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
+        let existMsg = this.cache[longIdKey] as RawMessage
+        if (!existMsg) {
+            try {
+                existMsg = await this.getMsgByLongId(msg.msgId)
+            } catch (e) {
+                existMsg = msg
+            }
+        }
+
+        Object.assign(existMsg, msg)
+        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().catch();
+        try {
+            await this.db.get(seqIdKey)
+        } catch (e) {
+            this.db.put(seqIdKey, msg.msgId).then().catch();
+            // log("更新seqId error", e.stack, seqIdKey);
+        }
+        // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
+    }
+
+
+    private async genMsgShortId(): Promise<number> {
+        const key = "msg_current_short_id";
+        if (this.currentShortId === undefined) {
+            try {
+                let id: string = await this.db.get(key);
+                this.currentShortId = parseInt(id);
+            } catch (e) {
+                this.currentShortId = -2147483640
+            }
+        }
+
+        this.currentShortId++;
+        this.db.put(key, this.currentShortId.toString()).then().catch();
+        return this.currentShortId;
+    }
+
+    async addFileCache(fileName: string, data: FileCache) {
+        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        if (this.cache[key]) {
+            return
+        }
+        let cacheDBData = {...data}
+        delete cacheDBData['downloadFunc']
+        this.cache[fileName] = data;
+        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> {
+        const key = this.DB_KEY_PREFIX_FILE + fileName;
+        if (this.cache[key]) {
+            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())
+        }
+    }
+}
+
+export const dbUtil = new DBUtil();

src/common/server/http.ts

@@ -1,9 +1,7 @@
-import express, {Express, Request, Response} from "express";
+import express, {Express, json, Request, Response} from "express";
 import {getConfigUtil, log} from "../utils";
 import http from "http";
 
-const JSONbig = require('json-bigint')({storeAsString: true});
-
 type RegisterHandler = (res: Response, payload: any) => Promise<any>
 
 export abstract class HttpServerBase {
@@ -13,20 +11,17 @@ 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((req, res, next) => {
-            let data = '';
-            req.on('data', chunk => {
-                data += chunk.toString();
-            });
-            req.on('end', () => {
-                if (data) {
-                    try {
-                        // log("receive raw", data)
-                        req.body = JSONbig.parse(data);
-                    } catch (e) {
-                        return next(e);
-                    }
+            // 兼容处理没有带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();
             });
@@ -63,13 +58,13 @@ export abstract class HttpServerBase {
     }
 
     stop() {
-        if (this.server){
+        if (this.server) {
             this.server.close()
             this.server = null;
         }
     }
 
-    restart(port: number){
+    restart(port: number) {
         this.stop()
         this.start(port)
     }
@@ -81,20 +76,20 @@ export abstract class HttpServerBase {
             url = "/" + url
         }
 
-        if (!this.expressAPP[method]){
+        if (!this.expressAPP[method]) {
             const err = `${this.name} register router failed，${method} not exist`;
             log(err);
             throw err;
         }
         this.expressAPP[method](url, this.authorize, async (req: Request, res: Response) => {
             let payload = req.body;
-            if (method == "get"){
+            if (method == "get") {
                 payload = req.query
             }
             log("收到http请求", url, payload);
-            try{
+            try {
                 res.send(await handler(res, payload))
-            }catch (e) {
+            } catch (e) {
                 this.handleFailed(res, payload, e.stack.toString())
             }
         });

src/common/server/websocket.ts

@@ -1,4 +1,4 @@
-import {Server, WebSocket} from "ws";
+import {WebSocket, WebSocketServer} from "ws";
 import {getConfigUtil, log} from "../utils";
 import urlParse from "url";
 import {IncomingMessage} from "node:http";
@@ -15,25 +15,25 @@ class WebsocketClientBase {
         }
     }
 
-    onMessage(msg: string){
+    onMessage(msg: string) {
 
     }
 }
 
 export class WebsocketServerBase {
-    private ws: Server = null;
+    private ws: WebSocketServer = null;
 
     constructor() {
         console.log(`llonebot websocket service started`)
     }
 
     start(port: number) {
-        this.ws = new Server({port});
-        this.ws.on("connection", (wsClient, req)=>{
+        this.ws = new WebSocketServer({port});
+        this.ws.on("connection", (wsClient, req) => {
             const url = req.url.split("?").shift()
             this.authorize(wsClient, req);
             this.onConnect(wsClient, url, req);
-            wsClient.on("message", async (msg)=>{
+            wsClient.on("message", async (msg) => {
                 this.onMessage(wsClient, url, msg.toString())
             })
         })
@@ -45,7 +45,8 @@ export class WebsocketServerBase {
         });
         this.ws = null;
     }
-    restart(port: number){
+
+    restart(port: number) {
         this.stop();
         this.start(port);
     }
@@ -85,7 +86,7 @@ export class WebsocketServerBase {
 
     }
 
-    onMessage(wsClient: WebSocket, url: string,  msg: string) {
+    onMessage(wsClient: WebSocket, url: string, msg: string) {
 
     }
 

src/common/types.ts

@@ -1,20 +1,40 @@
 export interface OB11Config {
-    httpPort: number
-    httpHosts: string[]
-    wsPort: number
-    wsHosts: string[]
-    enableHttp?: boolean
-    enableHttpPost?: boolean
-    enableWs?: boolean
-    enableWsReverse?: boolean
+  httpPort: number
+  httpHosts: string[]
+  wsPort: number
+  wsHosts: string[]
+  enableHttp?: boolean
+  enableHttpPost?: boolean
+  enableWs?: boolean
+  enableWsReverse?: boolean
+  messagePostFormat?: 'array' | 'string'
+}
+export interface CheckVersion {
+  result: boolean,
+  version: string
+}
+export interface Config {
+  ob11: OB11Config
+  token?: string
+  heartInterval?: number // ms
+  enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
+  debug?: boolean
+  reportSelfMessage?: boolean
+  log?: boolean
+  autoDeleteFile?: boolean
+  autoDeleteFileSecond?: number
+  ffmpeg?: string // ffmpeg路径
 }
 
-export interface Config {
-    ob11: OB11Config
-    token?: string
-    heartInterval?: number  // ms
-    enableLocalFile2Url?: boolean  // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
-    debug?: boolean
-    reportSelfMessage?: boolean
-    log?: boolean
-}
+export interface LLOneBotError {
+  ffmpegError?: string
+  otherError?: string
+}
+
+export interface FileCache {
+  fileName: string
+  filePath: string
+  fileSize: string
+  url?: string
+  downloadFunc?: () => Promise<void>
+}

src/common/utils.ts

@@ -1,15 +1,19 @@
-import * as path from "path";
-import {selfInfo} from "./data";
-import {ConfigUtil} from "./config";
+import * as path from "node:path";
+import { selfInfo } from "./data";
+import { ConfigUtil } from "./config";
 import util from "util";
-import {encode, getDuration} from "silk-wasm";
+import { encode, getDuration, isWav } from "silk-wasm";
 import fs from 'fs';
-import {v4 as uuidv4} from "uuid";
+import * as crypto from 'crypto';
+import { v4 as uuidv4 } from "uuid";
+import ffmpeg from "fluent-ffmpeg"
+import * as https from "node:https";
+import { version } from "../version";
 
-export const CONFIG_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
+export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
 
 export function getConfigUtil() {
-    const configFilePath = path.join(CONFIG_DIR, `config_${selfInfo.uin}.json`)
+    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
     return new ConfigUtil(configFilePath)
 }
 
@@ -30,9 +34,72 @@ function truncateString(obj: any, maxLength = 500) {
     return obj;
 }
 
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+// 判断是否为最新版本
+export async function checkVersion() {
+    const latestVersionText = await getRemoteVersion();
+    const latestVersion = latestVersionText.split(".");
+    const currentVersion = version.split(".");
+    for (let k in [0, 1, 2]) {
+        if (latestVersion[k] > currentVersion[k]) {
+            return { result: false, version: latestVersionText };
+        }
+    }
+    return { result: true, version: version };
+}
+export async function updateLLOneBot() {
+    let mirrorGithubList = ["https://mirror.ghproxy.com"];
+    const latestVersion = await getRemoteVersion();
+    if (latestVersion && latestVersion != "") {
+        const downloadUrl = "https://github.com/LLOneBot/LLOneBot/releases/download/v" + latestVersion + "/LLOneBot.zip";
+        const realUrl = mirrorGithubList[0] + downloadUrl;
+    }
+    return false;
+}
+export async function getRemoteVersion() {
+    let mirrorGithubList = ["https://521github.com"];
+    let Version = "";
+    for (let i = 0; i < mirrorGithubList.length; i++) {
+        let mirrorGithub = mirrorGithubList[i];
+        let tVersion = await getRemoteVersionByMirror(mirrorGithub);
+        if (tVersion && tVersion != "") {
+            Version = tVersion;
+            break;
+        }
+    }
+    return Version;
+}
+export async function getRemoteVersionByMirror(mirrorGithub: string) {
+    let releasePage = "error";
+    let reqPromise = async function (): Promise<string> {
+        return new Promise((resolve, reject) => {
+            https.get(mirrorGithub + "/LLOneBot/LLOneBot/releases", res => {
+                let list = [];
+                res.on('data', chunk => {
+                    list.push(chunk);
+                });
+                res.on('end', () => {
+                    resolve(Buffer.concat(list).toString());
+                });
+            }).on('error', err => {
+                reject();
+            });
+        });
+    }
+    try {
+        releasePage = await reqPromise();
+        if (releasePage === "error") return "";
+        return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))[0];
+    }
+    catch { }
+    return "";
+
+}
 export function log(...msg: any[]) {
     if (!getConfigUtil().getConfig().log) {
-        return
+        return //console.log(...msg);
     }
     let currentDateTime = new Date().toLocaleString();
     const date = new Date();
@@ -54,7 +121,7 @@ export function log(...msg: any[]) {
     logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
     // sendLog(...msg);
     // console.log(msg)
-    fs.appendFile(path.join(CONFIG_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
+    fs.appendFile(path.join(DATA_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
 
     })
 }
@@ -136,7 +203,26 @@ export function mergeNewProperties(newObj: any, oldObj: any) {
     });
 }
 
+export function checkFfmpeg(newPath: string = null): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        if (newPath) {
+            ffmpeg.setFfmpegPath(newPath);
+            ffmpeg.getAvailableFormats((err, formats) => {
+                if (err) {
+                    log('ffmpeg is not installed or not found in PATH:', err);
+                    resolve(false)
+                } else {
+                    log('ffmpeg is installed.');
+                    resolve(true);
+                }
+            })
+        }
+    });
+}
+
 export async function encodeSilk(filePath: string) {
+    const fsp = require("fs").promises
+
     function getFileHeader(filePath: string) {
         // 定义要读取的字节数
         const bytesToRead = 7;
@@ -154,35 +240,76 @@ export async function encodeSilk(filePath: string) {
         }
     }
 
-    async function getAudioSampleRate(filePath: string) {
-        try {
-            const mm = await import('music-metadata');
-            const metadata = await mm.parseFile(filePath);
-            log(`${filePath}采样率`, metadata.format.sampleRate);
-            return metadata.format.sampleRate;
-        } catch (error) {
-            log(`${filePath}采样率获取失败`, error.stack);
-            // console.error(error);
-        }
+    async function isWavFile(filePath: string) {
+        return isWav(fs.readFileSync(filePath));
     }
 
+    // async function getAudioSampleRate(filePath: string) {
+    //     try {
+    //         const mm = await import('music-metadata');
+    //         const metadata = await mm.parseFile(filePath);
+    //         log(`${filePath}采样率`, metadata.format.sampleRate);
+    //         return metadata.format.sampleRate;
+    //     } catch (error) {
+    //         log(`${filePath}采样率获取失败`, error.stack);
+    //         // console.error(error);
+    //     }
+    // }
+
     try {
         const fileName = path.basename(filePath);
-        const pcm = fs.readFileSync(filePath);
-        const pttPath = path.join(CONFIG_DIR, uuidv4());
+        const pttPath = path.join(DATA_DIR, uuidv4());
         if (getFileHeader(filePath) !== "02232153494c4b") {
-            log(`语音文件${filePath}需要转换`)
-            const sampleRate = await getAudioSampleRate(filePath) || 44100;
-            const silk = await encode(pcm, sampleRate);
+            log(`语音文件${filePath}需要转换成silk`)
+            const _isWav = await isWavFile(filePath);
+            const wavPath = pttPath + ".wav"
+            if (!_isWav) {
+                log(`语音文件${filePath}正在转换成wav`)
+                // let voiceData = await fsp.readFile(filePath)
+                await new Promise((resolve, reject) => {
+                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
+                    if (ffmpegPath) {
+                        ffmpeg.setFfmpegPath(ffmpegPath);
+                    }
+                    ffmpeg(filePath).toFormat("wav").audioChannels(2).on('end', function () {
+                        log('wav转换完成');
+                    })
+                        .on('error', function (err) {
+                            log(`wav转换出错: `, err.message,);
+                            reject(err);
+                        })
+                        .save(wavPath)
+                        .on("end", () => {
+                            filePath = wavPath
+                            resolve(wavPath);
+                        });
+                })
+            }
+            // const sampleRate = await getAudioSampleRate(filePath) || 0;
+            // log("音频采样率", sampleRate)
+            const pcm = fs.readFileSync(filePath);
+            const silk = await encode(pcm, 0);
             fs.writeFileSync(pttPath, silk.data);
-            log(`语音文件${filePath}转换成功!`)
+            fs.unlink(wavPath, (err) => { });
+            log(`语音文件${filePath}转换成功!`, pttPath)
             return {
                 converted: true,
                 path: pttPath,
                 duration: silk.duration,
             };
         } else {
-            const duration = getDuration(pcm);
+            const pcm = fs.readFileSync(filePath);
+            let duration = 0;
+            try {
+                duration = getDuration(pcm);
+            } catch (e) {
+                log("获取语音文件时长失败", filePath, e.stack)
+                duration = fs.statSync(filePath).size / 1024 / 3  // 每3kb大约1s
+                duration = Math.floor(duration)
+                duration = Math.max(1, duration)
+                log("使用文件大小估算时长", duration)
+            }
+
             return {
                 converted: false,
                 path: filePath,
@@ -193,4 +320,83 @@ export async function encodeSilk(filePath: string) {
         log("convert silk failed", error.stack);
         return {};
     }
-}
+}
+
+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/common/utils/index.ts

@@ -0,0 +1,342 @@
+import * as path from "node:path";
+import {selfInfo} from "../data";
+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"
+
+export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
+
+export function getConfigUtil() {
+    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
+    return new ConfigUtil(configFilePath)
+}
+
+function truncateString(obj: any, maxLength = 500) {
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach(key => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
+export function isNumeric(str: string) {
+    return /^\d+$/.test(str);
+}
+
+
+export function log(...msg: any[]) {
+    if (!getConfigUtil().getConfig().log) {
+        return //console.log(...msg);
+    }
+    let currentDateTime = new Date().toLocaleString();
+    const date = new Date();
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    const currentDate = `${year}-${month}-${day}`;
+    const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ""
+    let logMsg = "";
+    for (let msgItem of msg) {
+        // 判断是否是对象
+        if (typeof msgItem === "object") {
+            let obj = JSON.parse(JSON.stringify(msgItem));
+            logMsg += JSON.stringify(truncateString(obj)) + " ";
+            continue;
+        }
+        logMsg += msgItem + " ";
+    }
+    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
+    // sendLog(...msg);
+    // console.log(msg)
+    fs.appendFile(path.join(DATA_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
+
+    })
+}
+
+export function isGIF(path: string) {
+    const buffer = Buffer.alloc(4);
+    const fd = fs.openSync(path, 'r');
+    fs.readSync(fd, buffer, 0, 4, 0);
+    fs.closeSync(fd);
+    return buffer.toString() === 'GIF8'
+}
+
+export function sleep(ms: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+
+// 定义一个异步函数来检查文件是否存在
+export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const startTime = Date.now();
+
+        function check() {
+            if (fs.existsSync(path)) {
+                resolve();
+            } else if (Date.now() - startTime > timeout) {
+                reject(new Error(`文件不存在: ${path}`));
+            } else {
+                setTimeout(check, 100);
+            }
+        }
+
+        check();
+    });
+}
+
+export async function file2base64(path: string) {
+    const readFile = util.promisify(fs.readFile);
+    let result = {
+        err: "",
+        data: ""
+    }
+    try {
+        // 读取文件内容
+        // if (!fs.existsSync(path)){
+        //     path = path.replace("\\Ori\\", "\\Thumb\\");
+        // }
+        try {
+            await checkFileReceived(path, 5000);
+        } catch (e: any) {
+            result.err = e.toString();
+            return result;
+        }
+        const data = await readFile(path);
+        // 转换为Base64编码
+        result.data = data.toString('base64');
+    } catch (err) {
+        result.err = err.toString();
+    }
+    return result;
+}
+
+
+// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
+export function mergeNewProperties(newObj: any, oldObj: any) {
+    Object.keys(newObj).forEach(key => {
+        // 如果老对象不存在当前属性，则直接复制
+        if (!oldObj.hasOwnProperty(key)) {
+            oldObj[key] = newObj[key];
+        } else {
+            // 如果老对象和新对象的当前属性都是对象，则递归合并
+            if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
+                mergeNewProperties(newObj[key], oldObj[key]);
+            } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
+                // 属性冲突，有一方不是对象，直接覆盖
+                oldObj[key] = newObj[key];
+            }
+        }
+    });
+}
+
+export function checkFfmpeg(newPath: string = null): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        if (newPath) {
+            ffmpeg.setFfmpegPath(newPath);
+            ffmpeg.getAvailableFormats((err, formats) => {
+                if (err) {
+                    log('ffmpeg is not installed or not found in PATH:', err);
+                    resolve(false)
+                } else {
+                    log('ffmpeg is installed.');
+                    resolve(true);
+                }
+            })
+        }
+    });
+}
+
+export async function encodeSilk(filePath: string) {
+    const fsp = require("fs").promises
+
+    function getFileHeader(filePath: string) {
+        // 定义要读取的字节数
+        const bytesToRead = 7;
+        try {
+            const buffer = fs.readFileSync(filePath, {
+                encoding: null,
+                flag: "r",
+            });
+
+            const fileHeader = buffer.toString("hex", 0, bytesToRead);
+            return fileHeader;
+        } catch (err) {
+            console.error("读取文件错误:", err);
+            return;
+        }
+    }
+
+    async function isWavFile(filePath: string) {
+        return isWav(fs.readFileSync(filePath));
+    }
+
+    // async function getAudioSampleRate(filePath: string) {
+    //     try {
+    //         const mm = await import('music-metadata');
+    //         const metadata = await mm.parseFile(filePath);
+    //         log(`${filePath}采样率`, metadata.format.sampleRate);
+    //         return metadata.format.sampleRate;
+    //     } catch (error) {
+    //         log(`${filePath}采样率获取失败`, error.stack);
+    //         // console.error(error);
+    //     }
+    // }
+
+    try {
+        const fileName = path.basename(filePath);
+        const pttPath = path.join(DATA_DIR, uuidv4());
+        if (getFileHeader(filePath) !== "02232153494c4b") {
+            log(`语音文件${filePath}需要转换成silk`)
+            const _isWav = await isWavFile(filePath);
+            const wavPath = pttPath + ".wav"
+            if (!_isWav) {
+                log(`语音文件${filePath}正在转换成wav`)
+                // let voiceData = await fsp.readFile(filePath)
+                await new Promise((resolve, reject) => {
+                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
+                    if (ffmpegPath) {
+                        ffmpeg.setFfmpegPath(ffmpegPath);
+                    }
+                    ffmpeg(filePath).toFormat("wav").audioChannels(2).on('end', function () {
+                        log('wav转换完成');
+                    })
+                        .on('error', function (err) {
+                            log(`wav转换出错: `, err.message,);
+                            reject(err);
+                        })
+                        .save(wavPath)
+                        .on("end", () => {
+                            filePath = wavPath
+                            resolve(wavPath);
+                        });
+                })
+            }
+            // 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) => { });
+            log(`语音文件${filePath}转换成功!`, pttPath)
+            return {
+                converted: true,
+                path: pttPath,
+                duration: silk.duration,
+            };
+        } else {
+            const pcm = fs.readFileSync(filePath);
+            let duration = 0;
+            try {
+                duration = getDuration(pcm);
+            } catch (e) {
+                log("获取语音文件时长失败", filePath, e.stack)
+                duration = fs.statSync(filePath).size / 1024 / 3  // 每3kb大约1s
+                duration = Math.floor(duration)
+                duration = Math.max(1, duration)
+                log("使用文件大小估算时长", duration)
+            }
+
+            return {
+                converted: false,
+                path: filePath,
+                duration: duration,
+            };
+        }
+    } catch (error) {
+        log("convert silk failed", error.stack);
+        return {};
+    }
+}
+
+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/common/utils/qqlevel.ts

@@ -0,0 +1,7 @@
+// QQ等级换算
+import {QQLevel} from "../../ntqqapi/types";
+
+export function calcQQLevel(level: QQLevel) {
+    const {crownNum, sunNum, moonNum, starNum} = level
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
+}

src/common/utils/qqpkg.ts

@@ -0,0 +1,10 @@
+import path from "path";
+
+type QQPkgInfo = {
+    version: string;
+    buildVersion: string;
+    platform: string;
+    eleArch: string;
+}
+
+export const qqPkgInfo: QQPkgInfo = require(path.join(process.resourcesPath, "app/package.json"))

src/global.d.ts

@@ -1,10 +1,8 @@
-import {LLOneBot} from "./preload";
-
-
+import { type LLOneBot } from './preload'
 
 declare global {
-    interface Window {
-        llonebot: typeof llonebot;
-        LiteLoader: any;
-    }
-}
+  interface Window {
+    llonebot: LLOneBot
+    LiteLoader: any
+  }
+}

src/main/main.ts

@@ -1,22 +1,46 @@
 // 运行在 Electron 主进程 下的插件入口
 
-import {BrowserWindow, ipcMain} from 'electron';
-import fs from 'fs';
+import {BrowserWindow, dialog, ipcMain} from 'electron';
+import * as fs from 'node:fs';
 import {Config} from "../common/types";
-import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "../common/channels";
+import {
+    CHANNEL_ERROR,
+    CHANNEL_GET_CONFIG,
+    CHANNEL_LOG,
+    CHANNEL_CHECKVERSION,
+    CHANNEL_SELECT_FILE,
+    CHANNEL_SET_CONFIG,
+    CHANNEL_UPDATE,
+} from "../common/channels";
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {CONFIG_DIR, getConfigUtil, log} from "../common/utils";
-import {addHistoryMsg, getGroupMember, msgHistory, selfInfo} from "../common/data";
-import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
+import {checkFfmpeg, checkVersion, DATA_DIR, getConfigUtil, log, updateLLOneBot} from "../common/utils";
+import {
+    friendRequests,
+    getFriend,
+    getGroup,
+    getGroupMember,
+    llonebotError,
+    refreshGroupMembers,
+    selfInfo
+} from "../common/data";
+import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
 import {OB11Constructor} from "../onebot11/constructor";
-import {NTQQApi} from "../ntqqapi/ntcall";
-import {ChatType, RawMessage} from "../ntqqapi/types";
+import {ChatType, FriendRequestNotify, 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 {postEvent} from "../onebot11/server/postevent";
+import {postOB11Event} from "../onebot11/server/postOB11Event";
 import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
-import {EventType} from "../onebot11/event/OB11BaseEvent";
+import {OB11GroupAdminNoticeEvent} from "../onebot11/event/notice/OB11GroupAdminNoticeEvent";
+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";
+import {NTQQUserApi} from "../ntqqapi/api/user";
+import {NTQQGroupApi} from "../ntqqapi/api/group";
+import {registerPokeHandler} from "../ntqqapi/external/ccpoke";
+import {OB11FriendPokeEvent, OB11GroupPokeEvent} from "../onebot11/event/notice/OB11PokeEvent";
 
 
 let running = false;
@@ -25,72 +49,69 @@ let running = false;
 // 加载插件时触发
 function onLoad() {
     log("llonebot main onLoad");
-    if (!fs.existsSync(CONFIG_DIR)) {
-        fs.mkdirSync(CONFIG_DIR, {recursive: true});
-    }
-    ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
-        return getConfigUtil().getConfig()
-    })
-    ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
-        let oldConfig = getConfigUtil().getConfig();
-        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;
+    ipcMain.handle(CHANNEL_CHECKVERSION, async (event, arg) => {
+        return checkVersion();
+    });
+    ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
+        return updateLLOneBot();
+    });
+    ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
+        const selectPath = new Promise<string>((resolve, reject) => {
+            dialog
+                .showOpenDialog({
+                    title: "请选择ffmpeg",
+                    properties: ["openFile"],
+                    buttonLabel: "确定",
+                })
+                .then((result) => {
+                    log("选择文件", result);
+                    if (!result.canceled) {
+                        const _selectPath = path.join(result.filePaths[0]);
+                        resolve(_selectPath);
+                        // let config = getConfigUtil().getConfig()
+                        // config.ffmpeg = path.join(result.filePaths[0]);
+                        // getConfigUtil().setConfig(config);
                     }
-                }
-            }
+                    resolve("")
+                })
+                .catch((err) => {
+                    reject(err);
+                });
+        })
+        try {
+            return await selectPath;
+        } catch (e) {
+            log("选择文件出错", e)
+            return ""
         }
     })
+    if (!fs.existsSync(DATA_DIR)) {
+        fs.mkdirSync(DATA_DIR, {recursive: true});
+    }
+    ipcMain.handle(CHANNEL_ERROR, (event, arg) => {
+        return llonebotError;
+    })
+    ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
+        const config = getConfigUtil().getConfig()
+        return config;
+    })
+    ipcMain.on(CHANNEL_SET_CONFIG, (event, config: Config) => {
+        setConfig(config).then();
+    })
 
-    ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => {
+    ipcMain.on(CHANNEL_LOG, (event, arg) => {
         log(arg);
     })
 
-
-    function postReceiveMsg(msgList: RawMessage[]) {
+    async function postReceiveMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
         for (let message of msgList) {
-            // log("收到新消息", message)
-            message.msgShortId = msgHistory[message.msgId]?.msgShortId
-            if (!message.msgShortId) {
-                addHistoryMsg(message);
-            }
+
+            // log("收到新消息", message.msgId, message.msgSeq)
+            // if (message.senderUin !== selfInfo.uin){
+            message.msgShortId = await dbUtil.addMsg(message);
+            // }
+
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
                     msg.raw = message;
@@ -99,38 +120,55 @@ function onLoad() {
                 if (isSelfMsg && !reportSelfMessage) {
                     return
                 }
-                postEvent(msg);
+                postOB11Event(msg);
                 // log("post msg", msg)
-            }).catch(e => log("constructMessage error: ", e.toString()));
+            }).catch(e => log("constructMessage error: ", e.stack.toString()));
+            OB11Constructor.GroupEvent(message).then(groupEvent => {
+                if (groupEvent) {
+                    // log("post group event", groupEvent);
+                    postOB11Event(groupEvent);
+                }
+            })
         }
     }
 
-
-    async function start() {
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
+    async function startReceiveHook() {
+        registerPokeHandler((id, isGroup) => {
+            log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
+            let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent;
+            if (isGroup) {
+                pokeEvent = new OB11GroupPokeEvent(parseInt(id));
+            }else{
+                pokeEvent = new OB11FriendPokeEvent(parseInt(id));
+            }
+            postOB11Event(pokeEvent);
+        })
+        registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
             try {
-                postReceiveMsg(payload.msgList);
+                await postReceiveMsg(payload.msgList);
             } catch (e) {
-                log("report message error: ", e.toString());
+                log("report message error: ", e.stack.toString());
             }
         })
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
+        registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
             for (const message of payload.msgList) {
-                // log("message update", message.sendStatus, message)
-                if (message.recallTime != "0") {
+                // log("message update", message.sendStatus, message.msgId, message.msgSeq)
+                if (message.recallTime != "0") { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断
                     // 撤回消息上报
-                    const oriMessage = msgHistory[message.msgId]
+                    const oriMessage = await dbUtil.getMsgByLongId(message.msgId)
                     if (!oriMessage) {
                         continue
                     }
+                    oriMessage.recallTime = message.recallTime
+                    dbUtil.updateMsg(oriMessage).then();
                     if (message.chatType == ChatType.friend) {
                         const friendRecallEvent = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId);
-                        postEvent(friendRecallEvent);
+                        postOB11Event(friendRecallEvent);
                     } else if (message.chatType == ChatType.group) {
                         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(
@@ -140,27 +178,154 @@ function onLoad() {
                             oriMessage.msgShortId
                         )
 
-                        postEvent(groupRecallEvent);
+                        postOB11Event(groupRecallEvent);
                     }
+                    // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
                     continue
                 }
-                addHistoryMsg(message)
+                dbUtil.updateMsg(message).then();
             }
         })
-        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
+        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
             const {reportSelfMessage} = getConfigUtil().getConfig();
             if (!reportSelfMessage) {
                 return
             }
             // log("reportSelfMessage", payload)
             try {
-                postReceiveMsg([payload.msgRecord]);
+                await postReceiveMsg([payload.msgRecord]);
             } catch (e) {
-                log("report self message error: ", e.toString());
+                log("report self message error: ", e.stack.toString());
             }
         })
-        NTQQApi.getGroups(true).then()
+        registerReceiveHook<{
+            "doubt": boolean,
+            "oldestUnreadSeq": string,
+            "unreadCount": number
+        }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
+            if (payload.unreadCount) {
+                // log("开始获取群通知详情")
+                let notify: GroupNotifies;
+                try {
+                    notify = await NTQQGroupApi.getGroupNotifies();
+                } catch (e) {
+                    // log("获取群通知详情失败", e);
+                    return
+                }
+
+                const notifies = notify.notifies.slice(0, payload.unreadCount)
+                // log("获取群通知详情完成", notifies, payload);
+
+                for (const notify of notifies) {
+                    try {
+                        notify.time = Date.now();
+                        // const notifyTime = parseInt(notify.seq) / 1000
+                        // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
+                        // if (notifyTime < startTime) {
+                        //     continue;
+                        // }
+                        let existNotify = await dbUtil.getGroupNotify(notify.seq);
+                        if (existNotify) {
+                            continue
+                        }
+                        log("收到群通知", 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, notify.user1.uid);
+                            log("有管理员变动通知");
+                            refreshGroupMembers(notify.group.groupCode).then()
+                            let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
+                            groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
+                            log("开始获取变动的管理员")
+                            if (member1) {
+                                log("变动管理员获取成功")
+                                groupAdminNoticeEvent.user_id = parseInt(member1.uin);
+                                groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
+                                postOB11Event(groupAdminNoticeEvent, true);
+                            } else {
+                                log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
+                            }
+                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
+                            // log("有成员退出通知");
+                            // const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                            // let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                            // postEvent(groupDecreaseEvent, true);
+                        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
+                            log("有加群请求");
+                            let groupRequestEvent = new OB11GroupRequestEvent();
+                            groupRequestEvent.group_id = parseInt(notify.group.groupCode);
+                            let requestQQ = ""
+                            try {
+                                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin;
+                            } catch (e) {
+                                log("获取加群人QQ号失败", e)
+                            }
+                            groupRequestEvent.user_id = parseInt(requestQQ) || 0;
+                            groupRequestEvent.sub_type = "add"
+                            groupRequestEvent.comment = notify.postscript;
+                            groupRequestEvent.flag = notify.seq;
+                            postOB11Event(groupRequestEvent);
+                        } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+                            log("收到邀请我加群通知")
+                            let groupInviteEvent = new OB11GroupRequestEvent();
+                            groupInviteEvent.group_id = parseInt(notify.group.groupCode);
+                            let user_id = (await getFriend(notify.user2.uid))?.uin
+                            if (!user_id) {
+                                user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
+                            }
+                            groupInviteEvent.user_id = parseInt(user_id);
+                            groupInviteEvent.sub_type = "invite";
+                            groupInviteEvent.flag = notify.seq;
+                            postOB11Event(groupInviteEvent);
+                        }
+                    } catch (e) {
+                        log("解析群通知失败", e.stack.toString());
+                    }
+                }
+
+            } else if (payload.doubt) {
+                // 可能有群管理员变动
+            }
+        })
+
+        registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
+            for (const req of payload.data.buddyReqs) {
+                if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
+                    friendRequests[req.sourceId] = req;
+                    log("有新的好友请求", req);
+                    let friendRequestEvent = new OB11FriendRequestEvent();
+                    try {
+                        let requester = await NTQQUserApi.getUserDetailInfo(req.friendUid)
+                        friendRequestEvent.user_id = parseInt(requester.uin);
+                    } catch (e) {
+                        log("获取加好友者QQ号失败", e);
+                    }
+                    friendRequestEvent.flag = req.sourceId.toString();
+                    friendRequestEvent.comment = req.extWords;
+                    postOB11Event(friendRequestEvent);
+                }
+            }
+        })
+    }
+
+    let startTime = 0;
+
+    async function start() {
+        log("llonebot pid", process.pid)
+        startTime = Date.now();
+        startReceiveHook().then();
+        NTQQGroupApi.getGroups(true).then()
         const config = getConfigUtil().getConfig()
+        // 检查ffmpeg
+        checkFfmpeg(config.ffmpeg).then(exist => {
+            if (!exist) {
+                llonebotError.ffmpegError = `没有找到ffmpeg,音频只能发送wav和silk`
+            }
+        })
         if (config.ob11.enableHttp) {
             try {
                 ob11HTTPServer.start(config.ob11.httpPort)
@@ -168,33 +333,39 @@ function onLoad() {
                 log("http server start failed", e);
             }
         }
-        if (config.ob11.enableWs){
+        if (config.ob11.enableWs) {
             ob11WebsocketServer.start(config.ob11.wsPort);
         }
-        if (config.ob11.enableWsReverse){
+        if (config.ob11.enableWsReverse) {
             ob11ReverseWebsockets.start();
         }
 
         log("LLOneBot start")
     }
 
+    let getSelfNickCount = 0;
     const init = async () => {
         try {
-            const _ = await NTQQApi.getSelfInfo();
+            log("start get self info")
+            const _ = await NTQQUserApi.getSelfInfo();
+            log("get self info api result:", _);
             Object.assign(selfInfo, _);
             selfInfo.nick = selfInfo.uin;
-            log("get self simple info", _);
         } catch (e) {
-            log("retry get self info");
+            log("retry get self info", e);
         }
+        log("self info", selfInfo);
         if (selfInfo.uin) {
             try {
-                const userInfo = (await NTQQApi.getUserInfo(selfInfo.uid));
+                const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
                 log("self info", userInfo);
                 if (userInfo) {
                     selfInfo.nick = userInfo.nick;
                 } else {
-                    return setTimeout(init, 1000);
+                    getSelfNickCount++;
+                    if (getSelfNickCount < 10) {
+                        return setTimeout(init, 1000);
+                    }
                 }
             } catch (e) {
                 log("get self nickname failed", e.toString());
@@ -211,6 +382,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/api/file.ts

@@ -0,0 +1,217 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {
+    CacheFileList,
+    CacheFileListItem,
+    CacheFileType,
+    CacheScanResult,
+    ChatCacheList, ChatCacheListItemBasic,
+    ChatType,
+    ElementType
+} from "../types";
+import path from "path";
+import {log} from "../../common/utils";
+import fs from "fs";
+import {ReceiveCmdS} from "../hook";
+
+export class NTQQFileApi{
+    static async getFileType(filePath: string) {
+        return await callNTQQApi<{ ext: string }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
+        })
+    }
+    static async getFileMd5(filePath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_MD5,
+            args: [filePath]
+        })
+    }
+    static async copyFile(filePath: string, destPath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_COPY,
+            args: [{
+                fromPath: filePath,
+                toPath: destPath
+            }]
+        })
+    }
+    static async getFileSize(filePath: string) {
+        return await callNTQQApi<number>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
+        })
+    }
+    // 上传文件到QQ的文件夹
+    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC) {
+        const md5 = await NTQQFileApi.getFileMd5(filePath);
+        let ext = (await NTQQFileApi.getFileType(filePath))?.ext
+        if (ext) {
+            ext = "." + ext
+        } else {
+            ext = ""
+        }
+        let fileName = `${path.basename(filePath)}`;
+        if (fileName.indexOf(".") === -1) {
+            fileName += ext;
+        }
+        const mediaPath = await callNTQQApi<string>({
+            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
+            args: [{
+                path_info: {
+                    md5HexStr: md5,
+                    fileName: fileName,
+                    elementType: elementType,
+                    elementSubType: 0,
+                    thumbSize: 0,
+                    needCreate: true,
+                    downloadType: 1,
+                    file_uuid: ""
+                }
+            }]
+        })
+        log("media path", mediaPath)
+        await NTQQFileApi.copyFile(filePath, mediaPath);
+        const fileSize = await NTQQFileApi.getFileSize(filePath);
+        return {
+            md5,
+            fileName,
+            path: mediaPath,
+            fileSize
+        }
+    }
+    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string) {
+        // 用于下载收到的消息中的图片等
+        if (fs.existsSync(sourcePath)) {
+            return sourcePath
+        }
+        const apiParams = [
+            {
+                getReq: {
+                    msgId: msgId,
+                    chatType: chatType,
+                    peerUid: peerUid,
+                    elementId: elementId,
+                    thumbSize: 0,
+                    downloadType: 1,
+                    filePath: thumbPath,
+                },
+            },
+            undefined,
+        ]
+        // log("需要下载media", sourcePath);
+        await callNTQQApi({
+            methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
+            args: apiParams,
+            cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+            cmdCB: (payload: { notifyInfo: { filePath: string } }) => {
+                // log("media 下载完成判断", payload.notifyInfo.filePath, sourcePath);
+                return payload.notifyInfo.filePath == sourcePath;
+            }
+        })
+        return sourcePath
+    }
+    static async getImageSize(filePath: string) {
+        return await callNTQQApi<{ width: number, height: number }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
+        })
+    }
+
+}
+
+export class NTQQFileCacheApi{
+    static async setCacheSilentScan(isSilent: boolean = true) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
+            args: [{
+                isSilent
+            }, null]
+        });
+    }
+    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 addCacheScannedPaths(pathMap: object = {}) {
+        return callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
+            args: [{
+                pathMap: {...pathMap},
+            }, null]
+        });
+    }
+    static scanCache() {
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmdS.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 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]
+        });
+    }
+
+}

src/ntqqapi/api/friend.ts

@@ -0,0 +1,61 @@
+import {Friend, FriendRequest} from "../types";
+import {ReceiveCmdS} from "../hook";
+import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
+import {friendRequests} from "../../common/data";
+
+export class NTQQFriendApi{
+    static async getFriends(forced = false) {
+        const data = await callNTQQApi<{
+            data: {
+                categoryId: number,
+                categroyName: string,
+                categroyMbCount: number,
+                buddyList: Friend[]
+            }[]
+        }>(
+            {
+                methodName: NTQQApiMethod.FRIENDS,
+                args: [{force_update: forced}, undefined],
+                cbCmd: ReceiveCmdS.FRIENDS
+            })
+        let _friends: Friend[] = [];
+        for (const fData of data.data) {
+            _friends.push(...fData.buddyList)
+        }
+        return _friends
+    }
+    static async likeFriend(uid: string, count = 1) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.LIKE_FRIEND,
+            args: [{
+                doLikeUserInfo: {
+                    friendUid: uid,
+                    sourceId: 71,
+                    doLikeCount: count,
+                    doLikeTollCount: 0
+                }
+            }, null]
+        })
+    }
+    static async handleFriendRequest(sourceId: number, accept: boolean,) {
+        const request: FriendRequest = friendRequests[sourceId]
+        if (!request) {
+            throw `sourceId ${sourceId}, 对应的好友请求不存在`
+        }
+        const result = await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
+            args: [
+                {
+                    "approvalInfo": {
+                        "friendUid": request.friendUid,
+                        "reqTime": request.reqTime,
+                        accept
+                    }
+                }
+            ]
+        })
+        delete friendRequests[sourceId];
+        return result;
+    }
+
+}

src/ntqqapi/api/group.ts

@@ -0,0 +1,223 @@
+import {ReceiveCmdS} from "../hook";
+import {Group, GroupMember, GroupMemberRole, GroupNotifies, GroupNotify, GroupRequestOperateTypes} from "../types";
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {uidMaps} from "../../common/data";
+import {log} from "../../common/utils";
+import {BrowserWindow} from "electron";
+import {dbUtil} from "../../common/db";
+
+export class NTQQGroupApi{
+    static async getGroups(forced = false) {
+        let cbCmd = ReceiveCmdS.GROUPS
+        if (process.platform != "win32") {
+            cbCmd = ReceiveCmdS.GROUPS_UNIX
+        }
+        const result = await callNTQQApi<{
+            updateType: number,
+            groupList: Group[]
+        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
+        return result.groupList
+    }
+    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
+        const sceneId = await callNTQQApi({
+            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
+            args: [{
+                groupCode: groupQQ,
+                scene: "groupMemberList_MainWindow"
+            }]
+        })
+        // log("get group member sceneId", sceneId);
+        try {
+            const result = await callNTQQApi<{
+                result: { infos: any }
+            }>({
+                methodName: NTQQApiMethod.GROUP_MEMBERS,
+                args: [{
+                    sceneId: sceneId,
+                    num: num
+                },
+                    null
+                ]
+            })
+            // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
+            const values = result.result.infos.values()
+
+            const members: GroupMember[] = Array.from(values)
+            for (const member of members) {
+                uidMaps[member.uid] = member.uin;
+            }
+            // log(uidMaps);
+            // log("members info", values);
+            log(`get group ${groupQQ} members success`)
+            return members
+        } catch (e) {
+            log(`get group ${groupQQ} members failed`, e)
+            return []
+        }
+    }
+    static async getGroupNotifies() {
+        // 获取管理员变更
+        // 加群通知，退出通知，需要管理员权限
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmdS.GROUP_NOTIFY,
+            classNameIsRegister: true,
+        }).then()
+        return await callNTQQApi<GroupNotifies>({
+            methodName: NTQQApiMethod.GET_GROUP_NOTICE,
+            cbCmd: ReceiveCmdS.GROUP_NOTIFY,
+            afterFirstCmd: false,
+            args: [
+                {"doubt": false, "startSeq": "", "number": 14},
+                null
+            ]
+        });
+    }
+    static async getGroupIgnoreNotifies() {
+        await NTQQGroupApi.getGroupNotifies();
+        const result = callNTQQApi<GroupNotifies>({
+            className: NTQQApiClass.WINDOW_API,
+            methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
+            cbCmd: ReceiveCmdS.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 = await dbUtil.getGroupNotify(seq)
+        if (!notify) {
+            throw `${seq}对应的加群通知不存在`
+        }
+        // delete groupNotifies[seq];
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
+            args: [
+                {
+                    "doubt": false,
+                    "operateMsg": {
+                        "operateType": operateType, // 2 拒绝
+                        "targetMsg": {
+                            "seq": seq,  // 通知序列号
+                            "type": notify.type,
+                            "groupCode": notify.group.groupCode,
+                            "postscript": reason
+                        }
+                    }
+                },
+                null
+            ]
+        });
+    }
+    static async quitGroup(groupQQ: string) {
+        await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.QUIT_GROUP,
+            args: [
+                {"groupCode": groupQQ},
+                null
+            ]
+        })
+    }
+    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.KICK_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        kickUids,
+                        refuseForever,
+                        kickReason,
+                    }
+                ]
+            }
+        )
+    }
+    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
+        // timeStamp为秒数, 0为解除禁言
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.MUTE_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        memList,
+                    }
+                ]
+            }
+        )
+    }
+    static async banGroup(groupQQ: string, shutUp: boolean) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.MUTE_GROUP,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    shutUp
+                }, null
+            ]
+        })
+    }
+    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_CARD,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    cardName
+                }, null
+            ]
+        })
+    }
+    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_ROLE,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    role
+                }, null
+            ]
+        })
+    }
+    static async setGroupName(groupQQ: string, groupName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_GROUP_NAME,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    groupName
+                }, null
+            ]
+        })
+    }
+
+    // 头衔不可用
+    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) {
+
+    }
+}

src/ntqqapi/api/msg.ts

@@ -0,0 +1,187 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
+import {ChatType, RawMessage, SendMessageElement} from "../types";
+import {log, sleep} from "../../common/utils";
+import {dbUtil} from "../../common/db";
+import {selfInfo} from "../../common/data";
+import {ReceiveCmdS, registerReceiveHook} from "../hook";
+
+export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
+
+export interface Peer {
+    chatType: ChatType
+    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
+    guildId?: ""
+}
+
+export class NTQQMsgApi {
+    static async activateGroupChat(groupCode: string) {
+        // await this.fetchRecentContact();
+        // await sleep(500);
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.ADD_ACTIVE_CHAT,
+            args: [{peer:{peerUid: groupCode, chatType: ChatType.group}, cnt: 20}]
+        })
+    }
+    static async fetchRecentContact(){
+        await callNTQQApi({
+            methodName: NTQQApiMethod.RECENT_CONTACT,
+            args: [
+                {
+                    fetchParam: {
+                        anchorPointContact: {
+                            contactId: '',
+                            sortField: '',
+                            pos: 0,
+                        },
+                        relativeMoveCount: 0,
+                        listType: 2,  // 1普通消息，2群助手内的消息
+                        count: 200,
+                        fetchOld: true,
+                    },
+                }
+            ]
+        })
+    }
+
+    static async recallMsg(peer: Peer, msgIds: string[]) {
+        return await callNTQQApi({
+            methodName: NTQQApiMethod.RECALL_MSG,
+            args: [{
+                peer,
+                msgIds
+            }, null]
+        })
+    }
+
+    static async sendMsg(peer: Peer, msgElements: SendMessageElement[],
+                         waitComplete = true, timeout = 10000) {
+        const peerUid = peer.peerUid
+
+        // 等待上一个相同的peer发送完
+        let checkLastSendUsingTime = 0;
+        const waitLastSend = async () => {
+            if (checkLastSendUsingTime > timeout) {
+                throw ("发送超时")
+            }
+            let lastSending = sendMessagePool[peer.peerUid]
+            if (lastSending) {
+                // log("有正在发送的消息，等待中...")
+                await sleep(500);
+                checkLastSendUsingTime += 500;
+                return await waitLastSend();
+            } else {
+                return;
+            }
+        }
+        await waitLastSend();
+
+        let sentMessage: RawMessage = null;
+        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
+            delete sendMessagePool[peerUid];
+            sentMessage = rawMessage;
+        }
+
+        let checkSendCompleteUsingTime = 0;
+        const checkSendComplete = async (): Promise<RawMessage> => {
+            if (sentMessage) {
+                if (waitComplete) {
+                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
+                        return sentMessage
+                    }
+                } else {
+                    return sentMessage
+                }
+                // log(`给${peerUid}发送消息成功`)
+            }
+            checkSendCompleteUsingTime += 500
+            if (checkSendCompleteUsingTime > timeout) {
+                throw ('发送超时')
+            }
+            await sleep(500)
+            return await checkSendComplete()
+        }
+
+        callNTQQApi({
+            methodName: NTQQApiMethod.SEND_MSG,
+            args: [{
+                msgId: "0",
+                peer, msgElements,
+                msgAttributeInfos: new Map(),
+            }, null]
+        }).then()
+        return await checkSendComplete()
+    }
+
+    static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.FORWARD_MSG,
+            args: [
+                {
+                    msgIds: msgIds,
+                    srcContact: srcPeer,
+                    dstContacts: [
+                        destPeer
+                    ],
+                    commentElements: [],
+                    msgAttributeInfos: new Map()
+                },
+                null,
+            ]
+        })
+    }
+
+    static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+        const msgInfos = msgIds.map(id => {
+            return {msgId: id, senderShowName: selfInfo.nick}
+        })
+        const apiArgs = [
+            {
+                msgInfos,
+                srcContact: srcPeer,
+                dstContact: destPeer,
+                commentElements: [],
+                msgAttributeInfos: new Map()
+            },
+            null,
+        ]
+        return await new Promise<RawMessage>((resolve, reject) => {
+            let complete = false
+            setTimeout(() => {
+                if (!complete) {
+                    reject("转发消息超时");
+                }
+            }, 5000)
+            registerReceiveHook(ReceiveCmdS.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
+                const msg = payload.msgRecord
+                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
+                const arkElement = msg.elements.find(ele => ele.arkElement)
+                if (!arkElement) {
+                    // log("收到的不是转发消息")
+                    return
+                }
+                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
+                if (forwardData.app != 'com.tencent.multimsg') {
+                    return
+                }
+                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
+                    complete = true
+                    await dbUtil.addMsg(msg)
+                    resolve(msg)
+                    log('转发消息成功：', payload)
+                }
+            })
+            callNTQQApi<GeneralCallResult>({
+                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
+                args: apiArgs
+            }).then(result => {
+                log("转发消息结果:", result, apiArgs)
+                if (result.result !== 0) {
+                    complete = true;
+                    reject("转发消息失败," + JSON.stringify(result));
+                }
+            })
+        })
+    }
+
+
+}

src/ntqqapi/api/user.ts

@@ -0,0 +1,57 @@
+import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import {SelfInfo, User} from "../types";
+import {ReceiveCmdS} from "../hook";
+import {uidMaps} from "../../common/data";
+
+
+export class NTQQUserApi{
+    static async setQQAvatar(filePath: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_QQ_AVATAR,
+            args: [{
+                path:filePath
+            }, null],
+            timeoutSecond: 10 // 10秒不一定够
+        });
+    }
+
+    static async getSelfInfo() {
+        return await callNTQQApi<SelfInfo>({
+            className: NTQQApiClass.GLOBAL_DATA,
+            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
+        })
+    }
+    static async getUserInfo(uid: string) {
+        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
+            methodName: NTQQApiMethod.USER_INFO,
+            args: [{force: true, uids: [uid]}, undefined],
+            cbCmd: ReceiveCmdS.USER_INFO
+        })
+        return result.profiles.get(uid)
+    }
+    static async getUserDetailInfo(uid: string) {
+        const result = await callNTQQApi<{ info: User }>({
+            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+            cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
+            afterFirstCmd: false,
+            cmdCB: (payload) => {
+                const success = payload.info.uid == uid
+                // log("get user detail info", success, uid, payload)
+                return success
+            },
+            args: [
+                {
+                    uid
+                },
+                null
+            ]
+        })
+        const info = result.info
+        if (info?.uin) {
+            uidMaps[info.uid] = info.uin
+        }
+        return info
+    }
+
+
+}

src/ntqqapi/constructor.ts

@@ -1,15 +1,20 @@
 import {
     AtType,
     ElementType,
+    PicType,
+    SendArkElement,
     SendFaceElement,
+    SendFileElement,
     SendPicElement,
     SendPttElement,
     SendReplyElement,
-    SendTextElement
+    SendTextElement,
+    SendVideoElement
 } from "./types";
-import {NTQQApi} from "./ntcall";
-import {encodeSilk, log} from "../common/utils";
-import fs from "fs";
+import {calculateFileMD5, encodeSilk, getVideoInfo, isGIF, log, sleep} from "../common/utils";
+import {promises as fs} from "node:fs";
+import ffmpeg from "fluent-ffmpeg"
+import {NTQQFileApi} from "./api/file";
 
 
 export class SendMsgElementConstructor {
@@ -54,9 +59,12 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath);
-        const imageSize = await NTQQApi.getImageSize(picPath);
+    static async pic(picPath: string, summary: string = ""): Promise<SendPicElement> {
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC);
+        if (fileSize === 0) {
+            throw "文件异常，大小为0";
+        }
+        const imageSize = await NTQQFileApi.getImageSize(picPath);
         const picElement = {
             md5HexStr: md5,
             fileSize: fileSize,
@@ -65,12 +73,12 @@ export class SendMsgElementConstructor {
             fileName: fileName,
             sourcePath: path,
             original: true,
-            picType: 1001,
+            picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
             picSubType: 0,
             fileUuid: "",
             fileSubId: "",
             thumbFileSize: 0,
-            summary: "",
+            summary,
         };
 
         return {
@@ -80,12 +88,101 @@ export class SendMsgElementConstructor {
         };
     }
 
+    static async file(filePath: string, fileName: string = ""): Promise<SendFileElement> {
+        const {md5, fileName: _fileName, path, fileSize} = await NTQQFileApi.uploadFile(filePath, ElementType.FILE);
+        if (fileSize === 0) {
+            throw "文件异常，大小为0";
+        }
+        let element: SendFileElement = {
+            elementType: ElementType.FILE,
+            elementId: "",
+            fileElement: {
+                fileName: fileName || _fileName,
+                "filePath": path,
+                "fileSize": (fileSize).toString(),
+            }
+        }
+
+        return element;
+    }
+
+    static async video(filePath: string, fileName: string = ""): Promise<SendVideoElement> {
+        let {fileName: _fileName, path, fileSize, md5} = await NTQQFileApi.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);
-        if (converted){
-            fs.unlink(silkPath, ()=>{});
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT);
+        if (fileSize === 0) {
+            throw "文件异常，大小为0";
+        }
+        if (converted) {
+            fs.unlink(silkPath).then();
         }
         return {
             elementType: ElementType.PTT,
@@ -121,4 +218,12 @@ export class SendMsgElementConstructor {
             }
         }
     }
+
+    static ark(data: any): SendArkElement {
+        return {
+            elementType: ElementType.ARK,
+            elementId: "",
+            arkElement: data
+        }
+    }
 }

src/ntqqapi/external/ccpoke/index.ts

@@ -0,0 +1,28 @@
+import {log} from "../../../common/utils";
+
+let pokeEngine: any = null
+
+type PokeHandler = (id: string, isGroup: boolean)=>void
+
+let pokeRecords: Record<string, number> = {}
+export function registerPokeHandler(handler: PokeHandler){
+    if(!pokeEngine){
+        try {
+            pokeEngine = require("./ccpoke/poke-win32-x64.node")
+            pokeEngine.performHooks();
+        }catch (e) {
+            log("戳一戳引擎加载失败", e)
+            return
+        }
+    }
+    pokeEngine.setHandlerForPokeHook((id: string, isGroup: boolean)=>{
+        let existTime = pokeRecords[id]
+        if (existTime){
+            if (Date.now() - existTime < 1500){
+                return
+            }
+        }
+        pokeRecords[id] = Date.now()
+        handler(id, isGroup);
+    })
+}

src/ntqqapi/hook.ts

@@ -1,25 +1,41 @@
 import {BrowserWindow} from 'electron';
-import {log, sleep} from "../common/utils";
-import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
-import {Group, RawMessage, User} from "./types";
-import {addHistoryMsg, friends, groups, msgHistory} from "../common/data";
+import {getConfigUtil, log, sleep} from "../common/utils";
+import {NTQQApiClass} from "./ntcall";
+import {NTQQMsgApi, sendMessagePool} from "./api/msg"
+import {ChatType, Group, RawMessage, User} from "./types";
+import {friends, groups, selfInfo, tempGroupCodeMap} from "../common/data";
 import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
-import {OB11GroupIncreaseEvent} from "../onebot11/event/notice/OB11GroupIncreaseEvent";
 import {v4 as uuidv4} from "uuid"
-import {postEvent} from "../onebot11/server/postevent";
+import {postOB11Event} from "../onebot11/server/postOB11Event";
+import {HOOK_LOG} from "../common/config";
+import fs from "fs";
+import {dbUtil} from "../common/db";
+import {NTQQGroupApi} from "./api/group";
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
-export enum ReceiveCmd {
-    UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    NEW_MSG = "nodeIKernelMsgListener/onRecvMsg",
-    SELF_SEND_MSG = "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO = "nodeIKernelProfileListener/onProfileSimpleChanged",
-    GROUPS = "nodeIKernelGroupListener/onGroupListUpdate",
-    GROUPS_UNIX = "onGroupListUpdate",
-    FRIENDS = "onBuddyListChange"
+export let ReceiveCmdS = {
+    UPDATE_MSG: "nodeIKernelMsgListener/onMsgInfoListUpdate",
+    UPDATE_ACTIVE_MSG: "nodeIKernelMsgListener/onActiveMsgInfoUpdate",
+    NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
+    NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
+    SELF_SEND_MSG: "nodeIKernelMsgListener/onAddSendMsg",
+    USER_INFO: "nodeIKernelProfileListener/onProfileSimpleChanged",
+    USER_DETAIL_INFO: "nodeIKernelProfileListener/onProfileDetailInfoChanged",
+    GROUPS: "nodeIKernelGroupListener/onGroupListUpdate",
+    GROUPS_UNIX: "onGroupListUpdate",
+    FRIENDS: "onBuddyListChange",
+    MEDIA_DOWNLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaDownloadComplete",
+    UNREAD_GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
+    GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
+    FRIEND_REQUEST: "nodeIKernelBuddyListener/onBuddyReqChange",
+    SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
+    CACHE_SCAN_FINISH: "nodeIKernelStorageCleanListener/onFinishScan",
+    MEDIA_UPLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaUploadComplete",
 }
 
+export type ReceiveCmd = typeof ReceiveCmdS[keyof typeof ReceiveCmdS]
+
 interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
     0: {
         "type": "request",
@@ -35,7 +51,7 @@ interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
 }
 
 let receiveHooks: Array<{
-    method: ReceiveCmd,
+    method: ReceiveCmd[],
     hookFunc: ((payload: any) => void | Promise<void>)
     id: string
 }> = []
@@ -43,13 +59,19 @@ let receiveHooks: Array<{
 export function hookNTQQApiReceive(window: BrowserWindow) {
     const originalSend = window.webContents.send;
     const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-        // log(`received ntqq api message: ${channel}`, JSON.stringify(args))
+        try {
+            if (!args[0]?.eventName?.startsWith("ns-LoggerApi")) {
+                HOOK_LOG && log(`received ntqq api message: ${channel}`, JSON.stringify(args))
+            }
+        } catch (e) {
+
+        }
         if (args?.[1] instanceof Array) {
             for (let receiveData of args?.[1]) {
                 const ntQQApiMethodName = receiveData.cmdName;
                 // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
                 for (let hook of receiveHooks) {
-                    if (hook.method === ntQQApiMethodName) {
+                    if (hook.method.includes(ntQQApiMethodName)) {
                         new Promise((resolve, reject) => {
                             try {
                                 let _ = hook.hookFunc(receiveData.payload)
@@ -87,19 +109,28 @@ export function hookNTQQApiCall(window: BrowserWindow) {
 
     const proxyIpcMsg = new Proxy(ipc_message_proxy, {
         apply(target, thisArg, args) {
-            log("call NTQQ api", thisArg, args);
+            try {
+                if (args[3][1][0] !== "info") {
+                    HOOK_LOG && log("call NTQQ api", thisArg, args);
+                }
+            } catch (e) {
+
+            }
             return target.apply(thisArg, args);
         },
     });
-    // if (webContents._events["-ipc-message"]?.[0]) {
-    //     webContents._events["-ipc-message"][0] = proxyIpcMsg;
-    // } else {
-    //     webContents._events["-ipc-message"] = proxyIpcMsg;
-    // }
+    if (webContents._events["-ipc-message"]?.[0]) {
+        webContents._events["-ipc-message"][0] = proxyIpcMsg;
+    } else {
+        webContents._events["-ipc-message"] = proxyIpcMsg;
+    }
 }
 
-export function registerReceiveHook<PayloadType>(method: ReceiveCmd, hookFunc: (payload: PayloadType) => void): string {
+export function registerReceiveHook<PayloadType>(method: ReceiveCmd | ReceiveCmd[], hookFunc: (payload: PayloadType) => void): string {
     const id = uuidv4()
+    if (!Array.isArray(method)) {
+        method = [method]
+    }
     receiveHooks.push({
         method,
         hookFunc,
@@ -113,19 +144,30 @@ export function removeReceiveHook(id: string) {
     receiveHooks.splice(index, 1);
 }
 
+let activatedGroups: string[] = [];
 async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
     for (let group of _groups) {
+        // log("update group", group)
+        if (!activatedGroups.includes(group.groupCode)) {
+            NTQQMsgApi.activateGroupChat(group.groupCode).then((r) => {
+                activatedGroups.push(group.groupCode);
+                // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
+                // if (r.result !== 0) {
+                //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
+                // }else {
+                // }
+            }).catch(log)
+        }
         let existGroup = groups.find(g => g.groupCode == group.groupCode);
         if (existGroup) {
             Object.assign(existGroup, group);
-        }
-        else {
+        } else {
             groups.push(group);
             existGroup = group;
         }
 
         if (needUpdate) {
-            const members = await NTQQApi.getGroupMembers(group.groupCode);
+            const members = await NTQQGroupApi.getGroupMembers(group.groupCode);
 
             if (members) {
                 existGroup.members = members;
@@ -144,7 +186,7 @@ async function processGroupEvent(payload) {
                     const oldMembers = existGroup.members;
 
                     await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-                    const newMembers = await NTQQApi.getGroupMembers(group.groupCode);
+                    const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode);
 
                     group.members = newMembers;
                     const newMembersSet = new Set<string>();  // 建立索引降低时间复杂度
@@ -155,26 +197,7 @@ async function processGroupEvent(payload) {
 
                     for (const member of oldMembers) {
                         if (!newMembersSet.has(member.uin)) {
-                            postEvent(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
-                            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)) {
-                            postEvent(new OB11GroupIncreaseEvent(group.groupCode, parseInt(member.uin)));
+                            postOB11Event(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
                             break;
                         }
                     }
@@ -183,36 +206,36 @@ async function processGroupEvent(payload) {
         }
 
         updateGroups(newGroupList, false).then();
-    }
-    catch (e) {
+    } catch (e) {
         updateGroups(payload.groupList).then();
         console.log(e);
     }
 }
 
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS, (payload) => {
+// 群列表变动
+registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
     if (payload.updateType != 2) {
         updateGroups(payload.groupList).then();
-    }
-    else {
+    } else {
         if (process.platform == "win32") {
             processGroupEvent(payload).then();
         }
     }
 })
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmd.GROUPS_UNIX, (payload) => {
+registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS_UNIX, (payload) => {
     if (payload.updateType != 2) {
         updateGroups(payload.groupList).then();
-    }
-    else {
+    } else {
         if (process.platform != "win32") {
             processGroupEvent(payload).then();
         }
     }
 })
+
+// 好友列表变动
 registerReceiveHook<{
     data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
-}>(ReceiveCmd.FRIENDS, payload => {
+}>(ReceiveCmdS.FRIENDS, payload => {
     for (const fData of payload.data) {
         const _friends = fData.buddyList;
         for (let friend of _friends) {
@@ -226,22 +249,54 @@ registerReceiveHook<{
     }
 })
 
-registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
-    for (const message of payload.msgList) {
-        // log("收到新消息，push到历史记录", message)
-        addHistoryMsg(message)
+// 新消息
+registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    const {autoDeleteFile} = getConfigUtil().getConfig();
+    if (!autoDeleteFile) {
+        return
     }
-    const msgIds = Object.keys(msgHistory);
-    if (msgIds.length > 30000) {
-        delete msgHistory[msgIds.sort()[0]]
+    for (const message of payload.msgList) {
+        // log("收到新消息，push到历史记录", message.msgId)
+        // dbUtil.addMsg(message).then()
+        // 清理文件
+
+        for (const msgElement of message.elements) {
+            setTimeout(() => {
+                const picPath = msgElement.picElement?.sourcePath
+                const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
+                const pttPath = msgElement.pttElement?.filePath
+                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))
+                }
+                const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
+                if (aioOpGrayTipElement) {
+                    tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat;
+                }
+
+                // log("需要清理的文件", pathList);
+                for (const path of pathList) {
+                    if (path) {
+                        fs.unlink(picPath, () => {
+                            log("删除文件成功", path)
+                        });
+                    }
+                }
+            }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
+        }
     }
 })
 
-registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
+registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({msgRecord}) => {
     const message = msgRecord;
     const peerUid = message.peerUid;
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
-    const sendCallback = sendMessagePool[peerUid];
+    // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
+    dbUtil.addMsg(message).then()
+    const sendCallback = sendMessagePool[peerUid]
     if (sendCallback) {
         try {
             sendCallback(message);
@@ -250,3 +305,7 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRe
         }
     }
 })
+
+registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
+    selfInfo.online = info.info.status !== 20
+})

src/ntqqapi/ntcall.ts

@@ -1,30 +1,23 @@
 import {ipcMain} from "electron";
 import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook";
 import {log} from "../common/utils";
-import {ChatType, Friend, Group, GroupMember, RawMessage, SelfInfo, SendMessageElement, User} from "./types";
-import * as fs from "fs";
-import {addHistoryMsg, msgHistory, selfInfo, uidMaps} from "../common/data";
+
 import {v4 as uuidv4} from "uuid"
 
-interface IPCReceiveEvent {
-    eventName: string
-    callbackId: string
-}
-
-export type IPCReceiveDetail = [
-    {
-        cmdName: NTQQApiMethod
-        payload: unknown
-    },
-]
-
 export enum NTQQApiClass {
     NT_API = "ns-ntApi",
     FS_API = "ns-FsApi",
+    OS_API = "ns-OsApi",
+    WINDOW_API = "ns-WindowApi",
+    HOTUPDATE_API = "ns-HotUpdateApi",
+    BUSINESS_API = "ns-BusinessApi",
     GLOBAL_DATA = "ns-GlobalDataApi"
 }
 
 export enum NTQQApiMethod {
+    RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
+    ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
+    ADD_ACTIVE_CHAT_2 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
     LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
     SELF_INFO = "fetchAuthData",
     FRIENDS = "nodeIKernelBuddyService/getBuddyList",
@@ -32,6 +25,7 @@ export enum NTQQApiMethod {
     GROUP_MEMBER_SCENE = "nodeIKernelGroupService/createMemberListScene",
     GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
     USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
+    USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
     FILE_TYPE = "getFileType",
     FILE_MD5 = "getFileMd5",
     FILE_COPY = "copyFile",
@@ -41,7 +35,37 @@ export enum NTQQApiMethod {
     RECALL_MSG = "nodeIKernelMsgService/recallMsg",
     SEND_MSG = "nodeIKernelMsgService/sendMsg",
     DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia",
-    MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment" // 合并转发
+    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",
+    MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment", // 合并转发
+    GET_GROUP_NOTICE = "nodeIKernelGroupService/getSingleScreenNotifies",
+    HANDLE_GROUP_REQUEST = "nodeIKernelGroupService/operateSysNotify",
+    QUIT_GROUP = "nodeIKernelGroupService/quitGroup",
+    // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
+    HANDLE_FRIEND_REQUEST = "nodeIKernelBuddyService/approvalFriendRequest",
+    KICK_MEMBER = "nodeIKernelGroupService/kickMember",
+    MUTE_MEMBER = "nodeIKernelGroupService/setMemberShutUp",
+    MUTE_GROUP = "nodeIKernelGroupService/setGroupShutUp",
+    SET_MEMBER_CARD = "nodeIKernelGroupService/modifyMemberCardName",
+    SET_MEMBER_ROLE = "nodeIKernelGroupService/modifyMemberRole",
+    PUBLISH_GROUP_BULLETIN = "nodeIKernelGroupService/publishGroupBulletinBulletin",
+    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 {
@@ -50,41 +74,40 @@ enum NTQQApiChannel {
     IPC_UP_1 = "IPC_UP_1",
 }
 
-export interface Peer {
-    chatType: ChatType
-    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ""
-}
-
-enum CallBackType {
-    UUID,
-    METHOD
-}
-
 interface NTQQApiParams {
-    methodName: NTQQApiMethod,
+    methodName: NTQQApiMethod | string,
     className?: NTQQApiClass,
     channel?: NTQQApiChannel,
+    classNameIsRegister?: boolean
     args?: unknown[],
-    cbCmd?: ReceiveCmd | null
+    cbCmd?: ReceiveCmd | null,
+    cmdCB?: (payload: any) => boolean;
+    afterFirstCmd?: boolean,  // 是否在methodName调用完之后再去hook cbCmd
     timeoutSecond?: number,
 }
 
-function callNTQQApi<ReturnType>(params: NTQQApiParams) {
+export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
     let {
         className, methodName, channel, args,
-        cbCmd, timeoutSecond: timeout
+        cbCmd, timeoutSecond: timeout,
+        classNameIsRegister, cmdCB, afterFirstCmd
     } = params;
     className = className ?? NTQQApiClass.NT_API;
     channel = channel ?? NTQQApiChannel.IPC_UP_2;
     args = args ?? [];
     timeout = timeout ?? 5;
+    afterFirstCmd = afterFirstCmd ?? true;
     const uuid = uuidv4();
     // log("callNTQQApi", channel, className, methodName, args, uuid)
     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];
+        if (classNameIsRegister) {
+            eventName += "-register";
+        }
+        const apiArgs = [methodName, ...args]
         if (!cbCmd) {
             // QQ后端会返回结果，并且可以插根据uuid识别
             hookApiCallbacks[uuid] = (r: ReturnType) => {
@@ -93,15 +116,27 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
             };
         } else {
             // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
-            hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
-                log(`${methodName} callback`, result)
-                if (result.result == 0) {
-                    const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
-                        log(methodName, "second callback", cbCmd, payload);
+            const secondCallback = () => {
+                const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
+                    // log(methodName, "second callback", cbCmd, payload, cmdCB);
+                    if (!!cmdCB) {
+                        if (cmdCB(payload)) {
+                            removeReceiveHook(hookId);
+                            success = true
+                            resolve(payload);
+                        }
+                    } else {
                         removeReceiveHook(hookId);
                         success = true
                         resolve(payload);
-                    })
+                    }
+                })
+            }
+            !afterFirstCmd && secondCallback();
+            hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
+                log(`${methodName} callback`, result)
+                if (result?.result == 0 || result === undefined) {
+                    afterFirstCmd && secondCallback();
                 } else {
                     success = true
                     reject(`ntqq api call failed, ${result.errMsg}`);
@@ -111,12 +146,11 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         setTimeout(() => {
             // log("ntqq api timeout", success, channel, className, methodName)
             if (!success) {
-                log(`ntqq api timeout ${channel}, ${className}, ${methodName}`)
-                reject(`ntqq api timeout ${channel}, ${className}, ${methodName}`)
+                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs);
+                reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
             }
         }, _timeout)
-        const eventName = className + "-" + channel[channel.length - 1];
-        const apiArgs = [methodName, ...args]
+
         ipcMain.emit(
             channel,
             {},
@@ -127,335 +161,21 @@ function callNTQQApi<ReturnType>(params: NTQQApiParams) {
 }
 
 
-export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
-
-interface GeneralCallResult {
+export interface GeneralCallResult {
     result: number,  // 0: success
     errMsg: string
 }
 
 
 export class NTQQApi {
-    // static likeFriend = defineNTQQApi<void>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.LIKE_FRIEND)
-    static likeFriend(uid: string, count = 1) {
-        return callNTQQApi({
-            methodName: NTQQApiMethod.LIKE_FRIEND,
-            args: [{
-                doLikeUserInfo: {
-                    friendUid: uid,
-                    sourceId: 71,
-                    doLikeCount: count,
-                    doLikeTollCount: 0
-                }
-            }, null]
+    static async call(className: NTQQApiClass, cmdName: string, args: any[],) {
+        return await callNTQQApi<GeneralCallResult>({
+            className,
+            methodName: cmdName,
+            args: [
+                ...args,
+            ]
         })
     }
 
-    static getSelfInfo() {
-        return callNTQQApi<SelfInfo>({
-            className: NTQQApiClass.GLOBAL_DATA,
-            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
-        })
-    }
-
-    static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
-            methodName: NTQQApiMethod.USER_INFO,
-            args: [{force: true, uids: [uid]}, undefined],
-            cbCmd: ReceiveCmd.USER_INFO
-        })
-        return result.profiles.get(uid)
-    }
-
-    static async getFriends(forced = false) {
-        const data = await callNTQQApi<{
-            data: {
-                categoryId: number,
-                categroyName: string,
-                categroyMbCount: number,
-                buddyList: Friend[]
-            }[]
-        }>(
-            {
-                methodName: NTQQApiMethod.FRIENDS,
-                args: [{force_update: forced}, undefined],
-                cbCmd: ReceiveCmd.FRIENDS
-            })
-        let _friends: Friend[] = [];
-        for (const fData of data.data) {
-            _friends.push(...fData.buddyList)
-        }
-        return _friends
-    }
-
-    static async getGroups(forced = false) {
-        let cbCmd = ReceiveCmd.GROUPS
-        if (process.platform != "win32") {
-            cbCmd = ReceiveCmd.GROUPS_UNIX
-        }
-        const result = await callNTQQApi<{
-            updateType: number,
-            groupList: Group[]
-        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
-        return result.groupList
-    }
-
-    static async getGroupMembers(groupQQ: string, num = 3000) {
-        const sceneId = await callNTQQApi({
-            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
-            args: [{
-                groupCode: groupQQ,
-                scene: "groupMemberList_MainWindow"
-            }]
-        })
-        // log("get group member sceneId", sceneId);
-        try {
-            const result = await callNTQQApi<{
-                result: { infos: any }
-            }>({
-                methodName: NTQQApiMethod.GROUP_MEMBERS,
-                args: [{
-                    sceneId: sceneId,
-                    num: num
-                },
-                    null
-                ]
-            })
-            // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
-            let values = result.result.infos.values()
-
-            let members = Array.from(values) as GroupMember[]
-            for(const member of members){
-                // uidMaps[member.uid] = member.uin;
-            }
-            // log(uidMaps);
-            // log("members info", values);
-            return members
-        } catch (e) {
-            log(`get group ${groupQQ} members failed`, e)
-            return []
-        }
-    }
-
-
-    static getFileType(filePath: string) {
-        return callNTQQApi<{ ext: string }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
-        })
-    }
-
-    static getFileMd5(filePath: string) {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.FS_API,
-            methodName: NTQQApiMethod.FILE_MD5,
-            args: [filePath]
-        })
-    }
-
-    static copyFile(filePath: string, destPath: string) {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_COPY, args: [{
-                fromPath: filePath,
-                toPath: destPath
-            }]
-        })
-    }
-
-    static getImageSize(filePath: string) {
-        return callNTQQApi<{ width: number, height: number }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
-        })
-    }
-
-    static getFileSize(filePath: string) {
-        return callNTQQApi<number>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
-        })
-    }
-
-    // 上传文件到QQ的文件夹
-    static async uploadFile(filePath: string) {
-        const md5 = await NTQQApi.getFileMd5(filePath);
-        let ext = (await NTQQApi.getFileType(filePath))?.ext
-        if (ext) {
-            ext = "." + ext
-        } else {
-            ext = ""
-        }
-        const fileName = `${md5}${ext}`;
-        const mediaPath = await callNTQQApi<string>({
-            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
-            args: [{
-                path_info: {
-                    md5HexStr: md5,
-                    fileName: fileName,
-                    elementType: 2,
-                    elementSubType: 0,
-                    thumbSize: 0,
-                    needCreate: true,
-                    downloadType: 1,
-                    file_uuid: ""
-                }
-            }]
-        })
-        log("media path", mediaPath)
-        await NTQQApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQApi.getFileSize(filePath);
-        return {
-            md5,
-            fileName,
-            path: mediaPath,
-            fileSize
-        }
-    }
-
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string) {
-        // 用于下载收到的消息中的图片等
-        if (fs.existsSync(sourcePath)) {
-            return sourcePath
-        }
-        const apiParams = [
-            {
-                getReq: {
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
-                    thumbSize: 0,
-                    downloadType: 1,
-                    filePath: thumbPath,
-                },
-            },
-            undefined,
-        ]
-        await callNTQQApi({methodName: NTQQApiMethod.DOWNLOAD_MEDIA, args: apiParams})
-        return sourcePath
-    }
-
-    static recallMsg(peer: Peer, msgIds: string[]) {
-        return callNTQQApi({
-            methodName: NTQQApiMethod.RECALL_MSG, args: [{
-                peer,
-                msgIds
-            }, null]
-        })
-    }
-
-    static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = false, timeout=10000) {
-        const sendTimeout = timeout
-
-        return new Promise<RawMessage>((resolve, reject) => {
-            const peerUid = peer.peerUid;
-            let usingTime = 0;
-            let success = false;
-            let isTimeout = false;
-
-            const checkSuccess = () => {
-                if (!success) {
-                    sendMessagePool[peerUid] = null;
-                    isTimeout = true;
-                    reject("发送超时")
-                }
-            }
-            setTimeout(checkSuccess, sendTimeout);
-
-            const checkLastSend = () => {
-                let lastSending = sendMessagePool[peerUid]
-                if (sendTimeout < usingTime) {
-                    sendMessagePool[peerUid] = null;
-                    isTimeout = true;
-                    reject("发送超时")
-                }
-                if (!!lastSending) {
-                    // log("有正在发送的消息，等待中...")
-                    usingTime += 500;
-                    setTimeout(checkLastSend, 500);
-                } else {
-                    log("可以进行发送消息，设置发送成功回调", sendMessagePool)
-                    sendMessagePool[peerUid] = (rawMessage: RawMessage) => {
-                        sendMessagePool[peerUid] = null;
-                        const checkSendComplete = () => {
-                            if (isTimeout) {
-                                return reject("发送超时")
-                            }
-                            if (msgHistory[rawMessage.msgId]?.sendStatus == 2) {
-                                success = true;
-                                resolve(rawMessage);
-                            } else {
-                                setTimeout(checkSendComplete, 500)
-                            }
-                        }
-                        if (waitComplete) {
-                            checkSendComplete();
-                        } else {
-                            success = true;
-                            resolve(rawMessage);
-                        }
-                    }
-                }
-            }
-            checkLastSend()
-            callNTQQApi({
-                methodName: NTQQApiMethod.SEND_MSG,
-                args: [{
-                    msgId: "0",
-                    peer, msgElements,
-                    msgAttributeInfos: new Map(),
-                }, null]
-            }).then()
-        })
-    }
-
-    static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        let msgInfos = msgIds.map(id => {
-            return {msgId: id, senderShowName: "LLOneBot"}
-        })
-        const apiArgs = [
-            {
-                msgInfos,
-                srcContact: srcPeer,
-                dstContact: destPeer,
-                commentElements: [],
-                msgAttributeInfos: new Map()
-            },
-            null,
-        ]
-        return new Promise<RawMessage>((resolve, reject) => {
-            let complete = false
-            setTimeout(() => {
-                if (!complete) {
-                    reject("转发消息超时");
-                }
-            }, 5000)
-            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, (payload: { msgRecord: RawMessage }) => {
-                const msg = payload.msgRecord;
-                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
-                const arkElement = msg.elements.find(ele => ele.arkElement)
-                if (!arkElement) {
-                    // log("收到的不是转发消息")
-                    return
-                }
-                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData);
-                if (forwardData.app != "com.tencent.multimsg") {
-                    return
-                }
-                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
-                    complete = true;
-                    addHistoryMsg(msg)
-                    resolve(msg);
-                    log("转发消息成功：", payload)
-                }
-            })
-            callNTQQApi<GeneralCallResult>({
-                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
-                args: apiArgs
-            }).then(result => {
-                log("转发消息结果:", result, apiArgs)
-                if (result.result !== 0) {
-                    complete = true;
-                    reject("转发消息失败," + JSON.stringify(result));
-                }
-            })
-        })
-    }
 }

src/ntqqapi/types/cache.ts

@@ -0,0 +1,65 @@
+import {ChatType} from "./msg";
+
+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/ntqqapi/types/group.ts

@@ -0,0 +1,55 @@
+import {QQLevel, Sex} from "./user";
+
+export interface Group {
+    groupCode: string,
+    maxMember: number,
+    memberCount: number,
+    groupName: string,
+    groupStatus: 0,
+    memberRole: 2,
+    isTop: boolean,
+    toppedTimestamp: "0",
+    privilegeFlag: number, //65760
+    isConf: boolean,
+    hasModifyConfGroupFace: boolean,
+    hasModifyConfGroupName: boolean,
+    remarkName: string,
+    hasMemo: boolean,
+    groupShutupExpireTime: string, //"0",
+    personShutupExpireTime: string, //"0",
+    discussToGroupUin: string, //"0",
+    discussToGroupMaxMsgSeq: number,
+    discussToGroupTime: number,
+    groupFlagExt: number, //1073938496,
+    authGroupType: number, //0,
+    groupCreditLevel: number, //0,
+    groupFlagExt3: number, //0,
+    groupOwnerId: {
+        "memberUin": string, //"0",
+        "memberUid": string, //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
+    },
+    members: GroupMember[]  // 原始数据是没有这个的，为了方便自己加了这个字段
+}
+
+export enum GroupMemberRole {
+    normal = 2,
+    admin = 3,
+    owner = 4
+}
+
+export interface GroupMember {
+    avatarPath: string;
+    cardName: string;
+    cardType: number;
+    isDelete: boolean;
+    nick: string;
+    qid: string;
+    remark: string;
+    role: GroupMemberRole; // 群主:4, 管理员:3，群员:2
+    shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
+    uid: string; // 加密的字符串
+    uin: string; // QQ号
+    isRobot: boolean;
+    sex?: Sex
+    qqLevel?: QQLevel
+}

src/ntqqapi/types/index.ts

@@ -0,0 +1,7 @@
+
+export * from './user';
+export * from './group';
+export * from './msg';
+export * from './notify';
+export * from './cache';
+

src/ntqqapi/types/msg.ts

@@ -1,70 +1,14 @@
-export interface User {
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    nick: string;
-    avatarUrl?: string;
-    longNick?: string; // 签名
-    remark?: string
-}
-
-export interface SelfInfo extends User {
-
-}
-
-export interface Friend extends User {
-}
-
-export interface Group {
-    groupCode: string,
-    maxMember: number,
-    memberCount: number,
-    groupName: string,
-    groupStatus: 0,
-    memberRole: 2,
-    isTop: boolean,
-    toppedTimestamp: "0",
-    privilegeFlag: number, //65760
-    isConf: boolean,
-    hasModifyConfGroupFace: boolean,
-    hasModifyConfGroupName: boolean,
-    remarkName: string,
-    hasMemo: boolean,
-    groupShutupExpireTime: string, //"0",
-    personShutupExpireTime: string, //"0",
-    discussToGroupUin: string, //"0",
-    discussToGroupMaxMsgSeq: number,
-    discussToGroupTime: number,
-    groupFlagExt: number, //1073938496,
-    authGroupType: number, //0,
-    groupCreditLevel: number, //0,
-    groupFlagExt3: number, //0,
-    groupOwnerId: {
-        "memberUin": string, //"0",
-        "memberUid": string, //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
-    },
-    members: GroupMember[]  // 原始数据是没有这个的，为了方便自己加了这个字段
-}
-
-export interface GroupMember {
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: number; // 群主:4, 管理员:3，群员:2
-    shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-}
+import {GroupMemberRole} from "./group";
 
 export enum ElementType {
     TEXT = 1,
     PIC = 2,
+    FILE = 3,
     PTT = 4,
+    VIDEO = 5,
     FACE = 6,
     REPLY = 7,
+    ARK = 10,
 }
 
 export interface SendTextElement {
@@ -87,7 +31,7 @@ export interface SendPttElement {
         filePath: string,
         md5HexStr: string,
         fileSize: number,
-        duration: number,
+        duration: number,  // 单位是秒
         formatType: number,
         voiceType: number,
         voiceChangeType: number,
@@ -99,6 +43,11 @@ export interface SendPttElement {
     }
 }
 
+export enum PicType {
+    gif = 2000,
+    jpg = 1000
+}
+
 export interface SendPicElement {
     elementType: ElementType.PIC,
     elementId: "",
@@ -110,7 +59,7 @@ export interface SendPicElement {
         fileName: string,
         sourcePath: string,
         original: boolean,
-        picType: number,
+        picType: PicType,
         picSubType: number,
         fileUuid: string,
         fileSubId: string,
@@ -136,7 +85,43 @@ export interface SendFaceElement {
     faceElement: FaceElement
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement
+export interface FileElement {
+    "fileMd5"?: "",
+    "fileName": string,
+    "filePath": string,
+    "fileSize": string,
+    "picHeight"?: number,
+    "picWidth"?: number,
+    "picThumbPath"?: {},
+    "file10MMd5"?: "",
+    "fileSha"?: "",
+    "fileSha3"?: "",
+    "fileUuid"?: "",
+    "fileSubId"?: "",
+    "thumbFileSize"?: number
+}
+
+export interface SendFileElement {
+    elementType: ElementType.FILE
+    elementId: "",
+    fileElement: FileElement
+}
+
+export interface SendVideoElement {
+    elementType: ElementType.VIDEO
+    elementId: "",
+    videoElement: VideoElement
+}
+
+export interface SendArkElement {
+    elementType: ElementType.ARK,
+    elementId: "",
+    arkElement: ArkElement
+
+}
+
+export type SendMessageElement = SendTextElement | SendPttElement |
+    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement
 
 export enum AtType {
     notAt = 0,
@@ -175,6 +160,8 @@ export interface PttElement {
 
 export interface ArkElement {
     bytesData: string;
+    linkInfo: null,
+    subElementType: null
 }
 
 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
@@ -188,9 +175,15 @@ export interface PicElement {
     fileSize: number;
     fileName: string;
     fileUuid: string;
+    md5HexStr?: string;
+}
+
+export enum GrayTipElementSubType {
+    INVITE_NEW_MEMBER = 12,
 }
 
 export interface GrayTipElement {
+    subElementType: GrayTipElementSubType;
     revokeElement: {
         operatorRole: string;
         operatorUid: string;
@@ -199,6 +192,11 @@ export interface GrayTipElement {
         operatorMemRemark?: string;
         wording: string;  // 自定义的撤回提示语
     }
+    aioOpGrayTipElement: TipAioOpGrayTipElement,
+    groupElement: TipGroupElement,
+    xmlElement: {
+        content: string;
+    }
 }
 
 export interface FaceElement {
@@ -206,10 +204,86 @@ export interface FaceElement {
     faceType: 1
 }
 
+export interface VideoElement {
+    "filePath": string,
+    "fileName": string,
+    "videoMd5"?: string,
+    "thumbMd5"?: string
+    "fileTime"?: number, // second
+    "thumbSize"?: number, // byte
+    "fileFormat"?: number,  // 2表示mp4？
+    "fileSize"?: string,  // byte
+    "thumbWidth"?: number,
+    "thumbHeight"?: number,
+    "busiType"?: 0, // 未知
+    "subBusiType"?: 0, // 未知
+    "thumbPath"?: Map<number, any>,
+    "transferStatus"?: 0, // 未知
+    "progress"?: 0,  // 下载进度？
+    "invalidState"?: 0, // 未知
+    "fileUuid"?: string,  // 可以用于下载链接？
+    "fileSubId"?: "",
+    "fileBizId"?: null,
+    "originVideoMd5"?: "",
+    "import_rich_media_context"?: null,
+    "sourceVideoCodecFormat"?: number
+}
+
+export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
+    operateType: number,
+    peerUid: string,
+    fromGrpCodeOfTmpChat: string,
+}
+
+export enum TipGroupElementType {
+    memberIncrease = 1,
+    ban = 8
+}
+
+export interface TipGroupElement {
+    "type": TipGroupElementType,  // 1是表示有人加入群, 自己加入群也会收到这个
+    "role": 0,  // 暂时不知
+    "groupName": string,  // 暂时获取不到
+    "memberUid": string,
+    "memberNick": string,
+    "memberRemark": string,
+    "adminUid": string,  // 同意加群的管理员uid
+    "adminNick": string,
+    "adminRemark": string,
+    "createGroup": null,
+    "memberAdd"?: {
+        "showType": 1,
+        "otherAdd": null,
+        "otherAddByOtherQRCode": null,
+        "otherAddByYourQRCode": null,
+        "youAddByOtherQRCode": null,
+        "otherInviteOther": null,
+        "otherInviteYou": null,
+        "youInviteOther": null
+    },
+    "shutUp"?: {
+        "curTime": string,
+        "duration": string,  // 禁言时间，秒
+        "admin": {
+            "uid": string,
+            "card": string,
+            "name": string,
+            "role": GroupMemberRole
+        },
+        "member": {
+            "uid": string
+            "card": string,
+            "name": string,
+            "role": GroupMemberRole
+        }
+    }
+}
+
+
 export interface RawMessage {
     msgId: string;
     msgShortId?: number;  // 自己维护的消息id
-    msgTime: string;
+    msgTime: string; // 时间戳，秒
     msgSeq: string;
     senderUid: string;
     senderUin?: string; // 发送者QQ号
@@ -222,6 +296,7 @@ export interface RawMessage {
     recallTime: string; // 撤回时间, "0"是没有撤回
     elements: {
         elementId: string,
+        elementType: ElementType;
         replyElement: {
             senderUid: string; // 原消息发送者QQ号
             sourceMsgIsIncPic: boolean; // 原消息是否有图片
@@ -239,5 +314,7 @@ export interface RawMessage {
         arkElement: ArkElement;
         grayTipElement: GrayTipElement;
         faceElement: FaceElement;
+        videoElement: VideoElement;
+        fileElement: FileElement;
     }[];
-}
+}

src/ntqqapi/types/notify.ts

@@ -0,0 +1,64 @@
+
+export enum GroupNotifyTypes {
+    INVITE_ME = 1,
+    INVITED_JOIN = 4,  // 有人接受了邀请入群
+    JOIN_REQUEST = 7,
+    ADMIN_SET = 8,
+    ADMIN_UNSET = 12,
+    MEMBER_EXIT = 11, // 主动退出?
+
+}
+
+export interface GroupNotifies {
+    doubt: boolean,
+    nextStartSeq: string,
+    notifies: GroupNotify[],
+}
+
+export enum GroupNotifyStatus {
+    IGNORE = 0,
+    WAIT_HANDLE = 1,
+    APPROVE = 2,
+    REJECT = 3
+}
+
+export interface GroupNotify {
+    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
+    seq: string, // 唯一标识符，转成数字再除以1000应该就是时间戳？
+    type: GroupNotifyTypes,
+    status: GroupNotifyStatus,  // 0是已忽略？，1是未处理，2是已同意
+    group: { groupCode: string, groupName: string },
+    user1: { uid: string, nickName: string }, // 被设置管理员的人
+    user2: { uid: string, nickName: string },  // 操作者
+    actionUser: { uid: string, nickName: string }, //未知
+    actionTime: string,
+    invitationExt: {
+        srcType: number,  // 0?未知
+        groupCode: string, waitStatus: number
+    },
+    postscript: string,  // 加群用户填写的验证信息
+    repeatSeqs: [],
+    warningTips: string
+}
+
+export enum GroupRequestOperateTypes {
+    approve = 1,
+    reject = 2
+}
+
+export interface FriendRequest {
+    friendUid: string,
+    reqTime: string,  // 时间戳,秒
+    extWords: string,  // 申请人填写的验证消息
+    isUnread: boolean,
+    friendNick: string,
+    sourceId: number,
+    groupCode: string
+}
+
+export interface FriendRequestNotify {
+    data: {
+        unreadNums: number,
+        buddyReqs: FriendRequest[]
+    }
+}

src/ntqqapi/types/user.ts

@@ -0,0 +1,28 @@
+export enum Sex {
+    male = 0,
+    female = 2,
+    unknown = 255,
+}
+
+export interface QQLevel {
+    "crownNum": number,
+    "sunNum": number,
+    "moonNum": number,
+    "starNum": number
+}
+export interface User {
+    uid: string; // 加密的字符串
+    uin: string; // QQ号
+    nick: string;
+    avatarUrl?: string;
+    longNick?: string; // 签名
+    remark?: string;
+    sex?: Sex;
+    "qqLevel"?: QQLevel
+}
+
+export interface SelfInfo extends User {
+    online?: boolean;
+}
+
+export interface Friend extends User {}

src/onebot11/action/BaseAction.ts

@@ -1,9 +1,11 @@
 import {ActionName, BaseCheckResult} from "./types"
 import {OB11Response} from "./utils"
 import {OB11Return} from "../types";
+import {log} from "../../common/utils";
 
 class BaseAction<PayloadType, ReturnDataType> {
     actionName: ActionName
+
     protected async check(payload: PayloadType): Promise<BaseCheckResult> {
         return {
             valid: true,
@@ -19,11 +21,12 @@ class BaseAction<PayloadType, ReturnDataType> {
             const resData = await this._handle(payload);
             return OB11Response.ok(resData);
         } catch (e) {
-            return OB11Response.error(e.toString(), 200);
+            log("发生错误", e)
+            return OB11Response.error(e?.toString() || e?.stack?.toString() || "未知错误，可能操作超时", 200);
         }
     }
 
-    public async websocketHandle(payload: PayloadType, echo: string): Promise<OB11Return<ReturnDataType | null>> {
+    public async websocketHandle(payload: PayloadType, echo: any): Promise<OB11Return<ReturnDataType | null>> {
         const result = await this.check(payload)
         if (!result.valid) {
             return OB11Response.error(result.message, 1400)
@@ -32,7 +35,8 @@ class BaseAction<PayloadType, ReturnDataType> {
             const resData = await this._handle(payload)
             return OB11Response.ok(resData, echo);
         } catch (e) {
-            return OB11Response.error(e.toString(), 1200, echo)
+            log("发生错误", e)
+            return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo)
         }
     }
 

src/onebot11/action/CanSendImage.ts

@@ -1,10 +1,10 @@
 import {ActionName} from "./types";
 import CanSendRecord from "./CanSendRecord";
 
-interface ReturnType{
+interface ReturnType {
     yes: boolean
 }
 
-export default class CanSendImage extends CanSendRecord{
+export default class CanSendImage extends CanSendRecord {
     actionName = ActionName.CanSendImage
 }

src/onebot11/action/CanSendRecord.ts

@@ -1,14 +1,14 @@
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
 
-interface ReturnType{
+interface ReturnType {
     yes: boolean
 }
 
-export default class CanSendRecord extends BaseAction<any, ReturnType>{
+export default class CanSendRecord extends BaseAction<any, ReturnType> {
     actionName = ActionName.CanSendRecord
 
-    protected async _handle(payload): Promise<ReturnType>{
+    protected async _handle(payload): Promise<ReturnType> {
         return {
             yes: true
         }

src/onebot11/action/CleanCache.ts

@@ -0,0 +1,105 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+import fs from "fs";
+import Path from "path";
+import {
+    ChatType,
+    ChatCacheListItemBasic,
+    CacheFileType
+} from '../../ntqqapi/types';
+import {dbUtil} from "../../common/db";
+import {NTQQFileApi, NTQQFileCacheApi} from "../../ntqqapi/api/file";
+
+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 NTQQFileCacheApi.setCacheSilentScan(false);
+
+                cacheFilePaths.push((await NTQQFileCacheApi.getHotUpdateCachePath()));
+                cacheFilePaths.push((await NTQQFileCacheApi.getDesktopTmpPath()));
+                (await NTQQFileCacheApi.getCacheSessionPathList()).forEach(e => cacheFilePaths.push(e.value));
+
+                // await NTQQApi.addCacheScannedPaths(); // XXX: 调用就崩溃，原因目前还未知
+                const cacheScanResult = await NTQQFileCacheApi.scanCache();
+                const cacheSize = parseInt(cacheScanResult.size[6]);
+
+                if (cacheScanResult.result !== 0) {
+                    throw('Something went wrong while scanning cache. Code: ' + cacheScanResult.result);
+                }
+
+                await NTQQFileCacheApi.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 NTQQFileCacheApi.getFileCacheInfo(fileType)).infos.map(file => file.fileKey));
+                }
+
+                // 一并清除
+                await NTQQFileCacheApi.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) => {
+        NTQQFileCacheApi.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/Debug.ts

@@ -0,0 +1,28 @@
+import BaseAction from "./BaseAction";
+import {NTQQApi} from "../../ntqqapi/ntcall";
+import {ActionName} from "./types";
+import {log} from "../../common/utils";
+
+interface Payload {
+    method: string,
+    args: any[],
+}
+
+export default class Debug extends BaseAction<Payload, any> {
+    actionName = ActionName.Debug
+
+    protected async _handle(payload: Payload): Promise<any> {
+        log("debug call ntqq api", payload);
+        const method = NTQQApi[payload.method]
+        if (!method) {
+            throw `${method} 不存在`
+        }
+        const result = method(...payload.args);
+        if (method.constructor.name === "AsyncFunction") {
+            return await result
+        }
+        return result
+        // const info = await NTQQApi.getUserDetailInfo(friends[0].uid);
+        // return info
+    }
+}

src/onebot11/action/DeleteMsg.ts

@@ -1,7 +1,7 @@
 import {ActionName} from "./types";
 import BaseAction from "./BaseAction";
-import {NTQQApi} from "../../ntqqapi/ntcall";
-import {getHistoryMsgByShortId} from "../../common/data";
+import {dbUtil} from "../../common/db";
+import {NTQQMsgApi} from "../../ntqqapi/api/msg";
 
 interface Payload {
     message_id: number
@@ -10,9 +10,9 @@ interface Payload {
 class DeleteMsg extends BaseAction<Payload, void> {
     actionName = ActionName.DeleteMsg
 
-    protected async _handle(payload:Payload){
-        let msg = getHistoryMsgByShortId(payload.message_id)
-        await NTQQApi.recallMsg({
+    protected async _handle(payload: Payload) {
+        let msg = await dbUtil.getMsgByShortId(payload.message_id)
+        await NTQQMsgApi.recallMsg({
             chatType: msg.chatType,
             peerUid: msg.peerUid
         }, [msg.msgId])

src/onebot11/action/GetFile.ts

@@ -0,0 +1,47 @@
+import BaseAction from "./BaseAction";
+import {getConfigUtil} from "../../common/utils";
+import fs from "fs/promises";
+import {dbUtil} from "../../common/db";
+
+export interface GetFilePayload {
+    file: string // 文件名
+}
+
+export interface GetFileResponse {
+    file?: string  // path
+    url?: string
+    file_size?: string
+    file_name?: string
+    base64?: string
+}
+
+
+export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
+    protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
+        const cache = await dbUtil.getFileCache(payload.file)
+        const {autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond} = getConfigUtil().getConfig()
+        if (!cache) {
+            throw new Error('file not found')
+        }
+        if (cache.downloadFunc) {
+            await cache.downloadFunc()
+        }
+        let res: GetFileResponse = {
+            file: cache.filePath,
+            url: cache.url,
+            file_size: cache.fileSize,
+            file_name: cache.fileName
+        }
+        if (enableLocalFile2Url) {
+            if (!cache.url) {
+                res.base64 = await fs.readFile(cache.filePath, 'base64')
+            }
+        }
+        if (autoDeleteFile) {
+            setTimeout(() => {
+                fs.unlink(cache.filePath)
+            }, autoDeleteFileSecond * 1000)
+        }
+        return res
+    }
+}

src/onebot11/action/GetFriendList.ts

@@ -8,7 +8,7 @@ import {ActionName} from "./types";
 class GetFriendList extends BaseAction<null, OB11User[]> {
     actionName = ActionName.GetFriendList
 
-    protected async _handle(payload: null){
+    protected async _handle(payload: null) {
         return OB11Constructor.friends(friends);
     }
 }

src/onebot11/action/GetGroupList.ts

@@ -8,7 +8,7 @@ import {ActionName} from "./types";
 class GetGroupList extends BaseAction<null, OB11Group[]> {
     actionName = ActionName.GetGroupList
 
-    protected async _handle(payload: null){
+    protected async _handle(payload: null) {
         return OB11Constructor.groups(groups);
     }
 }

src/onebot11/action/GetGroupMemberInfo.ts

@@ -3,6 +3,8 @@ import {getGroupMember} from "../../common/data";
 import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
+import {NTQQUserApi} from "../../ntqqapi/api/user";
+import {isNull, log} from "../../common/utils";
 
 
 export interface PayloadType {
@@ -13,13 +15,18 @@ export interface PayloadType {
 class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
     actionName = ActionName.GetGroupMemberInfo
 
-    protected async _handle(payload: PayloadType){
+    protected async _handle(payload: PayloadType) {
         const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString())
         if (member) {
+            if (isNull(member.sex)){
+                log("获取群成员详细信息")
+                let info = (await NTQQUserApi.getUserDetailInfo(member.uid))
+                log("群成员详细信息结果", info)
+                Object.assign(member, info);
+            }
             return OB11Constructor.groupMember(payload.group_id.toString(), member)
-        }
-        else {
-            throw(`群成员${payload.user_id}不存在`)
+        } else {
+            throw (`群成员${payload.user_id}不存在`)
         }
     }
 }

src/onebot11/action/GetGroupMemberList.ts

@@ -1,9 +1,9 @@
 import {OB11GroupMember} from '../types';
 import {getGroup} from "../../common/data";
-import {NTQQApi} from "../../ntqqapi/ntcall";
 import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
 
 export interface PayloadType {
     group_id: number
@@ -13,15 +13,14 @@ export interface PayloadType {
 class GetGroupMemberList extends BaseAction<PayloadType, OB11GroupMember[]> {
     actionName = ActionName.GetGroupMemberList
 
-    protected async _handle(payload: PayloadType){
+    protected async _handle(payload: PayloadType) {
         const group = await getGroup(payload.group_id.toString());
         if (group) {
             if (!group.members?.length) {
-                group.members = await NTQQApi.getGroupMembers(payload.group_id.toString())
+                group.members = await NTQQGroupApi.getGroupMembers(payload.group_id.toString())
             }
             return OB11Constructor.groupMembers(group);
-        }
-        else {
+        } else {
             throw (`群${payload.group_id}不存在`)
         }
     }

src/onebot11/action/GetGuildList.ts

@@ -0,0 +1,10 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+
+export default class GetGuildList extends BaseAction<null, null> {
+    actionName = ActionName.GetGuildList
+
+    protected async _handle(payload: null): Promise<null> {
+        return null;
+    }
+}

src/onebot11/action/GetImage.ts

@@ -0,0 +1,7 @@
+import {GetFileBase} from "./GetFile";
+import {ActionName} from "./types";
+
+
+export default class GetImage extends GetFileBase {
+    actionName = ActionName.GetImage
+}

src/onebot11/action/GetLoginInfo.ts

@@ -8,7 +8,7 @@ import {ActionName} from "./types";
 class GetLoginInfo extends BaseAction<null, OB11User> {
     actionName = ActionName.GetLoginInfo
 
-    protected async _handle(payload: null){
+    protected async _handle(payload: null) {
         return OB11Constructor.selfInfo(selfInfo);
     }
 }

src/onebot11/action/GetMsg.ts

@@ -1,8 +1,8 @@
-import {getHistoryMsgByShortId} from "../../common/data";
 import {OB11Message} from '../types';
 import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
+import {dbUtil} from "../../common/db";
 
 
 export interface PayloadType {
@@ -14,18 +14,19 @@ export type ReturnDataType = OB11Message
 class GetMsg extends BaseAction<PayloadType, OB11Message> {
     actionName = ActionName.GetMsg
 
-    protected async _handle(payload: PayloadType){
+    protected async _handle(payload: PayloadType) {
         // log("history msg ids", Object.keys(msgHistory));
-        if (!payload.message_id){
-            throw("参数message_id不能为空")
+        if (!payload.message_id) {
+            throw ("参数message_id不能为空")
         }
-        const msg = getHistoryMsgByShortId(payload.message_id)
-        if (msg) {
-            const msgData = await OB11Constructor.message(msg);
-            return msgData
-        } else {
-            throw("消息不存在")
+        let msg = await dbUtil.getMsgByShortId(payload.message_id)
+        if(!msg) {
+            msg = await dbUtil.getMsgByLongId(payload.message_id.toString())
         }
+        if (!msg){
+            throw ("消息不存在")
+        }
+        return await OB11Constructor.message(msg)
     }
 }
 

src/onebot11/action/GetRecord.ts

@@ -0,0 +1,15 @@
+import {GetFileBase, GetFilePayload, GetFileResponse} from "./GetFile";
+import {ActionName} from "./types";
+
+interface Payload extends GetFilePayload {
+    out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
+}
+
+export default class GetRecord extends GetFileBase {
+    actionName = ActionName.GetRecord
+
+    protected async _handle(payload: Payload): Promise<GetFileResponse> {
+        let res = super._handle(payload);
+        return res;
+    }
+}

src/onebot11/action/GetStatus.ts

@@ -1,13 +1,15 @@
 import BaseAction from "./BaseAction";
 import {OB11Status} from "../types";
 import {ActionName} from "./types";
+import {selfInfo} from "../../common/data";
 
 
 export default class GetStatus extends BaseAction<any, OB11Status> {
     actionName = ActionName.GetStatus
+
     protected async _handle(payload: any): Promise<OB11Status> {
         return {
-            online: null,
+            online: selfInfo.online,
             good: true
         }
     }

src/onebot11/action/GetVersionInfo.ts

@@ -1,10 +1,11 @@
 import BaseAction from "./BaseAction";
 import {OB11Version} from "../types";
-import {version} from "../../common/data";
 import {ActionName} from "./types";
+import {version} from "../../version";
 
-export default class GetVersionInfo extends BaseAction<any, OB11Version>{
+export default class GetVersionInfo extends BaseAction<any, OB11Version> {
     actionName = ActionName.GetVersionInfo
+
     protected async _handle(payload: any): Promise<OB11Version> {
         return {
             app_name: "LLOneBot",

src/onebot11/action/MarkMsgAsRead.ts

@@ -0,0 +1,14 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+
+interface Payload{
+    message_id: number
+}
+
+export default class GoCQHTTPMarkMsgAsRead extends BaseAction<Payload, null>{
+    actionName = ActionName.GoCQHTTP_MarkMsgAsRead
+
+    protected async _handle(payload: Payload): Promise<null> {
+        return null
+    }
+}

src/onebot11/action/SendGroupMsg.ts

@@ -1,9 +1,17 @@
 import SendMsg from "./SendMsg";
-import {ActionName} from "./types";
+import {ActionName, BaseCheckResult} from "./types";
+import {OB11PostSendMsg} from "../types";
+import {log} from "../../common/utils";
 
 
-class SendGroupMsg extends SendMsg{
+class SendGroupMsg extends SendMsg {
     actionName = ActionName.SendGroupMsg
+
+    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+        delete payload.user_id;
+        payload.message_type = "group"
+        return super.check(payload);
+    }
 }
 
 export default SendGroupMsg

src/onebot11/action/SendLike.ts

@@ -0,0 +1,35 @@
+import BaseAction from "./BaseAction";
+import {getFriend, getUidByUin, uidMaps} from "../../common/data";
+import {ActionName} from "./types";
+import {log} from "../../common/utils";
+import {NTQQFriendApi} from "../../ntqqapi/api/friend";
+
+interface Payload {
+    user_id: number,
+    times: number
+}
+
+export default class SendLike extends BaseAction<Payload, null> {
+    actionName = ActionName.SendLike
+
+    protected async _handle(payload: Payload): Promise<null> {
+        log("点赞参数", payload)
+        try {
+            const qq = payload.user_id.toString();
+            const friend = await getFriend(qq)
+            let uid: string;
+            if (!friend) {
+                uid = getUidByUin(qq)
+            } else {
+                uid = friend.uid
+            }
+            let result = await NTQQFriendApi.likeFriend(uid, parseInt(payload.times?.toString()) || 1);
+            if (result.result !== 0) {
+                throw result.errMsg
+            }
+        } catch (e) {
+            throw `点赞失败 ${e}`
+        }
+        return null
+    }
+}

src/onebot11/action/SendMsg.ts

@@ -1,15 +1,32 @@
-import {AtType, ChatType, Group, SendMessageElement} from "../../ntqqapi/types";
-import {addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getUidByUin, selfInfo,} from "../../common/data";
-import {OB11MessageData, OB11MessageDataType, OB11MessageMixType, OB11MessageNode, OB11PostSendMsg} from '../types';
-import {NTQQApi, Peer} from "../../ntqqapi/ntcall";
+import {
+    AtType,
+    ChatType,
+    ElementType,
+    Group,
+    RawMessage,
+    SendArkElement,
+    SendMessageElement
+} from "../../ntqqapi/types";
+import {friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo,} from "../../common/data";
+import {
+    OB11MessageCustomMusic,
+    OB11MessageData,
+    OB11MessageDataType,
+    OB11MessageMixType,
+    OB11MessageNode,
+    OB11PostSendMsg
+} from '../types';
+import {Peer} from "../../ntqqapi/api/msg";
 import {SendMsgElementConstructor} from "../../ntqqapi/constructor";
 import {uri2local} from "../utils";
 import BaseAction from "./BaseAction";
 import {ActionName, BaseCheckResult} from "./types";
-import * as fs from "fs";
-import {log} from "../../common/utils";
-import {v4 as uuidv4} from "uuid"
-import {parseCQCode} from "../cqcode";
+import * as fs from "node:fs";
+import {log, sleep} from "../../common/utils";
+import {decodeCQCode} from "../cqcode";
+import {dbUtil} from "../../common/db";
+import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
+import {NTQQMsgApi} from "../../ntqqapi/api/msg";
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
     function checkUri(uri: string): boolean {
@@ -55,34 +72,50 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
 
     protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
         const messages = this.convertMessage2List(payload.message);
-        const fmNum = this.forwardMsgNum(payload)
+        const fmNum = this.getSpecialMsgNum(payload, OB11MessageDataType.node)
         if (fmNum && fmNum != messages.length) {
             return {
                 valid: false,
                 message: "转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素"
             }
         }
+        if (payload.group_id && !(await getGroup(payload.group_id))) {
+            return {
+                valid: false,
+                message: `群${payload.group_id}不存在`
+            }
+        }
+        if (payload.user_id && payload.message_type !== "group") {
+            if (!(await getFriend(payload.user_id))) {
+                if (!ALLOW_SEND_TEMP_MSG) {
+                    return {
+                        valid: false,
+                        message: `不能发送临时消息`
+                    }
+                }
+            }
+        }
         return {
             valid: true,
         }
     }
 
     protected async _handle(payload: OB11PostSendMsg) {
+
         const peer: Peer = {
             chatType: ChatType.friend,
             peerUid: ""
         }
-
+        let isTempMsg = false;
         let group: Group | undefined = undefined;
-        if (payload?.group_id) {
+        const genGroupPeer = async () => {
             group = await getGroup(payload.group_id.toString())
-            if (!group) {
-                throw (`群${payload.group_id}不存在`)
-            }
             peer.chatType = ChatType.group
             // peer.name = group.name
             peer.peerUid = group.groupCode
-        } else if (payload?.user_id) {
+        }
+
+        const genFriendPeer = () => {
             const friend = friends.find(f => f.uin == payload.user_id.toString())
             if (friend) {
                 // peer.name = friend.nickName
@@ -94,26 +127,49 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     throw (`找不到私聊对象${payload.user_id}`)
                 }
                 // peer.name = tempUser.nickName
+                isTempMsg = true;
                 peer.peerUid = tempUserUid;
             }
         }
+        if (payload?.group_id && payload.message_type === "group") {
+            await genGroupPeer()
+
+        } else if (payload?.user_id) {
+            genFriendPeer()
+        } else if (payload.group_id) {
+            await genGroupPeer()
+        } else {
+            throw ("发送消息参数错误, 请指定group_id或user_id")
+        }
         const messages = this.convertMessage2List(payload.message);
-        if (this.forwardMsgNum(payload)) {
+        if (this.getSpecialMsgNum(payload, OB11MessageDataType.node)) {
             try {
                 const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group)
                 return {message_id: returnMsg.msgShortId}
             } catch (e) {
                 throw ("发送转发消息失败 " + e.toString())
             }
+        } else {
+            if (this.getSpecialMsgNum(payload, OB11MessageDataType.music)) {
+                const music: OB11MessageCustomMusic = messages[0] as OB11MessageCustomMusic
+                if (music) {
+                    const {url, audio, title, content, image} = music.data;
+                    const selfPeer: Peer = {peerUid: selfInfo.uid, chatType: ChatType.friend}
+                    // 搞不定！
+                    // const musicMsg = await this.send(selfPeer, [this.genMusicElement(url, audio, title, content, image)], [], false)
+                    // 转发
+                    // const res = await NTQQApi.forwardMsg(selfPeer, peer, [musicMsg.msgId])
+                    // log("转发音乐消息成功", res);
+                    // return {message_id: musicMsg.msgShortId}
+                }
+            }
         }
         // log("send msg:", peer, sendElements)
         const {sendElements, deleteAfterSentFiles} = await this.createSendElements(messages, group)
-        try {
-            const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
-            return {message_id: returnMsg.msgShortId}
-        } catch (e) {
-            throw (e.toString())
-        }
+        const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
+        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+        }));
+        return {message_id: returnMsg.msgShortId}
     }
 
     protected convertMessage2List(message: OB11MessageMixType) {
@@ -124,35 +180,72 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             //         text: message
             //     }
             // }] as OB11MessageData[]
-            message = parseCQCode(message.toString())
+            message = decodeCQCode(message.toString())
         } else if (!Array.isArray(message)) {
             message = [message]
         }
         return message;
     }
 
-    private forwardMsgNum(payload: OB11PostSendMsg): number {
+    private getSpecialMsgNum(payload: OB11PostSendMsg, msgType: OB11MessageDataType): number {
         if (Array.isArray(payload.message)) {
-            return payload.message.filter(msg => msg.type == OB11MessageDataType.node).length
+            return payload.message.filter(msg => msg.type == msgType).length
         }
         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 NTQQMsgApi.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 nodeIds: string[] = []
-        for (const messageNode of messageNodes){
+        let nodeMsgIds: string[] = []
+        // 先判断一遍是不是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 = getHistoryMsgByShortId(nodeId);
-                if (nodeMsg){
-                    nodeIds.push(nodeMsg.msgId);
+                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
+                if (!needClone) {
+                    nodeMsgIds.push(nodeMsg.msgId)
+                } else {
+                    if (nodeMsg.peerUid !== selfInfo.uid) {
+                        const cloneMsg = await this.cloneMsg(nodeMsg)
+                        if (cloneMsg) {
+                            nodeMsgIds.push(cloneMsg.msgId)
+                        }
+                    }
                 }
             } else {
                 // 自定义的消息
@@ -163,18 +256,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);
-                    nodeIds.push(nodeMsg.msgId)
-                    log("转发节点生成成功", nodeMsg.msgId);
+                    let sendElementsSplit: SendMessageElement[][] = []
+                    let splitIndex = 0;
+                    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)
                 }
             }
         }
 
+        // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
+        let nodeMsgArray: Array<RawMessage> = []
+        let srcPeer: Peer = null;
+        let needSendSelf = false;
+        for (const [index, msgId] of nodeMsgIds.entries()) {
+            const nodeMsg = await dbUtil.getMsgByLongId(msgId)
+            if (nodeMsg) {
+                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) {
+            log("需要克隆转发消息");
+            for (const [index, msg] of nodeMsgArray.entries()) {
+                if (msg.peerUid !== selfInfo.uid) {
+                    const cloneMsg = await this.cloneMsg(msg)
+                    if (cloneMsg) {
+                        nodeMsgIds[index] = cloneMsg.msgId
+                    }
+                }
+            }
+        }
+        // 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(selfPeer, destPeer, nodeIds)
+            log("开发转发", nodeMsgIds)
+            return await NTQQMsgApi.multiForwardMsg(srcPeer, destPeer, nodeMsgIds)
         } catch (e) {
             log("forward failed", e)
             return null;
@@ -197,13 +354,17 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 }
                     break;
                 case OB11MessageDataType.at: {
+                    if (!group) {
+                        continue
+                    }
                     let atQQ = sendMsg.data?.qq;
                     if (atQQ) {
                         atQQ = atQQ.toString()
                         if (atQQ === "all") {
                             sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
                         } else {
-                            const atMember = group?.members.find(m => m.uin == atQQ)
+                            // const atMember = group?.members.find(m => m.uin == atQQ)
+                            const atMember = await getGroupMember(group?.groupCode, atQQ);
                             if (atMember) {
                                 sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
                             }
@@ -214,8 +375,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 case OB11MessageDataType.reply: {
                     let replyMsgId = sendMsg.data.id;
                     if (replyMsgId) {
-                        replyMsgId = replyMsgId.toString()
-                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
+                        const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
                         if (replyMsg) {
                             sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
@@ -229,19 +389,44 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     }
                 }
                     break;
+
                 case OB11MessageDataType.image:
+                case OB11MessageDataType.file:
+                case OB11MessageDataType.video:
                 case OB11MessageDataType.voice: {
-                    const file = sendMsg.data?.file
+                    let file = sendMsg.data?.file
+                    const payloadFileName = sendMsg.data?.name
                     if (file) {
-                        const {path, isLocal} = (await uri2local(uuidv4(), file))
+                        const cache = await dbUtil.getFileCache(file)
+                        if (cache) {
+                            if (fs.existsSync(cache.filePath)) {
+                                file = "file://" + cache.filePath
+                            } else if (cache.downloadFunc) {
+                                await cache.downloadFunc()
+                                file = cache.filePath;
+                            } else if (cache.url) {
+                                file = cache.url
+                            }
+                            log("找到文件缓存", file);
+                        }
+                        const {path, isLocal, fileName, errMsg} = (await uri2local(file))
+                        if (errMsg) {
+                            throw errMsg
+                        }
                         if (path) {
                             if (!isLocal) { // 只删除http和base64转过来的文件
                                 deleteAfterSentFiles.push(path)
                             }
-                            if (sendMsg.type === OB11MessageDataType.image) {
-                                sendElements.push(await SendMsgElementConstructor.pic(path))
-                            } else {
-                                sendElements.push(await SendMsgElementConstructor.ptt(path))
+                            if (sendMsg.type === OB11MessageDataType.file) {
+                                log("发送文件", path, 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));
+                            } else if (sendMsg.type === OB11MessageDataType.voice) {
+                                sendElements.push(await SendMsgElementConstructor.ptt(path));
+                            }else if (sendMsg.type === OB11MessageDataType.image) {
+                                sendElements.push(await SendMsgElementConstructor.pic(path, sendMsg.data.summary || ""));
                             }
                         }
                     }
@@ -257,16 +442,53 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         }
     }
 
-    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = false) {
+    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {
         if (!sendElements.length) {
             throw ("消息体无法解析")
         }
-        const returnMsg = await NTQQApi.sendMsg(peer, sendElements, waitComplete, 20000);
-        addHistoryMsg(returnMsg)
+        const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000);
+        log("消息发送结果", returnMsg)
+        returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
         deleteAfterSentFiles.map(f => fs.unlink(f, () => {
         }))
         return returnMsg
     }
+
+    private genMusicElement(url: string, audio: string, title: string, content: string, image: string): SendArkElement {
+        const musicJson = {
+            app: 'com.tencent.structmsg',
+            config: {
+                ctime: 1709689928,
+                forward: 1,
+                token: '5c1e4905f926dd3a64a4bd3841460351',
+                type: 'normal'
+            },
+            extra: {app_type: 1, appid: 100497308, uin: selfInfo.uin},
+            meta: {
+                news: {
+                    action: '',
+                    android_pkg_name: '',
+                    app_type: 1,
+                    appid: 100497308,
+                    ctime: 1709689928,
+                    desc: content || title,
+                    jumpUrl: url,
+                    musicUrl: audio,
+                    preview: image,
+                    source_icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
+                    source_url: '',
+                    tag: 'QQ音乐',
+                    title: title,
+                    uin: selfInfo.uin,
+                }
+            },
+            prompt: content || title,
+            ver: '0.0.0.1',
+            view: 'news'
+        }
+
+        return SendMsgElementConstructor.ark(musicJson)
+    }
 }
 
 export default SendMsg

src/onebot11/action/SendPrivateMsg.ts

@@ -1,8 +1,14 @@
 import SendMsg from "./SendMsg";
-import {ActionName} from "./types";
+import {ActionName, BaseCheckResult} from "./types";
+import {OB11PostSendMsg} from "../types";
 
 class SendPrivateMsg extends SendMsg {
     actionName = ActionName.SendPrivateMsg
+
+    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+        payload.message_type = "private"
+        return super.check(payload);
+    }
 }
 
 export default SendPrivateMsg

src/onebot11/action/SetFriendAddRequest.ts

@@ -0,0 +1,18 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+import {NTQQFriendApi} from "../../ntqqapi/api/friend";
+
+interface Payload {
+    flag: string,
+    approve: boolean,
+    remark?: string,
+}
+
+export default class SetFriendAddRequest extends BaseAction<Payload, null> {
+    actionName = ActionName.SetFriendAddRequest;
+
+    protected async _handle(payload: Payload): Promise<null> {
+        await NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), payload.approve)
+        return null;
+    }
+}

src/onebot11/action/SetGroupAddRequest.ts

@@ -0,0 +1,25 @@
+import BaseAction from "./BaseAction";
+import {GroupRequestOperateTypes} from "../../ntqqapi/types";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    flag: string,
+    // sub_type: "add" | "invite",
+    // type: "add" | "invite"
+    approve: boolean,
+    reason: string
+}
+
+export default class SetGroupAddRequest extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupAddRequest
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const seq = payload.flag.toString();
+        await NTQQGroupApi.handleGroupRequest(seq,
+            payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+            payload.reason
+        )
+        return null
+    }
+}

src/onebot11/action/SetGroupAdmin.ts

@@ -0,0 +1,24 @@
+import BaseAction from "./BaseAction";
+import {getGroupMember} from "../../common/data";
+import {GroupMemberRole} from "../../ntqqapi/types";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    user_id: number,
+    enable: boolean
+}
+
+export default class SetGroupAdmin extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupAdmin
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const member = await getGroupMember(payload.group_id, payload.user_id)
+        if (!member) {
+            throw `群成员${payload.user_id}不存在`
+        }
+        await NTQQGroupApi.setMemberRole(payload.group_id.toString(), member.uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal)
+        return null
+    }
+}

src/onebot11/action/SetGroupBan.ts

@@ -0,0 +1,24 @@
+import BaseAction from "./BaseAction";
+import {getGroupMember} from "../../common/data";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    user_id: number,
+    duration: number
+}
+
+export default class SetGroupBan extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupBan
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const member = await getGroupMember(payload.group_id, payload.user_id)
+        if (!member) {
+            throw `群成员${payload.user_id}不存在`
+        }
+        await NTQQGroupApi.banMember(payload.group_id.toString(),
+            [{uid: member.uid, timeStamp: parseInt(payload.duration.toString())}])
+        return null
+    }
+}

src/onebot11/action/SetGroupCard.ts

@@ -0,0 +1,23 @@
+import BaseAction from "./BaseAction";
+import {getGroupMember} from "../../common/data";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    user_id: number,
+    card: string
+}
+
+export default class SetGroupCard extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupCard
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const member = await getGroupMember(payload.group_id, payload.user_id)
+        if (!member) {
+            throw `群成员${payload.user_id}不存在`
+        }
+        await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || "")
+        return null
+    }
+}

src/onebot11/action/SetGroupKick.ts

@@ -0,0 +1,23 @@
+import BaseAction from "./BaseAction";
+import {getGroupMember} from "../../common/data";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    user_id: number,
+    reject_add_request: boolean
+}
+
+export default class SetGroupKick extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupKick
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const member = await getGroupMember(payload.group_id, payload.user_id)
+        if (!member) {
+            throw `群成员${payload.user_id}不存在`
+        }
+        await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request);
+        return null
+    }
+}

src/onebot11/action/SetGroupLeave.ts

@@ -0,0 +1,22 @@
+import BaseAction from "./BaseAction";
+import {log} from "../../common/utils";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    is_dismiss: boolean
+}
+
+export default class SetGroupLeave extends BaseAction<Payload, any> {
+    actionName = ActionName.SetGroupLeave
+
+    protected async _handle(payload: Payload): Promise<any> {
+        try {
+            await NTQQGroupApi.quitGroup(payload.group_id.toString())
+        } catch (e) {
+            log("退群失败", e)
+            throw e
+        }
+    }
+}

src/onebot11/action/SetGroupName.ts

@@ -0,0 +1,18 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    group_name: string
+}
+
+export default class SetGroupName extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupName
+
+    protected async _handle(payload: Payload): Promise<null> {
+
+        await NTQQGroupApi.setGroupName(payload.group_id.toString(), payload.group_name)
+        return null
+    }
+}

src/onebot11/action/SetGroupWholeBan.ts

@@ -0,0 +1,18 @@
+import BaseAction from "./BaseAction";
+import {ActionName} from "./types";
+import {NTQQGroupApi} from "../../ntqqapi/api/group";
+
+interface Payload {
+    group_id: number,
+    enable: boolean
+}
+
+export default class SetGroupWholeBan extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupWholeBan
+
+    protected async _handle(payload: Payload): Promise<null> {
+
+        await NTQQGroupApi.banGroup(payload.group_id.toString(), !!payload.enable)
+        return null
+    }
+}

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

@@ -0,0 +1,25 @@
+import BaseAction from "../BaseAction";
+import {OB11User} from "../../types";
+import {getFriend, getGroupMember, groups} from "../../../common/data";
+import {OB11Constructor} from "../../constructor";
+import {ActionName} from "../types";
+
+
+export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: number }, OB11User> {
+    actionName = ActionName.GoCQHTTP_GetStrangerInfo
+
+    protected async _handle(payload: { user_id: number }): Promise<OB11User> {
+        const user_id = payload.user_id.toString()
+        const friend = await getFriend(user_id)
+        if (friend) {
+            return OB11Constructor.friend(friend);
+        }
+        for (const group of groups) {
+            const member = await getGroupMember(group.groupCode, user_id)
+            if (member) {
+                return OB11Constructor.groupMember(group.groupCode, member) as OB11User
+            }
+        }
+        throw ("查无此人")
+    }
+}

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

@@ -1,15 +1,16 @@
-import SendMsg, {ReturnDataType} from "../SendMsg";
-import {OB11MessageMixType, OB11PostSendMsg} from "../../types";
-import {ActionName, BaseCheckResult} from "../types";
+import SendMsg from "../SendMsg";
+import {OB11PostSendMsg} from "../../types";
+import {ActionName} from "../types";
 
-export class GoCQHTTPSendGroupForwardMsg extends SendMsg{
+export class GoCQHTTPSendGroupForwardMsg extends SendMsg {
     actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
-    protected async check(payload: OB11PostSendMsg){
+
+    protected async check(payload: OB11PostSendMsg) {
         payload.message = this.convertMessage2List(payload.messages);
         return super.check(payload);
     }
 }
 
-export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendGroupForwardMsg{
+export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendGroupForwardMsg {
     actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg;
 }

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 {uri2local} from "../../utils";
+import fs from "fs";
+import {NTQQMsgApi} from "../../../ntqqapi/api/msg";
+
+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 NTQQMsgApi.sendMsg({chatType: ChatType.group, peerUid: group.groupCode}, [sendFileEle]);
+        return null
+    }
+}

src/onebot11/action/index.ts

@@ -15,22 +15,66 @@ import CanSendRecord from "./CanSendRecord";
 import CanSendImage from "./CanSendImage";
 import GetStatus from "./GetStatus";
 import {GoCQHTTPSendGroupForwardMsg, GoCQHTTPSendPrivateForwardMsg} from "./go-cqhttp/SendForwardMsg";
+import GoCQHTTPGetStrangerInfo from "./go-cqhttp/GetStrangerInfo";
+import SendLike from "./SendLike";
+import SetGroupAddRequest from "./SetGroupAddRequest";
+import SetGroupLeave from "./SetGroupLeave";
+import GetGuildList from "./GetGuildList";
+import Debug from "./Debug";
+import SetFriendAddRequest from "./SetFriendAddRequest";
+import SetGroupWholeBan from "./SetGroupWholeBan";
+import SetGroupName from "./SetGroupName";
+import SetGroupBan from "./SetGroupBan";
+import SetGroupKick from "./SetGroupKick";
+import SetGroupAdmin from "./SetGroupAdmin";
+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(),
     new GetFriendList(),
     new GetGroupList(), new GetGroupInfo(), new GetGroupMemberList(), new GetGroupMemberInfo(),
     new SendGroupMsg(), new SendPrivateMsg(), new SendMsg(),
     new DeleteMsg(),
+    new SetGroupAddRequest(),
+    new SetFriendAddRequest(),
+    new SetGroupLeave(),
     new GetVersionInfo(),
     new CanSendRecord(),
     new CanSendImage(),
     new GetStatus(),
+    new SetGroupWholeBan(),
+    new SetGroupBan(),
+    new SetGroupKick(),
+    new SetGroupAdmin(),
+    new SetGroupName(),
+    new SetGroupCard(),
+    new GetImage(),
+    new GetRecord(),
+    new CleanCache(),
 
     //以下为go-cqhttp api
     new GoCQHTTPSendGroupForwardMsg(),
     new GoCQHTTPSendPrivateForwardMsg(),
+    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,33 @@
+import {GroupNotify, GroupNotifyStatus} from "../../../ntqqapi/types";
+import BaseAction from "../BaseAction";
+import {ActionName} from "../types";
+import {uidMaps} from "../../../common/data";
+import {log} from "../../../common/utils";
+import {NTQQUserApi} from "../../../ntqqapi/api/user";
+import {NTQQGroupApi} from "../../../ntqqapi/api/group";
+
+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 NTQQGroupApi.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 NTQQUserApi.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 {ActionName} from "../types";
+import { uri2local } from "../../utils";
+import * as fs from "node:fs";
+import { checkFileReceived } from "../../../common/utils";
+import {NTQQUserApi} from "../../../ntqqapi/api/user";
+// 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 NTQQUserApi.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

@@ -2,17 +2,24 @@ export type BaseCheckResult = ValidCheckResult | InvalidCheckResult
 
 export interface ValidCheckResult {
     valid: true
+
     [k: string | number]: any
 }
 
 export interface InvalidCheckResult {
     valid: false
     message: string
+
     [k: string | number]: any
 }
 
 export enum ActionName {
-    TestForwardMsg = "test_forward_msg",
+    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",
     GetFriendList = "get_friend_list",
     GetGroupInfo = "get_group_info",
@@ -24,11 +31,27 @@ export enum ActionName {
     SendGroupMsg = "send_group_msg",
     SendPrivateMsg = "send_private_msg",
     DeleteMsg = "delete_msg",
+    SetGroupAddRequest = "set_group_add_request",
+    SetFriendAddRequest = "set_friend_add_request",
+    SetGroupLeave = "set_group_leave",
     GetVersionInfo = "get_version_info",
     GetStatus = "get_status",
     CanSendRecord = "can_send_record",
     CanSendImage = "can_send_image",
+    SetGroupKick = "set_group_kick",
+    SetGroupBan = "set_group_ban",
+    SetGroupWholeBan = "set_group_whole_ban",
+    SetGroupAdmin = "set_group_admin",
+    SetGroupCard = "set_group_card",
+    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_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/action/utils.ts

@@ -1,4 +1,5 @@
 import {OB11Return} from '../types';
+import {isNull} from '../../common/utils';
 
 export class OB11Response {
     static res<T>(data: T, status: string, retcode: number, message: string = ""): OB11Return<T> {
@@ -8,21 +9,21 @@ export class OB11Response {
             data: data,
             message: message,
             wording: message,
-            echo: ""
+            echo: null
         }
     }
 
-    static ok<T>(data: T, echo: string = "") {
+    static ok<T>(data: T, echo: any = null) {
         let res = OB11Response.res<T>(data, "ok", 0)
-        if (echo) {
+        if (!isNull(echo)) {
             res.echo = echo;
         }
         return res;
     }
 
-    static error(err: string, retcode: number, echo: string = "") {
+    static error(err: string, retcode: number, echo: any = null) {
         let res = OB11Response.res(null, "failed", retcode, err)
-        if (echo) {
+        if (!isNull(echo)) {
             res.echo = echo;
         }
         return res;

src/onebot11/constructor.ts

@@ -5,26 +5,46 @@ import {
     OB11Message,
     OB11MessageData,
     OB11MessageDataType,
-    OB11User
+    OB11User,
+    OB11UserSex
 } from "./types";
-import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types';
-import {getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data';
-import {file2base64, getConfigUtil, log} from "../common/utils";
-import {NTQQApi} from "../ntqqapi/ntcall";
+import {
+    AtType,
+    ChatType,
+    GrayTipElementSubType,
+    Group,
+    GroupMember,
+    IMAGE_HTTP_HOST,
+    RawMessage,
+    SelfInfo, Sex,
+    TipGroupElementType,
+    User
+} from '../ntqqapi/types';
+import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
+import {getConfigUtil, log, sleep} from "../common/utils";
 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";
+import {NTQQUserApi} from "../ntqqapi/api/user";
+import {NTQQFileApi} from "../ntqqapi/api/file";
+import {calcQQLevel} from "../common/utils/qqlevel";
 
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
 
-        const {enableLocalFile2Url} = getConfigUtil().getConfig()
+        const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig()
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
             self_id: parseInt(selfInfo.uin),
             user_id: parseInt(msg.senderUin),
-            time: parseInt(msg.msgTime) || 0,
+            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),
@@ -34,7 +54,8 @@ export class OB11Constructor {
             raw_message: "",
             font: 14,
             sub_type: "friend",
-            message: [],
+            message: messagePostFormat === 'string' ? '' : [],
+            message_format: messagePostFormat === 'string' ? 'string' : 'array',
             post_type: selfInfo.uin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
         }
         if (msg.chatType == ChatType.group) {
@@ -53,6 +74,10 @@ export class OB11Constructor {
             }
         } else if (msg.chatType == ChatType.temp) {
             resMsg.sub_type = "group"
+            const tempGroupCode = tempGroupCodeMap[msg.peerUin]
+            if (tempGroupCode) {
+                resMsg.group_id = parseInt(tempGroupCode)
+            }
         }
 
         for (let element of msg.elements) {
@@ -63,55 +88,113 @@ export class OB11Constructor {
             if (element.textElement && element.textElement?.atType !== AtType.notAt) {
                 message_data["type"] = OB11MessageDataType.at
                 if (element.textElement.atType == AtType.atAll) {
-                    message_data["data"]["mention"] = "all"
+                    // message_data["data"]["mention"] = "all"
                     message_data["data"]["qq"] = "all"
                 } else {
                     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
                         }
                     }
                     if (atQQ) {
-                        message_data["data"]["mention"] = atQQ
+                        // message_data["data"]["mention"] = atQQ
                         message_data["data"]["qq"] = atQQ
                     }
                 }
             } else if (element.textElement) {
                 message_data["type"] = "text"
-                let text= element.textElement.content
-                if (!text.trim()){
+                let text = element.textElement.content
+                if (!text.trim()) {
                     continue;
                 }
                 message_data["data"]["text"] = text
-                if (text){
-                    resMsg.raw_message += text
-                }
-            } else if (element.picElement) {
-                message_data["type"] = "image"
-                message_data["data"]["file_id"] = element.picElement.fileUuid
-                message_data["data"]["path"] = element.picElement.sourcePath
-                message_data["data"]["file"] = element.picElement.sourcePath
-                message_data["data"]["http_file"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
-                try {
-                    await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                        element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
-                } catch (e) {
-                }
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
-                const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
-                if (replyMsg) {
-                    message_data["data"]["id"] = replyMsg.msgShortId
-                } else {
-                    continue
+                // log("收到回复消息", element.replyElement.replayMsgSeq)
+                try {
+                    const replyMsg = await dbUtil.getMsgBySeqId(element.replyElement.replayMsgSeq)
+                    // log("找到回复消息", replyMsg.msgShortId, replyMsg.msgId)
+                    if (replyMsg) {
+                        message_data["data"]["id"] = replyMsg.msgShortId.toString()
+                    } else {
+                        continue
+                    }
+                } catch (e) {
+                    log("获取不到引用的消息", e.stack, element.replyElement.replayMsgSeq)
                 }
+
+            } else if (element.picElement) {
+                message_data["type"] = "image"
+                // message_data["data"]["file"] = element.picElement.sourcePath
+                message_data["data"]["file"] = element.picElement.fileName
+                // message_data["data"]["path"] = element.picElement.sourcePath
+                const url = element.picElement.originImageUrl
+                const fileMd5 = element.picElement.md5HexStr
+                if (url) {
+                    message_data["data"]["url"] = IMAGE_HTTP_HOST + 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
+                message_data["data"]["file_size"] = element.picElement.fileSize
+                dbUtil.addFileCache(element.picElement.fileName, {
+                    fileName: element.picElement.fileName,
+                    filePath: element.picElement.sourcePath,
+                    fileSize: element.picElement.fileSize.toString(),
+                    url: message_data["data"]["url"],
+                    downloadFunc: async () => {
+                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                            element.elementId, element.picElement.thumbPath?.get(0) || "", element.picElement.sourcePath)
+                    }
+                }).then()
+                // 不在自动下载图片
+
+            } else if (element.videoElement) {
+                message_data["type"] = OB11MessageDataType.video;
+                message_data["data"]["file"] = element.videoElement.fileName
+                message_data["data"]["path"] = element.videoElement.filePath
+                // message_data["data"]["file_id"] = element.videoElement.fileUuid
+                message_data["data"]["file_size"] = element.videoElement.fileSize
+                dbUtil.addFileCache(element.videoElement.fileName, {
+                    fileName: element.videoElement.fileName,
+                    filePath: element.videoElement.filePath,
+                    fileSize: element.videoElement.fileSize,
+                    downloadFunc: async () => {
+                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                            element.elementId, element.videoElement.thumbPath.get(0), element.videoElement.filePath)
+                    }
+                }).then()
+                // 怎么拿到url呢
+            } else if (element.fileElement) {
+                message_data["type"] = OB11MessageDataType.file;
+                message_data["data"]["file"] = element.fileElement.fileName
+                // message_data["data"]["path"] = element.fileElement.filePath
+                // message_data["data"]["file_id"] = element.fileElement.fileUuid
+                message_data["data"]["file_size"] = element.fileElement.fileSize
+                dbUtil.addFileCache(element.fileElement.fileName, {
+                    fileName: element.fileElement.fileName,
+                    filePath: element.fileElement.filePath,
+                    fileSize: element.fileElement.fileSize,
+                    downloadFunc: async () => {
+                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                            element.elementId, null, element.fileElement.filePath)
+                    }
+                }).then()
+                // 怎么拿到url呢
             } else if (element.pttElement) {
                 message_data["type"] = OB11MessageDataType.voice;
-                message_data["data"]["file"] = element.pttElement.filePath
-                message_data["data"]["file_id"] = element.pttElement.fileUuid
+                message_data["data"]["file"] = element.pttElement.fileName
+                message_data["data"]["path"] = element.pttElement.filePath
+                // message_data["data"]["file_id"] = element.pttElement.fileUuid
+                message_data["data"]["file_size"] = element.pttElement.fileSize
+                dbUtil.addFileCache(element.pttElement.fileName, {
+                    fileName: element.pttElement.fileName,
+                    filePath: element.pttElement.filePath,
+                    fileSize: element.pttElement.fileSize,
+                }).then()
 
                 // log("收到语音消息", msg)
                 // window.LLAPI.Ptt2Text(message.raw.msgId, message.peer, messages).then(text => {
@@ -126,31 +209,96 @@ export class OB11Constructor {
                 message_data["type"] = OB11MessageDataType.face;
                 message_data["data"]["id"] = element.faceElement.faceIndex.toString();
             }
-            if (message_data.data.file) {
-                let filePath: string = message_data.data.file;
-                if (!enableLocalFile2Url) {
-                    message_data.data.file = "file://" + filePath
-                } else { // 不使用本地路径
-                    if (message_data.data.http_file) {
-                        message_data.data.file = message_data.data.http_file
-                    } else {
-                        let {err, data} = await file2base64(filePath);
-                        if (err) {
-                            log("文件转base64失败", filePath, err)
-                        } else {
-                            message_data.data.file = "base64://" + data
-                        }
-                    }
-                }
-            }
             if (message_data.type !== "unknown" && message_data.data) {
-                resMsg.message.push(message_data);
+                const cqCode = encodeCQCode(message_data);
+                if (messagePostFormat === 'string') {
+                    (resMsg.message as string) += cqCode;
+                } else (resMsg.message as OB11MessageData[]).push(message_data);
+
+                resMsg.raw_message += cqCode;
             }
         }
         resMsg.raw_message = resMsg.raw_message.trim();
         return resMsg;
     }
 
+    static async GroupEvent(msg: RawMessage): Promise<OB11GroupNoticeEvent> {
+        if (msg.chatType !== ChatType.group) {
+            return;
+        }
+        // log("group msg", msg);
+        for (let element of msg.elements) {
+            const grayTipElement = element.grayTipElement
+            const groupElement = 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 NTQQUserApi.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 NTQQUserApi.getUserDetailInfo(memberUid))?.uin
+                    }
+                    else {
+                        memberUin = "0";  // 0表示全员禁言
+                        if (duration > 0) {
+                            duration = -1
+                        }
+                    }
+                    const adminUin = (await getGroupMember(msg.peerUid, adminUid))?.uin || (await NTQQUserApi.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.fileUuid, name: element.fileElement.fileName, size: parseInt(element.fileElement.fileSize)})
+            }
+
+            if (grayTipElement) {
+                if (grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER){
+                    log("收到新人被邀请进群消息", grayTipElement)
+                    const xmlElement = grayTipElement.xmlElement
+                    if (xmlElement?.content){
+                        const regex = /jp="(\d+)"/g;
+
+                        let matches = [];
+                        let match = null
+
+                        while ((match = regex.exec(xmlElement.content)) !== null) {
+                            matches.push(match[1]);
+                        }
+                        if (matches.length === 2){
+                            const [inviter, invitee] = matches;
+                            return new OB11GroupIncreaseEvent(parseInt(msg.peerUid), parseInt(invitee), parseInt(inviter), "invite");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     static friend(friend: User): OB11User {
         return {
             user_id: parseInt(friend.uin),
@@ -179,12 +327,32 @@ export class OB11Constructor {
         }[role]
     }
 
+    static sex(sex: Sex): OB11UserSex{
+        const sexMap = {
+            [Sex.male]: OB11UserSex.male,
+            [Sex.female]: OB11UserSex.female,
+            [Sex.unknown]: OB11UserSex.unknown
+        }
+        return sexMap[sex] || OB11UserSex.unknown
+    }
     static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
             group_id: parseInt(group_id),
             user_id: parseInt(member.uin),
             nickname: member.nick,
-            card: member.cardName
+            card: member.cardName,
+            sex: OB11Constructor.sex(member.sex),
+            age: 0,
+            area: "",
+            level: member.qqLevel && calcQQLevel(member.qqLevel) || 0,
+            join_time: 0,  // 暂时没法获取
+            last_sent_time: 0,  // 暂时没法获取
+            title_expire_time: 0,
+            unfriendly: false,
+            card_changeable: true,
+            is_robot: member.isRobot,
+            shut_up_timestamp: member.shutUpTime,
+            role: OB11Constructor.groupMemberRole(member.role),
         }
     }
 
@@ -205,4 +373,4 @@ export class OB11Constructor {
     static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Constructor.group)
     }
-}
+}

src/onebot11/cqcode.ts

@@ -29,7 +29,7 @@ function h(type: string, data: any) {
     }
 }
 
-export function parseCQCode(source: string): OB11MessageData[] {
+export function decodeCQCode(source: string): OB11MessageData[] {
     const elements: any[] = []
     let result: ReturnType<typeof from>
     while ((result = from(source))) {
@@ -44,6 +44,35 @@ export function parseCQCode(source: string): OB11MessageData[] {
     return elements
 }
 
+
+export function encodeCQCode(data: OB11MessageData) {
+    const CQCodeEscapeText = (text: string) => {
+        return text.replace(/\&/g, '&amp;')
+            .replace(/\[/g, '&#91;')
+            .replace(/\]/g, '&#93;')
+            
+    };
+
+    const CQCodeEscape = (text: string) => {
+        return text.replace(/\&/g, '&amp;')
+            .replace(/\[/g, '&#91;')
+            .replace(/\]/g, '&#93;')
+            .replace(/,/g, '&#44;');
+    };
+
+    if (data.type === 'text') {
+        return CQCodeEscapeText(data.data.text);
+    }
+
+    let result = '[CQ:' + data.type;
+    for (const name in data.data) {
+        const value = data.data[name];
+        result += `,${name}=${CQCodeEscape(value)}`;
+    }
+    result += ']';
+    return result;
+}
+
 // 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/OB11BaseEvent.ts

@@ -10,7 +10,7 @@ export enum EventType {
 
 
 export abstract class OB11BaseEvent {
-    time = new Date().getTime();
+    time = Math.floor(Date.now() / 1000);
     self_id = parseInt(selfInfo.uin);
     post_type: EventType;
 }

src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts

@@ -1,6 +1,6 @@
-import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 
-export class OB11GroupAdminNoticeEvent extends OB11BaseNoticeEvent {
+export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {
     notice_type = "group_admin"
-    sub_type: string  // "set" | "unset"
+    sub_type: "set" | "unset"  // "set" | "unset"
 }

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

@@ -2,7 +2,7 @@ import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 
 export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
     notice_type = "group_decrease";
-    sub_type = "leave";  // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
+    sub_type: "leave" | "kick" | "kick_me" = "leave";  // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
     operate_id: number;
 
     constructor(groupId: number, userId: number) {

src/onebot11/event/notice/OB11GroupIncreaseEvent.ts

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

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/event/notice/OB11PokeEvent.ts

@@ -0,0 +1,31 @@
+import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+import {selfInfo} from "../../../common/data";
+import {OB11BaseEvent} from "../OB11BaseEvent";
+
+class OB11PokeEvent extends OB11BaseNoticeEvent{
+    notice_type = "notify"
+    sub_type = "poke"
+    target_id = parseInt(selfInfo.uin)
+    user_id: number
+
+}
+
+export class OB11FriendPokeEvent extends OB11PokeEvent{
+    sender_id: number
+    constructor(user_id: number) {
+        super();
+        this.user_id = user_id;
+        this.sender_id = user_id;
+    }
+}
+
+export class OB11GroupPokeEvent extends OB11PokeEvent{
+    group_id: number
+
+    constructor(group_id: number, user_id: number=0) {
+        super();
+        this.group_id = group_id;
+        this.target_id = user_id;
+        this.user_id = user_id;
+    }
+}

src/onebot11/event/request/OB11FriendRequest.ts

@@ -0,0 +1,11 @@
+import {OB11BaseNoticeEvent} from "../notice/OB11BaseNoticeEvent";
+import {EventType} from "../OB11BaseEvent";
+
+
+export class OB11FriendRequestEvent extends OB11BaseNoticeEvent {
+    post_type = EventType.REQUEST
+    user_id: number;
+    request_type: "friend" = "friend";
+    comment: string;
+    flag: string;
+}

src/onebot11/event/request/OB11GroupRequest.ts

@@ -0,0 +1,11 @@
+import {OB11GroupNoticeEvent} from "../notice/OB11GroupNoticeEvent";
+import {EventType} from "../OB11BaseEvent";
+
+
+export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {
+    post_type = EventType.REQUEST;
+    request_type: "group" = "group";
+    sub_type: "add" | "invite" = "add";
+    comment: string;
+    flag: string;
+}

src/onebot11/server/http.ts

@@ -6,6 +6,7 @@ import {actionHandlers} from "../action";
 
 class OB11HTTPServer extends HttpServerBase {
     name = "OneBot V11 server"
+
     handleFailed(res: Response, payload: any, e: any) {
         res.send(OB11Response.error(e.stack.toString(), 200))
     }
@@ -19,8 +20,10 @@ class OB11HTTPServer extends HttpServerBase {
 
 export const ob11HTTPServer = new OB11HTTPServer();
 
-for (const action of actionHandlers) {
-    for(const method of ["post", "get"]){
-        ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
+setTimeout(() => {
+    for (const action of actionHandlers) {
+        for (const method of ["post", "get"]) {
+            ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
+        }
     }
-}
+}, 0)

src/onebot11/server/postOB11Event.ts

@@ -3,18 +3,18 @@ import {OB11Message} from "../types";
 import {selfInfo} from "../../common/data";
 import {OB11BaseMetaEvent} from "../event/meta/OB11BaseMetaEvent";
 import {OB11BaseNoticeEvent} from "../event/notice/OB11BaseNoticeEvent";
-import * as websocket from "ws";
+import {WebSocket as WebSocketClass} from "ws";
 import {wsReply} from "./ws/reply";
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 
-const eventWSList: websocket.WebSocket[] = [];
+const eventWSList: WebSocketClass[] = [];
 
-export function registerWsEventSender(ws: websocket.WebSocket) {
+export function registerWsEventSender(ws: WebSocketClass) {
     eventWSList.push(ws);
 }
 
-export function unregisterWsEventSender(ws: websocket.WebSocket) {
+export function unregisterWsEventSender(ws: WebSocketClass) {
     let index = eventWSList.indexOf(ws);
     if (index !== -1) {
         eventWSList.splice(index, 1);
@@ -29,10 +29,10 @@ export function postWsEvent(event: PostEventType) {
     }
 }
 
-export function postEvent(msg: PostEventType) {
+export function postOB11Event(msg: PostEventType, reportSelf = false) {
     const config = getConfigUtil().getConfig();
     // 判断msg是否是event
-    if (!config.reportSelfMessage) {
+    if (!config.reportSelfMessage && !reportSelf) {
         if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
             return
         }

src/onebot11/server/ws/ReverseWebsocket.ts

@@ -1,19 +1,21 @@
 import {getConfigUtil, log} from "../../../common/utils";
 
-import * as WebSocket from "ws";
+
 import {selfInfo} from "../../../common/data";
 import {LifeCycleSubType, OB11LifeCycleEvent} from "../../event/meta/OB11LifeCycleEvent";
 import {ActionName} from "../../action/types";
 import {OB11Response} from "../../action/utils";
 import BaseAction from "../../action/BaseAction";
 import {actionMap} from "../../action";
-import {registerWsEventSender, unregisterWsEventSender} from "../postevent";
+import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
 import {wsReply} from "./reply";
+import {WebSocket as WebSocketClass} from "ws";
+import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";
 
 export let rwsList: ReverseWebsocket[] = [];
 
 export class ReverseWebsocket {
-    public websocket: WebSocket.WebSocket;
+    public websocket: WebSocketClass;
     public url: string;
     private running: boolean = false;
 
@@ -33,8 +35,8 @@ export class ReverseWebsocket {
     }
 
     public async onmessage(msg: string) {
-        let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}}
-        let echo = ""
+        let receiveData: { action: ActionName, params: any, echo?: any } = {action: null, params: {}}
+        let echo = null
         try {
             receiveData = JSON.parse(msg.toString())
             echo = receiveData.echo
@@ -75,8 +77,8 @@ export class ReverseWebsocket {
     }
 
     private connect() {
-        const {token} = getConfigUtil().getConfig()
-        this.websocket = new WebSocket.WebSocket(this.url, {
+        const {token, heartInterval} = getConfigUtil().getConfig()
+        this.websocket = new WebSocketClass(this.url, {
             handshakeTimeout: 2000,
             perMessageDeflate: false,
             headers: {
@@ -100,7 +102,11 @@ export class ReverseWebsocket {
 
         this.websocket.on("error", log);
 
+        const wsClientInterval = setInterval(() => {
+            postWsEvent(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval));
+        }, heartInterval);  // 心跳包
         this.websocket.on("close", () => {
+            clearInterval(wsClientInterval);
             log("The websocket connection: " + this.url + " closed, trying reconnecting...");
             this.onclose();
         });

src/onebot11/server/ws/WebsocketServer.ts

@@ -2,7 +2,7 @@ import {WebSocket} from "ws";
 import {getConfigUtil, log} from "../../../common/utils";
 import {actionMap} from "../../action";
 import {OB11Response} from "../../action/utils";
-import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postevent";
+import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
 import {ActionName} from "../../action/types";
 import BaseAction from "../../action/BaseAction";
 import {LifeCycleSubType, OB11LifeCycleEvent} from "../../event/meta/OB11LifeCycleEvent";
@@ -10,6 +10,7 @@ import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";
 import {WebsocketServerBase} from "../../../common/server/websocket";
 import {IncomingMessage} from "node:http";
 import {wsReply} from "./reply";
+import {selfInfo} from "../../../common/data";
 
 let heartbeatRunning = false;
 
@@ -18,7 +19,7 @@ class OB11WebsocketServer extends WebsocketServerBase {
         wsClient.send(JSON.stringify(OB11Response.res(null, "failed", 1403, "token验证失败")))
     }
 
-    async handleAction(wsClient: WebSocket, actionName: string, params: any, echo?: string) {
+    async handleAction(wsClient: WebSocket, actionName: string, params: any, echo?: any) {
         const action: BaseAction<any, any> = actionMap.get(actionName);
         if (!action) {
             return wsReply(wsClient, OB11Response.error("不支持的api " + actionName, 1404, echo))
@@ -27,15 +28,15 @@ class OB11WebsocketServer extends WebsocketServerBase {
             let handleResult = await action.websocketHandle(params, echo);
             wsReply(wsClient, handleResult)
         } catch (e) {
-            wsReply(wsClient, OB11Response.error(`api处理出错:${e}`, 1200, echo))
+            wsReply(wsClient, OB11Response.error(`api处理出错:${e.stack}`, 1200, echo))
         }
     }
 
     onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
         if (url == "/api" || url == "/api/" || url == "/") {
             wsClient.on("message", async (msg) => {
-                let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}}
-                let echo = ""
+                let receiveData: { action: ActionName, params: any, echo?: any } = {action: null, params: {}}
+                let echo = null
                 try {
                     receiveData = JSON.parse(msg.toString())
                     echo = receiveData.echo
@@ -58,7 +59,7 @@ class OB11WebsocketServer extends WebsocketServerBase {
             }
             const {heartInterval} = getConfigUtil().getConfig();
             const wsClientInterval = setInterval(() => {
-                postWsEvent(new OB11HeartbeatEvent(true, true, heartInterval));
+                postWsEvent(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval));
             }, heartInterval);  // 心跳包
             wsClient.on("close", () => {
                 log("event上报ws客户端已断开")

src/onebot11/server/ws/reply.ts

@@ -1,18 +1,17 @@
-import * as websocket from "ws";
+import {WebSocket as WebSocketClass} from "ws";
 import {OB11Response} from "../../action/utils";
-import {PostEventType} from "../postevent";
-import {log} from "../../../common/utils";
+import {PostEventType} from "../postOB11Event";
+import {isNull, log} from "../../../common/utils";
 
-export function wsReply(wsClient: websocket.WebSocket, data: OB11Response | PostEventType) {
+export function wsReply(wsClient: WebSocketClass, data: OB11Response | PostEventType) {
     try {
-        let packet = Object.assign({
-        }, data);
-        if (!packet["echo"]){
+        let packet = Object.assign({}, data);
+        if (isNull(packet["echo"])) {
             delete packet["echo"];
         }
         wsClient.send(JSON.stringify(packet))
-        log("ws 消息上报", wsClient.url || "", data)
+        log("ws 消息上报", wsClient.url || "", data);
     } catch (e) {
-        log("websocket 回复失败", e)
+        log("websocket 回复失败", e.stack, data);
     }
 }

src/onebot11/types.ts

@@ -1,4 +1,4 @@
-import {AtType, RawMessage} from "../ntqqapi/types";
+import {RawMessage} from "../ntqqapi/types";
 import {EventType} from "./event/OB11BaseEvent";
 
 export interface OB11User {
@@ -31,6 +31,14 @@ export interface OB11GroupMember {
     level?: number
     role?: OB11GroupMemberRole
     title?: string
+    area?: string
+    unfriendly?: boolean
+    title_expire_time?: number
+    card_changeable?: boolean
+    // 以下为gocq字段
+    shut_up_timestamp?: number
+    // 以下为扩展字段
+    is_robot?: boolean
 }
 
 export interface OB11Group {
@@ -59,13 +67,14 @@ 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",
     sub_type?: "friend" | "group" | "normal",
     sender: OB11Sender,
-    message: OB11MessageData[],
+    message: OB11MessageData[] | string,
+    message_format: 'array' | 'string',
     raw_message: string,
     font: number,
     post_type?: EventType,
@@ -77,19 +86,22 @@ export interface OB11Return<DataType> {
     retcode: number
     data: DataType
     message: string,
-    echo?: string, // ws调用api才有此字段
+    echo?: any, // ws调用api才有此字段
     wording?: string,  // go-cqhttp字段，错误信息
 }
 
 export enum OB11MessageDataType {
     text = "text",
     image = "image",
+    music = "music",
+    video = "video",
     voice = "record",
+    file = "file",
     at = "at",
     reply = "reply",
     json = "json",
     face = "face",
-    node = "node"  // 合并转发消息
+    node = "node",  // 合并转发消息
 }
 
 export interface OB11MessageText {
@@ -101,19 +113,31 @@ export interface OB11MessageText {
 
 interface OB11MessageFileBase {
     data: {
+        name?: string;
         file: string,
-        http_file?: string;
+        url?: string;
     }
 }
 
 export interface OB11MessageImage extends OB11MessageFileBase {
     type: OB11MessageDataType.image
+    data: OB11MessageFileBase['data'] & {
+        summary ? : string; // 图片摘要
+    }
 }
 
 export interface OB11MessageRecord extends OB11MessageFileBase {
     type: OB11MessageDataType.voice
 }
 
+export interface OB11MessageFile extends OB11MessageFileBase {
+    type: OB11MessageDataType.file
+}
+
+export interface OB11MessageVideo extends OB11MessageFileBase {
+    type: OB11MessageDataType.video
+}
+
 export interface OB11MessageAt {
     type: OB11MessageDataType.at
     data: {
@@ -147,12 +171,24 @@ export interface OB11MessageNode {
     }
 }
 
+export interface OB11MessageCustomMusic{
+    type: OB11MessageDataType.music
+    data: {
+        type: "custom"
+        url: string,
+        audio: string,
+        title: string,
+        content?: string,
+        image?: string
+    }
+}
+
 export type OB11MessageData =
     OB11MessageText |
     OB11MessageFace |
     OB11MessageAt | OB11MessageReply |
-    OB11MessageImage | OB11MessageRecord |
-    OB11MessageNode
+    OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
+    OB11MessageNode | OB11MessageCustomMusic
 
 export interface OB11PostSendMsg {
     message_type?: "private" | "group"