chore(AutoEncryption): delegate mongocryptd to mongodb-client-encryption

Delegates management of almost all items associated with autoEncryption
to the autoEncryptor. autoEncryptor now handles spawning of
mongocryptd and mongocryptd client

* expose MongoTimeoutError
* delegate mongocryptd to mongodb-client-encryption
* incorporate feedback

Author: daprahamian

index.js

@@ -10,6 +10,7 @@ const connect = require('./lib/mongo_client').connect;
 // Expose error class
 connect.MongoError = core.MongoError;
 connect.MongoNetworkError = core.MongoNetworkError;
+connect.MongoTimeoutError = core.MongoTimeoutError;
 
 // Actual driver classes exported
 connect.Admin = require('./lib/admin');

lib/operations/close.js

@@ -23,22 +23,21 @@ class CloseOperation extends OperationBase {
       client.removeAllListeners('close');
       callback(err, null);
     };
-    const mongocryptdClientClose = err => {
-      const mongocryptdClient = client.s.mongocryptdClient;
-      if (!mongocryptdClient) {
-        completeClose(err);
-        return;
-      }
-
-      mongocryptdClient.close(force, err2 => completeClose(err || err2));
-    };
 
     if (client.topology == null) {
-      mongocryptdClientClose();
+      completeClose();
       return;
     }
 
-    client.topology.close(force, mongocryptdClientClose);
+    client.topology.close(force, err => {
+      const autoEncrypter = client.topology.s.options.autoEncrypter;
+      if (!autoEncrypter) {
+        completeClose(err);
+        return;
+      }
+
+      autoEncrypter.teardown(force, err2 => completeClose(err || err2));
+    });
   }
 }
 

lib/operations/connect.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const os = require('os');
 const OperationBase = require('./operation').OperationBase;
 const defineAspects = require('./operation').defineAspects;
 const Aspect = require('./operation').Aspect;
@@ -482,35 +481,16 @@ function createTopology(mongoClient, topologyType, options, callback) {
       return;
     }
     try {
-      AutoEncrypter = require('mongodb-client-encryption').AutoEncrypter;
+      AutoEncrypter = require('mongodb-client-encryption')(require('../../index')).AutoEncrypter;
     } catch (err) {
       callback(err);
       return;
     }
 
-    const MongoClient = loadClient();
-    let connectionString;
-    if (options.autoEncryption.extraOptions && options.autoEncryption.extraOptions.mongocryptURI) {
-      connectionString = options.autoEncryption.extraOptions.mongocryptURI;
-    } else if (os.platform() === 'win32') {
-      connectionString = 'mongodb://localhost:27020/?serverSelectionTimeoutMS=1000';
-    } else {
-      connectionString = 'mongodb://%2Ftmp%2Fmongocryptd.sock/?serverSelectionTimeoutMS=1000';
-    }
-
-    const mongocryptdClient = new MongoClient(connectionString, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true
-    });
-    mongoClient.s.mongocryptdClient = mongocryptdClient;
-    mongocryptdClient.connect(err => {
+    const mongoCryptOptions = Object.assign({}, options.autoEncryption);
+    topology.s.options.autoEncrypter = new AutoEncrypter(mongoClient, mongoCryptOptions);
+    topology.s.options.autoEncrypter.init(err => {
       if (err) return callback(err, null);
-
-      const mongoCryptOptions = Object.assign({}, options.autoEncryption, {
-        mongocryptdClient
-      });
-
-      topology.s.options.autoEncrypter = new AutoEncrypter(mongoClient, mongoCryptOptions);
       callback(null, newTopology);
     });
   });