@willieee802/zigbee-herdsman 0.48.3 → 0.49.1

package/dist/zspec/zcl/buffaloZcl.js

@@ -15,21 +15,34 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuffaloZcl = void 0;
-const enums_1 = require("./definition/enums");
 const buffalo_1 = require("../../buffalo");
-const Utils = __importStar(require("./utils"));
-const utils_1 = require("../../utils");
 const logger_1 = require("../../utils/logger");
-const NS = 'zh:zcl:buffalo';
+const utils_1 = require("../../utils/utils");
+const datatypes_1 = require("./definition/datatypes");
+const enums_1 = require("./definition/enums");
+const Utils = __importStar(require("./utils"));
+const NS = "zh:zcl:buffalo";
+const UINT8_NON_VALUE = datatypes_1.ZCL_TYPE_INVALID_BY_TYPE[datatypes_1.ZclType.Uint8];
+const UINT16_NON_VALUE = datatypes_1.ZCL_TYPE_INVALID_BY_TYPE[datatypes_1.ZclType.Uint16];
 const SEC_KEY_LENGTH = 16;
 const EXTENSION_FIELD_SETS_DATA_TYPE = {
     6: [enums_1.DataType.UINT8],
@@ -38,136 +51,101 @@ const EXTENSION_FIELD_SETS_DATA_TYPE = {
     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
-    writeUInt40SB(value) {
-        this.writeUInt32(value[1]);
-        this.writeUInt8(value[0]);
-    }
-    readUInt40SB() {
-        const lsb = this.readUInt32();
-        const msb = this.readUInt8();
-        return [msb, lsb];
-    }
-    writeUInt48SB(value) {
-        this.writeUInt32(value[1]);
-        this.writeUInt16(value[0]);
-    }
-    readUInt48SB() {
-        const lsb = this.readUInt32();
-        const msb = this.readUInt16();
-        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);
-        this.writeBuffer(temp.subarray(0, 7), 7);
-    }
-    readUInt56SB() {
-        const lsb = this.readUInt32();
-        const xsb = this.readUInt16();
-        const msb = this.readUInt8();
-        return [msb, xsb, lsb];
-    }
-    readUInt64SB() {
-        // XXX: not following pattern, should return as [msb, lsb]
-        return this.readIeeeAddr();
-    }
-    writeUInt64SB(value) {
-        // 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);
-        this.writeUInt32(msb);
-    }
-    writeInt40SB(value) {
-        this.writeInt32(value[1]);
-        this.writeInt8(value[0]);
-    }
-    readInt40SB() {
-        const lsb = this.readInt32();
-        const msb = this.readInt8();
-        return [msb, lsb];
-    }
-    writeInt56SB(value) {
-        const temp = Buffer.alloc(8);
-        temp.writeInt32LE(value[1], 0);
-        temp.writeInt32LE(value[0], 4);
-        this.writeBuffer(temp.subarray(0, 7), 7);
-    }
-    readInt56SB() {
-        const lsb = this.readInt32();
-        const xsb = this.readInt16();
-        const msb = this.readInt8();
-        return [msb, xsb, lsb];
-    }
-    writeInt64SB(value) {
-        this.writeInt32(value[1]);
-        this.writeInt32(value[0]);
-    }
-    readInt64SB() {
-        const lsb = this.readInt32();
-        const msb = this.readInt32();
-        return [msb, lsb];
+    readLengthUInt8() {
+        const value = this.readUInt8();
+        return value === UINT8_NON_VALUE ? Number.NaN : value;
+    }
+    readLengthUInt16() {
+        const value = this.readUInt16();
+        return value === UINT16_NON_VALUE ? Number.NaN : value;
     }
     writeOctetStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        this.writeUInt8(value.length);
-        this.writeBuffer(value, value.length);
+        if (value) {
+            this.writeUInt8(value.length);
+            this.writeBuffer(value, value.length);
+        }
+        else {
+            this.writeUInt8(UINT8_NON_VALUE);
+        }
     }
     readOctetStr() {
-        const length = this.readUInt8();
-        return (length < 0xFF) ? this.readBuffer(length) : Buffer.from([]); // non-value
+        const length = this.readLengthUInt8();
+        return Number.isNaN(length) ? Buffer.from([]) : this.readBuffer(length);
     }
+    // TODO: support read/write with specific `length` from attribute metadata (CHAR_STR & LONG_CHAR_STR)
     writeCharStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        if (typeof value === 'string') {
-            this.writeUInt8(value.length);
-            this.writeUtf8String(value);
+        // In case of an empty string, send 0 length, from the spec:
+        // "Setting this sub-field to 0x00 represents a character string with no character data (an “empty string”). Setting
+        // this sub-field to 0xff represents the non-value. In both cases the character data sub-field has zero length."
+        if (value != null) {
+            if (typeof value === "string") {
+                this.writeUInt8(Buffer.byteLength(value, "utf8"));
+                this.writeUtf8String(value);
+            }
+            else {
+                // XXX: value.length not written?
+                this.writeBuffer(value, value.length);
+            }
         }
         else {
-            // XXX: value.length not written?
-            this.writeBuffer(value, value.length);
+            this.writeUInt8(UINT8_NON_VALUE);
         }
     }
     readCharStr() {
-        const length = this.readUInt8();
-        return (length < 0xFF) ? this.readUtf8String(length) : '';
+        const length = this.readLengthUInt8();
+        return Number.isNaN(length) ? "" : this.readUtf8String(length);
     }
     writeLongOctetStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        this.writeUInt16(value.length);
-        this.writeBuffer(value, value.length);
+        if (value) {
+            this.writeUInt16(value.length);
+            this.writeBuffer(value, value.length);
+        }
+        else {
+            this.writeUInt16(UINT16_NON_VALUE);
+        }
     }
     readLongOctetStr() {
-        const length = this.readUInt16();
-        return (length < 0xFFFF) ? this.readBuffer(length) : Buffer.from([]); // non-value
+        const length = this.readLengthUInt16();
+        return Number.isNaN(length) ? Buffer.from([]) : this.readBuffer(length);
     }
     writeLongCharStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        this.writeUInt16(value.length);
-        this.writeUtf8String(value);
+        // In case of an empty string, send 0 length, from the spec:
+        // "Setting this sub-field to 0x0000 represents a long character string with no character data (an “empty string”).
+        // Setting this sub-field to 0xffff represents an non-value long character string value. In both cases the character
+        // data sub-field has zero length"
+        if (value != null) {
+            this.writeUInt16(Buffer.byteLength(value, "utf8"));
+            this.writeUtf8String(value);
+        }
+        else {
+            this.writeUInt16(UINT16_NON_VALUE);
+        }
     }
     readLongCharStr() {
-        const length = this.readUInt16();
-        return (length < 0xFFFF) ? this.readUtf8String(length) : ''; // non-value
+        const length = this.readLengthUInt16();
+        return Number.isNaN(length) ? "" : this.readUtf8String(length);
     }
     writeArray(value) {
-        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);
-        for (const element of value.elements) {
-            this.write(elTypeNumeric, element, {});
+        if (value) {
+            const elTypeNumeric = typeof value.elementType === "number" ? value.elementType : enums_1.DataType[value.elementType];
+            this.writeUInt8(elTypeNumeric);
+            this.writeUInt16(value.elements.length);
+            for (const element of value.elements) {
+                this.write(elTypeNumeric, element, {});
+            }
+        }
+        else {
+            this.writeUInt8(enums_1.DataType.NO_DATA); // XXX: correct value?
+            this.writeUInt16(UINT16_NON_VALUE);
         }
-        ;
     }
+    // TODO: support read [] with specific length (`arrayLengthSize` & `arrayLengthField`) from parameter metadata
     readArray() {
         const values = [];
         const elementType = this.readUInt8();
-        const numberOfElements = this.readUInt16();
-        if (numberOfElements < 0xFFFF) {
+        const numberOfElements = this.readLengthUInt16();
+        if (!Number.isNaN(numberOfElements)) {
+            // not non-value
             for (let i = 0; i < numberOfElements; i++) {
                 const value = this.read(elementType, {});
                 values.push(value);
@@ -176,19 +154,22 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return values;
     }
     writeStruct(value) {
-        // XXX: from ZCL spec: "The zeroth element may not be written to."
-        //      how does this translates to writing here?
-        // TODO: this does not allow writing "non-value" 0xFFFF
-        this.writeUInt16(value.length);
-        for (const v of value) {
-            this.writeUInt8(v.elmType);
-            this.write(v.elmType, v.elmVal, {});
+        if (value) {
+            this.writeUInt16(value.length);
+            for (const v of value) {
+                this.writeUInt8(v.elmType);
+                this.write(v.elmType, v.elmVal, {});
+            }
+        }
+        else {
+            this.writeUInt16(UINT16_NON_VALUE);
         }
     }
     readStruct() {
         const values = [];
-        const numberOfElements = this.readUInt16();
-        if (numberOfElements < 0xFFFF) {
+        const numberOfElements = this.readLengthUInt16();
+        if (!Number.isNaN(numberOfElements)) {
+            // not non-value
             for (let i = 0; i < numberOfElements; i++) {
                 const elementType = this.readUInt8();
                 const value = this.read(elementType, {});
@@ -198,39 +179,39 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return values;
     }
     writeToD(value) {
-        this.writeUInt8(value.hours ?? 0xFF);
-        this.writeUInt8(value.minutes ?? 0xFF);
-        this.writeUInt8(value.seconds ?? 0xFF);
-        this.writeUInt8(value.hundredths ?? 0xFF);
+        this.writeUInt8(value.hours == null || Number.isNaN(value.hours) ? UINT8_NON_VALUE : value.hours);
+        this.writeUInt8(value.minutes == null || Number.isNaN(value.minutes) ? UINT8_NON_VALUE : value.minutes);
+        this.writeUInt8(value.seconds == null || Number.isNaN(value.seconds) ? UINT8_NON_VALUE : value.seconds);
+        this.writeUInt8(value.hundredths == null || Number.isNaN(value.hundredths) ? UINT8_NON_VALUE : value.hundredths);
     }
     readToD() {
-        const hours = this.readUInt8();
-        const minutes = this.readUInt8();
-        const seconds = this.readUInt8();
-        const hundredths = this.readUInt8();
+        const hours = this.readLengthUInt8();
+        const minutes = this.readLengthUInt8();
+        const seconds = this.readLengthUInt8();
+        const hundredths = this.readLengthUInt8();
         return {
-            hours: hours < 0xFF ? hours : null,
-            minutes: minutes < 0xFF ? minutes : null,
-            seconds: seconds < 0xFF ? seconds : null,
-            hundredths: hundredths < 0xFF ? hundredths : null,
+            hours,
+            minutes,
+            seconds,
+            hundredths,
         };
     }
     writeDate(value) {
-        this.writeUInt8(value.year != null ? (value.year - 1900) : 0xFF);
-        this.writeUInt8(value.month ?? 0xFF);
-        this.writeUInt8(value.dayOfMonth ?? 0xFF);
-        this.writeUInt8(value.dayOfWeek ?? 0xFF);
+        this.writeUInt8(value.year == null || Number.isNaN(value.year) ? UINT8_NON_VALUE : value.year - 1900);
+        this.writeUInt8(value.month == null || Number.isNaN(value.month) ? UINT8_NON_VALUE : value.month);
+        this.writeUInt8(value.dayOfMonth == null || Number.isNaN(value.dayOfMonth) ? UINT8_NON_VALUE : value.dayOfMonth);
+        this.writeUInt8(value.dayOfWeek == null || Number.isNaN(value.dayOfWeek) ? UINT8_NON_VALUE : value.dayOfWeek);
     }
     readDate() {
-        const year = this.readUInt8();
-        const month = this.readUInt8();
-        const dayOfMonth = this.readUInt8();
-        const dayOfWeek = this.readUInt8();
+        const year = this.readLengthUInt8();
+        const month = this.readLengthUInt8();
+        const dayOfMonth = this.readLengthUInt8();
+        const dayOfWeek = this.readLengthUInt8();
         return {
-            year: year < 0xFF ? year + 1900 : null,
-            month: month < 0xFF ? month : null,
-            dayOfMonth: dayOfMonth < 0xFF ? dayOfMonth : null,
-            dayOfWeek: dayOfWeek < 0xFF ? dayOfWeek : null,
+            year: year + 1900, // remains NaN if year is NaN
+            month,
+            dayOfMonth,
+            dayOfWeek,
         };
     }
     //--- BuffaloZclDataType
@@ -282,81 +263,90 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         for (const entry of value) {
             this.writeUInt16(entry.transitionTime);
             if (entry.heatSetpoint != null) {
-                this.writeUInt16(entry.heatSetpoint);
+                this.writeInt16(entry.heatSetpoint);
             }
             if (entry.coolSetpoint != null) {
-                this.writeUInt16(entry.coolSetpoint);
+                this.writeInt16(entry.coolSetpoint);
             }
         }
     }
     readListThermoTransitions(options) {
         if (options.payload == null || options.payload.mode == null || options.payload.numoftrans == null) {
-            throw new Error('Cannot read LIST_THERMO_TRANSITIONS without required payload options specified');
+            throw new Error("Cannot read LIST_THERMO_TRANSITIONS without required payload options specified");
         }
         const heat = options.payload.mode & 1;
         const cool = options.payload.mode & 2;
         const result = [];
         for (let i = 0; i < options.payload.numoftrans; i++) {
             const entry = {
-                transitionTime: this.readUInt16()
+                transitionTime: this.readUInt16(),
             };
             if (heat) {
-                entry.heatSetpoint = this.readUInt16();
+                entry.heatSetpoint = this.readInt16();
             }
             if (cool) {
-                entry.coolSetpoint = this.readUInt16();
+                entry.coolSetpoint = this.readInt16();
             }
             result.push(entry);
         }
         return result;
     }
-    writeGdpFrame(value) {
-        if (value.commandID == 0xF0) { // Commissioning Reply
+    writeGpdFrame(value) {
+        if (value.commandID === 0xf0) {
+            // Commissioning Reply
             const v = value;
-            const panIDPresent = v.options & (1 << 0);
-            const gpdSecurityKeyPresent = v.options & (1 << 1);
-            const gpdKeyEncryption = v.options & (1 << 2);
-            const securityLevel = v.options & (3 << 3) >> 3;
+            const panIDPresent = Boolean(v.options & 0x1);
+            const gpdSecurityKeyPresent = Boolean(v.options & 0x2);
+            const gpdKeyEncryption = Boolean((v.options >> 2) & 0x1);
+            const securityLevel = (v.options >> 3) & 0x3;
             const hasGPDKeyMIC = gpdKeyEncryption && gpdSecurityKeyPresent;
-            const hasFrameCounter = gpdSecurityKeyPresent &&
-                gpdKeyEncryption &&
-                (securityLevel === 0b10 || securityLevel === 0b11);
-            this.writeUInt8(1 +
-                (panIDPresent ? 2 : 0) +
-                (gpdSecurityKeyPresent ? 16 : 0) +
-                (hasGPDKeyMIC ? 4 : 0) +
-                (hasFrameCounter ? 4 : 0)); // Length
+            const hasFrameCounter = gpdSecurityKeyPresent && gpdKeyEncryption && (securityLevel === 0b10 || securityLevel === 0b11);
+            this.writeUInt8(1 + (panIDPresent ? 2 : 0) + (gpdSecurityKeyPresent ? 16 : 0) + (hasGPDKeyMIC ? 4 : 0) + (hasFrameCounter ? 4 : 0)); // Length
             this.writeUInt8(v.options);
             if (panIDPresent) {
+                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
                 this.writeUInt16(v.panID);
             }
             if (gpdSecurityKeyPresent) {
+                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
                 this.writeBuffer(v.securityKey, 16);
             }
             if (hasGPDKeyMIC) {
+                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
                 this.writeUInt32(v.keyMic);
             }
             if (hasFrameCounter) {
+                // biome-ignore lint/style/noNonNullAssertion: ignored using `--suppress`
                 this.writeUInt32(v.frameCounter);
             }
         }
-        else if (value.commandID == 0xF3) { // Channel configuration
+        else if (value.commandID === 0xf3) {
+            // Channel configuration
             const v = value;
             this.writeUInt8(1);
-            this.writeUInt8(v.operationalChannel & 0xF | ((v.basic ? 1 : 0) << 4));
+            this.writeUInt8((v.operationalChannel & 0xf) | ((v.basic ? 1 : 0) << 4));
         }
-        else if (value.commandID == 0xF4 ||
-            value.commandID == 0xF5 ||
-            (value.commandID >= 0xF7 && value.commandID <= 0xFF)) {
+        else if (value.commandID === 0xf4 || value.commandID === 0xf5 || (value.commandID >= 0xf7 && value.commandID <= 0xff)) {
             // Other commands sent to GPD
             const v = value;
             this.writeUInt8(v.buffer.length);
             this.writeBuffer(v.buffer, v.buffer.length);
         }
+        // 0xf1: Write Attributes
+        // 0xf2: Read Attributes
+        // 0xf6: ZCL Tunneling
     }
-    readGdpFrame(options) {
-        // Commisioning
-        if (options.payload?.commandID === 0xE0) {
+    readGpdFrame(options) {
+        if (options.payload?.payloadSize === undefined) {
+            throw new Error("Cannot read GPD_FRAME without required payload options specified");
+        }
+        if (Number.isNaN(options.payload.payloadSize) || options.payload.payloadSize === 0) {
+            return {}; // non-value, don't move position
+        }
+        // ensure offset by options.payload.payloadSize (if any) at end of parsing to not cause issues with spec changes (until supported)
+        const startPosition = this.position;
+        if (options.payload.commandID === 0xe0) {
+            // Commisioning
             const frame = {
                 deviceID: this.readUInt8(),
                 options: this.readUInt8(),
@@ -367,12 +357,14 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 applicationInfo: 0,
                 manufacturerID: 0,
                 modelID: 0,
-                numGdpCommands: 0,
+                numGpdCommands: 0,
                 gpdCommandIdList: Buffer.alloc(0),
                 numServerClusters: 0,
                 numClientClusters: 0,
                 gpdServerClusters: Buffer.alloc(0),
                 gpdClientClusters: Buffer.alloc(0),
+                genericSwitchConfig: 0,
+                currentContactStatus: 0,
             };
             if (frame.options & 0x80) {
                 frame.extendedOptions = this.readUInt8();
@@ -396,31 +388,39 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 frame.modelID = this.readUInt16();
             }
             if (frame.applicationInfo & 0x04) {
-                frame.numGdpCommands = this.readUInt8();
-                frame.gpdCommandIdList = this.readBuffer(frame.numGdpCommands);
+                frame.numGpdCommands = this.readUInt8();
+                frame.gpdCommandIdList = this.readBuffer(frame.numGpdCommands);
             }
             if (frame.applicationInfo & 0x08) {
                 const len = this.readUInt8();
-                frame.numServerClusters = len & 0xF;
-                frame.numClientClusters = (len >> 4) & 0xF;
+                frame.numServerClusters = len & 0xf;
+                frame.numClientClusters = (len >> 4) & 0xf;
                 frame.gpdServerClusters = this.readBuffer(2 * frame.numServerClusters);
                 frame.gpdClientClusters = this.readBuffer(2 * frame.numClientClusters);
             }
+            if (frame.applicationInfo & 0x10) {
+                const len = this.readUInt8();
+                if (len >= 1) {
+                    frame.genericSwitchConfig = this.readUInt8();
+                }
+                if (len >= 2) {
+                    frame.currentContactStatus = this.readUInt8();
+                }
+            }
+            this.setPosition(startPosition + options.payload.payloadSize);
             return frame;
-            // Channel Request
         }
-        else if (options.payload?.commandID === 0xE3) {
-            const options = this.readUInt8();
+        if (options.payload.commandID === 0xe3) {
+            // Channel Request
+            const channelOpts = this.readUInt8();
+            this.setPosition(startPosition + options.payload.payloadSize);
             return {
-                nextChannel: options & 0xF,
-                nextNextChannel: options >> 4,
+                nextChannel: channelOpts & 0xf,
+                nextNextChannel: channelOpts >> 4,
             };
-            // Manufacturer-specific Attribute Reporting
         }
-        else if (options.payload?.commandID == 0xA1) {
-            if (options.payload.payloadSize == null) {
-                throw new Error('Cannot read GDP_FRAME with commandID=0xA1 without payloadSize options specified');
-            }
+        if (options.payload.commandID === 0xa1) {
+            // Manufacturer-specific Attribute Reporting
             const start = this.position;
             const frame = {
                 manufacturerCode: this.readUInt16(),
@@ -431,24 +431,21 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             while (this.position - start < options.payload.payloadSize) {
                 const attributeID = this.readUInt16();
                 const type = this.readUInt8();
-                let attribute = attributeID;
-                try {
-                    attribute = cluster.getAttribute(attributeID).name;
-                }
-                catch {
+                /* v8 ignore next */
+                let attribute = cluster.getAttribute(attributeID)?.name;
+                // number type is only used when going into this if
+                if (!attribute) {
                     // 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);
+                    logger_1.logger.debug(`Unknown attribute ${attributeID} in cluster ${cluster.name}`, NS);
+                    attribute = attributeID;
                 }
                 frame.attributes[attribute] = this.read(type, options);
             }
+            this.setPosition(startPosition + options.payload.payloadSize);
             return frame;
         }
-        else if (this.isMore()) {
-            return { raw: this.buffer.subarray(this.position) };
-        }
-        else {
-            return {};
-        }
+        // might contain `gppNwkAddr`, `gppGpdLink` & `mic` from ZCL cluster after this, so limit by `payloadSize`
+        return { raw: this.readBuffer(options.payload.payloadSize) };
     }
     writeStructuredSelector(value) {
         if (value != null) {
@@ -468,7 +465,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             // no indexes, whole attribute value is to be read
             return { indicatorType: enums_1.StructuredIndicatorType.Whole };
         }
-        else if (indicator < enums_1.StructuredIndicatorType.WriteAdd) {
+        if (indicator < enums_1.StructuredIndicatorType.WriteAdd) {
             const indexes = [];
             for (let i = 0; i < indicator; i++) {
                 const index = this.readUInt16();
@@ -476,9 +473,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             }
             return { indexes };
         }
-        else {
-            throw new Error(`Read structured selector was outside [0-15] range.`);
-        }
+        throw new Error("Read structured selector was outside [0-15] range.");
     }
     writeListTuyaDataPointValues(dpValues) {
         for (const dpValue of dpValues) {
@@ -486,8 +481,8 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             this.writeUInt8(dpValue.datatype);
             const dataLen = dpValue.data.length;
             // UInt16BE
-            this.writeUInt8((dataLen >> 8) & 0xFF);
-            this.writeUInt8(dataLen & 0xFF);
+            this.writeUInt8((dataLen >> 8) & 0xff);
+            this.writeUInt8(dataLen & 0xff);
             this.writeBuffer(dpValue.data, dataLen);
         }
     }
@@ -503,7 +498,7 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 const data = this.readBuffer(len_lo + (len_hi << 8));
                 value.push({ dp, datatype, data });
             }
-            catch (error) {
+            catch {
                 break;
             }
         }
@@ -527,46 +522,49 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         return value;
     }
     writeBigEndianUInt24(value) {
-        this.buffer.writeUIntBE(value, this.position, 3);
-        this.position += 3;
+        this.position = this.buffer.writeUIntBE(value, this.position, 3);
     }
     readBigEndianUInt24() {
         const value = this.buffer.readUIntBE(this.position, 3);
         this.position += 3;
         return value;
     }
-    // private writeMiStruct(value: Record<number, number | number[]>): {
-    //     XXX: read only?
-    // }
+    // NOTE: writeMiStruct is not supported.
     readMiStruct() {
         const length = this.readUInt8();
         const value = {};
-        if (length === 0xFF) {
+        if (length === UINT8_NON_VALUE) {
             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) {
+            const remaining = this.buffer.length - this.position;
+            if (remaining <= 1) {
+                if (remaining === 1) {
+                    // Some Xiaomi structs have a trailing byte, skip it.
+                    this.position += 1;
+                }
                 break;
             }
         }
         return value;
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // biome-ignore lint/suspicious/noExplicitAny: API
     write(type, value, options) {
         switch (type) {
             case enums_1.DataType.NO_DATA:
             case enums_1.DataType.UNKNOWN: {
                 return; // nothing to write
             }
-            case enums_1.DataType.DATA8:
             case enums_1.DataType.BOOLEAN:
+            case enums_1.DataType.DATA8:
             case enums_1.DataType.BITMAP8:
             case enums_1.DataType.UINT8:
             case enums_1.DataType.ENUM8: {
-                return this.writeUInt8(value);
+                this.writeUInt8(value);
+                break;
             }
             case enums_1.DataType.DATA16:
             case enums_1.DataType.BITMAP16:
@@ -574,177 +572,219 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             case enums_1.DataType.ENUM16:
             case enums_1.DataType.CLUSTER_ID:
             case enums_1.DataType.ATTR_ID: {
-                return this.writeUInt16(value);
+                this.writeUInt16(value);
+                break;
             }
             case enums_1.DataType.DATA24:
             case enums_1.DataType.BITMAP24:
             case enums_1.DataType.UINT24: {
-                return this.writeUInt24(value);
+                this.writeUInt24(value);
+                break;
             }
             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);
+                this.writeUInt32(value);
+                break;
             }
             case enums_1.DataType.DATA40:
             case enums_1.DataType.BITMAP40:
             case enums_1.DataType.UINT40: {
-                return this.writeUInt40SB(value);
+                this.writeUInt40(value);
+                break;
             }
             case enums_1.DataType.DATA48:
             case enums_1.DataType.BITMAP48:
             case enums_1.DataType.UINT48: {
-                return this.writeUInt48SB(value);
+                this.writeUInt48(value);
+                break;
             }
             case enums_1.DataType.DATA56:
             case enums_1.DataType.BITMAP56:
             case enums_1.DataType.UINT56: {
-                return this.writeUInt56SB(value);
+                this.writeUInt56(value);
+                break;
             }
             case enums_1.DataType.DATA64:
             case enums_1.DataType.BITMAP64:
             case enums_1.DataType.UINT64: {
-                return this.writeUInt64SB(value);
+                this.writeUInt64(value);
+                break;
             }
             case enums_1.DataType.INT8: {
-                return this.writeInt8(value);
+                this.writeInt8(value);
+                break;
             }
             case enums_1.DataType.INT16: {
-                return this.writeInt16(value);
+                this.writeInt16(value);
+                break;
             }
             case enums_1.DataType.INT24: {
-                return this.writeInt24(value);
+                this.writeInt24(value);
+                break;
             }
             case enums_1.DataType.INT32: {
-                return this.writeInt32(value);
+                this.writeInt32(value);
+                break;
             }
             case enums_1.DataType.INT40: {
-                return this.writeInt40SB(value);
+                this.writeInt40(value);
+                break;
             }
             case enums_1.DataType.INT48: {
-                return this.writeInt48(value);
+                this.writeInt48(value);
+                break;
             }
             case enums_1.DataType.INT56: {
-                return this.writeInt56SB(value);
+                this.writeInt56(value);
+                break;
             }
             case enums_1.DataType.INT64: {
-                return this.writeInt64SB(value);
+                this.writeInt64(value);
+                break;
             }
             // case DataType.SEMI_PREC: {
             //     // https://tc39.es/proposal-float16array/
             //     // not currently used
-            //     return this.writeSemiFloatLE(value);
+            //     this.writeSemiFloatLE(value);
+            //     break;
             // }
             case enums_1.DataType.SINGLE_PREC: {
-                return this.writeFloatLE(value);
+                this.writeFloatLE(value);
+                break;
             }
             case enums_1.DataType.DOUBLE_PREC: {
-                return this.writeDoubleLE(value);
+                this.writeDoubleLE(value);
+                break;
             }
             case enums_1.DataType.OCTET_STR: {
-                return this.writeOctetStr(value);
+                this.writeOctetStr(value);
+                break;
             }
             case enums_1.DataType.CHAR_STR: {
-                return this.writeCharStr(value);
+                this.writeCharStr(value);
+                break;
             }
             case enums_1.DataType.LONG_OCTET_STR: {
-                return this.writeLongOctetStr(value);
+                this.writeLongOctetStr(value);
+                break;
             }
             case enums_1.DataType.LONG_CHAR_STR: {
-                return this.writeLongCharStr(value);
+                this.writeLongCharStr(value);
+                break;
             }
             case enums_1.DataType.ARRAY:
             case enums_1.DataType.SET:
             case enums_1.DataType.BAG: {
-                return this.writeArray(value);
+                this.writeArray(value);
+                break;
             }
             case enums_1.DataType.STRUCT: {
-                return this.writeStruct(value);
+                this.writeStruct(value);
+                break;
             }
             case enums_1.DataType.TOD: {
-                return this.writeToD(value);
+                this.writeToD(value);
+                break;
             }
             case enums_1.DataType.DATE: {
-                return this.writeDate(value);
+                this.writeDate(value);
+                break;
             }
             case enums_1.DataType.IEEE_ADDR: {
-                return this.writeIeeeAddr(value);
+                this.writeIeeeAddr(value);
+                break;
             }
             case enums_1.DataType.SEC_KEY: {
-                return this.writeBuffer(value, SEC_KEY_LENGTH);
+                this.writeBuffer(value, SEC_KEY_LENGTH);
+                break;
             }
             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);
-                    }
-                    else {
-                        throw new Error('Cannot write USE_DATA_TYPE without dataType option specified');
+                    if (Buffer.isBuffer(value) || (0, utils_1.isNumberArray)(value)) {
+                        this.writeBuffer(value, value.length);
+                        break;
                     }
+                    throw new Error("Cannot write USE_DATA_TYPE without dataType option specified");
                 }
-                return this.write(options.dataType, value, options);
+                this.write(options.dataType, value, options);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_UINT8: {
-                return this.writeListUInt8(value);
+                this.writeListUInt8(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_UINT16: {
-                return this.writeListUInt16(value);
+                this.writeListUInt16(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_UINT24: {
-                return this.writeListUInt24(value);
+                this.writeListUInt24(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_UINT32: {
-                return this.writeListUInt32(value);
+                this.writeListUInt32(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_ZONEINFO: {
-                return this.writeListZoneInfo(value);
+                this.writeListZoneInfo(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.EXTENSION_FIELD_SETS: {
-                return this.writeExtensionFieldSets(value);
+                this.writeExtensionFieldSets(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_THERMO_TRANSITIONS: {
-                return this.writeListThermoTransitions(value);
+                this.writeListThermoTransitions(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.BUFFER: {
                 // XXX: inconsistent with read that allows partial with options.length, here always "whole"
-                return this.writeBuffer(value, value.length);
+                this.writeBuffer(value, value.length);
+                break;
             }
-            case enums_1.BuffaloZclDataType.GDP_FRAME: {
-                return this.writeGdpFrame(value);
+            case enums_1.BuffaloZclDataType.GPD_FRAME: {
+                this.writeGpdFrame(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
-                return this.writeStructuredSelector(value);
+                this.writeStructuredSelector(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_TUYA_DATAPOINT_VALUES: {
-                return this.writeListTuyaDataPointValues(value);
+                this.writeListTuyaDataPointValues(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.LIST_MIBOXER_ZONES: {
-                return this.writeListMiboxerZones(value);
+                this.writeListMiboxerZones(value);
+                break;
             }
             case enums_1.BuffaloZclDataType.BIG_ENDIAN_UINT24: {
-                return this.writeBigEndianUInt24(value);
+                this.writeBigEndianUInt24(value);
+                break;
             }
             default: {
                 // In case the type is undefined, write it as a buffer to easily allow for custom types
                 // e.g. for https://github.com/Koenkk/zigbee-herdsman/issues/127
-                if (Buffer.isBuffer(value) || (0, utils_1.IsNumberArray)(value)) {
-                    return this.writeBuffer(value, value.length);
+                if (Buffer.isBuffer(value) || (0, utils_1.isNumberArray)(value)) {
+                    this.writeBuffer(value, value.length);
+                    break;
                 }
+                throw new Error(`Write for '${type}' not available`);
             }
         }
-        throw new Error(`Write for '${type}' not available`);
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // biome-ignore lint/suspicious/noExplicitAny: API
     read(type, options) {
         switch (type) {
             case enums_1.DataType.NO_DATA:
             case enums_1.DataType.UNKNOWN: {
                 return; // nothing to write
             }
-            case enums_1.DataType.DATA8:
             case enums_1.DataType.BOOLEAN:
+            case enums_1.DataType.DATA8:
             case enums_1.DataType.BITMAP8:
             case enums_1.DataType.UINT8:
             case enums_1.DataType.ENUM8: {
@@ -773,22 +813,22 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             case enums_1.DataType.DATA40:
             case enums_1.DataType.BITMAP40:
             case enums_1.DataType.UINT40: {
-                return this.readUInt40SB();
+                return this.readUInt40();
             }
             case enums_1.DataType.DATA48:
             case enums_1.DataType.BITMAP48:
             case enums_1.DataType.UINT48: {
-                return this.readUInt48SB();
+                return this.readUInt48();
             }
             case enums_1.DataType.DATA56:
             case enums_1.DataType.BITMAP56:
             case enums_1.DataType.UINT56: {
-                return this.readUInt56SB();
+                return this.readUInt56();
             }
             case enums_1.DataType.DATA64:
             case enums_1.DataType.BITMAP64:
             case enums_1.DataType.UINT64: {
-                return this.readUInt64SB();
+                return this.readUInt64();
             }
             case enums_1.DataType.INT8: {
                 return this.readInt8();
@@ -803,16 +843,16 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 return this.readInt32();
             }
             case enums_1.DataType.INT40: {
-                return this.readInt40SB();
+                return this.readInt40();
             }
             case enums_1.DataType.INT48: {
                 return this.readInt48();
             }
             case enums_1.DataType.INT56: {
-                return this.readInt56SB();
+                return this.readInt56();
             }
             case enums_1.DataType.INT64: {
-                return this.readInt64SB();
+                return this.readInt64();
             }
             // case DataType.SEMI_PREC: {
             //     // https://tc39.es/proposal-float16array/
@@ -865,31 +905,31 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             }
             case enums_1.BuffaloZclDataType.LIST_UINT8: {
                 if (options.length == null) {
-                    throw new Error('Cannot read LIST_UINT8 without length option specified');
+                    throw new Error("Cannot read LIST_UINT8 without length option specified");
                 }
                 return this.readListUInt8(options.length);
             }
             case enums_1.BuffaloZclDataType.LIST_UINT16: {
                 if (options.length == null) {
-                    throw new Error('Cannot read LIST_UINT16 without length option specified');
+                    throw new Error("Cannot read LIST_UINT16 without length option specified");
                 }
                 return this.readListUInt16(options.length);
             }
             case enums_1.BuffaloZclDataType.LIST_UINT24: {
                 if (options.length == null) {
-                    throw new Error('Cannot read LIST_UINT24 without length option specified');
+                    throw new Error("Cannot read LIST_UINT24 without length option specified");
                 }
                 return this.readListUInt24(options.length);
             }
             case enums_1.BuffaloZclDataType.LIST_UINT32: {
                 if (options.length == null) {
-                    throw new Error('Cannot read LIST_UINT32 without length option specified');
+                    throw new Error("Cannot read LIST_UINT32 without length option specified");
                 }
                 return this.readListUInt32(options.length);
             }
             case enums_1.BuffaloZclDataType.LIST_ZONEINFO: {
                 if (options.length == null) {
-                    throw new Error('Cannot read LIST_ZONEINFO without length option specified');
+                    throw new Error("Cannot read LIST_ZONEINFO without length option specified");
                 }
                 return this.readListZoneInfo(options.length);
             }
@@ -903,8 +943,8 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 // if length option not specified, read the whole buffer
                 return this.readBuffer(options.length ?? this.buffer.length);
             }
-            case enums_1.BuffaloZclDataType.GDP_FRAME: {
-                return this.readGdpFrame(options);
+            case enums_1.BuffaloZclDataType.GPD_FRAME: {
+                return this.readGpdFrame(options);
             }
             case enums_1.BuffaloZclDataType.STRUCTURED_SELECTOR: {
                 return this.readStructuredSelector();