Merge branch 'dev'

# Conflicts:
#	src/renderer.ts

.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,32 +1,36 @@
 # LLOneBot API
 
+
 将NTQQLiteLoaderAPI封装成OneBot11/12标准的API, V12没有完整测试
 
+*注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
+
 ## 安装方法
 
-1.安装[NTQQLiteLoader](https://github.com/LiteLoaderQQNT/LiteLoaderQQNT)
+1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
 
-2.安装修改后的[LiteLoaderQQNT-Plugin-LLAPI](https://github.com/linyuchen/LiteLoaderQQNT-Plugin-LLAPI)，原版的功能有缺陷
+2.安装修改后的[LiteLoaderQQNT-Plugin-LLAPI](https://github.com/linyuchen/LiteLoaderQQNT-Plugin-LLAPI/releases)，原版的功能有缺陷
 
-3.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/)
+3.安装本项目插件[OneBotApi](https://github.com/linyuchen/LiteLoaderQQNT-OneBotApi/releases/), 注意本插件2.0以下的版本不支持LiteLoader 1.0.0及以上版本
 
-*关于插件的安装方法: 上述的两个插件都没有上架NTQQLiteLoader插件市场，需要自己下载源码复制到插件目录*
+*关于插件的安装方法: 上述的两个插件都没有上架NTQQLiteLoader插件市场，需要自己下载复制到插件目录*
 
-*Windows插件目录:`%USERPROFILE%/Documents/LiteLoaderQQNT/plugins`*
+*插件目录:`LiteLoaderQQNT/plugins`*
-
-*Mac插件目录:`~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins`*
 
 ## 支持的API
 
 目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
 
+主要功能:
+- [x] 发送好友消息
+- [x] 发送临时消息
+- [x] 发送群消息
+- [x] 获取好友列表
 - [x] 获取群列表
 - [x] 获取群成员列表
-- [x] 获取好友列表
-- [x] 发送群消息
-- [x] 发送好友消息
 - [x] 撤回消息
 - [x] 上报好友消息
+- [x] 上报临时消息
 - [x] 上报群消息
 
 消息格式支持:
@@ -56,3 +60,71 @@
 ![](doc/image/example.jpg)
 
 *暂时不支持`"message": "hello"`这种message为字符串的形式*
+
+## 一些坑
+
+<details>
+    <summary>下载了插件但是没有看到在NTQQ中生效</summary>
+<br/>
+    检查是否下载的是插件release的版本，如果是源码的话需要自行编译。依然不生效请查阅<a href="https://liteloaderqqnt.github.io/guide/plugins.html">LiteLoaderQQNT的文档</a>
+</details>
+<br/>
+
+<details>
+    <summary>调用接口报404</summary>
+<br/>
+    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口，并且所有接口都只支持POST方法，调用GET方法会报404
+</details>
+<br/>
+
+<details>
+    <summary>发送不了图片和语音</summary>
+<br/>
+    检查当前操作用户是否有LiteLoaderQQNT/data/LLOneBot的写入权限，如Windows把QQ上安装到C盘有可能会出现无权限导致发送失败
+</details>
+<br/>
+
+<details>
+    <summary>不支持cq码</summary>
+<br/>
+    cq码已经过时了，没有支持的打算(主要是我不用这玩意儿，加上我懒)
+</details>
+<br/>
+
+<details>
+    <summary>onebot 12对接不了</summary>
+<br/>
+    onebot 12只写了部分兼容，没有完整测试，不保证能用，慎用
+</details>
+<br/>
+
+<details>
+    <summary>QQ多开时事件没有上报</summary>
+<br/>
+    小概率事件，有可能是IPC通信串台了(不确定)，重启QQ可解决，目前正在想办法修复
+</details>
+<br/>
+
+<details>
+    <summary>QQ变得很卡</summary>
+<br/>
+    这是你的群特别多导致的，因为启动后会批量获取群成员列表，获取完之后就正常了
+</details>
+<br/>
+
+<details>
+    <summary>如何查看日志</summary>
+<br/>
+    LiteLoaderQQNT/data/LLOneBot/*.log
+</details>
+<br/>
+
+## TODO
+
+- [x] 接口返回更详细的错误信息，目前消息发不出去也会返回发送成功(这河里吗)
+- [ ] 转发消息记录 
+- [ ] 支持websocket，等个有缘人提PR实现
+- [ ] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
+
+## onebot11文档
+<https://11.onebot.dev/>

manifest.json

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

package-lock.json

@@ -9,7 +9,8 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "express": "^4.18.2"
+        "express": "^4.18.2",
+        "uuid": "^9.0.1"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.23.2",
@@ -5213,6 +5214,18 @@
         "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": {
       "version": "1.1.2",
       "resolved": "https://mirrors.cloud.tencent.com/npm/vary/-/vary-1.1.2.tgz",

package.json

@@ -17,16 +17,17 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "electron": "^27.0.2",
     "@babel/preset-env": "^7.23.2",
     "@types/express": "^4.17.20",
     "babel-loader": "^9.1.3",
+    "electron": "^27.0.2",
     "ts-loader": "^9.5.0",
+    "typescript": "^5.2.2",
     "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4",
+    "webpack-cli": "^5.1.4"
-    "typescript": "^5.2.2"
   }
 }

src/common/types.ts

@@ -3,6 +3,12 @@ export enum AtType {
     atUser = 2
 }
 
+export enum ChatType {
+    friend = 1,
+    group = 2,
+    temp = 100
+}
+
 export type GroupMemberInfo = {
     avatarPath: string;
     cardName: string;
@@ -44,7 +50,7 @@ export type Group = {
 }
 
 export type Peer = {
-    chatType: "private" | "group"
+    chatType: ChatType
     name: string
     uid: string  // qq号
 }
@@ -52,7 +58,10 @@ export type Peer = {
 export type MessageElement = {
     raw: {
         msgId: string,
+        msgTime: string,
         msgSeq: string,
+        senderUin: string; // 发送者QQ号
+        chatType: ChatType,
         elements: {
             replyElement: {
                 senderUid: string,  // 原消息发送者QQ号
@@ -98,7 +107,6 @@ export type MessageElement = {
             }
         }[]
     }
-
     peer: Peer,
     sender: {
         uid: string  // 一串加密的字符串
@@ -114,7 +122,7 @@ export type SendMessage = {
         text: string, // 纯文本
     }
 } | {
-    type: "image" | "voice",
+    type: "image" | "voice" | "record",
     file: string, // 本地路径
     data?: {
         file: string // 本地路径
@@ -139,7 +147,7 @@ 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"
+    | "get_friend_list" | "delete_msg" | "get_login_info" | "get_group_member_list" | "get_group_member_info"
 
 export type PostDataSendMsg = {
     action: PostDataAction
@@ -152,9 +160,17 @@ export type PostDataSendMsg = {
     user_id: string,
     group_id: string,
     message: SendMessage[];
+    ipc_uuid?: string
 }
 
 export type Config = {
     port: number,
     hosts: string[],
 }
+
+export type SendMsgResult = {
+    status: number,
+    retcode: number,
+    data: any,
+    message: string,
+}

src/global.d.ts

@@ -6,7 +6,7 @@ import {
     Peer,
     PostDataSendMsg,
     SelfInfo,
-    SendMessage,
+    SendMessage, SendMsgResult,
     User
 } from "./common/types";
 
@@ -43,9 +43,10 @@ declare var llonebot: {
     setConfig(config: Config):void;
     getConfig():Promise<Config>;
     setSelfInfo(selfInfo: SelfInfo):void;
-    downloadFile(arg: {uri: string, localFilePath: string}):Promise<string>;
+    downloadFile(arg: {uri: string, fileName: string}):Promise<{errMsg: string, path: string}>;
     deleteFile(path: string[]):Promise<void>;
     getRunningStatus(): Promise<boolean>;
+    sendSendMsgResult(sessionId: string, msgResult: SendMsgResult): void;
 };
 
 declare global {

src/main/HttpServer.ts

@@ -1,7 +1,8 @@
+import {log} from "./utils";
+
 const express = require("express");
-const bodyParser = require('body-parser');
 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";
 
 // @SiberianHusky 2021-08-15
@@ -17,7 +18,7 @@ function checkSendMessage(sendMsgList: SendMessage[]) {
             let data = msg["data"];
             if (type === "text" && !data["text"]) {
                 return 400;
-            } else if (["image", "voice"].includes(type)) {
+            } else if (["image", "voice", "record"].includes(type)) {
                 if (!data["file"]) {
                     return 400;
                 }
@@ -44,10 +45,11 @@ function checkSendMessage(sendMsgList: SendMessage[]) {
 }
 // ==end==
 
-function handlePost(jsonData: any) {
+function handlePost(jsonData: any, handleSendResult: (data: SendMsgResult)=>void) {
+    log("API receive post:" + JSON.stringify(jsonData))
     if (!jsonData.params) {
-        jsonData.params = jsonData
+        jsonData.params = JSON.parse(JSON.stringify(jsonData));
-
+        delete jsonData.params.params;
     }
     let resData = {
         status: 0,
@@ -55,6 +57,7 @@ function handlePost(jsonData: any) {
         data: {},
         message: ''
     }
+
     if (jsonData.action == "get_login_info") {
         resData["data"] = selfInfo
     } else if (jsonData.action == "send_private_msg" || jsonData.action == "send_group_msg") {
@@ -68,7 +71,8 @@ function handlePost(jsonData: any) {
         if (resData.status == 200) {
             resData.message = "发送成功";
             resData.data = jsonData.message;
-            sendIPCSendQQMsg(jsonData);
+            sendIPCSendQQMsg(jsonData, handleSendResult);
+            return;
         } else {
             resData.message = "发送失败, 请检查消息格式";
             resData.data = jsonData.message;
@@ -143,15 +147,16 @@ export function startExpress(port: number) {
     const app = express();
     // 中间件，用于解析POST请求的请求体
     app.use(express.urlencoded({extended: true, limit: "500mb"}));
-    app.use(bodyParser({limit: '500mb'}))
+    app.use(express.json({limit: '500mb'}));
-    app.use(express.json());
 
     function parseToOnebot12(action: PostDataAction) {
         app.post('/' + action, (req: any, res: any) => {
             let jsonData: PostDataSendMsg = req.body;
             jsonData.action = action
-            let resData = handlePost(jsonData)
+            let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
-            res.send(resData)
+            if (resData){
+                res.send(resData)
+            }
         });
     }
 
@@ -170,8 +175,10 @@ export function startExpress(port: number) {
     // 处理POST请求的路由
     app.post('/', (req: any, res: any) => {
         let jsonData: PostDataSendMsg = req.body;
-        let resData = handlePost(jsonData)
+        let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
-        res.send(resData)
+        if (resData){
+            res.send(resData)
+        }
     });
     app.post('/send_msg', (req: any, res: any) => {
         let jsonData: PostDataSendMsg = req.body;
@@ -186,11 +193,13 @@ export function startExpress(port: number) {
                 jsonData.action = "send_private_msg"
             }
         }
-        let resData = handlePost(jsonData)
+        let resData = handlePost(jsonData, (data:SendMsgResult)=>{res.send(data)})
-        res.send(resData)
+        if (resData){
+            res.send(resData)
+        }
     })
 
     app.listen(port, "0.0.0.0", () => {
-        console.log(`服务器已启动，监听端口 ${port}`);
+        console.log(`llonebot started 0.0.0.0:${port}`);
     });
 }

src/main/IPCSend.ts

@@ -1,6 +1,8 @@
 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 {v4 as uuid4} from "uuid";
+import {log} from "./utils";
 
 function sendIPCMsg(channel: string, data: any) {
     let contents = webContents.getAllWebContents();
@@ -8,12 +10,23 @@ function sendIPCMsg(channel: string, data: any) {
         try {
             content.send(channel, data)
         } catch (e) {
+            console.log("llonebot send ipc msg to render error:", e)
         }
     }
 }
 
 
-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);
 }
 

src/main/main.ts

@@ -17,8 +17,9 @@ import {
 } from "../common/IPCChannel";
 import {ConfigUtil} from "./config";
 import {startExpress} from "./HttpServer";
-import {log} from "./utils";
+import {CONFIG_DIR, isGIF, log} from "./utils";
 import {friends, groups, selfInfo} from "./data";
+import {} from "../global";
 
 const fs = require('fs');
 
@@ -26,37 +27,80 @@ let running = false;
 
 
 // 加载插件时触发
-function onLoad(plugin: any) {
+function onLoad() {
     log("main onLoaded");
+
+    // const config_dir = browserWindow.LiteLoader.plugins["LLOneBot"].path.data;
     function getConfigUtil() {
-        const configFilePath = path.join(plugin.path.data, `config_${selfInfo.user_id}.json`)
+        const configFilePath = path.join(CONFIG_DIR, `config_${selfInfo.user_id}.json`)
         return new ConfigUtil(configFilePath)
     }
 
-    if (!fs.existsSync(plugin.path.data)) {
+    if (!fs.existsSync(CONFIG_DIR)) {
-        fs.mkdirSync(plugin.path.data, {recursive: true});
+        fs.mkdirSync(CONFIG_DIR, {recursive: true});
     }
     ipcMain.handle(CHANNEL_GET_CONFIG, (event: any, arg: any) => {
         return getConfigUtil().getConfig()
     })
-    ipcMain.handle(CHANNEL_DOWNLOAD_FILE, async (event: any, arg: {uri: string, localFilePath: 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 url = new URL(arg.uri);
-        if (url.protocol == "base64:"){
+        if (url.protocol == "base64:") {
             // base64转成文件
             let base64Data = arg.uri.split("base64://")[1]
-            const buffer = Buffer.from(base64Data, 'base64');
+            try {
+                const buffer = Buffer.from(base64Data, 'base64');
 
-            fs.writeFileSync(arg.localFilePath, buffer);
+                fs.writeFileSync(filePath, buffer);
-        }
+            } catch (e: any) {
-        else if (url.protocol == "http:" || url.protocol == "https:") {
+                return {
+                    success: false,
+                    errMsg: `base64文件下载失败,` + e.toString(),
+                    path: ""
+                }
+            }
+        } else if (url.protocol == "http:" || url.protocol == "https:") {
             // 下载文件
             let res = await fetch(url)
+            if (!res.ok) {
+                return {
+                    success: false,
+                    errMsg: `${url}下载失败,` + res.statusText,
+                    path: ""
+                }
+            }
             let blob = await res.blob();
             let buffer = await blob.arrayBuffer();
-            fs.writeFileSync(arg.localFilePath, Buffer.from(buffer));
+            try {
+                fs.writeFileSync(filePath, Buffer.from(buffer));
+            } catch (e: any) {
+                return {
+                    success: false,
+                    errMsg: `${url}下载失败,` + e.toString(),
+                    path: ""
+                }
+            }
         }
-        // todo: 需要识别gif格式
+        else{
-        return arg.localFilePath;
+            return {
+                success: false,
+                errMsg: `不支持的file协议,` + url.protocol,
+                path: ""
+            }
+        }
+        if (isGIF(filePath)) {
+            fs.renameSync(filePath, filePath + ".gif");
+            filePath += ".gif";
+        }
+        return {
+            success: true,
+            errMsg: "",
+            path: filePath
+        };
     })
     ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
         getConfigUtil().setConfig(arg)
@@ -97,7 +141,7 @@ function onLoad(plugin: 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 {
                 fetch(host, {
                     method: "POST",
@@ -107,9 +151,9 @@ function onLoad(plugin: any) {
                     },
                     body: JSON.stringify(arg)
                 }).then((res: any) => {
-                    log("新消息事件上传");
+                    log(`新消息事件上传成功: ${host} ` + JSON.stringify(arg));
                 }, (err: any) => {
-                    log("新消息事件上传失败:" + err + JSON.stringify(arg));
+                    log(`新消息事件上传失败: ${host} ` + err + JSON.stringify(arg));
                 });
             } catch (e: any) {
                 log(e.toString())
@@ -140,12 +184,17 @@ function onLoad(plugin: any) {
 
 
 // 创建窗口时触发
-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

@@ -1,8 +1,28 @@
+import * as path from "path";
+import {json} from "express";
+import {selfInfo} from "./data";
+
 const fs = require('fs');
 
+export const CONFIG_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
 export function log(msg: any) {
     let currentDateTime = new Date().toLocaleString();
-    fs.appendFile("./llonebot.log", currentDateTime + ":" + msg + "\n", (err: any) => {
+    const date = new Date();
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+    const currentDate = `${year}-${month}-${day}`;
+    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) => {
 
     })
-}
+}
+
+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,6 +1,6 @@
 // Electron 主进程 与 渲染进程 交互的桥梁
 
-import {Config, Group, PostDataSendMsg, SelfInfo, User} from "./common/types";
+import {Config, Group, PostDataSendMsg, SelfInfo, SendMsgResult, User} from "./common/types";
 import {
     CHANNEL_DOWNLOAD_FILE,
     CHANNEL_GET_CONFIG,
@@ -33,7 +33,11 @@ contextBridge.exposeInMainWorld("llonebot", {
     updateFriends: (friends: User[]) => {
         ipcRenderer.send(CHANNEL_UPDATE_FRIENDS, friends);
     },
+    sendSendMsgResult: (sessionId: string, msgResult: SendMsgResult)=>{
+        ipcRenderer.send(sessionId, msgResult);
+    },
     listenSendMessage: (handle: (jsonData: PostDataSendMsg) => void) => {
+        ipcRenderer.send(CHANNEL_LOG, "发送消息API已注册");
         ipcRenderer.on(CHANNEL_SEND_MSG, (event: any, args: PostDataSendMsg) => {
             handle(args)
         })

src/renderer.ts

@@ -2,15 +2,31 @@
 
 // import express from "express";
 // 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 groups: Group[] = []
 let friends: User[] = []
 let msgHistory: MessageElement[] = []
 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> {
     let user = uid_maps[uid]
     if (!user) {
@@ -31,8 +47,6 @@ async function getFriends() {
     }
     window.llonebot.updateFriends(friends)
     return friends
-
-
 }
 
 async function getFriend(qq: string) {
@@ -82,6 +96,11 @@ async function getGroupMembers(group_qq: string, forced: boolean = false) {
             if (!group!.members!.find(m => m.uid == member.uid)) {
                 group!.members!.push(member)
             }
+            uid_maps[member.uid] = {
+                uin: member.uin,
+                uid: member.uid,
+                nickName: member.nick
+            };
         }
         window.llonebot.updateGroups(groups)
         console.log(`更新群${group.name}成员列表`, group)
@@ -102,8 +121,8 @@ 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: {
@@ -111,18 +130,21 @@ async function handleNewMessage(messages: MessageElement[]) {
                 user_id: self_qq
             },
             self_id: self_qq,
-            time: 0,
+            time: parseInt(message.raw.msgTime || "0"),
             type: "message",
             post_type: "message",
             message_type: message.peer.chatType,
             detail_type: message.peer.chatType,
             message_id: message.raw.msgId,
             sub_type: "",
-            message: []
+            message: [],
+            raw_message: "",
+            font: 14
         }
-        if (message.peer.chatType == "group") {
+        if (message.raw.chatType == ChatType.group) {
             let group_id = message.peer.uid
             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
             let groupMember = await getGroupMember(group_id, message.sender.uid)
             onebot_message_data["user_id"] = groupMember!.uin
@@ -132,14 +154,26 @@ async function handleNewMessage(messages: MessageElement[]) {
                 card: groupMember!.cardName,
                 role: OnebotGroupMemberRole[groupMember!.role]
             }
-            console.log("收到群消息", onebot_message_data)
+            // console.log("收到群消息", onebot_message_data)
-        } else if (message.peer.chatType == "private") {
+        } else if (message.raw.chatType == ChatType.friend) {
-            onebot_message_data["user_id"] = message.peer.uid
+            onebot_message_data["user_id"] = message.raw.senderUin;
-            let friend = await getFriend(message.sender.uid)
+            onebot_message_data.message_type = onebot_message_data.sub_type = "friend"
+            let friend = await getFriend(message.raw.senderUin);
             onebot_message_data.sender = {
                 user_id: friend!.uin,
                 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) {
             let message_data: any = {
@@ -167,6 +201,7 @@ async function handleNewMessage(messages: MessageElement[]) {
                 if (!element.picElement.sourcePath.startsWith("/")) {
                     startS += "/"
                 }
+                // todo: 转成base64
                 message_data["data"]["file"] = startS + element.picElement.sourcePath
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
@@ -174,6 +209,9 @@ async function handleNewMessage(messages: MessageElement[]) {
             }
             onebot_message_data.message.push(message_data)
         }
+        if (msgHistory.length > 10000) {
+            msgHistory.splice(0, 100)
+        }
         msgHistory.push(message)
         console.log("发送上传消息给ipc main", onebot_message_data)
         window.llonebot.postData(onebot_message_data);
@@ -181,6 +219,13 @@ async function handleNewMessage(messages: MessageElement[]) {
 }
 
 async function listenSendMessage(postData: PostDataSendMsg) {
+    console.log("收到发送消息请求", postData);
+    let sendMsgResult: SendMsgResult = {
+        retcode: 0,
+        status: 0,
+        data: {},
+        message: "发送成功"
+    }
     if (postData.action == "send_private_msg" || postData.action == "send_group_msg") {
         let peer: Peer | null = null;
         if (!postData.params) {
@@ -193,22 +238,41 @@ async function listenSendMessage(postData: PostDataSendMsg) {
         if (postData.action == "send_private_msg") {
             let friend = await getFriend(postData.params.user_id)
             if (friend) {
+                console.log("好友消息", postData)
                 peer = {
-                    chatType: "private",
+                    chatType: ChatType.friend,
                     name: friend.nickName,
                     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") {
             let group = await getGroup(postData.params.group_id)
             if (group) {
                 peer = {
-                    chatType: "group",
+                    chatType: ChatType.group,
                     name: group.name,
                     uid: group.uid
                 }
 
             } else {
+                sendMsgResult.status = -1;
+                sendMsgResult.retcode = -1;
+                sendMsgResult.message = `发送失败，未找到群${postData.params.group_id}`;
                 console.log("未找到群, 发送群消息失败", postData)
             }
         }
@@ -227,23 +291,36 @@ 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
+                    // 收到的是uri格式的，需要转成本地的, uri格式有三种，http, file, base64
                     let url = message.data?.file || message.file
                     let uri = new URL(url);
                     let ext: string;
                     if (message.type == "image") {
-                        // todo: 需要识别gif格式
                         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})
+                        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
                     sendFiles.push(localFilePath);
@@ -255,13 +332,27 @@ async function listenSendMessage(postData: PostDataSendMsg) {
                 }
             }
             console.log("发送消息", postData)
+            if (sendMsgResult.status !== 0) {
+                window.llonebot.sendSendMsgResult(postData.ipc_uuid, sendMsgResult)
+                return;
+            }
             window.LLAPI.sendMessage(peer, postData.params.message).then(res => {
                     console.log("消息发送成功:", peer, postData.params.message)
                     if (sendFiles.length) {
                         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)
         }
     }
 }
@@ -273,165 +364,185 @@ function recallMessage(msgId: string) {
 
 let chatListEle: HTMLCollectionOf<Element>
 
-async function onLoad(arg: any) {
+async function getGroupsMembers(groupsArg: Group[]) {
-    let runningStatus = await window.llonebot.getRunningStatus();
+    // 批量获取群成员列表
-    if (runningStatus) {
+    let failedGroups: Group[] = []
-        return;
+    for (const group of groupsArg) {
-    }
+        let handledGroup = await getGroupMembers(group.uid, true)
-
+        if (handledGroup.length == 0) {
-    async function getGroupsMembers(groupsArg: Group[]) {
+            failedGroups.push(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("全部群成员获取完毕")
         }
     }
-    await getFriends();
+    if (failedGroups.length > 0) {
-    await getGroups();
+        console.log("获取群成员列表失败，重试", failedGroups.map(group => group.name))
-    await getGroupsMembers(groups);
+        setTimeout(() => {
-
+            getGroupsMembers(failedGroups).then()
-    function onNewMessages(messages: MessageElement[]) {
+        }, 1000)
-        async function func(messages: MessageElement[]) {
+    } else {
-            console.log("收到新消息", messages)
+        window.llonebot.log("全部群成员获取完毕")
-            if (!self_qq) {
-                self_qq = (await window.LLAPI.getAccountInfo()).uin
-            }
-            await handleNewMessage(messages);
-        }
-
-        func(messages).then(() => {
-        })
-        // console.log("chatListEle", chatListEle)
     }
-    window.LLAPI.on("new-messages", onNewMessages);
+}
-    window.LLAPI.on("new-send-messages", onNewMessages);
 
+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;
+        return false;
     }
     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.log("selfInfo " + JSON.stringify(selfInfo));
-    window.llonebot.startExpress();
+    return true;
+}
 
-    window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
+function onLoad() {
-        listenSendMessage(postData).then().catch(err => console.log("listenSendMessage err", err))
+    window.llonebot.log("llonebot render onLoad");
-    })
+    window.llonebot.getRunningStatus().then(running => {
-    window.llonebot.listenRecallMessage((arg: { message_id: string }) => {
+        if (running) {
-        recallMessage(arg.message_id)
+            return;
-    })
+        }
-    window.llonebot.log("llonebot loaded");
+        initAccountInfo().then(
-
+            (initSuccess) => {
-    window.LLAPI.add_qmenu((qContextMenu: Node) => {
+                if (!initSuccess) {
-        let btn = document.createElement("a")
+                    return;
-        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)
                 }
-            }
+                if (friends.length == 0) {
-
+                    getFriends().then(() => {
-            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 (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();
 
-                // 配置观察选项
+                window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
-                const config = {attributes: true, childList: true, subtree: true};
+                    listenSendMessage(postData).then().catch(err => console.log("listenSendMessage err", err))
-
+                })
-                // 传入目标节点和观察选项
+                window.llonebot.listenRecallMessage((arg: { message_id: string }) => {
-                observer.observe(targetNode, config);
+                    recallMessage(arg.message_id)
-
+                })
-            } catch (e) {
+                window.llonebot.log("llonebot loaded");
-                window.llonebot.log(e)
+                //     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) {
+async function onSettingWindowCreated(view: Element) {
+    window.llonebot.log("setting window created");
     const {port, hosts} = await window.llonebot.getConfig()
 
     function creatHostEleStr(host: string) {
         let eleStr = `
-            <div class="hostItem vertical-list-item">
+            <setting-item data-direction="row" class="hostItem vertical-list-item">
                 <h2>事件上报地址(http)</h2>
-                <input class="host" type="text" value="${host}" 
+                <input class="host input-text" type="text" value="${host}" 
                 style="width:60%;padding: 5px"
-                placeholder="不支持localhost,如果是本机请填写局域网ip"/>
+                placeholder="如果localhost上报失败试试局域网ip"/>
-            </div>
+            </setting-item>
             `
         return eleStr
     }
@@ -440,20 +551,26 @@ async function onConfigView(view: any) {
     for (const host of hosts) {
         hostsEleStr += creatHostEleStr(host);
     }
-    const html = `
+    let html = `
-    <section class="wrap">
+    <div class="config_view">
-        <div class="vertical-list-item">
+        <setting-section>
-            <h2>监听端口</h2>
+            <setting-panel style="padding: 10px">
-            <input id="port" type="number" value="${port}"/>
+                <setting-list class="wrap">
-        </div>
+                    <setting-item class="vertical-list-item" data-direction="row">
-        <div>
+                        <setting-text>监听端口</setting-text>
-            <button id="addHost" class="q-button">添加上报地址</button>
+                        <input id="port" type="number" value="${port}"/>
-        </div>
+                    </setting-item>
-        <div id="hostItems">
+                    <div>
-            ${hostsEleStr}
+                        <button id="addHost" class="q-button">添加上报地址</button>
-        </div>
+                    </div>
-        <button id="save" class="q-button">保存(监听端口重启QQ后生效)</button>
+                    <div id="hostItems">
-    </section>
+                        ${hostsEleStr}
+                    </div>
+                    <button id="save" class="q-button">保存(监听端口重启QQ后生效)</button>
+                </setting-list>
+            </setting-panel>
+        </setting-section>
+    </div>
     `
 
     const parser = new DOMParser();
@@ -462,7 +579,7 @@ async function onConfigView(view: any) {
 
     function addHostEle(initValue: string = "") {
         let addressDoc = parser.parseFromString(creatHostEleStr(initValue), "text/html");
-        let addressEle = addressDoc.querySelector("div")
+        let addressEle = addressDoc.querySelector("setting-item")
         let hostItemsEle = document.getElementById("hostItems");
         hostItemsEle.appendChild(addressEle);
     }
@@ -490,12 +607,15 @@ async function onConfigView(view: any) {
             })
             alert("保存成功");
         })
-    doc.querySelectorAll("section").forEach((node) => view.appendChild(node));
+    doc.body.childNodes.forEach(node => {
+        view.appendChild(node);
+    });
 
 
 }
 
+setTimeout(onLoad, 2000)
+
 export {
-    onLoad,
+    onSettingWindowCreated
-    onConfigView
 }