gcf-common-lib 0.11.0 → 0.13.0

package/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 };
 };
@@ -7,8 +16,8 @@ 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 isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
-const noop_1 = __importDefault(require("lodash-es/noop"));
+const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const noop_1 = __importDefault(require("lodash/noop"));
 const utils_1 = require("./utils");
 exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
@@ -21,68 +30,103 @@ 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).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 !== 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,
+                    },
+                };
+                const attr = {
+                    error: {
+                        name: err.name,
+                        message: `GCF [${fname}]: ${err.message}`,
+                    },
+                };
+                yield this.publish(event, context, response, attr).catch(noop_1.default);
+                throw err;
+            }));
         });
     }
-    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 publish(event, context, json, attributes) {
+        var _a, _b;
+        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,
+                    attributes: Object.assign(Object.assign({}, attributes), { requestId: (_b = (_a = event) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b.requestId, type: 'response', response: true }),
+                });
+            }
+        });
     }
-    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 getTopic(event, context) {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function* () {
+            /** t_{GUID}__{YYYY-MM-DD} */
+            let topicName;
+            if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
+                const gsEvent = event;
+                topicName = (_a = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.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(gsEvent.bucket).file(gsEvent.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);
+                }
+            }
+            else if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.pubsub.topic.publish') {
+                const psEvent = event;
+                topicName = (_e = (_d = psEvent.attributes) === null || _d === void 0 ? void 0 : _d.topic) !== null && _e !== void 0 ? _e : (_f = psEvent.data) === null || _f === void 0 ? void 0 : _f.topic;
+            }
+            if (topicName && !(0, isEmpty_1.default)(topicName)) {
+                const topic = exports.pubSub.topic(topicName);
+                yield topic.setMetadata({ labels: { date: topicName.split('__')[1] } });
+                return topic;
+            }
+        });
     }
-    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 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 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 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 getSecrets(names, versions) {
-        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx])));
+    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]); })));
+        });
     }
 }
 exports.GcfCommon = GcfCommon;

package/index.ts

@@ -1,11 +1,11 @@
 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 isEmpty from "lodash/isEmpty";
+import noop from "lodash/noop";
 import {timeoutAfter} from "./utils";
 
-export type TEvent = {
+export type TGSEvent = {
     bucket: string;
     contentType: string;
     crc32c: string;
@@ -26,14 +26,22 @@ export type TEvent = {
     updated: string;
 }
 
+export type TPSEvent = {
+    '@type': string; // 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
+    attributes?: { [k: string]: any };
+    data?: string | { [k: string]: any };
+}
+
+export type TEvent = TGSEvent | TPSEvent;
+
 export type TContext = {
     eventId: string;
     timestamp: string;
-    eventType: string; // 'google.storage.object.finalize'
+    eventType: 'google.storage.object.finalize' | 'google.pubsub.topic.publish';
     resource: {
-        service: string; // 'storage.googleapis.com'
+        service: 'storage.googleapis.com' | 'pubsub.googleapis.com';
         name: string;
-        type: string; // 'storage#object'
+        type: string; // 'storage#object' | 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
     }
 }
 
@@ -81,28 +89,54 @@ export class GcfCommon {
                         stack: err.stack,
                     },
                 };
-                await this.publish(event, context, response).catch(noop);
+                const attr = {
+                    error: {
+                        name: err.name,
+                        message: `GCF [${fname}]: ${err.message}`,
+                    },
+                };
+                await this.publish(event, context, response, attr).catch(noop);
                 throw err;
             })
             ;
     }
 
-    static async publish(event: TEvent, context: TContext, json: TResponse) {
+    static async publish(event: TEvent, context: TContext, json: TResponse, attributes?: any) {
         const topic = await this.getTopic(event, context);
         console.log('publish:', topic?.name, json);
-        if (topic) return await topic.publishMessage({json});
+
+        if (topic) {
+            return await topic.publishMessage({
+                json,
+                attributes: {
+                    ...attributes,
+                    requestId: (event as TPSEvent)?.attributes?.requestId,
+                    type: 'response',
+                    response: true,
+                },
+            });
+        }
     }
 
     static async getTopic(event: TEvent, context: TContext) {
 
         /** t_{GUID}__{YYYY-MM-DD} */
-        let topicName: string | undefined = event?.metadata?.topic;
+        let topicName: string | undefined;
 
-        if (!topicName && context?.resource?.type === 'storage#object') {
-            const file: File = storage.bucket(event.bucket).file(event.name);
-            const [meta] = await file.getMetadata();
-            topicName = meta?.metadata?.topic;
-            console.log('topic:', topicName);
+        if (context?.eventType === 'google.storage.object.finalize') {
+            const gsEvent = event as TGSEvent;
+
+            topicName = gsEvent?.metadata?.topic;
+
+            if (!topicName && context?.resource?.type === 'storage#object') {
+                const file: File = storage.bucket(gsEvent.bucket).file(gsEvent.name);
+                const [meta] = await file.getMetadata();
+                topicName = meta?.metadata?.topic;
+                console.log('topic:', topicName);
+            }
+        } else if (context?.eventType === 'google.pubsub.topic.publish') {
+            const psEvent = event as TPSEvent;
+            topicName = psEvent.attributes?.topic ?? (psEvent.data as any)?.topic;
         }
 
         if (topicName && !isEmpty(topicName)) {
@@ -112,7 +146,7 @@ export class GcfCommon {
         }
     }
 
-    static async getOptions(event: TEvent, context: TContext) {
+    static async getOptions(event: TGSEvent, context: TContext) {
         if (event?.metadata?.options) {
             return JSON.parse(event?.metadata?.options ?? '{}');
         } else {

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "publishConfig": {
     "access": "public",
     "branches": [
       "master"
     ]
   },
-  "engines": {},
+  "engines": {
+    "node": "14",
+    "npm": "8"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" || exit 0"
   },
@@ -17,16 +20,15 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^2.18.5",
-    "@google-cloud/secret-manager": "^3.10.1",
-    "@google-cloud/storage": "^5.18.1",
-    "lodash-es": "^4.17.21"
+    "@google-cloud/pubsub": "^2.19.0",
+    "@google-cloud/secret-manager": "^3.11.0",
+    "@google-cloud/storage": "^5.18.2",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@tsconfig/node14": "^1.0.1",
-    "@types/lodash-es": "^4.17.6"
+    "@types/lodash": "^4.14.179"
   },
-  "keywords": [],
   "author": "alert83@gmail.com",
   "license": "MIT"
 }

package/tsconfig.json

@@ -3,6 +3,7 @@
   "extends": "@tsconfig/node14/tsconfig.json",
   "compilerOptions": {
     "moduleResolution": "node",
+    "target": "ES6",
     "lib": [
       "ES2018",
       "ES2019",

package/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.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(() => {
-            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;