zigbee-herdsman 0.57.2 → 0.57.4

package/dist/zspec/zdo/buffaloZdo.js

@@ -569,7 +569,7 @@ class BuffaloZdo extends buffalo_1.default {
                 throw new Error(`Malformed TLV. Invalid data length for tagId=${tagId}, expected ${length}.`);
             }
             const nextTLVStart = this.getPosition() + length;
-            // null == unknown tag
+            // undefined == unknown tag
             let tlv;
             if (tagId < enums_1.GlobalTLV.MANUFACTURER_SPECIFIC) {
                 /* istanbul ignore else */
@@ -608,18 +608,112 @@ class BuffaloZdo extends buffalo_1.default {
         return tlvs;
     }
     //-- REQUESTS
+    static buildRequest(hasZdoMessageOverhead, clusterId, ...args) {
+        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), hasZdoMessageOverhead ? consts_2.ZDO_MESSAGE_OVERHEAD : 0);
+        switch (clusterId) {
+            case clusters_1.ClusterId.NETWORK_ADDRESS_REQUEST: {
+                return buffalo.buildNetworkAddressRequest(...args);
+            }
+            case clusters_1.ClusterId.IEEE_ADDRESS_REQUEST: {
+                return buffalo.buildIeeeAddressRequest(...args);
+            }
+            case clusters_1.ClusterId.NODE_DESCRIPTOR_REQUEST: {
+                return buffalo.buildNodeDescriptorRequest(...args);
+            }
+            case clusters_1.ClusterId.POWER_DESCRIPTOR_REQUEST: {
+                return buffalo.buildPowerDescriptorRequest(...args);
+            }
+            case clusters_1.ClusterId.SIMPLE_DESCRIPTOR_REQUEST: {
+                return buffalo.buildSimpleDescriptorRequest(...args);
+            }
+            case clusters_1.ClusterId.ACTIVE_ENDPOINTS_REQUEST: {
+                return buffalo.buildActiveEndpointsRequest(...args);
+            }
+            case clusters_1.ClusterId.MATCH_DESCRIPTORS_REQUEST: {
+                return buffalo.buildMatchDescriptorRequest(...args);
+            }
+            case clusters_1.ClusterId.SYSTEM_SERVER_DISCOVERY_REQUEST: {
+                return buffalo.buildSystemServiceDiscoveryRequest(...args);
+            }
+            case clusters_1.ClusterId.PARENT_ANNOUNCE: {
+                return buffalo.buildParentAnnounce(...args);
+            }
+            case clusters_1.ClusterId.BIND_REQUEST: {
+                return buffalo.buildBindRequest(...args);
+            }
+            case clusters_1.ClusterId.UNBIND_REQUEST: {
+                return buffalo.buildUnbindRequest(...args);
+            }
+            case clusters_1.ClusterId.CLEAR_ALL_BINDINGS_REQUEST: {
+                return buffalo.buildClearAllBindingsRequest(...args);
+            }
+            case clusters_1.ClusterId.LQI_TABLE_REQUEST: {
+                return buffalo.buildLqiTableRequest(...args);
+            }
+            case clusters_1.ClusterId.ROUTING_TABLE_REQUEST: {
+                return buffalo.buildRoutingTableRequest(...args);
+            }
+            case clusters_1.ClusterId.BINDING_TABLE_REQUEST: {
+                return buffalo.buildBindingTableRequest(...args);
+            }
+            case clusters_1.ClusterId.LEAVE_REQUEST: {
+                return buffalo.buildLeaveRequest(...args);
+            }
+            case clusters_1.ClusterId.PERMIT_JOINING_REQUEST: {
+                return buffalo.buildPermitJoining(...args);
+            }
+            case clusters_1.ClusterId.NWK_UPDATE_REQUEST: {
+                return buffalo.buildNwkUpdateRequest(...args);
+            }
+            case clusters_1.ClusterId.NWK_ENHANCED_UPDATE_REQUEST: {
+                return buffalo.buildNwkEnhancedUpdateRequest(...args);
+            }
+            case clusters_1.ClusterId.NWK_IEEE_JOINING_LIST_REQUEST: {
+                return buffalo.buildNwkIEEEJoiningListRequest(...args);
+            }
+            case clusters_1.ClusterId.NWK_BEACON_SURVEY_REQUEST: {
+                return buffalo.buildNwkBeaconSurveyRequest(...args);
+            }
+            case clusters_1.ClusterId.START_KEY_NEGOTIATION_REQUEST: {
+                return buffalo.buildStartKeyNegotiationRequest(...args);
+            }
+            case clusters_1.ClusterId.RETRIEVE_AUTHENTICATION_TOKEN_REQUEST: {
+                return buffalo.buildRetrieveAuthenticationTokenRequest(...args);
+            }
+            case clusters_1.ClusterId.GET_AUTHENTICATION_LEVEL_REQUEST: {
+                return buffalo.buildGetAuthenticationLevelRequest(...args);
+            }
+            case clusters_1.ClusterId.SET_CONFIGURATION_REQUEST: {
+                return buffalo.buildSetConfigurationRequest(...args);
+            }
+            case clusters_1.ClusterId.GET_CONFIGURATION_REQUEST: {
+                return buffalo.buildGetConfigurationRequest(...args);
+            }
+            case clusters_1.ClusterId.START_KEY_UPDATE_REQUEST: {
+                return buffalo.buildStartKeyUpdateRequest(...args);
+            }
+            case clusters_1.ClusterId.DECOMMISSION_REQUEST: {
+                return buffalo.buildDecommissionRequest(...args);
+            }
+            case clusters_1.ClusterId.CHALLENGE_REQUEST: {
+                return buffalo.buildChallengeRequest(...args);
+            }
+            default: {
+                throw new Error(`Unsupported request building for cluster ID '${clusterId}'.`);
+            }
+        }
+    }
     /**
      * @see ClusterId.NETWORK_ADDRESS_REQUEST
      * @param target IEEE address for the request
      * @param reportKids True to request that the target list their children in the response. [request type = 0x01]
      * @param childStartIndex The index of the first child to list in the response. Ignored if reportKids is false.
      */
-    static buildNetworkAddressRequest(target, reportKids, childStartIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeIeeeAddr(target);
-        buffalo.writeUInt8(reportKids ? 1 : 0);
-        buffalo.writeUInt8(childStartIndex);
-        return buffalo.getWritten();
+    buildNetworkAddressRequest(target, reportKids, childStartIndex) {
+        this.writeIeeeAddr(target);
+        this.writeUInt8(reportKids ? 1 : 0);
+        this.writeUInt8(childStartIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.IEEE_ADDRESS_REQUEST
@@ -628,20 +722,18 @@ class BuffaloZdo extends buffalo_1.default {
      * @param reportKids True to request that the target list their children in the response. [request type = 0x01]
      * @param childStartIndex The index of the first child to list in the response. Ignored if reportKids is false.
      */
-    static buildIeeeAddressRequest(target, reportKids, childStartIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
-        buffalo.writeUInt8(reportKids ? 1 : 0);
-        buffalo.writeUInt8(childStartIndex);
-        return buffalo.getWritten();
+    buildIeeeAddressRequest(target, reportKids, childStartIndex) {
+        this.writeUInt16(target);
+        this.writeUInt8(reportKids ? 1 : 0);
+        this.writeUInt8(childStartIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.NODE_DESCRIPTOR_REQUEST
      * @param target NWK address for the request
      */
-    static buildNodeDescriptorRequest(target, fragmentationParameters) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
+    buildNodeDescriptorRequest(target, fragmentationParameters) {
+        this.writeUInt16(target);
         if (fragmentationParameters) {
             let length = 2;
             /* istanbul ignore else */
@@ -652,38 +744,35 @@ class BuffaloZdo extends buffalo_1.default {
             if (fragmentationParameters.maxIncomingTransferUnit) {
                 length += 2;
             }
-            buffalo.writeGlobalTLV({ tagId: enums_1.GlobalTLV.FRAGMENTATION_PARAMETERS, length, tlv: fragmentationParameters });
+            this.writeGlobalTLV({ tagId: enums_1.GlobalTLV.FRAGMENTATION_PARAMETERS, length, tlv: fragmentationParameters });
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.POWER_DESCRIPTOR_REQUEST
      * @param target NWK address for the request
      */
-    static buildPowerDescriptorRequest(target) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
-        return buffalo.getWritten();
+    buildPowerDescriptorRequest(target) {
+        this.writeUInt16(target);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.SIMPLE_DESCRIPTOR_REQUEST
      * @param target NWK address for the request
      * @param targetEndpoint The endpoint on the destination
      */
-    static buildSimpleDescriptorRequest(target, targetEndpoint) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
-        buffalo.writeUInt8(targetEndpoint);
-        return buffalo.getWritten();
+    buildSimpleDescriptorRequest(target, targetEndpoint) {
+        this.writeUInt16(target);
+        this.writeUInt8(targetEndpoint);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.ACTIVE_ENDPOINTS_REQUEST
      * @param target NWK address for the request
      */
-    static buildActiveEndpointsRequest(target) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
-        return buffalo.getWritten();
+    buildActiveEndpointsRequest(target) {
+        this.writeUInt16(target);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.MATCH_DESCRIPTORS_REQUEST
@@ -692,36 +781,33 @@ class BuffaloZdo extends buffalo_1.default {
      * @param inClusterList List of Input ClusterIDs to be used for matching
      * @param outClusterList List of Output ClusterIDs to be used for matching
      */
-    static buildMatchDescriptorRequest(target, profileId, inClusterList, outClusterList) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(target);
-        buffalo.writeUInt16(profileId);
-        buffalo.writeUInt8(inClusterList.length);
-        buffalo.writeListUInt16(inClusterList);
-        buffalo.writeUInt8(outClusterList.length);
-        buffalo.writeListUInt16(outClusterList);
-        return buffalo.getWritten();
+    buildMatchDescriptorRequest(target, profileId, inClusterList, outClusterList) {
+        this.writeUInt16(target);
+        this.writeUInt16(profileId);
+        this.writeUInt8(inClusterList.length);
+        this.writeListUInt16(inClusterList);
+        this.writeUInt8(outClusterList.length);
+        this.writeListUInt16(outClusterList);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.SYSTEM_SERVER_DISCOVERY_REQUEST
      * @param serverMask See Table 2-34 for bit assignments.
      */
-    static buildSystemServiceDiscoveryRequest(serverMask) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt16(Utils.createServerMask(serverMask));
-        return buffalo.getWritten();
+    buildSystemServiceDiscoveryRequest(serverMask) {
+        this.writeUInt16(Utils.createServerMask(serverMask));
+        return this.getWritten();
     }
     /**
      * @see ClusterId.PARENT_ANNOUNCE
      * @param children The IEEE addresses of the children bound to the parent.
      */
-    static buildParentAnnounce(children) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(children.length);
+    buildParentAnnounce(children) {
+        this.writeUInt8(children.length);
         for (const child of children) {
-            buffalo.writeIeeeAddr(child);
+            this.writeIeeeAddr(child);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.BIND_REQUEST
@@ -734,26 +820,25 @@ class BuffaloZdo extends buffalo_1.default {
      * @param groupAddress The destination address for the binding entry. Group ID for ::MULTICAST_BINDING.
      * @param destinationEndpoint The destination endpoint for the binding entry. Only if ::UNICAST_BINDING.
      */
-    static buildBindRequest(source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeIeeeAddr(source);
-        buffalo.writeUInt8(sourceEndpoint);
-        buffalo.writeUInt16(clusterId);
-        buffalo.writeUInt8(type);
+    buildBindRequest(source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint) {
+        this.writeIeeeAddr(source);
+        this.writeUInt8(sourceEndpoint);
+        this.writeUInt16(clusterId);
+        this.writeUInt8(type);
         switch (type) {
             case consts_2.UNICAST_BINDING: {
-                buffalo.writeIeeeAddr(destination);
-                buffalo.writeUInt8(destinationEndpoint);
+                this.writeIeeeAddr(destination);
+                this.writeUInt8(destinationEndpoint);
                 break;
             }
             case consts_2.MULTICAST_BINDING: {
-                buffalo.writeUInt16(groupAddress);
+                this.writeUInt16(groupAddress);
                 break;
             }
             default:
                 throw new zdoStatusError_1.ZdoStatusError(status_1.Status.NOT_SUPPORTED);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.UNBIND_REQUEST
@@ -766,67 +851,62 @@ class BuffaloZdo extends buffalo_1.default {
      * @param groupAddress The destination address for the binding entry. Group ID for ::MULTICAST_BINDING.
      * @param destinationEndpoint The destination endpoint for the binding entry. Only if ::UNICAST_BINDING.
      */
-    static buildUnbindRequest(source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeIeeeAddr(source);
-        buffalo.writeUInt8(sourceEndpoint);
-        buffalo.writeUInt16(clusterId);
-        buffalo.writeUInt8(type);
+    buildUnbindRequest(source, sourceEndpoint, clusterId, type, destination, groupAddress, destinationEndpoint) {
+        this.writeIeeeAddr(source);
+        this.writeUInt8(sourceEndpoint);
+        this.writeUInt16(clusterId);
+        this.writeUInt8(type);
         switch (type) {
             case consts_2.UNICAST_BINDING: {
-                buffalo.writeIeeeAddr(destination);
-                buffalo.writeUInt8(destinationEndpoint);
+                this.writeIeeeAddr(destination);
+                this.writeUInt8(destinationEndpoint);
                 break;
             }
             case consts_2.MULTICAST_BINDING: {
-                buffalo.writeUInt16(groupAddress);
+                this.writeUInt16(groupAddress);
                 break;
             }
             default:
                 throw new zdoStatusError_1.ZdoStatusError(status_1.Status.NOT_SUPPORTED);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.CLEAR_ALL_BINDINGS_REQUEST
      */
-    static buildClearAllBindingsRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildClearAllBindingsRequest(tlv) {
         // ClearAllBindingsReqEUI64TLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(tlv.eui64List.length * consts_1.EUI64_SIZE + 1 - 1);
-        buffalo.writeUInt8(tlv.eui64List.length);
+        this.writeUInt8(0x00);
+        this.writeUInt8(tlv.eui64List.length * consts_1.EUI64_SIZE + 1 - 1);
+        this.writeUInt8(tlv.eui64List.length);
         for (const entry of tlv.eui64List) {
-            buffalo.writeIeeeAddr(entry);
+            this.writeIeeeAddr(entry);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.LQI_TABLE_REQUEST
      * @param startIndex Starting Index for the requested elements of the Neighbor Table.
      */
-    static buildLqiTableRequest(startIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(startIndex);
-        return buffalo.getWritten();
+    buildLqiTableRequest(startIndex) {
+        this.writeUInt8(startIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.ROUTING_TABLE_REQUEST
      * @param startIndex Starting Index for the requested elements of the Neighbor Table.
      */
-    static buildRoutingTableRequest(startIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(startIndex);
-        return buffalo.getWritten();
+    buildRoutingTableRequest(startIndex) {
+        this.writeUInt8(startIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.BINDING_TABLE_REQUEST
      * @param startIndex Starting Index for the requested elements of the Neighbor Table.
      */
-    static buildBindingTableRequest(startIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(startIndex);
-        return buffalo.getWritten();
+    buildBindingTableRequest(startIndex) {
+        this.writeUInt8(startIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.LEAVE_REQUEST
@@ -834,11 +914,10 @@ class BuffaloZdo extends buffalo_1.default {
      *   the EUI64 of a child of the target device to remove that child.
      * @param leaveRequestFlags A bitmask of leave options. Include ::AND_REJOIN if the target is to rejoin the network immediately after leaving.
      */
-    static buildLeaveRequest(deviceAddress, leaveRequestFlags) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeIeeeAddr(deviceAddress);
-        buffalo.writeUInt8(leaveRequestFlags);
-        return buffalo.getWritten();
+    buildLeaveRequest(deviceAddress, leaveRequestFlags) {
+        this.writeIeeeAddr(deviceAddress);
+        this.writeUInt8(leaveRequestFlags);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.PERMIT_JOINING_REQUEST
@@ -847,15 +926,14 @@ class BuffaloZdo extends buffalo_1.default {
      *   This field SHALL always have a value of 1, indicating a request to change the Trust Center policy.
      *   If a frame is received with a value of 0, it shall be treated as having a value of 1.
      */
-    static buildPermitJoining(duration, authentication, tlvs) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(duration);
-        buffalo.writeUInt8(authentication);
+    buildPermitJoining(duration, authentication, tlvs) {
+        this.writeUInt8(duration);
+        this.writeUInt8(authentication);
         // BeaconAppendixEncapsulationGlobalTLV
         //   - SupportedKeyNegotiationMethodsGlobalTLV
         //   - FragmentationParametersGlobalTLV
-        buffalo.writeGlobalTLVs(tlvs);
-        return buffalo.getWritten();
+        this.writeGlobalTLVs(tlvs);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.NWK_UPDATE_REQUEST
@@ -873,42 +951,41 @@ class BuffaloZdo extends buffalo_1.default {
      * @param nwkManagerAddr This field SHALL be present only if the duration is set to 0xff, and, where present,
      *   indicates the NWK address for the device with the Network Manager bit set in its Node Descriptor.
      */
-    static buildNwkUpdateRequest(channels, duration, count, nwkUpdateId, nwkManagerAddr) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt32(ZSpecUtils.channelsToUInt32Mask(channels));
-        buffalo.writeUInt8(duration);
-        if (count != null && duration >= 0x00 && duration <= 0x05) {
-            buffalo.writeUInt8(count);
+    buildNwkUpdateRequest(channels, duration, count, nwkUpdateId, nwkManagerAddr) {
+        this.writeUInt32(ZSpecUtils.channelsToUInt32Mask(channels));
+        this.writeUInt8(duration);
+        if (count !== undefined && duration >= 0x00 && duration <= 0x05) {
+            this.writeUInt8(count);
         }
         // TODO: What does "This value is set by the Network Channel Manager prior to sending the message." mean exactly??
         //       (isn't used/mentioned in EmberZNet, confirmed working if not set at all for channel change)
-        // for now, allow to bypass with null, otherwise should throw if null and duration passes below conditions (see NwkEnhancedUpdateRequest)
-        if (nwkUpdateId != null && (duration === 0xfe || duration === 0xff)) {
-            buffalo.writeUInt8(nwkUpdateId);
+        // for now, allow to bypass with undefined, otherwise should throw if undefined and duration passes below conditions (see NwkEnhancedUpdateRequest)
+        if (nwkUpdateId !== undefined && (duration === 0xfe || duration === 0xff)) {
+            this.writeUInt8(nwkUpdateId);
         }
-        if (nwkManagerAddr != null && duration === 0xff) {
-            buffalo.writeUInt16(nwkManagerAddr);
+        if (nwkManagerAddr !== undefined && duration === 0xff) {
+            this.writeUInt16(nwkManagerAddr);
         }
-        return buffalo.getWritten();
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
-     */
-    static buildScanChannelsRequest(scanChannels, duration, count) {
-        return BuffaloZdo.buildNwkUpdateRequest(scanChannels, duration, count, null, null);
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
-     */
-    static buildChannelChangeRequest(channel, nwkUpdateId) {
-        return BuffaloZdo.buildNwkUpdateRequest([channel], 0xfe, null, nwkUpdateId, null);
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
-     */
-    static buildSetActiveChannelsAndNwkManagerIdRequest(channels, nwkUpdateId, nwkManagerAddr) {
-        return BuffaloZdo.buildNwkUpdateRequest(channels, 0xff, null, nwkUpdateId, nwkManagerAddr);
+        return this.getWritten();
     }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
+    //  */
+    // private buildScanChannelsRequest(scanChannels: number[], duration: number, count: number): Buffer {
+    //     return this.buildNwkUpdateRequest(scanChannels, duration, count, undefined, undefined);
+    // }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
+    //  */
+    // private buildChannelChangeRequest(channel: number, nwkUpdateId: number | undefined): Buffer {
+    //     return this.buildNwkUpdateRequest([channel], 0xfe, undefined, nwkUpdateId, undefined);
+    // }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkUpdateRequest
+    //  */
+    // private buildSetActiveChannelsAndNwkManagerIdRequest(channels: number[], nwkUpdateId: number | undefined, nwkManagerAddr: NodeId): Buffer {
+    //     return this.buildNwkUpdateRequest(channels, 0xff, undefined, nwkUpdateId, nwkManagerAddr);
+    // }
     /**
      * @see ClusterId.NWK_ENHANCED_UPDATE_REQUEST
      * @param channelPages The set of channels (32-bit bitmap) for each channel page.
@@ -937,136 +1014,132 @@ class BuffaloZdo extends buffalo_1.default {
      *          And in case of Enhanced Active scan EBR shall be sent with EPID filter instead of PJOIN filter.
      *   Bit 1-7: Reserved
      */
-    static buildNwkEnhancedUpdateRequest(channelPages, duration, count, nwkUpdateId, nwkManagerAddr, configurationBitmask) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(channelPages.length);
+    buildNwkEnhancedUpdateRequest(channelPages, duration, count, nwkUpdateId, nwkManagerAddr, configurationBitmask) {
+        this.writeUInt8(channelPages.length);
         for (const channelPage of channelPages) {
-            buffalo.writeUInt32(channelPage);
+            this.writeUInt32(channelPage);
         }
-        buffalo.writeUInt8(duration);
-        if (count != null && duration >= 0x00 && duration <= 0x05) {
-            buffalo.writeUInt8(count);
+        this.writeUInt8(duration);
+        if (count !== undefined && duration >= 0x00 && duration <= 0x05) {
+            this.writeUInt8(count);
         }
-        if (nwkUpdateId != null && (duration === 0xfe || duration === 0xff)) {
-            buffalo.writeUInt8(nwkUpdateId);
+        if (nwkUpdateId !== undefined && (duration === 0xfe || duration === 0xff)) {
+            this.writeUInt8(nwkUpdateId);
         }
-        if (nwkManagerAddr != null && duration === 0xff) {
-            buffalo.writeUInt16(nwkManagerAddr);
+        if (nwkManagerAddr !== undefined && duration === 0xff) {
+            this.writeUInt16(nwkManagerAddr);
         }
         /* istanbul ignore else */
-        if (configurationBitmask != null) {
-            buffalo.writeUInt8(configurationBitmask);
+        if (configurationBitmask !== undefined) {
+            this.writeUInt8(configurationBitmask);
         }
-        return buffalo.getWritten();
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
-     */
-    static buildEnhancedScanChannelsRequest(channelPages, duration, count, configurationBitmask) {
-        return BuffaloZdo.buildNwkEnhancedUpdateRequest(channelPages, duration, count, null, null, configurationBitmask);
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
-     */
-    static buildEnhancedChannelChangeRequest(channelPage, nwkUpdateId, configurationBitmask) {
-        return BuffaloZdo.buildNwkEnhancedUpdateRequest([channelPage], 0xfe, null, nwkUpdateId, null, configurationBitmask);
-    }
-    /**
-     * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
-     */
-    static buildEnhancedSetActiveChannelsAndNwkManagerIdRequest(channelPages, nwkUpdateId, nwkManagerAddr, configurationBitmask) {
-        return BuffaloZdo.buildNwkEnhancedUpdateRequest(channelPages, 0xff, null, nwkUpdateId, nwkManagerAddr, configurationBitmask);
+        return this.getWritten();
     }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
+    //  */
+    // private buildEnhancedScanChannelsRequest(channelPages: number[], duration: number, count: number, configurationBitmask: number | undefined): Buffer {
+    //     return this.buildNwkEnhancedUpdateRequest(channelPages, duration, count, undefined, undefined, configurationBitmask);
+    // }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
+    //  */
+    // private buildEnhancedChannelChangeRequest(channelPage: number, nwkUpdateId: number | undefined, configurationBitmask: number | undefined): Buffer {
+    //     return this.buildNwkEnhancedUpdateRequest([channelPage], 0xfe, undefined, nwkUpdateId, undefined, configurationBitmask);
+    // }
+    // /**
+    //  * Shortcut for @see BuffaloZdo.buildNwkEnhancedUpdateRequest
+    //  */
+    // private buildEnhancedSetActiveChannelsAndNwkManagerIdRequest(
+    //     channelPages: number[],
+    //     nwkUpdateId: number | undefined,
+    //     nwkManagerAddr: NodeId,
+    //     configurationBitmask: number | undefined,
+    // ): Buffer {
+    //     return this.buildNwkEnhancedUpdateRequest(channelPages, 0xff, undefined, nwkUpdateId, nwkManagerAddr, configurationBitmask);
+    // }
     /**
      * @see ClusterId.NWK_IEEE_JOINING_LIST_REQUEST
      * @param startIndex The starting index into the receiving device’s nwkIeeeJoiningList that SHALL be sent back.
      */
-    static buildNwkIEEEJoiningListRequest(startIndex) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(startIndex);
-        return buffalo.getWritten();
+    buildNwkIEEEJoiningListRequest(startIndex) {
+        this.writeUInt8(startIndex);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.NWK_BEACON_SURVEY_REQUEST
      */
-    static buildNwkBeaconSurveyRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildNwkBeaconSurveyRequest(tlv) {
         // BeaconSurveyConfigurationTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(2 + tlv.scanChannelList.length * 4 - 1);
-        buffalo.writeUInt8(tlv.scanChannelList.length);
-        buffalo.writeListUInt32(tlv.scanChannelList);
-        buffalo.writeUInt8(tlv.configurationBitmask);
-        return buffalo.getWritten();
+        this.writeUInt8(0x00);
+        this.writeUInt8(2 + tlv.scanChannelList.length * 4 - 1);
+        this.writeUInt8(tlv.scanChannelList.length);
+        this.writeListUInt32(tlv.scanChannelList);
+        this.writeUInt8(tlv.configurationBitmask);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.START_KEY_NEGOTIATION_REQUEST
      */
-    static buildStartKeyNegotiationRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildStartKeyNegotiationRequest(tlv) {
         // Curve25519PublicPointTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(consts_1.EUI64_SIZE + consts_2.CURVE_PUBLIC_POINT_SIZE - 1);
-        buffalo.writeIeeeAddr(tlv.eui64);
-        buffalo.writeBuffer(tlv.publicPoint, consts_2.CURVE_PUBLIC_POINT_SIZE);
-        return buffalo.getWritten();
+        this.writeUInt8(0x00);
+        this.writeUInt8(consts_1.EUI64_SIZE + consts_2.CURVE_PUBLIC_POINT_SIZE - 1);
+        this.writeIeeeAddr(tlv.eui64);
+        this.writeBuffer(tlv.publicPoint, consts_2.CURVE_PUBLIC_POINT_SIZE);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.RETRIEVE_AUTHENTICATION_TOKEN_REQUEST
      */
-    static buildRetrieveAuthenticationTokenRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildRetrieveAuthenticationTokenRequest(tlv) {
         // AuthenticationTokenIdTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(1 - 1);
-        buffalo.writeUInt8(tlv.tlvTypeTagId);
-        return buffalo.getWritten();
+        this.writeUInt8(0x00);
+        this.writeUInt8(1 - 1);
+        this.writeUInt8(tlv.tlvTypeTagId);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.GET_AUTHENTICATION_LEVEL_REQUEST
      */
-    static buildGetAuthenticationLevelRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildGetAuthenticationLevelRequest(tlv) {
         // TargetIEEEAddressTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(consts_1.EUI64_SIZE - 1);
-        buffalo.writeIeeeAddr(tlv.ieee);
-        return buffalo.getWritten();
+        this.writeUInt8(0x00);
+        this.writeUInt8(consts_1.EUI64_SIZE - 1);
+        this.writeIeeeAddr(tlv.ieee);
+        return this.getWritten();
     }
     /**
      * @see ClusterId.SET_CONFIGURATION_REQUEST
      */
-    static buildSetConfigurationRequest(nextPanIdChange, nextChannelChange, configurationParameters) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeGlobalTLV({ tagId: enums_1.GlobalTLV.NEXT_PAN_ID_CHANGE, length: consts_1.PAN_ID_SIZE, tlv: nextPanIdChange });
-        buffalo.writeGlobalTLV({ tagId: enums_1.GlobalTLV.NEXT_CHANNEL_CHANGE, length: 4, tlv: nextChannelChange });
-        buffalo.writeGlobalTLV({ tagId: enums_1.GlobalTLV.CONFIGURATION_PARAMETERS, length: 2, tlv: configurationParameters });
-        return buffalo.getWritten();
+    buildSetConfigurationRequest(nextPanIdChange, nextChannelChange, configurationParameters) {
+        this.writeGlobalTLV({ tagId: enums_1.GlobalTLV.NEXT_PAN_ID_CHANGE, length: consts_1.PAN_ID_SIZE, tlv: nextPanIdChange });
+        this.writeGlobalTLV({ tagId: enums_1.GlobalTLV.NEXT_CHANNEL_CHANGE, length: 4, tlv: nextChannelChange });
+        this.writeGlobalTLV({ tagId: enums_1.GlobalTLV.CONFIGURATION_PARAMETERS, length: 2, tlv: configurationParameters });
+        return this.getWritten();
     }
     /**
      * @see ClusterId.GET_CONFIGURATION_REQUEST
      * @param tlvIds The IDs of each TLV that are being requested.
      *   Maximum number dependent on the underlying maximum size of the message as allowed by fragmentation.
      */
-    static buildGetConfigurationRequest(tlvIds) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
-        buffalo.writeUInt8(tlvIds.length);
+    buildGetConfigurationRequest(tlvIds) {
+        this.writeUInt8(tlvIds.length);
         for (const tlvId of tlvIds) {
-            buffalo.writeUInt8(tlvId);
+            this.writeUInt8(tlvId);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.START_KEY_UPDATE_REQUEST
      */
-    static buildStartKeyUpdateRequest(selectedKeyNegotiationMethod, fragmentationParameters) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildStartKeyUpdateRequest(selectedKeyNegotiationMethod, fragmentationParameters) {
         // SelectedKeyNegotiationMethodTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(consts_1.EUI64_SIZE + 2 - 1);
-        buffalo.writeUInt8(selectedKeyNegotiationMethod.protocol);
-        buffalo.writeUInt8(selectedKeyNegotiationMethod.presharedSecret);
-        buffalo.writeIeeeAddr(selectedKeyNegotiationMethod.sendingDeviceEui64);
+        this.writeUInt8(0x00);
+        this.writeUInt8(consts_1.EUI64_SIZE + 2 - 1);
+        this.writeUInt8(selectedKeyNegotiationMethod.protocol);
+        this.writeUInt8(selectedKeyNegotiationMethod.presharedSecret);
+        this.writeIeeeAddr(selectedKeyNegotiationMethod.sendingDeviceEui64);
         {
             let length = 2;
             /* istanbul ignore else */
@@ -1077,39 +1150,40 @@ class BuffaloZdo extends buffalo_1.default {
             if (fragmentationParameters.maxIncomingTransferUnit) {
                 length += 2;
             }
-            buffalo.writeGlobalTLV({ tagId: enums_1.GlobalTLV.FRAGMENTATION_PARAMETERS, length, tlv: fragmentationParameters });
+            this.writeGlobalTLV({ tagId: enums_1.GlobalTLV.FRAGMENTATION_PARAMETERS, length, tlv: fragmentationParameters });
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.DECOMMISSION_REQUEST
      */
-    static buildDecommissionRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildDecommissionRequest(tlv) {
         // DeviceEUI64ListTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(tlv.eui64List.length * consts_1.EUI64_SIZE + 1 - 1);
-        buffalo.writeUInt8(tlv.eui64List.length);
+        this.writeUInt8(0x00);
+        this.writeUInt8(tlv.eui64List.length * consts_1.EUI64_SIZE + 1 - 1);
+        this.writeUInt8(tlv.eui64List.length);
         for (const eui64 of tlv.eui64List) {
-            buffalo.writeIeeeAddr(eui64);
+            this.writeIeeeAddr(eui64);
         }
-        return buffalo.getWritten();
+        return this.getWritten();
     }
     /**
      * @see ClusterId.CHALLENGE_REQUEST
      */
-    static buildChallengeRequest(tlv) {
-        const buffalo = new BuffaloZdo(Buffer.alloc(MAX_BUFFER_SIZE), consts_2.ZDO_MESSAGE_OVERHEAD);
+    buildChallengeRequest(tlv) {
         // APSFrameCounterChallengeTLV: Local: ID: 0x00
-        buffalo.writeUInt8(0x00);
-        buffalo.writeUInt8(consts_1.EUI64_SIZE + consts_2.CHALLENGE_VALUE_SIZE - 1);
-        buffalo.writeIeeeAddr(tlv.senderEui64);
-        buffalo.writeBuffer(tlv.challengeValue, consts_2.CHALLENGE_VALUE_SIZE);
-        return buffalo.getWritten();
+        this.writeUInt8(0x00);
+        this.writeUInt8(consts_1.EUI64_SIZE + consts_2.CHALLENGE_VALUE_SIZE - 1);
+        this.writeIeeeAddr(tlv.senderEui64);
+        this.writeBuffer(tlv.challengeValue, consts_2.CHALLENGE_VALUE_SIZE);
+        return this.getWritten();
     }
     //-- RESPONSES
-    static readResponse(clusterId, buffer) {
-        const buffalo = new BuffaloZdo(buffer, consts_2.ZDO_MESSAGE_OVERHEAD); // set pos to skip `transaction sequence number`
+    static checkStatus(result) {
+        return result[0] === status_1.Status.SUCCESS;
+    }
+    static readResponse(hasZdoMessageOverhead, clusterId, buffer) {
+        const buffalo = new BuffaloZdo(buffer, hasZdoMessageOverhead ? consts_2.ZDO_MESSAGE_OVERHEAD : 0); // set pos to skip `transaction sequence number`
         switch (clusterId) {
             case clusters_1.ClusterId.NETWORK_ADDRESS_RESPONSE: {
                 return buffalo.readNetworkAddressResponse();
@@ -1171,7 +1245,7 @@ class BuffaloZdo extends buffalo_1.default {
             case clusters_1.ClusterId.NWK_ENHANCED_UPDATE_RESPONSE: {
                 return buffalo.readNwkEnhancedUpdateResponse();
             }
-            case clusters_1.ClusterId.NWK_IEEE_JOINING_LIST_REPONSE: {
+            case clusters_1.ClusterId.NWK_IEEE_JOINING_LIST_RESPONSE: {
                 return buffalo.readNwkIEEEJoiningListResponse();
             }
             case clusters_1.ClusterId.NWK_UNSOLICITED_ENHANCED_UPDATE_RESPONSE: {
@@ -1213,12 +1287,10 @@ class BuffaloZdo extends buffalo_1.default {
      * @see ClusterId.NETWORK_ADDRESS_RESPONSE
      */
     readNetworkAddressResponse() {
+        // INV_REQUESTTYPE or DEVICE_NOT_FOUND
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE or DEVICE_NOT_FOUND
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status == status_1.Status.SUCCESS) {
             const eui64 = this.readIeeeAddr();
             const nwkAddress = this.readUInt16();
             let assocDevCount = 0;
@@ -1229,24 +1301,23 @@ class BuffaloZdo extends buffalo_1.default {
                 startIndex = this.readUInt8();
                 assocDevList = this.readListUInt16(assocDevCount);
             }
-            return {
+            result = {
                 eui64,
                 nwkAddress,
                 startIndex,
                 assocDevList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.IEEE_ADDRESS_RESPONSE
      */
     readIEEEAddressResponse() {
+        // INV_REQUESTTYPE or DEVICE_NOT_FOUND
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE or DEVICE_NOT_FOUND
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const eui64 = this.readIeeeAddr();
             const nwkAddress = this.readUInt16();
             let assocDevCount = 0;
@@ -1257,24 +1328,23 @@ class BuffaloZdo extends buffalo_1.default {
                 startIndex = this.readUInt8();
                 assocDevList = this.readListUInt16(assocDevCount);
             }
-            return {
+            result = {
                 eui64,
                 nwkAddress,
                 startIndex,
                 assocDevList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.NODE_DESCRIPTOR_RESPONSE
      */
     readNodeDescriptorResponse() {
+        // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const nwkAddress = this.readUInt16();
             // in bits: [logical type: 3] [deprecated: 1] [deprecated: 1] [fragmentation supported (R23): 1] [reserved/unused: 2]
             const nodeDescByte1 = this.readUInt8();
@@ -1289,10 +1359,10 @@ class BuffaloZdo extends buffalo_1.default {
             const deprecated1 = this.readUInt8();
             // Global: FragmentationParametersGlobalTLV
             const tlvs = this.readTLVs();
-            return {
+            result = {
                 nwkAddress,
                 logicalType: nodeDescByte1 & 0x07,
-                fragmentationSupported: serverMask.stackComplianceResivion >= 23 ? (nodeDescByte1 & 0x20) >> 5 === 1 : null,
+                fragmentationSupported: serverMask.stackComplianceRevision >= 23 ? (nodeDescByte1 & 0x20) >> 5 === 1 : undefined,
                 apsFlags: nodeDescByte2 & 0x07,
                 frequencyBand: (nodeDescByte2 & 0xf8) >> 3,
                 capabilities: macCapFlags,
@@ -1305,21 +1375,20 @@ class BuffaloZdo extends buffalo_1.default {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.POWER_DESCRIPTOR_RESPONSE
      */
     readPowerDescriptorResponse() {
+        // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const nwkAddress = this.readUInt16();
             const byte1 = this.readUInt8();
             const byte2 = this.readUInt8();
-            return {
+            result = {
                 nwkAddress,
                 currentPowerMode: byte1 & 0xf,
                 availPowerSources: (byte1 >> 4) & 0xf,
@@ -1327,20 +1396,18 @@ class BuffaloZdo extends buffalo_1.default {
                 currentPowerSourceLevel: (byte2 >> 4) & 0xf,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.SIMPLE_DESCRIPTOR_RESPONSE
      */
     readSimpleDescriptorResponse() {
+        // INVALID_EP, NOT_ACTIVE, DEVICE_NOT_FOUND, INV_REQUESTTYPE or NO_DESCRIPTOR
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INVALID_EP, NOT_ACTIVE, DEVICE_NOT_FOUND, INV_REQUESTTYPE or NO_DESCRIPTOR
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const nwkAddress = this.readUInt16();
             // Length in bytes of the Simple Descriptor to follow. [0x00-0xff]
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const length = this.readUInt8();
             const endpoint = this.readUInt8();
             const profileId = this.readUInt16();
@@ -1350,8 +1417,9 @@ class BuffaloZdo extends buffalo_1.default {
             const inClusterList = this.readListUInt16(inClusterCount); // empty if inClusterCount==0
             const outClusterCount = this.readUInt8();
             const outClusterList = this.readListUInt16(outClusterCount); // empty if outClusterCount==0
-            return {
+            result = {
                 nwkAddress,
+                length,
                 endpoint,
                 profileId,
                 deviceId,
@@ -1360,44 +1428,43 @@ class BuffaloZdo extends buffalo_1.default {
                 outClusterList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.ACTIVE_ENDPOINTS_RESPONSE
      */
     readActiveEndpointsResponse() {
+        // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const nwkAddress = this.readUInt16();
             const endpointCount = this.readUInt8();
             const endpointList = this.readListUInt8(endpointCount);
-            return {
+            result = {
                 nwkAddress,
                 endpointList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.MATCH_DESCRIPTORS_RESPONSE
      */
     readMatchDescriptorsResponse() {
+        // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // DEVICE_NOT_FOUND, INV_REQUESTTYPE, or NO_DESCRIPTOR
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const nwkAddress = this.readUInt16();
             const endpointCount = this.readUInt8();
             const endpointList = this.readListUInt8(endpointCount);
-            return {
+            result = {
                 nwkAddress,
                 endpointList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.END_DEVICE_ANNOUNCE
@@ -1407,89 +1474,76 @@ class BuffaloZdo extends buffalo_1.default {
         const eui64 = this.readIeeeAddr();
         /** @see MACCapabilityFlags */
         const capabilities = this.readUInt8();
-        return { nwkAddress, eui64, capabilities: Utils.getMacCapFlags(capabilities) };
+        return [status_1.Status.SUCCESS, { nwkAddress, eui64, capabilities: Utils.getMacCapFlags(capabilities) }];
     }
     /**
      * @see ClusterId.SYSTEM_SERVER_DISCOVERY_RESPONSE
      */
     readSystemServerDiscoveryResponse() {
+        // never expected !== SUCCESS
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // Shouldn't happen
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const serverMask = Utils.getServerMask(this.readUInt16());
-            return {
+            result = {
                 serverMask,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.PARENT_ANNOUNCE_RESPONSE
      */
     readParentAnnounceResponse() {
+        // NOT_SUPPORTED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const numberOfChildren = this.readUInt8();
             const children = [];
             for (let i = 0; i < numberOfChildren; i++) {
                 const childEui64 = this.readIeeeAddr();
                 children.push(childEui64);
             }
-            return { children };
+            result = { children };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.BIND_RESPONSE
      * @returns No response payload, throws if not success
      */
     readBindResponse() {
+        // NOT_SUPPORTED, INVALID_EP, TABLE_FULL, or NOT_AUTHORIZED
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED, INVALID_EP, TABLE_FULL, or NOT_AUTHORIZED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.UNBIND_RESPONSE
      * @returns No response payload, throws if not success
      */
     readUnbindResponse() {
+        // NOT_SUPPORTED, INVALID_EP, NO_ENTRY or NOT_AUTHORIZED
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED, INVALID_EP, NO_ENTRY or NOT_AUTHORIZED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.CLEAR_ALL_BINDINGS_RESPONSE
      * @returns No response payload, throws if not success
      */
     readClearAllBindingsResponse() {
+        // NOT_SUPPORTED, NOT_AUTHORIZED, INV_REQUESTTYPE, or NO_MATCH.
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED, NOT_AUTHORIZED, INV_REQUESTTYPE, or NO_MATCH.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.LQI_TABLE_RESPONSE
      */
     readLQITableResponse() {
+        // NOT_SUPPORTED or any status code returned from the NLME-GET.confirm primitive.
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED or any status code returned from the NLME-GET.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const neighborTableEntries = this.readUInt8();
             const startIndex = this.readUInt8();
             // [0x00-0x02]
@@ -1517,23 +1571,22 @@ class BuffaloZdo extends buffalo_1.default {
                     lqi,
                 });
             }
-            return {
+            result = {
                 neighborTableEntries,
                 startIndex,
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.ROUTING_TABLE_RESPONSE
      */
     readRoutingTableResponse() {
+        // NOT_SUPPORTED or any status code returned from the NLMEGET.confirm primitive.
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED or any status code returned from the NLMEGET.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const routingTableEntries = this.readUInt8();
             const startIndex = this.readUInt8();
             // [0x00-0xFF]
@@ -1545,7 +1598,7 @@ class BuffaloZdo extends buffalo_1.default {
                 const nextHopAddress = this.readUInt16();
                 entryList.push({
                     destinationAddress,
-                    status: statusByte & 0x07,
+                    status: enums_1.RoutingTableStatus[statusByte & 0x07],
                     memoryConstrained: (statusByte & 0x08) >> 3,
                     manyToOne: (statusByte & 0x10) >> 4,
                     routeRecordRequired: (statusByte & 0x20) >> 5,
@@ -1553,23 +1606,22 @@ class BuffaloZdo extends buffalo_1.default {
                     nextHopAddress,
                 });
             }
-            return {
+            result = {
                 routingTableEntries,
                 startIndex,
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.BINDING_TABLE_RESPONSE
      */
     readBindingTableResponse() {
+        // NOT_SUPPORTED or any status code returned from the APSMEGET.confirm primitive.
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED or any status code returned from the APSMEGET.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const bindingTableEntries = this.readUInt8();
             const startIndex = this.readUInt8();
             // [0x00-0xFF]
@@ -1595,95 +1647,86 @@ class BuffaloZdo extends buffalo_1.default {
                     destEndpoint,
                 });
             }
-            return {
+            result = {
                 bindingTableEntries,
                 startIndex,
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.LEAVE_RESPONSE
      * @returns No response payload, throws if not success
      */
     readLeaveResponse() {
+        // NOT_SUPPORTED, NOT_AUTHORIZED or any status code returned from the NLMELEAVE.confirm primitive.
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED, NOT_AUTHORIZED or any status code returned from the NLMELEAVE.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.PERMIT_JOINING_RESPONSE
      * @returns No response payload, throws if not success
      */
     readPermitJoiningResponse() {
+        // INV_REQUESTTYPE, NOT_AUTHORIZED, or any status code returned from the NLME-PERMIT-JOINING.confirm primitive.
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, NOT_AUTHORIZED, or any status code returned from the NLME-PERMIT-JOINING.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.NWK_UPDATE_RESPONSE
      */
     readNwkUpdateResponse() {
+        // INV_REQUESTTYPE, NOT_SUPPORTED, or any status values returned from the MLME-SCAN.confirm primitive
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, NOT_SUPPORTED, or any status values returned from the MLME-SCAN.confirm primitive
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const scannedChannels = this.readUInt32();
             const totalTransmissions = this.readUInt16();
             const totalFailures = this.readUInt16();
             // [0x00-0xFF]
             const entryCount = this.readUInt8();
             const entryList = this.readListUInt8(entryCount);
-            return {
+            result = {
                 scannedChannels,
                 totalTransmissions,
                 totalFailures,
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.NWK_ENHANCED_UPDATE_RESPONSE
      */
     readNwkEnhancedUpdateResponse() {
+        // INV_REQUESTTYPE, NOT_SUPPORTED, or any status values returned from the MLME-SCAN.confirm primitive.
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, NOT_SUPPORTED, or any status values returned from the MLME-SCAN.confirm primitive.
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const scannedChannels = this.readUInt32();
             const totalTransmissions = this.readUInt16();
             const totalFailures = this.readUInt16();
             // [0x00-0xFF]
             const entryCount = this.readUInt8();
             const entryList = this.readListUInt8(entryCount);
-            return {
+            result = {
                 scannedChannels,
                 totalTransmissions,
                 totalFailures,
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.NWK_IEEE_JOINING_LIST_REPONSE
      */
     readNwkIEEEJoiningListResponse() {
+        // INV_REQUESTTYPE, or NOT_SUPPORTED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const updateId = this.readUInt8();
             const joiningPolicy = this.readUInt8();
             // [0x00-0xFF]
@@ -1699,7 +1742,7 @@ class BuffaloZdo extends buffalo_1.default {
                     entryList.push(ieee);
                 }
             }
-            return {
+            result = {
                 updateId,
                 joiningPolicy,
                 entryListTotal,
@@ -1707,23 +1750,22 @@ class BuffaloZdo extends buffalo_1.default {
                 entryList,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.NWK_UNSOLICITED_ENHANCED_UPDATE_RESPONSE
      */
     readNwkUnsolicitedEnhancedUpdateResponse() {
+        // ??
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // ??
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const channelInUse = this.readUInt32();
             const macTxUCastTotal = this.readUInt16();
             const macTxUCastFailures = this.readUInt16();
             const macTxUCastRetries = this.readUInt16();
             const timePeriod = this.readUInt8();
-            return {
+            result = {
                 channelInUse,
                 macTxUCastTotal,
                 macTxUCastFailures,
@@ -1731,17 +1773,16 @@ class BuffaloZdo extends buffalo_1.default {
                 timePeriod,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.NWK_BEACON_SURVEY_RESPONSE
      */
     readNwkBeaconSurveyResponse() {
+        // INV_REQUESTTYPE, or NOT_SUPPORTED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const localTLVs = new Map([
                 // Local: ID: 0x01: BeaconSurveyResultsTLV
                 [0x01, this.readBeaconSurveyResultsTLV],
@@ -1749,146 +1790,135 @@ class BuffaloZdo extends buffalo_1.default {
                 [0x02, this.readPotentialParentsTLV],
             ]);
             const tlvs = this.readTLVs(localTLVs);
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.START_KEY_NEGOTIATION_RESPONSE
      */
     readStartKeyNegotiationResponse() {
+        // INVALID_TLV, MISSING_TLV, TEMPORARY_FAILURE, NOT_AUTHORIZED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INVALID_TLV, MISSING_TLV, TEMPORARY_FAILURE, NOT_AUTHORIZED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const localTLVs = new Map([
                 // Local: ID: 0x00: Curve25519PublicPointTLV
                 [0x00, this.readCurve25519PublicPointTLV],
             ]);
             const tlvs = this.readTLVs(localTLVs);
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.RETRIEVE_AUTHENTICATION_TOKEN_RESPONSE
      */
     readRetrieveAuthenticationTokenResponse() {
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             // no local TLV
             const tlvs = this.readTLVs();
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.GET_AUTHENTICATION_LEVEL_RESPONSE
      */
     readGetAuthenticationLevelResponse() {
+        // NOT_SUPPORTED, INV_REQUESTTYPE, MISSING_TLV, and NOT_AUTHORIZED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // NOT_SUPPORTED, INV_REQUESTTYPE, MISSING_TLV, and NOT_AUTHORIZED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const localTLVs = new Map([
                 // Local: ID: 0x00: DeviceAuthenticationLevelTLV
                 [0x00, this.readDeviceAuthenticationLevelTLV],
             ]);
             const tlvs = this.readTLVs(localTLVs);
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.SET_CONFIGURATION_RESPONSE
      */
     readSetConfigurationResponse() {
+        // INV_REQUESTTYPE, or NOT_SUPPORTED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const localTLVs = new Map([
                 // Local: ID: 0x00: ProcessingStatusTLV
                 [0x00, this.readProcessingStatusTLV],
             ]);
             const tlvs = this.readTLVs(localTLVs);
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.GET_CONFIGURATION_RESPONSE
      */
     readGetConfigurationResponse() {
+        // INV_REQUESTTYPE, or NOT_SUPPORTED
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             // Global: IDs: x, y, z
             const tlvs = this.readTLVs();
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
     /**
      * @see ClusterId.START_KEY_UPDATE_RESPONSE
      * @returns No response payload, throws if not success
      */
     readStartKeyUpdateResponse() {
+        // INV_REQUESTTYPE, NOT_AUTHORIZED or NOT_SUPPORTED
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, NOT_AUTHORIZED or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.DECOMMISSION_RESPONSE
      * @returns No response payload, throws if not success
      */
     readDecommissionResponse() {
+        // INV_REQUESTTYPE, NOT_AUTHORIZED or NOT_SUPPORTED
         const status = this.readUInt8();
-        /* istanbul ignore else */
-        if (status !== status_1.Status.SUCCESS) {
-            // INV_REQUESTTYPE, NOT_AUTHORIZED or NOT_SUPPORTED
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
+        return [status, undefined];
     }
     /**
      * @see ClusterId.CHALLENGE_RESPONSE
      */
     readChallengeResponse() {
         const status = this.readUInt8();
-        if (status !== status_1.Status.SUCCESS) {
-            throw new zdoStatusError_1.ZdoStatusError(status);
-        }
-        else {
+        let result;
+        if (status === status_1.Status.SUCCESS) {
             const localTLVs = new Map([
                 // Local: ID: 0x00: APSFrameCounterResponseTLV
                 [0x00, this.readAPSFrameCounterResponseTLV],
             ]);
             const tlvs = this.readTLVs(localTLVs);
-            return {
+            result = {
                 tlvs,
             };
         }
+        return [status, result];
     }
 }
 exports.BuffaloZdo = BuffaloZdo;