Merge branch 'main' into NODE-4691-kill-in-fight-ops-on-heartbeat-timeout

Author: baileympearson

etc/check-remote.sh

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+if git remote get-url --push origin | grep -qv "github.com:mongodb"; then
+    echo "git remote does not match node-mongodb-native.  are you working off of a fork?"
+    exit 1
+fi

etc/docs/build.ts

@@ -73,6 +73,8 @@ async function updateSiteTemplateForNewVersion(
 }
 
 async function main() {
+  await exec('bash ./etc/check-remote.sh');
+
   chdir(__dirname);
 
   const { tag, status, skipPrompts } = getCommandLineArguments();

package.json

@@ -121,7 +121,7 @@
     "fix:eslint": "npm run check:eslint -- --fix",
     "prepare": "node etc/prepare.js",
     "preview:docs": "ts-node etc/docs/preview.ts",
-    "release": "standard-version -a -i HISTORY.md",
+    "release": "bash etc/check-remote.sh && standard-version -a -i HISTORY.md",
     "test": "npm run check:lint && npm run test:all",
     "test:all": "npm run check:unit && npm run check:test",
     "update:docs": "npm run build:docs -- --yes"

src/cmap/auth/mongodb_aws.ts

@@ -4,7 +4,7 @@ import * as url from 'url';
 
 import type { Binary, BSONSerializeOptions } from '../../bson';
 import * as BSON from '../../bson';
-import { aws4, credentialProvider } from '../../deps';
+import { aws4, getAwsCredentialProvider } from '../../deps';
 import {
   MongoAWSError,
   MongoCompatibilityError,
@@ -198,6 +198,8 @@ function makeTempCredentials(credentials: MongoCredentials, callback: Callback<M
     );
   }
 
+  const credentialProvider = getAwsCredentialProvider();
+
   // Check if the AWS credential provider from the SDK is present. If not,
   // use the old method.
   if ('kModuleError' in credentialProvider) {

src/cmap/connection.ts

@@ -384,7 +384,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
       } else {
         // Get the first orphaned operation description.
         const entry = this[kQueue].entries().next();
-        if (entry) {
+        if (entry.value != null) {
           const [requestId, orphaned]: [number, OperationDescription] = entry.value;
           // If the orphaned operation description exists then set it.
           operationDescription = orphaned;

src/deps.ts

@@ -72,18 +72,22 @@ type CredentialProvider = {
   fromNodeProviderChain(this: void): () => Promise<AWSCredentials>;
 };
 
-export let credentialProvider: CredentialProvider | { kModuleError: MongoMissingDependencyError } =
-  makeErrorModule(
-    new MongoMissingDependencyError(
-      'Optional module `@aws-sdk/credential-providers` not found.' +
-        ' Please install it to enable getting aws credentials via the official sdk.'
-    )
-  );
-
-try {
-  // Ensure you always wrap an optional require in the try block NODE-3199
-  credentialProvider = require('@aws-sdk/credential-providers');
-} catch {} // eslint-disable-line
+export function getAwsCredentialProvider():
+  | CredentialProvider
+  | { kModuleError: MongoMissingDependencyError } {
+  try {
+    // Ensure you always wrap an optional require in the try block NODE-3199
+    const credentialProvider = require('@aws-sdk/credential-providers');
+    return credentialProvider;
+  } catch {
+    return makeErrorModule(
+      new MongoMissingDependencyError(
+        'Optional module `@aws-sdk/credential-providers` not found.' +
+          ' Please install it to enable getting aws credentials via the official sdk.'
+      )
+    );
+  }
+}
 
 type SnappyLib = {
   [PKG_VERSION]: { major: number; minor: number; patch: number };

test/unit/cmap/connection.test.ts

@@ -287,6 +287,34 @@ describe('new Connection()', function () {
         });
       });
 
+      context('when no operation description is in the queue', function () {
+        const document = { ok: 1 };
+
+        beforeEach(function () {
+          // @ts-expect-error: driverSocket does not fully satisfy the stream type, but that's okay
+          connection = sinon.spy(new Connection(driverSocket, connectionOptionsDefaults));
+          connection.isMonitoringConnection = true;
+          const queueSymbol = getSymbolFrom(connection, 'queue');
+          queue = connection[queueSymbol];
+        });
+
+        it('does not error', function () {
+          const msg = generateOpMsgBuffer(document);
+          const msgHeader: MessageHeader = {
+            length: msg.readInt32LE(0),
+            requestId: 2,
+            responseTo: 1,
+            opCode: msg.readInt32LE(12)
+          };
+          const msgBody = msg.subarray(16);
+
+          const message = new BinMsg(msg, msgHeader, msgBody);
+          expect(() => {
+            connection.onMessage(message);
+          }).to.not.throw();
+        });
+      });
+
       context('when more than one operation description is in the queue', function () {
         let spyOne;
         let spyTwo;