@pi-r/mongodb 0.7.2 → 0.7.4

package/README.md

@@ -1,9 +1,9 @@
-### @pi-r/mongodb
-
-https://e-mc.readthedocs.io/en/latest/db/mongodb.html
-
-PEP 402 - Forever Dodgers
-
-### LICENSE
-
+### @pi-r/mongodb
+
+https://e-mc.readthedocs.io/en/latest/db/mongodb.html
+
+PEP 402 - Forever Dodgers
+
+### LICENSE
+
 MIT

package/client/index.js

@@ -243,7 +243,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = false;
     }
     else if (parallel === undefined) {
-        parallel = !batch.some(item => item.parallel === false);
+        parallel = !batch.some(item => item.parallel === false || !!item.update);
     }
     if (!parallel) {
         outResult ||= new Array(length);

package/client/pool.js

@@ -0,0 +1,61 @@
+"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 asString(credential) {
+        const { options, uri } = credential;
+        if (uri && options) {
+            return uri + JSON.stringify(options);
+        }
+        return super.asString(credential);
+    }
+    static sanitize(credential) {
+        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;
+    }
+}
+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,29 +1,29 @@
-{
-  "name": "@pi-r/mongodb",
-  "version": "0.7.2",
-  "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.9.4",
-    "@e-mc/request": "^0.9.4",
-    "@e-mc/types": "^0.9.4",
-    "mongodb": "^6.7.0"
-  }
-}
+{
+  "name": "@pi-r/mongodb",
+  "version": "0.7.4",
+  "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.9.12",
+    "@e-mc/request": "^0.9.12",
+    "@e-mc/types": "^0.9.12",
+    "mongodb": "^6.9.0"
+  }
+}

package/types/index.d.ts

@@ -1,43 +1,43 @@
-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, RunCommandOptions, Sort, SortDirection, UpdateFilter } from 'mongodb';
-
-export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBFilterValue, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
-    source: "mongodb";
-    id?: string;
-    updateType?: 0 | 1 | 2 | 3;
-}
-
-export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "tlsCAFile" | "tlsCRLFile" | "tlsAllowInvalidHostnames" | "tlsAllowInvalidCertificates" | "tlsInsecure"> {}
-
-export interface MongoDBSortValue {
-    value?: Sort;
-    direction?: SortDirection;
-}
-
-export interface MongoDBAggregate {
-    pipeline?: Document[];
-    options?: AggregateOptions;
-}
-
-export interface MongoDBClientDBOptions {
-    client?: {
-        db?: DbOptions;
-        collection?: CollectionOptions;
-        command?: RunCommandOptions;
-    };
-    execute?: {
-        insert?: CommandOperationOptions;
-        update?: CommandOperationOptions;
-    };
-    command?: ArrayOf<Document>;
-    aggregate?: MongoDBAggregate | Document[];
-    sort?: Sort | string | MongoDBSortValue;
-}
-
-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, RunCommandOptions, Sort, SortDirection, UpdateFilter } from 'mongodb';
+
+export interface MongoDBDataSource extends DbDataSource<Filter<Document> | MongoDBFilterValue, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], MongoDBCredential, string>, MongoDBClientDBOptions, CascadeAction {
+    source: "mongodb";
+    id?: string;
+    updateType?: 0 | 1 | 2 | 3;
+}
+
+export interface MongoDBCredential extends ServerAuth, Pick<MongoClientOptions, "auth" | "authMechanism" | "authSource" | "tlsCertificateKeyFile" | "tlsCertificateKeyFilePassword" | "tlsCAFile" | "tlsCRLFile" | "tlsAllowInvalidHostnames" | "tlsAllowInvalidCertificates" | "tlsInsecure"> {}
+
+export interface MongoDBSortValue {
+    value?: Sort;
+    direction?: SortDirection;
+}
+
+export interface MongoDBAggregate {
+    pipeline?: Document[];
+    options?: AggregateOptions;
+}
+
+export interface MongoDBClientDBOptions {
+    client?: {
+        db?: DbOptions;
+        collection?: CollectionOptions;
+        command?: RunCommandOptions;
+    };
+    execute?: {
+        insert?: CommandOperationOptions;
+        update?: CommandOperationOptions;
+    };
+    command?: ArrayOf<Document>;
+    aggregate?: MongoDBAggregate | Document[];
+    sort?: Sort | string | MongoDBSortValue;
+}
+
+export interface MongoDBFilterValue {
+    value?: Filter<Document>;
+    options?: CommandOperationOptions;
 }