gcf-common-lib 0.25.38 → 0.25.40

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.25.38",
+  "version": "0.25.40",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -21,7 +21,7 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^4.0.0",
+    "@google-cloud/pubsub": "^4.0.1",
     "@google-cloud/secret-manager": "^5.0.0",
     "@google-cloud/storage": "^7.0.1",
     "amqplib": "^0.10.3",

package/src/index.js

@@ -89,11 +89,14 @@ class GcfCommon {
     }
     static publish(event, context, json, attributes) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.time('safeGetAttributes');
             const { topic, exchange, queue, appId, env, requestId } = yield this.safeGetAttributes(event, context, [
                 'topic',
                 'exchange',
                 'queue',
             ]);
+            console.timeEnd('safeGetAttributes');
+            console.time('publish');
             if (topic && !(0, isEmpty_1.default)(topic)) {
                 console.log('publish:', topic, appId, env, json, attributes);
                 return exports.pubSub.topic(topic).publishMessage({
@@ -117,15 +120,17 @@ class GcfCommon {
                     yield (0, utils_1.publishAmqp)(ch, exchange, queue !== null && queue !== void 0 ? queue : '', json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
                 }), this.amqpOptions.url);
             }
+            console.timeEnd('publish');
         });
     }
     static safeGetAttributes(event, context, props) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             let metaOrAttr = this.getMetadataOrAttribute(event, context);
-            const everyPropIsNil = props.map(prop => (0, lodash_1.get)(metaOrAttr, prop)).every(v => (0, lodash_1.isNil)(v));
+            // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+            const someProp = props.map(prop => (0, lodash_1.get)(metaOrAttr, prop)).some(v => !(0, lodash_1.isNil)(v));
             // if no prop then check file metadata
-            if (everyPropIsNil && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
+            if (!someProp && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
                 console.log('get metadata from file');
                 if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
                     const gsEvent = event;

package/src/index.ts

@@ -68,11 +68,15 @@ export class GcfCommon {
   }
 
   static async publish(event: TEvent, context: TContext, json?: TResponse, attributes?: Dict<any>) {
+    console.time('safeGetAttributes');
     const { topic, exchange, queue, appId, env, requestId } = await this.safeGetAttributes(event, context, [
       'topic',
       'exchange',
       'queue',
     ]);
+    console.timeEnd('safeGetAttributes');
+
+    console.time('publish');
 
     if (topic && !isEmpty(topic)) {
       console.log('publish:', topic, appId, env, json, attributes);
@@ -105,14 +109,17 @@ export class GcfCommon {
         await publishAmqp(ch, exchange, queue ?? '', json ?? {}, this.amqpOptions.publishOptions);
       }, this.amqpOptions.url as string);
     }
+
+    console.timeEnd('publish');
   }
 
   static async safeGetAttributes(event: TEvent, context: TContext, props: string[]) {
     let metaOrAttr = this.getMetadataOrAttribute(event, context);
-    const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+    // 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 (everyPropIsNil && context?.resource?.type === 'storage#object') {
+    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;