From dc874e3415e8b8f57c1e145b0aeef786ad01abc8 Mon Sep 17 00:00:00 2001 From: Edgard Messias Date: Mon, 14 Dec 2020 17:47:45 -0300 Subject: [PATCH] Fixed event emitter for default callback --- src/WAConnection/3.Connect.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/WAConnection/3.Connect.ts b/src/WAConnection/3.Connect.ts index ce36e2f..96fe520 100644 --- a/src/WAConnection/3.Connect.ts +++ b/src/WAConnection/3.Connect.ts @@ -202,12 +202,15 @@ export class WAConnection extends Base { const l0 = json[0] || '' const l1 = typeof json[1] !== 'object' || json[1] === null ? {} : json[1] const l2 = ((json[2] || [])[0] || [])[0] || '' + Object.keys(l1).forEach(key => { - anyTriggered = anyTriggered || this.emit (`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`, json) - anyTriggered = anyTriggered || this.emit (`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`, json) + anyTriggered = this.emit (`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`) || anyTriggered; + anyTriggered = this.emit (`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`) || anyTriggered; + anyTriggered = this.emit (`${DEF_CALLBACK_PREFIX}${l0},${key}`) || anyTriggered; }) - anyTriggered = anyTriggered || this.emit (`${DEF_CALLBACK_PREFIX}${l0},,${l2}`, json) - anyTriggered = anyTriggered || this.emit (`${DEF_CALLBACK_PREFIX}${l0}`, json) + anyTriggered = this.emit (`${DEF_CALLBACK_PREFIX}${l0},,${l2}`) || anyTriggered; + anyTriggered = this.emit (`${DEF_CALLBACK_PREFIX}${l0}`) || anyTriggered; + if (anyTriggered) return if (this.state === 'open' && json[0] === 'Pong') {