gcf-common-lib 0.23.8 → 0.23.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.23.8",
+  "version": "0.23.10",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -21,7 +21,6 @@
     "@google-cloud/pubsub": "^3.2.1",
     "@google-cloud/secret-manager": "^4.2.0",
     "@google-cloud/storage": "^6.9.0",
-    "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "mongodb": "^4.14.0",

package/src/mongo-helper.js

@@ -0,0 +1,36 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoHelper = void 0;
+class MongoHelper {
+    static collectionExists(client, name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const db = client.db();
+            const collections = yield db.listCollections({ name }, { nameOnly: true }).toArray();
+            return collections.length > 0;
+        });
+    }
+    static collectionSafeGet(client, name, options, afterCreate) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const db = client.db();
+            let coll;
+            if (yield this.collectionExists(client, name)) {
+                coll = db.collection(name);
+            }
+            else {
+                coll = yield db.createCollection(name, options);
+                afterCreate && (yield afterCreate(coll));
+            }
+            return coll;
+        });
+    }
+}
+exports.MongoHelper = MongoHelper;

package/src/mongo-helper.ts

@@ -0,0 +1,30 @@
+import {Collection, CreateCollectionOptions, MongoClient} from "mongodb";
+import {Document} from "bson";
+
+export class MongoHelper {
+    static async collectionExists(client: MongoClient, name: string) {
+        const db = client.db();
+        const collections = await db.listCollections({name}, {nameOnly: true}).toArray();
+        return collections.length > 0;
+    }
+
+    static async collectionSafeGet<TSchema extends Document = Document>(
+        client: MongoClient,
+        name: string,
+        options?: CreateCollectionOptions,
+        afterCreate?: (col: Collection<TSchema>) => Promise<void>,
+    ) {
+        const db = client.db();
+        let coll: Collection<TSchema>;
+
+        if (await this.collectionExists(client, name)) {
+            coll = db.collection<TSchema>(name);
+        } else {
+            coll = await db.createCollection<TSchema>(name, options);
+            afterCreate && (await afterCreate(coll));
+        }
+
+        return coll;
+    }
+
+}

package/src/mongo-lock.js

@@ -16,13 +16,14 @@ exports.MongoLock = void 0;
 const moment_1 = __importDefault(require("moment"));
 const noop_1 = __importDefault(require("lodash/noop"));
 const rxjs_1 = require("rxjs");
+const mongo_helper_1 = require("./mongo-helper");
 class MongoLock {
     constructor(client) {
         this.client = client;
     }
     getCollection() {
         return __awaiter(this, void 0, void 0, function* () {
-            const locksColl = this.client.db().collection('locks');
+            const locksColl = yield mongo_helper_1.MongoHelper.collectionSafeGet(this.client, 'locks');
             yield locksColl.indexExists('expiresAt')
                 .then((exists) => __awaiter(this, void 0, void 0, function* () {
                 if (!exists)

package/src/mongo-lock.ts

@@ -2,6 +2,7 @@ import {MongoClient, MongoError} from "mongodb";
 import moment from "moment";
 import noop from "lodash/noop";
 import {defer, from, identity, lastValueFrom, map, retry, switchMap} from "rxjs";
+import {MongoHelper} from "./mongo-helper";
 
 export class MongoLock {
 
@@ -9,7 +10,7 @@ export class MongoLock {
     }
 
     async getCollection() {
-        const locksColl = this.client.db().collection('locks');
+        const locksColl = await MongoHelper.collectionSafeGet(this.client, 'locks' );
         await locksColl.indexExists('expiresAt')
             .then(async exists => {
                 if (!exists) await locksColl.createIndex({"expiresAt": 1}, {expireAfterSeconds: 0});