gcf-common-lib 0.26.60 → 0.28.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.26.60",
+  "version": "0.28.61",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -24,13 +24,13 @@
     "@types/bluebird": "^3.5.42",
     "@types/lodash": "^4.14.201",
     "@types/node": "^16.18.61",
-    "@google-cloud/pubsub": "^4.0.7",
+    "@google-cloud/pubsub": "^4.1.1",
     "@google-cloud/secret-manager": "^5.0.1",
-    "@google-cloud/storage": "^7.6.0",
+    "@google-cloud/storage": "^7.7.0",
     "amqplib": "^0.10.3",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "mongodb": "^4.17.1",
     "rxjs": "^7.8.1"
   },

package/src/index.js

@@ -29,15 +29,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GcfCommon = exports.secretClient = exports.pubSub = exports.MongoDb = exports.RxJs = exports.SecretManager = exports.PubSub = void 0;
+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");
-// export * as Storage from '@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"));
 exports.RxJs = __importStar(require("rxjs"));
@@ -45,7 +46,7 @@ exports.MongoDb = __importStar(require("mongodb"));
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 exports.pubSub = new pubsub_1.PubSub();
-// export const storage = new Storage();
+exports.storage = new storage_1.Storage();
 exports.secretClient = new secret_manager_1.SecretManagerServiceClient();
 class GcfCommon {
     constructor() { }
@@ -54,10 +55,14 @@ class GcfCommon {
      * @param {!TEvent} event Event payload.
      * @param {!TContext} context Metadata for the event.
      * @param handler
-     * @param timeout Seconds
+     * @param timeoutSec Seconds
      */
-    static async process(event, context, handler = rxjs_1.identity, timeout = 535) {
-        return Promise.race([(0, utils_1.timeoutAfter)(timeout), handler(event, context)])
+    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 }) })));
+    }
+    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);
             await this.publish(event, context, res);

package/src/index.ts

@@ -1,15 +1,16 @@
 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 { identity } 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;
 
-// export * as Storage from '@google-cloud/storage';
+export * as Storage from '@google-cloud/storage';
 export * as PubSub from '@google-cloud/pubsub';
 export * as SecretManager from '@google-cloud/secret-manager';
 export * as RxJs from 'rxjs';
@@ -18,7 +19,7 @@ export * from './types';
 export * from './utils';
 
 export const pubSub = new PubSub();
-// export const storage = new Storage();
+export const storage = new Storage();
 export const secretClient = new SecretManagerServiceClient();
 
 export class GcfCommon {
@@ -40,15 +41,27 @@ export class GcfCommon {
    * @param {!TEvent} event Event payload.
    * @param {!TContext} context Metadata for the event.
    * @param handler
-   * @param timeout Seconds
+   * @param timeoutSec Seconds
    */
   static async process<T extends TResponse, E = TEvent>(
     event: E,
     context: TContext,
     handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
-    timeout = 535,
+    timeoutSec = 535,
   ) {
-    return Promise.race([timeoutAfter(timeout), 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 }) })),
+    );
+  }
+
+  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,
+  ) {
+    return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
       .then(async res => {
         // console.log('res:', res);
         await this.publish(event, context, res as T);

package/src/mongo-lock.js

@@ -4,11 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoLock = void 0;
-const moment_1 = __importDefault(require("moment"));
+const moment_1 = __importDefault(require("moment/moment"));
 const noop_1 = __importDefault(require("lodash/noop"));
 const rxjs_1 = require("rxjs");
 const mongo_helper_1 = require("./mongo-helper");
 const bluebird_1 = __importDefault(require("bluebird"));
+/**
+ * @deprecated
+ */
 class MongoLock {
     constructor(client) {
         this.client = client;

package/src/mongo-lock.ts

@@ -1,10 +1,13 @@
+import moment from 'moment/moment';
 import { MongoClient, MongoError } from 'mongodb';
-import moment from 'moment';
 import noop from 'lodash/noop';
 import { defer, from, identity, lastValueFrom, map, retry, switchMap, tap } from 'rxjs';
 import { MongoHelper } from './mongo-helper';
 import Bluebird from 'bluebird';
 
+/**
+ * @deprecated
+ */
 export class MongoLock {
   constructor(private client: MongoClient) {}