gcf-common-lib 0.25.51 → 0.25.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.25.51",
+  "version": "0.25.53",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -21,22 +21,22 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^4.0.1",
-    "@google-cloud/secret-manager": "^5.0.0",
-    "@google-cloud/storage": "^7.0.1",
+    "@google-cloud/pubsub": "^4.0.6",
+    "@google-cloud/secret-manager": "^5.0.1",
+    "@google-cloud/storage": "^7.3.1",
     "amqplib": "^0.10.3",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "mongodb": "^4.16.0",
+    "mongodb": "^4.17.1",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@tsconfig/node14": "^14.1.0",
-    "@types/amqplib": "^0.10.1",
-    "@types/bluebird": "^3.5.38",
-    "@types/lodash": "^4.14.197",
-    "@types/node": "^14.18.54"
+    "@types/amqplib": "^0.10.3",
+    "@types/bluebird": "^3.5.41",
+    "@types/lodash": "^4.14.200",
+    "@types/node": "^14.18.63"
   },
   "author": "alert83@gmail.com",
   "license": ""

package/src/index.js

@@ -90,11 +90,7 @@ 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',
-            ]);
+            const { topic, exchange, queue, 'app-id': appId, env, 'request-id': requestId, } = yield this.safeGetAttributes(event, context, ['topic', 'exchange', 'queue']);
             console.timeEnd('safeGetAttributes');
             //
             console.time('publish');
@@ -102,30 +98,28 @@ class GcfCommon {
                 console.log('send:', topic, appId, env, json, attributes);
                 yield exports.pubSub.topic(topic).publishMessage({
                     json: json !== null && json !== void 0 ? json : {},
-                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, v => '' + v)), { appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 
-                        //
-                        type: 'response', response: '1' }),
+                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, v => '' + v)), { 'request-id': requestId !== null && requestId !== void 0 ? requestId : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 'app-id': appId !== null && appId !== void 0 ? appId : '', appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '' }),
                 });
             }
             if (exchange && !(0, isEmpty_1.default)(exchange)) {
                 console.log('send:', exchange, queue, appId, env, json, attributes);
                 yield (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
                     yield ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-                    yield (0, utils_1.publishAmqp)(ch, exchange, queue !== null && queue !== void 0 ? queue : '', json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
+                    yield (0, utils_1.publishAmqp)(ch, exchange, queue !== null && queue !== void 0 ? queue : '', json !== null && json !== void 0 ? json : {}, Object.assign(Object.assign({}, this.amqpOptions.publishOptions), { correlationId: requestId }));
                 }), this.amqpOptions.url);
             }
             else if (queue && !(0, isEmpty_1.default)(queue)) {
                 console.log('send:', queue, appId, env, json, attributes);
                 yield (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
                     yield ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                    yield (0, utils_1.publishAmqp)(ch, undefined, queue, json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
+                    yield (0, utils_1.publishAmqp)(ch, undefined, queue, json !== null && json !== void 0 ? json : {}, Object.assign(Object.assign({}, this.amqpOptions.publishOptions), { correlationId: requestId }));
                 }), this.amqpOptions.url);
             }
             console.timeEnd('publish');
         });
     }
     static safeGetAttributes(event, context, props) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             let metaOrAttr = this.getMetadataOrAttribute(event, context);
             // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
@@ -139,7 +133,7 @@ class GcfCommon {
                     metaOrAttr = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {};
                 }
             }
-            return Object.assign(Object.assign({}, metaOrAttr), { appId: (_c = metaOrAttr.appId) !== null && _c !== void 0 ? _c : metaOrAttr['app-id'], requestId: (_d = metaOrAttr.requestId) !== null && _d !== void 0 ? _d : metaOrAttr['request-id'] });
+            return Object.assign(Object.assign({}, metaOrAttr), { 'app-id': (_c = metaOrAttr['app-id']) !== null && _c !== void 0 ? _c : metaOrAttr.appId, appId: (_d = metaOrAttr['app-id']) !== null && _d !== void 0 ? _d : metaOrAttr.appId, 'request-id': (_e = metaOrAttr['request-id']) !== null && _e !== void 0 ? _e : metaOrAttr.requestId, requestId: (_f = metaOrAttr['request-id']) !== null && _f !== void 0 ? _f : metaOrAttr.requestId });
         });
     }
     static getOptions(event, context) {

package/src/index.ts

@@ -70,11 +70,14 @@ export class GcfCommon {
   static async publish<E = TEvent>(event: E, 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',
-    ]);
+    const {
+      topic,
+      exchange,
+      queue,
+      'app-id': appId,
+      env,
+      'request-id': requestId,
+    } = await this.safeGetAttributes(event, context, ['topic', 'exchange', 'queue']);
 
     console.timeEnd('safeGetAttributes');
 
@@ -88,13 +91,12 @@ export class GcfCommon {
         json: json ?? {},
         attributes: {
           ...mapValues(attributes ?? {}, v => '' + v),
+          'request-id': requestId ?? '',
+          requestId: requestId ?? '',
+          'app-id': appId ?? '',
           appId: appId ?? '',
           env: env ?? '',
-          requestId: requestId ?? '',
-          //
-          type: 'response',
-          response: '1',
-        },
+        } as TMetadataOrAttributes,
       });
     }
 
@@ -102,13 +104,19 @@ export class GcfCommon {
       console.log('send:', exchange, queue, appId, env, json, attributes);
       await withAmqpCh(async ch => {
         await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-        await publishAmqp(ch, exchange, queue ?? '', json ?? {}, this.amqpOptions.publishOptions);
+        await publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
+          ...this.amqpOptions.publishOptions,
+          correlationId: requestId,
+        });
       }, this.amqpOptions.url as string);
     } else if (queue && !isEmpty(queue)) {
       console.log('send:', queue, appId, env, json, attributes);
       await withAmqpCh(async ch => {
         await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-        await publishAmqp(ch, undefined, queue, json ?? {}, this.amqpOptions.publishOptions);
+        await publishAmqp(ch, undefined, queue, json ?? {}, {
+          ...this.amqpOptions.publishOptions,
+          correlationId: requestId,
+        });
       }, this.amqpOptions.url as string);
     }
 
@@ -132,8 +140,10 @@ export class GcfCommon {
 
     return {
       ...metaOrAttr,
-      appId: metaOrAttr.appId ?? metaOrAttr['app-id'],
-      requestId: metaOrAttr.requestId ?? metaOrAttr['request-id'],
+      'app-id': metaOrAttr['app-id'] ?? (metaOrAttr as any).appId,
+      appId: metaOrAttr['app-id'] ?? (metaOrAttr as any).appId,
+      'request-id': metaOrAttr['request-id'] ?? (metaOrAttr as any).requestId,
+      requestId: metaOrAttr['request-id'] ?? (metaOrAttr as any).requestId,
     } as TMetadataOrAttributes;
   }
 

package/src/types.ts

@@ -31,6 +31,7 @@ export type TPSEvent<A = TMetadataOrAttributes> = {
 export type TEvent = TGSEvent | TPSEvent;
 
 export type TMetadataOrAttributes = {
+  'request-id'?: string; // for rpc response [GUID]
   topic?: string; // response PubSub topic [t_{GUID}__{YYYY-MM-DD}]
   exchange?: string; // response amqp exchange
   queue?: string; // response amqp queue
@@ -49,11 +50,8 @@ export type TMetadataOrAttributes = {
   'user-id'?: string;
   'tenant-id'?: string;
   //
-  env?: string; // app environment
-  appId?: string; // app id
   'app-id'?: string; // app id
-  requestId?: string; // for rpc response [GUID]
-  'request-id'?: string; // for rpc response [GUID]
+  env?: string; // app environment
 };
 
 export type TContext = {