v1.2.7

修改发送消息返回数据

README.md

@@ -18,7 +18,7 @@
 
 ## 支持的API
 
-目前只支持http协议，不支持websocket，事件上报也是http协议
+目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
 
 - [x] 获取群列表
 - [x] 获取群成员列表
@@ -49,4 +49,13 @@
 - [x] get_group_member_info
 - [x] get_friend_list
 
-**自己发送成功的消息也会上报，可以用于获取需要撤回消息的id**
+**自己发送成功的消息也会上报，可以用于获取需要撤回消息的id**
+
+## 示例
+
+![](doc/image/example.jpg)
+
+*暂时不支持`"message": "hello"`这种message为字符串的形式*
+
+## onebot11文档
+<https://11.onebot.dev/>

manifest.json

@@ -4,7 +4,7 @@
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "1.2.1",
+    "version": "1.2.7",
     "thumbnail": "./icon.png",
     "author": {
         "name": "linyuchen",

src/common/IPCChannel.ts

@@ -8,4 +8,6 @@ export const CHANNEL_UPDATE_FRIENDS = "llonebot_update_friends"
 export const CHANNEL_LOG = "llonebot_log"
 export const CHANNEL_POST_ONEBOT_DATA = "llonebot_post_onebot_data"
 export const CHANNEL_SET_SELF_INFO= "llonebot_set_self_info"
-export const CHANNEL_DOWNLOAD_FILE= "llonebot_download_file"
+export const CHANNEL_DOWNLOAD_FILE= "llonebot_download_file"
+export const CHANNEL_DELETE_FILE= "llonebot_delete_file"
+export const CHANNEL_GET_RUNNING_STATUS= "llonebot_get_running_status"

src/common/types.ts

@@ -114,7 +114,7 @@ export type SendMessage = {
         text: string, // 纯文本
     }
 } | {
-    type: "image" | "voice",
+    type: "image" | "voice" | "record",
     file: string, // 本地路径
     data?: {
         file: string // 本地路径

src/global.d.ts

@@ -44,6 +44,8 @@ declare var llonebot: {
     getConfig():Promise<Config>;
     setSelfInfo(selfInfo: SelfInfo):void;
     downloadFile(arg: {uri: string, localFilePath: string}):Promise<string>;
+    deleteFile(path: string[]):Promise<void>;
+    getRunningStatus(): Promise<boolean>;
 };
 
 declare global {

src/main/HttpServer.ts

@@ -1,11 +1,54 @@
-import {sendIPCRecallQQMsg, sendIPCSendQQMsg} from "./IPCSend";
-
 const express = require("express");
-import {OnebotGroupMemberRole, PostDataAction, PostDataSendMsg} from "../common/types";
+const bodyParser = require('body-parser');
+import {sendIPCRecallQQMsg, sendIPCSendQQMsg} from "./IPCSend";
+import {OnebotGroupMemberRole, PostDataAction, PostDataSendMsg, SendMessage} from "../common/types";
 import {friends, groups, selfInfo} from "./data";
 
+// @SiberianHusky 2021-08-15
+function checkSendMessage(sendMsgList: SendMessage[]) {
+    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"].includes(type)) {
+                if (!data["file"]) {
+                    return 400;
+                }
+                else{
+                    if (checkUri(data["file"])) {
+                        return 200;
+                    }
+                    else{
+                        return 400;
+                    }
+                }
+
+            } else if (type === "at" && !data["qq"]) {
+                return 400;
+            } else if (type === "reply" && !data["id"]) {
+                return 400;
+            }
+        }
+        else{
+            return 400
+        }
+    }
+    return 200;
+}
+// ==end==
+
 function handlePost(jsonData: any) {
-    jsonData.params = jsonData;
+    if (!jsonData.params) {
+        jsonData.params = jsonData
+
+    }
     let resData = {
         status: 0,
         retcode: 0,
@@ -17,11 +60,20 @@ function handlePost(jsonData: any) {
     } else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
         if (jsonData.action == "send_private_msg") {
             jsonData.message_type = "private"
-        }
-        else {
+        } else {
             jsonData.message_type = "group"
         }
-        sendIPCSendQQMsg(jsonData);
+        // @SiberianHuskY 2021-10-20 22:00:00
+        resData.status = checkSendMessage(jsonData.message);
+        if (resData.status == 200) {
+            resData.message = "发送成功";
+            resData.data = jsonData.message;
+            sendIPCSendQQMsg(jsonData);
+        } else {
+            resData.message = "发送失败, 请检查消息格式";
+            resData.data = jsonData.message;
+        }
+        // == end ==
     } else if (jsonData.action == "get_group_list") {
         resData["data"] = groups.map(group => {
             return {
@@ -37,8 +89,7 @@ function handlePost(jsonData: any) {
                 })
             }
         })
-    }
-    else if (jsonData.action == "get_group_info") {
+    } else if (jsonData.action == "get_group_info") {
         let group = groups.find(group => group.uid == jsonData.params.group_id)
         if (group) {
             resData["data"] = {
@@ -47,10 +98,9 @@ function handlePost(jsonData: any) {
                 member_count: group.members.length,
             }
         }
-    }
-    else if (jsonData.action == "get_group_member_info") {
+    } else if (jsonData.action == "get_group_member_info") {
         let member = groups.find(group => group.uid == jsonData.params.group_id)?.members?.find(member => member.uin == jsonData.params.user_id)
-        resData["data"] ={
+        resData["data"] = {
             user_id: member.uin,
             user_name: member.nick,
             user_display_name: member.cardName || member.nick,
@@ -58,8 +108,7 @@ function handlePost(jsonData: any) {
             card: member.cardName,
             role: OnebotGroupMemberRole[member.role],
         }
-    }
-    else if (jsonData.action == "get_group_member_list") {
+    } else if (jsonData.action == "get_group_member_list") {
         let group = groups.find(group => group.uid == jsonData.params.group_id)
         if (group) {
             resData["data"] = group?.members?.map(member => {
@@ -93,7 +142,8 @@ function handlePost(jsonData: any) {
 export function startExpress(port: number) {
     const app = express();
     // 中间件，用于解析POST请求的请求体
-    app.use(express.urlencoded({extended: true}));
+    app.use(express.urlencoded({extended: true, limit: "500mb"}));
+    app.use(bodyParser({limit: '500mb'}))
     app.use(express.json());
 
     function parseToOnebot12(action: PostDataAction) {
@@ -104,6 +154,7 @@ export function startExpress(port: number) {
             res.send(resData)
         });
     }
+
     const actionList: PostDataAction[] = ["get_login_info", "send_private_msg", "send_group_msg",
         "get_group_list", "get_friend_list", "delete_msg", "get_group_member_list", "get_group_member_info"]
 

src/main/main.ts

@@ -13,19 +13,21 @@ import {
     CHANNEL_SET_CONFIG,
     CHANNEL_START_HTTP_SERVER,
     CHANNEL_UPDATE_FRIENDS,
-    CHANNEL_UPDATE_GROUPS
+    CHANNEL_UPDATE_GROUPS, CHANNEL_DELETE_FILE, CHANNEL_GET_RUNNING_STATUS
 } from "../common/IPCChannel";
 import {ConfigUtil} from "./config";
 import {startExpress} from "./HttpServer";
-import {log} from "./utils";
+import {isGIF, log} from "./utils";
 import {friends, groups, selfInfo} from "./data";
 
 const fs = require('fs');
 
+let running = false;
+
 
 // 加载插件时触发
 function onLoad(plugin: any) {
-
+    log("main onLoaded");
     function getConfigUtil() {
         const configFilePath = path.join(plugin.path.data, `config_${selfInfo.user_id}.json`)
         return new ConfigUtil(configFilePath)
@@ -53,6 +55,10 @@ function onLoad(plugin: any) {
             let buffer = await blob.arrayBuffer();
             fs.writeFileSync(arg.localFilePath, Buffer.from(buffer));
         }
+        if (isGIF(arg.localFilePath)) {
+            fs.renameSync(arg.localFilePath, arg.localFilePath + ".gif");
+            arg.localFilePath += ".gif";
+        }
         return arg.localFilePath;
     })
     ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
@@ -121,6 +127,17 @@ function onLoad(plugin: any) {
     ipcMain.handle(CHANNEL_SET_SELF_INFO, (event: any, arg: SelfInfo) => {
         selfInfo.user_id = arg.user_id;
         selfInfo.nickname = arg.nickname;
+        running = true;
+    })
+
+    ipcMain.on(CHANNEL_DELETE_FILE, (event: any, arg: string[]) => {
+        for (const path of arg) {
+            fs.unlinkSync(path);
+        }
+    })
+
+    ipcMain.handle(CHANNEL_GET_RUNNING_STATUS, (event: any, arg: any) => {
+        return running;
     })
 }
 

src/main/utils.ts

@@ -5,4 +5,12 @@ export function log(msg: any) {
     fs.appendFile("./llonebot.log", currentDateTime + ":" + msg + "\n", (err: any) => {
 
     })
+}
+
+export function isGIF(path: string) {
+    const buffer = Buffer.alloc(4);
+    const fd = fs.openSync(path, 'r');
+    fs.readSync(fd, buffer, 0, 4, 0);
+    fs.closeSync(fd);
+    return buffer.toString() === 'GIF8'
 }

src/preload.ts

@@ -3,10 +3,18 @@
 import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
 import {
     CHANNEL_DOWNLOAD_FILE,
-    CHANNEL_GET_CONFIG, CHANNEL_SET_SELF_INFO, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
-    CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG,
+    CHANNEL_GET_CONFIG,
+    CHANNEL_SET_SELF_INFO,
+    CHANNEL_LOG,
+    CHANNEL_POST_ONEBOT_DATA,
+    CHANNEL_RECALL_MSG,
+    CHANNEL_SEND_MSG,
     CHANNEL_SET_CONFIG,
-    CHANNEL_START_HTTP_SERVER, CHANNEL_UPDATE_FRIENDS, CHANNEL_UPDATE_GROUPS
+    CHANNEL_START_HTTP_SERVER,
+    CHANNEL_UPDATE_FRIENDS,
+    CHANNEL_UPDATE_GROUPS,
+    CHANNEL_DELETE_FILE,
+    CHANNEL_GET_RUNNING_STATUS
 } from "./common/IPCChannel";
 
 
@@ -50,8 +58,14 @@ contextBridge.exposeInMainWorld("llonebot", {
     setSelfInfo(selfInfo: SelfInfo){
         ipcRenderer.invoke(CHANNEL_SET_SELF_INFO, selfInfo)
     },
-    downloadFile: async (arg: {uri: string, localFilePath: string}) => {
+    downloadFile: (arg: {uri: string, localFilePath: string}) => {
         return ipcRenderer.invoke(CHANNEL_DOWNLOAD_FILE, arg);
     },
+    deleteFile: async (localFilePath: string[]) => {
+        ipcRenderer.send(CHANNEL_DELETE_FILE, localFilePath);
+    },
+    getRunningStatus: () => {
+        return ipcRenderer.invoke(CHANNEL_GET_RUNNING_STATUS);
+    }
     // startExpress,
 });

src/renderer.ts

@@ -4,6 +4,7 @@
 // const { ipcRenderer } = require('electron');
 import {AtType, Group, MessageElement, OnebotGroupMemberRole, Peer, PostDataSendMsg, User} from "./common/types";
 import * as stream from "stream";
+import {raw} from "express";
 
 let self_qq: string = ""
 let groups: Group[] = []
@@ -20,8 +21,27 @@ async function getUserInfo(uid: string): Promise<User> {
     return user
 }
 
-function getFriend(qq: string) {
-    return friends.find(friend => friend.uid == qq)
+async function getFriends() {
+    let _friends = await window.LLAPI.getFriendsList(false)
+    for (let friend of _friends) {
+        let existFriend = friends.find(f => f.uin == friend.uin)
+        if (!existFriend) {
+            friends.push(friend)
+        }
+    }
+    window.llonebot.updateFriends(friends)
+    return friends
+
+
+}
+
+async function getFriend(qq: string) {
+    let friend = friends.find(friend => friend.uin == qq)
+    if (!friend) {
+        await getFriends();
+        friend = friends.find(friend => friend.uin == qq);
+    }
+    return friend;
 }
 
 async function getGroup(qq: string) {
@@ -39,11 +59,11 @@ async function getGroups() {
         group.members = [];
         let existGroup = groups.find(g => g.uid == group.uid)
         if (!existGroup) {
-            console.log("更新群列表", groups)
+            // console.log("更新群列表", groups)
             groups.push(group)
-            window.llonebot.updateGroups(groups)
         }
     }
+    window.llonebot.updateGroups(groups)
     return groups
 }
 
@@ -115,7 +135,7 @@ async function handleNewMessage(messages: MessageElement[]) {
             console.log("收到群消息", onebot_message_data)
         } else if (message.peer.chatType == "private") {
             onebot_message_data["user_id"] = message.peer.uid
-            let friend = getFriend(message.sender.uid)
+            let friend = await getFriend(message.sender.uid)
             onebot_message_data.sender = {
                 user_id: friend!.uin,
                 nickname: friend!.nickName
@@ -171,12 +191,12 @@ async function listenSendMessage(postData: PostDataSendMsg) {
             }
         }
         if (postData.action == "send_private_msg") {
-            let friend = getFriend(postData.params.user_id)
+            let friend = await getFriend(postData.params.user_id)
             if (friend) {
                 peer = {
                     chatType: "private",
                     name: friend.nickName,
-                    uid: friend.uin
+                    uid: friend.uid
                 }
             }
         } else if (postData.action == "send_group_msg") {
@@ -193,6 +213,7 @@ async function listenSendMessage(postData: PostDataSendMsg) {
             }
         }
         if (peer) {
+            let sendFiles: string[] = [];
             for (let message of postData.params.message) {
                 if (message.type == "at") {
                     // @ts-ignore
@@ -206,7 +227,7 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                     message.content = `@${atMember.cardName || atMember.nick}`
                 } else if (message.type == "text") {
                     message.content = message.data?.text || message.content
-                } else if (message.type == "image" || message.type == "voice") {
+                } else if (message.type == "image" || message.type == "voice" || message.type == "record") {
                     // todo: 收到的应该是uri格式的，需要转成本地的, uri格式有三种，http, file, base64
                     let url = message.data?.file || message.file
                     let uri = new URL(url);
@@ -214,16 +235,18 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                     if (message.type == "image") {
                         ext = ".png"
                     }
-                    if (message.type == "voice") {
+                    if (message.type == "voice" || message.type == "record") {
+                        message.type = "voice"
                         ext = ".amr"
                     }
                     let localFilePath = `${Date.now()}${ext}`
                     if (uri.protocol == "file:") {
                         localFilePath = url.split("file://")[1]
                     } else {
-                        await window.llonebot.downloadFile({uri: url, localFilePath: localFilePath})
+                        localFilePath = await window.llonebot.downloadFile({uri: url, localFilePath: localFilePath})
                     }
                     message.file = localFilePath
+                    sendFiles.push(localFilePath);
                 } else if (message.type == "reply") {
                     let msgId = message.data?.id || message.msgId
                     let replyMessage = msgHistory.find(msg => msg.raw.msgId == msgId)
@@ -231,9 +254,13 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                     message.msgSeq = replyMessage?.raw.msgSeq || ""
                 }
             }
-            // 发送完之后要删除下载的文件
             console.log("发送消息", postData)
-            window.LLAPI.sendMessage(peer, postData.params.message).then(res => console.log("消息发送成功:", res),
+            window.LLAPI.sendMessage(peer, postData.params.message).then(res => {
+                    console.log("消息发送成功:", peer, postData.params.message)
+                    if (sendFiles.length) {
+                        window.llonebot.deleteFile(sendFiles);
+                    }
+                },
                 err => console.log("消息发送失败", postData, err))
         }
     }
@@ -246,14 +273,11 @@ function recallMessage(msgId: string) {
 
 let chatListEle: HTMLCollectionOf<Element>
 
-function onLoad() {
-
-    window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
-        listenSendMessage(postData).then()
-    });
-    window.llonebot.listenRecallMessage((arg: { message_id: string }) => {
-        recallMessage(arg.message_id)
-    })
+async function onLoad(arg: any) {
+    let runningStatus = await window.llonebot.getRunningStatus();
+    if (runningStatus) {
+        return;
+    }
 
     async function getGroupsMembers(groupsArg: Group[]) {
         // 批量获取群成员列表
@@ -270,9 +294,12 @@ function onLoad() {
                 getGroupsMembers(failedGroups).then()
             }, 1000)
         } else {
-            console.log("全部群成员获取完毕", groups)
+            window.llonebot.log("全部群成员获取完毕")
         }
     }
+    await getFriends();
+    await getGroups();
+    await getGroupsMembers(groups);
 
     function onNewMessages(messages: MessageElement[]) {
         async function func(messages: MessageElement[]) {
@@ -285,25 +312,31 @@ function onLoad() {
 
         func(messages).then(() => {
         })
-        console.log("chatListEle", chatListEle)
+        // console.log("chatListEle", chatListEle)
     }
+    window.LLAPI.on("new-messages", onNewMessages);
+    window.LLAPI.on("new-send-messages", onNewMessages);
 
-    getGroups().then(() => {
-        getGroupsMembers(groups).then(() => {
-            window.LLAPI.on("new-messages", onNewMessages);
-            window.LLAPI.on("new-send-messages", onNewMessages);
-        })
-    })
+    let accountInfo = await window.LLAPI.getAccountInfo();
+    window.llonebot.log("getAccountInfo " + JSON.stringify(accountInfo));
+    if (!accountInfo.uid) {
+        return;
+    }
+    let selfInfo = await window.LLAPI.getUserInfo(accountInfo.uid);
+    window.llonebot.setSelfInfo({
+        user_id: accountInfo.uin,
+        nickname: selfInfo.nickName
+    });
+    window.llonebot.log("selfInfo " + JSON.stringify(selfInfo))
+    window.llonebot.startExpress();
 
-    window.LLAPI.getAccountInfo().then(accountInfo => {
-        window.LLAPI.getUserInfo(accountInfo.uid).then(userInfo => {
-            window.llonebot.setSelfInfo({
-                user_id: accountInfo.uin,
-                nickname: userInfo.nickName
-            });
-            window.llonebot.startExpress();
-        })
+    window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
+        listenSendMessage(postData).then().catch(err => console.log("listenSendMessage err", err))
     })
+    window.llonebot.listenRecallMessage((arg: { message_id: string }) => {
+        recallMessage(arg.message_id)
+    })
+    window.llonebot.log("llonebot loaded");
 
     window.LLAPI.add_qmenu((qContextMenu: Node) => {
         let btn = document.createElement("a")
@@ -340,7 +373,7 @@ function onLoad() {
         }
         btn.innerText = "获取群成员列表"
         console.log(qContextMenu)
-        qContextMenu.appendChild(btn)
+        // qContextMenu.appendChild(btn)
     })
 
     window.LLAPI.on("context-msg-menu", (event, target, msgIds) => {