Merge pull request #5609 from capaio/rmq-url-acceptable-types

feature(microservices): update acceptable types in RabbitMq urls
nestjs · Nov 2, 2020 · 0ec42bd · 0ec42bd
2 parents 62352ac + 1655e96
commit 0ec42bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/packages/microservices/client/client-rmq.ts b/packages/microservices/client/client-rmq.ts
@@ -18,6 +18,7 @@ import {
 } from '../constants';
 import { ReadPacket, RmqOptions, WritePacket } from '../interfaces';
 import { ClientProxy } from './client-proxy';
+import { RmqUrl } from '../external/rmq-url.interface';
 
 let rqmPackage: any = {};
 
@@ -28,7 +29,7 @@ export class ClientRMQ extends ClientProxy {
   protected connection: Promise<any>;
   protected client: any = null;
   protected channel: any = null;
-  protected urls: string[];
+  protected urls: string[] | RmqUrl[];
   protected queue: string;
   protected queueOptions: any;
   protected responseEmitter: EventEmitter;

diff --git a/packages/microservices/external/rmq-url.interface.ts b/packages/microservices/external/rmq-url.interface.ts
@@ -0,0 +1,11 @@
+export interface RmqUrl {
+  protocol?: string;
+  hostname?: string;
+  port?: number;
+  username?: string;
+  password?: string;
+  locale?: string;
+  frameMax?: number;
+  heartbeat?: number;
+  vhost?: string;
+}
diff --git a/packages/microservices/interfaces/microservice-configuration.interface.ts b/packages/microservices/interfaces/microservice-configuration.interface.ts
@@ -12,6 +12,7 @@ import { Server } from '../server/server';
 import { CustomTransportStrategy } from './custom-transport-strategy.interface';
 import { Deserializer } from './deserializer.interface';
 import { Serializer } from './serializer.interface';
+import { RmqUrl } from '../external/rmq-url.interface';
 
 export type MicroserviceOptions =
   | GrpcOptions
@@ -119,7 +120,7 @@ export interface NatsOptions {
 export interface RmqOptions {
   transport?: Transport.RMQ;
   options?: {
-    urls?: string[];
+    urls?: string[] | RmqUrl[];
     queue?: string;
     prefetchCount?: number;
     isGlobalPrefetchCount?: boolean;

diff --git a/packages/microservices/server/server-rmq.ts b/packages/microservices/server/server-rmq.ts
@@ -20,6 +20,7 @@ import {
   OutgoingResponse,
 } from '../interfaces/packet.interface';
 import { Server } from './server';
+import { RmqUrl } from '../external/rmq-url.interface';
 
 let rqmPackage: any = {};
 
@@ -28,7 +29,7 @@ export class ServerRMQ extends Server implements CustomTransportStrategy {
 
   protected server: any = null;
   protected channel: any = null;
-  protected readonly urls: string[];
+  protected readonly urls: string[] | RmqUrl[];
   protected readonly queue: string;
   protected readonly prefetchCount: number;
   protected readonly queueOptions: any;