fix(connection): correctly bubble up timeout and disconnected events …

…re: #8383
Automattic · Nov 27, 2019 · 02047ca · 02047ca
1 parent e6616d7
commit 02047ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -671,9 +671,6 @@ Connection.prototype.openUri = function(uri, options, callback) {
         if (type === 'Single') {
           const server = Array.from(db.s.topology.s.servers.values())[0];
 
-          server.s.pool.on('close', () => {
-            _this.readyState = STATES.disconnected;
-          });
           server.s.topology.on('serverHeartbeatSucceeded', () => {
             _handleReconnect();
           });
@@ -683,8 +680,11 @@ Connection.prototype.openUri = function(uri, options, callback) {
           server.s.pool.on('timeout', () => {
             _this.emit('timeout');
           });
+          client.on('serverClosed', () => {
+            _this.readyState = STATES.disconnected;
+          });
           server.s.pool.on('drain', err => {
-            if (err && err.name === 'MongoNetworkError') {
+            if (err && err.name === 'MongoNetworkError' && err.message.endsWith('timed out')) {
               _this.emit('timeout');
             }
           });

diff --git a/test/connection.test.js b/test/connection.test.js
@@ -188,6 +188,7 @@ describe('connections:', function() {
         let numDisconnected = 0;
         let numReconnected = 0;
         let numReconnect = 0;
+        let numTimeout = 0;
         let numClose = 0;
         const conn = mongoose.createConnection('mongodb://localhost:27000/mongoosetest?heartbeatfrequencyms=1000', {
           useNewUrlParser: true,
@@ -203,6 +204,9 @@ describe('connections:', function() {
         conn.on('reconnect', function() {
           ++numReconnect;
         });
+        conn.on('timeout', function() {
+          ++timeout;
+        });
         // Same as `reconnect`, just for backwards compat
         conn.on('reconnected', function() {
           ++numReconnected;
@@ -241,6 +245,7 @@ describe('connections:', function() {
             assert.equal(numDisconnected, 1);
             assert.equal(numReconnected, 1);
             assert.equal(numReconnect, 1);
+            assert.equal(numTimeout, 0);
             assert.equal(numClose, 0);
 
             conn.close();