Skip to content

Commit cf2c1ae

Browse files
author
Alex Dukhnovskiy
committed
fix(microservices): fix tests and CS grpc-multipackage
1 parent 2626eb7 commit cf2c1ae

9 files changed

Lines changed: 139 additions & 789 deletions

File tree

integration/microservices/src/grpc/math.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ message SumResult {
1414

1515
message RequestSum {
1616
repeated int32 data = 1;
17-
}
17+
}

packages/microservices/client/client-grpc.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
7474
};
7575
const options: any = isObject(this.options)
7676
? {
77-
...this.options,
78-
...maxMessageLengthOptions,
79-
loader: '',
80-
}
77+
...this.options,
78+
...maxMessageLengthOptions,
79+
loader: '',
80+
}
8181
: {
82-
...maxMessageLengthOptions,
83-
};
82+
...maxMessageLengthOptions,
83+
};
8484

8585
const credentials =
8686
options.credentials || grpcPackage.credentials.createInsecure();

packages/microservices/server/server-grpc.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
210210
const handler = methodHandler(call.request, call.metadata);
211211
const result$ = this.transformToObservable(await handler);
212212
await result$
213-
.pipe(
214-
takeUntil(fromEvent(call as any, CANCEL_EVENT)),
215-
catchError(err => {
216-
call.emit('error', err);
217-
return EMPTY;
218-
}),
219-
)
220-
.forEach(data => call.write(data));
213+
.pipe(
214+
takeUntil(fromEvent(call as any, CANCEL_EVENT)),
215+
catchError(err => {
216+
call.emit('error', err);
217+
return EMPTY;
218+
}),
219+
)
220+
.forEach(data => call.write(data));
221221
call.end();
222222
};
223223
}
@@ -230,8 +230,8 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
230230
// Check if error means that stream ended on other end
231231
if (
232232
String(e)
233-
.toLowerCase()
234-
.indexOf('cancelled') > -1
233+
.toLowerCase()
234+
.indexOf('cancelled') > -1
235235
) {
236236
call.end();
237237
return;
@@ -244,14 +244,14 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
244244
const handler = methodHandler(req.asObservable());
245245
const res = this.transformToObservable(await handler);
246246
await res
247-
.pipe(
248-
takeUntil(fromEvent(call as any, CANCEL_EVENT)),
249-
catchError(err => {
250-
call.emit('error', err);
251-
return EMPTY;
252-
}),
253-
)
254-
.forEach(m => call.write(m));
247+
.pipe(
248+
takeUntil(fromEvent(call as any, CANCEL_EVENT)),
249+
catchError(err => {
250+
call.emit('error', err);
251+
return EMPTY;
252+
}),
253+
)
254+
.forEach(m => call.write(m));
255255

256256
call.end();
257257
};

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

Lines changed: 0 additions & 286 deletions
This file was deleted.

0 commit comments

Comments
 (0)