wrap FLE errors in MongoCryptErrors

Author: baileympearson

src/client-side-encryption/auto_encrypter.ts

@@ -1,8 +1,4 @@
-import {
-  type MongoCrypt,
-  type MongoCryptConstructor,
-  type MongoCryptOptions
-} from 'mongodb-client-encryption';
+import { type MongoCrypt, type MongoCryptOptions } from 'mongodb-client-encryption';
 import * as net from 'net';
 
 import { deserialize, type Document, serialize } from '../bson';
@@ -15,7 +11,7 @@ import { type Abortable } from '../mongo_types';
 import { MongoDBCollectionNamespace } from '../utils';
 import { autoSelectSocketOptions } from './client_encryption';
 import * as cryptoCallbacks from './crypto_callbacks';
-import { MongoCryptInvalidArgumentError } from './errors';
+import { defaultErrorWrapper, MongoCryptInvalidArgumentError } from './errors';
 import { MongocryptdManager } from './mongocryptd_manager';
 import {
   type CredentialProviders,
@@ -183,7 +179,7 @@ export class AutoEncrypter {
   [kDecorateResult] = false;
 
   /** @internal */
-  static getMongoCrypt(): MongoCryptConstructor {
+  static getMongoCrypt(): typeof MongoCrypt {
     const encryption = getMongoDBClientEncryption();
     if ('kModuleError' in encryption) {
       throw encryption.kModuleError;
@@ -259,7 +255,8 @@ export class AutoEncrypter {
 
     const mongoCryptOptions: MongoCryptOptions = {
       enableMultipleCollinfo: true,
-      cryptoCallbacks
+      cryptoCallbacks,
+      errorWrapper: defaultErrorWrapper
     };
     if (options.schemaMap) {
       mongoCryptOptions.schemaMap = Buffer.isBuffer(options.schemaMap)

src/client-side-encryption/client_encryption.ts

@@ -1,7 +1,6 @@
 import type {
   ExplicitEncryptionContextOptions,
   MongoCrypt,
-  MongoCryptConstructor,
   MongoCryptOptions
 } from 'mongodb-client-encryption';
 
@@ -28,6 +27,7 @@ import { type CSOTTimeoutContext, TimeoutContext } from '../timeout';
 import { MongoDBCollectionNamespace, resolveTimeoutOptions } from '../utils';
 import * as cryptoCallbacks from './crypto_callbacks';
 import {
+  defaultErrorWrapper,
   MongoCryptCreateDataKeyError,
   MongoCryptCreateEncryptedCollectionError,
   MongoCryptInvalidArgumentError
@@ -87,7 +87,7 @@ export class ClientEncryption {
   _credentialProviders?: CredentialProviders;
 
   /** @internal */
-  static getMongoCrypt(): MongoCryptConstructor {
+  static getMongoCrypt(): typeof MongoCrypt {
     const encryption = getMongoDBClientEncryption();
     if ('kModuleError' in encryption) {
       throw encryption.kModuleError;
@@ -147,7 +147,8 @@ export class ClientEncryption {
       cryptoCallbacks,
       kmsProviders: !Buffer.isBuffer(this._kmsProviders)
         ? (serialize(this._kmsProviders) as Buffer)
-        : this._kmsProviders
+        : this._kmsProviders,
+      errorWrapper: defaultErrorWrapper
     };
 
     this._keyVaultNamespace = options.keyVaultNamespace;

src/client-side-encryption/errors.ts

@@ -26,6 +26,9 @@ export class MongoCryptError extends MongoError {
   }
 }
 
+export const defaultErrorWrapper = (error: Error) =>
+  new MongoCryptError(error.message, { cause: error });
+
 /**
  * @public
  *

test/integration/client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts

@@ -537,7 +537,7 @@ describe('Range Explicit Encryption', function () {
             })
             .catch(e => e);
 
-          expect(resultOrError).to.be.instanceOf(TypeError);
+          expect(resultOrError).to.be.instanceOf(MongoCryptError);
         }
       );
     });

test/integration/client-side-encryption/client_side_encryption.prose.25.lookup.test.ts

@@ -6,7 +6,13 @@ import { type MongoCryptOptions } from 'mongodb-client-encryption';
 import * as sinon from 'sinon';
 
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { AutoEncrypter, BSON, type Document, type MongoClient } from '../../mongodb';
+import {
+  AutoEncrypter,
+  BSON,
+  type Document,
+  type MongoClient,
+  MongoCryptError
+} from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
@@ -421,7 +427,7 @@ describe('$lookup support', defaultMetadata, function () {
             .toArray()
             .catch(error => error);
 
-          expect(actual).to.be.instanceOf(TypeError);
+          expect(actual).to.be.instanceOf(MongoCryptError);
           expect(actual.message).to.match(
             /libmongocrypt is not configured to support encrypting a command with multiple collections/i
           );