@pi-r/mongodb 0.3.5 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/mongodb
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/mongodb
+
+## LICENSE
+
 MIT

package/client/index.d.ts

@@ -1,12 +1,12 @@
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { MongoDBDataSource, MongoDBFilterValue, MongoDBSortValue } from '../types';
-
-import type { CommandOperationOptions, Document, Filter, Sort, SortDirection } from 'mongodb';
-
-declare const MongoDB: IDbSourceClient<MongoDBDataSource> & {
-    getFilterValue(query: Filter<Document> | MongoDBFilterValue, coerce?: boolean): [Filter<Document>, CommandOperationOptions?];
-    getSortValue(sort: Sort | string | MongoDBSortValue, coerce?: boolean): [Sort | string, SortDirection?];
-};
-
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { MongoDBDataSource, MongoDBFilterValue, MongoDBSortValue } from '../types';
+
+import type { CommandOperationOptions, Document, Filter, Sort, SortDirection } from 'mongodb';
+
+declare const MongoDB: IDbSourceClient<MongoDBDataSource> & {
+    getFilterValue(query: Filter<Document> | MongoDBFilterValue, coerce?: boolean): [Filter<Document>, CommandOperationOptions?];
+    getSortValue(sort: Sort | string | MongoDBSortValue, coerce?: boolean): [Sort | string, SortDirection?];
+};
+
 export = MongoDB;

package/client/index.js

@@ -2,7 +2,6 @@
 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");
@@ -26,7 +25,7 @@ class MongoDBPool extends DbPool {
         return this.client.close(force);
     }
     isEmpty() {
-        var _a, _b;
+        var _a;
         if (this.closed) {
             return true;
         }
@@ -38,7 +37,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) && (0, util_1.checkEmpty)((_b = topology.s) === null || _b === void 0 ? void 0 : _b.servers);
+            return (0, util_1.checkEmpty)((_a = topology.s) === null || _a === void 0 ? void 0 : _a.sessions);
         }
         return false;
     }
@@ -347,7 +346,8 @@ function setCredential(item) {
                         }
                     }
                 }
-                new MongoDBPool(new mongodb.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                const db = require("mongodb");
+                new MongoDBPool(new db.MongoClient(item.uri, options), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -368,6 +368,7 @@ 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);
@@ -415,7 +416,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     credential.options.maxPoolSize = size;
                 }
             }
-            clients.push(client = await new mongodb.MongoClient(credential.uri, credential.options).connect());
+            clients.push(client = await new db.MongoClient(credential.uri, credential.options).connect());
         }
         if (connectOnce) {
             mongoClient = client;
@@ -464,7 +465,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             pipeline = Array.isArray(aggregate) ? aggregate : aggregate.pipeline;
         }
         if (id && (!query || limit === 1) && !pipeline) {
-            query = { '_id': new mongodb.ObjectId(id) };
+            query = { '_id': new db.ObjectId(id) };
             limit = 1;
         }
         if (queryString) {
@@ -569,7 +570,6 @@ 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/client/pool.js

@@ -0,0 +1,65 @@
+"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;

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@pi-r/mongodb",
-  "version": "0.3.5",
-  "description": "MongoDB client driver for E-mc.",
-  "main": "client/index.js",
-  "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/db/mongodb"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.6.7",
-    "@e-mc/request": "^0.6.7",
-    "@e-mc/types": "^0.6.7",
-    "mongodb": "^5.9.2"
-  }
-}
+{
+  "name": "@pi-r/mongodb",
+  "version": "0.3.6",
+  "description": "MongoDB client driver for E-mc.",
+  "main": "client/index.js",
+  "types": "client/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/db/mongodb"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "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",
+    "mongodb": "^5.9.2"
+  }
+}

package/types/index.d.ts

@@ -1,46 +1,46 @@
-import type { DbDataSource } from '@e-mc/types/lib/squared';
-
-import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
-
-import type { AggregateOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, Sort, SortDirection, UpdateFilter } from 'mongodb';
-
-export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBQueryWithOptions, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], string | MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
-    source: "mongodb";
-    id?: string;
-    updateType?: 0 | 1 | 2 | 3;
-}
-
-export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCAFile" | "tlsCertificateFile" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "sslCA" | "sslKey" | "sslCert"> {}
-
-export interface MongoDBSortValue {
-    value?: Sort;
-    direction?: SortDirection;
-}
-
-export interface MongoDBAggregate {
-    pipeline?: Document[];
-    options?: AggregateOptions;
-}
-
-export interface MongoDBClientDBOptions {
-    client?: {
-        db?: DbOptions;
-        collection?: CollectionOptions;
-    };
-    execute?: {
-        insert?: CommandOperationOptions;
-        update?: CommandOperationOptions;
-    };
-    aggregate?: MongoDBAggregate;
-    sort?: Sort | string | MongoDBSortValue;
-}
-
-export interface MongoDBQueryWithOptions {
-    value: Filter<Document>;
-    options: CommandOperationOptions;
-}
-
-export interface MongoDBFilterValue {
-    value?: Filter<Document>;
-    options?: CommandOperationOptions;
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
+
+import type { AggregateOptions, CollectionOptions, CommandOperationOptions, DbOptions, Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, Sort, SortDirection, UpdateFilter } from 'mongodb';
+
+export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBQueryWithOptions, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], string | MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
+    source: "mongodb";
+    id?: string;
+    updateType?: 0 | 1 | 2 | 3;
+}
+
+export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCAFile" | "tlsCertificateFile" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "sslCA" | "sslKey" | "sslCert"> {}
+
+export interface MongoDBSortValue {
+    value?: Sort;
+    direction?: SortDirection;
+}
+
+export interface MongoDBAggregate {
+    pipeline?: Document[];
+    options?: AggregateOptions;
+}
+
+export interface MongoDBClientDBOptions {
+    client?: {
+        db?: DbOptions;
+        collection?: CollectionOptions;
+    };
+    execute?: {
+        insert?: CommandOperationOptions;
+        update?: CommandOperationOptions;
+    };
+    aggregate?: MongoDBAggregate;
+    sort?: Sort | string | MongoDBSortValue;
+}
+
+export interface MongoDBQueryWithOptions {
+    value: Filter<Document>;
+    options: CommandOperationOptions;
+}
+
+export interface MongoDBFilterValue {
+    value?: Filter<Document>;
+    options?: CommandOperationOptions;
 }