Address lint failures

Author: W-A-James

src/sdam/server.ts

@@ -338,42 +338,33 @@ export class Server extends TypedEventEmitter<ServerEvents> {
     };
 
     // FIXME: This is where withConnection logic should go
-    if (conn) {
-      // send operation, possibly reauthenticating and return without checking back in
+    if (!conn) {
       try {
-        return await runCommand(conn);
+        conn = await this.pool.checkOut();
       } catch (e) {
-        if (shouldReauth(e)) {
-          conn = await this.pool.reauthenticateAsync(conn);
-          return await runCommand(conn);
-        }
+        if (!e) throw new MongoRuntimeError('Failed to create connection without error');
+        if (!(e instanceof PoolClearedError)) this.handleError(e);
+
         throw e;
       }
     }
 
-    // check out connection
+    // Reauth flow
+    let rv;
     try {
-      conn = await this.pool.checkOut();
+      rv = await runCommand(conn);
     } catch (e) {
-      if (!e) throw new MongoRuntimeError('Failed to create connection without error');
-      if (!(e instanceof PoolClearedError)) this.handleError(e);
-
-      throw e;
-    }
-    // call executeCommandAsync with that checked out connection
-    try {
-      return await runCommand(conn);
-    } catch (e) {
-      // if it errors
-      //    check if we should reauthenticate
       if (shouldReauth(e)) {
         conn = await this.pool.reauthenticateAsync(conn);
-        return await runCommand(conn);
+        rv = await runCommand(conn);
+      } else {
+        throw e;
       }
-      throw e;
     } finally {
       this.pool.checkIn(conn);
     }
+
+    return rv;
   }
 
   /**

test/spec/server-discovery-and-monitoring/unified/standalone-topology-lifecycle.json

@@ -0,0 +1,79 @@
+{
+  "description": "standalone-heartbeat",
+  "schemaVersion": "1.16",
+  "runOnRequirements": [
+    {
+      "topologies": [
+        "single"
+      ],
+      "minServerVersion": "4.4"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "setupClient"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "Topology lifecycle",
+      "operations": [
+        {
+          "name": "createEntities",
+          "object": "testRunner",
+          "arguments": {
+            "entities": [
+              {
+                "client": {
+                  "id": "client",
+                  "observeEvents": [
+                    "topologyDescriptionChangedEvent",
+                    "serverDescriptionChangedEvent"
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "waitForEvent",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client",
+            "event": {
+              "topologyDescriptionChangedEvent": {}
+            },
+            "count": 2
+          }
+        },
+        {
+          "name": "close",
+          "object": "client"
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client",
+          "eventType": "sdam",
+          "events": [
+            {
+              "topologyDescriptionChangedEvent": {}
+            },
+            {
+              "serverDescriptionChangedEvent": {}
+            },
+            {
+              "topologyDescriptionChangedEvent": {}
+            },
+            {
+              "topologyDescriptionChangedEvent": {}
+            }
+          ],
+          "ignoreExtraEvents": true
+        }
+      ]
+    }
+  ]
+}

test/unit/assorted/server_discovery_and_monitoring.spec.test.ts

@@ -3,7 +3,6 @@ import { expect } from 'chai';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as sinon from 'sinon';
-import { promisify } from 'util';
 
 import {
   ConnectionPool,

test/unit/cmap/connection_pool.test.js

@@ -6,9 +6,7 @@ const mock = require('../../tools/mongodb-mock/index');
 const sinon = require('sinon');
 const { expect } = require('chai');
 const { setImmediate } = require('timers');
-const { promisify } = require('util');
 const { ns, isHello } = require('../../mongodb');
-const { LEGACY_HELLO_COMMAND } = require('../../mongodb');
 const { createTimerSandbox } = require('../timer_sandbox');
 const { topologyWithPlaceholderClient } = require('../../tools/utils');
 const { MongoClientAuthProviders } = require('../../mongodb');

test/unit/operations/get_more.test.ts

@@ -54,7 +54,7 @@ describe('GetMoreOperation', function () {
         );
         const opts = { ...options, documentsReturnedIn: 'nextBatch', returnFieldSelector: null };
         const operation = new GetMoreOperation(namespace, cursorId, server, opts);
-        const stub = sinon.stub(server, 'command').callsFake((_, __, ___) => {});
+        const stub = sinon.stub(server, 'command').returns(Promise.resolve({}));
 
         const expectedGetMoreCommand = {
           getMore: cursorId,

test/unit/sdam/server.test.ts

@@ -9,7 +9,6 @@ import {
   MongoErrorLabel,
   MongoNetworkError,
   MongoNetworkTimeoutError,
-  ns,
   ObjectId,
   Server,
   ServerDescription,