Merge pull request #53 from disymayufei/dev-1

补充支持基本的正向和反向Websocket
2024-11-22 01:56:33 +00:00 · 2024-02-19 21:54:27 +08:00 · 2024-02-19 21:54:27 +08:00 · 5094ba724a
commit 5094ba724a
parent 9b8b9a203c 82e3ca113d
54 changed files with 893 additions and 478 deletions
--- a/manifest.json
+++ b/manifest.json
@ -4,7 +4,7 @@
  "name": "LLOneBot",
  "slug": "LLOneBot",
  "description": "LiteLoaderQQNT的OneBotApi",
-  "version": "3.3.1",
+  "version": "3.4.0",
  "thumbnail": "./icon.png",
  "authors": [
    {
--- a/package-lock.json
+++ b/package-lock.json
@ -11,8 +11,10 @@
      "license": "ISC",
      "dependencies": {
        "express": "^4.18.2",
+        "express-ws": "^5.0.2",
        "json-bigint": "^1.0.0",
-        "uuid": "^9.0.1"
+        "uuid": "^9.0.1",
+        "ws": "^8.16.0"
      },
      "devDependencies": {
        "@babel/preset-env": "^7.23.2",
@ -3134,6 +3136,40 @@
        "node": ">= 0.10.0"
      }
    },
+    "node_modules/express-ws": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmmirror.com/express-ws/-/express-ws-5.0.2.tgz",
+      "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==",
+      "dependencies": {
+        "ws": "^7.4.6"
+      },
+      "engines": {
+        "node": ">=4.5.0"
+      },
+      "peerDependencies": {
+        "express": "^4.0.0 || ^5.0.0-alpha.1"
+      }
+    },
+    "node_modules/express-ws/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
--- a/package.json
+++ b/package.json
@ -5,7 +5,7 @@
  "main": "dist/main.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "ELECTRON_SKIP_BINARY_DOWNLOAD=1 npm install electron --no-save",
+    "postinstall": "set 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",
@ -19,8 +19,10 @@
  "license": "ISC",
  "dependencies": {
    "express": "^4.18.2",
+    "express-ws": "^5.0.2",
    "json-bigint": "^1.0.0",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "ws": "^8.16.0"
  },
  "devDependencies": {
    "@babel/preset-env": "^7.23.2",
--- a/src/common/config.ts
+++ b/src/common/config.ts
@ -1,6 +1,6 @@
-import { Config } from "./types";
+import {Config} from "./types";

-const fs = require("fs")
+const fs = require("fs");

 export class ConfigUtil {
    configPath: string;
@ -11,9 +11,10 @@ export class ConfigUtil {

    getConfig(): Config {
        let defaultConfig: Config = {
-            port: 3000,
+            httpPort: 3000,
+            httpHosts: [],
            wsPort: 3001,
-            hosts: [],
+            wsHosts: [],
            token: "",
            enableBase64: false,
            debug: false,
@ -28,22 +29,26 @@ export class ConfigUtil {
            try {
                jsonData = JSON.parse(data)
            }
-            catch (e){
-
+            catch (e) {}
+            if (!jsonData.httpHosts) {
+                jsonData.httpHosts = []
            }
-            if (!jsonData.hosts) {
-                jsonData.hosts = []
+            if (!jsonData.wsHosts) {
+                jsonData.wsHosts = []
            }
-            if (!jsonData.wsPort){
+            if (!jsonData.wsPort) {
                jsonData.wsPort = 3001
            }
-            if (!jsonData.token){
+            if (!jsonData.httpPort) {
+                jsonData.httpPort = 3000
+            }
+            if (!jsonData.token) {
                jsonData.token = ""
            }
            return jsonData;
        }
    }
-
+  
    setConfig(config: Config) {
        fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
    }
--- a/src/common/data.ts
+++ b/src/common/data.ts
@ -1,6 +1,5 @@
-import { NTQQApi } from '../ntqqapi/ntcall';
-import { Friend, Group, GroupMember, RawMessage, SelfInfo } from "../ntqqapi/types";
-import { log } from "./utils";
+import {NTQQApi} from '../ntqqapi/ntcall';
+import {Friend, Group, GroupMember, RawMessage, SelfInfo} from "../ntqqapi/types";

 export let groups: Group[] = []
 export let friends: Friend[] = []
@ -88,5 +87,5 @@ export function getStrangerByUin(uin: string) {
    }
 }

-export const version = "v3.3.1"
+export const version = "v3.4.0"
 export const heartInterval = 15000 // 毫秒
--- a/src/common/types.ts
+++ b/src/common/types.ts
@ -1,11 +1,15 @@
 export interface Config {
-    port: number
+    httpPort: number
+    httpHosts: string[]
    wsPort: number
-    hosts: string[]
+    wsHosts: string[]
+    enableHttp?: boolean
+    enableHttpPost?: boolean
+    enableWs?: boolean
+    enableWsReverse?: boolean
    token?: string
    enableBase64?: boolean
    debug?: boolean
    reportSelfMessage?: boolean
    log?: boolean
-}
-
+}
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@ -2,7 +2,6 @@ import * as path from "path";
 import {selfInfo} from "./data";
 import {ConfigUtil} from "./config";
 import util from "util";
-import { sendLog } from '../main/ipcsend';

 const fs = require('fs');

@ -49,6 +48,10 @@ 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> {
--- a/src/global.d.ts
+++ b/src/global.d.ts
@ -1,4 +1,4 @@
-import { Config } from "./common/types";
+import {Config} from "./common/types";


 declare var llonebot: {
--- a/src/main/ipcsend.ts
+++ b/src/main/ipcsend.ts
@ -1,5 +1,5 @@
 import {webContents} from 'electron';
-import { CHANNEL_LOG } from '../common/channels';
+import {CHANNEL_LOG} from '../common/channels';


 function sendIPCMsg(channel: string, ...data: any) {
--- a/src/main/main.ts
+++ b/src/main/main.ts
@ -1,16 +1,18 @@
 // 运行在 Electron 主进程 下的插件入口

-import { BrowserWindow, ipcMain } from 'electron';
+import {BrowserWindow, ipcMain} from 'electron';

-import { Config } from "../common/types";
-import { CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG, } from "../common/channels";
-import { postMsg, setToken, startHTTPServer, startWSServer } from "../onebot11/server";
-import { CONFIG_DIR, getConfigUtil, log } from "../common/utils";
-import { addHistoryMsg, getGroupMember, msgHistory, selfInfo, uidMaps } from "../common/data";
-import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook";
-import { OB11Constructor } from "../onebot11/constructor";
-import { NTQQApi } from "../ntqqapi/ntcall";
-import { ChatType, RawMessage } from "../ntqqapi/types";
+import {Config} from "../common/types";
+import {postMsg, setToken, startHTTPServer, initWebsocket} from "../onebot11/server";
+import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "../common/channels";
+import {CONFIG_DIR, getConfigUtil, log} from "../common/utils";
+import {addHistoryMsg, getGroupMember, msgHistory, selfInfo} from "../common/data";
+import {hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook";
+import {OB11Constructor} from "../onebot11/constructor";
+import {NTQQApi} from "../ntqqapi/ntcall";
+import {ChatType, RawMessage} from "../ntqqapi/types";
+import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
+import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";

 const fs = require('fs');

@ -23,21 +25,20 @@ function onLoad() {

    // const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;

-
    if (!fs.existsSync(CONFIG_DIR)) {
        fs.mkdirSync(CONFIG_DIR, {recursive: true});
    }
    ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
-        return getConfigUtil().getConfig()
+        return getConfigUtil().getConfig();
    })
    ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
        let oldConfig = getConfigUtil().getConfig();
        getConfigUtil().setConfig(arg)
-        if (arg.port != oldConfig.port) {
-            startHTTPServer(arg.port)
+        if (arg.httpPort != oldConfig.httpPort) {
+            startHTTPServer(arg.httpPort)
        }
        if (arg.wsPort != oldConfig.wsPort) {
-            startWSServer(arg.wsPort)
+            initWebsocket(arg.wsPort)
        }
        if (arg.token != oldConfig.token) {
            setToken(arg.token);
@ -45,7 +46,7 @@ function onLoad() {
    })

    ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => {
-        log(arg)
+        log(arg);
    })


@ -55,7 +56,7 @@ function onLoad() {
            log("收到新消息", message)
            message.msgShortId = msgHistory[message.msgId]?.msgShortId
            if (!message.msgShortId) {
-                addHistoryMsg(message)
+                addHistoryMsg(message);
            }
            OB11Constructor.message(message).then((msg) => {
                if (debug) {
@ -65,7 +66,6 @@ function onLoad() {
                    return
                }
                postMsg(msg);
-                // log("post msg", msg)
            }).catch(e => log("constructMessage error: ", e.toString()));
        }
    }
@ -74,10 +74,9 @@ function onLoad() {
    async function start() {
        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
            try {
-                // log("received msg length", payload.msgList.length);
                postRawMsg(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) => {
@ -90,8 +89,8 @@ function onLoad() {
                        continue
                    }
                    if (message.chatType == ChatType.friend) {
-                        const friendRecallEvent = OB11Constructor.friendRecallEvent(message.senderUin, oriMessage.msgShortId)
-                        postMsg(friendRecallEvent)
+                        const friendRecallEvent = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId);
+                        postMsg(friendRecallEvent);
                    } else if (message.chatType == ChatType.group) {
                        let operatorId = message.senderUin
                        for (const element of message.elements) {
@ -99,13 +98,14 @@ function onLoad() {
                            const operator = await getGroupMember(message.peerUin, null, operatorUid)
                            operatorId = operator.uin
                        }
-                        const groupRecallEvent = OB11Constructor.groupRecallEvent(
-                            message.peerUin,
-                            message.senderUin,
-                            operatorId,
+                        const groupRecallEvent = new OB11GroupRecallNoticeEvent(
+                            parseInt(message.peerUin),
+                            parseInt(message.senderUin),
+                            parseInt(operatorId),
                            oriMessage.msgShortId
                        )
-                        postMsg(groupRecallEvent)
+
+                        postMsg(groupRecallEvent);
                    }
                    continue
                }
@ -113,7 +113,7 @@ function onLoad() {
            }
        })
        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
-            const {reportSelfMessage} = getConfigUtil().getConfig()
+            const {reportSelfMessage} = getConfigUtil().getConfig();
            if (!reportSelfMessage) {
                return
            }
@ -121,45 +121,46 @@ function onLoad() {
            try {
                postRawMsg([payload.msgRecord]);
            } catch (e) {
-                log("report self message error: ", e.toString())
+                log("report self message error: ", e.toString());
            }
        })
        NTQQApi.getGroups(true).then()
+      
        const config = getConfigUtil().getConfig()
-        startHTTPServer(config.port)
-        startWSServer(config.wsPort)
+        startHTTPServer(config.httpPort)
+        initWebsocket(config.wsPort);
        setToken(config.token)
        log("LLOneBot start")
    }

    const init = async () => {
        try {
-            const _ = await NTQQApi.getSelfInfo()
-            Object.assign(selfInfo, _)
-            selfInfo.nick = selfInfo.uin
-            log("get self simple info", _)
+            const _ = await NTQQApi.getSelfInfo();
+            Object.assign(selfInfo, _);
+            selfInfo.nick = selfInfo.uin;
+            log("get self simple info", _);
        } catch (e) {
-            log("retry get self info")
+            log("retry get self info");
        }
        if (selfInfo.uin) {
            try {
-                const userInfo = (await NTQQApi.getUserInfo(selfInfo.uid))
+                const userInfo = (await NTQQApi.getUserInfo(selfInfo.uid));
                log("self info", userInfo);
                if (userInfo) {
-                    selfInfo.nick = userInfo.nick
+                    selfInfo.nick = userInfo.nick;
                } else {
-                    return setTimeout(init, 1000)
+                    return setTimeout(init, 1000);
                }
            } catch (e) {
-                log("get self nickname failed", e.toString())
-                return setTimeout(init, 1000)
+                log("get self nickname failed", e.toString());
+                return setTimeout(init, 1000);
            }
            start().then();
        } else {
            setTimeout(init, 1000)
        }
    }
-    setTimeout(init, 1000)
+    setTimeout(init, 1000);
 }


--- a/src/ntqqapi/constructor.ts
+++ b/src/ntqqapi/constructor.ts
@ -1,13 +1,13 @@
 import {
+    AtType,
    ElementType,
+    SendFaceElement,
    SendPicElement,
    SendPttElement,
    SendReplyElement,
-    SendTextElement,
-    AtType,
-    SendFaceElement
+    SendTextElement
 } from "./types";
-import { NTQQApi } from "./ntcall";
+import {NTQQApi} from "./ntcall";


 export class SendMsgElementConstructor {
--- a/src/ntqqapi/hook.ts
+++ b/src/ntqqapi/hook.ts
@ -1,10 +1,12 @@
-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 { addHistoryMsg, friends, groups, msgHistory } from "../common/data";
-import { v4 as uuidv4 } from 'uuid';
+import {BrowserWindow} from 'electron';
+import {log, sleep} from "../common/utils";
+import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
+import {Group, RawMessage, User} from "./types";
+import {addHistoryMsg, friends, groups, msgHistory} from "../common/data";
+import {v4 as uuidv4} from 'uuid';
+import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
+import {OB11GroupIncreaseEvent} from "../onebot11/event/notice/OB11GroupIncreaseEvent";
+import {postMsg} from "../onebot11/server";

 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}

@ -41,7 +43,7 @@ let receiveHooks: Array<{
 export function hookNTQQApiReceive(window: BrowserWindow) {
    const originalSend = window.webContents.send;
    const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-        // log(`received ntqq api message: ${channel}`, JSON.stringify(args))
+        // console.log(`received ntqq api message: ${channel}`, JSON.stringify(args))
        if (args?.[1] instanceof Array) {
            for (let receiveData of args?.[1]) {
                const ntQQApiMethodName = receiveData.cmdName;
@ -93,25 +95,103 @@ export function removeReceiveHook(id: string) {
    receiveHooks.splice(index, 1);
 }

-async function updateGroups(_groups: Group[]) {
+async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
    for (let 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 {
-            Object.assign(existGroup, group)
+        let existGroup = groups.find(g => g.groupCode == group.groupCode);
+        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) {
+            let 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)) {
+                            postMsg(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)) {
+                            postMsg(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[] }[]
 }>(ReceiveCmd.FRIENDS, payload => {
@ -128,12 +208,6 @@ registerReceiveHook<{
    }
 })

-// registerReceiveHook<any>(ReceiveCmd.USER_INFO, (payload)=>{
-//     log("user info", payload);
-// })
-
-
-
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
    for (const message of payload.msgList) {
        // log("收到新消息，push到历史记录", message)
--- a/src/ntqqapi/ntcall.ts
+++ b/src/ntqqapi/ntcall.ts
@ -1,12 +1,8 @@
-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 {ipcMain} from "electron";
+import {v4 as uuidv4} from "uuid";
+import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook";
+import {log} from "../common/utils";
+import {ChatType, Friend, Group, GroupMember, RawMessage, SelfInfo, SendMessageElement, User} from "./types";
 import * as fs from "fs";

 interface IPCReceiveEvent {
--- a/src/onebot11/ReconnectingWebsocket.ts
+++ b/src/onebot11/ReconnectingWebsocket.ts
@ -0,0 +1,56 @@
+import {log} from "../common/utils";
+
+const WebSocket = require("ws");
+
+export class ReconnectingWebsocket {
+    private websocket;
+    private readonly url: string;
+
+    public constructor(url: string) {
+        this.url = url;
+        this.reconnect()
+    }
+
+    public onopen = function (){}
+
+    public onmessage = function (msg){}
+
+    public onclose = function () {}
+
+    public send(msg) {
+        if (this.websocket && this.websocket.readyState == WebSocket.OPEN) {
+            this.websocket.send(msg);
+        }
+    }
+
+    private reconnect() {
+        this.websocket = new WebSocket(this.url, {
+            handshakeTimeout: 2000,
+            perMessageDeflate: false
+        });
+
+        console.log("Trying to connect to the websocket server: " + this.url);
+
+        const instance = this;
+
+        this.websocket.on("open", function open() {
+            console.log("Connected to the websocket server: " + instance.url);
+            instance.onopen();
+        });
+
+        this.websocket.on("message", function message(data) {
+            instance.onmessage(data.toString());
+        });
+
+        this.websocket.on("error", console.error);
+
+        this.websocket.on("close", function close() {
+            console.log("The websocket connection: " + instance.url + " closed, trying reconnecting...");
+            instance.onclose();
+
+            setTimeout(() => {
+                instance.reconnect();
+            }, 3000);  // TODO: 重连间隔在配置文件中实现
+        });
+    }
+}
--- a/src/onebot11/actions/BaseAction.ts
+++ b/src/onebot11/actions/BaseAction.ts
@ -1,6 +1,6 @@
 import {ActionName, BaseCheckResult} from "./types"
-import { OB11Response } from "./utils"
-import { OB11Return } from "../types";
+import {OB11Response, OB11WebsocketResponse} from "./utils"
+import {OB11Return, OB11WebsocketReturn} from "../types";

 class BaseAction<PayloadType, ReturnDataType> {
    actionName: ActionName
@ -11,20 +11,33 @@ class BaseAction<PayloadType, ReturnDataType> {
    }

    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: string): Promise<OB11WebsocketReturn<ReturnDataType | null>> {
        const result = await this.check(payload)
        if (!result.valid) {
-            return OB11Response.error(result.message)
+            return OB11WebsocketResponse.error(result.message, 1400)
        }
        try {
            const resData = await this._handle(payload)
-            return OB11Response.ok(resData)
-        }catch (e) {
-            return OB11Response.error(e.toString())
+            return OB11WebsocketResponse.ok(resData, echo);
+        } catch (e) {
+            return OB11WebsocketResponse.error(e.toString(), 1200)
        }
    }

    protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-        throw `pleas override ${this.actionName} _handle`
+        throw `pleas override ${this.actionName} _handle`;
    }
 }

--- a/src/onebot11/actions/CanSendImage.ts
+++ b/src/onebot11/actions/CanSendImage.ts
@ -1,4 +1,4 @@
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 import CanSendRecord from "./CanSendRecord";

 interface ReturnType{
--- a/src/onebot11/actions/CanSendRecord.ts
+++ b/src/onebot11/actions/CanSendRecord.ts
@ -1,5 +1,5 @@
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+import {ActionName} from "./types";

 interface ReturnType{
    yes: boolean
--- a/src/onebot11/actions/DeleteMsg.ts
+++ b/src/onebot11/actions/DeleteMsg.ts
@ -1,7 +1,7 @@
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 import BaseAction from "./BaseAction";
-import { NTQQApi } from "../../ntqqapi/ntcall";
-import { getHistoryMsgByShortId, msgHistory } from "../../common/data";
+import {NTQQApi} from "../../ntqqapi/ntcall";
+import {getHistoryMsgByShortId} from "../../common/data";

 interface Payload {
    message_id: number
--- a/src/onebot11/actions/GetFriendList.ts
+++ b/src/onebot11/actions/GetFriendList.ts
@ -1,8 +1,8 @@
-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[]> {
--- a/src/onebot11/actions/GetGroupInfo.ts
+++ b/src/onebot11/actions/GetGroupInfo.ts
@ -1,8 +1,8 @@
-import { OB11Group } from '../types';
-import { getGroup } 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
--- a/src/onebot11/actions/GetGroupList.ts
+++ b/src/onebot11/actions/GetGroupList.ts
@ -1,9 +1,8 @@
-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[]> {
--- a/src/onebot11/actions/GetGroupMemberInfo.ts
+++ b/src/onebot11/actions/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 {
--- a/src/onebot11/actions/GetGroupMemberList.ts
+++ b/src/onebot11/actions/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
--- a/src/onebot11/actions/GetLoginInfo.ts
+++ b/src/onebot11/actions/GetLoginInfo.ts
@ -1,8 +1,8 @@
-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> {
--- a/src/onebot11/actions/GetMsg.ts
+++ b/src/onebot11/actions/GetMsg.ts
@ -1,9 +1,8 @@
-import { getHistoryMsgByShortId, msgHistory } from "../../common/data";
-import { OB11Message } from '../types';
-import { OB11Constructor } from "../constructor";
-import { log } from "../../common/utils";
+import {getHistoryMsgByShortId} from "../../common/data";
+import {OB11Message} from '../types';
+import {OB11Constructor} from "../constructor";
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+import {ActionName} from "./types";


 export interface PayloadType {
--- a/src/onebot11/actions/GetStatus.ts
+++ b/src/onebot11/actions/GetStatus.ts
@ -1,6 +1,6 @@
 import BaseAction from "./BaseAction";
 import {OB11Status} from "../types";
-import { ActionName } from "./types";
+import {ActionName} from "./types";


 export default class GetStatus extends BaseAction<any, OB11Status> {
--- a/src/onebot11/actions/GetVersionInfo.ts
+++ b/src/onebot11/actions/GetVersionInfo.ts
@ -1,7 +1,7 @@
 import BaseAction from "./BaseAction";
-import { OB11Version } from "../types";
+import {OB11Version} from "../types";
 import {version} from "../../common/data";
-import { ActionName } from "./types";
+import {ActionName} from "./types";

 export default class GetVersionInfo extends BaseAction<any, OB11Version>{
    actionName = ActionName.GetVersionInfo
--- a/src/onebot11/actions/SendGroupMsg.ts
+++ b/src/onebot11/actions/SendGroupMsg.ts
@ -1,5 +1,5 @@
 import SendMsg from "./SendMsg";
-import { ActionName } from "./types";
+import {ActionName} from "./types";


 class SendGroupMsg extends SendMsg{
--- a/src/onebot11/actions/SendMsg.ts
+++ b/src/onebot11/actions/SendMsg.ts
@ -1,12 +1,12 @@
-import { AtType, ChatType, Group, SendMessageElement } from "../../ntqqapi/types";
-import { addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getStrangerByUin, } from "../../common/data";
-import { OB11MessageData, OB11MessageDataType, OB11PostSendMsg } from '../types';
-import { NTQQApi, Peer } from "../../ntqqapi/ntcall";
-import { SendMsgElementConstructor } from "../../ntqqapi/constructor";
-import { uri2local } from "../utils";
-import { v4 as uuid4 } from 'uuid';
+import {AtType, ChatType, Group, SendMessageElement} from "../../ntqqapi/types";
+import {addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getStrangerByUin,} from "../../common/data";
+import {OB11MessageData, OB11MessageDataType, OB11PostSendMsg} from '../types';
+import {NTQQApi, Peer} from "../../ntqqapi/ntcall";
+import {SendMsgElementConstructor} from "../../ntqqapi/constructor";
+import {uri2local} from "../utils";
+import {v4 as uuid4} from 'uuid';
 import BaseAction from "./BaseAction";
-import { ActionName } from "./types";
+import {ActionName} from "./types";
 import * as fs from "fs";

 export interface ReturnDataType {
--- a/src/onebot11/actions/SendPrivateMsg.ts
+++ b/src/onebot11/actions/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
--- a/src/onebot11/actions/index.ts
+++ b/src/onebot11/actions/index.ts
@ -9,6 +9,7 @@ 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";
@ -25,4 +26,15 @@ export const actionHandlers = [
    new CanSendRecord(),
    new CanSendImage(),
    new GetStatus()
-]
+]
+
+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();
--- a/src/onebot11/actions/types.ts
+++ b/src/onebot11/actions/types.ts
@ -1,5 +1,3 @@
-import GetVersionInfo from "./GetVersionInfo";
-
 export type BaseCheckResult = ValidCheckResult | InvalidCheckResult

 export interface ValidCheckResult {
@ -13,7 +11,7 @@ export interface InvalidCheckResult {
    [k: string | number]: any
 }

-export enum ActionName{
+export enum ActionName {
    GetLoginInfo = "get_login_info",
    GetFriendList = "get_friend_list",
    GetGroupInfo = "get_group_info",
--- a/src/onebot11/actions/utils.ts
+++ b/src/onebot11/actions/utils.ts
@ -1,19 +1,36 @@
-import { OB11Return } from '../types';
+import {OB11Return, OB11WebsocketReturn} from '../types';

 export class OB11Response {
-    static res<T>(data: T, status: number = 0, message: string = "", echo=""): OB11Return<T> {
+    static res<T>(data: T, status: string, retcode: number, message: string = ""): OB11Return<T> {
        return {
            status: status,
-            retcode: status,
+            retcode: retcode,
            data: data,
-            message: message,
-            echo,
+            message: message
        }
    }
    static ok<T>(data: T) {
-        return OB11Response.res<T>(data)
+        return OB11Response.res<T>(data, "ok", 0)
    }
-    static error(err: string, status=-1) {
-        return OB11Response.res(null, status, err)
+    static error(err: string, retcode: number) {
+        return OB11Response.res(null, "failed", retcode, err)
+    }
+}
+
+export class OB11WebsocketResponse {
+    static res<T>(data: T, status: string, retcode: number, echo: string, message: string = ""): OB11WebsocketReturn<T> {
+        return {
+            status: status,
+            retcode: retcode,
+            data: data,
+            echo: echo,
+            message: message
+        }
+    }
+    static ok<T>(data: T, echo: string = "") {
+        return OB11WebsocketResponse.res<T>(data, "ok", 0, echo)
+    }
+    static error(err: string, retcode: number, echo: string = "") {
+        return OB11WebsocketResponse.res(null, "failed", retcode, echo, err)
    }
 }
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@ -1,19 +1,11 @@
-import {
-    OB11MessageDataType,
-    OB11GroupMemberRole,
-    OB11Message,
-    OB11Group,
-    OB11GroupMember,
-    OB11User
-} from "./types";
-import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
-import { getFriend, getGroupMember, getHistoryMsgBySeq, heartInterval, msgHistory, selfInfo } from '../common/data';
-import { file2base64, getConfigUtil, log } from "../common/utils";
-import { NTQQApi } from "../ntqqapi/ntcall";
-import {OB11EventConstructor} from "./events/constructor";
+import {OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11Message, OB11MessageDataType, 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";


-export class OB11Constructor extends OB11EventConstructor{
+export class OB11Constructor {
    static async message(msg: RawMessage): Promise<OB11Message> {

        const {enableBase64} = getConfigUtil().getConfig()
--- a/src/onebot11/event/OB11BaseEvent.ts
+++ b/src/onebot11/event/OB11BaseEvent.ts
@ -0,0 +1,15 @@
+import {selfInfo} from "../../common/data";
+
+export enum EventType {
+    META = "meta_event",
+    REQUEST = "request",
+    NOTICE = "notice",
+    MESSAGE = "message"
+}
+
+
+export abstract class OB11BaseEvent {
+    time = new Date().getTime();
+    self_id = selfInfo.uin;
+    post_type: EventType;
+}
--- a/src/onebot11/event/manager.ts
+++ b/src/onebot11/event/manager.ts
@ -0,0 +1,24 @@
+import * as websocket from "ws";
+import {PostMsgType, wsReply} from "../server";
+import {ReconnectingWebsocket} from "../ReconnectingWebsocket";
+
+const websocketList = [];
+
+export function registerEventSender(ws: websocket.WebSocket | ReconnectingWebsocket) {
+    websocketList.push(ws);
+}
+
+export function unregisterEventSender(ws: websocket.WebSocket | ReconnectingWebsocket) {
+    let index = websocketList.indexOf(ws);
+    if (index !== -1) {
+        websocketList.splice(index, 1);
+    }
+}
+
+export function callEvent(event: PostMsgType) {
+    new Promise(() => {
+        for (const ws of websocketList) {
+            wsReply(ws, event);
+        }
+    }).then()
+}
--- a/src/onebot11/event/message/OB11BaseMessageEvent.ts
+++ b/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;
+}
--- a/src/onebot11/event/meta/OB11BaseMetaEvent.ts
+++ b/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;
+}
--- a/src/onebot11/event/meta/OB11HeartbeatEvent.ts
+++ b/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
+        }
+    }
+}
--- a/src/onebot11/event/meta/OB11LifeCycleEvent.ts
+++ b/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;
+    }
+}
--- a/src/onebot11/event/notice/OB11BaseNoticeEvent.ts
+++ b/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;
+}
--- a/src/onebot11/event/notice/OB11FriendRecallNoticeEvent.ts
+++ b/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;
+    }
+}
--- a/src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts
+++ b/src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts
@ -0,0 +1,6 @@
+import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent";
+
+export class OB11GroupAdminNoticeEvent extends OB11BaseNoticeEvent {
+    notice_type = "group_admin"
+    sub_type: string  // "set" | "unset"
+}
--- a/src/onebot11/event/notice/OB11GroupDecreaseEvent.ts
+++ b/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";  // 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;
+    }
+}
--- a/src/onebot11/event/notice/OB11GroupIncreaseEvent.ts
+++ b/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;
+    }
+}
--- a/src/onebot11/event/notice/OB11GroupNoticeEvent.ts
+++ b/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;
+}
--- a/src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts
+++ b/src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts
@ -0,0 +1,16 @@
+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;
+    }
+}
--- a/src/onebot11/events/constructor.ts
+++ b/src/onebot11/events/constructor.ts
@ -1,58 +0,0 @@
-import {
-    OB11EventBase,
-    OB11EventPostType, OB11FriendRecallNoticeEvent,
-    OB11GroupRecallNoticeEvent,
-    OB11HeartEvent,
-    OB11LifeCycleEvent, OB11MetaEvent, OB11NoticeEvent
-} from "./types";
-import { heartInterval, selfInfo } from "../../common/data";
-
-function eventBase(post_type: OB11EventPostType): OB11EventBase {
-    return {
-        time: Math.floor(Date.now() / 1000),
-        self_id: parseInt(selfInfo.uin),
-        post_type
-    }
-}
-
-export class OB11EventConstructor {
-    static lifeCycleEvent(): OB11LifeCycleEvent {
-        return {
-            ...eventBase(OB11EventPostType.META) as OB11MetaEvent,
-            meta_event_type: "lifecycle",
-            sub_type: "connect"
-        }
-    }
-
-    static heartEvent(): OB11HeartEvent {
-        return {
-            ...eventBase(OB11EventPostType.META) as OB11MetaEvent,
-            meta_event_type: "heartbeat",
-            status: {
-                online: true,
-                good: true
-            },
-            interval: heartInterval
-        }
-    }
-
-    static groupRecallEvent(group_id: string, user_id: string, operator_id: string, message_id: number): OB11GroupRecallNoticeEvent {
-        return {
-            ...eventBase(OB11EventPostType.NOTICE) as OB11NoticeEvent,
-            notice_type: "group_recall",
-            group_id: parseInt(group_id),
-            user_id: parseInt(user_id),
-            operator_id: parseInt(operator_id),
-            message_id
-        }
-    }
-
-    static friendRecallEvent(user_id: string, message_id: number): OB11FriendRecallNoticeEvent {
-        return {
-            ...eventBase(OB11EventPostType.NOTICE) as OB11NoticeEvent,
-            notice_type: "friend_recall",
-            user_id: parseInt(user_id),
-            message_id
-        }
-    }
-}
--- a/src/onebot11/events/types.ts
+++ b/src/onebot11/events/types.ts
@ -1,67 +0,0 @@
-import { OB11Status } from "../types";
-
-export enum OB11EventPostType{
-    META = "meta_event",
-    NOTICE = "notice"
-}
-
-export interface OB11EventBase {
-    time: number
-    self_id: number
-    post_type: OB11EventPostType
-}
-
-export interface OB11MetaEvent extends OB11EventBase{
-    post_type: OB11EventPostType.META
-    meta_event_type: "lifecycle" | "heartbeat"
-}
-
-export interface OB11NoticeEvent extends OB11EventBase{
-    post_type: OB11EventPostType.NOTICE
-    notice_type: "group_admin" | "group_decrease" | "group_increase" | "group_ban" | "friend_add" | "group_recall" | "friend_recall"
-}
-
-interface OB11GroupNoticeBase extends OB11NoticeEvent{
-    group_id: number
-    user_id: number
-}
-
-export interface OB11GroupAdminNoticeEvent extends OB11GroupNoticeBase{
-    notice_type: "group_admin"
-    sub_type: "set" | "unset"
-}
-
-export interface OB11GroupMemberDecNoticeEvent extends OB11GroupNoticeBase{
-    notice_type: "group_decrease"
-    sub_type: "leave" | "kick" | "kick_me"
-    operator_id: number
-}
-
-export interface OB11GroupMemberIncNoticeEvent extends OB11GroupNoticeBase{
-    notice_type: "group_increase"
-    sub_type: "approve" | "invite"
-    operator_id: number
-}
-
-export interface OB11GroupRecallNoticeEvent extends OB11GroupNoticeBase{
-    notice_type: "group_recall"
-    operator_id: number
-    message_id: number
-}
-
-export interface OB11FriendRecallNoticeEvent extends OB11NoticeEvent{
-    notice_type: "friend_recall"
-    user_id: number
-    message_id: number
-}
-
-export interface OB11LifeCycleEvent extends OB11MetaEvent {
-    meta_event_type: "lifecycle"
-    sub_type: "enable" | "disable" | "connect"
-}
-
-export interface OB11HeartEvent extends OB11MetaEvent {
-    meta_event_type: "heartbeat"
-    status: OB11Status
-    interval: number
-}
--- a/src/onebot11/server.ts
+++ b/src/onebot11/server.ts
@ -1,27 +1,72 @@
 import * as http from "http";
 import * as websocket from "ws";
 import urlParse from "url";
-import express from "express";
-import { Request } from 'express';
-import { Response } from 'express';
-import { getConfigUtil, log } from "../common/utils";
-import { heartInterval, selfInfo } from "../common/data";
-import { OB11Message, OB11Return, OB11MessageData } from './types';
-import { actionHandlers } from "./actions";
-import { OB11Response } from "./actions/utils";
-import { ActionName } from "./actions/types";
+import express, {Request, Response} from "express";
+import {getConfigUtil, log} from "../common/utils";
+import {heartInterval, selfInfo} from "../common/data";
+import {OB11Message, OB11MessageData, OB11Return} from './types';
+import {actionHandlers, actionMap} from "./actions";
+import {OB11Response, OB11WebsocketResponse} from "./actions/utils";
+import {callEvent, registerEventSender, unregisterEventSender} from "./event/manager";
+import {ReconnectingWebsocket} from "./ReconnectingWebsocket";
+import {ActionName} from "./actions/types";
+import {OB11BaseMetaEvent} from "./event/meta/OB11BaseMetaEvent";
+import {OB11BaseNoticeEvent} from "./event/notice/OB11BaseNoticeEvent";
 import BaseAction from "./actions/BaseAction";
-import { OB11Constructor } from "./constructor";
-import { OB11EventBase, OB11LifeCycleEvent, OB11MetaEvent, OB11NoticeEvent } from "./events/types";
+import {LifeCycleSubType, OB11LifeCycleEvent} from "./event/meta/OB11LifeCycleEvent";
+import {OB11HeartbeatEvent} from "./event/meta/OB11HeartbeatEvent";

-let wsServer: websocket.Server = null;
-let accessToken = ""
+let accessToken = "";
+let heartbeatRunning = false;
+
+// @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==

 const JSONbig = require('json-bigint')({storeAsString: true});
+
 const expressAPP = express();
-let httpServer: http.Server = null;
 expressAPP.use(express.urlencoded({extended: true, limit: "500mb"}));

+let httpServer: http.Server = null;
+
+let websocketServer = null;
+
 expressAPP.use((req, res, next) => {
    let data = '';
    req.on('data', chunk => {
@ -76,121 +121,178 @@ export function startHTTPServer(port: number) {
        res.send('LLOneBot已启动');
    })

-    httpServer = expressAPP.listen(port, "0.0.0.0", () => {
-        console.log(`LLOneBot http server started 0.0.0.0:${port}`);
-    });
+    if (getConfigUtil().getConfig().enableHttp) {
+        httpServer = expressAPP.listen(port, "0.0.0.0", () => {
+            console.log(`llonebot http service started 0.0.0.0:${port}`);
+        });
+    }
 }

-let wsEventClients: websocket.WebSocket[] = [];
-type RouterHandler = (payload: any) => Promise<OB11Return<any>>
-let routers: Record<string, RouterHandler> = {};
+export function initWebsocket(port: number) {
+    if (!heartbeatRunning) {
+        setInterval(() => {
+            callEvent(new OB11HeartbeatEvent(true, true, heartInterval));
+        }, heartInterval);  // 心跳包

-function wsReply(wsClient: websocket.WebSocket, data: OB11Return<any> | PostMsgType) {
+        heartbeatRunning = true;
+    }
+
+    if (getConfigUtil().getConfig().enableWs) {
+        if (websocketServer) {
+            websocketServer.close((err) => {
+                log("ws server close failed!", err)
+            })
+        }
+
+        websocketServer = new websocket.Server({port});
+        console.log(`llonebot websocket service started 0.0.0.0:${port}`);
+
+        websocketServer.on("connection", (ws, req) => {
+            const url = req.url.split("?").shift();
+            log("receive ws connect", url)
+            let token: string = ""
+            const authHeader = req.headers['authorization'];
+            if (authHeader) {
+                token = authHeader.split("Bearer ").pop()
+                log("receive ws header token", token);
+            } else {
+                const parsedUrl = urlParse.parse(req.url, true);
+                const urlToken = parsedUrl.query.access_token;
+                if (urlToken) {
+                    if (Array.isArray(urlToken)) {
+                        token = urlToken[0]
+                    } else {
+                        token = urlToken
+                    }
+                    log("receive ws url token", token);
+                }
+            }
+            if (accessToken) {
+                if (token != accessToken) {
+                    ws.send(JSON.stringify(OB11WebsocketResponse.res(null, "failed", 1403, "token验证失败")))
+                    return ws.close()
+                }
+            }
+
+            if (url == "/api" || url == "/api/" || url == "/") {
+                ws.on("message", async (msg) => {
+                    let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}}
+                    let echo = ""
+                    log("收到正向Websocket消息", msg.toString())
+                    try {
+                        receiveData = JSON.parse(msg.toString())
+                        echo = receiveData.echo
+                    } catch (e) {
+                        return wsReply(ws, OB11WebsocketResponse.error("json解析失败，请检查数据格式", 1400, echo))
+                    }
+                    const action: BaseAction<any, any> = actionMap.get(receiveData.action);
+                    if (!action) {
+                        return wsReply(ws, OB11WebsocketResponse.error("不支持的api " + receiveData.action, 1404, echo))
+                    }
+                    try {
+                        let handleResult = await action.websocketHandle(receiveData.params, echo);
+                        wsReply(ws, handleResult)
+                    } catch (e) {
+                        wsReply(ws, OB11WebsocketResponse.error(`api处理出错:${e}`, 1200, echo))
+                    }
+                })
+            }
+            if (url == "/event" || url == "/event/" || url == "/") {
+                registerEventSender(ws);
+
+                log("event上报ws客户端已连接")
+
+                try {
+                    wsReply(ws, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT))
+                } catch (e){
+                    log("发送生命周期失败", e)
+                }
+
+                ws.on("close", () => {
+                    log("event上报ws客户端已断开")
+                    unregisterEventSender(ws);
+                })
+            }
+        })
+    }
+
+    initReverseWebsocket();
+}
+function initReverseWebsocket() {
+    const config = getConfigUtil().getConfig();
+    if (config.enableWsReverse) {
+        console.log("Prepare to connect all reverse websockets...");
+        for (const url of config.wsHosts) {
+            new Promise(() => {
+                try {
+                    let wsClient = new ReconnectingWebsocket(url);
+                    registerEventSender(wsClient);
+
+                    wsClient.onopen = function () {
+                        wsReply(wsClient, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT));
+                    }
+
+                    wsClient.onclose = function () {
+                        unregisterEventSender(wsClient);
+                    }
+
+                    wsClient.onmessage = async function (msg) {
+                        let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}}
+                        let echo = ""
+                        log("收到正向Websocket消息", msg.toString())
+                        try {
+                            receiveData = JSON.parse(msg.toString())
+                            echo = receiveData.echo
+                        } catch (e) {
+                            return wsReply(wsClient, OB11WebsocketResponse.error("json解析失败，请检查数据格式", 1400, echo))
+                        }
+                        const action: BaseAction<any, any> = actionMap.get(receiveData.action);
+                        if (!action) {
+                            return wsReply(wsClient, OB11WebsocketResponse.error("不支持的api " + receiveData.action, 1404, echo))
+                        }
+                        try {
+                            let handleResult = await action.websocketHandle(receiveData.params, echo);
+                            wsReply(wsClient, handleResult)
+                        } catch (e) {
+                            wsReply(wsClient, OB11WebsocketResponse.error(`api处理出错:${e}`, 1200, echo))
+                        }
+                    }
+                }
+                catch (e) {
+                    log(e.stack);
+                }
+            }).then();
+        }
+    }
+}
+
+export function wsReply(wsClient: websocket.WebSocket | ReconnectingWebsocket, data: OB11WebsocketResponse | PostMsgType) {
    try {
-        wsClient.send(JSON.stringify(data))
+        let packet = Object.assign({
+            echo: ""
+        }, data);
+        if (!packet.echo) {
+            packet.echo = "";
+        }
+
+        wsClient.send(JSON.stringify(packet))
        log("ws 消息上报", data)
    } catch (e) {
        log("websocket 回复失败", e)
    }
 }

-export function startWSServer(port: number) {
-    if (wsServer) {
-        wsServer.close((err) => {
-            log("ws server close failed!", err)
-        })
-    }
-    wsServer = new websocket.Server({port})
-    wsServer.on("connection", (ws, req) => {
-        const url = req.url.split("?").shift();
-        log("receive ws connect", url)
-        let token: string = ""
-        const authHeader = req.headers['authorization'];
-        if (authHeader) {
-            token = authHeader.split("Bearer ").pop()
-            log("receive ws header token", token);
-        } else {
-            const parsedUrl = urlParse.parse(req.url, true);
-            const urlToken = parsedUrl.query.access_token;
-            if (urlToken) {
-                if (Array.isArray(urlToken)) {
-                    token = urlToken[0]
-                } else {
-                    token = urlToken
-                }
-                log("receive ws url token", token);
-            }
-
-        }
-        if (accessToken) {
-            if (token != accessToken) {
-                ws.send(JSON.stringify(OB11Response.res(null, 1403, "token验证失败")))
-                return ws.close()
-            }
-        }
-        if (url == "/api" || url == "/api/" || url == "/") {
-            ws.on("message", async (msg) => {
-
-                let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}}
-                let echo = ""
-                log("收到ws消息", msg.toString())
-                try {
-                    receiveData = JSON.parse(msg.toString())
-                    echo = receiveData.echo
-                } catch (e) {
-                    return wsReply(ws, {...OB11Response.error("json解析失败，请检查数据格式"), echo})
-                }
-                const handle: RouterHandler | undefined = routers[receiveData.action]
-                if (!handle) {
-                    let handleResult = OB11Response.error("不支持的api " + receiveData.action, 1404)
-                    handleResult.echo = echo
-                    return wsReply(ws, handleResult)
-                }
-                try {
-                    let handleResult = await handle(receiveData.params)
-                    if (echo){
-                        handleResult.echo = echo
-                    }
-                    wsReply(ws, handleResult)
-                } catch (e) {
-                    wsReply(ws, OB11Response.error(`api处理出错:${e}`))
-                }
-            })
-        }
-        if (url == "/event" || url == "/event/" || url == "/") {
-            log("event上报ws客户端已连接")
-            wsEventClients.push(ws)
-            try {
-                wsReply(ws, OB11Constructor.lifeCycleEvent())
-            }catch (e){
-                log("发送生命周期失败", e)
-            }
-            // 心跳
-            let wsHeart = setInterval(()=>{
-                if (wsEventClients.find(c => c == ws)){
-                    wsReply(ws, OB11Constructor.heartEvent())
-                }
-            }, heartInterval)
-            ws.on("close", () => {
-                clearInterval(wsHeart);
-                log("event上报ws客户端已断开")
-                wsEventClients = wsEventClients.filter((c) => c != ws)
-            })
-        }
-    })
-}
-
-type PostMsgType = OB11Message | OB11MetaEvent | OB11NoticeEvent
+export type PostMsgType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent

 export function postMsg(msg: PostMsgType) {
-    const {reportSelfMessage} = getConfigUtil().getConfig()
+    const config = getConfigUtil().getConfig();
    // 判断msg是否是event
-    if (!reportSelfMessage) {
+    if (!config.reportSelfMessage) {
        if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
            return
        }
    }
-    for (const host of getConfigUtil().getConfig().hosts) {
+    for (const host of config.httpHosts) {
        fetch(host, {
            method: "POST",
            headers: {
@ -204,12 +306,9 @@ export function postMsg(msg: PostMsgType) {
            log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg));
        });
    }
-    for (const wsClient of wsEventClients) {
-        log("新消息事件ws上报", msg)
-        new Promise((resolve, reject) => {
-            wsReply(wsClient, msg);
-        }).then();
-    }
+
+    log("新消息事件ws上报", msg);
+    callEvent(msg);
 }


@ -226,7 +325,7 @@ function registerRouter(action: string, handle: (payload: any) => Promise<any>)
            res.send(result)
        } catch (e) {
            log(e.stack);
-            res.send(OB11Response.error(e.stack.toString()))
+            res.send(OB11Response.error(e.stack.toString(), 200))
        }
    }

@ -236,7 +335,6 @@ function registerRouter(action: string, handle: (payload: any) => Promise<any>)
    expressAPP.get(url, expressAuthorize, (req: Request, res: Response) => {
        _handle(res, req.query as any || {}).then()
    });
-    routers[action] = handle
 }

 for (const action of actionHandlers) {
--- a/src/onebot11/types.ts
+++ b/src/onebot11/types.ts
@ -1,4 +1,4 @@
-import { AtType, RawMessage } from "../ntqqapi/types";
+import {AtType, RawMessage} from "../ntqqapi/types";

 export interface OB11User {
    user_id: number;
@ -85,14 +85,14 @@ export type OB11ApiName =
    | "get_msg"

 export interface OB11Return<DataType> {
-    status: number
+    status: string
    retcode: number
    data: DataType
    message: string,
-    echo?: string
 }

-export interface OB11SendMsgReturn extends OB11Return<{ message_id: string }> {
+export interface OB11WebsocketReturn<DataType> extends OB11Return<DataType>{
+    echo: string
 }

 export enum OB11MessageDataType {
--- a/src/onebot11/utils.ts
+++ b/src/onebot11/utils.ts
@ -1,7 +1,7 @@
-import { CONFIG_DIR, isGIF } from "../common/utils";
+import {CONFIG_DIR, isGIF} from "../common/utils";
 import * as path from 'path';
-import { NTQQApi } from '../ntqqapi/ntcall';
-import { OB11MessageData } from "./types";
+import {OB11MessageData} from "./types";
+
 const fs = require("fs").promises;

 export async function uri2local(fileName: string, uri: string){
--- a/src/preload.ts
+++ b/src/preload.ts
@ -1,11 +1,7 @@
 // Electron 主进程 与 渲染进程 交互的桥梁

 import {Config} from "./common/types";
-import {
-    CHANNEL_GET_CONFIG,
-    CHANNEL_LOG,
-    CHANNEL_SET_CONFIG,
-} from "./common/channels";
+import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "./common/channels";


 const {contextBridge} = require("electron");
--- a/src/renderer.ts
+++ b/src/renderer.ts
@ -6,11 +6,11 @@ async function onSettingWindowCreated(view: Element) {
    window.llonebot.log("setting window created");
    let config = await window.llonebot.getConfig()

-    function creatHostEleStr(host: string) {
+    function createHttpHostEleStr(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}" 
+                <input class="httpHost input-text" type="text" value="${host}" 
                style="width:60%;padding: 5px"
                placeholder="如果localhost上报失败试试局域网ip"/>
            </setting-item>
@ -19,10 +19,29 @@ async function onSettingWindowCreated(view: Element) {
        return eleStr
    }

-    let hostsEleStr = ""
-    for (const host of config.hosts) {
-        hostsEleStr += creatHostEleStr(host);
+    function createWsHostEleStr(host: string) {
+        let eleStr = `
+            <setting-item data-direction="row" class="hostItem vertical-list-item">
+                <h2>事件上报地址(反向websocket)</h2>
+                <input class="wsHost input-text" type="text" value="${host}" 
+                style="width:60%;padding: 5px"
+                placeholder="如果localhost上报失败试试局域网ip"/>
+            </setting-item>
+
+            `
+        return eleStr
    }
+
+    let httpHostsEleStr = ""
+    for (const host of config.httpHosts) {
+        httpHostsEleStr += createHttpHostEleStr(host);
+    }
+
+    let wsHostsEleStr = ""
+    for (const host of config.wsHosts) {
+        wsHostsEleStr += createWsHostEleStr(host);
+    }
+
    let html = `
    <div class="config_view llonebot">
        <setting-section>
@ -30,10 +49,17 @@ async function onSettingWindowCreated(view: Element) {
                <setting-list class="wrap">
                    <setting-item class="vertical-list-item" data-direction="row">
                        <setting-text>HTTP监听端口</setting-text>
-                        <input id="port" type="number" value="${config.port}"/>
+                        <input id="httpPort" type="number" value="${config.httpPort}"/>
                    </setting-item>
+                    <div>
+                        <button id="addHttpHost" class="q-button">添加HTTP POST上报地址</button>
+                    </div>
+                    <div id="httpHostItems">
+                        ${httpHostsEleStr}
+                    </div>
+                    
                    <setting-item class="vertical-list-item" data-direction="row">
-                        <setting-text>正向ws监听端口</setting-text>
+                        <setting-text>正向Websocket监听端口</setting-text>
                        <input id="wsPort" type="number" value="${config.wsPort}"/>
                    </setting-item>
                    <setting-item class="vertical-list-item" data-direction="row">
@ -41,15 +67,43 @@ async function onSettingWindowCreated(view: Element) {
                        <input id="token" type="text" placeholder="可为空" value="${config.token}"/>
                    </setting-item>
                    <div>
-                        <button id="addHost" class="q-button">添加HTTP上报地址</button>
+                        <button id="addWsHost" class="q-button">添加反向Websocket上报地址</button>
                    </div>
-                    <div id="hostItems">
-                        ${hostsEleStr}
+                    <div id="wsHostItems">
+                        ${wsHostsEleStr}
                    </div>
                    <button id="save" class="q-button">保存</button>
                </setting-list>
            </setting-panel>
            <setting-panel>
+                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                    <div>
+                        <div>启用HTTP支持</div>
+                        <div class="tips">修改后须重启QQ生效</div>
+                    </div>
+                    <setting-switch id="http" ${config.enableHttp ? "is-active" : ""}></setting-switch>
+                </setting-item>
+                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                    <div>
+                        <div>启用HTTP POST支持</div>
+                        <div class="tips">修改后须重启QQ生效</div>
+                    </div>
+                    <setting-switch id="httpPost" ${config.enableHttpPost ? "is-active" : ""}></setting-switch>
+                </setting-item>
+                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                    <div>
+                        <div>启用正向Websocket支持</div>
+                        <div class="tips">修改后须重启QQ生效</div>
+                    </div>
+                    <setting-switch id="websocket" ${config.enableWs ? "is-active" : ""}></setting-switch>
+                </setting-item>
+                <setting-item data-direction="row" class="hostItem vertical-list-item">
+                    <div>
+                        <div>启用反向Websocket支持</div>
+                        <div class="tips">修改后须重启QQ生效</div>
+                    </div>
+                    <setting-switch id="websocketReverse" ${config.enableWsReverse ? "is-active" : ""}></setting-switch>
+                </setting-item>
                <setting-item data-direction="row" class="hostItem vertical-list-item">
                    <div>
                        <div>上报文件进行base64编码</div>
@ -100,15 +154,25 @@ async function onSettingWindowCreated(view: Element) {
    const doc = parser.parseFromString(html, "text/html");


-    function addHostEle(initValue: string = "") {
-        let addressDoc = parser.parseFromString(creatHostEleStr(initValue), "text/html");
-        let addressEle = addressDoc.querySelector("setting-item")
-        let hostItemsEle = document.getElementById("hostItems");
+    function addHostEle(type: string, initValue: string = "") {
+        let addressEle, hostItemsEle;
+        if (type === "ws") {
+            let addressDoc = parser.parseFromString(createWsHostEleStr(initValue), "text/html");
+            addressEle = addressDoc.querySelector("setting-item")
+            hostItemsEle = document.getElementById("wsHostItems");
+        }
+        else {
+            let addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), "text/html");
+            addressEle = addressDoc.querySelector("setting-item")
+            hostItemsEle = document.getElementById("httpHostItems");
+        }
+
        hostItemsEle.appendChild(addressEle);
    }


-    doc.getElementById("addHost").addEventListener("click", () => addHostEle())
+    doc.getElementById("addHttpHost").addEventListener("click", () => addHostEle("http"))
+    doc.getElementById("addWsHost").addEventListener("click", () => addHostEle("ws"))

    function switchClick(eleId: string, configKey: string) {
        doc.getElementById(eleId)?.addEventListener("click", (e) => {
@ -124,6 +188,10 @@ async function onSettingWindowCreated(view: Element) {
        })
    }

+    switchClick("http", "enableHttp");
+    switchClick("httpPost", "enableHttpPost");
+    switchClick("websocket", "enableWs");
+    switchClick("websocketReverse", "enableWsReverse");
    switchClick("debug", "debug");
    switchClick("switchBase64", "enableBase64");
    switchClick("reportSelfMessage", "reportSelfMessage");
@ -131,26 +199,37 @@ async function onSettingWindowCreated(view: Element) {

    doc.getElementById("save")?.addEventListener("click",
        () => {
-            const portEle: HTMLInputElement = document.getElementById("port") as HTMLInputElement
-            const wsPortEle: HTMLInputElement = document.getElementById("wsPort") as HTMLInputElement
-            const hostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName("host") as HTMLCollectionOf<HTMLInputElement>;
+            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 port = doc.querySelector("input[type=number]")?.value
-            // const host = doc.querySelector("input[type=text]")?.value
-            // 获取端口和host
-            const port = portEle.value
-            const wsPort = wsPortEle.value
-            const token = tokenEle.value

-            let hosts: string[] = [];
-            for (const hostEle of hostEles) {
+            // 获取端口和host
+            const httpPort = httpPortEle.value
+            let httpHosts: string[] = [];
+
+            for (const hostEle of httpHostEles) {
                if (hostEle.value) {
-                    hosts.push(hostEle.value.trim());
+                    httpHosts.push(hostEle.value);
                }
            }
-            config.port = parseInt(port);
+
+            const wsPort = wsPortEle.value
+            const token = tokenEle.value
+            let wsHosts: string[] = [];
+
+            for (const hostEle of wsHostEles) {
+                if (hostEle.value) {
+                    wsHosts.push(hostEle.value);
+                }
+            }
+
+
+            config.httpPort = parseInt(httpPort);
+            config.httpHosts = httpHosts;
            config.wsPort = parseInt(wsPort);
-            config.hosts = hosts;
+            config.wsHosts = wsHosts;
            config.token = token.trim();
            window.llonebot.setConfig(config);
            alert("保存成功");
@ -161,7 +240,6 @@ async function onSettingWindowCreated(view: Element) {
        view.appendChild(node);
    });

-
 }