Merge branch 'dev'

# Conflicts:
#	manifest.json

.github/workflows/publish.yml

@@ -0,0 +1,36 @@
+name: "publish"
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+
+    - name: setup node
+      uses: actions/setup-node@v2
+      with:
+        node-version: 18
+
+    - name: install dependenies
+      run: npm install
+
+    - name: build
+      run: npm run build
+
+    - name: zip
+      run: |
+        sudo apt install zip -y
+        cp manifest.json ./dist/manifest.json
+        zip LLOneBot.zip ./dist/* -j
+    
+    - name: publish
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "LLOneBot.zip"
+        draft: true
+        token: ${{ secrets.RELEASE_TOKEN }}

README.md

@@ -1,24 +1,25 @@
 # LLOneBot API
 
-将NTQQLiteLoaderAPI封装成OneBot11/12标准的API
+
+将NTQQLiteLoaderAPI封装成OneBot11/12标准的API, V12没有完整测试
+
+*注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
 
 ## 安装方法
 
-1.安装[NTQQLiteLoader](https://github.com/LiteLoaderQQNT/LiteLoaderQQNT)
+1.安装[NTQQLiteLoader](https://liteloaderqqnt.github.io/guide/install.html)
 
 2.安装修改后的[LiteLoaderQQNT-Plugin-LLAPI](https://github.com/linyuchen/LiteLoaderQQNT-Plugin-LLAPI)，原版的功能有缺陷
 
-3.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi)
+3.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本
 
-*关于插件的安装方法: 上述的两个插件都没有上架NTQQLiteLoader插件市场，需要自己下载源码复制到插件目录*
+*关于插件的安装方法: 上述的两个插件都没有上架NTQQLiteLoader插件市场，需要自己下载复制到插件目录*
 
-*Windows插件目录:`%USERPROFILE%/Documents/LiteLoaderQQNT/plugins`*
-
-*Mac插件目录:`~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins`*
+*插件目录:`LiteLoaderQQNT/plugins`*
 
 ## 支持的API
 
-目前只支持http协议，不支持websocket，事件上报也是http协议
+目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
 
 - [x] 获取群列表
 - [x] 获取群成员列表
@@ -38,4 +39,24 @@
 - [ ] 转发消息记录
 - [ ] xml
 
-**自己发送成功的消息也会上报，可以用于获取需要撤回消息的id**
+支持的api:
+- [x] get_login_info
+- [x] send_msg
+- [x] send_group_msg
+- [x] send_private_msg
+- [x] delete_msg
+- [x] get_group_list
+- [x] get_group_member_list
+- [x] get_group_member_info
+- [x] get_friend_list
+
+**自己发送成功的消息也会上报，可以用于获取需要撤回消息的id**
+
+## 示例
+
+![](doc/image/example.jpg)
+
+*暂时不支持`"message": "hello"`这种message为字符串的形式*
+
+## onebot11文档
+<https://11.onebot.dev/>

manifest.json

@@ -1,19 +1,19 @@
 {
-    "manifest_version": 3,
+    "manifest_version": 4,
     "type": "extension",
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "0.1.0",
+    "version": "2.0.4",
     "thumbnail": "./icon.png",
-    "author": {
+    "authors": [{
         "name": "linyuchen",
         "link": "https://github.com/linyuchen"
-    },
+    }],
     "repository": {
-        "repo": "linyuchen/LLOneBot",
+        "repo": "linyuchen/LiteLoaderQQNT-OneBotApi",
         "branch": "main",
-        "use_release": {
+        "release": {
             "tag": "latest",
             "name": "LLOneBot.zip"
         }

package.json

@@ -9,9 +9,9 @@
     "build-main": "webpack --config webpack.main.config.js",
     "build-preload": "webpack --config webpack.preload.config.js",
     "build-renderer": "webpack --config webpack.renderer.config.js",
-    "build-mac": "npm run build && npm run deploy-mac",
+    "build-mac": "npm run build && cp manifest.json dist/ && npm run deploy-mac",
     "deploy-mac": "cp dist/* ~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins/LLOnebot/",
-    "build-win": "npm run build && npm run deploy-win",
+    "build-win": "npm run build && cp manifest.json dist/ && npm run deploy-win",
     "deploy-win": "cmd /c \"copy dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOnebot\\\""
   },
   "author": "",

src/common/IPCChannel.ts

@@ -6,4 +6,8 @@ export const CHANNEL_START_HTTP_SERVER = "llonebot_start_http_server"
 export const CHANNEL_UPDATE_GROUPS = "llonebot_update_groups"
 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_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_DELETE_FILE= "llonebot_delete_file"
+export const CHANNEL_GET_RUNNING_STATUS= "llonebot_get_running_status"

src/common/types.ts

@@ -17,6 +17,18 @@ export type GroupMemberInfo = {
     uin: string; // QQ号
 }
 
+export const OnebotGroupMemberRole = {
+    4: 'owner',
+    3: 'admin',
+    2: 'member'
+}
+
+
+export type SelfInfo = {
+    user_id: string;
+    nickname: string;
+}
+
 export type User = {
     avatarUrl?: string;
     bio?: string;  // 签名
@@ -32,7 +44,7 @@ export type Group = {
 }
 
 export type Peer = {
-    chatType: "private" | "group"
+    chatType: "private" | "group" | "friend"
     name: string
     uid: string  // qq号
 }
@@ -41,6 +53,7 @@ export type MessageElement = {
     raw: {
         msgId: string,
         msgSeq: string,
+        senderUin: string; // 发送者QQ号
         elements: {
             replyElement: {
                 senderUid: string,  // 原消息发送者QQ号
@@ -86,7 +99,6 @@ export type MessageElement = {
             }
         }[]
     }
-
     peer: Peer,
     sender: {
         uid: string  // 一串加密的字符串
@@ -102,7 +114,7 @@ export type SendMessage = {
         text: string, // 纯文本
     }
 } | {
-    type: "image" | "voice",
+    type: "image" | "voice" | "record",
     file: string, // 本地路径
     data?: {
         file: string // 本地路径
@@ -126,8 +138,11 @@ export type SendMessage = {
     }
 }
 
+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"
+
 export type PostDataSendMsg = {
-    action: "send_private_msg" | "send_group_msg" | "get_group_list" | "get_friend_list" | "delete_msg",
+    action: PostDataAction
     message_type?: "private" | "group"
     params?: {
         user_id: string,
@@ -141,5 +156,5 @@ export type PostDataSendMsg = {
 
 export type Config = {
     port: number,
-    host: string,
+    hosts: string[],
 }

src/global.d.ts

@@ -1,16 +1,25 @@
-import {Config, Group, GroupMemberInfo, MessageElement, Peer, PostDataSendMsg, SendMessage, User} from "./common/types";
+import {
+    Config,
+    Group,
+    GroupMemberInfo,
+    MessageElement,
+    Peer,
+    PostDataSendMsg,
+    SelfInfo,
+    SendMessage,
+    User
+} from "./common/types";
 
 
 declare var LLAPI: {
     on(event: "new-messages" | "new-send-messages", callback: (data: MessageElement[]) => void): void;
     on(event: "context-msg-menu", callback: (event: any, target: any, msgIds:any) => void): void;
     getAccountInfo(): Promise<{
-        uid: string  // qq
-        uin: string  // 一串加密的字符串
+        uid: string  // 一串加密的字符串
+        uin: string  // qq
     }>
 
-    // uid是一串加密的字符串
-    getUserInfo(uid: string): Promise<User>;
+    getUserInfo(uid: string): Promise<User>; // uid是一串加密的字符串
     sendMessage(peer: Peer, message: SendMessage[]): Promise<any>;
     recallMessage(peer: Peer, msgIds: string[]): Promise<void>;
     getGroupsList(forced: boolean): Promise<Group[]>
@@ -33,6 +42,10 @@ declare var llonebot: {
     log(data: any): void,
     setConfig(config: Config):void;
     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,23 +1,87 @@
-import {sendIPCRecallQQMsg, sendIPCSendQQMsg} from "./IPCSend";
+import {log} from "./utils";
 
 const express = require("express");
-import {PostDataSendMsg} from "../common/types";
-import {friends, groups} from "./data";
+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) {
+    log("API receive post:" + JSON.stringify(jsonData))
+    if (!jsonData.params) {
+        jsonData.params = JSON.parse(JSON.stringify(jsonData));
+        delete jsonData.params.params;
+    }
     let resData = {
         status: 0,
         retcode: 0,
         data: {},
         message: ''
     }
-    if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
-        sendIPCSendQQMsg(jsonData);
+    if (jsonData.action == "get_login_info") {
+        resData["data"] = selfInfo
+    } else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
+        if (jsonData.action == "send_private_msg") {
+            jsonData.message_type = "private"
+        } else {
+            jsonData.message_type = "group"
+        }
+        // @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 {
                 group_id: group.uid,
                 group_name: group.name,
+                member_count: group.members.length,
                 group_members: group.members.map(member => {
                     return {
                         user_id: member.uin,
@@ -27,33 +91,36 @@ function handlePost(jsonData: any) {
                 })
             }
         })
+    } else if (jsonData.action == "get_group_info") {
+        let group = groups.find(group => group.uid == jsonData.params.group_id)
+        if (group) {
+            resData["data"] = {
+                group_id: group.uid,
+                group_name: group.name,
+                member_count: group.members.length,
+            }
+        }
+    } 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"] = {
+            user_id: member.uin,
+            user_name: member.nick,
+            user_display_name: member.cardName || member.nick,
+            nickname: member.nick,
+            card: member.cardName,
+            role: OnebotGroupMemberRole[member.role],
+        }
     } 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 => {
-                let role = "member"
-                switch (member.role) {
-                    case 4: {
-                        role = "owner"
-                        break;
-                    }
-                    case 3: {
-                        role = "admin"
-                        break
-                    }
-                    case 2: {
-                        role = "member"
-                        break
-                    }
-
-                }
                 return {
                     user_id: member.uin,
                     user_name: member.nick,
                     user_display_name: member.cardName || member.nick,
                     nickname: member.nick,
                     card: member.cardName,
-                    role
+                    role: OnebotGroupMemberRole[member.role],
                 }
 
             }) || []
@@ -76,10 +143,25 @@ function handlePost(jsonData: any) {
 
 export function startExpress(port: number) {
     const app = express();
-
     // 中间件，用于解析POST请求的请求体
-    app.use(express.urlencoded({extended: true}));
-    app.use(express.json());
+    app.use(express.urlencoded({extended: true, limit: "500mb"}));
+    app.use(express.json({limit: '500mb'}));
+
+    function parseToOnebot12(action: PostDataAction) {
+        app.post('/' + action, (req: any, res: any) => {
+            let jsonData: PostDataSendMsg = req.body;
+            jsonData.action = action
+            let resData = handlePost(jsonData)
+            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"]
+
+    for (const action of actionList) {
+        parseToOnebot12(action as PostDataAction)
+    }
 
     app.get('/', (req: any, res: any) => {
         res.send('llonebot已启动');
@@ -92,18 +174,6 @@ export function startExpress(port: number) {
         let resData = handlePost(jsonData)
         res.send(resData)
     });
-    app.post('/send_private_msg', (req: any, res: any) => {
-        let jsonData: PostDataSendMsg = req.body;
-        jsonData.action = "send_private_msg"
-        let resData = handlePost(jsonData)
-        res.send(resData)
-    })
-    app.post('/send_group_msg', (req: any, res: any) => {
-        let jsonData: PostDataSendMsg = req.body;
-        jsonData.action = "send_group_msg"
-        let resData = handlePost(jsonData)
-        res.send(resData)
-    })
     app.post('/send_msg', (req: any, res: any) => {
         let jsonData: PostDataSendMsg = req.body;
         if (jsonData.message_type == "private") {
@@ -120,12 +190,7 @@ export function startExpress(port: number) {
         let resData = handlePost(jsonData)
         res.send(resData)
     })
-    app.post('/delete_msg', (req: any, res: any) => {
-        let jsonData: PostDataSendMsg = req.body;
-        jsonData.action = "delete_msg"
-        let resData = handlePost(jsonData)
-        res.send(resData)
-    })
+
     app.listen(port, "0.0.0.0", () => {
         console.log(`服务器已启动，监听端口 ${port}`);
     });

src/main/IPCSend.ts

@@ -1,4 +1,4 @@
-import {webContents} from 'electron';
+import {ipcMain, webContents} from 'electron';
 import {PostDataSendMsg} from "../common/types";
 import {CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG} from "../common/IPCChannel";
 
@@ -8,6 +8,7 @@ function sendIPCMsg(channel: string, data: any) {
         try {
             content.send(channel, data)
         } catch (e) {
+            console.log("llonebot send ipc msg to render error:", e)
         }
     }
 }

src/main/config.ts

@@ -11,10 +11,18 @@ export class ConfigUtil{
 
     getConfig(): Config{
         if (!fs.existsSync(this.configPath)) {
-            return {"port":3000, "host": "http://localhost:5000/"}
+            return {port:3000, hosts: ["http://192.168.1.2:5000/"]}
         } else {
             const data = fs.readFileSync(this.configPath, "utf-8");
-            return JSON.parse(data);
+            let jsonData =JSON.parse(data);
+            if (!jsonData.hosts){
+                jsonData.hosts = []
+            }
+            return jsonData;
         }
     }
+
+    setConfig(config: Config){
+        fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
+    }
 }

src/main/data.ts

@@ -1,4 +1,9 @@
-import {Group, User} from "../common/types";
+import {Group, SelfInfo, User} from "../common/types";
 
 export let groups: Group[] = []
 export let friends: User[] = []
+
+export let selfInfo: SelfInfo = {
+    user_id: "",
+    nickname: ""
+}

src/main/main.ts

@@ -1,42 +1,75 @@
 // 运行在 Electron 主进程 下的插件入口
 
 import * as path from "path";
-
-const fs = require('fs');
 import {ipcMain} from 'electron';
 
-import {Config, Group, User} from "../common/types";
+import {Config, Group, SelfInfo, User} from "../common/types";
 import {
-    CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
+    CHANNEL_DOWNLOAD_FILE,
+    CHANNEL_GET_CONFIG,
+    CHANNEL_SET_SELF_INFO,
+    CHANNEL_LOG,
+    CHANNEL_POST_ONEBOT_DATA,
     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";
 import {ConfigUtil} from "./config";
 import {startExpress} from "./HttpServer";
-import {log} from "./utils";
-import {friends, groups} from "./data";
+import {isGIF, log} from "./utils";
+import {friends, groups, selfInfo} from "./data";
+import {} from "../global";
 
+const fs = require('fs');
+
+let running = false;
 
 
 // 加载插件时触发
-function onLoad(plugin: any) {
+function onLoad() {
+    log("main onLoaded");
+    // const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;
+    const config_dir = global.LiteLoader.plugins["LLOneBot"].path.data;
+    function getConfigUtil() {
+        const configFilePath = path.join(config_dir, `config_${selfInfo.user_id}.json`)
+        return new ConfigUtil(configFilePath)
+    }
 
-    const configFilePath = path.join(plugin.path.data, "config.json")
-    let configUtil = new ConfigUtil(configFilePath)
-
-    if (!fs.existsSync(plugin.path.data)) {
-        fs.mkdirSync(plugin.path.data, {recursive: true});
+    if (!fs.existsSync(config_dir)) {
+        fs.mkdirSync(config_dir, {recursive: true});
     }
     ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
-        return configUtil.getConfig()
+        return getConfigUtil().getConfig()
+    })
+    ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: {uri: string, localFilePath: string}) => {
+        let url = new URL(arg.uri);
+        if (url.protocol == "base64:"){
+            // base64转成文件
+            let base64Data = arg.uri.split("base64://")[1]
+            const buffer = Buffer.from(base64Data, 'base64');
+
+            fs.writeFileSync(arg.localFilePath, buffer);
+        }
+        else if (url.protocol == "http:" || url.protocol == "https:") {
+            // 下载文件
+            let res = await fetch(url)
+            let blob = await res.blob();
+            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) => {
-        fs.writeFileSync(configFilePath, JSON.stringify(arg, null, 2), "utf-8")
+        getConfigUtil().setConfig(arg)
     })
 
     ipcMain.on(CHANNEL_START_HTTP_SERVER, (event: any, arg: any) => {
-        startExpress(configUtil.getConfig().port)
+        startExpress(getConfigUtil().getConfig().port)
     })
 
     ipcMain.on(CHANNEL_UPDATE_GROUPS, (event: any, arg: Group[]) => {
@@ -70,20 +103,23 @@ function onLoad(plugin: any) {
     })
 
     ipcMain.on(CHANNEL_POST_ONEBOT_DATA, (event: any, arg: any) => {
-        try {
-            fetch(configUtil.getConfig().host, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json"
-                },
-                body: JSON.stringify(arg)
-            }).then((res: any) => {
-                log("新消息事件上传");
-            }, (err: any) => {
-                log("新消息事件上传失败:" + err + JSON.stringify(arg));
-            });
-        } catch (e: any) {
-            log(e.toString())
+        for(const host of getConfigUtil().getConfig().hosts) {
+            try {
+                fetch(host, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "x-self-id": selfInfo.user_id
+                    },
+                    body: JSON.stringify(arg)
+                }).then((res: any) => {
+                    log("新消息事件上传");
+                }, (err: any) => {
+                    log("新消息事件上传失败:" + err + JSON.stringify(arg));
+                });
+            } catch (e: any) {
+                log(e.toString())
+            }
         }
     })
 
@@ -91,17 +127,36 @@ function onLoad(plugin: any) {
         log(arg)
     })
 
+    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;
+    })
 }
 
 
 // 创建窗口时触发
-function onBrowserWindowCreated(window: any, plugin: any) {
+function onBrowserWindowCreated(window: any) {
 
 }
 
+try {
+    onLoad();
+} catch (e: any) {
+    console.log(e.toString())
+}
 
 // 这两个函数都是可选的
 export {
-    onLoad, onBrowserWindowCreated
+    onBrowserWindowCreated
 }

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

@@ -1,11 +1,20 @@
 // Electron 主进程 与 渲染进程 交互的桥梁
 
-import {Config, Group, PostDataSendMsg, User} from "./common/types";
+import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
 import {
-    CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_POST_ONEBOT_DATA,
-    CHANNEL_RECALL_MSG, CHANNEL_SEND_MSG,
+    CHANNEL_DOWNLOAD_FILE,
+    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";
 
 
@@ -25,6 +34,7 @@ contextBridge.exposeInMainWorld("llonebot", {
         ipcRenderer.send(CHANNEL_UPDATE_FRIENDS, friends);
     },
     listenSendMessage: (handle: (jsonData: PostDataSendMsg) => void) => {
+        ipcRenderer.send(CHANNEL_LOG, "发送消息API已注册");
         ipcRenderer.on(CHANNEL_SEND_MSG, (event: any, args: PostDataSendMsg) => {
             handle(args)
         })
@@ -45,6 +55,18 @@ contextBridge.exposeInMainWorld("llonebot", {
     },
     getConfig: async () => {
         return ipcRenderer.invoke(CHANNEL_GET_CONFIG);
+    },
+    setSelfInfo(selfInfo: SelfInfo){
+        ipcRenderer.invoke(CHANNEL_SET_SELF_INFO, selfInfo)
+    },
+    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

@@ -2,7 +2,9 @@
 
 // import express from "express";
 // const { ipcRenderer } = require('electron');
-import {AtType, Group, MessageElement, Peer, PostDataSendMsg, User} from "./common/types";
+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[] = []
@@ -19,8 +21,25 @@ 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) {
@@ -38,11 +57,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
 }
 
@@ -83,6 +102,7 @@ async function getGroupMember(group_qq: string, member_uid: string) {
 
 
 async function handleNewMessage(messages: MessageElement[]) {
+    // console.log("llonebot 收到消息:", messages);
     for (let message of messages) {
         let onebot_message_data: any = {
             self: {
@@ -97,18 +117,30 @@ async function handleNewMessage(messages: MessageElement[]) {
             detail_type: message.peer.chatType,
             message_id: message.raw.msgId,
             sub_type: "",
-            message: []
+            message: [],
+            raw_message: "",
+            font: 14
         }
-        // let group: Group
         if (message.peer.chatType == "group") {
             let group_id = message.peer.uid
             let group = (await getGroup(group_id))!
             onebot_message_data["group_id"] = message.peer.uid
             let groupMember = await getGroupMember(group_id, message.sender.uid)
             onebot_message_data["user_id"] = groupMember!.uin
-            console.log("收到群消息", onebot_message_data)
-        } else if (message.peer.chatType == "private") {
-            onebot_message_data["user_id"] = message.peer.uid
+            onebot_message_data.sender = {
+                user_id: groupMember!.uin,
+                nickname: groupMember!.nick,
+                card: groupMember!.cardName,
+                role: OnebotGroupMemberRole[groupMember!.role]
+            }
+            // console.log("收到群消息", onebot_message_data)
+        } else if (message.peer.chatType == "private" || message.peer.chatType == "friend") {
+            onebot_message_data["user_id"] = message.raw.senderUin;
+            let friend = await getFriend(message.raw.senderUin)
+            onebot_message_data.sender = {
+                user_id: friend!.uin,
+                nickname: friend!.nickName
+            }
         }
         for (let element of message.raw.elements) {
             let message_data: any = {
@@ -132,7 +164,11 @@ async function handleNewMessage(messages: MessageElement[]) {
                 message_data["type"] = "image"
                 message_data["data"]["file_id"] = element.picElement.fileUuid
                 message_data["data"]["path"] = element.picElement.sourcePath
-                message_data["data"]["file"] = element.picElement.sourcePath
+                let startS = "file://"
+                if (!element.picElement.sourcePath.startsWith("/")) {
+                    startS += "/"
+                }
+                message_data["data"]["file"] = startS + element.picElement.sourcePath
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
                 message_data["data"]["id"] = msgHistory.find(msg => msg.raw.msgSeq == element.replyElement.replayMsgSeq)?.raw.msgId
@@ -146,9 +182,10 @@ async function handleNewMessage(messages: MessageElement[]) {
 }
 
 async function listenSendMessage(postData: PostDataSendMsg) {
+    console.log("收到发送消息请求", postData);
     if (postData.action == "send_private_msg" || postData.action == "send_group_msg") {
         let peer: Peer | null = null;
-        if (!postData.params){
+        if (!postData.params) {
             postData.params = {
                 message: postData.message,
                 user_id: postData.user_id,
@@ -156,12 +193,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") {
@@ -178,8 +215,9 @@ async function listenSendMessage(postData: PostDataSendMsg) {
             }
         }
         if (peer) {
-            for (let message of postData.params.message){
-                if (message.type == "at"){
+            let sendFiles: string[] = [];
+            for (let message of postData.params.message) {
+                if (message.type == "at") {
                     // @ts-ignore
                     message.type = "text"
                     message.atType = AtType.atUser
@@ -189,14 +227,29 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                     message.atNtUid = atMember.uid
                     message.atUid = atUid
                     message.content = `@${atMember.cardName || atMember.nick}`
-                }
-                else if (message.type == "text"){
+                } else if (message.type == "text") {
                     message.content = message.data?.text || message.content
-                }
-                else if (message.type == "image" || message.type == "voice"){
-                    message.file = message.data?.file || message.file
-                }
-                else if (message.type == "reply"){
+                } else if (message.type == "image" || message.type == "voice" || message.type == "record") {
+                    // 收到的是uri格式的，需要转成本地的, uri格式有三种，http, file, base64
+                    let url = message.data?.file || message.file
+                    let uri = new URL(url);
+                    let ext: string;
+                    if (message.type == "image") {
+                        ext = ".png"
+                    }
+                    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 {
+                        localFilePath = await window.llonebot.downloadFile({uri: url, localFilePath: localFilePath})
+                        sendFiles.push(localFilePath);
+                    }
+                    message.file = localFilePath
+                } else if (message.type == "reply") {
                     let msgId = message.data?.id || message.msgId
                     let replyMessage = msgHistory.find(msg => msg.raw.msgId == msgId)
                     message.msgId = msgId
@@ -204,7 +257,12 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                 }
             }
             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))
         }
     }
@@ -217,177 +275,256 @@ function recallMessage(msgId: string) {
 
 let chatListEle: HTMLCollectionOf<Element>
 
-function onLoad() {
-    window.llonebot.startExpress();
-    window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
-        listenSendMessage(postData).then()
+async function getGroupsMembers(groupsArg: Group[]) {
+    // 批量获取群成员列表
+    let failedGroups: Group[] = []
+    for (const group of groupsArg) {
+        let handledGroup = await getGroupMembers(group.uid, true)
+        if (handledGroup.length == 0) {
+            failedGroups.push(group)
+        }
+    }
+    if (failedGroups.length > 0) {
+        console.log("获取群成员列表失败，重试", failedGroups.map(group => group.name))
+        setTimeout(() => {
+            getGroupsMembers(failedGroups).then()
+        }, 1000)
+    } else {
+        window.llonebot.log("全部群成员获取完毕")
+    }
+}
+
+function onNewMessages(messages: MessageElement[]) {
+    async function func(messages: MessageElement[]) {
+        console.log("收到新消息", messages)
+        if (!self_qq) {
+            self_qq = (await window.LLAPI.getAccountInfo()).uin
+        }
+        await handleNewMessage(messages);
+    }
+
+    func(messages).then(() => {
+    })
+    // console.log("chatListEle", chatListEle)
+}
+
+async function initAccountInfo(){
+    let accountInfo = await window.LLAPI.getAccountInfo();
+    window.llonebot.log("getAccountInfo " + JSON.stringify(accountInfo));
+    if (!accountInfo.uid) {
+        return false;
+    }
+    let selfInfo = await window.LLAPI.getUserInfo(accountInfo.uid);
+    window.llonebot.setSelfInfo({
+        user_id: accountInfo.uin,
+        nickname: selfInfo.nickName
     });
-    window.llonebot.listenRecallMessage((arg: { message_id: string }) => {
-        recallMessage(arg.message_id)
-    })
+    window.llonebot.log("selfInfo " + JSON.stringify(selfInfo));
+    return true;
+}
 
-    async function getGroupsMembers(groupsArg: Group[]) {
-        // 批量获取群成员列表
-        let failedGroups: Group[] = []
-        for (const group of groupsArg) {
-            let handledGroup = await getGroupMembers(group.uid, true)
-            if (handledGroup.length == 0) {
-                failedGroups.push(group)
-            }
+function onLoad() {
+    window.llonebot.log("llonebot render onLoad");
+    window.llonebot.getRunningStatus().then(running=>{
+        if (running) {
+            return;
         }
-        if (failedGroups.length > 0) {
-            console.log("获取群成员列表失败，重试", failedGroups.map(group => group.name))
-            setTimeout(() => {
-                getGroupsMembers(failedGroups).then()
-            }, 1000)
-        }
-        else{
-            console.log("全部群成员获取完毕", groups)
-        }
-    }
-
-    function onNewMessages(messages: MessageElement[]) {
-        async function func(messages: MessageElement[]) {
-            console.log("收到新消息", messages)
-            if (!self_qq) {
-                self_qq = (await window.LLAPI.getAccountInfo()).uin
-            }
-            await handleNewMessage(messages);
-        }
-
-        func(messages).then(() => {
-        })
-        console.log("chatListEle", chatListEle)
-    }
-
-    getGroups().then(()=>{
-        getGroupsMembers(groups).then(()=>{
-            window.LLAPI.on("new-messages", onNewMessages);
-            window.LLAPI.on("new-send-messages", onNewMessages);
-        })
-    })
-
-    window.LLAPI.add_qmenu((qContextMenu: Node) => {
-        let btn = document.createElement("a")
-        btn.className = "q-context-menu-item q-context-menu-item--normal vue-component"
-        btn.setAttribute("aria-disabled", "false")
-        btn.setAttribute("role", "menuitem")
-        btn.setAttribute("tabindex", "-1")
-        btn.onclick = ()=>{
-            // window.LLAPI.getPeer().then(peer => {
-            //     // console.log("current peer", peer)
-            //     if (peer && peer.chatType == "group") {
-            //         getGroupMembers(peer.uid, true).then(()=> {
-            //             console.log("获取群成员列表成功", groups);
-            //             alert("获取群成员列表成功")
-            //         })
-            //     }
-            // })
-            async function func() {
-                for (const group of groups) {
-                    await getGroupMembers(group.uid, true)
+        initAccountInfo().then(
+            (initSuccess)=>{
+                if (!initSuccess) {
+                    return;
                 }
-            }
-            func().then(()=> {
-                console.log("获取群成员列表结果", groups);
-                // 找到members数量为空的群
-                groups.map(group => {
-                    if (group.members.length == 0) {
-                        console.log(`${group.name}群成员为空`)
-                    }
-                })
-                window.llonebot.updateGroups(groups)
-            })
-        }
-        btn.innerText = "获取群成员列表"
-        console.log(qContextMenu)
-        qContextMenu.appendChild(btn)
-    })
-
-    window.LLAPI.on("context-msg-menu", (event, target, msgIds) => {
-        console.log("msg menu", event, target, msgIds);
-    })
-
-    // console.log("getAccountInfo", LLAPI.getAccountInfo());
-    function getChatListEle() {
-        chatListEle = document.getElementsByClassName("viewport-list__inner")
-        console.log("chatListEle", chatListEle)
-        if (chatListEle.length == 0) {
-            setTimeout(getChatListEle, 500)
-        } else {
-            try {
-                // 选择要观察的目标节点
-                const targetNode = chatListEle[0];
-
-                // 创建一个观察器实例并传入回调函数
-                const observer = new MutationObserver(function (mutations) {
-                    mutations.forEach(function (mutation) {
-                        // console.log("chat list changed", mutation.type); // 输出 mutation 的类型
-                        // 获得当前聊天窗口
-                        window.LLAPI.getPeer().then(peer => {
-                            // console.log("current peer", peer)
-                            if (peer && peer.chatType == "group"){
-                                getGroupMembers(peer.uid, false).then()
-                            }
-                        })
+                if (friends.length == 0) {
+                    getFriends().then(()=>{});
+                }
+                if (groups.length == 0) {
+                    getGroups().then(()=>{
+                        getGroupsMembers(groups).then(()=>{});
                     });
-                });
+                }
+                window.LLAPI.on("new-messages", onNewMessages);
+                window.LLAPI.on("new-send-messages", onNewMessages);
+                window.llonebot.log("llonebot render start");
+                window.llonebot.startExpress();
 
-                // 配置观察选项
-                const config = {attributes: true, childList: true, subtree: true};
-
-                // 传入目标节点和观察选项
-                observer.observe(targetNode, config);
-
-            }catch (e) {
-                window.llonebot.log(e)
+                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")
+            //         btn.className = "q-context-menu-item q-context-menu-item--normal vue-component"
+            //         btn.setAttribute("aria-disabled", "false")
+            //         btn.setAttribute("role", "menuitem")
+            //         btn.setAttribute("tabindex", "-1")
+            //         btn.onclick = () => {
+            //             // window.LLAPI.getPeer().then(peer => {
+            //             //     // console.log("current peer", peer)
+            //             //     if (peer && peer.chatType == "group") {
+            //             //         getGroupMembers(peer.uid, true).then(()=> {
+            //             //             console.log("获取群成员列表成功", groups);
+            //             //             alert("获取群成员列表成功")
+            //             //         })
+            //             //     }
+            //             // })
+            //             async function func() {
+            //                 for (const group of groups) {
+            //                     await getGroupMembers(group.uid, true)
+            //                 }
+            //             }
+            //
+            //             func().then(() => {
+            //                 console.log("获取群成员列表结果", groups);
+            //                 // 找到members数量为空的群
+            //                 groups.map(group => {
+            //                     if (group.members.length == 0) {
+            //                         console.log(`${group.name}群成员为空`)
+            //                     }
+            //                 })
+            //                 window.llonebot.updateGroups(groups)
+            //             })
+            //         }
+            //         btn.innerText = "获取群成员列表"
+            //         console.log(qContextMenu)
+            //         // qContextMenu.appendChild(btn)
+            //     })
+            //
+            //     window.LLAPI.on("context-msg-menu", (event, target, msgIds) => {
+            //         console.log("msg menu", event, target, msgIds);
+            //     })
+            //
+            //     // console.log("getAccountInfo", LLAPI.getAccountInfo());
+            //     function getChatListEle() {
+            //         chatListEle = document.getElementsByClassName("viewport-list__inner")
+            //         console.log("chatListEle", chatListEle)
+            //         if (chatListEle.length == 0) {
+            //             setTimeout(getChatListEle, 500)
+            //         } else {
+            //             try {
+            //                 // 选择要观察的目标节点
+            //                 const targetNode = chatListEle[0];
+            //
+            //                 // 创建一个观察器实例并传入回调函数
+            //                 const observer = new MutationObserver(function (mutations) {
+            //                     mutations.forEach(function (mutation) {
+            //                         // console.log("chat list changed", mutation.type); // 输出 mutation 的类型
+            //                         // 获得当前聊天窗口
+            //                         window.LLAPI.getPeer().then(peer => {
+            //                             // console.log("current peer", peer)
+            //                             if (peer && peer.chatType == "group") {
+            //                                 getGroupMembers(peer.uid, false).then()
+            //                             }
+            //                         })
+            //                     });
+            //                 });
+            //
+            //                 // 配置观察选项
+            //                 const config = {attributes: true, childList: true, subtree: true};
+            //
+            //                 // 传入目标节点和观察选项
+            //                 observer.observe(targetNode, config);
+            //
+            //             } catch (e) {
+            //                 window.llonebot.log(e)
+            //             }
+            //         }
+            //     }
+            //
+            //     // getChatListEle();
             }
-        }
-    }
-
-    // getChatListEle();
+        );
+    });
 }
 
 // 打开设置界面时触发
-async function onConfigView(view: any) {
-    // 插件本体的路径
-    // const plugin_path = (window as any).LiteLoader.plugins.LLOneBot.path;
-    const {port, host} = await window.llonebot.getConfig()
-    const html = `
-    <section>
-        <div>
-            <label>监听端口</label>
-            <input id="port" type="number" value="${port}"/>
-        </div>
-        <div>
-            <label>事件上报地址(http)</label>
-            <input id="host" type="text" value="${host}"/>
-        </div>
-        <button id="save">保存(重启QQ后生效)</button>
-    </section>
+async function onSettingWindowCreated (view: Element) {
+    window.llonebot.log("setting window created");
+    const {port, hosts} = await window.llonebot.getConfig()
+
+    function creatHostEleStr(host: string) {
+        let eleStr = `
+            <setting-item data-direction="row" class="hostItem vertical-list-item">
+                <h2>事件上报地址(http)</h2>
+                <input class="host input-text" type="text" value="${host}" 
+                style="width:60%;padding: 5px"
+                placeholder="如果localhost上报失败试试局域网ip"/>
+            </setting-item>
+            `
+        return eleStr
+    }
+
+    let hostsEleStr = ""
+    for (const host of hosts) {
+        hostsEleStr += creatHostEleStr(host);
+    }
+    let html = `
+    <div class="config_view">
+        <setting-section>
+            <setting-panel style="padding: 10px">
+                <setting-list class="wrap">
+                    <setting-item class="vertical-list-item" data-direction="row">
+                        <setting-text>监听端口</setting-text>
+                        <input id="port" type="number" value="${port}"/>
+                    </setting-item>
+                    <div>
+                        <button id="addHost" class="q-button">添加上报地址</button>
+                    </div>
+                    <div id="hostItems">
+                        ${hostsEleStr}
+                    </div>
+                    <button id="save" class="q-button">保存(监听端口重启QQ后生效)</button>
+                </setting-list>
+            </setting-panel>
+        </setting-section>
+    </div>
     `
+
     const parser = new DOMParser();
     const doc = parser.parseFromString(html, "text/html");
+
+
+    function addHostEle(initValue: string = "") {
+        let addressDoc = parser.parseFromString(creatHostEleStr(initValue), "text/html");
+        let addressEle = addressDoc.querySelector("setting-item")
+        let hostItemsEle = document.getElementById("hostItems");
+        hostItemsEle.appendChild(addressEle);
+    }
+
+
+    doc.getElementById("addHost").addEventListener("click", () => addHostEle())
+
     doc.getElementById("save")?.addEventListener("click",
         () => {
             const portEle: HTMLInputElement = document.getElementById("port") as HTMLInputElement
-            const hostEle: HTMLInputElement = document.getElementById("host") as HTMLInputElement
+            const hostEles: HTMLCollectionOf<HTMLInputElement> = document.getElementsByClassName("host") as HTMLCollectionOf<HTMLInputElement>;
             // const port = doc.querySelector("input[type=number]")?.value
             // const host = doc.querySelector("input[type=text]")?.value
             // 获取端口和host
             const port = portEle.value
-            const host = hostEle.value
-            if (port && host) {
-                window.llonebot.setConfig({
-                    port: parseInt(port),
-                    host: host
-                })
+            let hosts: string[] = [];
+            for (const hostEle of hostEles) {
+                if (hostEle.value) {
+                    hosts.push(hostEle.value);
+                }
             }
+            window.llonebot.setConfig({
+                port: parseInt(port),
+                hosts: hosts
+            })
+            alert("保存成功");
         })
-    doc.querySelectorAll("section").forEach((node) => view.appendChild(node));
+    doc.body.childNodes.forEach(node => {
+        view.appendChild(node);
+    });
+
+
 }
 
+setTimeout(onLoad, 2000)
+
 export {
-    onLoad,
-    onConfigView
+    onSettingWindowCreated
 }