fix: Use BuffaloZdo in ZStackAdapter (#1133)

Koenkk · Sep 14, 2024 · 4fa371d · 4fa371d
1 parent e2683ed
commit 4fa371d
Show file tree

Hide file tree

Showing 17 changed files with 882 additions and 832 deletions.
diff --git a/src/adapter/ember/adapter/emberAdapter.ts b/src/adapter/ember/adapter/emberAdapter.ts
@@ -99,18 +99,6 @@ export type LinkKeyBackupData = {
     incomingFrameCounter: number;
 };
 
-/** Enum to pass strings from numbers up to Z2M. */
-enum RoutingTableStatus {
-    ACTIVE = 0x0,
-    DISCOVERY_UNDERWAY = 0x1,
-    DISCOVERY_FAILED = 0x2,
-    INACTIVE = 0x3,
-    VALIDATION_UNDERWAY = 0x4,
-    RESERVED1 = 0x5,
-    RESERVED2 = 0x6,
-    RESERVED3 = 0x7,
-}
-
 enum NetworkInitAction {
     /** Ain't that nice! */
     DONE,
@@ -536,7 +524,7 @@ export class EmberAdapter extends Adapter {
      */
     private async onZDOResponse(apsFrame: EmberApsFrame, sender: NodeId, messageContents: Buffer): Promise<void> {
         try {
-            const payload = BuffaloZdo.readResponse(apsFrame.clusterId, messageContents);
+            const payload = BuffaloZdo.readResponse(apsFrame.clusterId, messageContents, true);
 
             logger.debug(() => `<~~~ [ZDO ${Zdo.ClusterId[apsFrame.clusterId]} from=${sender} ${payload ? JSON.stringify(payload) : 'OK'}]`, NS);
             this.oneWaitress.resolveZDO(sender, apsFrame, payload);
@@ -2168,7 +2156,7 @@ export class EmberAdapter extends Adapter {
                 for (const entry of result.entryList) {
                     table.push({
                         destinationAddress: entry.destinationAddress,
-                        status: RoutingTableStatus[entry.status], // get str value from enum to satisfy upstream's needs
+                        status: TsType.RoutingTableStatus[entry.status], // get str value from enum to satisfy upstream's needs
                         nextHop: entry.nextHopAddress,
                     });
                 }

diff --git a/src/adapter/tstype.ts b/src/adapter/tstype.ts
@@ -51,6 +51,17 @@ interface LQI {
     neighbors: LQINeighbor[];
 }
 
+enum RoutingTableStatus {
+    ACTIVE = 0x0,
+    DISCOVERY_UNDERWAY = 0x1,
+    DISCOVERY_FAILED = 0x2,
+    INACTIVE = 0x3,
+    VALIDATION_UNDERWAY = 0x4,
+    RESERVED1 = 0x5,
+    RESERVED2 = 0x6,
+    RESERVED3 = 0x7,
+}
+
 interface RoutingTableEntry {
     destinationAddress: number;
     status: string;
@@ -113,4 +124,5 @@ export {
     StartResult,
     RoutingTableEntry,
     AdapterOptions,
+    RoutingTableStatus,
 };
diff --git a/src/adapter/z-stack/adapter/manager.ts b/src/adapter/z-stack/adapter/manager.ts
@@ -16,6 +16,7 @@ import {AdapterBackup} from './adapter-backup';
 import {AdapterNvMemory} from './adapter-nv-memory';
 import {Endpoints} from './endpoints';
 import {ZnpVersion} from './tstype';
+import ZStackAdapter from './zStackAdapter';
 
 const NS = 'zh:adapter:zstack:manager';
 
@@ -33,12 +34,14 @@ export class ZnpAdapterManager {
     public backup: AdapterBackup;
 
     private znp: Znp;
+    private adapter: ZStackAdapter;
     private options: ZStackModels.StartupOptions;
     // @ts-expect-error initialized in `start()`
     private nwkOptions: Models.NetworkOptions;
 
-    public constructor(znp: Znp, options: ZStackModels.StartupOptions) {
+    public constructor(adapter: ZStackAdapter, znp: Znp, options: ZStackModels.StartupOptions) {
         this.znp = znp;
+        this.adapter = adapter;
         this.options = options;
         this.nv = new AdapterNvMemory(this.znp);
         this.backup = new AdapterBackup(this.znp, this.nv, this.options.backupPath);
@@ -449,13 +452,9 @@ export class ZnpAdapterManager {
      * Registers endpoints before beginning normal operation.
      */
     private async registerEndpoints(): Promise<void> {
-        const activeEpResponse = this.znp.waitFor(UnpiConstants.Type.AREQ, Subsystem.ZDO, 'activeEpRsp');
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        this.znp.request(Subsystem.ZDO, 'activeEpReq', {dstaddr: 0, nwkaddrofinterest: 0});
-        const activeEp = await activeEpResponse.start().promise;
-
+        const activeEp = await this.adapter.activeEndpoints(0);
         for (const endpoint of Endpoints) {
-            if (activeEp.payload.activeeplist.includes(endpoint.endpoint)) {
+            if (activeEp.endpoints.includes(endpoint.endpoint)) {
                 logger.debug(`endpoint '${endpoint.endpoint}' already registered`, NS);
             } else {
                 logger.debug(`registering endpoint '${endpoint.endpoint}'`, NS);