nongo-driver 3.3.17 → 3.3.18

package/dist/atlas-api.d.ts

@@ -2,8 +2,11 @@ import { Analyzer, AtlasParams, AtlasSearchIndex, CreateSearchIndex } from './in
 export default class AtlasApi {
     private params;
     private readonly ftsUrl;
-    private readonly defaultOptions;
+    private nonceCountByNonce;
+    private lastChallenge;
     constructor(params: AtlasParams);
+    private digestJsonRequest;
+    private handleResponse;
     putCustomAnalyzers(analyzers: Analyzer[]): Promise<Analyzer[]>;
     getSearchIndexes(db: string, collection: string): Promise<AtlasSearchIndex[]>;
     createSearchIndex(db: string, collection: string, index: CreateSearchIndex): Promise<any>;

package/dist/atlas-api.js

@@ -4,45 +4,213 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const deep_equal_1 = __importDefault(require("deep-equal"));
-const request_promise_1 = __importDefault(require("request-promise"));
+const undici_1 = require("undici");
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const wbb_logger_1 = __importDefault(require("wbb-logger"));
 const logger = new wbb_logger_1.default('atlas-api.ts');
+function md5(input) {
+    return node_crypto_1.default.createHash('md5').update(input).digest('hex');
+}
+function randomHex(bytes = 16) {
+    return node_crypto_1.default.randomBytes(bytes).toString('hex');
+}
+function parseWwwAuthenticate(header) {
+    var _a;
+    // Expects something like: Digest realm="...", nonce="...", qop="auth", opaque="...", algorithm=MD5
+    // We’ll parse key="value" pairs.
+    const schemeMatch = header.match(/^\s*Digest\s+/i);
+    if (!schemeMatch)
+        return null;
+    const params = {};
+    const rest = header.replace(/^\s*Digest\s+/i, '');
+    // Split by commas not inside quotes
+    const parts = (_a = rest.match(/([a-z0-9_-]+)=(?:"[^"]*"|[^,]*)/gi)) !== null && _a !== void 0 ? _a : [];
+    for (const part of parts) {
+        const idx = part.indexOf('=');
+        const k = part.slice(0, idx).trim();
+        let v = part.slice(idx + 1).trim();
+        if (v.startsWith('"') && v.endsWith('"'))
+            v = v.slice(1, -1);
+        params[k] = v;
+    }
+    return params;
+}
+function buildDigestAuthHeader(opts) {
+    var _a, _b, _c, _d, _e;
+    const { username, password, method, uri, challenge, nc, cnonce } = opts;
+    const realm = (_a = challenge.realm) !== null && _a !== void 0 ? _a : '';
+    const nonce = (_b = challenge.nonce) !== null && _b !== void 0 ? _b : '';
+    const qopRaw = (_c = challenge.qop) !== null && _c !== void 0 ? _c : '';
+    const opaque = challenge.opaque;
+    const algorithm = ((_d = challenge.algorithm) !== null && _d !== void 0 ? _d : 'MD5').toUpperCase();
+    // We implement the common case Atlas uses: MD5 + qop=auth
+    // If qop has multiple values, pick auth if present.
+    const qop = (_e = qopRaw
+        .split(',')
+        .map((s) => s.trim())
+        .find((v) => v === 'auth')) !== null && _e !== void 0 ? _e : (qopRaw ? qopRaw.split(',')[0].trim() : undefined);
+    if (algorithm !== 'MD5') {
+        // Atlas is typically MD5; if it ever changes, you’ll want to extend this.
+        throw new Error(`Unsupported digest algorithm: ${algorithm}`);
+    }
+    const ha1 = md5(`${username}:${realm}:${password}`);
+    const ha2 = md5(`${method}:${uri}`);
+    const ncHex = nc.toString(16).padStart(8, '0');
+    let response;
+    if (qop) {
+        response = md5(`${ha1}:${nonce}:${ncHex}:${cnonce}:${qop}:${ha2}`);
+    }
+    else {
+        // RFC legacy
+        response = md5(`${ha1}:${nonce}:${ha2}`);
+    }
+    const pieces = [];
+    pieces.push(`username="${username}"`);
+    pieces.push(`realm="${realm}"`);
+    pieces.push(`nonce="${nonce}"`);
+    pieces.push(`uri="${uri}"`);
+    pieces.push(`response="${response}"`);
+    if (opaque)
+        pieces.push(`opaque="${opaque}"`);
+    if (algorithm)
+        pieces.push(`algorithm=${algorithm}`);
+    if (qop) {
+        pieces.push(`qop=${qop}`);
+        pieces.push(`nc=${ncHex}`);
+        pieces.push(`cnonce="${cnonce}"`);
+    }
+    return `Digest ${pieces.join(', ')}`;
+}
 class AtlasApi {
     constructor(params) {
         this.params = params;
-        const { baseUrl, groupId, clusterName, publicKey, privateKey } = params;
-        this.defaultOptions = {
-            auth: {
-                user: publicKey,
-                pass: privateKey,
-                sendImmediately: false,
-            },
-            json: true,
-        };
+        // digest state
+        this.nonceCountByNonce = new Map();
+        this.lastChallenge = null;
+        const { baseUrl, groupId, clusterName } = params;
         this.ftsUrl = `${baseUrl}/groups/${groupId}/clusters/${clusterName}/fts`;
     }
+    async digestJsonRequest(method, url, body) {
+        var _a, _b, _c;
+        const { publicKey, privateKey } = this.params;
+        const headers = {
+            accept: 'application/json',
+        };
+        let requestBody;
+        if (body !== undefined) {
+            headers['content-type'] = 'application/json';
+            requestBody = JSON.stringify(body);
+        }
+        // 1) Try with cached digest challenge if we have one (avoids an extra 401 round-trip)
+        const tryOnce = async (authHeader) => {
+            var _a;
+            const h = authHeader ? Object.assign(Object.assign({}, headers), { authorization: authHeader }) : headers;
+            const res = await (0, undici_1.request)(url, { method, headers: h, body: requestBody });
+            const contentType = ((_a = res.headers['content-type']) !== null && _a !== void 0 ? _a : '').toString();
+            const raw = await res.body.text();
+            return { res, contentType, raw };
+        };
+        // If we already have a challenge cached, attempt auth immediately
+        if ((_a = this.lastChallenge) === null || _a === void 0 ? void 0 : _a.nonce) {
+            const challenge = this.lastChallenge;
+            const nonce = challenge.nonce;
+            const nc = ((_b = this.nonceCountByNonce.get(nonce)) !== null && _b !== void 0 ? _b : 0) + 1;
+            this.nonceCountByNonce.set(nonce, nc);
+            const u = new URL(url);
+            const uri = `${u.pathname}${u.search}`; // must be path+query for digest
+            const auth = buildDigestAuthHeader({
+                username: publicKey,
+                password: privateKey,
+                method,
+                uri,
+                challenge,
+                nc,
+                cnonce: randomHex(8),
+            });
+            const attempt = await tryOnce(auth);
+            if (attempt.res.statusCode !== 401) {
+                return this.handleResponse(method, url, attempt.res.statusCode, attempt.contentType, attempt.raw);
+            }
+            // fall through and re-challenge below
+        }
+        // 2) No cached challenge (or cached failed). Make an unauthenticated request to get WWW-Authenticate
+        const first = await tryOnce(undefined);
+        if (first.res.statusCode !== 401) {
+            return this.handleResponse(method, url, first.res.statusCode, first.contentType, first.raw);
+        }
+        const wwwAuth = first.res.headers['www-authenticate'];
+        const wwwAuthStr = Array.isArray(wwwAuth) ? wwwAuth.join(', ') : (wwwAuth !== null && wwwAuth !== void 0 ? wwwAuth : '').toString();
+        const challenge = parseWwwAuthenticate(wwwAuthStr);
+        if (!(challenge === null || challenge === void 0 ? void 0 : challenge.nonce)) {
+            const err = new Error(`401 from Atlas but no Digest challenge found in WWW-Authenticate header`);
+            err.statusCode = 401;
+            err.wwwAuthenticate = wwwAuthStr;
+            throw err;
+        }
+        // cache challenge for next requests
+        this.lastChallenge = challenge;
+        const nonce = challenge.nonce;
+        const nc = ((_c = this.nonceCountByNonce.get(nonce)) !== null && _c !== void 0 ? _c : 0) + 1;
+        this.nonceCountByNonce.set(nonce, nc);
+        const u = new URL(url);
+        const uri = `${u.pathname}${u.search}`;
+        const auth = buildDigestAuthHeader({
+            username: publicKey,
+            password: privateKey,
+            method,
+            uri,
+            challenge,
+            nc,
+            cnonce: randomHex(8),
+        });
+        // 3) Retry with Digest Authorization
+        const second = await tryOnce(auth);
+        return this.handleResponse(method, url, second.res.statusCode, second.contentType, second.raw);
+    }
+    handleResponse(method, url, statusCode, contentType, raw) {
+        if (statusCode < 200 || statusCode >= 300) {
+            let parsed = raw;
+            if (contentType.includes('application/json')) {
+                try {
+                    parsed = raw ? JSON.parse(raw) : null;
+                }
+                catch (_a) {
+                    // keep raw
+                }
+            }
+            const err = new Error(`Atlas API request failed: ${method} ${url} -> ${statusCode}`);
+            err.statusCode = statusCode;
+            err.body = parsed;
+            throw err;
+        }
+        if (!raw)
+            return undefined;
+        if (contentType.includes('application/json'))
+            return JSON.parse(raw);
+        return raw;
+    }
     async putCustomAnalyzers(analyzers) {
         const url = `${this.ftsUrl}/analyzers`;
-        return (0, request_promise_1.default)(Object.assign(Object.assign({}, this.defaultOptions), { url, body: analyzers }));
+        // Keep whatever your API expects. Many Atlas endpoints use PUT for replacement semantics.
+        return this.digestJsonRequest('PUT', url, analyzers);
     }
     async getSearchIndexes(db, collection) {
         const url = `${this.ftsUrl}/indexes/${db}/${collection}`;
-        return (0, request_promise_1.default)(Object.assign(Object.assign({}, this.defaultOptions), { url }));
+        return this.digestJsonRequest('GET', url);
     }
     async createSearchIndex(db, collection, index) {
         this.logIndexChange(db, collection, 'Creating', index.name);
         const url = `${this.ftsUrl}/indexes`;
-        return (0, request_promise_1.default)(Object.assign(Object.assign({}, this.defaultOptions), { method: 'POST', url, body: Object.assign({ collectionName: collection, database: db }, index) }));
+        return this.digestJsonRequest('POST', url, Object.assign({ collectionName: collection, database: db }, index));
     }
     async ensureSearchIndexes(db, collection, createParams) {
         const existingIndexes = await this.getSearchIndexes(db, collection);
         const toRemove = new Map();
         existingIndexes.forEach((e) => toRemove.set(e.name, e));
         for (const cParams of createParams) {
-            const { name } = cParams;
-            const existing = toRemove.get(name);
+            const existing = toRemove.get(cParams.name);
             if (existing) {
-                toRemove.delete(name);
+                toRemove.delete(cParams.name);
                 await this.updateSearchIndex(db, collection, existing, cParams);
             }
             else {
@@ -52,20 +220,19 @@ class AtlasApi {
         for (const index of toRemove.values()) {
             await this.deleteSearchIndex(db, collection, index);
         }
-        return await this.getSearchIndexes(db, collection);
+        return this.getSearchIndexes(db, collection);
     }
     async updateSearchIndex(db, collection, existingIndex, createParams) {
-        if ((0, deep_equal_1.default)(existingIndex.mappings, createParams.mappings)) {
+        if ((0, deep_equal_1.default)(existingIndex.mappings, createParams.mappings))
             return;
-        }
         this.logIndexChange(db, collection, 'Updating', createParams.name);
         const url = `${this.ftsUrl}/indexes/${existingIndex.indexID}`;
-        return (0, request_promise_1.default)(Object.assign(Object.assign({}, this.defaultOptions), { method: 'PATCH', url, body: Object.assign({ collectionName: collection, database: db }, createParams) }));
+        return this.digestJsonRequest('PATCH', url, Object.assign({ collectionName: collection, database: db }, createParams));
     }
     async deleteSearchIndex(db, collection, existingIndex) {
         this.logIndexChange(db, collection, 'Deleting', existingIndex.name);
         const url = `${this.ftsUrl}/indexes/${existingIndex.indexID}`;
-        return (0, request_promise_1.default)(Object.assign(Object.assign({}, this.defaultOptions), { method: 'DELETE', url }));
+        return this.digestJsonRequest('DELETE', url);
     }
     logIndexChange(db, collection, action, indexName) {
         logger.info(`${action} search index "${indexName}" for collection ${db}.${collection}`);

package/dist/atlas-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"atlas-api.js","sourceRoot":"","sources":["../src/atlas-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atlas-api.js","sourceRoot":"","sources":["../src/atlas-api.ts"],"names":[],"mappings":"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"}

package/dist/interface/atlas/index.d.ts

@@ -11,6 +11,7 @@ export interface AtlasSearchIndex {
     mappings: Mappings;
     name: string;
     status: string;
+    synonyms: string[];
 }
 export interface Analyzer {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nongo-driver",
-  "version": "3.3.17",
+  "version": "3.3.18",
   "description": "A promise driven, schema lead, mongo driver.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,9 +28,9 @@
     "just-diff": "^6.0.2",
     "minimist": "^1.2.8",
     "mongodb": "^5.7.0",
-    "request-promise": "^4.2.6",
     "semver": "^7.5.4",
     "tslint": "^5.8.0",
+    "undici": "^7.18.2",
     "wbb-logger": "^1.0.0"
   },
   "devDependencies": {

package/src/atlas-api.ts

@@ -1,120 +1,305 @@
 import deepEqual from 'deep-equal';
-import rp from 'request-promise';
+import { request } from 'undici';
+import crypto from 'node:crypto';
 import Logger from 'wbb-logger';
-import {Analyzer, AtlasParams, AtlasSearchIndex, CreateSearchIndex} from './interface/atlas';
+import { Analyzer, AtlasParams, AtlasSearchIndex, CreateSearchIndex } from './interface/atlas';
 
 const logger = new Logger('atlas-api.ts');
 
-export default class AtlasApi {
+type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
+
+function md5(input: string) {
+  return crypto.createHash('md5').update(input).digest('hex');
+}
+
+function randomHex(bytes = 16) {
+  return crypto.randomBytes(bytes).toString('hex');
+}
+
+function parseWwwAuthenticate(header: string) {
+  // Expects something like: Digest realm="...", nonce="...", qop="auth", opaque="...", algorithm=MD5
+  // We’ll parse key="value" pairs.
+  const schemeMatch = header.match(/^\s*Digest\s+/i);
+  if (!schemeMatch) return null;
+
+  const params: Record<string, string> = {};
+  const rest = header.replace(/^\s*Digest\s+/i, '');
+
+  // Split by commas not inside quotes
+  const parts = rest.match(/([a-z0-9_-]+)=(?:"[^"]*"|[^,]*)/gi) ?? [];
+  for (const part of parts) {
+    const idx = part.indexOf('=');
+    const k = part.slice(0, idx).trim();
+    let v = part.slice(idx + 1).trim();
+    if (v.startsWith('"') && v.endsWith('"')) v = v.slice(1, -1);
+    params[k] = v;
+  }
+  return params;
+}
+
+function buildDigestAuthHeader(opts: {
+  username: string;
+  password: string;
+  method: string;
+  uri: string; // path + query, not full URL
+  challenge: Record<string, string>;
+  nc: number;
+  cnonce: string;
+}) {
+  const { username, password, method, uri, challenge, nc, cnonce } = opts;
+
+  const realm = challenge.realm ?? '';
+  const nonce = challenge.nonce ?? '';
+  const qopRaw = challenge.qop ?? '';
+  const opaque = challenge.opaque;
+  const algorithm = (challenge.algorithm ?? 'MD5').toUpperCase();
 
+  // We implement the common case Atlas uses: MD5 + qop=auth
+  // If qop has multiple values, pick auth if present.
+  const qop = qopRaw
+    .split(',')
+    .map((s) => s.trim())
+    .find((v) => v === 'auth') ?? (qopRaw ? qopRaw.split(',')[0].trim() : undefined);
+
+  if (algorithm !== 'MD5') {
+    // Atlas is typically MD5; if it ever changes, you’ll want to extend this.
+    throw new Error(`Unsupported digest algorithm: ${algorithm}`);
+  }
+
+  const ha1 = md5(`${username}:${realm}:${password}`);
+  const ha2 = md5(`${method}:${uri}`);
+
+  const ncHex = nc.toString(16).padStart(8, '0');
+
+  let response: string;
+  if (qop) {
+    response = md5(`${ha1}:${nonce}:${ncHex}:${cnonce}:${qop}:${ha2}`);
+  } else {
+    // RFC legacy
+    response = md5(`${ha1}:${nonce}:${ha2}`);
+  }
+
+  const pieces: string[] = [];
+  pieces.push(`username="${username}"`);
+  pieces.push(`realm="${realm}"`);
+  pieces.push(`nonce="${nonce}"`);
+  pieces.push(`uri="${uri}"`);
+  pieces.push(`response="${response}"`);
+
+  if (opaque) pieces.push(`opaque="${opaque}"`);
+  if (algorithm) pieces.push(`algorithm=${algorithm}`);
+
+  if (qop) {
+    pieces.push(`qop=${qop}`);
+    pieces.push(`nc=${ncHex}`);
+    pieces.push(`cnonce="${cnonce}"`);
+  }
+
+  return `Digest ${pieces.join(', ')}`;
+}
+
+export default class AtlasApi {
   private readonly ftsUrl: string;
-  private readonly defaultOptions;
+
+  // digest state
+  private nonceCountByNonce = new Map<string, number>();
+  private lastChallenge: Record<string, string> | null = null;
 
   constructor(private params: AtlasParams) {
-    const {baseUrl, groupId, clusterName, publicKey, privateKey} = params;
-
-    this.defaultOptions = {
-      auth: {
-        user: publicKey,
-        pass: privateKey,
-        sendImmediately: false,
-      },
-      json: true,
+    const { baseUrl, groupId, clusterName } = params;
+    this.ftsUrl = `${baseUrl}/groups/${groupId}/clusters/${clusterName}/fts`;
+  }
+
+  private async digestJsonRequest<T>(method: HttpMethod, url: string, body?: unknown): Promise<T> {
+    const { publicKey, privateKey } = this.params;
+
+    const headers: Record<string, string> = {
+      accept: 'application/json',
     };
 
-    this.ftsUrl = `${baseUrl}/groups/${groupId}/clusters/${clusterName}/fts`;
+    let requestBody: string | undefined;
+    if (body !== undefined) {
+      headers['content-type'] = 'application/json';
+      requestBody = JSON.stringify(body);
+    }
+
+    // 1) Try with cached digest challenge if we have one (avoids an extra 401 round-trip)
+    const tryOnce = async (authHeader?: string) => {
+      const h = authHeader ? { ...headers, authorization: authHeader } : headers;
+
+      const res = await request(url, { method, headers: h, body: requestBody });
+      const contentType = (res.headers['content-type'] ?? '').toString();
+      const raw = await res.body.text();
+
+      return { res, contentType, raw };
+    };
+
+    // If we already have a challenge cached, attempt auth immediately
+    if (this.lastChallenge?.nonce) {
+      const challenge = this.lastChallenge;
+      const nonce = challenge.nonce;
+      const nc = (this.nonceCountByNonce.get(nonce) ?? 0) + 1;
+      this.nonceCountByNonce.set(nonce, nc);
+
+      const u = new URL(url);
+      const uri = `${u.pathname}${u.search}`; // must be path+query for digest
+
+      const auth = buildDigestAuthHeader({
+        username: publicKey,
+        password: privateKey,
+        method,
+        uri,
+        challenge,
+        nc,
+        cnonce: randomHex(8),
+      });
+
+      const attempt = await tryOnce(auth);
+      if (attempt.res.statusCode !== 401) {
+        return this.handleResponse<T>(method, url, attempt.res.statusCode, attempt.contentType, attempt.raw);
+      }
+      // fall through and re-challenge below
+    }
+
+    // 2) No cached challenge (or cached failed). Make an unauthenticated request to get WWW-Authenticate
+    const first = await tryOnce(undefined);
+
+    if (first.res.statusCode !== 401) {
+      return this.handleResponse<T>(method, url, first.res.statusCode, first.contentType, first.raw);
+    }
+
+    const wwwAuth = first.res.headers['www-authenticate'];
+    const wwwAuthStr = Array.isArray(wwwAuth) ? wwwAuth.join(', ') : (wwwAuth ?? '').toString();
+
+    const challenge = parseWwwAuthenticate(wwwAuthStr);
+    if (!challenge?.nonce) {
+      const err = new Error(`401 from Atlas but no Digest challenge found in WWW-Authenticate header`);
+      (err as any).statusCode = 401;
+      (err as any).wwwAuthenticate = wwwAuthStr;
+      throw err;
+    }
+
+    // cache challenge for next requests
+    this.lastChallenge = challenge;
+
+    const nonce = challenge.nonce;
+    const nc = (this.nonceCountByNonce.get(nonce) ?? 0) + 1;
+    this.nonceCountByNonce.set(nonce, nc);
+
+    const u = new URL(url);
+    const uri = `${u.pathname}${u.search}`;
+
+    const auth = buildDigestAuthHeader({
+      username: publicKey,
+      password: privateKey,
+      method,
+      uri,
+      challenge,
+      nc,
+      cnonce: randomHex(8),
+    });
+
+    // 3) Retry with Digest Authorization
+    const second = await tryOnce(auth);
+    return this.handleResponse<T>(method, url, second.res.statusCode, second.contentType, second.raw);
+  }
+
+  private handleResponse<T>(
+    method: string,
+    url: string,
+    statusCode: number,
+    contentType: string,
+    raw: string,
+  ): T {
+    if (statusCode < 200 || statusCode >= 300) {
+      let parsed: any = raw;
+      if (contentType.includes('application/json')) {
+        try {
+          parsed = raw ? JSON.parse(raw) : null;
+        } catch {
+          // keep raw
+        }
+      }
+
+      const err = new Error(`Atlas API request failed: ${method} ${url} -> ${statusCode}`) as any;
+      err.statusCode = statusCode;
+      err.body = parsed;
+      throw err;
+    }
+
+    if (!raw) return undefined as unknown as T;
+    if (contentType.includes('application/json')) return JSON.parse(raw) as T;
+    return raw as unknown as T;
   }
 
   public async putCustomAnalyzers(analyzers: Analyzer[]): Promise<Analyzer[]> {
     const url = `${this.ftsUrl}/analyzers`;
-    return rp({
-      ...this.defaultOptions,
-      url,
-      body: analyzers,
-    });
+    // Keep whatever your API expects. Many Atlas endpoints use PUT for replacement semantics.
+    return this.digestJsonRequest<Analyzer[]>('PUT', url, analyzers);
   }
 
   public async getSearchIndexes(db: string, collection: string): Promise<AtlasSearchIndex[]> {
     const url = `${this.ftsUrl}/indexes/${db}/${collection}`;
-    return rp({
-      ...this.defaultOptions,
-      url,
-    });
+    return this.digestJsonRequest<AtlasSearchIndex[]>('GET', url);
   }
 
   public async createSearchIndex(db: string, collection: string, index: CreateSearchIndex): Promise<any> {
     this.logIndexChange(db, collection, 'Creating', index.name);
     const url = `${this.ftsUrl}/indexes`;
-    return rp({
-      ...this.defaultOptions,
-      method: 'POST',
-      url,
-      body: {
-        collectionName: collection,
-        database: db,
-        ...index,
-      },
+    return this.digestJsonRequest<any>('POST', url, {
+      collectionName: collection,
+      database: db,
+      ...index,
     });
   }
 
-  public async ensureSearchIndexes(db: string, collection: string, createParams: CreateSearchIndex[]): Promise<AtlasSearchIndex[]> {
+  public async ensureSearchIndexes(db: string, collection: string, createParams: CreateSearchIndex[]) {
     const existingIndexes = await this.getSearchIndexes(db, collection);
     const toRemove = new Map<string, AtlasSearchIndex>();
     existingIndexes.forEach((e) => toRemove.set(e.name, e));
 
     for (const cParams of createParams) {
-      const {name} = cParams;
-      const existing = toRemove.get(name);
-
+      const existing = toRemove.get(cParams.name);
       if (existing) {
-        toRemove.delete(name);
+        toRemove.delete(cParams.name);
         await this.updateSearchIndex(db, collection, existing, cParams);
       } else {
         await this.createSearchIndex(db, collection, cParams);
       }
-
     }
 
     for (const index of toRemove.values()) {
       await this.deleteSearchIndex(db, collection, index);
     }
 
-    return await this.getSearchIndexes(db, collection);
+    return this.getSearchIndexes(db, collection);
   }
 
-  public async updateSearchIndex(db: string, collection: string, existingIndex: AtlasSearchIndex, createParams: CreateSearchIndex): Promise<any> {
-    if (deepEqual(existingIndex.mappings, createParams.mappings)) {
-      return;
-    }
+  public async updateSearchIndex(
+    db: string,
+    collection: string,
+    existingIndex: AtlasSearchIndex,
+    createParams: CreateSearchIndex,
+  ): Promise<any> {
+    if (deepEqual(existingIndex.mappings, createParams.mappings)) return;
 
     this.logIndexChange(db, collection, 'Updating', createParams.name);
-
     const url = `${this.ftsUrl}/indexes/${existingIndex.indexID}`;
 
-    return rp({
-      ...this.defaultOptions,
-      method: 'PATCH',
-      url,
-      body: {
-        collectionName: collection,
-        database: db,
-        ...createParams,
-      },
+    return this.digestJsonRequest<any>('PATCH', url, {
+      collectionName: collection,
+      database: db,
+      ...createParams,
     });
   }
 
   public async deleteSearchIndex(db: string, collection: string, existingIndex: AtlasSearchIndex): Promise<any> {
     this.logIndexChange(db, collection, 'Deleting', existingIndex.name);
     const url = `${this.ftsUrl}/indexes/${existingIndex.indexID}`;
-    return rp({
-      ...this.defaultOptions,
-      method: 'DELETE',
-      url,
-    });
+    return this.digestJsonRequest<any>('DELETE', url);
   }
 
   private logIndexChange(db: string, collection: string, action: string, indexName: string) {
     logger.info(`${action} search index "${indexName}" for collection ${db}.${collection}`);
   }
-
 }

package/src/interface/atlas/index.ts

@@ -14,6 +14,7 @@ export interface AtlasSearchIndex {
   mappings: Mappings;
   name: string;
   status: string;
+  synonyms: string[];
 }
 
 export interface Analyzer {

package/test/atlas-api.test.ts

@@ -4,21 +4,21 @@ import {AtlasParams, AtlasSearchIndex, CreateSearchIndex} from '../src/interface
 import {setUpInterceptors} from './atlas-api-nock';
 
 const groupId = '5b06b6b34e658110696b1da3';
-const clusterName = 'wbb-stage';
+const clusterName = 'wbb-staging';
 const collectionName = 'Entity';
-const database = 'monmouth-county-council';
+const database = 'afeltham';
 
 const params: AtlasParams = {
   groupId,
   baseUrl: 'https://cloud.mongodb.com/api/atlas/v1.0',
-  publicKey: 'aPublicKey',
-  privateKey: 'aPrivateKey',
+  publicKey: 'pfkjhdxk',
+  privateKey: '37bed739-c794-4dec-bd52-90fb4f1bd1cd',
   clusterName,
 };
 
 it('Search index management', async () => {
 
-  setUpInterceptors();
+  // setUpInterceptors();
 
   const createIndex = (name: string): CreateSearchIndex => ({
     mappings: {dynamic: true},
@@ -35,18 +35,20 @@ it('Search index management', async () => {
     {
       collectionName,
       database,
-      indexID: '606c53edf81dfe4a33b5caeb',
+      indexID: '6961209db2890435699787f5',
       mappings: {dynamic: true},
       name: 'index1',
-      status: 'IN_PROGRESS',
+      status: 'STEADY',
+      "synonyms": [],
     },
     {
       collectionName,
       database,
-      indexID: '606c53ed4012d1669a8bbeed',
+      indexID: '696120a1b289043569978f80',
       mappings: {dynamic: true},
       name: 'index2',
-      status: 'IN_PROGRESS',
+      status: 'STEADY',
+      "synonyms": [],
     },
   ];
   expect(firstEnsure).toStrictEqual(firstExpected);
@@ -59,4 +61,4 @@ it('Search index management', async () => {
   // Instead just make sure all the interceptors were used
   expect(nock.isDone());
 
-});
+}, 10000);

package/test/database-helper.ts

@@ -11,7 +11,9 @@ let mongoMemoryServer: MongoMemoryServer;
 const getInMemoryServer = async () => {
   if (!mongoMemoryServer) {
     logger.info("Using in memory server.");
-    mongoMemoryServer = await MongoMemoryServer.create();
+    mongoMemoryServer = await MongoMemoryServer.create({
+      binary: {version: "6.0.6"},
+    });
   }
   return mongoMemoryServer;
 };

package/test/models/dummy-model-changed-obj.ts

@@ -0,0 +1,12 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface DummyModelChangedObj {
+  'name': string;
+  'pets': Array<{
+    'species'?: string;
+    'likes'?: {
+      'food'?: string[];
+      'drink'?: string[];
+    };
+  }>;
+  '_id'?: any;
+}

package/test/models/dummy-model-obj.ts

@@ -0,0 +1,40 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface DummyModelObj {
+  'dontStripChildren'?: any;
+  'dontStripChildren2'?: any;
+  'exampleMap'?: {[key: string]: {
+    'mapValueField': string;
+  }};
+  'created'?: Date;
+  'arrayOfObject'?: object[];
+  'name': string;
+  'age': number;
+  'pets': Array<{
+    'species'?: string;
+    'likes'?: {
+      'food'?: string[];
+      'drink'?: string[];
+    };
+  }>;
+  'job': {
+    'role': string;
+    'at'?: string;
+  };
+  'location'?: {
+    'address1'?: string;
+  };
+  'autoInit': {
+    'initArray': Array<{
+      'nestedObj': any;
+    }>;
+    'initNestedObj'?: {
+      'hello'?: string;
+    };
+    'initNestedNative'?: any;
+  };
+  'notEmptyFields'?: {
+    'aString': string;
+    'anArray': string[];
+  };
+  '_id'?: any;
+}

package/test/models/dummy-model-with-max-index-obj.ts

@@ -0,0 +1,195 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface DummyModelWithMaxIndexObj {
+  'clients'?: {
+    'client1'?: {
+      'favouritePet'?: string;
+    };
+    'client2'?: {
+      'favouritePet'?: string;
+    };
+    'client3'?: {
+      'favouritePet'?: string;
+    };
+    'client4'?: {
+      'favouritePet'?: string;
+    };
+    'client5'?: {
+      'favouritePet'?: string;
+    };
+    'client6'?: {
+      'favouritePet'?: string;
+    };
+    'client7'?: {
+      'favouritePet'?: string;
+    };
+    'client8'?: {
+      'favouritePet'?: string;
+    };
+    'client9'?: {
+      'favouritePet'?: string;
+    };
+    'client10'?: {
+      'favouritePet'?: string;
+    };
+    'client11'?: {
+      'favouritePet'?: string;
+    };
+    'client12'?: {
+      'favouritePet'?: string;
+    };
+    'client13'?: {
+      'favouritePet'?: string;
+    };
+    'client14'?: {
+      'favouritePet'?: string;
+    };
+    'client15'?: {
+      'favouritePet'?: string;
+    };
+    'client16'?: {
+      'favouritePet'?: string;
+    };
+    'client17'?: {
+      'favouritePet'?: string;
+    };
+    'client18'?: {
+      'favouritePet'?: string;
+    };
+    'client19'?: {
+      'favouritePet'?: string;
+    };
+    'client20'?: {
+      'favouritePet'?: string;
+    };
+    'client21'?: {
+      'favouritePet'?: string;
+    };
+    'client22'?: {
+      'favouritePet'?: string;
+    };
+    'client23'?: {
+      'favouritePet'?: string;
+    };
+    'client24'?: {
+      'favouritePet'?: string;
+    };
+    'client25'?: {
+      'favouritePet'?: string;
+    };
+    'client26'?: {
+      'favouritePet'?: string;
+    };
+    'client27'?: {
+      'favouritePet'?: string;
+    };
+    'client28'?: {
+      'favouritePet'?: string;
+    };
+    'client29'?: {
+      'favouritePet'?: string;
+    };
+    'client30'?: {
+      'favouritePet'?: string;
+    };
+    'client31'?: {
+      'favouritePet'?: string;
+    };
+    'client32'?: {
+      'favouritePet'?: string;
+    };
+    'client33'?: {
+      'favouritePet'?: string;
+    };
+    'client34'?: {
+      'favouritePet'?: string;
+    };
+    'client35'?: {
+      'favouritePet'?: string;
+    };
+    'client36'?: {
+      'favouritePet'?: string;
+    };
+    'client37'?: {
+      'favouritePet'?: string;
+    };
+    'client38'?: {
+      'favouritePet'?: string;
+    };
+    'client39'?: {
+      'favouritePet'?: string;
+    };
+    'client40'?: {
+      'favouritePet'?: string;
+    };
+    'client41'?: {
+      'favouritePet'?: string;
+    };
+    'client42'?: {
+      'favouritePet'?: string;
+    };
+    'client43'?: {
+      'favouritePet'?: string;
+    };
+    'client44'?: {
+      'favouritePet'?: string;
+    };
+    'client45'?: {
+      'favouritePet'?: string;
+    };
+    'client46'?: {
+      'favouritePet'?: string;
+    };
+    'client47'?: {
+      'favouritePet'?: string;
+    };
+    'client48'?: {
+      'favouritePet'?: string;
+    };
+    'client49'?: {
+      'favouritePet'?: string;
+    };
+    'client50'?: {
+      'favouritePet'?: string;
+    };
+    'client51'?: {
+      'favouritePet'?: string;
+    };
+    'client52'?: {
+      'favouritePet'?: string;
+    };
+    'client53'?: {
+      'favouritePet'?: string;
+    };
+    'client54'?: {
+      'favouritePet'?: string;
+    };
+    'client55'?: {
+      'favouritePet'?: string;
+    };
+    'client56'?: {
+      'favouritePet'?: string;
+    };
+    'client57'?: {
+      'favouritePet'?: string;
+    };
+    'client58'?: {
+      'favouritePet'?: string;
+    };
+    'client59'?: {
+      'favouritePet'?: string;
+    };
+    'client60'?: {
+      'favouritePet'?: string;
+    };
+    'client61'?: {
+      'favouritePet'?: string;
+    };
+    'client62'?: {
+      'favouritePet'?: string;
+    };
+    'client63'?: {
+      'favouritePet'?: string;
+    };
+  };
+  '_id'?: any;
+}

package/test/models/dummy-model-with-revision-obj.ts

@@ -0,0 +1,13 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface DummyModelWithRevisionObj {
+  'revision'?: string;
+  'history'?: Array<{
+    'id'?: string;
+    'revision'?: string;
+    'created'?: Date;
+  }>;
+  'created': Date;
+  'name': string;
+  'age'?: number;
+  '_id'?: any;
+}

package/test/models/text-index-model-modified-obj.ts

@@ -0,0 +1,12 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface TextIndexModelModifiedObj {
+  'name'?: string;
+  'module'?: string;
+  'description'?: {
+    'en'?: string;
+    'cy'?: string;
+    'es'?: string;
+  };
+  'summary'?: string;
+  '_id'?: any;
+}

package/test/models/text-index-model-obj.ts

@@ -0,0 +1,11 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface TextIndexModelObj {
+  'name'?: string;
+  'module'?: string;
+  'description'?: {
+    'en'?: string;
+    'cy'?: string;
+  };
+  'summary'?: string;
+  '_id'?: any;
+}

package/test/models/text-index-model-too-long-obj.ts

@@ -0,0 +1,11 @@
+// This file was generated using nongo-driver's TsInterfaceGenerator.
+export default interface TextIndexModelTooLongObj {
+  'name'?: string;
+  'module'?: string;
+  'description'?: {
+    'en'?: string;
+    'cy'?: string;
+  };
+  'summary'?: string;
+  '_id'?: any;
+}