zigbee-herdsman 5.0.4 → 6.0.1

package/dist/zspec/zcl/buffaloZcl.d.ts

@@ -1,24 +1,39 @@
 import { Buffalo } from "../../buffalo";
 import { BuffaloZclDataType, DataType } from "./definition/enums";
 import type { BuffaloZclOptions } from "./definition/tstype";
-export interface GPDChannelConfiguration {
-    commandID: number;
-    operationalChannel: number;
-    basic: boolean;
-}
-export interface GPDCommissioningReply {
-    commandID: number;
-    options: number;
-    /** expected valid if corresponding `options` bits set */
-    panID?: number;
-    /** expected valid if corresponding `options` bits set */
-    securityKey?: Buffer;
-    /** expected valid if corresponding `options` bits set */
-    keyMic?: number;
-    /** expected valid if corresponding `options` bits set */
-    frameCounter?: number;
-}
 export declare class BuffaloZcl extends Buffalo {
+    private writeZclUInt8;
+    private readZclUInt8;
+    private writeZclUInt16;
+    private readZclUInt16;
+    private writeZclUInt24;
+    private readZclUInt24;
+    private writeZclUInt32;
+    private readZclUInt32;
+    private writeZclUInt40;
+    private readZclUInt40;
+    private writeZclUInt48;
+    private readZclUInt48;
+    private writeZclUInt56;
+    private readZclUInt56;
+    private writeZclUInt64;
+    private readZclUInt64;
+    private writeZclInt8;
+    private readZclInt8;
+    private writeZclInt16;
+    private readZclInt16;
+    private writeZclInt24;
+    private readZclInt24;
+    private writeZclInt32;
+    private readZclInt32;
+    private writeZclInt40;
+    private readZclInt40;
+    private writeZclInt48;
+    private readZclInt48;
+    private writeZclInt56;
+    private readZclInt56;
+    private writeZclInt64;
+    private readZclInt64;
     private writeOctetStr;
     private readOctetStr;
     private writeCharStr;

package/dist/zspec/zcl/buffaloZcl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buffaloZcl.d.ts","sourceRoot":"","sources":["../../../src/zspec/zcl/buffaloZcl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAGtC,OAAO,EAAC,kBAAkB,EAAE,QAAQ,EAA0B,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EAAC,iBAAiB,EAA+B,MAAM,qBAAqB,CAAC;AAuFzF,MAAM,WAAW,uBAAuB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yDAAyD;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAwBD,qBAAa,UAAW,SAAQ,OAAO;IACnC,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,OAAO;IAcf,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,sBAAsB;IAsB9B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,yBAAyB;IA4BjC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,YAAY;IAwJpB,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,2BAA2B;IAoBnC,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,YAAY;IA0Bb,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAqOxF,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,GAAG;CAkMpF"}
+{"version":3,"file":"buffaloZcl.d.ts","sourceRoot":"","sources":["../../../src/zspec/zcl/buffaloZcl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAGtC,OAAO,EAAC,kBAAkB,EAAE,QAAQ,EAA0B,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EACR,iBAAiB,EAkBpB,MAAM,qBAAqB,CAAC;AAc7B,qBAAa,UAAW,SAAQ,OAAO;IAYnC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,OAAO;IAcf,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,sBAAsB;IAsB9B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,yBAAyB;IA4BjC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,YAAY;IA8IpB,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,2BAA2B;IAoBnC,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,YAAY;IA0Bb,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAqOxF,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,GAAG;CAkMpF"}

package/dist/zspec/zcl/buffaloZcl.js

@@ -48,62 +48,204 @@ 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: shuffles quite a lot of code (ZH is mostly typed `string | number` and ZHC requires lots of scrutiny)
+    // private writeZclBoolean(value: boolean | undefined): void {
+    //     this.writeUInt8(value === undefined ? 0xff : value ? 1 : 0);
+    // }
+    // private readZclBoolean(): boolean | undefined {
+    //     const value = this.readUInt8();
+    //     return value === 0xff ? undefined : !!value;
+    // }
+    writeZclUInt8(value) {
+        this.writeUInt8(Number.isNaN(value) ? 0xff : value);
+    }
+    readZclUInt8() {
+        const value = this.readUInt8();
+        return value === 0xff ? Number.NaN : value;
+    }
+    writeZclUInt16(value) {
+        this.writeUInt16(Number.isNaN(value) ? 0xffff : value);
+    }
+    readZclUInt16() {
+        const value = this.readUInt16();
+        return value === 0xffff ? Number.NaN : value;
+    }
+    writeZclUInt24(value) {
+        this.writeUInt24(Number.isNaN(value) ? 0xffffff : value);
+    }
+    readZclUInt24() {
+        const value = this.readUInt24();
+        return value === 0xffffff ? Number.NaN : value;
+    }
+    writeZclUInt32(value) {
+        this.writeUInt32(Number.isNaN(value) ? 0xffffffff : value);
+    }
+    readZclUInt32() {
+        const value = this.readUInt32();
+        return value === 0xffffffff ? Number.NaN : value;
+    }
+    writeZclUInt40(value) {
+        this.writeUInt40(Number.isNaN(value) ? 0xffffffffff : value);
+    }
+    readZclUInt40() {
+        const value = this.readUInt40();
+        return value === 0xffffffffff ? Number.NaN : value;
+    }
+    writeZclUInt48(value) {
+        this.writeUInt48(Number.isNaN(value) ? 0xffffffffffff : value);
+    }
+    readZclUInt48() {
+        const value = this.readUInt48();
+        return value === 0xffffffffffff ? Number.NaN : value;
+    }
+    writeZclUInt56(value) {
+        this.writeUInt56(value === undefined ? 0xffffffffffffffn : value);
+    }
+    readZclUInt56() {
+        const value = this.readUInt56();
+        return value === 0xffffffffffffffn ? undefined : value;
+    }
+    writeZclUInt64(value) {
+        this.writeUInt64(value === undefined ? 0xffffffffffffffffn : value);
+    }
+    readZclUInt64() {
+        const value = this.readUInt64();
+        return value === 0xffffffffffffffffn ? undefined : value;
+    }
+    writeZclInt8(value) {
+        this.writeInt8(Number.isNaN(value) ? -0x80 : value);
+    }
+    readZclInt8() {
+        const value = this.readInt8();
+        return value === -0x80 ? Number.NaN : value;
+    }
+    writeZclInt16(value) {
+        this.writeInt16(Number.isNaN(value) ? -0x8000 : value);
+    }
+    readZclInt16() {
+        const value = this.readInt16();
+        return value === -0x8000 ? Number.NaN : value;
+    }
+    writeZclInt24(value) {
+        this.writeInt24(Number.isNaN(value) ? -0x800000 : value);
+    }
+    readZclInt24() {
+        const value = this.readInt24();
+        return value === -0x800000 ? Number.NaN : value;
+    }
+    writeZclInt32(value) {
+        this.writeInt32(Number.isNaN(value) ? -0x80000000 : value);
+    }
+    readZclInt32() {
+        const value = this.readInt32();
+        return value === -0x80000000 ? Number.NaN : value;
+    }
+    writeZclInt40(value) {
+        this.writeInt40(Number.isNaN(value) ? -0x8000000000 : value);
+    }
+    readZclInt40() {
+        const value = this.readInt40();
+        return value === -0x8000000000 ? Number.NaN : value;
+    }
+    writeZclInt48(value) {
+        this.writeInt48(Number.isNaN(value) ? -0x800000000000 : value);
+    }
+    readZclInt48() {
+        const value = this.readInt48();
+        return value === -0x800000000000 ? Number.NaN : value;
+    }
+    writeZclInt56(value) {
+        this.writeInt56(value === undefined ? -0x80000000000000n : value);
+    }
+    readZclInt56() {
+        const value = this.readInt56();
+        return value === -0x80000000000000n ? undefined : value;
+    }
+    writeZclInt64(value) {
+        this.writeInt64(value === undefined ? -0x8000000000000000n : value);
+    }
+    readZclInt64() {
+        const value = this.readInt64();
+        return value === -0x8000000000000000n ? undefined : 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(0xff); // non-value
+        }
     }
     readOctetStr() {
-        const length = this.readUInt8();
-        return length < 0xff ? this.readBuffer(length) : Buffer.from([]); // non-value
+        const length = this.readZclUInt8();
+        return Number.isNaN(length) ? Buffer.from([]) : this.readBuffer(length);
     }
     writeCharStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        if (typeof value === "string") {
-            this.writeUInt8(Buffer.byteLength(value, "utf8"));
-            this.writeUtf8String(value);
+        if (value) {
+            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(0xff); // non-value
         }
     }
     readCharStr() {
-        const length = this.readUInt8();
-        return length < 0xff ? this.readUtf8String(length) : "";
+        const length = this.readZclUInt8();
+        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(0xffff); // non-value
+        }
     }
     readLongOctetStr() {
-        const length = this.readUInt16();
-        return length < 0xffff ? this.readBuffer(length) : Buffer.from([]); // non-value
+        const length = this.readZclUInt16();
+        return Number.isNaN(length) ? Buffer.from([]) : this.readBuffer(length);
     }
     writeLongCharStr(value) {
-        // TODO: this does not allow "non-value" 0xFF
-        this.writeUInt16(Buffer.byteLength(value, "utf8"));
-        this.writeUtf8String(value);
+        if (value) {
+            this.writeUInt16(Buffer.byteLength(value, "utf8"));
+            this.writeUtf8String(value);
+        }
+        else {
+            this.writeUInt16(0xffff); // non-value
+        }
     }
     readLongCharStr() {
-        const length = this.readUInt16();
-        return length < 0xffff ? this.readUtf8String(length) : ""; // non-value
+        const length = this.readZclUInt16();
+        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(0xffff); // non-value
         }
     }
     readArray() {
         const values = [];
         const elementType = this.readUInt8();
-        const numberOfElements = this.readUInt16();
-        if (numberOfElements < 0xffff) {
+        const numberOfElements = this.readZclUInt16();
+        if (!Number.isNaN(numberOfElements)) {
+            // not non-value
             for (let i = 0; i < numberOfElements; i++) {
                 const value = this.read(elementType, {});
                 values.push(value);
@@ -112,19 +254,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(0xffff); // non-value
         }
     }
     readStruct() {
         const values = [];
-        const numberOfElements = this.readUInt16();
-        if (numberOfElements < 0xffff) {
+        const numberOfElements = this.readZclUInt16();
+        if (!Number.isNaN(numberOfElements)) {
+            // not non-value
             for (let i = 0; i < numberOfElements; i++) {
                 const elementType = this.readUInt8();
                 const value = this.read(elementType, {});
@@ -134,39 +279,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) ? 0xff : value.hours);
+        this.writeUInt8(value.minutes == null || Number.isNaN(value.minutes) ? 0xff : value.minutes);
+        this.writeUInt8(value.seconds == null || Number.isNaN(value.seconds) ? 0xff : value.seconds);
+        this.writeUInt8(value.hundredths == null || Number.isNaN(value.hundredths) ? 0xff : value.hundredths);
     }
     readToD() {
-        const hours = this.readUInt8();
-        const minutes = this.readUInt8();
-        const seconds = this.readUInt8();
-        const hundredths = this.readUInt8();
+        const hours = this.readZclUInt8();
+        const minutes = this.readZclUInt8();
+        const seconds = this.readZclUInt8();
+        const hundredths = this.readZclUInt8();
         return {
-            hours: hours < 0xff ? hours : undefined,
-            minutes: minutes < 0xff ? minutes : undefined,
-            seconds: seconds < 0xff ? seconds : undefined,
-            hundredths: hundredths < 0xff ? hundredths : undefined,
+            hours,
+            minutes,
+            seconds,
+            hundredths,
         };
     }
     writeDate(value) {
-        this.writeUInt8(value.year !== undefined ? 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) ? 0xff : value.year - 1900);
+        this.writeUInt8(value.month == null || Number.isNaN(value.month) ? 0xff : value.month);
+        this.writeUInt8(value.dayOfMonth == null || Number.isNaN(value.dayOfMonth) ? 0xff : value.dayOfMonth);
+        this.writeUInt8(value.dayOfWeek == null || Number.isNaN(value.dayOfWeek) ? 0xff : value.dayOfWeek);
     }
     readDate() {
-        const year = this.readUInt8();
-        const month = this.readUInt8();
-        const dayOfMonth = this.readUInt8();
-        const dayOfWeek = this.readUInt8();
+        const year = this.readZclUInt8();
+        const month = this.readZclUInt8();
+        const dayOfMonth = this.readZclUInt8();
+        const dayOfWeek = this.readZclUInt8();
         return {
-            year: year < 0xff ? year + 1900 : undefined,
-            month: month < 0xff ? month : undefined,
-            dayOfMonth: dayOfMonth < 0xff ? dayOfMonth : undefined,
-            dayOfWeek: dayOfWeek < 0xff ? dayOfWeek : undefined,
+            year: year + 1900, // remains NaN if year is NaN
+            month,
+            dayOfMonth,
+            dayOfWeek,
         };
     }
     //--- BuffaloZclDataType
@@ -292,9 +437,15 @@ class BuffaloZcl extends buffalo_1.Buffalo {
         // 0xf6: ZCL Tunneling
     }
     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) {
+        if (options.payload.commandID === 0xe0) {
             // Commisioning
             const frame = {
                 deviceID: this.readUInt8(),
@@ -356,29 +507,20 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                     frame.currentContactStatus = this.readUInt8();
                 }
             }
-            if (options.payload.payloadSize) {
-                this.position = startPosition + options.payload.payloadSize;
-            }
+            this.setPosition(startPosition + options.payload.payloadSize);
             return frame;
         }
-        if (options.payload?.commandID === 0xe3) {
+        if (options.payload.commandID === 0xe3) {
             // Channel Request
             const channelOpts = this.readUInt8();
-            /* v8 ignore start */
-            if (options.payload?.payloadSize) {
-                this.position = startPosition + options.payload.payloadSize;
-            }
-            /* v8 ignore stop */
+            this.setPosition(startPosition + options.payload.payloadSize);
             return {
                 nextChannel: channelOpts & 0xf,
                 nextNextChannel: channelOpts >> 4,
             };
         }
-        if (options.payload?.commandID === 0xa1) {
+        if (options.payload.commandID === 0xa1) {
             // Manufacturer-specific Attribute Reporting
-            if (options.payload.payloadSize === undefined) {
-                throw new Error("Cannot read GPD_FRAME with commandID=0xA1 without payloadSize options specified");
-            }
             const start = this.position;
             const frame = {
                 manufacturerCode: this.readUInt16(),
@@ -399,17 +541,11 @@ class BuffaloZcl extends buffalo_1.Buffalo {
                 }
                 frame.attributes[attribute] = this.read(type, options);
             }
-            this.position = startPosition + options.payload.payloadSize;
+            this.setPosition(startPosition + options.payload.payloadSize);
             return frame;
         }
-        if (options.payload?.payloadSize && this.isMore()) {
-            // might contain `gppNwkAddr`, `gppGpdLink` & `mic` from ZCL cluster, so limit by `payloadSize`
-            return { raw: this.readBuffer(options.payload.payloadSize) };
-        }
-        if (options.payload?.payloadSize) {
-            this.position = startPosition + options.payload.payloadSize;
-        }
-        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) {
@@ -523,12 +659,12 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             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: {
-                this.writeUInt8(value);
+                this.writeZclUInt8(value);
                 break;
             }
             case enums_1.DataType.DATA16:
@@ -537,13 +673,13 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             case enums_1.DataType.ENUM16:
             case enums_1.DataType.CLUSTER_ID:
             case enums_1.DataType.ATTR_ID: {
-                this.writeUInt16(value);
+                this.writeZclUInt16(value);
                 break;
             }
             case enums_1.DataType.DATA24:
             case enums_1.DataType.BITMAP24:
             case enums_1.DataType.UINT24: {
-                this.writeUInt24(value);
+                this.writeZclUInt24(value);
                 break;
             }
             case enums_1.DataType.DATA32:
@@ -551,63 +687,63 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             case enums_1.DataType.UINT32:
             case enums_1.DataType.UTC:
             case enums_1.DataType.BAC_OID: {
-                this.writeUInt32(value);
+                this.writeZclUInt32(value);
                 break;
             }
             case enums_1.DataType.DATA40:
             case enums_1.DataType.BITMAP40:
             case enums_1.DataType.UINT40: {
-                this.writeUInt40(value);
+                this.writeZclUInt40(value);
                 break;
             }
             case enums_1.DataType.DATA48:
             case enums_1.DataType.BITMAP48:
             case enums_1.DataType.UINT48: {
-                this.writeUInt48(value);
+                this.writeZclUInt48(value);
                 break;
             }
             case enums_1.DataType.DATA56:
             case enums_1.DataType.BITMAP56:
             case enums_1.DataType.UINT56: {
-                this.writeUInt56(value);
+                this.writeZclUInt56(value);
                 break;
             }
             case enums_1.DataType.DATA64:
             case enums_1.DataType.BITMAP64:
             case enums_1.DataType.UINT64: {
-                this.writeUInt64(value);
+                this.writeZclUInt64(value);
                 break;
             }
             case enums_1.DataType.INT8: {
-                this.writeInt8(value);
+                this.writeZclInt8(value);
                 break;
             }
             case enums_1.DataType.INT16: {
-                this.writeInt16(value);
+                this.writeZclInt16(value);
                 break;
             }
             case enums_1.DataType.INT24: {
-                this.writeInt24(value);
+                this.writeZclInt24(value);
                 break;
             }
             case enums_1.DataType.INT32: {
-                this.writeInt32(value);
+                this.writeZclInt32(value);
                 break;
             }
             case enums_1.DataType.INT40: {
-                this.writeInt40(value);
+                this.writeZclInt40(value);
                 break;
             }
             case enums_1.DataType.INT48: {
-                this.writeInt48(value);
+                this.writeZclInt48(value);
                 break;
             }
             case enums_1.DataType.INT56: {
-                this.writeInt56(value);
+                this.writeZclInt56(value);
                 break;
             }
             case enums_1.DataType.INT64: {
-                this.writeInt64(value);
+                this.writeZclInt64(value);
                 break;
             }
             // case DataType.SEMI_PREC: {
@@ -748,12 +884,12 @@ class BuffaloZcl extends buffalo_1.Buffalo {
             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.readUInt8();
+                return this.readZclUInt8();
             }
             case enums_1.DataType.DATA16:
             case enums_1.DataType.BITMAP16:
@@ -761,63 +897,63 @@ 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.readUInt16();
+                return this.readZclUInt16();
             }
             case enums_1.DataType.DATA24:
             case enums_1.DataType.BITMAP24:
             case enums_1.DataType.UINT24: {
-                return this.readUInt24();
+                return this.readZclUInt24();
             }
             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();
+                return this.readZclUInt32();
             }
             case enums_1.DataType.DATA40:
             case enums_1.DataType.BITMAP40:
             case enums_1.DataType.UINT40: {
-                return this.readUInt40();
+                return this.readZclUInt40();
             }
             case enums_1.DataType.DATA48:
             case enums_1.DataType.BITMAP48:
             case enums_1.DataType.UINT48: {
-                return this.readUInt48();
+                return this.readZclUInt48();
             }
             case enums_1.DataType.DATA56:
             case enums_1.DataType.BITMAP56:
             case enums_1.DataType.UINT56: {
-                return this.readUInt56();
+                return this.readZclUInt56();
             }
             case enums_1.DataType.DATA64:
             case enums_1.DataType.BITMAP64:
             case enums_1.DataType.UINT64: {
-                return this.readUInt64();
+                return this.readZclUInt64();
             }
             case enums_1.DataType.INT8: {
-                return this.readInt8();
+                return this.readZclInt8();
             }
             case enums_1.DataType.INT16: {
-                return this.readInt16();
+                return this.readZclInt16();
             }
             case enums_1.DataType.INT24: {
-                return this.readInt24();
+                return this.readZclInt24();
             }
             case enums_1.DataType.INT32: {
-                return this.readInt32();
+                return this.readZclInt32();
             }
             case enums_1.DataType.INT40: {
-                return this.readInt40();
+                return this.readZclInt40();
             }
             case enums_1.DataType.INT48: {
-                return this.readInt48();
+                return this.readZclInt48();
             }
             case enums_1.DataType.INT56: {
-                return this.readInt56();
+                return this.readZclInt56();
             }
             case enums_1.DataType.INT64: {
-                return this.readInt64();
+                return this.readZclInt64();
             }
             // case DataType.SEMI_PREC: {
             //     // https://tc39.es/proposal-float16array/