gcf-common-lib 0.5.3 → 0.6.0

package/index.js

@@ -73,14 +73,16 @@ var GcfCommon = /** @class */ (function () {
                         });
                     }); })
                         .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                        var dataJSON;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
+                        var fname, dataJSON;
+                        var _a, _b;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
                                 case 0:
-                                    dataJSON = { error: { name: err.name, message: err.message, stack: err.stack } };
+                                    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:
-                                    _a.sent();
+                                    _c.sent();
                                     throw err;
                             }
                         });
@@ -117,34 +119,60 @@ var GcfCommon = /** @class */ (function () {
      * @param {!Object} context Metadata for the event.
      */
     GcfCommon.getTopic = function (event, context) {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var pubSub, topicName, storage, file, meta, topic;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_d) {
+                switch (_d.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];
+                        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 = (_c.sent())[0];
-                        topicName = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _b === void 0 ? void 0 : _b.topic;
+                        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);
-                        _c.label = 2;
+                        _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:
-                        _c.sent();
+                        _d.sent();
                         return [2 /*return*/, topic];
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     */
+    GcfCommon.getOptions = function (event, context) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function () {
+            var storage, file, meta;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        if (!((_a = event === null || event === void 0 ? void 0 : event.metadata) === null || _a === void 0 ? void 0 : _a.options)) return [3 /*break*/, 1];
+                        return [2 /*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 : '{}')];
+                    case 1:
+                        storage = new storage_1.Storage();
+                        file = storage.bucket(event.bucket).file(event.name);
+                        return [4 /*yield*/, file.getMetadata()];
+                    case 2:
+                        meta = (_f.sent())[0];
+                        return [2 /*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 : '{}')];
+                }
+            });
+        });
+    };
     /**
      *
      * @param s Google function time limit (max: 9 min)
@@ -161,6 +189,44 @@ var GcfCommon = /** @class */ (function () {
             });
         });
     };
+    //
+    GcfCommon.indexToA1 = function (idx) {
+        return this.colNumToA1(idx + 1);
+    };
+    GcfCommon.colNumToA1 = function (columnNumber) {
+        var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        // To store result (Excel column name)
+        var charIdxArr = [];
+        while (columnNumber > 0) {
+            // Find remainder
+            var 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 { // 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(function (n) { return chars[n]; }).join('');
+    };
+    GcfCommon.A1ToIndex = function (value) {
+        return this.A1ToColNum(value) - 1;
+    };
+    GcfCommon.A1ToColNum = function (value) {
+        var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        var result = 0;
+        // tslint:disable-next-line:prefer-for-of
+        for (var i = 0; i < value.length; i++) {
+            result *= chars.length;
+            result += chars.indexOf(value[i]) + 1;
+        }
+        return result;
+    };
     return GcfCommon;
 }());
 exports.GcfCommon = GcfCommon;

package/index.ts

@@ -21,7 +21,8 @@ export class GcfCommon {
                 await this.publish(event, context, res ?? {});
             })
             .catch(async (err: Error) => {
-                const dataJSON = {error: {name: err.name, message: err.message, stack: err.stack}};
+                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;
             })
@@ -49,9 +50,9 @@ export class GcfCommon {
         const pubSub = new PubSub();
 
         /** t_{GUID}__{YYYY-MM-DD} */
-        let topicName: string | undefined;
+        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();
@@ -66,6 +67,22 @@ export class GcfCommon {
         }
     }
 
+    /**
+     *
+     * @param {!Object} event Event payload.
+     * @param {!Object} context Metadata for the event.
+     */
+    static async getOptions(event, context) {
+        if (event?.metadata?.options) {
+            return JSON.parse(event?.metadata?.options ?? '{}');
+        } else {
+            const storage = new Storage();
+            const file: File = storage.bucket(event.bucket).file(event.name);
+            const [meta] = await file.getMetadata();
+            return JSON.parse(meta?.metadata?.options ?? '{}');
+        }
+    }
+
     /**
      *
      * @param s Google function time limit (max: 9 min)
@@ -77,4 +94,50 @@ export class GcfCommon {
             }, s * 1000);
         });
     }
+
+    //
+
+    static indexToA1(idx: number) {
+        return this.colNumToA1(idx + 1);
+    }
+
+    static colNumToA1(columnNumber: number) {
+        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+        // To store result (Excel column name)
+        const charIdxArr: number[] = [];
+
+        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 { // 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('');
+    }
+
+    static A1ToIndex(value: string) {
+        return this.A1ToColNum(value) - 1;
+    }
+
+    static A1ToColNum(value: string) {
+        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;
+        }
+        return result;
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "publishConfig": { "access": "public", "branches": ["master"] },
   "engines": {},
   "scripts": {