@pi-r/mongodb 0.3.6 → 0.3.8

package/client/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.getSortValue = exports.getFilterValue = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
 const path = require("path");
+const mongodb = require("mongodb");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/db/util");
 const Db = require("@e-mc/db");
@@ -25,7 +26,7 @@ class MongoDBPool extends DbPool {
         return this.client.close(force);
     }
     isEmpty() {
-        var _a;
+        var _a, _b;
         if (this.closed) {
             return true;
         }
@@ -37,7 +38,7 @@ class MongoDBPool extends DbPool {
                     return (0, util_1.checkEmpty)(topology[name]);
                 }
             }
-            return (0, util_1.checkEmpty)((_a = topology.s) === null || _a === void 0 ? void 0 : _a.sessions);
+            return (0, util_1.checkEmpty)((_a = topology.s) === null || _a === void 0 ? void 0 : _a.sessions) && (0, util_1.checkEmpty)((_b = topology.s) === null || _b === void 0 ? void 0 : _b.servers);
         }
         return false;
     }
@@ -346,8 +347,7 @@ function setCredential(item) {
                         }
                     }
                 }
-                const db = require("mongodb");
-                new MongoDBPool(new db.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                new MongoDBPool(new mongodb.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -368,7 +368,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mongodb");
     let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -416,7 +415,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     credential.options.maxPoolSize = size;
                 }
             }
-            clients.push(client = await new db.MongoClient(credential.uri, credential.options).connect());
+            clients.push(client = await new mongodb.MongoClient(credential.uri, credential.options).connect());
         }
         if (connectOnce) {
             mongoClient = client;
@@ -465,7 +464,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
         }
         if (id && (!query || limit === 1) && !pipeline) {
-            query = { '_id': new db.ObjectId(id) };
+            query = { '_id': new mongodb.ObjectId(id) };
             limit = 1;
         }
         if (queryString) {
@@ -489,7 +488,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     continue;
                 }
             }
-            else if (!aggregate && setResult()) {
+            else if (!aggregate && !update && setResult()) {
                 continue;
             }
             if (!ignoreCache && outCacheMiss) {
@@ -570,6 +569,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 if (updateOptions && coercing) {
                                     (0, types_1.coerceObject)(updateOptions);
                                 }
+                                await collection.updateMany(filter, update, updateOptions);
                             }
                             cursor = collection.find(filter, command);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mongodb",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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.6.16",
-    "@e-mc/request": "^0.6.16",
-    "@e-mc/types": "^0.6.16",
+    "@e-mc/db": "^0.6.19",
+    "@e-mc/request": "^0.6.19",
+    "@e-mc/types": "^0.6.19",
     "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;