fix(microcervices): fix multipackages client

Author: Alex Dukhnovskiy

packages/microservices/client/client-grpc.ts

@@ -22,7 +22,7 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
   protected readonly logger = new Logger(ClientProxy.name);
   protected readonly clients = new Map<string, any>();
   protected readonly url: string;
-  protected grpcClient: any;
+  protected grpcClients: any[] = [];
 
   constructor(protected readonly options: GrpcOptions['options']) {
     super();
@@ -35,12 +35,18 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
       require('grpc'),
     );
     grpcProtoLoaderPackage = loadPackage(protoLoader, ClientGrpcProxy.name);
-    this.grpcClient = this.createClient();
+    this.grpcClients = this.createClients();
   }
 
   public getService<T extends {}>(name: string): T {
     const grpcClient = this.createClientByServiceName(name);
-    const protoMethods = Object.keys(this.grpcClient[name].prototype);
+    const getClient = this.getClient(name);
+
+    if (!getClient) {
+      throw new InvalidGrpcServiceException();
+    }
+
+    const protoMethods = Object.keys(getClient[name].prototype);
     const grpcService = {} as T;
 
     protoMethods.forEach(m => {
@@ -55,7 +61,9 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
   }
 
   public createClientByServiceName(name: string) {
-    if (!this.grpcClient[name]) {
+    const getClient = this.getClient(name);
+
+    if (!getClient) {
       throw new InvalidGrpcServiceException();
     }
     const maxSendMessageLengthKey = 'grpc.max_send_message_length';
@@ -86,11 +94,7 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
       options.credentials || grpcPackage.credentials.createInsecure();
 
     delete options.credentials;
-    const grpcClient = new this.grpcClient[name](
-      this.url,
-      credentials,
-      options,
-    );
+    const grpcClient = new getClient[name](this.url, credentials, options);
     this.clients.set(name, grpcClient);
     return grpcClient;
   }
@@ -155,23 +159,28 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
     };
   }
 
-  public createClient(): any {
+  public createClients(): any[] {
     const grpcContext = this.loadProto();
     const packageOpt = this.getOptionsProp(this.options, 'package');
-
+    const grpcPkgs = [];
     const packageNames = Array.isArray(packageOpt) ? packageOpt : [packageOpt];
 
     for (const packageName of packageNames) {
       const grpcPkg = this.lookupPackage(grpcContext, packageName);
 
       if (!grpcPkg) {
         const invalidPackageError = new InvalidGrpcPackageException();
-        this.logger.error(invalidPackageError.message, invalidPackageError.stack);
+        this.logger.error(
+          invalidPackageError.message,
+          invalidPackageError.stack,
+        );
         throw invalidPackageError;
       }
 
-      return grpcPkg;
+      grpcPkgs.push(grpcPkg);
     }
+
+    return grpcPkgs;
   }
 
   public loadProto(): any {
@@ -204,8 +213,11 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
   }
 
   public close() {
-    this.grpcClient && this.grpcClient.close();
-    this.grpcClient = null;
+    this.grpcClients.forEach(client => {
+      client.close();
+    });
+
+    this.grpcClients = [];
   }
 
   public async connect(): Promise<any> {
@@ -221,6 +233,10 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
     );
   }
 
+  protected getClient(name: string): any {
+    return this.grpcClients.find(client => client.hasOwnProperty(name));
+  }
+
   protected publish(packet: any, callback: (packet: any) => any): any {
     throw new Error(
       'Method is not supported in gRPC mode. Use ClientGrpc instead (learn more in the documentation).',

packages/microservices/test/client/client-grpc.spec.ts

@@ -33,8 +33,8 @@ describe('ClientGrpcProxy', () => {
       protoPath: ['test.proto', 'test2.proto'],
       package: ['test', 'test2'],
       loader: {
-        includeDirs: [join(__dirname, '.')]
-      }
+        includeDirs: [join(__dirname, '.')],
+      },
     });
   });
 
@@ -225,14 +225,14 @@ describe('ClientGrpcProxy', () => {
     });
   });
 
-  describe('createClient', () => {
+  describe('createClients', () => {
     describe('when package does not exist', () => {
       it('should throw "InvalidGrpcPackageException"', () => {
         sinon.stub(client, 'lookupPackage').callsFake(() => null);
         (client as any).logger = new NoopLogger();
 
         try {
-          client.createClient();
+          client.createClients();
         } catch (err) {
           expect(err).to.be.instanceof(InvalidGrpcPackageException);
         }