start the zcl timeout after module send

HalleyAssist · Sep 19, 2023 · 2da433a · 2da433a
1 parent ed76766
commit 2da433a
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/lib/Af.js b/lib/Af.js
@@ -408,6 +408,14 @@ class Af extends EventEmitter {
         }
     }
 
+    static async areqCancel(areq){
+        const a = areq.catch(ex => {
+            if (!ex || ex.message !== "canceled") throw ex
+        })
+        areq.cancel()
+        await a
+    }
+
     async _zclFoundation(srcEp, dstEp, cId, cmd, zclData, cfg) {
         var areq,
             manufCode = 0,
@@ -460,7 +468,7 @@ class Af extends EventEmitter {
             else                    // from local ep to remote ep
                 mandatoryEvent = 'ZCL:foundation:' + nwkAddr.toString(16) + ':' + dstEp.getEpId() + ':' + srcEp.getEpId() + ':' + seqNum;
 
-            areq = this.waitFor(mandatoryEvent, AreqTimeout)
+            areq = this.waitFor(mandatoryEvent)
         }
 
         var afOptions = cfg.afOptions !== undefined ? cfg.afOptions : {}
@@ -470,11 +478,7 @@ class Af extends EventEmitter {
             rsp = await this.send(srcEp, dstEp, cId, zclBuffer, afOptions)
         } catch (err) {
             if (areq) {
-                const a = areq.catch(ex => {
-                    if (!ex || ex.message !== "canceled") throw ex
-                })
-                areq.cancel()
-                await a
+                await Af.areqCancel(areq)
             }
             if (err.code == "ETIMEDOUT") {
                 err.message = "zclFoundation(" + cmd + ":" + seqNum + ") " + err.message
@@ -487,9 +491,12 @@ class Af extends EventEmitter {
         }
 
         try {
-            rsp = await areq
+            rsp = await Q.timeout(areq, AreqTimeout)
         } catch (err) {
             if (err.code == "ETIMEDOUT") {
+                if (areq) {
+                    await Af.areqCancel(areq)
+                }
                 err.message = "zclFoundation(" + cmd + ":" + seqNum + ") " + err.message
             }
             throw err
@@ -551,7 +558,7 @@ class Af extends EventEmitter {
                 mandatoryEvent = 'ZCL:functional:' + dstEp.nwkAddr.toString(16) + ':' + dstEp.getEpId() + ':' + srcEp.getEpId() + ':' + seqNum;
 
 
-            areq = this.waitFor(mandatoryEvent, AreqTimeout)
+            areq = this.waitFor(mandatoryEvent)
         }
 
         var afOptions = cfg.afOptions !== undefined ? cfg.afOptions : {}
@@ -561,11 +568,7 @@ class Af extends EventEmitter {
             rsp = await this.send(srcEp, dstEp, cId, zclBuffer, afOptions)
         } catch (err) {
             if (areq) {
-                const a = areq.catch(ex => {
-                    if (!ex || ex.message !== "canceled") throw ex
-                })
-                areq.cancel()
-                await a
+                await Af.areqCancel(areq)
             }
             if (err.code == "ETIMEDOUT") {
                 err.message = "zclFunctional(" + cmd + ":" + seqNum + ") " + err.message
@@ -578,9 +581,12 @@ class Af extends EventEmitter {
         }
 
         try {
-            rsp = await areq
+            rsp = await Q.timeout(areq, AreqTimeout)
         } catch (err) {
             if (err.code == "ETIMEDOUT") {
+                if (areq) {
+                    await Af.areqCancel(areq)
+                }
                 err.message = "zclFunctional(" + cmd + ":" + seqNum + ") " + err.message
             }
             throw err