add heartbeat timeout to websocket

Author: skadefro

OpenFlow/src/Messages/Message.ts

@@ -102,6 +102,7 @@ export class Message {
                     this.Ping(cli);
                     break;
                 case "pong":
+                    cli.lastheartbeat = new Date();
                     break;
                 case "listcollections":
                     this.ListCollections(cli);

OpenFlow/src/WebSocketClient.ts

@@ -42,6 +42,7 @@ export class WebSocketClient {
     public remoteip: string;
     public clientagent: string;
     public clientversion: string;
+    public lastheartbeat: Date = new Date();
 
 
     user: User;

OpenFlow/src/WebSocketServer.ts

@@ -60,6 +60,17 @@ export class WebSocketServer {
                 console.error(error);
                 cli.Close();
             }
+            var now = new Date();
+            var seconds = (now.getTime() - cli.lastheartbeat.getTime()) / 1000;
+            if (seconds >= 20) {
+                if (cli.user != null) {
+                    WebSocketServer._logger.info("client " + cli.user.name + "/" + cli.clientagent + " timeout, close down");
+                } else {
+                    WebSocketServer._logger.info("client not signed/" + cli.clientagent + " timeout, close down");
+                }
+                cli.Close();
+                return false;
+            }
             return cli.ping();
         });
         if (count !== WebSocketServer._clients.length) {

OpenFlow/src/amqpwrapper.ts

@@ -190,8 +190,10 @@ export class amqpwrapper {
         if (this.queues[queue] != null) {
             q = this.queues[queue];
         } else {
+            this._logger.error("[AMQP] Request for removing unknown consumer " + queue);
             return;
         }
+        this._logger.info("[AMQP] Remove queue consumer " + queue);
         await this.channel.cancel(q.consumerTag);
         delete this.queues[q.queue];
     }

VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7