From 8981f12b1a600147be450a234f8a0e2f334dcdc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sat, 16 Nov 2024 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=A7=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/network/HttpClientComponent.vue |  3 ++
 .../src/pages/network/HttpServerComponent.vue | 31 ++++++++++--------
 .../network/WebsocketClientComponent.vue      |  3 ++
 .../network/WebsocketServerComponent.vue      | 32 +++++++++----------
 src/onebot/config/config.ts                   |  8 ++---
 src/onebot/index.ts                           |  2 +-
 6 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/napcat.webui/src/pages/network/HttpClientComponent.vue b/napcat.webui/src/pages/network/HttpClientComponent.vue
index 1bdc58a9..7014c888 100644
--- a/napcat.webui/src/pages/network/HttpClientComponent.vue
+++ b/napcat.webui/src/pages/network/HttpClientComponent.vue
@@ -18,6 +18,9 @@
                 <t-form-item label="调试模式">
                     <t-checkbox v-model="config.debug" />
                 </t-form-item>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
             </t-form>
         </div>
     </div>
diff --git a/napcat.webui/src/pages/network/HttpServerComponent.vue b/napcat.webui/src/pages/network/HttpServerComponent.vue
index cc5ba90f..d0495ee3 100644
--- a/napcat.webui/src/pages/network/HttpServerComponent.vue
+++ b/napcat.webui/src/pages/network/HttpServerComponent.vue
@@ -1,32 +1,35 @@
 <template>
     <div class="container">
         <div class="form-container">
-            <h3>HTTP Server 配置</h3>
+            <h3>WebSocket Server 配置</h3>
             <t-form>
+                <t-form-item label="主机">
+                    <t-input v-model="config.host" />
+                </t-form-item>
                 <t-form-item label="端口">
                     <t-input v-model.number="config.port" type="number" />
                 </t-form-item>
-                <t-form-item label="主机">
-                    <t-input v-model="config.host" type="text" />
-                </t-form-item>
-                <t-form-item label="启用 CORS">
-                    <t-checkbox v-model="config.enableCors" />
-                </t-form-item>
-                <t-form-item label="启用 WS">
-                    <t-checkbox v-model="config.enableWebsocket" />
-                </t-form-item>
                 <t-form-item label="消息格式">
-                    <t-input v-model="config.messagePostFormat" type="text" />
+                    <t-input v-model="config.messagePostFormat" />
                 </t-form-item>
                 <t-form-item label="报告自身消息">
                     <t-checkbox v-model="config.reportSelfMessage" />
                 </t-form-item>
                 <t-form-item label="Token">
-                    <t-input v-model="config.token" type="text" />
+                    <t-input v-model="config.token" />
+                </t-form-item>
+                <t-form-item label="启用推送事件">
+                    <t-checkbox v-model="config.enablePushEvent" />
                 </t-form-item>
                 <t-form-item label="调试模式">
                     <t-checkbox v-model="config.debug" />
                 </t-form-item>
+                <t-form-item label="心跳间隔">
+                    <t-input v-model.number="config.heartInterval" type="number" />
+                </t-form-item>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
             </t-form>
         </div>
     </div>
@@ -34,9 +37,9 @@
 
 <script setup lang="ts">
 import { defineProps } from 'vue';
-import { HttpServerConfig } from '../../../../src/onebot/config/config';
+import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
 defineProps<{
-    config: HttpServerConfig;
+    config: WebsocketServerConfig;
 }>();
 </script>
 
diff --git a/napcat.webui/src/pages/network/WebsocketClientComponent.vue b/napcat.webui/src/pages/network/WebsocketClientComponent.vue
index 9d2e89fe..92700863 100644
--- a/napcat.webui/src/pages/network/WebsocketClientComponent.vue
+++ b/napcat.webui/src/pages/network/WebsocketClientComponent.vue
@@ -21,6 +21,9 @@
                 <t-form-item label="心跳间隔">
                     <t-input v-model.number="config.heartInterval" type="number" />
                 </t-form-item>
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
+                </t-form-item>
             </t-form>
         </div>
     </div>
diff --git a/napcat.webui/src/pages/network/WebsocketServerComponent.vue b/napcat.webui/src/pages/network/WebsocketServerComponent.vue
index a30af7e0..dc922c16 100644
--- a/napcat.webui/src/pages/network/WebsocketServerComponent.vue
+++ b/napcat.webui/src/pages/network/WebsocketServerComponent.vue
@@ -1,31 +1,31 @@
 <template>
     <div class="container">
         <div class="form-container">
-            <h3>WebSocket Server 配置</h3>
+            <h3>HTTP Server 配置</h3>
             <t-form>
-                <t-form-item label="主机">
-                    <t-input v-model="config.host" />
-                </t-form-item>
                 <t-form-item label="端口">
                     <t-input v-model.number="config.port" type="number" />
                 </t-form-item>
-                <t-form-item label="消息格式">
-                    <t-input v-model="config.messagePostFormat" />
+                <t-form-item label="主机">
+                    <t-input v-model="config.host" type="text" />
                 </t-form-item>
-                <t-form-item label="报告自身消息">
-                    <t-checkbox v-model="config.reportSelfMessage" />
+                <t-form-item label="启用 CORS">
+                    <t-checkbox v-model="config.enableCors" />
+                </t-form-item>
+                <t-form-item label="启用 WS">
+                    <t-checkbox v-model="config.enableWebsocket" />
+                </t-form-item>
+                <t-form-item label="消息格式">
+                    <t-input v-model="config.messagePostFormat" type="text" />
                 </t-form-item>
                 <t-form-item label="Token">
-                    <t-input v-model="config.token" />
-                </t-form-item>
-                <t-form-item label="启用推送事件">
-                    <t-checkbox v-model="config.enablePushEvent" />
+                    <t-input v-model="config.token" type="text" />
                 </t-form-item>
                 <t-form-item label="调试模式">
                     <t-checkbox v-model="config.debug" />
                 </t-form-item>
-                <t-form-item label="心跳间隔">
-                    <t-input v-model.number="config.heartInterval" type="number" />
+                <t-form-item label="启用">
+                    <t-checkbox v-model="config.enable" />
                 </t-form-item>
             </t-form>
         </div>
@@ -34,9 +34,9 @@
 
 <script setup lang="ts">
 import { defineProps } from 'vue';
-import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
+import { HttpServerConfig } from '../../../../src/onebot/config/config';
 defineProps<{
-    config: WebsocketServerConfig;
+    config: HttpServerConfig;
 }>();
 </script>
 
diff --git a/src/onebot/config/config.ts b/src/onebot/config/config.ts
index c4c34b20..7938106f 100644
--- a/src/onebot/config/config.ts
+++ b/src/onebot/config/config.ts
@@ -42,7 +42,6 @@ export const httpServerDefaultConfigs = createDefaultAdapterConfig({
     enableCors: true,
     enableWebsocket: true,
     messagePostFormat: 'array',
-    reportSelfMessage: false,
     token: '',
     debug: false,
 });
@@ -63,13 +62,13 @@ export const websocketServerDefaultConfigs = createDefaultAdapterConfig({
     name: 'websocket-server',
     enable: false as boolean,
     host: '0.0.0.0',
-    port: 3002,
+    port: 3001,
     messagePostFormat: 'array',
     reportSelfMessage: false,
     token: '',
     enablePushEvent: true,
     debug: false,
-    heartInterval: 0,
+    heartInterval: 30000,
 });
 export type WebsocketServerConfig = typeof websocketServerDefaultConfigs;
 
@@ -81,7 +80,7 @@ export const websocketClientDefaultConfigs = createDefaultAdapterConfig({
     reportSelfMessage: false,
     token: '',
     debug: false,
-    heartInterval: 0,
+    heartInterval: 30000,
 });
 export type WebsocketClientConfig = typeof websocketClientDefaultConfigs;
 
@@ -166,7 +165,6 @@ export function migrateOneBotConfigsV1(config: Partial<v1Config>): OneBotConfig
                 token: config.http.secret,
                 debug: config.debug,
                 messagePostFormat: config.messagePostFormat,
-                reportSelfMessage: config.reportSelfMessage,
             }),
         ];
     }
diff --git a/src/onebot/index.ts b/src/onebot/index.ts
index 2c930c5e..b7537dc0 100644
--- a/src/onebot/index.ts
+++ b/src/onebot/index.ts
@@ -616,7 +616,7 @@ export class NapCatOneBot11Adapter {
                 } else if (ob11Msg.stringMsg.message.length === 0 || ob11Msg.arrayMsg.message.length == 0) {
                     return;
                 }
-                const notreportSelf_network = network.flat().filter((e) => e.enable && !e.reportSelfMessage);
+                const notreportSelf_network = network.flat().filter((e) => e.enable && (('reportSelfMessage' in e && !e.reportSelfMessage) || !('reportSelfMessage' in e)));
                 if (isSelfMsg) {
                     for (const adapter of notreportSelf_network) {
                         msgMap.delete(adapter.name);