diff --git a/README.md b/README.md index 810f7d9..2c6c8fe 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,11 @@ LiteLoaderQQNT的OneBot11协议插件 ## 支持的API -目前只支持http协议，不支持websocket，事件上报也是http协议 +目前支持的协议 +- [x] http调用api +- [x] http事件上报 +- [x] 正向websocket +- [ ] 反向websocket 主要功能: - [x] 发送好友消息 @@ -29,9 +33,11 @@ LiteLoaderQQNT的OneBot11协议插件 - [x] 撤回消息 - [x] 上报好友消息 - [x] 上报群消息 +- [x] 上报好友、群消息撤回 消息格式支持: - [x] 文字 +- [x] 表情 - [x] 图片 - [x] 引用消息 - [x] @群成员 @@ -53,6 +59,10 @@ LiteLoaderQQNT的OneBot11协议插件 - [x] get_group_member_info - [x] get_friend_list - [x] get_msg +- [x] get_version_info +- [x] get_status +- [x] can_send_image +- [x] can_send_record ## 示例 @@ -98,9 +108,9 @@ LiteLoaderQQNT的OneBot11协议插件 ## TODO - [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用 +- [x] 支持正向websocket - [ ] 转发消息记录 - [ ] 好友点赞api -- [ ] 支持websocket，等个有缘人提PR实现 ## onebot11文档 diff --git a/manifest.json b/manifest.json index 3574dc6..4ffec7f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,31 +1,33 @@ { - "manifest_version": 4, - "type": "extension", - "name": "LLOneBot", - "slug": "LLOneBot", - "description": "LiteLoaderQQNT的OneBotApi", - "version": "3.0.8", - "thumbnail": "./icon.png", - "authors": [{ - "name": "linyuchen", - "link": "https://github.com/linyuchen" - }], - "repository": { + "manifest_version": 4, + "type": "extension", + "name": "LLOneBot", + "slug": "LLOneBot", + "description": "LiteLoaderQQNT的OneBotApi", + "version": "3.4.0", + "thumbnail": "./icon.png", + "authors": [ + { + "name": "linyuchen", + "link": "https://github.com/linyuchen" + } + ], + "repository": { "repo": "linyuchen/LiteLoaderQQNT-OneBotApi", "branch": "main", "release": { - "tag": "latest", - "name": "LLOneBot.zip" - } -}, - "platform": [ - "win32", - "linux", - "darwin" - ], - "injects": { - "renderer": "./renderer.js", - "main": "./main.js", - "preload": "./preload.js" + "tag": "latest", + "name": "LLOneBot.zip" } + }, + "platform": [ + "win32", + "linux", + "darwin" + ], + "injects": { + "renderer": "./renderer.js", + "main": "./main.js", + "preload": "./preload.js" + } } diff --git a/package-lock.json b/package-lock.json index 9c1e3a4..4bc8916 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,8 @@ "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": { @@ -2204,7 +2205,7 @@ }, "node_modules/@types/ws": { "version": "8.5.10", - "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.5.10.tgz", + "resolved": "https://mirrors.cloud.tencent.com/npm/@types/ws/-/ws-8.5.10.tgz", "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, "dependencies": { @@ -4739,8 +4740,9 @@ }, "node_modules/ws": { "version": "8.16.0", - "resolved": "https://registry.npmmirror.com/ws/-/ws-8.16.0.tgz", + "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" }, diff --git a/package.json b/package.json index e7a043a..10a0c76 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "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" } } diff --git a/src/common/config.ts b/src/common/config.ts index e390a4b..762a04b 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -2,7 +2,7 @@ import {Config} from "./types"; const fs = require("fs"); -export class ConfigUtil{ +export class ConfigUtil { configPath: string; constructor(configPath: string) { @@ -10,24 +10,46 @@ export class ConfigUtil{ } getConfig(): Config { + let defaultConfig: Config = { + httpPort: 3000, + httpHosts: [], + wsPort: 3001, + wsHosts: [], + token: "", + enableBase64: false, + debug: false, + log: false, + reportSelfMessage: false + } if (!fs.existsSync(this.configPath)) { - return { - httpPort: 3000, - httpHosts: ["http://127.0.0.1:5000/"], - wsPort: 3001, - wsHosts: ["ws://127.0.0.1:3002/"] - } + return defaultConfig } else { const data = fs.readFileSync(this.configPath, "utf-8"); - let jsonData = JSON.parse(data); - if (!jsonData.hosts) { - jsonData.hosts = []; + let jsonData: Config = defaultConfig; + try { + jsonData = JSON.parse(data) + } + catch (e) {} + if (!jsonData.httpHosts) { + jsonData.httpHosts = [] + } + if (!jsonData.wsHosts) { + jsonData.wsHosts = [] + } + if (!jsonData.wsPort) { + jsonData.wsPort = 3001 + } + if (!jsonData.httpPort) { + jsonData.httpPort = 3000 + } + if (!jsonData.token) { + jsonData.token = "" } return jsonData; } } - - setConfig(config: Config){ - fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8"); + + setConfig(config: Config) { + fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8") } } diff --git a/src/common/data.ts b/src/common/data.ts index bbd23e1..ce94b06 100644 --- a/src/common/data.ts +++ b/src/common/data.ts @@ -1,6 +1,5 @@ -import { NTQQApi } from '../ntqqapi/ntcall'; -import { Friend, Group, GroupMember, RawMessage, SelfInfo } from "../ntqqapi/types"; -import { log } from "./utils"; +import {NTQQApi} from '../ntqqapi/ntcall'; +import {Friend, Group, GroupMember, RawMessage, SelfInfo} from "../ntqqapi/types"; export let groups: Group[] = [] export let friends: Friend[] = [] @@ -86,4 +85,7 @@ export function getStrangerByUin(uin: string) { return uidMaps[key]; } } -} \ No newline at end of file +} + +export const version = "v3.4.0" +export const heartInterval = 15000 // 毫秒 \ No newline at end of file diff --git a/src/common/types.ts b/src/common/types.ts index 54964dd..abc2b88 100644 --- a/src/common/types.ts +++ b/src/common/types.ts @@ -7,6 +7,7 @@ export interface Config { enableHttpPost?: boolean enableWs?: boolean enableWsReverse?: boolean + token?: string enableBase64?: boolean debug?: boolean reportSelfMessage?: boolean diff --git a/src/common/utils.ts b/src/common/utils.ts index 233d2bd..2a1f67d 100644 --- a/src/common/utils.ts +++ b/src/common/utils.ts @@ -2,7 +2,6 @@ import * as path from "path"; import {selfInfo} from "./data"; import {ConfigUtil} from "./config"; import util from "util"; -import { sendLog } from '../main/ipcsend'; const fs = require('fs'); @@ -33,7 +32,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) => { diff --git a/src/global.d.ts b/src/global.d.ts index d410524..df0ba6e 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -1,4 +1,4 @@ -import { Config } from "./common/types"; +import {Config} from "./common/types"; declare var llonebot: { diff --git a/src/main/ipcsend.ts b/src/main/ipcsend.ts index b40da4f..56eeb25 100644 --- a/src/main/ipcsend.ts +++ b/src/main/ipcsend.ts @@ -1,5 +1,5 @@ import {webContents} from 'electron'; -import { CHANNEL_LOG } from '../common/channels'; +import {CHANNEL_LOG} from '../common/channels'; function sendIPCMsg(channel: string, ...data: any) { diff --git a/src/main/main.ts b/src/main/main.ts index c2ab87e..009b7aa 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -1,22 +1,18 @@ // 运行在 Electron 主进程 下的插件入口 -import * as path from "path"; -import { BrowserWindow, ipcMain } from 'electron'; -import * as util from 'util'; +import {BrowserWindow, ipcMain} from 'electron'; -import { Config } from "../common/types"; -import { - CHANNEL_GET_CONFIG, - CHANNEL_LOG, - CHANNEL_SET_CONFIG, -} from "../common/channels"; -import {initWebsocket, postMsg, startExpress, startWebsocketServer} from "../onebot11/server"; -import { CONFIG_DIR, getConfigUtil, log } from "../common/utils"; -import { addHistoryMsg, msgHistory, selfInfo } from "../common/data"; -import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook"; -import { OB11Constructor } from "../onebot11/constructor"; -import { NTQQApi } from "../ntqqapi/ntcall"; -import { Group, RawMessage, SelfInfo } from "../ntqqapi/types"; +import {Config} from "../common/types"; +import {postMsg, setToken, startHTTPServer, initWebsocket} from "../onebot11/server"; +import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "../common/channels"; +import {CONFIG_DIR, getConfigUtil, log} from "../common/utils"; +import {addHistoryMsg, getGroupMember, msgHistory, selfInfo} from "../common/data"; +import {hookNTQQApiReceive, ReceiveCmd, registerReceiveHook} from "../ntqqapi/hook"; +import {OB11Constructor} from "../onebot11/constructor"; +import {NTQQApi} from "../ntqqapi/ntcall"; +import {ChatType, RawMessage} from "../ntqqapi/types"; +import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent"; +import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent"; const fs = require('fs'); @@ -36,7 +32,17 @@ function onLoad() { return getConfigUtil().getConfig(); }) ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => { - getConfigUtil().setConfig(arg); + let oldConfig = getConfigUtil().getConfig(); + getConfigUtil().setConfig(arg) + if (arg.httpPort != oldConfig.httpPort) { + startHTTPServer(arg.httpPort) + } + if (arg.wsPort != oldConfig.wsPort) { + initWebsocket(arg.wsPort) + } + if (arg.token != oldConfig.token) { + setToken(arg.token); + } }) ipcMain.on(CHANNEL_LOG, (event: any, arg: any) => { @@ -47,7 +53,8 @@ function onLoad() { function postRawMsg(msgList: RawMessage[]) { const {debug, reportSelfMessage} = getConfigUtil().getConfig(); for (let message of msgList) { - message.msgShortId = msgHistory[message.msgId]?.msgShortId; + log("收到新消息", message) + message.msgShortId = msgHistory[message.msgId]?.msgShortId if (!message.msgShortId) { addHistoryMsg(message); } @@ -55,8 +62,8 @@ function onLoad() { if (debug) { msg.raw = message; } - if (msg.user_id == selfInfo.uin && !reportSelfMessage) { - return; + if (msg.user_id.toString() == selfInfo.uin && !reportSelfMessage) { + return } postMsg(msg); }).catch(e => log("constructMessage error: ", e.toString())); @@ -64,8 +71,7 @@ function onLoad() { } - function start() { - log("llonebot start"); + async function start() { registerReceiveHook<{ msgList: Array }>(ReceiveCmd.NEW_MSG, (payload) => { try { postRawMsg(payload.msgList); @@ -73,7 +79,39 @@ function onLoad() { log("report message error: ", e.toString()); } }) + registerReceiveHook<{ msgList: Array }>(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 = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId); + postMsg(friendRecallEvent); + } else if (message.chatType == ChatType.group) { + let operatorId = message.senderUin + for (const element of message.elements) { + const operatorUid = element.grayTipElement?.revokeElement.operatorUid + const operator = await getGroupMember(message.peerUin, null, operatorUid) + operatorId = operator.uin + } + const groupRecallEvent = new OB11GroupRecallNoticeEvent( + parseInt(message.peerUin), + parseInt(message.senderUin), + parseInt(operatorId), + oriMessage.msgShortId + ) + postMsg(groupRecallEvent); + } + continue + } + addHistoryMsg(message) + } + }) registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => { const {reportSelfMessage} = getConfigUtil().getConfig(); if (!reportSelfMessage) { @@ -86,12 +124,13 @@ function onLoad() { log("report self message error: ", e.toString()); } }) - NTQQApi.getGroups(true).then(); - - const config = getConfigUtil().getConfig(); - startExpress(config.httpPort); - startWebsocketServer(config.wsPort); - initWebsocket(); + NTQQApi.getGroups(true).then() + + const config = getConfigUtil().getConfig() + startHTTPServer(config.httpPort) + initWebsocket(config.wsPort); + setToken(config.token) + log("LLOneBot start") } const init = async () => { @@ -116,10 +155,9 @@ function onLoad() { log("get self nickname failed", e.toString()); return setTimeout(init, 1000); } - start(); - } - else{ - setTimeout(init, 1000); + start().then(); + } else { + setTimeout(init, 1000) } } setTimeout(init, 1000); @@ -131,7 +169,7 @@ function onBrowserWindowCreated(window: BrowserWindow) { try { hookNTQQApiReceive(window); } catch (e) { - log("llonebot hook error: ", e.toString()) + log("LLOneBot hook error: ", e.toString()) } } diff --git a/src/ntqqapi/constructor.ts b/src/ntqqapi/constructor.ts index 76a38b0..3267e27 100644 --- a/src/ntqqapi/constructor.ts +++ b/src/ntqqapi/constructor.ts @@ -1,4 +1,12 @@ -import {ElementType, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, AtType} from "./types"; +import { + AtType, + ElementType, + SendFaceElement, + SendPicElement, + SendPttElement, + SendReplyElement, + SendTextElement +} from "./types"; import {NTQQApi} from "./ntcall"; @@ -44,7 +52,7 @@ export class SendMsgElementConstructor { } } - static async pic(picPath: string): Promise{ + static async pic(picPath: string): Promise { 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 { + static async ptt(pttPath: string): Promise { 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 + } + } + } } \ No newline at end of file diff --git a/src/ntqqapi/hook.ts b/src/ntqqapi/hook.ts index c9800f0..8f8b63b 100644 --- a/src/ntqqapi/hook.ts +++ b/src/ntqqapi/hook.ts @@ -1,15 +1,12 @@ import {BrowserWindow} from 'electron'; import {log, sleep} from "../common/utils"; import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall"; -import {Group, GroupMember, RawMessage, User} from "./types"; +import {Group, RawMessage, User} from "./types"; import {addHistoryMsg, friends, groups, msgHistory} from "../common/data"; import {v4 as uuidv4} from 'uuid'; -import {callEvent, EventType} from "../onebot11/event/manager"; -import {OB11Message} from "../onebot11/types"; -import {OB11Constructor} from "../onebot11/constructor"; -import BaseMessageEvent from "../onebot11/event/BaseMessageEvent"; -import GroupDecreaseEvent from "../onebot11/event/GroupDecreaseEvent"; -import GroupIncreaseEvent from "../onebot11/event/GroupIncreaseEvent"; +import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent"; +import {OB11GroupIncreaseEvent} from "../onebot11/event/notice/OB11GroupIncreaseEvent"; +import {postMsg} from "../onebot11/server"; export let hookApiCallbacks: Record void> = {} @@ -39,7 +36,7 @@ interface NTQQApiReturnData extends Array { let receiveHooks: Array<{ method: ReceiveCmd, - hookFunc: (payload: any) => void, + hookFunc: ((payload: any) => void | Promise) id: string }> = [] @@ -55,7 +52,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).then() + } } catch (e) { log("hook error", e, receiveData.payload) } @@ -137,7 +137,7 @@ async function processGroupEvent(payload) { for (const member of oldMembers) { if (!newMembersSet.has(member.uin)) { - callEvent(new GroupDecreaseEvent(group.groupCode, parseInt(member.uin))); + postMsg(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin))); break; } } @@ -156,7 +156,7 @@ async function processGroupEvent(payload) { group.members = newMembers; for (const member of newMembers) { if (!oldMembersSet.has(member.uin)) { - callEvent(new GroupIncreaseEvent(group.groupCode, parseInt(member.uin))); + postMsg(new OB11GroupIncreaseEvent(group.groupCode, parseInt(member.uin))); break; } } @@ -208,22 +208,10 @@ registerReceiveHook<{ } }) -registerReceiveHook<{ msgList: Array }>(ReceiveCmd.UPDATE_MSG, (payload) => { - for (const message of payload.msgList) { - addHistoryMsg(message) - } -}) - registerReceiveHook<{ msgList: Array }>(ReceiveCmd.NEW_MSG, (payload) => { for (const message of payload.msgList) { // log("收到新消息，push到历史记录", message) addHistoryMsg(message) - - OB11Constructor.message(message).then( - function (message) { - callEvent(new BaseMessageEvent(), message); - } - ); } const msgIds = Object.keys(msgHistory); if (msgIds.length > 30000) { diff --git a/src/ntqqapi/ntcall.ts b/src/ntqqapi/ntcall.ts index 7d1e5ba..01de63d 100644 --- a/src/ntqqapi/ntcall.ts +++ b/src/ntqqapi/ntcall.ts @@ -1,12 +1,8 @@ -import { ipcMain } from "electron"; -import { v4 as uuidv4 } from "uuid"; -import { ReceiveCmd, hookApiCallbacks, registerReceiveHook, removeReceiveHook } from "./hook"; -import { log } from "../common/utils"; -import { ChatType, Friend, PicElement, SelfInfo, User } from "./types"; -import { Group } from "./types"; -import { GroupMember } from "./types"; -import { RawMessage } from "./types"; -import { SendMessageElement } from "./types"; +import {ipcMain} from "electron"; +import {v4 as uuidv4} from "uuid"; +import {hookApiCallbacks, ReceiveCmd, registerReceiveHook, removeReceiveHook} from "./hook"; +import {log} from "../common/utils"; +import {ChatType, Friend, Group, GroupMember, RawMessage, SelfInfo, SendMessageElement, User} from "./types"; import * as fs from "fs"; interface IPCReceiveEvent { diff --git a/src/ntqqapi/types.ts b/src/ntqqapi/types.ts index da86cf8..da4ff74 100644 --- a/src/ntqqapi/types.ts +++ b/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,6 +190,22 @@ 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 @@ -191,6 +217,7 @@ export interface RawMessage { sendNickName: string; sendMemberName?: string; // 发送者群名片 chatType: ChatType; + sendStatus?: number; // 消息状态，2是已撤回 elements: { elementId: string, replyElement: { @@ -208,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; - }; -} - - diff --git a/src/onebot11/ReconnectingWebsocket.ts b/src/onebot11/ReconnectingWebsocket.ts index 032a5b9..ecf5c5e 100644 --- a/src/onebot11/ReconnectingWebsocket.ts +++ b/src/onebot11/ReconnectingWebsocket.ts @@ -1,6 +1,8 @@ +import {log} from "../common/utils"; + const WebSocket = require("ws"); -class ReconnectingWebsocket { +export class ReconnectingWebsocket { private websocket; private readonly url: string; @@ -15,14 +17,6 @@ class ReconnectingWebsocket { public onclose = function () {} - private heartbeat() { - clearTimeout(this.websocket.pingTimeout); - - this.websocket.pingTimeout = setTimeout(() => { - this.websocket.terminate(); - }, 3000); - } - public send(msg) { if (this.websocket && this.websocket.readyState == WebSocket.OPEN) { this.websocket.send(msg); @@ -50,15 +44,13 @@ class ReconnectingWebsocket { this.websocket.on("error", console.error); - this.websocket.on("ping", this.heartbeat); - this.websocket.on("close", function close() { console.log("The websocket connection: " + instance.url + " closed, trying reconnecting..."); instance.onclose(); - setTimeout(instance.reconnect, 3000); + setTimeout(() => { + instance.reconnect(); + }, 3000); // TODO: 重连间隔在配置文件中实现 }); } -} - -export default ReconnectingWebsocket; \ No newline at end of file +} \ No newline at end of file diff --git a/src/onebot11/actions/CanSendImage.ts b/src/onebot11/actions/CanSendImage.ts new file mode 100644 index 0000000..d018808 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/src/onebot11/actions/CanSendRecord.ts b/src/onebot11/actions/CanSendRecord.ts new file mode 100644 index 0000000..6019253 --- /dev/null +++ b/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{ + actionName = ActionName.CanSendRecord + + protected async _handle(payload): Promise{ + return { + yes: true + } + } +} \ No newline at end of file diff --git a/src/onebot11/actions/DeleteMsg.ts b/src/onebot11/actions/DeleteMsg.ts index 7c999c3..8ed6c1c 100644 --- a/src/onebot11/actions/DeleteMsg.ts +++ b/src/onebot11/actions/DeleteMsg.ts @@ -1,7 +1,7 @@ -import { ActionName } from "./types"; +import {ActionName} from "./types"; import BaseAction from "./BaseAction"; -import { NTQQApi } from "../../ntqqapi/ntcall"; -import { getHistoryMsgByShortId, msgHistory } from "../../common/data"; +import {NTQQApi} from "../../ntqqapi/ntcall"; +import {getHistoryMsgByShortId} from "../../common/data"; interface Payload { message_id: number diff --git a/src/onebot11/actions/GetFriendList.ts b/src/onebot11/actions/GetFriendList.ts index 6827728..4aff82a 100644 --- a/src/onebot11/actions/GetFriendList.ts +++ b/src/onebot11/actions/GetFriendList.ts @@ -1,8 +1,8 @@ -import { OB11User } from '../types'; -import { OB11Constructor } from "../constructor"; -import { friends } from "../../common/data"; +import {OB11User} from '../types'; +import {OB11Constructor} from "../constructor"; +import {friends} from "../../common/data"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; class GetFriendList extends BaseAction { diff --git a/src/onebot11/actions/GetGroupInfo.ts b/src/onebot11/actions/GetGroupInfo.ts index af59af1..952972c 100644 --- a/src/onebot11/actions/GetGroupInfo.ts +++ b/src/onebot11/actions/GetGroupInfo.ts @@ -1,24 +1,24 @@ -import { OB11Group } from '../types'; -import { getGroup, groups } from "../../common/data"; -import { OB11Constructor } from "../constructor"; +import {OB11Group} from '../types'; +import {getGroup} from "../../common/data"; +import {OB11Constructor} from "../constructor"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; interface PayloadType { group_id: number } -class GetGroupInfo extends BaseAction { +class GetGroupInfo extends BaseAction { actionName = ActionName.GetGroupInfo protected async _handle(payload: PayloadType) { const group = await getGroup(payload.group_id.toString()) if (group) { - return OB11Constructor.groups(groups) + return OB11Constructor.group(group) } else { throw `群${payload.group_id}不存在` } } } -export default GetGroupInfo \ No newline at end of file +export default GetGroupInfo diff --git a/src/onebot11/actions/GetGroupList.ts b/src/onebot11/actions/GetGroupList.ts index d56cf12..bfbdc71 100644 --- a/src/onebot11/actions/GetGroupList.ts +++ b/src/onebot11/actions/GetGroupList.ts @@ -1,9 +1,8 @@ -import { OB11Group } from '../types'; -import { OB11Constructor } from "../constructor"; -import { groups } from "../../common/data"; +import {OB11Group} from '../types'; +import {OB11Constructor} from "../constructor"; +import {groups} from "../../common/data"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; - +import {ActionName} from "./types"; class GetGroupList extends BaseAction { diff --git a/src/onebot11/actions/GetGroupMemberInfo.ts b/src/onebot11/actions/GetGroupMemberInfo.ts index 7010e9a..7546c1c 100644 --- a/src/onebot11/actions/GetGroupMemberInfo.ts +++ b/src/onebot11/actions/GetGroupMemberInfo.ts @@ -1,8 +1,8 @@ -import { OB11GroupMember } from '../types'; -import { getGroupMember } from "../../common/data"; -import { OB11Constructor } from "../constructor"; +import {OB11GroupMember} from '../types'; +import {getGroupMember} from "../../common/data"; +import {OB11Constructor} from "../constructor"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; export interface PayloadType { diff --git a/src/onebot11/actions/GetGroupMemberList.ts b/src/onebot11/actions/GetGroupMemberList.ts index f9d9b55..0f97973 100644 --- a/src/onebot11/actions/GetGroupMemberList.ts +++ b/src/onebot11/actions/GetGroupMemberList.ts @@ -1,9 +1,9 @@ -import { OB11GroupMember } from '../types'; -import { getGroup } from "../../common/data"; -import { NTQQApi } from "../../ntqqapi/ntcall"; -import { OB11Constructor } from "../constructor"; +import {OB11GroupMember} from '../types'; +import {getGroup} from "../../common/data"; +import {NTQQApi} from "../../ntqqapi/ntcall"; +import {OB11Constructor} from "../constructor"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; export interface PayloadType { group_id: number diff --git a/src/onebot11/actions/GetLoginInfo.ts b/src/onebot11/actions/GetLoginInfo.ts index 56dbfe1..ab8694f 100644 --- a/src/onebot11/actions/GetLoginInfo.ts +++ b/src/onebot11/actions/GetLoginInfo.ts @@ -1,8 +1,8 @@ -import { OB11User } from '../types'; -import { OB11Constructor } from "../constructor"; -import { selfInfo } from "../../common/data"; +import {OB11User} from '../types'; +import {OB11Constructor} from "../constructor"; +import {selfInfo} from "../../common/data"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; class GetLoginInfo extends BaseAction { diff --git a/src/onebot11/actions/GetMsg.ts b/src/onebot11/actions/GetMsg.ts index 22de0cf..0be0ddf 100644 --- a/src/onebot11/actions/GetMsg.ts +++ b/src/onebot11/actions/GetMsg.ts @@ -1,8 +1,8 @@ -import { getHistoryMsgByShortId, msgHistory } from "../../common/data"; -import { OB11Message } from '../types'; -import { OB11Constructor } from "../constructor"; +import {getHistoryMsgByShortId} from "../../common/data"; +import {OB11Message} from '../types'; +import {OB11Constructor} from "../constructor"; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; export interface PayloadType { @@ -16,6 +16,9 @@ class GetMsg extends BaseAction { protected async _handle(payload: PayloadType){ // log("history msg ids", Object.keys(msgHistory)); + if (!payload.message_id){ + throw("参数message_id不能为空") + } const msg = getHistoryMsgByShortId(payload.message_id) if (msg) { const msgData = await OB11Constructor.message(msg); diff --git a/src/onebot11/actions/GetStatus.ts b/src/onebot11/actions/GetStatus.ts new file mode 100644 index 0000000..c3f038c --- /dev/null +++ b/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 { + actionName = ActionName.GetStatus + protected async _handle(payload: any): Promise { + return { + online: null, + good: true + } + } +} \ No newline at end of file diff --git a/src/onebot11/actions/GetVersionInfo.ts b/src/onebot11/actions/GetVersionInfo.ts new file mode 100644 index 0000000..83ba16b --- /dev/null +++ b/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{ + actionName = ActionName.GetVersionInfo + protected async _handle(payload: any): Promise { + return { + app_name: "LLOneBot", + protocol_version: "v11", + app_version: version + } + } +} \ No newline at end of file diff --git a/src/onebot11/actions/SendGroupMsg.ts b/src/onebot11/actions/SendGroupMsg.ts index 13df317..3bb09b5 100644 --- a/src/onebot11/actions/SendGroupMsg.ts +++ b/src/onebot11/actions/SendGroupMsg.ts @@ -1,5 +1,5 @@ import SendMsg from "./SendMsg"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; class SendGroupMsg extends SendMsg{ diff --git a/src/onebot11/actions/SendMsg.ts b/src/onebot11/actions/SendMsg.ts index c8bb429..cc84d23 100644 --- a/src/onebot11/actions/SendMsg.ts +++ b/src/onebot11/actions/SendMsg.ts @@ -1,20 +1,12 @@ -import { AtType, ChatType, Group } from "../../ntqqapi/types"; -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"; -import { SendMessageElement } from "../../ntqqapi/types"; -import { SendMsgElementConstructor } from "../../ntqqapi/constructor"; -import { uri2local } from "../utils"; -import { v4 as uuid4 } from 'uuid'; +import {AtType, ChatType, Group, SendMessageElement} from "../../ntqqapi/types"; +import {addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getStrangerByUin,} from "../../common/data"; +import {OB11MessageData, OB11MessageDataType, OB11PostSendMsg} from '../types'; +import {NTQQApi, Peer} from "../../ntqqapi/ntcall"; +import {SendMsgElementConstructor} from "../../ntqqapi/constructor"; +import {uri2local} from "../utils"; +import {v4 as uuid4} from 'uuid'; import BaseAction from "./BaseAction"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; import * as fs from "fs"; export interface ReturnDataType { @@ -24,7 +16,7 @@ export interface ReturnDataType { class SendMsg extends BaseAction { actionName = ActionName.SendMsg - protected async _handle(payload: OB11PostSendMsg){ + protected async _handle(payload: OB11PostSendMsg) { const peer: Peer = { chatType: ChatType.friend, peerUid: "" @@ -39,18 +31,16 @@ class SendMsg extends BaseAction { 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 @@ -63,8 +53,7 @@ class SendMsg extends BaseAction { text: payload.message } }] as OB11MessageData[] - } - else if (!Array.isArray(payload.message)) { + } else if (!Array.isArray(payload.message)) { payload.message = [payload.message] } const sendElements: SendMessageElement[] = [] @@ -75,22 +64,23 @@ class SendMsg extends BaseAction { 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) { @@ -100,20 +90,27 @@ class SendMsg extends BaseAction { 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)) } } @@ -125,10 +122,11 @@ class SendMsg extends BaseAction { try { const returnMsg = await NTQQApi.sendMsg(peer, sendElements) addHistoryMsg(returnMsg) - deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{})) - return { message_id: returnMsg.msgShortId } + deleteAfterSentFiles.map(f => fs.unlink(f, () => { + })) + return {message_id: returnMsg.msgShortId} } catch (e) { - throw(e.toString()) + throw (e.toString()) } } } diff --git a/src/onebot11/actions/SendPrivateMsg.ts b/src/onebot11/actions/SendPrivateMsg.ts index 26a8b22..5ce5b95 100644 --- a/src/onebot11/actions/SendPrivateMsg.ts +++ b/src/onebot11/actions/SendPrivateMsg.ts @@ -1,5 +1,5 @@ import SendMsg from "./SendMsg"; -import { ActionName } from "./types"; +import {ActionName} from "./types"; class SendPrivateMsg extends SendMsg { actionName = ActionName.SendPrivateMsg diff --git a/src/onebot11/actions/index.ts b/src/onebot11/actions/index.ts index dfd90c5..dfbfa90 100644 --- a/src/onebot11/actions/index.ts +++ b/src/onebot11/actions/index.ts @@ -10,6 +10,10 @@ import SendPrivateMsg from './SendPrivateMsg' import SendMsg from './SendMsg' import DeleteMsg from "./DeleteMsg"; import BaseAction from "./BaseAction"; +import GetVersionInfo from "./GetVersionInfo"; +import CanSendRecord from "./CanSendRecord"; +import CanSendImage from "./CanSendImage"; +import GetStatus from "./GetStatus"; export const actionHandlers = [ new GetMsg(), @@ -17,7 +21,11 @@ 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() ] function initActionMap() { @@ -29,4 +37,4 @@ function initActionMap() { return actionMap } -export const actionMap = initActionMap(); \ No newline at end of file +export const actionMap = initActionMap(); diff --git a/src/onebot11/actions/types.ts b/src/onebot11/actions/types.ts index fdfeeb5..1fc5145 100644 --- a/src/onebot11/actions/types.ts +++ b/src/onebot11/actions/types.ts @@ -11,7 +11,7 @@ export interface InvalidCheckResult { [k: string | number]: any } -export enum ActionName{ +export enum ActionName { GetLoginInfo = "get_login_info", GetFriendList = "get_friend_list", GetGroupInfo = "get_group_info", @@ -22,5 +22,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", } \ No newline at end of file diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts index bbe7c92..2a2c59a 100644 --- a/src/onebot11/constructor.ts +++ b/src/onebot11/constructor.ts @@ -1,15 +1,8 @@ -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, msgHistory, selfInfo } from '../common/data'; -import { file2base64, getConfigUtil, log } from "../common/utils"; -import { NTQQApi } from "../ntqqapi/ntcall"; +import {OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11Message, OB11MessageDataType, OB11User} from "./types"; +import {AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User} from '../ntqqapi/types'; +import {getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo} from '../common/data'; +import {file2base64, getConfigUtil, log} from "../common/utils"; +import {NTQQApi} from "../ntqqapi/ntcall"; export class OB11Constructor { @@ -18,14 +11,14 @@ export class OB11Constructor { 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.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 || "", }, @@ -37,10 +30,11 @@ export class OB11Constructor { } if (msg.chatType == ChatType.group) { resMsg.sub_type = "normal" - resMsg.group_id = msg.peerUin + 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" @@ -111,6 +105,9 @@ export class OB11Constructor { } else if (element.arkElement) { message_data["type"] = OB11MessageDataType.json; message_data["data"]["data"] = element.arkElement.bytesData; + } else if (element.faceElement){ + message_data["type"] = OB11MessageDataType.face; + message_data["data"]["id"] = element.faceElement.faceIndex.toString(); } if (message_data.data.http_file) { message_data.data.file = message_data.data.http_file @@ -135,7 +132,7 @@ export class OB11Constructor { static friend(friend: User): OB11User { return { - user_id: friend.uin, + user_id: parseInt(friend.uin), nickname: friend.nick, remark: friend.remark } @@ -144,7 +141,7 @@ export class OB11Constructor { static selfInfo(selfInfo: SelfInfo): OB11User { return { - user_id: selfInfo.uin, + user_id: parseInt(selfInfo.uin), nickname: selfInfo.nick } } @@ -163,8 +160,8 @@ export class OB11Constructor { 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 } @@ -177,8 +174,10 @@ export class OB11Constructor { static group(group: Group): OB11Group { return { - group_id: group.groupCode, - group_name: group.groupName + group_id: parseInt(group.groupCode), + group_name: group.groupName, + member_count: group.memberCount, + max_member_count: group.maxMember } } diff --git a/src/onebot11/event/BaseEvent.ts b/src/onebot11/event/BaseEvent.ts deleted file mode 100644 index 39e8679..0000000 --- a/src/onebot11/event/BaseEvent.ts +++ /dev/null @@ -1,10 +0,0 @@ -import {selfInfo} from "../../common/data"; -import {EventType} from "./manager"; - -class BaseEvent { - time = new Date().getTime(); - self_id = selfInfo.uin; - post_type: EventType; -} - -export default BaseEvent; \ No newline at end of file diff --git a/src/onebot11/event/BaseMessageEvent.ts b/src/onebot11/event/BaseMessageEvent.ts deleted file mode 100644 index ba47aee..0000000 --- a/src/onebot11/event/BaseMessageEvent.ts +++ /dev/null @@ -1,8 +0,0 @@ -import BaseEvent from "./BaseEvent"; -import {EventType} from "./manager"; - -class BaseMessageEvent extends BaseEvent { - post_type = EventType.MESSAGE; -} - -export default BaseMessageEvent \ No newline at end of file diff --git a/src/onebot11/event/OB11BaseEvent.ts b/src/onebot11/event/OB11BaseEvent.ts new file mode 100644 index 0000000..f45577f --- /dev/null +++ b/src/onebot11/event/OB11BaseEvent.ts @@ -0,0 +1,15 @@ +import {selfInfo} from "../../common/data"; + +export enum EventType { + META = "meta_event", + REQUEST = "request", + NOTICE = "notice", + MESSAGE = "message" +} + + +export abstract class OB11BaseEvent { + time = new Date().getTime(); + self_id = selfInfo.uin; + post_type: EventType; +} \ No newline at end of file diff --git a/src/onebot11/event/manager.ts b/src/onebot11/event/manager.ts index 2bf0de2..93ce191 100644 --- a/src/onebot11/event/manager.ts +++ b/src/onebot11/event/manager.ts @@ -1,32 +1,24 @@ -import {selfInfo} from "../../common/data"; -import BaseEvent from "./BaseEvent"; +import * as websocket from "ws"; +import {PostMsgType, wsReply} from "../server"; +import {ReconnectingWebsocket} from "../ReconnectingWebsocket"; const websocketList = []; -export enum EventType { - META = "meta_event", - REQUEST = "request", - NOTICE = "notice", - MESSAGE = "message" -} - -export function registerEventSender(ws) { +export function registerEventSender(ws: websocket.WebSocket | ReconnectingWebsocket) { websocketList.push(ws); } -export function unregisterEventSender(ws) { +export function unregisterEventSender(ws: websocket.WebSocket | ReconnectingWebsocket) { let index = websocketList.indexOf(ws); if (index !== -1) { websocketList.splice(index, 1); } } -export function callEvent(event: BaseEvent, data: DataType = null) { - - const assignedEvent = (data == null ? event : Object.assign(event, data)); - for (const ws of websocketList) { - ws.send( - JSON.stringify(assignedEvent) - ); - } +export function callEvent(event: PostMsgType) { + new Promise(() => { + for (const ws of websocketList) { + wsReply(ws, event); + } + }).then() } \ No newline at end of file diff --git a/src/onebot11/event/message/OB11BaseMessageEvent.ts b/src/onebot11/event/message/OB11BaseMessageEvent.ts new file mode 100644 index 0000000..6018aeb --- /dev/null +++ b/src/onebot11/event/message/OB11BaseMessageEvent.ts @@ -0,0 +1,5 @@ +import {EventType, OB11BaseEvent} from "../OB11BaseEvent"; + +export abstract class OB11BaseMessageEvent extends OB11BaseEvent { + post_type = EventType.MESSAGE; +} \ No newline at end of file diff --git a/src/onebot11/event/meta/OB11BaseMetaEvent.ts b/src/onebot11/event/meta/OB11BaseMetaEvent.ts new file mode 100644 index 0000000..d3946e6 --- /dev/null +++ b/src/onebot11/event/meta/OB11BaseMetaEvent.ts @@ -0,0 +1,6 @@ +import {EventType, OB11BaseEvent} from "../OB11BaseEvent"; + +export abstract class OB11BaseMetaEvent extends OB11BaseEvent { + post_type = EventType.META; + meta_event_type: string; +} \ No newline at end of file diff --git a/src/onebot11/event/meta/OB11HeartbeatEvent.ts b/src/onebot11/event/meta/OB11HeartbeatEvent.ts new file mode 100644 index 0000000..42fa024 --- /dev/null +++ b/src/onebot11/event/meta/OB11HeartbeatEvent.ts @@ -0,0 +1,21 @@ +import {OB11BaseMetaEvent} from "./OB11BaseMetaEvent"; + +interface HeartbeatStatus { + online: boolean | null, + good: boolean +} + +export class OB11HeartbeatEvent extends OB11BaseMetaEvent { + meta_event_type = "heartbeat"; + status: HeartbeatStatus; + interval: number; + + public constructor(isOnline: boolean | null, isGood: boolean, interval: number) { + super(); + this.interval = interval; + this.status = { + online: isOnline, + good: isGood + } + } +} \ No newline at end of file diff --git a/src/onebot11/event/meta/OB11LifeCycleEvent.ts b/src/onebot11/event/meta/OB11LifeCycleEvent.ts new file mode 100644 index 0000000..e9243ca --- /dev/null +++ b/src/onebot11/event/meta/OB11LifeCycleEvent.ts @@ -0,0 +1,17 @@ +import {OB11BaseMetaEvent} from "./OB11BaseMetaEvent"; + +export enum LifeCycleSubType { + ENABLE = "enable", + DISABLE = "disable", + CONNECT = "connect" +} + +export class OB11LifeCycleEvent extends OB11BaseMetaEvent { + meta_event_type = "lifecycle"; + sub_type: LifeCycleSubType; + + public constructor(subType: LifeCycleSubType) { + super(); + this.sub_type = subType; + } +} \ No newline at end of file diff --git a/src/onebot11/event/notice/OB11BaseNoticeEvent.ts b/src/onebot11/event/notice/OB11BaseNoticeEvent.ts new file mode 100644 index 0000000..9429d2c --- /dev/null +++ b/src/onebot11/event/notice/OB11BaseNoticeEvent.ts @@ -0,0 +1,5 @@ +import {EventType, OB11BaseEvent} from "../OB11BaseEvent"; + +export abstract class OB11BaseNoticeEvent extends OB11BaseEvent { + post_type = EventType.NOTICE; +} \ No newline at end of file diff --git a/src/onebot11/event/notice/OB11FriendRecallNoticeEvent.ts b/src/onebot11/event/notice/OB11FriendRecallNoticeEvent.ts new file mode 100644 index 0000000..9344b44 --- /dev/null +++ b/src/onebot11/event/notice/OB11FriendRecallNoticeEvent.ts @@ -0,0 +1,13 @@ +import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent"; + +export class OB11FriendRecallNoticeEvent extends OB11BaseNoticeEvent { + notice_type = "friend_recall" + user_id: number + message_id: number + + public constructor(userId: number, messageId: number) { + super(); + this.user_id = userId; + this.message_id = messageId; + } +} \ No newline at end of file diff --git a/src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts b/src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts new file mode 100644 index 0000000..f30739e --- /dev/null +++ b/src/onebot11/event/notice/OB11GroupAdminNoticeEvent.ts @@ -0,0 +1,6 @@ +import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent"; + +export class OB11GroupAdminNoticeEvent extends OB11BaseNoticeEvent { + notice_type = "group_admin" + sub_type: string // "set" | "unset" +} \ No newline at end of file diff --git a/src/onebot11/event/GroupDecreaseEvent.ts b/src/onebot11/event/notice/OB11GroupDecreaseEvent.ts similarity index 54% rename from src/onebot11/event/GroupDecreaseEvent.ts rename to src/onebot11/event/notice/OB11GroupDecreaseEvent.ts index b53c326..f9518d2 100644 --- a/src/onebot11/event/GroupDecreaseEvent.ts +++ b/src/onebot11/event/notice/OB11GroupDecreaseEvent.ts @@ -1,13 +1,9 @@ -import BaseEvent from "./BaseEvent"; -import {EventType} from "./manager"; +import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent"; -class GroupDecreaseEvent extends BaseEvent { - post_type = EventType.NOTICE; +export class OB11GroupDecreaseEvent extends OB11GroupNoticeEvent { notice_type = "group_decrease"; - subtype = "leave"; // TODO: 实现其他几种子类型的识别 - group_id: number; + sub_type = "leave"; // TODO: 实现其他几种子类型的识别 ("leave" | "kick" | "kick_me") operate_id: number; - user_id: number; constructor(groupId: number, userId: number) { super(); @@ -16,5 +12,3 @@ class GroupDecreaseEvent extends BaseEvent { this.user_id = userId; } } - -export default GroupDecreaseEvent \ No newline at end of file diff --git a/src/onebot11/event/GroupIncreaseEvent.ts b/src/onebot11/event/notice/OB11GroupIncreaseEvent.ts similarity index 53% rename from src/onebot11/event/GroupIncreaseEvent.ts rename to src/onebot11/event/notice/OB11GroupIncreaseEvent.ts index 9d75b1c..0b07394 100644 --- a/src/onebot11/event/GroupIncreaseEvent.ts +++ b/src/onebot11/event/notice/OB11GroupIncreaseEvent.ts @@ -1,13 +1,9 @@ -import BaseEvent from "./BaseEvent"; -import {EventType} from "./manager"; +import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent"; -class GroupIncreaseEvent extends BaseEvent { - post_type = EventType.NOTICE; +export class OB11GroupIncreaseEvent extends OB11GroupNoticeEvent { notice_type = "group_increase"; - subtype = "approve"; // TODO: 实现其他几种子类型的识别 - group_id: number; + sub_type = "approve"; // TODO: 实现其他几种子类型的识别 ("approve" | "invite") operate_id: number; - user_id: number; constructor(groupId: number, userId: number) { super(); @@ -15,7 +11,4 @@ class GroupIncreaseEvent extends BaseEvent { this.operate_id = userId; // 实际上不应该这么实现，但是现在还没有办法识别用户是被邀请的，还是主动加入的 this.user_id = userId; } -} - - -export default GroupIncreaseEvent \ No newline at end of file +} \ No newline at end of file diff --git a/src/onebot11/event/notice/OB11GroupNoticeEvent.ts b/src/onebot11/event/notice/OB11GroupNoticeEvent.ts new file mode 100644 index 0000000..31c1d6c --- /dev/null +++ b/src/onebot11/event/notice/OB11GroupNoticeEvent.ts @@ -0,0 +1,6 @@ +import {OB11BaseNoticeEvent} from "./OB11BaseNoticeEvent"; + +export abstract class OB11GroupNoticeEvent extends OB11BaseNoticeEvent { + group_id: number; + user_id: number; +} \ No newline at end of file diff --git a/src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts b/src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts new file mode 100644 index 0000000..83c31d5 --- /dev/null +++ b/src/onebot11/event/notice/OB11GroupRecallNoticeEvent.ts @@ -0,0 +1,16 @@ +import {OB11GroupNoticeEvent} from "./OB11GroupNoticeEvent"; + +export class OB11GroupRecallNoticeEvent extends OB11GroupNoticeEvent { + notice_type = "group_recall" + operator_id: number + message_id: number + + constructor(groupId: number, userId: number, operatorId: number, messageId: number) { + super(); + + this.group_id = groupId; + this.user_id = userId; + this.operator_id = operatorId; + this.message_id = messageId; + } +} \ No newline at end of file diff --git a/src/onebot11/server.ts b/src/onebot11/server.ts index 88ef669..b2a2a7c 100644 --- a/src/onebot11/server.ts +++ b/src/onebot11/server.ts @@ -1,26 +1,25 @@ -import { getConfigUtil, log } from "../common/utils"; - -const express = require("express"); -const expressWs = require("express-ws"); - -import { Request } from 'express'; -import { Response } from 'express'; - -const JSONbig = require('json-bigint')({ storeAsString: true }); -import { selfInfo } from "../common/data"; -import { OB11Message, OB11Return, OB11MessageData } from './types'; +import * as http from "http"; +import * as websocket from "ws"; +import urlParse from "url"; +import express, {Request, Response} from "express"; +import {getConfigUtil, log} from "../common/utils"; +import {heartInterval, selfInfo} from "../common/data"; +import {OB11Message, OB11MessageData, OB11Return} from './types'; import {actionHandlers, actionMap} from "./actions"; import {OB11Response, OB11WebsocketResponse} from "./actions/utils"; -import {registerEventSender, unregisterEventSender} from "./event/manager"; -import ReconnectingWebsocket from "./ReconnectingWebsocket"; +import {callEvent, registerEventSender, unregisterEventSender} from "./event/manager"; +import {ReconnectingWebsocket} from "./ReconnectingWebsocket"; +import {ActionName} from "./actions/types"; +import {OB11BaseMetaEvent} from "./event/meta/OB11BaseMetaEvent"; +import {OB11BaseNoticeEvent} from "./event/notice/OB11BaseNoticeEvent"; +import BaseAction from "./actions/BaseAction"; +import {LifeCycleSubType, OB11LifeCycleEvent} from "./event/meta/OB11LifeCycleEvent"; +import {OB11HeartbeatEvent} from "./event/meta/OB11HeartbeatEvent"; +let accessToken = ""; +let heartbeatRunning = false; // @SiberianHusky 2021-08-15 -enum WebsocketType { - API, - EVENT, - ALL -} function checkSendMessage(sendMsgList: OB11MessageData[]) { function checkUri(uri: string): boolean { @@ -59,11 +58,14 @@ function checkSendMessage(sendMsgList: OB11MessageData[]) { // ==end== -const expressAPP = express(); -expressAPP.use(express.urlencoded({ extended: true, limit: "500mb" })); +const JSONbig = require('json-bigint')({storeAsString: true}); -const expressWsApp = express(); -const websocketClientConnections = []; +const expressAPP = express(); +expressAPP.use(express.urlencoded({extended: true, limit: "500mb"})); + +let httpServer: http.Server = null; + +let websocketServer = null; expressAPP.use((req, res, next) => { let data = ''; @@ -83,185 +85,258 @@ expressAPP.use((req, res, next) => { }); }); -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已启动'); }) if (getConfigUtil().getConfig().enableHttp) { - expressAPP.listen(port, "0.0.0.0", () => { + httpServer = expressAPP.listen(port, "0.0.0.0", () => { console.log(`llonebot http service started 0.0.0.0:${port}`); }); } } -export function startWebsocketServer(port: number) { - const config = getConfigUtil().getConfig(); - if (config.enableWs) { - try { - expressWs(expressWsApp) - expressWsApp.listen(getConfigUtil().getConfig().wsPort, function () { - console.log(`llonebot websocket service started 0.0.0.0:${port}`); - }); - } - catch (e) { - console.log(e); - } - } -} +export function initWebsocket(port: number) { + if (!heartbeatRunning) { + setInterval(() => { + callEvent(new OB11HeartbeatEvent(true, true, heartInterval)); + }, heartInterval); // 心跳包 + + heartbeatRunning = true; + } -export function initWebsocket() { if (getConfigUtil().getConfig().enableWs) { - expressWsApp.ws("/api", (ws, req) => { - initWebsocketServer(ws, req, WebsocketType.API); - }); - expressWsApp.ws("/event", (ws, req) => { - initWebsocketServer(ws, req, WebsocketType.EVENT); - }); - expressWsApp.ws("/", (ws, req) => { - initWebsocketServer(ws, req, WebsocketType.ALL); - }); + if (websocketServer) { + websocketServer.close((err) => { + log("ws server close failed!", err) + }) + } + + websocketServer = new websocket.Server({port}); + console.log(`llonebot websocket service started 0.0.0.0:${port}`); + + websocketServer.on("connection", (ws, req) => { + const url = req.url.split("?").shift(); + log("receive ws connect", url) + let token: string = "" + const authHeader = req.headers['authorization']; + if (authHeader) { + token = authHeader.split("Bearer ").pop() + log("receive ws header token", token); + } else { + const parsedUrl = urlParse.parse(req.url, true); + const urlToken = parsedUrl.query.access_token; + if (urlToken) { + if (Array.isArray(urlToken)) { + token = urlToken[0] + } else { + token = urlToken + } + log("receive ws url token", token); + } + } + if (accessToken) { + if (token != accessToken) { + ws.send(JSON.stringify(OB11WebsocketResponse.res(null, "failed", 1403, "token验证失败"))) + return ws.close() + } + } + + if (url == "/api" || url == "/api/" || url == "/") { + ws.on("message", async (msg) => { + let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}} + let echo = "" + log("收到正向Websocket消息", msg.toString()) + try { + receiveData = JSON.parse(msg.toString()) + echo = receiveData.echo + } catch (e) { + return wsReply(ws, OB11WebsocketResponse.error("json解析失败，请检查数据格式", 1400, echo)) + } + const action: BaseAction = actionMap.get(receiveData.action); + if (!action) { + return wsReply(ws, OB11WebsocketResponse.error("不支持的api " + receiveData.action, 1404, echo)) + } + try { + let handleResult = await action.websocketHandle(receiveData.params, echo); + wsReply(ws, handleResult) + } catch (e) { + wsReply(ws, OB11WebsocketResponse.error(`api处理出错:${e}`, 1200, echo)) + } + }) + } + if (url == "/event" || url == "/event/" || url == "/") { + registerEventSender(ws); + + log("event上报ws客户端已连接") + + try { + wsReply(ws, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT)) + } catch (e){ + log("发送生命周期失败", e) + } + + ws.on("close", () => { + log("event上报ws客户端已断开") + unregisterEventSender(ws); + }) + } + }) } initReverseWebsocket(); } - function initReverseWebsocket() { const config = getConfigUtil().getConfig(); if (config.enableWsReverse) { + console.log("Prepare to connect all reverse websockets..."); for (const url of config.wsHosts) { - try { - let wsClient = new ReconnectingWebsocket(url); - websocketClientConnections.push(wsClient); - registerEventSender(wsClient); + new Promise(() => { + try { + let wsClient = new ReconnectingWebsocket(url); + registerEventSender(wsClient); - wsClient.onclose = function () { - console.log("The websocket connection: " + url + " closed, trying reconnecting..."); - unregisterEventSender(wsClient); - let index = websocketClientConnections.indexOf(wsClient); - if (index !== -1) { - websocketClientConnections.splice(index, 1); + wsClient.onopen = function () { + wsReply(wsClient, new OB11LifeCycleEvent(LifeCycleSubType.CONNECT)); } - } - wsClient.onmessage = async function (message) { - console.log(message); - if (typeof message === "string") { + wsClient.onclose = function () { + unregisterEventSender(wsClient); + } + + wsClient.onmessage = async function (msg) { + let receiveData: { action: ActionName, params: any, echo?: string } = {action: null, params: {}} + let echo = "" + log("收到正向Websocket消息", msg.toString()) try { - let recv = JSON.parse(message); - let echo = recv.echo ?? ""; - - if (actionMap.has(recv.action)) { - let action = actionMap.get(recv.action); - const result = await action.websocketHandle(recv.params, echo); - wsClient.send(JSON.stringify(result)); - } - else { - wsClient.send(JSON.stringify(OB11WebsocketResponse.error("Bad Request", 1400, echo))); - } + receiveData = JSON.parse(msg.toString()) + echo = receiveData.echo } catch (e) { - log(e.stack); - wsClient.send(JSON.stringify(OB11WebsocketResponse.error(e.stack.toString(), 1200))); + return wsReply(wsClient, OB11WebsocketResponse.error("json解析失败，请检查数据格式", 1400, echo)) + } + const action: BaseAction = actionMap.get(receiveData.action); + if (!action) { + return wsReply(wsClient, OB11WebsocketResponse.error("不支持的api " + receiveData.action, 1404, echo)) + } + try { + let handleResult = await action.websocketHandle(receiveData.params, echo); + wsReply(wsClient, handleResult) + } catch (e) { + wsReply(wsClient, OB11WebsocketResponse.error(`api处理出错:${e}`, 1200, echo)) } } } - } - catch (e) { - console.log(e); - } + catch (e) { + log(e.stack); + } + }).then(); } } } -function initWebsocketServer(ws, req, type: WebsocketType) { - if (type == WebsocketType.EVENT || type == WebsocketType.ALL) { - registerEventSender(ws); +export function wsReply(wsClient: websocket.WebSocket | ReconnectingWebsocket, data: OB11WebsocketResponse | PostMsgType) { + try { + let packet = Object.assign({ + echo: "" + }, data); + if (!packet.echo) { + packet.echo = ""; + } + + wsClient.send(JSON.stringify(packet)) + log("ws 消息上报", data) + } catch (e) { + log("websocket 回复失败", e) } - - ws.on("message", async function (message) { - if (type == WebsocketType.API || type == WebsocketType.ALL) { - try { - let recv = JSON.parse(message); - let echo = recv.echo ?? ""; - - if (actionMap.has(recv.action)) { - let action = actionMap.get(recv.action) - const result = await action.websocketHandle(recv.params, echo); - ws.send(JSON.stringify(result)); - } - else { - ws.send(JSON.stringify(OB11WebsocketResponse.error("Bad Request", 1400, echo))); - } - } catch (e) { - log(e.stack); - ws.send(JSON.stringify(OB11WebsocketResponse.error(e.stack.toString(), 1200))); - } - } - }); - - ws.on("close", function (ev) { - if (type == WebsocketType.EVENT || type == WebsocketType.ALL) { - unregisterEventSender(ws); - } - }); } +export type PostMsgType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent -export function postMsg(msg: OB11Message) { +export function postMsg(msg: PostMsgType) { const config = getConfigUtil().getConfig(); - if (config.enableHttpPost) { - if (!config.reportSelfMessage) { - if (msg.user_id == selfInfo.uin) { - return - } - } - for (const host of config.httpHosts) { - fetch(host, { - method: "POST", - headers: { - "Content-Type": "application/json", - "x-self-id": selfInfo.uin - }, - body: JSON.stringify(msg) - }).then((res: any) => { - log(`新消息事件上报成功: ${host} ` + JSON.stringify(msg)); - }, (err: any) => { - log(`新消息事件上报失败: ${host} ` + err + JSON.stringify(msg)); - }); + // 判断msg是否是event + if (!config.reportSelfMessage) { + if ((msg as OB11Message).user_id.toString() == selfInfo.uin) { + return } } + for (const host of config.httpHosts) { + fetch(host, { + method: "POST", + headers: { + "Content-Type": "application/json", + "x-self-id": selfInfo.uin + }, + body: JSON.stringify(msg) + }).then((res: any) => { + log(`新消息事件HTTP上报成功: ${host} ` + JSON.stringify(msg)); + }, (err: any) => { + log(`新消息事件HTTP上报失败: ${host} ` + err + JSON.stringify(msg)); + }); + } + log("新消息事件ws上报", msg); + callEvent(msg); } -let routers: Record Promise>> = {}; function registerRouter(action: string, handle: (payload: any) => Promise) { 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(), 200)) } } - expressAPP.post(url, (req: Request, res: Response) => { - _handle(res, req.body).then() + expressAPP.post(url, expressAuthorize, (req: Request, res: Response) => { + _handle(res, req.body || {}).then() }); - expressAPP.get(url, (req: Request, res: Response) => { - _handle(res, req.query as any).then() + expressAPP.get(url, expressAuthorize, (req: Request, res: Response) => { + _handle(res, req.query as any || {}).then() }); - routers[url] = handle } -for (const action of actionHandlers) { +for (const action of actionHandlers) { registerRouter(action.actionName, (payload) => action.handle(payload)) } \ No newline at end of file diff --git a/src/onebot11/types.ts b/src/onebot11/types.ts index fc2d900..e7b43ad 100644 --- a/src/onebot11/types.ts +++ b/src/onebot11/types.ts @@ -1,8 +1,7 @@ -import { AtType } from "../ntqqapi/types"; -import { RawMessage } from "../ntqqapi/types"; +import {AtType, RawMessage} from "../ntqqapi/types"; export interface OB11User { - user_id: string; + user_id: number; nickname: string; remark?: string } @@ -20,8 +19,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 +33,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,12 +55,12 @@ export enum OB11MessageType { } export interface OB11Message { - self_id?: string, + self_id?: number, time: number, 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" | "normal", sender: OB11Sender, @@ -89,26 +88,21 @@ export interface OB11Return { status: string retcode: number data: DataType - message: string + message: string, } -export interface OB11WebsocketReturn { - status: string - retcode: number - data: DataType +export interface OB11WebsocketReturn extends OB11Return{ echo: string - message: string } -export interface OB11SendMsgReturn extends OB11Return<{message_id: string}>{} - export enum OB11MessageDataType { text = "text", image = "image", voice = "record", at = "at", reply = "reply", - json = "json" + json = "json", + face = "face" } export type OB11MessageData = { @@ -140,6 +134,11 @@ export type OB11MessageData = { data: { id: string, } +} | { + type: OB11MessageDataType.face, + data: { + id: string + } } export interface OB11PostSendMsg { @@ -147,4 +146,17 @@ export interface OB11PostSendMsg { user_id: string, group_id?: string, message: OB11MessageData[] | string | OB11MessageData; -} \ No newline at end of file +} + +export interface OB11Version { + app_name: "LLOneBot" + app_version: string + protocol_version: "v11" +} + + +export interface OB11Status { + online: boolean | null, + good: boolean +} + diff --git a/src/onebot11/utils.ts b/src/onebot11/utils.ts index d1cdfdc..8050e68 100644 --- a/src/onebot11/utils.ts +++ b/src/onebot11/utils.ts @@ -1,6 +1,7 @@ -import { CONFIG_DIR, isGIF } from "../common/utils"; +import {CONFIG_DIR, isGIF} from "../common/utils"; import * as path from 'path'; -import { NTQQApi } from '../ntqqapi/ntcall'; +import {OB11MessageData} from "./types"; + const fs = require("fs").promises; export async function uri2local(fileName: string, uri: string){ @@ -59,4 +60,40 @@ export async function uri2local(fileName: string, uri: string){ res.success = true res.path = filePath return res -} \ No newline at end of file +} + + +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; +} diff --git a/src/preload.ts b/src/preload.ts index afde46f..347f916 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -1,11 +1,7 @@ // Electron 主进程 与 渲染进程 交互的桥梁 import {Config} from "./common/types"; -import { - CHANNEL_GET_CONFIG, - CHANNEL_LOG, - CHANNEL_SET_CONFIG, -} from "./common/channels"; +import {CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG,} from "./common/channels"; const {contextBridge} = require("electron"); diff --git a/src/renderer.ts b/src/renderer.ts index 03f5a34..e673b44 100644 --- a/src/renderer.ts +++ b/src/renderer.ts @@ -62,13 +62,17 @@ async function onSettingWindowCreated(view: Element) { 正向Websocket监听端口 + + Access Token + +
${wsHostsEleStr}
- + @@ -151,13 +155,15 @@ async function onSettingWindowCreated(view: Element) { function addHostEle(type: string, initValue: string = "") { - let addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), "text/html"); - let addressEle = addressDoc.querySelector("setting-item") - let hostItemsEle; + let addressEle, hostItemsEle; if (type === "ws") { + let addressDoc = parser.parseFromString(createWsHostEleStr(initValue), "text/html"); + addressEle = addressDoc.querySelector("setting-item") hostItemsEle = document.getElementById("wsHostItems"); } else { + let addressDoc = parser.parseFromString(createHttpHostEleStr(initValue), "text/html"); + addressEle = addressDoc.querySelector("setting-item") hostItemsEle = document.getElementById("httpHostItems"); } @@ -197,6 +203,7 @@ async function onSettingWindowCreated(view: Element) { const httpHostEles: HTMLCollectionOf = document.getElementsByClassName("httpHost") as HTMLCollectionOf; const wsPortEle: HTMLInputElement = document.getElementById("wsPort") as HTMLInputElement; const wsHostEles: HTMLCollectionOf = document.getElementsByClassName("wsHost") as HTMLCollectionOf; + const tokenEle = document.getElementById("token") as HTMLInputElement; // 获取端口和host const httpPort = httpPortEle.value @@ -209,6 +216,7 @@ async function onSettingWindowCreated(view: Element) { } const wsPort = wsPortEle.value + const token = tokenEle.value let wsHosts: string[] = []; for (const hostEle of wsHostEles) { @@ -222,6 +230,7 @@ async function onSettingWindowCreated(view: Element) { config.httpHosts = httpHosts; config.wsPort = parseInt(wsPort); config.wsHosts = wsHosts; + config.token = token.trim(); window.llonebot.setConfig(config); alert("保存成功"); })