gcf-common-lib 0.29.62 → 0.30.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.29.62",
+  "version": "0.30.62",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -30,7 +30,7 @@
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "mongodb": "^4.17.2",
+    "mongodb": "^6.5.0",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {

package/src/mongo-helper.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoHelper = void 0;
 const mongodb_1 = require("mongodb");
 const bluebird_1 = __importDefault(require("bluebird"));
+let mongoClient;
 exports.MongoHelper = {
     async collectionExists(client, name) {
         const db = client.db();
@@ -27,8 +28,14 @@ exports.MongoHelper = {
     async withMongoClient(fn, url, mongoClientOptions) {
         function withDisposer() {
             return bluebird_1.default.method(async () => {
-                return new mongodb_1.MongoClient(url, mongoClientOptions).connect();
-            })().disposer((client, promise) => client.close());
+                if (!mongoClient) {
+                    mongoClient = new mongodb_1.MongoClient(url, mongoClientOptions);
+                    await mongoClient.connect();
+                }
+                return mongoClient;
+            })().disposer((client, promise) => {
+                // client.close();
+            });
         }
         return bluebird_1.default.using(withDisposer(), client => fn(client));
     },

package/src/mongo-helper.ts

@@ -1,6 +1,7 @@
 import { Collection, CreateCollectionOptions, MongoClient, MongoClientOptions } from 'mongodb';
 import { Document } from 'bson';
 import Bluebird from 'bluebird';
+let mongoClient: MongoClient;
 
 export const MongoHelper = {
   async collectionExists(client: MongoClient, name: string) {
@@ -35,8 +36,14 @@ export const MongoHelper = {
   ) {
     function withDisposer() {
       return Bluebird.method(async () => {
-        return new MongoClient(url, mongoClientOptions).connect();
-      })().disposer((client, promise) => client.close());
+        if (!mongoClient) {
+          mongoClient = new MongoClient(url, mongoClientOptions);
+          await mongoClient.connect();
+        }
+        return mongoClient;
+      })().disposer((client, promise) => {
+        // client.close();
+      });
     }
 
     return Bluebird.using(withDisposer(), client => fn(client));