@pi-r/mongodb 0.9.4 → 0.10.1

package/client/index.js

@@ -56,13 +56,12 @@ function setCredential(item) {
         switch (authMechanism) {
             case 'MONGODB-X509': {
                 for (const attr of ['tlsCertificateKeyFile', 'tlsCAFile', 'tlsCRLFile']) {
-                    let value = credential[attr];
+                    const value = credential[attr];
                     if ((0, types_1.isString)(value)) {
-                        if (Db.isPath(value = value.trim(), true)) {
+                        if (Db.isPath(value, true)) {
                             const pathname = path.resolve(value);
                             if (this.canRead(pathname, { ownPermissionOnly: true })) {
                                 options[attr] = pathname;
-                                continue;
                             }
                         }
                         else if (Request.isCert(value)) {
@@ -82,14 +81,14 @@ function setCredential(item) {
                                     }
                                 }
                                 if (key.length > 0) {
-                                    options.key = Buffer.from(key.join('\n'), 'utf-8');
+                                    options.key = Buffer.from(key.join('\n'), 'utf8');
                                 }
                                 if (cert.length > 0) {
-                                    options.cert = Buffer.from(cert.join('\n'), 'utf-8');
+                                    options.cert = Buffer.from(cert.join('\n'), 'utf8');
                                 }
                             }
                             else {
-                                options[attr === 'tlsCAFile' ? 'ca' : 'crl'] = Buffer.from(value, 'utf-8');
+                                options[attr === 'tlsCAFile' ? 'ca' : 'crl'] = Buffer.from(value, 'utf8');
                             }
                         }
                     }
@@ -140,14 +139,18 @@ function setCredential(item) {
         }
         item.uri = uri;
         if (!options.writeConcern && ('w' in options || 'wtimeoutMS' in options || 'journal' in options)) {
-            options.writeConcern = new mongodb.WriteConcern(options.w, options.wtimeoutMS, options.journal);
+            options.writeConcern = {
+                w: options.w,
+                wtimeoutMS: options.wtimeoutMS,
+                journal: options.journal
+            };
             delete options.w;
             delete options.wtimeoutMS;
             delete options.journal;
         }
     }
-    else if (!(0, types_1.isString)(uri)) {
-        throw (0, types_1.errorMessage)("mongodb", 'Not defined - credentials');
+    else if (!uri) {
+        throw (0, types_1.errorMessage)("mongodb", "Invalid credentials", 'uri');
     }
     const usePool = item.usePool;
     if (!usePool) {
@@ -155,7 +158,8 @@ function setCredential(item) {
     }
     let username, password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username) {
+        username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username;
+        if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -169,7 +173,7 @@ function setCredential(item) {
     }
     const config = this.getPoolConfig("mongodb", password);
     if (config) {
-        const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
+        const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout, server_timeout } = config;
         if (min >= 0) {
             options.minPoolSize ??= min;
         }
@@ -191,6 +195,9 @@ function setCredential(item) {
         if (socket_timeout > 0) {
             options.socketTimeoutMS ??= socket_timeout;
         }
+        if (server_timeout > 0) {
+            options.serverSelectionTimeoutMS ??= server_timeout;
+        }
     }
     const poolKey = DbPool.asString(item);
     if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
@@ -301,7 +308,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         let queryString = '', rows, pipeline;
         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 : '');
+            queryString = (name || '') + '_' + table + '_' + (limit > 0 ? limit.toString() : '0') + Db.asString(sort, true) + Db.asString(client, true) + (targetObject ? targetObject.toString() + cacheObjectKey : '');
         }
         if (aggregate) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
@@ -496,7 +503,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
     }
-    return this.processRows(batch, tasks, {
+    return this.processRows(batch, tasks, clients.length === 0 ? parallel : {
         parallel,
         disconnect() {
             for (const item of clients) {
@@ -514,7 +521,7 @@ async function initCollection(target, item) {
         await Promise.all((!Array.isArray(item.command) ? [item.command] : item.command).map(async (cmd) => db.command(document, cmd)))
             .then(items => {
             for (const output of items) {
-                this.addLog(this.statusType.INFO, output, this.moduleName, 'runCommand');
+                this.addLog(this.statusType.INFO, output, "mongodb", 'runCommand');
             }
         });
     }
@@ -525,7 +532,7 @@ async function initCollection(target, item) {
                 this.addLog(this.statusType.INFO, `inserted: ${insertedCount}, upserted: ${upsertedCount}, matched: ${matchedCount}, modified: ${modifiedCount}, deleted: ${deletedCount}`, "mongodb", 'bulkWrite');
             }
             else {
-                this.addLog(this.statusType.WARN, 'Operation was not acknowledged', this.moduleName, 'bulkWrite');
+                this.addLog(this.statusType.WARN, 'Operation was not acknowledged', "mongodb", 'bulkWrite');
             }
         });
     }

package/client/pool.js

@@ -3,6 +3,8 @@ 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) {
@@ -11,6 +13,9 @@ class MongoDBPool extends DbPool {
         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;
@@ -57,5 +62,4 @@ class MongoDBPool extends DbPool {
         return this.client.s?.hasBeenClosed === true;
     }
 }
-MongoDBPool.CACHE_UNUSED = ['maxPoolSize', 'minPoolSize', 'connectTimeoutMS', 'socketTimeoutMS', 'maxConnecting', 'maxIdleTimeMS', 'waitQueueTimeoutMS', 'maxStalenessSeconds', 'localThresholdMS', 'serverSelectionTimeoutMS', 'heartbeatFrequencyMS', 'minHeartbeatFrequencyMS', 'compressors', 'zlibCompressionLevel', 'srvMaxHosts'];
 module.exports = MongoDBPool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "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.11.5",
-    "@e-mc/request": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
-    "mongodb": "^6.15.0"
+    "@e-mc/db": "^0.12.3",
+    "@e-mc/request": "^0.12.3",
+    "@e-mc/types": "^0.12.3",
+    "mongodb": "^6.16.0"
   }
 }