@zwave-js/cc 13.10.1 → 14.0.0-beta.0

package/build/cc/MeterCC.js

@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var MeterCCReport_1, MeterCCGet_1, MeterCCSupportedReport_1, MeterCCReset_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeterCCReset = exports.MeterCCSupportedGet = exports.MeterCCSupportedReport = exports.MeterCCGet = exports.MeterCCReport = exports.MeterCC = exports.MeterCCAPI = exports.MeterCCValues = void 0;
 exports.isAccumulatedValue = isAccumulatedValue;
@@ -415,22 +416,28 @@ function isAccumulatedValue(meterType, scale) {
     // FIXME: We should probably move the meter definitions into code
     switch (meterType) {
         case 0x01: // Electric
-            return (scale === 0x00 // kWh
+            return (
+            // kVarh
+            // Pulse count
+            scale === 0x00 // kWh
                 || scale === 0x01 // kVAh
-                || scale === 0x03 // Pulse count
-                || scale === 0x08 // kVarh
-            );
+                || scale === 0x03
+                || scale === 0x08);
         case 0x02: // Gas
-            return (scale === 0x00 // m³
-                || scale === 0x01 // ft³
-                || scale === 0x03 // Pulse count
-            );
+            return (
+            // Pulse count
+            // ft³
+            scale === 0x00 // m³
+                || scale === 0x01
+                || scale === 0x03);
         case 0x03: // Water
-            return (scale === 0x00 // m³
+            return (
+            // Pulse count
+            // US gallons
+            scale === 0x00 // m³
                 || scale === 0x01 // ft³
-                || scale === 0x02 // US gallons
-                || scale === 0x03 // Pulse count
-            );
+                || scale === 0x02
+                || scale === 0x03);
         case 0x04: // Heating
             return scale === 0x00; // kWh
         case 0x05: // Cooling
@@ -484,12 +491,12 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
     async get(options) {
         __assertType("options", "(optional) MeterCCGetOptions", __assertType__optional_MeterCCGetOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.Get);
-        const cc = new MeterCCGet(this.applHost, {
+        const cc = new MeterCCGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...options,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (response) {
             return {
                 type: response.type,
@@ -507,12 +514,12 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
     async sendReport(options) {
         __assertType("options", "MeterCCReportOptions", __assertType__MeterCCReportOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.Report);
-        const cc = new MeterCCReport(this.applHost, {
+        const cc = new MeterCCReport({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...options,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async getAll(accumulatedOnly = false) {
         __assertType("accumulatedOnly", "(optional) boolean", __assertType__optional_boolean.bind(void 0, accumulatedOnly));
@@ -551,11 +558,11 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getSupported() {
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.SupportedGet);
-        const cc = new MeterCCSupportedGet(this.applHost, {
+        const cc = new MeterCCSupportedGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (response) {
             return (0, safe_2.pick)(response, [
                 "type",
@@ -568,22 +575,22 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
     async sendSupportedReport(options) {
         __assertType("options", "MeterCCSupportedReportOptions", __assertType__MeterCCSupportedReportOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.SupportedReport);
-        const cc = new MeterCCSupportedReport(this.applHost, {
+        const cc = new MeterCCSupportedReport({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...options,
         });
-        await this.applHost.sendCommand(cc, this.commandOptions);
+        await this.host.sendCommand(cc, this.commandOptions);
     }
     async reset(options) {
         __assertType("options", "(optional) MeterCCResetOptions", __assertType__optional_MeterCCResetOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.Reset);
-        const cc = new MeterCCReset(this.applHost, {
+        const cc = new MeterCCReset({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...options,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     get [API_1.SET_VALUE]() {
         return async function ({ property, propertyKey }, value) {
@@ -680,19 +687,19 @@ exports.MeterCCAPI = MeterCCAPI = __decorate([
     (0, CommandClassDecorators_1.API)(safe_1.CommandClasses.Meter)
 ], MeterCCAPI);
 let MeterCC = class MeterCC extends CommandClass_1.CommandClass {
-    async interview(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses.Meter, applHost, endpoint).withOptions({
+    async interview(ctx) {
+        const node = this.getNode(ctx);
+        const endpoint = this.getEndpoint(ctx);
+        const api = API_1.CCAPI.create(safe_1.CommandClasses.Meter, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: `Interviewing ${this.ccName}...`,
             direction: "none",
         });
-        if (this.version >= 2) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version >= 2) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "querying meter support...",
                 direction: "outbound",
@@ -711,14 +718,14 @@ supported rate types: ${suppResp.supportedRateTypes
                     .map((label) => `\n· ${label}`)
                     .join("")}
 supports reset:       ${suppResp.supportsReset}`;
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: logMessage,
                     direction: "inbound",
                 });
             }
             else {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: "Querying meter support timed out, skipping interview...",
                     level: "warn",
@@ -727,18 +734,18 @@ supports reset:       ${suppResp.supportsReset}`;
             }
         }
         // Query current meter values
-        await this.refreshValues(applHost);
+        await this.refreshValues(ctx);
         // Remember that the interview is complete
-        this.setInterviewComplete(applHost, true);
+        this.setInterviewComplete(ctx, true);
     }
-    async refreshValues(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses.Meter, applHost, endpoint).withOptions({
+    async refreshValues(ctx) {
+        const node = this.getNode(ctx);
+        const endpoint = this.getEndpoint(ctx);
+        const api = API_1.CCAPI.create(safe_1.CommandClasses.Meter, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        if (this.version === 1) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version === 1) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: `querying default meter value...`,
                 direction: "outbound",
@@ -746,16 +753,16 @@ supports reset:       ${suppResp.supportsReset}`;
             await api.get();
         }
         else {
-            const type = this.getValue(applHost, exports.MeterCCValues.type)
+            const type = this.getValue(ctx, exports.MeterCCValues.type)
                 ?? 0;
-            const supportedScales = this.getValue(applHost, exports.MeterCCValues.supportedScales) ?? [];
-            const supportedRateTypes = this.getValue(applHost, exports.MeterCCValues.supportedRateTypes) ?? [];
+            const supportedScales = this.getValue(ctx, exports.MeterCCValues.supportedScales) ?? [];
+            const supportedRateTypes = this.getValue(ctx, exports.MeterCCValues.supportedRateTypes) ?? [];
             const rateTypes = supportedRateTypes.length
                 ? supportedRateTypes
                 : [undefined];
             for (const rateType of rateTypes) {
                 for (const scale of supportedScales) {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `querying meter value (type = ${(0, core_1.getMeterName)(type)}, scale = ${((0, core_1.getMeterScale)(type, scale)
                             ?? (0, core_1.getUnknownMeterScale)(scale)).label}${rateType != undefined
@@ -768,14 +775,14 @@ supports reset:       ${suppResp.supportsReset}`;
             }
         }
     }
-    shouldRefreshValues(applHost) {
+    shouldRefreshValues(ctx) {
         // Poll the device when all of the supported values were last updated longer than 6 hours ago.
         // This may lead to some values not being updated, but the user may have disabled some unnecessary
         // reports to reduce traffic.
-        const valueDB = applHost.tryGetValueDB(this.nodeId);
+        const valueDB = ctx.tryGetValueDB(this.nodeId);
         if (!valueDB)
             return true;
-        const values = this.getDefinedValueIDs(applHost).filter((v) => exports.MeterCCValues.value.is(v));
+        const values = this.getDefinedValueIDs(ctx).filter((v) => exports.MeterCCValues.value.is(v));
         return values.every((v) => {
             const lastUpdated = valueDB.getTimestamp(v);
             return (lastUpdated == undefined
@@ -786,8 +793,8 @@ supports reset:       ${suppResp.supportsReset}`;
      * Returns which type this meter has.
      * This only works AFTER the interview process
      */
-    static getMeterTypeCached(applHost, endpoint) {
-        return applHost
+    static getMeterTypeCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.MeterCCValues.type.endpoint(endpoint.index));
     }
@@ -795,8 +802,8 @@ supports reset:       ${suppResp.supportsReset}`;
      * Returns which scales are supported by this meter.
      * This only works AFTER the interview process
      */
-    static getSupportedScalesCached(applHost, endpoint) {
-        return applHost
+    static getSupportedScalesCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.MeterCCValues.supportedScales.endpoint(endpoint.index));
     }
@@ -804,8 +811,8 @@ supports reset:       ${suppResp.supportsReset}`;
      * Returns whether reset is supported by this meter.
      * This only works AFTER the interview process
      */
-    static supportsResetCached(applHost, endpoint) {
-        return applHost
+    static supportsResetCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.MeterCCValues.supportsReset.endpoint(endpoint.index));
     }
@@ -813,12 +820,12 @@ supports reset:       ${suppResp.supportsReset}`;
      * Returns which rate types are supported by this meter.
      * This only works AFTER the interview process
      */
-    static getSupportedRateTypesCached(applHost, endpoint) {
-        return applHost
+    static getSupportedRateTypesCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.MeterCCValues.supportedRateTypes.endpoint(endpoint.index));
     }
-    translatePropertyKey(applHost, property, propertyKey) {
+    translatePropertyKey(ctx, property, propertyKey) {
         if (property === "value" && typeof propertyKey === "number") {
             const { meterType, rateType, scale } = splitPropertyKey(propertyKey);
             let ret;
@@ -837,7 +844,7 @@ supports reset:       ${suppResp.supportsReset}`;
         else if (property === "reset" && typeof propertyKey === "number") {
             return (0, core_1.getMeterName)(propertyKey);
         }
-        return super.translatePropertyKey(applHost, property, propertyKey);
+        return super.translatePropertyKey(ctx, property, propertyKey);
     }
 };
 exports.MeterCC = MeterCC;
@@ -846,80 +853,87 @@ exports.MeterCC = MeterCC = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(6),
     (0, CommandClassDecorators_1.ccValues)(exports.MeterCCValues)
 ], MeterCC);
-let MeterCCReport = class MeterCCReport extends MeterCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            const { type, rateType, scale1, value, bytesRead } = parseMeterValueAndInfo(this.payload, 0);
-            this.type = type;
-            this.rateType = rateType;
-            this.value = value;
-            let offset = bytesRead;
-            const floatSize = bytesRead - 2;
-            if (this.payload.length >= offset + 2) {
-                this.deltaTime = this.payload.readUInt16BE(offset);
-                offset += 2;
-                if (this.deltaTime === 0xffff) {
-                    this.deltaTime = safe_1.UNKNOWN_STATE;
-                }
-                if (
-                // Previous value is included only if delta time is not 0
-                this.deltaTime !== 0
-                    && this.payload.length >= offset + floatSize) {
-                    const { value: prevValue } = (0, safe_1.parseFloatWithScale)(
-                    // This float is split in the payload
-                    Buffer.concat([
-                        Buffer.from([this.payload[1]]),
-                        this.payload.subarray(offset),
-                    ]));
-                    offset += floatSize;
-                    this.previousValue = prevValue;
-                }
+let MeterCCReport = MeterCCReport_1 = class MeterCCReport extends MeterCC {
+    constructor(options) {
+        super(options);
+        this.type = options.type;
+        this.scale = options.scale;
+        this.value = options.value;
+        this.previousValue = options.previousValue;
+        this.rateType = options.rateType ?? _Types_1.RateType.Unspecified;
+        this.deltaTime = options.deltaTime ?? safe_1.UNKNOWN_STATE;
+    }
+    static from(raw, ctx) {
+        const { type, rateType, scale1, value, bytesRead } = parseMeterValueAndInfo(raw.payload, 0);
+        let offset = bytesRead;
+        const floatSize = bytesRead - 2;
+        let deltaTime;
+        let previousValue;
+        if (raw.payload.length >= offset + 2) {
+            deltaTime = raw.payload.readUInt16BE(offset);
+            offset += 2;
+            if (deltaTime === 0xffff) {
+                deltaTime = safe_1.UNKNOWN_STATE;
             }
-            else {
-                // 0 means that no previous value is included
-                this.deltaTime = 0;
+            if (
+            // Previous value is included only if delta time is not 0
+            deltaTime !== 0
+                && raw.payload.length >= offset + floatSize) {
+                const { value: prevValue } = (0, safe_1.parseFloatWithScale)(
+                // This float is split in the payload
+                Buffer.concat([
+                    Buffer.from([raw.payload[1]]),
+                    raw.payload.subarray(offset),
+                ]));
+                offset += floatSize;
+                previousValue = prevValue;
             }
-            this.scale = parseScale(scale1, this.payload, offset);
         }
         else {
-            this.type = options.type;
-            this.scale = options.scale;
-            this.value = options.value;
-            this.previousValue = options.previousValue;
-            this.rateType = options.rateType ?? _Types_1.RateType.Unspecified;
-            this.deltaTime = options.deltaTime ?? safe_1.UNKNOWN_STATE;
-        }
+            // 0 means that no previous value is included
+            deltaTime = 0;
+        }
+        const scale = parseScale(scale1, raw.payload, offset);
+        return new MeterCCReport_1({
+            nodeId: ctx.sourceNodeId,
+            type,
+            rateType,
+            value,
+            deltaTime,
+            previousValue,
+            scale,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
+        const ccVersion = (0, CommandClass_1.getEffectiveCCVersion)(ctx, this);
         const meter = (0, core_1.getMeter)(this.type);
         const scale = (0, core_1.getMeterScale)(this.type, this.scale)
             ?? (0, core_1.getUnknownMeterScale)(this.scale);
         // Filter out unknown meter types and scales, unless the strict validation is disabled
-        const measurementValidation = !this.host.getDeviceConfig?.(this.nodeId)?.compat?.disableStrictMeasurementValidation;
+        const measurementValidation = !ctx.getDeviceConfig?.(this.nodeId)?.compat?.disableStrictMeasurementValidation;
         if (measurementValidation) {
             safe_1.validatePayload.withReason(`Unknown meter type ${(0, safe_2.num2hex)(this.type)} or corrupted data`)(!!meter);
             safe_1.validatePayload.withReason(`Unknown meter scale ${(0, safe_2.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, core_1.getUnknownMeterScale)(this.scale).label);
             // Filter out unsupported meter types, scales and rate types if possible
-            if (this.version >= 2) {
-                const expectedType = this.getValue(applHost, exports.MeterCCValues.type);
+            if (ccVersion >= 2) {
+                const expectedType = this.getValue(ctx, exports.MeterCCValues.type);
                 if (expectedType != undefined) {
                     safe_1.validatePayload.withReason("Unexpected meter type or corrupted data")(this.type === expectedType);
                 }
-                const supportedScales = this.getValue(applHost, exports.MeterCCValues.supportedScales);
+                const supportedScales = this.getValue(ctx, exports.MeterCCValues.supportedScales);
                 if (supportedScales?.length) {
                     safe_1.validatePayload.withReason(`Unsupported meter scale ${scale.label} or corrupted data`)(supportedScales.includes(this.scale));
                 }
-                const supportedRateTypes = this.getValue(applHost, exports.MeterCCValues.supportedRateTypes);
+                const supportedRateTypes = this.getValue(ctx, exports.MeterCCValues.supportedRateTypes);
                 if (supportedRateTypes?.length) {
                     safe_1.validatePayload.withReason(`Unsupported rate type ${(0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType)} or corrupted data`)(supportedRateTypes.includes(this.rateType));
                 }
             }
         }
         const valueValue = exports.MeterCCValues.value(this.type, this.rateType, this.scale);
-        this.setMetadata(applHost, valueValue, {
+        this.setMetadata(ctx, valueValue, {
             ...valueValue.meta,
             label: getValueLabel(this.type, this.scale, this.rateType),
             unit: scale.unit,
@@ -929,7 +943,7 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
                 rateType: this.rateType,
             },
         });
-        this.setValue(applHost, valueValue, this.value);
+        this.setValue(ctx, valueValue, this.value);
         return true;
     }
     type;
@@ -938,7 +952,7 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
     previousValue;
     rateType;
     deltaTime;
-    serialize() {
+    serialize(ctx) {
         const { data: typeAndValue, floatParams, scale2 } = encodeMeterValueAndInfo(this.type, this.rateType, this.scale, this.value);
         const deltaTime = this.deltaTime ?? 0xffff;
         const deltaTimeBytes = Buffer.allocUnsafe(2);
@@ -962,9 +976,9 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
                 Buffer.from([scale2]),
             ]);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const scale = (0, core_1.getMeterScale)(this.type, this.scale)
             ?? (0, core_1.getUnknownMeterScale)(this.scale);
         const message = {
@@ -980,13 +994,13 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
             message["prev. value"] = this.previousValue;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.MeterCCReport = MeterCCReport;
-exports.MeterCCReport = MeterCCReport = __decorate([
+exports.MeterCCReport = MeterCCReport = MeterCCReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.MeterCommand.Report)
 ], MeterCCReport);
 function testResponseForMeterGet(sent, received) {
@@ -995,43 +1009,49 @@ function testResponseForMeterGet(sent, received) {
     return ((sent.scale == undefined || sent.scale === received.scale)
         && (sent.rateType == undefined || sent.rateType == received.rateType));
 }
-let MeterCCGet = class MeterCCGet extends MeterCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            if (this.payload.length >= 1) {
-                this.rateType = (this.payload[0] & 0b11_000_000) >>> 6;
-                this.scale = (this.payload[0] & 0b00_111_000) >>> 3;
-                if (this.scale === 7) {
-                    (0, safe_1.validatePayload)(this.payload.length >= 2);
-                    this.scale += this.payload[1];
-                }
+let MeterCCGet = MeterCCGet_1 = class MeterCCGet extends MeterCC {
+    constructor(options) {
+        super(options);
+        this.rateType = options.rateType;
+        this.scale = options.scale;
+    }
+    static from(raw, ctx) {
+        let rateType;
+        let scale;
+        if (raw.payload.length >= 1) {
+            rateType = (raw.payload[0] & 0b11_000_000) >>> 6;
+            scale = (raw.payload[0] & 0b00_111_000) >>> 3;
+            if (scale === 7) {
+                (0, safe_1.validatePayload)(raw.payload.length >= 2);
+                scale += raw.payload[1];
             }
         }
-        else {
-            this.rateType = options.rateType;
-            this.scale = options.scale;
-        }
+        return new MeterCCGet_1({
+            nodeId: ctx.sourceNodeId,
+            rateType,
+            scale,
+        });
     }
     rateType;
     scale;
-    serialize() {
+    serialize(ctx) {
         let scale1;
         let scale2;
         let bufferLength = 0;
+        const ccVersion = (0, CommandClass_1.getEffectiveCCVersion)(ctx, this);
         if (this.scale == undefined) {
             scale1 = 0;
         }
-        else if (this.version >= 4 && this.scale >= 7) {
+        else if (ccVersion >= 4 && this.scale >= 7) {
             scale1 = 7;
             scale2 = this.scale >>> 3;
             bufferLength = 2;
         }
-        else if (this.version >= 3) {
+        else if (ccVersion >= 3) {
             scale1 = this.scale & 0b111;
             bufferLength = 1;
         }
-        else if (this.version >= 2) {
+        else if (ccVersion >= 2) {
             scale1 = this.scale & 0b11;
             bufferLength = 1;
         }
@@ -1039,7 +1059,7 @@ let MeterCCGet = class MeterCCGet extends MeterCC {
             scale1 = 0;
         }
         let rateTypeFlags = 0;
-        if (this.version >= 4 && this.rateType != undefined) {
+        if (ccVersion >= 4 && this.rateType != undefined) {
             rateTypeFlags = this.rateType & 0b11;
             bufferLength = Math.max(bufferLength, 1);
         }
@@ -1047,17 +1067,17 @@ let MeterCCGet = class MeterCCGet extends MeterCC {
         this.payload[0] = (rateTypeFlags << 6) | (scale1 << 3);
         if (scale2)
             this.payload[1] = scale2;
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         if (this.rateType != undefined) {
             message["rate type"] = (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType);
         }
         if (this.scale != undefined) {
-            if (host) {
+            if (ctx) {
                 // Try to lookup the meter type to translate the scale
-                const type = this.getValue(host, exports.MeterCCValues.type);
+                const type = this.getValue(ctx, exports.MeterCCValues.type);
                 if (type != undefined) {
                     message.scale = ((0, core_1.getMeterScale)(type, this.scale)
                         ?? (0, core_1.getUnknownMeterScale)(this.scale)).label;
@@ -1068,62 +1088,69 @@ let MeterCCGet = class MeterCCGet extends MeterCC {
             }
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.MeterCCGet = MeterCCGet;
-exports.MeterCCGet = MeterCCGet = __decorate([
+exports.MeterCCGet = MeterCCGet = MeterCCGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.MeterCommand.Get),
     (0, CommandClassDecorators_1.expectedCCResponse)(MeterCCReport, testResponseForMeterGet)
 ], MeterCCGet);
-let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.type = this.payload[0] & 0b0_00_11111;
-            this.supportsReset = !!(this.payload[0] & 0b1_00_00000);
-            const hasMoreScales = !!(this.payload[1] & 0b1_0000000);
-            if (hasMoreScales) {
-                // The bitmask is spread out
-                (0, safe_1.validatePayload)(this.payload.length >= 3);
-                const extraBytes = this.payload[2];
-                (0, safe_1.validatePayload)(this.payload.length >= 3 + extraBytes);
-                // The bitmask is the original payload byte plus all following bytes
-                // Since the first byte only has 7 bits, we need to reduce all following bits by 1
-                this.supportedScales = (0, safe_1.parseBitMask)(Buffer.concat([
-                    Buffer.from([this.payload[1] & 0b0_1111111]),
-                    this.payload.subarray(3, 3 + extraBytes),
-                ]), 0).map((scale) => (scale >= 8 ? scale - 1 : scale));
-            }
-            else {
-                // only 7 bits in the bitmask. Bit 7 is 0, so no need to mask it out
-                this.supportedScales = (0, safe_1.parseBitMask)(Buffer.from([this.payload[1]]), 0);
-            }
-            // This is only present in V4+
-            this.supportedRateTypes = (0, safe_1.parseBitMask)(Buffer.from([(this.payload[0] & 0b0_11_00000) >>> 5]), 1);
+let MeterCCSupportedReport = MeterCCSupportedReport_1 = class MeterCCSupportedReport extends MeterCC {
+    constructor(options) {
+        super(options);
+        this.type = options.type;
+        this.supportsReset = options.supportsReset;
+        this.supportedScales = options.supportedScales;
+        this.supportedRateTypes = options.supportedRateTypes;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const type = raw.payload[0] & 0b0_00_11111;
+        const supportsReset = !!(raw.payload[0] & 0b1_00_00000);
+        const hasMoreScales = !!(raw.payload[1] & 0b1_0000000);
+        let supportedScales;
+        if (hasMoreScales) {
+            // The bitmask is spread out
+            (0, safe_1.validatePayload)(raw.payload.length >= 3);
+            const extraBytes = raw.payload[2];
+            (0, safe_1.validatePayload)(raw.payload.length >= 3 + extraBytes);
+            // The bitmask is the original payload byte plus all following bytes
+            // Since the first byte only has 7 bits, we need to reduce all following bits by 1
+            supportedScales = (0, safe_1.parseBitMask)(Buffer.concat([
+                Buffer.from([raw.payload[1] & 0b0_1111111]),
+                raw.payload.subarray(3, 3 + extraBytes),
+            ]), 0).map((scale) => (scale >= 8 ? scale - 1 : scale));
         }
         else {
-            this.type = options.type;
-            this.supportsReset = options.supportsReset;
-            this.supportedScales = options.supportedScales;
-            this.supportedRateTypes = options.supportedRateTypes;
-        }
+            // only 7 bits in the bitmask. Bit 7 is 0, so no need to mask it out
+            supportedScales = (0, safe_1.parseBitMask)(Buffer.from([raw.payload[1]]), 0);
+        }
+        // This is only present in V4+
+        const supportedRateTypes = (0, safe_1.parseBitMask)(Buffer.from([(raw.payload[0] & 0b0_11_00000) >>> 5]), 1);
+        return new MeterCCSupportedReport_1({
+            nodeId: ctx.sourceNodeId,
+            type,
+            supportsReset,
+            supportedScales,
+            supportedRateTypes,
+        });
     }
     type;
     supportsReset;
     supportedScales;
     supportedRateTypes;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         if (!this.supportsReset)
             return true;
+        const ccVersion = (0, CommandClass_1.getEffectiveCCVersion)(ctx, this);
         // Create reset values
-        if (this.version < 6) {
-            this.ensureMetadata(applHost, exports.MeterCCValues.resetAll);
+        if (ccVersion < 6) {
+            this.ensureMetadata(ctx, exports.MeterCCValues.resetAll);
         }
         else {
             for (const scale of this.supportedScales) {
@@ -1132,7 +1159,7 @@ let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
                     continue;
                 for (const rateType of this.supportedRateTypes) {
                     const resetSingleValue = exports.MeterCCValues.resetSingle(this.type, rateType, scale);
-                    this.ensureMetadata(applHost, resetSingleValue, {
+                    this.ensureMetadata(ctx, resetSingleValue, {
                         ...resetSingleValue.meta,
                         label: `Reset ${getValueLabel(this.type, scale, rateType)}`,
                     });
@@ -1141,7 +1168,7 @@ let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
         }
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         const typeByte = (this.type & 0b0_00_11111)
             | (this.supportedRateTypes.includes(_Types_1.RateType.Consumed)
                 ? 0b0_01_00000
@@ -1168,9 +1195,9 @@ let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
                 Buffer.from(supportedScales.subarray(1)),
             ]);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "meter type": (0, core_1.getMeterName)(this.type),
             "supports reset": this.supportsReset,
@@ -1183,7 +1210,7 @@ let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
                 .join(", "),
         };
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1201,7 +1228,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.MeterCCValues.supportedRateTypes)
 ], MeterCCSupportedReport.prototype, "supportedRateTypes", void 0);
-exports.MeterCCSupportedReport = MeterCCSupportedReport = __decorate([
+exports.MeterCCSupportedReport = MeterCCSupportedReport = MeterCCSupportedReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.MeterCommand.SupportedReport)
 ], MeterCCSupportedReport);
 let MeterCCSupportedGet = class MeterCCSupportedGet extends MeterCC {
@@ -1211,30 +1238,35 @@ exports.MeterCCSupportedGet = MeterCCSupportedGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.MeterCommand.SupportedGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(MeterCCSupportedReport)
 ], MeterCCSupportedGet);
-let MeterCCReset = class MeterCCReset extends MeterCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            if (this.payload.length > 0) {
-                const { type, rateType, scale1, value, bytesRead: scale2Offset, } = parseMeterValueAndInfo(this.payload, 0);
-                this.type = type;
-                this.rateType = rateType;
-                this.targetValue = value;
-                this.scale = parseScale(scale1, this.payload, scale2Offset);
-            }
-        }
-        else {
-            this.type = options.type;
-            this.scale = options.scale;
-            this.rateType = options.rateType;
-            this.targetValue = options.targetValue;
+let MeterCCReset = MeterCCReset_1 = class MeterCCReset extends MeterCC {
+    constructor(options) {
+        super(options);
+        this.type = options.type;
+        this.scale = options.scale;
+        this.rateType = options.rateType;
+        this.targetValue = options.targetValue;
+    }
+    static from(raw, ctx) {
+        if (raw.payload.length === 0) {
+            return new MeterCCReset_1({
+                nodeId: ctx.sourceNodeId,
+            });
         }
+        const { type, rateType, scale1, value: targetValue, bytesRead: scale2Offset, } = parseMeterValueAndInfo(raw.payload, 0);
+        const scale = parseScale(scale1, raw.payload, scale2Offset);
+        return new MeterCCReset_1({
+            nodeId: ctx.sourceNodeId,
+            type,
+            rateType,
+            targetValue,
+            scale,
+        });
     }
     type;
     scale;
     rateType;
     targetValue;
-    serialize() {
+    serialize(ctx) {
         if (this.type != undefined
             && this.scale != undefined
             && this.rateType != undefined
@@ -1248,9 +1280,9 @@ let MeterCCReset = class MeterCCReset extends MeterCC {
                 ]);
             }
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         if (this.type != undefined) {
             message.type = (0, core_1.getMeterName)(this.type);
@@ -1266,13 +1298,13 @@ let MeterCCReset = class MeterCCReset extends MeterCC {
             message["target value"] = this.targetValue;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.MeterCCReset = MeterCCReset;
-exports.MeterCCReset = MeterCCReset = __decorate([
+exports.MeterCCReset = MeterCCReset = MeterCCReset_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.MeterCommand.Reset),
     (0, CommandClassDecorators_1.useSupervision)()
 ], MeterCCReset);