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

fix(): resolve merge conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2020-03-11 22:41:53 +01:00
parent 207d14a774 11ce74cafc
commit d3e14195e2
95 changed files with 17928 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,12 +153,14 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
let upstreamSubscription: Subscription;
const upstreamSubjectOrData = args[0];
const maybeMetadata = args[1];
const isUpstreamSubject =
upstreamSubjectOrData && isFunction(upstreamSubjectOrData.subscribe);
const call =
isRequestStream && isUpstreamSubject
? client[methodName]()
? client[methodName](maybeMetadata)
: client[methodName](...args);
if (isRequestStream && isUpstreamSubject) {
@@ -215,13 +217,20 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
if (isRequestStream && isUpstreamSubject) {
return new Observable(observer => {
const call = client[methodName]((error, data) => {
if (error) {
return observer.error(error);
}
observer.next(data);
observer.complete();
});
const callArgs = [
(error: unknown, data: unknown) => {
if (error) {
return observer.error(error);
}
observer.next(data);
observer.complete();
},
];
const maybeMetadata = args[1];
if (maybeMetadata) {
callArgs.unshift(maybeMetadata);
}
const call = client[methodName](...callArgs);
upstreamSubjectOrData.subscribe(
(val: unknown) => call.write(val),
(err: unknown) => call.emit('error', err),