gcf-common-lib 0.10.0 → 0.11.0

package/index.js

@@ -1,100 +1,88 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GcfCommon = exports.storage = exports.pubSub = 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 lodash_1 = require("lodash");
+const isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
+const noop_1 = __importDefault(require("lodash-es/noop"));
 const utils_1 = require("./utils");
 exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
 const secretClient = new secret_manager_1.SecretManagerServiceClient();
 class GcfCommon {
-    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* () {
-                yield this.publish(event, context, res !== null && res !== void 0 ? 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).catch(lodash_1.noop);
-                throw err;
-            }));
+    /**
+     *
+     * @param {!TEvent} event Event payload.
+     * @param {!TContext} context Metadata for the event.
+     * @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).catch(noop_1.default);
+            throw err;
         });
     }
-    static publish(event, context, json) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const topic = yield this.getTopic(event, context);
-            console.log('publish:', topic === null || topic === void 0 ? void 0 : topic.name, json);
-            if (topic)
-                return yield topic.publishMessage({ json });
-        });
+    static async publish(event, context, json) {
+        const topic = await this.getTopic(event, context);
+        console.log('publish:', topic?.name, json);
+        if (topic)
+            return await topic.publishMessage({ json });
     }
-    static getTopic(event, context) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            let topicName = (_a = event === null || event === void 0 ? void 0 : event.metadata) === null || _a === void 0 ? void 0 : _a.topic;
-            if (!topicName && ((_b = context === null || context === void 0 ? void 0 : context.resource) === null || _b === void 0 ? void 0 : _b.type) === 'storage#object') {
-                const file = exports.storage.bucket(event.bucket).file(event.name);
-                const [meta] = yield file.getMetadata();
-                topicName = (_c = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _c === void 0 ? void 0 : _c.topic;
-                console.log('topic:', topicName);
-            }
-            if (topicName && !(0, lodash_1.isEmpty)(topicName)) {
-                const topic = exports.pubSub.topic(topicName);
-                yield topic.setMetadata({ labels: { date: topicName.split('__')[1] } });
-                return topic;
-            }
-        });
+    static async getTopic(event, context) {
+        /** t_{GUID}__{YYYY-MM-DD} */
+        let topicName = event?.metadata?.topic;
+        if (!topicName && context?.resource?.type === 'storage#object') {
+            const file = exports.storage.bucket(event.bucket).file(event.name);
+            const [meta] = await file.getMetadata();
+            topicName = meta?.metadata?.topic;
+            console.log('topic:', topicName);
+        }
+        if (topicName && !(0, isEmpty_1.default)(topicName)) {
+            const topic = exports.pubSub.topic(topicName);
+            await topic.setMetadata({ labels: { date: topicName.split('__')[1] } });
+            return topic;
+        }
     }
-    static getOptions(event, context) {
-        var _a, _b, _c, _d, _e;
-        return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = event === null || event === void 0 ? void 0 : event.metadata) === null || _a === void 0 ? void 0 : _a.options) {
-                return JSON.parse((_c = (_b = event === null || event === void 0 ? void 0 : event.metadata) === null || _b === void 0 ? void 0 : _b.options) !== null && _c !== void 0 ? _c : '{}');
-            }
-            else {
-                const file = exports.storage.bucket(event.bucket).file(event.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 : '{}');
-            }
-        });
+    static async getOptions(event, context) {
+        if (event?.metadata?.options) {
+            return JSON.parse(event?.metadata?.options ?? '{}');
+        }
+        else {
+            const file = exports.storage.bucket(event.bucket).file(event.name);
+            const [meta] = await file.getMetadata();
+            return JSON.parse(meta?.metadata?.options ?? '{}');
+        }
     }
-    static getSecret(name, version) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectId = yield secretClient.getProjectId();
-            const secretName = `projects/${projectId}/secrets/${name}`;
-            const secretVersion = `${secretName}/versions/${version !== null && version !== void 0 ? version : 'latest'}`;
-            const [response] = yield 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 secretClient.getProjectId();
+        const secretName = `projects/${projectId}/secrets/${name}`;
+        const secretVersion = `${secretName}/versions/${version ?? 'latest'}`;
+        const [response] = await 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]); })));
-        });
+    static async getSecrets(names, versions) {
+        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx])));
     }
 }
 exports.GcfCommon = GcfCommon;

package/index.ts

@@ -1,7 +1,8 @@
 import {PubSub} from "@google-cloud/pubsub";
 import {SecretManagerServiceClient} from "@google-cloud/secret-manager";
 import {File, Storage} from "@google-cloud/storage";
-import {isEmpty, noop} from 'lodash';
+import isEmpty from "lodash-es/isEmpty";
+import noop from "lodash-es/noop";
 import {timeoutAfter} from "./utils";
 
 export type TEvent = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -19,12 +19,12 @@
   "dependencies": {
     "@google-cloud/pubsub": "^2.18.5",
     "@google-cloud/secret-manager": "^3.10.1",
-    "@google-cloud/storage": "^5.18.0",
-    "lodash": "^4.17.21"
+    "@google-cloud/storage": "^5.18.1",
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
     "@tsconfig/node14": "^1.0.1",
-    "@types/lodash": "^4.14.178"
+    "@types/lodash-es": "^4.17.6"
   },
   "keywords": [],
   "author": "alert83@gmail.com",

package/tsconfig.json

@@ -2,28 +2,14 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "@tsconfig/node14/tsconfig.json",
   "compilerOptions": {
-    "allowJs": false,
-    "removeComments": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "isolatedModules": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "commonjs",
     "moduleResolution": "node",
-    "target": "ES6",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
     "lib": [
       "ES2018",
       "ES2019",
       "ES2020",
       "ES2021",
       "ESNext"
-    ],
-    "types": [],
-    "plugins": []
+    ]
   },
   "exclude": [
     "node_modules/**",

package/utils.js

@@ -1,43 +1,42 @@
 "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.A1ToIndex = exports.colNumToA1 = exports.indexToA1 = exports.timeoutAfter = void 0;
-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);
-        });
+/**
+ *
+ * @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);
     });
 }
 exports.timeoutAfter = timeoutAfter;
+//
 function indexToA1(idx) {
     return colNumToA1(idx + 1);
 }
 exports.indexToA1 = indexToA1;
 function colNumToA1(columnNumber) {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    // To store result (Excel column name)
     const charIdxArr = [];
     while (columnNumber > 0) {
+        // Find remainder
         const rem = columnNumber % chars.length;
+        // If remainder is 0, then a
+        // 'Z' must be there in output
         if (rem === 0) {
             charIdxArr.push(chars.length - 1);
             columnNumber = Math.floor(columnNumber / chars.length) - 1;
         }
-        else {
+        else { // If remainder is non-zero
             charIdxArr.push(rem - 1);
             columnNumber = Math.floor(columnNumber / chars.length);
         }
     }
+    // Reverse the string and print result
     return charIdxArr.reverse().map((n) => chars[n]).join('');
 }
 exports.colNumToA1 = colNumToA1;
@@ -48,6 +47,7 @@ exports.A1ToIndex = A1ToIndex;
 function A1ToColNum(value) {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     let result = 0;
+    // tslint:disable-next-line:prefer-for-of
     for (let i = 0; i < value.length; i++) {
         result *= chars.length;
         result += chars.indexOf(value[i]) + 1;