@pi-r/mongodb 0.10.3 → 0.10.5

package/client/index.js

@@ -283,7 +283,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { source, name, table, id, aggregate, distinct, sort, client, cacheObjectKey, ignoreCache } = item;
+        const { source, name, table, id, aggregate, distinct, sort, ignoreCache } = item;
         let { query, update, streamRow, limit = 0 } = item;
         if (!table) {
             const error = (0, types_1.errorMessage)(source, "Missing database table");
@@ -312,8 +312,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
             streamRow = (0, types_1.asFunction)(streamRow);
         }
         let queryString = '', rows, pipeline;
-        if (caching && ignoreCache !== true && (!targetObject || typeof cacheObjectKey === 'string') && !streamRow) {
-            queryString = (name || '') + '_' + table + '_' + (limit > 0 ? limit.toString() : '0') + Db.asString(sort, true) + Db.asString(client, true) + (targetObject ? targetObject.toString() + cacheObjectKey : '');
+        if (caching && ignoreCache !== true && !streamRow) {
+            const collection = item.client?.collection;
+            const db = item.client?.db;
+            queryString = (name || '') + '_' + table + (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;
@@ -324,7 +326,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, DbPool.sanitize(mongoCredential || credential), queryString, cacheValue))) {
                     ++mongoCache;
                     if (parallel) {
                         tasks[i] = Promise.resolve(rows);
@@ -343,7 +345,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     continue;
                 }
             }
-            else if (!aggregate && setResult()) {
+            else if (!aggregate && !update && setResult()) {
                 continue;
             }
             if (!ignoreCache && outCacheMiss) {
@@ -529,7 +531,7 @@ async function checkTimeout(value, limit = 0) {
 async function initCollection(target, item) {
     const db = target.db(item.name, item.client?.db);
     if (item.command) {
-        await Promise.all((!Array.isArray(item.command) ? [item.command] : item.command).map(async (cmd) => db.command(document, cmd)))
+        await Promise.all((Array.isArray(item.command) ? item.command : [item.command]).map((cmd) => db.command(cmd, { signal: this.signal })))
             .then(items => {
             for (const output of items) {
                 this.addLog(this.statusType.INFO, output, "mongodb", 'runCommand');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.12.7",
-    "@e-mc/request": "^0.12.7",
-    "@e-mc/types": "^0.12.7",
+    "@e-mc/db": "^0.12.17",
+    "@e-mc/request": "^0.12.17",
+    "@e-mc/types": "^0.12.17",
     "mongodb": "^6.19.0"
   }
 }