@pi-r/mongodb 0.2.13 → 0.2.15

package/client/index.js

@@ -369,9 +369,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         return [];
     }
     const db = require("mongodb");
-    let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
+    let parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
-        ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
+        ({ parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -489,7 +489,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     continue;
                 }
             }
-            else if (!aggregate && setResult()) {
+            else if (!aggregate && !update && setResult()) {
                 continue;
             }
             if (!ignoreCache && outCacheMiss) {
@@ -618,10 +618,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             }
                         })
                             .on('end', () => stream.destroy());
+                        return;
                     }
-                    else {
-                        rows = await cursor.toArray();
-                    }
+                    rows = await cursor.toArray();
                 }
                 if (rows) {
                     this.add(item, 4);
@@ -654,8 +653,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
-        disconnect: () => clients.forEach(item => item.close(true)),
-        parallel
+        parallel,
+        errorAsEmpty,
+        disconnect: () => clients.forEach(item => item.close(true))
     }, outResult);
 }
 exports.executeBatchQuery = executeBatchQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "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.5.18",
-    "@e-mc/request": "^0.5.18",
-    "@e-mc/types": "^0.5.18",
+    "@e-mc/db": "^0.5.23",
+    "@e-mc/request": "^0.5.23",
+    "@e-mc/types": "^0.5.23",
     "mongodb": "^5.9.2"
   }
 }

package/client/pool.js

@@ -1,65 +0,0 @@
-"use strict";
-const util_1 = require("@e-mc/db/util");
-const DbPool = require('@e-mc/db/pool');
-const POOL_ACTIVE = new WeakSet();
-class MongoDBPool extends DbPool {
-    static CACHE_UNUSED = ['maxPoolSize', 'minPoolSize', 'connectTimeoutMS', 'socketTimeoutMS', 'maxConnecting', 'maxIdleTimeMS', 'waitQueueTimeoutMS', 'maxStalenessSeconds', 'localThresholdMS', 'serverSelectionTimeoutMS', 'heartbeatFrequencyMS', 'minHeartbeatFrequencyMS', 'timeoutMS', 'compressors', 'zlibCompressionLevel', 'srvMaxHosts', 'mongodbLogPath', 'mongodbLogComponentSeverities', 'mongodbLogMaxDocumentLength'];
-    static CACHE_IGNORE = ['pkFactory'];
-    static asString(credential) {
-        const { options, uri } = credential;
-        if (uri && options) {
-            return uri + JSON.stringify(options);
-        }
-        return super.asString(credential);
-    }
-    static sanitize(credential) {
-        if (!this.canCache(credential)) {
-            return;
-        }
-        const target = credential.options;
-        if (!target || !POOL_ACTIVE.has(credential) || credential.uuidKey) {
-            return credential;
-        }
-        const options = super.sanitize(target);
-        return options !== target ? { uri: credential.uri, options } : credential;
-    }
-    async detach(force) {
-        this.remove();
-        if (this.closed) {
-            return;
-        }
-        return this.close(force);
-    }
-    get closeable() {
-        const topology = this.client.topology;
-        return topology ? super.closeable || topology.s.state === 'closing' : true;
-    }
-    async getConnection(credential) {
-        if (credential) {
-            POOL_ACTIVE.add(credential);
-        }
-        return this.client.connect();
-    }
-    async close(force = false) {
-        return this.client.close(force);
-    }
-    isEmpty() {
-        if (this.closed) {
-            return true;
-        }
-        const topology = this.client.topology;
-        if (topology) {
-            const name = Object.getOwnPropertySymbols(topology).find(sym => sym.toString() === 'Symbol(waitQueue)');
-            return (0, util_1.checkEmpty)(name ? topology[name] : topology.s.servers);
-        }
-        return false;
-    }
-    get closed() {
-        const topology = this.client.topology;
-        if (topology && (this.success > 0 || this.failed > 0)) {
-            return topology.isDestroyed();
-        }
-        return this.client.s?.hasBeenClosed === true;
-    }
-}
-module.exports = MongoDBPool;