fix(webserver): Terminate SSE connections on shutdown for a clean shu…

…tdown
Hypfer · Sep 15, 2021 · bfbf4dd · bfbf4dd
1 parent b7aed1a
commit bfbf4dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/backend/lib/webserver/RobotRouter.js b/backend/lib/webserver/RobotRouter.js
@@ -135,6 +135,12 @@ class RobotRouter {
     getRouter() {
         return this.router;
     }
+
+    shutdown() {
+        Object.values(this.sseHubs).forEach(hub => {
+            hub.shutdown();
+        });
+    }
 }
 
 module.exports = RobotRouter;
diff --git a/backend/lib/webserver/WebServer.js b/backend/lib/webserver/WebServer.js
@@ -210,6 +210,7 @@ class WebServer {
     shutdown() {
         return new Promise((resolve, reject) => {
             Logger.debug("Webserver shutdown in progress...");
+            this.robotRouter.shutdown();
 
             //closing the server
             this.webserver.close(() => {

diff --git a/backend/lib/webserver/middlewares/sse/SSEHub.js b/backend/lib/webserver/middlewares/sse/SSEHub.js
@@ -38,6 +38,13 @@ class SSEHub {
             client.write(payload);
         });
     }
+
+    shutdown() {
+        this.clients.forEach(client => {
+            client.terminate();
+            this.unregister(client);
+        });
+    }
 }
 
 module.exports = SSEHub;