gcf-common-lib 0.8.1 → 0.11.0

package/index.js

@@ -1,19 +1,33 @@
 "use strict";
+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 lodash_1 = require("lodash");
-const storage_1 = require("@google-cloud/storage");
 const pubsub_1 = require("@google-cloud/pubsub");
+const secret_manager_1 = require("@google-cloud/secret-manager");
+const storage_1 = require("@google-cloud/storage");
+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 {
+    /**
+     *
+     * @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) => {
@@ -25,7 +39,7 @@ class GcfCommon {
                     stack: err.stack,
                 },
             };
-            await this.publish(event, context, response).catch(lodash_1.noop);
+            await this.publish(event, context, response).catch(noop_1.default);
             throw err;
         });
     }
@@ -36,6 +50,7 @@ class GcfCommon {
             return await topic.publishMessage({ json });
     }
     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);
@@ -43,7 +58,7 @@ class GcfCommon {
             topicName = meta?.metadata?.topic;
             console.log('topic:', topicName);
         }
-        if (topicName && !(0, lodash_1.isEmpty)(topicName)) {
+        if (topicName && !(0, isEmpty_1.default)(topicName)) {
             const topic = exports.pubSub.topic(topicName);
             await topic.setMetadata({ labels: { date: topicName.split('__')[1] } });
             return topic;
@@ -59,5 +74,15 @@ class GcfCommon {
             return JSON.parse(meta?.metadata?.options ?? '{}');
         }
     }
+    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 async getSecrets(names, versions) {
+        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx])));
+    }
 }
 exports.GcfCommon = GcfCommon;

package/index.ts

@@ -1,6 +1,8 @@
-import {isEmpty, noop} from 'lodash';
-import {File, Storage} from "@google-cloud/storage";
 import {PubSub} from "@google-cloud/pubsub";
+import {SecretManagerServiceClient} from "@google-cloud/secret-manager";
+import {File, Storage} from "@google-cloud/storage";
+import isEmpty from "lodash-es/isEmpty";
+import noop from "lodash-es/noop";
 import {timeoutAfter} from "./utils";
 
 export type TEvent = {
@@ -45,6 +47,7 @@ export type TResponse = {
 
 export const pubSub = new PubSub();
 export const storage = new Storage();
+const secretClient = new SecretManagerServiceClient();
 
 export class GcfCommon {
 
@@ -118,4 +121,16 @@ export class GcfCommon {
             return JSON.parse(meta?.metadata?.options ?? '{}');
         }
     }
+
+    static async getSecret(name: string, version?: string) {
+        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 async getSecrets(names: string[], versions?: string[]) {
+        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx])));
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.8.1",
+  "version": "0.11.0",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -17,13 +17,14 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^2.18.4",
-    "@google-cloud/storage": "^5.17.0",
-    "lodash": "^4.17.21"
+    "@google-cloud/pubsub": "^2.18.5",
+    "@google-cloud/secret-manager": "^3.10.1",
+    "@google-cloud/storage": "^5.18.1",
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.178",
-    "@tsconfig/node14": "^1.0.1"
+    "@tsconfig/node14": "^1.0.1",
+    "@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": "ES2020",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
     "lib": [
       "ES2018",
       "ES2019",
       "ES2020",
       "ES2021",
       "ESNext"
-    ],
-    "types": [],
-    "plugins": []
+    ]
   },
   "exclude": [
     "node_modules/**",

package/utils.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.A1ToColNum = exports.A1ToIndex = exports.colNumToA1 = 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(() => {
@@ -9,24 +13,30 @@ async function timeoutAfter(seconds = 540) {
     });
 }
 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;
@@ -37,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;