chore(): resolve merge conflicts

nestjs · Nov 2, 2020 · b8c6373 · b8c6373
2 parents bef63a7 + 0af826e
commit b8c6373
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/packages/microservices/client/client-kafka.ts b/packages/microservices/client/client-kafka.ts
@@ -11,6 +11,7 @@ import { KafkaHeaders } from '../enums';
 import { InvalidKafkaClientTopicPartitionException } from '../errors/invalid-kafka-client-topic-partition.exception';
 import { InvalidKafkaClientTopicException } from '../errors/invalid-kafka-client-topic.exception';
 import {
+  BrokersFunction,
   Consumer,
   ConsumerConfig,
   ConsumerGroupJoinEvent,
@@ -47,7 +48,7 @@ export class ClientKafka extends ClientProxy {
   protected responsePatterns: string[] = [];
   protected consumerAssignments: { [key: string]: number[] } = {};
 
-  protected brokers: string[];
+  protected brokers: string[] | BrokersFunction;
   protected clientId: string;
   protected groupId: string;
 

diff --git a/packages/microservices/external/kafka-options.interface.ts b/packages/microservices/external/kafka-options.interface.ts
@@ -1,7 +1,7 @@
 /// <reference types="node" />
 
-import * as tls from 'tls';
 import * as net from 'net';
+import * as tls from 'tls';
 
 type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
 type XOR<T, U> = T | U extends object
@@ -16,8 +16,10 @@ export declare class Kafka {
   logger(): Logger;
 }
 
+export type BrokersFunction = () => string[] | Promise<string[]>;
+
 export interface KafkaConfig {
-  brokers: string[];
+  brokers: string[] | BrokersFunction;
   ssl?: tls.ConnectionOptions | boolean;
   sasl?: SASLOptions;
   clientId?: string;

diff --git a/packages/microservices/external/kafka.interface.ts b/packages/microservices/external/kafka.interface.ts
@@ -12,13 +12,16 @@ export declare class Kafka {
   logger(): Logger;
 }
 
+export type BrokersFunction = () => string[] | Promise<string[]>;
+
 export interface KafkaConfig {
-  brokers: string[];
+  brokers: string[] | BrokersFunction;
   ssl?: tls.ConnectionOptions | boolean;
   sasl?: SASLOptions;
   clientId?: string;
   connectionTimeout?: number;
   authenticationTimeout?: number;
+  reauthenticationThreshold?: number;
   requestTimeout?: number;
   enforceRequestTimeout?: boolean;
   retry?: RetryOptions;

diff --git a/packages/microservices/server/server-kafka.ts b/packages/microservices/server/server-kafka.ts
@@ -10,6 +10,7 @@ import {
 import { KafkaContext } from '../ctx-host';
 import { KafkaHeaders, Transport } from '../enums';
 import {
+  BrokersFunction,
   Consumer,
   ConsumerConfig,
   EachMessagePayload,
@@ -38,7 +39,7 @@ export class ServerKafka extends Server implements CustomTransportStrategy {
   protected consumer: Consumer = null;
   protected producer: Producer = null;
 
-  protected brokers: string[];
+  protected brokers: string[] | BrokersFunction;
   protected clientId: string;
   protected groupId: string;