Skip to content

Commit 77deb79

Browse files
CodeVac513CodeVac513
committed
refactor(microservices): fix the typo 'RQM_' to 'RMQ_'
1 parent ffd6698 commit 77deb79

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

‎packages/microservices/client/client-rmq.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import {
1515
import { first, map, retryWhen, scan, skip, switchMap } from 'rxjs/operators';
1616
import {
1717
DISCONNECTED_RMQ_MESSAGE,
18-
RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
19-
RQM_DEFAULT_NO_ASSERT,
20-
RQM_DEFAULT_NOACK,
21-
RQM_DEFAULT_PERSISTENT,
22-
RQM_DEFAULT_PREFETCH_COUNT,
23-
RQM_DEFAULT_QUEUE,
24-
RQM_DEFAULT_QUEUE_OPTIONS,
25-
RQM_DEFAULT_URL,
18+
RMQ_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
19+
RMQ_DEFAULT_NO_ASSERT,
20+
RMQ_DEFAULT_NOACK,
21+
RMQ_DEFAULT_PERSISTENT,
22+
RMQ_DEFAULT_PREFETCH_COUNT,
23+
RMQ_DEFAULT_QUEUE,
24+
RMQ_DEFAULT_QUEUE_OPTIONS,
25+
RMQ_DEFAULT_URL,
2626
} from '../constants';
2727
import { RmqEvents, RmqEventsMap, RmqStatus } from '../events/rmq.events';
2828
import { ReadPacket, RmqOptions, WritePacket } from '../interfaces';
@@ -71,11 +71,11 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
7171

7272
constructor(protected readonly options: Required<RmqOptions>['options']) {
7373
super();
74-
this.queue = this.getOptionsProp(this.options, 'queue', RQM_DEFAULT_QUEUE);
74+
this.queue = this.getOptionsProp(this.options, 'queue', RMQ_DEFAULT_QUEUE);
7575
this.queueOptions = this.getOptionsProp(
7676
this.options,
7777
'queueOptions',
78-
RQM_DEFAULT_QUEUE_OPTIONS,
78+
RMQ_DEFAULT_QUEUE_OPTIONS,
7979
);
8080
this.replyQueue = this.getOptionsProp(
8181
this.options,
@@ -85,7 +85,7 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
8585
this.noAssert =
8686
this.getOptionsProp(this.options, 'noAssert') ??
8787
this.queueOptions.noAssert ??
88-
RQM_DEFAULT_NO_ASSERT;
88+
RMQ_DEFAULT_NO_ASSERT;
8989

9090
loadPackage('amqplib', ClientRMQ.name, () => require('amqplib'));
9191
rmqPackage = loadPackage('amqp-connection-manager', ClientRMQ.name, () =>
@@ -150,7 +150,7 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
150150

151151
public createClient(): AmqpConnectionManager {
152152
const socketOptions = this.getOptionsProp(this.options, 'socketOptions');
153-
const urls = this.getOptionsProp(this.options, 'urls') || [RQM_DEFAULT_URL];
153+
const urls = this.getOptionsProp(this.options, 'urls') || [RMQ_DEFAULT_URL];
154154
return rmqPackage.connect(urls, socketOptions);
155155
}
156156

@@ -199,10 +199,10 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
199199
public async setupChannel(channel: Channel, resolve: Function) {
200200
const prefetchCount =
201201
this.getOptionsProp(this.options, 'prefetchCount') ||
202-
RQM_DEFAULT_PREFETCH_COUNT;
202+
RMQ_DEFAULT_PREFETCH_COUNT;
203203
const isGlobalPrefetchCount =
204204
this.getOptionsProp(this.options, 'isGlobalPrefetchCount') ||
205-
RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT;
205+
RMQ_DEFAULT_IS_GLOBAL_PREFETCH_COUNT;
206206

207207
if (!this.noAssert) {
208208
await channel.assertQueue(this.queue, this.queueOptions);
@@ -239,7 +239,7 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
239239
}
240240

241241
public async consumeChannel(channel: Channel) {
242-
const noAck = this.getOptionsProp(this.options, 'noAck', RQM_DEFAULT_NOACK);
242+
const noAck = this.getOptionsProp(this.options, 'noAck', RMQ_DEFAULT_NOACK);
243243
await channel.consume(
244244
this.replyQueue,
245245
(msg: ConsumeMessage | null) =>
@@ -384,7 +384,7 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
384384
persistent: this.getOptionsProp(
385385
this.options,
386386
'persistent',
387-
RQM_DEFAULT_PERSISTENT,
387+
RMQ_DEFAULT_PERSISTENT,
388388
),
389389
...options,
390390
headers: this.mergeHeaders(options?.headers),
@@ -435,7 +435,7 @@ export class ClientRMQ extends ClientProxy<RmqEvents, RmqStatus> {
435435
persistent: this.getOptionsProp(
436436
this.options,
437437
'persistent',
438-
RQM_DEFAULT_PERSISTENT,
438+
RMQ_DEFAULT_PERSISTENT,
439439
),
440440
...options,
441441
headers: this.mergeHeaders(options?.headers),

‎packages/microservices/constants.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ export const REDIS_DEFAULT_HOST = 'localhost';
77
export const NATS_DEFAULT_URL = 'nats://localhost:4222';
88
export const MQTT_DEFAULT_URL = 'mqtt://localhost:1883';
99
export const GRPC_DEFAULT_URL = 'localhost:5000';
10-
export const RQM_DEFAULT_URL = 'amqp://localhost';
10+
export const RMQ_DEFAULT_URL = 'amqp://localhost';
1111
export const KAFKA_DEFAULT_BROKER = 'localhost:9092';
1212
export const KAFKA_DEFAULT_CLIENT = 'nestjs-consumer';
1313
export const KAFKA_DEFAULT_GROUP = 'nestjs-group';
1414
export const MQTT_SEPARATOR = '/';
1515
export const MQTT_WILDCARD_SINGLE = '+';
1616
export const MQTT_WILDCARD_ALL = '#';
17-
export const RQM_DEFAULT_QUEUE = '';
18-
export const RQM_DEFAULT_PREFETCH_COUNT = 0;
19-
export const RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT = false;
20-
export const RQM_DEFAULT_QUEUE_OPTIONS = {};
21-
export const RQM_DEFAULT_NOACK = true;
22-
export const RQM_DEFAULT_PERSISTENT = false;
23-
export const RQM_DEFAULT_NO_ASSERT = false;
17+
export const RMQ_DEFAULT_QUEUE = '';
18+
export const RMQ_DEFAULT_PREFETCH_COUNT = 0;
19+
export const RMQ_DEFAULT_IS_GLOBAL_PREFETCH_COUNT = false;
20+
export const RMQ_DEFAULT_QUEUE_OPTIONS = {};
21+
export const RMQ_DEFAULT_NOACK = true;
22+
export const RMQ_DEFAULT_PERSISTENT = false;
23+
export const RMQ_DEFAULT_NO_ASSERT = false;
2424
export const RMQ_SEPARATOR = '.';
2525
export const RMQ_WILDCARD_SINGLE = '*';
2626
export const RMQ_WILDCARD_ALL = '#';
@@ -40,12 +40,12 @@ export const PARAM_ARGS_METADATA = ROUTE_ARGS_METADATA;
4040
export const REQUEST_PATTERN_METADATA = 'microservices:request_pattern';
4141
export const REPLY_PATTERN_METADATA = 'microservices:reply_pattern';
4242

43-
export const RQM_NO_EVENT_HANDLER = (
43+
export const RMQ_NO_EVENT_HANDLER = (
4444
text: TemplateStringsArray,
4545
pattern: string,
4646
) =>
4747
`An unsupported event was received. It has been negative acknowledged, so it will not be re-delivered. Pattern: ${pattern}`;
48-
export const RQM_NO_MESSAGE_HANDLER = (
48+
export const RMQ_NO_MESSAGE_HANDLER = (
4949
text: TemplateStringsArray,
5050
pattern: string,
5151
) =>

‎packages/microservices/server/server-rmq.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import {
1111
RMQ_SEPARATOR,
1212
RMQ_WILDCARD_ALL,
1313
RMQ_WILDCARD_SINGLE,
14-
RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
15-
RQM_DEFAULT_NOACK,
16-
RQM_DEFAULT_NO_ASSERT,
17-
RQM_DEFAULT_PREFETCH_COUNT,
18-
RQM_DEFAULT_QUEUE,
19-
RQM_DEFAULT_QUEUE_OPTIONS,
20-
RQM_DEFAULT_URL,
21-
RQM_NO_EVENT_HANDLER,
22-
RQM_NO_MESSAGE_HANDLER,
14+
RMQ_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
15+
RMQ_DEFAULT_NOACK,
16+
RMQ_DEFAULT_NO_ASSERT,
17+
RMQ_DEFAULT_PREFETCH_COUNT,
18+
RMQ_DEFAULT_QUEUE,
19+
RMQ_DEFAULT_QUEUE_OPTIONS,
20+
RMQ_DEFAULT_URL,
21+
RMQ_NO_EVENT_HANDLER,
22+
RMQ_NO_MESSAGE_HANDLER,
2323
} from '../constants';
2424
import { RmqContext } from '../ctx-host';
2525
import { Transport } from '../enums';
@@ -74,13 +74,13 @@ export class ServerRMQ extends Server<RmqEvents, RmqStatus> {
7474

7575
constructor(protected readonly options: Required<RmqOptions>['options']) {
7676
super();
77-
this.urls = this.getOptionsProp(this.options, 'urls') || [RQM_DEFAULT_URL];
77+
this.urls = this.getOptionsProp(this.options, 'urls') || [RMQ_DEFAULT_URL];
7878
this.queue =
79-
this.getOptionsProp(this.options, 'queue') || RQM_DEFAULT_QUEUE;
80-
this.noAck = this.getOptionsProp(this.options, 'noAck', RQM_DEFAULT_NOACK);
79+
this.getOptionsProp(this.options, 'queue') || RMQ_DEFAULT_QUEUE;
80+
this.noAck = this.getOptionsProp(this.options, 'noAck', RMQ_DEFAULT_NOACK);
8181
this.queueOptions =
8282
this.getOptionsProp(this.options, 'queueOptions') ||
83-
RQM_DEFAULT_QUEUE_OPTIONS;
83+
RMQ_DEFAULT_QUEUE_OPTIONS;
8484

8585
this.loadPackage('amqplib', ServerRMQ.name, () => require('amqplib'));
8686
rmqPackage = this.loadPackage(
@@ -189,7 +189,7 @@ export class ServerRMQ extends Server<RmqEvents, RmqStatus> {
189189
const noAssert =
190190
this.getOptionsProp(this.options, 'noAssert') ??
191191
this.queueOptions.noAssert ??
192-
RQM_DEFAULT_NO_ASSERT;
192+
RMQ_DEFAULT_NO_ASSERT;
193193

194194
if (!noAssert) {
195195
await channel.assertQueue(this.queue, this.queueOptions);
@@ -198,12 +198,12 @@ export class ServerRMQ extends Server<RmqEvents, RmqStatus> {
198198
const isGlobalPrefetchCount = this.getOptionsProp(
199199
this.options,
200200
'isGlobalPrefetchCount',
201-
RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
201+
RMQ_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
202202
);
203203
const prefetchCount = this.getOptionsProp(
204204
this.options,
205205
'prefetchCount',
206-
RQM_DEFAULT_PREFETCH_COUNT,
206+
RMQ_DEFAULT_PREFETCH_COUNT,
207207
);
208208

209209
if (this.options.exchange || this.options.wildcards) {
@@ -279,7 +279,7 @@ export class ServerRMQ extends Server<RmqEvents, RmqStatus> {
279279

280280
if (!handler) {
281281
if (!this.noAck) {
282-
this.logger.warn(RQM_NO_MESSAGE_HANDLER`${pattern}`);
282+
this.logger.warn(RMQ_NO_MESSAGE_HANDLER`${pattern}`);
283283
this.channel!.nack(rmqContext.getMessage() as Message, false, false);
284284
}
285285
const status = 'error';
@@ -324,7 +324,7 @@ export class ServerRMQ extends Server<RmqEvents, RmqStatus> {
324324
const handler = this.getHandlerByPattern(pattern);
325325
if (!handler && !this.noAck) {
326326
this.channel!.nack(context.getMessage() as Message, false, false);
327-
return this.logger.warn(RQM_NO_EVENT_HANDLER`${pattern}`);
327+
return this.logger.warn(RMQ_NO_EVENT_HANDLER`${pattern}`);
328328
}
329329
return super.handleEvent(pattern, packet, context);
330330
}

0 commit comments

Comments
 (0)