@opens/rabbitmq 1.1.4 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +9 -5
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -67,26 +67,30 @@ var RabbitMQ = class {
|
|
|
67
67
|
};
|
|
68
68
|
if (ttl) assertQueueOptions.arguments["x-message-ttl"] = ttl;
|
|
69
69
|
if (queueArguments) assertQueueOptions.arguments = { ...assertQueueOptions.arguments, ...queueArguments };
|
|
70
|
-
const
|
|
70
|
+
const processor = consumer ?? up ?? Promise.resolve;
|
|
71
|
+
const instrumentedProcessor = this.telemetry?.instrumentFunc(
|
|
72
|
+
{ name: params.name, type: import_observability.TRACE_TYPE.MESSAGE },
|
|
73
|
+
processor
|
|
74
|
+
);
|
|
75
|
+
const handler = async (msg) => {
|
|
71
76
|
if (!msg) return;
|
|
72
77
|
try {
|
|
73
78
|
const data = JSON.parse(msg.content.toString());
|
|
74
|
-
const
|
|
75
|
-
|
|
79
|
+
const consumerFunc = instrumentedProcessor ?? processor;
|
|
80
|
+
await consumerFunc(data, { fields: msg.fields, properties: msg.properties });
|
|
76
81
|
channel.ack(msg);
|
|
77
82
|
} catch (error) {
|
|
78
83
|
channel.nack(msg, false, false);
|
|
79
84
|
} finally {
|
|
80
85
|
}
|
|
81
86
|
};
|
|
82
|
-
const instrumentedHandler = this.telemetry?.instrumentFunc({ name: params.name, type: import_observability.TRACE_TYPE.MESSAGE }, fn);
|
|
83
87
|
const bindingKeys = Array.isArray(bindingKey) ? bindingKey : [bindingKey];
|
|
84
88
|
await Promise.all([
|
|
85
89
|
channel.assertExchange(exchange, "topic", { durable: true }),
|
|
86
90
|
channel.assertQueue(name, assertQueueOptions),
|
|
87
91
|
...bindingKeys.map((key) => channel.bindQueue(name, exchange, key)),
|
|
88
92
|
channel.prefetch(prefetch || 1),
|
|
89
|
-
channel.consume(name,
|
|
93
|
+
channel.consume(name, handler)
|
|
90
94
|
]);
|
|
91
95
|
console.log(
|
|
92
96
|
`[@opens/rabbitmq] Subscribed to ${name} on exchange ${exchange} with binding keys: ${bindingKeys.join(
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts","../src/rabbitmq.ts"],"sourcesContent":["import { connect } from 'amqp-connection-manager';\nimport { RabbitMQ } from './rabbitmq';\nexport const rabbitmq = new RabbitMQ(connect);\n","import { TRACE_TYPE } from '@opens/observability';\nimport { BaseTracer } from '@opens/observability/dist/tracers/_base-tracer';\nimport { AmqpConnectionManager, connect, ChannelWrapper } from 'amqp-connection-manager';\nimport { Channel, ConsumeMessage, MessageFields, MessageProperties } from 'amqplib';\n\ntype ConsumerFunc = (\n data: any,\n metadata: {\n fields: MessageFields;\n properties: MessageProperties;\n },\n) => Promise<void>;\n\nexport interface SubscribeParams {\n ttl?: number;\n name: string;\n exchange: string;\n durable?: boolean;\n prefetch?: number;\n queueArguments?: Record<string, any>;\n exclusive?: boolean;\n bindingKey: string | string[];\n consumer?: ConsumerFunc;\n up?: ConsumerFunc;\n down?: ConsumerFunc;\n}\n\nexport class RabbitMQ {\n private connection: AmqpConnectionManager | undefined;\n private publisherChannel: ChannelWrapper | undefined;\n private telemetry!: BaseTracer | undefined;\n\n constructor(private startConnection: typeof connect) {}\n public start(params: {\n hostname: string;\n password: string;\n protocol: string;\n username: string;\n port: number;\n telemetry?: BaseTracer;\n }) {\n this.connection = this.startConnection(params)\n .on('connect', () => {\n console.log('[@opens/rabbitmq] Connected to RabbitMQ');\n })\n .on('connectFailed', (err) => {\n console.error('[@opens/rabbitmq] Failed to connect to RabbitMQ:', err);\n })\n .on('disconnect', (err) => {\n console.error('[@opens/rabbitmq] Disconnected from RabbitMQ:', err);\n });\n this.telemetry = params.telemetry;\n this.publisherChannel = this.connection.createChannel({ json: true });\n }\n\n public async publish(params: {\n exchange: string;\n routingKey: string;\n payload: any;\n options?: Object;\n }): Promise<boolean>;\n public async publish(exchange: string, routingKey: string, payload: any, options?: Object): Promise<boolean>;\n public async publish(\n exchangeOrParams: string | { exchange: string; routingKey: string; payload: any; options?: Object },\n routingKey?: string,\n payload?: any,\n options?: Object,\n ): Promise<boolean> {\n if (!this.publisherChannel) throw Error('No publisher channel open');\n\n if (typeof exchangeOrParams === 'object') {\n const { exchange, routingKey: key, payload: data, options: opts } = exchangeOrParams;\n return this.publisherChannel.publish(exchange, key, data, opts);\n }\n return this.publisherChannel.publish(exchangeOrParams, routingKey!, payload, options);\n }\n\n public subscribe(params: SubscribeParams): ChannelWrapper {\n const { consumer, up, durable, exchange, exclusive, ttl, queueArguments, name, bindingKey, prefetch } = params;\n if (!this.connection) throw new Error(\"Rabbit MQ hasn't started yet and won't be able to subscribe to events\");\n if (!consumer && !up) throw new Error('No consumer function provided');\n\n const channelWrapper: ChannelWrapper = this.connection.createChannel({\n json: true,\n setup: async (channel: Channel) => {\n const assertQueueOptions: any = {\n durable,\n exclusive,\n arguments: {},\n };\n\n if (ttl) assertQueueOptions.arguments['x-message-ttl'] = ttl;\n if (queueArguments) assertQueueOptions.arguments = { ...assertQueueOptions.arguments, ...queueArguments };\n\n const
|
|
1
|
+
{"version":3,"sources":["../src/index.ts","../src/rabbitmq.ts"],"sourcesContent":["import { connect } from 'amqp-connection-manager';\nimport { RabbitMQ } from './rabbitmq';\nexport const rabbitmq = new RabbitMQ(connect);\n","import { TRACE_TYPE } from '@opens/observability';\nimport { BaseTracer } from '@opens/observability/dist/tracers/_base-tracer';\nimport { AmqpConnectionManager, connect, ChannelWrapper } from 'amqp-connection-manager';\nimport { Channel, ConsumeMessage, MessageFields, MessageProperties } from 'amqplib';\n\ntype ConsumerFunc = (\n data: any,\n metadata: {\n fields: MessageFields;\n properties: MessageProperties;\n },\n) => Promise<void>;\n\nexport interface SubscribeParams {\n ttl?: number;\n name: string;\n exchange: string;\n durable?: boolean;\n prefetch?: number;\n queueArguments?: Record<string, any>;\n exclusive?: boolean;\n bindingKey: string | string[];\n consumer?: ConsumerFunc;\n up?: ConsumerFunc;\n down?: ConsumerFunc;\n}\n\nexport class RabbitMQ {\n private connection: AmqpConnectionManager | undefined;\n private publisherChannel: ChannelWrapper | undefined;\n private telemetry!: BaseTracer | undefined;\n\n constructor(private startConnection: typeof connect) {}\n public start(params: {\n hostname: string;\n password: string;\n protocol: string;\n username: string;\n port: number;\n telemetry?: BaseTracer;\n }) {\n this.connection = this.startConnection(params)\n .on('connect', () => {\n console.log('[@opens/rabbitmq] Connected to RabbitMQ');\n })\n .on('connectFailed', (err) => {\n console.error('[@opens/rabbitmq] Failed to connect to RabbitMQ:', err);\n })\n .on('disconnect', (err) => {\n console.error('[@opens/rabbitmq] Disconnected from RabbitMQ:', err);\n });\n this.telemetry = params.telemetry;\n this.publisherChannel = this.connection.createChannel({ json: true });\n }\n\n public async publish(params: {\n exchange: string;\n routingKey: string;\n payload: any;\n options?: Object;\n }): Promise<boolean>;\n public async publish(exchange: string, routingKey: string, payload: any, options?: Object): Promise<boolean>;\n public async publish(\n exchangeOrParams: string | { exchange: string; routingKey: string; payload: any; options?: Object },\n routingKey?: string,\n payload?: any,\n options?: Object,\n ): Promise<boolean> {\n if (!this.publisherChannel) throw Error('No publisher channel open');\n\n if (typeof exchangeOrParams === 'object') {\n const { exchange, routingKey: key, payload: data, options: opts } = exchangeOrParams;\n return this.publisherChannel.publish(exchange, key, data, opts);\n }\n return this.publisherChannel.publish(exchangeOrParams, routingKey!, payload, options);\n }\n\n public subscribe(params: SubscribeParams): ChannelWrapper {\n const { consumer, up, durable, exchange, exclusive, ttl, queueArguments, name, bindingKey, prefetch } = params;\n if (!this.connection) throw new Error(\"Rabbit MQ hasn't started yet and won't be able to subscribe to events\");\n if (!consumer && !up) throw new Error('No consumer function provided');\n\n const channelWrapper: ChannelWrapper = this.connection.createChannel({\n json: true,\n setup: async (channel: Channel) => {\n const assertQueueOptions: any = {\n durable,\n exclusive,\n arguments: {},\n };\n\n if (ttl) assertQueueOptions.arguments['x-message-ttl'] = ttl;\n if (queueArguments) assertQueueOptions.arguments = { ...assertQueueOptions.arguments, ...queueArguments };\n const processor = consumer ?? up ?? Promise.resolve;\n\n const instrumentedProcessor = this.telemetry?.instrumentFunc(\n { name: params.name, type: TRACE_TYPE.MESSAGE },\n processor,\n );\n\n const handler = async (msg: ConsumeMessage | null) => {\n if (!msg) return;\n try {\n const data = JSON.parse(msg.content.toString());\n const consumerFunc = instrumentedProcessor ?? processor;\n await consumerFunc(data, { fields: msg.fields, properties: msg.properties });\n channel.ack(msg);\n } catch (error) {\n channel.nack(msg, false, false);\n } finally {\n }\n };\n const bindingKeys = Array.isArray(bindingKey) ? bindingKey : [bindingKey];\n\n await Promise.all([\n channel.assertExchange(exchange, 'topic', { durable: true }),\n channel.assertQueue(name, assertQueueOptions),\n ...bindingKeys.map((key) => channel.bindQueue(name, exchange, key)),\n channel.prefetch(prefetch || 1),\n channel.consume(name, handler),\n ]);\n\n console.log(\n `[@opens/rabbitmq] Subscribed to ${name} on exchange ${exchange} with binding keys: ${bindingKeys.join(\n ', ',\n )}`,\n );\n },\n });\n return channelWrapper;\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qCAAwB;;;ACAxB,2BAA2B;AA2BpB,IAAM,WAAN,MAAe;AAAA,EAKpB,YAAoB,iBAAiC;AAAjC;AAAA,EAAkC;AAAA,EAJ9C;AAAA,EACA;AAAA,EACA;AAAA,EAGD,MAAM,QAOV;AACD,SAAK,aAAa,KAAK,gBAAgB,MAAM,EAC1C,GAAG,WAAW,MAAM;AACnB,cAAQ,IAAI,yCAAyC;AAAA,IACvD,CAAC,EACA,GAAG,iBAAiB,CAAC,QAAQ;AAC5B,cAAQ,MAAM,oDAAoD,GAAG;AAAA,IACvE,CAAC,EACA,GAAG,cAAc,CAAC,QAAQ;AACzB,cAAQ,MAAM,iDAAiD,GAAG;AAAA,IACpE,CAAC;AACH,SAAK,YAAY,OAAO;AACxB,SAAK,mBAAmB,KAAK,WAAW,cAAc,EAAE,MAAM,KAAK,CAAC;AAAA,EACtE;AAAA,EASA,MAAa,QACX,kBACA,YACA,SACA,SACkB;AAClB,QAAI,CAAC,KAAK,iBAAkB,OAAM,MAAM,2BAA2B;AAEnE,QAAI,OAAO,qBAAqB,UAAU;AACxC,YAAM,EAAE,UAAU,YAAY,KAAK,SAAS,MAAM,SAAS,KAAK,IAAI;AACpE,aAAO,KAAK,iBAAiB,QAAQ,UAAU,KAAK,MAAM,IAAI;AAAA,IAChE;AACA,WAAO,KAAK,iBAAiB,QAAQ,kBAAkB,YAAa,SAAS,OAAO;AAAA,EACtF;AAAA,EAEO,UAAU,QAAyC;AACxD,UAAM,EAAE,UAAU,IAAI,SAAS,UAAU,WAAW,KAAK,gBAAgB,MAAM,YAAY,SAAS,IAAI;AACxG,QAAI,CAAC,KAAK,WAAY,OAAM,IAAI,MAAM,uEAAuE;AAC7G,QAAI,CAAC,YAAY,CAAC,GAAI,OAAM,IAAI,MAAM,+BAA+B;AAErE,UAAM,iBAAiC,KAAK,WAAW,cAAc;AAAA,MACnE,MAAM;AAAA,MACN,OAAO,OAAO,YAAqB;AACjC,cAAM,qBAA0B;AAAA,UAC9B;AAAA,UACA;AAAA,UACA,WAAW,CAAC;AAAA,QACd;AAEA,YAAI,IAAK,oBAAmB,UAAU,eAAe,IAAI;AACzD,YAAI,eAAgB,oBAAmB,YAAY,EAAE,GAAG,mBAAmB,WAAW,GAAG,eAAe;AACxG,cAAM,YAAY,YAAY,MAAM,QAAQ;AAE5C,cAAM,wBAAwB,KAAK,WAAW;AAAA,UAC5C,EAAE,MAAM,OAAO,MAAM,MAAM,gCAAW,QAAQ;AAAA,UAC9C;AAAA,QACF;AAEA,cAAM,UAAU,OAAO,QAA+B;AACpD,cAAI,CAAC,IAAK;AACV,cAAI;AACF,kBAAM,OAAO,KAAK,MAAM,IAAI,QAAQ,SAAS,CAAC;AAC9C,kBAAM,eAAe,yBAAyB;AAC9C,kBAAM,aAAa,MAAM,EAAE,QAAQ,IAAI,QAAQ,YAAY,IAAI,WAAW,CAAC;AAC3E,oBAAQ,IAAI,GAAG;AAAA,UACjB,SAAS,OAAO;AACd,oBAAQ,KAAK,KAAK,OAAO,KAAK;AAAA,UAChC,UAAE;AAAA,UACF;AAAA,QACF;AACA,cAAM,cAAc,MAAM,QAAQ,UAAU,IAAI,aAAa,CAAC,UAAU;AAExE,cAAM,QAAQ,IAAI;AAAA,UAChB,QAAQ,eAAe,UAAU,SAAS,EAAE,SAAS,KAAK,CAAC;AAAA,UAC3D,QAAQ,YAAY,MAAM,kBAAkB;AAAA,UAC5C,GAAG,YAAY,IAAI,CAAC,QAAQ,QAAQ,UAAU,MAAM,UAAU,GAAG,CAAC;AAAA,UAClE,QAAQ,SAAS,YAAY,CAAC;AAAA,UAC9B,QAAQ,QAAQ,MAAM,OAAO;AAAA,QAC/B,CAAC;AAED,gBAAQ;AAAA,UACN,mCAAmC,IAAI,gBAAgB,QAAQ,uBAAuB,YAAY;AAAA,YAChG;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF,CAAC;AACD,WAAO;AAAA,EACT;AACF;;;ADjIO,IAAM,WAAW,IAAI,SAAS,sCAAO;","names":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opens/rabbitmq",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "A wrapper around common message brokers",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"amqplib": "^0.10.5"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@opens/observability": "^1.0.
|
|
42
|
+
"@opens/observability": "^1.0.5"
|
|
43
43
|
},
|
|
44
44
|
"peerDependenciesMeta": {
|
|
45
45
|
"opens/observability": {
|