feat(NODE-5908): support range v2 protocol (#13)

mongodb-js · Jun 12, 2024 · 4650f7c · 4650f7c
1 parent 39d898a
commit 4650f7c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/addon/mongocrypt.cc b/addon/mongocrypt.cc
@@ -514,9 +514,7 @@ MongoCrypt::MongoCrypt(const CallbackInfo& info)
         mongocrypt_setopt_bypass_query_analysis(_mongo_crypt.get());
     }
 
-    if (options.Get("rangeV2").ToBoolean()) {
-        mongocrypt_setopt_use_range_v2(_mongo_crypt.get());
-    }
+    mongocrypt_setopt_use_range_v2(_mongo_crypt.get());
 
     mongocrypt_setopt_use_need_kms_credentials_state(_mongo_crypt.get());
 
@@ -596,10 +594,10 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) {
             throw TypeError::New(Env(), errorStringFromStatus(context.get()));
         }
 
-        if (strcasecmp(algorithm.c_str(), "rangepreview") == 0) {
+        if (strcasecmp(algorithm.c_str(), "range") == 0) {
             if (!options.Has("rangeOptions")) {
                 throw TypeError::New(
-                    Env(), "`rangeOptions` must be provided if `algorithm` is set to RangePreview");
+                    Env(), "`rangeOptions` must be provided if `algorithm` is set to Range");
             }
 
             Uint8Array rangeOptions = Uint8ArrayFromValue(options["rangeOptions"], "rangeOptions");

diff --git a/src/index.ts b/src/index.ts
@@ -40,8 +40,6 @@ export interface MongoCryptConstructor {
     cryptSharedLibSearchPaths?: string[];
     cryptSharedLibPath?: string;
     bypassQueryAnalysis?: boolean;
-    /** @experimental */
-    rangeV2?: boolean;
   }): MongoCrypt;
   libmongocryptVersion: string;
 }

diff --git a/test/bindings.test.ts b/test/bindings.test.ts
@@ -341,17 +341,17 @@ describe('MongoCryptConstructor', () => {
       });
     });
 
-    context('when algorithm is `rangePreview', () => {
+    context('when algorithm is `Range', () => {
       it('throws a TypeError if rangeOptions is not provided', () => {
         expect(() =>
           mc.makeExplicitEncryptionContext(value, {
             // minimum required arguments from libmongocrypt
             keyId: keyId.buffer,
             expressionMode: false,
-            algorithm: 'rangePreview'
+            algorithm: 'Range'
           })
         )
-          .to.throw(/`rangeOptions` must be provided if `algorithm` is set to RangePreview/)
+          .to.throw(/`rangeOptions` must be provided if `algorithm` is set to Range/)
           .to.be.instanceOf(TypeError);
       });
 
@@ -361,26 +361,26 @@ describe('MongoCryptConstructor', () => {
             // minimum required arguments from libmongocrypt
             keyId: keyId.buffer,
             expressionMode: false,
-            algorithm: 'rangePreview',
+            algorithm: 'Range',
             rangeOptions: 'non-buffer'
           })
         )
           .to.throw(/Parameter `rangeOptions` must be a Uint8Array./)
           .to.be.instanceOf(TypeError);
       });
 
-      it('checks if `rangePreview` is set case-insensitive', () => {
+      it('checks if `Range` is set case-insensitive', () => {
         expect(
           mc.makeExplicitEncryptionContext(value, {
             // minimum required arguments from libmongocrypt
             keyId: keyId.buffer,
             expressionMode: false,
-            algorithm: 'RANGEPREVIEW',
+            algorithm: 'RANGE',
             rangeOptions: serialize({
               sparsity: new Long(42)
             }),
 
-            // contention factor is required for `rangePreview` but
+            // contention factor is required for `Range` but
             // is enforced in libmongocrypt, not our bindings
             contentionFactor: 2
           })