@pi-r/mongodb 0.6.3 → 0.6.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,7 +1,10 @@
-### @pi-r/mongodb
+# @pi-r/mongodb
 
-https://e-mc.readthedocs.io/en/latest/db/mongodb.html
+## Documentation
 
-### LICENSE
+- [E-mc](https://e-mc.readthedocs.io/en/latest/db/mongodb.html)
+- [squared](https://squared.readthedocs.io)
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -47,9 +47,10 @@ class MongoDBPool extends DbPool {
 }
 const POOL_STATE = {};
 const POOL_UNUSED = ['maxPoolSize', 'minPoolSize', 'connectTimeoutMS', 'socketTimeoutMS', 'maxConnecting', 'maxIdleTimeMS', 'waitQueueTimeoutMS', 'serverSelectionTimeoutMS', 'heartbeatFrequencyMS', 'minHeartbeatFrequencyMS', 'compressors', 'zlibCompressionLevel', 'srvMaxHosts'];
+const POOL_ACTIVE = new WeakSet();
 function removePoolProperties(credential) {
     const options = credential.options;
-    if (options && !credential.uuidKey) {
+    if (options && !credential.uuidKey && POOL_ACTIVE.has(credential)) {
         let result;
         for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
             const attr = POOL_UNUSED[i];
@@ -79,7 +80,7 @@ function setCredential(item) {
     const options = item.options || (item.options = {});
     let uri = item.uri;
     if (credential) {
-        let { protocol, server, hostname, port, username, password } = (0, util_1.parseServerAuth)(credential, 27017 /* VALUES.PORT */), { auth, authMechanism = 'DEFAULT', authSource, authMechanismProperties } = credential, authentication = '';
+        let { protocol, server, hostname, port, username, password } = (0, util_1.parseServerAuth)(credential, 27017), { auth, authMechanism = 'DEFAULT', authSource, authMechanismProperties } = credential, authentication = '';
         if (authMechanism === 'GSSAPI') {
             const principal = auth?.username || username || options.auth?.username;
             if ((0, types_1.isString)(principal)) {
@@ -94,10 +95,10 @@ function setCredential(item) {
                 authentication = (0, util_1.getBasicAuth)(username, password);
             }
             if (!server && hostname) {
-                server = hostname + ':' + (port || 27017 /* VALUES.PORT */);
+                server = hostname + ':' + (port || 27017);
             }
             if (!server) {
-                throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Not defined - server address');
+                throw (0, types_1.errorMessage)("mongodb", 'Not defined - server address');
             }
             uri = (protocol || 'mongodb:') + '//' + authentication + server;
         }
@@ -142,7 +143,7 @@ function setCredential(item) {
                     uri += '&tls=true';
                 }
                 else {
-                    throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Missing TLS/SSL credentials');
+                    throw (0, types_1.errorMessage)("mongodb", 'Missing TLS/SSL credentials');
                 }
                 authSource || (authSource = '$external');
                 break;
@@ -166,7 +167,7 @@ function setCredential(item) {
         item.uri = uri;
     }
     else if (!(0, types_1.isString)(uri)) {
-        throw (0, types_1.errorMessage)("mongodb" /* STRINGS.MODULE_NAME */, 'Not defined - credentials');
+        throw (0, types_1.errorMessage)("mongodb", 'Not defined - credentials');
     }
     const usePool = item.usePool;
     if (!usePool) {
@@ -186,7 +187,7 @@ function setCredential(item) {
             return;
         }
     }
-    const config = this.getPoolConfig("mongodb" /* STRINGS.MODULE_NAME */, password);
+    const config = this.getPoolConfig("mongodb", password);
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
@@ -248,18 +249,19 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("mongodb" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("mongodb", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     let mongoClient, mongoCredential, mongoCache = 0, onceCredential = connectOnce ? getCacheObject(batch[0]) : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(connectOnce ? batch[0] : item), ...connectOnce ? [item, batch[0]] : [item]);
         let client;
         if (pool) {
             try {
                 client = await pool.getConnection();
                 pool.connected = true;
+                POOL_ACTIVE.add(credential);
             }
             catch {
                 if (pool.closeable) {
@@ -281,7 +283,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             mongoClient = client;
             mongoCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     if (this.host?.username) {
@@ -292,7 +294,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const { source, name, table, id, aggregate, sort, client, cacheObjectKey, ignoreCache } = item;
         let { query, update, streamRow, limit = 0 } = item;
         if (!table) {
-            const error = (0, types_1.errorMessage)(source, "Missing database table" /* ERR_DB.TABLE */);
+            const error = (0, types_1.errorMessage)(source, "Missing database table");
             ++mongoCache;
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
@@ -309,13 +311,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const getInstance = (target) => target.db(name, client?.db);
         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 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 coercing = this.hasCoerce("mongodb", '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);
@@ -341,7 +343,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = rows;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     return true;
                 }
                 return false;
@@ -376,7 +378,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 const command = item.command;
                 if (command) {
                     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')));
+                        .then(items => items.forEach(output => this.addLog(this.statusType.INFO, output, "mongodb", 'runCommand')));
                 }
                 const collection = getCollection(instance);
                 if (update && coercing) {
@@ -480,7 +482,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 reject(error);
                             }
                             else {
-                                this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                                this.add(item, 4);
                                 resolve(!error ? this.setQueryResult(source, removePoolProperties(mongoCredential || credential), queryString, rows, cacheValue) : rows);
                             }
                         })
@@ -491,14 +493,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 if (rows) {
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    this.add(item, 4);
                     if (targetObject) {
                         rows = targetObject(item, rows);
                     }
                     resolve(this.setQueryResult(source, removePoolProperties(mongoCredential || credential), queryString, rows, cacheValue));
                 }
                 else {
-                    throw (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */);
+                    throw (0, types_1.errorMessage)(source, "Missing database query");
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "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.3",
-    "@e-mc/request": "^0.8.3",
-    "@e-mc/types": "^0.8.3",
-    "mongodb": "^6.3.0"
+    "@e-mc/db": "^0.8.6",
+    "@e-mc/request": "^0.8.6",
+    "@e-mc/types": "^0.8.6",
+    "mongodb": "^6.4.0"
   }
 }