[CONJS-254] ensuring option connectTimeout is respected

* now respected when using unix socket or name pipe
* timeout is removed when socket is successfully established, in place of returning connection object (so when authentication is complete + 'pre-queries' if needed ended)

lib/connection.js

@@ -769,6 +769,9 @@ class Connection extends EventEmitter {
    * @private
    */
   streamInitSocket() {
+    if (this.opts.connectTimeout) {
+      this.timeout = setTimeout(this.connectTimeoutReached.bind(this), this.opts.connectTimeout, Date.now());
+    }
     if (this.opts.socketPath) {
       this.socket = Net.connect(this.opts.socketPath);
     } else if (this.opts.stream) {
@@ -805,17 +808,12 @@ class Connection extends EventEmitter {
   }
 
   socketInit() {
-    if (this.opts.connectTimeout) {
-      this.timeout = setTimeout(this.connectTimeoutReached.bind(this), this.opts.connectTimeout, Date.now());
-    }
-
     this.socket.on('data', this.streamIn.onData.bind(this.streamIn));
     this.socket.on('error', this.socketErrorHandler.bind(this));
     this.socket.on('end', this.socketErrorHandler.bind(this));
     this.socket.on(
       'connect',
       function () {
-        clearTimeout(this.timeout);
         if (this.status === Status.CONNECTING) {
           this.status = Status.AUTHENTICATING;
           this.socket.setTimeout(this.opts.socketTimeout, this.socketTimeoutReached.bind(this));
@@ -867,6 +865,7 @@ class Connection extends EventEmitter {
       .then(this.executeInitQuery.bind(this))
       .then(this.executeSessionTimeout.bind(this))
       .then(() => {
+        clearTimeout(this.timeout);
         conn.status = Status.CONNECTED;
         process.nextTick(conn.connectResolveFct, conn);