fix: allow client connect after close

src/change_stream.ts

@@ -588,7 +588,6 @@ function processNewChange(
 }
 
 function processError(changeStream: ChangeStream, error: AnyError, callback?: Callback) {
-  const topology = getTopology(changeStream.parent);
   const cursor = changeStream.cursor;
 
   // If the change stream has been closed explicitly, do not process error.
@@ -618,6 +617,7 @@ function processError(changeStream: ChangeStream, error: AnyError, callback?: Ca
     // close internal cursor, ignore errors
     cursor.close();
 
+    const topology = getTopology(changeStream.parent);
     waitForTopologyConnected(topology, { readPreference: cursor.readPreference }, err => {
       // if the topology can't reconnect, close the stream
       if (err) return unresumableError(err);

src/mongo_client.ts

@@ -362,7 +362,10 @@ export class MongoClient extends EventEmitter implements OperationParent {
         return cb();
       }
 
+      // clear out references to old topology
       const topology = this.topology;
+      this.topology = undefined;
+
       topology.close({ force }, err => {
         const autoEncrypter = topology.s.options.autoEncrypter;
         if (!autoEncrypter) {

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 MongoError(`'connect' cannot be called when already connected`);
+  }
+
   let didRequestAuthentication = false;
   const logger = new Logger('MongoClient', options);
 

test/functional/connection.test.js

@@ -1,6 +1,6 @@
 'use strict';
+const { withClient, setupDatabase } = require('./shared');
 const test = require('./shared').assert,
-  setupDatabase = require('./shared').setupDatabase,
   expect = require('chai').expect;
 
 describe('Connection', function () {
@@ -274,3 +274,55 @@ describe('Connection', function () {
     }
   });
 });
+
+it(
+  'should be able to connect again after close',
+  withClient(function (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;
+        expect(client.isConnected()).to.be.false;
+
+        client.connect(err => {
+          expect(err).to.not.exist;
+          expect(client.isConnected()).to.be.true;
+
+          collection.insertOne({ b: 2 }, (err, result) => {
+            expect(err).to.not.exist;
+            expect(result).to.exist;
+            expect(client.topology.isDestroyed()).to.be.false;
+            done();
+          });
+        });
+      });
+    });
+  })
+);
+
+it(
+  'should correctly fail on retry when client has been closed',
+  withClient(function (client, done) {
+    expect(client.isConnected()).to.be.true;
+    const collection = client.db('shouldCorrectlyFailOnRetry').collection('test');
+    collection.insertOne({ a: 1 }, (err, result) => {
+      expect(err).to.not.exist;
+      expect(result).to.exist;
+
+      client.close(true, function (err) {
+        expect(err).to.not.exist;
+        expect(client.isConnected()).to.be.false;
+
+        expect(() => {
+          collection.insertOne({ a: 2 });
+        }).to.throw(/must be connected/);
+        done();
+      });
+    });
+  })
+);

test/functional/find.test.js

@@ -2637,15 +2637,16 @@ describe('Find', function () {
         expect(err).to.not.exist;
 
         let selectedServer;
-        const selectServerStub = sinon.stub(client.topology, 'selectServer').callsFake(function () {
+        const topology = client.topology;
+        const selectServerStub = sinon.stub(topology, 'selectServer').callsFake(function () {
           const args = Array.prototype.slice.call(arguments);
           const originalCallback = args.pop();
           args.push((err, server) => {
             selectedServer = server;
             originalCallback(err, server);
           });
 
-          return client.topology.selectServer.wrappedMethod.apply(this, args);
+          return topology.selectServer.wrappedMethod.apply(this, args);
         });
 
         const collection = client.db().collection('test_read_preference');

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;
           });
       });
     }