gcf-common-lib 0.23.7 → 0.23.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.23.7",
+  "version": "0.23.9",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -18,18 +18,19 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^3.3.0",
-    "@google-cloud/secret-manager": "^4.2.1",
-    "@google-cloud/storage": "^6.9.3",
+    "@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": "^5.1.0",
+    "mongodb": "^4.14.0",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@tsconfig/node18": "^1.0.1",
+    "@tsconfig/node14": "^1.0.3",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^18.14.1"
+    "@types/node": "^14.18.36"
   },
   "author": "alert83@gmail.com",
   "license": "MIT"

package/src/index.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,96 +31,106 @@ class GcfCommon {
      * @param handler
      * @param timeout Seconds
      */
-    static async process(event, context, handler, timeout = 535) {
-        return Promise.race([
-            (0, utils_1.timeoutAfter)(timeout),
-            handler(event, context),
-        ])
-            .then(async (res) => {
-            // console.log('res:', res);
-            await this.publish(event, context, res);
-        })
-            .catch(async (err) => {
-            const fname = process?.env?.K_SERVICE ?? 'UNKNOWN';
-            const response = {
-                error: {
-                    name: err.name,
-                    message: `GCF [${fname}]: ${err.message}`,
-                    stack: err.stack,
-                },
-            };
-            await this.publish(event, context, response, { error: '1' }).catch(noop_1.default);
-            throw err;
+    static process(event, context, handler, timeout = 535) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.race([
+                (0, utils_1.timeoutAfter)(timeout),
+                handler(event, context),
+            ])
+                .then((res) => __awaiter(this, void 0, void 0, function* () {
+                // console.log('res:', res);
+                yield this.publish(event, context, res);
+            }))
+                .catch((err) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const fname = (_b = (_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.K_SERVICE) !== null && _b !== void 0 ? _b : 'UNKNOWN';
+                const response = {
+                    error: {
+                        name: err.name,
+                        message: `GCF [${fname}]: ${err.message}`,
+                        stack: err.stack,
+                    },
+                };
+                yield this.publish(event, context, response, { error: '1' }).catch(noop_1.default);
+                throw err;
+            }));
         });
     }
-    static async publish(event, context, json, attributes) {
-        const { topic, requestId, env } = await this.getTopic(event, context);
-        console.log('publish:', topic, env, json, attributes);
-        if (!(0, isEmpty_1.default)(topic)) {
-            return exports.pubSub.topic(topic).publishMessage({
-                json: json ?? {},
-                attributes: {
-                    ...(0, fromPairs_1.default)(Object.entries(attributes ?? {})
-                        .map(([k, v]) => [k, '' + v])),
-                    env: env ?? '',
-                    requestId: requestId ?? '',
-                    type: 'response',
-                    response: '1',
-                },
-            });
-        }
+    static publish(event, context, json, attributes) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { topic, requestId, env } = yield this.getTopic(event, context);
+            console.log('publish:', topic, env, json, attributes);
+            if (!(0, isEmpty_1.default)(topic)) {
+                return exports.pubSub.topic(topic).publishMessage({
+                    json: json !== null && json !== void 0 ? json : {},
+                    attributes: Object.assign(Object.assign({}, (0, fromPairs_1.default)(Object.entries(attributes !== null && attributes !== void 0 ? attributes : {})
+                        .map(([k, v]) => [k, '' + v]))), { env: env !== null && env !== void 0 ? env : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', type: 'response', response: '1' }),
+                });
+            }
+        });
     }
-    static async getTopic(event, context) {
-        /** t_{GUID}__{YYYY-MM-DD} */
-        let topic;
-        let requestId;
-        let env;
-        switch (context?.eventType) {
-            case 'google.storage.object.finalize': {
-                const gsEvent = event;
-                ({ topic, requestId, env } = gsEvent?.metadata ?? {});
-                if (!topic && context?.resource?.type === 'storage#object') {
-                    const [meta] = await exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    ({ topic, requestId, env } = meta?.metadata ?? {});
+    static getTopic(event, context) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            /** t_{GUID}__{YYYY-MM-DD} */
+            let topic;
+            let requestId;
+            let env;
+            switch (context === null || context === void 0 ? void 0 : context.eventType) {
+                case 'google.storage.object.finalize': {
+                    const gsEvent = event;
+                    ({ topic, requestId, env } = (_a = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata) !== null && _a !== void 0 ? _a : {});
+                    if (!topic && ((_b = context === null || context === void 0 ? void 0 : context.resource) === null || _b === void 0 ? void 0 : _b.type) === 'storage#object') {
+                        const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
+                        ({ topic, requestId, env } = (_c = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _c !== void 0 ? _c : {});
+                    }
+                    break;
+                }
+                case 'google.pubsub.topic.publish': {
+                    const psEvent = event;
+                    ({ topic, requestId, env } = (_d = psEvent === null || psEvent === void 0 ? void 0 : psEvent.attributes) !== null && _d !== void 0 ? _d : {});
+                    break;
                 }
-                break;
-            }
-            case 'google.pubsub.topic.publish': {
-                const psEvent = event;
-                ({ topic, requestId, env } = psEvent?.attributes ?? {});
-                break;
             }
-        }
-        return { topic, requestId, env };
+            return { topic, requestId, env };
+        });
     }
-    static async getOptions(event, context) {
-        switch (context?.eventType) {
-            case 'google.storage.object.finalize': {
-                const gsEvent = event;
-                if (gsEvent?.metadata?.options) {
-                    return JSON.parse(gsEvent?.metadata?.options ?? '{}');
+    static getOptions(event, context) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __awaiter(this, void 0, void 0, function* () {
+            switch (context === null || context === void 0 ? void 0 : context.eventType) {
+                case 'google.storage.object.finalize': {
+                    const gsEvent = event;
+                    if ((_a = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata) === null || _a === void 0 ? void 0 : _a.options) {
+                        return JSON.parse((_c = (_b = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata) === null || _b === void 0 ? void 0 : _b.options) !== null && _c !== void 0 ? _c : '{}');
+                    }
+                    else {
+                        const file = exports.storage.bucket(gsEvent.bucket).file(gsEvent.name);
+                        const [meta] = yield file.getMetadata();
+                        return JSON.parse((_e = (_d = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _d === void 0 ? void 0 : _d.options) !== null && _e !== void 0 ? _e : '{}');
+                    }
                 }
-                else {
-                    const file = exports.storage.bucket(gsEvent.bucket).file(gsEvent.name);
-                    const [meta] = await file.getMetadata();
-                    return JSON.parse(meta?.metadata?.options ?? '{}');
+                case 'google.pubsub.topic.publish': {
+                    const psEvent = event;
+                    return JSON.parse((_g = (_f = psEvent === null || psEvent === void 0 ? void 0 : psEvent.attributes) === null || _f === void 0 ? void 0 : _f.options) !== null && _g !== void 0 ? _g : '{}');
                 }
             }
-            case 'google.pubsub.topic.publish': {
-                const psEvent = event;
-                return JSON.parse(psEvent?.attributes?.options ?? '{}');
-            }
-        }
+        });
     }
-    static async getSecret(name, version) {
-        const projectId = await exports.secretClient.getProjectId();
-        const secretName = `projects/${projectId}/secrets/${name}`;
-        const secretVersion = `${secretName}/versions/${version ?? 'latest'}`;
-        const [response] = await exports.secretClient.accessSecretVersion({ name: secretVersion });
-        return response?.payload?.data?.toString();
+    static getSecret(name, version) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectId = yield exports.secretClient.getProjectId();
+            const secretName = `projects/${projectId}/secrets/${name}`;
+            const secretVersion = `${secretName}/versions/${version !== null && version !== void 0 ? version : 'latest'}`;
+            const [response] = yield exports.secretClient.accessSecretVersion({ name: secretVersion });
+            return (_b = (_a = response === null || response === void 0 ? void 0 : response.payload) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.toString();
+        });
     }
-    static async getSecrets(names, versions) {
-        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch()));
+    static getSecrets(names, versions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Promise.all(names.map((name, idx) => __awaiter(this, void 0, void 0, function* () { return this.getSecret(name, versions === null || versions === void 0 ? void 0 : versions[idx]).catch(); })));
+        });
     }
 }
 exports.GcfCommon = GcfCommon;

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

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,19 +16,21 @@ 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 {
-    client;
     constructor(client) {
         this.client = client;
     }
-    async getCollection() {
-        const locksColl = this.client.db().collection('locks');
-        await locksColl.indexExists('expiresAt')
-            .then(async (exists) => {
-            if (!exists)
-                await locksColl.createIndex({ "expiresAt": 1 }, { expireAfterSeconds: 0 });
+    getCollection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            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)
+                    yield locksColl.createIndex({ "expiresAt": 1 }, { expireAfterSeconds: 0 });
+            }));
+            return locksColl;
         });
-        return locksColl;
     }
     /**
      * Create the MongoDB collection and an expiring index on a field named "expiresAt".
@@ -27,39 +38,45 @@ class MongoLock {
      * db.createCollection('locks');
      * db.locks.createIndex( { "expiresAt": 1 }, { expireAfterSeconds: 0 } )
      **/
-    async acquireLock(name, ttlSeconds) {
-        const collection = await this.getCollection();
-        // Entry gets removed automatically due to an expiry index in Mongo
-        const expiresAt = (0, moment_1.default)().add(ttlSeconds, 'seconds').toDate();
-        try {
-            await collection.insertOne({
-                _id: name,
-                expiresAt,
-            });
-            return true;
-        }
-        catch (ex) {
-            // 11000 means duplicate key error, which is expected on an active lock
-            if (ex?.code !== 11000) {
-                // Unexpected error, what happened here :o
-                throw ex;
+    acquireLock(name, ttlSeconds) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const collection = yield this.getCollection();
+            // Entry gets removed automatically due to an expiry index in Mongo
+            const expiresAt = (0, moment_1.default)().add(ttlSeconds, 'seconds').toDate();
+            try {
+                yield collection.insertOne({
+                    _id: name,
+                    expiresAt,
+                });
+                return true;
+            }
+            catch (ex) {
+                // 11000 means duplicate key error, which is expected on an active lock
+                if ((ex === null || ex === void 0 ? void 0 : ex.code) !== 11000) {
+                    // Unexpected error, what happened here :o
+                    throw ex;
+                }
+                // As we got a duplicate key exception, no lock could be acquired
+                return false;
             }
-            // As we got a duplicate key exception, no lock could be acquired
-            return false;
-        }
+        });
     }
-    async releaseLock(name) {
-        const collection = await this.getCollection();
-        return collection.deleteOne({ _id: name });
+    releaseLock(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const collection = yield this.getCollection();
+            return collection.deleteOne({ _id: name });
+        });
     }
-    async acquireAndExecute(name, ttlSeconds, wait, fn) {
-        const delay = 200;
-        const count = Math.round((1000 / delay) * ttlSeconds);
-        return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(this.acquireLock(name, ttlSeconds))).pipe((0, rxjs_1.map)(locked => {
-            console.log(locked);
-            if (!locked)
-                throw locked;
-        }), wait ? (0, rxjs_1.retry)({ count, delay }) : rxjs_1.identity, (0, rxjs_1.switchMap)(() => fn().finally(() => this.releaseLock(name).catch(noop_1.default)))));
+    acquireAndExecute(name, ttlSeconds, wait, fn) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const delay = 200;
+            const count = Math.round((1000 / delay) * ttlSeconds);
+            return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(this.acquireLock(name, ttlSeconds))).pipe((0, rxjs_1.map)(locked => {
+                console.log(locked);
+                if (!locked)
+                    throw locked;
+            }), wait ? (0, rxjs_1.retry)({ count, delay }) : rxjs_1.identity, (0, rxjs_1.switchMap)(() => fn().finally(() => this.releaseLock(name).catch(noop_1.default)))));
+        });
     }
 }
 exports.MongoLock = MongoLock;

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});

package/src/utils.js

@@ -1,15 +1,26 @@
 "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.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.timeoutAfter = void 0;
 /**
  *
  * @param seconds Google function timeout limit (max: 9 min)
  */
-async function timeoutAfter(seconds = 540) {
-    return new Promise((resolve, reject) => {
-        setTimeout(() => {
-            reject(new Error(`${seconds} seconds timeout exceeded`));
-        }, seconds * 1000);
+function timeoutAfter(seconds = 540) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                reject(new Error(`${seconds} seconds timeout exceeded`));
+            }, seconds * 1000);
+        });
     });
 }
 exports.timeoutAfter = timeoutAfter;

package/tsconfig.json

@@ -1,10 +1,14 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node14/tsconfig.json",
   "compilerOptions": {
-  },
-  "exclude": [
-    "node_modules/**",
-    "**/*.d.ts"
-  ]
+    "target": "ES6",
+    "lib": [
+      "ES2018",
+      "ES2019",
+      "ES2020",
+      "ES2021",
+      "ESNext"
+    ]
+  }
 }