feat: Prepare to move specific ZDO requests out of Adapter (#1187)

* Prepare to move specific ZDO requests out of Adapter * Fix prettier. * Fix zstack tests. * Fix ember tests. * More coverage. * Fix prettier. * Add tests for zstack ZDO request payload alteration logic. * Cleanup zstack ZDO response handling & more robust tests. * Extra zstack edge-case coverage. * Update zstack to use `sendZdo`. * zstack: Match AREQ/SREQ logic, cleanup and optimize. More coverage. * Better condition for IEEE vs nwk matching (avoid possible edge-cases). * deconz * ezsp * Fix prettier. * ezsp: fix not compatible with 8.x.x. * zboss * zboss: fix. * deconz: fix `deviceJoined` event * zigate * zigate: better zdo buffalo patch * zboss: fix ignore response status in driver (handled upstream) * zboss: fix non-standard ZDO response payloads * zboss: fix leftover * zboss: fix permit join. * zboss: fix INDICATION payload * zboss: fix ZDO_DEV_UPDATE_IND. * zstack: remove `networkAddress` event in favor of `zdoResponse`. * zboss: revert unsupported join changes. * Fix prettier. * Feedback. * ZStack: only discover route when node descriptor request fails --------- Co-authored-by: Koen Kanters <[email protected]>
Koenkk · Sep 21, 2024 · d84725b · d84725b
1 parent 97b8dc0
commit d84725b
Show file tree

Hide file tree

Showing 41 changed files with 5,403 additions and 4,060 deletions.
diff --git a/src/adapter/adapter.ts b/src/adapter/adapter.ts
@@ -6,6 +6,8 @@ import * as Models from '../models';
 import {logger} from '../utils/logger';
 import {BroadcastAddress} from '../zspec/enums';
 import * as Zcl from '../zspec/zcl';
+import * as Zdo from '../zspec/zdo';
+import * as ZdoTypes from '../zspec/zdo/definition/tstypes';
 import * as AdapterEvents from './events';
 import * as TsType from './tstype';
 
@@ -14,6 +16,7 @@ const NS = 'zh:adapter';
 interface AdapterEventMap {
     deviceJoined: [payload: AdapterEvents.DeviceJoinedPayload];
     zclPayload: [payload: AdapterEvents.ZclPayload];
+    zdoResponse: [clusterId: Zdo.ClusterId, response: ZdoTypes.GenericZdoResponse];
     disconnected: [];
     deviceAnnounce: [payload: AdapterEvents.DeviceAnnouncePayload];
     deviceLeave: [payload: AdapterEvents.DeviceLeavePayload];
@@ -219,6 +222,28 @@ abstract class Adapter extends events.EventEmitter<AdapterEventMap> {
      * ZDO
      */
 
+    public abstract sendZdo(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: Zdo.ClusterId,
+        payload: Buffer,
+        disableResponse: true,
+    ): Promise<void>;
+    public abstract sendZdo<K extends keyof ZdoTypes.RequestToResponseMap>(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: K,
+        payload: Buffer,
+        disableResponse: false,
+    ): Promise<ZdoTypes.RequestToResponseMap[K]>;
+    public abstract sendZdo<K extends keyof ZdoTypes.RequestToResponseMap>(
+        ieeeAddress: string,
+        networkAddress: number,
+        clusterId: K,
+        payload: Buffer,
+        disableResponse: boolean,
+    ): Promise<ZdoTypes.RequestToResponseMap[K] | void>;
+
     public abstract permitJoin(seconds: number, networkAddress?: number): Promise<void>;
 
     public abstract lqi(networkAddress: number): Promise<TsType.LQI>;