mirror of
https://github.com/LLOneBot/LLOneBot.git
synced 2024-11-22 01:56:33 +00:00
ver: 2.1.0
This commit is contained in:
23
README.md
23
README.md
@@ -20,13 +20,16 @@
|
|||||||
|
|
||||||
目前只支持http协议POST方法,不支持websocket,事件上报也是http协议
|
目前只支持http协议POST方法,不支持websocket,事件上报也是http协议
|
||||||
|
|
||||||
|
主要功能:
|
||||||
|
- [x] 发送好友消息
|
||||||
|
- [x] 发送临时消息
|
||||||
|
- [x] 发送群消息
|
||||||
|
- [x] 获取好友列表
|
||||||
- [x] 获取群列表
|
- [x] 获取群列表
|
||||||
- [x] 获取群成员列表
|
- [x] 获取群成员列表
|
||||||
- [x] 获取好友列表
|
|
||||||
- [x] 发送群消息
|
|
||||||
- [x] 发送好友消息
|
|
||||||
- [x] 撤回消息
|
- [x] 撤回消息
|
||||||
- [x] 上报好友消息
|
- [x] 上报好友消息
|
||||||
|
- [x] 上报临时消息
|
||||||
- [x] 上报群消息
|
- [x] 上报群消息
|
||||||
|
|
||||||
消息格式支持:
|
消息格式支持:
|
||||||
@@ -101,6 +104,13 @@
|
|||||||
</details>
|
</details>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>QQ变得很卡</summary>
|
||||||
|
<br/>
|
||||||
|
这是你的群特别多导致的,因为启动后会批量获取群成员列表,获取完之后就正常了
|
||||||
|
</details>
|
||||||
|
<br/>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>如何查看日志</summary>
|
<summary>如何查看日志</summary>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -108,5 +118,12 @@
|
|||||||
</details>
|
</details>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
|
||||||
|
- [x] 接口返回更详细的错误信息,目前消息发不出去也会返回发送成功(这河里吗)
|
||||||
|
- [ ] 转发消息记录
|
||||||
|
- [ ] 支持websocket,等个有缘人提PR实现
|
||||||
|
- [ ] 重构摆脱LLAPI,目前调用LLAPI只能在renderer进程调用,需重构成在main进程调用
|
||||||
|
|
||||||
## onebot11文档
|
## onebot11文档
|
||||||
<https://11.onebot.dev/>
|
<https://11.onebot.dev/>
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
"name": "LLOneBot",
|
"name": "LLOneBot",
|
||||||
"slug": "LLOneBot",
|
"slug": "LLOneBot",
|
||||||
"description": "LiteLoaderQQNT的OneBotApi",
|
"description": "LiteLoaderQQNT的OneBotApi",
|
||||||
"version": "2.0.4",
|
"version": "2.1.0",
|
||||||
"thumbnail": "./icon.png",
|
"thumbnail": "./icon.png",
|
||||||
"authors": [{
|
"authors": [{
|
||||||
"name": "linyuchen",
|
"name": "linyuchen",
|
||||||
|
15
package-lock.json
generated
15
package-lock.json
generated
@@ -9,7 +9,8 @@
|
|||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "^4.18.2"
|
"express": "^4.18.2",
|
||||||
|
"uuid": "^9.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/preset-env": "^7.23.2",
|
"@babel/preset-env": "^7.23.2",
|
||||||
@@ -5213,6 +5214,18 @@
|
|||||||
"node": ">= 0.4.0"
|
"node": ">= 0.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/uuid": {
|
||||||
|
"version": "9.0.1",
|
||||||
|
"resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-9.0.1.tgz",
|
||||||
|
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
|
||||||
|
"funding": [
|
||||||
|
"https://github.com/sponsors/broofa",
|
||||||
|
"https://github.com/sponsors/ctavan"
|
||||||
|
],
|
||||||
|
"bin": {
|
||||||
|
"uuid": "dist/bin/uuid"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/vary": {
|
"node_modules/vary": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://mirrors.cloud.tencent.com/npm/vary/-/vary-1.1.2.tgz",
|
"resolved": "https://mirrors.cloud.tencent.com/npm/vary/-/vary-1.1.2.tgz",
|
||||||
|
@@ -17,16 +17,17 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "^4.18.2"
|
"express": "^4.18.2",
|
||||||
|
"uuid": "^9.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^27.0.2",
|
|
||||||
"@babel/preset-env": "^7.23.2",
|
"@babel/preset-env": "^7.23.2",
|
||||||
"@types/express": "^4.17.20",
|
"@types/express": "^4.17.20",
|
||||||
"babel-loader": "^9.1.3",
|
"babel-loader": "^9.1.3",
|
||||||
|
"electron": "^27.0.2",
|
||||||
"ts-loader": "^9.5.0",
|
"ts-loader": "^9.5.0",
|
||||||
|
"typescript": "^5.2.2",
|
||||||
"webpack": "^5.89.0",
|
"webpack": "^5.89.0",
|
||||||
"webpack-cli": "^5.1.4",
|
"webpack-cli": "^5.1.4"
|
||||||
"typescript": "^5.2.2"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -3,6 +3,12 @@ export enum AtType {
|
|||||||
atUser = 2
|
atUser = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum ChatType {
|
||||||
|
friend = 1,
|
||||||
|
group = 2,
|
||||||
|
temp = 100
|
||||||
|
}
|
||||||
|
|
||||||
export type GroupMemberInfo = {
|
export type GroupMemberInfo = {
|
||||||
avatarPath: string;
|
avatarPath: string;
|
||||||
cardName: string;
|
cardName: string;
|
||||||
@@ -44,7 +50,7 @@ export type Group = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type Peer = {
|
export type Peer = {
|
||||||
chatType: "private" | "group" | "friend"
|
chatType: ChatType
|
||||||
name: string
|
name: string
|
||||||
uid: string // qq号
|
uid: string // qq号
|
||||||
}
|
}
|
||||||
@@ -52,8 +58,10 @@ export type Peer = {
|
|||||||
export type MessageElement = {
|
export type MessageElement = {
|
||||||
raw: {
|
raw: {
|
||||||
msgId: string,
|
msgId: string,
|
||||||
|
msgTime: string,
|
||||||
msgSeq: string,
|
msgSeq: string,
|
||||||
senderUin: string; // 发送者QQ号
|
senderUin: string; // 发送者QQ号
|
||||||
|
chatType: ChatType,
|
||||||
elements: {
|
elements: {
|
||||||
replyElement: {
|
replyElement: {
|
||||||
senderUid: string, // 原消息发送者QQ号
|
senderUid: string, // 原消息发送者QQ号
|
||||||
@@ -139,7 +147,7 @@ export type SendMessage = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type PostDataAction = "send_private_msg" | "send_group_msg" | "get_group_list"
|
export type PostDataAction = "send_private_msg" | "send_group_msg" | "get_group_list"
|
||||||
| "get_friend_list" | "delete_msg" | "get_login_info" | "get_group_member_list" | "get_group_member_info"
|
| "get_friend_list" | "delete_msg" | "get_login_info" | "get_group_member_list" | "get_group_member_info"
|
||||||
|
|
||||||
export type PostDataSendMsg = {
|
export type PostDataSendMsg = {
|
||||||
action: PostDataAction
|
action: PostDataAction
|
||||||
@@ -152,9 +160,17 @@ export type PostDataSendMsg = {
|
|||||||
user_id: string,
|
user_id: string,
|
||||||
group_id: string,
|
group_id: string,
|
||||||
message: SendMessage[];
|
message: SendMessage[];
|
||||||
|
ipc_uuid?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type Config = {
|
export type Config = {
|
||||||
port: number,
|
port: number,
|
||||||
hosts: string[],
|
hosts: string[],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type SendMsgResult = {
|
||||||
|
status: number,
|
||||||
|
retcode: number,
|
||||||
|
data: any,
|
||||||
|
message: string,
|
||||||
|
}
|
5
src/global.d.ts
vendored
5
src/global.d.ts
vendored
@@ -6,7 +6,7 @@ import {
|
|||||||
Peer,
|
Peer,
|
||||||
PostDataSendMsg,
|
PostDataSendMsg,
|
||||||
SelfInfo,
|
SelfInfo,
|
||||||
SendMessage,
|
SendMessage, SendMsgResult,
|
||||||
User
|
User
|
||||||
} from "./common/types";
|
} from "./common/types";
|
||||||
|
|
||||||
@@ -43,9 +43,10 @@ declare var llonebot: {
|
|||||||
setConfig(config: Config):void;
|
setConfig(config: Config):void;
|
||||||
getConfig():Promise<Config>;
|
getConfig():Promise<Config>;
|
||||||
setSelfInfo(selfInfo: SelfInfo):void;
|
setSelfInfo(selfInfo: SelfInfo):void;
|
||||||
downloadFile(arg: {uri: string, fileName: string}):Promise<string>;
|
downloadFile(arg: {uri: string, fileName: string}):Promise<{errMsg: string, path: string}>;
|
||||||
deleteFile(path: string[]):Promise<void>;
|
deleteFile(path: string[]):Promise<void>;
|
||||||
getRunningStatus(): Promise<boolean>;
|
getRunningStatus(): Promise<boolean>;
|
||||||
|
sendSendMsgResult(sessionId: string, msgResult: SendMsgResult): void;
|
||||||
};
|
};
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
|
@@ -3,7 +3,7 @@ import {log} from "./utils";
|
|||||||
const express = require("express");
|
const express = require("express");
|
||||||
const bodyParser = require('body-parser');
|
const bodyParser = require('body-parser');
|
||||||
import {sendIPCRecallQQMsg, sendIPCSendQQMsg} from "./IPCSend";
|
import {sendIPCRecallQQMsg, sendIPCSendQQMsg} from "./IPCSend";
|
||||||
import {OnebotGroupMemberRole, PostDataAction, PostDataSendMsg, SendMessage} from "../common/types";
|
import {OnebotGroupMemberRole, PostDataAction, PostDataSendMsg, SendMessage, SendMsgResult} from "../common/types";
|
||||||
import {friends, groups, selfInfo} from "./data";
|
import {friends, groups, selfInfo} from "./data";
|
||||||
|
|
||||||
// @SiberianHusky 2021-08-15
|
// @SiberianHusky 2021-08-15
|
||||||
@@ -19,7 +19,7 @@ function checkSendMessage(sendMsgList: SendMessage[]) {
|
|||||||
let data = msg["data"];
|
let data = msg["data"];
|
||||||
if (type === "text" && !data["text"]) {
|
if (type === "text" && !data["text"]) {
|
||||||
return 400;
|
return 400;
|
||||||
} else if (["image", "voice"].includes(type)) {
|
} else if (["image", "voice", "record"].includes(type)) {
|
||||||
if (!data["file"]) {
|
if (!data["file"]) {
|
||||||
return 400;
|
return 400;
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,7 @@ function checkSendMessage(sendMsgList: SendMessage[]) {
|
|||||||
}
|
}
|
||||||
// ==end==
|
// ==end==
|
||||||
|
|
||||||
function handlePost(jsonData: any) {
|
function handlePost(jsonData: any, handleSendResult: (data: SendMsgResult)=>void) {
|
||||||
log("API receive post:" + JSON.stringify(jsonData))
|
log("API receive post:" + JSON.stringify(jsonData))
|
||||||
if (!jsonData.params) {
|
if (!jsonData.params) {
|
||||||
jsonData.params = JSON.parse(JSON.stringify(jsonData));
|
jsonData.params = JSON.parse(JSON.stringify(jsonData));
|
||||||
@@ -58,6 +58,7 @@ function handlePost(jsonData: any) {
|
|||||||
data: {},
|
data: {},
|
||||||
message: ''
|
message: ''
|
||||||
}
|
}
|
||||||
|
|
||||||
if (jsonData.action == "get_login_info") {
|
if (jsonData.action == "get_login_info") {
|
||||||
resData["data"] = selfInfo
|
resData["data"] = selfInfo
|
||||||
} else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
|
} else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
|
||||||
@@ -71,7 +72,8 @@ function handlePost(jsonData: any) {
|
|||||||
if (resData.status == 200) {
|
if (resData.status == 200) {
|
||||||
resData.message = "发送成功";
|
resData.message = "发送成功";
|
||||||
resData.data = jsonData.message;
|
resData.data = jsonData.message;
|
||||||
sendIPCSendQQMsg(jsonData);
|
sendIPCSendQQMsg(jsonData, handleSendResult);
|
||||||
|
return;
|
||||||
} else {
|
} else {
|
||||||
resData.message = "发送失败, 请检查消息格式";
|
resData.message = "发送失败, 请检查消息格式";
|
||||||
resData.data = jsonData.message;
|
resData.data = jsonData.message;
|
||||||
@@ -153,8 +155,10 @@ export function startExpress(port: number) {
|
|||||||
app.post('/' + action, (req: any, res: any) => {
|
app.post('/' + action, (req: any, res: any) => {
|
||||||
let jsonData: PostDataSendMsg = req.body;
|
let jsonData: PostDataSendMsg = req.body;
|
||||||
jsonData.action = action
|
jsonData.action = action
|
||||||
let resData = handlePost(jsonData)
|
let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
|
||||||
|
if (resData){
|
||||||
res.send(resData)
|
res.send(resData)
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,8 +177,10 @@ export function startExpress(port: number) {
|
|||||||
// 处理POST请求的路由
|
// 处理POST请求的路由
|
||||||
app.post('/', (req: any, res: any) => {
|
app.post('/', (req: any, res: any) => {
|
||||||
let jsonData: PostDataSendMsg = req.body;
|
let jsonData: PostDataSendMsg = req.body;
|
||||||
let resData = handlePost(jsonData)
|
let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
|
||||||
|
if (resData){
|
||||||
res.send(resData)
|
res.send(resData)
|
||||||
|
}
|
||||||
});
|
});
|
||||||
app.post('/send_msg', (req: any, res: any) => {
|
app.post('/send_msg', (req: any, res: any) => {
|
||||||
let jsonData: PostDataSendMsg = req.body;
|
let jsonData: PostDataSendMsg = req.body;
|
||||||
@@ -189,11 +195,13 @@ export function startExpress(port: number) {
|
|||||||
jsonData.action = "send_private_msg"
|
jsonData.action = "send_private_msg"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let resData = handlePost(jsonData)
|
let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
|
||||||
|
if (resData){
|
||||||
res.send(resData)
|
res.send(resData)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
app.listen(port, "0.0.0.0", () => {
|
app.listen(port, "0.0.0.0", () => {
|
||||||
console.log(`服务器已启动,监听端口 ${port}`);
|
console.log(`llonebot started 0.0.0.0:${port}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
@@ -1,6 +1,8 @@
|
|||||||
import {ipcMain, webContents} from 'electron';
|
import {ipcMain, webContents} from 'electron';
|
||||||
import {PostDataSendMsg} from "../common/types";
|
import {PostDataSendMsg, SendMsgResult} from "../common/types";
|
||||||
import {CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG} from "../common/IPCChannel";
|
import {CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG} from "../common/IPCChannel";
|
||||||
|
import {v4 as uuid4} from "uuid";
|
||||||
|
import {log} from "./utils";
|
||||||
|
|
||||||
function sendIPCMsg(channel: string, data: any) {
|
function sendIPCMsg(channel: string, data: any) {
|
||||||
let contents = webContents.getAllWebContents();
|
let contents = webContents.getAllWebContents();
|
||||||
@@ -14,7 +16,17 @@ function sendIPCMsg(channel: string, data: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export function sendIPCSendQQMsg(postData: PostDataSendMsg) {
|
export function sendIPCSendQQMsg(postData: PostDataSendMsg, handleSendResult: (data: SendMsgResult) => void) {
|
||||||
|
const onceSessionId = "llonebot_send_msg_" + uuid4();
|
||||||
|
postData.ipc_uuid = onceSessionId;
|
||||||
|
ipcMain.once(onceSessionId, (event: any, sendResult: SendMsgResult) => {
|
||||||
|
// log("llonebot send msg ipcMain.once:" + JSON.stringify(sendResult));
|
||||||
|
try {
|
||||||
|
handleSendResult(sendResult)
|
||||||
|
} catch (e) {
|
||||||
|
log("llonebot send msg ipcMain.once error:" + JSON.stringify(e))
|
||||||
|
}
|
||||||
|
})
|
||||||
sendIPCMsg(CHANNEL_SEND_MSG, postData);
|
sendIPCMsg(CHANNEL_SEND_MSG, postData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -29,6 +29,7 @@ let running = false;
|
|||||||
// 加载插件时触发
|
// 加载插件时触发
|
||||||
function onLoad() {
|
function onLoad() {
|
||||||
log("main onLoaded");
|
log("main onLoaded");
|
||||||
|
|
||||||
// const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;
|
// const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;
|
||||||
function getConfigUtil() {
|
function getConfigUtil() {
|
||||||
const configFilePath = path.join(CONFIG_DIR, `config_${selfInfo.user_id}.json`)
|
const configFilePath = path.join(CONFIG_DIR, `config_${selfInfo.user_id}.json`)
|
||||||
@@ -41,28 +42,65 @@ function onLoad() {
|
|||||||
ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
|
ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
|
||||||
return getConfigUtil().getConfig()
|
return getConfigUtil().getConfig()
|
||||||
})
|
})
|
||||||
ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: {uri: string, fileName: string}) => {
|
ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: { uri: string, fileName: string }): Promise<{
|
||||||
|
success: boolean,
|
||||||
|
errMsg: string,
|
||||||
|
path: string
|
||||||
|
}> => {
|
||||||
let filePath = path.join(CONFIG_DIR, arg.fileName)
|
let filePath = path.join(CONFIG_DIR, arg.fileName)
|
||||||
let url = new URL(arg.uri);
|
let url = new URL(arg.uri);
|
||||||
if (url.protocol == "base64:"){
|
if (url.protocol == "base64:") {
|
||||||
// base64转成文件
|
// base64转成文件
|
||||||
let base64Data = arg.uri.split("base64://")[1]
|
let base64Data = arg.uri.split("base64://")[1]
|
||||||
|
try {
|
||||||
const buffer = Buffer.from(base64Data, 'base64');
|
const buffer = Buffer.from(base64Data, 'base64');
|
||||||
|
|
||||||
fs.writeFileSync(filePath, buffer);
|
fs.writeFileSync(filePath, buffer);
|
||||||
|
} catch (e: any) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
errMsg: `base64文件下载失败,` + e.toString(),
|
||||||
|
path: ""
|
||||||
}
|
}
|
||||||
else if (url.protocol == "http:" || url.protocol == "https:") {
|
}
|
||||||
|
} else if (url.protocol == "http:" || url.protocol == "https:") {
|
||||||
// 下载文件
|
// 下载文件
|
||||||
let res = await fetch(url)
|
let res = await fetch(url)
|
||||||
|
if (!res.ok) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
errMsg: `${url}下载失败,` + res.statusText,
|
||||||
|
path: ""
|
||||||
|
}
|
||||||
|
}
|
||||||
let blob = await res.blob();
|
let blob = await res.blob();
|
||||||
let buffer = await blob.arrayBuffer();
|
let buffer = await blob.arrayBuffer();
|
||||||
|
try {
|
||||||
fs.writeFileSync(filePath, Buffer.from(buffer));
|
fs.writeFileSync(filePath, Buffer.from(buffer));
|
||||||
|
} catch (e: any) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
errMsg: `${url}下载失败,` + e.toString(),
|
||||||
|
path: ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
errMsg: `不支持的file协议,` + url.protocol,
|
||||||
|
path: ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (isGIF(filePath)) {
|
if (isGIF(filePath)) {
|
||||||
fs.renameSync(filePath, filePath + ".gif");
|
fs.renameSync(filePath, filePath + ".gif");
|
||||||
filePath += ".gif";
|
filePath += ".gif";
|
||||||
}
|
}
|
||||||
return filePath;
|
return {
|
||||||
|
success: true,
|
||||||
|
errMsg: "",
|
||||||
|
path: filePath
|
||||||
|
};
|
||||||
})
|
})
|
||||||
ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
|
ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
|
||||||
getConfigUtil().setConfig(arg)
|
getConfigUtil().setConfig(arg)
|
||||||
@@ -103,7 +141,7 @@ function onLoad() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
ipcMain.on(CHANNEL_POST_ONEBOT_DATA, (event: any, arg: any) => {
|
ipcMain.on(CHANNEL_POST_ONEBOT_DATA, (event: any, arg: any) => {
|
||||||
for(const host of getConfigUtil().getConfig().hosts) {
|
for (const host of getConfigUtil().getConfig().hosts) {
|
||||||
try {
|
try {
|
||||||
fetch(host, {
|
fetch(host, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -113,9 +151,9 @@ function onLoad() {
|
|||||||
},
|
},
|
||||||
body: JSON.stringify(arg)
|
body: JSON.stringify(arg)
|
||||||
}).then((res: any) => {
|
}).then((res: any) => {
|
||||||
log("新消息事件上传成功:" + JSON.stringify(arg));
|
log(`新消息事件上传成功: ${host} ` + JSON.stringify(arg));
|
||||||
}, (err: any) => {
|
}, (err: any) => {
|
||||||
log("新消息事件上传失败:" + err + JSON.stringify(arg));
|
log(`新消息事件上传失败: ${host} ` + err + JSON.stringify(arg));
|
||||||
});
|
});
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
log(e.toString())
|
log(e.toString())
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
import {json} from "express";
|
import {json} from "express";
|
||||||
|
import {selfInfo} from "./data";
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
@@ -11,7 +12,8 @@ export function log(msg: any) {
|
|||||||
const month = date.getMonth() + 1;
|
const month = date.getMonth() + 1;
|
||||||
const day = date.getDate();
|
const day = date.getDate();
|
||||||
const currentDate = `${year}-${month}-${day}`;
|
const currentDate = `${year}-${month}-${day}`;
|
||||||
fs.appendFile(path.join(CONFIG_DIR , `llonebot-${currentDate}.log`), currentDateTime + ":" + JSON.stringify(msg) + "\n", (err: any) => {
|
const userInfo = selfInfo.user_id ? `${selfInfo.nickname}(${selfInfo.user_id})` : ""
|
||||||
|
fs.appendFile(path.join(CONFIG_DIR , `llonebot-${currentDate}.log`), currentDateTime + ` ${userInfo}:` + JSON.stringify(msg) + "\n", (err: any) => {
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// Electron 主进程 与 渲染进程 交互的桥梁
|
// Electron 主进程 与 渲染进程 交互的桥梁
|
||||||
|
|
||||||
import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
|
import {Config, Group, PostDataSendMsg, SelfInfo, SendMsgResult, User} from "./common/types";
|
||||||
import {
|
import {
|
||||||
CHANNEL_DOWNLOAD_FILE,
|
CHANNEL_DOWNLOAD_FILE,
|
||||||
CHANNEL_GET_CONFIG,
|
CHANNEL_GET_CONFIG,
|
||||||
@@ -33,6 +33,9 @@ contextBridge.exposeInMainWorld("llonebot", {
|
|||||||
updateFriends: (friends: User[]) => {
|
updateFriends: (friends: User[]) => {
|
||||||
ipcRenderer.send(CHANNEL_UPDATE_FRIENDS, friends);
|
ipcRenderer.send(CHANNEL_UPDATE_FRIENDS, friends);
|
||||||
},
|
},
|
||||||
|
sendSendMsgResult: (sessionId: string, msgResult: SendMsgResult)=>{
|
||||||
|
ipcRenderer.send(sessionId, msgResult);
|
||||||
|
},
|
||||||
listenSendMessage: (handle: (jsonData: PostDataSendMsg) => void) => {
|
listenSendMessage: (handle: (jsonData: PostDataSendMsg) => void) => {
|
||||||
ipcRenderer.send(CHANNEL_LOG, "发送消息API已注册");
|
ipcRenderer.send(CHANNEL_LOG, "发送消息API已注册");
|
||||||
ipcRenderer.on(CHANNEL_SEND_MSG, (event: any, args: PostDataSendMsg) => {
|
ipcRenderer.on(CHANNEL_SEND_MSG, (event: any, args: PostDataSendMsg) => {
|
||||||
|
131
src/renderer.ts
131
src/renderer.ts
@@ -2,15 +2,31 @@
|
|||||||
|
|
||||||
// import express from "express";
|
// import express from "express";
|
||||||
// const { ipcRenderer } = require('electron');
|
// const { ipcRenderer } = require('electron');
|
||||||
import {AtType, Group, MessageElement, OnebotGroupMemberRole, Peer, PostDataSendMsg, User} from "./common/types";
|
import {
|
||||||
import * as stream from "stream";
|
AtType,
|
||||||
import {raw} from "express";
|
ChatType,
|
||||||
|
Group,
|
||||||
|
MessageElement,
|
||||||
|
OnebotGroupMemberRole,
|
||||||
|
Peer,
|
||||||
|
PostDataSendMsg, SendMsgResult,
|
||||||
|
User
|
||||||
|
} from "./common/types";
|
||||||
|
|
||||||
let self_qq: string = ""
|
let self_qq: string = ""
|
||||||
let groups: Group[] = []
|
let groups: Group[] = []
|
||||||
let friends: User[] = []
|
let friends: User[] = []
|
||||||
let msgHistory: MessageElement[] = []
|
let msgHistory: MessageElement[] = []
|
||||||
let uid_maps: Record<string, User> = {} // 一串加密的字符串 -> qq号
|
let uid_maps: Record<string, User> = {} // 一串加密的字符串 -> qq号
|
||||||
|
|
||||||
|
function getStrangerByUin(uin: string) {
|
||||||
|
for (const key in uid_maps) {
|
||||||
|
if (uid_maps[key].uin === uin) {
|
||||||
|
return uid_maps[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function getUserInfo(uid: string): Promise<User> {
|
async function getUserInfo(uid: string): Promise<User> {
|
||||||
let user = uid_maps[uid]
|
let user = uid_maps[uid]
|
||||||
if (!user) {
|
if (!user) {
|
||||||
@@ -80,6 +96,11 @@ async function getGroupMembers(group_qq: string, forced: boolean = false) {
|
|||||||
if (!group!.members!.find(m => m.uid == member.uid)) {
|
if (!group!.members!.find(m => m.uid == member.uid)) {
|
||||||
group!.members!.push(member)
|
group!.members!.push(member)
|
||||||
}
|
}
|
||||||
|
uid_maps[member.uid] = {
|
||||||
|
uin: member.uin,
|
||||||
|
uid: member.uid,
|
||||||
|
nickName: member.nick
|
||||||
|
};
|
||||||
}
|
}
|
||||||
window.llonebot.updateGroups(groups)
|
window.llonebot.updateGroups(groups)
|
||||||
console.log(`更新群${group.name}成员列表`, group)
|
console.log(`更新群${group.name}成员列表`, group)
|
||||||
@@ -100,9 +121,8 @@ async function getGroupMember(group_qq: string, member_uid: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function handleNewMessage(messages: MessageElement[]) {
|
async function handleNewMessage(messages: MessageElement[]) {
|
||||||
// console.log("llonebot 收到消息:", messages);
|
console.log("llonebot 收到消息:", messages);
|
||||||
for (let message of messages) {
|
for (let message of messages) {
|
||||||
let onebot_message_data: any = {
|
let onebot_message_data: any = {
|
||||||
self: {
|
self: {
|
||||||
@@ -110,7 +130,7 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
user_id: self_qq
|
user_id: self_qq
|
||||||
},
|
},
|
||||||
self_id: self_qq,
|
self_id: self_qq,
|
||||||
time: 0,
|
time: parseInt(message.raw.msgTime || "0"),
|
||||||
type: "message",
|
type: "message",
|
||||||
post_type: "message",
|
post_type: "message",
|
||||||
message_type: message.peer.chatType,
|
message_type: message.peer.chatType,
|
||||||
@@ -121,9 +141,10 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
raw_message: "",
|
raw_message: "",
|
||||||
font: 14
|
font: 14
|
||||||
}
|
}
|
||||||
if (message.peer.chatType == "group") {
|
if (message.raw.chatType == ChatType.group) {
|
||||||
let group_id = message.peer.uid
|
let group_id = message.peer.uid
|
||||||
let group = (await getGroup(group_id))!
|
let group = (await getGroup(group_id))!
|
||||||
|
onebot_message_data.message_type = onebot_message_data.sub_type = "group"
|
||||||
onebot_message_data["group_id"] = message.peer.uid
|
onebot_message_data["group_id"] = message.peer.uid
|
||||||
let groupMember = await getGroupMember(group_id, message.sender.uid)
|
let groupMember = await getGroupMember(group_id, message.sender.uid)
|
||||||
onebot_message_data["user_id"] = groupMember!.uin
|
onebot_message_data["user_id"] = groupMember!.uin
|
||||||
@@ -134,13 +155,25 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
role: OnebotGroupMemberRole[groupMember!.role]
|
role: OnebotGroupMemberRole[groupMember!.role]
|
||||||
}
|
}
|
||||||
// console.log("收到群消息", onebot_message_data)
|
// console.log("收到群消息", onebot_message_data)
|
||||||
} else if (message.peer.chatType == "private" || message.peer.chatType == "friend") {
|
} else if (message.raw.chatType == ChatType.friend) {
|
||||||
onebot_message_data["user_id"] = message.raw.senderUin;
|
onebot_message_data["user_id"] = message.raw.senderUin;
|
||||||
let friend = await getFriend(message.raw.senderUin)
|
onebot_message_data.message_type = onebot_message_data.sub_type = "friend"
|
||||||
|
let friend = await getFriend(message.raw.senderUin);
|
||||||
onebot_message_data.sender = {
|
onebot_message_data.sender = {
|
||||||
user_id: friend!.uin,
|
user_id: friend!.uin,
|
||||||
nickname: friend!.nickName
|
nickname: friend!.nickName
|
||||||
}
|
}
|
||||||
|
} else if (message.raw.chatType == ChatType.temp) {
|
||||||
|
let senderQQ = message.raw.senderUin;
|
||||||
|
let senderUid = message.sender.uid;
|
||||||
|
let sender = await getUserInfo(senderUid);
|
||||||
|
onebot_message_data["user_id"] = senderQQ;
|
||||||
|
onebot_message_data.message_type = "friend"
|
||||||
|
onebot_message_data.sub_type = "group";
|
||||||
|
onebot_message_data.sender = {
|
||||||
|
user_id: senderQQ,
|
||||||
|
nickname: sender.nickName
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for (let element of message.raw.elements) {
|
for (let element of message.raw.elements) {
|
||||||
let message_data: any = {
|
let message_data: any = {
|
||||||
@@ -168,6 +201,7 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
if (!element.picElement.sourcePath.startsWith("/")) {
|
if (!element.picElement.sourcePath.startsWith("/")) {
|
||||||
startS += "/"
|
startS += "/"
|
||||||
}
|
}
|
||||||
|
// todo: 转成base64
|
||||||
message_data["data"]["file"] = startS + element.picElement.sourcePath
|
message_data["data"]["file"] = startS + element.picElement.sourcePath
|
||||||
} else if (element.replyElement) {
|
} else if (element.replyElement) {
|
||||||
message_data["type"] = "reply"
|
message_data["type"] = "reply"
|
||||||
@@ -175,6 +209,9 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
}
|
}
|
||||||
onebot_message_data.message.push(message_data)
|
onebot_message_data.message.push(message_data)
|
||||||
}
|
}
|
||||||
|
if (msgHistory.length > 10000) {
|
||||||
|
msgHistory.splice(0, 100)
|
||||||
|
}
|
||||||
msgHistory.push(message)
|
msgHistory.push(message)
|
||||||
console.log("发送上传消息给ipc main", onebot_message_data)
|
console.log("发送上传消息给ipc main", onebot_message_data)
|
||||||
window.llonebot.postData(onebot_message_data);
|
window.llonebot.postData(onebot_message_data);
|
||||||
@@ -183,6 +220,12 @@ async function handleNewMessage(messages: MessageElement[]) {
|
|||||||
|
|
||||||
async function listenSendMessage(postData: PostDataSendMsg) {
|
async function listenSendMessage(postData: PostDataSendMsg) {
|
||||||
console.log("收到发送消息请求", postData);
|
console.log("收到发送消息请求", postData);
|
||||||
|
let sendMsgResult: SendMsgResult = {
|
||||||
|
retcode: 0,
|
||||||
|
status: 0,
|
||||||
|
data: {},
|
||||||
|
message: "发送成功"
|
||||||
|
}
|
||||||
if (postData.action == "send_private_msg" || postData.action == "send_group_msg") {
|
if (postData.action == "send_private_msg" || postData.action == "send_group_msg") {
|
||||||
let peer: Peer | null = null;
|
let peer: Peer | null = null;
|
||||||
if (!postData.params) {
|
if (!postData.params) {
|
||||||
@@ -195,22 +238,41 @@ async function listenSendMessage(postData: PostDataSendMsg) {
|
|||||||
if (postData.action == "send_private_msg") {
|
if (postData.action == "send_private_msg") {
|
||||||
let friend = await getFriend(postData.params.user_id)
|
let friend = await getFriend(postData.params.user_id)
|
||||||
if (friend) {
|
if (friend) {
|
||||||
|
console.log("好友消息", postData)
|
||||||
peer = {
|
peer = {
|
||||||
chatType: "private",
|
chatType: ChatType.friend,
|
||||||
name: friend.nickName,
|
name: friend.nickName,
|
||||||
uid: friend.uid
|
uid: friend.uid
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// 临时消息
|
||||||
|
console.log("发送临时消息", postData)
|
||||||
|
let receiver = getStrangerByUin(postData.params.user_id);
|
||||||
|
if (receiver) {
|
||||||
|
peer = {
|
||||||
|
chatType: ChatType.temp,
|
||||||
|
name: receiver.nickName,
|
||||||
|
uid: receiver.uid
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sendMsgResult.status = -1;
|
||||||
|
sendMsgResult.retcode = -1;
|
||||||
|
sendMsgResult.message = `发送失败,未找到对象${postData.params.user_id},检查他是否为好友或是群友`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (postData.action == "send_group_msg") {
|
} else if (postData.action == "send_group_msg") {
|
||||||
let group = await getGroup(postData.params.group_id)
|
let group = await getGroup(postData.params.group_id)
|
||||||
if (group) {
|
if (group) {
|
||||||
peer = {
|
peer = {
|
||||||
chatType: "group",
|
chatType: ChatType.group,
|
||||||
name: group.name,
|
name: group.name,
|
||||||
uid: group.uid
|
uid: group.uid
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
sendMsgResult.status = -1;
|
||||||
|
sendMsgResult.retcode = -1;
|
||||||
|
sendMsgResult.message = `发送失败,未找到群${postData.params.group_id}`;
|
||||||
console.log("未找到群, 发送群消息失败", postData)
|
console.log("未找到群, 发送群消息失败", postData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -245,7 +307,20 @@ async function listenSendMessage(postData: PostDataSendMsg) {
|
|||||||
if (uri.protocol == "file:") {
|
if (uri.protocol == "file:") {
|
||||||
localFilePath = url.split("file://")[1]
|
localFilePath = url.split("file://")[1]
|
||||||
} else {
|
} else {
|
||||||
localFilePath = await window.llonebot.downloadFile({uri: url, fileName: localFilePath})
|
const {errMsg, path} = await window.llonebot.downloadFile({
|
||||||
|
uri: url,
|
||||||
|
fileName: `${Date.now()}${ext}`
|
||||||
|
})
|
||||||
|
console.log("下载文件结果", errMsg, path)
|
||||||
|
if (errMsg) {
|
||||||
|
console.log("下载文件失败", errMsg);
|
||||||
|
sendMsgResult.status = -1;
|
||||||
|
sendMsgResult.retcode = -1;
|
||||||
|
sendMsgResult.message = `发送失败,下载文件失败,${errMsg}`;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
localFilePath = path;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
message.file = localFilePath
|
message.file = localFilePath
|
||||||
sendFiles.push(localFilePath);
|
sendFiles.push(localFilePath);
|
||||||
@@ -257,13 +332,27 @@ async function listenSendMessage(postData: PostDataSendMsg) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log("发送消息", postData)
|
console.log("发送消息", postData)
|
||||||
|
if (sendMsgResult.status !== 0) {
|
||||||
|
window.llonebot.sendSendMsgResult(postData.ipc_uuid, sendMsgResult)
|
||||||
|
return;
|
||||||
|
}
|
||||||
window.LLAPI.sendMessage(peer, postData.params.message).then(res => {
|
window.LLAPI.sendMessage(peer, postData.params.message).then(res => {
|
||||||
console.log("消息发送成功:", peer, postData.params.message)
|
console.log("消息发送成功:", peer, postData.params.message)
|
||||||
if (sendFiles.length) {
|
if (sendFiles.length) {
|
||||||
window.llonebot.deleteFile(sendFiles);
|
window.llonebot.deleteFile(sendFiles);
|
||||||
}
|
}
|
||||||
|
window.llonebot.sendSendMsgResult(postData.ipc_uuid, sendMsgResult)
|
||||||
},
|
},
|
||||||
err => console.log("消息发送失败", postData, err))
|
err => {
|
||||||
|
sendMsgResult.status = -1;
|
||||||
|
sendMsgResult.retcode = -1;
|
||||||
|
sendMsgResult.message = `发送失败,${err}`;
|
||||||
|
window.llonebot.sendSendMsgResult(postData.ipc_uuid, sendMsgResult)
|
||||||
|
console.log("消息发送失败", postData, err)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
console.log(sendMsgResult, postData);
|
||||||
|
window.llonebot.sendSendMsgResult(postData.ipc_uuid, sendMsgResult)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -308,7 +397,7 @@ function onNewMessages(messages: MessageElement[]) {
|
|||||||
// console.log("chatListEle", chatListEle)
|
// console.log("chatListEle", chatListEle)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function initAccountInfo(){
|
async function initAccountInfo() {
|
||||||
let accountInfo = await window.LLAPI.getAccountInfo();
|
let accountInfo = await window.LLAPI.getAccountInfo();
|
||||||
window.llonebot.log("getAccountInfo " + JSON.stringify(accountInfo));
|
window.llonebot.log("getAccountInfo " + JSON.stringify(accountInfo));
|
||||||
if (!accountInfo.uid) {
|
if (!accountInfo.uid) {
|
||||||
@@ -325,21 +414,23 @@ async function initAccountInfo(){
|
|||||||
|
|
||||||
function onLoad() {
|
function onLoad() {
|
||||||
window.llonebot.log("llonebot render onLoad");
|
window.llonebot.log("llonebot render onLoad");
|
||||||
window.llonebot.getRunningStatus().then(running=>{
|
window.llonebot.getRunningStatus().then(running => {
|
||||||
if (running) {
|
if (running) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
initAccountInfo().then(
|
initAccountInfo().then(
|
||||||
(initSuccess)=>{
|
(initSuccess) => {
|
||||||
if (!initSuccess) {
|
if (!initSuccess) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (friends.length == 0) {
|
if (friends.length == 0) {
|
||||||
getFriends().then(()=>{});
|
getFriends().then(() => {
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (groups.length == 0) {
|
if (groups.length == 0) {
|
||||||
getGroups().then(()=>{
|
getGroups().then(() => {
|
||||||
getGroupsMembers(groups).then(()=>{});
|
getGroupsMembers(groups).then(() => {
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
window.LLAPI.on("new-messages", onNewMessages);
|
window.LLAPI.on("new-messages", onNewMessages);
|
||||||
@@ -440,7 +531,7 @@ function onLoad() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 打开设置界面时触发
|
// 打开设置界面时触发
|
||||||
async function onSettingWindowCreated (view: Element) {
|
async function onSettingWindowCreated(view: Element) {
|
||||||
window.llonebot.log("setting window created");
|
window.llonebot.log("setting window created");
|
||||||
const {port, hosts} = await window.llonebot.getConfig()
|
const {port, hosts} = await window.llonebot.getConfig()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user