Rediscover route when defaultResponse fails. Koenkk/zigbee2mqtt#2693

Koenkk · Jan 18, 2020 · 920b4a2 · 920b4a2
1 parent 2aa58cb
commit 920b4a2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/src/adapter/adapter.ts b/src/adapter/adapter.ts
@@ -78,6 +78,8 @@ abstract class Adapter extends events.EventEmitter {
 
     public abstract setLED(enabled: boolean): Promise<void>;
 
+    public abstract discoverRoute(networkAddress: number): Promise<void>;
+
     public abstract lqi(networkAddress: number): Promise<TsType.LQI>;
 
     public abstract routingTable(networkAddress: number): Promise<TsType.RoutingTable>;

diff --git a/src/adapter/z-stack/adapter/zStackAdapter.ts b/src/adapter/z-stack/adapter/zStackAdapter.ts
@@ -163,6 +163,11 @@ class ZStackAdapter extends Adapter {
         await this.znp.request(Subsystem.UTIL, 'ledControl', {ledid: 3, mode: enabled ? 1 : 0});
     }
 
+    public async discoverRoute(networkAddress: number): Promise<void> {
+        const payload =  {dstAddr: networkAddress, options: 2, radius: Constants.AF.DEFAULT_RADIUS};
+        await this.znp.request(Subsystem.ZDO, 'extRouteDisc', payload);
+    }
+
     public async nodeDescriptor(networkAddress: number): Promise<NodeDescriptor> {
         return this.queue.execute<NodeDescriptor>(async () => {
             const response = this.znp.waitFor(Type.AREQ, Subsystem.ZDO, 'nodeDescRsp', {nwkaddr: networkAddress});

diff --git a/src/controller/controller.ts b/src/controller/controller.ts
@@ -508,7 +508,16 @@ class Controller extends events.EventEmitter {
                         frame.getCommand().ID, 0, frame.Cluster.ID, frame.Header.transactionSequenceNumber,
                     );
                 } catch (error) {
-                    debug.error(`Default response to ${device.ieeeAddr} failed`);
+                    debug.error(`Default response to ${device.ieeeAddr} failed, force route discovery`);
+                    await this.adapter.discoverRoute(device.networkAddress);
+
+                    try {
+                        await endpoint.defaultResponse(
+                            frame.getCommand().ID, 0, frame.Cluster.ID, frame.Header.transactionSequenceNumber,
+                        );
+                    } catch (error) {
+                        debug.error(`Default response to ${device.ieeeAddr} failed, even after route discovery`);
+                    }
                 }
             }
 

diff --git a/test/adapter/z-stack/zStackAdapter.test.ts b/test/adapter/z-stack/zStackAdapter.test.ts
@@ -155,6 +155,8 @@ const basicMocks = () => {
             return {};
         } else if (subsystem === Subsystem.AF && command === 'interPanCtl') {
             return {};
+        } else if (subsystem === Subsystem.ZDO && command === 'extRouteDisc') {
+            return {};
         } else {
             missing();
         }
@@ -1782,6 +1784,15 @@ describe('zStackAdapter', () => {
         expect(await adapter.supportsLED()).toBeTruthy();
     });
 
+    it('Route discovery', async () => {
+        basicMocks();
+        await adapter.start();
+        mockZnpRequest.mockClear();
+        await adapter.discoverRoute(1239);
+        expect(mockZnpRequest).toBeCalledTimes(1);
+        expect(mockZnpRequest).toBeCalledWith(Subsystem.ZDO, 'extRouteDisc', {dstAddr: 1239, options: 2, radius: 30});
+    });
+
     it('Node descriptor', async () => {
         basicMocks();
         let result;

diff --git a/test/controller.test.ts b/test/controller.test.ts
@@ -21,6 +21,7 @@ const mocksendZclFrameInterPANIeeeAddr = jest.fn();
 const mocksendZclFrameInterPANBroadcastWithResponse = jest.fn();
 const mockRestoreChannelInterPAN = jest.fn();
 const mockAdapterPermitJoin = jest.fn();
+const mockDiscoverRoute = jest.fn();
 const mockAdapterSupportsBackup = jest.fn().mockReturnValue(true);
 const mockAdapterReset = jest.fn();
 const mockAdapterStop = jest.fn();
@@ -199,6 +200,7 @@ jest.mock('../src/adapter/z-stack/adapter/zStackAdapter', () => {
             sendZclFrameNetworkAddress: mockSendZclFrameNetworkAddress,
             sendZclFrameGroup: mockSendZclFrameGroup,
             permitJoin: mockAdapterPermitJoin,
+            discoverRoute: mockDiscoverRoute,
             stop: mockAdapterStop,
             removeDevice: mockAdapterRemoveDevice,
             lqi: (networkAddress) => {
@@ -1189,11 +1191,11 @@ describe('Controller', () => {
         });
     });
 
-    it('Receive zclData send default response fails', async () => {
+    it('Receive zclData send default response fails should attempt route discover', async () => {
         await controller.start();
         await mockAdapterEvents['deviceJoined']({networkAddress: 129, ieeeAddr: '0x129'});
         mockSendZclFrameNetworkAddress.mockClear();
-        mockSendZclFrameNetworkAddress.mockRejectedValueOnce("");
+        mockSendZclFrameNetworkAddress.mockRejectedValue("");
         await mockAdapterEvents['zclData']({
             address: 129,
             frame: ZclFrame.create(1, 1, false, 4476, 29, 1, 5, {groupid: 1, sceneid: 1}),
@@ -1202,7 +1204,8 @@ describe('Controller', () => {
             groupID: 10,
         });
 
-        expect(mockSendZclFrameNetworkAddress).toBeCalledTimes(1);
+        expect(mockDiscoverRoute).toBeCalledTimes(1);
+        expect(mockSendZclFrameNetworkAddress).toBeCalledTimes(2);
     });
 
     it('Respond to genTime read', async () => {