gcf-common-lib 0.27.60 → 0.28.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.27.60",
+  "version": "0.28.62",
   "publishConfig": {
     "access": "public",
     "branches": [

package/src/index.js

@@ -32,12 +32,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GcfCommon = exports.secretClient = exports.storage = exports.pubSub = exports.MongoDb = exports.RxJs = exports.SecretManager = exports.PubSub = exports.Storage = 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/isEmpty"));
 const mapValues_1 = __importDefault(require("lodash/mapValues"));
 const noop_1 = __importDefault(require("lodash/noop"));
 const rxjs_1 = require("rxjs");
 const utils_1 = require("./utils");
-const storage_1 = require("@google-cloud/storage");
 exports.Storage = __importStar(require("@google-cloud/storage"));
 exports.PubSub = __importStar(require("@google-cloud/pubsub"));
 exports.SecretManager = __importStar(require("@google-cloud/secret-manager"));
@@ -58,6 +58,19 @@ class GcfCommon {
      * @param timeoutSec Seconds
      */
     static async process(event, context, handler = rxjs_1.identity, timeoutSec = 535) {
+        const asyncHandler = async (_event, _context) => await handler(_event, _context);
+        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler(event, context))).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.publish(event, context, res).catch(noop_1.default);
+            return res;
+        })
+            .catch(async (error) => {
+            await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            throw error;
+        });
+    }
+    static async processOLd(event, context, handler = rxjs_1.identity, timeoutSec = 535) {
         return Promise.race([(0, utils_1.timeoutAfter)(timeoutSec), handler(event, context)])
             .then(async (res) => {
             // console.log('res:', res);
@@ -69,10 +82,6 @@ class GcfCommon {
             throw error;
         });
     }
-    static async processRxjs(event, context, handler = rxjs_1.identity, timeoutSec = 535) {
-        const asyncHandler = async (_event, _context) => await handler(_event, _context);
-        return (0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler(event, context))).pipe((0, rxjs_1.first)(), (0, rxjs_1.timeout)({ first: (0, utils_1.ms)({ s: timeoutSec }) }));
-    }
     static buildResponse(error) {
         return {
             error: {

package/src/index.ts

@@ -1,14 +1,14 @@
 import { PubSub } from '@google-cloud/pubsub';
 import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import { Storage } from '@google-cloud/storage';
 import { Options } from 'amqplib';
 import isEmpty from 'lodash/isEmpty';
 import mapValues from 'lodash/mapValues';
 import noop from 'lodash/noop';
-import { defer, first, from, identity, timeout } from 'rxjs';
+import { defer, first, firstValueFrom, from, identity, timeout } from 'rxjs';
 import { TContext, TEvent, TGSEvent, TMetadataOrAttributes, TPSEvent, TResponse } from './types';
 import { ms, publishAmqp, timeoutAfter, withAmqpCh } from './utils';
 import Dict = NodeJS.Dict;
-import { Storage } from '@google-cloud/storage';
 
 export * as Storage from '@google-cloud/storage';
 export * as PubSub from '@google-cloud/pubsub';
@@ -49,10 +49,13 @@ export class GcfCommon {
     handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
     timeoutSec = 535,
   ) {
-    return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
+    const asyncHandler = async (_event: any, _context: any) => await handler(_event, _context);
+    return firstValueFrom(
+      defer(() => from(asyncHandler(event, context))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
+    )
       .then(async res => {
         // console.log('res:', res);
-        await this.publish(event, context, res as T);
+        await this.publish(event, context, res as T).catch(noop);
         return res;
       })
       .catch(async (error: Error) => {
@@ -61,14 +64,22 @@ export class GcfCommon {
       });
   }
 
-  static async processRxjs<T extends TResponse, E = TEvent>(
+  static async processOLd<T extends TResponse, E = TEvent>(
     event: E,
     context: TContext,
     handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
     timeoutSec = 535,
   ) {
-    const asyncHandler = async (_event: any, _context: any) => await handler(_event, _context);
-    return defer(() => from(asyncHandler(event, context))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) }));
+    return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
+      .then(async res => {
+        // console.log('res:', res);
+        await this.publish(event, context, res as T);
+        return res;
+      })
+      .catch(async (error: Error) => {
+        await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+        throw error;
+      });
   }
 
   static buildResponse(error: Error) {