gcf-common-lib 0.26.59 → 0.27.60

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.26.59",
+  "version": "0.27.60",
   "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

@@ -32,14 +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 get_1 = __importDefault(require("lodash/get"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
-const isNil_1 = __importDefault(require("lodash/isNil"));
 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"));
@@ -57,10 +55,10 @@ 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) {
+        return Promise.race([(0, utils_1.timeoutAfter)(timeoutSec), handler(event, context)])
             .then(async (res) => {
             // console.log('res:', res);
             await this.publish(event, context, res);
@@ -71,6 +69,10 @@ 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: {
@@ -124,16 +126,16 @@ class GcfCommon {
     static async safeGetAttributes(event, context, props) {
         let metaOrAttr = this.getMetadataOrAttribute(event, context);
         // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
-        const someProp = props.map(prop => (0, get_1.default)(metaOrAttr, prop)).some(v => !(0, isNil_1.default)(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;
-                const [meta] = await exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                metaOrAttr = meta?.metadata ?? {};
-            }
-        }
+        // 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,

package/src/index.ts

@@ -1,16 +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 get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
-import isNil from 'lodash/isNil';
 import mapValues from 'lodash/mapValues';
 import noop from 'lodash/noop';
-import { identity } from 'rxjs';
+import { defer, first, 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';
@@ -43,15 +41,15 @@ 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)])
+    return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
       .then(async res => {
         // console.log('res:', res);
         await this.publish(event, context, res as T);
@@ -63,6 +61,16 @@ export class GcfCommon {
       });
   }
 
+  static async processRxjs<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 }) }));
+  }
+
   static buildResponse(error: Error) {
     return {
       error: {
@@ -128,17 +136,17 @@ export class GcfCommon {
   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 storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        metaOrAttr = meta?.metadata ?? {};
-      }
-    }
+    // 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,

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) {}