Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add globalOptions support in SqsService with sqs endpoint property #81

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
23 changes: 23 additions & 0 deletions e2e/module.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,29 @@ describe('SqsModule', () => {
expect(sqsService.options.consumers).toHaveLength(1);
expect(sqsService.options.producers).toHaveLength(1);
});

it('should register module async with globalOptions', async () => {
module = await Test.createTestingModule({
imports: [
SqsModule.registerAsync({
useFactory: async () => {
return {
globalOptions: {
endpoint: SQS_ENDPOINT,
},
consumers: [TestQueues[TestQueue.Test]],
producers: [TestQueues[TestQueue.Test]],
};
},
}),
],
}).compile();

const sqsService = module.get(SqsService);
expect(sqsService).toBeTruthy();
expect(sqsService.options.consumers).toHaveLength(1);
expect(sqsService.options.producers).toHaveLength(1);
});
});

describe('full flow', () => {
Expand Down
19 changes: 18 additions & 1 deletion lib/sqs.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Consumer, StopOptions } from 'sqs-consumer';
import { Producer } from 'sqs-producer';
import { SQSClient, GetQueueAttributesCommand, PurgeQueueCommand, QueueAttributeName } from '@aws-sdk/client-sqs';
import {
GlobalOptions,
Message,
QueueName,
SqsConsumerEventHandlerMeta,
Expand All @@ -19,6 +20,7 @@ export class SqsService implements OnModuleInit, OnModuleDestroy {
public readonly producers = new Map<QueueName, Producer>();

private logger: LoggerService;
private globalOptions: GlobalOptions;
private globalStopOptions: StopOptions;

public constructor(
Expand All @@ -28,6 +30,7 @@ export class SqsService implements OnModuleInit, OnModuleDestroy {

public async onModuleInit(): Promise<void> {
this.logger = this.options.logger ?? new Logger('SqsService', { timestamp: false });
this.globalOptions = this.options.globalOptions ?? {};
this.globalStopOptions = this.options.globalStopOptions ?? {};

const messageHandlers = await this.discover.providerMethodsWithMetaAtKey<SqsMessageHandlerMeta>(
Expand All @@ -49,9 +52,15 @@ export class SqsService implements OnModuleInit, OnModuleDestroy {
return;
}

const shouldUseGlobalOptionsEndpoint = this.globalOptions.endpoint && !consumerOptions.sqs;
const isBatchHandler = metadata.meta.batch === true;
const consumer = Consumer.create({
...consumerOptions,
...(shouldUseGlobalOptionsEndpoint && {
sqs: new SQSClient({
endpoint: this.globalOptions.endpoint,
}),
}),
...(isBatchHandler
? {
handleMessageBatch: metadata.discoveredMethod.handler.bind(
Expand Down Expand Up @@ -79,7 +88,15 @@ export class SqsService implements OnModuleInit, OnModuleDestroy {
throw new Error(`Producer already exists: ${name}`);
}

const producer = Producer.create(producerOptions);
const shouldUseGlobalOptionsEndpoint = this.globalOptions.endpoint && !producerOptions.sqs;
const producer = Producer.create({
...producerOptions,
...(shouldUseGlobalOptionsEndpoint && {
sqs: new SQSClient({
endpoint: this.globalOptions.endpoint,
}),
}),
});
this.producers.set(name, producer);
});

Expand Down
5 changes: 5 additions & 0 deletions lib/sqs.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ export type SqsProducerOptions = ProducerOptions & {
name: QueueName;
};

export type GlobalOptions = {
endpoint?: string;
};

export interface SqsOptions {
globalOptions?: GlobalOptions;
consumers?: SqsConsumerOptions[];
producers?: SqsProducerOptions[];
logger?: LoggerService;
Expand Down