ZStack: fix request network address blocking all requests

src/adapter/z-stack/adapter/zStackAdapter.ts

@@ -258,7 +258,7 @@ class ZStackAdapter extends Adapter {
         const clusterId = Zdo.ClusterId.NETWORK_ADDRESS_REQUEST;
         const zdoPayload = Zdo.Buffalo.buildRequest(this.hasZdoMessageOverhead, clusterId, ieeeAddr as EUI64, false, 0);
 
-        const result = await this.sendZdo(ieeeAddr, ZSpec.NULL_NODE_ID, clusterId, zdoPayload, false);
+        const result = await this.sendZdoInternal(ieeeAddr, ZSpec.NULL_NODE_ID, clusterId, zdoPayload, false, true);
 
         /* istanbul ignore else */
         if (Zdo.Buffalo.checkStatus(result)) {
@@ -308,7 +308,35 @@ class ZStackAdapter extends Adapter {
         payload: Buffer,
         disableResponse: boolean,
     ): Promise<ZdoTypes.RequestToResponseMap[K] | void> {
-        return await this.queue.execute(async () => {
+        // @ts-expect-error TODO fix
+        return await this.sendZdoInternal(ieeeAddress, networkAddress, clusterId, payload, disableResponse, false);
+    }
+
+    private async sendZdoInternal(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: Zdo.ClusterId,
+        payload: Buffer,
+        disableResponse: true,
+        skipQueue: boolean,
+    ): Promise<void>;
+    private async sendZdoInternal<K extends keyof ZdoTypes.RequestToResponseMap>(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: K,
+        payload: Buffer,
+        disableResponse: false,
+        skipQueue: boolean,
+    ): Promise<ZdoTypes.RequestToResponseMap[K]>;
+    private async sendZdoInternal<K extends keyof ZdoTypes.RequestToResponseMap>(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: K,
+        payload: Buffer,
+        disableResponse: boolean,
+        skipQueue: boolean,
+    ): Promise<ZdoTypes.RequestToResponseMap[K] | void> {
+        const func = async (): Promise<ZdoTypes.RequestToResponseMap[K] | void> => {
             this.checkInterpanLock();
 
             // stack-specific requirements
@@ -404,7 +432,8 @@ class ZStackAdapter extends Adapter {
 
                 return response.payload.zdo;
             }
-        }, networkAddress);
+        };
+        return skipQueue ? await func() : await this.queue.execute(func, networkAddress);
     }
 
     public async sendZclFrameToEndpoint(
@@ -417,6 +446,7 @@ class ZStackAdapter extends Adapter {
         disableRecovery: boolean,
         sourceEndpoint?: number,
     ): Promise<Events.ZclPayload | void> {
+        logger.debug(`== sendZclFrameToEndpoint add to queue - ${ieeeAddr}/${networkAddress}`, NS);
         return await this.queue.execute<Events.ZclPayload | void>(async () => {
             this.checkInterpanLock();
             return await this.sendZclFrameToEndpointInternal(

src/utils/queue.ts

@@ -1,9 +1,13 @@
+import {logger} from './logger';
+
 interface Job {
     key?: string | number;
     running: boolean;
     start?: () => void;
 }
 
+const NS = 'zh:queue';
+
 class Queue {
     private jobs: Job[];
     private readonly concurrent: number;
@@ -14,6 +18,7 @@ class Queue {
     }
 
     public async execute<T>(func: () => Promise<T>, key?: string | number): Promise<T> {
+        logger.debug(`== queue add - ${key} (keys=${this.jobs.map((j) => j.key)})`, NS);
         const job: Job = {key, running: false};
         this.jobs.push(job);
 
@@ -33,9 +38,11 @@ class Queue {
         }
 
         try {
+            logger.debug(`== queue execute func - ${key} (keys=${this.jobs.map((j) => j.key)})`, NS);
             return await func();
         } finally {
             this.jobs.splice(this.jobs.indexOf(job), 1);
+            logger.debug(`== queue remove - ${key}  (keys=${this.jobs.map((j) => j.key)})`, NS);
             this.executeNext();
         }
     }