@pi-r/mongodb 0.6.1 → 0.6.3

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/mongodb
 
+https://e-mc.readthedocs.io/en/latest/db/mongodb.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -69,15 +69,9 @@ function getCacheObject(item) {
     return { uri: item.uri, options: item.options, uuidKey: credential?.uuidKey };
 }
 function getPoolKey(credential) {
-    const options = credential.options;
-    if (options && credential.uri) {
-        const auth = options.auth;
-        let result = credential.uri + (auth ? '_' + (auth.username || '') + '@' + (auth.password || '') : '') + '_' + (options.authMechanism || '') + Db.asString(options.authMechanismProperties, true);
-        if (options.tls || options.ssl) {
-            const { tlsCertificateKeyFile = '', tlsCAFile = '', tlsCRLFile = '', tlsCertificateKeyFilePassword = '', tlsAllowInvalidHostnames, tlsAllowInvalidCertificates, tlsInsecure } = options;
-            result += tlsCertificateKeyFile + tlsCAFile + tlsCRLFile + tlsCertificateKeyFilePassword + (tlsAllowInvalidHostnames ? '1' : '0') + (tlsAllowInvalidCertificates ? '1' : '0') + (tlsInsecure ? '1' : '0');
-        }
-        return result;
+    const { options, uri } = credential;
+    if (uri && options) {
+        return uri + JSON.stringify(credential.options);
     }
 }
 function setCredential(item) {
@@ -179,22 +173,19 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if (typeof usePool === 'string' && (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = options.auth?.username || item.uri && (0, util_1.parseConnectionString)(item.uri)?.username) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
-    const poolKey = getPoolKey(item);
-    if (!poolKey) {
-        item.usePool = false;
-        return;
-    }
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("mongodb" /* STRINGS.MODULE_NAME */, password);
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout, socket_timeout } = config;
@@ -220,6 +211,11 @@ function setCredential(item) {
             options.socketTimeoutMS ?? (options.socketTimeoutMS = socket_timeout);
         }
     }
+    const poolKey = getPoolKey(item);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new MongoDBPool(new mongodb.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "MongoDB client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/mongodb"
   },
   "keywords": [
@@ -21,9 +21,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.1",
-    "@e-mc/request": "^0.8.1",
-    "@e-mc/types": "^0.8.1",
+    "@e-mc/db": "^0.8.3",
+    "@e-mc/request": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
     "mongodb": "^6.3.0"
   }
 }

package/types/index.d.ts

@@ -10,7 +10,7 @@ export interface MongoDBDataSource extends DbDataSource<Filter<Document> | Mongo
     updateType?: 0 | 1 | 2 | 3;
 }
 
-export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCAFile" | "tlsCertificateFile" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "sslCA" | "sslKey" | "sslCert"> {}
+export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "tlsCAFile" | "tlsCRLFile" | "tlsAllowInvalidHostnames" | "tlsAllowInvalidCertificates" | "tlsInsecure"> {}
 
 export interface MongoDBSortValue {
     value?: Sort;