Merge remote-tracking branch 'origin/main'

fix cqcode encode

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

electron.vite.config.ts

@@ -0,0 +1,69 @@
+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' }] })]
+    },
+    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,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.11.0",
+  "name": "LLOneBot v3.13.10",
   "slug": "LLOneBot",
   "description": "LiteLoaderQQNT的OneBotApi",
-  "version": "3.11.0",
+  "version": "3.13.10",
   "thumbnail": "./icon.png",
   "authors": [
     {
@@ -26,8 +26,8 @@
     "darwin"
   ],
   "injects": {
-    "renderer": "./renderer.js",
+    "renderer": "./renderer/index.js",
-    "main": "./main.js",
+    "main": "./main/main.cjs",
-    "preload": "./preload.js"
+    "preload": "./preload/preload.cjs"
   }
 }

package.json

@@ -1,46 +1,44 @@
 {
   "name": "llonebot",
   "version": "1.0.0",
+  "type": "module",
   "description": "NTQQLiteLoaderOneBotApi",
   "main": "dist/main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "electron-vite build",
-    "build": "npm run build-main && npm run build-preload && npm run build-renderer && npm run build-version",
+    "build-mac": "npm run build && npm run deploy-mac",
-    "build-main": "webpack --config webpack.main.config.js",
+    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
-    "build-preload": "webpack --config webpack.preload.config.js",
+    "build-win": "npm run build && npm run deploy-win",
-    "build-renderer": "webpack --config webpack.renderer.config.js",
+    "deploy-win": "cmd /c \"xcopy /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
-    "build-version": "ts-node ./scripts/gen-version.ts",
-    "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\\\""
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "express": "^4.18.2",
+    "file-type": "^19.0.0",
     "fluent-ffmpeg": "^2.1.2",
-    "json-bigint": "^1.0.0",
+    "level": "^8.0.1",
-    "music-metadata": "^8.1.4",
     "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/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",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "copy-webpack-plugin": "^12.0.2",
     "electron": "^29.0.1",
-    "ts-loader": "^9.5.0",
+    "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": "^5.2.2",
+    "typescript": "*",
-    "webpack": "^5.89.0",
+    "vite": "^5.1.4",
-    "webpack-cli": "^5.1.4"
+    "vite-plugin-cp": "^4.0.8"
   }
 }

scripts/gen-version.ts

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

src/common/channels.ts

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

src/common/config.ts

@@ -1,8 +1,10 @@
 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 HOOK_LOG = false;
+
+export const ALLOW_SEND_TEMP_MSG = false;
 
 export class ConfigUtil {
     private readonly configPath: string;
@@ -12,7 +14,7 @@ export class ConfigUtil {
         this.configPath = configPath;
     }
 
-    getConfig(cache=true) {
+    getConfig(cache = true) {
         if (this.config && cache) {
             return this.config;
         }

src/common/data.ts

@@ -1,111 +1,108 @@
-import {NTQQApi} from '../ntqqapi/ntcall';
+import {NTQQApi} from '../ntqqapi/ntcall'
 import {
-    FileElement,
+    type Friend,
-    Friend,
+    type FriendRequest,
-    FriendRequest,
+    type Group,
-    Group,
+    type GroupMember,
-    GroupMember,
+    type GroupNotify,
-    GroupNotify,
+    type RawMessage,
-    PicElement, PttElement,
+    type SelfInfo
-    RawMessage,
+} from '../ntqqapi/types'
-    SelfInfo, VideoElement
+import {type FileCache, type LLOneBotError} from './types'
-} from "../ntqqapi/types";
+import {dbUtil} from "./db";
-import {FileCache, LLOneBotError} from "./types";
+import {raw} from "express";
-export let selfInfo: SelfInfo = {
+import {log} from "./utils";
-    uid: "",
+
-    uin: "",
+export const selfInfo: SelfInfo = {
-    nick: "",
+    uid: '',
-    online: true,
+    uin: '',
+    nick: '',
+    online: true
 }
 export let groups: Group[] = []
 export let friends: Friend[] = []
-export let msgHistory: Record<string, RawMessage> = {}  // msgId: RawMessage
+export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>()
-export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>();
+export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
-export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>();
+export const llonebotError: LLOneBotError = {
-export let llonebotError: LLOneBotError = {
+    ffmpegError: '',
-    ffmpegError: "",
+    otherError: ''
-    otherError: ""
-}
-let globalMsgId = Math.floor(Date.now() / 1000);
-
-export let fileCache: Map<string, FileCache> = new Map();
-
-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 async function getFriend(qq: string): Promise<Friend | undefined> {
+export async function getFriend(qq: string, uid: string = ""): Promise<Friend | undefined> {
-    let friend = friends.find(friend => friend.uin === qq)
+    let filterKey = uid ? "uid" : "uin"
-    // if (!friend){
+    let filterValue = uid ? uid : qq
-    //     friends = (await NTQQApi.getFriends(true))
+    let friend = friends.find(friend => friend[filterKey] === filterValue.toString())
-    //     friend = friends.find(friend => friend.uin === qq)
+    // 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)
+    let group = groups.find(group => group.groupCode === qq.toString())
-    // if (!group){
+    if (!group) {
-    //     groups = await NTQQApi.getGroups(true);
+        try {
-    //     group = groups.find(group => group.groupCode === qq)
+            const _groups = await NTQQApi.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 | number, memberQQ: string | number, memberUid: string = null) {
-    groupQQ = groupQQ.toString();
+    groupQQ = groupQQ.toString()
-    if (memberQQ){
+    if (memberQQ) {
-        memberQQ = memberQQ.toString();
+        memberQQ = memberQQ.toString()
     }
     const group = await getGroup(groupQQ)
     if (group) {
-        let filterFunc: (member: GroupMember) => boolean
+        const filterKey = memberQQ ? "uin" : "uid"
-        if (memberQQ) {
+        const filterValue = memberQQ ? memberQQ : memberUid
-            filterFunc = member => member.uin === memberQQ
+        let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
-        } else if (memberUid) {
-            filterFunc = member => member.uid === memberUid
-        }
         let member = group.members?.find(filterFunc)
         if (!member) {
-            const _members = await NTQQApi.getGroupMembers(groupQQ)
+            try {
-            if (_members.length) {
+                const _members = await NTQQApi.getGroupMembers(groupQQ)
-                group.members = _members
+                if (_members.length > 0) {
+                    group.members = _members
+                }
+            } catch (e) {
+                // log("刷新群成员列表失败", e.stack.toString())
             }
+
             member = group.members?.find(filterFunc)
         }
         return member
     }
+    return null
 }
 
-
+export async function refreshGroupMembers(groupQQ: string) {
-
+    const group = groups.find(group => group.groupCode === groupQQ)
-
+    if (group) {
-export function getHistoryMsgBySeq(seq: string) {
+        group.members = await NTQQApi.getGroupMembers(groupQQ)
-    return Object.values(msgHistory).find(msg => msg.msgSeq === seq)
+    }
 }
 
-
+export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
-export let 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 let tempGroupCodeMap: Record<string, string> = {}  // peerUid => 群号

src/common/db.ts

@@ -0,0 +1,208 @@
+import {Level} from "level";
+import {RawMessage} from "../ntqqapi/types";
+import {DATA_DIR, log} from "./utils";
+import {selfInfo} from "./data";
+import {FileCache} from "./types";
+
+
+class DBUtil {
+    private readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
+    private readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
+    private readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
+    private readonly DB_KEY_PREFIX_FILE = "file_";
+    private db: Level;
+    public cache: Record<string, RawMessage | string | FileCache> = {}  // <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()
+        setInterval(() => {
+            this.cache = {}
+        }, 1000 * 60 * 10)
+    }
+
+    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
+    }
+
+    async getMsgByShortId(shortMsgId: number): Promise<RawMessage> {
+        const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
+        if (this.cache[shortMsgIdKey]) {
+            return this.cache[shortMsgIdKey] as RawMessage
+        }
+        const longId = await this.db.get(shortMsgIdKey);
+        const msg = await this.getMsgByLongId(longId)
+        this.addCache(msg)
+        return msg
+    }
+
+    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
+        }
+        const data = await this.db.get(longIdKey)
+        const msg = JSON.parse(data)
+        this.addCache(msg)
+        return msg
+    }
+
+    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
+        }
+        const longId = await this.db.get(seqIdKey);
+        const msg = await this.getMsgByLongId(longId)
+        this.addCache(msg)
+        return msg
+    }
+
+    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);
+        // log("新增消息记录", msg.msgId)
+        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;
+        try {
+            this.db.put(shortIdKey, msg.msgId).then();
+            this.db.put(longIdKey, JSON.stringify(msg)).then();
+            try {
+                await this.db.get(seqIdKey)
+            } catch (e) {
+                // log("新的seqId", seqIdKey)
+                this.db.put(seqIdKey, msg.msgId).then();
+            }
+            if (!this.cache[seqIdKey]) {
+                this.cache[seqIdKey] = msg;
+            }
+            // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
+        } catch (e) {
+            // log("addMsg db error", e.stack.toString());
+        }
+        return shortMsgId
+    }
+
+    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();
+        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();
+        try {
+            await this.db.get(seqIdKey)
+        } catch (e) {
+            this.db.put(seqIdKey, msg.msgId).then();
+            // 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++;
+        await this.db.put(key, this.currentShortId.toString());
+        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;
+        await this.db.put(key, JSON.stringify(cacheDBData));
+    }
+
+    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) {
+
+        }
+    }
+}
+
+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 {
@@ -14,23 +12,7 @@ export abstract class HttpServerBase {
     constructor() {
         this.expressAPP = express();
         this.expressAPP.use(express.urlencoded({extended: true, limit: "500mb"}));
-        this.expressAPP.use((req, res, next) => {
+        this.expressAPP.use(json({limit: "500mb"}));
-            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);
-                    }
-                }
-                next();
-            });
-        });
     }
 
     authorize(req: Request, res: Response, next: () => void) {
@@ -63,13 +45,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 +63,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 = new WebSocketServer({port});
-        this.ws.on("connection", (wsClient, req)=>{
+        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,40 +1,37 @@
-import {FileElement, PicElement, PttElement, VideoElement} from "../ntqqapi/types";
-
 export interface OB11Config {
-    httpPort: number
+  httpPort: number
-    httpHosts: string[]
+  httpHosts: string[]
-    wsPort: number
+  wsPort: number
-    wsHosts: string[]
+  wsHosts: string[]
-    enableHttp?: boolean
+  enableHttp?: boolean
-    enableHttpPost?: boolean
+  enableHttpPost?: boolean
-    enableWs?: boolean
+  enableWs?: boolean
-    enableWsReverse?: boolean
+  enableWsReverse?: boolean
-    messagePostFormat?: 'array' | 'string'
+  messagePostFormat?: 'array' | 'string'
 }
 
 export interface Config {
-    ob11: OB11Config
+  ob11: OB11Config
-    token?: string
+  token?: string
-    heartInterval?: number  // ms
+  heartInterval?: number // ms
-    enableLocalFile2Url?: boolean  // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
+  enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
-    debug?: boolean
+  debug?: boolean
-    reportSelfMessage?: boolean
+  reportSelfMessage?: boolean
-    log?: boolean
+  log?: boolean
-    autoDeleteFile?: boolean
+  autoDeleteFile?: boolean
-    autoDeleteFileSecond?: number
+  autoDeleteFileSecond?: number
-    ffmpeg?: string  // ffmpeg路径
+  ffmpeg?: string // ffmpeg路径
 }
 
-export type LLOneBotError = {
+export interface LLOneBotError {
-    ffmpegError?: string
+  ffmpegError?: string
-    otherError?: string
+  otherError?: string
 }
 
-
+export interface FileCache {
-export interface FileCache{
+  fileName: string
-    fileName: string,
+  filePath: string
-    filePath: string,
+  fileSize: string
-    fileSize: string,
+  url?: string
-    url?: string,
+  downloadFunc?: () => Promise<void>
-    downloadFunc?: () => Promise<void>;
+}
-}

src/common/utils.ts

@@ -1,4 +1,4 @@
-import * as path from "path";
+import * as path from "node:path";
 import {selfInfo} from "./data";
 import {ConfigUtil} from "./config";
 import util from "util";
@@ -7,10 +7,10 @@ import fs from 'fs';
 import {v4 as uuidv4} from "uuid";
 import ffmpeg from "fluent-ffmpeg"
 
-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)
 }
 
@@ -33,7 +33,7 @@ function truncateString(obj: any, maxLength = 500) {
 
 export function log(...msg: any[]) {
     if (!getConfigUtil().getConfig().log) {
-        return
+        return //console.log(...msg);
     }
     let currentDateTime = new Date().toLocaleString();
     const date = new Date();
@@ -55,7 +55,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) => {
 
     })
 }
@@ -178,26 +178,26 @@ export async function encodeSilk(filePath: string) {
         return isWav(fs.readFileSync(filePath));
     }
 
-    async function getAudioSampleRate(filePath: string) {
+    // async function getAudioSampleRate(filePath: string) {
-        try {
+    //     try {
-            const mm = await import('music-metadata');
+    //         const mm = await import('music-metadata');
-            const metadata = await mm.parseFile(filePath);
+    //         const metadata = await mm.parseFile(filePath);
-            log(`${filePath}采样率`, metadata.format.sampleRate);
+    //         log(`${filePath}采样率`, metadata.format.sampleRate);
-            return metadata.format.sampleRate;
+    //         return metadata.format.sampleRate;
-        } catch (error) {
+    //     } catch (error) {
-            log(`${filePath}采样率获取失败`, error.stack);
+    //         log(`${filePath}采样率获取失败`, error.stack);
-            // console.error(error);
+    //         // console.error(error);
-        }
+    //     }
-    }
+    // }
 
     try {
         const fileName = path.basename(filePath);
-        const pttPath = path.join(CONFIG_DIR, uuidv4());
+        const pttPath = path.join(DATA_DIR, uuidv4());
         if (getFileHeader(filePath) !== "02232153494c4b") {
             log(`语音文件${filePath}需要转换成silk`)
-            const isWav = await isWavFile(filePath);
+            const _isWav = await isWavFile(filePath);
             const wavPath = pttPath + ".wav"
-            if (!isWav) {
+            if (!_isWav) {
                 log(`语音文件${filePath}正在转换成wav`)
                 // let voiceData = await fsp.readFile(filePath)
                 await new Promise((resolve, reject) => {
@@ -219,9 +219,9 @@ export async function encodeSilk(filePath: string) {
                         });
                 })
             }
-            const sampleRate = await getAudioSampleRate(filePath) || 44100;
+            // const sampleRate = await getAudioSampleRate(filePath) || 0;
             const pcm = fs.readFileSync(filePath);
-            const silk = await encode(pcm, sampleRate);
+            const silk = await encode(pcm, 0);
             fs.writeFileSync(pttPath, silk.data);
             fs.unlink(wavPath, (err) => {
             });
@@ -233,7 +233,17 @@ export async function encodeSilk(filePath: string) {
             };
         } else {
             const pcm = fs.readFileSync(filePath);
-            const duration = getDuration(pcm);
+            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,

src/global.d.ts

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

src/main/main.ts

@@ -1,7 +1,7 @@
 // 运行在 Electron 主进程 下的插件入口
 
 import {BrowserWindow, dialog, ipcMain} from 'electron';
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import {Config} from "../common/types";
 import {
     CHANNEL_ERROR,
@@ -11,15 +11,13 @@ import {
     CHANNEL_SET_CONFIG,
 } from "../common/channels";
 import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {checkFfmpeg, CONFIG_DIR, getConfigUtil, log} from "../common/utils";
+import {checkFfmpeg, DATA_DIR, getConfigUtil, log} from "../common/utils";
 import {
-    addHistoryMsg,
+    friendRequests, getFriend,
-    friendRequests,
     getGroup,
     getGroupMember,
     groupNotifies,
-    llonebotError,
+    llonebotError, refreshGroupMembers,
-    msgHistory,
     selfInfo
 } from "../common/data";
 import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
@@ -43,6 +41,7 @@ import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecrease
 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";
 
 
 let running = false;
@@ -82,8 +81,8 @@ function onLoad() {
             return ""
         }
     })
-    if (!fs.existsSync(CONFIG_DIR)) {
+    if (!fs.existsSync(DATA_DIR)) {
-        fs.mkdirSync(CONFIG_DIR, {recursive: true});
+        fs.mkdirSync(DATA_DIR, {recursive: true});
     }
     ipcMain.handle(CHANNEL_ERROR, (event, arg) => {
         return llonebotError;
@@ -141,7 +140,7 @@ function onLoad() {
         // 检查ffmpeg
         if (arg.ffmpeg) {
             checkFfmpeg(arg.ffmpeg).then(success => {
-                if (success){
+                if (success) {
                     llonebotError.ffmpegError = ''
                 }
             })
@@ -153,14 +152,14 @@ function onLoad() {
         log(arg);
     })
 
-    function postReceiveMsg(msgList: RawMessage[]) {
+    async function postReceiveMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
         for (let message of msgList) {
-            // log("收到新消息", message)
+            // log("收到新消息", message.msgId, message.msgSeq)
-            message.msgShortId = msgHistory[message.msgId]?.msgShortId
+            // if (message.senderUin !== selfInfo.uin){
-            if (!message.msgShortId) {
+                message.msgShortId = await dbUtil.addMsg(message);
-                addHistoryMsg(message);
+            // }
-            }
+
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
                     msg.raw = message;
@@ -171,27 +170,29 @@ function onLoad() {
                 }
                 postOB11Event(msg);
                 // log("post msg", msg)
-            }).catch(e => log("constructMessage error: ", e.toString()));
+            }).catch(e => log("constructMessage error: ", e.stack.toString()));
         }
     }
 
     async function startReceiveHook() {
-        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
+        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_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) => {
             for (const message of payload.msgList) {
-                // log("message update", message.sendStatus, message)
+                // log("message update", message.sendStatus, message.msgId, message.msgSeq)
                 if (message.recallTime != "0") {
                     // 撤回消息上报
-                    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);
                         postOB11Event(friendRecallEvent);
@@ -211,21 +212,22 @@ function onLoad() {
 
                         postOB11Event(groupRecallEvent);
                     }
+                    // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
                     continue
                 }
-                addHistoryMsg(message)
+                dbUtil.updateMsg(message).then();
             }
         })
-        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
+        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.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());
             }
         })
         registerReceiveHook<{
@@ -245,29 +247,31 @@ function onLoad() {
 
                 const notifies = notify.notifies.slice(0, payload.unreadCount)
                 // log("获取群通知详情完成", notifies, payload);
-                try {
+
-                    for (const notify of notifies) {
+                for (const notify of notifies) {
+                    try {
                         notify.time = Date.now();
                         const notifyTime = parseInt(notify.seq) / 1000
                         // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
-                        if (notifyTime < startTime) {
+                        // if (notifyTime < startTime) {
-                            continue;
+                        //     continue;
-                        }
+                        // }
                         let existNotify = groupNotifies[notify.seq];
-                        if (existNotify){
+                        if (existNotify) {
-                            if (Date.now() - existNotify.time < 3000){
+                            if (Date.now() - existNotify.time < 3000) {
                                 continue
                             }
                         }
                         log("收到群通知", notify);
                         groupNotifies[notify.seq] = notify;
-                        const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                        // let member2: GroupMember;
-                        let member2: GroupMember;
+                        // if (notify.user2.uid) {
-                        if (notify.user2.uid) {
+                        //     member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
-                            member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
+                        // }
-                        }
                         if ([GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET].includes(notify.type)) {
+                            const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
                             log("有管理员变动通知");
+                            refreshGroupMembers(notify.group.groupCode).then()
                             let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
                             groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
                             log("开始获取变动的管理员")
@@ -280,8 +284,9 @@ function onLoad() {
                                 log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
                             }
                         } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
-                            log("有成员退出通知");
+                            // log("有成员退出通知");
-                            let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                            // 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("有加群请求");
@@ -298,20 +303,26 @@ function onLoad() {
                             groupRequestEvent.comment = notify.postscript;
                             groupRequestEvent.flag = notify.seq;
                             postOB11Event(groupRequestEvent);
-                        }
+                        } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
-                        else if(notify.type == GroupNotifyTypes.INVITE_ME){
+                            log("收到邀请我加群通知")
                             let groupInviteEvent = new OB11GroupRequestEvent();
                             groupInviteEvent.group_id = parseInt(notify.group.groupCode);
-                            let user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
+                            let user_id = (await getFriend("", notify.user2.uid))?.uin
+                            if (!user_id){
+                                user_id = (await NTQQApi.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());
                     }
-                } catch (e) {
-                    log("解析群通知失败", e.stack);
                 }
+
+            } else if (payload.doubt) {
+                // 可能有群管理员变动
             }
         })
 
@@ -368,16 +379,18 @@ function onLoad() {
     let getSelfNickCount = 0;
     const init = async () => {
         try {
+            log("start get self info")
             const _ = await NTQQApi.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 NTQQApi.getUserDetailInfo(selfInfo.uid));
                 log("self info", userInfo);
                 if (userInfo) {
                     selfInfo.nick = userInfo.nick;

src/ntqqapi/constructor.ts

@@ -1,6 +1,6 @@
 import {
     AtType,
-    ElementType,
+    ElementType, PicType, SendArkElement,
     SendFaceElement,
     SendFileElement,
     SendPicElement,
@@ -9,8 +9,8 @@ import {
     SendTextElement
 } from "./types";
 import {NTQQApi} from "./ntcall";
-import {encodeSilk} from "../common/utils";
+import {encodeSilk, isGIF} from "../common/utils";
-import * as fs from "fs";
+import * as fs from "node:fs";
 
 
 export class SendMsgElementConstructor {
@@ -57,6 +57,9 @@ export class SendMsgElementConstructor {
 
     static async pic(picPath: string): Promise<SendPicElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath, ElementType.PIC);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
         const imageSize = await NTQQApi.getImageSize(picPath);
         const picElement = {
             md5HexStr: md5,
@@ -66,7 +69,7 @@ export class SendMsgElementConstructor {
             fileName: fileName,
             sourcePath: path,
             original: true,
-            picType: 1001,
+            picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
             picSubType: 0,
             fileUuid: "",
             fileSubId: "",
@@ -81,19 +84,22 @@ export class SendMsgElementConstructor {
         };
     }
 
-    static async file(filePath: string, isVideo: boolean = false): Promise<SendFileElement> {
+    static async file(filePath: string, showPreview: boolean = false, fileName: string = ""): Promise<SendFileElement> {
         let picHeight = 0;
         let picWidth = 0;
-        if (isVideo) {
+        if (showPreview) {
             picHeight = 1024;
             picWidth = 768;
         }
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        const {md5, fileName: _fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
         let element: SendFileElement = {
             elementType: ElementType.FILE,
             elementId: "",
             fileElement: {
-                fileName,
+                fileName: fileName || _fileName,
                 "filePath": path,
                 "fileSize": (fileSize).toString(),
                 picHeight,
@@ -104,14 +110,17 @@ export class SendMsgElementConstructor {
         return element;
     }
 
-    static video(filePath: string): Promise<SendFileElement> {
+    static video(filePath: string, fileName: string=""): Promise<SendFileElement> {
-        return SendMsgElementConstructor.file(filePath, true);
+        return SendMsgElementConstructor.file(filePath, true, fileName);
     }
 
     static async ptt(pttPath: string): Promise<SendPttElement> {
         const {converted, path: silkPath, duration} = await encodeSilk(pttPath);
         // log("生成语音", silkPath, duration);
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(silkPath, ElementType.PTT);
+        if (fileSize === 0){
+            throw "文件异常，大小为0";
+        }
         if (converted) {
             fs.unlink(silkPath, () => {
             });
@@ -150,4 +159,12 @@ export class SendMsgElementConstructor {
             }
         }
     }
+
+    static ark(data: any): SendArkElement {
+        return {
+            elementType: ElementType.ARK,
+            elementId: "",
+            arkElement: data
+        }
+    }
 }

src/ntqqapi/hook.ts

@@ -2,13 +2,14 @@ import {BrowserWindow} from 'electron';
 import {getConfigUtil, log, sleep} from "../common/utils";
 import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
 import {Group, RawMessage, User} from "./types";
-import {addHistoryMsg, friends, groups, msgHistory, selfInfo} from "../common/data";
+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 {postOB11Event} from "../onebot11/server/postOB11Event";
 import {HOOK_LOG} from "../common/config";
 import fs from "fs";
+import {dbUtil} from "../common/db";
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
@@ -25,7 +26,8 @@ export enum ReceiveCmd {
     UNREAD_GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
     GROUP_NOTIFY = "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
     FRIEND_REQUEST = "nodeIKernelBuddyListener/onBuddyReqChange",
-    SELF_STATUS = "nodeIKernelProfileListener/onSelfStatusChanged",
+    SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+    CACHE_SCAN_FINISH = "nodeIKernelStorageCleanListener/onFinishScan",
 }
 
 interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
@@ -231,21 +233,25 @@ registerReceiveHook<{
 })
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
-    const {autoDeleteFile, autoDeleteFileSecond} = getConfigUtil().getConfig();
+    const {autoDeleteFile} = getConfigUtil().getConfig();
     for (const message of payload.msgList) {
-        // log("收到新消息，push到历史记录", message)
+        // log("收到新消息，push到历史记录", message.msgId)
-        addHistoryMsg(message)
+        // dbUtil.addMsg(message).then()
         // 清理文件
         if (!autoDeleteFile) {
             continue
         }
         for (const msgElement of message.elements) {
             setTimeout(() => {
-                const picPath = msgElement.picElement?.sourcePath;
+                const picPath = msgElement.picElement?.sourcePath
-                const pttPath = msgElement.pttElement?.filePath;
+                const pttPath = msgElement.pttElement?.filePath
-                const pathList = [picPath, pttPath];
+                const pathList = [picPath, pttPath]
-                if (msgElement.picElement){
+                if (msgElement.picElement) {
-                    pathList.push(...Object.values(msgElement.picElement.thumbPath));
+                    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) {
@@ -255,20 +261,18 @@ registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload
                         });
                     }
                 }
-            }, autoDeleteFileSecond * 1000)
+            }, 60 * 1000)
         }
     }
-    const msgIds = Object.keys(msgHistory);
-    if (msgIds.length > 30000) {
-        delete msgHistory[msgIds.sort()[0]]
-    }
 })
 
 registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.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);
@@ -278,6 +282,6 @@ registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRe
     }
 })
 
-registerReceiveHook<{info: {status: number}}>(ReceiveCmd.SELF_STATUS, (info)=>{
+registerReceiveHook<{ info: { status: number } }>(ReceiveCmd.SELF_STATUS, (info) => {
-    selfInfo.online = info.info.status !== 20;
+    selfInfo.online = info.info.status !== 20
-})
+})

src/ntqqapi/ntcall.ts

@@ -15,12 +15,16 @@ import {
     RawMessage,
     SelfInfo,
     SendMessageElement,
-    User
+    User,
+    CacheScanResult,
+    ChatCacheList, ChatCacheListItemBasic,
+    CacheFileList, CacheFileListItem, CacheFileType,
 } from "./types";
 import * as fs from "fs";
-import {addHistoryMsg, friendRequests, groupNotifies, msgHistory, selfInfo} from "../common/data";
+import {friendRequests, groupNotifies, selfInfo, uidMaps} from "../common/data";
 import {v4 as uuidv4} from "uuid"
 import path from "path";
+import {dbUtil} from "../common/db";
 
 interface IPCReceiveEvent {
     eventName: string
@@ -37,6 +41,9 @@ export type IPCReceiveDetail = [
 export enum NTQQApiClass {
     NT_API = "ns-ntApi",
     FS_API = "ns-FsApi",
+    OS_API = "ns-OsApi",
+    HOTUPDATE_API = "ns-HotUpdateApi",
+    BUSINESS_API = "ns-BusinessApi",
     GLOBAL_DATA = "ns-GlobalDataApi"
 }
 
@@ -58,6 +65,7 @@ export enum NTQQApiMethod {
     RECALL_MSG = "nodeIKernelMsgService/recallMsg",
     SEND_MSG = "nodeIKernelMsgService/sendMsg",
     DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia",
+    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",
     MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment", // 合并转发
     GET_GROUP_NOTICE = "nodeIKernelGroupService/getSingleScreenNotifies",
     HANDLE_GROUP_REQUEST = "nodeIKernelGroupService/operateSysNotify",
@@ -71,6 +79,18 @@ export enum NTQQApiMethod {
     SET_MEMBER_ROLE = "nodeIKernelGroupService/modifyMemberRole",
     PUBLISH_GROUP_BULLETIN = "nodeIKernelGroupService/publishGroupBulletinBulletin",
     SET_GROUP_NAME = "nodeIKernelGroupService/modifyGroupName",
+
+    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',
 }
 
 enum NTQQApiChannel {
@@ -182,8 +202,8 @@ interface GeneralCallResult {
 
 export class NTQQApi {
     // static likeFriend = defineNTQQApi<void>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.LIKE_FRIEND)
-    static likeFriend(uid: string, count = 1) {
+    static async likeFriend(uid: string, count = 1) {
-        return callNTQQApi<GeneralCallResult>({
+        return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.LIKE_FRIEND,
             args: [{
                 doLikeUserInfo: {
@@ -196,8 +216,8 @@ export class NTQQApi {
         })
     }
 
-    static getSelfInfo() {
+    static async getSelfInfo() {
-        return callNTQQApi<SelfInfo>({
+        return await callNTQQApi<SelfInfo>({
             className: NTQQApiClass.GLOBAL_DATA,
             methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
         })
@@ -265,7 +285,7 @@ export class NTQQApi {
         return result.groupList
     }
 
-    static async getGroupMembers(groupQQ: string, num = 3000) {
+    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
         const sceneId = await callNTQQApi({
             methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
             args: [{
@@ -287,11 +307,11 @@ export class NTQQApi {
                 ]
             })
             // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
-            let values = result.result.infos.values()
+            const values = result.result.infos.values()
 
-            let members = Array.from(values) as GroupMember[]
+            const members: GroupMember[] = Array.from(values)
             for (const member of members) {
-                // uidMaps[member.uid] = member.uin;
+                uidMaps[member.uid] = member.uin;
             }
             // log(uidMaps);
             // log("members info", values);
@@ -303,38 +323,39 @@ export class NTQQApi {
         }
     }
 
-
+    static async getFileType(filePath: string) {
-    static getFileType(filePath: string) {
+        return await callNTQQApi<{ ext: string }>({
-        return callNTQQApi<{ ext: string }>({
             className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
         })
     }
 
-    static getFileMd5(filePath: string) {
+    static async getFileMd5(filePath: string) {
-        return callNTQQApi<string>({
+        return await callNTQQApi<string>({
             className: NTQQApiClass.FS_API,
             methodName: NTQQApiMethod.FILE_MD5,
             args: [filePath]
         })
     }
 
-    static copyFile(filePath: string, destPath: string) {
+    static async copyFile(filePath: string, destPath: string) {
-        return callNTQQApi<string>({
+        return await callNTQQApi<string>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_COPY, args: [{
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_COPY,
+            args: [{
                 fromPath: filePath,
                 toPath: destPath
             }]
         })
     }
 
-    static getImageSize(filePath: string) {
+    static async getImageSize(filePath: string) {
-        return callNTQQApi<{ width: number, height: number }>({
+        return await callNTQQApi<{ width: number, height: number }>({
             className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
         })
     }
 
-    static getFileSize(filePath: string) {
+    static async getFileSize(filePath: string) {
-        return callNTQQApi<number>({
+        return await callNTQQApi<number>({
             className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
         })
     }
@@ -410,17 +431,18 @@ export class NTQQApi {
         return sourcePath
     }
 
-    static recallMsg(peer: Peer, msgIds: string[]) {
+    static async recallMsg(peer: Peer, msgIds: string[]) {
-        return callNTQQApi({
+        return await callNTQQApi({
-            methodName: NTQQApiMethod.RECALL_MSG, args: [{
+            methodName: NTQQApiMethod.RECALL_MSG,
+            args: [{
                 peer,
                 msgIds
             }, null]
         })
     }
 
-    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = false, timeout = 10000) {
+    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-        const peerUid = peer.peerUid;
+        const peerUid = peer.peerUid
 
         // 等待上一个相同的peer发送完
         let checkLastSendUsingTime = 0;
@@ -448,17 +470,23 @@ export class NTQQApi {
 
         let checkSendCompleteUsingTime = 0;
         const checkSendComplete = async (): Promise<RawMessage> => {
-            if (sentMessage && msgHistory[sentMessage.msgId]?.sendStatus == 2) {
+            if (sentMessage) {
-                // log(`给${peerUid}发送消息成功`)
+                if (waitComplete) {
-                return sentMessage;
+                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
-            } else {
+                        return sentMessage
-                checkSendCompleteUsingTime += 500;
+                    }
-                if (checkSendCompleteUsingTime > timeout) {
-                    throw ("发送超时")
                 }
-                await sleep(500);
+                else{
-                return await checkSendComplete()
+                    return sentMessage
+                }
+                // log(`给${peerUid}发送消息成功`)
             }
+            checkSendCompleteUsingTime += 500
+            if (checkSendCompleteUsingTime > timeout) {
+                throw ('发送超时')
+            }
+            await sleep(500)
+            return await checkSendComplete()
         }
 
         callNTQQApi({
@@ -469,11 +497,29 @@ export class NTQQApi {
                 msgAttributeInfos: new Map(),
             }, null]
         }).then()
-        return checkSendComplete();
+        return await checkSendComplete()
     }
 
-    static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+    static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        let msgInfos = msgIds.map(id => {
+        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 = [
@@ -486,30 +532,30 @@ export class NTQQApi {
             },
             null,
         ]
-        return new Promise<RawMessage>((resolve, reject) => {
+        return await new Promise<RawMessage>((resolve, reject) => {
             let complete = false
             setTimeout(() => {
                 if (!complete) {
                     reject("转发消息超时");
                 }
             }, 5000)
-            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, (payload: { msgRecord: RawMessage }) => {
+            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
-                const msg = payload.msgRecord;
+                const msg = payload.msgRecord
                 // 需要判断它是转发的消息，并且识别到是当前转发的这一条
                 const arkElement = msg.elements.find(ele => ele.arkElement)
                 if (!arkElement) {
                     // log("收到的不是转发消息")
                     return
                 }
-                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData);
+                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
-                if (forwardData.app != "com.tencent.multimsg") {
+                if (forwardData.app != 'com.tencent.multimsg') {
                     return
                 }
                 if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
-                    complete = true;
+                    complete = true
-                    addHistoryMsg(msg)
+                    await dbUtil.addMsg(msg)
-                    resolve(msg);
+                    resolve(msg)
-                    log("转发消息成功：", payload)
+                    log('转发消息成功：', payload)
                 }
             })
             callNTQQApi<GeneralCallResult>({
@@ -600,8 +646,8 @@ export class NTQQApi {
         return result;
     }
 
-    static kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = "") {
+    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
-        return callNTQQApi<GeneralCallResult>(
+        return await callNTQQApi<GeneralCallResult>(
             {
                 methodName: NTQQApiMethod.KICK_MEMBER,
                 args: [
@@ -616,9 +662,9 @@ export class NTQQApi {
         )
     }
 
-    static banMember(groupQQ: string, memList: { uid: string, timeStamp: number }[]) {
+    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
         // timeStamp为秒数, 0为解除禁言
-        return callNTQQApi<GeneralCallResult>(
+        return await callNTQQApi<GeneralCallResult>(
             {
                 methodName: NTQQApiMethod.MUTE_MEMBER,
                 args: [
@@ -631,8 +677,8 @@ export class NTQQApi {
         )
     }
 
-    static banGroup(groupQQ: string, shutUp: boolean) {
+    static async banGroup(groupQQ: string, shutUp: boolean) {
-        return callNTQQApi<GeneralCallResult>({
+        return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.MUTE_GROUP,
             args: [
                 {
@@ -643,8 +689,8 @@ export class NTQQApi {
         })
     }
 
-    static setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
+    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
-        return callNTQQApi<GeneralCallResult>({
+        return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.SET_MEMBER_CARD,
             args: [
                 {
@@ -656,8 +702,8 @@ export class NTQQApi {
         })
     }
 
-    static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
-        return callNTQQApi<GeneralCallResult>({
+        return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.SET_MEMBER_ROLE,
             args: [
                 {
@@ -669,8 +715,8 @@ export class NTQQApi {
         })
     }
 
-    static setGroupName(groupQQ: string, groupName: string) {
+    static async setGroupName(groupQQ: string, groupName: string) {
-        return callNTQQApi<GeneralCallResult>({
+        return await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.SET_GROUP_NAME,
             args: [
                 {
@@ -684,4 +730,107 @@ export class NTQQApi {
     static publishGroupBulletin(groupQQ: string, title: string, content: string) {
 
     }
+
+    static async setCacheSilentScan(isSilent: boolean = true) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
+            args: [{
+                isSilent
+            }, null]
+        });
+    }
+
+    static addCacheScannedPaths(pathMap: object = {}) {
+        return callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
+            args: [{
+                pathMap: {...pathMap},
+            }, null]
+        });
+    }
+
+    static scanCache() {
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmd.CACHE_SCAN_FINISH,
+            classNameIsRegister: true,
+        }).then();
+        return callNTQQApi<CacheScanResult>({
+            methodName: NTQQApiMethod.CACHE_SCAN,
+            args: [null, null],
+            timeoutSecond: 300,
+        });
+    }
+
+    static getHotUpdateCachePath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.HOTUPDATE_API,
+            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
+        });
+    }
+
+    static getDesktopTmpPath() {
+        return callNTQQApi<string>({
+            className: NTQQApiClass.BUSINESS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
+        });
+    }
+
+    static getCacheSessionPathList() {
+        return callNTQQApi<{
+            key: string,
+            value: string
+        }[]>({
+            className: NTQQApiClass.OS_API,
+            methodName: NTQQApiMethod.CACHE_PATH_SESSION,
+        });
+    }
+
+    static clearCache(cacheKeys: Array<string> = [ 'tmp', 'hotUpdate' ]) {
+        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
+            methodName: NTQQApiMethod.CACHE_CLEAR,
+            args: [{
+                keys: cacheKeys
+            }, null]
+        });
+    }
+
+    static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
+        return new Promise<ChatCacheList>((res, rej) => {
+            callNTQQApi<ChatCacheList>({
+                methodName: NTQQApiMethod.CACHE_CHAT_GET,
+                args: [{
+                    chatType: type,
+                    pageSize,
+                    order: 1,
+                    pageIndex
+                }, null]
+            }).then(list => res(list))
+            .catch(e => rej(e));
+        });
+    }
+
+    static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
+        const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
+
+        return callNTQQApi<CacheFileList>({
+            methodName: NTQQApiMethod.CACHE_FILE_GET,
+            args: [{
+                fileType: fileType,
+                restart: true,
+                pageSize: pageSize,
+                order: 1,
+                lastRecord: _lastRecord,
+            }, null]
+        })
+    }
+
+    static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
+            args: [{
+                chats,
+                fileKeys
+            }, null]
+        });
+    }
 }

src/ntqqapi/types.ts

@@ -63,6 +63,7 @@ export interface GroupMember {
     shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
     uid: string; // 加密的字符串
     uin: string; // QQ号
+    isRobot: boolean;
 }
 
 export enum ElementType {
@@ -72,6 +73,7 @@ export enum ElementType {
     PTT = 4,
     FACE = 6,
     REPLY = 7,
+    ARK = 10,
 }
 
 export interface SendTextElement {
@@ -94,7 +96,7 @@ export interface SendPttElement {
         filePath: string,
         md5HexStr: string,
         fileSize: number,
-        duration: number,
+        duration: number,  // 单位是秒
         formatType: number,
         voiceType: number,
         voiceChangeType: number,
@@ -106,6 +108,10 @@ export interface SendPttElement {
     }
 }
 
+export enum PicType {
+    gif = 2000,
+    jpg = 1000
+}
 export interface SendPicElement {
     elementType: ElementType.PIC,
     elementId: "",
@@ -117,7 +123,7 @@ export interface SendPicElement {
         fileName: string,
         sourcePath: string,
         original: boolean,
-        picType: number,
+        picType: PicType,
         picSubType: number,
         fileUuid: string,
         fileSubId: string,
@@ -160,13 +166,20 @@ export interface FileElement {
 }
 
 export interface SendFileElement {
-    "elementType": ElementType.FILE,
+    elementType: ElementType.FILE,
-    "elementId": "",
+    elementId: "",
-    "fileElement": FileElement
+    fileElement: FileElement
+}
+
+export interface SendArkElement {
+    elementType: ElementType.ARK,
+    elementId: "",
+    arkElement: ArkElement
+
 }
 
 export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement
+    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendArkElement
 
 export enum AtType {
     notAt = 0,
@@ -205,6 +218,8 @@ export interface PttElement {
 
 export interface ArkElement {
     bytesData: string;
+    linkInfo:null,
+    subElementType:null
 }
 
 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
@@ -218,6 +233,7 @@ export interface PicElement {
     fileSize: number;
     fileName: string;
     fileUuid: string;
+    md5HexStr?: string;
 }
 
 export interface GrayTipElement {
@@ -229,6 +245,7 @@ export interface GrayTipElement {
         operatorMemRemark?: string;
         wording: string;  // 自定义的撤回提示语
     }
+    aioOpGrayTipElement: TipAioOpGrayTipElement
 }
 
 export interface FaceElement {
@@ -249,7 +266,7 @@ export interface VideoElement {
     "thumbHeight": number,
     "busiType": 0, // 未知
     "subBusiType": 0, // 未知
-    "thumbPath": Map<number,any>,
+    "thumbPath": Map<number, any>,
     "transferStatus": 0, // 未知
     "progress": 0,  // 下载进度？
     "invalidState": 0, // 未知
@@ -261,6 +278,37 @@ export interface VideoElement {
     "sourceVideoCodecFormat": 0
 }
 
+export interface TipAioOpGrayTipElement{
+    operateType: number,
+    peerUid: string,
+    fromGrpCodeOfTmpChat: string,
+}
+
+export interface TipGroupElement {
+    "type": 1,  // 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": null
+}
+
+
 export interface RawMessage {
     msgId: string;
     msgShortId?: number;  // 自己维护的消息id
@@ -355,4 +403,68 @@ export interface FriendRequestNotify {
         unreadNums: number,
         buddyReqs: FriendRequest[]
     }
-}
+}
+
+export interface CacheScanResult {
+    result: number,
+    size: [ // 单位为字节
+        string, // 系统总存储空间
+        string, // 系统可用存储空间
+        string, // 系统已用存储空间
+        string, // QQ总大小
+        string, // 「聊天与文件」大小
+        string, // 未知
+        string, // 「缓存数据」大小
+        string, // 「其他数据」大小
+        string, // 未知
+    ]
+}
+
+export interface ChatCacheList {
+    pageCount: number,
+    infos: ChatCacheListItem[]
+}
+
+export interface ChatCacheListItem {
+    chatType: ChatType,
+    basicChatCacheInfo: ChatCacheListItemBasic,
+    guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
+}
+
+export interface ChatCacheListItemBasic {
+    chatSize: string,
+    chatTime: string,
+    uid: string,
+    uin: string,
+    remarkName: string,
+    nickName: string,
+    chatType?: ChatType,
+    isChecked?: boolean
+}
+
+export enum CacheFileType {
+    IMAGE = 0,
+    VIDEO = 1,
+    AUDIO = 2,
+    DOCUMENT = 3,
+    OTHER = 4,
+}
+
+export interface CacheFileList {
+    infos: CacheFileListItem[],
+}
+
+export interface CacheFileListItem {
+    fileSize: string,
+    fileTime: string,
+    fileKey: string,
+    elementId: string,
+    elementIdStr: string,
+    fileType: CacheFileType,
+    path: string,
+    fileName: string,
+    senderId: string,
+    previewPath: string,
+    senderName: string,
+    isChecked?: boolean,
+}

src/onebot11/action/BaseAction.ts

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

src/onebot11/action/Debug.ts

@@ -1,24 +1,24 @@
 import BaseAction from "./BaseAction";
 import {NTQQApi} from "../../ntqqapi/ntcall";
-import {friends} from "../../common/data";
 import {ActionName} from "./types";
 import {log} from "../../common/utils";
 
-interface Payload{
+interface Payload {
     method: string,
     args: any[],
 }
 
-export default class Debug extends BaseAction<Payload, 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){
+        if (!method) {
             throw `${method} 不存在`
         }
         const result = method(...payload.args);
-        if (method.constructor.name === "AsyncFunction"){
+        if (method.constructor.name === "AsyncFunction") {
             return await result
         }
         return result

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";
 
 interface Payload {
     message_id: number
@@ -10,8 +10,8 @@ interface Payload {
 class DeleteMsg extends BaseAction<Payload, void> {
     actionName = ActionName.DeleteMsg
 
-    protected async _handle(payload:Payload){
+    protected async _handle(payload: Payload) {
-        let msg = getHistoryMsgByShortId(payload.message_id)
+        let msg = await dbUtil.getMsgByShortId(payload.message_id)
         await NTQQApi.recallMsg({
             chatType: msg.chatType,
             peerUid: msg.peerUid

src/onebot11/action/GetFile.ts

@@ -1,13 +1,13 @@
 import BaseAction from "./BaseAction";
-import {fileCache} from "../../common/data";
 import {getConfigUtil} from "../../common/utils";
 import fs from "fs/promises";
+import {dbUtil} from "../../common/db";
 
-export interface GetFilePayload{
+export interface GetFilePayload {
     file: string // 文件名
 }
 
-export interface GetFileResponse{
+export interface GetFileResponse {
     file?: string  // path
     url?: string
     file_size?: string
@@ -16,9 +16,9 @@ export interface GetFileResponse{
 }
 
 
-export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse>{
+export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const cache = fileCache.get(payload.file)
+        const cache = await dbUtil.getFileCache(payload.file)
         const {autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond} = getConfigUtil().getConfig()
         if (!cache) {
             throw new Error('file not found')
@@ -26,7 +26,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse>{
         if (cache.downloadFunc) {
             await cache.downloadFunc()
         }
-        let res : GetFileResponse=  {
+        let res: GetFileResponse = {
             file: cache.filePath,
             url: cache.url,
             file_size: cache.fileSize,

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

@@ -13,13 +13,12 @@ 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) {
             return OB11Constructor.groupMember(payload.group_id.toString(), member)
-        }
+        } else {
-        else {
+            throw (`群成员${payload.user_id}不存在`)
-            throw(`群成员${payload.user_id}不存在`)
         }
     }
 }

src/onebot11/action/GetGroupMemberList.ts

@@ -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())
             }
             return OB11Constructor.groupMembers(group);
-        }
+        } else {
-        else {
             throw (`群${payload.group_id}不存在`)
         }
     }

src/onebot11/action/GetGuildList.ts

@@ -1,8 +1,9 @@
 import BaseAction from "./BaseAction";
 import {ActionName} from "./types";
 
-export default class GetGuildList extends BaseAction<null, null>{
+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

@@ -2,6 +2,6 @@ import {GetFileBase} from "./GetFile";
 import {ActionName} from "./types";
 
 
-export default class GetImage extends GetFileBase{
+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,17 +14,16 @@ 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){
+        if (!payload.message_id) {
-            throw("参数message_id不能为空")
+            throw ("参数message_id不能为空")
         }
-        const msg = getHistoryMsgByShortId(payload.message_id)
+        const msg = await dbUtil.getMsgByShortId(payload.message_id)
         if (msg) {
-            const msgData = await OB11Constructor.message(msg);
+            return await OB11Constructor.message(msg)
-            return msgData
         } else {
-            throw("消息不存在")
+            throw ("消息不存在")
         }
     }
 }

src/onebot11/action/GetRecord.ts

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

src/onebot11/action/GetStatus.ts

@@ -6,6 +6,7 @@ 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: selfInfo.online,

src/onebot11/action/GetVersionInfo.ts

@@ -3,8 +3,9 @@ import {OB11Version} from "../types";
 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

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

src/onebot11/action/SendMsg.ts

@@ -1,22 +1,24 @@
-import {AtType, ChatType, Group, RawMessage, SendMessageElement} from "../../ntqqapi/types";
+import {AtType, ChatType, Group, RawMessage, SendArkElement, SendMessageElement} from "../../ntqqapi/types";
+import {friends, getFriend, getGroup, getGroupMember, getUidByUin, selfInfo,} from "../../common/data";
 import {
-    addHistoryMsg,
+    OB11MessageCustomMusic,
-    friends,
+    OB11MessageData,
-    getGroup,
+    OB11MessageDataType,
-    getGroupMember,
+    OB11MessageMixType,
-    getHistoryMsgByShortId,
+    OB11MessageNode,
-    getUidByUin,
+    OB11PostSendMsg
-    selfInfo,
+} from '../types';
-} from "../../common/data";
-import {OB11MessageData, OB11MessageDataType, OB11MessageMixType, OB11MessageNode, OB11PostSendMsg} from '../types';
 import {NTQQApi, Peer} from "../../ntqqapi/ntcall";
 import {SendMsgElementConstructor} from "../../ntqqapi/constructor";
 import {uri2local} from "../utils";
 import BaseAction from "./BaseAction";
 import {ActionName, BaseCheckResult} from "./types";
-import * as fs from "fs";
+import * as fs from "node:fs";
-import {log} from "../../common/utils";
+import {log, sleep} from "../../common/utils";
 import {decodeCQCode} from "../cqcode";
+import {dbUtil} from "../../common/db";
+import {ALLOW_SEND_TEMP_MSG} from "../../common/config";
+import {FileCache} from "../../common/types";
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
     function checkUri(uri: string): boolean {
@@ -62,13 +64,29 @@ 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,
         }
@@ -79,17 +97,16 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             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
@@ -101,24 +118,51 @@ 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)
+            deleteAfterSentFiles.map(f => fs.unlink(f, () => {}));
             return {message_id: returnMsg.msgShortId}
         } catch (e) {
+            log("发送消息失败", e.stack.toString())
             throw (e.toString())
         }
     }
@@ -138,9 +182,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         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
     }
@@ -151,14 +195,15 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             chatType: ChatType.friend,
             peerUid: selfInfo.uid
         }
-        let selfNodeMsgList: RawMessage[] = [];
+        let selfNodeMsgList: RawMessage[] = []; // 自己给自己发的消息
         let originalNodeMsgList: RawMessage[] = [];
+        let sendForwardElements: SendMessageElement[] = []
         for (const messageNode of messageNodes) {
             // 一个node表示一个人的消息
             let nodeId = messageNode.data.id;
             // 有nodeId表示一个子转发消息卡片
             if (nodeId) {
-                let nodeMsg = getHistoryMsgByShortId(nodeId);
+                let nodeMsg = await dbUtil.getMsgByShortId(parseInt(nodeId));
                 if (nodeMsg) {
                     originalNodeMsgList.push(nodeMsg);
                 }
@@ -171,9 +216,11 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                         deleteAfterSentFiles
                     } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
                     log("开始生成转发节点", sendElements);
+                    sendForwardElements.push(...sendElements);
                     const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true);
                     selfNodeMsgList.push(nodeMsg);
                     log("转发节点生成成功", nodeMsg.msgId);
+                    await sleep(500);
                 } catch (e) {
                     log("生效转发消息节点失败", e)
                 }
@@ -183,27 +230,28 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         let nodeIds: string[] = []
         // 检查是否需要克隆直接引用消息id的节点
         let needSendSelf = false;
-        if (selfNodeMsgList.length) {
+        if (sendForwardElements.length) {
             needSendSelf = true
         } else {
             needSendSelf = !originalNodeMsgList.every((msg, index) => msg.peerUid === originalNodeMsgList[0].peerUid && msg.recallTime.length < 2)
         }
         if (needSendSelf) {
             nodeIds = selfNodeMsgList.map(msg => msg.msgId);
+            let sendElements: SendMessageElement[] = [];
             for (const originalNodeMsg of originalNodeMsgList) {
                 if (originalNodeMsg.peerUid === selfInfo.uid && originalNodeMsg.recallTime.length < 2) {
                     nodeIds.push(originalNodeMsg.msgId)
                 } else { // 需要进行克隆
-                    let sendElements: SendMessageElement[] = []
                     Object.keys(originalNodeMsg.elements).forEach((eleKey) => {
                         if (eleKey !== "elementId") {
+                            sendForwardElements.push(originalNodeMsg.elements[eleKey])
                             sendElements.push(originalNodeMsg.elements[eleKey])
                         }
                     })
                     try {
                         const nodeMsg = await NTQQApi.sendMsg(selfPeer, sendElements, true);
                         nodeIds.push(nodeMsg.msgId)
-                        log("克隆转发消息成功")
+                        log("克隆转发消息到节点")
                     } catch (e) {
                         log("克隆转发消息失败", e)
                     }
@@ -220,6 +268,15 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 peerUid: originalNodeMsgList[0].peerUid
             }
         }
+        // elements之间用换行符分隔
+        // let _sendForwardElements: SendMessageElement[] = []
+        // for(let i = 0; i < sendForwardElements.length; i++){
+        //     _sendForwardElements.push(sendForwardElements[i])
+        //     _sendForwardElements.push(SendMsgElementConstructor.text("\n\n"))
+        // }
+        // const nodeMsg = await NTQQApi.sendMsg(selfPeer, _sendForwardElements, true);
+        // nodeIds.push(nodeMsg.msgId)
+        // await sleep(500);
         // 开发转发
         try {
             return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeIds)
@@ -245,6 +302,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 }
                     break;
                 case OB11MessageDataType.at: {
+                    if (!group){
+                        continue
+                    }
                     let atQQ = sendMsg.data?.qq;
                     if (atQQ) {
                         atQQ = atQQ.toString()
@@ -263,8 +323,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 case OB11MessageDataType.reply: {
                     let replyMsgId = sendMsg.data.id;
                     if (replyMsgId) {
-                        replyMsgId = replyMsgId.toString()
+                        const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
-                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
                         if (replyMsg) {
                             sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
@@ -278,13 +337,29 @@ 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(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;
+                                log("找到文件缓存", file);
+                            }
+                        }
+                        const {path, isLocal, fileName, errMsg} = (await uri2local(file))
+                        if (errMsg){
+                            throw errMsg
+                        }
                         if (path) {
                             if (!isLocal) { // 只删除http和base64转过来的文件
                                 deleteAfterSentFiles.push(path)
@@ -295,7 +370,15 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                                 [OB11MessageDataType.video]: SendMsgElementConstructor.video,
                                 [OB11MessageDataType.file]: SendMsgElementConstructor.file,
                             }
-                            sendElements.push(await constructorMap[sendMsg.type](path));
+                            if (sendMsg.type === OB11MessageDataType.file) {
+                                log("发送文件", path, payloadFileName || fileName)
+                                sendElements.push(await SendMsgElementConstructor.file(path, false, payloadFileName || fileName));
+                            } else if (sendMsg.type === OB11MessageDataType.video) {
+                                log("发送视频", path, payloadFileName || fileName)
+                                sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName));
+                            } else {
+                                sendElements.push(await constructorMap[sendMsg.type](path));
+                            }
                         }
                     }
                 }
@@ -310,16 +393,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)
+        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/SetGroupAddRequest.ts

@@ -4,7 +4,7 @@ import {GroupNotify, GroupRequestOperateTypes} from "../../ntqqapi/types";
 import {NTQQApi} from "../../ntqqapi/ntcall";
 import {ActionName} from "./types";
 
-interface Payload{
+interface Payload {
     flag: string,
     // sub_type: "add" | "invite",
     // type: "add" | "invite"
@@ -12,17 +12,18 @@ interface Payload{
     reason: string
 }
 
-export default class SetGroupAddRequest extends BaseAction<Payload, null>{
+export default class SetGroupAddRequest extends BaseAction<Payload, null> {
     actionName = ActionName.SetGroupAddRequest
+
     protected async _handle(payload: Payload): Promise<null> {
         const seq = payload.flag.toString();
         const notify: GroupNotify = groupNotifies[seq]
-        try{
+        try {
             await NTQQApi.handleGroupRequest(seq,
-                payload.approve ? GroupRequestOperateTypes.approve: GroupRequestOperateTypes.reject,
+                payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
                 payload.reason
-                )
+            )
-        }catch (e) {
+        } catch (e) {
             throw e
         }
         return null

src/onebot11/action/SetGroupAdmin.ts

@@ -4,17 +4,18 @@ import {getGroupMember} from "../../common/data";
 import {GroupMemberRole} from "../../ntqqapi/types";
 import {ActionName} from "./types";
 
-interface Payload{
+interface Payload {
     group_id: number,
     user_id: number,
     enable: boolean
 }
 
-export default class SetGroupAdmin extends BaseAction<Payload, null>{
+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){
+        if (!member) {
             throw `群成员${payload.user_id}不存在`
         }
         await NTQQApi.setMemberRole(payload.group_id.toString(), member.uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal)

src/onebot11/action/SetGroupBan.ts

@@ -3,21 +3,22 @@ import {NTQQApi} from "../../ntqqapi/ntcall";
 import {getGroupMember} from "../../common/data";
 import {ActionName} from "./types";
 
-interface Payload{
+interface Payload {
     group_id: number,
     user_id: number,
     duration: number
 }
 
-export default class SetGroupBan extends BaseAction<Payload, null>{
+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){
+        if (!member) {
             throw `群成员${payload.user_id}不存在`
         }
         await NTQQApi.banMember(payload.group_id.toString(),
-            [{uid:member.uid, timeStamp: parseInt(payload.duration.toString())}])
+            [{uid: member.uid, timeStamp: parseInt(payload.duration.toString())}])
         return null
     }
 }

src/onebot11/action/SetGroupCard.ts

@@ -1,20 +1,20 @@
 import BaseAction from "./BaseAction";
 import {NTQQApi} from "../../ntqqapi/ntcall";
 import {getGroupMember} from "../../common/data";
-import {GroupMemberRole} from "../../ntqqapi/types";
 import {ActionName} from "./types";
 
-interface Payload{
+interface Payload {
     group_id: number,
     user_id: number,
     card: string
 }
 
-export default class SetGroupCard extends BaseAction<Payload, null>{
+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){
+        if (!member) {
             throw `群成员${payload.user_id}不存在`
         }
         await NTQQApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || "")

src/onebot11/action/SetGroupKick.ts

@@ -3,17 +3,18 @@ import {NTQQApi} from "../../ntqqapi/ntcall";
 import {getGroupMember} from "../../common/data";
 import {ActionName} from "./types";
 
-interface Payload{
+interface Payload {
     group_id: number,
     user_id: number,
     reject_add_request: boolean
 }
 
-export default class SetGroupKick extends BaseAction<Payload, null>{
+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){
+        if (!member) {
             throw `群成员${payload.user_id}不存在`
         }
         await NTQQApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request);

src/onebot11/action/SetGroupLeave.ts

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

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

@@ -1,21 +1,22 @@
 import BaseAction from "../BaseAction";
-import {OB11GroupMember, OB11User} from "../../types";
+import {OB11User} from "../../types";
-import {friends, getFriend, getGroupMember, groups} from "../../../common/data";
+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>{
+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){
+        if (friend) {
             return OB11Constructor.friend(friend);
         }
-        for(const group of groups){
+        for (const group of groups) {
             const member = await getGroupMember(group.groupCode, user_id)
-            if (member){
+            if (member) {
                 return OB11Constructor.groupMember(group.groupCode, member) as OB11User
             }
         }

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

@@ -1,15 +1,16 @@
-import SendMsg, {ReturnDataType} from "../SendMsg";
+import SendMsg from "../SendMsg";
-import {OB11MessageMixType, OB11PostSendMsg} from "../../types";
+import {OB11PostSendMsg} from "../../types";
-import {ActionName, BaseCheckResult} 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/index.ts

@@ -30,6 +30,8 @@ import SetGroupAdmin from "./SetGroupAdmin";
 import SetGroupCard from "./SetGroupCard";
 import GetImage from "./GetImage";
 import GetRecord from "./GetRecord";
+import GoCQHTTPMarkMsgAsRead from "./MarkMsgAsRead";
+import CleanCache from "./CleanCache";
 
 export const actionHandlers = [
     new Debug(),
@@ -55,12 +57,14 @@ export const actionHandlers = [
     new SetGroupCard(),
     new GetImage(),
     new GetRecord(),
+    new CleanCache(),
 
     //以下为go-cqhttp api
     new GoCQHTTPSendGroupForwardMsg(),
     new GoCQHTTPSendPrivateForwardMsg(),
     new GoCQHTTPGetStrangerInfo(),
-    new GetGuildList()
+    new GetGuildList(),
+    new GoCQHTTPMarkMsgAsRead(),
 
 ]
 

src/onebot11/action/types.ts

@@ -1,15 +1,15 @@
-import GetGuildList from "./GetGuildList";
-
 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
 }
 
@@ -42,9 +42,11 @@ export enum ActionName {
     SetGroupName = "set_group_name",
     GetImage = "get_image",
     GetRecord = "get_record",
+    CleanCache = "clean_cache",
     // 以下为go-cqhttp api
     GoCQHTTP_SendGroupForwardMsg = "send_group_forward_msg",
     GoCQHTTP_SendPrivateForwardMsg = "send_private_forward_msg",
     GoCQHTTP_GetStrangerInfo = "get_stranger_info",
     GetGuildList = "get_guild_list",
+    GoCQHTTP_MarkMsgAsRead = "mark_msg_as_read",
 }

src/onebot11/constructor.ts

@@ -5,27 +5,29 @@ import {
     OB11Message,
     OB11MessageData,
     OB11MessageDataType,
-    OB11User
+    OB11User,
+    OB11UserSex
 } from "./types";
-import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
+import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types';
-import {fileCache, getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data';
+import {getFriend, getGroupMember, selfInfo, tempGroupCodeMap} from '../common/data';
-import { file2base64, getConfigUtil, log } from "../common/utils";
+import {getConfigUtil, log} from "../common/utils";
-import { NTQQApi } from "../ntqqapi/ntcall";
+import {NTQQApi} from "../ntqqapi/ntcall";
-import { EventType } from "./event/OB11BaseEvent";
+import {EventType} from "./event/OB11BaseEvent";
-import { encodeCQCode } from "./cqcode";
+import {encodeCQCode} from "./cqcode";
+import {dbUtil} from "../common/db";
 
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
 
-        const { enableLocalFile2Url, ob11: { messagePostFormat } } = 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) || 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),
@@ -55,6 +57,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) {
@@ -90,29 +96,44 @@ export class OB11Constructor {
                 message_data["data"]["text"] = text
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
-                const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
+                // log("收到回复消息", element.replyElement.replayMsgSeq)
-                if (replyMsg) {
+                try{
-                    message_data["data"]["id"] = replyMsg.msgShortId.toString()
+                    const replyMsg = await dbUtil.getMsgBySeqId(element.replyElement.replayMsgSeq)
-                } else {
+                    // log("找到回复消息", replyMsg.msgShortId, replyMsg.msgId)
-                    continue
+                    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
-                message_data["data"]["url"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
+                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
-                fileCache.set(element.picElement.fileName, {
+                dbUtil.addFileCache(element.picElement.fileName, {
                     fileName: element.picElement.fileName,
                     filePath: element.picElement.sourcePath,
                     fileSize: element.picElement.fileSize.toString(),
-                    url: IMAGE_HTTP_HOST + element.picElement.originImageUrl,
+                    url: message_data["data"]["url"],
                     downloadFunc: async () => {
-                    await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                        element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
+                            element.elementId, element.picElement.thumbPath?.get(0) || "", element.picElement.sourcePath)
-                }})
+                    }
+                }).then()
                 // 不在自动下载图片
 
             } else if (element.videoElement) {
@@ -121,14 +142,15 @@ export class OB11Constructor {
                 message_data["data"]["path"] = element.videoElement.filePath
                 // message_data["data"]["file_id"] = element.videoElement.fileUuid
                 message_data["data"]["file_size"] = element.videoElement.fileSize
-                fileCache.set(element.videoElement.fileName, {
+                dbUtil.addFileCache(element.videoElement.fileName, {
                     fileName: element.videoElement.fileName,
                     filePath: element.videoElement.filePath,
                     fileSize: element.videoElement.fileSize,
                     downloadFunc: async () => {
                         await NTQQApi.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;
@@ -136,27 +158,27 @@ export class OB11Constructor {
                 // message_data["data"]["path"] = element.fileElement.filePath
                 // message_data["data"]["file_id"] = element.fileElement.fileUuid
                 message_data["data"]["file_size"] = element.fileElement.fileSize
-                fileCache.set(element.fileElement.fileName, {
+                dbUtil.addFileCache(element.fileElement.fileName, {
                     fileName: element.fileElement.fileName,
                     filePath: element.fileElement.filePath,
                     fileSize: element.fileElement.fileSize,
                     downloadFunc: async () => {
                         await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                             element.elementId, null, element.fileElement.filePath)
-                    }})
+                    }
+                }).then()
                 // 怎么拿到url呢
-            }
+            } else if (element.pttElement) {
-            else if (element.pttElement) {
                 message_data["type"] = OB11MessageDataType.voice;
                 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
-                fileCache.set(element.pttElement.fileName, {
+                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 => {
@@ -242,6 +264,17 @@ export class OB11Constructor {
             user_id: parseInt(member.uin),
             nickname: member.nick,
             card: member.cardName,
+            sex: OB11UserSex.unknown,
+            age: 0,
+            area: "",
+            level: 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),
         }
     }

src/onebot11/cqcode.ts

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

src/onebot11/event/OB11BaseEvent.ts

@@ -1,4 +1,4 @@
-import { selfInfo } from "../../common/data";
+import {selfInfo} from "../../common/data";
 
 export enum EventType {
     META = "meta_event",

src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts

@@ -1,4 +1,3 @@
-import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
 import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
 
 export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {

src/onebot11/event/notice/OB11GroupIncreaseEvent.ts

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

src/onebot11/event/request/OB11GroupRequest.ts

@@ -2,7 +2,7 @@ import {OB11GroupNoticeEvent} from "../notice/OB11GroupNoticeEvent";
 import {EventType} from "../OB11BaseEvent";
 
 
-export class OB11GroupRequestEvent extends OB11GroupNoticeEvent{
+export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {
     post_type = EventType.REQUEST;
     request_type: "group" = "group";
     sub_type: "add" | "invite" = "add";

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))
     }
@@ -20,7 +21,7 @@ class OB11HTTPServer extends HttpServerBase {
 export const ob11HTTPServer = new OB11HTTPServer();
 
 for (const action of actionHandlers) {
-    for(const method of ["post", "get"]){
+    for (const method of ["post", "get"]) {
         ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
     }
 }

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,7 +29,7 @@ export function postWsEvent(event: PostEventType) {
     }
 }
 
-export function postOB11Event(msg: PostEventType, reportSelf=false) {
+export function postOB11Event(msg: PostEventType, reportSelf = false) {
     const config = getConfigUtil().getConfig();
     // 判断msg是否是event
     if (!config.reportSelfMessage && !reportSelf) {

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 "../postOB11Event";
+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;
 
@@ -75,8 +77,8 @@ export class ReverseWebsocket {
     }
 
     private connect() {
-        const {token} = getConfigUtil().getConfig()
+        const {token, heartInterval} = getConfigUtil().getConfig()
-        this.websocket = new WebSocket.WebSocket(this.url, {
+        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

@@ -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;
 
@@ -27,7 +28,7 @@ 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))
         }
     }
 
@@ -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 "../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({
+        let packet = Object.assign({}, data);
-        }, data);
+        if (isNull(packet["echo"])) {
-        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

@@ -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,7 +67,7 @@ export interface OB11Message {
     self_id?: number,
     time: number,
     message_id: number,
-    real_id: string,
+    real_id: number,
     user_id: number,
     group_id?: number,
     message_type: "private" | "group",
@@ -85,6 +93,7 @@ export interface OB11Return<DataType> {
 export enum OB11MessageDataType {
     text = "text",
     image = "image",
+    music = "music",
     video = "video",
     voice = "record",
     file = "file",
@@ -92,7 +101,7 @@ export enum OB11MessageDataType {
     reply = "reply",
     json = "json",
     face = "face",
-    node = "node"  // 合并转发消息
+    node = "node",  // 合并转发消息
 }
 
 export interface OB11MessageText {
@@ -104,6 +113,7 @@ export interface OB11MessageText {
 
 interface OB11MessageFileBase {
     data: {
+        name?: string;
         file: string,
         url?: string;
     }
@@ -158,12 +168,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 | OB11MessageFile | OB11MessageVideo |
-    OB11MessageNode
+    OB11MessageNode | OB11MessageCustomMusic
 
 export interface OB11PostSendMsg {
     message_type?: "private" | "group"

src/onebot11/utils.ts

@@ -1,7 +1,8 @@
-import {CONFIG_DIR, isGIF} from "../common/utils";
+import {DATA_DIR, isGIF, log} from "../common/utils";
 import {v4 as uuidv4} from "uuid";
-import * as path from 'path';
+import * as path from 'node:path';
-import {fileCache} from "../common/data";
+import * as fileType from 'file-type';
+import {dbUtil} from "../common/db";
 
 const fs = require("fs").promises;
 
@@ -9,11 +10,13 @@ export async function uri2local(uri: string, fileName: string = null) {
     if (!fileName) {
         fileName = uuidv4();
     }
-    let filePath = path.join(CONFIG_DIR, fileName)
+    let filePath = path.join(DATA_DIR, fileName)
     let url = new URL(uri);
     let res = {
         success: false,
         errMsg: "",
+        fileName: "",
+        ext: "",
         path: "",
         isLocal: false
     }
@@ -23,13 +26,20 @@ export async function uri2local(uri: string, fileName: string = null) {
         try {
             const buffer = Buffer.from(base64Data, 'base64');
             await fs.writeFile(filePath, buffer);
+
         } catch (e: any) {
             res.errMsg = `base64文件下载失败,` + e.toString()
             return res
         }
     } else if (url.protocol == "http:" || url.protocol == "https:") {
         // 下载文件
-        let fetchRes = await fetch(url)
+        let fetchRes: Response;
+        try{
+            fetchRes = await fetch(url)
+        }catch (e) {
+            res.errMsg = `${url}下载失败`
+            return res
+        }
         if (!fetchRes.ok) {
             res.errMsg = `${url}下载失败,` + fetchRes.statusText
             return res
@@ -37,8 +47,16 @@ export async function uri2local(uri: string, fileName: string = null) {
         let blob = await fetchRes.blob();
         let buffer = await blob.arrayBuffer();
         try {
-            fileName = path.basename(url.pathname) || fileName
+            const pathInfo = path.parse(decodeURIComponent(url.pathname))
-            filePath = path.join(CONFIG_DIR, fileName)
+            if (pathInfo.name){
+                fileName = pathInfo.name
+                if (pathInfo.ext){
+                    fileName += pathInfo.ext
+                    // res.ext = pathInfo.ext
+                }
+            }
+            res.fileName = fileName
+            filePath = path.join(DATA_DIR, uuidv4() + fileName)
             await fs.writeFile(filePath, Buffer.from(buffer));
         } catch (e: any) {
             res.errMsg = `${url}下载失败,` + e.toString()
@@ -54,13 +72,11 @@ export async function uri2local(uri: string, fileName: string = null) {
             } else {
                 filePath = pathname
             }
-        }
+        } else {
-        else{
+            const cache = await dbUtil.getFileCache(uri);
-            const cache = fileCache.get(uri)
             if (cache) {
                 filePath = cache.filePath
-            }
+            } else {
-            else{
                 filePath = uri;
             }
         }
@@ -71,9 +87,23 @@ export async function uri2local(uri: string, fileName: string = null) {
     //     res.errMsg = `不支持的file协议,` + url.protocol
     //     return res
     // }
-    if (isGIF(filePath) && !res.isLocal) {
+    // if (isGIF(filePath) && !res.isLocal) {
-        await fs.rename(filePath, filePath + ".gif");
+    //     await fs.rename(filePath, filePath + ".gif");
-        filePath += ".gif";
+    //     filePath += ".gif";
+    // }
+    if (!res.isLocal && !res.ext) {
+        try {
+            let ext: string = (await fileType.fileTypeFromFile(filePath)).ext
+            if (ext) {
+                log("获取文件类型", ext, filePath)
+                await fs.rename(filePath, filePath + `.${ext}`)
+                filePath += `.${ext}`
+                res.fileName += `.${ext}`
+                res.ext = ext
+            }
+        } catch (e) {
+            // log("获取文件类型失败", filePath,e.stack)
+        }
     }
     res.success = true
     res.path = filePath

src/renderer.ts

@@ -1,383 +0,0 @@
-/// <reference path="./global.d.ts" />
-
-
-// 打开设置界面时触发
-
-async function onSettingWindowCreated(view: Element) {
-    window.llonebot.log("setting window created");
-    const isEmpty = (value: any) => value === undefined || value === null || value === '';
-    let config = await window.llonebot.getConfig()
-    const httpClass = "http";
-    const httpPostClass = "http-post";
-    const wsClass = "ws";
-    const reverseWSClass = "reverse-ws";
-    const llonebotError = await window.llonebot.getError();
-    window.llonebot.log("获取error" + JSON.stringify(llonebotError));
-    function createHttpHostEleStr(host: string) {
-        let eleStr = `
-            <setting-item data-direction="row" class="hostItem vertical-list-item ${httpPostClass}">
-                <h2>HTTP事件上报地址(http)</h2>
-                <input class="httpHost input-text" type="text" value="${host}" 
-                style="width:60%;padding: 5px"
-                placeholder="如:http://127.0.0.1:8080/onebot/v11/http"/>
-            </setting-item>
-            `
-        return eleStr
-    }
-
-    function createWsHostEleStr(host: string) {
-        let eleStr = `
-            <setting-item data-direction="row" class="hostItem vertical-list-item ${reverseWSClass}">
-                <h2>反向websocket地址:</h2>
-                <input class="wsHost input-text" type="text" value="${host}" 
-                style="width:60%;padding: 5px"
-                placeholder="如: ws://127.0.0.1:5410/onebot"/>
-            </setting-item>
-            `
-        return eleStr
-    }
-
-    let httpHostsEleStr = ""
-    for (const host of config.ob11.httpHosts) {
-        httpHostsEleStr += createHttpHostEleStr(host);
-    }
-
-    let wsHostsEleStr = ""
-    for (const host of config.ob11.wsHosts) {
-        wsHostsEleStr += createWsHostEleStr(host);
-    }
-
-    let html = `
-    <div class="config_view llonebot">
-        <setting-section>
-            <setting-panel id="llonebotError" style="display:${llonebotError.ffmpegError || llonebotError.otherError ? '' : 'none'}">
-                <setting-item id="ffmpegError" data-direction="row" 
-                    style="diplay:${llonebotError.ffmpegError ? '' : 'none'}"
-                    class="hostItem vertical-list-item">
-                    <setting-text data-type="secondary" class="err-content">${llonebotError.ffmpegError}</setting-text>
-                </setting-item>
-                <setting-item id="otherError" data-direction="row" 
-                    style="diplay:${llonebotError.otherError ? '' : 'none'}"
-                    class="hostItem vertical-list-item">
-                    <setting-text data-type="secondary" class="err-content">${llonebotError.otherError}</setting-text>
-                </setting-item>
-            </setting-panel>
-            <setting-panel>
-                <setting-list class="wrap">
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用HTTP服务</div>
-                        </div>
-                        <setting-switch id="http" ${config.ob11.enableHttp ? "is-active" : ""}></setting-switch>
-                    </setting-item>
-                    <setting-item class="vertical-list-item ${httpClass}" data-direction="row" style="display: ${config.ob11.enableHttp ? '' : 'none'}">
-                        <setting-text>HTTP监听端口</setting-text>
-                        <input id="httpPort" type="number" value="${config.ob11.httpPort}"/>
-                    </setting-item>
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用HTTP事件上报</div>
-                        </div>
-                        <setting-switch id="httpPost" ${config.ob11.enableHttpPost ? "is-active" : ""}></setting-switch>
-                    </setting-item>
-                    <div class="${httpPostClass}" style="display: ${config.ob11.enableHttpPost ? '' : 'none'}">
-                        <div >
-                            <button id="addHttpHost" class="q-button">添加HTTP POST上报地址</button>
-                        </div>
-                        <div id="httpHostItems">
-                            ${httpHostsEleStr}
-                        </div>
-                    </div>
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用正向Websocket协议</div>
-                        </div>
-                        <setting-switch id="websocket" ${config.ob11.enableWs ? "is-active" : ""}></setting-switch>
-                    </setting-item>
-                    <setting-item class="vertical-list-item ${wsClass}" data-direction="row" style="display: ${config.ob11.enableWs ? '' : 'none'}">
-                        <setting-text>正向Websocket监听端口</setting-text>
-                        <input id="wsPort" type="number" value="${config.ob11.wsPort}"/>
-                    </setting-item>
-                    
-                    <setting-item data-direction="row" class="hostItem vertical-list-item">
-                        <div>
-                            <div>启用反向Websocket协议</div>
-                        </div>
-                        <setting-switch id="websocketReverse" ${config.ob11.enableWsReverse ? "is-active" : ""}></setting-switch>
-                    </setting-item>
-                    <div class="${reverseWSClass}" style="display: ${config.ob11.enableWsReverse ? '' : 'none'}">
-                        <div>
-                            <button id="addWsHost" class="q-button">添加反向Websocket地址</button>
-                        </div>
-                        <div id="wsHostItems">
-                            ${wsHostsEleStr}
-                        </div>
-                    </div>
-                    <setting-item class="vertical-list-item" data-direction="row">
-                        <setting-text>Access Token</setting-text>
-                        <input id="token" type="text" placeholder="可为空" value="${config.token}"/>
-                    </setting-item>
-                    <setting-item data-direction="row" class="vertical-list-item">
-                        <setting-item data-direction="row" class="vertical-list-item" style="width: 80%">
-                            <setting-text>ffmpeg路径</setting-text>
-                            <input id="ffmpegPath" class="input-text" type="text" 
-                                style="width:80%;padding: 5px"
-                                value="${config.ffmpeg || ''}"/>
-                        </setting-item>
-                        <button id="selectFFMPEG" class="q-button q-button--small q-button--secondary">选择ffmpeg</button>
-                    </setting-item>
-                    <button id="save" class="q-button">保存</button>
-                </setting-list>
-            </setting-panel>
-            <setting-panel>
-
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <setting-text>消息上报数据类型</setting-text>
-                        <setting-text data-type="secondary">如客户端无特殊需求推荐保持默认设置，两者的详细差异可参考 <a href="javascript:LiteLoader.api.openExternal('https://github.com/botuniverse/onebot-11/tree/master/message#readme');">OneBot v11 文档</a></setting-text>
-                    </div>
-                    <setting-select id="messagePostFormat">
-                        <setting-option data-value="array" ${config.ob11.messagePostFormat !== "string" ? "is-selected" : ""}>消息段</setting-option>
-                        <setting-option data-value="string" ${config.ob11.messagePostFormat === "string" ? "is-selected" : ""}>CQ码</setting-option>
-                    </setting-select>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>获取文件使用base64编码</div>
-                        <div class="tips">开启后，调用/get_image、/get_record时，获取不到url时添加一个base64字段</div>
-                    </div>
-                    <setting-switch id="switchFileUrl" ${config.enableLocalFile2Url ? "is-active" : ""}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>debug模式</div>
-                        <div class="tips">开启后上报消息添加raw字段附带原始消息</div>
-                    </div>
-                    <setting-switch id="debug" ${config.debug ? "is-active" : ""}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>上报自身消息</div>
-                        <div class="tips">慎用，不然会自己和自己聊个不停</div>
-                    </div>
-                    <setting-switch id="reportSelfMessage" ${config.reportSelfMessage ? "is-active" : ""}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>日志</div>
-                        <div class="tips">目录:${window.LiteLoader.plugins["LLOneBot"].path.data}</div>
-                    </div>
-                    <setting-switch id="log" ${config.log ? "is-active" : ""}></setting-switch>
-                </setting-item>
-                <setting-item data-direction="row" class="vertical-list-item">
-                    <div>
-                        <div>自动删除收到的文件</div>
-                        <div class="tips">
-                            收到文件
-                            <input id="autoDeleteMin" 
-                                min="1" style="width: 50px"
-                                value="${config.autoDeleteFileSecond || 60}" type="number"/>秒后自动删除
-                        </div>
-                    </div>
-                    <setting-switch id="autoDeleteFile" ${config.autoDeleteFile ? "is-active" : ""}></setting-switch>
-                </setting-item>
-            </setting-panel>
-        </setting-section>
-    </div>
-    <style>
-        setting-panel {
-            padding: 10px;
-        }
-        .tips {
-            font-size: 0.75rem;
-        }
-        @media (prefers-color-scheme: dark){
-            .llonebot input {
-                color: white;
-            }
-        }
-    </style>
-    `
-
-    const parser = new DOMParser();
-    const doc = parser.parseFromString(html, "text/html");
-
-    const getError = async ()=> {
-        const llonebotError = await window.llonebot.getError();
-        console.log(llonebotError);
-        const llonebotErrorEle = document.getElementById("llonebotError");
-        const ffmpegErrorEle = document.getElementById("ffmpegError");
-        const otherErrorEle = document.getElementById("otherError");
-        if (llonebotError.otherError || llonebotError.ffmpegError){
-            llonebotErrorEle.style.display = ''
-        }
-        else{
-            llonebotErrorEle.style.display = 'none'
-        }
-        if (llonebotError.ffmpegError) {
-            const errContentEle = doc.querySelector("#ffmpegError .err-content")
-            // const errContent = ffmpegErrorEle.getElementsByClassName("err-content")[0];
-            errContentEle.textContent = llonebotError.ffmpegError;
-            (ffmpegErrorEle as HTMLElement).style.display = ''
-        }
-        else{
-            ffmpegErrorEle.style.display = ''
-        }
-        if (llonebotError.otherError) {
-            const errContentEle = doc.querySelector("#otherError .err-content")
-            errContentEle.textContent = llonebotError.otherError;
-            otherErrorEle.style.display = ''
-        }
-        else{
-            otherErrorEle.style.display = 'none'
-        }
-    }
-
-    function addHostEle(type: string, initValue: string = "") {
-        let addressEle, hostItemsEle;
-        if (type === "ws") {
-            let addressDoc = parser.parseFromString(createWsHostEleStr(initValue), "text/html");
-            addressEle = addressDoc.querySelector("setting-item")
-            hostItemsEle = document.getElementById("wsHostItems");
-        } else {
-            let addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), "text/html");
-            addressEle = addressDoc.querySelector("setting-item")
-            hostItemsEle = document.getElementById("httpHostItems");
-        }
-
-        hostItemsEle.appendChild(addressEle);
-    }
-
-
-    doc.getElementById("addHttpHost").addEventListener("click", () => addHostEle("http"))
-    doc.getElementById("addWsHost").addEventListener("click", () => addHostEle("ws"))
-    doc.getElementById("messagePostFormat").addEventListener("selected", (e: CustomEvent) => {
-        config.ob11.messagePostFormat = e.detail && !isEmpty(e.detail.value) ? e.detail.value : 'array';
-        window.llonebot.setConfig(config);
-    })
-
-    function switchClick(eleId: string, configKey: string, _config = null) {
-        if (!_config) {
-            _config = config
-        }
-        doc.getElementById(eleId)?.addEventListener("click", (e) => {
-            const switchEle = e.target as HTMLInputElement
-            if (_config[configKey]) {
-                _config[configKey] = false
-                switchEle.removeAttribute("is-active")
-            } else {
-                _config[configKey] = true
-                switchEle.setAttribute("is-active", "")
-            }
-            // 妈蛋，手动操作DOM越写越麻烦，要不用vue算了
-            const keyClassMap = {
-                "enableHttp": httpClass,
-                "enableHttpPost": httpPostClass,
-                "enableWs": wsClass,
-                "enableWsReverse": reverseWSClass,
-            }
-            for (let e of document.getElementsByClassName(keyClassMap[configKey])) {
-                e["style"].display = _config[configKey] ? "" : "none"
-            }
-
-            window.llonebot.setConfig(config)
-        })
-    }
-
-    switchClick("http", "enableHttp", config.ob11);
-    switchClick("httpPost", "enableHttpPost", config.ob11);
-    switchClick("websocket", "enableWs", config.ob11);
-    switchClick("websocketReverse", "enableWsReverse", config.ob11);
-    switchClick("debug", "debug");
-    switchClick("switchFileUrl", "enableLocalFile2Url");
-    switchClick("reportSelfMessage", "reportSelfMessage");
-    switchClick("log", "log");
-    switchClick("autoDeleteFile", "autoDeleteFile");
-
-    doc.getElementById("save")?.addEventListener("click",
-        () => {
-            const httpPortEle: HTMLInputElement = document.getElementById("httpPort") as HTMLInputElement;
-            const httpHostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName("httpHost") as HTMLCollectionOf<HTMLInputElement>;
-            const wsPortEle: HTMLInputElement = document.getElementById("wsPort") as HTMLInputElement;
-            const wsHostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName("wsHost") as HTMLCollectionOf<HTMLInputElement>;
-            const tokenEle = document.getElementById("token") as HTMLInputElement;
-            const ffmpegPathEle = document.getElementById("ffmpegPath") as HTMLInputElement;
-
-            // 获取端口和host
-            const httpPort = httpPortEle.value
-            let httpHosts: string[] = [];
-
-            for (const hostEle of httpHostEles) {
-                const value = hostEle.value.trim();
-                value && httpHosts.push(value);
-            }
-
-            const wsPort = wsPortEle.value;
-            const token = tokenEle.value.trim();
-            let wsHosts: string[] = [];
-
-            for (const hostEle of wsHostEles) {
-                const value = hostEle.value.trim();
-                value && wsHosts.push(value);
-            }
-
-            config.ob11.httpPort = parseInt(httpPort);
-            config.ob11.httpHosts = httpHosts;
-            config.ob11.wsPort = parseInt(wsPort);
-            config.ob11.wsHosts = wsHosts;
-            config.token = token;
-            config.ffmpeg = ffmpegPathEle.value.trim();
-            window.llonebot.setConfig(config);
-            setTimeout(()=>{
-                getError().then();
-            }, 1000);
-            alert("保存成功");
-        })
-
-    doc.getElementById("selectFFMPEG")?.addEventListener("click", ()=>{
-        window.llonebot.selectFile().then(selectPath=>{
-            if (selectPath){
-                config.ffmpeg = (document.getElementById("ffmpegPath") as HTMLInputElement).value = selectPath;
-                // window.llonebot.setConfig(config);
-            }
-        });
-    })
-
-    // 自动保存删除文件延时时间
-    const autoDeleteMinEle = doc.getElementById("autoDeleteMin") as HTMLInputElement;
-    let st = null;
-    autoDeleteMinEle.addEventListener("change", ()=>{
-        if (st){
-            clearTimeout(st)
-        }
-        st = setTimeout(()=>{
-            console.log("auto delete file minute change");
-            config.autoDeleteFileSecond = parseInt(autoDeleteMinEle.value) || 1;
-            window.llonebot.setConfig(config);
-        }, 1000)
-    })
-
-    doc.body.childNodes.forEach(node => {
-        view.appendChild(node);
-    });
-}
-
-
-function init() {
-    let hash = location.hash;
-    if (hash === "#/blank") {
-        return;
-    }
-}
-
-
-if (location.hash === "#/blank") {
-    (window as any).navigation.addEventListener("navigatesuccess", init, {once: true});
-} else {
-    init();
-}
-
-
-export {
-    onSettingWindowCreated
-}

src/renderer/components/button.ts

@@ -0,0 +1,4 @@
+
+export const SettingButton = (text: string, id?: string, type: string = 'secondary') => {
+    return `<setting-button ${type ? `data-type="${type}"` : ''} ${id ? `id="${id}"` : ''}>${text}</setting-button>`;
+}

src/renderer/components/index.ts

@@ -0,0 +1,5 @@
+export * from './list';
+export * from './item';
+export * from './button';
+export * from './switch';
+export * from './select';

src/renderer/components/item.ts

@@ -0,0 +1,10 @@
+
+export const SettingItem = (title: string, subtitle?: string, action?: string, id?: string, visible: boolean = true) => {
+    return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}>
+    <div>
+        <setting-text>${title}</setting-text>
+        ${subtitle ? `<setting-text data-type="secondary">${subtitle}</setting-text>` : ''}
+    </div>
+    ${action ? `<div>${action}</div>` : ''}
+</setting-item>`;
+}

src/renderer/components/list.ts

@@ -0,0 +1,10 @@
+
+export const SettingList = (items: string[], title?: string, isCollapsible: boolean = false, direction: string = 'column') => {
+    return `<setting-section ${title && !isCollapsible ? `data-title="${title}"` : ''}>
+    <setting-panel>
+        <setting-list ${direction ? `data-direction="${direction}"` : ''} ${isCollapsible ? 'is-collapsible' : ''} ${title && isCollapsible ? `data-title="${title}"` : ''}>
+            ${items.join('')}
+        </setting-list>
+    </setting-panel>
+</setting-section>`;
+}

src/renderer/components/option.ts

@@ -0,0 +1,4 @@
+
+export const SettingOption = (text: string, value?: string, isSelected: boolean = false) => {
+    return `<setting-option ${value ? `data-value="${value}"` : ''} ${isSelected ? 'is-selected' : ''}>${text}</setting-option>`;
+}

src/renderer/components/select.ts

@@ -0,0 +1,11 @@
+import { SettingOption } from "./option";
+
+export const SettingSelect = (items: Array<{ text: string, value: string }>, configKey?: string, configValue?: any) => {
+    return `<setting-select ${configKey ? `data-config-key="${configKey}"` : ''}>
+    <div>
+        ${items.map((e, i) => {
+            return SettingOption(e.text, e.value, (configKey && configValue ? configValue === e.value : i === 0));
+        }).join('')}
+    </div>
+</setting-select>`;
+}

src/renderer/components/switch.ts

@@ -0,0 +1,9 @@
+
+export const SettingSwitch = (configKey?: string, isActive: boolean = false, extraData?: Record<string, string>) => {
+    return `<setting-switch 
+    ${configKey ? `data-config-key="${configKey}"` : ''} 
+    ${isActive ? 'is-active' : ''} 
+    ${extraData ? Object.keys(extraData).map(key => `data-${key}="${extraData[key]}"`) : ''} 
+    >
+</setting-switch>`;
+}

src/renderer/index.ts

@@ -0,0 +1,311 @@
+/// <reference path="../global.d.ts" />
+import {
+    SettingButton,
+    SettingItem,
+    SettingList,
+    SettingSelect,
+    SettingSwitch
+} from './components';
+import StyleRaw from './style.css?raw';
+
+// 打开设置界面时触发
+
+async function onSettingWindowCreated(view: Element) {
+    window.llonebot.log("setting window created");
+    const isEmpty = (value: any) => value === undefined || value === null || value === '';
+    let config = await window.llonebot.getConfig();
+    let ob11Config = { ...config.ob11 };
+    const setConfig = (key: string, value: any) => {
+        const configKey = key.split('.');
+
+        if (key.indexOf('ob11') === 0) {
+            if (configKey.length === 2) ob11Config[configKey[1]] = value;
+            else ob11Config[key] = value;
+        } else {
+            if (configKey.length === 2) config[configKey[0]][configKey[1]] = value;
+            else config[key] = value;
+
+            if (!['heartInterval', 'token', 'ffmpeg'].includes(key)){
+                window.llonebot.setConfig(config);
+            }
+        }
+    };
+
+    const parser = new DOMParser();
+    const doc = parser.parseFromString([
+        '<div>',
+        `<style>${StyleRaw}</style>`,
+        SettingList([
+            SettingItem('启用 HTTP 服务', null,
+                SettingSwitch('ob11.enableHttp', config.ob11.enableHttp, { 'control-display-id': 'config-ob11-httpPort' }),
+            ),
+            SettingItem('HTTP 服务监听端口', null,
+                `<div class="q-input"><input class="q-input__inner" data-config-key="ob11.httpPort" type="number" min="1" max="65534" value="${config.ob11.httpPort}" placeholder="${config.ob11.httpPort}" /></div>`,
+                'config-ob11-httpPort', config.ob11.enableHttp
+            ),
+            SettingItem('启用 HTTP 事件上报', null,
+                SettingSwitch('ob11.enableHttpPost', config.ob11.enableHttpPost, { 'control-display-id': 'config-ob11-httpHosts' }),
+            ),
+            `<div class="config-host-list" id="config-ob11-httpHosts" ${config.ob11.enableHttpPost ? '' : 'is-hidden'}>
+                <setting-item data-direction="row">
+                    <div>
+                        <setting-text>HTTP 事件上报地址</setting-text>
+                    </div>
+                    <setting-button id="config-ob11-httpHosts-add" data-type="primary">添加</setting-button>
+                </setting-item>
+                <div id="config-ob11-httpHosts-list"></div>
+            </div>`,
+            SettingItem('启用正向 WebSocket 服务', null,
+                SettingSwitch('ob11.enableWs', config.ob11.enableWs, { 'control-display-id': 'config-ob11-wsPort' }),
+            ),
+            SettingItem('正向 WebSocket 服务监听端口', null,
+                `<div class="q-input"><input class="q-input__inner" data-config-key="ob11.wsPort" type="number" min="1" max="65534" value="${config.ob11.wsPort}" placeholder="${config.ob11.wsPort}" /></div>`,
+                'config-ob11-wsPort', config.ob11.enableWs
+            ),
+            SettingItem('启用反向 WebSocket 服务', null,
+                SettingSwitch('ob11.enableWsReverse', config.ob11.enableWsReverse, { 'control-display-id': 'config-ob11-wsHosts' }),
+            ),
+            `<div class="config-host-list" id="config-ob11-wsHosts" ${config.ob11.enableWsReverse ? '' : 'is-hidden'}>
+                <setting-item data-direction="row">
+                    <div>
+                        <setting-text>反向 WebSocket 监听地址</setting-text>
+                    </div>
+                    <setting-button id="config-ob11-wsHosts-add" data-type="primary">添加</setting-button>
+                </setting-item>
+                <div id="config-ob11-wsHosts-list"></div>
+            </div>`,
+            SettingItem(' WebSocket 服务心跳间隔',
+                '控制每隔多久发送一个心跳包，单位为毫秒',
+                `<div class="q-input"><input class="q-input__inner" data-config-key="heartInterval" type="number" min="1000" value="${config.heartInterval}" placeholder="${config.heartInterval}" /></div>`,
+            ),
+            SettingItem('Access token', null,
+                `<div class="q-input" style="width:210px;"><input class="q-input__inner" data-config-key="token" type="text" value="${config.token}" placeholder="未设置" /></div>`,
+            ),
+            SettingItem(
+                '消息上报格式类型',
+                '如客户端无特殊需求推荐保持默认设置，两者的详细差异可参考 <a href="javascript:LiteLoader.api.openExternal(\'https://github.com/botuniverse/onebot-11/tree/master/message#readme\');">OneBot v11 文档</a>',
+                SettingSelect([
+                    { text: '消息段', value: 'array' },
+                    { text: 'CQ码', value: 'string' },
+                ], 'ob11.messagePostFormat', config.ob11.messagePostFormat),
+            ),
+            SettingItem(
+                'ffmpeg 路径', `<span id="config-ffmpeg-path-text">${!isEmpty(config.ffmpeg) ? config.ffmpeg : '未指定'}</span>`,
+                SettingButton('选择', 'config-ffmpeg-select'),
+            ),
+            SettingItem(
+                '', null,
+                SettingButton('保存', 'config-ob11-save', 'primary'),
+            )
+        ]),
+        SettingList([
+            SettingItem(
+                '使用 Base64 编码获取文件',
+                '开启后，调用 /get_image、/get_record 时，获取不到 url 时添加一个 Base64 字段',
+                SettingSwitch('enableLocalFile2Url', config.enableLocalFile2Url),
+            ),
+            SettingItem(
+                '调试模式',
+                '开启后上报信息会添加 raw 字段以附带原始信息',
+                SettingSwitch('debug', config.debug),
+            ),
+            SettingItem(
+                '上报 Bot 自身发送的消息',
+                '上报 event 为 message_sent',
+                SettingSwitch('reportSelfMessage', config.reportSelfMessage),
+            ),
+            SettingItem(
+                '自动删除收到的文件',
+                '在收到文件后的指定时间内删除该文件',
+                SettingSwitch('autoDeleteFile', config.autoDeleteFile, { 'control-display-id': 'config-auto-delete-file-second' }),
+            ),
+            SettingItem(
+                '自动删除文件时间',
+                '单位为秒',
+                `<div class="q-input"><input class="q-input__inner" data-config-key="autoDeleteFileSecond" type="number" min="1" value="${config.autoDeleteFileSecond}" placeholder="${config.autoDeleteFileSecond}" /></div>`,
+                'config-auto-delete-file-second', config.autoDeleteFile
+            ),
+            SettingItem(
+                '写入日志',
+                `将日志文件写入插件的数据文件夹`,
+                SettingSwitch('log', config.log),
+            ),
+            SettingItem(
+                '日志文件目录',
+                `${window.LiteLoader.plugins['LLOneBot'].path.data}`,
+                SettingButton('打开', 'config-open-log-path'),
+            ),
+        ]),
+        SettingList([
+            SettingItem(
+                'GitHub',
+                `https://github.com/LLOneBot/LLOneBot`,
+                SettingButton('点个Star', 'open-github'),
+            ),
+            SettingItem(
+                'Telegram 群',
+                `https://t.me/+nLZEnpne-pQ1OWFl`,
+                SettingButton('进去逛逛', 'open-telegram'),
+            ),
+            SettingItem(
+                'QQ 群',
+                `545402644`,
+                SettingButton('我要进去', 'open-qq-group'),
+            ),
+        ]),
+        '</div>',
+    ].join(''), "text/html");
+
+    // 外链按钮
+    doc.querySelector('#open-github').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://github.com/LLOneBot/LLOneBot')
+    })
+    doc.querySelector('#open-telegram').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://t.me/+nLZEnpne-pQ1OWFl')
+    })
+    doc.querySelector('#open-qq-group').addEventListener('click', () => {
+        window.LiteLoader.api.openExternal('https://qm.qq.com/q/bDnHRG38aI')
+    })
+    // 生成反向地址列表
+    const buildHostListItem = (type: string, host: string, index: number) => {
+        const dom = {
+            container: document.createElement('setting-item'),
+            input: document.createElement('input'),
+            inputContainer: document.createElement('div'),
+            deleteBtn: document.createElement('setting-button'),
+        };
+
+        dom.container.classList.add('setting-host-list-item');
+        dom.container.dataset.direction = 'row';
+
+        dom.input.classList.add('q-input__inner');
+        dom.input.type = 'url';
+        dom.input.value = host;
+        dom.input.addEventListener('input', () => {
+            ob11Config[type][index] = dom.input.value;
+        });
+
+        dom.inputContainer.classList.add('q-input');
+        dom.inputContainer.appendChild(dom.input);
+
+        dom.deleteBtn.innerHTML = '删除';
+        dom.deleteBtn.dataset.type = 'secondary';
+        dom.deleteBtn.addEventListener('click', () => {
+            ob11Config[type].splice(index, 1);
+            initReverseHost(type);
+        });
+
+        dom.container.appendChild(dom.inputContainer);
+        dom.container.appendChild(dom.deleteBtn);
+
+        return dom.container;
+    };
+    const buildHostList = (hosts: string[], type: string) => {
+        const result: HTMLElement[] = [];
+    
+        hosts.forEach((host, index) => {
+            result.push(buildHostListItem(type, host, index));
+        });
+    
+        return result;
+    };
+    const addReverseHost = (type: string, doc: Document = document) => {
+        const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`);
+        hostContainerDom.appendChild(buildHostListItem(type, '', ob11Config[type].length));
+        ob11Config[type].push('');
+    };
+    const initReverseHost = (type: string, doc: Document = document) => {
+        const hostContainerDom = doc.body.querySelector(`#config-ob11-${type}-list`);
+        [ ...hostContainerDom.childNodes ].forEach(dom => dom.remove());
+        buildHostList(ob11Config[type], type).forEach(dom => {
+            hostContainerDom.appendChild(dom);
+        });
+    };
+    initReverseHost('httpHosts', doc);
+    initReverseHost('wsHosts', doc);
+
+    doc.querySelector('#config-ob11-httpHosts-add').addEventListener('click', () => addReverseHost('httpHosts'));
+    doc.querySelector('#config-ob11-wsHosts-add').addEventListener('click', () => addReverseHost('wsHosts'));
+
+    doc.querySelector('#config-ffmpeg-select').addEventListener('click', () => {
+        window.llonebot.selectFile()
+            .then(path => {
+                if (!isEmpty(path)) {
+                    setConfig('ffmpeg', path);
+                    document.querySelector('#config-ffmpeg-path-text').innerHTML = path;
+                }
+            })
+    });
+
+    doc.querySelector('#config-open-log-path').addEventListener('click', () => {
+        window.LiteLoader.api.openPath(window.LiteLoader.plugins['LLOneBot'].path.data);
+    })
+
+    // 开关
+    doc.querySelectorAll('setting-switch[data-config-key]').forEach((dom: HTMLElement) => {
+        dom.addEventListener('click', () => {
+            const active = dom.getAttribute('is-active') === null;
+
+            setConfig(dom.dataset.configKey, active);
+
+            if (active) dom.setAttribute('is-active', '');
+            else dom.removeAttribute('is-active');
+
+            if (!isEmpty(dom.dataset.controlDisplayId)) {
+                const displayDom = document.querySelector(`#${dom.dataset.controlDisplayId}`);
+                if (active) displayDom.removeAttribute('is-hidden');
+                else displayDom.setAttribute('is-hidden', '');
+            }
+        });
+    });
+
+    // 输入框
+    doc.querySelectorAll('setting-item .q-input input.q-input__inner[data-config-key]').forEach((dom: HTMLInputElement) => {
+        dom.addEventListener('input', () => {
+            const Type = dom.getAttribute('type');
+            const configKey = dom.dataset.configKey;
+            const configValue = Type === 'number' ? (parseInt(dom.value) >= 1 ? parseInt(dom.value) : 1) : dom.value;
+
+            setConfig(configKey, configValue);
+        });
+    });
+
+    // 下拉框
+    doc.querySelectorAll('setting-select').forEach((dom: HTMLElement) => {
+        dom.addEventListener('selected', (e: CustomEvent) => {
+            const configKey = dom.dataset.configKey;
+            const configValue = e.detail.value;
+
+            setConfig(configKey, configValue);
+        });
+    });
+
+    // 保存按钮
+    doc.querySelector('#config-ob11-save').addEventListener('click', () => {
+        config.ob11 = ob11Config;
+
+        window.llonebot.setConfig(config);
+        alert('保存成功');
+    });
+
+    doc.body.childNodes.forEach(node => {
+        view.appendChild(node);
+    });
+}
+
+function init () {
+  const hash = location.hash
+  if (hash === '#/blank') {
+
+  }
+}
+
+if (location.hash === '#/blank') {
+  (window as any).navigation.addEventListener('navigatesuccess', init, { once: true })
+} else {
+  init()
+}
+
+export {
+  onSettingWindowCreated
+}

src/renderer/style.css

@@ -0,0 +1,64 @@
+setting-item[is-hidden],
+setting-item[is-hidden] + setting-divider {
+  display: none !important;
+}
+
+.config-host-list {
+  width: 100%;
+  padding-left: 16px;
+  box-sizing: border-box;
+}
+.config-host-list[is-hidden],
+.config-host-list[is-hidden] + setting-divider {
+  display: none !important;
+}
+
+setting-item .q-input {
+  height: 24px;
+  width: 100px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  box-sizing: border-box;
+  position: relative;
+  background: var(--bg_bottom_light);
+  border: 1px solid var(--border_dark);
+}
+
+setting-item .q-input .q-input__inner {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+  box-sizing: border-box;
+  color: var(--text_primary);
+  font-family: inherit;
+  font-size: 12px;
+  height: 24px;
+  line-height: 24px;
+  width: 100%;
+  border: 1px solid transparent;
+  padding: 0px 8px;
+}
+
+setting-item .q-input input[type=number].q-input__inner::-webkit-outer-spin-button,
+setting-item .q-input input[type=number].q-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.config-host-list setting-item.setting-host-list-item .q-input {
+  width: 260px;
+}
+
+setting-item a {
+  color: var(--text-link);
+}
+setting-item a:hover {
+  color: var(--hover-link);
+}
+setting-item a:active,
+setting-item a:visited {
+  color: var(--text-link);
+}

src/version.ts

@@ -1 +1 @@
-export const version = "3.11.0"
+export const version = "3.13.10"

tsconfig.json

@@ -8,11 +8,14 @@
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "node",
-//    "sourceMap": true
+    //    "sourceMap": true
   },
-  "include": ["src/*"],
+  "include": [
+    "src/*",
+    "src/**/*",
+    "scripts/*"
+  ],
   "exclude": [
     "node_modules",
-    "src/common/types.ts"
   ]
 }

webpack.base.config.js

@@ -1,80 +0,0 @@
-// import path from "path";
-const webpack = require('webpack');
-const path = require('path');
-const TerserPlugin = require('terser-webpack-plugin');
-const CopyPlugin = require('copy-webpack-plugin');
-
-const ignoreModules = [
-    "silk-wasm", "electron"
-];
-const copyModules = ["silk-wasm"]
-
-let config = {
-    // target: 'node',
-    entry: {
-        // main: './src/main.ts',
-        // preload: './src/preload.ts'
-    }, // 入口文件路径
-    target: "node",
-    output: { // 输出文件配置
-        path: path.resolve(__dirname, 'dist'), // 输出目录路径
-        filename: '[name].js', // 输出文件名
-        // libraryTarget: "commonjs2",
-        // chunkFormat: "commonjs",
-    },
-    externals: ignoreModules,
-    experiments: {
-        // outputModule: true
-        // asyncWebAssembly: true
-    },
-    resolve: {
-        extensions: ['.js', '.ts']
-    },
-    module: { // 模块配置
-        rules: [ // 模块规则
-            {
-                test: /\.js$/, // 匹配.js文件
-                exclude: /node_modules/, // 排除node_modules目录
-                use: { // 使用的loader
-                    loader: 'babel-loader',
-                    options: {
-                        presets: ['@babel/preset-env'],
-                    }
-                }
-            },
-            {
-                test: /\.ts$/, // 匹配.ts文件
-                // exclude: /node_modules/, // 排除node_modules目录
-                use: { // 使用的loader
-                    loader: 'ts-loader',
-                    options: {
-                        // configFile: 'src/tsconfig.json'
-                    }
-                }
-            }]
-    },
-    optimization: {
-        minimize: false,
-        minimizer: [
-            new TerserPlugin({
-                extractComments: false,
-            }),
-        ],
-    },
-    plugins: [
-        new CopyPlugin({
-            patterns: copyModules.map(m => {
-                m = `node_modules/${m}`
-                return {
-                    from: m,
-                    to: m
-                }
-            })
-        }),
-        new webpack.DefinePlugin({
-            'process.env.FLUENTFFMPEG_COV': false,
-        }),
-    ], // devtool: 'source-map',
-}
-
-module.exports = config

webpack.main.config.js

@@ -1,11 +0,0 @@
-const baseConfig = require('./webpack.base.config.js')
-
-baseConfig.target = 'electron-main'
-baseConfig.entry = {
-    main: './src/main/main.ts',
-    // preload: './src/preload.ts',
-}
-baseConfig.output.libraryTarget = 'commonjs2'
-baseConfig.output.chunkFormat = 'commonjs'
-
-module.exports = baseConfig

webpack.preload.config.js

@@ -1,9 +0,0 @@
-const baseConfig = require('./webpack.base.config.js')
-
-baseConfig.target = 'electron-preload'
-baseConfig.entry = {
-    preload: './src/preload.ts',
-}
-baseConfig.output.chunkFormat = 'commonjs'
-baseConfig.output.libraryTarget = 'commonjs2'
-module.exports = baseConfig

webpack.renderer.config.js

@@ -1,11 +0,0 @@
-const baseConfig = require('./webpack.base.config.js')
-
-baseConfig.target = 'electron-renderer'
-baseConfig.entry = {
-    renderer: './src/renderer.ts',
-}
-baseConfig.output.libraryTarget = 'module'
-baseConfig.output.chunkFormat = 'module'
-baseConfig.experiments.outputModule = true
-
-module.exports = baseConfig