From 8c1af7436e9d3314d020fafc4bc0526876ddd902 Mon Sep 17 00:00:00 2001 From: Paramjeet Date: Fri, 23 Jun 2023 17:13:42 +0530 Subject: [PATCH 1/2] feat: added traceId, reqStartTime support in meta --- lib/rabbit.d.ts | 7 ++++++- lib/rabbit.js | 24 ++++++++++++++++++++---- src/rabbit.ts | 15 ++++++++++++++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/lib/rabbit.d.ts b/lib/rabbit.d.ts index 590b2ea..f548b46 100644 --- a/lib/rabbit.d.ts +++ b/lib/rabbit.d.ts @@ -17,6 +17,8 @@ interface SubscribeCallbackArgs { replyTo: any; rKey: string; correlationId: any; + traceId: any; + reqStartTime: any; ack: () => void; nack: () => void; } @@ -115,11 +117,14 @@ declare class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId + * @param {Object} extra - extra message properties like traceId, reqStartTime + * @param {string} extra.traceId + * @param {string} extra.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname: string, message: Record, options: Options.Publish, handle?: boolean): Promise; + send(qname: string, message: Record, options: Options.Publish, extra?: Record, handle?: boolean): Promise; /** * Get a message from a queue, just get it * diff --git a/lib/rabbit.js b/lib/rabbit.js index bfa3cee..2e121be 100644 --- a/lib/rabbit.js +++ b/lib/rabbit.js @@ -8,6 +8,12 @@ const safely_parse_json_1 = __importDefault(require("safely-parse-json")); * @class Rabbit */ class Rabbit { + name; + emitter; + config; + queues; + client; + channel; /** * @param {string} name - unique name to this service * @param {EventEmitter} emitter @@ -206,10 +212,12 @@ class Rabbit { this.log(`Subscribin to ${qid}`); return ch.consume(qid, msg => { const message = { - content: safely_parse_json_1.default(msg.content.toString()), + content: (0, safely_parse_json_1.default)(msg.content.toString()), replyTo: msg.properties.replyTo, rKey: msg.fields.routingKey, correlationId: msg.properties.correlationId, + traceId: msg.properties.headers.traceId, + reqStartTime: msg.properties.headers.reqStartTime, ack: () => { q.channel.ack(msg); }, @@ -269,11 +277,19 @@ class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId + * @param {Object} extra - extra message properties like traceId, reqStartTime + * @param {string} extra.traceId + * @param {string} extra.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname, message, options, handle = true) { + send(qname, message, options, extra = {}, handle = true) { + options.headers = { + ...options.headers, + traceId: extra.traceId, + reqStartTime: extra.reqStartTime + }; const p = this.channel.sendToQueue(qname, message, options); if (handle === false) { return p; @@ -301,8 +317,8 @@ class Rabbit { if (message === false) { throw new Error(`No message on ${qname}`); } - return safely_parse_json_1.default(message.content.toString()); + return (0, safely_parse_json_1.default)(message.content.toString()); } } module.exports = Rabbit; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../src/rabbit.ts"],"names":[],"mappings":";;;;AACA,sFAAyG;AACzG,0EAAyC;AAwBzC;;GAEG;AACH,MAAM,MAAM;IAOV;;;;OAIG;IACH,YAAY,IAAY,EAAE,OAAqB,EAAE,MAAoB;QACnE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,CAAC,MAAM,GAAG;YACZ,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,IAAI,EAAE,IAAI;YACV,GAAG,MAAM;YACT,IAAI,EAAE;gBACJ,0BAA0B,EAAE,CAAC;gBAC7B,sBAAsB,EAAE,CAAC;gBACzB,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI;aACvB;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,kCAAkC;QACpD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,2BAA2B;IAClD,CAAC;IAED,GAAG,CAAC,OAAe,EAAE,IAAU;QAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YACvB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO;YACP,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAe,EAAE,IAAU;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI;SAClC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAU,EAAE,IAAU;QAC1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,IAAI;YACJ,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS;YAC9C,GAAG,MAAM,CAAC,IAAI,GAAG;YACjB,GAAG,MAAM,CAAC,QAAQ,GAAG;YACrB,GAAG,IAAI,GAAG;YACV,GAAG,MAAM,CAAC,IAAI,EAAE,CACjB,CAAC,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACxB,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI;SACL,CAAC;QACF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE;gBACxB,IAAI;aACL,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,iCAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC5C,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;gBAC9B,MAAM,OAAO,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC5B,OAAO,CAAC,UAAU,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;gBACnC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC7B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAqB;QAC/B,MAAM,IAAI,GAAsB;YAC9B,IAAI,EAAE,IAAI;YACV,GAAG,EAAE;SACN,CAAC;QAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;YAC9B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACxB,IAAI,GAAG,EAAE;oBACP,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;wBACd,WAAW;qBACZ,CAAC,CAAC;iBACJ;gBACD,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACxB,IAAI,GAAG,EAAE;oBACP,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;wBACd,WAAW;qBACZ,CAAC,CAAC;iBACJ;gBACD,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,WAAW,6BAA6B,CAAC,CAAC;gBACrE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;oBAChB,WAAW;oBACX,cAAc,EAAE,OAAO;iBACxB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACzB,MAAM,OAAO,GAAG,IAAI,WAAW,qBAAqB,CAAC;gBACrD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;oBAChB,WAAW;iBACZ,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;MAIE;IACF,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,qBAAqB;QACrB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YAC/C,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;YACzB,OAAO,IAAI,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;MASE;IACF,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,EAAwB;QAC3D,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,KAAK;YACjB,GAAG,EAAE;SACN,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;YACrC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,SAAS,KAAK,CAAC,EAAkB;gBACtC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACf,iBAAiB;gBACjB,OAAO,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;oBAC9C,MAAM,OAAO,GAAG,IAAI,SAAS,iBAAiB;wBAC1C,IAAI,CAAC,CAAC,aAAa,gBAAgB,CAAC,CAAC,YAAY,WAAW,CAAC;oBACjE,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;wBAChB,SAAS;wBACT,aAAa,EAAE,CAAC,CAAC,aAAa;wBAC9B,YAAY,EAAE,CAAC,CAAC,YAAY;qBAC7B,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;QACzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAGD;;;;;;;MAOE;IACF,SAAS,CAAC,GAAW,EAAE,EAAyC;QAC9D,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAkB,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC;YACjC,OAAO,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBAC3B,MAAM,OAAO,GAAG;oBACd,OAAO,EAAE,2BAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACzC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO;oBAC/B,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU;oBAC3B,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,aAAa;oBAC3C,GAAG,EAAE,GAAG,EAAE;wBACR,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrB,CAAC;oBACD,IAAI,EAAE,GAAG,EAAE;wBACT,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACtB,CAAC;iBACF,CAAC;gBACF,EAAE,CAAC,OAAO,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,GAAW;QAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,aAAa;QACb,MAAM,OAAO,GAAY,CAAC,CAAC,OAAO,CAAC,QAAmB,CAAC;QACvD,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;MAWE;IACF,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,OAAgC,EAAE,OAAwB,EAAE,MAAM,GAAG,IAAI;QAClG,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,OAAO,CAAC,CAAC;SACV;QACD,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAClB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;gBACd,SAAS,EAAE,GAAG;gBACd,OAAO;gBACP,OAAO;aACR,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;;;MAWE;IACF,IAAI,CAAC,KAAa,EAAE,OAAgC,EAAE,OAAwB,EAAE,MAAM,GAAG,IAAI;QAC3F,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,MAAM,KAAK,KAAK,EAAE;YACpB,OAAO,CAAC,CAAC;SACV;QAED,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACnB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACb,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;gBACd,SAAS,EAAE,KAAK;gBAChB,OAAO;gBACP,OAAO;aACR,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;MAME;IACF,KAAK,CAAC,UAAU,CAAI,KAAa;QAC/B,aAAa;QACb,MAAM,OAAO,GAAY,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,IAAI,OAAO,KAAK,KAAK,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC;SAC3C;QACD,OAAO,2BAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;CACF;AAED,iBAAS,MAAM,CAAC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../src/rabbit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/rabbit.ts b/src/rabbit.ts index 4e37673..4767d33 100644 --- a/src/rabbit.ts +++ b/src/rabbit.ts @@ -20,6 +20,8 @@ interface SubscribeCallbackArgs { replyTo: any; rKey: string; correlationId: any; + traceId: any; + reqStartTime: any; ack: () => void; nack: () => void; } @@ -251,6 +253,8 @@ class Rabbit { replyTo: msg.properties.replyTo, rKey: msg.fields.routingKey, correlationId: msg.properties.correlationId, + traceId: msg.properties.headers.traceId, + reqStartTime: msg.properties.headers.reqStartTime, ack: () => { q.channel.ack(msg); }, @@ -313,11 +317,20 @@ class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId + * @param {Object} extra - extra message properties like traceId, reqStartTime + * @param {string} extra.traceId + * @param {string} extra.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname: string, message: Record, options: Options.Publish, handle = true) { + send(qname: string, message: Record, options: Options.Publish, extra: Record = {}, handle = true) { + options.headers = { + ...options.headers, + traceId: extra.traceId, + reqStartTime: extra.reqStartTime + }; + const p = this.channel.sendToQueue(qname, message, options); if (handle === false) { return p; From 2e79b30192aea1a6ef963b92cc7a8ba018914851 Mon Sep 17 00:00:00 2001 From: Paramjeet Date: Mon, 26 Jun 2023 17:13:58 +0530 Subject: [PATCH 2/2] feat: added request meta support --- lib/rabbit.d.ts | 11 +++++------ lib/rabbit.js | 18 ++++++++---------- src/rabbit.ts | 19 ++++++++----------- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/lib/rabbit.d.ts b/lib/rabbit.d.ts index f548b46..0fe7306 100644 --- a/lib/rabbit.d.ts +++ b/lib/rabbit.d.ts @@ -17,8 +17,7 @@ interface SubscribeCallbackArgs { replyTo: any; rKey: string; correlationId: any; - traceId: any; - reqStartTime: any; + meta: any; ack: () => void; nack: () => void; } @@ -117,14 +116,14 @@ declare class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId - * @param {Object} extra - extra message properties like traceId, reqStartTime - * @param {string} extra.traceId - * @param {string} extra.reqStartTime - the time when request initiated in our system + * @param {Object} meta - meta contains message properties like traceId, reqStartTime + * @param {string} meta.traceId + * @param {string} meta.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname: string, message: Record, options: Options.Publish, extra?: Record, handle?: boolean): Promise; + send(qname: string, message: Record, options: Options.Publish, meta?: Record, handle?: boolean): Promise; /** * Get a message from a queue, just get it * diff --git a/lib/rabbit.js b/lib/rabbit.js index 2e121be..020c3f8 100644 --- a/lib/rabbit.js +++ b/lib/rabbit.js @@ -209,15 +209,14 @@ class Rabbit { subscribe(qid, cb) { const q = this.queues[qid]; return q.channel.addSetup((ch) => { - this.log(`Subscribin to ${qid}`); + this.log(`Subscribing to ${qid}`); return ch.consume(qid, msg => { const message = { content: (0, safely_parse_json_1.default)(msg.content.toString()), replyTo: msg.properties.replyTo, rKey: msg.fields.routingKey, correlationId: msg.properties.correlationId, - traceId: msg.properties.headers.traceId, - reqStartTime: msg.properties.headers.reqStartTime, + meta: msg.properties.headers, ack: () => { q.channel.ack(msg); }, @@ -277,18 +276,17 @@ class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId - * @param {Object} extra - extra message properties like traceId, reqStartTime - * @param {string} extra.traceId - * @param {string} extra.reqStartTime - the time when request initiated in our system + * @param {Object} meta - meta contains message properties like traceId, reqStartTime + * @param {string} meta.traceId + * @param {string} meta.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname, message, options, extra = {}, handle = true) { + send(qname, message, options, meta = {}, handle = true) { options.headers = { ...options.headers, - traceId: extra.traceId, - reqStartTime: extra.reqStartTime + ...meta, }; const p = this.channel.sendToQueue(qname, message, options); if (handle === false) { @@ -321,4 +319,4 @@ class Rabbit { } } module.exports = Rabbit; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../src/rabbit.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../src/rabbit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/rabbit.ts b/src/rabbit.ts index 4767d33..ae8089a 100644 --- a/src/rabbit.ts +++ b/src/rabbit.ts @@ -20,8 +20,7 @@ interface SubscribeCallbackArgs { replyTo: any; rKey: string; correlationId: any; - traceId: any; - reqStartTime: any; + meta: any; ack: () => void; nack: () => void; } @@ -246,15 +245,14 @@ class Rabbit { subscribe(qid: string, cb: (args: SubscribeCallbackArgs) => void) { const q = this.queues[qid]; return q.channel.addSetup((ch: ConfirmChannel) => { - this.log(`Subscribin to ${qid}`); + this.log(`Subscribing to ${qid}`); return ch.consume(qid, msg => { const message = { content: safeJSON(msg.content.toString()), replyTo: msg.properties.replyTo, rKey: msg.fields.routingKey, correlationId: msg.properties.correlationId, - traceId: msg.properties.headers.traceId, - reqStartTime: msg.properties.headers.reqStartTime, + meta: msg.properties.headers, ack: () => { q.channel.ack(msg); }, @@ -317,18 +315,17 @@ class Rabbit { * @param {Object} options - the name of the reply queue, correlationId * @param {string} options.replyTo - the name of reply queue * @param {string} options.correlationId - * @param {Object} extra - extra message properties like traceId, reqStartTime - * @param {string} extra.traceId - * @param {string} extra.reqStartTime - the time when request initiated in our system + * @param {Object} meta - meta contains message properties like traceId, reqStartTime + * @param {string} meta.traceId + * @param {string} meta.reqStartTime - the time when request initiated in our system * @param {boolean} handle=true - handle the effect to * * @return {Promise} */ - send(qname: string, message: Record, options: Options.Publish, extra: Record = {}, handle = true) { + send(qname: string, message: Record, options: Options.Publish, meta: Record = {}, handle = true) { options.headers = { ...options.headers, - traceId: extra.traceId, - reqStartTime: extra.reqStartTime + ...meta, }; const p = this.channel.sendToQueue(qname, message, options);