Merge branch 'v2'

# Conflicts:
#	manifest.json

README.md

@@ -1,20 +1,20 @@
 # LLOneBot API
 
+注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档
+
 将NTQQLiteLoaderAPI封装成OneBot11/12标准的API, V12没有完整测试
 
 ## 安装方法
 
-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/releases/)
+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
 

manifest.json

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

src/main/main.ts

@@ -19,6 +19,7 @@ import {ConfigUtil} from "./config";
 import {startExpress} from "./HttpServer";
 import {isGIF, log} from "./utils";
 import {friends, groups, selfInfo} from "./data";
+import {} from "../global";
 
 const fs = require('fs');
 
@@ -26,15 +27,17 @@ 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(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)) {
-        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 getConfigUtil().getConfig()
@@ -143,12 +146,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/renderer.ts

@@ -31,8 +31,6 @@ async function getFriends() {
     }
     window.llonebot.updateFriends(friends)
     return friends
-
-
 }
 
 async function getFriend(qq: string) {
@@ -273,13 +271,7 @@ function recallMessage(msgId: string) {
 
 let chatListEle: HTMLCollectionOf<Element>
 
-async function onLoad(arg: any) {
-    let runningStatus = await window.llonebot.getRunningStatus();
-    if (runningStatus) {
-        return;
-    }
-
-    async function getGroupsMembers(groupsArg: Group[]) {
+async function getGroupsMembers(groupsArg: Group[]) {
     // 批量获取群成员列表
     let failedGroups: Group[] = []
     for (const group of groupsArg) {
@@ -296,12 +288,9 @@ async function onLoad(arg: any) {
     } else {
         window.llonebot.log("全部群成员获取完毕")
     }
-    }
-    await getFriends();
-    await getGroups();
-    await getGroupsMembers(groups);
+}
 
-    function onNewMessages(messages: MessageElement[]) {
+function onNewMessages(messages: MessageElement[]) {
     async function func(messages: MessageElement[]) {
         console.log("收到新消息", messages)
         if (!self_qq) {
@@ -313,10 +302,9 @@ async function onLoad(arg: any) {
     func(messages).then(() => {
     })
     // console.log("chatListEle", chatListEle)
-    }
-    window.LLAPI.on("new-messages", onNewMessages);
-    window.LLAPI.on("new-send-messages", onNewMessages);
+}
 
+async function initAccountInfo(){
     let accountInfo = await window.LLAPI.getAccountInfo();
     window.llonebot.log("getAccountInfo " + JSON.stringify(accountInfo));
     if (!accountInfo.uid) {
@@ -327,7 +315,28 @@ async function onLoad(arg: any) {
         user_id: accountInfo.uin,
         nickname: selfInfo.nickName
     });
-    window.llonebot.log("selfInfo " + JSON.stringify(selfInfo))
+    window.llonebot.log("selfInfo " + JSON.stringify(selfInfo));
+}
+
+function onLoad() {
+    window.llonebot.log("llonebot render onLoad");
+    window.llonebot.getRunningStatus().then(running=>{
+        if (running) {
+            return;
+        }
+        initAccountInfo().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();
 
                 window.llonebot.listenSendMessage((postData: PostDataSendMsg) => {
@@ -337,7 +346,6 @@ async function onLoad(arg: any) {
                     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"
@@ -418,10 +426,14 @@ async function onLoad(arg: any) {
                 }
 
                 // getChatListEle();
+            }
+        );
+    });
 }
 
 // 打开设置界面时触发
-async function onConfigView(view: any) {
+async function onSettingWindowCreated (view: any) {
+    window.llonebot.log("setting window created");
     const {port, hosts} = await window.llonebot.getConfig()
 
     function creatHostEleStr(host: string) {
@@ -495,7 +507,11 @@ async function onConfigView(view: any) {
 
 }
 
+
+
+
+onLoad()
+
 export {
-    onLoad,
-    onConfigView
+    onSettingWindowCreated
 }