amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(microservices): align to the rest of codebase

Browse Source
This commit is contained in:
Kamil Myśliwiec
2020-01-24 14:32:13 +01:00
parent b46bf16265
commit c5d1122f0d
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/microservices/client/client-grpc.ts
View File

@@ -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 grpcClients: any[] = [];
protected grpcClients = [];
constructor(protected readonly options: GrpcOptions['options']) {
super();
@@ -40,13 +40,12 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
public getService<T extends {}>(name: string): T {
const grpcClient = this.createClientByServiceName(name);
const getClient = this.getClient(name);
if (!getClient) {
const clientRef = this.getClient(name);
if (!clientRef) {
throw new InvalidGrpcServiceException();
}
const protoMethods = Object.keys(getClient[name].prototype);
const protoMethods = Object.keys(clientRef[name].prototype);
const grpcService = {} as T;
protoMethods.forEach(m => {
@@ -61,9 +60,8 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
}
public createClientByServiceName(name: string) {
const getClient = this.getClient(name);
if (!getClient) {
const clientRef = this.getClient(name);
if (!clientRef) {
throw new InvalidGrpcServiceException();
}
const maxSendMessageLengthKey = 'grpc.max_send_message_length';
@@ -94,7 +92,7 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
options.credentials || grpcPackage.credentials.createInsecure();
delete options.credentials;
const grpcClient = new getClient[name](this.url, credentials, options);
const grpcClient = new clientRef[name](this.url, credentials, options);
this.clients.set(name, grpcClient);
return grpcClient;
}
@@ -161,9 +159,11 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
public createClients(): any[] {
const grpcContext = this.loadProto();
const packageOpt = this.getOptionsProp(this.options, 'package');
const grpcPkgs = [];
const packageNames = Array.isArray(packageOpt) ? packageOpt : [packageOpt];
const packageOption = this.getOptionsProp(this.options, 'package');
const grpcPackages = [];
const packageNames = Array.isArray(packageOption)
? packageOption
: [packageOption];
for (const packageName of packageNames) {
const grpcPkg = this.lookupPackage(grpcContext, packageName);
@@ -176,11 +176,9 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
);
throw invalidPackageError;
}
grpcPkgs.push(grpcPkg);
grpcPackages.push(grpcPkg);
}
return grpcPkgs;
return grpcPackages;
}
public loadProto(): any {
@@ -213,10 +211,7 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
}
public close() {
this.grpcClients.forEach(client => {
client.close();
});
this.grpcClients.forEach(client => client.close());
this.grpcClients = [];
}