@pi-r/mongodb 0.6.0 → 0.6.2

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/mongodb
 
+https://e-mc.readthedocs.io/en/latest/db/mongodb.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -69,15 +69,9 @@ function getCacheObject(item) {
     return { uri: item.uri, options: item.options, uuidKey: credential?.uuidKey };
 }
 function getPoolKey(credential) {
-    const options = credential.options;
-    if (options && credential.uri) {
-        const auth = options.auth;
-        let result = credential.uri + (auth ? '_' + (auth.username || '') + '@' + (auth.password || '') : '') + '_' + (options.authMechanism || '') + Db.asString(options.authMechanismProperties, true);
-        if (options.tls || options.ssl) {
-            const { tlsCertificateKeyFile = '', tlsCAFile = '', tlsCRLFile = '', tlsCertificateKeyFilePassword = '', tlsAllowInvalidHostnames, tlsAllowInvalidCertificates, tlsInsecure } = options;
-            result += tlsCertificateKeyFile + tlsCAFile + tlsCRLFile + tlsCertificateKeyFilePassword + (tlsAllowInvalidHostnames ? '1' : '0') + (tlsAllowInvalidCertificates ? '1' : '0') + (tlsInsecure ? '1' : '0');
-        }
-        return result;
+    const { options, uri } = credential;
+    if (uri && options) {
+        return uri + JSON.stringify(credential.options);
     }
 }
 function setCredential(item) {
@@ -179,22 +173,19 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if (typeof usePool === 'string' && (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
-    const poolKey = getPoolKey(item);
-    if (!poolKey) {
-        item.usePool = false;
-        return;
-    }
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("mongodb" /* STRINGS.MODULE_NAME */, password);
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
@@ -220,6 +211,11 @@ function setCredential(item) {
             options.socketTimeoutMS ?? (options.socketTimeoutMS = socket_timeout);
         }
     }
+    const poolKey = getPoolKey(item);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new MongoDBPool(new mongodb.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
@@ -318,15 +314,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const getCollection = (target) => getInstance(target).collection(table, client?.collection);
         const runCommand = async (target, document) => getInstance(target).command(document, client?.command);
         const credential = mongoCredential || onceCredential || getCacheObject(item);
-        const renewCache = ignoreCache === 0;
-        const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
+        const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         const coercing = this.hasCoerce("mongodb" /* STRINGS.MODULE_NAME */, 'options', credential.uuidKey);
         const targetObject = typeof checkObject === 'string' ? coercing && (0, types_1.asFunction)(checkObject) : checkObject;
         if (typeof streamRow === 'string') {
             streamRow = coercing && (0, types_1.asFunction)(streamRow);
         }
         let queryString = '', rows, pipeline;
-        if ((caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache) && (!targetObject || typeof cacheObjectKey === 'string') && !streamRow) {
+        if (caching && ignoreCache !== true && (!targetObject || typeof cacheObjectKey === 'string') && !streamRow) {
             queryString = (name || '') + '_' + table + '_' + limit + Db.asString(sort, true) + Db.asString(client, true) + (targetObject ? targetObject.toString() + cacheObjectKey : '');
         }
         if (aggregate) {
@@ -383,9 +378,26 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     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, "mongodb" /* STRINGS.MODULE_NAME */, 'runCommand')));
                 }
+                const collection = getCollection(instance);
+                if (update && coercing) {
+                    (0, types_1.coerceObject)(update);
+                }
+                if (Array.isArray(update)) {
+                    commandType = this.commandType.INSERT;
+                    const insertOptions = item.execute?.insert;
+                    if (insertOptions && coercing) {
+                        (0, types_1.coerceObject)(insertOptions);
+                    }
+                    if (update.length === 1) {
+                        await collection.insertOne(update[0], insertOptions);
+                    }
+                    else if (update.length > 1) {
+                        await collection.insertMany(update, insertOptions);
+                    }
+                    update = undefined;
+                }
                 let cursor;
                 if (pipeline || query) {
-                    const collection = getCollection(instance);
                     if (pipeline) {
                         const aggregateOptions = (0, types_1.isPlainObject)(aggregate) ? aggregate.options : undefined;
                         if (coercing) {
@@ -404,31 +416,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                     else {
                         const [filter, operation] = getFilterValue(query, coercing);
-                        if (update && coercing) {
-                            (0, types_1.coerceObject)(update);
-                        }
-                        if ((0, types_1.isArray)(update)) {
-                            commandType = this.commandType.INSERT;
-                            const insertOptions = item.execute?.insert;
-                            if (insertOptions && coercing) {
-                                (0, types_1.coerceObject)(insertOptions);
-                            }
-                            if (update.length === 1) {
-                                await collection.insertOne(update[0], insertOptions);
-                            }
-                            else {
-                                await collection.insertMany(update, insertOptions);
-                            }
-                            update = undefined;
-                        }
-                        else if (item.updateType === 1) {
-                            update = undefined;
-                        }
+                        const updateType = item.updateType;
                         if (limit === 1) {
                             let document;
                             if (update) {
                                 commandType = this.commandType.UPDATE;
-                                document = await collection[item.updateType === 2 ? 'findOneAndReplace' : item.updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation);
+                                document = await collection[updateType === 2 ? 'findOneAndReplace' : updateType === 3 ? 'findOneAndDelete' : 'findOneAndUpdate'](filter, update, operation);
                             }
                             else {
                                 commandType = this.commandType.SELECT;
@@ -437,7 +430,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             rows = document ? [document] : [];
                         }
                         else {
-                            if (update) {
+                            if (update && updateType === 1) {
                                 commandType = this.commandType.UPDATE;
                                 const updateOptions = item.execute?.update;
                                 if (updateOptions && coercing) {
@@ -450,7 +443,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 else if (!aggregate) {
-                    cursor = getCollection(instance).find();
+                    cursor = collection.find();
                 }
                 if (cursor) {
                     commandType = this.commandType.SELECT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.0",
-    "@e-mc/request": "^0.8.0",
-    "@e-mc/types": "^0.8.0",
+    "@e-mc/db": "^0.8.2",
+    "@e-mc/request": "^0.8.2",
+    "@e-mc/types": "^0.8.2",
     "mongodb": "^6.3.0"
   }
 }