fix resends without delay

HalleyAssist · Sep 12, 2023 · c728532 · c728532
1 parent 81df8cb
commit c728532
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/Af.js b/lib/Af.js
@@ -265,8 +265,7 @@ class Af extends EventEmitter {
         let shouldResend = false
         let signalTimeout = Q.defer()
         try {
-            let areqCancelable = this.waitFor(afEventCnf, areqTimeout)
-            areqCancelable.catch(() => { })
+            let areqCancelable
 
             const startAreq = async () => {
                 let cnf
@@ -282,8 +281,6 @@ class Af extends EventEmitter {
 
                     if (shouldResend) {
                         shouldResend = false
-                        areqCancelable = this.waitFor(afEventCnf, areqTimeout)
-                        areqCancelable.catch(() => { })
                         await afSend()
                     }
                 } while (shouldResend)
@@ -303,6 +300,9 @@ class Af extends EventEmitter {
 
             let isResend = false
             const afSend = async () => {
+                areqCancelable = this.waitFor(afEventCnf, areqTimeout)
+                areqCancelable.catch(() => { })
+
                 let rsp
                 if (!isBroadcast && dstEp.getSrcRtg && !isResend) {
                     const srcRtg = dstEp.getSrcRtg()

diff --git a/lib/AfController.js b/lib/AfController.js
@@ -1,6 +1,6 @@
 const EventEmitter = require('eventemitter2')
 const Q = require('@halleyassist/q-lite')
-const debug = require('debug')("zigbee-shepherd:afc")
+const debug = require('debug')("zstack-af:controller")
 
 class AfController extends EventEmitter {
     constructor(){
@@ -78,7 +78,7 @@ class AfController extends EventEmitter {
 
                 // Perform send
                 if(i != 1) {
-                    debug(`Doing indirect send attempt #${i}/${retries}`)
+                    debug(`Doing indirect send attempt ${i}/${retries}`)
                 }
 
                 workPromise = sendFn()