diff --git a/src/core b/src/core index c3a61516..c4be1830 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit c3a61516d5d5cb1ff3f503024f228329d44d43f2 +Subproject commit c4be18301ff85fbf18b218eb2c9e8d00d0aefc3f diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 873ecc86..cf2fc98c 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -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); diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts index a5a51326..c535de5c 100644 --- a/src/webui/ui/NapCat.ts +++ b/src/webui/ui/NapCat.ts @@ -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", }) ), - `
HTTP 事件上报密钥
-
@@ -77,9 +76,9 @@ async function onSettingWindowCreated(view: Element) {
HTTP 事件上报地址
- 添加 + 添加 -
+
`, 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", }) ), - `
反向 WebSocket 监听地址
- 添加 + 添加 -
+
`, 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", diff --git a/src/webui/ui/components/SettingButton.ts b/src/webui/ui/components/SettingButton.ts index 201ffc88..4dc0ff37 100644 --- a/src/webui/ui/components/SettingButton.ts +++ b/src/webui/ui/components/SettingButton.ts @@ -1,3 +1,3 @@ export const SettingButton = (text: string, id?: string, type: string = 'secondary') => { - return `${text}` - } \ No newline at end of file + return `${text}` +} \ No newline at end of file diff --git a/src/webui/ui/components/SettingItem.ts b/src/webui/ui/components/SettingItem.ts index fe2208f7..26055f3c 100644 --- a/src/webui/ui/components/SettingItem.ts +++ b/src/webui/ui/components/SettingItem.ts @@ -1,15 +1,15 @@ export const SettingItem = ( - title: string, - subtitle?: string, - action?: string, - id?: string, - visible: boolean = true, - ) => { - return ` + title: string, + subtitle?: string, + action?: string, + id?: string, + visible: boolean = true, +) => { + return `
${title} ${subtitle ? `${subtitle}` : ''}
${action ? `
${action}
` : ''} ` - } \ No newline at end of file +} \ No newline at end of file diff --git a/static/assets/renderer.js b/static/assets/renderer.js index 25bbd63e..e960fcef 100644 --- a/static/assets/renderer.js +++ b/static/assets/renderer.js @@ -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" }) ), - `
+ `
HTTP 事件上报密钥
- +
HTTP 事件上报地址
- 添加 + 添加 -
+
`, 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" }) ), - `
+ `
反向 WebSocket 监听地址
- 添加 + 添加 -
+
`, 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"