@pi-r/mongodb 0.12.0 → 0.12.2

package/client/index.js

@@ -249,6 +249,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         outResult ||= new Array(length);
     }
     const caching = this.hasCache("mongodb", sessionKey);
+    const sortKeys = this.settingsOf("mongodb", 'cache', 'sort_keys') === true;
     const tasks = new Array(length);
     const clients = [];
     let mongoClient, mongoCredential, mongoCache = 0, onceCredential = connectOnce ? getCacheObject(batch[0]) : undefined;
@@ -328,11 +329,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
         if (coercing && typeof streamRow === 'string') {
             streamRow = asFunction(streamRow);
         }
-        let queryString = '', rows, pipeline;
-        if (caching && ignoreCache !== true && (!targetObject || typeof item.cacheObjectKey === 'string') && !streamRow) {
+        let queryString = '', cacheCredential, rows, pipeline;
+        if (caching && ignoreCache !== true && !streamRow) {
             const collection = item.client?.collection;
             const db = item.client?.db;
-            queryString = (name || '') + '_' + table + (item.withFields ? '_' + Db.asString(item.withFields, true) : '') + (sort ? '_' + Db.asString(sort, true) : '') + '_' + (limit > 0 ? limit.toString() : '0') + (db ? Db.asString(db, true) : '') + (collection ? Db.asString(collection, true) : '') + (targetObject ? targetObject.toString() + item.cacheObjectKey : '');
+            queryString = (name || '') + '_' + table + (item.withFields ? '_' + Db.asString(item.withFields, true) : '') + (sort ? '_' + Db.asString(sort, true) : '') + '_' + (limit > 0 ? limit.toString() : '0') + (db ? Db.asString(db, true) : '') + (collection ? Db.asString(collection, true) : '') + (targetObject && typeof item.cacheObjectKey === 'string' ? targetObject.toString() + item.cacheObjectKey : '');
         }
         if (aggregate) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
@@ -343,7 +344,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         if (queryString) {
             const setResult = () => {
-                if (ignoreCache !== 1 && (rows = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue))) {
+                if (ignoreCache !== 1 && (rows = this.getQueryResult(source, cacheCredential, queryString, cacheValue))) {
                     ++mongoCache;
                     if (parallel) {
                         tasks[i] = Promise.resolve(rows);
@@ -358,12 +359,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
             };
             if (pipeline || query || distinct) {
                 queryString += Db.asString(aggregate || query || distinct, true);
+                cacheCredential = DbPool.sanitize(mongoCredential || credential, sortKeys);
                 if ((aggregate || distinct || !update) && setResult()) {
                     continue;
                 }
             }
-            else if (!aggregate && setResult()) {
-                continue;
+            else if (!aggregate) {
+                cacheCredential = DbPool.sanitize(mongoCredential || credential, sortKeys);
+                if (setResult()) {
+                    continue;
+                }
             }
             if (!ignoreCache && outCacheMiss) {
                 outCacheMiss.push(source);
@@ -497,7 +502,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             }
                             else {
                                 this.add(item, 4);
-                                resolve(!error ? this.setQueryResult(source, DbPool.sanitize(mongoCredential || credential), queryString, rows, cacheValue) : rows);
+                                resolve(!error ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : rows);
                             }
                         })
                             .on('end', () => stream.destroy());
@@ -511,7 +516,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     if (targetObject) {
                         rows = targetObject(item, rows);
                     }
-                    resolve(this.setQueryResult(source, DbPool.sanitize(mongoCredential || credential), queryString, rows, cacheValue));
+                    resolve(this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue));
                 }
                 else {
                     throw errorMessage(source, "Missing database query");

package/client/pool.js

@@ -12,7 +12,7 @@ class MongoDBPool extends DbPool {
         }
         return super.asString(credential);
     }
-    static sanitize(credential) {
+    static sanitize(credential, sort) {
         if (!this.canCache(credential)) {
             return;
         }
@@ -20,7 +20,7 @@ class MongoDBPool extends DbPool {
         if (!target || !POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }
-        const options = super.sanitize(target);
+        const options = super.sanitize(target, sort);
         return options !== target ? { uri: credential.uri, options } : credential;
     }
     async detach(force) {

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -20,9 +17,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.14.0",
-    "@e-mc/request": "^0.14.0",
-    "@e-mc/types": "^0.14.0",
-    "mongodb": "^7.2.0"
+    "@e-mc/db": "^0.14.3",
+    "@e-mc/request": "^0.14.3",
+    "@e-mc/types": "^0.14.3",
+    "mongodb": "^7.3.0"
   }
 }