From b8c479ebe5705becbfe760110f54c7ccc8bf0bff Mon Sep 17 00:00:00 2001 From: ccappai Date: Mon, 26 Oct 2020 11:38:20 +0100 Subject: [PATCH 1/7] feature(microservices): update acceptable types in RabbitMq urls --- packages/microservices/client/client-rmq.ts | 3 ++- packages/microservices/external/rmq-url.interface.ts | 11 +++++++++++ .../microservice-configuration.interface.ts | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/microservices/external/rmq-url.interface.ts diff --git a/packages/microservices/client/client-rmq.ts b/packages/microservices/client/client-rmq.ts index de7a5c03f82..9eb74fb159c 100644 --- a/packages/microservices/client/client-rmq.ts +++ b/packages/microservices/client/client-rmq.ts @@ -17,6 +17,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 = {}; @@ -27,7 +28,7 @@ export class ClientRMQ extends ClientProxy { protected connection: Promise; 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 new file mode 100644 index 00000000000..d14c110f255 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/packages/microservices/interfaces/microservice-configuration.interface.ts b/packages/microservices/interfaces/microservice-configuration.interface.ts index 147215bf819..1596552b622 100644 --- a/packages/microservices/interfaces/microservice-configuration.interface.ts +++ b/packages/microservices/interfaces/microservice-configuration.interface.ts @@ -119,7 +119,7 @@ export interface NatsOptions { export interface RmqOptions { transport?: Transport.RMQ; options?: { - urls?: string[]; + urls?: any[]; queue?: string; prefetchCount?: number; isGlobalPrefetchCount?: boolean; From f51b8f820ba3bd1a6f8f819e5361aa04b3494c18 Mon Sep 17 00:00:00 2001 From: ccappai Date: Thu, 29 Oct 2020 10:28:24 +0100 Subject: [PATCH 2/7] feature(microservices): update acceptable types in RabbitMq options --- .../interfaces/microservice-configuration.interface.ts | 3 ++- packages/microservices/server/server-rmq.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/microservices/interfaces/microservice-configuration.interface.ts b/packages/microservices/interfaces/microservice-configuration.interface.ts index 1596552b622..c5a5a32244b 100644 --- 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?: any[]; + urls?: RmqUrl[] | string[]; queue?: string; prefetchCount?: number; isGlobalPrefetchCount?: boolean; diff --git a/packages/microservices/server/server-rmq.ts b/packages/microservices/server/server-rmq.ts index 0546adab388..63abb8b1173 100644 --- 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; From 5fc57bd3f298ccc76917441e3d4584d890230e0b Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Fri, 30 Oct 2020 09:04:37 +0100 Subject: [PATCH 3/7] Update packages/microservices/server/server-rmq.ts --- packages/microservices/server/server-rmq.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/microservices/server/server-rmq.ts b/packages/microservices/server/server-rmq.ts index 63abb8b1173..794e63ea52a 100644 --- a/packages/microservices/server/server-rmq.ts +++ b/packages/microservices/server/server-rmq.ts @@ -20,7 +20,7 @@ import { OutgoingResponse, } from '../interfaces/packet.interface'; import { Server } from './server'; -import {RmqUrl} from "../external/rmq-url.interface"; +import { RmqUrl } from "../external/rmq-url.interface"; let rqmPackage: any = {}; From 5b3c664c8c1811dd21e213b8cddfda8e601fff44 Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Fri, 30 Oct 2020 09:04:51 +0100 Subject: [PATCH 4/7] Update packages/microservices/interfaces/microservice-configuration.interface.ts --- .../interfaces/microservice-configuration.interface.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/microservices/interfaces/microservice-configuration.interface.ts b/packages/microservices/interfaces/microservice-configuration.interface.ts index c5a5a32244b..70b501dc18d 100644 --- a/packages/microservices/interfaces/microservice-configuration.interface.ts +++ b/packages/microservices/interfaces/microservice-configuration.interface.ts @@ -12,7 +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"; +import { RmqUrl } from "../external/rmq-url.interface"; export type MicroserviceOptions = | GrpcOptions From ad27807e124c39d82fbc9daa8e41339c68fbb096 Mon Sep 17 00:00:00 2001 From: Kamil Mysliwiec Date: Fri, 30 Oct 2020 09:05:14 +0100 Subject: [PATCH 5/7] Update packages/microservices/client/client-rmq.ts --- packages/microservices/client/client-rmq.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/microservices/client/client-rmq.ts b/packages/microservices/client/client-rmq.ts index 9eb74fb159c..5365e68be4a 100644 --- a/packages/microservices/client/client-rmq.ts +++ b/packages/microservices/client/client-rmq.ts @@ -17,7 +17,7 @@ import { } from '../constants'; import { ReadPacket, RmqOptions, WritePacket } from '../interfaces'; import { ClientProxy } from './client-proxy'; -import {RmqUrl} from "../external/rmq-url.interface"; +import { RmqUrl } from "../external/rmq-url.interface"; let rqmPackage: any = {}; From f96470b4ecfd04d29fa3704e035dbf864455775d Mon Sep 17 00:00:00 2001 From: ccappai Date: Fri, 30 Oct 2020 09:16:48 +0100 Subject: [PATCH 6/7] run format script --- packages/microservices/client/client-rmq.ts | 2 +- .../external/rmq-url.interface.ts | 18 +++++++++--------- .../microservice-configuration.interface.ts | 2 +- packages/microservices/server/server-rmq.ts | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/microservices/client/client-rmq.ts b/packages/microservices/client/client-rmq.ts index 5365e68be4a..7cf210d088a 100644 --- a/packages/microservices/client/client-rmq.ts +++ b/packages/microservices/client/client-rmq.ts @@ -17,7 +17,7 @@ import { } from '../constants'; import { ReadPacket, RmqOptions, WritePacket } from '../interfaces'; import { ClientProxy } from './client-proxy'; -import { RmqUrl } from "../external/rmq-url.interface"; +import { RmqUrl } from '../external/rmq-url.interface'; let rqmPackage: any = {}; diff --git a/packages/microservices/external/rmq-url.interface.ts b/packages/microservices/external/rmq-url.interface.ts index d14c110f255..752b4601308 100644 --- a/packages/microservices/external/rmq-url.interface.ts +++ b/packages/microservices/external/rmq-url.interface.ts @@ -1,11 +1,11 @@ export interface RmqUrl { protocol?: string; - hostname?: string, - port?: number, - username?: string, - password?: string, - locale?: string, - frameMax?: number, - heartbeat?: number, - vhost?: string -} \ No newline at end of file + 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 index 70b501dc18d..8ec160df3b6 100644 --- a/packages/microservices/interfaces/microservice-configuration.interface.ts +++ b/packages/microservices/interfaces/microservice-configuration.interface.ts @@ -12,7 +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"; +import { RmqUrl } from '../external/rmq-url.interface'; export type MicroserviceOptions = | GrpcOptions diff --git a/packages/microservices/server/server-rmq.ts b/packages/microservices/server/server-rmq.ts index 794e63ea52a..858d92f89e1 100644 --- a/packages/microservices/server/server-rmq.ts +++ b/packages/microservices/server/server-rmq.ts @@ -20,7 +20,7 @@ import { OutgoingResponse, } from '../interfaces/packet.interface'; import { Server } from './server'; -import { RmqUrl } from "../external/rmq-url.interface"; +import { RmqUrl } from '../external/rmq-url.interface'; let rqmPackage: any = {}; From 1655e963a531509f309595da49f059c38bb4cc11 Mon Sep 17 00:00:00 2001 From: ccappai Date: Fri, 30 Oct 2020 09:39:42 +0100 Subject: [PATCH 7/7] change type order --- .../interfaces/microservice-configuration.interface.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/microservices/interfaces/microservice-configuration.interface.ts b/packages/microservices/interfaces/microservice-configuration.interface.ts index 8ec160df3b6..fca8eedb7b5 100644 --- a/packages/microservices/interfaces/microservice-configuration.interface.ts +++ b/packages/microservices/interfaces/microservice-configuration.interface.ts @@ -120,7 +120,7 @@ export interface NatsOptions { export interface RmqOptions { transport?: Transport.RMQ; options?: { - urls?: RmqUrl[] | string[]; + urls?: string[] | RmqUrl[]; queue?: string; prefetchCount?: number; isGlobalPrefetchCount?: boolean;