gcf-common-lib 0.4.0 → 0.5.5

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,34 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Node.js Package
+on: [ push ]
+
+# on:
+#  release:
+#    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/index.js

@@ -1,112 +1,169 @@
-"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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GcfCommon = void 0;
-var storage_1 = require("@google-cloud/storage");
-var pubsub_1 = require("@google-cloud/pubsub");
-var lodash_1 = require("lodash");
-var GcfCommon = /** @class */ (function () {
-    function GcfCommon() {
-    }
-    GcfCommon.publish = function (event, context, json) {
-        return __awaiter(this, void 0, void 0, function () {
-            var topic;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getTopic(event, context)];
-                    case 1:
-                        topic = _a.sent();
-                        console.log('publish:', topic === null || topic === void 0 ? void 0 : topic.name, json);
-                        if (!topic) return [3 /*break*/, 3];
-                        return [4 /*yield*/, topic.publishMessage({ json: json })];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    GcfCommon.getTopic = function (event, context) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var pubSub, topicName, storage, file, meta, tpc;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        pubSub = new pubsub_1.PubSub();
-                        if (!(((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object')) return [3 /*break*/, 2];
-                        storage = new storage_1.Storage();
-                        file = storage.bucket(event.bucket).file(event.name);
-                        return [4 /*yield*/, file.getMetadata()];
-                    case 1:
-                        meta = (_c.sent())[0];
-                        topicName = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _b === void 0 ? void 0 : _b.topic;
-                        console.log('topic:', topicName);
-                        _c.label = 2;
-                    case 2:
-                        if ((0, lodash_1.isEmpty)(topicName))
-                            return [2 /*return*/];
-                        tpc = pubSub.topic(topicName);
-                        return [4 /*yield*/, tpc.setMetadata({ labels: { date: topicName.split('__')[1] } })];
-                    case 3:
-                        _c.sent();
-                        return [2 /*return*/, tpc];
-                }
-            });
-        });
-    };
-    /**
-     *
-     * @param s (google function limit max = 9 min)
-     */
-    GcfCommon.delay = function (s) {
-        if (s === void 0) { s = 540; }
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        setTimeout(function () {
-                            reject(new Error(s + " seconds timeout exceeded"));
-                        }, s * 1000);
-                    })];
-            });
-        });
-    };
-    return GcfCommon;
-}());
-exports.GcfCommon = GcfCommon;
+"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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GcfCommon = void 0;
+var storage_1 = require("@google-cloud/storage");
+var pubsub_1 = require("@google-cloud/pubsub");
+var lodash_1 = require("lodash");
+var GcfCommon = /** @class */ (function () {
+    function GcfCommon() {
+    }
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     * @param handler
+     * @param timeout Seconds
+     */
+    GcfCommon.process = function (event, context, handler, timeout) {
+        if (timeout === void 0) { timeout = 535; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.race([
+                        this.delay(535),
+                        handler(event, context),
+                    ])
+                        .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: 
+                                // console.log('res:', res);
+                                return [4 /*yield*/, this.publish(event, context, res !== null && res !== void 0 ? res : {})];
+                                case 1:
+                                    // console.log('res:', res);
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })
+                        .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                        var fname, dataJSON;
+                        var _a, _b;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
+                                case 0:
+                                    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';
+                                    dataJSON = { error: { name: err.name, message: "GCF [" + fname + "]: " + err.message, stack: err.stack } };
+                                    return [4 /*yield*/, this.publish(event, context, dataJSON).catch(lodash_1.noop)];
+                                case 1:
+                                    _c.sent();
+                                    throw err;
+                            }
+                        });
+                    }); })];
+            });
+        });
+    };
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     * @param json
+     */
+    GcfCommon.publish = function (event, context, json) {
+        return __awaiter(this, void 0, void 0, function () {
+            var topic;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getTopic(event, context)];
+                    case 1:
+                        topic = _a.sent();
+                        console.log('publish:', topic === null || topic === void 0 ? void 0 : topic.name, json);
+                        if (!topic) return [3 /*break*/, 3];
+                        return [4 /*yield*/, topic.publishMessage({ json: json })];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     */
+    GcfCommon.getTopic = function (event, context) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var pubSub, topicName, storage, file, meta, topic;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        pubSub = new pubsub_1.PubSub();
+                        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')) return [3 /*break*/, 2];
+                        storage = new storage_1.Storage();
+                        file = storage.bucket(event.bucket).file(event.name);
+                        return [4 /*yield*/, file.getMetadata()];
+                    case 1:
+                        meta = (_d.sent())[0];
+                        topicName = (_c = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _c === void 0 ? void 0 : _c.topic;
+                        console.log('topic:', topicName);
+                        _d.label = 2;
+                    case 2:
+                        if (!!(0, lodash_1.isEmpty)(topicName)) return [3 /*break*/, 4];
+                        topic = pubSub.topic(topicName);
+                        return [4 /*yield*/, topic.setMetadata({ labels: { date: topicName.split('__')[1] } })];
+                    case 3:
+                        _d.sent();
+                        return [2 /*return*/, topic];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     *
+     * @param s Google function time limit (max: 9 min)
+     */
+    GcfCommon.delay = function (s) {
+        if (s === void 0) { s = 540; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        setTimeout(function () {
+                            reject(new Error(s + " seconds timeout exceeded"));
+                        }, s * 1000);
+                    })];
+            });
+        });
+    };
+    return GcfCommon;
+}());
+exports.GcfCommon = GcfCommon;

package/index.ts

@@ -1,20 +1,58 @@
 import {File, Storage} from '@google-cloud/storage';
-import {PubSub} from '@google-cloud/pubsub';
-import {isEmpty} from 'lodash';
+import {PubSub, Topic} from '@google-cloud/pubsub';
+import {isEmpty, noop} from 'lodash';
 
 export class GcfCommon {
+
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     * @param handler
+     * @param timeout Seconds
+     */
+    static async process(event, context, handler: (event, context) => Promise<any>, timeout = 535) {
+        return Promise.race([
+            this.delay(535),
+            handler(event, context),
+        ])
+            .then(async (res: any) => {
+                // console.log('res:', res);
+                await this.publish(event, context, res ?? {});
+            })
+            .catch(async (err: Error) => {
+                const fname = process?.env?.K_SERVICE ?? 'UNKNOWN';
+                const dataJSON = {error: {name: err.name, message: `GCF [${fname}]: ${err.message}`, stack: err.stack}};
+                await this.publish(event, context, dataJSON).catch(noop);
+                throw err;
+            })
+            ;
+    }
+
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     * @param json
+     */
     static async publish(event, context, json) {
         const topic = await this.getTopic(event, context);
         console.log('publish:', topic?.name, json);
-        if (topic) await topic.publishMessage({json});
+        if (topic) return await topic.publishMessage({json});
     }
 
-    static async getTopic(event, context) {
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     */
+    static async getTopic(event, context): Promise<Topic | undefined> {
         const pubSub = new PubSub();
+
         /** t_{GUID}__{YYYY-MM-DD} */
-        let topicName: string;
+        let topicName: string | undefined = event?.metadata?.topic;
 
-        if (context?.resource?.type === 'storage#object') {
+        if (!topicName && context?.resource?.type === 'storage#object') {
             const storage = new Storage();
             const file: File = storage.bucket(event.bucket).file(event.name);
             const [meta] = await file.getMetadata();
@@ -22,16 +60,16 @@ export class GcfCommon {
             console.log('topic:', topicName);
         }
 
-        if (isEmpty(topicName)) return;
-
-        const tpc = pubSub.topic(topicName);
-        await tpc.setMetadata({labels: {date: topicName.split('__')[1]}});
-        return tpc;
+        if (!isEmpty(topicName)) {
+            const topic = pubSub.topic(topicName);
+            await topic.setMetadata({labels: {date: topicName.split('__')[1]}});
+            return topic;
+        }
     }
 
     /**
      *
-     * @param s (google function limit max = 9 min)
+     * @param s Google function time limit (max: 9 min)
      */
     static async delay(s: number = 540) {
         return new Promise<undefined>((resolve, reject) => {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.4.0",
+  "version": "0.5.5",
+  "publishConfig": { "access": "public", "branches": ["master"] },
   "engines": {},
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" || exit 0"
   },
   "repository": {
     "type": "git",