fix: some id(int and string) compatibility

feat: change port not need restart

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,6 +52,7 @@
 - [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
@@ -67,7 +74,7 @@
 <details>
     <summary>调用接口报404</summary>
 <br/>
-    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口，并且所有接口都只支持POST方法，调用GET方法会报404
+    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口
 </details>
 <br/>
 
@@ -94,11 +101,10 @@
 
 
 ## TODO
-
+- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
+- [x] 支持正向websocket
 - [ ] 转发消息记录 
 - [ ] 好友点赞api
-- [ ] 支持websocket，等个有缘人提PR实现
-- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 
 ## onebot11文档
 <https://11.onebot.dev/>

manifest.json

@@ -4,7 +4,7 @@
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "3.0.1",
+    "version": "3.1.2",
     "thumbnail": "./icon.png",
     "authors": [{
         "name": "linyuchen",

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,31 @@
-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 {
         if (!fs.existsSync(this.configPath)) {
-            return {port:3000, hosts: ["http://192.168.1.2:5000/"]}
+            return {port: 3000, hosts: ["http://192.168.1.2:5000/"], wsPort: 3001}
         } else {
             const data = fs.readFileSync(this.configPath, "utf-8");
-            let jsonData =JSON.parse(data);
-            if (!jsonData.hosts){
+            let jsonData = JSON.parse(data);
+            if (!jsonData.hosts) {
                 jsonData.hosts = []
             }
+            if (!jsonData.wsPort){
+                jsonData.wsPort = 3001
+            }
             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, RawMessage, SelfInfo } from "../ntqqapi/types";
+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){
@@ -23,16 +44,23 @@ export async function getGroup(qq: string): Promise<Group | undefined> {
     return group
 }
 
-export async function getGroupMember(groupQQ: string, memberQQ: string) {
+export async function getGroupMember(groupQQ: string, memberQQ: string=null, memberUid: string=null) {
     const group = await getGroup(groupQQ)
     if (group) {
-        let member = group.members?.find(member => member.uin === memberQQ)
+        let filterFunc: (member: GroupMember) => boolean
+        if (memberQQ){
+            filterFunc = member => member.uin === memberQQ
+        }
+        else if (memberUid){
+            filterFunc = member => member.uid === memberUid
+        }
+        let member = group.members?.find(filterFunc)
         if (!member){
             const _members = await NTQQApi.getGroupMembers(groupQQ)
             if (_members.length){
                 group.members = _members
             }
-            member = group.members?.find(member => member.uin === memberQQ)
+            member = group.members?.find(filterFunc)
         }
         return member
     }

src/common/types.ts

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

src/main/main.ts

@@ -10,10 +10,9 @@ import {
     CHANNEL_LOG,
     CHANNEL_SET_CONFIG,
 } from "../common/channels";
-import { ConfigUtil } from "../common/config";
-import { postMsg, startExpress } from "../onebot11/server";
+import { postMsg, startHTTPServer, startWSServer } from "../onebot11/server";
 import { CONFIG_DIR, getConfigUtil, log } from "../common/utils";
-import { friends, groups, msgHistory, selfInfo } from "../common/data";
+import { addHistoryMsg, msgHistory, selfInfo } from "../common/data";
 import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook";
 import { OB11Constructor } from "../onebot11/constructor";
 import { NTQQApi } from "../ntqqapi/ntcall";
@@ -38,7 +37,14 @@ 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)
+        }
     })
 
     ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => {
@@ -48,15 +54,20 @@ function onLoad() {
 
     function postRawMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
-        for (const message of msgList) {
+        for (let message of msgList) {
+            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()));
         }
     }
@@ -65,6 +76,7 @@ function onLoad() {
     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())
@@ -76,17 +88,21 @@ function onLoad() {
             if (!reportSelfMessage) {
                 return
             }
-            log("reportSelfMessage", payload)
+            // log("reportSelfMessage", payload)
             try {
                 postRawMsg([payload.msgRecord]);
             } catch (e) {
                 log("report self message error: ", e.toString())
             }
         })
-        startExpress(getConfigUtil().getConfig().port)
+        NTQQApi.getGroups(true).then()
+        const config = getConfigUtil().getConfig()
+        startHTTPServer(config.port)
+        startWSServer(config.wsPort)
+        log("LLOneBot start")
     }
 
-    async function getSelfInfo() {
+    const init = async () => {
         try {
             const _ = await NTQQApi.getSelfInfo()
             Object.assign(selfInfo, _)
@@ -94,52 +110,27 @@ function onLoad() {
             log("get self simple info", _)
         } catch (e) {
             log("retry get self info")
-
         }
         if (selfInfo.uin) {
             try {
                 const userInfo = (await NTQQApi.getUserInfo(selfInfo.uid))
+                log("self info", userInfo);
                 if (userInfo) {
                     selfInfo.nick = userInfo.nick
                 } else {
-                    return setTimeout(() => {
-                        getSelfInfo().then()
-                    }, 100)
+                    return setTimeout(init, 1000)
                 }
             } catch (e) {
                 log("get self nickname failed", e.toString())
+                return setTimeout(init, 1000)
             }
             start();
-            // try {
-            //     friends.push(...(await NTQQApi.getFriends(true)))
-            //     log("get friends", friends)
-            //     let _groups: Group[] = []
-            //     for(let i=0; i++; i<3){
-            //         try{
-            //             _groups = await NTQQApi.getGroups(true)
-            //             log("get groups sucess", _groups)
-            //             break
-            //         } catch(e) {
-            //             log("get groups failed", e)
-            //         }
-            //     }
-            //     for (let g of _groups) {
-            //         g.members = (await NTQQApi.getGroupMembers(g.groupCode))
-            //         log("group members", g.members)
-            //         groups.push(g)
-            //     }
-
-            // } catch (e) {
-            //     log("!!!初始化失败", e.stack.toString())
-            // }
-        } else {
-            setTimeout(() => {
-                getSelfInfo().then()
-            }, 100)
+        }
+        else{
+            setTimeout(init, 1000)
         }
     }
-
-    getSelfInfo().then()
+    setTimeout(init, 1000)
 }
 
 
@@ -148,7 +139,7 @@ function onBrowserWindowCreated(window: BrowserWindow) {
     try {
         hookNTQQApiReceive(window);
     } catch (e) {
-        log("llonebot hook error: ", e.toString())
+        log("LLOneBot hook error: ", e.toString())
     }
 }
 

src/ntqqapi/hook.ts

@@ -1,24 +1,24 @@
-import {BrowserWindow} from 'electron';
-import {getConfigUtil, log} from "../common/utils";
-import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
+import { BrowserWindow } from 'electron';
+import { getConfigUtil, log } from "../common/utils";
+import { NTQQApi, NTQQApiClass, sendMessagePool } from "./ntcall";
 import { Group, User } from "./types";
 import { RawMessage } from "./types";
-import {friends, groups, msgHistory} from "../common/data";
+import { addHistoryMsg, friends, groups, msgHistory } from "../common/data";
 import { v4 as uuidv4 } from 'uuid';
 
-export let hookApiCallbacks: Record<string, (apiReturn: any)=>void>={}
+export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
 export enum ReceiveCmd {
     UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
     NEW_MSG = "nodeIKernelMsgListener/onRecvMsg",
     SELF_SEND_MSG = "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO = "nodeIKernelProfileListener/onProfileDetailInfoChanged",
+    USER_INFO = "nodeIKernelProfileListener/onProfileSimpleChanged",
     GROUPS = "nodeIKernelGroupListener/onGroupListUpdate",
     GROUPS_UNIX = "onGroupListUpdate",
     FRIENDS = "onBuddyListChange"
 }
 
-interface NTQQApiReturnData<PayloadType=unknown> extends Array<any> {
+interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
     0: {
         "type": "request",
         "eventName": NTQQApiClass,
@@ -51,7 +51,7 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                         new Promise((resolve, reject) => {
                             try {
                                 hook.hookFunc(receiveData.payload);
-                            }catch (e) {
+                            } catch (e) {
                                 log("hook error", e, receiveData.payload)
                             }
                         }).then()
@@ -59,10 +59,10 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                 }
             }
         }
-        if (args[0]?.callbackId){
+        if (args[0]?.callbackId) {
             // log("hookApiCallback", hookApiCallbacks, args)
             const callbackId = args[0].callbackId;
-            if (hookApiCallbacks[callbackId]){
+            if (hookApiCallbacks[callbackId]) {
                 // log("callback found")
                 new Promise((resolve, reject) => {
                     hookApiCallbacks[callbackId](args[1]);
@@ -85,36 +85,43 @@ export function registerReceiveHook<PayloadType>(method: ReceiveCmd, hookFunc: (
     return id;
 }
 
-export function removeReceiveHook(id: string){
-    const index = receiveHooks.findIndex(h=>h.id === id)
+export function removeReceiveHook(id: string) {
+    const index = receiveHooks.findIndex(h => h.id === id)
     receiveHooks.splice(index, 1);
 }
 
-async function updateGroups(_groups: Group[]){
-    for(let group of _groups){
-        let existGroup = groups.find(g=>g.groupCode == group.groupCode)
-        if (!existGroup){
-            // log("update group")
-            let _membeers = await NTQQApi.getGroupMembers(group.groupCode)
-            if (_membeers){
-                group.members = _membeers
-            }
+async function updateGroups(_groups: Group[]) {
+    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{
-            group.members = [...existGroup.members]
+        } else {
+            Object.assign(existGroup, group)
         }
     }
-    groups.length = 0;
-    groups.push(..._groups)
 }
 
-registerReceiveHook<{groupList: Group[]}>(ReceiveCmd.GROUPS, (payload)=>updateGroups(payload.groupList).then())
-registerReceiveHook<{groupList: Group[]}>(ReceiveCmd.GROUPS_UNIX, (payload)=>updateGroups(payload.groupList).then())
-registerReceiveHook<{data:{categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[]}[]}>(ReceiveCmd.FRIENDS, payload=>{
-    friends.length = 0
+registerReceiveHook<{ groupList: Group[] }>(ReceiveCmd.GROUPS, (payload) => updateGroups(payload.groupList).then())
+registerReceiveHook<{ groupList: Group[] }>(ReceiveCmd.GROUPS_UNIX, (payload) => updateGroups(payload.groupList).then())
+registerReceiveHook<{
+    data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
+}>(ReceiveCmd.FRIENDS, payload => {
     for (const fData of payload.data) {
-        friends.push(...fData.buddyList)
+        const _friends = fData.buddyList;
+        for (let friend of _friends) {
+            let existFriend = friends.find(f => f.uin == friend.uin)
+            if (!existFriend) {
+                friends.push(friend)
+            } else {
+                Object.assign(existFriend, friend)
+            }
+        }
     }
 })
 
@@ -124,31 +131,30 @@ registerReceiveHook<{data:{categoryId: number, categroyName: string, categroyMbC
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, (payload) => {
     for (const message of payload.msgList) {
-        msgHistory[message.msgId] = message;
+        addHistoryMsg(message)
     }
 })
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
     for (const message of payload.msgList) {
-        log("收到新消息，push到历史记录", message)
-        if (!msgHistory[message.msgId]){
-            msgHistory[message.msgId] = message
-        }
-        else{
-            Object.assign(msgHistory[message.msgId], message)
-        }
+        // log("收到新消息，push到历史记录", message)
+        addHistoryMsg(message)
+    }
+    const msgIds = Object.keys(msgHistory);
+    if (msgIds.length > 30000) {
+        delete msgHistory[msgIds.sort()[0]]
     }
 })
 
-registerReceiveHook<{msgRecord: RawMessage}>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord})=>{
+registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
     const message = msgRecord;
     const peerUid = message.peerUid;
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
     const sendCallback = sendMessagePool[peerUid];
-    if (sendCallback){
-        try{
+    if (sendCallback) {
+        try {
             sendCallback(message);
-        }catch(e){
+        } catch (e) {
             log("receive self msg error", e.stack)
         }
     }

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,14 +140,17 @@ export class NTQQApi {
     }
 
     static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ info: User }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
-            [{ force: true, uids: [uid] }, undefined], ReceiveCmd.USER_INFO)
-        return result.info
-
+        const result = await callNTQQApi<{
+            profiles: Map<string, User>
+        }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
+            [{force: true, uids: [uid]}, undefined], ReceiveCmd.USER_INFO)
+        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)
@@ -162,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
     }
 
@@ -173,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
@@ -183,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) {
@@ -193,7 +199,6 @@ export class NTQQApi {
     }
 
 
-
     static getFileType(filePath: string) {
         return callNTQQApi<{
             ext: string
@@ -205,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) {
@@ -222,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,
@@ -246,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 = [
@@ -268,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[]) {
@@ -298,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

@@ -182,6 +182,7 @@ export interface PicElement {
 
 export interface RawMessage {
     msgId: string;
+    msgShortId?: number;  // 自己维护的消息id
     msgTime: string;
     msgSeq: string;
     senderUin: string; // 发送者QQ号

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/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,7 @@ 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()]
+        const msg = getHistoryMsgByShortId(payload.message_id)
         if (msg) {
             const msgData = await OB11Constructor.message(msg);
             return msgData

src/onebot11/actions/SendMsg.ts

@@ -1,5 +1,11 @@
 import { AtType, ChatType, Group } 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 { Peer } from "../../ntqqapi/ntcall";
@@ -10,9 +16,10 @@ 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> {
@@ -23,6 +30,7 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             chatType: ChatType.friend,
             peerUid: ""
         }
+        let deleteAfterSentFiles: string[] = []
         let group: Group | undefined = undefined;
         if (payload?.group_id) {
             group = await getGroup(payload.group_id.toString())
@@ -88,27 +96,27 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     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))
-                        }
-                    }
-                } break;
-                case OB11MessageDataType.image: {
-                    const file = sendMsg.data?.file
-                    if (file) {
-                        const picPath = await (await uri2local(uuid4(), file)).path
-                        if (picPath) {
-                            sendElements.push(await SendMsgElementConstructor.pic(picPath))
+                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
                     }
                 } break;
+                case OB11MessageDataType.image:
                 case OB11MessageDataType.voice: {
                     const file = sendMsg.data?.file
                     if (file) {
-                        const voicePath = await (await uri2local(uuid4(), file)).path
-                        if (voicePath) {
-                            sendElements.push(await SendMsgElementConstructor.ptt(voicePath))
+                        const {path, isLocal} = (await uri2local(uuid4(), file))
+                        if (path) {
+                            if (!isLocal){ // 只删除http和base64转过来的文件
+                                deleteAfterSentFiles.push(path)
+                            }
+                            if (sendMsg.type === OB11MessageDataType.image){
+                                sendElements.push(await SendMsgElementConstructor.pic(path))
+                            }
+                            else {
+                                sendElements.push(await SendMsgElementConstructor.ptt(path))
+                            }
                         }
                     }
                 }
@@ -117,7 +125,9 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         // log("send msg:", peer, sendElements)
         try {
             const returnMsg = await NTQQApi.sendMsg(peer, sendElements)
-            return { message_id: returnMsg.msgId }
+            addHistoryMsg(returnMsg)
+            deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{}))
+            return { message_id: returnMsg.msgShortId }
         } catch (e) {
             throw(e.toString())
         }

src/onebot11/constructor.ts

@@ -1,23 +1,31 @@
-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 {file2base64, getConfigUtil, log} from "../common/utils";
+import { getFriend, getGroupMember, getHistoryMsgBySeq, msgHistory, selfInfo } from '../common/data';
+import { file2base64, getConfigUtil, log } from "../common/utils";
 import { NTQQApi } from "../ntqqapi/ntcall";
 
 
 export class OB11Constructor {
     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,
-            user_id: msg.senderUin,
+            self_id: parseInt(selfInfo.uin),
+            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,7 +36,8 @@ 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);
@@ -54,10 +63,18 @@ export class OB11Constructor {
                     message_data["data"]["mention"] = "all"
                     message_data["data"]["qq"] = "all"
                 } else {
+                    let atUid = element.textElement.atNtUid
                     let atQQ = element.textElement.atUid
-                    // let atMember = await getGroupMember(msg.peerUin, uid)
-                    message_data["data"]["mention"] = atQQ
-                    message_data["data"]["qq"] = atQQ
+                    if (!atQQ || atQQ === "0") {
+                        const atMember = await getGroupMember(msg.peerUin, null, atUid)
+                        if (atMember) {
+                            atQQ = atMember.uin
+                        }
+                    }
+                    if (atQQ) {
+                        message_data["data"]["mention"] = atQQ
+                        message_data["data"]["qq"] = atQQ
+                    }
                 }
             } else if (element.textElement) {
                 message_data["type"] = "text"
@@ -70,16 +87,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
-                }
-                else{
+                    message_data["data"]["id"] = replyMsg.msgShortId
+                } else {
                     continue
                 }
             } else if (element.pttElement) {
@@ -96,14 +112,12 @@ export class OB11Constructor {
                 message_data["type"] = OB11MessageDataType.json;
                 message_data["data"]["data"] = element.arkElement.bytesData;
             }
-            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) {
-                    // filePath = filePath.replace("\\Ori\\", "\\Thumb\\")
                     let {err, data} = await file2base64(filePath);
                     if (err) {
                         console.log("文件转base64失败", err)
@@ -116,36 +130,26 @@ export class OB11Constructor {
                 resMsg.message.push(message_data);
             }
         }
-        // if (msgHistory.length > 10000) {
-        //     msgHistory.splice(0, 100)
-        // }
-        // msgHistory.push(message)
-        // if (!reportSelfMessage && onebot_message_data["user_id"] == self_qq) {
-        //     console.log("开启了不上传自己发送的消息，进行拦截 ", onebot_message_data);
-        // } else {
-        //     console.log("发送上传消息给ipc main", onebot_message_data);
-        //     window.llonebot.postData(onebot_message_data);
-        // }
         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)
     }
 
@@ -157,28 +161,28 @@ export class OB11Constructor {
         }[role]
     }
 
-    static groupMember(group_id: string, member: GroupMember): OB11GroupMember{
+    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
-            group_id,
-            user_id: member.uin,
+            group_id: parseInt(group_id),
+            user_id: parseInt(member.uin),
             nickname: member.nick,
             card: member.cardName
         }
     }
 
-    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/server.ts

@@ -1,73 +1,22 @@
-import { getConfigUtil, log } from "../common/utils";
-
-const express = require("express");
+import * as http from "http";
+import * as websocket from "ws";
+import express from "express";
 import { Request } from 'express';
 import { Response } from 'express';
-
-const JSONbig = require('json-bigint')({ storeAsString: true });
+import { getConfigUtil, log } from "../common/utils";
 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";
 
+let wsServer: websocket.Server = null;
 
-// @SiberianHusky 2021-08-15
-function checkSendMessage(sendMsgList: OB11MessageData[]) {
-    function checkUri(uri: string): boolean {
-        const pattern = /^(file:\/\/|http:\/\/|https:\/\/|base64:\/\/)/;
-        return pattern.test(uri);
-    }
-
-    for (let msg of sendMsgList) {
-        if (msg["type"] && msg["data"]) {
-            let type = msg["type"];
-            let data = msg["data"];
-            if (type === "text" && !data["text"]) {
-                return 400;
-            } else if (["image", "voice", "record"].includes(type)) {
-                if (!data["file"]) {
-                    return 400;
-                } else {
-                    if (checkUri(data["file"])) {
-                        return 200;
-                    } else {
-                        return 400;
-                    }
-                }
-
-            } else if (type === "at" && !data["qq"]) {
-                return 400;
-            } else if (type === "reply" && !data["id"]) {
-                return 400;
-            }
-        } else {
-            return 400
-        }
-    }
-    return 200;
-}
-
-// ==end==
-
-
-class OB11Response {
-    static res<T>(data: T, status: number = 0, message: string = ""): OB11Return<T> {
-        return {
-            status: status,
-            retcode: status,
-            data: data,
-            message: message
-        }
-    }
-    static ok<T>(data: T) {
-        return OB11Response.res<T>(data)
-    }
-    static error(err: string) {
-        return OB11Response.res(null, -1, err)
-    }
-}
-
+const JSONbig = require('json-bigint')({storeAsString: true});
 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 +35,82 @@ 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) {
 
+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", () => {
-        console.log(`llonebot started 0.0.0.0:${port}`);
+    httpServer = expressAPP.listen(port, "0.0.0.0", () => {
+        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> = {};
+
+function wsReply(wsClient: websocket.WebSocket, data: OB11Return<any> | OB11Message) {
+    try {
+        wsClient.send(JSON.stringify(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;
+        // ws.send('Welcome to the LLOneBot WebSocket server! url:' + url);
+
+        if (url == "/api" || url == "/api/" || url == "/") {
+            ws.on("message", async (msg) => {
+
+                let receiveData: { action: ActionName, params: any } = {action: null, params: {}}
+                log("收到ws消息", msg.toString())
+                try {
+                    receiveData = JSON.parse(msg.toString())
+                } catch (e) {
+                    return wsReply(ws, OB11Response.error("json解析失败，请检查数据格式"))
+                }
+                const handle: RouterHandler | undefined = routers[receiveData.action]
+                if (!handle) {
+                    return wsReply(ws, OB11Response.error("不支持的api " + receiveData.action))
+                }
+                try {
+                    const handleResult = await handle(receiveData.params)
+                    wsReply(ws, handleResult)
+                } catch (e) {
+                    wsReply(ws, OB11Response.error(`api处理出错:${e}`))
+                }
+            })
+        }
+        if (url == "/event" || url == "/event/" || url == "/") {
+            log("event上报ws客户端已连接")
+            wsEventClients.push(ws)
+            ws.on("close", () => {
+                log("event上报ws客户端已断开")
+                wsEventClients = wsEventClients.filter((c) => c != ws)
+            })
+        }
+    })
+}
+
 
 export function postMsg(msg: OB11Message) {
-    const { reportSelfMessage } = getConfigUtil().getConfig()
+    const {reportSelfMessage} = getConfigUtil().getConfig()
     if (!reportSelfMessage) {
-        if (msg.user_id == selfInfo.uin) {
+        if (msg.user_id.toString() == selfInfo.uin) {
             return
         }
     }
@@ -121,27 +123,32 @@ 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()))
         }
@@ -153,9 +160,9 @@ function registerRouter(action: string, handle: (payload: any) => Promise<any>)
     expressAPP.get(url, (req: Request, res: Response) => {
         _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

@@ -2,7 +2,7 @@ import { AtType } from "../ntqqapi/types";
 import { RawMessage } from "../ntqqapi/types";
 
 export interface OB11User{
-    user_id: string;
+    user_id: number;
     nickname: string;
     remark?: string
 }
@@ -20,8 +20,8 @@ export enum OB11GroupMemberRole{
 }
 
 export interface OB11GroupMember {
-    group_id: string
-    user_id: string
+    group_id: number
+    user_id: number
     nickname: string
     card?: string
     sex?: OB11UserSex
@@ -34,14 +34,14 @@ export interface OB11GroupMember {
 }
 
 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 +56,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,
-    group_id?: string,
+    user_id: number,
+    group_id?: number,
     message_type: "private" | "group",
-    sub_type?: "friend" | "group" | "other",
+    sub_type?: "friend" | "group" | "normal",
     sender: OB11Sender,
     message: OB11MessageData[],
     raw_message: string,

src/onebot11/utils.ts

@@ -1,11 +1,18 @@
 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){
     let filePath = path.join(CONFIG_DIR, fileName)
     let url = new URL(uri);
+    let res = {
+        success: false,
+        errMsg: "",
+        path: "",
+        isLocal: false
+    }
     if (url.protocol == "base64:") {
         // base64转成文件
         let base64Data = uri.split("base64://")[1]
@@ -13,51 +20,80 @@ export async function uri2local(fileName: string, uri: string){
             const buffer = Buffer.from(base64Data, 'base64');
             await fs.writeFile(filePath, buffer);
         } catch (e: any) {
-            return {
-                success: false,
-                errMsg: `base64文件下载失败,` + e.toString(),
-                path: ""
-            }
+            res.errMsg = `base64文件下载失败,` + e.toString()
+            return res
         }
     } else if (url.protocol == "http:" || url.protocol == "https:") {
         // 下载文件
-        let res = await fetch(url)
-        if (!res.ok) {
-            return {
-                success: false,
-                errMsg: `${url}下载失败,` + res.statusText,
-                path: ""
-            }
+        let fetchRes = await fetch(url)
+        if (!fetchRes.ok) {
+            res.errMsg = `${url}下载失败,` + fetchRes.statusText
+            return res
         }
-        let blob = await res.blob();
+        let blob = await fetchRes.blob();
         let buffer = await blob.arrayBuffer();
         try {
             await fs.writeFile(filePath, Buffer.from(buffer));
         } catch (e: any) {
-            return {
-                success: false,
-                errMsg: `${url}下载失败,` + e.toString(),
-                path: ""
-            }
+            res.errMsg = `${url}下载失败,` + e.toString()
+            return res
         }
     } else if (url.protocol === "file:"){
-        await fs.copyFile(url.pathname, filePath);
-        // filePath = (await NTQQApi.uploadFile(url.pathname)).path;
+        // await fs.copyFile(url.pathname, filePath);
+        let pathname = decodeURIComponent(url.pathname)
+        if (process.platform === "win32"){
+            filePath = pathname.slice(1)
+        }
+        else{
+            filePath = pathname
+        }
+        res.isLocal = true
     }
     else{
-        return {
-            success: false,
-            errMsg: `不支持的file协议,` + url.protocol,
-            path: ""
-        }
+        res.errMsg = `不支持的file协议,` + url.protocol
+        return res
     }
-    if (isGIF(filePath)) {
+    if (isGIF(filePath) && !res.isLocal) {
         await fs.rename(filePath, filePath + ".gif");
         filePath += ".gif";
     }
-    return {
-        success: true,
-        errMsg: "",
-        path: filePath
-    };
-}
+    res.success = true
+    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,20 @@ 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>
                     <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,11 +128,13 @@ 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 port = doc.querySelector("input[type=number]")?.value
             // const host = doc.querySelector("input[type=text]")?.value
             // 获取端口和host
             const port = portEle.value
+            const wsPort = wsPortEle.value
             let hosts: string[] = [];
             for (const hostEle of hostEles) {
                 if (hostEle.value) {
@@ -136,6 +142,7 @@ async function onSettingWindowCreated(view: Element) {
                 }
             }
             config.port = parseInt(port);
+            config.wsPort = parseInt(wsPort);
             config.hosts = hosts;
             window.llonebot.setConfig(config);
             alert("保存成功");