allow for client connect after close

Author: HanaPearlman

src/mongo_client.ts

@@ -346,19 +346,29 @@ export class MongoClient extends EventEmitter implements OperationParent {
     const force = typeof forceOrCallback === 'boolean' ? forceOrCallback : false;
 
     return maybePromise(callback, cb => {
+      const completeClose = (err?: AnyError) => {
+        // clear out references to old topology
+        this.topology = undefined;
+        this.s.dbCache = new Map();
+        this.s.sessions = new Set();
+
+        cb(err);
+      };
+
       if (this.topology == null) {
-        return cb();
+        completeClose();
+        return;
       }
 
       const topology = this.topology;
       topology.close({ force }, err => {
         const autoEncrypter = topology.s.options.autoEncrypter;
         if (!autoEncrypter) {
-          cb(err);
+          completeClose(err);
           return;
         }
 
-        autoEncrypter.teardown(force, err2 => cb(err || err2));
+        autoEncrypter.teardown(force, err2 => completeClose(err || err2));
       });
     });
   }

src/operations/connect.ts

@@ -197,6 +197,11 @@ export function connect(
     throw new Error('no callback function provided');
   }
 
+  // Has a connection already been established?
+  if (mongoClient.topology && mongoClient.topology.isConnected()) {
+    throw new Error(`'connect' cannot be called when already connected`);
+  }
+
   let didRequestAuthentication = false;
   const logger = new Logger('MongoClient', options);
 

test/functional/connection.test.js

@@ -2,6 +2,7 @@
 const test = require('./shared').assert,
   setupDatabase = require('./shared').setupDatabase,
   expect = require('chai').expect;
+const withClient = require('./shared').withClient;
 
 describe('Connection', function () {
   before(function () {
@@ -273,4 +274,31 @@ describe('Connection', function () {
       done();
     }
   });
+
+  it('should be able to connect again after close', function () {
+    return withClient.call(this, (client, done) => {
+      expect(client.isConnected()).to.be.true;
+
+      const collection = () => client.db('testReconnect').collection('test');
+      collection().insertOne({ a: 1 }, (err, result) => {
+        expect(err).to.not.exist;
+        expect(result).to.exist;
+
+        client.close(err => {
+          expect(err).to.not.exist;
+
+          client.connect(err => {
+            expect(err).to.not.exist;
+
+            collection().insertOne({ b: 2 }, (err, result) => {
+              expect(err).to.not.exist;
+              expect(result).to.exist;
+              expect(client.topology.isDestroyed()).to.be.false;
+              done();
+            });
+          });
+        });
+      });
+    });
+  });
 });

test/functional/sessions.test.js

@@ -123,7 +123,7 @@ describe('Sessions', function () {
               // verify that the `endSessions` command was sent
               const lastCommand = test.commands.started[test.commands.started.length - 1];
               expect(lastCommand.commandName).to.equal('endSessions');
-              expect(client.topology.s.sessionPool.sessions).to.have.length(0);
+              expect(client.topology).to.not.exist;
             });
         });
       });
@@ -143,7 +143,7 @@ describe('Sessions', function () {
             // verify that the `endSessions` command was sent
             const lastCommand = test.commands.started[test.commands.started.length - 1];
             expect(lastCommand.commandName).to.equal('endSessions');
-            expect(client.topology.s.sessionPool.sessions).to.have.length(0);
+            expect(client.topology).to.not.exist;
           });
       });
     }