gcf-common-lib 0.25.53 → 0.26.55

package/.eslintrc.json

@@ -0,0 +1,56 @@
+{
+  "root": true,
+  "env": {
+    "es2021": true,
+    "commonjs": true,
+    "mongo": true
+  },
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "tsconfigRootDir": ".",
+    "project": [
+      "./tsconfig.json"
+    ]
+  },
+  "plugins": [
+    "@typescript-eslint",
+    "import",
+    "promise",
+    "rxjs",
+    "lodash",
+    "capture",
+    "no-closure",
+    "unicorn"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "plugin:promise/recommended",
+    "plugin:rxjs/recommended",
+    "plugin:lodash/recommended",
+    "plugin:unicorn/recommended"
+  ],
+  "settings": {
+    "import/resolver": {
+      "typescript": true,
+      "node": true
+    }
+  },
+  "rules": {
+    "block-scoped-var": "error",
+    "no-loop-func": "error",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-empty-interface": "off",
+    "lodash/prefer-lodash-method": "off",
+    "rxjs/no-implicit-any-catch": "off",
+    "unicorn/prevent-abbreviations": "off",
+    "capture/explicit-closures": "error",
+    "no-closure/no-tagged-closures": "error"
+  }
+}

package/.prettierrc

@@ -5,5 +5,6 @@
   "semi": true,
   "singleQuote": true,
   "arrowParens": "avoid",
-  "bracketSameLine": true
+  "bracketSameLine": true,
+  "endOfLine": "crlf"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.25.53",
+  "version": "0.26.55",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -9,7 +9,7 @@
     ]
   },
   "engines": {
-    "node": "14",
+    "node": "16",
     "npm": "8"
   },
   "main": "src/index",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@google-cloud/pubsub": "^4.0.6",
     "@google-cloud/secret-manager": "^5.0.1",
-    "@google-cloud/storage": "^7.3.1",
+    "@google-cloud/storage": "^7.4.0",
     "amqplib": "^0.10.3",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
@@ -32,11 +32,22 @@
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@tsconfig/node14": "^14.1.0",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
+    "@tsconfig/node16": "^16.1.1",
     "@types/amqplib": "^0.10.3",
     "@types/bluebird": "^3.5.41",
     "@types/lodash": "^4.14.200",
-    "@types/node": "^14.18.63"
+    "@types/node": "^16.18.59",
+    "eslint": "^8.52.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-capture": "^1.1.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-lodash": "^7.4.0",
+    "eslint-plugin-no-closure": "^1.0.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-rxjs": "^5.0.3",
+    "eslint-plugin-unicorn": "^48.0.1"
   },
   "author": "alert83@gmail.com",
   "license": ""

package/src/index.js

@@ -25,27 +25,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GcfCommon = exports.secretClient = exports.storage = exports.pubSub = exports.MongoDb = exports.RxJs = exports.SecretManager = exports.PubSub = exports.Storage = void 0;
 const pubsub_1 = require("@google-cloud/pubsub");
+const secret_manager_1 = require("@google-cloud/secret-manager");
+const storage_1 = require("@google-cloud/storage");
+const get_1 = __importDefault(require("lodash/get"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const isNil_1 = __importDefault(require("lodash/isNil"));
+const mapValues_1 = __importDefault(require("lodash/mapValues"));
 const noop_1 = __importDefault(require("lodash/noop"));
+const rxjs_1 = require("rxjs");
 const utils_1 = require("./utils");
-const storage_1 = require("@google-cloud/storage");
-const secret_manager_1 = require("@google-cloud/secret-manager");
-const lodash_1 = require("lodash");
 exports.Storage = __importStar(require("@google-cloud/storage"));
 exports.PubSub = __importStar(require("@google-cloud/pubsub"));
 exports.SecretManager = __importStar(require("@google-cloud/secret-manager"));
@@ -57,6 +51,7 @@ exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
 exports.secretClient = new secret_manager_1.SecretManagerServiceClient();
 class GcfCommon {
+    constructor() { }
     /**
      *
      * @param {!TEvent} event Event payload.
@@ -64,114 +59,116 @@ class GcfCommon {
      * @param handler
      * @param timeout Seconds
      */
-    static process(event, context, handler = (e, c) => __awaiter(this, void 0, void 0, function* () { return e; }), 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* () {
-                yield this.publish(event, context, GcfCommon.buildResponse(err), { error: '1' }).catch(noop_1.default);
-                throw err;
-            }));
+    static async process(event, context, handler = rxjs_1.identity, 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);
+            return res;
+        })
+            .catch(async (error) => {
+            await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            throw error;
         });
     }
     static buildResponse(error) {
-        var _a, _b;
         return {
             error: {
                 name: error.name,
-                message: `GCF [${(_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'}]: ${error.message}`,
+                message: `GCF [${process?.env?.K_SERVICE ?? 'UNKNOWN'}]: ${error.message}`,
                 stack: error.stack,
             },
         };
     }
-    static publish(event, context, json, attributes) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.time('safeGetAttributes');
-            const { topic, exchange, queue, 'app-id': appId, env, 'request-id': requestId, } = yield this.safeGetAttributes(event, context, ['topic', 'exchange', 'queue']);
-            console.timeEnd('safeGetAttributes');
-            //
-            console.time('publish');
-            if (topic && !(0, isEmpty_1.default)(topic)) {
-                console.log('send:', topic, appId, env, json, attributes);
-                yield exports.pubSub.topic(topic).publishMessage({
-                    json: json !== null && json !== void 0 ? json : {},
-                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, v => '' + v)), { 'request-id': requestId !== null && requestId !== void 0 ? requestId : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 'app-id': appId !== null && appId !== void 0 ? appId : '', appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '' }),
+    static async publish(event, context, json, attributes) {
+        console.time('safeGetAttributes');
+        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(event, context, ['consumer_id', 'topic', 'exchange', 'queue']);
+        console.timeEnd('safeGetAttributes');
+        //
+        console.time('publish');
+        if (topic && !(0, isEmpty_1.default)(topic)) {
+            console.log('send:', topic, app_id, env, json, attributes);
+            await exports.pubSub.topic(topic).publishMessage({
+                json: json ?? {},
+                attributes: {
+                    ...(0, mapValues_1.default)(attributes ?? {}, v => '' + v),
+                    consumer_id: consumer_id ?? '',
+                    request_id: request_id ?? '',
+                    app_id: app_id ?? '',
+                    env: env ?? '',
+                },
+            });
+        }
+        if (exchange && !(0, isEmpty_1.default)(exchange)) {
+            console.log('send:', exchange, queue, app_id, env, json, attributes);
+            await (0, utils_1.withAmqpCh)(async (ch) => {
+                await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
+                await (0, utils_1.publishAmqp)(ch, exchange, queue ?? '', json ?? {}, {
+                    ...this.amqpOptions.publishOptions,
+                    correlationId: request_id,
                 });
-            }
-            if (exchange && !(0, isEmpty_1.default)(exchange)) {
-                console.log('send:', exchange, queue, appId, env, json, attributes);
-                yield (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
-                    yield ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-                    yield (0, utils_1.publishAmqp)(ch, exchange, queue !== null && queue !== void 0 ? queue : '', json !== null && json !== void 0 ? json : {}, Object.assign(Object.assign({}, this.amqpOptions.publishOptions), { correlationId: requestId }));
-                }), this.amqpOptions.url);
-            }
-            else if (queue && !(0, isEmpty_1.default)(queue)) {
-                console.log('send:', queue, appId, env, json, attributes);
-                yield (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
-                    yield ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                    yield (0, utils_1.publishAmqp)(ch, undefined, queue, json !== null && json !== void 0 ? json : {}, Object.assign(Object.assign({}, this.amqpOptions.publishOptions), { correlationId: requestId }));
-                }), this.amqpOptions.url);
-            }
-            console.timeEnd('publish');
-        });
+            }, this.amqpOptions.url);
+        }
+        else if (queue && !(0, isEmpty_1.default)(queue)) {
+            console.log('send:', queue, app_id, env, json, attributes);
+            await (0, utils_1.withAmqpCh)(async (ch) => {
+                // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
+                await (0, utils_1.publishAmqp)(ch, undefined, queue, json ?? {}, {
+                    ...this.amqpOptions.publishOptions,
+                    correlationId: request_id,
+                });
+            }, this.amqpOptions.url);
+        }
+        console.timeEnd('publish');
     }
-    static safeGetAttributes(event, context, props) {
-        var _a, _b, _c, _d, _e, _f;
-        return __awaiter(this, void 0, void 0, function* () {
-            let metaOrAttr = this.getMetadataOrAttribute(event, context);
-            // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
-            const someProp = props.map(prop => (0, lodash_1.get)(metaOrAttr, prop)).some(v => !(0, lodash_1.isNil)(v));
-            // if no prop then check file metadata
-            if (!someProp && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
-                console.log('get metadata from file');
-                if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
-                    const gsEvent = event;
-                    const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    metaOrAttr = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {};
-                }
+    static async safeGetAttributes(event, context, props) {
+        let metaOrAttr = this.getMetadataOrAttribute(event, context);
+        // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+        const someProp = props.map(prop => (0, get_1.default)(metaOrAttr, prop)).some(v => !(0, isNil_1.default)(v));
+        // if no prop then check file metadata
+        if (!someProp && context?.resource?.type === 'storage#object') {
+            console.log('get metadata from file');
+            if (context?.eventType === 'google.storage.object.finalize') {
+                const gsEvent = event;
+                const [meta] = await exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
+                metaOrAttr = meta?.metadata ?? {};
             }
-            return Object.assign(Object.assign({}, metaOrAttr), { 'app-id': (_c = metaOrAttr['app-id']) !== null && _c !== void 0 ? _c : metaOrAttr.appId, appId: (_d = metaOrAttr['app-id']) !== null && _d !== void 0 ? _d : metaOrAttr.appId, 'request-id': (_e = metaOrAttr['request-id']) !== null && _e !== void 0 ? _e : metaOrAttr.requestId, requestId: (_f = metaOrAttr['request-id']) !== null && _f !== void 0 ? _f : metaOrAttr.requestId });
-        });
+        }
+        return {
+            ...metaOrAttr,
+            app_id: metaOrAttr.app_id,
+            request_id: metaOrAttr.request_id,
+        };
     }
-    static getOptions(event, context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { options } = yield this.safeGetAttributes(event, context, ['options']);
-            return JSON.parse(options !== null && options !== void 0 ? options : '{}');
-        });
+    static async getOptions(event, context) {
+        const { options } = await this.safeGetAttributes(event, context, ['options']);
+        return JSON.parse(options ?? '{}');
     }
     static getMetadataOrAttribute(event, context) {
         let metadataOrAttribute;
-        switch (context === null || context === void 0 ? void 0 : context.eventType) {
+        switch (context?.eventType) {
             case 'google.storage.object.finalize': {
                 const gsEvent = event;
-                metadataOrAttribute = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata;
+                metadataOrAttribute = gsEvent?.metadata;
                 break;
             }
             case 'google.pubsub.topic.publish': {
                 const psEvent = event;
-                metadataOrAttribute = psEvent === null || psEvent === void 0 ? void 0 : psEvent.attributes;
+                metadataOrAttribute = psEvent?.attributes;
                 break;
             }
         }
-        return metadataOrAttribute !== null && metadataOrAttribute !== void 0 ? metadataOrAttribute : {};
+        return metadataOrAttribute ?? {};
     }
-    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 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 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(); })));
-        });
+    static async getSecrets(names, versions) {
+        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch(noop_1.default)));
     }
 }
 exports.GcfCommon = GcfCommon;

package/src/index.ts

@@ -1,12 +1,15 @@
 import { PubSub } from '@google-cloud/pubsub';
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import { Storage } from '@google-cloud/storage';
+import { Options } from 'amqplib';
+import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
+import isNil from 'lodash/isNil';
+import mapValues from 'lodash/mapValues';
 import noop from 'lodash/noop';
-import { ms, publishAmqp, timeoutAfter, withAmqpCh } from './utils';
-import { Storage } from '@google-cloud/storage';
-import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import { identity } from 'rxjs';
 import { TContext, TEvent, TGSEvent, TMetadataOrAttributes, TPSEvent, TResponse } from './types';
-import { get, isNil, mapValues } from 'lodash';
-import { Options } from 'amqplib';
+import { ms, publishAmqp, timeoutAfter, withAmqpCh } from './utils';
 import Dict = NodeJS.Dict;
 
 export * as Storage from '@google-cloud/storage';
@@ -22,6 +25,8 @@ export const storage = new Storage();
 export const secretClient = new SecretManagerServiceClient();
 
 export class GcfCommon {
+  constructor() {}
+
   static amqpOptions: {
     url?: string;
     assertExchange?: Options.AssertExchange;
@@ -43,17 +48,18 @@ export class GcfCommon {
   static async process<T extends TResponse, E = TEvent>(
     event: E,
     context: TContext,
-    handler: (event: E, context: TContext) => Promise<T> = async (e, c) => e as any,
+    handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
     timeout = 535,
   ) {
     return Promise.race([timeoutAfter(timeout), handler(event, context)])
-      .then(async (res: T | undefined) => {
+      .then(async res => {
         // console.log('res:', res);
-        await this.publish(event, context, res);
+        await this.publish(event, context, res as T);
+        return res;
       })
-      .catch(async (err: Error) => {
-        await this.publish(event, context, GcfCommon.buildResponse(err), { error: '1' }).catch(noop);
-        throw err;
+      .catch(async (error: Error) => {
+        await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+        throw error;
       });
   }
 
@@ -70,14 +76,11 @@ export class GcfCommon {
   static async publish<E = TEvent>(event: E, context: TContext, json?: TResponse, attributes?: Dict<any>) {
     console.time('safeGetAttributes');
 
-    const {
-      topic,
-      exchange,
-      queue,
-      'app-id': appId,
-      env,
-      'request-id': requestId,
-    } = await this.safeGetAttributes(event, context, ['topic', 'exchange', 'queue']);
+    const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
+      event,
+      context,
+      ['consumer_id', 'topic', 'exchange', 'queue'],
+    );
 
     console.timeEnd('safeGetAttributes');
 
@@ -86,36 +89,35 @@ export class GcfCommon {
     console.time('publish');
 
     if (topic && !isEmpty(topic)) {
-      console.log('send:', topic, appId, env, json, attributes);
+      console.log('send:', topic, app_id, env, json, attributes);
       await pubSub.topic(topic).publishMessage({
         json: json ?? {},
         attributes: {
           ...mapValues(attributes ?? {}, v => '' + v),
-          'request-id': requestId ?? '',
-          requestId: requestId ?? '',
-          'app-id': appId ?? '',
-          appId: appId ?? '',
+          consumer_id: consumer_id ?? '',
+          request_id: request_id ?? '',
+          app_id: app_id ?? '',
           env: env ?? '',
         } as TMetadataOrAttributes,
       });
     }
 
     if (exchange && !isEmpty(exchange)) {
-      console.log('send:', exchange, queue, appId, env, json, attributes);
+      console.log('send:', exchange, queue, app_id, env, json, attributes);
       await withAmqpCh(async ch => {
         await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
         await publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
           ...this.amqpOptions.publishOptions,
-          correlationId: requestId,
+          correlationId: request_id,
         });
       }, this.amqpOptions.url as string);
     } else if (queue && !isEmpty(queue)) {
-      console.log('send:', queue, appId, env, json, attributes);
+      console.log('send:', queue, app_id, env, json, attributes);
       await withAmqpCh(async ch => {
-        await ch.assertQueue(queue, this.amqpOptions.assertOptions);
+        // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
         await publishAmqp(ch, undefined, queue, json ?? {}, {
           ...this.amqpOptions.publishOptions,
-          correlationId: requestId,
+          correlationId: request_id,
         });
       }, this.amqpOptions.url as string);
     }
@@ -140,10 +142,8 @@ export class GcfCommon {
 
     return {
       ...metaOrAttr,
-      'app-id': metaOrAttr['app-id'] ?? (metaOrAttr as any).appId,
-      appId: metaOrAttr['app-id'] ?? (metaOrAttr as any).appId,
-      'request-id': metaOrAttr['request-id'] ?? (metaOrAttr as any).requestId,
-      requestId: metaOrAttr['request-id'] ?? (metaOrAttr as any).requestId,
+      app_id: metaOrAttr.app_id,
+      request_id: metaOrAttr.request_id,
     } as TMetadataOrAttributes;
   }
 
@@ -180,6 +180,6 @@ export class GcfCommon {
   }
 
   static async getSecrets(names: string[], versions?: string[]) {
-    return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch()));
+    return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch(noop)));
   }
 }

package/src/mongo-helper.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -15,37 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoHelper = void 0;
 const mongodb_1 = require("mongodb");
 const bluebird_1 = __importDefault(require("bluebird"));
-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;
-        });
-    }
-    static withMongoClient(fn, url, mongoClientOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            function withDisposer() {
-                return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
-                    return new mongodb_1.MongoClient(url, mongoClientOptions).connect();
-                }))().disposer((client, promise) => client.close());
-            }
-            return bluebird_1.default.using(withDisposer(), (client) => fn(client));
-        });
-    }
-}
-exports.MongoHelper = MongoHelper;
+exports.MongoHelper = {
+    async collectionExists(client, name) {
+        const db = client.db();
+        const collections = await db.listCollections({ name }, { nameOnly: true }).toArray();
+        return collections.length > 0;
+    },
+    async collectionSafeGet(client, name, options, afterCreate) {
+        const db = client.db();
+        let coll;
+        if (await this.collectionExists(client, name)) {
+            coll = db.collection(name);
+        }
+        else {
+            coll = await db.createCollection(name, options);
+            afterCreate && (await afterCreate(coll));
+        }
+        return coll;
+    },
+    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());
+        }
+        return bluebird_1.default.using(withDisposer(), client => fn(client));
+    },
+};

package/src/mongo-helper.ts

@@ -2,14 +2,14 @@ import { Collection, CreateCollectionOptions, MongoClient, MongoClientOptions }
 import { Document } from 'bson';
 import Bluebird from 'bluebird';
 
-export class MongoHelper {
-  static async collectionExists(client: MongoClient, name: string) {
+export const MongoHelper = {
+  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>(
+  async collectionSafeGet<TSchema extends Document = Document>(
     client: MongoClient,
     name: string,
     options?: CreateCollectionOptions,
@@ -26,15 +26,19 @@ export class MongoHelper {
     }
 
     return coll;
-  }
+  },
 
-  static async withMongoClient<T = any>(fn: (mongoClient: MongoClient) => Promise<T>, url: string, mongoClientOptions?: MongoClientOptions) {
+  async withMongoClient<T = any>(
+    fn: (mongoClient: MongoClient) => Promise<T>,
+    url: string,
+    mongoClientOptions?: MongoClientOptions,
+  ) {
     function withDisposer() {
       return Bluebird.method(async () => {
         return new MongoClient(url, mongoClientOptions).connect();
       })().disposer((client, promise) => client.close());
     }
 
-    return Bluebird.using(withDisposer(),  (client) => fn(client));
-  }
-}
+    return Bluebird.using(withDisposer(), client => fn(client));
+  },
+};

package/src/mongo-lock.js

@@ -1,13 +1,4 @@
 "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,15 +13,14 @@ class MongoLock {
     constructor(client) {
         this.client = client;
     }
-    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;
+    async getCollection() {
+        const locksColl = await mongo_helper_1.MongoHelper.collectionSafeGet(this.client, 'locks');
+        await locksColl.indexExists('expiresAt').then(async (exists) => {
+            if (!exists)
+                await locksColl.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+            return;
         });
+        return locksColl;
     }
     /**
      * Create the MongoDB collection and an expiring index on a field named "expiresAt".
@@ -38,66 +28,55 @@ class MongoLock {
      * db.createCollection('locks');
      * db.locks.createIndex( { "expiresAt": 1 }, { expireAfterSeconds: 0 } )
      **/
-    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;
+    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 (error) {
+            // 11000 means duplicate key error, which is expected on an active lock
+            if (error?.code !== 11000) {
+                // Unexpected error, what happened here :o
+                throw error;
             }
-        });
+            // As we got a duplicate key exception, no lock could be acquired
+            return false;
+        }
     }
-    releaseLock(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collection = yield this.getCollection();
-            return collection.deleteOne({ _id: name });
-        });
+    async releaseLock(name) {
+        const collection = await this.getCollection();
+        return collection.deleteOne({ _id: name });
     }
-    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 new Error('Could not acquire lock');
-            }), wait ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity), (0, rxjs_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () {
-                const self = this;
-                function withDisposer() {
-                    return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () { return void 0; }))()
-                        .disposer(() => {
-                        self.releaseLock(name).catch(noop_1.default);
-                    });
-                }
-                return bluebird_1.default.using(withDisposer(), () => fn());
-            }))));
-        });
+    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 new Error('Could not acquire lock');
+        }), wait ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity), (0, rxjs_1.switchMap)(async () => {
+            const method = bluebird_1.default.method(rxjs_1.identity);
+            const withDisposer = () => method(this).disposer(mongoLock => {
+                mongoLock.releaseLock(name).catch(noop_1.default);
+            });
+            return bluebird_1.default.using(withDisposer(), () => fn());
+        })));
     }
-    checkLock(name, waitSeconds = 0) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const delay = 200;
-            const count = Math.round((1000 / delay) * waitSeconds);
-            const collection = yield this.getCollection();
-            return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(collection.findOne({ _id: name }))).pipe((0, rxjs_1.map)(lock => {
-                // console.log(lock);
-                if (lock)
-                    throw lock;
-            }), waitSeconds > 0 ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity)));
-        });
+    async checkLock(name, waitSeconds = 0) {
+        const delay = 200;
+        const count = Math.round((1000 / delay) * waitSeconds);
+        const collection = await this.getCollection();
+        return (0, rxjs_1.lastValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(collection.findOne({ _id: name }))).pipe((0, rxjs_1.map)(lock => {
+            // console.log(lock);
+            if (lock)
+                throw lock;
+        }), waitSeconds > 0 ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity)));
     }
 }
 exports.MongoLock = MongoLock;

package/src/mongo-lock.ts

@@ -6,13 +6,13 @@ import { MongoHelper } from './mongo-helper';
 import Bluebird from 'bluebird';
 
 export class MongoLock {
-  constructor(private client: MongoClient) {
-  }
+  constructor(private client: MongoClient) {}
 
   async getCollection() {
     const locksColl = await MongoHelper.collectionSafeGet(this.client, 'locks');
     await locksColl.indexExists('expiresAt').then(async exists => {
       if (!exists) await locksColl.createIndex({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+      return;
     });
     return locksColl;
   }
@@ -36,11 +36,11 @@ export class MongoLock {
       });
 
       return true;
-    } catch (ex) {
+    } catch (error) {
       // 11000 means duplicate key error, which is expected on an active lock
-      if ((ex as MongoError)?.code !== 11000) {
+      if ((error as MongoError)?.code !== 11_000) {
         // Unexpected error, what happened here :o
-        throw ex;
+        throw error;
       }
 
       // As we got a duplicate key exception, no lock could be acquired
@@ -65,14 +65,12 @@ export class MongoLock {
         }),
         wait ? retry({ count, delay }) : tap(identity),
         switchMap(async () => {
-          const self = this;
+          const method = Bluebird.method(identity);
 
-          function withDisposer() {
-            return Bluebird.method(async () => void 0)()
-              .disposer(() => {
-                self.releaseLock(name).catch(noop);
-              });
-          }
+          const withDisposer = () =>
+            method(this).disposer(mongoLock => {
+              mongoLock.releaseLock(name).catch(noop);
+            });
 
           return Bluebird.using(withDisposer(), () => fn());
         }),

package/src/types.ts

@@ -31,26 +31,27 @@ export type TPSEvent<A = TMetadataOrAttributes> = {
 export type TEvent = TGSEvent | TPSEvent;
 
 export type TMetadataOrAttributes = {
-  'request-id'?: string; // for rpc response [GUID]
+  request_id?: string; // for rpc response [GUID]
+  consumer_id?: string; // for rpc response [GUID]
   topic?: string; // response PubSub topic [t_{GUID}__{YYYY-MM-DD}]
   exchange?: string; // response amqp exchange
   queue?: string; // response amqp queue
   //
   filename?: string;
   referer?: string;
-  'remote-address'?: string;
-  'upload-id'?: string;
-  'user-agent'?: string;
+  remote_address?: string;
+  upload_id?: string;
+  user_agent?: string;
   timestamp?: string;
   //
   action?: string;
   pipeline?: string;
   options?: string;
-  'job-uid'?: string;
-  'user-id'?: string;
-  'tenant-id'?: string;
+  job_uid?: string;
+  user_id?: string;
+  tenant_id?: string;
   //
-  'app-id'?: string; // app id
+  app_id?: string; // app id
   env?: string; // app environment
 };
 

package/src/utils.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -15,21 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendToQueueConfAmqp = exports.publishAmqp = exports.withAmqpCh = exports.withAmqpConn = exports.safeJsonParse = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
 const amqplib_1 = require("amqplib");
 const bluebird_1 = __importDefault(require("bluebird"));
-const lodash_1 = require("lodash");
+const chain_1 = __importDefault(require("lodash/chain"));
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
  */
-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));
-    });
+async function timeoutAfter(seconds = 540) {
+    return new Promise((resolve, reject) => setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000));
 }
 exports.timeoutAfter = timeoutAfter;
-function delay(seconds) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => setTimeout(() => resolve(undefined), seconds * 1000));
-    });
+async function delay(seconds) {
+    return new Promise(resolve => setTimeout(() => resolve(), seconds * 1000));
 }
 exports.delay = delay;
 //
@@ -44,8 +31,8 @@ function sec(o) {
     multiMap.h = multiMap.m * 60;
     multiMap.d = multiMap.h * 24;
     multiMap.w = multiMap.d * 7;
-    return (0, lodash_1.chain)(Object.entries(o))
-        .map(([k, v]) => { var _a; return ((_a = multiMap[k]) !== null && _a !== void 0 ? _a : 0) * (v !== null && v !== void 0 ? v : 0); })
+    return (0, chain_1.default)(Object.entries(o))
+        .map(([k, v]) => (multiMap[k] ?? 0) * (v ?? 0))
         .reduce((sum, v) => sum + v)
         .value();
 }
@@ -87,7 +74,7 @@ exports.colNumToA1 = colNumToA1;
 function A1ToColNum(value) {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     let result = 0;
-    // tslint:disable-next-line:prefer-for-of
+    // eslint-disable-next-line unicorn/no-for-loop
     for (let i = 0; i < value.length; i++) {
         result *= chars.length;
         result += chars.indexOf(value[i]) + 1;
@@ -99,53 +86,45 @@ function safeJsonParse(value, fallbackValue) {
     try {
         return JSON.parse(value);
     }
-    catch (err) {
+    catch {
         return fallbackValue;
     }
 }
 exports.safeJsonParse = safeJsonParse;
 //
-function withAmqpConn(fn, url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        function withDisposer() {
-            return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
-                const amqpConn = yield (0, amqplib_1.connect)(url);
-                amqpConn.on('close', () => console.info('Amqp connection closed!'));
-                return amqpConn;
-            }))().disposer((conn, promise) => conn.close());
-        }
-        return bluebird_1.default.using(withDisposer(), conn => fn(conn));
-    });
+async function withAmqpConn(fn, url) {
+    function withDisposer() {
+        return bluebird_1.default.method(async () => {
+            const amqpConn = await (0, amqplib_1.connect)(url);
+            amqpConn.on('close', () => console.info('Amqp connection closed!'));
+            return amqpConn;
+        })().disposer((conn, promise) => conn.close());
+    }
+    return bluebird_1.default.using(withDisposer(), conn => fn(conn));
 }
 exports.withAmqpConn = withAmqpConn;
-function withAmqpCh(fn, url, useConfirmChannel = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return withAmqpConn((conn) => __awaiter(this, void 0, void 0, function* () {
-            function withDisposer() {
-                return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
-                    return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
-                }))().disposer((ch, promise) => ch.close());
-            }
-            return bluebird_1.default.using(withDisposer(), ch => fn(ch));
-        }), url);
-    });
+async function withAmqpCh(fn, url, useConfirmChannel = false) {
+    return withAmqpConn(async (conn) => {
+        function withDisposer() {
+            return bluebird_1.default.method(async () => {
+                return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
+            })().disposer((ch, promise) => ch.close());
+        }
+        return bluebird_1.default.using(withDisposer(), ch => fn(ch));
+    }, url);
 }
 exports.withAmqpCh = withAmqpCh;
-function publishAmqp(ch, exchange, routingKey, json, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const payload = Buffer.from(JSON.stringify(json));
-        const keepSending = exchange
-            ? ch.publish(exchange, routingKey, payload, options)
-            : ch.sendToQueue(routingKey, payload, options);
-        if (!keepSending)
-            yield new Promise(resolve => ch.once('drain', () => resolve(undefined)));
-    });
+async function publishAmqp(ch, exchange, routingKey, json, options) {
+    const payload = Buffer.from(JSON.stringify(json));
+    const keepSending = exchange
+        ? ch.publish(exchange, routingKey, payload, options)
+        : ch.sendToQueue(routingKey, payload, options);
+    if (!keepSending)
+        await new Promise(resolve => ch.once('drain', () => resolve()));
 }
 exports.publishAmqp = publishAmqp;
-function sendToQueueConfAmqp(ch, queue, json, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const payload = Buffer.from(JSON.stringify(json));
-        yield new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))));
-    });
+async function sendToQueueConfAmqp(ch, queue, json, options) {
+    const payload = Buffer.from(JSON.stringify(json));
+    await new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))));
 }
 exports.sendToQueueConfAmqp = sendToQueueConfAmqp;

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
 import Bluebird from 'bluebird';
-import { chain, Dictionary } from 'lodash';
+import chain from 'lodash/chain';
 import Dict = NodeJS.Dict;
 
 /**
@@ -8,13 +8,13 @@ import Dict = NodeJS.Dict;
  * @param seconds Google function v1 timeout limit (max: 9 min)
  */
 export async function timeoutAfter(seconds: number = 540) {
-  return new Promise<undefined>((resolve, reject) =>
+  return new Promise<void>((resolve, reject) =>
     setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000),
   );
 }
 
 export async function delay(seconds: number) {
-  return new Promise(resolve => setTimeout(() => resolve(undefined), seconds * 1000));
+  return new Promise<void>(resolve => setTimeout(() => resolve(), seconds * 1000));
 }
 
 //
@@ -77,7 +77,7 @@ export function colNumToA1(columnNumber: number) {
 export function A1ToColNum(value: string) {
   const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
   let result = 0;
-  // tslint:disable-next-line:prefer-for-of
+  // eslint-disable-next-line unicorn/no-for-loop
   for (let i = 0; i < value.length; i++) {
     result *= chars.length;
     result += chars.indexOf(value[i]) + 1;
@@ -88,7 +88,7 @@ export function A1ToColNum(value: string) {
 export function safeJsonParse<T = Dict<any>>(value: string, fallbackValue?: T) {
   try {
     return JSON.parse(value) as T;
-  } catch (err) {
+  } catch {
     return fallbackValue;
   }
 }
@@ -123,20 +123,20 @@ export async function publishAmqp(
   ch: Channel,
   exchange: string | undefined,
   routingKey: string,
-  json: Dictionary<any>,
+  json: Dict<any>,
   options?: Options.Publish,
 ) {
   const payload = Buffer.from(JSON.stringify(json));
   const keepSending = exchange
     ? ch.publish(exchange, routingKey, payload, options)
     : ch.sendToQueue(routingKey, payload, options);
-  if (!keepSending) await new Promise(resolve => ch.once('drain', () => resolve(undefined)));
+  if (!keepSending) await new Promise<void>(resolve => ch.once('drain', () => resolve()));
 }
 
 export async function sendToQueueConfAmqp(
   ch: ConfirmChannel,
   queue: string,
-  json: Dictionary<any>,
+  json: Dict<any>,
   options?: Options.Publish,
 ) {
   const payload = Buffer.from(JSON.stringify(json));

package/tsconfig.json

@@ -1,15 +1,10 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "@tsconfig/node14/tsconfig.json",
+  "extends": "@tsconfig/node16/tsconfig.json",
   "compilerOptions": {
-    "target": "ES6",
-    "lib": [
-      "ES2018",
-      "ES2019",
-      "ES2020",
-      "ES2021",
-      "ES2022",
-      "ESNext"
-    ]
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "target": "es2021",
+    "lib": ["es2022"]
   }
 }