@pi-r/atlas 0.11.3 → 0.12.0

package/client/index.js

@@ -1,14 +1,10 @@
 "use strict";
-exports.validateDatabase = validateDatabase;
-exports.createDatabaseClient = createDatabaseClient;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-exports.getObjectId = getObjectId;
-const mongodb = require("mongodb");
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const mongodb_1 = require("@pi-r/mongodb");
+
+const mongodb = require('mongodb');
+const Cloud = require('@e-mc/cloud');
+const { coerceObject, hashKey, isPlainObject } = require('@e-mc/types');
+const { formatError, hasBasicAuth } = require('@e-mc/cloud/util');
+const { getFilterValue, getSortValue, initCollection } = require('@pi-r/mongodb');
 function sanitizeCredentials(credential) {
     const { username, password } = credential;
     if (username) {
@@ -21,7 +17,7 @@ function sanitizeCredentials(credential) {
 }
 function validateDatabase(credential, data) {
     if (data.table && /^mongodb(?:\+srv)?:\/\//i.test(data.uri)) {
-        if (credential.auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)) {
+        if (credential.auth?.username || credential.username || hasBasicAuth(data.uri)) {
             return true;
         }
         const setAuthSource = () => credential.authSource ||= '$external';
@@ -34,11 +30,8 @@ function validateDatabase(credential, data) {
                 }
                 break;
             case 'MONGODB-AWS':
-                if (credential.authMechanismProperties) {
-                    setAuthSource();
-                    return true;
-                }
-                break;
+                setAuthSource();
+                return true;
             case 'PLAIN':
                 credential.maxPoolSize ??= 1;
                 setAuthSource();
@@ -62,7 +55,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const coercing = this.hasCoerce("atlas", 'options');
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     const createClient = async (item, options) => {
-        const key = length > 1 ? (0, types_1.hashKey)(item.uri + Cloud.asString(options, true)) : '_';
+        const key = length > 1 ? hashKey(item.uri + Cloud.asString(options, true)) : '_';
         let client = clients[key];
         if (client) {
             return client;
@@ -80,10 +73,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, name, table, id, aggregate, distinct, sort, client, ignoreCache } = item;
+        const { service, name, table, id, aggregate, distinct, withFields, sort, timeoutMS = 0, ignoreCache } = item;
         if (!table) {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database table");
+            throw formatError(item, "Missing database table");
         }
         let { query, update, limit = 0 } = item;
         if (id && (!query || limit === 1)) {
@@ -91,21 +84,21 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             limit = 1;
         }
         const options = item.options ? length === 1 ? Object.assign(item.options, credential) : { ...item.options, ...credential } : length === 1 ? credential : { ...credential };
-        let rows, queryString = caching && ignoreCache !== true ? (name || '') + '_' + table + '_' + (limit > 0 ? limit.toString() : '0') + Cloud.asString(options, true) + (sort ? Cloud.asString(sort, true) : '') + (client ? Cloud.asString(client, true) : '') : '', auth, pipeline;
+        let rows, queryString = caching && ignoreCache !== true ? (name || '') + '_' + table + '_' + (limit > 0 ? limit.toString() : '0') + Cloud.asString(options, true) + (withFields ? Cloud.asString(withFields, true) : '') + (sort ? Cloud.asString(sort, true) : '') + (item.client ? Cloud.asString(item.client, true) : '') : '', auth, pipeline;
         if (queryString) {
             sanitizeCredentials(options);
             auth = { uri: item.uri, options };
         }
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         const instance = await createClient(item, options);
-        const collection = await mongodb_1.initCollection.call(this, instance, item);
+        const collection = await initCollection.call(this, instance, item);
         if (update && coercing) {
-            (0, types_1.coerceObject)(update);
+            coerceObject(update);
         }
         if (Array.isArray(update)) {
             const insertOptions = item.execute?.insert;
             if (insertOptions && coercing) {
-                (0, types_1.coerceObject)(insertOptions);
+                coerceObject(insertOptions);
             }
             if (update.length === 1) {
                 await collection.insertOne(update[0], insertOptions);
@@ -127,28 +120,34 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             if (pipeline) {
-                const aggOptions = (0, types_1.isPlainObject)(aggregate) ? aggregate.options : undefined;
+                let aggOptions = isPlainObject(aggregate) ? aggregate.options : undefined;
                 if (coercing) {
                     for (const doc of pipeline) {
-                        (0, types_1.coerceObject)(doc);
+                        coerceObject(doc);
                     }
                     if (aggOptions) {
-                        (0, types_1.coerceObject)(aggOptions);
+                        coerceObject(aggOptions);
                     }
                 }
-                const items = collection.aggregate(pipeline, aggOptions);
+                if (timeoutMS > 0) {
+                    (aggOptions ||= {}).timeoutMS = timeoutMS;
+                }
+                const cursor = collection.aggregate(pipeline, aggOptions);
+                if (withFields) {
+                    cursor.project(withFields);
+                }
                 if (sort) {
-                    items.sort((0, mongodb_1.getSortValue)(sort, coercing)[0]);
+                    cursor.sort(getSortValue(sort, coercing)[0]);
                 }
                 if (limit > 0) {
-                    items.limit(limit);
+                    cursor.limit(limit);
                 }
-                rows = await items.toArray();
+                rows = await cursor.toArray();
             }
             else {
-                const [filter, operation = {}] = (0, mongodb_1.getFilterValue)(query, coercing);
+                const [filter, operation = {}] = getFilterValue(query, coercing);
                 if (sort) {
-                    operation.sort = (0, mongodb_1.getSortValue)(sort, coercing)[0];
+                    operation.sort = getSortValue(sort, coercing)[0];
                 }
                 if (limit === 1) {
                     const document = update ? await collection[item.updateType === 2 ? 'findOneAndReplace' : item.updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation) : await collection.findOne(filter, operation);
@@ -156,20 +155,22 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 else {
                     if (update && item.updateType === 1) {
-                        const updateOptions = item.execute?.update;
-                        if (updateOptions && coercing) {
-                            (0, types_1.coerceObject)(updateOptions);
-                        }
-                        await collection.updateMany(filter, update, updateOptions);
+                        await collection.updateMany(filter, update, item.execute?.update);
+                    }
+                    if (timeoutMS > 0) {
+                        operation.timeoutMS = timeoutMS;
+                    }
+                    const cursor = collection.find(filter, operation);
+                    if (withFields) {
+                        cursor.project(withFields);
                     }
-                    const items = collection.find(filter, operation);
                     if (sort) {
-                        items.sort(...(0, mongodb_1.getSortValue)(sort, coercing));
+                        cursor.sort(...getSortValue(sort, coercing));
                     }
                     if (limit > 1) {
-                        items.limit(limit);
+                        cursor.limit(limit);
                     }
-                    rows = await items.toArray();
+                    rows = await cursor.toArray();
                 }
             }
         }
@@ -181,22 +182,28 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const [a, b, c] = Array.isArray(distinct) ? distinct : [distinct];
-            rows = await (b ? c ? collection.distinct(a, b, c) : collection.distinct(a, b) : collection.distinct(a));
+            let [a, b, c] = Array.isArray(distinct) ? distinct : [distinct];
+            if (timeoutMS > 0) {
+                (c ||= {}).timeoutMS = timeoutMS;
+            }
+            rows = await (c ? b ? collection.distinct(a, b, c) : collection.distinct(a, c) : b ? collection.distinct(a, b) : collection.distinct(a));
         }
         else if (!aggregate) {
             if (queryString && (rows = this.getCacheResult(service, auth, queryString, cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
-            const items = collection.find();
+            const cursor = timeoutMS > 0 ? collection.find({}, { timeoutMS }) : collection.find();
+            if (withFields) {
+                cursor.project(withFields);
+            }
             if (sort) {
-                items.sort(...(0, mongodb_1.getSortValue)(sort, coercing));
+                cursor.sort(...getSortValue(sort, coercing));
             }
             if (limit > 0) {
-                items.limit(limit);
+                cursor.limit(limit);
             }
-            rows = await items.toArray();
+            rows = await cursor.toArray();
         }
         else {
             queryString = '';
@@ -209,3 +216,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
 function getObjectId(value) {
     return { '_id': new mongodb.ObjectId(value) };
 }
+
+exports.createDatabaseClient = createDatabaseClient;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.getObjectId = getObjectId;
+exports.validateDatabase = validateDatabase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/atlas",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "description": "MongoDB Atlas cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,11 +19,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.13.10",
-    "@e-mc/db": "^0.13.10",
-    "@e-mc/module": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
-    "@pi-r/mongodb": "^0.11.3",
-    "mongodb": "^6.21.0"
+    "@e-mc/cloud": "^0.14.0",
+    "@e-mc/db": "^0.14.0",
+    "@e-mc/module": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
+    "@pi-r/mongodb": "^0.12.0",
+    "mongodb": "^7.2.0"
   }
 }