chore() merge changes

Author: kamilmysliwiec

package-lock.json

@@ -32,9 +32,9 @@
   "license": "MIT",
   "dependencies": {
     "@grpc/proto-loader": "^0.3.0",
-    "@nestjs/common": "5.1.0",
-    "@nestjs/core": "^5.3.10",
-    "@nestjs/microservices": "5.1.0",
+    "@nestjs/common": "5.5.0",
+    "@nestjs/core": "^5.5.0",
+    "@nestjs/microservices": "5.5.0",
     "@nestjs/testing": "5.1.0",
     "@nestjs/websockets": "5.1.0",
     "@nuxtjs/opencollective": "^0.1.0",

package.json

@@ -47,6 +47,11 @@ export class HttpModule {
       imports: options.imports,
       providers: [
         ...this.createAsyncProviders(options),
+        {
+          provide: AXIOS_INSTANCE_TOKEN,
+          useFactory: (config: HttpModuleOptions) => Axios.create(config),
+          inject: [HTTP_MODULE_OPTIONS],
+        },
         {
           provide: HTTP_MODULE_ID,
           useValue: randomStringGenerator(),

packages/common/http/http.module.ts

@@ -20,6 +20,8 @@ export interface GrpcOptions {
   transport?: Transport.GRPC;
   options: {
     url?: string;
+    maxSendMessageLength?: number;
+    maxReceiveMessageLength?: number;
     credentials?: any;
     protoPath: string;
     package: string;

packages/common/interfaces/microservices/microservice-configuration.interface.ts

@@ -27,3 +27,5 @@ export const RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT = false;
 export const RQM_DEFAULT_QUEUE_OPTIONS = {};
 
 export const GRPC_DEFAULT_PROTO_LOADER = '@grpc/proto-loader';
+export const GRPC_DEFAULT_MAX_RECEIVE_MESSAGE_LENGTH = 4 * 1024 * 1024;
+export const GRPC_DEFAULT_MAX_SEND_MESSAGE_LENGTH = 4 * 1024 * 1024;

packages/microservices/constants.ts

@@ -21,6 +21,8 @@ export interface GrpcOptions {
   transport?: Transport.GRPC;
   options: {
     url?: string;
+    maxSendMessageLength?: number;
+    maxReceiveMessageLength?: number;
     credentials?: any;
     protoPath: string;
     package: string;

packages/microservices/interfaces/microservice-configuration.interface.ts

@@ -3,8 +3,10 @@ import { fromEvent } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import {
   CANCEL_EVENT,
+  GRPC_DEFAULT_MAX_RECEIVE_MESSAGE_LENGTH,
+  GRPC_DEFAULT_MAX_SEND_MESSAGE_LENGTH,
   GRPC_DEFAULT_PROTO_LOADER,
-  GRPC_DEFAULT_URL,
+  GRPC_DEFAULT_URL
 } from '../constants';
 import { InvalidGrpcPackageException } from '../exceptions/errors/invalid-grpc-package.exception';
 import { InvalidProtoDefinitionException } from '../exceptions/errors/invalid-proto-definition.exception';
@@ -154,7 +156,10 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
   }
 
   public createClient(): any {
-    const server = new grpcPackage.Server();
+    const server = new grpcPackage.Server({
+      'grpc.max_send_message_length': this.getOptionsProp<GrpcOptions>(this.options, 'maxSendMessageLength', GRPC_DEFAULT_MAX_SEND_MESSAGE_LENGTH),
+      'grpc.max_receive_message_length': this.getOptionsProp<GrpcOptions>(this.options, 'maxReceiveMessageLength', GRPC_DEFAULT_MAX_RECEIVE_MESSAGE_LENGTH)
+  });
     const credentials = this.getOptionsProp<GrpcOptions>(
       this.options,
       'credentials',

packages/microservices/server/server-grpc.ts

@@ -63,7 +63,7 @@ export abstract class Server {
     prop: keyof T['options'],
     defaultValue = undefined,
   ) {
-    return obj ? obj[prop as string] : defaultValue;
+    return obj && obj[prop as string] || defaultValue;
   }
 
   protected handleError(error: string) {