Fix unhandled error on sendZclFrameToEndpointInternal in case of requ…

…est execute time more than timeout.
Koenkk · Oct 19, 2024 · 3e3a358 · 3e3a358
1 parent 425e58e
commit 3e3a358
Showing 1 changed file with 30 additions and 17 deletions.
diff --git a/src/adapter/zboss/adapter/zbossAdapter.ts b/src/adapter/zboss/adapter/zbossAdapter.ts
@@ -354,7 +354,7 @@ export class ZBOSSAdapter extends Adapter {
         let response = null;
         const command = zclFrame.command;
         if (command.response && disableResponse === false) {
-            response = this.waitFor(
+            response = this.waitForInternal(
                 networkAddress,
                 endpoint,
                 zclFrame.header.transactionSequenceNumber,
@@ -363,7 +363,7 @@ export class ZBOSSAdapter extends Adapter {
                 timeout,
             );
         } else if (!zclFrame.header.frameControl.disableDefaultResponse) {
-            response = this.waitFor(
+            response = this.waitForInternal(
                 networkAddress,
                 endpoint,
                 zclFrame.header.transactionSequenceNumber,
@@ -470,28 +470,41 @@ export class ZBOSSAdapter extends Adapter {
         return;
     }
 
-    public waitFor(
+    private waitForInternal(
         networkAddress: number,
         endpoint: number,
-        // frameType: Zcl.FrameType,
-        // direction: Zcl.Direction,
-        transactionSequenceNumber: number,
+        transactionSequenceNumber: number | undefined,
         clusterID: number,
         commandIdentifier: number,
         timeout: number,
-    ): {promise: Promise<ZclPayload>; cancel: () => void; start: () => {promise: Promise<ZclPayload>}} {
-        const payload = {
-            address: networkAddress,
-            endpoint,
-            clusterID,
-            commandIdentifier,
-            transactionSequenceNumber,
-        };
-
-        const waiter = this.waitress.waitFor(payload, timeout);
+    ): {start: () => {promise: Promise<ZclPayload>}; cancel: () => void} {
+        const waiter = this.waitress.waitFor(
+            {
+                address: networkAddress,
+                endpoint,
+                clusterID,
+                commandIdentifier,
+                transactionSequenceNumber,
+            },
+            timeout,
+        );
         const cancel = (): void => this.waitress.remove(waiter.ID);
+        return {start: waiter.start, cancel};
+    }
+
+     public waitFor(
+        networkAddress: number,
+        endpoint: number,
+        frameType: Zcl.FrameType,
+        direction: Zcl.Direction,
+        transactionSequenceNumber: number | undefined,
+        clusterID: number,
+        commandIdentifier: number,
+        timeout: number,
+    ): {promise: Promise<ZclPayload>; cancel: () => void} {
+        const waiter = this.waitForInternal(networkAddress, endpoint, transactionSequenceNumber, clusterID, commandIdentifier, timeout);
 
-        return {cancel: cancel, promise: waiter.start().promise, start: waiter.start};
+        return {cancel: waiter.cancel, promise: waiter.start().promise};
     }
 
     private waitressTimeoutFormatter(matcher: WaitressMatcher, timeout: number): string {