Merge branch 'dev'

# Conflicts:
#	manifest.json
#	src/common/data.ts

README.md

@@ -1,9 +1,11 @@
 # LLOneBot API
 
-将NTQQLiteLoaderAPI封装成OneBot11标准的API
+LiteLoaderQQNT的OneBot11协议插件
 
 *注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
 
+*V3之后不再需要LLAPI*
+
 ## 安装方法
 
 1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
@@ -16,7 +18,11 @@
 
 ## 支持的API
 
-目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
+目前支持的协议
+- [x] http调用api
+- [x] http事件上报
+- [x] 正向websocket
+- [ ] 反向websocket
 
 主要功能:
 - [x] 发送好友消息
@@ -46,10 +52,14 @@
 - [x] send_private_msg
 - [x] delete_msg
 - [x] get_group_list
+- [x] get_group_info
 - [x] get_group_member_list
 - [x] get_group_member_info
 - [x] get_friend_list
 - [x] get_msg
+- [x] get_version_info
+- [x] can_send_image
+- [x] can_send_record
 
 ## 示例
 
@@ -67,7 +77,7 @@
 <details>
     <summary>调用接口报404</summary>
 <br/>
-    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口，并且所有接口都只支持POST方法，调用GET方法会报404
+    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口
 </details>
 <br/>
 
@@ -94,11 +104,10 @@
 
 
 ## TODO
-
+- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
+- [x] 支持正向websocket
 - [ ] 转发消息记录 
 - [ ] 好友点赞api
-- [ ] 支持websocket，等个有缘人提PR实现
-- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 
 ## onebot11文档
 <https://11.onebot.dev/>

manifest.json

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

package-lock.json

@@ -18,11 +18,13 @@
         "@babel/preset-env": "^7.23.2",
         "@types/express": "^4.17.20",
         "@types/uuid": "^9.0.8",
+        "@types/ws": "^8.5.10",
         "babel-loader": "^9.1.3",
         "ts-loader": "^9.5.0",
         "typescript": "^5.2.2",
         "webpack": "^5.89.0",
-        "webpack-cli": "^5.1.4"
+        "webpack-cli": "^5.1.4",
+        "ws": "^8.16.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -2199,6 +2201,15 @@
       "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
       "dev": true
     },
+    "node_modules/@types/ws": {
+      "version": "8.5.10",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/@types/ws/-/ws-8.5.10.tgz",
+      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -4691,6 +4702,27 @@
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
+    "node_modules/ws": {
+      "version": "8.16.0",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",

package.json

@@ -26,10 +26,12 @@
     "@babel/preset-env": "^7.23.2",
     "@types/express": "^4.17.20",
     "@types/uuid": "^9.0.8",
+    "@types/ws": "^8.5.10",
     "babel-loader": "^9.1.3",
     "ts-loader": "^9.5.0",
     "typescript": "^5.2.2",
     "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4"
+    "webpack-cli": "^5.1.4",
+    "ws": "^8.16.0"
   }
 }

src/common/config.ts

@@ -1,28 +1,50 @@
-import {Config} from "./types";
+import { Config } from "./types";
 
 const fs = require("fs")
 
-export class ConfigUtil{
+export class ConfigUtil {
     configPath: string;
 
     constructor(configPath: string) {
         this.configPath = configPath;
     }
 
-    getConfig(): Config{
+    getConfig(): Config {
+        let defaultConfig: Config = {
+            port: 3000,
+            wsPort: 3001,
+            hosts: [],
+            token: "",
+            enableBase64: false,
+            debug: false,
+            log: false,
+            reportSelfMessage: false
+        }
         if (!fs.existsSync(this.configPath)) {
-            return {port:3000, hosts: ["http://192.168.1.2:5000/"]}
+            return defaultConfig
         } else {
             const data = fs.readFileSync(this.configPath, "utf-8");
-            let jsonData =JSON.parse(data);
+            let jsonData: Config = defaultConfig;
-            if (!jsonData.hosts){
+            try {
+                jsonData = JSON.parse(data)
+            }
+            catch (e){
+
+            }
+            if (!jsonData.hosts) {
                 jsonData.hosts = []
             }
+            if (!jsonData.wsPort){
+                jsonData.wsPort = 3001
+            }
+            if (!jsonData.token){
+                jsonData.token = ""
+            }
             return jsonData;
         }
     }
 
-    setConfig(config: Config){
+    setConfig(config: Config) {
         fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
     }
 }

src/common/data.ts

@@ -1,10 +1,31 @@
 import { NTQQApi } from '../ntqqapi/ntcall';
 import { Friend, Group, GroupMember, RawMessage, SelfInfo } from "../ntqqapi/types";
+import { log } from "./utils";
 
 export let groups: Group[] = []
 export let friends: Friend[] = []
 export let msgHistory: Record<string, RawMessage> = {}  // msgId: RawMessage
 
+let globalMsgId = Date.now()
+
+export function addHistoryMsg(msg: RawMessage): boolean{
+    let existMsg = msgHistory[msg.msgId]
+    if (existMsg){
+        Object.assign(existMsg, msg)
+        msg.msgShortId = existMsg.msgShortId;
+        return false
+    }
+    msg.msgShortId = ++globalMsgId
+    msgHistory[msg.msgId] = msg
+    return true
+}
+
+export function getHistoryMsgByShortId(shortId: number | string){
+    // log("getHistoryMsgByShortId", shortId, Object.values(msgHistory).map(m=>m.msgShortId))
+    return Object.values(msgHistory).find(msg => msg.msgShortId.toString() == shortId.toString())
+}
+
+
 export async function getFriend(qq: string): Promise<Friend | undefined> {
     let friend = friends.find(friend => friend.uin === qq)
     // if (!friend){
@@ -66,3 +87,6 @@ export function getStrangerByUin(uin: string) {
         }
     }
 }
+
+export const version = "v3.3.0"
+export const heartInterval = 15000 // 毫秒

src/common/types.ts

@@ -1,6 +1,8 @@
 export interface Config {
     port: number
+    wsPort: number
     hosts: string[]
+    token?: string
     enableBase64?: boolean
     debug?: boolean
     reportSelfMessage?: boolean

src/common/utils.ts

@@ -33,7 +33,7 @@ export function log(...msg: any[]) {
         }
         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) => {

src/main/main.ts

@@ -1,23 +1,16 @@
 // 运行在 Electron 主进程 下的插件入口
 
-import * as path from "path";
 import { BrowserWindow, ipcMain } from 'electron';
-import * as util from 'util';
 
 import { Config } from "../common/types";
-import {
+import { CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG, } from "../common/channels";
-    CHANNEL_GET_CONFIG,
+import { postMsg, setToken, startHTTPServer, startWSServer } from "../onebot11/server";
-    CHANNEL_LOG,
-    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 { 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 { Group, RawMessage, SelfInfo } from "../ntqqapi/types";
+import { ChatType, RawMessage } from "../ntqqapi/types";
 
 const fs = require('fs');
 
@@ -38,7 +31,17 @@ function onLoad() {
         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.wsPort != oldConfig.wsPort) {
+            startWSServer(arg.wsPort)
+        }
+        if (arg.token != oldConfig.token) {
+            setToken(arg.token);
+        }
     })
 
     ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => {
@@ -48,35 +51,73 @@ function onLoad() {
 
     function postRawMsg(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) {
+                if (msg.user_id.toString() == selfInfo.uin && !reportSelfMessage) {
                     return
                 }
                 postMsg(msg);
+                // log("post msg", msg)
             }).catch(e => log("constructMessage error: ", e.toString()));
         }
     }
 
 
-    function start() {
+    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())
             }
         })
-
+        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
+            for (const message of payload.msgList) {
+                // log("message update", message, message.sendStatus)
+                if (message.sendStatus === 2) {
+                    // 撤回消息上报
+                    const oriMessage = msgHistory[message.msgId]
+                    if (!oriMessage) {
+                        continue
+                    }
+                    if (message.chatType == ChatType.friend) {
+                        const friendRecallEvent = OB11Constructor.friendRecallEvent(message.senderUin, oriMessage.msgShortId)
+                        postMsg(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 = OB11Constructor.groupRecallEvent(
+                            message.peerUin,
+                            message.senderUin,
+                            operatorId,
+                            oriMessage.msgShortId
+                        )
+                        postMsg(groupRecallEvent)
+                    }
+                    continue
+                }
+                addHistoryMsg(message)
+            }
+        })
         registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
             const {reportSelfMessage} = getConfigUtil().getConfig()
             if (!reportSelfMessage) {
                 return
             }
-            log("reportSelfMessage", payload)
+            // log("reportSelfMessage", payload)
             try {
                 postRawMsg([payload.msgRecord]);
             } catch (e) {
@@ -84,10 +125,14 @@ function onLoad() {
             }
         })
         NTQQApi.getGroups(true).then()
-        startExpress(getConfigUtil().getConfig().port)
+        const config = getConfigUtil().getConfig()
+        startHTTPServer(config.port)
+        startWSServer(config.wsPort)
+        setToken(config.token)
+        log("LLOneBot start")
     }
 
-    async function getSelfInfo() {
+    const init = async () => {
         try {
             const _ = await NTQQApi.getSelfInfo()
             Object.assign(selfInfo, _)
@@ -95,7 +140,6 @@ function onLoad() {
             log("get self simple info", _)
         } catch (e) {
             log("retry get self info")
-
         }
         if (selfInfo.uin) {
             try {
@@ -104,25 +148,18 @@ function onLoad() {
                 if (userInfo) {
                     selfInfo.nick = userInfo.nick
                 } else {
-                    return setTimeout(() => {
+                    return setTimeout(init, 1000)
-                        getSelfInfo().then()
-                    }, 100)
                 }
             } catch (e) {
                 log("get self nickname failed", e.toString())
-                return setTimeout(() => {
+                return setTimeout(init, 1000)
-                    getSelfInfo().then()
-                }, 100)
             }
-            start();
+            start().then();
         } else {
-            setTimeout(() => {
+            setTimeout(init, 1000)
-                getSelfInfo().then()
-            }, 100)
         }
     }
-
+    setTimeout(init, 1000)
-    getSelfInfo().then()
 }
 
 
@@ -131,7 +168,7 @@ function onBrowserWindowCreated(window: BrowserWindow) {
     try {
         hookNTQQApiReceive(window);
     } catch (e) {
-        log("llonebot hook error: ", e.toString())
+        log("LLOneBot hook error: ", e.toString())
     }
 }
 

src/ntqqapi/constructor.ts

@@ -1,5 +1,13 @@
-import {ElementType, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, AtType} from "./types";
+import {
-import {NTQQApi} from "./ntcall";
+    ElementType,
+    SendPicElement,
+    SendPttElement,
+    SendReplyElement,
+    SendTextElement,
+    AtType,
+    SendFaceElement
+} from "./types";
+import { NTQQApi } from "./ntcall";
 
 
 export class SendMsgElementConstructor {
@@ -44,7 +52,7 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string): Promise<SendPicElement>{
+    static async pic(picPath: string): Promise<SendPicElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath);
         const imageSize = await NTQQApi.getImageSize(picPath);
         const picElement = {
@@ -70,7 +78,7 @@ export class SendMsgElementConstructor {
         };
     }
 
-    static async ptt(pttPath: string):Promise<SendPttElement> {
+    static async ptt(pttPath: string): Promise<SendPttElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(pttPath);
         return {
             elementType: ElementType.PTT,
@@ -94,4 +102,15 @@ export class SendMsgElementConstructor {
             }
         };
     }
+
+    static face(faceId: number): SendFaceElement {
+        return {
+            elementType: ElementType.FACE,
+            elementId: "",
+            faceElement: {
+                faceIndex: faceId,
+                faceType: 1
+            }
+        }
+    }
 }

src/ntqqapi/hook.ts

@@ -3,7 +3,7 @@ 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 { addHistoryMsg, friends, groups, msgHistory } from "../common/data";
 import { v4 as uuidv4 } from 'uuid';
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
@@ -34,7 +34,7 @@ interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
 
 let receiveHooks: Array<{
     method: ReceiveCmd,
-    hookFunc: (payload: any) => void,
+    hookFunc: ((payload: any) => void | Promise<void>)
     id: string
 }> = []
 
@@ -50,7 +50,10 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                     if (hook.method === ntQQApiMethodName) {
                         new Promise((resolve, reject) => {
                             try {
-                                hook.hookFunc(receiveData.payload);
+                                let _ = hook.hookFunc(receiveData.payload)
+                                if (hook.hookFunc.constructor.name === "AsyncFunction"){
+                                    (_ as Promise<void>).then()
+                                }
                             } catch (e) {
                                 log("hook error", e, receiveData.payload)
                             }
@@ -129,23 +132,15 @@ registerReceiveHook<{
 //     log("user info", payload);
 // })
 
-registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, (payload) => {
+
-    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)
+        // log("收到新消息，push到历史记录", message)
-        if (!msgHistory[message.msgId]) {
+        addHistoryMsg(message)
-            msgHistory[message.msgId] = message
-        } else {
-            Object.assign(msgHistory[message.msgId], message)
-        }
     }
     const msgIds = Object.keys(msgHistory);
-    if (msgIds.length > 3000) {
+    if (msgIds.length > 30000) {
         delete msgHistory[msgIds.sort()[0]]
     }
 })

src/ntqqapi/ntcall.ts

@@ -78,8 +78,7 @@ function callNTQQApi<ReturnType>(channel: NTQQApiChannel, className: NTQQApiClas
                 success = true
                 resolve(r)
             };
-        }
+        } else {
-        else {
             // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
             hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
                 log(`${methodName} callback`, result)
@@ -90,8 +89,7 @@ function callNTQQApi<ReturnType>(channel: NTQQApiChannel, className: NTQQApiClas
                         success = true
                         resolve(payload);
                     })
-                }
+                } else {
-                else {
                     success = true
                     reject(`ntqq api call failed, ${result.errMsg}`);
                 }
@@ -108,7 +106,7 @@ function callNTQQApi<ReturnType>(channel: NTQQApiChannel, className: NTQQApiClas
         ipcMain.emit(
             channel,
             {},
-            { type: 'request', callbackId: uuid, eventName: className + "-" + channel[channel.length - 1] },
+            {type: 'request', callbackId: uuid, eventName: className + "-" + channel[channel.length - 1]},
             [methodName, ...args],
         )
     })
@@ -142,13 +140,17 @@ export class NTQQApi {
     }
 
     static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ profiles: Map<string, User> }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
+        const result = await callNTQQApi<{
-            [{ force: true, uids: [uid] }, undefined], ReceiveCmd.USER_INFO)
+            profiles: Map<string, User>
+        }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
+            [{force: true, uids: [uid]}, undefined], ReceiveCmd.USER_INFO)
         return result.profiles.get(uid)
     }
 
     static async getFriends(forced = false) {
-        const data = await callNTQQApi<{ data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: Friend[] }[] }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.FRIENDS, [{ force_update: forced }, undefined], ReceiveCmd.FRIENDS)
+        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[] = [];
         for (const fData of data.data) {
             _friends.push(...fData.buddyList)
@@ -161,7 +163,10 @@ export class NTQQApi {
         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[]
+        }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUPS, [{force_update: forced}, undefined], cbCmd)
         return result.groupList
     }
 
@@ -172,7 +177,9 @@ export class NTQQApi {
         }])
         // log("get group member sceneId", sceneId);
         try {
-            const result = await callNTQQApi<{result:{infos: any}}>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUP_MEMBERS,
+            const result = await callNTQQApi<{
+                result: { infos: any }
+            }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.GROUP_MEMBERS,
                 [{
                     sceneId: sceneId,
                     num: num
@@ -182,7 +189,7 @@ export class NTQQApi {
             // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
             let values = result.result.infos.values()
 
-            values =  Array.from(values) as GroupMember[]
+            values = Array.from(values) as GroupMember[]
             // log("members info", values);
             return values
         } catch (e) {
@@ -192,7 +199,6 @@ export class NTQQApi {
     }
 
 
-
     static getFileType(filePath: string) {
         return callNTQQApi<{
             ext: string
@@ -204,7 +210,10 @@ export class NTQQApi {
     }
 
     static copyFile(filePath: string, destPath: string) {
-        return callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_COPY, [{ fromPath: filePath, toPath: destPath }])
+        return callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.FS_API, NTQQApiMethod.FILE_COPY, [{
+            fromPath: filePath,
+            toPath: destPath
+        }])
     }
 
     static getImageSize(filePath: string) {
@@ -221,7 +230,14 @@ export class NTQQApi {
     // 上传文件到QQ的文件夹
     static async uploadFile(filePath: string) {
         const md5 = await NTQQApi.getFileMd5(filePath);
-        const fileName = `${md5}.${(await NTQQApi.getFileType(filePath)).ext}`;
+        let ext = (await NTQQApi.getFileType(filePath))?.ext
+        if (ext) {
+            ext = "." + ext
+        }
+        else{
+            ext = ""
+        }
+        const fileName = `${md5}${ext}`;
         const mediaPath = await callNTQQApi<string>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.MEDIA_FILE_PATH, [{
             path_info: {
                 md5HexStr: md5,
@@ -245,9 +261,9 @@ 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 = [
@@ -267,8 +283,12 @@ export class NTQQApi {
         await callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.DOWNLOAD_MEDIA, apiParams)
         return sourcePath
     }
+
     static recallMsg(peer: Peer, msgIds: string[]) {
-        return callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.RECALL_MSG, [{ peer, msgIds }, null])
+        return callNTQQApi(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.RECALL_MSG, [{
+            peer,
+            msgIds
+        }, null])
     }
 
     static sendMsg(peer: Peer, msgElements: SendMessageElement[]) {
@@ -297,8 +317,7 @@ export class NTQQApi {
                     // log("有正在发送的消息，等待中...")
                     usingTime += 100;
                     setTimeout(checkLastSend, 100);
-                }
+                } else {
-                else {
                     log("可以进行发送消息，设置发送成功回调", sendMessagePool)
                     sendMessagePool[peerUid] = (rawMessage: RawMessage) => {
                         success = true;

src/ntqqapi/types.ts

@@ -7,13 +7,14 @@ export interface User {
     remark?: string
 }
 
-export interface SelfInfo extends User{
+export interface SelfInfo extends User {
 
 }
 
-export interface Friend extends User{}
+export interface Friend extends User {
+}
 
-export interface Group{
+export interface Group {
     groupCode: string,
     maxMember: number,
     memberCount: number,
@@ -62,6 +63,7 @@ export enum ElementType {
     TEXT = 1,
     PIC = 2,
     PTT = 4,
+    FACE = 6,
     REPLY = 7,
 }
 
@@ -76,6 +78,7 @@ export interface SendTextElement {
         atNtUid: string,
     }
 }
+
 export interface SendPttElement {
     elementType: ElementType.PTT,
     elementId: "",
@@ -127,7 +130,13 @@ export interface SendReplyElement {
     }
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement
+export interface SendFaceElement {
+    elementType: ElementType.FACE,
+    elementId: "",
+    faceElement: FaceElement
+}
+
+export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement
 
 export enum AtType {
     notAt = 0,
@@ -140,6 +149,7 @@ export enum ChatType {
     group = 2,
     temp = 100
 }
+
 export interface PttElement {
     canConvert2Text: boolean;
     duration: number; // 秒数
@@ -180,8 +190,25 @@ 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 RawMessage {
     msgId: string;
+    msgShortId?: number;  // 自己维护的消息id
     msgTime: string;
     msgSeq: string;
     senderUin: string; // 发送者QQ号
@@ -190,6 +217,7 @@ export interface RawMessage {
     sendNickName: string;
     sendMemberName?: string; // 发送者群名片
     chatType: ChatType;
+    sendStatus?: number;  // 消息状态，2是已撤回
     elements: {
         elementId: string,
         replyElement: {
@@ -207,17 +235,7 @@ export interface RawMessage {
         picElement: PicElement;
         pttElement: PttElement;
         arkElement: ArkElement;
+        grayTipElement: GrayTipElement;
+        faceElement: FaceElement;
     }[];
 }
-
-export interface MessageElement {
-    raw: RawMessage;
-    peer: any;
-    sender: {
-        uid: string; // 一串加密的字符串
-        memberName: string;
-        nickname: string;
-    };
-}
-
-

src/onebot11/actions/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/actions/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/actions/DeleteMsg.ts

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

src/onebot11/actions/GetGroupInfo.ts

@@ -1,5 +1,5 @@
 import { OB11Group } from '../types';
-import { getGroup, groups } from "../../common/data";
+import { getGroup } from "../../common/data";
 import { OB11Constructor } from "../constructor";
 import BaseAction from "./BaseAction";
 import { ActionName } from "./types";
@@ -8,13 +8,13 @@ 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}不存在`
         }

src/onebot11/actions/GetMsg.ts

@@ -1,4 +1,4 @@
-import { msgHistory } from "../../common/data";
+import { getHistoryMsgByShortId, msgHistory } from "../../common/data";
 import { OB11Message } from '../types';
 import { OB11Constructor } from "../constructor";
 import { log } from "../../common/utils";
@@ -7,7 +7,7 @@ import { ActionName } from "./types";
 
 
 export interface PayloadType {
-    message_id: string
+    message_id: number
 }
 
 export type ReturnDataType = OB11Message
@@ -17,7 +17,10 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
     protected async _handle(payload: PayloadType){
         // log("history msg ids", Object.keys(msgHistory));
-        const msg = msgHistory[payload.message_id.toString()]
+        if (!payload.message_id){
+            throw("参数message_id不能为空")
+        }
+        const msg = getHistoryMsgByShortId(payload.message_id)
         if (msg) {
             const msgData = await OB11Constructor.message(msg);
             return msgData

src/onebot11/actions/GetStatus.ts

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

src/onebot11/actions/GetVersionInfo.ts

@@ -0,0 +1,15 @@
+import BaseAction from "./BaseAction";
+import { OB11Version } from "../types";
+import {version} from "../../common/data";
+import { ActionName } from "./types";
+
+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/actions/SendMsg.ts

@@ -1,25 +1,22 @@
-import { AtType, ChatType, Group } from "../../ntqqapi/types";
+import { AtType, ChatType, Group, SendMessageElement } from "../../ntqqapi/types";
-import { friends, getGroup, getStrangerByUin, msgHistory } from "../../common/data";
+import { addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getStrangerByUin, } from "../../common/data";
 import { OB11MessageData, OB11MessageDataType, OB11PostSendMsg } from '../types';
-import { NTQQApi } from "../../ntqqapi/ntcall";
+import { NTQQApi, Peer } 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
+    message_id: number
 }
 
 class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     actionName = ActionName.SendMsg
 
-    protected async _handle(payload: OB11PostSendMsg){
+    protected async _handle(payload: OB11PostSendMsg) {
         const peer: Peer = {
             chatType: ChatType.friend,
             peerUid: ""
@@ -34,18 +31,16 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             peer.chatType = ChatType.group
             // peer.name = group.name
             peer.peerUid = group.groupCode
-        }
+        } else if (payload?.user_id) {
-        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 {
-            else {
                 peer.chatType = ChatType.temp
                 const tempUser = getStrangerByUin(payload.user_id.toString())
                 if (!tempUser) {
-                    throw(`找不到私聊对象${payload.user_id}`)
+                    throw (`找不到私聊对象${payload.user_id}`)
                 }
                 // peer.name = tempUser.nickName
                 peer.peerUid = tempUser.uid
@@ -58,8 +53,7 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     text: payload.message
                 }
             }] as OB11MessageData[]
-        }
+        } else if (!Array.isArray(payload.message)) {
-        else if (!Array.isArray(payload.message)) {
             payload.message = [payload.message]
         }
         const sendElements: SendMessageElement[] = []
@@ -70,45 +64,53 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     if (text) {
                         sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
                     }
-                } break;
+                }
+                    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 {
-                        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;
+                }
+                    break;
                 case OB11MessageDataType.reply: {
                     let replyMsgId = sendMsg.data.id;
                     if (replyMsgId) {
                         replyMsgId = replyMsgId.toString()
-                        const replyMsg = msgHistory[replyMsgId]
+                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
                         if (replyMsg) {
-                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsgId, replyMsg.senderUin, replyMsg.senderUin))
+                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
                     }
-                } break;
+                }
+                    break;
+                case OB11MessageDataType.face: {
+                    const faceId = sendMsg.data?.id
+                    if (faceId) {
+                        sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
+                    }
+                }
+                    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转过来的文件
+                            if (!isLocal) { // 只删除http和base64转过来的文件
                                 deleteAfterSentFiles.push(path)
                             }
-                            if (sendMsg.type === OB11MessageDataType.image){
+                            if (sendMsg.type === OB11MessageDataType.image) {
                                 sendElements.push(await SendMsgElementConstructor.pic(path))
-                            }
+                            } else {
-                            else {
                                 sendElements.push(await SendMsgElementConstructor.ptt(path))
                             }
                         }
@@ -119,10 +121,12 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         // log("send msg:", peer, sendElements)
         try {
             const returnMsg = await NTQQApi.sendMsg(peer, sendElements)
-            deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{}))
+            addHistoryMsg(returnMsg)
-            return { message_id: returnMsg.msgId }
+            deleteAfterSentFiles.map(f => fs.unlink(f, () => {
+            }))
+            return {message_id: returnMsg.msgShortId}
         } catch (e) {
-            throw(e.toString())
+            throw (e.toString())
         }
     }
 }

src/onebot11/actions/index.ts

@@ -9,6 +9,10 @@ import SendGroupMsg from './SendGroupMsg'
 import SendPrivateMsg from './SendPrivateMsg'
 import SendMsg from './SendMsg'
 import DeleteMsg from "./DeleteMsg";
+import GetVersionInfo from "./GetVersionInfo";
+import CanSendRecord from "./CanSendRecord";
+import CanSendImage from "./CanSendImage";
+import GetStatus from "./GetStatus";
 
 export const actionHandlers = [
     new GetMsg(),
@@ -16,5 +20,9 @@ export const actionHandlers = [
     new GetFriendList(),
     new GetGroupList(), new GetGroupInfo(), new GetGroupMemberList(), new GetGroupMemberInfo(),
     new SendGroupMsg(), new SendPrivateMsg(), new SendMsg(),
-    new DeleteMsg()
+    new DeleteMsg(),
+    new GetVersionInfo(),
+    new CanSendRecord(),
+    new CanSendImage(),
+    new GetStatus()
 ]

src/onebot11/actions/types.ts

@@ -1,3 +1,5 @@
+import GetVersionInfo from "./GetVersionInfo";
+
 export type BaseCheckResult = ValidCheckResult | InvalidCheckResult
 
 export interface ValidCheckResult {
@@ -22,5 +24,9 @@ export enum ActionName{
     SendMsg = "send_msg",
     SendGroupMsg = "send_group_msg",
     SendPrivateMsg = "send_private_msg",
-    DeleteMsg = "delete_msg"
+    DeleteMsg = "delete_msg",
+    GetVersionInfo = "get_version_info",
+    GetStatus = "get_status",
+    CanSendRecord = "can_send_record",
+    CanSendImage = "can_send_image",
 }

src/onebot11/actions/utils.ts

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

src/onebot11/constructor.ts

@@ -1,23 +1,32 @@
-import {OB11MessageDataType, OB11GroupMemberRole, OB11Message, OB11MessageData, OB11Group, OB11GroupMember, OB11User} from "./types";
+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, selfInfo } from '../common/data';
+import { getFriend, getGroupMember, getHistoryMsgBySeq, heartInterval, msgHistory, selfInfo } from '../common/data';
-import {file2base64, getConfigUtil, log} from "../common/utils";
+import { file2base64, getConfigUtil, log } from "../common/utils";
 import { NTQQApi } from "../ntqqapi/ntcall";
+import {OB11EventConstructor} from "./events/constructor";
 
 
-export class OB11Constructor {
+export class OB11Constructor extends OB11EventConstructor{
     static async message(msg: RawMessage): Promise<OB11Message> {
+
         const {enableBase64} = getConfigUtil().getConfig()
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
-            self_id: selfInfo.uin,
+            self_id: parseInt(selfInfo.uin),
-            user_id: msg.senderUin,
+            user_id: parseInt(msg.senderUin),
             time: parseInt(msg.msgTime) || 0,
-            message_id: msg.msgId,
+            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 || "",
             },
@@ -28,10 +37,12 @@ export class OB11Constructor {
             post_type: "message",
         }
         if (msg.chatType == ChatType.group) {
-            resMsg.group_id = msg.peerUin
+            resMsg.sub_type = "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"
@@ -56,13 +67,13 @@ export class OB11Constructor {
                 } 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){
+                    if (atQQ) {
                         message_data["data"]["mention"] = atQQ
                         message_data["data"]["qq"] = atQQ
                     }
@@ -78,16 +89,15 @@ export class OB11Constructor {
                 try {
                     await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                         element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
-                }catch (e) {
+                } catch (e) {
                     message_data["data"]["http_file"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
                 }
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
                 const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
                 if (replyMsg) {
-                    message_data["data"]["id"] = replyMsg.msgId
+                    message_data["data"]["id"] = replyMsg.msgShortId
-                }
+                } else {
-                else{
                     continue
                 }
             } else if (element.pttElement) {
@@ -103,11 +113,13 @@ 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){
+            if (message_data.data.http_file) {
                 message_data.data.file = message_data.data.http_file
-            }
+            } else if (message_data.data.file) {
-            else if (message_data.data.file) {
                 let filePath: string = message_data.data.file;
                 message_data.data.file = "file://" + filePath
                 if (enableBase64) {
@@ -126,23 +138,23 @@ export class OB11Constructor {
         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 +166,28 @@ export class OB11Constructor {
         }[role]
     }
 
-    static groupMember(group_id: string, member: GroupMember): OB11GroupMember{
+    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
-            group_id,
+            group_id: parseInt(group_id),
-            user_id: member.uin,
+            user_id: parseInt(member.uin),
             nickname: member.nick,
             card: member.cardName
         }
     }
 
-    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_id: parseInt(group.groupCode),
             group_name: group.groupName
         }
     }
 
-    static groups(groups: Group[]): OB11Group[]{
+    static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Constructor.group)
     }
 }

src/onebot11/events/constructor.ts

@@ -0,0 +1,58 @@
+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
+        }
+    }
+}

src/onebot11/events/types.ts

@@ -0,0 +1,67 @@
+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
+}

src/onebot11/server.ts

@@ -1,73 +1,26 @@
-import { getConfigUtil, log } from "../common/utils";
+import * as http from "http";
-
+import * as websocket from "ws";
-const express = require("express");
+import urlParse from "url";
+import express from "express";
 import { Request } from 'express';
 import { Response } from 'express';
-
+import { getConfigUtil, log } from "../common/utils";
-const JSONbig = require('json-bigint')({ storeAsString: true });
+import { heartInterval, selfInfo } from "../common/data";
-import { 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 BaseAction from "./actions/BaseAction";
+import { OB11Constructor } from "./constructor";
+import { OB11EventBase, OB11LifeCycleEvent, OB11MetaEvent, OB11NoticeEvent } from "./events/types";
 
+let wsServer: websocket.Server = null;
+let accessToken = ""
 
-// @SiberianHusky 2021-08-15
+const JSONbig = require('json-bigint')({storeAsString: true});
-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" }));
+let httpServer: http.Server = null;
+expressAPP.use(express.urlencoded({extended: true, limit: "500mb"}));
 
 expressAPP.use((req, res, next) => {
     let data = '';
@@ -86,29 +39,154 @@ expressAPP.use((req, res, next) => {
         next();
     });
 });
-// expressAPP.use(express.json({
-//     limit: '500mb',
-//     verify: (req: any, res: any, buf: any, encoding: any) => {
-//         req.rawBody = buf;
-//     }
-// }));
 
-export function startExpress(port: number) {
+const expressAuthorize = (req: Request, res: Response, next: () => void) => {
+    let token = ""
+    const authHeader = req.get("authorization")
+    if (authHeader) {
+        token = authHeader.split("Bearer ").pop()
+        log("receive http header token", token)
+    } else if (req.query.access_token) {
+        if (Array.isArray(req.query.access_token)) {
+            token = req.query.access_token[0].toString();
+        } else {
+            token = req.query.access_token.toString();
+        }
+        log("receive http url token", token)
+    }
 
+    if (accessToken) {
+        if (token != accessToken) {
+            return res.status(403).send(JSON.stringify({message: 'token verify failed!'}));
+        }
+    }
+    next();
+
+};
+
+export function setToken(token: string) {
+    accessToken = token
+}
+
+export function startHTTPServer(port: number) {
+    if (httpServer) {
+        httpServer.close();
+    }
     expressAPP.get('/', (req: Request, res: Response) => {
-        res.send('llonebot已启动');
+        res.send('LLOneBot已启动');
     })
 
-    expressAPP.listen(port, "0.0.0.0", () => {
+    httpServer = expressAPP.listen(port, "0.0.0.0", () => {
-        console.log(`llonebot started 0.0.0.0:${port}`);
+        console.log(`LLOneBot http server started 0.0.0.0:${port}`);
     });
 }
 
+let wsEventClients: websocket.WebSocket[] = [];
+type RouterHandler = (payload: any) => Promise<OB11Return<any>>
+let routers: Record<string, RouterHandler> = {};
 
-export function postMsg(msg: OB11Message) {
+function wsReply(wsClient: websocket.WebSocket, data: OB11Return<any> | PostMsgType) {
-    const { reportSelfMessage } = getConfigUtil().getConfig()
+    try {
+        wsClient.send(JSON.stringify(data))
+        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 function postMsg(msg: PostMsgType) {
+    const {reportSelfMessage} = getConfigUtil().getConfig()
+    // 判断msg是否是event
     if (!reportSelfMessage) {
-        if (msg.user_id == selfInfo.uin) {
+        if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
             return
         }
     }
@@ -121,41 +199,46 @@ export function postMsg(msg: OB11Message) {
             },
             body: JSON.stringify(msg)
         }).then((res: any) => {
-            log(`新消息事件上报成功: ${host} ` + JSON.stringify(msg));
+            log(`新消息事件HTTP上报成功: ${host} ` + JSON.stringify(msg));
         }, (err: any) => {
-            log(`新消息事件上报失败: ${host} ` + err + JSON.stringify(msg));
+            log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg));
         });
     }
+    for (const wsClient of wsEventClients) {
+        log("新消息事件ws上报", msg)
+        new Promise((resolve, reject) => {
+            wsReply(wsClient, msg);
+        }).then();
+    }
 }
 
-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) {
-        catch (e) {
             log(e.stack);
             res.send(OB11Response.error(e.stack.toString()))
         }
     }
 
-    expressAPP.post(url, (req: Request, res: Response) => {
+    expressAPP.post(url, expressAuthorize, (req: Request, res: Response) => {
-        _handle(res, req.body).then()
+        _handle(res, req.body || {}).then()
     });
-    expressAPP.get(url, (req: Request, res: Response) => {
+    expressAPP.get(url, expressAuthorize, (req: Request, res: Response) => {
-        _handle(res, req.query as any).then()
+        _handle(res, req.query as any || {}).then()
     });
-    routers[url] = handle
+    routers[action] = handle
 }
 
-for (const action  of actionHandlers) {
+for (const action of actionHandlers) {
     registerRouter(action.actionName, (payload) => action.handle(payload))
 }

src/onebot11/types.ts

@@ -1,27 +1,26 @@
-import { AtType } from "../ntqqapi/types";
+import { AtType, RawMessage } from "../ntqqapi/types";
-import { RawMessage } from "../ntqqapi/types";
 
-export interface OB11User{
+export interface OB11User {
-    user_id: string;
+    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
+    group_id: number
-    user_id: string
+    user_id: number
     nickname: string
     card?: string
     sex?: OB11UserSex
@@ -33,15 +32,15 @@ export interface OB11GroupMember {
     title?: string
 }
 
-export interface OB11Group{
+export interface OB11Group {
-    group_id: string
+    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,14 +55,14 @@ 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,
+    user_id: number,
-    group_id?: string,
+    group_id?: number,
     message_type: "private" | "group",
-    sub_type?: "friend" | "group" | "other",
+    sub_type?: "friend" | "group" | "normal",
     sender: OB11Sender,
     message: OB11MessageData[],
     raw_message: string,
@@ -89,10 +88,12 @@ export interface OB11Return<DataType> {
     status: number
     retcode: number
     data: DataType
-    message: string
+    message: string,
+    echo?: string
 }
 
-export interface OB11SendMsgReturn extends OB11Return<{message_id: string}>{}
+export interface OB11SendMsgReturn extends OB11Return<{ message_id: string }> {
+}
 
 export enum OB11MessageDataType {
     text = "text",
@@ -100,7 +101,8 @@ export enum OB11MessageDataType {
     voice = "record",
     at = "at",
     reply = "reply",
-    json = "json"
+    json = "json",
+    face = "face"
 }
 
 export type OB11MessageData = {
@@ -132,6 +134,11 @@ export type OB11MessageData = {
     data: {
         id: string,
     }
+} | {
+    type: OB11MessageDataType.face,
+    data: {
+        id: string
+    }
 }
 
 export interface OB11PostSendMsg {
@@ -140,3 +147,16 @@ export interface OB11PostSendMsg {
     group_id?: string,
     message: OB11MessageData[] | string | OB11MessageData;
 }
+
+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,6 +1,7 @@
 import { CONFIG_DIR, isGIF } from "../common/utils";
 import * as path from 'path';
 import { NTQQApi } from '../ntqqapi/ntcall';
+import { OB11MessageData } from "./types";
 const fs = require("fs").promises;
 
 export async function uri2local(fileName: string, uri: string){
@@ -39,11 +40,12 @@ export async function uri2local(fileName: string, uri: string){
         }
     } else if (url.protocol === "file:"){
         // await fs.copyFile(url.pathname, filePath);
+        let pathname = decodeURIComponent(url.pathname)
         if (process.platform === "win32"){
-            filePath = url.pathname.slice(1)
+            filePath = pathname.slice(1)
         }
         else{
-            filePath = url.pathname
+            filePath = pathname
         }
         res.isLocal = true
     }
@@ -59,3 +61,39 @@ export async function uri2local(fileName: string, uri: string){
     res.path = filePath
     return res
 }
+
+
+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;
+}

src/renderer.ts

@@ -29,16 +29,24 @@ async function onSettingWindowCreated(view: Element) {
             <setting-panel>
                 <setting-list class="wrap">
                     <setting-item class="vertical-list-item" data-direction="row">
-                        <setting-text>监听端口</setting-text>
+                        <setting-text>HTTP监听端口</setting-text>
                         <input id="port" type="number" value="${config.port}"/>
                     </setting-item>
+                    <setting-item class="vertical-list-item" data-direction="row">
+                        <setting-text>正向ws监听端口</setting-text>
+                        <input id="wsPort" type="number" value="${config.wsPort}"/>
+                    </setting-item>
+                    <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>
                     <div>
-                        <button id="addHost" class="q-button">添加上报地址</button>
+                        <button id="addHost" class="q-button">添加HTTP上报地址</button>
                     </div>
                     <div id="hostItems">
                         ${hostsEleStr}
                     </div>
-                    <button id="save" class="q-button">保存(监听端口重启QQ后生效)</button>
+                    <button id="save" class="q-button">保存</button>
                 </setting-list>
             </setting-panel>
             <setting-panel>
@@ -124,19 +132,26 @@ 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 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) {
                 if (hostEle.value) {
-                    hosts.push(hostEle.value);
+                    hosts.push(hostEle.value.trim());
                 }
             }
             config.port = parseInt(port);
+            config.wsPort = parseInt(wsPort);
             config.hosts = hosts;
+            config.token = token.trim();
             window.llonebot.setConfig(config);
             alert("保存成功");
         })