refactor: support passing an autoEncrypter to the connection pool

mongodb · Jan 1, 2020 · 3844dd8 · 3844dd8
1 parent dd1e717
commit 3844dd8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/cmap/connection.js b/lib/cmap/connection.js
@@ -20,6 +20,7 @@ const kLastUseTime = Symbol('lastUseTime');
 const kClusterTime = Symbol('clusterTime');
 const kDescription = Symbol('description');
 const kIsMaster = Symbol('ismaster');
+const kAutoEncrypter = Symbol('autoEncrypter');
 
 class Connection extends EventEmitter {
   constructor(stream, options) {
@@ -38,6 +39,11 @@ class Connection extends EventEmitter {
     this[kGeneration] = options.generation;
     this[kLastUseTime] = Date.now();
 
+    // retain a reference to an `AutoEncrypter` if present
+    if (options.autoEncrypter) {
+      this[kAutoEncrypter] = options.autoEncrypter;
+    }
+
     // setup parser stream and message handling
     this[kQueue] = new Map();
     this[kMessageStream] = new MessageStream(options);
@@ -172,14 +178,20 @@ class Connection extends EventEmitter {
 /// protocol methods. Eventually, the operation executor will return a `Connection` to execute
 /// against.
 function makeServerTrampoline(connection) {
-  return {
+  const server = {
     description: connection.description,
     clusterTime: connection[kClusterTime],
     s: {
       bson: connection.bson,
       pool: { write: write.bind(connection), isConnected: () => true }
     }
   };
+
+  if (connection[kAutoEncrypter]) {
+    server.autoEncrypter = connection[kAutoEncrypter];
+  }
+
+  return server;
 }
 
 function messageHandler(conn) {

diff --git a/lib/cmap/connection_pool.js b/lib/cmap/connection_pool.js
@@ -129,7 +129,8 @@ class ConnectionPool extends EventEmitter {
       minPoolSize: typeof options.minPoolSize === 'number' ? options.minPoolSize : 0,
       maxIdleTimeMS: typeof options.maxIdleTimeMS === 'number' ? options.maxIdleTimeMS : 0,
       waitQueueTimeoutMS:
-        typeof options.waitQueueTimeoutMS === 'number' ? options.waitQueueTimeoutMS : 10000
+        typeof options.waitQueueTimeoutMS === 'number' ? options.waitQueueTimeoutMS : 10000,
+      autoEncrypter: options.autoEncrypter
     });
 
     if (options.minSize > options.maxSize) {