@midwayjs/ws 3.20.9 → 3.20.10

package/dist/framework.js

@@ -50,6 +50,16 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
         else {
             server = (_a = this.configurationOptions.server) !== null && _a !== void 0 ? _a : http.createServer();
         }
+        if (this.configurationOptions.enableServerHeartbeatCheck) {
+            if (server.listening) {
+                this.startHeartBeat();
+            }
+            else {
+                server.on('listening', () => {
+                    this.startHeartBeat();
+                });
+            }
+        }
         server.on('upgrade', async (request, socket, head) => {
             // check if the upgrade auth handler is set
             if (this.upgradeAuthHandler) {
@@ -77,13 +87,19 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
             await new Promise(resolve => {
                 server.listen(this.configurationOptions.port, () => {
                     this.logger.info(`[midway:ws] WebSocket server port = ${this.configurationOptions.port} start success.`);
-                    if (this.configurationOptions.enableServerHeartbeatCheck) {
-                        this.startHeartBeat();
-                    }
                     resolve();
                 });
             });
         }
+        this.app.on('error', err => {
+            this.logger.error('socket server got error', err);
+        });
+        this.app.on('close', () => {
+            if (this.heartBeatInterval) {
+                clearInterval(this.heartBeatInterval);
+            }
+            this.logger.info('socket server close');
+        });
     }
     async beforeStop() {
         return new Promise(resolve => {
@@ -225,15 +241,6 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                 }
             }
         });
-        this.app.on('error', err => {
-            this.logger.error('socket server got error', err);
-        });
-        this.app.on('close', () => {
-            if (this.heartBeatInterval) {
-                clearInterval(this.heartBeatInterval);
-            }
-            this.logger.info('socket server close');
-        });
     }
     async bindSocketResponse(result, socket, propertyName, methodMap) {
         if (!result)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/ws",
-  "version": "3.20.9",
+  "version": "3.20.10",
   "description": "Midway Web Framework for ws",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,6 +24,7 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.20.4",
+    "@midwayjs/koa": "^3.20.4",
     "@midwayjs/mock": "^3.20.4",
     "fs-extra": "11.3.0"
   },
@@ -39,5 +40,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "d9032e8d591cb4e4997e31d757d7f055078536d6"
+  "gitHead": "60ef5c3dd5ebb2ee79388a4b942f07a9ef70b854"
 }