From 3107bd724669079f462b9c8b843b9f2d552855ff Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Wed, 1 Jun 2022 17:52:48 +0200 Subject: [PATCH 1/2] fix: process ws return route messages serially Signed-off-by: Timo Glastra --- packages/core/src/transport/WsOutboundTransport.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/core/src/transport/WsOutboundTransport.ts b/packages/core/src/transport/WsOutboundTransport.ts index 594012e4e5..b9fe02b09b 100644 --- a/packages/core/src/transport/WsOutboundTransport.ts +++ b/packages/core/src/transport/WsOutboundTransport.ts @@ -1,3 +1,4 @@ +import type { AgentMessageReceivedEvent } from '..' import type { Agent } from '../agent/Agent' import type { Logger } from '../logger' import type { OutboundPackage } from '../types' @@ -7,6 +8,7 @@ import type WebSocket from 'ws' import { AgentConfig } from '../agent/AgentConfig' import { EventEmitter } from '../agent/EventEmitter' +import { AgentEventTypes } from '../agent/Events' import { AriesFrameworkError } from '../error/AriesFrameworkError' import { isValidJweStructure, JsonEncoder } from '../utils' import { Buffer } from '../utils/buffer' @@ -109,7 +111,12 @@ export class WsOutboundTransport implements OutboundTransport { ) } this.logger.debug('Payload received from mediator:', payload) - void this.agent.receiveMessage(payload) + this.eventEmitter.emit({ + type: AgentEventTypes.AgentMessageReceived, + payload: { + message: payload, + }, + }) } private listenOnWebSocketMessages(socket: WebSocket) { From 6f14c578b4207e6b4a3447878606e80efb27853c Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Thu, 2 Jun 2022 12:08:13 +0200 Subject: [PATCH 2/2] fix: do not import from .. Signed-off-by: Timo Glastra --- packages/core/src/transport/WsOutboundTransport.ts | 2 +- packages/core/src/utils/__tests__/indyProofRequest.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/transport/WsOutboundTransport.ts b/packages/core/src/transport/WsOutboundTransport.ts index b9fe02b09b..e051adabf8 100644 --- a/packages/core/src/transport/WsOutboundTransport.ts +++ b/packages/core/src/transport/WsOutboundTransport.ts @@ -1,5 +1,5 @@ -import type { AgentMessageReceivedEvent } from '..' import type { Agent } from '../agent/Agent' +import type { AgentMessageReceivedEvent } from '../agent/Events' import type { Logger } from '../logger' import type { OutboundPackage } from '../types' import type { OutboundTransport } from './OutboundTransport' diff --git a/packages/core/src/utils/__tests__/indyProofRequest.test.ts b/packages/core/src/utils/__tests__/indyProofRequest.test.ts index 547745bcc7..5b08490d17 100644 --- a/packages/core/src/utils/__tests__/indyProofRequest.test.ts +++ b/packages/core/src/utils/__tests__/indyProofRequest.test.ts @@ -1,4 +1,4 @@ -import { checkProofRequestForDuplicates } from '..' +import { checkProofRequestForDuplicates } from '../indyProofRequest' import { AriesFrameworkError,