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

package/build/cc/IrrigationCC.js

@@ -5,7 +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 IrrigationCC_1;
+var IrrigationCC_1, IrrigationCCSystemInfoReport_1, IrrigationCCSystemStatusReport_1, IrrigationCCSystemConfigReport_1, IrrigationCCValveInfoReport_1, IrrigationCCValveConfigReport_1, IrrigationCCValveTableReport_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IrrigationCCSystemShutoff = exports.IrrigationCCValveTableRun = exports.IrrigationCCValveTableGet = exports.IrrigationCCValveTableReport = exports.IrrigationCCValveTableSet = exports.IrrigationCCValveRun = exports.IrrigationCCValveConfigGet = exports.IrrigationCCValveConfigReport = exports.IrrigationCCValveConfigSet = exports.IrrigationCCValveInfoGet = exports.IrrigationCCValveInfoReport = exports.IrrigationCCSystemConfigGet = exports.IrrigationCCSystemConfigReport = exports.IrrigationCCSystemConfigSet = exports.IrrigationCCSystemStatusGet = exports.IrrigationCCSystemStatusReport = exports.IrrigationCCSystemInfoGet = exports.IrrigationCCSystemInfoReport = exports.IrrigationCC = exports.IrrigationCCAPI = exports.IrrigationCCValues = void 0;
 function __assertType(argName, typeName, boundHasError) {
@@ -485,11 +485,11 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getSystemInfo() {
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.SystemInfoGet);
-        const cc = new IrrigationCCSystemInfoGet(this.applHost, {
+        const cc = new IrrigationCCSystemInfoGet({
             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, [
                 "numValves",
@@ -502,11 +502,11 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getSystemStatus() {
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.SystemStatusGet);
-        const cc = new IrrigationCCSystemStatusGet(this.applHost, {
+        const cc = new IrrigationCCSystemStatusGet({
             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, [
                 "systemVoltage",
@@ -530,11 +530,11 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     async getSystemConfig() {
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.SystemConfigGet);
-        const cc = new IrrigationCCSystemConfigGet(this.applHost, {
+        const cc = new IrrigationCCSystemConfigGet({
             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, [
                 "masterValveDelay",
@@ -548,22 +548,22 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     async setSystemConfig(config) {
         __assertType("config", "IrrigationCCSystemConfigSetOptions", __assertType__IrrigationCCSystemConfigSetOptions.bind(void 0, config));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.SystemConfigSet);
-        const cc = new IrrigationCCSystemConfigSet(this.applHost, {
+        const cc = new IrrigationCCSystemConfigSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...config,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async getValveInfo(valveId) {
         __assertType("valveId", "ValveId", __assertType__ValveId.bind(void 0, valveId));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveInfoGet);
-        const cc = new IrrigationCCValveInfoGet(this.applHost, {
+        const cc = new IrrigationCCValveInfoGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             valveId,
         });
-        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, [
                 "connected",
@@ -580,22 +580,22 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     async setValveConfig(options) {
         __assertType("options", "IrrigationCCValveConfigSetOptions", __assertType__IrrigationCCValveConfigSetOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveConfigSet);
-        const cc = new IrrigationCCValveConfigSet(this.applHost, {
+        const cc = new IrrigationCCValveConfigSet({
             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 getValveConfig(valveId) {
         __assertType("valveId", "ValveId", __assertType__ValveId.bind(void 0, valveId));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveConfigGet);
-        const cc = new IrrigationCCValveConfigGet(this.applHost, {
+        const cc = new IrrigationCCValveConfigGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             valveId,
         });
-        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, [
                 "nominalCurrentHighThreshold",
@@ -612,13 +612,13 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
         __assertType("valveId", "ValveId", __assertType__ValveId.bind(void 0, valveId));
         __assertType("duration", "number", __assertType__number.bind(void 0, duration));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveRun);
-        const cc = new IrrigationCCValveRun(this.applHost, {
+        const cc = new IrrigationCCValveRun({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             valveId,
             duration,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     shutoffValve(valveId) {
         __assertType("valveId", "ValveId", __assertType__ValveId.bind(void 0, valveId));
@@ -629,29 +629,29 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
         __assertType("entries", undefined, __assertType__sa__2_ea_2.bind(void 0, entries));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveTableSet);
         if (!this.endpoint.virtual) {
-            const maxValveTableSize = IrrigationCC.getMaxValveTableSizeCached(this.applHost, this.endpoint);
+            const maxValveTableSize = IrrigationCC.getMaxValveTableSizeCached(this.host, this.endpoint);
             if (maxValveTableSize != undefined
                 && entries.length > maxValveTableSize) {
                 throw new safe_1.ZWaveError(`The number of valve table entries must not exceed ${maxValveTableSize}.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
         }
-        const cc = new IrrigationCCValveTableSet(this.applHost, {
+        const cc = new IrrigationCCValveTableSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             tableId,
             entries,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async getValveTable(tableId) {
         __assertType("tableId", "number", __assertType__number.bind(void 0, tableId));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveTableGet);
-        const cc = new IrrigationCCValveTableGet(this.applHost, {
+        const cc = new IrrigationCCValveTableGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             tableId,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (response) {
             return response?.entries;
         }
@@ -659,12 +659,12 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     async runTables(tableIDs) {
         __assertType("tableIDs", undefined, __assertType__sa__number_ea_2.bind(void 0, tableIDs));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.ValveTableRun);
-        const cc = new IrrigationCCValveTableRun(this.applHost, {
+        const cc = new IrrigationCCValveTableRun({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             tableIDs,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /**
      * Shuts off the entire system for the given duration.
@@ -673,12 +673,12 @@ let IrrigationCCAPI = class IrrigationCCAPI extends API_1.CCAPI {
     async shutoffSystem(duration) {
         __assertType("duration", "number", __assertType__number.bind(void 0, duration));
         this.assertSupportsCommand(_Types_1.IrrigationCommand, _Types_1.IrrigationCommand.SystemShutoff);
-        const cc = new IrrigationCCSystemShutoff(this.applHost, {
+        const cc = new IrrigationCCSystemShutoff({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             duration,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /** Shuts off the entire system permanently and prevents schedules from running */
     shutoffSystemPermanently() {
@@ -833,8 +833,8 @@ let IrrigationCC = IrrigationCC_1 = class IrrigationCC extends CommandClass_1.Co
      * Returns the maximum number of valve table entries reported by the node.
      * This only works AFTER the node has been interviewed.
      */
-    static getMaxValveTableSizeCached(applHost, endpoint) {
-        return applHost
+    static getMaxValveTableSizeCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.IrrigationCCValues.maxValveTableSize.endpoint(endpoint.index));
     }
@@ -842,8 +842,8 @@ let IrrigationCC = IrrigationCC_1 = class IrrigationCC extends CommandClass_1.Co
      * Returns the number of zone valves reported by the node.
      * This only works AFTER the node has been interviewed.
      */
-    static getNumValvesCached(applHost, endpoint) {
-        return applHost
+    static getNumValvesCached(ctx, endpoint) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.IrrigationCCValues.numValves.endpoint(endpoint.index));
     }
@@ -851,30 +851,30 @@ let IrrigationCC = IrrigationCC_1 = class IrrigationCC extends CommandClass_1.Co
      * Returns whether the node supports a master valve
      * This only works AFTER the node has been interviewed.
      */
-    static supportsMasterValveCached(applHost, endpoint) {
-        return !!applHost
+    static supportsMasterValveCached(ctx, endpoint) {
+        return !!ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.IrrigationCCValues.supportsMasterValve.endpoint(endpoint.index));
     }
-    async interview(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses.Irrigation, 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.Irrigation, 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",
         });
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: "Querying irrigation system info...",
             direction: "outbound",
         });
         const systemInfo = await api.getSystemInfo();
         if (!systemInfo) {
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "Time out while querying irrigation system info, skipping interview...",
                 level: "warn",
@@ -886,31 +886,31 @@ supports master valve: ${systemInfo.supportsMasterValve}
 no. of valves:         ${systemInfo.numValves}
 no. of valve tables:   ${systemInfo.numValveTables}
 max. valve table size: ${systemInfo.maxValveTableSize}`;
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: logMessage,
             direction: "inbound",
         });
         // For each valve, create the values to start/stop a run
         for (let i = 1; i <= systemInfo.numValves; i++) {
-            this.ensureMetadata(applHost, exports.IrrigationCCValues.valveRunDuration(i));
-            this.ensureMetadata(applHost, exports.IrrigationCCValues.valveRunStartStop(i));
+            this.ensureMetadata(ctx, exports.IrrigationCCValues.valveRunDuration(i));
+            this.ensureMetadata(ctx, exports.IrrigationCCValues.valveRunStartStop(i));
         }
         // And create a shutoff value
-        this.ensureMetadata(applHost, exports.IrrigationCCValues.shutoffSystem);
+        this.ensureMetadata(ctx, exports.IrrigationCCValues.shutoffSystem);
         // Query current 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.Irrigation, 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.Irrigation, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
         // Query the current system config
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: "Querying irrigation system configuration...",
             direction: "outbound",
@@ -929,7 +929,7 @@ rain sensor polarity:     ${(0, safe_2.getEnumMemberName)(_Types_1.IrrigationSen
                 logMessage += `
 moisture sensor polarity: ${(0, safe_2.getEnumMemberName)(_Types_1.IrrigationSensorPolarity, systemConfig.moistureSensorPolarity)}`;
             }
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: logMessage,
                 direction: "inbound",
@@ -937,35 +937,35 @@ moisture sensor polarity: ${(0, safe_2.getEnumMemberName)(_Types_1.IrrigationSen
         }
         // and status
         // Query the current system config
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: "Querying irrigation system status...",
             direction: "outbound",
         });
         await api.getSystemStatus();
         // for each valve, query the current status and configuration
-        if (IrrigationCC_1.supportsMasterValveCached(applHost, endpoint)) {
-            applHost.controllerLog.logNode(node.id, {
+        if (IrrigationCC_1.supportsMasterValveCached(ctx, endpoint)) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "Querying master valve configuration...",
                 direction: "outbound",
             });
             await api.getValveConfig("master");
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "Querying master valve status...",
                 direction: "outbound",
             });
             await api.getValveInfo("master");
         }
-        for (let i = 1; i <= (IrrigationCC_1.getNumValvesCached(applHost, endpoint) ?? 0); i++) {
-            applHost.controllerLog.logNode(node.id, {
+        for (let i = 1; i <= (IrrigationCC_1.getNumValvesCached(ctx, endpoint) ?? 0); i++) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: `Querying configuration for valve ${(0, strings_1.padStart)(i.toString(), 3, "0")}...`,
                 direction: "outbound",
             });
             await api.getValveConfig(i);
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: `Querying status for valve ${(0, strings_1.padStart)(i.toString(), 3, "0")}...`,
                 direction: "outbound",
@@ -973,14 +973,14 @@ moisture sensor polarity: ${(0, safe_2.getEnumMemberName)(_Types_1.IrrigationSen
             await api.getValveInfo(i);
         }
     }
-    translateProperty(applHost, property, propertyKey) {
+    translateProperty(ctx, property, propertyKey) {
         if (property === "master") {
             return "Master valve";
         }
         else if (typeof property === "number") {
             return `Valve ${(0, strings_1.padStart)(property.toString(), 3, "0")}`;
         }
-        return super.translateProperty(applHost, property, propertyKey);
+        return super.translateProperty(ctx, property, propertyKey);
     }
 };
 exports.IrrigationCC = IrrigationCC;
@@ -989,22 +989,36 @@ exports.IrrigationCC = IrrigationCC = IrrigationCC_1 = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(1),
     (0, CommandClassDecorators_1.ccValues)(exports.IrrigationCCValues)
 ], IrrigationCC);
-let IrrigationCCSystemInfoReport = class IrrigationCCSystemInfoReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 4);
-        this.supportsMasterValve = !!(this.payload[0] & 0x01);
-        this.numValves = this.payload[1];
-        this.numValveTables = this.payload[2];
-        this.maxValveTableSize = this.payload[3] & 0b1111;
+let IrrigationCCSystemInfoReport = IrrigationCCSystemInfoReport_1 = class IrrigationCCSystemInfoReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.supportsMasterValve = options.supportsMasterValve;
+        this.numValves = options.numValves;
+        this.numValveTables = options.numValveTables;
+        this.maxValveTableSize = options.maxValveTableSize;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        const supportsMasterValve = !!(raw.payload[0] & 0x01);
+        const numValves = raw.payload[1];
+        const numValveTables = raw.payload[2];
+        const maxValveTableSize = raw.payload[3] & 0b1111;
+        return new IrrigationCCSystemInfoReport_1({
+            nodeId: ctx.sourceNodeId,
+            supportsMasterValve,
+            numValves,
+            numValveTables,
+            maxValveTableSize,
+        });
     }
     numValves;
     numValveTables;
     supportsMasterValve;
     maxValveTableSize;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "supports master valve": this.supportsMasterValve,
                 "no. of valves": this.numValves,
@@ -1027,7 +1041,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.IrrigationCCValues.maxValveTableSize)
 ], IrrigationCCSystemInfoReport.prototype, "maxValveTableSize", void 0);
-exports.IrrigationCCSystemInfoReport = IrrigationCCSystemInfoReport = __decorate([
+exports.IrrigationCCSystemInfoReport = IrrigationCCSystemInfoReport = IrrigationCCSystemInfoReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemInfoReport)
 ], IrrigationCCSystemInfoReport);
 let IrrigationCCSystemInfoGet = class IrrigationCCSystemInfoGet extends IrrigationCC {
@@ -1037,41 +1051,80 @@ exports.IrrigationCCSystemInfoGet = IrrigationCCSystemInfoGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemInfoGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCSystemInfoReport)
 ], IrrigationCCSystemInfoGet);
-let IrrigationCCSystemStatusReport = class IrrigationCCSystemStatusReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 2);
-        this.systemVoltage = this.payload[0];
-        this.flowSensorActive = !!(this.payload[1] & 0x01);
-        this.pressureSensorActive = !!(this.payload[1] & 0x02);
-        this.rainSensorActive = !!(this.payload[1] & 0x04);
-        this.moistureSensorActive = !!(this.payload[1] & 0x08);
+let IrrigationCCSystemStatusReport = IrrigationCCSystemStatusReport_1 = class IrrigationCCSystemStatusReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.systemVoltage = options.systemVoltage;
+        this.flowSensorActive = options.flowSensorActive;
+        this.pressureSensorActive = options.pressureSensorActive;
+        this.rainSensorActive = options.rainSensorActive;
+        this.moistureSensorActive = options.moistureSensorActive;
+        this.flow = options.flow;
+        this.pressure = options.pressure;
+        this.shutoffDuration = options.shutoffDuration;
+        this.errorNotProgrammed = options.errorNotProgrammed;
+        this.errorEmergencyShutdown = options.errorEmergencyShutdown;
+        this.errorHighPressure = options.errorHighPressure;
+        this.errorLowPressure = options.errorLowPressure;
+        this.errorValve = options.errorValve;
+        this.masterValveOpen = options.masterValveOpen;
+        this.firstOpenZoneId = options.firstOpenZoneId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const systemVoltage = raw.payload[0];
+        const flowSensorActive = !!(raw.payload[1] & 0x01);
+        const pressureSensorActive = !!(raw.payload[1] & 0x02);
+        const rainSensorActive = !!(raw.payload[1] & 0x04);
+        const moistureSensorActive = !!(raw.payload[1] & 0x08);
         let offset = 2;
+        let flow;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0);
-            if (this.flowSensorActive)
-                this.flow = value;
+            if (flowSensorActive)
+                flow = value;
             offset += bytesRead;
         }
+        let pressure;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0);
-            if (this.pressureSensorActive)
-                this.pressure = value;
+            if (pressureSensorActive)
+                pressure = value;
             offset += bytesRead;
         }
-        (0, safe_1.validatePayload)(this.payload.length >= offset + 4);
-        this.shutoffDuration = this.payload[offset];
-        this.errorNotProgrammed = !!(this.payload[offset + 1] & 0x01);
-        this.errorEmergencyShutdown = !!(this.payload[offset + 1] & 0x02);
-        this.errorHighPressure = !!(this.payload[offset + 1] & 0x04);
-        this.errorLowPressure = !!(this.payload[offset + 1] & 0x08);
-        this.errorValve = !!(this.payload[offset + 1] & 0x10);
-        this.masterValveOpen = !!(this.payload[offset + 2] & 0x01);
-        if (this.payload[offset + 3]) {
-            this.firstOpenZoneId = this.payload[offset + 3];
-        }
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + 4);
+        const shutoffDuration = raw.payload[offset];
+        const errorNotProgrammed = !!(raw.payload[offset + 1] & 0x01);
+        const errorEmergencyShutdown = !!(raw.payload[offset + 1] & 0x02);
+        const errorHighPressure = !!(raw.payload[offset + 1] & 0x04);
+        const errorLowPressure = !!(raw.payload[offset + 1] & 0x08);
+        const errorValve = !!(raw.payload[offset + 1] & 0x10);
+        const masterValveOpen = !!(raw.payload[offset + 2] & 0x01);
+        let firstOpenZoneId;
+        if (raw.payload[offset + 3]) {
+            firstOpenZoneId = raw.payload[offset + 3];
+        }
+        return new IrrigationCCSystemStatusReport_1({
+            nodeId: ctx.sourceNodeId,
+            systemVoltage,
+            flowSensorActive,
+            pressureSensorActive,
+            rainSensorActive,
+            moistureSensorActive,
+            flow,
+            pressure,
+            shutoffDuration,
+            errorNotProgrammed,
+            errorEmergencyShutdown,
+            errorHighPressure,
+            errorLowPressure,
+            errorValve,
+            masterValveOpen,
+            firstOpenZoneId,
+        });
     }
     systemVoltage;
     flowSensorActive;
@@ -1088,7 +1141,7 @@ let IrrigationCCSystemStatusReport = class IrrigationCCSystemStatusReport extend
     errorValve;
     masterValveOpen;
     firstOpenZoneId;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "system voltage": `${this.systemVoltage} V`,
             "active sensors": [
@@ -1128,7 +1181,7 @@ let IrrigationCCSystemStatusReport = class IrrigationCCSystemStatusReport extend
             message.errors = errors.map((e) => `\n· ${e}`).join("");
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1179,7 +1232,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.IrrigationCCValues.firstOpenZoneId)
 ], IrrigationCCSystemStatusReport.prototype, "firstOpenZoneId", void 0);
-exports.IrrigationCCSystemStatusReport = IrrigationCCSystemStatusReport = __decorate([
+exports.IrrigationCCSystemStatusReport = IrrigationCCSystemStatusReport = IrrigationCCSystemStatusReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemStatusReport)
 ], IrrigationCCSystemStatusReport);
 let IrrigationCCSystemStatusGet = class IrrigationCCSystemStatusGet extends IrrigationCC {
@@ -1190,26 +1243,27 @@ exports.IrrigationCCSystemStatusGet = IrrigationCCSystemStatusGet = __decorate([
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCSystemStatusReport)
 ], IrrigationCCSystemStatusGet);
 let IrrigationCCSystemConfigSet = class IrrigationCCSystemConfigSet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.masterValveDelay = options.masterValveDelay;
-            this.highPressureThreshold = options.highPressureThreshold;
-            this.lowPressureThreshold = options.lowPressureThreshold;
-            this.rainSensorPolarity = options.rainSensorPolarity;
-            this.moistureSensorPolarity = options.moistureSensorPolarity;
-        }
+    constructor(options) {
+        super(options);
+        this.masterValveDelay = options.masterValveDelay;
+        this.highPressureThreshold = options.highPressureThreshold;
+        this.lowPressureThreshold = options.lowPressureThreshold;
+        this.rainSensorPolarity = options.rainSensorPolarity;
+        this.moistureSensorPolarity = options.moistureSensorPolarity;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCSystemConfigSet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     masterValveDelay;
     highPressureThreshold;
     lowPressureThreshold;
     rainSensorPolarity;
     moistureSensorPolarity;
-    serialize() {
+    serialize(ctx) {
         let polarity = 0;
         if (this.rainSensorPolarity != undefined)
             polarity |= 0b1;
@@ -1226,9 +1280,9 @@ let IrrigationCCSystemConfigSet = class IrrigationCCSystemConfigSet extends Irri
             (0, safe_1.encodeFloatWithScale)(this.lowPressureThreshold, 0 /* kPa */),
             Buffer.from([polarity]),
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "master valve delay": `${this.masterValveDelay} s`,
             "high pressure threshold": `${this.highPressureThreshold} kPa`,
@@ -1241,7 +1295,7 @@ let IrrigationCCSystemConfigSet = class IrrigationCCSystemConfigSet extends Irri
             message["moisture sensor polarity"] = (0, safe_2.getEnumMemberName)(_Types_1.IrrigationSensorPolarity, this.moistureSensorPolarity);
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1251,38 +1305,58 @@ exports.IrrigationCCSystemConfigSet = IrrigationCCSystemConfigSet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemConfigSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], IrrigationCCSystemConfigSet);
-let IrrigationCCSystemConfigReport = class IrrigationCCSystemConfigReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 2);
-        this.masterValveDelay = this.payload[0];
+let IrrigationCCSystemConfigReport = IrrigationCCSystemConfigReport_1 = class IrrigationCCSystemConfigReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.masterValveDelay = options.masterValveDelay;
+        this.highPressureThreshold = options.highPressureThreshold;
+        this.lowPressureThreshold = options.lowPressureThreshold;
+        this.rainSensorPolarity = options.rainSensorPolarity;
+        this.moistureSensorPolarity = options.moistureSensorPolarity;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const masterValveDelay = raw.payload[0];
         let offset = 1;
+        let highPressureThreshold;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0 /* kPa */);
-            this.highPressureThreshold = value;
+            highPressureThreshold = value;
             offset += bytesRead;
         }
+        let lowPressureThreshold;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0 /* kPa */);
-            this.lowPressureThreshold = value;
+            lowPressureThreshold = value;
             offset += bytesRead;
         }
-        (0, safe_1.validatePayload)(this.payload.length >= offset + 1);
-        const polarity = this.payload[offset];
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + 1);
+        const polarity = raw.payload[offset];
+        let rainSensorPolarity;
+        let moistureSensorPolarity;
         if (!!(polarity & 0b1000_0000)) {
             // The valid bit is set
-            this.rainSensorPolarity = polarity & 0b1;
-            this.moistureSensorPolarity = (polarity & 0b10) >>> 1;
-        }
+            rainSensorPolarity = polarity & 0b1;
+            moistureSensorPolarity = (polarity & 0b10) >>> 1;
+        }
+        return new IrrigationCCSystemConfigReport_1({
+            nodeId: ctx.sourceNodeId,
+            masterValveDelay,
+            highPressureThreshold,
+            lowPressureThreshold,
+            rainSensorPolarity,
+            moistureSensorPolarity,
+        });
     }
     masterValveDelay;
     highPressureThreshold;
     lowPressureThreshold;
     rainSensorPolarity;
     moistureSensorPolarity;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "master valve delay": `${this.masterValveDelay} s`,
             "high pressure threshold": `${this.highPressureThreshold} kPa`,
@@ -1295,7 +1369,7 @@ let IrrigationCCSystemConfigReport = class IrrigationCCSystemConfigReport extend
             message["moisture sensor polarity"] = (0, safe_2.getEnumMemberName)(_Types_1.IrrigationSensorPolarity, this.moistureSensorPolarity);
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1316,7 +1390,7 @@ __decorate([
 __decorate([
     (0, CommandClassDecorators_1.ccValue)(exports.IrrigationCCValues.moistureSensorPolarity)
 ], IrrigationCCSystemConfigReport.prototype, "moistureSensorPolarity", void 0);
-exports.IrrigationCCSystemConfigReport = IrrigationCCSystemConfigReport = __decorate([
+exports.IrrigationCCSystemConfigReport = IrrigationCCSystemConfigReport = IrrigationCCSystemConfigReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemConfigReport)
 ], IrrigationCCSystemConfigReport);
 let IrrigationCCSystemConfigGet = class IrrigationCCSystemConfigGet extends IrrigationCC {
@@ -1326,26 +1400,54 @@ exports.IrrigationCCSystemConfigGet = IrrigationCCSystemConfigGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.SystemConfigGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCSystemConfigReport)
 ], IrrigationCCSystemConfigGet);
-let IrrigationCCValveInfoReport = class IrrigationCCValveInfoReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 4);
-        if ((this.payload[0] & 0b1) === _Types_1.ValveType.MasterValve) {
-            this.valveId = "master";
+let IrrigationCCValveInfoReport = IrrigationCCValveInfoReport_1 = class IrrigationCCValveInfoReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.valveId = options.valveId;
+        this.connected = options.connected;
+        this.nominalCurrent = options.nominalCurrent;
+        this.errorShortCircuit = options.errorShortCircuit;
+        this.errorHighCurrent = options.errorHighCurrent;
+        this.errorLowCurrent = options.errorLowCurrent;
+        this.errorMaximumFlow = options.errorMaximumFlow;
+        this.errorHighFlow = options.errorHighFlow;
+        this.errorLowFlow = options.errorLowFlow;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        let valveId;
+        if ((raw.payload[0] & 0b1) === _Types_1.ValveType.MasterValve) {
+            valveId = "master";
         }
         else {
-            this.valveId = this.payload[1];
-        }
-        this.connected = !!(this.payload[0] & 0b10);
-        this.nominalCurrent = 10 * this.payload[2];
-        this.errorShortCircuit = !!(this.payload[3] & 0b1);
-        this.errorHighCurrent = !!(this.payload[3] & 0b10);
-        this.errorLowCurrent = !!(this.payload[3] & 0b100);
-        if (this.valveId === "master") {
-            this.errorMaximumFlow = !!(this.payload[3] & 0b1000);
-            this.errorHighFlow = !!(this.payload[3] & 0b1_0000);
-            this.errorLowFlow = !!(this.payload[3] & 0b10_0000);
-        }
+            valveId = raw.payload[1];
+        }
+        const connected = !!(raw.payload[0] & 0b10);
+        const nominalCurrent = 10 * raw.payload[2];
+        const errorShortCircuit = !!(raw.payload[3] & 0b1);
+        const errorHighCurrent = !!(raw.payload[3] & 0b10);
+        const errorLowCurrent = !!(raw.payload[3] & 0b100);
+        let errorMaximumFlow;
+        let errorHighFlow;
+        let errorLowFlow;
+        if (valveId === "master") {
+            errorMaximumFlow = !!(raw.payload[3] & 0b1000);
+            errorHighFlow = !!(raw.payload[3] & 0b1_0000);
+            errorLowFlow = !!(raw.payload[3] & 0b10_0000);
+        }
+        return new IrrigationCCValveInfoReport_1({
+            nodeId: ctx.sourceNodeId,
+            valveId,
+            connected,
+            nominalCurrent,
+            errorShortCircuit,
+            errorHighCurrent,
+            errorLowCurrent,
+            errorMaximumFlow,
+            errorHighFlow,
+            errorLowFlow,
+        });
     }
     valveId;
     connected;
@@ -1356,47 +1458,47 @@ let IrrigationCCValveInfoReport = class IrrigationCCValveInfoReport extends Irri
     errorMaximumFlow;
     errorHighFlow;
     errorLowFlow;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // connected
         const valveConnectedValue = exports.IrrigationCCValues.valveConnected(this.valveId);
-        this.ensureMetadata(applHost, valveConnectedValue);
-        this.setValue(applHost, valveConnectedValue, this.connected);
+        this.ensureMetadata(ctx, valveConnectedValue);
+        this.setValue(ctx, valveConnectedValue, this.connected);
         // nominalCurrent
         const nominalCurrentValue = exports.IrrigationCCValues.nominalCurrent(this.valveId);
-        this.ensureMetadata(applHost, nominalCurrentValue);
-        this.setValue(applHost, nominalCurrentValue, this.nominalCurrent);
+        this.ensureMetadata(ctx, nominalCurrentValue);
+        this.setValue(ctx, nominalCurrentValue, this.nominalCurrent);
         // errorShortCircuit
         const errorShortCircuitValue = exports.IrrigationCCValues.errorShortCircuit(this.valveId);
-        this.ensureMetadata(applHost, errorShortCircuitValue);
-        this.setValue(applHost, errorShortCircuitValue, this.errorShortCircuit);
+        this.ensureMetadata(ctx, errorShortCircuitValue);
+        this.setValue(ctx, errorShortCircuitValue, this.errorShortCircuit);
         // errorHighCurrent
         const errorHighCurrentValue = exports.IrrigationCCValues.errorHighCurrent(this.valveId);
-        this.ensureMetadata(applHost, errorHighCurrentValue);
-        this.setValue(applHost, errorHighCurrentValue, this.errorHighCurrent);
+        this.ensureMetadata(ctx, errorHighCurrentValue);
+        this.setValue(ctx, errorHighCurrentValue, this.errorHighCurrent);
         // errorLowCurrent
         const errorLowCurrentValue = exports.IrrigationCCValues.errorLowCurrent(this.valveId);
-        this.ensureMetadata(applHost, errorLowCurrentValue);
-        this.setValue(applHost, errorLowCurrentValue, this.errorLowCurrent);
+        this.ensureMetadata(ctx, errorLowCurrentValue);
+        this.setValue(ctx, errorLowCurrentValue, this.errorLowCurrent);
         if (this.errorMaximumFlow != undefined) {
             const errorMaximumFlowValue = exports.IrrigationCCValues.errorMaximumFlow(this.valveId);
-            this.ensureMetadata(applHost, errorMaximumFlowValue);
-            this.setValue(applHost, errorMaximumFlowValue, this.errorMaximumFlow);
+            this.ensureMetadata(ctx, errorMaximumFlowValue);
+            this.setValue(ctx, errorMaximumFlowValue, this.errorMaximumFlow);
         }
         if (this.errorHighFlow != undefined) {
             const errorHighFlowValue = exports.IrrigationCCValues.errorHighFlow(this.valveId);
-            this.ensureMetadata(applHost, errorHighFlowValue);
-            this.setValue(applHost, errorHighFlowValue, this.errorHighFlow);
+            this.ensureMetadata(ctx, errorHighFlowValue);
+            this.setValue(ctx, errorHighFlowValue, this.errorHighFlow);
         }
         if (this.errorLowFlow != undefined) {
             const errorLowFlowValue = exports.IrrigationCCValues.errorLowFlow(this.valveId);
-            this.ensureMetadata(applHost, errorLowFlowValue);
-            this.setValue(applHost, errorLowFlowValue, this.errorLowFlow);
+            this.ensureMetadata(ctx, errorLowFlowValue);
+            this.setValue(ctx, errorLowFlowValue, this.errorLowFlow);
         }
         return true;
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "valve ID": this.valveId,
             connected: this.connected,
@@ -1414,40 +1516,41 @@ let IrrigationCCValveInfoReport = class IrrigationCCValveInfoReport extends Irri
             message.errors = errors.map((e) => `\n· ${e}`).join("");
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.IrrigationCCValveInfoReport = IrrigationCCValveInfoReport;
-exports.IrrigationCCValveInfoReport = IrrigationCCValveInfoReport = __decorate([
+exports.IrrigationCCValveInfoReport = IrrigationCCValveInfoReport = IrrigationCCValveInfoReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.ValveInfoReport)
 ], IrrigationCCValveInfoReport);
 function testResponseForIrrigationCommandWithValveId(sent, received) {
     return received.valveId === sent.valveId;
 }
 let IrrigationCCValveInfoGet = class IrrigationCCValveInfoGet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.valveId = options.valveId;
-        }
+    constructor(options) {
+        super(options);
+        this.valveId = options.valveId;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveInfoGet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     valveId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([
             this.valveId === "master" ? 1 : 0,
             this.valveId === "master" ? 1 : this.valveId || 1,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "valve ID": this.valveId,
             },
@@ -1460,24 +1563,23 @@ exports.IrrigationCCValveInfoGet = IrrigationCCValveInfoGet = __decorate([
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCValveInfoReport, testResponseForIrrigationCommandWithValveId)
 ], IrrigationCCValveInfoGet);
 let IrrigationCCValveConfigSet = class IrrigationCCValveConfigSet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.valveId = options.valveId;
-            this.nominalCurrentHighThreshold =
-                options.nominalCurrentHighThreshold;
-            this.nominalCurrentLowThreshold =
-                options.nominalCurrentLowThreshold;
-            this.maximumFlow = options.maximumFlow;
-            this.highFlowThreshold = options.highFlowThreshold;
-            this.lowFlowThreshold = options.lowFlowThreshold;
-            this.useRainSensor = options.useRainSensor;
-            this.useMoistureSensor = options.useMoistureSensor;
-        }
+    constructor(options) {
+        super(options);
+        this.valveId = options.valveId;
+        this.nominalCurrentHighThreshold = options.nominalCurrentHighThreshold;
+        this.nominalCurrentLowThreshold = options.nominalCurrentLowThreshold;
+        this.maximumFlow = options.maximumFlow;
+        this.highFlowThreshold = options.highFlowThreshold;
+        this.lowFlowThreshold = options.lowFlowThreshold;
+        this.useRainSensor = options.useRainSensor;
+        this.useMoistureSensor = options.useMoistureSensor;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveConfigSet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     valveId;
     nominalCurrentHighThreshold;
@@ -1487,7 +1589,7 @@ let IrrigationCCValveConfigSet = class IrrigationCCValveConfigSet extends Irriga
     lowFlowThreshold;
     useRainSensor;
     useMoistureSensor;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([
                 this.valveId === "master" ? 1 : 0,
@@ -1503,11 +1605,11 @@ let IrrigationCCValveConfigSet = class IrrigationCCValveConfigSet extends Irriga
                     | (this.useMoistureSensor ? 0b10 : 0),
             ]),
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "valve ID": this.valveId,
                 "nominal current high threshold": `${this.nominalCurrentHighThreshold} mA`,
@@ -1526,74 +1628,100 @@ exports.IrrigationCCValveConfigSet = IrrigationCCValveConfigSet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.ValveConfigSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], IrrigationCCValveConfigSet);
-let IrrigationCCValveConfigReport = class IrrigationCCValveConfigReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 4);
-        if ((this.payload[0] & 0b1) === _Types_1.ValveType.MasterValve) {
-            this.valveId = "master";
+let IrrigationCCValveConfigReport = IrrigationCCValveConfigReport_1 = class IrrigationCCValveConfigReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.valveId = options.valveId;
+        this.nominalCurrentHighThreshold = options.nominalCurrentHighThreshold;
+        this.nominalCurrentLowThreshold = options.nominalCurrentLowThreshold;
+        this.maximumFlow = options.maximumFlow;
+        this.highFlowThreshold = options.highFlowThreshold;
+        this.lowFlowThreshold = options.lowFlowThreshold;
+        this.useRainSensor = options.useRainSensor;
+        this.useMoistureSensor = options.useMoistureSensor;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        let valveId;
+        if ((raw.payload[0] & 0b1) === _Types_1.ValveType.MasterValve) {
+            valveId = "master";
         }
         else {
-            this.valveId = this.payload[1];
+            valveId = raw.payload[1];
         }
-        this.nominalCurrentHighThreshold = 10 * this.payload[2];
-        this.nominalCurrentLowThreshold = 10 * this.payload[3];
+        const nominalCurrentHighThreshold = 10 * raw.payload[2];
+        const nominalCurrentLowThreshold = 10 * raw.payload[3];
         let offset = 4;
+        let maximumFlow;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0 /* l/h */);
-            this.maximumFlow = value;
+            maximumFlow = value;
             offset += bytesRead;
         }
+        let highFlowThreshold;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0 /* l/h */);
-            this.highFlowThreshold = value;
+            highFlowThreshold = value;
             offset += bytesRead;
         }
+        let lowFlowThreshold;
         {
-            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(offset));
+            const { value, scale, bytesRead } = (0, safe_1.parseFloatWithScale)(raw.payload.subarray(offset));
             (0, safe_1.validatePayload)(scale === 0 /* l/h */);
-            this.lowFlowThreshold = value;
+            lowFlowThreshold = value;
             offset += bytesRead;
         }
-        (0, safe_1.validatePayload)(this.payload.length >= offset + 1);
-        this.useRainSensor = !!(this.payload[offset] & 0b1);
-        this.useMoistureSensor = !!(this.payload[offset] & 0b10);
+        (0, safe_1.validatePayload)(raw.payload.length >= offset + 1);
+        const useRainSensor = !!(raw.payload[offset] & 0b1);
+        const useMoistureSensor = !!(raw.payload[offset] & 0b10);
+        return new IrrigationCCValveConfigReport_1({
+            nodeId: ctx.sourceNodeId,
+            valveId,
+            nominalCurrentHighThreshold,
+            nominalCurrentLowThreshold,
+            maximumFlow,
+            highFlowThreshold,
+            lowFlowThreshold,
+            useRainSensor,
+            useMoistureSensor,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // nominalCurrentHighThreshold
         const nominalCurrentHighThresholdValue = exports.IrrigationCCValues
             .nominalCurrentHighThreshold(this.valveId);
-        this.ensureMetadata(applHost, nominalCurrentHighThresholdValue);
-        this.setValue(applHost, nominalCurrentHighThresholdValue, this.nominalCurrentHighThreshold);
+        this.ensureMetadata(ctx, nominalCurrentHighThresholdValue);
+        this.setValue(ctx, nominalCurrentHighThresholdValue, this.nominalCurrentHighThreshold);
         // nominalCurrentLowThreshold
         const nominalCurrentLowThresholdValue = exports.IrrigationCCValues
             .nominalCurrentLowThreshold(this.valveId);
-        this.ensureMetadata(applHost, nominalCurrentLowThresholdValue);
-        this.setValue(applHost, nominalCurrentLowThresholdValue, this.nominalCurrentLowThreshold);
+        this.ensureMetadata(ctx, nominalCurrentLowThresholdValue);
+        this.setValue(ctx, nominalCurrentLowThresholdValue, this.nominalCurrentLowThreshold);
         // maximumFlow
         const maximumFlowValue = exports.IrrigationCCValues.maximumFlow(this.valveId);
-        this.ensureMetadata(applHost, maximumFlowValue);
-        this.setValue(applHost, maximumFlowValue, this.maximumFlow);
+        this.ensureMetadata(ctx, maximumFlowValue);
+        this.setValue(ctx, maximumFlowValue, this.maximumFlow);
         // highFlowThreshold
         const highFlowThresholdValue = exports.IrrigationCCValues.highFlowThreshold(this.valveId);
-        this.ensureMetadata(applHost, highFlowThresholdValue);
-        this.setValue(applHost, highFlowThresholdValue, this.highFlowThreshold);
+        this.ensureMetadata(ctx, highFlowThresholdValue);
+        this.setValue(ctx, highFlowThresholdValue, this.highFlowThreshold);
         // lowFlowThreshold
         const lowFlowThresholdValue = exports.IrrigationCCValues.lowFlowThreshold(this.valveId);
-        this.ensureMetadata(applHost, lowFlowThresholdValue);
-        this.setValue(applHost, lowFlowThresholdValue, this.lowFlowThreshold);
+        this.ensureMetadata(ctx, lowFlowThresholdValue);
+        this.setValue(ctx, lowFlowThresholdValue, this.lowFlowThreshold);
         // useRainSensor
         const useRainSensorValue = exports.IrrigationCCValues.useRainSensor(this.valveId);
-        this.ensureMetadata(applHost, useRainSensorValue);
-        this.setValue(applHost, useRainSensorValue, this.useRainSensor);
+        this.ensureMetadata(ctx, useRainSensorValue);
+        this.setValue(ctx, useRainSensorValue, this.useRainSensor);
         // useMoistureSensor
         const useMoistureSensorValue = exports.IrrigationCCValues.useMoistureSensor(this.valveId);
-        this.ensureMetadata(applHost, useMoistureSensorValue);
-        this.setValue(applHost, useMoistureSensorValue, this.useMoistureSensor);
+        this.ensureMetadata(ctx, useMoistureSensorValue);
+        this.setValue(ctx, useMoistureSensorValue, this.useMoistureSensor);
         return true;
     }
     valveId;
@@ -1604,9 +1732,9 @@ let IrrigationCCValveConfigReport = class IrrigationCCValveConfigReport extends
     lowFlowThreshold;
     useRainSensor;
     useMoistureSensor;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "valve ID": this.valveId,
                 "nominal current high threshold": `${this.nominalCurrentHighThreshold} mA`,
@@ -1621,31 +1749,32 @@ let IrrigationCCValveConfigReport = class IrrigationCCValveConfigReport extends
     }
 };
 exports.IrrigationCCValveConfigReport = IrrigationCCValveConfigReport;
-exports.IrrigationCCValveConfigReport = IrrigationCCValveConfigReport = __decorate([
+exports.IrrigationCCValveConfigReport = IrrigationCCValveConfigReport = IrrigationCCValveConfigReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.ValveConfigReport)
 ], IrrigationCCValveConfigReport);
 let IrrigationCCValveConfigGet = class IrrigationCCValveConfigGet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.valveId = options.valveId;
-        }
+    constructor(options) {
+        super(options);
+        this.valveId = options.valveId;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveConfigGet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     valveId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([
             this.valveId === "master" ? 1 : 0,
             this.valveId === "master" ? 1 : this.valveId || 1,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "valve ID": this.valveId,
             },
@@ -1658,20 +1787,21 @@ exports.IrrigationCCValveConfigGet = IrrigationCCValveConfigGet = __decorate([
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCValveConfigReport, testResponseForIrrigationCommandWithValveId)
 ], IrrigationCCValveConfigGet);
 let IrrigationCCValveRun = class IrrigationCCValveRun extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.valveId = options.valveId;
-            this.duration = options.duration;
-        }
+    constructor(options) {
+        super(options);
+        this.valveId = options.valveId;
+        this.duration = options.duration;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveRun({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     valveId;
     duration;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([
             this.valveId === "master" ? 1 : 0,
             this.valveId === "master" ? 1 : this.valveId || 1,
@@ -1679,9 +1809,9 @@ let IrrigationCCValveRun = class IrrigationCCValveRun extends IrrigationCC {
             0,
         ]);
         this.payload.writeUInt16BE(this.duration, 2);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "valve ID": this.valveId,
         };
@@ -1692,7 +1822,7 @@ let IrrigationCCValveRun = class IrrigationCCValveRun extends IrrigationCC {
             message.action = "turn off";
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1703,20 +1833,21 @@ exports.IrrigationCCValveRun = IrrigationCCValveRun = __decorate([
     (0, CommandClassDecorators_1.useSupervision)()
 ], IrrigationCCValveRun);
 let IrrigationCCValveTableSet = class IrrigationCCValveTableSet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.tableId = options.tableId;
-            this.entries = options.entries;
-        }
+    constructor(options) {
+        super(options);
+        this.tableId = options.tableId;
+        this.entries = options.entries;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveTableSet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     tableId;
     entries;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(1 + this.entries.length * 3);
         this.payload[0] = this.tableId;
         for (let i = 0; i < this.entries.length; i++) {
@@ -1725,9 +1856,9 @@ let IrrigationCCValveTableSet = class IrrigationCCValveTableSet extends Irrigati
             this.payload[offset] = entry.valveId;
             this.payload.writeUInt16BE(entry.duration, offset + 1);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "table ID": this.tableId,
         };
@@ -1742,7 +1873,7 @@ let IrrigationCCValveTableSet = class IrrigationCCValveTableSet extends Irrigati
             }
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1752,22 +1883,32 @@ exports.IrrigationCCValveTableSet = IrrigationCCValveTableSet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.ValveTableSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], IrrigationCCValveTableSet);
-let IrrigationCCValveTableReport = class IrrigationCCValveTableReport extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        (0, safe_1.validatePayload)((this.payload.length - 1) % 3 === 0);
-        this.tableId = this.payload[0];
-        this.entries = [];
-        for (let offset = 1; offset < this.payload.length; offset += 3) {
-            this.entries.push({
-                valveId: this.payload[offset],
-                duration: this.payload.readUInt16BE(offset + 1),
+let IrrigationCCValveTableReport = IrrigationCCValveTableReport_1 = class IrrigationCCValveTableReport extends IrrigationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.tableId = options.tableId;
+        this.entries = options.entries;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)((raw.payload.length - 1) % 3 === 0);
+        const tableId = raw.payload[0];
+        const entries = [];
+        for (let offset = 1; offset < raw.payload.length; offset += 3) {
+            entries.push({
+                valveId: raw.payload[offset],
+                duration: raw.payload.readUInt16BE(offset + 1),
             });
         }
+        return new IrrigationCCValveTableReport_1({
+            nodeId: ctx.sourceNodeId,
+            tableId,
+            entries,
+        });
     }
     tableId;
     entries;
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "table ID": this.tableId,
         };
@@ -1782,37 +1923,38 @@ let IrrigationCCValveTableReport = class IrrigationCCValveTableReport extends Ir
             }
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.IrrigationCCValveTableReport = IrrigationCCValveTableReport;
-exports.IrrigationCCValveTableReport = IrrigationCCValveTableReport = __decorate([
+exports.IrrigationCCValveTableReport = IrrigationCCValveTableReport = IrrigationCCValveTableReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IrrigationCommand.ValveTableReport)
 ], IrrigationCCValveTableReport);
 function testResponseForIrrigationValveTableGet(sent, received) {
     return received.tableId === sent.tableId;
 }
 let IrrigationCCValveTableGet = class IrrigationCCValveTableGet extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.tableId = options.tableId;
-        }
+    constructor(options) {
+        super(options);
+        this.tableId = options.tableId;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveTableGet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     tableId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.tableId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "table ID": this.tableId,
             },
@@ -1825,27 +1967,28 @@ exports.IrrigationCCValveTableGet = IrrigationCCValveTableGet = __decorate([
     (0, CommandClassDecorators_1.expectedCCResponse)(IrrigationCCValveTableReport, testResponseForIrrigationValveTableGet)
 ], IrrigationCCValveTableGet);
 let IrrigationCCValveTableRun = class IrrigationCCValveTableRun extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.tableIDs = options.tableIDs;
-            if (this.tableIDs.length < 1) {
-                throw new safe_1.ZWaveError(`${this.constructor.name}: At least one table ID must be specified.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-            }
+    constructor(options) {
+        super(options);
+        this.tableIDs = options.tableIDs;
+        if (this.tableIDs.length < 1) {
+            throw new safe_1.ZWaveError(`${this.constructor.name}: At least one table ID must be specified.`, safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
     }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCValveTableRun({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
+    }
     tableIDs;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from(this.tableIDs);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "table IDs": this.tableIDs
                     .map((id) => (0, strings_1.padStart)(id.toString(), 3, "0"))
@@ -1860,24 +2003,25 @@ exports.IrrigationCCValveTableRun = IrrigationCCValveTableRun = __decorate([
     (0, CommandClassDecorators_1.useSupervision)()
 ], IrrigationCCValveTableRun);
 let IrrigationCCSystemShutoff = class IrrigationCCSystemShutoff extends IrrigationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
-        }
-        else {
-            this.duration = options.duration;
-        }
+    constructor(options) {
+        super(options);
+        this.duration = options.duration;
+    }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new IrrigationCCSystemShutoff({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
     }
     duration;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.duration ?? 255]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 duration: this.duration === 0
                     ? "temporarily"