From 48f00a80e77b70d41550a117644e720eff562ac5 Mon Sep 17 00:00:00 2001 From: lucas-barbosa-oliveira Date: Mon, 29 Mar 2021 09:37:10 -0300 Subject: [PATCH] Correcting the Promise RPC Client options. --- package-lock.json | 2 +- package.json | 2 +- src/application/connection.ts | 2 +- src/application/port/communication.option.interface.ts | 2 +- src/infrastructure/rabbitmq/rpc/client.register.rabbitmq.ts | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 381a306..905603d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "amqp-client-node", - "version": "1.0.9", + "version": "1.0.10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3704ae0..3a501ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amqp-client-node", - "version": "1.0.10", + "version": "1.0.11", "description": "Library for publish and subscribe events on message bus. In addition, it is possible to perform resource requests from the use of the standard commonly known as RPC.", "main": "lib/index.js", "typings": "lib/index.d.ts", diff --git a/src/application/connection.ts b/src/application/connection.ts index ee70dcd..87e08a7 100644 --- a/src/application/connection.ts +++ b/src/application/connection.ts @@ -123,7 +123,7 @@ export class Connection implements IConnection { optOrCall?: IClientOptions | ((err, message: any) => void), options?: IClientOptions): any { if (!(optOrCall instanceof Function)) { - return this.rpcClientPromise(exchangeName, resourceName, parameters, options) + return this.rpcClientPromise(exchangeName, resourceName, parameters, optOrCall) } this.rpcClientCallback(exchangeName, resourceName, parameters, optOrCall, options) } diff --git a/src/application/port/communication.option.interface.ts b/src/application/port/communication.option.interface.ts index 19a6a61..5790aad 100644 --- a/src/application/port/communication.option.interface.ts +++ b/src/application/port/communication.option.interface.ts @@ -14,7 +14,7 @@ export interface ISubExchangeOptions { export interface IClientOptions { exchange?: IExchangeOptions, - rcpTimeout?: number + rpcTimeout?: number } export interface IServerOptions { diff --git a/src/infrastructure/rabbitmq/rpc/client.register.rabbitmq.ts b/src/infrastructure/rabbitmq/rpc/client.register.rabbitmq.ts index 262e544..ea41fe8 100644 --- a/src/infrastructure/rabbitmq/rpc/client.register.rabbitmq.ts +++ b/src/infrastructure/rabbitmq/rpc/client.register.rabbitmq.ts @@ -8,7 +8,7 @@ import { IClientOptions } from '../../../application/port/communication.option.i import { IMessage } from '../../../application/port/message.interface' const defClientOptions: IClientOptions = { - rcpTimeout: 5000 + rpcTimeout: 5000 } @injectable() @@ -35,8 +35,10 @@ export class ClientRegisterRabbitmq implements IClientRegister { const exchange = this._connection.getExchange(exchangeName, options ? options.exchange : undefined) await exchange.initialized + if (!options.rpcTimeout) options.rpcTimeout = defClientOptions.rpcTimeout + let time - const timeout = options.rcpTimeout + const timeout = options.rpcTimeout if (timeout > 0) { new Promise((res) => {