fix: adjust APS constants

Author: Nerivec

src/zigbee-stack/aps-handler.ts

@@ -96,7 +96,7 @@ export interface APSHandlerCallbacks {
 /** apsDuplicateEntryLifetime: Duration while APS duplicate table entries remain valid (milliseconds). Spec default ≈ 8s. */
 const CONFIG_APS_DUPLICATE_TIMEOUT_MS = 8000; // TODO: verify
 /** apsAckWaitDuration: Default ack wait duration per Zigbee 3.0 spec (milliseconds). */
-export const CONFIG_APS_ACK_WAIT_DURATION_MS = 1600 + 200; // some extra for ZoH
+export const CONFIG_APS_ACK_WAIT_DURATION_MS = 1600 + 500; // some extra for ZoH
 /** apsMaxFrameRetries: Default number of APS retransmissions when ACK is missing. */
 export const CONFIG_APS_MAX_FRAME_RETRIES = 3;
 /** apsFragmentationTimeout: Timeout for incomplete incoming APS fragment reassembly (milliseconds). */

test/compliance/integration.test.ts

@@ -55,7 +55,12 @@ import {
     ZigbeeNWKRouteDiscovery,
     ZigbeeNWKStatus,
 } from "../../src/zigbee/zigbee-nwk.js";
-import { APSHandler, type APSHandlerCallbacks, CONFIG_APS_MAX_FRAME_RETRIES } from "../../src/zigbee-stack/aps-handler.js";
+import {
+    APSHandler,
+    type APSHandlerCallbacks,
+    CONFIG_APS_ACK_WAIT_DURATION_MS,
+    CONFIG_APS_MAX_FRAME_RETRIES,
+} from "../../src/zigbee-stack/aps-handler.js";
 import { MACHandler, type MACHandlerCallbacks } from "../../src/zigbee-stack/mac-handler.js";
 import { NWKGPHandler, type NWKGPHandlerCallbacks } from "../../src/zigbee-stack/nwk-gp-handler.js";
 import { NWKHandler, type NWKHandlerCallbacks } from "../../src/zigbee-stack/nwk-handler.js";
@@ -1432,11 +1437,11 @@ describe("Integration and End-to-End Compliance", () => {
                 expect(mockMACHandlerCallbacks.onSendFrame).toHaveBeenCalledTimes(1);
 
                 for (let attempt = 0; attempt < CONFIG_APS_MAX_FRAME_RETRIES; attempt++) {
-                    await vi.advanceTimersByTimeAsync(1500);
+                    await vi.advanceTimersByTimeAsync(CONFIG_APS_ACK_WAIT_DURATION_MS - 1);
                     await Promise.resolve();
                 }
 
-                await vi.advanceTimersByTimeAsync(1500);
+                await vi.advanceTimersByTimeAsync(CONFIG_APS_ACK_WAIT_DURATION_MS - 1);
                 await Promise.resolve();
 
                 expect(mockMACHandlerCallbacks.onSendFrame).toHaveBeenCalledTimes(CONFIG_APS_MAX_FRAME_RETRIES + 1);

test/zigbee-stack/aps-handler.test.ts

@@ -13,7 +13,7 @@ import {
     type ZigbeeAPSHeader,
 } from "../../src/zigbee/zigbee-aps.js";
 import { type ZigbeeNWKHeader, ZigbeeNWKRouteDiscovery } from "../../src/zigbee/zigbee-nwk.js";
-import { APSHandler, type APSHandlerCallbacks } from "../../src/zigbee-stack/aps-handler.js";
+import { APSHandler, type APSHandlerCallbacks, CONFIG_APS_ACK_WAIT_DURATION_MS } from "../../src/zigbee-stack/aps-handler.js";
 import { MACHandler, type MACHandlerCallbacks } from "../../src/zigbee-stack/mac-handler.js";
 import { NWKHandler, type NWKHandlerCallbacks } from "../../src/zigbee-stack/nwk-handler.js";
 import {
@@ -2098,7 +2098,7 @@ describe("APS Handler", () => {
 
         await apsHandler.processFrame(Buffer.alloc(0), ackMacHeader, ackNwkHeader, ackHeader, 175);
 
-        await vi.advanceTimersByTimeAsync(1500);
+        await vi.advanceTimersByTimeAsync(CONFIG_APS_ACK_WAIT_DURATION_MS - 1);
         await vi.runOnlyPendingTimersAsync();
 
         expect(sendFrameMock).toHaveBeenCalledTimes(1);
@@ -2171,7 +2171,7 @@ describe("APS Handler", () => {
         mockContext.deviceTable.set(dest64, savedEntry);
         mockContext.address16ToAddress64.set(dest16, dest64);
 
-        await vi.advanceTimersByTimeAsync(1500);
+        await vi.advanceTimersByTimeAsync(CONFIG_APS_ACK_WAIT_DURATION_MS - 1);
         await vi.runOnlyPendingTimersAsync();
 
         expect(sendFrameMock.mock.calls.length).toBeGreaterThan(1);