GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: webui

Browse Source
This commit is contained in:
手瓜一十雪 2024-05-17 18:11:53 +08:00
parent 8f87070434
commit 407c6b4c5f
6 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core

@ -1 +1 @@
Subproject commit c3a61516d5d5cb1ff3f503024f228329d44d43f2 Subproject commit c4be18301ff85fbf18b218eb2c9e8d00d0aefc3f

6
src/onebot11/main.ts
View File

@ -10,6 +10,7 @@ import {
GroupMemberRole, GroupMemberRole,
GroupNotify, GroupNotify,
GroupNotifyTypes, GroupNotifyTypes,
KickedOffLineInfo,
RawMessage RawMessage
} from '@/core/entities'; } from '@/core/entities';
import { OB11Config, ob11Config } from '@/onebot11/config'; import { OB11Config, ob11Config } from '@/onebot11/config';
@ -29,6 +30,7 @@ import { OB11FriendRecallNoticeEvent } from '@/onebot11/event/notice/OB11FriendR
import { OB11GroupRecallNoticeEvent } from '@/onebot11/event/notice/OB11GroupRecallNoticeEvent'; import { OB11GroupRecallNoticeEvent } from '@/onebot11/event/notice/OB11GroupRecallNoticeEvent';
import { logMessage, logNotice, logRequest } from '@/onebot11/log'; import { logMessage, logNotice, logRequest } from '@/onebot11/log';
import { OB11Message } from '@/onebot11/types'; import { OB11Message } from '@/onebot11/types';
import { OB11LifeCycleEvent } from './event/meta/OB11LifeCycleEvent';
export class NapCatOnebot11 { export class NapCatOnebot11 {
@ -83,6 +85,10 @@ export class NapCatOnebot11 {
// console.log(buffer.toString()); // console.log(buffer.toString());
// console.log('ob11 onRecvSysMsg', JSON.stringify(msg, null, 2)); // console.log('ob11 onRecvSysMsg', JSON.stringify(msg, null, 2));
}; };
msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
// 下线通知
//postOB11Event
};
msgListener.onRecvMsg = (msg) => { msgListener.onRecvMsg = (msg) => {
// console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2)); // console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2));
logDebug('收到消息', msg); logDebug('收到消息', msg);

26
src/webui/ui/NapCat.ts
View File

@ -5,8 +5,7 @@ import { SettingSwitch } from "./components/SettingSwitch";
import { SettingSelect } from "./components/SettingSelect"; import { SettingSelect } from "./components/SettingSelect";
import { OB11Config, OB11ConfigWrapper } from "./components/WebUiApiOB11Config"; import { OB11Config, OB11ConfigWrapper } from "./components/WebUiApiOB11Config";
async function onSettingWindowCreated(view: Element) { async function onSettingWindowCreated(view: Element) {
const isEmpty = (value: any) => const isEmpty = (value: any) => value === undefined || value === undefined || value === "";
value === undefined || value === undefined || value === "";
await OB11ConfigWrapper.Init(localStorage.getItem("auth") as string); await OB11ConfigWrapper.Init(localStorage.getItem("auth") as string);
let ob11Config: OB11Config = await OB11ConfigWrapper.GetOB11Config(); let ob11Config: OB11Config = await OB11ConfigWrapper.GetOB11Config();
const setOB11Config = (key: string, value: any) => { const setOB11Config = (key: string, value: any) => {
@ -59,17 +58,17 @@ async function onSettingWindowCreated(view: Element) {
"启用 HTTP 事件上报", "启用 HTTP 事件上报",
undefined, undefined,
SettingSwitch("ob11.http.enablePost", ob11Config.http.enablePost, { SettingSwitch("ob11.http.enablePost", ob11Config.http.enablePost, {
"control-display-id": "config-ob11-http.postUrls", "control-display-id": "config-ob11-http-postUrls",
}) })
), ),
`<div class="config-host-list" id="config-ob11-http.postUrls" ${ob11Config.http.enablePost ? "" : "is-hidden" `<div class="config-host-list" id="config-ob11-http-postUrls" ${ob11Config.http.enablePost ? "" : "is-hidden"
}> }>
<setting-item data-direction="row"> <setting-item data-direction="row">
<div> <div>
<setting-text>HTTP 事件上报密钥</setting-text> <setting-text>HTTP 事件上报密钥</setting-text>
</div> </div>
<div class="q-input"> <div class="q-input">
<input id="config-ob11-http.secret" class="q-input__inner" data-config-key="ob11.http.secret" type="text" value="${ob11Config.http.secret <input id="config-ob11-http-secret" class="q-input__inner" data-config-key="ob11.http.secret" type="text" value="${ob11Config.http.secret
}" placeholder="未设置" /> }" placeholder="未设置" />
</div> </div>
</setting-item> </setting-item>
@ -77,9 +76,9 @@ async function onSettingWindowCreated(view: Element) {
<div> <div>
<setting-text>HTTP 事件上报地址</setting-text> <setting-text>HTTP 事件上报地址</setting-text>
</div> </div>
<setting-button id="config-ob11-http.postUrls-add" data-type="primary">添加</setting-button> <setting-button id="config-ob11-http-postUrls-add" data-type="primary">添加</setting-button>
</setting-item> </setting-item>
<div id="config-ob11-http.postUrls-list"></div> <div id="config-ob11-http-postUrls-list"></div>
</div>`, </div>`,
SettingItem( SettingItem(
"启用正向 WebSocket 服务", "启用正向 WebSocket 服务",
@ -99,18 +98,18 @@ async function onSettingWindowCreated(view: Element) {
"启用反向 WebSocket 服务", "启用反向 WebSocket 服务",
undefined, undefined,
SettingSwitch("ob11.reverseWs.enable", ob11Config.reverseWs.enable, { SettingSwitch("ob11.reverseWs.enable", ob11Config.reverseWs.enable, {
"control-display-id": "config-ob11-reverseWs.urls", "control-display-id": "config-ob11-reverseWs-urls",
}) })
), ),
`<div class="config-host-list" id="config-ob11-reverseWs.urls" ${ob11Config.reverseWs.enable ? "" : "is-hidden" `<div class="config-host-list" id="config-ob11-reverseWs-urls" ${ob11Config.reverseWs.enable ? "" : "is-hidden"
}> }>
<setting-item data-direction="row"> <setting-item data-direction="row">
<div> <div>
<setting-text>反向 WebSocket 监听地址</setting-text> <setting-text>反向 WebSocket 监听地址</setting-text>
</div> </div>
<setting-button id="config-ob11-reverseWs.urls-add" data-type="primary">添加</setting-button> <setting-button id="config-ob11-reverseWs-urls-add" data-type="primary">添加</setting-button>
</setting-item> </setting-item>
<div id="config-ob11-reverseWs.urls-list"></div> <div id="config-ob11-reverseWs-urls-list"></div>
</div>`, </div>`,
SettingItem( SettingItem(
" WebSocket 服务心跳间隔", " WebSocket 服务心跳间隔",
@ -275,16 +274,15 @@ async function onSettingWindowCreated(view: Element) {
}; };
initReverseHost("http.postUrls", doc); initReverseHost("http.postUrls", doc);
initReverseHost("reverseWs.urls", doc); initReverseHost("reverseWs.urls", doc);
doc doc
.querySelector("#config-ob11-http.postUrls-add") .querySelector("#config-ob11-http-postUrls-add")
?.addEventListener("click", () => ?.addEventListener("click", () =>
addReverseHost("http.postUrls", document, { addReverseHost("http.postUrls", document, {
placeholder: "如：http://127.0.0.1:5140/onebot", placeholder: "如：http://127.0.0.1:5140/onebot",
}) })
); );
doc doc
.querySelector("#config-ob11-reverseWs.urls-add") .querySelector("#config-ob11-reverseWs-urls-add")
?.addEventListener("click", () => ?.addEventListener("click", () =>
addReverseHost("reverseWs.urls", document, { addReverseHost("reverseWs.urls", document, {
placeholder: "如：ws://127.0.0.1:5140/onebot", placeholder: "如：ws://127.0.0.1:5140/onebot",

4
src/webui/ui/components/SettingButton.ts
View File

@ -1,3 +1,3 @@
export const SettingButton = (text: string, id?: string, type: string = 'secondary') => { export const SettingButton = (text: string, id?: string, type: string = 'secondary') => {
return `<setting-button ${type ? `data-type="${type}"` : ''} ${id ? `id="${id}"` : ''}>${text}</setting-button>` return `<setting-button ${type ? `data-type="${type}"` : ''} ${id ? `id="${id}"` : ''}>${text}</setting-button>`
} }

16
src/webui/ui/components/SettingItem.ts
View File

@ -1,15 +1,15 @@
export const SettingItem = ( export const SettingItem = (
title: string, title: string,
subtitle?: string, subtitle?: string,
action?: string, action?: string,
id?: string, id?: string,
visible: boolean = true, visible: boolean = true,
) => { ) => {
return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}> return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}>
<div> <div>
<setting-text>${title}</setting-text> <setting-text>${title}</setting-text>
${subtitle ? `<setting-text data-type="secondary">${subtitle}</setting-text>` : ''} ${subtitle ? `<setting-text data-type="secondary">${subtitle}</setting-text>` : ''}
</div> </div>
${action ? `<div>${action}</div>` : ''} ${action ? `<div>${action}</div>` : ''}
</setting-item>` </setting-item>`
} }

22
static/assets/renderer.js
View File

@ -196,25 +196,25 @@ async function onSettingWindowCreated(view) {
"启用 HTTP 事件上报", "启用 HTTP 事件上报",
void 0, void 0,
SettingSwitch("ob11.http.enablePost", ob11Config.http.enablePost, { SettingSwitch("ob11.http.enablePost", ob11Config.http.enablePost, {
"control-display-id": "config-ob11-http.postUrls" "control-display-id": "config-ob11-http-postUrls"
}) })
), ),
`<div class="config-host-list" id="config-ob11-http.postUrls" ${ob11Config.http.enablePost ? "" : "is-hidden"}> `<div class="config-host-list" id="config-ob11-http-postUrls" ${ob11Config.http.enablePost ? "" : "is-hidden"}>
<setting-item data-direction="row"> <setting-item data-direction="row">
<div> <div>
<setting-text>HTTP 事件上报密钥</setting-text> <setting-text>HTTP 事件上报密钥</setting-text>
</div> </div>
<div class="q-input"> <div class="q-input">
<input id="config-ob11-http.secret" class="q-input__inner" data-config-key="ob11.http.secret" type="text" value="${ob11Config.http.secret}" placeholder="未设置" /> <input id="config-ob11-http-secret" class="q-input__inner" data-config-key="ob11.http.secret" type="text" value="${ob11Config.http.secret}" placeholder="未设置" />
</div> </div>
</setting-item> </setting-item>
<setting-item data-direction="row"> <setting-item data-direction="row">
<div> <div>
<setting-text>HTTP 事件上报地址</setting-text> <setting-text>HTTP 事件上报地址</setting-text>
</div> </div>
<setting-button id="config-ob11-http.postUrls-add" data-type="primary">添加</setting-button> <setting-button id="config-ob11-http-postUrls-add" data-type="primary">添加</setting-button>
</setting-item> </setting-item>
<div id="config-ob11-http.postUrls-list"></div> <div id="config-ob11-http-postUrls-list"></div>
</div>`, </div>`,
SettingItem( SettingItem(
"启用正向 WebSocket 服务", "启用正向 WebSocket 服务",
@ -234,17 +234,17 @@ async function onSettingWindowCreated(view) {
"启用反向 WebSocket 服务", "启用反向 WebSocket 服务",
void 0, void 0,
SettingSwitch("ob11.reverseWs.enable", ob11Config.reverseWs.enable, { SettingSwitch("ob11.reverseWs.enable", ob11Config.reverseWs.enable, {
"control-display-id": "config-ob11-reverseWs.urls" "control-display-id": "config-ob11-reverseWs-urls"
}) })
), ),
`<div class="config-host-list" id="config-ob11-reverseWs.urls" ${ob11Config.reverseWs.enable ? "" : "is-hidden"}> `<div class="config-host-list" id="config-ob11-reverseWs-urls" ${ob11Config.reverseWs.enable ? "" : "is-hidden"}>
<setting-item data-direction="row"> <setting-item data-direction="row">
<div> <div>
<setting-text>反向 WebSocket 监听地址</setting-text> <setting-text>反向 WebSocket 监听地址</setting-text>
</div> </div>
<setting-button id="config-ob11-reverseWs.urls-add" data-type="primary">添加</setting-button> <setting-button id="config-ob11-reverseWs-urls-add" data-type="primary">添加</setting-button>
</setting-item> </setting-item>
<div id="config-ob11-reverseWs.urls-list"></div> <div id="config-ob11-reverseWs-urls-list"></div>
</div>`, </div>`,
SettingItem( SettingItem(
" WebSocket 服务心跳间隔", " WebSocket 服务心跳间隔",
@ -386,13 +386,13 @@ async function onSettingWindowCreated(view) {
}; };
initReverseHost("http.postUrls", doc); initReverseHost("http.postUrls", doc);
initReverseHost("reverseWs.urls", doc); initReverseHost("reverseWs.urls", doc);
doc.querySelector("#config-ob11-http.postUrls-add")?.addEventListener( doc.querySelector("#config-ob11-http-postUrls-add")?.addEventListener(
"click", "click",
() => addReverseHost("http.postUrls", document, { () => addReverseHost("http.postUrls", document, {
placeholder: "如：http://127.0.0.1:5140/onebot" placeholder: "如：http://127.0.0.1:5140/onebot"
}) })
); );
doc.querySelector("#config-ob11-reverseWs.urls-add")?.addEventListener( doc.querySelector("#config-ob11-reverseWs-urls-add")?.addEventListener(
"click", "click",
() => addReverseHost("reverseWs.urls", document, { () => addReverseHost("reverseWs.urls", document, {
placeholder: "如：ws://127.0.0.1:5140/onebot" placeholder: "如：ws://127.0.0.1:5140/onebot"