fix: 反向ws

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.0.3",
+  "version": "4.1.2",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.0.3",
+  "version": "4.1.2",
   "scripts": {
     "build:framework": "npm run build:webui && vite build --mode framework",
     "build:shell": "npm run build:webui && vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.0.3';
+export const napCatVersion = '4.1.2';

src/onebot/network/active-websocket.ts

@@ -43,7 +43,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
                 }
             }, this.config.heartInterval);
         }
-
+        this.isEnable = true;
         await this.tryConnect();
     }
 
@@ -159,7 +159,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
         const oldUrl = this.config.url;
         const oldHeartInterval = this.config.heartInterval;
         this.config = newConfig;
-    
+
         if (newConfig.enable && !wasEnabled) {
             this.open();
             return OB11NetworkReloadType.NetWorkOpen;
@@ -167,7 +167,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             this.close();
             return OB11NetworkReloadType.NetWorkClose;
         }
-    
+
         if (oldUrl !== newConfig.url) {
             this.close();
             if (newConfig.enable) {
@@ -175,7 +175,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             }
             return OB11NetworkReloadType.NetWorkReload;
         }
-    
+
         if (oldHeartInterval !== newConfig.heartInterval) {
             if (this.heartbeatRef) {
                 clearInterval(this.heartbeatRef);
@@ -190,7 +190,7 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
             }
             return OB11NetworkReloadType.NetWorkReload;
         }
-    
+
         return OB11NetworkReloadType.Normal;
     }
 }

src/onebot/network/passive-websocket.ts

@@ -17,7 +17,6 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
     wsClients: WebSocket[] = [];
     wsClientsMutex = new Mutex();
     isEnable: boolean = false;
-    hasBeenClosed: boolean = false;
     heartbeatInterval: number = 0;
     logger: LogWrapper;
     public config: WebsocketServerConfig;
@@ -107,10 +106,6 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
             this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Server] Cannot open a opened WebSocket server');
             return;
         }
-        if (this.hasBeenClosed) {
-            this.logger.logError.bind(this.logger)('[OneBot] [WebSocket Server] Cannot open a WebSocket server that has been closed');
-            return;
-        }
         const addressInfo = this.wsServer.address();
         this.logger.log('[OneBot] [WebSocket Server] Server Started', typeof (addressInfo) === 'string' ? addressInfo : addressInfo?.address + ':' + addressInfo?.port);