Do not reset timeout when client closing (#21)

* Do not reset timeout when client closing

* Sender client reset timeouts between messages

* fixup

Author: kornys

lib/coreClient.js

@@ -39,6 +39,7 @@ class CoreClient {
         this.reconnectCount = 0;
         this.logstats;
         this.options = {};
+        this.endState = false;
     }
 
     /**
@@ -48,6 +49,7 @@ class CoreClient {
      * @param {integer} closeSleep - time in ms for scheduling closing, undefined = close now
      */
     close(context, closeSleep) {
+        this.endState = true;
         if(closeSleep) {
             this.timeoutClose(context, closeSleep);
         }else{
@@ -109,8 +111,10 @@ class CoreClient {
      * @param {object} context - event context
      */
     resetTimeout(context) {
-        this.cancelTimeout();
-        this.timeoutClose(context, this.timeout);
+        if(!this.endState) {
+            this.cancelTimeout();
+            this.timeoutClose(context, this.timeout);
+        }
     }
 
     /**

lib/receiverClient.js

@@ -83,15 +83,15 @@ class Receiver extends CoreClient {
                 Utils.printStatistic(context);
             }
 
-            //reset timer (simulaton of fetch)
-            self.resetTimeout(context, self.options.recvListen);
-
             //if received all expected messages and timeout is 0 close connection
             if (((!self.options.processReplyTo) || self.options.recvListen) && self.received === self.expected) {
                 self.cancelTimeout();
                 self.close(context, self.options.closeSleep);
             }
 
+            //reset timer
+            self.resetTimeout(context, self.options.recvListen);
+
             //add credit for drain
             if (!(self.options.duration > 0) &&
                     (self.expected === 0) &&

lib/senderClient.js

@@ -125,6 +125,10 @@ class Sender extends CoreClient {
 
                 Utils.printMessage(message, this.options);
 
+                if (this.options.timeout > 0) {
+                    this.resetTimeout(context, false);
+                }
+
                 if (this.options.logStats === 'endpoints') {
                     Utils.printStatistic(context);
                 }
@@ -149,6 +153,10 @@ class Sender extends CoreClient {
             context.sender.send(message);
         }
 
+        if (self.options.timeout > 0) {
+            self.resetTimeout(context, false);
+        }
+
         Utils.printMessage(message, self.options);
 
         if (self.options.logStats === 'endpoints') {