Improve debug logging for routing table/LQI request failure (#651)

* added more debugging info for LQI/routingTable * updated test to match new failure message * reduced line lengths * fixed indentation * switched positions of text and code in debug msg * adapted test to new error message * adapted error message * fixed error message * added LQI/routing debugging info to EZSP adapter * fixed syntax * fixed syntax * removed error code resolution does not work due to some indexing problem * Update adapter.test.ts * Update zStackAdapter.ts --------- Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
Koenkk · Feb 2, 2023 · 7530ba0 · 7530ba0
1 parent 5364ba0
commit 7530ba0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/adapter/ezsp/adapter/ezspAdapter.ts b/src/adapter/ezsp/adapter/ezspAdapter.ts
@@ -277,7 +277,7 @@ class EZSPAdapter extends Adapter {
                     {startindex: startIndex}
                 );
                 if (result.status !== EmberStatus.SUCCESS) {
-                    throw new Error(`LQI for '${networkAddress}' failed`);
+                    throw new Error(`LQI for '${networkAddress}' failed with with status code ${result.status}`);
                 }
 
                 return result;
@@ -323,7 +323,7 @@ class EZSPAdapter extends Adapter {
                     {startindex: startIndex}
                 );
                 if (result.status !== EmberStatus.SUCCESS) {
-                    throw new Error(`Routing table for '${networkAddress}' failed`);
+                    throw new Error(`Routing table for '${networkAddress}' failed with status code ${result.status}`);
                 }
 
                 return result;

diff --git a/src/adapter/z-stack/adapter/zStackAdapter.ts b/src/adapter/z-stack/adapter/zStackAdapter.ts
@@ -564,7 +564,8 @@ class ZStackAdapter extends Adapter {
                 );
                 const result = await response.start().promise;
                 if (result.payload.status !== ZnpCommandStatus.SUCCESS) {
-                    throw new Error(`LQI for '${networkAddress}' failed`);
+                    throw new Error(`LQI for '${networkAddress}' failed with error: '${
+                        ZnpCommandStatus[result.payload.status]}' (${result.payload.status})`);
                 }
 
                 return result;
@@ -611,7 +612,8 @@ class ZStackAdapter extends Adapter {
                 );
                 const result = await response.start().promise;
                 if (result.payload.status !== ZnpCommandStatus.SUCCESS) {
-                    throw new Error(`Routing table for '${networkAddress}' failed`);
+                    throw new Error(`Routing table for '${networkAddress}' failed with error: '${
+                        ZnpCommandStatus[result.payload.status]}' (${result.payload.status})`);
                 }
 
                 return result;

diff --git a/test/adapter/z-stack/adapter.test.ts b/test/adapter/z-stack/adapter.test.ts
@@ -2522,7 +2522,7 @@ describe("zstack-adapter", () => {
 
         let error;
         try {await adapter.lqi(204)} catch (e) {error = e};
-        expect(error).toStrictEqual(new Error("LQI for '204' failed"));
+        expect(error).toStrictEqual(new Error("LQI for '204' failed with error: 'FAILURE' (1)"));
         expect(mockQueueExecute.mock.calls[0][1]).toBe(204);
         expect(mockZnpRequest).toBeCalledTimes(1);
         expect(mockZnpRequest).toBeCalledWith(Subsystem.ZDO, 'mgmtLqiReq', {dstaddr: 204, startindex: 0}, 1)
@@ -2549,7 +2549,7 @@ describe("zstack-adapter", () => {
 
         let error;
         try {await adapter.routingTable(206)} catch (e) {error = e};
-        expect(error).toStrictEqual(new Error("Routing table for '206' failed"));
+        expect(error).toStrictEqual(new Error("Routing table for '206' failed with error: 'FAILURE' (1)"));
         expect(mockQueueExecute.mock.calls[0][1]).toBe(206);
         expect(mockZnpRequest).toBeCalledTimes(1);
         expect(mockZnpRequest).toBeCalledWith(Subsystem.ZDO, 'mgmtRtgReq', {dstaddr: 206, startindex: 0}, 1)