@pi-r/atlas 0.7.3 → 0.8.1

package/client/index.js

@@ -1,10 +1,14 @@
 "use strict";
-exports.getObjectId = exports.executeBatchQuery = exports.executeQuery = exports.createDatabaseClient = exports.validateDatabase = void 0;
+exports.validateDatabase = validateDatabase;
+exports.createDatabaseClient = createDatabaseClient;
+exports.executeQuery = executeQuery;
+exports.executeBatchQuery = executeBatchQuery;
+exports.getObjectId = getObjectId;
 const mongodb = require("mongodb");
-const types_1 = require("@e-mc/types");
+const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
+const types_1 = require("@e-mc/types");
 const mongodb_1 = require("@pi-r/mongodb");
-const Cloud = require("@e-mc/cloud");
 function sanitizeCredentials(credential) {
     const { username, password } = credential;
     if (username) {
@@ -17,18 +21,41 @@ function sanitizeCredentials(credential) {
 }
 function validateDatabase(credential, data) {
     const auth = credential.auth;
-    return !!(data.table && Cloud.isURL(data.uri) && (auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)));
+    if (data.table && Cloud.isURL(data.uri)) {
+        if (auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)) {
+            return true;
+        }
+        const setAuthSource = () => credential.authSource ||= '$external';
+        switch (credential.authMechanism) {
+            case 'MONGODB-X509':
+                if (credential.tlsCertificateKeyFile) {
+                    credential.tls = true;
+                    setAuthSource();
+                    return true;
+                }
+                break;
+            case 'GSSAPI':
+            case 'MONGODB-AWS':
+                if ((0, types_1.isPlainObject)(credential.authMechanismProperties)) {
+                    setAuthSource();
+                    return true;
+                }
+                break;
+            case 'PLAIN':
+                credential.maxPoolSize ??= 1;
+                setAuthSource();
+                return true;
+        }
+    }
+    return false;
 }
-exports.validateDatabase = validateDatabase;
 function createDatabaseClient(credential, data) {
     sanitizeCredentials(credential);
     return new mongodb.MongoClient(data.uri, credential);
 }
-exports.createDatabaseClient = createDatabaseClient;
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
-exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
     const length = batch.length;
     const result = new Array(length);
@@ -37,11 +64,11 @@ 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) => {
-        return clients[item.uri + Cloud.asString(options, true)] ||= await createDatabaseClient.call(this, options, item).connect();
+        return clients[length > 1 ? (0, types_1.hashKey)(item.uri + Cloud.asString(options, true)) : '_'] ||= await createDatabaseClient.call(this, options, item).connect();
     };
     const closeClient = () => {
         for (const key in clients) {
-            clients[key].close();
+            void clients[key].close();
         }
     };
     for (let i = 0; i < length; ++i) {
@@ -65,18 +92,15 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const getInstance = (target) => target.db(name, client?.db);
         const getCollection = (target) => getInstance(target).collection(table, client?.collection);
         const runCommand = async (target, document) => getInstance(target).command(document, client?.command);
-        const getCache = () => {
-            if (ignoreCache !== 1) {
-                cacheValue.renewCache = ignoreCache === 0;
-                return this.getQueryResult(service, auth, queryString, cacheValue);
-            }
-        };
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         const instance = await createClient(item, options);
-        const command = item.command;
-        if (command) {
-            await Promise.all((!Array.isArray(command) ? [command] : command).map(async (cmd) => runCommand(instance, cmd)))
-                .then(items => items.forEach(output => this.addLog(this.statusType.INFO, output, "atlas", 'runCommand')));
+        if (item.command) {
+            await Promise.all((!Array.isArray(item.command) ? [item.command] : item.command).map(async (cmd) => runCommand(instance, cmd)))
+                .then(items => {
+                for (const output of items) {
+                    this.addLog(this.statusType.INFO, output, "atlas", 'runCommand');
+                }
+            });
         }
         const collection = getCollection(instance);
         if (update && coercing) {
@@ -101,20 +125,22 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         if (pipeline || query) {
             if (queryString) {
                 queryString += Cloud.asString(aggregate || query, true);
-                if ((aggregate || !update) && (rows = getCache())) {
+                if ((aggregate || !update) && (rows = this.getCacheResult(service, auth, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
             }
             if (pipeline) {
-                const aggregateOptions = (0, types_1.isPlainObject)(aggregate) ? aggregate.options : undefined;
+                const aggOptions = (0, types_1.isPlainObject)(aggregate) ? aggregate.options : undefined;
                 if (coercing) {
-                    pipeline.forEach(doc => (0, types_1.coerceObject)(doc));
-                    if (aggregateOptions) {
-                        (0, types_1.coerceObject)(aggregateOptions);
+                    for (const doc of pipeline) {
+                        (0, types_1.coerceObject)(doc);
+                    }
+                    if (aggOptions) {
+                        (0, types_1.coerceObject)(aggOptions);
                     }
                 }
-                const items = collection.aggregate(pipeline, aggregateOptions);
+                const items = collection.aggregate(pipeline, aggOptions);
                 if (sort) {
                     items.sort((0, mongodb_1.getSortValue)(sort, coercing)[0]);
                 }
@@ -150,7 +176,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
         }
         else if (!aggregate) {
-            if (queryString && (rows = getCache())) {
+            if (queryString && (rows = this.getCacheResult(service, auth, queryString, cacheValue, ignoreCache))) {
                 result[i] = rows;
                 continue;
             }
@@ -171,8 +197,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-exports.executeBatchQuery = executeBatchQuery;
 function getObjectId(value) {
     return { '_id': new mongodb.ObjectId(value) };
 }
-exports.getObjectId = getObjectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/atlas",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "MongoDB Atlas cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.9.6",
-    "@e-mc/db": "^0.9.6",
-    "@e-mc/module": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
-    "@pi-r/mongodb": "^0.7.3",
+    "@e-mc/cloud": "^0.10.0",
+    "@e-mc/db": "^0.10.0",
+    "@e-mc/module": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
+    "@pi-r/mongodb": "^0.8.0",
     "mongodb": "^6.8.0"
   }
 }