fix config path

manifest.json

@@ -1,19 +1,19 @@
 {
-    "manifest_version": 3,
+    "manifest_version": 4,
     "type": "extension",
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "1.2.6",
+    "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)) {
+    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()
@@ -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) {
@@ -272,50 +270,40 @@ 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) {
@@ -326,101 +314,125 @@ 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));
-    window.llonebot.startExpress();
+}
 
-    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(
-
+            ()=>{
-    window.LLAPI.add_qmenu((qContextMenu: Node) => {
+                if (friends.length == 0) {
-        let btn = document.createElement("a")
+                    getFriends().then(()=>{});
-        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 (groups.length == 0) {
-
+                    getGroups().then(()=>{
-            func().then(() => {
+                        getGroupsMembers(groups).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()
-                            }
-                        })
                     });
-                });
+                }
+                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 }) => {
+                    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(() => {
-                observer.observe(targetNode, config);
+                            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)
+                })
 
-            } catch (e) {
+                window.LLAPI.on("context-msg-menu", (event, target, msgIds) => {
-                window.llonebot.log(e)
+                    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: any) {
+    window.llonebot.log("setting window created");
     const {port, hosts} = await window.llonebot.getConfig()
 
     function creatHostEleStr(host: string) {
@@ -494,7 +506,11 @@ async function onConfigView(view: any) {
 
 }
 
+
+
+
+onLoad()
+
 export {
-    onLoad,
+    onSettingWindowCreated
-    onConfigView
 }