chore: ver 3.11.1

fix: vite build ws

.github/workflows/publish.yml

@@ -17,7 +17,9 @@ jobs:
         node-version: 18
 
     - name: install dependenies
-      run: npm install
+      run: |
+        export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+        npm install
 
     - name: build
       run: npm run build
@@ -26,7 +28,8 @@ jobs:
       run: |
         sudo apt install zip -y
         cp manifest.json ./dist/manifest.json
-        zip LLOneBot.zip ./dist/* -j
+        cd ./dist/
+        zip -r ../LLOneBot.zip ./* 
     
     - name: publish
       uses: ncipollo/release-action@v1

.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,10 +1,26 @@
-# LLOneBot API
 
-将NTQQLiteLoaderAPI封装成OneBot11标准的API
+# LLOneBot API
+LiteLoaderQQNT的OneBot11协议插件
+
+TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 *注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
 
+*V3之后不再需要LLAPI*
+
 ## 安装方法
+### Linux 容器化快速安装
+
+执行以下任意脚本，按照提示设置NoVnc密码，即可运行，脚本问题与异常参考 [llonebot-docker](https://github.com/MliKiowa/llonebot-docker) 项目。
+
+ ```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
+ ```
+
+### 通用手动安装方法
 
 1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
 
@@ -14,9 +30,28 @@
 
 *插件目录:`LiteLoaderQQNT/plugins`*
 
+安装后的目录结构如下
+```
+├── plugins
+│   ├── LLOneBot
+│   │   └── main.js
+│   │   └── preload.js
+│   │   └── renderer.js
+│   │   └── manifest.json
+│   │   └── node_modules/...
+```
+
+### 使用termux安装
+
+见<https://github.com/LLOneBot/llonebot-termux>
+
 ## 支持的API
 
-目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
+目前支持的协议
+- [x] http调用api
+- [x] http事件上报
+- [x] 正向websocket
+- [x] 反向websocket
 
 主要功能:
 - [x] 发送好友消息
@@ -25,31 +60,44 @@
 - [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] 语音
+- [x] 语音(支持mp3、wav等多种音频格式直接发送)
 - [x] json消息(只上报)
-- [ ] 红包
-- [ ] 转发消息记录
-- [ ] xml
-
-支持的api:
-- [x] get_login_info
-- [x] send_msg
-- [x] send_group_msg
-- [x] send_private_msg
-- [x] delete_msg
-- [x] get_group_list
-- [x] get_group_member_list
-- [x] get_group_member_info
-- [x] get_friend_list
-- [x] get_msg
+- [x] 转发消息记录(目前只能发不能收)
+- [x] 视频(上报时暂时只有个空的file)
+- [x] 文件(上报时暂时只有个空的file), type为file, data为{file: uri}, 发送时uri支持http://, file://, base64://
+    ```
+    {
+        "type": "file",
+        "data": {
+            "file": "file:///D:/1.txt"
+        }
+    }
+    ```
+- [ ] 发送音乐卡片
+- [ ] 红包（没有计划支持）
+- [ ] xml (没有计划支持)
 
 ## 示例
 
@@ -67,7 +115,8 @@
 <details>
     <summary>调用接口报404</summary>
 <br/>
-    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口，并且所有接口都只支持POST方法，调用GET方法会报404
+    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口
+- 
 </details>
 <br/>
 
@@ -78,13 +127,6 @@
 </details>
 <br/>
 
-<details>
-    <summary>不支持cq码</summary>
-<br/>
-    cq码已经过时了，没有支持的打算(主要是我不用这玩意儿，加上我懒)
-</details>
-<br/>
-
 <details>
     <summary>QQ变得很卡</summary>
 <br/>
@@ -92,13 +134,57 @@
 </details>
 <br/>
 
+## 支持的onebot v11 api:
+- [x] get_login_info
+- [x] send_msg
+- [x] send_group_msg
+- [x] send_private_msg
+- [x] delete_msg
+- [x] get_group_list
+- [x] get_group_info
+- [x] get_group_member_list
+- [x] get_group_member_info
+- [x] get_friend_list
+- [x] set_friend_add_request
+- [x] get_msg
+- [x] send_like
+- [x] set_group_add_request
+- [x] set_group_leave
+- [x] set_group_kick
+- [x] set_group_ban
+- [x] set_group_whole_ban
+- [x] set_group_kick
+- [x] set_group_admin
+- [x] set_group_card
+- [x] set_group_name
+- [x] get_version_info
+- [x] get_status
+- [x] can_send_image
+- [x] can_send_record
+- [x] get_image
+- [x] get_record
+
+### 支持的go-cqhtp api:
+- [x] send_private_forward_msg
+- [x] send_group_forward_msg
+- [x] get_stranger_info
 
 ## TODO
-
-- [ ] 转发消息记录 
-- [ ] 好友点赞api
-- [ ] 支持websocket，等个有缘人提PR实现
 - [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
+- [x] 支持正、反向websocket（感谢@disymayufei的PR）
+- [x] 转发消息记录 
+- [x] 好友点赞api
+- [x] 群管理功能，禁言、踢人，改群名片等
+- [x] 视频消息
+- [x] 文件消息
+- [ ] 音乐卡片
+- [ ] 无头模式
 
 ## onebot11文档
 <https://11.onebot.dev/>
+
+## 鸣谢
+* [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
+* [LLAPI](https://github.com/Night-stars-1/LiteLoaderQQNT-Plugin-LLAPI)
+* chronocat
+* [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)

electron.vite.config.ts

@@ -0,0 +1,67 @@
+import cp from 'vite-plugin-cp';
+import "./scripts/gen-version"
+
+const external = ["silk-wasm", "ws"];
+
+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.ts" },
+            },
+            rollupOptions: {
+                // external: externalAll,
+                input: "src/renderer.ts",
+            }
+        },
+        resolve:{
+        }
+    }
+}
+
+export default config;

manifest.json

@@ -1,31 +1,33 @@
 {
-    "manifest_version": 4,
-    "type": "extension",
-    "name": "LLOneBot",
-    "slug": "LLOneBot",
-    "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "3.0.2",
-    "thumbnail": "./icon.png",
-    "authors": [{
-        "name": "linyuchen",
-        "link": "https://github.com/linyuchen"
-    }],
-    "repository": {
+  "manifest_version": 4,
+  "type": "extension",
+  "name": "LLOneBot v3.11.1",
+  "slug": "LLOneBot",
+  "description": "LiteLoaderQQNT的OneBotApi",
+  "version": "3.11.1",
+  "thumbnail": "./icon.png",
+  "authors": [
+    {
+      "name": "linyuchen",
+      "link": "https://github.com/linyuchen"
+    }
+  ],
+  "repository": {
     "repo": "linyuchen/LiteLoaderQQNT-OneBotApi",
     "branch": "main",
     "release": {
-        "tag": "latest",
-        "name": "LLOneBot.zip"
+      "tag": "latest",
+      "name": "LLOneBot.zip"
     }
-},
-    "platform": [
-        "win32",
-        "linux",
-        "darwin"
-    ],
-    "injects": {
-        "renderer": "./renderer.js",
-        "main": "./main.js",
-        "preload": "./preload.js"
-    }
-}
+  },
+  "platform": [
+    "win32",
+    "linux",
+    "darwin"
+  ],
+  "injects": {
+    "renderer": "./renderer/renderer.js",
+    "main": "./main/main.cjs",
+    "preload": "./preload/preload.cjs"
+  }
+}

package.json

@@ -1,35 +1,43 @@
 {
   "name": "llonebot",
   "version": "1.0.0",
+  "type": "module",
   "description": "NTQQLiteLoaderOneBotApi",
   "main": "dist/main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "ELECTRON_SKIP_BINARY_DOWNLOAD=1 npm install electron --no-save",
-    "build": "npm run build-main && npm run build-preload && npm run build-renderer",
-    "build-main": "webpack --config webpack.main.config.js",
-    "build-preload": "webpack --config webpack.preload.config.js",
-    "build-renderer": "webpack --config webpack.renderer.config.js",
-    "build-mac": "npm run build && cp manifest.json dist/ && npm run deploy-mac",
-    "deploy-mac": "cp dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOnebot/",
-    "build-win": "npm run build && cp manifest.json dist/ && npm run deploy-win",
-    "deploy-win": "cmd /c \"copy dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOnebot\\\""
+    "build": "electron-vite build",
+    "build-mac": "npm run build && npm run deploy-mac",
+    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
+    "build-win": "npm run build && npm run deploy-win",
+    "deploy-win": "cmd /c \"xcopy /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "express": "^4.18.2",
-    "json-bigint": "^1.0.0",
-    "uuid": "^9.0.1"
+    "file-type": "^19.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "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",
-    "babel-loader": "^9.1.3",
-    "ts-loader": "^9.5.0",
-    "typescript": "^5.2.2",
-    "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4"
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "electron": "^29.0.1",
+    "electron-vite": "^2.0.0",
+    "eslint": "^8.0.1",
+    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+    "eslint-plugin-promise": "^6.0.0",
+    "ts-node": "^10.9.2",
+    "typescript": "*",
+    "vite": "^5.1.4",
+    "vite-plugin-cp": "^4.0.8"
   }
 }

scripts/gen-version.ts

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

src/common/channels.ts

@@ -1,3 +1,5 @@
-export const CHANNEL_GET_CONFIG = "llonebot_get_config"
-export const CHANNEL_SET_CONFIG = "llonebot_set_config"
-export const CHANNEL_LOG = "llonebot_log"
+export const CHANNEL_GET_CONFIG = 'llonebot_get_config'
+export const CHANNEL_SET_CONFIG = 'llonebot_set_config'
+export const CHANNEL_LOG = 'llonebot_log'
+export const CHANNEL_ERROR = 'llonebot_error'
+export const CHANNEL_SELECT_FILE = 'llonebot_select_ffmpeg'

src/common/config.ts

@@ -1,28 +1,84 @@
-import {Config} from "./types";
+import fs from "fs";
+import {Config, OB11Config} from './types';
+import {mergeNewProperties} from "./utils";
 
-const fs = require("fs")
+export const HOOK_LOG = false;
 
-export class ConfigUtil{
-    configPath: string;
+export class ConfigUtil {
+    private readonly configPath: string;
+    private config: Config | null = null;
 
     constructor(configPath: string) {
         this.configPath = configPath;
     }
 
-    getConfig(): Config{
+    getConfig(cache = true) {
+        if (this.config && cache) {
+            return this.config;
+        }
+
+        return this.reloadConfig();
+    }
+
+    reloadConfig(): Config {
+        let ob11Default: OB11Config = {
+            httpPort: 3000,
+            httpHosts: [],
+            wsPort: 3001,
+            wsHosts: [],
+            enableHttp: true,
+            enableHttpPost: true,
+            enableWs: true,
+            enableWsReverse: false,
+            messagePostFormat: "array",
+        }
+        let defaultConfig: Config = {
+            ob11: ob11Default,
+            heartInterval: 60000,
+            token: "",
+            enableLocalFile2Url: false,
+            debug: false,
+            log: false,
+            reportSelfMessage: false,
+            autoDeleteFile: false,
+            autoDeleteFileSecond: 60,
+        };
+
         if (!fs.existsSync(this.configPath)) {
-            return {port:3000, hosts: ["http://192.168.1.2:5000/"]}
+            this.config = defaultConfig;
+            return this.config;
         } else {
             const data = fs.readFileSync(this.configPath, "utf-8");
-            let jsonData =JSON.parse(data);
-            if (!jsonData.hosts){
-                jsonData.hosts = []
+            let jsonData: Config = defaultConfig;
+            try {
+                jsonData = JSON.parse(data)
+            } catch (e) {
+                this.config = defaultConfig;
+                return this.config;
             }
-            return jsonData;
+            mergeNewProperties(defaultConfig, jsonData);
+            this.checkOldConfig(jsonData.ob11, jsonData, "httpPort", "http");
+            this.checkOldConfig(jsonData.ob11, jsonData, "httpHosts", "hosts");
+            this.checkOldConfig(jsonData.ob11, jsonData, "wsPort", "wsPort");
+            // console.log("get config", jsonData);
+            this.config = jsonData;
+            return this.config;
         }
     }
 
-    setConfig(config: Config){
+    setConfig(config: Config) {
+        this.config = config;
         fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
     }
+
+    private checkOldConfig(currentConfig: Config | OB11Config,
+                           oldConfig: Config | OB11Config,
+                           currentKey: string, oldKey: string) {
+        // 迁移旧的配置到新配置，避免用户重新填写配置
+        const oldValue = oldConfig[oldKey];
+        if (oldValue) {
+            currentConfig[currentKey] = oldValue;
+            delete oldConfig[oldKey];
+        }
+    }
 }

src/common/data.ts

@@ -1,42 +1,86 @@
-import { NTQQApi } from '../ntqqapi/ntcall';
-import { Friend, Group, GroupMember, RawMessage, SelfInfo } from "../ntqqapi/types";
+import {NTQQApi} from '../ntqqapi/ntcall'
+import {
+    type Friend,
+    type FriendRequest,
+    type Group,
+    type GroupMember,
+    type GroupNotify,
+    type RawMessage,
+    type SelfInfo
+} from '../ntqqapi/types'
+import {type FileCache, type LLOneBotError} from './types'
 
+export const selfInfo: SelfInfo = {
+    uid: '',
+    uin: '',
+    nick: '',
+    online: true
+}
 export let groups: Group[] = []
 export let friends: Friend[] = []
-export let msgHistory: Record<string, RawMessage> = {}  // msgId: RawMessage
+export let msgHistory: Record<string, RawMessage> = {} // msgId: RawMessage
+export let groupNotifies: Map<string, GroupNotify> = new Map<string, GroupNotify>()
+export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
+export const llonebotError: LLOneBotError = {
+    ffmpegError: '',
+    otherError: ''
+}
+let globalMsgId = Math.floor(Date.now() / 1000)
+
+export const fileCache = new Map<string, FileCache>()
+
+export function addHistoryMsg(msg: RawMessage): boolean {
+    const 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> {
     let friend = friends.find(friend => friend.uin === qq)
-    // if (!friend){
-    //     friends = (await NTQQApi.getFriends(true))
-    //     friend = friends.find(friend => friend.uin === qq)
-    // }
+    if (!friend){
+        friends = (await NTQQApi.getFriends(true))
+        friend = friends.find(friend => friend.uin === qq)
+    }
     return friend
 }
 
 export async function getGroup(qq: string): Promise<Group | undefined> {
     let group = groups.find(group => group.groupCode === qq)
-    // if (!group){
-    //     groups = await NTQQApi.getGroups(true);
-    //     group = groups.find(group => group.groupCode === qq)
-    // }
+    if (!group){
+        groups = await NTQQApi.getGroups(true);
+        group = groups.find(group => group.groupCode === qq)
+    }
     return group
 }
 
-export async function getGroupMember(groupQQ: string, memberQQ: string=null, memberUid: string=null) {
+export async function getGroupMember(groupQQ: string | number, memberQQ: string | number, memberUid: string = null) {
+    groupQQ = groupQQ.toString()
+    if (memberQQ) {
+        memberQQ = memberQQ.toString()
+    }
     const group = await getGroup(groupQQ)
     if (group) {
         let filterFunc: (member: GroupMember) => boolean
-        if (memberQQ){
+        if (memberQQ) {
             filterFunc = member => member.uin === memberQQ
-        }
-        else if (memberUid){
+        } else if (memberUid) {
             filterFunc = member => member.uid === memberUid
         }
         let member = group.members?.find(filterFunc)
-        if (!member){
+        if (!member) {
             const _members = await NTQQApi.getGroupMembers(groupQQ)
-            if (_members.length){
+            if (_members.length > 0) {
                 group.members = _members
             }
             member = group.members?.find(filterFunc)
@@ -45,24 +89,23 @@ export async function getGroupMember(groupQQ: string, memberQQ: string=null, mem
     }
 }
 
-export let selfInfo: SelfInfo = {
-    uid: "",
-    uin: "",
-    nick: "",
+export async function refreshGroupMembers(groupQQ: string) {
+    const group = groups.find(group => group.groupCode === groupQQ)
+    if (group) {
+        group.members = await NTQQApi.getGroupMembers(groupQQ)
+    }
 }
 
-
 export function getHistoryMsgBySeq(seq: string) {
     return Object.values(msgHistory).find(msg => msg.msgSeq === seq)
 }
 
+export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
 
-export let uidMaps:Record<string, Friend> = {}  // 一串加密的字符串(uid) -> qq号
-
-export function getStrangerByUin(uin: string) {
+export function getUidByUin(uin: string) {
     for (const key in uidMaps) {
-        if (uidMaps[key].uin === uin) {
-            return uidMaps[key];
+        if (uidMaps[key] === uin) {
+            return key
         }
     }
-}
+}

src/common/server/http.ts

@@ -0,0 +1,92 @@
+import express, {Express, json, Request, Response} from "express";
+import {getConfigUtil, log} from "../utils";
+import http from "http";
+
+type RegisterHandler = (res: Response, payload: any) => Promise<any>
+
+export abstract class HttpServerBase {
+    name: string = "LLOneBot";
+    private readonly expressAPP: Express;
+    private server: http.Server = null;
+
+    constructor() {
+        this.expressAPP = express();
+        this.expressAPP.use(express.urlencoded({extended: true, limit: "500mb"}));
+        this.expressAPP.use(json({limit: "500mb"}));
+    }
+
+    authorize(req: Request, res: Response, next: () => void) {
+        let serverToken = getConfigUtil().getConfig().token;
+        let clientToken = ""
+        const authHeader = req.get("authorization")
+        if (authHeader) {
+            clientToken = authHeader.split("Bearer ").pop()
+            log("receive http header token", clientToken)
+        } else if (req.query.access_token) {
+            if (Array.isArray(req.query.access_token)) {
+                clientToken = req.query.access_token[0].toString();
+            } else {
+                clientToken = req.query.access_token.toString();
+            }
+            log("receive http url token", clientToken)
+        }
+
+        if (serverToken && clientToken != serverToken) {
+            return res.status(403).send(JSON.stringify({message: 'token verify failed!'}));
+        }
+        next();
+    };
+
+    start(port: number) {
+        this.expressAPP.get('/', (req: Request, res: Response) => {
+            res.send(`${this.name}已启动`);
+        })
+        this.listen(port);
+    }
+
+    stop() {
+        if (this.server) {
+            this.server.close()
+            this.server = null;
+        }
+    }
+
+    restart(port: number) {
+        this.stop()
+        this.start(port)
+    }
+
+    abstract handleFailed(res: Response, payload: any, err: any): void
+
+    registerRouter(method: "post" | "get" | string, url: string, handler: RegisterHandler) {
+        if (!url.startsWith("/")) {
+            url = "/" + url
+        }
+
+        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") {
+                payload = req.query
+            }
+            log("收到http请求", url, payload);
+            try {
+                res.send(await handler(res, payload))
+            } catch (e) {
+                this.handleFailed(res, payload, e.stack.toString())
+            }
+        });
+    }
+
+    protected listen(port: number) {
+        this.server = this.expressAPP.listen(port, "0.0.0.0", () => {
+            const info = `${this.name} started 0.0.0.0:${port}`
+            console.log(info);
+            log(info);
+        });
+    }
+}

src/common/server/websocket.ts

@@ -0,0 +1,96 @@
+import {WebSocket, WebSocketServer} from "ws";
+import {getConfigUtil, log} from "../utils";
+import urlParse from "url";
+import {IncomingMessage} from "node:http";
+
+class WebsocketClientBase {
+    private wsClient: WebSocket
+
+    constructor() {
+    }
+
+    send(msg: string) {
+        if (this.wsClient && this.wsClient.readyState == WebSocket.OPEN) {
+            this.wsClient.send(msg);
+        }
+    }
+
+    onMessage(msg: string) {
+
+    }
+}
+
+export class WebsocketServerBase {
+    private ws: WebSocketServer = null;
+
+    constructor() {
+        console.log(`llonebot websocket service started`)
+    }
+
+    start(port: number) {
+        this.ws = new WebSocketServer({port});
+        this.ws.on("connection", (wsClient, req) => {
+            const url = req.url.split("?").shift()
+            this.authorize(wsClient, req);
+            this.onConnect(wsClient, url, req);
+            wsClient.on("message", async (msg) => {
+                this.onMessage(wsClient, url, msg.toString())
+            })
+        })
+    }
+
+    stop() {
+        this.ws.close((err) => {
+            log("ws server close failed!", err)
+        });
+        this.ws = null;
+    }
+
+    restart(port: number) {
+        this.stop();
+        this.start(port);
+    }
+
+    authorize(wsClient: WebSocket, req) {
+        let token = getConfigUtil().getConfig().token;
+        const url = req.url.split("?").shift();
+        log("ws connect", url)
+        let clientToken: string = ""
+        const authHeader = req.headers['authorization'];
+        if (authHeader) {
+            clientToken = authHeader.split("Bearer ").pop()
+            log("receive ws header token", clientToken);
+        } else {
+            const parsedUrl = urlParse.parse(req.url, true);
+            const urlToken = parsedUrl.query.access_token;
+            if (urlToken) {
+                if (Array.isArray(urlToken)) {
+                    clientToken = urlToken[0]
+                } else {
+                    clientToken = urlToken
+                }
+                log("receive ws url token", clientToken);
+            }
+        }
+        if (token && clientToken != token) {
+            this.authorizeFailed(wsClient)
+            return wsClient.close()
+        }
+    }
+
+    authorizeFailed(wsClient: WebSocket) {
+
+    }
+
+    onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
+
+    }
+
+    onMessage(wsClient: WebSocket, url: string, msg: string) {
+
+    }
+
+    sendHeart() {
+
+    }
+}

src/common/types.ts

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

src/common/utils.ts

@@ -1,10 +1,11 @@
-import * as path from "path";
+import * as path from "node:path";
 import {selfInfo} from "./data";
 import {ConfigUtil} from "./config";
 import util from "util";
-import { sendLog } from '../main/ipcsend';
-
-const fs = require('fs');
+import {encode, getDuration, isWav} from "silk-wasm";
+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;
 
@@ -13,9 +14,26 @@ export function getConfigUtil() {
     return new ConfigUtil(configFilePath)
 }
 
+function truncateString(obj: any, maxLength = 500) {
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach(key => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
 export function log(...msg: any[]) {
-    if (!getConfigUtil().getConfig().log){
-        return
+    if (!getConfigUtil().getConfig().log) {
+        return //console.log(...msg);
     }
     let currentDateTime = new Date().toLocaleString();
     const date = new Date();
@@ -25,18 +43,19 @@ export function log(...msg: any[]) {
     const currentDate = `${year}-${month}-${day}`;
     const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ""
     let logMsg = "";
-    for (let msgItem of msg){
+    for (let msgItem of msg) {
         // 判断是否是对象
-        if (typeof msgItem === "object"){
-            logMsg += JSON.stringify(msgItem) + " ";
+        if (typeof msgItem === "object") {
+            let obj = JSON.parse(JSON.stringify(msgItem));
+            logMsg += JSON.stringify(truncateString(obj)) + " ";
             continue;
         }
         logMsg += msgItem + " ";
     }
-    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n`
+    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(CONFIG_DIR, `llonebot-${currentDate}.log`), logMsg, (err: any) => {
 
     })
 }
@@ -49,9 +68,13 @@ export function isGIF(path: string) {
     return buffer.toString() === 'GIF8'
 }
 
+export function sleep(ms: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
 
 // 定义一个异步函数来检查文件是否存在
-export function checkFileReceived(path: string, timeout: number=3000): Promise<void> {
+export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
     return new Promise((resolve, reject) => {
         const startTime = Date.now();
 
@@ -69,7 +92,7 @@ export function checkFileReceived(path: string, timeout: number=3000): Promise<v
     });
 }
 
-export async function file2base64(path: string){
+export async function file2base64(path: string) {
     const readFile = util.promisify(fs.readFile);
     let result = {
         err: "",
@@ -94,3 +117,135 @@ export async function file2base64(path: string){
     }
     return result;
 }
+
+
+// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
+export function mergeNewProperties(newObj: any, oldObj: any) {
+    Object.keys(newObj).forEach(key => {
+        // 如果老对象不存在当前属性，则直接复制
+        if (!oldObj.hasOwnProperty(key)) {
+            oldObj[key] = newObj[key];
+        } else {
+            // 如果老对象和新对象的当前属性都是对象，则递归合并
+            if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
+                mergeNewProperties(newObj[key], oldObj[key]);
+            } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
+                // 属性冲突，有一方不是对象，直接覆盖
+                oldObj[key] = newObj[key];
+            }
+        }
+    });
+}
+
+export function checkFfmpeg(newPath: string = null): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        if (newPath) {
+            ffmpeg.setFfmpegPath(newPath);
+            ffmpeg.getAvailableFormats((err, formats) => {
+                if (err) {
+                    log('ffmpeg is not installed or not found in PATH:', err);
+                    resolve(false)
+                } else {
+                    log('ffmpeg is installed.');
+                    resolve(true);
+                }
+            })
+        }
+    });
+}
+
+export async function encodeSilk(filePath: string) {
+    const fsp = require("fs").promises
+
+    function getFileHeader(filePath: string) {
+        // 定义要读取的字节数
+        const bytesToRead = 7;
+        try {
+            const buffer = fs.readFileSync(filePath, {
+                encoding: null,
+                flag: "r",
+            });
+
+            const fileHeader = buffer.toString("hex", 0, bytesToRead);
+            return fileHeader;
+        } catch (err) {
+            console.error("读取文件错误:", err);
+            return;
+        }
+    }
+
+    async function isWavFile(filePath: string) {
+        return isWav(fs.readFileSync(filePath));
+    }
+
+    // async function getAudioSampleRate(filePath: string) {
+    //     try {
+    //         const mm = await import('music-metadata');
+    //         const metadata = await mm.parseFile(filePath);
+    //         log(`${filePath}采样率`, metadata.format.sampleRate);
+    //         return metadata.format.sampleRate;
+    //     } catch (error) {
+    //         log(`${filePath}采样率获取失败`, error.stack);
+    //         // console.error(error);
+    //     }
+    // }
+
+    try {
+        const fileName = path.basename(filePath);
+        const pttPath = path.join(CONFIG_DIR, uuidv4());
+        if (getFileHeader(filePath) !== "02232153494c4b") {
+            log(`语音文件${filePath}需要转换成silk`)
+            const _isWav = await isWavFile(filePath);
+            const wavPath = pttPath + ".wav"
+            if (!_isWav) {
+                log(`语音文件${filePath}正在转换成wav`)
+                // let voiceData = await fsp.readFile(filePath)
+                await new Promise((resolve, reject) => {
+                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
+                    if (ffmpegPath) {
+                        ffmpeg.setFfmpegPath(ffmpegPath);
+                    }
+                    ffmpeg(filePath).toFormat("wav").on('end', function () {
+                        log('wav转换完成');
+                    })
+                        .on('error', function (err) {
+                            log(`wav转换出错: `, err.message,);
+                            reject(err);
+                        })
+                        .save(wavPath)
+                        .on("end", () => {
+                            filePath = wavPath
+                            resolve(wavPath);
+                        });
+                })
+            }
+            // const sampleRate = await getAudioSampleRate(filePath) || 0;
+            const pcm = fs.readFileSync(filePath);
+            const silk = await encode(pcm, 0);
+            fs.writeFileSync(pttPath, silk.data);
+            fs.unlink(wavPath, (err) => {
+            });
+            log(`语音文件${filePath}转换成功!`, pttPath)
+            return {
+                converted: true,
+                path: pttPath,
+                duration: silk.duration,
+            };
+        } else {
+            const pcm = fs.readFileSync(filePath);
+            const duration = getDuration(pcm);
+            return {
+                converted: false,
+                path: filePath,
+                duration: duration,
+            };
+        }
+    } catch (error) {
+        log("convert silk failed", error.stack);
+        return {};
+    }
+}
+
+export function isNull(value: any) {
+    return value === undefined || value === null;
+}

src/global.d.ts

@@ -1,15 +1,8 @@
-import { Config } from "./common/types";
-
-
-declare var llonebot: {
-    log(data: any): void,
-    setConfig(config: Config):void;
-    getConfig():Promise<Config>;
-};
+import { type LLOneBot } from './preload'
 
 declare global {
-    interface Window {
-        llonebot: typeof llonebot;
-        LiteLoader: any;
-    }
-}
+  interface Window {
+    llonebot: LLOneBot
+    LiteLoader: any
+  }
+}

src/main/ipcsend.ts

@@ -1,5 +1,4 @@
 import {webContents} from 'electron';
-import { CHANNEL_LOG } from '../common/channels';
 
 
 function sendIPCMsg(channel: string, ...data: any) {
@@ -12,7 +11,3 @@ function sendIPCMsg(channel: string, ...data: any) {
         }
     }
 }
-
-export function sendLog(...args){
-    sendIPCMsg(CHANNEL_LOG, ...args)
-}

src/main/main.ts

@@ -1,25 +1,49 @@
 // 运行在 Electron 主进程 下的插件入口
 
-import * as path from "path";
-import { BrowserWindow, ipcMain } from 'electron';
-import * as util from 'util';
-
-import { Config } from "../common/types";
+import {BrowserWindow, dialog, ipcMain} from 'electron';
+import * as fs from 'node:fs';
+import {Config} from "../common/types";
 import {
+    CHANNEL_ERROR,
     CHANNEL_GET_CONFIG,
     CHANNEL_LOG,
+    CHANNEL_SELECT_FILE,
     CHANNEL_SET_CONFIG,
 } from "../common/channels";
-import { ConfigUtil } from "../common/config";
-import { postMsg, startExpress } from "../onebot11/server";
-import { CONFIG_DIR, getConfigUtil, log } from "../common/utils";
-import { friends, groups, msgHistory, selfInfo } from "../common/data";
-import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook";
-import { OB11Constructor } from "../onebot11/constructor";
-import { NTQQApi } from "../ntqqapi/ntcall";
-import { Group, RawMessage, SelfInfo } from "../ntqqapi/types";
+import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
+import {checkFfmpeg, CONFIG_DIR, getConfigUtil, log} from "../common/utils";
+import {
+    addHistoryMsg,
+    friendRequests,
+    getGroup,
+    getGroupMember,
+    groupNotifies,
+    llonebotError,
+    msgHistory, refreshGroupMembers,
+    selfInfo
+} from "../common/data";
+import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
+import {OB11Constructor} from "../onebot11/constructor";
+import {NTQQApi} from "../ntqqapi/ntcall";
+import {
+    ChatType,
+    FriendRequestNotify,
+    GroupMember,
+    GroupNotifies,
+    GroupNotifyTypes,
+    RawMessage
+} from "../ntqqapi/types";
+import {ob11HTTPServer} from "../onebot11/server/http";
+import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
+import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
+import {postOB11Event} from "../onebot11/server/postOB11Event";
+import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
+import {OB11GroupAdminNoticeEvent} from "../onebot11/event/notice/OB11GroupAdminNoticeEvent";
+import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
+import {OB11GroupRequestEvent} from "../onebot11/event/request/OB11GroupRequest";
+import {OB11FriendRequestEvent} from "../onebot11/event/request/OB11FriendRequest";
+import * as path from "node:path";
 
-const fs = require('fs');
 
 let running = false;
 
@@ -28,110 +52,366 @@ let running = false;
 function onLoad() {
     log("llonebot main onLoad");
 
-    // const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;
-
-
+    ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
+        const selectPath = new Promise<string>((resolve, reject) => {
+            dialog
+                .showOpenDialog({
+                    title: "请选择ffmpeg",
+                    properties: ["openFile"],
+                    buttonLabel: "确定",
+                })
+                .then((result) => {
+                    log("选择文件", result);
+                    if (!result.canceled) {
+                        const _selectPath = path.join(result.filePaths[0]);
+                        resolve(_selectPath);
+                        // let config = getConfigUtil().getConfig()
+                        // config.ffmpeg = path.join(result.filePaths[0]);
+                        // getConfigUtil().setConfig(config);
+                    }
+                    resolve("")
+                })
+                .catch((err) => {
+                    reject(err);
+                });
+        })
+        try {
+            return await selectPath;
+        } catch (e) {
+            log("选择文件出错", e)
+            return ""
+        }
+    })
     if (!fs.existsSync(CONFIG_DIR)) {
         fs.mkdirSync(CONFIG_DIR, {recursive: true});
     }
-    ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
-        return getConfigUtil().getConfig()
+    ipcMain.handle(CHANNEL_ERROR, (event, arg) => {
+        return llonebotError;
     })
-    ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
+    ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
+        const config = getConfigUtil().getConfig()
+        return config;
+    })
+    ipcMain.on(CHANNEL_SET_CONFIG, (event, arg: Config) => {
+        let oldConfig = getConfigUtil().getConfig();
         getConfigUtil().setConfig(arg)
+        if (arg.ob11.httpPort != oldConfig.ob11.httpPort && arg.ob11.enableHttp) {
+            ob11HTTPServer.restart(arg.ob11.httpPort);
+        }
+        // 判断是否启用或关闭HTTP服务
+        if (!arg.ob11.enableHttp) {
+            ob11HTTPServer.stop();
+        } else {
+            ob11HTTPServer.start(arg.ob11.httpPort);
+        }
+        // 正向ws端口变化，重启服务
+        if (arg.ob11.wsPort != oldConfig.ob11.wsPort) {
+            ob11WebsocketServer.restart(arg.ob11.wsPort);
+        }
+        // 判断是否启用或关闭正向ws
+        if (arg.ob11.enableWs != oldConfig.ob11.enableWs) {
+            if (arg.ob11.enableWs) {
+                ob11WebsocketServer.start(arg.ob11.wsPort);
+            } else {
+                ob11WebsocketServer.stop();
+            }
+        }
+        // 判断是否启用或关闭反向ws
+        if (arg.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
+            if (arg.ob11.enableWsReverse) {
+                ob11ReverseWebsockets.start();
+            } else {
+                ob11ReverseWebsockets.stop();
+            }
+        }
+        if (arg.ob11.enableWsReverse) {
+            // 判断反向ws地址有变化
+            if (arg.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
+                ob11ReverseWebsockets.restart();
+            } else {
+                for (const newHost of arg.ob11.wsHosts) {
+                    if (!oldConfig.ob11.wsHosts.includes(newHost)) {
+                        ob11ReverseWebsockets.restart();
+                        break;
+                    }
+                }
+            }
+        }
+
+        // 检查ffmpeg
+        if (arg.ffmpeg) {
+            checkFfmpeg(arg.ffmpeg).then(success => {
+                if (success) {
+                    llonebotError.ffmpegError = ''
+                }
+            })
+        }
+
     })
 
-    ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => {
-        log(arg)
+    ipcMain.on(CHANNEL_LOG, (event, arg) => {
+        log(arg);
     })
 
-
-    function postRawMsg(msgList: RawMessage[]) {
+    function postReceiveMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
-        for (const message of msgList) {
+        for (let message of msgList) {
+            // log("收到新消息", message)
+            message.msgShortId = msgHistory[message.msgId]?.msgShortId
+            if (!message.msgShortId) {
+                addHistoryMsg(message);
+            }
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
                     msg.raw = message;
                 }
-                if (msg.user_id == selfInfo.uin && !reportSelfMessage) {
+                const isSelfMsg = msg.user_id.toString() == selfInfo.uin
+                if (isSelfMsg && !reportSelfMessage) {
                     return
                 }
-                postMsg(msg);
+                postOB11Event(msg);
+                // log("post msg", msg)
             }).catch(e => log("constructMessage error: ", e.toString()));
         }
     }
 
-
-    function start() {
+    async function startReceiveHook() {
         registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
             try {
-                postRawMsg(payload.msgList);
+                postReceiveMsg(payload.msgList);
             } catch (e) {
-                log("report message error: ", e.toString())
+                log("report message error: ", e.toString());
             }
         })
+        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
+            for (const message of payload.msgList) {
+                // log("message update", message.sendStatus, message)
+                if (message.recallTime != "0") {
+                    // 撤回消息上报
+                    const oriMessage = msgHistory[message.msgId]
+                    if (!oriMessage) {
+                        continue
+                    }
+                    if (message.chatType == ChatType.friend) {
+                        const friendRecallEvent = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId);
+                        postOB11Event(friendRecallEvent);
+                    } else if (message.chatType == ChatType.group) {
+                        let operatorId = message.senderUin
+                        for (const element of message.elements) {
+                            const operatorUid = element.grayTipElement?.revokeElement.operatorUid
+                            const operator = await getGroupMember(message.peerUin, null, operatorUid)
+                            operatorId = operator.uin
+                        }
+                        const groupRecallEvent = new OB11GroupRecallNoticeEvent(
+                            parseInt(message.peerUin),
+                            parseInt(message.senderUin),
+                            parseInt(operatorId),
+                            oriMessage.msgShortId
+                        )
 
+                        postOB11Event(groupRecallEvent);
+                    }
+                    continue
+                }
+                addHistoryMsg(message)
+            }
+        })
         registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
-            const {reportSelfMessage} = getConfigUtil().getConfig()
+            const {reportSelfMessage} = getConfigUtil().getConfig();
             if (!reportSelfMessage) {
                 return
             }
-            log("reportSelfMessage", payload)
+            // log("reportSelfMessage", payload)
             try {
-                postRawMsg([payload.msgRecord]);
+                postReceiveMsg([payload.msgRecord]);
             } catch (e) {
-                log("report self message error: ", e.toString())
+                log("report self message error: ", e.toString());
+            }
+        })
+        registerReceiveHook<{
+            "doubt": boolean,
+            "oldestUnreadSeq": string,
+            "unreadCount": number
+        }>(ReceiveCmd.UNREAD_GROUP_NOTIFY, async (payload) => {
+            if (payload.unreadCount) {
+                // log("开始获取群通知详情")
+                let notify: GroupNotifies;
+                try {
+                    notify = await NTQQApi.getGroupNotifies();
+                } catch (e) {
+                    // log("获取群通知详情失败", e);
+                    return
+                }
+
+                const notifies = notify.notifies.slice(0, payload.unreadCount)
+                // log("获取群通知详情完成", notifies, payload);
+                try {
+                    for (const notify of notifies) {
+                        notify.time = Date.now();
+                        const notifyTime = parseInt(notify.seq) / 1000
+                        // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
+                        if (notifyTime < startTime) {
+                            continue;
+                        }
+                        let existNotify = groupNotifies[notify.seq];
+                        if (existNotify) {
+                            if (Date.now() - existNotify.time < 3000) {
+                                continue
+                            }
+                        }
+                        log("收到群通知", notify);
+                        groupNotifies[notify.seq] = notify;
+                        const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                        refreshGroupMembers(notify.group.groupCode).then()
+                        let member2: GroupMember;
+                        if (notify.user2.uid) {
+                            member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
+                        }
+                        if ([GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET].includes(notify.type)) {
+                            log("有管理员变动通知");
+                            let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
+                            groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
+                            log("开始获取变动的管理员")
+                            if (member1) {
+                                log("变动管理员获取成功")
+                                groupAdminNoticeEvent.user_id = parseInt(member1.uin);
+                                groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
+                                postOB11Event(groupAdminNoticeEvent, true);
+                            } else {
+                                log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
+                            }
+                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
+                            log("有成员退出通知");
+                            let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                            // postEvent(groupDecreaseEvent, true);
+                        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
+                            log("有加群请求");
+                            let groupRequestEvent = new OB11GroupRequestEvent();
+                            groupRequestEvent.group_id = parseInt(notify.group.groupCode);
+                            let requestQQ = ""
+                            try {
+                                requestQQ = (await NTQQApi.getUserDetailInfo(notify.user1.uid)).uin;
+                            } catch (e) {
+                                log("获取加群人QQ号失败", e)
+                            }
+                            groupRequestEvent.user_id = parseInt(requestQQ) || 0;
+                            groupRequestEvent.sub_type = "add"
+                            groupRequestEvent.comment = notify.postscript;
+                            groupRequestEvent.flag = notify.seq;
+                            postOB11Event(groupRequestEvent);
+                        } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+                            let groupInviteEvent = new OB11GroupRequestEvent();
+                            groupInviteEvent.group_id = parseInt(notify.group.groupCode);
+                            let 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);
+                }
+            }
+            else if (payload.doubt){
+                // 可能有群管理员变动
+            }
+        })
+
+        registerReceiveHook<FriendRequestNotify>(ReceiveCmd.FRIEND_REQUEST, async (payload) => {
+            for (const req of payload.data.buddyReqs) {
+                if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
+                    friendRequests[req.sourceId] = req;
+                    log("有新的好友请求", req);
+                    let friendRequestEvent = new OB11FriendRequestEvent();
+                    try {
+                        let requester = await NTQQApi.getUserDetailInfo(req.friendUid)
+                        friendRequestEvent.user_id = parseInt(requester.uin);
+                    } catch (e) {
+                        log("获取加好友者QQ号失败", e);
+                    }
+                    friendRequestEvent.flag = req.sourceId.toString();
+                    friendRequestEvent.comment = req.extWords;
+                    postOB11Event(friendRequestEvent);
+                }
             }
         })
-        NTQQApi.getGroups(true).then()
-        startExpress(getConfigUtil().getConfig().port)
     }
 
-    async function getSelfInfo() {
-        try {
-            const _ = await NTQQApi.getSelfInfo()
-            Object.assign(selfInfo, _)
-            selfInfo.nick = selfInfo.uin
-            log("get self simple info", _)
-        } catch (e) {
-            log("retry get self info")
+    let startTime = 0;
 
+    async function start() {
+        startTime = Date.now();
+        startReceiveHook().then();
+        NTQQApi.getGroups(true).then()
+        const config = getConfigUtil().getConfig()
+        // 检查ffmpeg
+        checkFfmpeg(config.ffmpeg).then(exist => {
+            if (!exist) {
+                llonebotError.ffmpegError = `没有找到ffmpeg,音频只能发送wav和silk`
+            }
+        })
+        if (config.ob11.enableHttp) {
+            try {
+                ob11HTTPServer.start(config.ob11.httpPort)
+            } catch (e) {
+                log("http server start failed", e);
+            }
         }
+        if (config.ob11.enableWs) {
+            ob11WebsocketServer.start(config.ob11.wsPort);
+        }
+        if (config.ob11.enableWsReverse) {
+            ob11ReverseWebsockets.start();
+        }
+
+        log("LLOneBot start")
+    }
+
+    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;
+        } catch (e) {
+            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
+                    selfInfo.nick = userInfo.nick;
                 } else {
-                    return setTimeout(() => {
-                        getSelfInfo().then()
-                    }, 100)
+                    getSelfNickCount++;
+                    if (getSelfNickCount < 10) {
+                        return setTimeout(init, 1000);
+                    }
                 }
             } catch (e) {
-                log("get self nickname failed", e.toString())
-                return setTimeout(() => {
-                    getSelfInfo().then()
-                }, 100)
+                log("get self nickname failed", e.toString());
+                return setTimeout(init, 1000);
             }
-            start();
+            start().then();
         } else {
-            setTimeout(() => {
-                getSelfInfo().then()
-            }, 100)
+            setTimeout(init, 1000)
         }
     }
-
-    getSelfInfo().then()
+    setTimeout(init, 1000);
 }
 
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
     try {
+        hookNTQQApiCall(window);
         hookNTQQApiReceive(window);
     } catch (e) {
-        log("llonebot hook error: ", e.toString())
+        log("LLOneBot hook error: ", e.toString())
     }
 }
 

src/ntqqapi/constructor.ts

@@ -1,5 +1,16 @@
-import {ElementType, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, AtType} from "./types";
+import {
+    AtType,
+    ElementType, PicType,
+    SendFaceElement,
+    SendFileElement,
+    SendPicElement,
+    SendPttElement,
+    SendReplyElement,
+    SendTextElement
+} from "./types";
 import {NTQQApi} from "./ntcall";
+import {encodeSilk, isGIF} from "../common/utils";
+import * as fs from "node:fs";
 
 
 export class SendMsgElementConstructor {
@@ -44,8 +55,8 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string): Promise<SendPicElement>{
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath);
+    static async pic(picPath: string): Promise<SendPicElement> {
+        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath, ElementType.PIC);
         const imageSize = await NTQQApi.getImageSize(picPath);
         const picElement = {
             md5HexStr: md5,
@@ -55,7 +66,7 @@ export class SendMsgElementConstructor {
             fileName: fileName,
             sourcePath: path,
             original: true,
-            picType: 1001,
+            picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
             picSubType: 0,
             fileUuid: "",
             fileSubId: "",
@@ -70,8 +81,41 @@ export class SendMsgElementConstructor {
         };
     }
 
-    static async ptt(pttPath: string):Promise<SendPttElement> {
-        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(pttPath);
+    static async file(filePath: string, isVideo: boolean = false): Promise<SendFileElement> {
+        let picHeight = 0;
+        let picWidth = 0;
+        if (isVideo) {
+            picHeight = 1024;
+            picWidth = 768;
+        }
+        const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(filePath, ElementType.FILE);
+        let element: SendFileElement = {
+            elementType: ElementType.FILE,
+            elementId: "",
+            fileElement: {
+                fileName,
+                "filePath": path,
+                "fileSize": (fileSize).toString(),
+                picHeight,
+                picWidth
+            }
+        }
+
+        return element;
+    }
+
+    static video(filePath: string): Promise<SendFileElement> {
+        return SendMsgElementConstructor.file(filePath, true);
+    }
+
+    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 (converted) {
+            fs.unlink(silkPath, () => {
+            });
+        }
         return {
             elementType: ElementType.PTT,
             elementId: "",
@@ -80,7 +124,8 @@ export class SendMsgElementConstructor {
                 filePath: path,
                 md5HexStr: md5,
                 fileSize: fileSize,
-                duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
+                // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
+                duration: duration / 1000,
                 formatType: 1,
                 voiceType: 1,
                 voiceChangeType: 0,
@@ -94,4 +139,15 @@ export class SendMsgElementConstructor {
             }
         };
     }
+
+    static face(faceId: number): SendFaceElement {
+        return {
+            elementType: ElementType.FACE,
+            elementId: "",
+            faceElement: {
+                faceIndex: faceId,
+                faceType: 1
+            }
+        }
+    }
 }

src/ntqqapi/hook.ts

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

src/ntqqapi/ntcall.ts

@@ -1,13 +1,25 @@
-import { ipcMain } from "electron";
-import { v4 as uuidv4 } from "uuid";
-import { ReceiveCmd, hookApiCallbacks, registerReceiveHook, removeReceiveHook } from "./hook";
-import { log } from "../common/utils";
-import { ChatType, Friend, PicElement, SelfInfo, User } from "./types";
-import { Group } from "./types";
-import { GroupMember } from "./types";
-import { RawMessage } from "./types";
-import { SendMessageElement } from "./types";
-import * as fs from "fs";
+import {ipcMain} from 'electron'
+import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from './hook'
+import {log, sleep} from '../common/utils'
+import {
+    type ChatType,
+    ElementType,
+    type Friend,
+    type FriendRequest,
+    type Group, GroupMember,
+    type GroupMemberRole,
+    type GroupNotifies,
+    type GroupNotify,
+    type GroupRequestOperateTypes,
+    type RawMessage,
+    type SelfInfo,
+    type SendMessageElement,
+    type User
+} from './types'
+import * as fs from 'node:fs'
+import {addHistoryMsg, friendRequests, groupNotifies, msgHistory, selfInfo} from '../common/data'
+import {v4 as uuidv4} from 'uuid'
+import path from 'path'
 
 interface IPCReceiveEvent {
     eventName: string
@@ -22,134 +34,218 @@ export type IPCReceiveDetail = [
 ]
 
 export enum NTQQApiClass {
-    NT_API = "ns-ntApi",
-    FS_API = "ns-FsApi",
-    GLOBAL_DATA = "ns-GlobalDataApi"
+    NT_API = 'ns-ntApi',
+    FS_API = 'ns-FsApi',
+    GLOBAL_DATA = 'ns-GlobalDataApi'
 }
 
 export enum NTQQApiMethod {
-    LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
-    UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    SELF_INFO = "fetchAuthData",
-    FRIENDS = "nodeIKernelBuddyService/getBuddyList",
-    GROUPS = "nodeIKernelGroupService/getGroupList",
-    GROUP_MEMBER_SCENE = "nodeIKernelGroupService/createMemberListScene",
-    GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
-    USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
-    FILE_TYPE = "getFileType",
-    FILE_MD5 = "getFileMd5",
-    FILE_COPY = "copyFile",
-    IMAGE_SIZE = "getImageSizeFromPath",
-    FILE_SIZE = "getFileSize",
-    MEDIA_FILE_PATH = "nodeIKernelMsgService/getRichMediaFilePathForGuild",
-    RECALL_MSG = "nodeIKernelMsgService/recallMsg",
-    SEND_MSG = "nodeIKernelMsgService/sendMsg",
-    DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia"
+    LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+    SELF_INFO = 'fetchAuthData',
+    FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
+    GROUPS = 'nodeIKernelGroupService/getGroupList',
+    GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
+    GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
+    USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
+    USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
+    FILE_TYPE = 'getFileType',
+    FILE_MD5 = 'getFileMd5',
+    FILE_COPY = 'copyFile',
+    IMAGE_SIZE = 'getImageSizeFromPath',
+    FILE_SIZE = 'getFileSize',
+    MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+    RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+    SEND_MSG = 'nodeIKernelMsgService/sendMsg',
+    DOWNLOAD_MEDIA = 'nodeIKernelMsgService/downloadRichMedia',
+    MULTI_FORWARD_MSG = 'nodeIKernelMsgService/multiForwardMsgWithComment', // 合并转发
+    GET_GROUP_NOTICE = 'nodeIKernelGroupService/getSingleScreenNotifies',
+    HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
+    QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
+    // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
+    HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
+    KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
+    MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
+    MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
+    SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
+    SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
+    PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
+    SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
 }
 
 enum NTQQApiChannel {
-    IPC_UP_2 = "IPC_UP_2",
-    IPC_UP_3 = "IPC_UP_3",
-    IPC_UP_1 = "IPC_UP_1",
+    IPC_UP_2 = 'IPC_UP_2',
+    IPC_UP_3 = 'IPC_UP_3',
+    IPC_UP_1 = 'IPC_UP_1',
 }
 
 export interface Peer {
     chatType: ChatType
-    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ""
+    peerUid: string // 如果是群聊uid为群号，私聊uid就是加密的字符串
+    guildId?: ''
 }
 
-enum CallBackType {
-    UUID,
-    METHOD
+interface NTQQApiParams {
+    methodName: NTQQApiMethod | string
+    className?: NTQQApiClass
+    channel?: NTQQApiChannel
+    classNameIsRegister?: boolean
+    args?: unknown[]
+    cbCmd?: ReceiveCmd | null
+    cmdCB?: (payload: any) => boolean
+    afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
+    timeoutSecond?: number
 }
 
-
-function callNTQQApi<ReturnType>(channel: NTQQApiChannel, className: NTQQApiClass, methodName: NTQQApiMethod, args: unknown[] = [], cbCmd: ReceiveCmd | null = null, timeout = 5) {
-    const uuid = uuidv4();
+async function callNTQQApi<ReturnType>(params: NTQQApiParams) {
+    let {
+        className, methodName, channel, args,
+        cbCmd, timeoutSecond: timeout,
+        classNameIsRegister, cmdCB, afterFirstCmd
+    } = params
+    className = className ?? NTQQApiClass.NT_API
+    channel = channel ?? NTQQApiChannel.IPC_UP_2
+    args = args ?? []
+    timeout = timeout ?? 5
+    afterFirstCmd = afterFirstCmd ?? true
+    const uuid = uuidv4()
     // log("callNTQQApi", channel, className, methodName, args, uuid)
-    return new Promise((resolve: (data: ReturnType) => void, reject) => {
+    return await new Promise((resolve: (data: ReturnType) => void, reject) => {
         // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
         const _timeout = timeout * 1000
         let success = false
+        let eventName = className + '-' + channel[channel.length - 1]
+        if (classNameIsRegister) {
+            eventName += '-register'
+        }
+        const apiArgs = [methodName, ...args]
         if (!cbCmd) {
             // QQ后端会返回结果，并且可以插根据uuid识别
             hookApiCallbacks[uuid] = (r: ReturnType) => {
                 success = true
                 resolve(r)
-            };
-        }
-        else {
+            }
+        } else {
             // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
+            const secondCallback = () => {
+                const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
+                    // log(methodName, "second callback", cbCmd, payload, cmdCB);
+                    if (cmdCB) {
+                        if (cmdCB(payload)) {
+                            removeReceiveHook(hookId)
+                            success = true
+                            resolve(payload)
+                        }
+                    } else {
+                        removeReceiveHook(hookId)
+                        success = true
+                        resolve(payload)
+                    }
+                })
+            }
+            !afterFirstCmd && secondCallback()
             hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
                 log(`${methodName} callback`, result)
-                if (result.result == 0) {
-                    const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
-                        log(methodName, "second callback", cbCmd, payload);
-                        removeReceiveHook(hookId);
-                        success = true
-                        resolve(payload);
-                    })
-                }
-                else {
+                if (result?.result == 0 || result === undefined) {
+                    afterFirstCmd && secondCallback()
+                } else {
                     success = true
-                    reject(`ntqq api call failed, ${result.errMsg}`);
+                    reject(`ntqq api call failed, ${result.errMsg}`)
                 }
             }
         }
         setTimeout(() => {
             // log("ntqq api timeout", success, channel, className, methodName)
             if (!success) {
-                log(`ntqq api timeout ${channel}, ${className}, ${methodName}`)
-                reject(`ntqq api timeout ${channel}, ${className}, ${methodName}`)
+                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs)
+                reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
             }
         }, _timeout)
 
         ipcMain.emit(
             channel,
             {},
-            { type: 'request', callbackId: uuid, eventName: className + "-" + channel[channel.length - 1] },
-            [methodName, ...args],
+            {type: 'request', callbackId: uuid, eventName},
+            apiArgs
         )
     })
 }
 
-export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
+export const sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
 
 interface GeneralCallResult {
-    result: number,  // 0: success
+    result: number // 0: success
     errMsg: string
 }
 
-
 export class NTQQApi {
     // static likeFriend = defineNTQQApi<void>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.LIKE_FRIEND)
-    static likeFriend(uid: string, count = 1) {
-        return callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.LIKE_FRIEND, [{
-            doLikeUserInfo: {
-                friendUid: uid,
-                sourceId: 71,
-                doLikeCount: count,
-                doLikeTollCount: 0
-            }
-        },
-            null])
+    static async likeFriend(uid: string, count = 1) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.LIKE_FRIEND,
+            args: [{
+                doLikeUserInfo: {
+                    friendUid: uid,
+                    sourceId: 71,
+                    doLikeCount: count,
+                    doLikeTollCount: 0
+                }
+            }, null]
+        })
     }
 
-    static getSelfInfo() {
-        return callNTQQApi<SelfInfo>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.GLOBAL_DATA, NTQQApiMethod.SELF_INFO, [], null, 2)
-
+    static async getSelfInfo() {
+        return await callNTQQApi<SelfInfo>({
+            className: NTQQApiClass.GLOBAL_DATA,
+            // channel: NTQQApiChannel.IPC_UP_3,
+            methodName: NTQQApiMethod.SELF_INFO,
+            timeoutSecond: 2
+        })
     }
 
     static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ profiles: Map<string, User> }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
-            [{ force: true, uids: [uid] }, undefined], ReceiveCmd.USER_INFO)
+        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
+            methodName: NTQQApiMethod.USER_INFO,
+            args: [{force: true, uids: [uid]}, undefined],
+            cbCmd: ReceiveCmd.USER_INFO
+        })
         return result.profiles.get(uid)
     }
 
+    static async getUserDetailInfo(uid: string) {
+        const result = await callNTQQApi<{ info: User }>({
+            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+            cbCmd: ReceiveCmd.USER_DETAIL_INFO,
+            afterFirstCmd: false,
+            cmdCB: (payload) => {
+                const success = payload.info.uid == uid
+                // log("get user detail info", success, uid, payload)
+                return success
+            },
+            args: [
+                {
+                    uid
+                },
+                null
+            ]
+        })
+        return result.info
+    }
+
     static async getFriends(forced = false) {
-        const data = await callNTQQApi<{ data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: Friend[] }[] }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.FRIENDS, [{ force_update: forced }, undefined], ReceiveCmd.FRIENDS)
-        let _friends: Friend[] = [];
+        const data = await callNTQQApi<{
+            data: Array<{
+                categoryId: number
+                categroyName: string
+                categroyMbCount: number
+                buddyList: Friend[]
+            }>
+        }>(
+            {
+                methodName: NTQQApiMethod.FRIENDS,
+                args: [{force_update: forced}, undefined],
+                cbCmd: ReceiveCmd.FRIENDS
+            })
+        const _friends: Friend[] = []
         for (const fData of data.data) {
             _friends.push(...fData.buddyList)
         }
@@ -158,85 +254,122 @@ export class NTQQApi {
 
     static async getGroups(forced = false) {
         let cbCmd = ReceiveCmd.GROUPS
-        if (process.platform != "win32") {
+        if (process.platform != 'win32') {
             cbCmd = ReceiveCmd.GROUPS_UNIX
         }
-        const result = await callNTQQApi<{ updateType: number, groupList: Group[] }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUPS, [{ force_update: forced }, undefined], cbCmd)
+        const result = await callNTQQApi<{
+            updateType: number
+            groupList: Group[]
+        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
         return result.groupList
     }
 
-    static async getGroupMembers(groupQQ: string, num = 3000) {
-        const sceneId = await callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUP_MEMBER_SCENE, [{
-            groupCode: groupQQ,
-            scene: "groupMemberList_MainWindow"
-        }])
+    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
+        const sceneId = await callNTQQApi({
+            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
+            args: [{
+                groupCode: groupQQ,
+                scene: 'groupMemberList_MainWindow'
+            }]
+        })
         // log("get group member sceneId", sceneId);
         try {
-            const result = await callNTQQApi<{result:{infos: any}}>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUP_MEMBERS,
-                [{
-                    sceneId: sceneId,
-                    num: num
+            const result = await callNTQQApi<{
+                result: { infos: any }
+            }>({
+                methodName: NTQQApiMethod.GROUP_MEMBERS,
+                args: [{
+                    sceneId,
+                    num
                 },
                     null
-                ])
+                ]
+            })
             // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
-            let values = result.result.infos.values()
+            const values = result.result.infos.values()
 
-            values =  Array.from(values) as GroupMember[]
+            const members: GroupMember[] = Array.from(values)
+            for (const member of members) {
+                // uidMaps[member.uid] = member.uin;
+            }
+            // log(uidMaps);
             // log("members info", values);
-            return values
+            log(`get group ${groupQQ} members success`)
+            return members
         } catch (e) {
             log(`get group ${groupQQ} members failed`, e)
             return []
         }
     }
 
-
-
-    static getFileType(filePath: string) {
-        return callNTQQApi<{
-            ext: string
-        }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_TYPE, [filePath])
+    static async getFileType(filePath: string) {
+        return await callNTQQApi<{ ext: string }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
+        })
     }
 
-    static getFileMd5(filePath: string) {
-        return callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_MD5, [filePath])
+    static async getFileMd5(filePath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_MD5,
+            args: [filePath]
+        })
     }
 
-    static copyFile(filePath: string, destPath: string) {
-        return callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_COPY, [{ fromPath: filePath, toPath: destPath }])
+    static async copyFile(filePath: string, destPath: string) {
+        return await callNTQQApi<string>({
+            className: NTQQApiClass.FS_API,
+            methodName: NTQQApiMethod.FILE_COPY,
+            args: [{
+                fromPath: filePath,
+                toPath: destPath
+            }]
+        })
     }
 
-    static getImageSize(filePath: string) {
-        return callNTQQApi<{
-            width: number,
-            height: number
-        }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.IMAGE_SIZE, [filePath])
+    static async getImageSize(filePath: string) {
+        return await callNTQQApi<{ width: number, height: number }>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
+        })
     }
 
-    static getFileSize(filePath: string) {
-        return callNTQQApi<number>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_SIZE, [filePath])
+    static async getFileSize(filePath: string) {
+        return await callNTQQApi<number>({
+            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
+        })
     }
 
     // 上传文件到QQ的文件夹
-    static async uploadFile(filePath: string) {
-        const md5 = await NTQQApi.getFileMd5(filePath);
-        const fileName = `${md5}.${(await NTQQApi.getFileType(filePath)).ext}`;
-        const mediaPath = await callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.MEDIA_FILE_PATH, [{
-            path_info: {
-                md5HexStr: md5,
-                fileName: fileName,
-                elementType: 2,
-                elementSubType: 0,
-                thumbSize: 0,
-                needCreate: true,
-                downloadType: 1,
-                file_uuid: ""
-            }
-        }])
-        log("media path", mediaPath)
-        await NTQQApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQApi.getFileSize(filePath);
+    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC) {
+        const md5 = await NTQQApi.getFileMd5(filePath)
+        let ext = (await NTQQApi.getFileType(filePath))?.ext
+        if (ext) {
+            ext = '.' + ext
+        } else {
+            ext = ''
+        }
+        let fileName = `${path.basename(filePath)}`
+        if (!fileName.includes('.')) {
+            fileName += ext
+        }
+        const mediaPath = await callNTQQApi<string>({
+            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
+            args: [{
+                path_info: {
+                    md5HexStr: md5,
+                    fileName,
+                    elementType,
+                    elementSubType: 0,
+                    thumbSize: 0,
+                    needCreate: true,
+                    downloadType: 1,
+                    file_uuid: ''
+                }
+            }]
+        })
+        log('media path', mediaPath)
+        await NTQQApi.copyFile(filePath, mediaPath)
+        const fileSize = await NTQQApi.getFileSize(filePath)
         return {
             md5,
             fileName,
@@ -245,76 +378,312 @@ export class NTQQApi {
         }
     }
 
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string){
+    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string) {
         // 用于下载收到的消息中的图片等
-        if (fs.existsSync(sourcePath)){
+        if (fs.existsSync(sourcePath)) {
             return sourcePath
         }
         const apiParams = [
             {
                 getReq: {
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
+                    msgId,
+                    chatType,
+                    peerUid,
+                    elementId,
                     thumbSize: 0,
                     downloadType: 1,
-                    filePath: thumbPath,
-                },
+                    filePath: thumbPath
+                }
             },
-            undefined,
+            undefined
         ]
-        await callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.DOWNLOAD_MEDIA, apiParams)
+        // log("需要下载media", sourcePath);
+        await callNTQQApi({
+            methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
+            args: apiParams,
+            cbCmd: ReceiveCmd.MEDIA_DOWNLOAD_COMPLETE,
+            cmdCB: (payload: { notifyInfo: { filePath: string } }) => {
+                // log("media 下载完成判断", payload.notifyInfo.filePath, sourcePath);
+                return payload.notifyInfo.filePath == sourcePath
+            }
+        })
         return sourcePath
     }
-    static recallMsg(peer: Peer, msgIds: string[]) {
-        return callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.RECALL_MSG, [{ peer, msgIds }, null])
+
+    static async recallMsg(peer: Peer, msgIds: string[]) {
+        return await callNTQQApi({
+            methodName: NTQQApiMethod.RECALL_MSG,
+            args: [{
+                peer,
+                msgIds
+            }, null]
+        })
     }
 
-    static sendMsg(peer: Peer, msgElements: SendMessageElement[]) {
-        const sendTimeout = 10 * 1000
+    static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = false, timeout = 10000) {
+        const peerUid = peer.peerUid
 
-        return new Promise<RawMessage>((resolve, reject) => {
-            const peerUid = peer.peerUid;
-            let usingTime = 0;
-            let success = false;
-
-            const checkSuccess = () => {
-                if (!success) {
-                    sendMessagePool[peerUid] = null;
-                    reject("发送超时")
-                }
+        // 等待上一个相同的peer发送完
+        let checkLastSendUsingTime = 0
+        const waitLastSend = async () => {
+            if (checkLastSendUsingTime > timeout) {
+                throw ('发送超时')
             }
-            setTimeout(checkSuccess, sendTimeout);
+            const lastSending = sendMessagePool[peer.peerUid]
+            if (lastSending) {
+                // log("有正在发送的消息，等待中...")
+                await sleep(500)
+                checkLastSendUsingTime += 500
+                return await waitLastSend()
+            } else {
 
-            const checkLastSend = () => {
-                let lastSending = sendMessagePool[peerUid]
-                if (sendTimeout < usingTime) {
-                    sendMessagePool[peerUid] = null;
-                    reject("发送超时")
+            }
+        }
+        await waitLastSend()
+
+        let sentMessage: RawMessage = null
+        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
+            delete sendMessagePool[peerUid]
+            sentMessage = rawMessage
+        }
+
+        let checkSendCompleteUsingTime = 0
+        const checkSendComplete = async (): Promise<RawMessage> => {
+            if (sentMessage && msgHistory[sentMessage.msgId]?.sendStatus == 2) {
+                // log(`给${peerUid}发送消息成功`)
+                return sentMessage
+            } else {
+                checkSendCompleteUsingTime += 500
+                if (checkSendCompleteUsingTime > timeout) {
+                    throw ('发送超时')
                 }
-                if (!!lastSending) {
-                    // log("有正在发送的消息，等待中...")
-                    usingTime += 100;
-                    setTimeout(checkLastSend, 100);
+                await sleep(500)
+                return await checkSendComplete()
+            }
+        }
+
+        callNTQQApi({
+            methodName: NTQQApiMethod.SEND_MSG,
+            args: [{
+                msgId: '0',
+                peer,
+                msgElements,
+                msgAttributeInfos: new Map()
+            }, null]
+        }).then()
+        return await checkSendComplete()
+    }
+
+    static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+        const msgInfos = msgIds.map(id => {
+            return {msgId: id, senderShowName: selfInfo.nick}
+        })
+        const apiArgs = [
+            {
+                msgInfos,
+                srcContact: srcPeer,
+                dstContact: destPeer,
+                commentElements: [],
+                msgAttributeInfos: new Map()
+            },
+            null
+        ]
+        return await new Promise<RawMessage>((resolve, reject) => {
+            let complete = false
+            setTimeout(() => {
+                if (!complete) {
+                    reject('转发消息超时')
                 }
-                else {
-                    log("可以进行发送消息，设置发送成功回调", sendMessagePool)
-                    sendMessagePool[peerUid] = (rawMessage: RawMessage) => {
-                        success = true;
-                        sendMessagePool[peerUid] = null;
-                        resolve(rawMessage);
+            }, 5000)
+            registerReceiveHook(ReceiveCmd.SELF_SEND_MSG, (payload: { msgRecord: RawMessage }) => {
+                const msg = payload.msgRecord
+                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
+                const arkElement = msg.elements.find(ele => ele.arkElement)
+                if (!arkElement) {
+                    // log("收到的不是转发消息")
+                    return
+                }
+                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
+                if (forwardData.app != 'com.tencent.multimsg') {
+                    return
+                }
+                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
+                    complete = true
+                    addHistoryMsg(msg)
+                    resolve(msg)
+                    log('转发消息成功：', payload)
+                }
+            })
+            callNTQQApi<GeneralCallResult>({
+                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
+                args: apiArgs
+            }).then(result => {
+                log('转发消息结果:', result, apiArgs)
+                if (result.result !== 0) {
+                    complete = true
+                    reject('转发消息失败,' + JSON.stringify(result))
+                }
+            })
+        })
+    }
+
+    static async getGroupNotifies() {
+        // 获取管理员变更
+        // 加群通知，退出通知，需要管理员权限
+        callNTQQApi<GeneralCallResult>({
+            methodName: ReceiveCmd.GROUP_NOTIFY,
+            classNameIsRegister: true
+        }).then()
+        return await callNTQQApi<GroupNotifies>({
+            methodName: NTQQApiMethod.GET_GROUP_NOTICE,
+            cbCmd: ReceiveCmd.GROUP_NOTIFY,
+            afterFirstCmd: false,
+            args: [
+                {doubt: false, startSeq: '', number: 14},
+                null
+            ]
+        })
+    }
+
+    static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
+        const notify: GroupNotify = groupNotifies[seq]
+        if (!notify) {
+            throw `${seq}对应的加群通知不存在`
+        }
+        delete groupNotifies[seq]
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
+            args: [
+                {
+                    doubt: false,
+                    operateMsg: {
+                        operateType, // 2 拒绝
+                        targetMsg: {
+                            seq, // 通知序列号
+                            type: notify.type,
+                            groupCode: notify.group.groupCode,
+                            postscript: reason
+                        }
+                    }
+                },
+                null
+            ]
+        })
+    }
+
+    static async quitGroup(groupQQ: string) {
+        await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.QUIT_GROUP,
+            args: [
+                {groupCode: groupQQ},
+                null
+            ]
+        })
+    }
+
+    static async handleFriendRequest(sourceId: number, accept: boolean) {
+        const request: FriendRequest = friendRequests[sourceId]
+        if (!request) {
+            throw `sourceId ${sourceId}, 对应的好友请求不存在`
+        }
+        const result = await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
+            args: [
+                {
+                    approvalInfo: {
+                        friendUid: request.friendUid,
+                        reqTime: request.reqTime,
+                        accept
                     }
                 }
-            }
-            checkLastSend()
-            callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.SEND_MSG, [{
-                msgId: "0",
-                peer, msgElements,
-                msgAttributeInfos: new Map(),
-            }, null]).then()
+            ]
         })
-
+        delete friendRequests[sourceId]
+        return result
     }
 
-}
+    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.KICK_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        kickUids,
+                        refuseForever,
+                        kickReason
+                    }
+                ]
+            }
+        )
+    }
+
+    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
+        // timeStamp为秒数, 0为解除禁言
+        return await callNTQQApi<GeneralCallResult>(
+            {
+                methodName: NTQQApiMethod.MUTE_MEMBER,
+                args: [
+                    {
+                        groupCode: groupQQ,
+                        memList
+                    }
+                ]
+            }
+        )
+    }
+
+    static async banGroup(groupQQ: string, shutUp: boolean) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.MUTE_GROUP,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    shutUp
+                }, null
+            ]
+        })
+    }
+
+    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_CARD,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    cardName
+                }, null
+            ]
+        })
+    }
+
+    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_MEMBER_ROLE,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    uid: memberUid,
+                    role
+                }, null
+            ]
+        })
+    }
+
+    static async setGroupName(groupQQ: string, groupName: string) {
+        return await callNTQQApi<GeneralCallResult>({
+            methodName: NTQQApiMethod.SET_GROUP_NAME,
+            args: [
+                {
+                    groupCode: groupQQ,
+                    groupName
+                }, null
+            ]
+        })
+    }
+
+    static publishGroupBulletin(groupQQ: string, title: string, content: string) {
+
+    }
+}

src/ntqqapi/types.ts

@@ -7,13 +7,14 @@ export interface User {
     remark?: string
 }
 
-export interface SelfInfo extends User{
-
+export interface SelfInfo extends User {
+    online?: boolean;
 }
 
-export interface Friend extends User{}
+export interface Friend extends User {
+}
 
-export interface Group{
+export interface Group {
     groupCode: string,
     maxMember: number,
     memberCount: number,
@@ -44,6 +45,12 @@ export interface Group{
     members: GroupMember[]  // 原始数据是没有这个的，为了方便自己加了这个字段
 }
 
+export enum GroupMemberRole {
+    normal = 2,
+    admin = 3,
+    owner = 4
+}
+
 export interface GroupMember {
     avatarPath: string;
     cardName: string;
@@ -52,16 +59,19 @@ export interface GroupMember {
     nick: string;
     qid: string;
     remark: string;
-    role: number; // 群主:4, 管理员:3，群员:2
+    role: GroupMemberRole; // 群主:4, 管理员:3，群员:2
     shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
     uid: string; // 加密的字符串
     uin: string; // QQ号
+    isRobot: boolean;
 }
 
 export enum ElementType {
     TEXT = 1,
     PIC = 2,
+    FILE = 3,
     PTT = 4,
+    FACE = 6,
     REPLY = 7,
 }
 
@@ -76,6 +86,7 @@ export interface SendTextElement {
         atNtUid: string,
     }
 }
+
 export interface SendPttElement {
     elementType: ElementType.PTT,
     elementId: "",
@@ -96,6 +107,10 @@ export interface SendPttElement {
     }
 }
 
+export enum PicType {
+    gif = 2000,
+    jpg = 1000
+}
 export interface SendPicElement {
     elementType: ElementType.PIC,
     elementId: "",
@@ -107,7 +122,7 @@ export interface SendPicElement {
         fileName: string,
         sourcePath: string,
         original: boolean,
-        picType: number,
+        picType: PicType,
         picSubType: number,
         fileUuid: string,
         fileSubId: string,
@@ -127,7 +142,36 @@ export interface SendReplyElement {
     }
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement
+export interface SendFaceElement {
+    elementType: ElementType.FACE,
+    elementId: "",
+    faceElement: FaceElement
+}
+
+export interface FileElement {
+    "fileMd5"?: "",
+    "fileName": string,
+    "filePath": string,
+    "fileSize": string,
+    "picHeight"?: number,
+    "picWidth"?: number,
+    "picThumbPath"?: {},
+    "file10MMd5"?: "",
+    "fileSha"?: "",
+    "fileSha3"?: "",
+    "fileUuid"?: "",
+    "fileSubId"?: "",
+    "thumbFileSize"?: number
+}
+
+export interface SendFileElement {
+    "elementType": ElementType.FILE,
+    "elementId": "",
+    "fileElement": FileElement
+}
+
+export type SendMessageElement = SendTextElement | SendPttElement |
+    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement
 
 export enum AtType {
     notAt = 0,
@@ -140,6 +184,7 @@ export enum ChatType {
     group = 2,
     temp = 100
 }
+
 export interface PttElement {
     canConvert2Text: boolean;
     duration: number; // 秒数
@@ -180,18 +225,64 @@ export interface PicElement {
     fileUuid: string;
 }
 
+export interface GrayTipElement {
+    revokeElement: {
+        operatorRole: string;
+        operatorUid: string;
+        operatorNick: string;
+        operatorRemark: string;
+        operatorMemRemark?: string;
+        wording: string;  // 自定义的撤回提示语
+    }
+}
+
+export interface FaceElement {
+    faceIndex: number,
+    faceType: 1
+}
+
+export interface VideoElement {
+    "filePath": string,
+    "fileName": string,
+    "videoMd5": string,
+    "thumbMd5": string
+    "fileTime": 87, // second
+    "thumbSize": 314235, // byte
+    "fileFormat": 2,  // 2表示mp4？
+    "fileSize": string,  // byte
+    "thumbWidth": number,
+    "thumbHeight": number,
+    "busiType": 0, // 未知
+    "subBusiType": 0, // 未知
+    "thumbPath": Map<number, any>,
+    "transferStatus": 0, // 未知
+    "progress": 0,  // 下载进度？
+    "invalidState": 0, // 未知
+    "fileUuid": string,  // 可以用于下载链接？
+    "fileSubId": "",
+    "fileBizId": null,
+    "originVideoMd5": "",
+    "import_rich_media_context": null,
+    "sourceVideoCodecFormat": 0
+}
+
 export interface RawMessage {
     msgId: string;
-    msgTime: string;
+    msgShortId?: number;  // 自己维护的消息id
+    msgTime: string; // 时间戳，秒
     msgSeq: string;
-    senderUin: string; // 发送者QQ号
+    senderUid: string;
+    senderUin?: string; // 发送者QQ号
     peerUid: string; // 群号 或者 QQ uid
     peerUin: string; // 群号 或者 发送者QQ号
     sendNickName: string;
     sendMemberName?: string; // 发送者群名片
     chatType: ChatType;
+    sendStatus?: number;  // 消息状态，别人发的2是已撤回，自己发的2是已发送
+    recallTime: string; // 撤回时间, "0"是没有撤回
     elements: {
         elementId: string,
+        elementType: ElementType;
         replyElement: {
             senderUid: string; // 原消息发送者QQ号
             sourceMsgIsIncPic: boolean; // 原消息是否有图片
@@ -207,17 +298,66 @@ export interface RawMessage {
         picElement: PicElement;
         pttElement: PttElement;
         arkElement: ArkElement;
+        grayTipElement: GrayTipElement;
+        faceElement: FaceElement;
+        videoElement: VideoElement;
+        fileElement: FileElement;
     }[];
 }
 
-export interface MessageElement {
-    raw: RawMessage;
-    peer: any;
-    sender: {
-        uid: string; // 一串加密的字符串
-        memberName: string;
-        nickname: string;
-    };
+export enum GroupNotifyTypes {
+    INVITE_ME = 1,
+    INVITED_JOIN = 4,  // 有人接受了邀请入群
+    JOIN_REQUEST = 7,
+    ADMIN_SET = 8,
+    ADMIN_UNSET = 12,
+    MEMBER_EXIT = 11, // 主动退出?
+
 }
 
+export interface GroupNotifies {
+    doubt: boolean,
+    nextStartSeq: string,
+    notifies: GroupNotify[],
+}
 
+export interface GroupNotify {
+    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
+    seq: string, // 转成数字，再除以1000应该就是时间戳？
+    type: GroupNotifyTypes,
+    status: 0,  // 未知
+    group: { groupCode: string, groupName: string },
+    user1: { uid: string, nickName: string }, // 被设置管理员的人
+    user2: { uid: string, nickName: string },  // 操作者
+    actionUser: { uid: string, nickName: string }, //未知
+    actionTime: string,
+    invitationExt: {
+        srcType: number,  // 0?未知
+        groupCode: string, waitStatus: number
+    },
+    postscript: string,  // 加群用户填写的验证信息
+    repeatSeqs: [],
+    warningTips: string
+}
+
+export enum GroupRequestOperateTypes {
+    approve = 1,
+    reject = 2
+}
+
+export interface FriendRequest {
+    friendUid: string,
+    reqTime: string,  // 时间戳,秒
+    extWords: string,  // 申请人填写的验证消息
+    isUnread: boolean,
+    friendNick: string,
+    sourceId: number,
+    groupCode: string
+}
+
+export interface FriendRequestNotify {
+    data: {
+        unreadNums: number,
+        buddyReqs: FriendRequest[]
+    }
+}

src/onebot11/action/BaseAction.ts

@@ -0,0 +1,45 @@
+import {ActionName, BaseCheckResult} from "./types"
+import {OB11Response} from "./utils"
+import {OB11Return} from "../types";
+
+class BaseAction<PayloadType, ReturnDataType> {
+    actionName: ActionName
+
+    protected async check(payload: PayloadType): Promise<BaseCheckResult> {
+        return {
+            valid: true,
+        }
+    }
+
+    public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
+        const result = await this.check(payload);
+        if (!result.valid) {
+            return OB11Response.error(result.message, 400);
+        }
+        try {
+            const resData = await this._handle(payload);
+            return OB11Response.ok(resData);
+        } catch (e) {
+            return OB11Response.error(e.toString(), 200);
+        }
+    }
+
+    public async websocketHandle(payload: PayloadType, echo: any): Promise<OB11Return<ReturnDataType | null>> {
+        const result = await this.check(payload)
+        if (!result.valid) {
+            return OB11Response.error(result.message, 1400)
+        }
+        try {
+            const resData = await this._handle(payload)
+            return OB11Response.ok(resData, echo);
+        } catch (e) {
+            return OB11Response.error(e.toString(), 1200, echo)
+        }
+    }
+
+    protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
+        throw `pleas override ${this.actionName} _handle`;
+    }
+}
+
+export default BaseAction

src/onebot11/action/CanSendImage.ts

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

src/onebot11/action/CanSendRecord.ts

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

src/onebot11/action/Debug.ts

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

src/onebot11/action/DeleteMsg.ts

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

src/onebot11/action/GetFile.ts

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

src/onebot11/action/GetFriendList.ts

@@ -1,14 +1,14 @@
-import { OB11User } from '../types';
-import { OB11Constructor } from "../constructor";
-import { friends } from "../../common/data";
+import {OB11User} from '../types';
+import {OB11Constructor} from "../constructor";
+import {friends} from "../../common/data";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+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/GetGroupInfo.ts

@@ -1,24 +1,24 @@
-import { OB11Group } from '../types';
-import { getGroup, groups } from "../../common/data";
-import { OB11Constructor } from "../constructor";
+import {OB11Group} from '../types';
+import {getGroup} from "../../common/data";
+import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 
 interface PayloadType {
     group_id: number
 }
 
-class GetGroupInfo extends BaseAction<PayloadType, OB11Group[]> {
+class GetGroupInfo extends BaseAction<PayloadType, OB11Group> {
     actionName = ActionName.GetGroupInfo
 
     protected async _handle(payload: PayloadType) {
         const group = await getGroup(payload.group_id.toString())
         if (group) {
-            return OB11Constructor.groups(groups)
+            return OB11Constructor.group(group)
         } else {
             throw `群${payload.group_id}不存在`
         }
     }
 }
 
-export default GetGroupInfo
+export default GetGroupInfo

src/onebot11/action/GetGroupList.ts

@@ -1,15 +1,14 @@
-import { OB11Group } from '../types';
-import { OB11Constructor } from "../constructor";
-import { groups } from "../../common/data";
+import {OB11Group} from '../types';
+import {OB11Constructor} from "../constructor";
+import {groups} from "../../common/data";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
-
+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

@@ -1,8 +1,8 @@
-import { OB11GroupMember } from '../types';
-import { getGroupMember } from "../../common/data";
-import { OB11Constructor } from "../constructor";
+import {OB11GroupMember} from '../types';
+import {getGroupMember} from "../../common/data";
+import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 
 
 export interface PayloadType {
@@ -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 {
-            throw(`群成员${payload.user_id}不存在`)
+        } else {
+            throw (`群成员${payload.user_id}不存在`)
         }
     }
 }

src/onebot11/action/GetGroupMemberList.ts

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

src/onebot11/action/GetGuildList.ts

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

src/onebot11/action/GetImage.ts

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

src/onebot11/action/GetLoginInfo.ts

@@ -1,14 +1,14 @@
-import { OB11User } from '../types';
-import { OB11Constructor } from "../constructor";
-import { selfInfo } from "../../common/data";
+import {OB11User} from '../types';
+import {OB11Constructor} from "../constructor";
+import {selfInfo} from "../../common/data";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+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

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

src/onebot11/action/GetRecord.ts

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

src/onebot11/action/GetStatus.ts

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

src/onebot11/action/GetVersionInfo.ts

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

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,8 +1,8 @@
 import SendMsg from "./SendMsg";
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 
 
-class SendGroupMsg extends SendMsg{
+class SendGroupMsg extends SendMsg {
     actionName = ActionName.SendGroupMsg
 }
 

src/onebot11/action/SendLike.ts

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

src/onebot11/action/SendMsg.ts

@@ -0,0 +1,325 @@
+import {AtType, ChatType, Group, RawMessage, SendMessageElement} from "../../ntqqapi/types";
+import {
+    addHistoryMsg,
+    friends,
+    getGroup,
+    getGroupMember,
+    getHistoryMsgByShortId,
+    getUidByUin,
+    selfInfo,
+} 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 "node:fs";
+import {log} from "../../common/utils";
+import {decodeCQCode} from "../cqcode";
+
+function checkSendMessage(sendMsgList: OB11MessageData[]) {
+    function checkUri(uri: string): boolean {
+        const pattern = /^(file:\/\/|http:\/\/|https:\/\/|base64:\/\/)/;
+        return pattern.test(uri);
+    }
+
+    for (let msg of sendMsgList) {
+        if (msg["type"] && msg["data"]) {
+            let type = msg["type"];
+            let data = msg["data"];
+            if (type === "text" && !data["text"]) {
+                return 400;
+            } else if (["image", "voice", "record"].includes(type)) {
+                if (!data["file"]) {
+                    return 400;
+                } else {
+                    if (checkUri(data["file"])) {
+                        return 200;
+                    } else {
+                        return 400;
+                    }
+                }
+
+            } else if (type === "at" && !data["qq"]) {
+                return 400;
+            } else if (type === "reply" && !data["id"]) {
+                return 400;
+            }
+        } else {
+            return 400
+        }
+    }
+    return 200;
+}
+
+export interface ReturnDataType {
+    message_id: number
+}
+
+export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
+    actionName = ActionName.SendMsg
+
+    protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
+        const messages = this.convertMessage2List(payload.message);
+        const fmNum = this.forwardMsgNum(payload)
+        if (fmNum && fmNum != messages.length) {
+            return {
+                valid: false,
+                message: "转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素"
+            }
+        }
+        return {
+            valid: true,
+        }
+    }
+
+    protected async _handle(payload: OB11PostSendMsg) {
+        const peer: Peer = {
+            chatType: ChatType.friend,
+            peerUid: ""
+        }
+
+        let group: Group | undefined = undefined;
+        if (payload?.group_id) {
+            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 friend = friends.find(f => f.uin == payload.user_id.toString())
+            if (friend) {
+                // peer.name = friend.nickName
+                peer.peerUid = friend.uid
+            } else {
+                peer.chatType = ChatType.temp
+                const tempUserUid = getUidByUin(payload.user_id.toString())
+                if (!tempUserUid) {
+                    throw (`找不到私聊对象${payload.user_id}`)
+                }
+                // peer.name = tempUser.nickName
+                peer.peerUid = tempUserUid;
+            }
+        }
+        const messages = this.convertMessage2List(payload.message);
+        if (this.forwardMsgNum(payload)) {
+            try {
+                const returnMsg = await this.handleForwardNode(peer, messages as OB11MessageNode[], group)
+                return {message_id: returnMsg.msgShortId}
+            } catch (e) {
+                throw ("发送转发消息失败 " + e.toString())
+            }
+        }
+        // log("send msg:", peer, sendElements)
+        const {sendElements, deleteAfterSentFiles} = await this.createSendElements(messages, group)
+        try {
+            const returnMsg = await this.send(peer, sendElements, deleteAfterSentFiles)
+            return {message_id: returnMsg.msgShortId}
+        } catch (e) {
+            throw (e.toString())
+        }
+    }
+
+    protected convertMessage2List(message: OB11MessageMixType) {
+        if (typeof message === "string") {
+            // message = [{
+            //     type: OB11MessageDataType.text,
+            //     data: {
+            //         text: message
+            //     }
+            // }] as OB11MessageData[]
+            message = decodeCQCode(message.toString())
+        } else if (!Array.isArray(message)) {
+            message = [message]
+        }
+        return message;
+    }
+
+    private forwardMsgNum(payload: OB11PostSendMsg): number {
+        if (Array.isArray(payload.message)) {
+            return payload.message.filter(msg => msg.type == OB11MessageDataType.node).length
+        }
+        return 0
+    }
+
+    // 返回一个合并转发的消息id
+    private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[], group: Group | undefined) {
+        const selfPeer: Peer = {
+            chatType: ChatType.friend,
+            peerUid: selfInfo.uid
+        }
+        let selfNodeMsgList: RawMessage[] = [];
+        let originalNodeMsgList: RawMessage[] = [];
+        for (const messageNode of messageNodes) {
+            // 一个node表示一个人的消息
+            let nodeId = messageNode.data.id;
+            // 有nodeId表示一个子转发消息卡片
+            if (nodeId) {
+                let nodeMsg = getHistoryMsgByShortId(nodeId);
+                if (nodeMsg) {
+                    originalNodeMsgList.push(nodeMsg);
+                }
+            } else {
+                // 自定义的消息
+                // 提取消息段，发给自己生成消息id
+                try {
+                    const {
+                        sendElements,
+                        deleteAfterSentFiles
+                    } = await this.createSendElements(this.convertMessage2List(messageNode.data.content), group);
+                    log("开始生成转发节点", sendElements);
+                    const nodeMsg = await this.send(selfPeer, sendElements, deleteAfterSentFiles, true);
+                    selfNodeMsgList.push(nodeMsg);
+                    log("转发节点生成成功", nodeMsg.msgId);
+                } catch (e) {
+                    log("生效转发消息节点失败", e)
+                }
+            }
+        }
+
+        let nodeIds: string[] = []
+        // 检查是否需要克隆直接引用消息id的节点
+        let needSendSelf = false;
+        if (selfNodeMsgList.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);
+            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") {
+                            sendElements.push(originalNodeMsg.elements[eleKey])
+                        }
+                    })
+                    try {
+                        const nodeMsg = await NTQQApi.sendMsg(selfPeer, sendElements, true);
+                        nodeIds.push(nodeMsg.msgId)
+                        log("克隆转发消息成功")
+                    } catch (e) {
+                        log("克隆转发消息失败", e)
+                    }
+                }
+            }
+        } else {
+            nodeIds = originalNodeMsgList.map(msg => msg.msgId)
+        }
+
+        let srcPeer = selfPeer;
+        if (!needSendSelf) {
+            srcPeer = {
+                chatType: originalNodeMsgList[0].chatType === ChatType.group ? ChatType.group : ChatType.friend,
+                peerUid: originalNodeMsgList[0].peerUid
+            }
+        }
+        // 开发转发
+        try {
+            return await NTQQApi.multiForwardMsg(srcPeer, destPeer, nodeIds)
+        } catch (e) {
+            log("forward failed", e)
+            return null;
+        }
+    }
+
+    private async createSendElements(messageData: OB11MessageData[], group: Group | undefined, ignoreTypes: OB11MessageDataType[] = []) {
+        let sendElements: SendMessageElement[] = []
+        let deleteAfterSentFiles: string[] = []
+        for (let sendMsg of messageData) {
+            if (ignoreTypes.includes(sendMsg.type)) {
+                continue
+            }
+            switch (sendMsg.type) {
+                case OB11MessageDataType.text: {
+                    const text = sendMsg.data?.text;
+                    if (text) {
+                        sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
+                    }
+                }
+                    break;
+                case OB11MessageDataType.at: {
+                    let atQQ = sendMsg.data?.qq;
+                    if (atQQ) {
+                        atQQ = atQQ.toString()
+                        if (atQQ === "all") {
+                            sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
+                        } else {
+                            // const atMember = group?.members.find(m => m.uin == atQQ)
+                            const atMember = await getGroupMember(group?.groupCode, atQQ);
+                            if (atMember) {
+                                sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
+                            }
+                        }
+                    }
+                }
+                    break;
+                case OB11MessageDataType.reply: {
+                    let replyMsgId = sendMsg.data.id;
+                    if (replyMsgId) {
+                        replyMsgId = replyMsgId.toString()
+                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
+                        if (replyMsg) {
+                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
+                        }
+                    }
+                }
+                    break;
+                case OB11MessageDataType.face: {
+                    const faceId = sendMsg.data?.id
+                    if (faceId) {
+                        sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
+                    }
+                }
+                    break;
+                case OB11MessageDataType.image:
+                case OB11MessageDataType.file:
+                case OB11MessageDataType.video:
+                case OB11MessageDataType.voice: {
+                    const file = sendMsg.data?.file
+                    if (file) {
+                        const {path, isLocal} = (await uri2local(file))
+                        if (path) {
+                            if (!isLocal) { // 只删除http和base64转过来的文件
+                                deleteAfterSentFiles.push(path)
+                            }
+                            const constructorMap = {
+                                [OB11MessageDataType.image]: SendMsgElementConstructor.pic,
+                                [OB11MessageDataType.voice]: SendMsgElementConstructor.ptt,
+                                [OB11MessageDataType.video]: SendMsgElementConstructor.video,
+                                [OB11MessageDataType.file]: SendMsgElementConstructor.file,
+                            }
+                            sendElements.push(await constructorMap[sendMsg.type](path));
+                        }
+                    }
+                }
+                    break;
+            }
+
+        }
+
+        return {
+            sendElements,
+            deleteAfterSentFiles
+        }
+    }
+
+    private async send(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = false) {
+        if (!sendElements.length) {
+            throw ("消息体无法解析")
+        }
+        const returnMsg = await NTQQApi.sendMsg(peer, sendElements, waitComplete, 20000);
+        addHistoryMsg(returnMsg)
+        deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+        }))
+        return returnMsg
+    }
+}
+
+export default SendMsg

src/onebot11/action/SendPrivateMsg.ts

@@ -1,5 +1,5 @@
 import SendMsg from "./SendMsg";
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 
 class SendPrivateMsg extends SendMsg {
     actionName = ActionName.SendPrivateMsg

src/onebot11/action/SetFriendAddRequest.ts

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

src/onebot11/action/SetGroupAddRequest.ts

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

src/onebot11/action/SetGroupAdmin.ts

@@ -0,0 +1,24 @@
+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 {
+    group_id: number,
+    user_id: number,
+    enable: boolean
+}
+
+export default class SetGroupAdmin extends BaseAction<Payload, null> {
+    actionName = ActionName.SetGroupAdmin
+
+    protected async _handle(payload: Payload): Promise<null> {
+        const member = await getGroupMember(payload.group_id, payload.user_id)
+        if (!member) {
+            throw `群成员${payload.user_id}不存在`
+        }
+        await NTQQApi.setMemberRole(payload.group_id.toString(), member.uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal)
+        return null
+    }
+}

src/onebot11/action/SetGroupBan.ts

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

src/onebot11/action/SetGroupCard.ts

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

src/onebot11/action/SetGroupKick.ts

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

src/onebot11/action/SetGroupLeave.ts

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

src/onebot11/action/SetGroupName.ts

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

src/onebot11/action/SetGroupWholeBan.ts

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

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

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

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

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

src/onebot11/action/index.ts

@@ -0,0 +1,78 @@
+import GetMsg from './GetMsg'
+import GetLoginInfo from './GetLoginInfo'
+import GetFriendList from './GetFriendList'
+import GetGroupList from './GetGroupList'
+import GetGroupInfo from './GetGroupInfo'
+import GetGroupMemberList from './GetGroupMemberList'
+import GetGroupMemberInfo from './GetGroupMemberInfo'
+import SendGroupMsg from './SendGroupMsg'
+import SendPrivateMsg from './SendPrivateMsg'
+import SendMsg from './SendMsg'
+import DeleteMsg from "./DeleteMsg";
+import BaseAction from "./BaseAction";
+import GetVersionInfo from "./GetVersionInfo";
+import CanSendRecord from "./CanSendRecord";
+import CanSendImage from "./CanSendImage";
+import GetStatus from "./GetStatus";
+import {GoCQHTTPSendGroupForwardMsg, GoCQHTTPSendPrivateForwardMsg} from "./go-cqhttp/SendForwardMsg";
+import GoCQHTTPGetStrangerInfo from "./go-cqhttp/GetStrangerInfo";
+import SendLike from "./SendLike";
+import SetGroupAddRequest from "./SetGroupAddRequest";
+import SetGroupLeave from "./SetGroupLeave";
+import GetGuildList from "./GetGuildList";
+import Debug from "./Debug";
+import SetFriendAddRequest from "./SetFriendAddRequest";
+import SetGroupWholeBan from "./SetGroupWholeBan";
+import SetGroupName from "./SetGroupName";
+import SetGroupBan from "./SetGroupBan";
+import SetGroupKick from "./SetGroupKick";
+import SetGroupAdmin from "./SetGroupAdmin";
+import SetGroupCard from "./SetGroupCard";
+import GetImage from "./GetImage";
+import GetRecord from "./GetRecord";
+import GoCQHTTPMarkMsgAsRead from "./MarkMsgAsRead";
+
+export const actionHandlers = [
+    new Debug(),
+    new SendLike(),
+    new GetMsg(),
+    new GetLoginInfo(),
+    new GetFriendList(),
+    new GetGroupList(), new GetGroupInfo(), new GetGroupMemberList(), new GetGroupMemberInfo(),
+    new SendGroupMsg(), new SendPrivateMsg(), new SendMsg(),
+    new DeleteMsg(),
+    new SetGroupAddRequest(),
+    new SetFriendAddRequest(),
+    new SetGroupLeave(),
+    new GetVersionInfo(),
+    new CanSendRecord(),
+    new CanSendImage(),
+    new GetStatus(),
+    new SetGroupWholeBan(),
+    new SetGroupBan(),
+    new SetGroupKick(),
+    new SetGroupAdmin(),
+    new SetGroupName(),
+    new SetGroupCard(),
+    new GetImage(),
+    new GetRecord(),
+
+    //以下为go-cqhttp api
+    new GoCQHTTPSendGroupForwardMsg(),
+    new GoCQHTTPSendPrivateForwardMsg(),
+    new GoCQHTTPGetStrangerInfo(),
+    new GetGuildList(),
+    new GoCQHTTPMarkMsgAsRead(),
+
+]
+
+function initActionMap() {
+    const actionMap = new Map<string, BaseAction<any, any>>();
+    for (const action of actionHandlers) {
+        actionMap.set(action.actionName, action);
+    }
+
+    return actionMap
+}
+
+export const actionMap = initActionMap();

src/onebot11/action/types.ts

@@ -0,0 +1,51 @@
+export type BaseCheckResult = ValidCheckResult | InvalidCheckResult
+
+export interface ValidCheckResult {
+    valid: true
+
+    [k: string | number]: any
+}
+
+export interface InvalidCheckResult {
+    valid: false
+    message: string
+
+    [k: string | number]: any
+}
+
+export enum ActionName {
+    Debug = "llonebot_debug",
+    SendLike = "send_like",
+    GetLoginInfo = "get_login_info",
+    GetFriendList = "get_friend_list",
+    GetGroupInfo = "get_group_info",
+    GetGroupList = "get_group_list",
+    GetGroupMemberInfo = "get_group_member_info",
+    GetGroupMemberList = "get_group_member_list",
+    GetMsg = "get_msg",
+    SendMsg = "send_msg",
+    SendGroupMsg = "send_group_msg",
+    SendPrivateMsg = "send_private_msg",
+    DeleteMsg = "delete_msg",
+    SetGroupAddRequest = "set_group_add_request",
+    SetFriendAddRequest = "set_friend_add_request",
+    SetGroupLeave = "set_group_leave",
+    GetVersionInfo = "get_version_info",
+    GetStatus = "get_status",
+    CanSendRecord = "can_send_record",
+    CanSendImage = "can_send_image",
+    SetGroupKick = "set_group_kick",
+    SetGroupBan = "set_group_ban",
+    SetGroupWholeBan = "set_group_whole_ban",
+    SetGroupAdmin = "set_group_admin",
+    SetGroupCard = "set_group_card",
+    SetGroupName = "set_group_name",
+    GetImage = "get_image",
+    GetRecord = "get_record",
+    // 以下为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/action/utils.ts

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

src/onebot11/actions/BaseAction.ts

@@ -1,31 +0,0 @@
-import {ActionName, BaseCheckResult} from "./types"
-import { OB11Response } from "./utils"
-import { OB11Return } from "../types";
-
-class BaseAction<PayloadType, ReturnDataType> {
-    actionName: ActionName
-    protected async check(payload: PayloadType): Promise<BaseCheckResult> {
-        return {
-            valid: true,
-        }
-    }
-
-    public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
-        const result = await this.check(payload)
-        if (!result.valid) {
-            return OB11Response.error(result.message)
-        }
-        try {
-            const resData = await this._handle(payload)
-            return OB11Response.ok(resData)
-        }catch (e) {
-            return OB11Response.error(e.toString())
-        }
-    }
-
-    protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-        throw `pleas override ${this.actionName} _handle`
-    }
-}
-
-export default BaseAction

src/onebot11/actions/DeleteMsg.ts

@@ -1,22 +0,0 @@
-import { ActionName } from "./types";
-import BaseAction from "./BaseAction";
-import { NTQQApi } from "../../ntqqapi/ntcall";
-import { msgHistory } from "../../common/data";
-
-interface Payload {
-    message_id: string
-}
-
-class DeleteMsg extends BaseAction<Payload, void> {
-    actionName = ActionName.DeleteMsg
-
-    protected async _handle(payload:Payload){
-        let msg = msgHistory[payload.message_id]
-        await NTQQApi.recallMsg({
-            chatType: msg.chatType,
-            peerUid: msg.peerUid
-        }, [payload.message_id])
-    }
-}
-
-export default DeleteMsg

src/onebot11/actions/GetMsg.ts

@@ -1,30 +0,0 @@
-import { msgHistory } from "../../common/data";
-import { OB11Message } from '../types';
-import { OB11Constructor } from "../constructor";
-import { log } from "../../common/utils";
-import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
-
-
-export interface PayloadType {
-    message_id: string
-}
-
-export type ReturnDataType = OB11Message
-
-class GetMsg extends BaseAction<PayloadType, OB11Message> {
-    actionName = ActionName.GetMsg
-
-    protected async _handle(payload: PayloadType){
-        // log("history msg ids", Object.keys(msgHistory));
-        const msg = msgHistory[payload.message_id.toString()]
-        if (msg) {
-            const msgData = await OB11Constructor.message(msg);
-            return msgData
-        } else {
-            throw("消息不存在")
-        }
-    }
-}
-
-export default GetMsg

src/onebot11/actions/SendMsg.ts

@@ -1,130 +0,0 @@
-import { AtType, ChatType, Group } from "../../ntqqapi/types";
-import { friends, getGroup, getStrangerByUin, msgHistory } from "../../common/data";
-import { OB11MessageData, OB11MessageDataType, OB11PostSendMsg } from '../types';
-import { NTQQApi } from "../../ntqqapi/ntcall";
-import { Peer } from "../../ntqqapi/ntcall";
-import { SendMessageElement } from "../../ntqqapi/types";
-import { SendMsgElementConstructor } from "../../ntqqapi/constructor";
-import { uri2local } from "../utils";
-import { v4 as uuid4 } from 'uuid';
-import { log } from "../../common/utils";
-import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
-import * as fs from "fs";
-
-export interface ReturnDataType {
-    message_id: string
-}
-
-class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
-    actionName = ActionName.SendMsg
-
-    protected async _handle(payload: OB11PostSendMsg){
-        const peer: Peer = {
-            chatType: ChatType.friend,
-            peerUid: ""
-        }
-        let deleteAfterSentFiles: string[] = []
-        let group: Group | undefined = undefined;
-        if (payload?.group_id) {
-            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 friend = friends.find(f => f.uin == payload.user_id.toString())
-            if (friend) {
-                // peer.name = friend.nickName
-                peer.peerUid = friend.uid
-            }
-            else {
-                peer.chatType = ChatType.temp
-                const tempUser = getStrangerByUin(payload.user_id.toString())
-                if (!tempUser) {
-                    throw(`找不到私聊对象${payload.user_id}`)
-                }
-                // peer.name = tempUser.nickName
-                peer.peerUid = tempUser.uid
-            }
-        }
-        if (typeof payload.message === "string") {
-            payload.message = [{
-                type: OB11MessageDataType.text,
-                data: {
-                    text: payload.message
-                }
-            }] as OB11MessageData[]
-        }
-        else if (!Array.isArray(payload.message)) {
-            payload.message = [payload.message]
-        }
-        const sendElements: SendMessageElement[] = []
-        for (let sendMsg of payload.message) {
-            switch (sendMsg.type) {
-                case OB11MessageDataType.text: {
-                    const text = sendMsg.data?.text;
-                    if (text) {
-                        sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
-                    }
-                } break;
-                case OB11MessageDataType.at: {
-                    let atQQ = sendMsg.data?.qq;
-                    if (atQQ) {
-                        atQQ = atQQ.toString()
-                        if (atQQ === "all") {
-                            sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
-                        }
-                        else {
-                            const atMember = group?.members.find(m => m.uin == atQQ)
-                            if (atMember) {
-                                sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
-                            }
-                        }
-                    }
-                } break;
-                case OB11MessageDataType.reply: {
-                    let replyMsgId = sendMsg.data.id;
-                    if (replyMsgId) {
-                        replyMsgId = replyMsgId.toString()
-                        const replyMsg = msgHistory[replyMsgId]
-                        if (replyMsg) {
-                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsgId, replyMsg.senderUin, replyMsg.senderUin))
-                        }
-                    }
-                } break;
-                case OB11MessageDataType.image:
-                case OB11MessageDataType.voice: {
-                    const file = sendMsg.data?.file
-                    if (file) {
-                        const {path, isLocal} = (await uri2local(uuid4(), file))
-                        if (path) {
-                            if (!isLocal){ // 只删除http和base64转过来的文件
-                                deleteAfterSentFiles.push(path)
-                            }
-                            if (sendMsg.type === OB11MessageDataType.image){
-                                sendElements.push(await SendMsgElementConstructor.pic(path))
-                            }
-                            else {
-                                sendElements.push(await SendMsgElementConstructor.ptt(path))
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        // log("send msg:", peer, sendElements)
-        try {
-            const returnMsg = await NTQQApi.sendMsg(peer, sendElements)
-            deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{}))
-            return { message_id: returnMsg.msgId }
-        } catch (e) {
-            throw(e.toString())
-        }
-    }
-}
-
-export default SendMsg

src/onebot11/actions/index.ts

@@ -1,20 +0,0 @@
-import GetMsg from './GetMsg'
-import GetLoginInfo from './GetLoginInfo'
-import GetFriendList from './GetFriendList'
-import GetGroupList from './GetGroupList'
-import GetGroupInfo from './GetGroupInfo'
-import GetGroupMemberList from './GetGroupMemberList'
-import GetGroupMemberInfo from './GetGroupMemberInfo'
-import SendGroupMsg from './SendGroupMsg'
-import SendPrivateMsg from './SendPrivateMsg'
-import SendMsg from './SendMsg'
-import DeleteMsg from "./DeleteMsg";
-
-export const actionHandlers = [
-    new GetMsg(),
-    new GetLoginInfo(),
-    new GetFriendList(),
-    new GetGroupList(), new GetGroupInfo(), new GetGroupMemberList(), new GetGroupMemberInfo(),
-    new SendGroupMsg(), new SendPrivateMsg(), new SendMsg(),
-    new DeleteMsg()
-]

src/onebot11/actions/types.ts

@@ -1,26 +0,0 @@
-export type BaseCheckResult = ValidCheckResult | InvalidCheckResult
-
-export interface ValidCheckResult {
-    valid: true
-    [k: string | number]: any
-}
-
-export interface InvalidCheckResult {
-    valid: false
-    message: string
-    [k: string | number]: any
-}
-
-export enum ActionName{
-    GetLoginInfo = "get_login_info",
-    GetFriendList = "get_friend_list",
-    GetGroupInfo = "get_group_info",
-    GetGroupList = "get_group_list",
-    GetGroupMemberInfo = "get_group_member_info",
-    GetGroupMemberList = "get_group_member_list",
-    GetMsg = "get_msg",
-    SendMsg = "send_msg",
-    SendGroupMsg = "send_group_msg",
-    SendPrivateMsg = "send_private_msg",
-    DeleteMsg = "delete_msg"
-}

src/onebot11/actions/utils.ts

@@ -1,18 +0,0 @@
-import { OB11Return } from '../types';
-
-export class OB11Response {
-    static res<T>(data: T, status: number = 0, message: string = ""): OB11Return<T> {
-        return {
-            status: status,
-            retcode: status,
-            data: data,
-            message: message
-        }
-    }
-    static ok<T>(data: T) {
-        return OB11Response.res<T>(data)
-    }
-    static error(err: string) {
-        return OB11Response.res(null, -1, err)
-    }
-}

src/onebot11/constructor.ts

@@ -1,37 +1,52 @@
-import {OB11MessageDataType, OB11GroupMemberRole, OB11Message, OB11MessageData, OB11Group, OB11GroupMember, OB11User} from "./types";
-import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
-import { getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo } from '../common/data';
-import {file2base64, getConfigUtil, log} from "../common/utils";
-import { NTQQApi } from "../ntqqapi/ntcall";
+import {
+    OB11Group,
+    OB11GroupMember,
+    OB11GroupMemberRole,
+    OB11Message,
+    OB11MessageData,
+    OB11MessageDataType,
+    OB11User,
+    OB11UserSex
+} from "./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 {getConfigUtil, log} from "../common/utils";
+import {NTQQApi} from "../ntqqapi/ntcall";
+import {EventType} from "./event/OB11BaseEvent";
+import {encodeCQCode} from "./cqcode";
 
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
-        const {enableBase64} = getConfigUtil().getConfig()
+
+        const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig()
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
-            self_id: selfInfo.uin,
-            user_id: msg.senderUin,
-            time: parseInt(msg.msgTime) || 0,
-            message_id: msg.msgId,
+            self_id: parseInt(selfInfo.uin),
+            user_id: parseInt(msg.senderUin),
+            time: parseInt(msg.msgTime) || Date.now(),
+            message_id: msg.msgShortId,
             real_id: msg.msgId,
             message_type: msg.chatType == ChatType.group ? "group" : "private",
             sender: {
-                user_id: msg.senderUin,
+                user_id: parseInt(msg.senderUin),
                 nickname: msg.sendNickName,
                 card: msg.sendMemberName || "",
             },
             raw_message: "",
             font: 14,
             sub_type: "friend",
-            message: [],
-            post_type: "message",
+            message: messagePostFormat === 'string' ? '' : [],
+            message_format: messagePostFormat === 'string' ? 'string' : 'array',
+            post_type: selfInfo.uin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
         }
         if (msg.chatType == ChatType.group) {
-            resMsg.group_id = msg.peerUin
+            resMsg.sub_type = "normal" // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
+            resMsg.group_id = parseInt(msg.peerUin)
             const member = await getGroupMember(msg.peerUin, msg.senderUin);
             if (member) {
                 resMsg.sender.role = OB11Constructor.groupMemberRole(member.role);
+                resMsg.sender.nickname = member.nick
             }
         } else if (msg.chatType == ChatType.friend) {
             resMsg.sub_type = "friend"
@@ -44,57 +59,109 @@ export class OB11Constructor {
         }
 
         for (let element of msg.elements) {
-            let message_data: any = {
+            let message_data: OB11MessageData | any = {
                 data: {},
                 type: "unknown"
             }
             if (element.textElement && element.textElement?.atType !== AtType.notAt) {
                 message_data["type"] = OB11MessageDataType.at
                 if (element.textElement.atType == AtType.atAll) {
-                    message_data["data"]["mention"] = "all"
+                    // message_data["data"]["mention"] = "all"
                     message_data["data"]["qq"] = "all"
                 } else {
                     let atUid = element.textElement.atNtUid
                     let atQQ = element.textElement.atUid
-                    if (!atQQ || atQQ === "0"){
+                    if (!atQQ || atQQ === "0") {
                         const atMember = await getGroupMember(msg.peerUin, null, atUid)
-                        if (atMember){
+                        if (atMember) {
                             atQQ = atMember.uin
                         }
                     }
-                    if (atQQ){
-                        message_data["data"]["mention"] = atQQ
+                    if (atQQ) {
+                        // message_data["data"]["mention"] = atQQ
                         message_data["data"]["qq"] = atQQ
                     }
                 }
             } else if (element.textElement) {
                 message_data["type"] = "text"
-                message_data["data"]["text"] = element.textElement.content
-            } else if (element.picElement) {
-                message_data["type"] = "image"
-                message_data["data"]["file_id"] = element.picElement.fileUuid
-                message_data["data"]["path"] = element.picElement.sourcePath
-                message_data["data"]["file"] = element.picElement.sourcePath
-                try {
-                    await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                        element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
-                }catch (e) {
-                    message_data["data"]["http_file"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
+                let text = element.textElement.content
+                if (!text.trim()) {
+                    continue;
                 }
+                message_data["data"]["text"] = text
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
                 const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
                 if (replyMsg) {
-                    message_data["data"]["id"] = replyMsg.msgId
-                }
-                else{
+                    message_data["data"]["id"] = replyMsg.msgShortId.toString()
+                } else {
                     continue
                 }
+            } 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
+                // message_data["data"]["file_id"] = element.picElement.fileUuid
+                message_data["data"]["file_size"] = element.picElement.fileSize
+                fileCache.set(element.picElement.fileName, {
+                    fileName: element.picElement.fileName,
+                    filePath: element.picElement.sourcePath,
+                    fileSize: element.picElement.fileSize.toString(),
+                    url: IMAGE_HTTP_HOST + element.picElement.originImageUrl,
+                    downloadFunc: async () => {
+                        await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
+                            element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
+                    }
+                })
+                // 不在自动下载图片
+
+            } else if (element.videoElement) {
+                message_data["type"] = OB11MessageDataType.video;
+                message_data["data"]["file"] = element.videoElement.fileName
+                message_data["data"]["path"] = element.videoElement.filePath
+                // message_data["data"]["file_id"] = element.videoElement.fileUuid
+                message_data["data"]["file_size"] = element.videoElement.fileSize
+                fileCache.set(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)
+                    }
+                })
+                // 怎么拿到url呢
+            } else if (element.fileElement) {
+                message_data["type"] = OB11MessageDataType.file;
+                message_data["data"]["file"] = element.fileElement.fileName
+                // message_data["data"]["path"] = element.fileElement.filePath
+                // message_data["data"]["file_id"] = element.fileElement.fileUuid
+                message_data["data"]["file_size"] = element.fileElement.fileSize
+                fileCache.set(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)
+                    }
+                })
+                // 怎么拿到url呢
             } else if (element.pttElement) {
                 message_data["type"] = OB11MessageDataType.voice;
-                message_data["data"]["file"] = element.pttElement.filePath
-                message_data["data"]["file_id"] = element.pttElement.fileUuid
-                // console.log("收到语音消息", message.raw.msgId, message.peer, element.pttElement)
+                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, {
+                    fileName: element.pttElement.fileName,
+                    filePath: element.pttElement.filePath,
+                    fileSize: element.pttElement.fileSize,
+                })
+
+                // log("收到语音消息", msg)
                 // window.LLAPI.Ptt2Text(message.raw.msgId, message.peer, messages).then(text => {
                 //     console.log("语音转文字结果", text);
                 // }).catch(err => {
@@ -103,46 +170,64 @@ export class OB11Constructor {
             } else if (element.arkElement) {
                 message_data["type"] = OB11MessageDataType.json;
                 message_data["data"]["data"] = element.arkElement.bytesData;
+            } else if (element.faceElement) {
+                message_data["type"] = OB11MessageDataType.face;
+                message_data["data"]["id"] = element.faceElement.faceIndex.toString();
             }
-            if (message_data.data.http_file){
-                message_data.data.file = message_data.data.http_file
-            }
-            else if (message_data.data.file) {
-                let filePath: string = message_data.data.file;
-                message_data.data.file = "file://" + filePath
-                if (enableBase64) {
-                    let {err, data} = await file2base64(filePath);
-                    if (err) {
-                        console.log("文件转base64失败", err)
-                    } else {
-                        message_data.data.file = "base64://" + data
-                    }
-                }
-            }
+
+            // if (message_data.data.file) {
+            //     let filePath: string = message_data.data.file;
+            //     if (!enableLocalFile2Url) {
+            //         message_data.data.file = "file://" + filePath
+            //     } else { // 不使用本地路径
+            //         const ignoreTypes = [OB11MessageDataType.file, OB11MessageDataType.video]
+            //         if (!ignoreTypes.includes(message_data.type)) {
+            //             if (message_data.data.url && !message_data.data.url.startsWith(IMAGE_HTTP_HOST + "/download")) {
+            //                 message_data.data.file = message_data.data.url
+            //             } else {
+            //                 let { err, data } = await file2base64(filePath);
+            //                 if (err) {
+            //                     log("文件转base64失败", filePath, err)
+            //                 } else {
+            //                     message_data.data.file = "base64://" + data
+            //                 }
+            //             }
+            //         } else {
+            //             message_data.data.file = "file://" + filePath
+            //         }
+            //     }
+            // }
+
             if (message_data.type !== "unknown" && message_data.data) {
-                resMsg.message.push(message_data);
+                const cqCode = encodeCQCode(message_data);
+                if (messagePostFormat === 'string') {
+                    (resMsg.message as string) += cqCode;
+                } else (resMsg.message as OB11MessageData[]).push(message_data);
+
+                resMsg.raw_message += cqCode;
             }
         }
+        resMsg.raw_message = resMsg.raw_message.trim();
         return resMsg;
     }
-    
-    static friend(friend: User): OB11User{
+
+    static friend(friend: User): OB11User {
         return {
-            user_id: friend.uin,
+            user_id: parseInt(friend.uin),
             nickname: friend.nick,
             remark: friend.remark
         }
-        
+
     }
 
-    static selfInfo(selfInfo: SelfInfo): OB11User{
+    static selfInfo(selfInfo: SelfInfo): OB11User {
         return {
-            user_id: selfInfo.uin,
+            user_id: parseInt(selfInfo.uin),
             nickname: selfInfo.nick
         }
     }
 
-    static friends(friends: User[]): OB11User[]{
+    static friends(friends: User[]): OB11User[] {
         return friends.map(OB11Constructor.friend)
     }
 
@@ -154,28 +239,42 @@ export class OB11Constructor {
         }[role]
     }
 
-    static groupMember(group_id: string, member: GroupMember): OB11GroupMember{
+    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
-            group_id,
-            user_id: member.uin,
+            group_id: parseInt(group_id),
+            user_id: parseInt(member.uin),
             nickname: member.nick,
-            card: member.cardName
+            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),
         }
     }
 
-    static groupMembers(group: Group): OB11GroupMember[]{
+    static groupMembers(group: Group): OB11GroupMember[] {
         log("construct ob11 group members", group)
-        return group.members.map(m=>OB11Constructor.groupMember(group.groupCode, m))
+        return group.members.map(m => OB11Constructor.groupMember(group.groupCode, m))
     }
 
-    static group(group: Group): OB11Group{
+    static group(group: Group): OB11Group {
         return {
-            group_id: group.groupCode,
-            group_name: group.groupName
+            group_id: parseInt(group.groupCode),
+            group_name: group.groupName,
+            member_count: group.memberCount,
+            max_member_count: group.maxMember
         }
     }
 
-    static groups(groups: Group[]): OB11Group[]{
+    static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Constructor.group)
     }
-}
+}

src/onebot11/cqcode.ts

@@ -0,0 +1,71 @@
+import {OB11MessageData} from "./types";
+
+const pattern = /\[CQ:(\w+)((,\w+=[^,\]]*)*)\]/
+
+function unescape(source: string) {
+    return String(source)
+        .replace(/[/g, '[')
+        .replace(/]/g, ']')
+        .replace(/,/g, ',')
+        .replace(/&/g, '&')
+}
+
+function from(source: string) {
+    const capture = pattern.exec(source)
+    if (!capture) return null
+    const [, type, attrs] = capture
+    const data: Record<string, any> = {}
+    attrs && attrs.slice(1).split(',').forEach((str) => {
+        const index = str.indexOf('=')
+        data[str.slice(0, index)] = unescape(str.slice(index + 1))
+    })
+    return {type, data, capture}
+}
+
+function h(type: string, data: any) {
+    return {
+        type,
+        data,
+    }
+}
+
+export function decodeCQCode(source: string): OB11MessageData[] {
+    const elements: any[] = []
+    let result: ReturnType<typeof from>
+    while ((result = from(source))) {
+        const {type, data, capture} = result
+        if (capture.index) {
+            elements.push(h('text', {text: unescape(source.slice(0, capture.index))}))
+        }
+        elements.push(h(type, data))
+        source = source.slice(capture.index + capture[0].length)
+    }
+    if (source) elements.push(h('text', {text: unescape(source)}))
+    return elements
+}
+
+
+export function encodeCQCode(data: OB11MessageData) {
+    const CQCodeEscape = (text: string) => {
+        return text.replace(/\[/g, '&#91;')
+            .replace(/\]/g, '&#93;')
+            .replace(/\&/g, '&amp;')
+            .replace(/,/g, '&#44;');
+    };
+
+    if (data.type === 'text') {
+        return CQCodeEscape(data.data.text);
+    }
+
+    let result = '[CQ:' + data.type;
+    for (const name in data.data) {
+        const value = data.data[name];
+        result += `,${name}=${CQCodeEscape(value)}`;
+    }
+    result += ']';
+    return result;
+}
+
+// const result = parseCQCode("[CQ:at,qq=114514]早上好啊[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]")
+// const result = parseCQCode("好好好")
+// console.log(JSON.stringify(result))

src/onebot11/event/OB11BaseEvent.ts

@@ -0,0 +1,16 @@
+import {selfInfo} from "../../common/data";
+
+export enum EventType {
+    META = "meta_event",
+    REQUEST = "request",
+    NOTICE = "notice",
+    MESSAGE = "message",
+    MESSAGE_SENT = "message_sent",
+}
+
+
+export abstract class OB11BaseEvent {
+    time = Math.floor(Date.now() / 1000);
+    self_id = parseInt(selfInfo.uin);
+    post_type: EventType;
+}

src/onebot11/event/message/OB11BaseMessageEvent.ts

@@ -0,0 +1,5 @@
+import {EventType, OB11BaseEvent} from "../OB11BaseEvent";
+
+export abstract class OB11BaseMessageEvent extends OB11BaseEvent {
+    post_type = EventType.MESSAGE;
+}

src/onebot11/event/meta/OB11BaseMetaEvent.ts

@@ -0,0 +1,6 @@
+import {EventType, OB11BaseEvent} from "../OB11BaseEvent";
+
+export abstract class OB11BaseMetaEvent extends OB11BaseEvent {
+    post_type = EventType.META;
+    meta_event_type: string;
+}

src/onebot11/event/meta/OB11HeartbeatEvent.ts

@@ -0,0 +1,21 @@
+import {OB11BaseMetaEvent} from "./OB11BaseMetaEvent";
+
+interface HeartbeatStatus {
+    online: boolean | null,
+    good: boolean
+}
+
+export class OB11HeartbeatEvent extends OB11BaseMetaEvent {
+    meta_event_type = "heartbeat";
+    status: HeartbeatStatus;
+    interval: number;
+
+    public constructor(isOnline: boolean | null, isGood: boolean, interval: number) {
+        super();
+        this.interval = interval;
+        this.status = {
+            online: isOnline,
+            good: isGood
+        }
+    }
+}

src/onebot11/event/meta/OB11LifeCycleEvent.ts

@@ -0,0 +1,17 @@
+import {OB11BaseMetaEvent} from "./OB11BaseMetaEvent";
+
+export enum LifeCycleSubType {
+    ENABLE = "enable",
+    DISABLE = "disable",
+    CONNECT = "connect"
+}
+
+export class OB11LifeCycleEvent extends OB11BaseMetaEvent {
+    meta_event_type = "lifecycle";
+    sub_type: LifeCycleSubType;
+
+    public constructor(subType: LifeCycleSubType) {
+        super();
+        this.sub_type = subType;
+    }
+}

src/onebot11/event/notice/OB11BaseNoticeEvent.ts

@@ -0,0 +1,5 @@
+import {EventType, OB11BaseEvent} from "../OB11BaseEvent";
+
+export abstract class OB11BaseNoticeEvent extends OB11BaseEvent {
+    post_type = EventType.NOTICE;
+}

src/onebot11/event/notice/OB11FriendRecallNoticeEvent.ts

@@ -0,0 +1,13 @@
+import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+
+export class OB11FriendRecallNoticeEvent extends OB11BaseNoticeEvent {
+    notice_type = "friend_recall"
+    user_id: number
+    message_id: number
+
+    public constructor(userId: number, messageId: number) {
+        super();
+        this.user_id = userId;
+        this.message_id = messageId;
+    }
+}

src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts

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

src/onebot11/event/notice/OB11GroupDecreaseEvent.ts

@@ -0,0 +1,14 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent {
+    notice_type = "group_decrease";
+    sub_type: "leave" | "kick" | "kick_me" = "leave";  // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me")
+    operate_id: number;
+
+    constructor(groupId: number, userId: number) {
+        super();
+        this.group_id = groupId;
+        this.operate_id = userId;  // 实际上不应该这么实现，但是现在还没有办法识别用户是被踢出的，还是自己主动退出的
+        this.user_id = userId;
+    }
+}

src/onebot11/event/notice/OB11GroupIncreaseEvent.ts

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

src/onebot11/event/notice/OB11GroupNoticeEvent.ts

@@ -0,0 +1,6 @@
+import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+
+export abstract class OB11GroupNoticeEvent extends OB11BaseNoticeEvent {
+    group_id: number;
+    user_id: number;
+}

src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts

@@ -0,0 +1,15 @@
+import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent";
+
+export class OB11GroupRecallNoticeEvent extends OB11GroupNoticeEvent {
+    notice_type = "group_recall"
+    operator_id: number
+    message_id: number
+
+    constructor(groupId: number, userId: number, operatorId: number, messageId: number) {
+        super();
+        this.group_id = groupId;
+        this.user_id = userId;
+        this.operator_id = operatorId;
+        this.message_id = messageId;
+    }
+}

src/onebot11/event/request/OB11FriendRequest.ts

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

src/onebot11/event/request/OB11GroupRequest.ts

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

src/onebot11/server.ts

@@ -1,161 +0,0 @@
-import { getConfigUtil, log } from "../common/utils";
-
-const express = require("express");
-import { Request } from 'express';
-import { Response } from 'express';
-
-const JSONbig = require('json-bigint')({ storeAsString: true });
-import { selfInfo } from "../common/data";
-import { OB11Message, OB11Return, OB11MessageData } from './types';
-import { actionHandlers } from "./actions";
-
-
-// @SiberianHusky 2021-08-15
-function checkSendMessage(sendMsgList: OB11MessageData[]) {
-    function checkUri(uri: string): boolean {
-        const pattern = /^(file:\/\/|http:\/\/|https:\/\/|base64:\/\/)/;
-        return pattern.test(uri);
-    }
-
-    for (let msg of sendMsgList) {
-        if (msg["type"] && msg["data"]) {
-            let type = msg["type"];
-            let data = msg["data"];
-            if (type === "text" && !data["text"]) {
-                return 400;
-            } else if (["image", "voice", "record"].includes(type)) {
-                if (!data["file"]) {
-                    return 400;
-                } else {
-                    if (checkUri(data["file"])) {
-                        return 200;
-                    } else {
-                        return 400;
-                    }
-                }
-
-            } else if (type === "at" && !data["qq"]) {
-                return 400;
-            } else if (type === "reply" && !data["id"]) {
-                return 400;
-            }
-        } else {
-            return 400
-        }
-    }
-    return 200;
-}
-
-// ==end==
-
-
-class OB11Response {
-    static res<T>(data: T, status: number = 0, message: string = ""): OB11Return<T> {
-        return {
-            status: status,
-            retcode: status,
-            data: data,
-            message: message
-        }
-    }
-    static ok<T>(data: T) {
-        return OB11Response.res<T>(data)
-    }
-    static error(err: string) {
-        return OB11Response.res(null, -1, err)
-    }
-}
-
-const expressAPP = express();
-expressAPP.use(express.urlencoded({ extended: true, limit: "500mb" }));
-
-expressAPP.use((req, res, next) => {
-    let data = '';
-    req.on('data', chunk => {
-        data += chunk.toString();
-    });
-    req.on('end', () => {
-        if (data) {
-            try {
-                // log("receive raw", data)
-                req.body = JSONbig.parse(data);
-            } catch (e) {
-                return next(e);
-            }
-        }
-        next();
-    });
-});
-// expressAPP.use(express.json({
-//     limit: '500mb',
-//     verify: (req: any, res: any, buf: any, encoding: any) => {
-//         req.rawBody = buf;
-//     }
-// }));
-
-export function startExpress(port: number) {
-
-    expressAPP.get('/', (req: Request, res: Response) => {
-        res.send('llonebot已启动');
-    })
-
-    expressAPP.listen(port, "0.0.0.0", () => {
-        console.log(`llonebot started 0.0.0.0:${port}`);
-    });
-}
-
-
-export function postMsg(msg: OB11Message) {
-    const { reportSelfMessage } = getConfigUtil().getConfig()
-    if (!reportSelfMessage) {
-        if (msg.user_id == selfInfo.uin) {
-            return
-        }
-    }
-    for (const host of getConfigUtil().getConfig().hosts) {
-        fetch(host, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                "x-self-id": selfInfo.uin
-            },
-            body: JSON.stringify(msg)
-        }).then((res: any) => {
-            log(`新消息事件上报成功: ${host} ` + JSON.stringify(msg));
-        }, (err: any) => {
-            log(`新消息事件上报失败: ${host} ` + err + JSON.stringify(msg));
-        });
-    }
-}
-
-let routers: Record<string, (payload: any) => Promise<OB11Return<any>>> = {};
-
-function registerRouter(action: string, handle: (payload: any) => Promise<any>) {
-    let url = action.toString()
-    if (!action.startsWith("/")) {
-        url = "/" + action
-    }
-    async function _handle(res: Response, payload: any) {
-        log("receive post data", url, payload)
-        try {
-            const result = await handle(payload)
-            res.send(result)
-        }
-        catch (e) {
-            log(e.stack);
-            res.send(OB11Response.error(e.stack.toString()))
-        }
-    }
-
-    expressAPP.post(url, (req: Request, res: Response) => {
-        _handle(res, req.body).then()
-    });
-    expressAPP.get(url, (req: Request, res: Response) => {
-        _handle(res, req.query as any).then()
-    });
-    routers[url] = handle
-}
-
-for (const action  of actionHandlers) {
-    registerRouter(action.actionName, (payload) => action.handle(payload))
-}

src/onebot11/server/http.ts

@@ -0,0 +1,27 @@
+import {Response} from "express";
+import {getConfigUtil} from "../../common/utils";
+import {OB11Response} from "../action/utils";
+import {HttpServerBase} from "../../common/server/http";
+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))
+    }
+
+    protected listen(port: number) {
+        if (getConfigUtil().getConfig().ob11.enableHttp) {
+            super.listen(port);
+        }
+    }
+}
+
+export const ob11HTTPServer = new OB11HTTPServer();
+
+for (const action of actionHandlers) {
+    for (const method of ["post", "get"]) {
+        ob11HTTPServer.registerRouter(method, action.actionName, (res, payload) => action.handle(payload))
+    }
+}

src/onebot11/server/postOB11Event.ts

@@ -0,0 +1,57 @@
+import {getConfigUtil, log} from "../../common/utils";
+import {OB11Message} from "../types";
+import {selfInfo} from "../../common/data";
+import {OB11BaseMetaEvent} from "../event/meta/OB11BaseMetaEvent";
+import {OB11BaseNoticeEvent} from "../event/notice/OB11BaseNoticeEvent";
+import {WebSocket as WebSocketClass} from "ws";
+import {wsReply} from "./ws/reply";
+
+export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
+
+const eventWSList: WebSocketClass[] = [];
+
+export function registerWsEventSender(ws: WebSocketClass) {
+    eventWSList.push(ws);
+}
+
+export function unregisterWsEventSender(ws: WebSocketClass) {
+    let index = eventWSList.indexOf(ws);
+    if (index !== -1) {
+        eventWSList.splice(index, 1);
+    }
+}
+
+export function postWsEvent(event: PostEventType) {
+    for (const ws of eventWSList) {
+        new Promise(() => {
+            wsReply(ws, event);
+        }).then()
+    }
+}
+
+export function postOB11Event(msg: PostEventType, reportSelf = false) {
+    const config = getConfigUtil().getConfig();
+    // 判断msg是否是event
+    if (!config.reportSelfMessage && !reportSelf) {
+        if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
+            return
+        }
+    }
+    if (config.ob11.enableHttpPost) {
+        for (const host of config.ob11.httpHosts) {
+            fetch(host, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-self-id": selfInfo.uin
+                },
+                body: JSON.stringify(msg)
+            }).then((res: any) => {
+                log(`新消息事件HTTP上报成功: ${host} ` + JSON.stringify(msg));
+            }, (err: any) => {
+                log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg));
+            });
+        }
+    }
+    postWsEvent(msg);
+}

src/onebot11/server/ws/ReverseWebsocket.ts

@@ -0,0 +1,138 @@
+import {getConfigUtil, log} from "../../../common/utils";
+
+
+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 {wsReply} from "./reply";
+import {WebSocket as WebSocketClass} from "ws";
+
+export let rwsList: ReverseWebsocket[] = [];
+
+export class ReverseWebsocket {
+    public websocket: WebSocketClass;
+    public url: string;
+    private running: boolean = false;
+
+    public constructor(url: string) {
+        this.url = url;
+        this.running = true;
+        this.connect();
+    }
+
+    public stop() {
+        this.running = false;
+        this.websocket.close();
+    }
+
+    public onopen() {
+        wsReply(this.websocket, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT));
+    }
+
+    public async onmessage(msg: string) {
+        let receiveData: { action: ActionName, params: any, echo?: any } = {action: null, params: {}}
+        let echo = null
+        try {
+            receiveData = JSON.parse(msg.toString())
+            echo = receiveData.echo
+            log("收到反向Websocket消息", receiveData)
+        } catch (e) {
+            return wsReply(this.websocket, OB11Response.error("json解析失败，请检查数据格式", 1400, echo))
+        }
+        const action: BaseAction<any, any> = actionMap.get(receiveData.action);
+        if (!action) {
+            return wsReply(this.websocket, OB11Response.error("不支持的api " + receiveData.action, 1404, echo))
+        }
+        try {
+            let handleResult = await action.websocketHandle(receiveData.params, echo);
+            wsReply(this.websocket, handleResult)
+        } catch (e) {
+            wsReply(this.websocket, OB11Response.error(`api处理出错:${e}`, 1200, echo))
+        }
+    }
+
+    public onclose = function () {
+        log("反向ws断开", this.url);
+        unregisterWsEventSender(this.websocket);
+        if (this.running) {
+            this.reconnect();
+        }
+    }
+
+    public send(msg: string) {
+        if (this.websocket && this.websocket.readyState == WebSocket.OPEN) {
+            this.websocket.send(msg);
+        }
+    }
+
+    private reconnect() {
+        setTimeout(() => {
+            this.connect();
+        }, 3000);  // TODO: 重连间隔在配置文件中实现
+    }
+
+    private connect() {
+        const {token} = getConfigUtil().getConfig()
+        this.websocket = new WebSocketClass(this.url, {
+            handshakeTimeout: 2000,
+            perMessageDeflate: false,
+            headers: {
+                'X-Self-ID': selfInfo.uin,
+                'Authorization': `Bearer ${token}`,
+                'x-client-role': 'Universal',  // koishi-adapter-onebot 需要这个字段
+            }
+        });
+        registerWsEventSender(this.websocket);
+        log("Trying to connect to the websocket server: " + this.url);
+
+
+        this.websocket.on("open", () => {
+            log("Connected to the websocket server: " + this.url);
+            this.onopen();
+        });
+
+        this.websocket.on("message", async (data) => {
+            await this.onmessage(data.toString());
+        });
+
+        this.websocket.on("error", log);
+
+        this.websocket.on("close", () => {
+            log("The websocket connection: " + this.url + " closed, trying reconnecting...");
+            this.onclose();
+        });
+    }
+}
+
+class OB11ReverseWebsockets {
+    start() {
+        for (const url of getConfigUtil().getConfig().ob11.wsHosts) {
+            log("开始连接反向ws", url)
+            new Promise(() => {
+                try {
+                    rwsList.push(new ReverseWebsocket(url));
+                } catch (e) {
+                    log(e.stack);
+                }
+            }).then();
+        }
+    }
+
+    stop() {
+        for (let rws of rwsList) {
+            rws.stop();
+        }
+    }
+
+    restart() {
+        this.stop();
+        this.start();
+    }
+}
+
+export const ob11ReverseWebsockets = new OB11ReverseWebsockets();
+

src/onebot11/server/ws/WebsocketServer.ts

@@ -0,0 +1,73 @@
+import {WebSocket} from "ws";
+import {getConfigUtil, log} from "../../../common/utils";
+import {actionMap} from "../../action";
+import {OB11Response} from "../../action/utils";
+import {postWsEvent, registerWsEventSender, unregisterWsEventSender} from "../postOB11Event";
+import {ActionName} from "../../action/types";
+import BaseAction from "../../action/BaseAction";
+import {LifeCycleSubType, OB11LifeCycleEvent} from "../../event/meta/OB11LifeCycleEvent";
+import {OB11HeartbeatEvent} from "../../event/meta/OB11HeartbeatEvent";
+import {WebsocketServerBase} from "../../../common/server/websocket";
+import {IncomingMessage} from "node:http";
+import {wsReply} from "./reply";
+
+let heartbeatRunning = false;
+
+class OB11WebsocketServer extends WebsocketServerBase {
+    authorizeFailed(wsClient: WebSocket) {
+        wsClient.send(JSON.stringify(OB11Response.res(null, "failed", 1403, "token验证失败")))
+    }
+
+    async handleAction(wsClient: WebSocket, actionName: string, params: any, echo?: any) {
+        const action: BaseAction<any, any> = actionMap.get(actionName);
+        if (!action) {
+            return wsReply(wsClient, OB11Response.error("不支持的api " + actionName, 1404, echo))
+        }
+        try {
+            let handleResult = await action.websocketHandle(params, echo);
+            wsReply(wsClient, handleResult)
+        } catch (e) {
+            wsReply(wsClient, OB11Response.error(`api处理出错:${e}`, 1200, echo))
+        }
+    }
+
+    onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
+        if (url == "/api" || url == "/api/" || url == "/") {
+            wsClient.on("message", async (msg) => {
+                let receiveData: { action: ActionName, params: any, echo?: any } = {action: null, params: {}}
+                let echo = null
+                try {
+                    receiveData = JSON.parse(msg.toString())
+                    echo = receiveData.echo
+                    log("收到正向Websocket消息", receiveData);
+                } catch (e) {
+                    return wsReply(wsClient, OB11Response.error("json解析失败，请检查数据格式", 1400, echo))
+                }
+                this.handleAction(wsClient, receiveData.action, receiveData.params, receiveData.echo).then()
+            })
+        }
+        if (url == "/event" || url == "/event/" || url == "/") {
+            registerWsEventSender(wsClient);
+
+            log("event上报ws客户端已连接")
+
+            try {
+                wsReply(wsClient, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
+            } catch (e) {
+                log("发送生命周期失败", e)
+            }
+            const {heartInterval} = getConfigUtil().getConfig();
+            const wsClientInterval = setInterval(() => {
+                postWsEvent(new OB11HeartbeatEvent(true, true, heartInterval));
+            }, heartInterval);  // 心跳包
+            wsClient.on("close", () => {
+                log("event上报ws客户端已断开")
+                clearInterval(wsClientInterval);
+                unregisterWsEventSender(wsClient);
+            })
+        }
+    }
+}
+
+export const ob11WebsocketServer = new OB11WebsocketServer()
+

src/onebot11/server/ws/reply.ts

@@ -0,0 +1,17 @@
+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: WebSocketClass, data: OB11Response | PostEventType) {
+    try {
+        let packet = Object.assign({}, data);
+        if (isNull(packet["echo"])) {
+            delete packet["echo"];
+        }
+        wsClient.send(JSON.stringify(packet))
+        log("ws 消息上报", wsClient.url || "", data);
+    } catch (e) {
+        log("websocket 回复失败", e.stack, data);
+    }
+}

src/onebot11/types.ts

@@ -1,27 +1,27 @@
-import { AtType } from "../ntqqapi/types";
-import { RawMessage } from "../ntqqapi/types";
+import {RawMessage} from "../ntqqapi/types";
+import {EventType} from "./event/OB11BaseEvent";
 
-export interface OB11User{
-    user_id: string;
+export interface OB11User {
+    user_id: number;
     nickname: string;
     remark?: string
 }
 
-export enum OB11UserSex{
+export enum OB11UserSex {
     male = "male",
     female = "female",
     unknown = "unknown"
 }
 
-export enum OB11GroupMemberRole{
+export enum OB11GroupMemberRole {
     owner = "owner",
     admin = "admin",
     member = "member",
 }
 
 export interface OB11GroupMember {
-    group_id: string
-    user_id: string
+    group_id: number
+    user_id: number
     nickname: string
     card?: string
     sex?: OB11UserSex
@@ -31,17 +31,25 @@ 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{
-    group_id: string
+export interface OB11Group {
+    group_id: number
     group_name: string
     member_count?: number
     max_member_count?: number
 }
 
 interface OB11Sender {
-    user_id: string,
+    user_id: number,
     nickname: string,
     sex?: OB11UserSex,
     age?: number,
@@ -56,87 +64,132 @@ export enum OB11MessageType {
 }
 
 export interface OB11Message {
-    self_id?: string,
+    self_id?: number,
     time: number,
-    message_id: string,
+    message_id: number,
     real_id: string,
-    user_id: string,
-    group_id?: string,
+    user_id: number,
+    group_id?: number,
     message_type: "private" | "group",
-    sub_type?: "friend" | "group" | "other",
+    sub_type?: "friend" | "group" | "normal",
     sender: OB11Sender,
-    message: OB11MessageData[],
+    message: OB11MessageData[] | string,
+    message_format: 'array' | 'string',
     raw_message: string,
     font: number,
-    post_type?: "message",
+    post_type?: EventType,
     raw?: RawMessage
 }
 
-export type OB11ApiName =
-    "send_msg"
-    | "send_private_msg"
-    | "send_group_msg"
-    | "get_group_list"
-    | "get_group_info"
-    | "get_friend_list"
-    | "delete_msg"
-    | "get_login_info"
-    | "get_group_member_list"
-    | "get_group_member_info"
-    | "get_msg"
-
 export interface OB11Return<DataType> {
-    status: number
+    status: string
     retcode: number
     data: DataType
-    message: string
+    message: string,
+    echo?: any, // ws调用api才有此字段
+    wording?: string,  // go-cqhttp字段，错误信息
 }
 
-export interface OB11SendMsgReturn extends OB11Return<{message_id: string}>{}
-
 export enum OB11MessageDataType {
     text = "text",
     image = "image",
+    video = "video",
     voice = "record",
+    file = "file",
     at = "at",
     reply = "reply",
-    json = "json"
+    json = "json",
+    face = "face",
+    node = "node"  // 合并转发消息
 }
 
-export type OB11MessageData = {
+export interface OB11MessageText {
     type: OB11MessageDataType.text,
-    content: string,
-    data?: {
+    data: {
         text: string, // 纯文本
     }
-} | {
-    type: "image" | "voice" | "record",
-    file: string, // 本地路径
-    data?: {
-        file: string // 本地路径
-    }
-} | {
-    type: OB11MessageDataType.at,
-    atType?: AtType,
-    content?: string,
-    atUid?: string,
-    atNtUid?: string,
-    data?: {
-        qq: string // at的qq号
-    }
-} | {
-    type: OB11MessageDataType.reply,
-    msgId: string,
-    msgSeq: string,
-    senderUin: string,
+}
+
+interface OB11MessageFileBase {
     data: {
-        id: string,
+        file: string,
+        url?: string;
     }
 }
 
+export interface OB11MessageImage extends OB11MessageFileBase {
+    type: OB11MessageDataType.image
+}
+
+export interface OB11MessageRecord extends OB11MessageFileBase {
+    type: OB11MessageDataType.voice
+}
+
+export interface OB11MessageFile extends OB11MessageFileBase {
+    type: OB11MessageDataType.file
+}
+
+export interface OB11MessageVideo extends OB11MessageFileBase {
+    type: OB11MessageDataType.video
+}
+
+export interface OB11MessageAt {
+    type: OB11MessageDataType.at
+    data: {
+        qq: string | "all"
+    }
+}
+
+export interface OB11MessageReply {
+    type: OB11MessageDataType.reply
+    data: {
+        id: string
+    }
+}
+
+export interface OB11MessageFace {
+    type: OB11MessageDataType.face
+    data: {
+        id: string
+    }
+}
+
+export type OB11MessageMixType = OB11MessageData[] | string | OB11MessageData;
+
+export interface OB11MessageNode {
+    type: OB11MessageDataType.node
+    data: {
+        id?: string
+        user_id?: number
+        nickname: string
+        content: OB11MessageMixType
+    }
+}
+
+export type OB11MessageData =
+    OB11MessageText |
+    OB11MessageFace |
+    OB11MessageAt | OB11MessageReply |
+    OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
+    OB11MessageNode
+
 export interface OB11PostSendMsg {
     message_type?: "private" | "group"
     user_id: string,
     group_id?: string,
-    message: OB11MessageData[] | string | OB11MessageData;
-}
+    message: OB11MessageMixType;
+    messages?: OB11MessageMixType;  // 兼容 go-cqhttp
+}
+
+export interface OB11Version {
+    app_name: "LLOneBot"
+    app_version: string
+    protocol_version: "v11"
+}
+
+
+export interface OB11Status {
+    online: boolean | null,
+    good: boolean
+}
+

src/onebot11/utils.ts

@@ -1,9 +1,15 @@
-import { CONFIG_DIR, isGIF } from "../common/utils";
-import * as path from 'path';
-import { NTQQApi } from '../ntqqapi/ntcall';
+import {CONFIG_DIR, isGIF} from "../common/utils";
+import {v4 as uuidv4} from "uuid";
+import * as path from 'node:path';
+import {fileCache} from "../common/data";
+import * as fileType from 'file-type';
+
 const fs = require("fs").promises;
 
-export async function uri2local(fileName: string, uri: string){
+export async function uri2local(uri: string, fileName: string = null) {
+    if (!fileName) {
+        fileName = uuidv4();
+    }
     let filePath = path.join(CONFIG_DIR, fileName)
     let url = new URL(uri);
     let res = {
@@ -18,6 +24,7 @@ export async function uri2local(fileName: string, uri: string){
         try {
             const buffer = Buffer.from(base64Data, 'base64');
             await fs.writeFile(filePath, buffer);
+
         } catch (e: any) {
             res.errMsg = `base64文件下载失败,` + e.toString()
             return res
@@ -32,29 +39,49 @@ export async function uri2local(fileName: string, uri: string){
         let blob = await fetchRes.blob();
         let buffer = await blob.arrayBuffer();
         try {
+            fileName = path.parse(url.pathname).name || fileName
+            filePath = path.join(CONFIG_DIR, fileName)
             await fs.writeFile(filePath, Buffer.from(buffer));
         } catch (e: any) {
             res.errMsg = `${url}下载失败,` + e.toString()
             return res
         }
-    } else if (url.protocol === "file:"){
-        // await fs.copyFile(url.pathname, filePath);
-        if (process.platform === "win32"){
-            filePath = url.pathname.slice(1)
-        }
-        else{
-            filePath = url.pathname
+    } else {
+        let pathname: string;
+        if (url.protocol === "file:") {
+            // await fs.copyFile(url.pathname, filePath);
+            pathname = decodeURIComponent(url.pathname)
+            if (process.platform === "win32") {
+                filePath = pathname.slice(1)
+            } else {
+                filePath = pathname
+            }
+        } else {
+            const cache = fileCache.get(uri)
+            if (cache) {
+                filePath = cache.filePath
+            } else {
+                filePath = uri;
+            }
         }
+
         res.isLocal = true
     }
-    else{
-        res.errMsg = `不支持的file协议,` + url.protocol
-        return res
-    }
+    // else{
+    //     res.errMsg = `不支持的file协议,` + url.protocol
+    //     return res
+    // }
     if (isGIF(filePath) && !res.isLocal) {
         await fs.rename(filePath, filePath + ".gif");
         filePath += ".gif";
     }
+    if (!res.isLocal) {
+        const {ext} = await fileType.fileTypeFromFile(filePath)
+        if (ext) {
+            await fs.rename(filePath, filePath + `.${ext}`)
+            filePath += `.${ext}`
+        }
+    }
     res.success = true
     res.path = filePath
     return res

src/preload.ts

@@ -1,25 +1,36 @@
 // Electron 主进程 与 渲染进程 交互的桥梁
 
-import {Config} from "./common/types";
+import {Config, LLOneBotError} from "./common/types";
 import {
+    CHANNEL_ERROR,
     CHANNEL_GET_CONFIG,
     CHANNEL_LOG,
+    CHANNEL_SELECT_FILE,
     CHANNEL_SET_CONFIG,
 } from "./common/channels";
 
-
 const {contextBridge} = require("electron");
 const {ipcRenderer} = require('electron');
 
-// 在window对象下导出只读对象
-contextBridge.exposeInMainWorld("llonebot", {
+const llonebot = {
     log: (data: any) => {
         ipcRenderer.send(CHANNEL_LOG, data);
     },
-    setConfig: (config: Config)=>{
+    setConfig: (config: Config) => {
         ipcRenderer.send(CHANNEL_SET_CONFIG, config);
     },
-    getConfig: async () => {
+    getConfig: async (): Promise<Config> => {
         return ipcRenderer.invoke(CHANNEL_GET_CONFIG);
     },
-});
+    getError: async (): Promise<LLOneBotError> => {
+        return ipcRenderer.invoke(CHANNEL_ERROR);
+    },
+    selectFile: (): Promise<string> => {
+        return ipcRenderer.invoke(CHANNEL_SELECT_FILE);
+    }
+}
+
+export type LLOneBot = typeof llonebot;
+
+// 在window对象下导出只读对象
+contextBridge.exposeInMainWorld("llonebot", llonebot);

src/renderer.ts

@@ -1,74 +1,185 @@
 /// <reference path="./global.d.ts" />
 
-
 // 打开设置界面时触发
-async function onSettingWindowCreated(view: Element) {
-    window.llonebot.log("setting window created");
-    let config = await window.llonebot.getConfig()
 
-    function creatHostEleStr(host: string) {
-        let eleStr = `
-            <setting-item data-direction="row" class="hostItem vertical-list-item">
-                <h2>事件上报地址(http)</h2>
-                <input class="host input-text" type="text" value="${host}" 
+async function onSettingWindowCreated (view: Element) {
+  window.llonebot.log('setting window created')
+  const isEmpty = (value: any) => value === undefined || value === null || value === ''
+  const 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) {
+    const 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="如果localhost上报失败试试局域网ip"/>
+                placeholder="如:http://127.0.0.1:8080/onebot/v11/http"/>
             </setting-item>
-
             `
-        return eleStr
-    }
+    return eleStr
+  }
 
-    let hostsEleStr = ""
-    for (const host of config.hosts) {
-        hostsEleStr += creatHostEleStr(host);
-    }
-    let html = `
+  function createWsHostEleStr (host: string) {
+    const 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)
+  }
+
+  const 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 class="vertical-list-item" data-direction="row">
-                        <setting-text>监听端口</setting-text>
-                        <input id="port" type="number" value="${config.port}"/>
+                    <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>
-                    <div>
-                        <button id="addHost" class="q-button">添加上报地址</button>
+                    <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>
-                    <div id="hostItems">
-                        ${hostsEleStr}
+                    <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>
-                    <button id="save" class="q-button">保存(监听端口重启QQ后生效)</button>
+                    <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="hostItem vertical-list-item">
+
+                <setting-item data-direction="row" class="vertical-list-item">
                     <div>
-                        <div>上报文件进行base64编码</div>
-                        <div class="tips">不开启时，上报文件将以本地路径形式发送</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-switch id="switchBase64" ${config.enableBase64 ? "is-active" : ""}></setting-switch>
+                    <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="hostItem vertical-list-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-switch id="debug" ${config.debug ? 'is-active' : ''}></setting-switch>
                 </setting-item>
-                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                <setting-item data-direction="row" class="vertical-list-item">
                     <div>
-                        <div>上报自身消息</div>
-                        <div class="tips">开启后上报自己发出的消息</div>
+                        <div>上报自身发送消息</div>
+                        <div class="tips"></div>
                     </div>
-                    <setting-switch id="reportSelfMessage" ${config.reportSelfMessage ? "is-active" : ""}></setting-switch>
+                    <setting-switch id="reportSelfMessage" ${config.reportSelfMessage ? 'is-active' : ''}></setting-switch>
                 </setting-item>
-                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                <setting-item data-direction="row" class="vertical-list-item">
                     <div>
                         <div>日志</div>
-                        <div class="tips">日志目录:${window.LiteLoader.plugins["LLOneBot"].path.data}</div>
+                        <div class="tips">目录:${window.LiteLoader.plugins.LLOneBot.path.data}</div>
                     </div>
-                    <setting-switch id="log" ${config.log ? "is-active" : ""}></setting-switch>
+                    <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>
@@ -88,68 +199,182 @@ async function onSettingWindowCreated(view: Element) {
     </style>
     `
 
-    const parser = new DOMParser();
-    const doc = parser.parseFromString(html, "text/html");
+  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).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(initValue: string = "") {
-        let addressDoc = parser.parseFromString(creatHostEleStr(initValue), "text/html");
-        let addressEle = addressDoc.querySelector("setting-item")
-        let hostItemsEle = document.getElementById("hostItems");
-        hostItemsEle.appendChild(addressEle);
+  function addHostEle (type: string, initValue: string = '') {
+    let addressEle, hostItemsEle
+    if (type === 'ws') {
+      const addressDoc = parser.parseFromString(createWsHostEleStr(initValue), 'text/html')
+      addressEle = addressDoc.querySelector('setting-item')
+      hostItemsEle = document.getElementById('wsHostItems')
+    } else {
+      const addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), 'text/html')
+      addressEle = addressDoc.querySelector('setting-item')
+      hostItemsEle = document.getElementById('httpHostItems')
     }
 
+    hostItemsEle.appendChild(addressEle)
+  }
 
-    doc.getElementById("addHost").addEventListener("click", () => addHostEle())
+  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) {
-        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", "")
-            }
-            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 (const e of document.getElementsByClassName(keyClassMap[configKey])) {
+        (e as HTMLElement).style.display = _config[configKey] ? '' : 'none'
+      }
 
-    switchClick("debug", "debug");
-    switchClick("switchBase64", "enableBase64");
-    switchClick("reportSelfMessage", "reportSelfMessage");
-    switchClick("log", "log");
+      window.llonebot.setConfig(config)
+    })
+  }
 
-    doc.getElementById("save")?.addEventListener("click",
-        () => {
-            const portEle: HTMLInputElement = document.getElementById("port") as HTMLInputElement
-            const hostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName("host") as HTMLCollectionOf<HTMLInputElement>;
-            // const port = doc.querySelector("input[type=number]")?.value
-            // const host = doc.querySelector("input[type=text]")?.value
-            // 获取端口和host
-            const port = portEle.value
-            let hosts: string[] = [];
-            for (const hostEle of hostEles) {
-                if (hostEle.value) {
-                    hosts.push(hostEle.value);
-                }
-            }
-            config.port = parseInt(port);
-            config.hosts = hosts;
-            window.llonebot.setConfig(config);
-            alert("保存成功");
-        })
+  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
 
-    doc.body.childNodes.forEach(node => {
-        view.appendChild(node);
-    });
+      // 获取端口和host
+      const httpPort = httpPortEle.value
+      const 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()
+      const 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 () {
+  const hash = location.hash
+  if (hash === '#/blank') {
+
+  }
+}
+
+if (location.hash === '#/blank') {
+  (window as any).navigation.addEventListener('navigatesuccess', init, { once: true })
+} else {
+  init()
+}
 
 export {
-    onSettingWindowCreated
+  onSettingWindowCreated
 }

src/version.ts

@@ -0,0 +1 @@
+export const version = "3.11.1"

tsconfig.json

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

webpack.base.config.js

@@ -1,60 +0,0 @@
-// import path from "path";
-const path = require('path');
-const TerserPlugin = require('terser-webpack-plugin');
-
-module.exports = {
-    // 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: [
-        // "express",
-        "electron", "fs"],
-    experiments: {
-        // outputModule: 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,
-            }),
-        ],
-    }
-}

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