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

Merge branch 'feature/grpc-server-package-definition' of https://github.com/krugi/nest into krugi-feature/grpc-server-package-definition

Browse Source
This commit is contained in:
Kamil Myśliwiec
2023-12-18 09:08:02 +01:00
parent 202dfbf4a3 7de2ff29a5
commit 0a6853c847
10 changed files with 141 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import { ClientGrpc, GrpcOptions } from '../interfaces';
import { ClientProxy } from './client-proxy';
import { GRPC_CANCELLED } from './constants';
import { ChannelOptions } from '../external/grpc-options.interface';
import { getGrpcPackageDefinition } from '../helpers';
let grpcPackage: any = {};
let grpcProtoLoaderPackage: any = {};
@@ -300,16 +301,11 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
public loadProto(): any {
try {
const file = this.getOptionsProp(this.options, 'protoPath');
const loader = this.getOptionsProp(this.options, 'loader');
const packageDefinition =
this.getOptionsProp(this.options, 'packageDefinition') ||
grpcProtoLoaderPackage.loadSync(file, loader);
const packageObject =
grpcPackage.loadPackageDefinition(packageDefinition);
return packageObject;
const packageDefinition = getGrpcPackageDefinition(
this.options,
grpcProtoLoaderPackage,
);
return grpcPackage.loadPackageDefinition(packageDefinition);
} catch (err) {
const invalidProtoError = new InvalidProtoDefinitionException(err.path);
const message =