timers

Author: sushantdhiman

lib/connection.js

@@ -1,6 +1,7 @@
 var Net = require('net');
 var util = require('util');
 var Tls = require('tls');
+var Timers = require('timers');
 var EventEmitter = require('events').EventEmitter;
 var Queue = require('double-ended-queue');
 
@@ -83,8 +84,13 @@ function Connection (opts)
   this.packetParser = new PacketParser(function (p) { connection.handlePacket(p); });
 
   this.stream.on('data', function (data) {
+    if (connection.connectTimeout) {
+      Timers.clearTimeout(connection.connectTimeout);
+      connection.connectTimeout = null;
+    }
     connection.packetParser.execute(data);
   });
+
   this.stream.on('end', function () {
     // we need to set this flag everywhere where we want connection to close
     if (connection._closing) {
@@ -120,10 +126,7 @@ function Connection (opts)
 
   if (this.config.connectTimeout) {
     var timeoutHandler = this._handleTimeoutError.bind(this);
-    this.stream.setTimeout(this.config.connectTimeout, timeoutHandler);
-    this.stream.once('connect', function () {
-      connection.stream.setTimeout(0, timeoutHandler);
-    });
+    this.connectTimeout = Timers.setTimeout(timeoutHandler, this.config.connectTimeout);
   }
 }
 util.inherits(Connection, EventEmitter);
@@ -147,7 +150,8 @@ Connection.prototype._handleNetworkError = function (err) {
 
 Connection.prototype._handleTimeoutError = function () {
   if (this.stream) {
-    this.stream.setTimeout(0);
+    Timers.clearTimeout(this.connectTimeout);
+    this.connectTimeout = null;
     this.stream.destroy();
   }