zigbee-herdsman 0.46.5 → 0.47.0

package/dist/{zcl → zspec/zcl}/buffaloZcl.js

@@ -23,19 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const buffalo_1 = require("../buffalo");
-const utils_1 = require("../utils");
-const logger_1 = require("../utils/logger");
-const definition_1 = require("./definition");
-const tstype_1 = require("./tstype");
+exports.BuffaloZcl = void 0;
+const enums_1 = require("./definition/enums");
+const buffalo_1 = require("../../buffalo");
 const Utils = __importStar(require("./utils"));
-const NS = 'zh:controller:buffalozcl';
+const utils_1 = require("../../utils");
+const logger_1 = require("../../utils/logger");
+const NS = 'zh:zcl:buffalo';
 const SEC_KEY_LENGTH = 16;
-const extensionFieldSetsDateTypeLookup = {
-    6: [definition_1.DataType.UINT8],
-    8: [definition_1.DataType.UINT8],
-    258: [definition_1.DataType.UINT8, definition_1.DataType.UINT8],
-    768: [definition_1.DataType.UINT16, definition_1.DataType.UINT16, definition_1.DataType.UINT16, definition_1.DataType.UINT8, definition_1.DataType.UINT8, definition_1.DataType.UINT8, definition_1.DataType.UINT16, definition_1.DataType.UINT16],
+const EXTENSION_FIELD_SETS_DATA_TYPE = {
+    6: [enums_1.DataType.UINT8],
+    8: [enums_1.DataType.UINT8],
+    258: [enums_1.DataType.UINT8, enums_1.DataType.UINT8],
+    768: [enums_1.DataType.UINT16, enums_1.DataType.UINT16, enums_1.DataType.UINT16, enums_1.DataType.UINT8, enums_1.DataType.UINT8, enums_1.DataType.UINT8, enums_1.DataType.UINT16, enums_1.DataType.UINT16],
 };
 class BuffaloZcl extends buffalo_1.Buffalo {
     // TODO: remove read/write int "SB" versions in favor of plain numbers, implemented in buffalo.ts
@@ -58,6 +58,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return [msb, lsb];
     }
     writeUInt56SB(value) {
+        // XXX: [uint32, uint32] param not following read return pattern [uint32, uint16, uint8]
         const temp = Buffer.alloc(8);
         temp.writeUInt32LE(value[1], 0);
         temp.writeUInt32LE(value[0], 4);
@@ -74,7 +75,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return this.readIeeeAddr();
     }
     writeUInt64SB(value) {
-        // XXX: not following pattern, should pass as number[]
+        // XXX: not following pattern, should pass as number[uint32, uint32]
         const msb = parseInt(value.slice(2, 10), 16);
         const lsb = parseInt(value.slice(10), 16);
         this.writeUInt32(lsb);
@@ -126,31 +127,13 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             this.writeUtf8String(value);
         }
         else {
+            // XXX: value.length not written?
             this.writeBuffer(value, value.length);
         }
     }
-    readCharStr(options) {
+    readCharStr() {
         const length = this.readUInt8();
-        // TODO: this workaround should be moved to a custom type
-        if (options.attrId === 65281) {
-            const value = {};
-            if (length === 0xFF) {
-                return value;
-            }
-            // Xiaomi struct parsing
-            for (let i = 0; i < length; i++) {
-                const index = this.readUInt8();
-                const dataType = this.readUInt8();
-                value[index] = this.read(dataType, {});
-                if (this.position === this.buffer.length) {
-                    break;
-                }
-            }
-            return value;
-        }
-        else {
-            return (length < 0xFF) ? this.readUtf8String(length) : '';
-        }
+        return (length < 0xFF) ? this.readUtf8String(length) : '';
     }
     writeLongOctetStr(value) {
         // TODO: this does not allow "non-value" 0xFF
@@ -171,7 +154,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return (length < 0xFFFF) ? this.readUtf8String(length) : ''; // non-value
     }
     writeArray(value) {
-        const elTypeNumeric = typeof value.elementType === 'number' ? value.elementType : definition_1.DataType[value.elementType];
+        const elTypeNumeric = typeof value.elementType === 'number' ? value.elementType : enums_1.DataType[value.elementType];
         this.writeUInt8(elTypeNumeric);
         // TODO: this does not allow writing "non-value" 0xFFFF
         this.writeUInt16(value.elements.length);
@@ -225,7 +208,12 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         const minutes = this.readUInt8();
         const seconds = this.readUInt8();
         const hundredths = this.readUInt8();
-        return { hours, minutes, seconds, hundredths };
+        return {
+            hours: hours < 0xFF ? hours : null,
+            minutes: minutes < 0xFF ? minutes : null,
+            seconds: seconds < 0xFF ? seconds : null,
+            hundredths: hundredths < 0xFF ? hundredths : null,
+        };
     }
     writeDate(value) {
         this.writeUInt8(value.year != null ? (value.year - 1900) : 0xFF);
@@ -234,11 +222,16 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         this.writeUInt8(value.dayOfWeek ?? 0xFF);
     }
     readDate() {
-        const year = this.readUInt8() + 1900;
+        const year = this.readUInt8();
         const month = this.readUInt8();
         const dayOfMonth = this.readUInt8();
         const dayOfWeek = this.readUInt8();
-        return { year, month, dayOfMonth, dayOfWeek };
+        return {
+            year: year < 0xFF ? year + 1900 : null,
+            month: month < 0xFF ? month : null,
+            dayOfMonth: dayOfMonth < 0xFF ? dayOfMonth : null,
+            dayOfWeek: dayOfWeek < 0xFF ? dayOfWeek : null,
+        };
     }
     //--- BuffaloZclDataType
     writeListZoneInfo(values) {
@@ -261,13 +254,16 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         for (const value of values) {
             this.writeUInt16(value.clstId);
             this.writeUInt8(value.len);
-            value.extField.forEach((entry, index) => {
-                this.write(extensionFieldSetsDateTypeLookup[value.clstId][index], entry, {});
-            });
+            let index = 0;
+            for (const entry of value.extField) {
+                this.write(EXTENSION_FIELD_SETS_DATA_TYPE[value.clstId][index], entry, {});
+                index++;
+            }
         }
     }
     readExtensionFieldSets() {
         const value = [];
+        // XXX: doesn't work if buffer has more unrelated fields after this one
         while (this.isMore()) {
             const clstId = this.readUInt16();
             const len = this.readUInt8();
@@ -275,7 +271,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             let index = 0;
             const extField = [];
             while (this.getPosition() < end) {
-                extField.push(this.read(extensionFieldSetsDateTypeLookup[clstId][index], {}));
+                extField.push(this.read(EXTENSION_FIELD_SETS_DATA_TYPE[clstId][index], {}));
                 index++;
             }
             value.push({ extField, clstId, len });
@@ -440,13 +436,14 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                     attribute = cluster.getAttribute(attributeID).name;
                 }
                 catch {
+                    // this is spammy because of the many manufacturer-specific attributes not currently used
                     logger_1.logger.debug("Unknown attribute " + attributeID + " in cluster " + cluster.name, NS);
                 }
                 frame.attributes[attribute] = this.read(type, options);
             }
             return frame;
         }
-        else if (this.position != this.buffer.length) {
+        else if (this.isMore()) {
             return { raw: this.buffer.subarray(this.position) };
         }
         else {
@@ -456,7 +453,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
     writeStructuredSelector(value) {
         if (value != null) {
             const indexes = value.indexes || [];
-            const indicatorType = value.indicatorType || tstype_1.StructuredIndicatorType.Whole;
+            const indicatorType = value.indicatorType || enums_1.StructuredIndicatorType.Whole;
             const indicator = indexes.length + indicatorType;
             this.writeUInt8(indicator);
             for (const index of indexes) {
@@ -469,9 +466,9 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         const indicator = this.readUInt8();
         if (indicator === 0) {
             // no indexes, whole attribute value is to be read
-            return { indicatorType: tstype_1.StructuredIndicatorType.Whole };
+            return { indicatorType: enums_1.StructuredIndicatorType.Whole };
         }
-        else {
+        else if (indicator < enums_1.StructuredIndicatorType.WriteAdd) {
             const indexes = [];
             for (let i = 0; i < indicator; i++) {
                 const index = this.readUInt16();
@@ -479,12 +476,16 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             }
             return { indexes };
         }
+        else {
+            throw new Error(`Read structured selector was outside [0-15] range.`);
+        }
     }
     writeListTuyaDataPointValues(dpValues) {
         for (const dpValue of dpValues) {
             this.writeUInt8(dpValue.dp);
             this.writeUInt8(dpValue.datatype);
             const dataLen = dpValue.data.length;
+            // UInt16BE
             this.writeUInt8((dataLen >> 8) & 0xFF);
             this.writeUInt8(dataLen & 0xFF);
             this.writeBuffer(dpValue.data, dataLen);
@@ -492,6 +493,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
     }
     readListTuyaDataPointValues() {
         const value = [];
+        // XXX: doesn't work if buffer has more unrelated fields after this one
         while (this.isMore()) {
             try {
                 const dp = this.readUInt8();
@@ -518,10 +520,9 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         const value = [];
         const len = this.readUInt8();
         for (let i = 0; i < len; i++) {
-            value.push({
-                groupId: this.readUInt16(),
-                zoneNum: this.readUInt8(),
-            });
+            const groupId = this.readUInt16();
+            const zoneNum = this.readUInt8();
+            value.push({ groupId, zoneNum });
         }
         return value;
     }
@@ -534,82 +535,101 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         this.position += 3;
         return value;
     }
+    // private writeMiStruct(value: Record<number, number | number[]>): {
+    //     XXX: read only?
+    // }
+    readMiStruct() {
+        const length = this.readUInt8();
+        const value = {};
+        if (length === 0xFF) {
+            return value;
+        }
+        for (let i = 0; i < length; i++) {
+            const index = this.readUInt8();
+            const dataType = this.readUInt8();
+            value[index] = this.read(dataType, {});
+            if (this.position === this.buffer.length) {
+                break;
+            }
+        }
+        return value;
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     write(type, value, options) {
         switch (type) {
-            case definition_1.DataType.NO_DATA:
-            case definition_1.DataType.UNKNOWN: {
+            case enums_1.DataType.NO_DATA:
+            case enums_1.DataType.UNKNOWN: {
                 return; // nothing to write
             }
-            case definition_1.DataType.DATA8:
-            case definition_1.DataType.BOOLEAN:
-            case definition_1.DataType.BITMAP8:
-            case definition_1.DataType.UINT8:
-            case definition_1.DataType.ENUM8: {
+            case enums_1.DataType.DATA8:
+            case enums_1.DataType.BOOLEAN:
+            case enums_1.DataType.BITMAP8:
+            case enums_1.DataType.UINT8:
+            case enums_1.DataType.ENUM8: {
                 return this.writeUInt8(value);
             }
-            case definition_1.DataType.DATA16:
-            case definition_1.DataType.BITMAP16:
-            case definition_1.DataType.UINT16:
-            case definition_1.DataType.ENUM16:
-            case definition_1.DataType.CLUSTER_ID:
-            case definition_1.DataType.ATTR_ID: {
+            case enums_1.DataType.DATA16:
+            case enums_1.DataType.BITMAP16:
+            case enums_1.DataType.UINT16:
+            case enums_1.DataType.ENUM16:
+            case enums_1.DataType.CLUSTER_ID:
+            case enums_1.DataType.ATTR_ID: {
                 return this.writeUInt16(value);
             }
-            case definition_1.DataType.DATA24:
-            case definition_1.DataType.BITMAP24:
-            case definition_1.DataType.UINT24: {
+            case enums_1.DataType.DATA24:
+            case enums_1.DataType.BITMAP24:
+            case enums_1.DataType.UINT24: {
                 return this.writeUInt24(value);
             }
-            case definition_1.DataType.DATA32:
-            case definition_1.DataType.BITMAP32:
-            case definition_1.DataType.UINT32:
-            case definition_1.DataType.UTC:
-            case definition_1.DataType.BAC_OID: {
+            case enums_1.DataType.DATA32:
+            case enums_1.DataType.BITMAP32:
+            case enums_1.DataType.UINT32:
+            case enums_1.DataType.UTC:
+            case enums_1.DataType.BAC_OID: {
                 return this.writeUInt32(value);
             }
-            case definition_1.DataType.DATA40:
-            case definition_1.DataType.BITMAP40:
-            case definition_1.DataType.UINT40: {
+            case enums_1.DataType.DATA40:
+            case enums_1.DataType.BITMAP40:
+            case enums_1.DataType.UINT40: {
                 return this.writeUInt40SB(value);
             }
-            case definition_1.DataType.DATA48:
-            case definition_1.DataType.BITMAP48:
-            case definition_1.DataType.UINT48: {
+            case enums_1.DataType.DATA48:
+            case enums_1.DataType.BITMAP48:
+            case enums_1.DataType.UINT48: {
                 return this.writeUInt48SB(value);
             }
-            case definition_1.DataType.DATA56:
-            case definition_1.DataType.BITMAP56:
-            case definition_1.DataType.UINT56: {
+            case enums_1.DataType.DATA56:
+            case enums_1.DataType.BITMAP56:
+            case enums_1.DataType.UINT56: {
                 return this.writeUInt56SB(value);
             }
-            case definition_1.DataType.DATA64:
-            case definition_1.DataType.BITMAP64:
-            case definition_1.DataType.UINT64: {
+            case enums_1.DataType.DATA64:
+            case enums_1.DataType.BITMAP64:
+            case enums_1.DataType.UINT64: {
                 return this.writeUInt64SB(value);
             }
-            case definition_1.DataType.INT8: {
+            case enums_1.DataType.INT8: {
                 return this.writeInt8(value);
             }
-            case definition_1.DataType.INT16: {
+            case enums_1.DataType.INT16: {
                 return this.writeInt16(value);
             }
-            case definition_1.DataType.INT24: {
+            case enums_1.DataType.INT24: {
                 return this.writeInt24(value);
             }
-            case definition_1.DataType.INT32: {
+            case enums_1.DataType.INT32: {
                 return this.writeInt32(value);
             }
-            case definition_1.DataType.INT40: {
+            case enums_1.DataType.INT40: {
                 return this.writeInt40SB(value);
             }
-            case definition_1.DataType.INT48: {
+            case enums_1.DataType.INT48: {
                 return this.writeInt48(value);
             }
-            case definition_1.DataType.INT56: {
+            case enums_1.DataType.INT56: {
                 return this.writeInt56SB(value);
             }
-            case definition_1.DataType.INT64: {
+            case enums_1.DataType.INT64: {
                 return this.writeInt64SB(value);
             }
             // case DataType.SEMI_PREC: {
@@ -617,45 +637,45 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             //     // not currently used
             //     return this.writeSemiFloatLE(value);
             // }
-            case definition_1.DataType.SINGLE_PREC: {
+            case enums_1.DataType.SINGLE_PREC: {
                 return this.writeFloatLE(value);
             }
-            case definition_1.DataType.DOUBLE_PREC: {
+            case enums_1.DataType.DOUBLE_PREC: {
                 return this.writeDoubleLE(value);
             }
-            case definition_1.DataType.OCTET_STR: {
+            case enums_1.DataType.OCTET_STR: {
                 return this.writeOctetStr(value);
             }
-            case definition_1.DataType.CHAR_STR: {
+            case enums_1.DataType.CHAR_STR: {
                 return this.writeCharStr(value);
             }
-            case definition_1.DataType.LONG_OCTET_STR: {
+            case enums_1.DataType.LONG_OCTET_STR: {
                 return this.writeLongOctetStr(value);
             }
-            case definition_1.DataType.LONG_CHAR_STR: {
+            case enums_1.DataType.LONG_CHAR_STR: {
                 return this.writeLongCharStr(value);
             }
-            case definition_1.DataType.ARRAY:
-            case definition_1.DataType.SET:
-            case definition_1.DataType.BAG: {
+            case enums_1.DataType.ARRAY:
+            case enums_1.DataType.SET:
+            case enums_1.DataType.BAG: {
                 return this.writeArray(value);
             }
-            case definition_1.DataType.STRUCT: {
+            case enums_1.DataType.STRUCT: {
                 return this.writeStruct(value);
             }
-            case definition_1.DataType.TOD: {
+            case enums_1.DataType.TOD: {
                 return this.writeToD(value);
             }
-            case definition_1.DataType.DATE: {
+            case enums_1.DataType.DATE: {
                 return this.writeDate(value);
             }
-            case definition_1.DataType.IEEE_ADDR: {
+            case enums_1.DataType.IEEE_ADDR: {
                 return this.writeIeeeAddr(value);
             }
-            case definition_1.DataType.SEC_KEY: {
+            case enums_1.DataType.SEC_KEY: {
                 return this.writeBuffer(value, SEC_KEY_LENGTH);
             }
-            case definition_1.BuffaloZclDataType.USE_DATA_TYPE: {
+            case enums_1.BuffaloZclDataType.USE_DATA_TYPE: {
                 if (options.dataType == null) {
                     if (Buffer.isBuffer(value) || (0, utils_1.IsNumberArray)(value)) {
                         return this.writeBuffer(value, value.length);
@@ -666,43 +686,44 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 }
                 return this.write(options.dataType, value, options);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT8: {
+            case enums_1.BuffaloZclDataType.LIST_UINT8: {
                 return this.writeListUInt8(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT16: {
+            case enums_1.BuffaloZclDataType.LIST_UINT16: {
                 return this.writeListUInt16(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT24: {
+            case enums_1.BuffaloZclDataType.LIST_UINT24: {
                 return this.writeListUInt24(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT32: {
+            case enums_1.BuffaloZclDataType.LIST_UINT32: {
                 return this.writeListUInt32(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_ZONEINFO: {
+            case enums_1.BuffaloZclDataType.LIST_ZONEINFO: {
                 return this.writeListZoneInfo(value);
             }
-            case definition_1.BuffaloZclDataType.EXTENSION_FIELD_SETS: {
+            case enums_1.BuffaloZclDataType.EXTENSION_FIELD_SETS: {
                 return this.writeExtensionFieldSets(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_THERMO_TRANSITIONS: {
+            case enums_1.BuffaloZclDataType.LIST_THERMO_TRANSITIONS: {
                 return this.writeListThermoTransitions(value);
             }
-            case definition_1.BuffaloZclDataType.BUFFER: {
+            case enums_1.BuffaloZclDataType.BUFFER: {
+                // XXX: inconsistent with read that allows partial with options.length, here always "whole"
                 return this.writeBuffer(value, value.length);
             }
-            case definition_1.BuffaloZclDataType.GDP_FRAME: {
+            case enums_1.BuffaloZclDataType.GDP_FRAME: {
                 return this.writeGdpFrame(value);
             }
-            case definition_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
+            case enums_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
                 return this.writeStructuredSelector(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_TUYA_DATAPOINT_VALUES: {
+            case enums_1.BuffaloZclDataType.LIST_TUYA_DATAPOINT_VALUES: {
                 return this.writeListTuyaDataPointValues(value);
             }
-            case definition_1.BuffaloZclDataType.LIST_MIBOXER_ZONES: {
+            case enums_1.BuffaloZclDataType.LIST_MIBOXER_ZONES: {
                 return this.writeListMiboxerZones(value);
             }
-            case definition_1.BuffaloZclDataType.BIG_ENDIAN_UINT24: {
+            case enums_1.BuffaloZclDataType.BIG_ENDIAN_UINT24: {
                 return this.writeBigEndianUInt24(value);
             }
             default: {
@@ -718,79 +739,79 @@ class BuffaloZcl extends buffalo_1.Buffalo {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     read(type, options) {
         switch (type) {
-            case definition_1.DataType.NO_DATA:
-            case definition_1.DataType.UNKNOWN: {
+            case enums_1.DataType.NO_DATA:
+            case enums_1.DataType.UNKNOWN: {
                 return; // nothing to write
             }
-            case definition_1.DataType.DATA8:
-            case definition_1.DataType.BOOLEAN:
-            case definition_1.DataType.BITMAP8:
-            case definition_1.DataType.UINT8:
-            case definition_1.DataType.ENUM8: {
+            case enums_1.DataType.DATA8:
+            case enums_1.DataType.BOOLEAN:
+            case enums_1.DataType.BITMAP8:
+            case enums_1.DataType.UINT8:
+            case enums_1.DataType.ENUM8: {
                 return this.readUInt8();
             }
-            case definition_1.DataType.DATA16:
-            case definition_1.DataType.BITMAP16:
-            case definition_1.DataType.UINT16:
-            case definition_1.DataType.ENUM16:
-            case definition_1.DataType.CLUSTER_ID:
-            case definition_1.DataType.ATTR_ID: {
+            case enums_1.DataType.DATA16:
+            case enums_1.DataType.BITMAP16:
+            case enums_1.DataType.UINT16:
+            case enums_1.DataType.ENUM16:
+            case enums_1.DataType.CLUSTER_ID:
+            case enums_1.DataType.ATTR_ID: {
                 return this.readUInt16();
             }
-            case definition_1.DataType.DATA24:
-            case definition_1.DataType.BITMAP24:
-            case definition_1.DataType.UINT24: {
+            case enums_1.DataType.DATA24:
+            case enums_1.DataType.BITMAP24:
+            case enums_1.DataType.UINT24: {
                 return this.readUInt24();
             }
-            case definition_1.DataType.DATA32:
-            case definition_1.DataType.BITMAP32:
-            case definition_1.DataType.UINT32:
-            case definition_1.DataType.UTC:
-            case definition_1.DataType.BAC_OID: {
+            case enums_1.DataType.DATA32:
+            case enums_1.DataType.BITMAP32:
+            case enums_1.DataType.UINT32:
+            case enums_1.DataType.UTC:
+            case enums_1.DataType.BAC_OID: {
                 return this.readUInt32();
             }
-            case definition_1.DataType.DATA40:
-            case definition_1.DataType.BITMAP40:
-            case definition_1.DataType.UINT40: {
+            case enums_1.DataType.DATA40:
+            case enums_1.DataType.BITMAP40:
+            case enums_1.DataType.UINT40: {
                 return this.readUInt40SB();
             }
-            case definition_1.DataType.DATA48:
-            case definition_1.DataType.BITMAP48:
-            case definition_1.DataType.UINT48: {
+            case enums_1.DataType.DATA48:
+            case enums_1.DataType.BITMAP48:
+            case enums_1.DataType.UINT48: {
                 return this.readUInt48SB();
             }
-            case definition_1.DataType.DATA56:
-            case definition_1.DataType.BITMAP56:
-            case definition_1.DataType.UINT56: {
+            case enums_1.DataType.DATA56:
+            case enums_1.DataType.BITMAP56:
+            case enums_1.DataType.UINT56: {
                 return this.readUInt56SB();
             }
-            case definition_1.DataType.DATA64:
-            case definition_1.DataType.BITMAP64:
-            case definition_1.DataType.UINT64: {
+            case enums_1.DataType.DATA64:
+            case enums_1.DataType.BITMAP64:
+            case enums_1.DataType.UINT64: {
                 return this.readUInt64SB();
             }
-            case definition_1.DataType.INT8: {
+            case enums_1.DataType.INT8: {
                 return this.readInt8();
             }
-            case definition_1.DataType.INT16: {
+            case enums_1.DataType.INT16: {
                 return this.readInt16();
             }
-            case definition_1.DataType.INT24: {
+            case enums_1.DataType.INT24: {
                 return this.readInt24();
             }
-            case definition_1.DataType.INT32: {
+            case enums_1.DataType.INT32: {
                 return this.readInt32();
             }
-            case definition_1.DataType.INT40: {
+            case enums_1.DataType.INT40: {
                 return this.readInt40SB();
             }
-            case definition_1.DataType.INT48: {
+            case enums_1.DataType.INT48: {
                 return this.readInt48();
             }
-            case definition_1.DataType.INT56: {
+            case enums_1.DataType.INT56: {
                 return this.readInt56SB();
             }
-            case definition_1.DataType.INT64: {
+            case enums_1.DataType.INT64: {
                 return this.readInt64SB();
             }
             // case DataType.SEMI_PREC: {
@@ -798,108 +819,111 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             //     // not currently used
             //     return this.readSemiFloatLE();
             // }
-            case definition_1.DataType.SINGLE_PREC: {
+            case enums_1.DataType.SINGLE_PREC: {
                 return this.readFloatLE();
             }
-            case definition_1.DataType.DOUBLE_PREC: {
+            case enums_1.DataType.DOUBLE_PREC: {
                 return this.readDoubleLE();
             }
-            case definition_1.DataType.OCTET_STR: {
+            case enums_1.DataType.OCTET_STR: {
                 return this.readOctetStr();
             }
-            case definition_1.DataType.CHAR_STR: {
-                return this.readCharStr(options);
+            case enums_1.DataType.CHAR_STR: {
+                return this.readCharStr();
             }
-            case definition_1.DataType.LONG_OCTET_STR: {
+            case enums_1.DataType.LONG_OCTET_STR: {
                 return this.readLongOctetStr();
             }
-            case definition_1.DataType.LONG_CHAR_STR: {
+            case enums_1.DataType.LONG_CHAR_STR: {
                 return this.readLongCharStr();
             }
-            case definition_1.DataType.ARRAY:
-            case definition_1.DataType.SET:
-            case definition_1.DataType.BAG: {
+            case enums_1.DataType.ARRAY:
+            case enums_1.DataType.SET:
+            case enums_1.DataType.BAG: {
                 return this.readArray();
             }
-            case definition_1.DataType.STRUCT: {
+            case enums_1.DataType.STRUCT: {
                 return this.readStruct();
             }
-            case definition_1.DataType.TOD: {
+            case enums_1.DataType.TOD: {
                 return this.readToD();
             }
-            case definition_1.DataType.DATE: {
+            case enums_1.DataType.DATE: {
                 return this.readDate();
             }
-            case definition_1.DataType.IEEE_ADDR: {
+            case enums_1.DataType.IEEE_ADDR: {
                 return this.readIeeeAddr();
             }
-            case definition_1.DataType.SEC_KEY: {
+            case enums_1.DataType.SEC_KEY: {
                 return this.readBuffer(SEC_KEY_LENGTH);
             }
-            case definition_1.BuffaloZclDataType.USE_DATA_TYPE: {
+            case enums_1.BuffaloZclDataType.USE_DATA_TYPE: {
                 if (options.dataType == null) {
                     return this.readBuffer(options.length ?? this.buffer.length);
                 }
                 return this.read(options.dataType, options);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT8: {
+            case enums_1.BuffaloZclDataType.LIST_UINT8: {
                 if (options.length == null) {
                     throw new Error('Cannot read LIST_UINT8 without length option specified');
                 }
                 return this.readListUInt8(options.length);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT16: {
+            case enums_1.BuffaloZclDataType.LIST_UINT16: {
                 if (options.length == null) {
                     throw new Error('Cannot read LIST_UINT16 without length option specified');
                 }
                 return this.readListUInt16(options.length);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT24: {
+            case enums_1.BuffaloZclDataType.LIST_UINT24: {
                 if (options.length == null) {
                     throw new Error('Cannot read LIST_UINT24 without length option specified');
                 }
                 return this.readListUInt24(options.length);
             }
-            case definition_1.BuffaloZclDataType.LIST_UINT32: {
+            case enums_1.BuffaloZclDataType.LIST_UINT32: {
                 if (options.length == null) {
                     throw new Error('Cannot read LIST_UINT32 without length option specified');
                 }
                 return this.readListUInt32(options.length);
             }
-            case definition_1.BuffaloZclDataType.LIST_ZONEINFO: {
+            case enums_1.BuffaloZclDataType.LIST_ZONEINFO: {
                 if (options.length == null) {
                     throw new Error('Cannot read LIST_ZONEINFO without length option specified');
                 }
                 return this.readListZoneInfo(options.length);
             }
-            case definition_1.BuffaloZclDataType.EXTENSION_FIELD_SETS: {
+            case enums_1.BuffaloZclDataType.EXTENSION_FIELD_SETS: {
                 return this.readExtensionFieldSets();
             }
-            case definition_1.BuffaloZclDataType.LIST_THERMO_TRANSITIONS: {
+            case enums_1.BuffaloZclDataType.LIST_THERMO_TRANSITIONS: {
                 return this.readListThermoTransitions(options);
             }
-            case definition_1.BuffaloZclDataType.BUFFER: {
+            case enums_1.BuffaloZclDataType.BUFFER: {
                 // if length option not specified, read the whole buffer
                 return this.readBuffer(options.length ?? this.buffer.length);
             }
-            case definition_1.BuffaloZclDataType.GDP_FRAME: {
+            case enums_1.BuffaloZclDataType.GDP_FRAME: {
                 return this.readGdpFrame(options);
             }
-            case definition_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
+            case enums_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
                 return this.readStructuredSelector();
             }
-            case definition_1.BuffaloZclDataType.LIST_TUYA_DATAPOINT_VALUES: {
+            case enums_1.BuffaloZclDataType.LIST_TUYA_DATAPOINT_VALUES: {
                 return this.readListTuyaDataPointValues();
             }
-            case definition_1.BuffaloZclDataType.LIST_MIBOXER_ZONES: {
+            case enums_1.BuffaloZclDataType.LIST_MIBOXER_ZONES: {
                 return this.readListMiboxerZones();
             }
-            case definition_1.BuffaloZclDataType.BIG_ENDIAN_UINT24: {
+            case enums_1.BuffaloZclDataType.BIG_ENDIAN_UINT24: {
                 return this.readBigEndianUInt24();
             }
+            case enums_1.BuffaloZclDataType.MI_STRUCT: {
+                return this.readMiStruct();
+            }
         }
         throw new Error(`Read for '${type}' not available`);
     }
 }
-exports.default = BuffaloZcl;
+exports.BuffaloZcl = BuffaloZcl;
 //# sourceMappingURL=buffaloZcl.js.map