Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/rabbitmq/src/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ export interface RabbitMQTransportOptions {
deadLetterUnhandled?: boolean;
queueArguments?: Record<string, unknown>;
retryQueueArguments?: Record<string, unknown>;
errorQueueArguments?: Record<string, unknown>;
auditQueueArguments?: Record<string, unknown>;
};
}

Expand All @@ -70,6 +72,8 @@ export interface ResolvedConsumerOptions {
readonly deadLetterUnhandled: boolean;
readonly queueArguments: Readonly<Record<string, unknown>>;
readonly retryQueueArguments: Readonly<Record<string, unknown>>;
readonly errorQueueArguments: Readonly<Record<string, unknown>>;
readonly auditQueueArguments: Readonly<Record<string, unknown>>;
}

export function resolveProducerOptions(opts: RabbitMQTransportOptions): ResolvedProducerOptions {
Expand All @@ -94,5 +98,7 @@ export function resolveConsumerOptions(opts: RabbitMQTransportOptions): Resolved
deadLetterUnhandled: c.deadLetterUnhandled ?? false,
queueArguments: c.queueArguments ?? {},
retryQueueArguments: c.retryQueueArguments ?? {},
errorQueueArguments: c.errorQueueArguments ?? {},
auditQueueArguments: c.auditQueueArguments ?? {},
};
}
12 changes: 10 additions & 2 deletions packages/rabbitmq/src/topology.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,20 @@ export function buildConsumerTopology(

if (opts.errorQueue !== null) {
exchanges.push({ exchange: opts.errorQueue, type: 'direct', durable: false });
queues.push({ queue: opts.errorQueue, durable: true });
queues.push({
queue: opts.errorQueue,
durable: true,
arguments: { ...opts.errorQueueArguments },
});
queueBindings.push({ exchange: opts.errorQueue, queue: opts.errorQueue, routingKey: '' });
}
if (opts.auditEnabled) {
exchanges.push({ exchange: opts.auditQueue, type: 'direct', durable: false });
queues.push({ queue: opts.auditQueue, durable: true });
queues.push({
queue: opts.auditQueue,
durable: true,
arguments: { ...opts.auditQueueArguments },
});
queueBindings.push({ exchange: opts.auditQueue, queue: opts.auditQueue, routingKey: '' });
}

Expand Down
6 changes: 6 additions & 0 deletions packages/rabbitmq/test/unit/options.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ describe('resolveConsumerOptions', () => {
expect(resolved.deadLetterUnhandled).toBe(false);
expect(resolved.queueArguments).toEqual({});
expect(resolved.retryQueueArguments).toEqual({});
expect(resolved.errorQueueArguments).toEqual({});
expect(resolved.auditQueueArguments).toEqual({});
});

it('caller overrides win', () => {
Expand All @@ -51,6 +53,8 @@ describe('resolveConsumerOptions', () => {
errorQueue: 'my-errors',
auditEnabled: true,
queueArguments: { 'x-max-priority': 10 },
errorQueueArguments: { 'x-queue-type': 'quorum' },
auditQueueArguments: { 'x-queue-type': 'quorum' },
},
};
const resolved = resolveConsumerOptions(opts);
Expand All @@ -60,6 +64,8 @@ describe('resolveConsumerOptions', () => {
expect(resolved.errorQueue).toBe('my-errors');
expect(resolved.auditEnabled).toBe(true);
expect(resolved.queueArguments).toEqual({ 'x-max-priority': 10 });
expect(resolved.errorQueueArguments).toEqual({ 'x-queue-type': 'quorum' });
expect(resolved.auditQueueArguments).toEqual({ 'x-queue-type': 'quorum' });
});

it('errorQueue: null opts out of error-queue routing', () => {
Expand Down
28 changes: 27 additions & 1 deletion packages/rabbitmq/test/unit/topology.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('retry/error/audit topology (master parity)', () => {
type: 'direct',
durable: false,
});
expect(topo.queues).toContainEqual({ queue: 'errors', durable: true });
expect(topo.queues).toContainEqual({ queue: 'errors', durable: true, arguments: {} });
expect(topo.queueBindings).toContainEqual({
exchange: 'errors',
queue: 'errors',
Expand Down Expand Up @@ -143,6 +143,32 @@ describe('buildConsumerTopology (general)', () => {
const main = t.queues.find((q) => q.queue === 'q-self');
expect(main?.arguments?.['x-max-priority']).toBe(10);
});

it('merges caller errorQueueArguments into the error queue', () => {
const t = buildConsumerTopology(
'q-self',
[],
resolveConsumerOptions({
url: '',
consumer: { errorQueueArguments: { 'x-queue-type': 'quorum' } },
}),
);
const error = t.queues.find((q) => q.queue === 'errors');
expect(error?.arguments?.['x-queue-type']).toBe('quorum');
});

it('merges caller auditQueueArguments into the audit queue', () => {
const t = buildConsumerTopology(
'q-self',
[],
resolveConsumerOptions({
url: '',
consumer: { auditEnabled: true, auditQueueArguments: { 'x-queue-type': 'quorum' } },
}),
);
const audit = t.queues.find((q) => q.queue === 'audit');
expect(audit?.arguments?.['x-queue-type']).toBe('quorum');
});
});

describe('exchangeNameForType', () => {
Expand Down
Loading