Skip to content

Commit fd720e8

Browse files
micaleviskmicalevisk
committed
refactor: remove deprecated apis from 3rd-party deps
Replacie old and deprecated APIs from `rxjs`, `body-parser` and NodeJS core (read this guide https://nodejs.org/en/docs/guides/buffer-constructor-deprecation). Do notice that the later only touches test files, thus doesn't affect production code.
1 parent f1b9b63 commit fd720e8

16 files changed

Lines changed: 79 additions & 66 deletions

File tree

‎integration/microservices/src/grpc-advanced/advanced.grpc.controller.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ export class AdvancedGrpcController {
134134
async streamReq(messages: Observable<any>): Promise<any> {
135135
const s = new Subject();
136136
const o = s.asObservable();
137-
messages.subscribe(
138-
msg => {
137+
messages.subscribe({
138+
next: () => {
139139
s.next({
140140
id: 1,
141141
itemTypes: [1],
@@ -146,9 +146,8 @@ export class AdvancedGrpcController {
146146
},
147147
});
148148
},
149-
null,
150-
() => s.complete(),
151-
);
149+
complete: () => s.complete(),
150+
});
152151
return o;
153152
}
154153

‎integration/microservices/src/grpc/grpc.controller.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ export class GrpcController {
5050
@GrpcStreamMethod('Math')
5151
async sumStream(messages: Observable<any>): Promise<any> {
5252
return new Promise<any>((resolve, reject) => {
53-
messages.subscribe(
54-
msg => {
53+
messages.subscribe({
54+
next: msg => {
5555
resolve({
5656
result: msg.data.reduce((a, b) => a + b),
5757
});
5858
},
59-
err => {
59+
error: err => {
6060
reject(err);
6161
},
62-
);
62+
});
6363
});
6464
}
6565

‎packages/microservices/exceptions/base-rpc-exception-filter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class BaseRpcExceptionFilter<T = any, R = any>
1717
}
1818
const res = exception.getError();
1919
const message = isObject(res) ? res : { status, message: res };
20-
return _throw(message);
20+
return _throw(() => message);
2121
}
2222

2323
public handleUnknownError(exception: T, status: string) {
@@ -29,7 +29,7 @@ export class BaseRpcExceptionFilter<T = any, R = any>
2929
const logger = BaseRpcExceptionFilter.logger;
3030
logger.error.apply(logger, loggerArgs as any);
3131

32-
return _throw({ status, message: errorMessage });
32+
return _throw(() => ({ status, message: errorMessage }));
3333
}
3434

3535
public isError(exception: any): exception is Error {

‎packages/microservices/server/server-grpc.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
220220
public createUnaryServiceMethod(methodHandler: Function): Function {
221221
return async (call: GrpcCall, callback: Function) => {
222222
const handler = methodHandler(call.request, call.metadata, call);
223-
this.transformToObservable(await handler).subscribe(
224-
data => callback(null, data),
225-
(err: any) => callback(err),
226-
);
223+
this.transformToObservable(await handler).subscribe({
224+
next: data => callback(null, data),
225+
error: (err: any) => callback(err),
226+
});
227227
};
228228
}
229229

‎packages/microservices/server/server.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Logger, LoggerService } from '@nestjs/common/services/logger.service';
22
import { loadPackage } from '@nestjs/common/utils/load-package.util';
33
import {
44
connectable,
5-
EMPTY as empty,
5+
EMPTY,
66
from as fromPromise,
77
isObservable,
88
Observable,
@@ -94,7 +94,7 @@ export abstract class Server {
9494
.pipe(
9595
catchError((err: any) => {
9696
scheduleOnNextTick({ err });
97-
return empty;
97+
return EMPTY;
9898
}),
9999
finalize(() => scheduleOnNextTick({ isDisposed: true })),
100100
)

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

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ describe('ClientGrpcProxy', () => {
129129

130130
it('should call native method', () => {
131131
const spy = sinon.spy(obj, methodName);
132-
stream$.subscribe(
133-
() => ({}),
134-
() => ({}),
135-
);
132+
stream$.subscribe({
133+
next: () => ({}),
134+
error: () => ({}),
135+
});
136136

137137
expect(spy.called).to.be.true;
138138
});
@@ -156,10 +156,10 @@ describe('ClientGrpcProxy', () => {
156156

157157
it('should subscribe to request upstream', () => {
158158
const upstreamSubscribe = sinon.spy(upstream, 'subscribe');
159-
stream$.subscribe(
160-
() => ({}),
161-
() => ({}),
162-
);
159+
stream$.subscribe({
160+
next: () => ({}),
161+
error: () => ({}),
162+
});
163163
upstream.next({ test: true });
164164

165165
expect(writeSpy.called).to.be.true;
@@ -201,7 +201,12 @@ describe('ClientGrpcProxy', () => {
201201

202202
it('propagates server errors', () => {
203203
const err = new Error('something happened');
204-
stream$.subscribe(dataSpy, errorSpy, completeSpy);
204+
stream$.subscribe({
205+
next: dataSpy,
206+
error: errorSpy,
207+
complete: completeSpy,
208+
});
209+
205210
eventCallbacks.data('a');
206211
eventCallbacks.data('b');
207212
callMock.finished = true;
@@ -219,7 +224,11 @@ describe('ClientGrpcProxy', () => {
219224
const grpcServerCancelErrMock = {
220225
details: 'Cancelled',
221226
};
222-
const subscription = stream$.subscribe(dataSpy, errorSpy);
227+
const subscription = stream$.subscribe({
228+
next: dataSpy,
229+
error: errorSpy,
230+
});
231+
223232
eventCallbacks.data('a');
224233
eventCallbacks.data('b');
225234
subscription.unsubscribe();
@@ -258,10 +267,10 @@ describe('ClientGrpcProxy', () => {
258267

259268
it('should call native method', () => {
260269
const spy = sinon.spy(obj, methodName);
261-
stream$.subscribe(
262-
() => ({}),
263-
() => ({}),
264-
);
270+
stream$.subscribe({
271+
next: () => ({}),
272+
error: () => ({}),
273+
});
265274

266275
expect(spy.called).to.be.true;
267276
});
@@ -298,10 +307,10 @@ describe('ClientGrpcProxy', () => {
298307

299308
it('should subscribe to request upstream', () => {
300309
const upstreamSubscribe = sinon.spy(upstream, 'subscribe');
301-
stream$.subscribe(
302-
() => ({}),
303-
() => ({}),
304-
);
310+
stream$.subscribe({
311+
next: () => ({}),
312+
error: () => ({}),
313+
});
305314
upstream.next({ test: true });
306315

307316
expect(writeSpy.called).to.be.true;

‎packages/microservices/test/client/client-mqtt.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import { empty } from 'rxjs';
2+
import { EMPTY } from 'rxjs';
33
import * as sinon from 'sinon';
44
import { ClientMqtt } from '../../client/client-mqtt';
55
import { ERROR_EVENT } from '../../constants';
@@ -311,9 +311,9 @@ describe('ClientMqtt', () => {
311311
on: (ev, callback) => callback(error),
312312
off: () => ({}),
313313
};
314-
client
315-
.mergeCloseEvent(instance as any, empty())
316-
.subscribe(null, (err: any) => expect(err).to.be.eql(error));
314+
client.mergeCloseEvent(instance as any, EMPTY).subscribe({
315+
error: (err: any) => expect(err).to.be.eql(error),
316+
});
317317
});
318318
});
319319
describe('handleError', () => {

‎packages/microservices/test/client/client-proxy.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ describe('ClientProxy', function () {
9696
throw new Error();
9797
});
9898
const stream$ = client.send({ test: 3 }, 'test');
99-
stream$.subscribe(
100-
() => {},
101-
err => {
99+
stream$.subscribe({
100+
next: () => {},
101+
error: err => {
102102
expect(err).to.be.instanceof(Error);
103103
},
104-
);
104+
});
105105
});
106106
});
107107
describe('when is connected', () => {
@@ -142,12 +142,12 @@ describe('ClientProxy', function () {
142142
throw new Error();
143143
});
144144
const stream$ = client.emit({ test: 3 }, 'test');
145-
stream$.subscribe(
146-
() => {},
147-
err => {
145+
stream$.subscribe({
146+
next: () => {},
147+
error: err => {
148148
expect(err).to.be.instanceof(Error);
149149
},
150-
);
150+
});
151151
});
152152
});
153153
describe('when is connected', () => {

‎packages/microservices/test/client/client-rmq.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from 'chai';
22
import { EventEmitter } from 'events';
3-
import { empty } from 'rxjs';
3+
import { EMPTY } from 'rxjs';
44
import * as sinon from 'sinon';
55
import { ClientRMQ } from '../../client/client-rmq';
66
import { ReadPacket } from '../../interfaces';
@@ -164,8 +164,8 @@ describe('ClientRMQ', function () {
164164
off: () => ({}),
165165
};
166166
client
167-
.mergeDisconnectEvent(instance as any, empty())
168-
.subscribe(null, (err: any) => expect(err).to.be.eql(error));
167+
.mergeDisconnectEvent(instance as any, EMPTY)
168+
.subscribe({ error: (err: any) => expect(err).to.be.eql(error) });
169169
});
170170
});
171171

‎packages/microservices/test/context/rpc-proxy.spec.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ describe('RpcProxy', () => {
3636
const proxy = routerProxy.create(async (client, data) => {
3737
return throwError(() => new RpcException('test'));
3838
}, handler);
39-
(await proxy(null, null)).subscribe(null, () => expectation.verify());
39+
(await proxy(null, null)).subscribe({
40+
error: () => expectation.verify(),
41+
});
4042
});
4143
});
4244
});

0 commit comments

Comments
 (0)