Merge branch 'main' into NODE-5068-flaky-cs-tests

Author: baileympearson

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.14.1"
+  ".": "6.14.2"
 }

HISTORY.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.14.2](https://github.com/mongodb/node-mongodb-native/compare/v6.14.1...v6.14.2) (2025-03-04)
+
+
+### Bug Fixes
+
+* **NODE-6803:** kms proxy socket creates unhandled rejection ([#4444](https://github.com/mongodb/node-mongodb-native/issues/4444)) ([ed69cf9](https://github.com/mongodb/node-mongodb-native/commit/ed69cf914435ebc96c44b265704571e3d34629ef))
+
 ## [6.14.1](https://github.com/mongodb/node-mongodb-native/compare/v6.14.0...v6.14.1) (2025-03-03)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "6.14.1",
+  "version": "6.14.2",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [

package.json

@@ -352,7 +352,7 @@ export class StateMachine {
     const message = request.message;
     const buffer = new BufferPool();
 
-    const netSocket: net.Socket = new net.Socket();
+    let netSocket: net.Socket;
     let socket: tls.TLSSocket;
 
     function destroySockets() {
@@ -388,26 +388,31 @@ export class StateMachine {
       }
     }
 
-    const {
-      promise: willConnect,
-      reject: rejectOnNetSocketError,
-      resolve: resolveOnNetSocketConnect
-    } = promiseWithResolvers<void>();
-    netSocket
-      .once('error', err => rejectOnNetSocketError(onerror(err)))
-      .once('close', () => rejectOnNetSocketError(onclose()))
-      .once('connect', () => resolveOnNetSocketConnect());
-
     let abortListener;
 
     try {
       if (this.options.proxyOptions && this.options.proxyOptions.proxyHost) {
+        netSocket = new net.Socket();
+
+        const {
+          promise: willConnect,
+          reject: rejectOnNetSocketError,
+          resolve: resolveOnNetSocketConnect
+        } = promiseWithResolvers<void>();
+
+        netSocket
+          .once('error', err => rejectOnNetSocketError(onerror(err)))
+          .once('close', () => rejectOnNetSocketError(onclose()))
+          .once('connect', () => resolveOnNetSocketConnect());
+
         const netSocketOptions = {
           ...socketOptions,
           host: this.options.proxyOptions.proxyHost,
           port: this.options.proxyOptions.proxyPort || 1080
         };
+
         netSocket.connect(netSocketOptions);
+
         await willConnect;
 
         try {