mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2024-11-21 09:36:35 +00:00
fix: webui
This commit is contained in:
手瓜一十雪
parent
8f87070434
commit
407c6b4c5f
2
src/core
2
src/core
@ -1 +1 @@
|
||||
Subproject commit c3a61516d5d5cb1ff3f503024f228329d44d43f2
|
||||
Subproject commit c4be18301ff85fbf18b218eb2c9e8d00d0aefc3f
|
||||
@ -10,6 +10,7 @@ import {
|
||||
GroupMemberRole,
|
||||
GroupNotify,
|
||||
GroupNotifyTypes,
|
||||
KickedOffLineInfo,
|
||||
RawMessage
|
||||
} from '@/core/entities';
|
||||
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 { logMessage, logNotice, logRequest } from '@/onebot11/log';
|
||||
import { OB11Message } from '@/onebot11/types';
|
||||
import { OB11LifeCycleEvent } from './event/meta/OB11LifeCycleEvent';
|
||||
|
||||
|
||||
export class NapCatOnebot11 {
|
||||
@ -83,6 +85,10 @@ export class NapCatOnebot11 {
|
||||
// console.log(buffer.toString());
|
||||
// console.log('ob11 onRecvSysMsg', JSON.stringify(msg, null, 2));
|
||||
};
|
||||
msgListener.onKickedOffLine = (Info: KickedOffLineInfo) => {
|
||||
// 下线通知
|
||||
//postOB11Event
|
||||
};
|
||||
msgListener.onRecvMsg = (msg) => {
|
||||
// console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2));
|
||||
logDebug('收到消息', msg);
|
||||
|
||||
@ -5,8 +5,7 @@ import { SettingSwitch } from "./components/SettingSwitch";
|
||||
import { SettingSelect } from "./components/SettingSelect";
|
||||
import { OB11Config, OB11ConfigWrapper } from "./components/WebUiApiOB11Config";
|
||||
async function onSettingWindowCreated(view: Element) {
|
||||
const isEmpty = (value: any) =>
|
||||
value === undefined || value === undefined || value === "";
|
||||
const isEmpty = (value: any) => value === undefined || value === undefined || value === "";
|
||||
await OB11ConfigWrapper.Init(localStorage.getItem("auth") as string);
|
||||
let ob11Config: OB11Config = await OB11ConfigWrapper.GetOB11Config();
|
||||
const setOB11Config = (key: string, value: any) => {
|
||||
@ -59,17 +58,17 @@ async function onSettingWindowCreated(view: Element) {
|
||||
"启用 HTTP 事件上报",
|
||||
undefined,
|
||||
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">
|
||||
<div>
|
||||
<setting-text>HTTP 事件上报密钥</setting-text>
|
||||
</div>
|
||||
<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="未设置" />
|
||||
</div>
|
||||
</setting-item>
|
||||
@ -77,9 +76,9 @@ async function onSettingWindowCreated(view: Element) {
|
||||
<div>
|
||||
<setting-text>HTTP 事件上报地址</setting-text>
|
||||
</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>
|
||||
<div id="config-ob11-http.postUrls-list"></div>
|
||||
<div id="config-ob11-http-postUrls-list"></div>
|
||||
</div>`,
|
||||
SettingItem(
|
||||
"启用正向 WebSocket 服务",
|
||||
@ -99,18 +98,18 @@ async function onSettingWindowCreated(view: Element) {
|
||||
"启用反向 WebSocket 服务",
|
||||
undefined,
|
||||
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">
|
||||
<div>
|
||||
<setting-text>反向 WebSocket 监听地址</setting-text>
|
||||
</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>
|
||||
<div id="config-ob11-reverseWs.urls-list"></div>
|
||||
<div id="config-ob11-reverseWs-urls-list"></div>
|
||||
</div>`,
|
||||
SettingItem(
|
||||
" WebSocket 服务心跳间隔",
|
||||
@ -275,16 +274,15 @@ async function onSettingWindowCreated(view: Element) {
|
||||
};
|
||||
initReverseHost("http.postUrls", doc);
|
||||
initReverseHost("reverseWs.urls", doc);
|
||||
|
||||
doc
|
||||
.querySelector("#config-ob11-http.postUrls-add")
|
||||
.querySelector("#config-ob11-http-postUrls-add")
|
||||
?.addEventListener("click", () =>
|
||||
addReverseHost("http.postUrls", document, {
|
||||
placeholder: "如：http://127.0.0.1:5140/onebot",
|
||||
})
|
||||
);
|
||||
doc
|
||||
.querySelector("#config-ob11-reverseWs.urls-add")
|
||||
.querySelector("#config-ob11-reverseWs-urls-add")
|
||||
?.addEventListener("click", () =>
|
||||
addReverseHost("reverseWs.urls", document, {
|
||||
placeholder: "如：ws://127.0.0.1:5140/onebot",
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
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>`
|
||||
}
|
||||
@ -1,15 +1,15 @@
|
||||
export const SettingItem = (
|
||||
title: string,
|
||||
subtitle?: string,
|
||||
action?: string,
|
||||
id?: string,
|
||||
visible: boolean = true,
|
||||
) => {
|
||||
return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}>
|
||||
title: string,
|
||||
subtitle?: string,
|
||||
action?: string,
|
||||
id?: string,
|
||||
visible: boolean = true,
|
||||
) => {
|
||||
return `<setting-item ${id ? `id="${id}"` : ''} ${!visible ? 'is-hidden' : ''}>
|
||||
<div>
|
||||
<setting-text>${title}</setting-text>
|
||||
${subtitle ? `<setting-text data-type="secondary">${subtitle}</setting-text>` : ''}
|
||||
</div>
|
||||
${action ? `<div>${action}</div>` : ''}
|
||||
</setting-item>`
|
||||
}
|
||||
}
|
||||
@ -196,25 +196,25 @@ async function onSettingWindowCreated(view) {
|
||||
"启用 HTTP 事件上报",
|
||||
void 0,
|
||||
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">
|
||||
<div>
|
||||
<setting-text>HTTP 事件上报密钥</setting-text>
|
||||
</div>
|
||||
<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>
|
||||
</setting-item>
|
||||
<setting-item data-direction="row">
|
||||
<div>
|
||||
<setting-text>HTTP 事件上报地址</setting-text>
|
||||
</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>
|
||||
<div id="config-ob11-http.postUrls-list"></div>
|
||||
<div id="config-ob11-http-postUrls-list"></div>
|
||||
</div>`,
|
||||
SettingItem(
|
||||
"启用正向 WebSocket 服务",
|
||||
@ -234,17 +234,17 @@ async function onSettingWindowCreated(view) {
|
||||
"启用反向 WebSocket 服务",
|
||||
void 0,
|
||||
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">
|
||||
<div>
|
||||
<setting-text>反向 WebSocket 监听地址</setting-text>
|
||||
</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>
|
||||
<div id="config-ob11-reverseWs.urls-list"></div>
|
||||
<div id="config-ob11-reverseWs-urls-list"></div>
|
||||
</div>`,
|
||||
SettingItem(
|
||||
" WebSocket 服务心跳间隔",
|
||||
@ -386,13 +386,13 @@ async function onSettingWindowCreated(view) {
|
||||
};
|
||||
initReverseHost("http.postUrls", doc);
|
||||
initReverseHost("reverseWs.urls", doc);
|
||||
doc.querySelector("#config-ob11-http.postUrls-add")?.addEventListener(
|
||||
doc.querySelector("#config-ob11-http-postUrls-add")?.addEventListener(
|
||||
"click",
|
||||
() => addReverseHost("http.postUrls", document, {
|
||||
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",
|
||||
() => addReverseHost("reverseWs.urls", document, {
|
||||
placeholder: "如：ws://127.0.0.1:5140/onebot"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user