gcf-common-lib 0.34.0 → 0.36.0

package/src/index.js

@@ -1,189 +1,191 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-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 = exports.MongoDb = exports.RxJs = exports.PubSub = exports.Storage = void 0;
-const pubsub_1 = require("@google-cloud/pubsub");
-const storage_1 = require("@google-cloud/storage");
-const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-const mapValues_1 = __importDefault(require("lodash/mapValues"));
-const noop_1 = __importDefault(require("lodash/noop"));
-const rxjs_1 = require("rxjs");
-const amqp_helper_1 = require("./amqp-helper");
-const utils_1 = require("./utils");
-exports.Storage = __importStar(require("@google-cloud/storage"));
-exports.PubSub = __importStar(require("@google-cloud/pubsub"));
-exports.RxJs = __importStar(require("rxjs"));
-exports.MongoDb = __importStar(require("mongodb"));
-__exportStar(require("./types"), exports);
-__exportStar(require("./utils"), exports);
-__exportStar(require("./mongo-helper"), exports);
-__exportStar(require("./amqp-helper"), exports);
-exports.pubSub = new pubsub_1.PubSub();
-exports.storage = new storage_1.Storage();
-// export const secretClient = new SecretManagerServiceClient();
-class GcfCommon {
-    constructor() { }
-    static amqpOptions = {
-        assertExchange: { durable: true, autoDelete: false },
-        assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
-        publishOptions: { persistent: true },
-    };
-    static async process(payload, handler, timeoutSec = 535) {
-        const asyncHandler = async (p) => await handler(p);
-        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler({ ...payload }))).pipe((0, rxjs_1.first)(), (0, rxjs_1.timeout)({ first: (0, utils_1.ms)({ s: timeoutSec }) })))
-            .then(async (res) => {
-            // console.log('res:', res);
-            await this.response({ ...payload }, res).catch(noop_1.default);
-            return res;
-        })
-            .catch(async (error) => {
-            await this.response({ ...payload }, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
-            throw error;
-        });
-    }
-    static buildResponse(error) {
-        return {
-            error: {
-                name: error.name,
-                message: `GCF [${process?.env?.K_SERVICE ?? 'UNKNOWN'}]: ${error.message}`,
-                stack: error.stack,
-            },
-        };
-    }
-    static async response(payload, json, attributes) {
-        // console.time('safeGetAttributes');
-        // const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
-        //   event,
-        //   context,
-        //   ['consumer_id', 'topic', 'exchange', 'queue'],
-        // );
-        // console.timeEnd('safeGetAttributes');
-        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(payload);
-        //
-        console.time('publish');
-        if (topic && !(0, isEmpty_1.default)(topic)) {
-            console.log('send:', topic, app_id, env, json, attributes);
-            await exports.pubSub.topic(topic).publishMessage({
-                json: json ?? {},
-                attributes: {
-                    ...(0, mapValues_1.default)(attributes ?? {}, v => '' + v),
-                    consumer_id: consumer_id ?? '',
-                    request_id: request_id ?? '',
-                    app_id: app_id ?? '',
-                    env: env ?? '',
-                },
-            });
-        }
-        if (exchange && !(0, isEmpty_1.default)(exchange)) {
-            console.log('send:', exchange, queue, app_id, env, json, attributes);
-            await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
-                await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-                await amqp_helper_1.AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
-                    ...this.amqpOptions.publishOptions,
-                    correlationId: request_id,
-                });
-            }, this.amqpOptions.url);
-        }
-        else if (queue && !(0, isEmpty_1.default)(queue)) {
-            console.log('send:', queue, app_id, env, json, attributes);
-            await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
-                // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                await amqp_helper_1.AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
-                    ...this.amqpOptions.publishOptions,
-                    correlationId: request_id,
-                });
-            }, this.amqpOptions.url);
-        }
-        console.timeEnd('publish');
-    }
-    // static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
-    //   let metaOrAttr = this.getMetadataOrAttribute(event, context);
-    //   // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
-    //
-    //   const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
-    //   // if no prop then check file metadata
-    //   if (!someProp && context?.resource?.type === 'storage#object') {
-    //     console.log('get metadata from file');
-    //     if (context?.eventType === 'google.storage.object.finalize') {
-    //       const gsEvent = event as TGSEvent;
-    //       const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-    //       metaOrAttr = meta?.metadata ?? {};
-    //     }
-    //   }
-    //
-    //   return {
-    //     ...metaOrAttr,
-    //     app_id: metaOrAttr.app_id,
-    //     request_id: metaOrAttr.request_id,
-    //   } as TMetadataOrAttributes;
-    // }
-    static async getOptions(payload) {
-        // const { options } = await this.safeGetAttributes(event, context, ['options']);
-        const { options } = this.getMetadataOrAttribute(payload);
-        return (0, utils_1.safeJsonParse)(options, {});
-    }
-    static getMetadataOrAttribute(payload) {
-        let metadataOrAttribute;
-        if (payload?.context) {
-            switch (payload?.context?.eventType) {
-                case 'google.storage.object.finalize': {
-                    const gsEvent = payload?.event;
-                    metadataOrAttribute = gsEvent?.metadata;
-                    break;
-                }
-                case 'google.pubsub.topic.publish': {
-                    const psEvent = payload?.event;
-                    metadataOrAttribute = psEvent?.attributes;
-                    break;
-                }
-            }
-        }
-        else if (payload?.request) {
-            metadataOrAttribute = this.getRequestMessage(payload.request)?.attributes;
-        }
-        // console.log('metadataOrAttribute:', metadataOrAttribute);
-        return metadataOrAttribute ?? {};
-    }
-    static getRequestMessage(request) {
-        return request.body.message;
-    }
-}
-exports.GcfCommon = GcfCommon;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+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 = exports.MongoDb = exports.RxJs = exports.PubSub = exports.Storage = void 0;
+const pubsub_1 = require("@google-cloud/pubsub");
+const storage_1 = require("@google-cloud/storage");
+const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const mapValues_1 = __importDefault(require("lodash/mapValues"));
+const noop_1 = __importDefault(require("lodash/noop"));
+const utils_1 = require("./utils");
+exports.Storage = __importStar(require("@google-cloud/storage"));
+exports.PubSub = __importStar(require("@google-cloud/pubsub"));
+exports.RxJs = __importStar(require("rxjs"));
+exports.MongoDb = __importStar(require("mongodb"));
+__exportStar(require("./types"), exports);
+__exportStar(require("./utils"), exports);
+__exportStar(require("./mongo-helper"), exports);
+// export * from './amqp-helper.ts';
+exports.pubSub = new pubsub_1.PubSub();
+exports.storage = new storage_1.Storage();
+exports.GcfCommon = {
+    // amqpOptions: {
+    //   assertExchange: { durable: true, autoDelete: false },
+    //   assertOptions: { durable: true, autoDelete: true, expires: ms({ d: 1 }) },
+    //   publishOptions: { persistent: true },
+    // } as {
+    //   url?: string;
+    //   assertExchange?: Options.AssertExchange;
+    //   assertOptions?: Options.AssertQueue;
+    //   publishOptions?: Options.Publish;
+    // },
+    async process(payload, handler) {
+        const asyncHandler = async (p) => await handler(p);
+        // return firstValueFrom(
+        //   defer(() => from(asyncHandler({ ...payload }))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
+        // )
+        return asyncHandler({ ...payload })
+            .then(async (res) => {
+            // console.log('res:', res);
+            await exports.GcfCommon.response({ ...payload }, res).catch(noop_1.default);
+            return res;
+        })
+            .catch(async (error) => {
+            await exports.GcfCommon.response({ ...payload }, exports.GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            throw error;
+        });
+    },
+    buildResponse(error) {
+        return {
+            error: {
+                name: error.name,
+                message: `GCF [${process?.env?.K_SERVICE ?? 'UNKNOWN'}]: ${error.message}`,
+                stack: error.stack,
+            },
+        };
+    },
+    async response(payload, json, attributes) {
+        // console.time('safeGetAttributes');
+        // const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await GcfCommon.safeGetAttributes(
+        //   event,
+        //   context,
+        //   ['consumer_id', 'topic', 'exchange', 'queue'],
+        // );
+        // console.timeEnd('safeGetAttributes');
+        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = exports.GcfCommon.getMetadataOrAttribute(payload);
+        //
+        console.time('publish');
+        if (topic && !(0, isEmpty_1.default)(topic)) {
+            console.log('send:', topic, app_id, env, json, attributes);
+            await exports.pubSub.topic(topic).publishMessage({
+                json: json ?? {},
+                attributes: {
+                    ...(0, mapValues_1.default)(attributes ?? {}, v => '' + v),
+                    consumer_id: consumer_id ?? '',
+                    request_id: request_id ?? '',
+                    app_id: app_id ?? '',
+                    env: env ?? '',
+                },
+            });
+        }
+        // if (exchange && !isEmpty(exchange)) {
+        //   console.log('send:', exchange, queue, app_id, env, json, attributes);
+        //   await AmqpHelper.withAmqpCh(async ch => {
+        //     await ch.assertExchange(exchange, 'direct', GcfCommon.amqpOptions.assertExchange);
+        //     await AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
+        //       ...GcfCommon.amqpOptions.publishOptions,
+        //       correlationId: request_id,
+        //     });
+        //   }, GcfCommon.amqpOptions.url as string);
+        // } else if (queue && !isEmpty(queue)) {
+        //   console.log('send:', queue, app_id, env, json, attributes);
+        //   await AmqpHelper.withAmqpCh(async ch => {
+        //     // await ch.assertQueue(queue, GcfCommon.amqpOptions.assertOptions);
+        //     await AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
+        //       ...GcfCommon.amqpOptions.publishOptions,
+        //       correlationId: request_id,
+        //     });
+        //   }, GcfCommon.amqpOptions.url as string);
+        // }
+        console.timeEnd('publish');
+    },
+    // async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
+    //   let metaOrAttr = GcfCommon.getMetadataOrAttribute(event, context);
+    //   // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+    //
+    //   const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
+    //   // if no prop then check file metadata
+    //   if (!someProp && context?.resource?.type === 'storage#object') {
+    //     console.log('get metadata from file');
+    //     if (context?.eventType === 'google.storage.object.finalize') {
+    //       const gsEvent = event as TGSEvent;
+    //       const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
+    //       metaOrAttr = meta?.metadata ?? {};
+    //     }
+    //   }
+    //
+    //   return {
+    //     ...metaOrAttr,
+    //     app_id: metaOrAttr.app_id,
+    //     request_id: metaOrAttr.request_id,
+    //   } as TMetadataOrAttributes;
+    // },
+    async getOptions(payload) {
+        // const { options } = await GcfCommon.safeGetAttributes(event, context, ['options']);
+        const { options } = exports.GcfCommon.getMetadataOrAttribute(payload);
+        return (0, utils_1.safeJsonParse)(options, {});
+    },
+    getMetadataOrAttribute(payload) {
+        let metadataOrAttribute;
+        if (payload?.context) {
+            switch (payload?.context?.eventType) {
+                case 'google.storage.object.finalize': {
+                    const gsEvent = payload?.event;
+                    metadataOrAttribute = gsEvent?.metadata;
+                    break;
+                }
+                case 'google.pubsub.topic.publish': {
+                    const psEvent = payload?.event;
+                    metadataOrAttribute = psEvent?.attributes;
+                    break;
+                }
+            }
+        }
+        else if (payload?.request) {
+            metadataOrAttribute = exports.GcfCommon.getRequestMessage(payload.request)?.attributes;
+        }
+        // console.log('metadataOrAttribute:', metadataOrAttribute);
+        return metadataOrAttribute ?? {};
+    },
+    getRequestMessage(request) {
+        return request.body.message;
+    },
+};