adds error handling for when tedious fails to connect

tediousjs · Feb 18, 2019 · 919fc68 · 919fc68
1 parent 8a8c74c
commit 919fc68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/tedious.js b/lib/tedious.js
@@ -233,13 +233,14 @@ class ConnectionPool extends base.ConnectionPool {
           payload: true
         }
       }
-
+      let hasPromiseResolved = false
       const tedious = new tds.Connection(cfg)
       IDS.add(tedious, 'Connection')
       debug('pool(%d): connection #%d created', IDS.get(this), IDS.get(tedious))
       debug('connection(%d): establishing', IDS.get(tedious))
 
       tedious.once('connect', err => {
+        hasPromiseResolved = true;
         if (err) {
           err = new base.ConnectionError(err)
           return reject(err)
@@ -249,6 +250,12 @@ class ConnectionPool extends base.ConnectionPool {
         resolve(tedious)
       })
 
+      tedious.on('end', () =>{
+        if(!hasPromiseResolved){
+          const err = new base.ConnectionError('The connection ended without ever completing the connection')
+          reject(err)
+        }
+      })
       tedious.on('error', err => {
         if (err.code === 'ESOCKET') {
           tedious.hasError = true

diff --git a/package-lock.json b/package-lock.json