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

package/build/cc/ConfigurationCC.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 ConfigurationCCReport_1, ConfigurationCCGet_1, ConfigurationCCSet_1, ConfigurationCCBulkReport_1, ConfigurationCCNameReport_1, ConfigurationCCNameGet_1, ConfigurationCCInfoReport_1, ConfigurationCCInfoGet_1, ConfigurationCCPropertiesReport_1, ConfigurationCCPropertiesGet_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationCCDefaultReset = exports.ConfigurationCCPropertiesGet = exports.ConfigurationCCPropertiesReport = exports.ConfigurationCCInfoGet = exports.ConfigurationCCInfoReport = exports.ConfigurationCCNameGet = exports.ConfigurationCCNameReport = exports.ConfigurationCCBulkGet = exports.ConfigurationCCBulkReport = exports.ConfigurationCCBulkSet = exports.ConfigurationCCSet = exports.ConfigurationCCGet = exports.ConfigurationCCReport = exports.ConfigurationCC = exports.ConfigurationCCAPI = exports.ConfigurationCCValues = exports.ConfigurationCCError = void 0;
 function __assertType(argName, typeName, boundHasError) {
@@ -445,14 +446,14 @@ exports.ConfigurationCCValues = Object.freeze({
         undefined),
     }),
 });
-function createConfigurationCCInstance(applHost, endpoint) {
-    return CommandClass_1.CommandClass.createInstanceUnchecked(applHost, endpoint.virtual ? endpoint.node.physicalNodes[0] : endpoint, ConfigurationCC);
+function createConfigurationCCInstance(endpoint) {
+    return CommandClass_1.CommandClass.createInstanceUnchecked(endpoint.virtual ? endpoint.node.physicalNodes[0] : endpoint, ConfigurationCC);
 }
-function normalizeConfigurationCCAPISetOptions(applHost, endpoint, options) {
+function normalizeConfigurationCCAPISetOptions(ctx, endpoint, options) {
     if ("bitMask" in options && options.bitMask) {
         // Variant 3: Partial param, look it up in the device config
-        const ccc = createConfigurationCCInstance(applHost, endpoint);
-        const paramInfo = ccc.getParamInformation(applHost, options.parameter, options.bitMask);
+        const ccc = createConfigurationCCInstance(endpoint);
+        const paramInfo = ccc.getParamInformation(ctx, options.parameter, options.bitMask);
         if (!paramInfo.isFromConfig) {
             throw new safe_1.ZWaveError("Setting a partial configuration parameter requires it to be defined in a device config file!", safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
@@ -475,8 +476,8 @@ function normalizeConfigurationCCAPISetOptions(applHost, endpoint, options) {
     }
     else {
         // Variant 1: Normal parameter, defined in a config file
-        const ccc = createConfigurationCCInstance(applHost, endpoint);
-        const paramInfo = ccc.getParamInformation(applHost, options.parameter, options.bitMask);
+        const ccc = createConfigurationCCInstance(endpoint);
+        const paramInfo = ccc.getParamInformation(ctx, options.parameter, options.bitMask);
         if (!paramInfo.isFromConfig) {
             throw new safe_1.ZWaveError("Setting a configuration parameter without specifying a value size and format requires it to be defined in a device config file!", safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
@@ -488,7 +489,7 @@ function normalizeConfigurationCCAPISetOptions(applHost, endpoint, options) {
         };
     }
 }
-function bulkMergePartialParamValues(applHost, endpoint, options) {
+function bulkMergePartialParamValues(ctx, endpoint, options) {
     // Merge partial parameters before doing anything else. Therefore, take the non-partials, ...
     const allParams = options.filter((o) => o.bitMask == undefined);
     // ... group the partials by parameter
@@ -501,11 +502,11 @@ function bulkMergePartialParamValues(applHost, endpoint, options) {
     }
     // and push the merged result into the array we'll be working with
     if (unmergedPartials.size) {
-        const ccc = createConfigurationCCInstance(applHost, endpoint);
+        const ccc = createConfigurationCCInstance(endpoint);
         for (const [parameter, partials] of unmergedPartials) {
             allParams.push({
                 parameter,
-                value: ccc.composePartialParamValues(applHost, parameter, partials.map((p) => ({
+                value: ccc.composePartialParamValues(ctx, parameter, partials.map((p) => ({
                     bitMask: p.bitMask,
                     partialValue: p.value,
                 }))),
@@ -530,8 +531,8 @@ function reInterpretSignedValue(value, valueSize, targetFormat) {
     serializeValue(raw, 0, valueSize, safe_1.ConfigValueFormat.SignedInteger, value);
     return parseValue(raw, valueSize, targetFormat);
 }
-function getParamInformationFromConfigFile(applHost, nodeId, endpointIndex) {
-    const deviceConfig = applHost.getDeviceConfig?.(nodeId);
+function getParamInformationFromConfigFile(ctx, nodeId, endpointIndex) {
+    const deviceConfig = ctx.getDeviceConfig?.(nodeId);
     if (endpointIndex === 0) {
         return (deviceConfig?.paramInformation
             ?? deviceConfig?.endpoints?.get(0)?.paramInformation);
@@ -571,9 +572,9 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
                 (0, API_1.throwWrongValueType)(this.ccId, property, "number", typeof value);
             }
             let ccInstance;
-            const applHost = this.applHost;
+            const applHost = this.host;
             if (this.isSinglecast()) {
-                ccInstance = createConfigurationCCInstance(this.applHost, this.endpoint);
+                ccInstance = createConfigurationCCInstance(this.endpoint);
             }
             else if (this.isMulticast()) {
                 // Multicast is only possible if the parameter definition is the same on all target nodes
@@ -584,7 +585,7 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
                     throw new safe_1.ZWaveError(`The multicast setValue API for Configuration CC requires all virtual target endpoints to support Configuration CC!`, safe_1.ZWaveErrorCodes.CC_Invalid);
                 }
                 // Figure out if all the relevant info is the same
-                const paramInfos = this.endpoint.node.physicalNodes.map((node) => createConfigurationCCInstance(this.applHost, node.getEndpoint(this.endpoint.index)).getParamInformation(this.applHost, property, propertyKey));
+                const paramInfos = this.endpoint.node.physicalNodes.map((node) => createConfigurationCCInstance(node.getEndpoint(this.endpoint.index)).getParamInformation(this.host, property, propertyKey));
                 if (!paramInfos.length
                     || !paramInfos.every((info, index) => {
                         if (index === 0)
@@ -595,7 +596,7 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
                     throw new safe_1.ZWaveError(`The multicast setValue API for Configuration CC requires all virtual target nodes to have the same parameter definition!`, safe_1.ZWaveErrorCodes.CC_Invalid);
                 }
                 // If it is, just use the first node to create the CC instance
-                ccInstance = createConfigurationCCInstance(this.applHost, this.endpoint);
+                ccInstance = createConfigurationCCInstance(this.endpoint);
             }
             else {
                 throw new safe_1.ZWaveError(`The setValue API for Configuration CC is not supported via broadcast!`, safe_1.ZWaveErrorCodes.CC_NotSupported);
@@ -680,13 +681,13 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         }
         this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Get);
         const { valueBitMask, allowUnexpectedResponse } = options ?? {};
-        const cc = new ConfigurationCCGet(this.applHost, {
+        const cc = new ConfigurationCCGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             parameter,
             allowUnexpectedResponse,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (!response)
             return;
         // Nodes may respond with a different parameter, e.g. if we
@@ -695,10 +696,10 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             if (!valueBitMask)
                 return response.value;
             // If a partial parameter was requested, extract that value
-            const paramInfo = cc.getParamInformation(this.applHost, response.parameter, valueBitMask);
+            const paramInfo = cc.getParamInformation(this.host, response.parameter, valueBitMask);
             return (0, safe_1.parsePartial)(response.value, valueBitMask, isSignedPartial(valueBitMask, paramInfo.format));
         }
-        this.applHost.controllerLog.logNode(this.endpoint.nodeId, {
+        this.host.logNode(this.endpoint.nodeId, {
             endpoint: this.endpoint.index,
             message: `Received unexpected ConfigurationReport (param = ${response.parameter}, value = ${response.value.toString()})`,
             direction: "inbound",
@@ -719,12 +720,12 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         const distinctParameters = (0, arrays_1.distinct)(options.map((o) => o.parameter));
         if (this.supportsCommand(_Types_1.ConfigurationCommand.BulkGet)
             && (0, safe_1.isConsecutiveArray)(distinctParameters)) {
-            const cc = new ConfigurationCCBulkGet(this.applHost, {
+            const cc = new ConfigurationCCBulkGet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 parameters: distinctParameters,
             });
-            const response = await this.applHost.sendCommand(cc, this.commandOptions);
+            const response = await this.host.sendCommand(cc, this.commandOptions);
             if (response)
                 values = response.values;
         }
@@ -732,12 +733,12 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Get);
             const _values = new Map();
             for (const parameter of distinctParameters) {
-                const cc = new ConfigurationCCGet(this.applHost, {
+                const cc = new ConfigurationCCGet({
                     nodeId: this.endpoint.nodeId,
-                    endpoint: this.endpoint.index,
+                    endpointIndex: this.endpoint.index,
                     parameter,
                 });
-                const response = await this.applHost.sendCommand(cc, this.commandOptions);
+                const response = await this.host.sendCommand(cc, this.commandOptions);
                 if (response) {
                     _values.set(response.parameter, response.value);
                 }
@@ -745,11 +746,11 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             values = _values;
         }
         // Combine the returned values with the requested ones
-        const cc = createConfigurationCCInstance(this.applHost, this.endpoint);
+        const cc = createConfigurationCCInstance(this.endpoint);
         return options.map((o) => {
             let value = values?.get(o.parameter);
             if (typeof value === "number" && o.bitMask) {
-                const paramInfo = cc.getParamInformation(this.applHost, o.parameter, o.bitMask);
+                const paramInfo = cc.getParamInformation(this.host, o.parameter, o.bitMask);
                 value = (0, safe_1.parsePartial)(value, o.bitMask, isSignedPartial(o.bitMask, paramInfo.format));
             }
             return { ...o, value };
@@ -765,22 +766,22 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             return this.setBulk([options]);
         }
         this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Set);
-        const normalized = normalizeConfigurationCCAPISetOptions(this.applHost, this.endpoint, options);
+        const normalized = normalizeConfigurationCCAPISetOptions(this.host, this.endpoint, options);
         let value = normalized.value;
         if (normalized.bitMask) {
-            const ccc = createConfigurationCCInstance(this.applHost, this.endpoint);
-            value = ccc.composePartialParamValue(this.applHost, normalized.parameter, normalized.bitMask, normalized.value);
+            const ccc = createConfigurationCCInstance(this.endpoint);
+            value = ccc.composePartialParamValue(this.host, normalized.parameter, normalized.bitMask, normalized.value);
         }
-        const cc = new ConfigurationCCSet(this.applHost, {
+        const cc = new ConfigurationCCSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             resetToDefault: false,
             parameter: normalized.parameter,
             value,
             valueSize: normalized.valueSize,
             valueFormat: normalized.valueFormat,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /**
      * Sets new values for multiple config parameters of the device. Uses the `BulkSet` command if supported, otherwise falls back to individual `Set` commands.
@@ -788,9 +789,9 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
     async setBulk(values) {
         __assertType("values", undefined, __assertType__sa_su_si__4__5_ei_si__4__7_ei_si__4__9_ei_eu_ea_2.bind(void 0, values));
         // Normalize the values so we can better work with them
-        const normalized = values.map((v) => normalizeConfigurationCCAPISetOptions(this.applHost, this.endpoint, v));
+        const normalized = values.map((v) => normalizeConfigurationCCAPISetOptions(this.host, this.endpoint, v));
         // And merge multiple partials that belong the same "full" value
-        const allParams = bulkMergePartialParamValues(this.applHost, this.endpoint, normalized);
+        const allParams = bulkMergePartialParamValues(this.host, this.endpoint, normalized);
         const canUseBulkSet = this.supportsCommand(_Types_1.ConfigurationCommand.BulkSet)
             // For Bulk Set we need consecutive parameters
             && (0, safe_1.isConsecutiveArray)(allParams.map((v) => v.parameter))
@@ -799,9 +800,9 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             // and identical size
             && new Set(allParams.map((v) => v.valueSize)).size === 1;
         if (canUseBulkSet) {
-            const cc = new ConfigurationCCBulkSet(this.applHost, {
+            const cc = new ConfigurationCCBulkSet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 parameters: allParams.map((v) => v.parameter),
                 valueSize: allParams[0].valueSize,
                 valueFormat: allParams[0].valueFormat,
@@ -809,7 +810,7 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
                 handshake: true,
             });
             // The handshake flag is set, so we expect a BulkReport in response
-            const result = await this.applHost.sendCommand(cc, this.commandOptions);
+            const result = await this.host.sendCommand(cc, this.commandOptions);
             // If we did receive a response, we also received the updated parameters,
             // so if any one was not accepted, we know by looking at the values.
             // Translate the result into a SupervisionResult by comparing the values
@@ -832,15 +833,15 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
             this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Set);
             const supervisionResults = [];
             for (const { parameter, value, valueSize, valueFormat, } of allParams) {
-                const cc = new ConfigurationCCSet(this.applHost, {
+                const cc = new ConfigurationCCSet({
                     nodeId: this.endpoint.nodeId,
-                    endpoint: this.endpoint.index,
+                    endpointIndex: this.endpoint.index,
                     parameter,
                     value,
                     valueSize,
                     valueFormat,
                 });
-                supervisionResults.push(await this.applHost.sendCommand(cc, this.commandOptions));
+                supervisionResults.push(await this.host.sendCommand(cc, this.commandOptions));
             }
             return (0, safe_1.mergeSupervisionResults)(supervisionResults);
         }
@@ -856,14 +857,21 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         if (parameter > 255) {
             return this.resetBulk([parameter]);
         }
+        // According to SDS14223 this flag SHOULD NOT be set
+        // Because we don't want to test the behavior, we enforce that it MUST not be set
+        // on legacy nodes
+        if (this.version <= 3) {
+            throw new safe_1.ZWaveError(`Resetting configuration parameters to default MUST not be done on nodes implementing ConfigurationCC V3 or below!`, safe_1.ZWaveErrorCodes
+                .ConfigurationCC_NoResetToDefaultOnLegacyDevices);
+        }
         this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Set);
-        const cc = new ConfigurationCCSet(this.applHost, {
+        const cc = new ConfigurationCCSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             parameter,
             resetToDefault: true,
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     /**
      * Resets multiple configuration parameters to their default value. Uses BulkSet if supported, otherwise falls back to individual Set commands.
@@ -874,24 +882,24 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         __assertType("parameters", undefined, __assertType__sa__number_ea_2.bind(void 0, parameters));
         if ((0, safe_1.isConsecutiveArray)(parameters)
             && this.supportsCommand(_Types_1.ConfigurationCommand.BulkSet)) {
-            const cc = new ConfigurationCCBulkSet(this.applHost, {
+            const cc = new ConfigurationCCBulkSet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 parameters,
                 resetToDefault: true,
             });
-            return this.applHost.sendCommand(cc, this.commandOptions);
+            return this.host.sendCommand(cc, this.commandOptions);
         }
         else {
             this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.Set);
-            const CCs = (0, arrays_1.distinct)(parameters).map((parameter) => new ConfigurationCCSet(this.applHost, {
+            const CCs = (0, arrays_1.distinct)(parameters).map((parameter) => new ConfigurationCCSet({
                 nodeId: this.endpoint.nodeId,
-                endpoint: this.endpoint.index,
+                endpointIndex: this.endpoint.index,
                 parameter,
                 resetToDefault: true,
             }));
             for (const cc of CCs) {
-                await this.applHost.sendCommand(cc, this.commandOptions);
+                await this.host.sendCommand(cc, this.commandOptions);
             }
         }
     }
@@ -900,22 +908,22 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         // This is dangerous - don't allow resetting all parameters via multicast
         this.assertPhysicalEndpoint(this.endpoint);
         this.assertSupportsCommand(_Types_1.ConfigurationCommand, _Types_1.ConfigurationCommand.DefaultReset);
-        const cc = new ConfigurationCCDefaultReset(this.applHost, {
+        const cc = new ConfigurationCCDefaultReset({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
         });
-        await this.applHost.sendCommand(cc, this.commandOptions);
+        await this.host.sendCommand(cc, this.commandOptions);
     }
     async getProperties(parameter) {
         __assertType("parameter", "number", __assertType__number.bind(void 0, parameter));
         // Get-type commands are only possible in singlecast
         this.assertPhysicalEndpoint(this.endpoint);
-        const cc = new ConfigurationCCPropertiesGet(this.applHost, {
+        const cc = new ConfigurationCCPropertiesGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             parameter,
         });
-        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, [
                 "valueSize",
@@ -936,12 +944,12 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         __assertType("parameter", "number", __assertType__number.bind(void 0, parameter));
         // Get-type commands are only possible in singlecast
         this.assertPhysicalEndpoint(this.endpoint);
-        const cc = new ConfigurationCCNameGet(this.applHost, {
+        const cc = new ConfigurationCCNameGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             parameter,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.name;
     }
     /** Requests usage info for a configuration parameter from the node */
@@ -949,12 +957,12 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         __assertType("parameter", "number", __assertType__number.bind(void 0, parameter));
         // Get-type commands are only possible in singlecast
         this.assertPhysicalEndpoint(this.endpoint);
-        const cc = new ConfigurationCCInfoGet(this.applHost, {
+        const cc = new ConfigurationCCInfoGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             parameter,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.info;
     }
     /**
@@ -975,15 +983,15 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
         // Get-type commands are only possible in singlecast
         this.assertPhysicalEndpoint(this.endpoint);
         // TODO: Reduce the priority of the messages
-        this.applHost.controllerLog.logNode(this.endpoint.nodeId, {
+        this.host.logNode(this.endpoint.nodeId, {
             endpoint: this.endpoint.index,
             message: `Scanning available parameters...`,
         });
-        const ccInstance = createConfigurationCCInstance(this.applHost, this.endpoint);
+        const ccInstance = createConfigurationCCInstance(this.endpoint);
         for (let param = 1; param <= 255; param++) {
             // Check if the parameter is readable
             let originalValue;
-            this.applHost.controllerLog.logNode(this.endpoint.nodeId, {
+            this.host.logNode(this.endpoint.nodeId, {
                 endpoint: this.endpoint.index,
                 message: `  trying param ${param}...`,
                 direction: "outbound",
@@ -998,10 +1006,10 @@ let ConfigurationCCAPI = class ConfigurationCCAPI extends API_1.CCAPI {
                 if (originalValue != undefined) {
                     const logMessage = `  Param ${param}:
     readable  = true
-    valueSize = ${ccInstance.getParamInformation(this.applHost, param)
+    valueSize = ${ccInstance.getParamInformation(this.host, param)
                         .valueSize}
     value     = ${originalValue.toString()}`;
-                    this.applHost.controllerLog.logNode(this.endpoint.nodeId, {
+                    this.host.logNode(this.endpoint.nodeId, {
                         endpoint: this.endpoint.index,
                         message: logMessage,
                         direction: "inbound",
@@ -1027,30 +1035,30 @@ exports.ConfigurationCCAPI = ConfigurationCCAPI = __decorate([
     (0, CommandClassDecorators_1.API)(safe_1.CommandClasses.Configuration)
 ], ConfigurationCCAPI);
 let ConfigurationCC = class ConfigurationCC 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.Configuration, 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.Configuration, 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",
         });
-        const deviceConfig = applHost.getDeviceConfig?.(node.id);
-        const paramInfo = getParamInformationFromConfigFile(applHost, node.id, this.endpointIndex);
+        const deviceConfig = ctx.getDeviceConfig?.(node.id);
+        const paramInfo = getParamInformationFromConfigFile(ctx, node.id, this.endpointIndex);
         if (paramInfo) {
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: `${this.constructor.name}: Loading configuration parameters from device config`,
                 direction: "none",
             });
-            this.deserializeParamInformationFromConfig(applHost, paramInfo);
+            this.deserializeParamInformationFromConfig(ctx, paramInfo);
         }
         const documentedParamNumbers = new Set(Array.from(paramInfo?.keys() ?? []).map((k) => k.parameter));
-        if (this.version >= 3) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version >= 3) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "finding first configuration parameter...",
                 direction: "outbound",
@@ -1060,7 +1068,7 @@ let ConfigurationCC = class ConfigurationCC extends CommandClass_1.CommandClass
             if (param0props) {
                 param = param0props.nextParameter;
                 if (param === 0) {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `didn't report any config params, trying #1 just to be sure...`,
                         direction: "inbound",
@@ -1069,7 +1077,7 @@ let ConfigurationCC = class ConfigurationCC extends CommandClass_1.CommandClass
                 }
             }
             else {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: "Finding first configuration parameter timed out, skipping interview...",
                     level: "warn",
@@ -1077,7 +1085,7 @@ let ConfigurationCC = class ConfigurationCC extends CommandClass_1.CommandClass
                 return;
             }
             while (param > 0) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: `querying parameter #${param} information...`,
                     direction: "outbound",
@@ -1087,7 +1095,7 @@ let ConfigurationCC = class ConfigurationCC extends CommandClass_1.CommandClass
                 // If querying the properties fails, don't abort the entire interview
                 () => undefined);
                 if (!props) {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `Querying parameter #${param} information timed out, skipping scan...`,
                         level: "warn",
@@ -1134,7 +1142,7 @@ is advanced (UI):    ${!!properties.isAdvanced}
 has bulk support:    ${!properties.noBulkSupport}
 alters capabilities: ${!!properties.altersCapabilities}`;
                 }
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: logMessage,
                     direction: "inbound",
@@ -1150,19 +1158,19 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                 }
             }
         }
-        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.Configuration, 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.Configuration, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        if (this.version < 3) {
+        if (api.version < 3) {
             // V1/V2: Query all values defined in the config file
-            const paramInfo = getParamInformationFromConfigFile(applHost, node.id, this.endpointIndex);
+            const paramInfo = getParamInformationFromConfigFile(ctx, node.id, this.endpointIndex);
             if (paramInfo?.size) {
                 // Because partial params share the same parameter number,
                 // we need to remember which ones we have already queried.
@@ -1176,7 +1184,7 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                         continue;
                     alreadyQueried.add(param.parameter);
                     // Query the current value
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `querying parameter #${param.parameter} value...`,
                         direction: "outbound",
@@ -1184,14 +1192,14 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                     // ... at least try to
                     const paramValue = await api.get(param.parameter);
                     if (typeof paramValue === "number") {
-                        applHost.controllerLog.logNode(node.id, {
+                        ctx.logNode(node.id, {
                             endpoint: this.endpointIndex,
                             message: `parameter #${param.parameter} has value: ${paramValue}`,
                             direction: "inbound",
                         });
                     }
                     else if (!paramValue) {
-                        applHost.controllerLog.logNode(node.id, {
+                        ctx.logNode(node.id, {
                             endpoint: this.endpointIndex,
                             message: `received no value for parameter #${param.parameter}`,
                             direction: "inbound",
@@ -1201,7 +1209,7 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                 }
             }
             else {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: `${this.constructor.name}: skipping interview because CC version is < 3 and there is no config file`,
                     direction: "none",
@@ -1210,12 +1218,12 @@ alters capabilities: ${!!properties.altersCapabilities}`;
         }
         else {
             // V3+: Query the values of discovered parameters
-            const parameters = (0, arrays_1.distinct)(this.getDefinedValueIDs(applHost)
+            const parameters = (0, arrays_1.distinct)(this.getDefinedValueIDs(ctx)
                 .map((v) => v.property)
                 .filter((p) => typeof p === "number"));
             for (const param of parameters) {
-                if (this.getParamInformation(applHost, param).readable !== false) {
-                    applHost.controllerLog.logNode(node.id, {
+                if (this.getParamInformation(ctx, param).readable !== false) {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `querying parameter #${param} value...`,
                         direction: "outbound",
@@ -1223,7 +1231,7 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                     await api.get(param);
                 }
                 else {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: `not querying parameter #${param} value, because it is writeonly`,
                         direction: "none",
@@ -1236,11 +1244,11 @@ alters capabilities: ${!!properties.altersCapabilities}`;
      * Whether this node's param information was loaded from a config file.
      * If this is true, we don't trust what the node reports
      */
-    paramExistsInConfigFile(applHost, parameter, valueBitMask) {
-        if (this.getValue(applHost, exports.ConfigurationCCValues.isParamInformationFromConfig) !== true) {
+    paramExistsInConfigFile(ctx, parameter, valueBitMask) {
+        if (this.getValue(ctx, exports.ConfigurationCCValues.isParamInformationFromConfig) !== true) {
             return false;
         }
-        const paramInformation = getParamInformationFromConfigFile(applHost, this.nodeId, this.endpointIndex);
+        const paramInformation = getParamInformationFromConfigFile(ctx, this.nodeId, this.endpointIndex);
         if (!paramInformation)
             return false;
         // Check if the param is defined in the config file, either as a normal param or a partial
@@ -1260,25 +1268,25 @@ alters capabilities: ${!!properties.altersCapabilities}`;
      * @internal
      * Stores config parameter metadata for this CC's node
      */
-    extendParamInformation(applHost, parameter, valueBitMask, info) {
+    extendParamInformation(ctx, parameter, valueBitMask, info) {
         // Don't trust param information that a node reports if we have already loaded it from a config file
         if (valueBitMask === undefined
-            && this.paramExistsInConfigFile(applHost, parameter)) {
+            && this.paramExistsInConfigFile(ctx, parameter)) {
             return;
         }
         // Retrieve the base metadata
-        const metadata = this.getParamInformation(applHost, parameter, valueBitMask);
+        const metadata = this.getParamInformation(ctx, parameter, valueBitMask);
         // Override it with new data
         Object.assign(metadata, info);
         // And store it back
-        this.setMetadata(applHost, exports.ConfigurationCCValues.paramInformation(parameter, valueBitMask), metadata);
+        this.setMetadata(ctx, exports.ConfigurationCCValues.paramInformation(parameter, valueBitMask), metadata);
     }
     /**
      * @internal
      * Returns stored config parameter metadata for this CC's node
      */
-    getParamInformation(applHost, parameter, valueBitMask) {
-        return (this.getMetadata(applHost, exports.ConfigurationCCValues.paramInformation(parameter, valueBitMask)) ?? {
+    getParamInformation(ctx, parameter, valueBitMask) {
+        return (this.getMetadata(ctx, exports.ConfigurationCCValues.paramInformation(parameter, valueBitMask)) ?? {
             ...safe_1.ValueMetadata.Any,
         });
     }
@@ -1286,20 +1294,20 @@ alters capabilities: ${!!properties.altersCapabilities}`;
      * **INTERNAL:** Returns the param info that was queried for this node. This returns the information that was returned by the node
      * and does not include partial parameters.
      */
-    getQueriedParamInfos(applHost) {
-        const parameters = (0, arrays_1.distinct)(this.getDefinedValueIDs(applHost)
+    getQueriedParamInfos(ctx) {
+        const parameters = (0, arrays_1.distinct)(this.getDefinedValueIDs(ctx)
             .map((v) => v.property)
             .filter((p) => typeof p === "number"));
         return (0, objects_1.composeObject)(parameters.map((p) => [
             p,
-            this.getParamInformation(applHost, p),
+            this.getParamInformation(ctx, p),
         ]));
     }
     /**
      * Returns stored config parameter metadata for all partial config params addressed with the given parameter number
      */
-    getPartialParamInfos(applHost, parameter) {
-        const valueDB = this.getValueDB(applHost);
+    getPartialParamInfos(ctx, parameter) {
+        const valueDB = this.getValueDB(ctx);
         return valueDB.findMetadata((id) => id.commandClass === this.ccId
             && (id.endpoint ?? 0) === this.endpointIndex
             && id.property === parameter
@@ -1308,16 +1316,16 @@ alters capabilities: ${!!properties.altersCapabilities}`;
     /**
      * Computes the full value of a parameter after applying a partial param value
      */
-    composePartialParamValue(applHost, parameter, bitMask, partialValue) {
-        return this.composePartialParamValues(applHost, parameter, [
+    composePartialParamValue(ctx, parameter, bitMask, partialValue) {
+        return this.composePartialParamValues(ctx, parameter, [
             { bitMask, partialValue },
         ]);
     }
     /**
      * Computes the full value of a parameter after applying multiple partial param values
      */
-    composePartialParamValues(applHost, parameter, partials) {
-        const valueDB = this.getValueDB(applHost);
+    composePartialParamValues(ctx, parameter, partials) {
+        const valueDB = this.getValueDB(ctx);
         // Add the other values together
         const otherValues = valueDB.findValues((id) => id.commandClass === this.ccId
             && (id.endpoint ?? 0) === this.endpointIndex
@@ -1334,8 +1342,8 @@ alters capabilities: ${!!properties.altersCapabilities}`;
         return ret;
     }
     /** Deserializes the config parameter info from a config file */
-    deserializeParamInformationFromConfig(applHost, config) {
-        const valueDB = this.getValueDB(applHost);
+    deserializeParamInformationFromConfig(ctx, config) {
+        const valueDB = this.getValueDB(ctx);
         // Clear old param information
         for (const meta of valueDB.getAllMetadata(this.ccId)) {
             if (typeof meta.property === "number"
@@ -1347,7 +1355,7 @@ alters capabilities: ${!!properties.altersCapabilities}`;
             }
         }
         // Allow overwriting the param info (mark it as unloaded)
-        this.setValue(applHost, exports.ConfigurationCCValues.isParamInformationFromConfig, false);
+        this.setValue(ctx, exports.ConfigurationCCValues.isParamInformationFromConfig, false);
         for (const [param, info] of config.entries()) {
             // We need to make the config information compatible with the
             // format that ConfigurationCC reports
@@ -1375,25 +1383,25 @@ alters capabilities: ${!!properties.altersCapabilities}`;
                 description: info.description,
                 isFromConfig: true,
             });
-            this.extendParamInformation(applHost, param.parameter, param.valueBitMask, paramInfo);
+            this.extendParamInformation(ctx, param.parameter, param.valueBitMask, paramInfo);
         }
         // Remember that we loaded the param information from a config file
-        this.setValue(applHost, exports.ConfigurationCCValues.isParamInformationFromConfig, true);
+        this.setValue(ctx, exports.ConfigurationCCValues.isParamInformationFromConfig, true);
     }
-    translatePropertyKey(applHost, property, propertyKey) {
+    translatePropertyKey(ctx, property, propertyKey) {
         if (typeof property === "number"
             && (propertyKey == undefined || typeof propertyKey === "number")) {
             // This CC names all configuration parameters differently,
             // so no name for the property key is required
             return undefined;
         }
-        return super.translateProperty(applHost, property, propertyKey);
+        return super.translateProperty(ctx, property, propertyKey);
     }
-    translateProperty(applHost, property, propertyKey) {
+    translateProperty(ctx, property, propertyKey) {
         // Try to retrieve the configured param label
         if (typeof property === "number"
             && (propertyKey == undefined || typeof propertyKey === "number")) {
-            const paramInfo = this.getParamInformation(applHost, property, propertyKey);
+            const paramInfo = this.getParamInformation(ctx, property, propertyKey);
             if (paramInfo.label)
                 return paramInfo.label;
             // fall back to paramXYZ[_key] if none is defined
@@ -1403,7 +1411,7 @@ alters capabilities: ${!!properties.altersCapabilities}`;
             }
             return ret;
         }
-        return super.translateProperty(applHost, property, propertyKey);
+        return super.translateProperty(ctx, property, propertyKey);
     }
 };
 exports.ConfigurationCC = ConfigurationCC;
@@ -1412,38 +1420,43 @@ exports.ConfigurationCC = ConfigurationCC = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(4),
     (0, CommandClassDecorators_1.ccValues)(exports.ConfigurationCCValues)
 ], ConfigurationCC);
-let ConfigurationCCReport = class ConfigurationCCReport extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // All fields must be present
-            (0, safe_1.validatePayload)(this.payload.length > 2);
-            this.parameter = this.payload[0];
-            this.valueSize = this.payload[1] & 0b111;
-            // Ensure we received a valid report
-            (0, safe_1.validatePayload)(this.valueSize >= 1, this.valueSize <= 4, this.payload.length >= 2 + this.valueSize);
-            // Default to parsing the value as SignedInteger, like the specs say.
-            // We try to re-interpret the value in persistValues()
-            this.value = parseValue(this.payload.subarray(2), this.valueSize, safe_1.ConfigValueFormat.SignedInteger);
-        }
-        else {
-            this.parameter = options.parameter;
-            this.value = options.value;
-            this.valueSize = options.valueSize;
-            this.valueFormat = options.valueFormat;
-        }
+let ConfigurationCCReport = ConfigurationCCReport_1 = class ConfigurationCCReport extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.value = options.value;
+        this.valueSize = options.valueSize;
+        this.valueFormat = options.valueFormat;
+    }
+    static from(raw, ctx) {
+        // All fields must be present
+        (0, safe_1.validatePayload)(raw.payload.length > 2);
+        const parameter = raw.payload[0];
+        const valueSize = raw.payload[1] & 0b111;
+        // Ensure we received a valid report
+        (0, safe_1.validatePayload)(valueSize >= 1, valueSize <= 4, raw.payload.length >= 2 + valueSize);
+        // Default to parsing the value as SignedInteger, like the specs say.
+        // We try to re-interpret the value in persistValues()
+        const value = parseValue(raw.payload.subarray(2), valueSize, safe_1.ConfigValueFormat.SignedInteger);
+        return new ConfigurationCCReport_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+            valueSize,
+            value,
+        });
     }
     parameter;
     value;
     valueSize;
     valueFormat; // only used for serialization
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
+        const ccVersion = (0, CommandClass_1.getEffectiveCCVersion)(ctx, this);
         // This parameter may be a partial param in the following cases:
         // * a config file defines it as such
         // * it was reported by the device as a bit field
-        const partialParams = this.getPartialParamInfos(applHost, this.parameter);
+        const partialParams = this.getPartialParamInfos(ctx, this.parameter);
         let cachedValueFormat;
         if (partialParams.length > 0) {
             // This is a partial param. All definitions should have the same format, so we just take the first one
@@ -1451,21 +1464,21 @@ let ConfigurationCCReport = class ConfigurationCCReport extends ConfigurationCC
         }
         else {
             // Check if the initial assumption of SignedInteger holds true
-            const oldParamInformation = this.getParamInformation(applHost, this.parameter);
+            const oldParamInformation = this.getParamInformation(ctx, this.parameter);
             cachedValueFormat = oldParamInformation.format;
             // On older CC versions, these reports may be the only way we can retrieve the value size
             // Therefore we store it here
-            this.extendParamInformation(applHost, this.parameter, undefined, {
+            this.extendParamInformation(ctx, this.parameter, undefined, {
                 valueSize: this.valueSize,
             });
-            if (this.version < 3
-                && !this.paramExistsInConfigFile(applHost, this.parameter)
+            if (ccVersion < 3
+                && !this.paramExistsInConfigFile(ctx, this.parameter)
                 && oldParamInformation.min == undefined
                 && oldParamInformation.max == undefined) {
                 const isSigned = oldParamInformation.format == undefined
                     || oldParamInformation.format
                         === safe_1.ConfigValueFormat.SignedInteger;
-                this.extendParamInformation(applHost, this.parameter, undefined, (0, safe_1.getIntegerLimits)(this.valueSize, isSigned));
+                this.extendParamInformation(ctx, this.parameter, undefined, (0, safe_1.getIntegerLimits)(this.valueSize, isSigned));
             }
         }
         // We may have to re-interpret the value as unsigned, depending on the cached value format
@@ -1479,27 +1492,27 @@ let ConfigurationCCReport = class ConfigurationCCReport extends ConfigurationCC
         if (partialParams.length > 0) {
             for (const param of partialParams) {
                 if (typeof param.propertyKey === "number") {
-                    this.setValue(applHost, exports.ConfigurationCCValues.paramInformation(this.parameter, param.propertyKey), (0, safe_1.parsePartial)(this.value, param.propertyKey, isSignedPartial(param.propertyKey, param.metadata.format)));
+                    this.setValue(ctx, exports.ConfigurationCCValues.paramInformation(this.parameter, param.propertyKey), (0, safe_1.parsePartial)(this.value, param.propertyKey, isSignedPartial(param.propertyKey, param.metadata.format)));
                 }
             }
         }
         else {
             // This is a single param
-            this.setValue(applHost, exports.ConfigurationCCValues.paramInformation(this.parameter), this.value);
+            this.setValue(ctx, exports.ConfigurationCCValues.paramInformation(this.parameter), this.value);
         }
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.concat([
             Buffer.from([this.parameter, this.valueSize & 0b111]),
             Buffer.allocUnsafe(this.valueSize),
         ]);
         serializeValue(this.payload, 2, this.valueSize, this.valueFormat ?? safe_1.ConfigValueFormat.SignedInteger, this.value);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "parameter #": this.parameter,
                 "value size": this.valueSize,
@@ -1509,83 +1522,82 @@ let ConfigurationCCReport = class ConfigurationCCReport extends ConfigurationCC
     }
 };
 exports.ConfigurationCCReport = ConfigurationCCReport;
-exports.ConfigurationCCReport = ConfigurationCCReport = __decorate([
+exports.ConfigurationCCReport = ConfigurationCCReport = ConfigurationCCReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.Report)
 ], ConfigurationCCReport);
 function testResponseForConfigurationGet(sent, received) {
     // We expect a Configuration Report that matches the requested parameter
     return (sent.parameter === received.parameter || sent.allowUnexpectedResponse);
 }
-let ConfigurationCCGet = class ConfigurationCCGet extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.parameter = this.payload[0];
-            this.allowUnexpectedResponse = false;
-        }
-        else {
-            this.parameter = options.parameter;
-            this.allowUnexpectedResponse = options.allowUnexpectedResponse
-                ?? false;
-        }
+let ConfigurationCCGet = ConfigurationCCGet_1 = class ConfigurationCCGet extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.allowUnexpectedResponse = options.allowUnexpectedResponse
+            ?? false;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const parameter = raw.payload[0];
+        return new ConfigurationCCGet_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+        });
     }
     parameter;
     allowUnexpectedResponse;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.parameter]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "parameter #": this.parameter },
         };
     }
 };
 exports.ConfigurationCCGet = ConfigurationCCGet;
-exports.ConfigurationCCGet = ConfigurationCCGet = __decorate([
+exports.ConfigurationCCGet = ConfigurationCCGet = ConfigurationCCGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.Get),
     (0, CommandClassDecorators_1.expectedCCResponse)(ConfigurationCCReport, testResponseForConfigurationGet)
 ], ConfigurationCCGet);
-let ConfigurationCCSet = class ConfigurationCCSet extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.parameter = this.payload[0];
-            this.resetToDefault = !!(this.payload[1] & 0b1000_0000);
-            this.valueSize = this.payload[1] & 0b111;
-            // Ensure we received a valid report
-            (0, safe_1.validatePayload)(this.valueSize >= 1, this.valueSize <= 4, this.payload.length >= 2 + this.valueSize);
-            // Parse the value as signed integer. We don't know the format here.
-            this.value = parseValue(this.payload.subarray(2), this.valueSize, safe_1.ConfigValueFormat.SignedInteger);
-        }
-        else {
-            this.parameter = options.parameter;
-            // According to SDS14223 this flag SHOULD NOT be set
-            // Because we don't want to test the behavior, we enforce that it MUST not be set
-            // on legacy nodes
-            if (options.resetToDefault && this.version <= 3) {
-                throw new safe_1.ZWaveError(`The resetToDefault flag MUST not be used on nodes implementing ConfigurationCC V3 or less!`, safe_1.ZWaveErrorCodes
-                    .ConfigurationCC_NoResetToDefaultOnLegacyDevices);
-            }
-            this.resetToDefault = !!options.resetToDefault;
-            if (!options.resetToDefault) {
-                // TODO: Default to the stored value size
-                this.valueSize = options.valueSize;
-                this.valueFormat = options.valueFormat
-                    ?? safe_1.ConfigValueFormat.SignedInteger;
-                this.value = options.value;
-            }
+let ConfigurationCCSet = ConfigurationCCSet_1 = class ConfigurationCCSet extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.resetToDefault = !!options.resetToDefault;
+        if (!options.resetToDefault) {
+            // TODO: Default to the stored value size
+            this.valueSize = options.valueSize;
+            this.valueFormat = options.valueFormat
+                ?? safe_1.ConfigValueFormat.SignedInteger;
+            this.value = options.value;
         }
     }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const parameter = raw.payload[0];
+        const resetToDefault = !!(raw.payload[1] & 0b1000_0000);
+        const valueSize = raw.payload[1] & 0b111;
+        // Ensure we received a valid report
+        (0, safe_1.validatePayload)(valueSize >= 1, valueSize <= 4, raw.payload.length >= 2 + valueSize);
+        // Parse the value as signed integer. We don't know the format here.
+        const value = parseValue(raw.payload.subarray(2), valueSize, safe_1.ConfigValueFormat.SignedInteger);
+        return new ConfigurationCCSet_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+            resetToDefault,
+            valueSize,
+            value,
+        });
+    }
     resetToDefault;
     parameter;
     valueSize;
     valueFormat;
     value;
-    serialize() {
+    serialize(ctx) {
         const valueSize = this.resetToDefault ? 1 : this.valueSize;
         const payloadLength = 2 + valueSize;
         this.payload = Buffer.alloc(payloadLength, 0);
@@ -1606,9 +1618,9 @@ let ConfigurationCCSet = class ConfigurationCCSet extends ConfigurationCC {
                 tryCatchOutOfBoundsError(e, this.value, this.parameter, valueSize, this.valueFormat);
             }
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "parameter #": this.parameter,
             "reset to default": this.resetToDefault,
@@ -1623,13 +1635,13 @@ let ConfigurationCCSet = class ConfigurationCCSet extends ConfigurationCC {
             message.value = configValueToString(this.value);
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.ConfigurationCCSet = ConfigurationCCSet;
-exports.ConfigurationCCSet = ConfigurationCCSet = __decorate([
+exports.ConfigurationCCSet = ConfigurationCCSet = ConfigurationCCSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.Set),
     (0, CommandClassDecorators_1.useSupervision)()
 ], ConfigurationCCSet);
@@ -1637,35 +1649,36 @@ function getResponseForBulkSet(cc) {
     return cc.handshake ? ConfigurationCCBulkReport : undefined;
 }
 let ConfigurationCCBulkSet = class ConfigurationCCBulkSet extends ConfigurationCC {
-    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);
+    constructor(options) {
+        super(options);
+        this._parameters = options.parameters;
+        if (this._parameters.length < 1) {
+            throw new safe_1.ZWaveError(`In a ConfigurationCC.BulkSet, parameters must be a non-empty array`, safe_1.ZWaveErrorCodes.CC_Invalid);
+        }
+        else if (!(0, safe_1.isConsecutiveArray)(this._parameters)) {
+            throw new safe_1.ZWaveError(`A ConfigurationCC.BulkSet can only be used for consecutive parameters`, safe_1.ZWaveErrorCodes.CC_Invalid);
+        }
+        this._handshake = !!options.handshake;
+        this._resetToDefault = !!options.resetToDefault;
+        if (!!options.resetToDefault) {
+            this._valueSize = 1;
+            this._valueFormat = safe_1.ConfigValueFormat.SignedInteger;
+            this._values = this._parameters.map(() => 0);
         }
         else {
-            this._parameters = options.parameters;
-            if (this._parameters.length < 1) {
-                throw new safe_1.ZWaveError(`In a ConfigurationCC.BulkSet, parameters must be a non-empty array`, safe_1.ZWaveErrorCodes.CC_Invalid);
-            }
-            else if (!(0, safe_1.isConsecutiveArray)(this._parameters)) {
-                throw new safe_1.ZWaveError(`A ConfigurationCC.BulkSet can only be used for consecutive parameters`, safe_1.ZWaveErrorCodes.CC_Invalid);
-            }
-            this._handshake = !!options.handshake;
-            this._resetToDefault = !!options.resetToDefault;
-            if (!!options.resetToDefault) {
-                this._valueSize = 1;
-                this._valueFormat = safe_1.ConfigValueFormat.SignedInteger;
-                this._values = this._parameters.map(() => 0);
-            }
-            else {
-                this._valueSize = options.valueSize;
-                this._valueFormat = options.valueFormat
-                    ?? safe_1.ConfigValueFormat.SignedInteger;
-                this._values = options.values;
-            }
+            this._valueSize = options.valueSize;
+            this._valueFormat = options.valueFormat
+                ?? safe_1.ConfigValueFormat.SignedInteger;
+            this._values = options.values;
         }
     }
+    static from(_raw, _ctx) {
+        // TODO: Deserialize payload
+        throw new safe_1.ZWaveError(`${this.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+        // return new ConfigurationCCBulkSet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
+    }
     _parameters;
     get parameters() {
         return this._parameters;
@@ -1690,7 +1703,7 @@ let ConfigurationCCBulkSet = class ConfigurationCCBulkSet extends ConfigurationC
     get handshake() {
         return this._handshake;
     }
-    serialize() {
+    serialize(ctx) {
         const valueSize = this._resetToDefault ? 1 : this.valueSize;
         const payloadLength = 4 + valueSize * this.parameters.length;
         this.payload = Buffer.alloc(payloadLength, 0);
@@ -1716,9 +1729,9 @@ let ConfigurationCCBulkSet = class ConfigurationCCBulkSet extends ConfigurationC
                 }
             }
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             handshake: this.handshake,
             "reset to default": this.resetToDefault,
@@ -1730,7 +1743,7 @@ let ConfigurationCCBulkSet = class ConfigurationCCBulkSet extends ConfigurationC
                 .join("");
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
@@ -1741,78 +1754,84 @@ exports.ConfigurationCCBulkSet = ConfigurationCCBulkSet = __decorate([
     (0, CommandClassDecorators_1.expectedCCResponse)(getResponseForBulkSet),
     (0, CommandClassDecorators_1.useSupervision)()
 ], ConfigurationCCBulkSet);
-let ConfigurationCCBulkReport = class ConfigurationCCBulkReport extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
+let ConfigurationCCBulkReport = ConfigurationCCBulkReport_1 = class ConfigurationCCBulkReport extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        // TODO: Check implementation:
+        this.reportsToFollow = options.reportsToFollow;
+        this.defaultValues = options.defaultValues;
+        this.isHandshakeResponse = options.isHandshakeResponse;
+        this.valueSize = options.valueSize;
+        for (const [param, value] of Object.entries(options.values)) {
+            this._values.set(parseInt(param), value);
+        }
+    }
+    static from(raw, ctx) {
         // Ensure we received enough bytes for the preamble
-        (0, safe_1.validatePayload)(this.payload.length >= 5);
-        const firstParameter = this.payload.readUInt16BE(0);
-        const numParams = this.payload[2];
-        this._reportsToFollow = this.payload[3];
-        this._defaultValues = !!(this.payload[4] & 0b1000_0000);
-        this._isHandshakeResponse = !!(this.payload[4] & 0b0100_0000);
-        this._valueSize = this.payload[4] & 0b111;
+        (0, safe_1.validatePayload)(raw.payload.length >= 5);
+        const firstParameter = raw.payload.readUInt16BE(0);
+        const numParams = raw.payload[2];
+        const reportsToFollow = raw.payload[3];
+        const defaultValues = !!(raw.payload[4] & 0b1000_0000);
+        const isHandshakeResponse = !!(raw.payload[4] & 0b0100_0000);
+        const valueSize = raw.payload[4] & 0b111;
         // Ensure the payload is long enough for all reported values
-        (0, safe_1.validatePayload)(this.payload.length >= 5 + numParams * this._valueSize);
+        (0, safe_1.validatePayload)(raw.payload.length >= 5 + numParams * valueSize);
+        const values = {};
         for (let i = 0; i < numParams; i++) {
             const param = firstParameter + i;
-            this._values.set(param, 
             // Default to parsing the value as SignedInteger, like the specs say.
             // We try to re-interpret the value in persistValues()
-            parseValue(this.payload.subarray(5 + i * this.valueSize), this.valueSize, safe_1.ConfigValueFormat.SignedInteger));
-        }
+            values[param] = parseValue(raw.payload.subarray(5 + i * valueSize), valueSize, safe_1.ConfigValueFormat.SignedInteger);
+        }
+        return new ConfigurationCCBulkReport_1({
+            nodeId: ctx.sourceNodeId,
+            reportsToFollow,
+            defaultValues,
+            isHandshakeResponse,
+            valueSize,
+            values,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // Store every received parameter
         // eslint-disable-next-line prefer-const
         for (let [parameter, value] of this._values.entries()) {
             // Check if the initial assumption of SignedInteger holds true
-            const oldParamInformation = this.getParamInformation(applHost, parameter);
+            const oldParamInformation = this.getParamInformation(ctx, parameter);
             if (oldParamInformation.format != undefined
                 && oldParamInformation.format
                     !== safe_1.ConfigValueFormat.SignedInteger) {
                 // Re-interpret the value with the new format
-                value = reInterpretSignedValue(value, this._valueSize, oldParamInformation.format);
+                value = reInterpretSignedValue(value, this.valueSize, oldParamInformation.format);
                 this._values.set(parameter, value);
             }
-            this.setValue(applHost, exports.ConfigurationCCValues.paramInformation(parameter), value);
+            this.setValue(ctx, exports.ConfigurationCCValues.paramInformation(parameter), value);
         }
         return true;
     }
-    _reportsToFollow;
-    get reportsToFollow() {
-        return this._reportsToFollow;
+    reportsToFollow;
+    defaultValues;
+    isHandshakeResponse;
+    valueSize;
+    _values = new Map();
+    get values() {
+        return this._values;
     }
     getPartialCCSessionId() {
         // We don't expect the applHost to merge CCs but we want to wait until all reports have been received
         return {};
     }
     expectMoreMessages() {
-        return this._reportsToFollow > 0;
-    }
-    _defaultValues;
-    get defaultValues() {
-        return this._defaultValues;
-    }
-    _isHandshakeResponse;
-    get isHandshakeResponse() {
-        return this._isHandshakeResponse;
-    }
-    _valueSize;
-    get valueSize() {
-        return this._valueSize;
-    }
-    _values = new Map();
-    get values() {
-        return this._values;
+        return this.reportsToFollow > 0;
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
-            "handshake response": this._isHandshakeResponse,
-            "default values": this._defaultValues,
-            "value size": this._valueSize,
+            "handshake response": this.isHandshakeResponse,
+            "default values": this.defaultValues,
+            "value size": this.valueSize,
             "reports to follow": this.reportsToFollow,
         };
         if (this._values.size > 0) {
@@ -1822,42 +1841,43 @@ let ConfigurationCCBulkReport = class ConfigurationCCBulkReport extends Configur
                 .join("");
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.ConfigurationCCBulkReport = ConfigurationCCBulkReport;
-exports.ConfigurationCCBulkReport = ConfigurationCCBulkReport = __decorate([
+exports.ConfigurationCCBulkReport = ConfigurationCCBulkReport = ConfigurationCCBulkReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.BulkReport)
 ], ConfigurationCCBulkReport);
 let ConfigurationCCBulkGet = class ConfigurationCCBulkGet extends ConfigurationCC {
-    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._parameters = options.parameters.sort();
-            if (!(0, safe_1.isConsecutiveArray)(this.parameters)) {
-                throw new safe_1.ZWaveError(`A ConfigurationCC.BulkGet can only be used for consecutive parameters`, safe_1.ZWaveErrorCodes.CC_Invalid);
-            }
+    constructor(options) {
+        super(options);
+        this._parameters = options.parameters.sort();
+        if (!(0, safe_1.isConsecutiveArray)(this.parameters)) {
+            throw new safe_1.ZWaveError(`A ConfigurationCC.BulkGet can only be used for consecutive parameters`, safe_1.ZWaveErrorCodes.CC_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 ConfigurationCCBulkGet({
+        // 	nodeId: ctx.sourceNodeId,
+        // });
+    }
     _parameters;
     get parameters() {
         return this._parameters;
     }
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(3);
         this.payload.writeUInt16BE(this.parameters[0], 0);
         this.payload[2] = this.parameters.length;
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { parameters: this.parameters.join(", ") },
         };
     }
@@ -1867,38 +1887,42 @@ exports.ConfigurationCCBulkGet = ConfigurationCCBulkGet = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.BulkGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(ConfigurationCCBulkReport)
 ], ConfigurationCCBulkGet);
-let ConfigurationCCNameReport = class ConfigurationCCNameReport extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // Parameter and # of reports must be present
-            (0, safe_1.validatePayload)(this.payload.length >= 3);
-            this.parameter = this.payload.readUInt16BE(0);
-            this.reportsToFollow = this.payload[2];
-            if (this.reportsToFollow > 0) {
-                // If more reports follow, the info must at least be one byte
-                (0, safe_1.validatePayload)(this.payload.length >= 4);
-            }
-            this.name = this.payload.subarray(3).toString("utf8");
-        }
-        else {
-            this.parameter = options.parameter;
-            this.name = options.name;
-            this.reportsToFollow = options.reportsToFollow;
-        }
+let ConfigurationCCNameReport = ConfigurationCCNameReport_1 = class ConfigurationCCNameReport extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.name = options.name;
+        this.reportsToFollow = options.reportsToFollow;
+    }
+    static from(raw, ctx) {
+        // Parameter and # of reports must be present
+        (0, safe_1.validatePayload)(raw.payload.length >= 3);
+        const parameter = raw.payload.readUInt16BE(0);
+        const reportsToFollow = raw.payload[2];
+        if (reportsToFollow > 0) {
+            // If more reports follow, the info must at least be one byte
+            (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        }
+        const name = raw.payload.subarray(3).toString("utf8");
+        return new ConfigurationCCNameReport_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+            reportsToFollow,
+            name,
+        });
     }
     parameter;
     name;
     reportsToFollow;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // Bitfield parameters that are not documented in a config file
         // are split into multiple partial parameters. We need to set the name for
         // all of them.
-        const partialParams = this.getPartialParamInfos(applHost, this.parameter);
+        const partialParams = this.getPartialParamInfos(ctx, this.parameter);
         if (partialParams.length === 0) {
-            this.extendParamInformation(applHost, this.parameter, undefined, {
+            this.extendParamInformation(ctx, this.parameter, undefined, {
                 label: this.name,
             });
         }
@@ -1913,20 +1937,20 @@ let ConfigurationCCNameReport = class ConfigurationCCNameReport extends Configur
                 if (bitNumber != undefined) {
                     label += ` (bit ${bitNumber})`;
                 }
-                this.extendParamInformation(applHost, paramNumber, bitMask, {
+                this.extendParamInformation(ctx, paramNumber, bitMask, {
                     label,
                 });
             }
         }
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         const nameBuffer = Buffer.from(this.name, "utf8");
         this.payload = Buffer.allocUnsafe(3 + nameBuffer.length);
         this.payload.writeUInt16BE(this.parameter, 0);
         this.payload[2] = this.reportsToFollow;
         nameBuffer.copy(this.payload, 3);
-        return super.serialize();
+        return super.serialize(ctx);
     }
     getPartialCCSessionId() {
         // Distinguish sessions by the parameter number
@@ -1935,15 +1959,15 @@ let ConfigurationCCNameReport = class ConfigurationCCNameReport extends Configur
     expectMoreMessages() {
         return this.reportsToFollow > 0;
     }
-    mergePartialCCs(applHost, partials) {
+    mergePartialCCs(partials, _ctx) {
         // Concat the name
         this.name = [...partials, this]
             .map((report) => report.name)
             .reduce((prev, cur) => prev + cur, "");
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "parameter #": this.parameter,
                 name: this.name,
@@ -1953,72 +1977,78 @@ let ConfigurationCCNameReport = class ConfigurationCCNameReport extends Configur
     }
 };
 exports.ConfigurationCCNameReport = ConfigurationCCNameReport;
-exports.ConfigurationCCNameReport = ConfigurationCCNameReport = __decorate([
+exports.ConfigurationCCNameReport = ConfigurationCCNameReport = ConfigurationCCNameReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.NameReport)
 ], ConfigurationCCNameReport);
-let ConfigurationCCNameGet = class ConfigurationCCNameGet extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.parameter = this.payload.readUInt16BE(0);
-        }
-        else {
-            this.parameter = options.parameter;
-        }
+let ConfigurationCCNameGet = ConfigurationCCNameGet_1 = class ConfigurationCCNameGet extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const parameter = raw.payload.readUInt16BE(0);
+        return new ConfigurationCCNameGet_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+        });
     }
     parameter;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(2);
         this.payload.writeUInt16BE(this.parameter, 0);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "parameter #": this.parameter },
         };
     }
 };
 exports.ConfigurationCCNameGet = ConfigurationCCNameGet;
-exports.ConfigurationCCNameGet = ConfigurationCCNameGet = __decorate([
+exports.ConfigurationCCNameGet = ConfigurationCCNameGet = ConfigurationCCNameGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.NameGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(ConfigurationCCNameReport)
 ], ConfigurationCCNameGet);
-let ConfigurationCCInfoReport = class ConfigurationCCInfoReport extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // Parameter and # of reports must be present
-            (0, safe_1.validatePayload)(this.payload.length >= 3);
-            this.parameter = this.payload.readUInt16BE(0);
-            this.reportsToFollow = this.payload[2];
-            if (this.reportsToFollow > 0) {
-                // If more reports follow, the info must at least be one byte
-                (0, safe_1.validatePayload)(this.payload.length >= 4);
-            }
-            this.info = this.payload.subarray(3).toString("utf8");
-        }
-        else {
-            this.parameter = options.parameter;
-            this.info = options.info;
-            this.reportsToFollow = options.reportsToFollow;
-        }
+let ConfigurationCCInfoReport = ConfigurationCCInfoReport_1 = class ConfigurationCCInfoReport extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.info = options.info;
+        this.reportsToFollow = options.reportsToFollow;
+    }
+    static from(raw, ctx) {
+        // Parameter and # of reports must be present
+        (0, safe_1.validatePayload)(raw.payload.length >= 3);
+        const parameter = raw.payload.readUInt16BE(0);
+        const reportsToFollow = raw.payload[2];
+        if (reportsToFollow > 0) {
+            // If more reports follow, the info must at least be one byte
+            (0, safe_1.validatePayload)(raw.payload.length >= 4);
+        }
+        const info = raw.payload.subarray(3).toString("utf8");
+        return new ConfigurationCCInfoReport_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+            reportsToFollow,
+            info,
+        });
     }
     parameter;
     info;
     reportsToFollow;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // Bitfield parameters that are not documented in a config file
         // are split into multiple partial parameters. We need to set the description for
         // all of them. However, these can get very long, so we put the reported
         // description on the first partial param, and refer to it from the others
-        const partialParams = this.getPartialParamInfos(applHost, this.parameter).sort((a, b) => (a.propertyKey ?? 0)
+        const partialParams = this.getPartialParamInfos(ctx, this.parameter).sort((a, b) => (a.propertyKey ?? 0)
             - (b.propertyKey ?? 0));
         if (partialParams.length === 0) {
-            this.extendParamInformation(applHost, this.parameter, undefined, {
+            this.extendParamInformation(ctx, this.parameter, undefined, {
                 description: this.info,
             });
         }
@@ -2031,27 +2061,27 @@ let ConfigurationCCInfoReport = class ConfigurationCCInfoReport extends Configur
                 const description = firstParamLabel
                     ? `Refer to ${firstParamLabel}`
                     : this.info;
-                this.extendParamInformation(applHost, paramNumber, bitMask, {
+                this.extendParamInformation(ctx, paramNumber, bitMask, {
                     description,
                 });
                 // Then we store the name of the first param to refer to it on the
                 // following partial params
                 if (firstParamLabel == undefined) {
                     firstParamLabel =
-                        this.getParamInformation(applHost, paramNumber, bitMask)
+                        this.getParamInformation(ctx, paramNumber, bitMask)
                             .label ?? `parameter ${paramNumber} - ${bitMask}`;
                 }
             }
         }
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         const infoBuffer = Buffer.from(this.info, "utf8");
         this.payload = Buffer.allocUnsafe(3 + infoBuffer.length);
         this.payload.writeUInt16BE(this.parameter, 0);
         this.payload[2] = this.reportsToFollow;
         infoBuffer.copy(this.payload, 3);
-        return super.serialize();
+        return super.serialize(ctx);
     }
     getPartialCCSessionId() {
         // Distinguish sessions by the parameter number
@@ -2060,15 +2090,15 @@ let ConfigurationCCInfoReport = class ConfigurationCCInfoReport extends Configur
     expectMoreMessages() {
         return this.reportsToFollow > 0;
     }
-    mergePartialCCs(applHost, partials) {
+    mergePartialCCs(partials, _ctx) {
         // Concat the info
         this.info = [...partials, this]
             .map((report) => report.info)
             .reduce((prev, cur) => prev + cur, "");
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "parameter #": this.parameter,
                 info: this.info,
@@ -2078,108 +2108,132 @@ let ConfigurationCCInfoReport = class ConfigurationCCInfoReport extends Configur
     }
 };
 exports.ConfigurationCCInfoReport = ConfigurationCCInfoReport;
-exports.ConfigurationCCInfoReport = ConfigurationCCInfoReport = __decorate([
+exports.ConfigurationCCInfoReport = ConfigurationCCInfoReport = ConfigurationCCInfoReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.InfoReport)
 ], ConfigurationCCInfoReport);
-let ConfigurationCCInfoGet = class ConfigurationCCInfoGet extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.parameter = this.payload.readUInt16BE(0);
-        }
-        else {
-            this.parameter = options.parameter;
-        }
+let ConfigurationCCInfoGet = ConfigurationCCInfoGet_1 = class ConfigurationCCInfoGet extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const parameter = raw.payload.readUInt16BE(0);
+        return new ConfigurationCCInfoGet_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+        });
     }
     parameter;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(2);
         this.payload.writeUInt16BE(this.parameter, 0);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "parameter #": this.parameter },
         };
     }
 };
 exports.ConfigurationCCInfoGet = ConfigurationCCInfoGet;
-exports.ConfigurationCCInfoGet = ConfigurationCCInfoGet = __decorate([
+exports.ConfigurationCCInfoGet = ConfigurationCCInfoGet = ConfigurationCCInfoGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.InfoGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(ConfigurationCCInfoReport)
 ], ConfigurationCCInfoGet);
-let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 3);
-            this.parameter = this.payload.readUInt16BE(0);
-            this.valueFormat = (this.payload[2] & 0b111000) >>> 3;
-            this.valueSize = this.payload[2] & 0b111;
-            // GH#1309 Some devices don't tell us the first parameter if we query #0
-            // Instead, they contain 0x000000
-            if (this.valueSize === 0 && this.payload.length < 5) {
-                this.nextParameter = 0;
-                return;
-            }
-            // Ensure the payload contains the two bytes for next parameter
-            const nextParameterOffset = 3 + 3 * this.valueSize;
-            (0, safe_1.validatePayload)(this.payload.length >= nextParameterOffset + 2);
-            if (this.valueSize > 0) {
-                if (this.valueFormat === safe_1.ConfigValueFormat.BitField) {
-                    this.minValue = 0;
-                }
-                else {
-                    this.minValue = parseValue(this.payload.subarray(3), this.valueSize, this.valueFormat);
-                }
-                this.maxValue = parseValue(this.payload.subarray(3 + this.valueSize), this.valueSize, this.valueFormat);
-                this.defaultValue = parseValue(this.payload.subarray(3 + 2 * this.valueSize), this.valueSize, this.valueFormat);
+let ConfigurationCCPropertiesReport = ConfigurationCCPropertiesReport_1 = class ConfigurationCCPropertiesReport extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+        this.valueSize = options.valueSize;
+        this.valueFormat = options.valueFormat;
+        if (this.valueSize > 0) {
+            if (options.minValue == undefined) {
+                throw new safe_1.ZWaveError("The minimum value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
-            if (this.version < 4) {
-                // Read the last 2 bytes to work around nodes not omitting min/max value when their size is 0
-                this.nextParameter = this.payload.readUInt16BE(this.payload.length - 2);
+            else if (options.maxValue == undefined) {
+                throw new safe_1.ZWaveError("The maximum value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
-            else {
-                this.nextParameter = this.payload.readUInt16BE(nextParameterOffset);
-                // Ensure the payload contains a byte for the 2nd option flags
-                (0, safe_1.validatePayload)(this.payload.length >= nextParameterOffset + 3);
-                const options1 = this.payload[2];
-                const options2 = this.payload[3 + 3 * this.valueSize + 2];
-                this.altersCapabilities = !!(options1 & 0b1000_0000);
-                this.isReadonly = !!(options1 & 0b0100_0000);
-                this.isAdvanced = !!(options2 & 0b1);
-                this.noBulkSupport = !!(options2 & 0b10);
+            else if (options.defaultValue == undefined) {
+                throw new safe_1.ZWaveError("The default value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
+            this.minValue = options.minValue;
+            this.maxValue = options.maxValue;
+            this.defaultValue = options.defaultValue;
+        }
+        this.nextParameter = options.nextParameter;
+        this.altersCapabilities = options.altersCapabilities;
+        this.isReadonly = options.isReadonly;
+        this.isAdvanced = options.isAdvanced;
+        this.noBulkSupport = options.noBulkSupport;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 3);
+        const parameter = raw.payload.readUInt16BE(0);
+        const valueFormat = (raw.payload[2] & 0b111000)
+            >>> 3;
+        const valueSize = raw.payload[2] & 0b111;
+        // GH#1309 Some devices don't tell us the first parameter if we query #0
+        // Instead, they contain 0x000000
+        let nextParameter;
+        if (valueSize === 0 && raw.payload.length < 5) {
+            nextParameter = 0;
+            return new ConfigurationCCPropertiesReport_1({
+                nodeId: ctx.sourceNodeId,
+                parameter,
+                valueFormat,
+                valueSize,
+                nextParameter,
+            });
         }
-        else {
-            this.parameter = options.parameter;
-            this.valueSize = options.valueSize;
-            this.valueFormat = options.valueFormat;
-            if (this.valueSize > 0) {
-                if (options.minValue == undefined) {
-                    throw new safe_1.ZWaveError("The minimum value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
-                else if (options.maxValue == undefined) {
-                    throw new safe_1.ZWaveError("The maximum value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
-                else if (options.defaultValue == undefined) {
-                    throw new safe_1.ZWaveError("The default value must be set when the value size is non-zero", safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
-                this.minValue = options.minValue;
-                this.maxValue = options.maxValue;
-                this.defaultValue = options.defaultValue;
+        // Ensure the payload contains the two bytes for next parameter
+        const nextParameterOffset = 3 + 3 * valueSize;
+        (0, safe_1.validatePayload)(raw.payload.length >= nextParameterOffset + 2);
+        let minValue;
+        let maxValue;
+        let defaultValue;
+        if (valueSize > 0) {
+            if (valueFormat === safe_1.ConfigValueFormat.BitField) {
+                minValue = 0;
             }
-            this.nextParameter = options.nextParameter;
-            this.altersCapabilities = options.altersCapabilities;
-            this.isReadonly = options.isReadonly;
-            this.isAdvanced = options.isAdvanced;
-            this.noBulkSupport = options.noBulkSupport;
-        }
+            else {
+                minValue = parseValue(raw.payload.subarray(3), valueSize, valueFormat);
+            }
+            maxValue = parseValue(raw.payload.subarray(3 + valueSize), valueSize, valueFormat);
+            defaultValue = parseValue(raw.payload.subarray(3 + 2 * valueSize), valueSize, valueFormat);
+        }
+        nextParameter = raw.payload.readUInt16BE(nextParameterOffset);
+        let altersCapabilities;
+        let isReadonly;
+        let isAdvanced;
+        let noBulkSupport;
+        if (raw.payload.length >= nextParameterOffset + 3) {
+            // V4 adds an options byte after the next parameter and two bits in byte 2
+            const options1 = raw.payload[2];
+            const options2 = raw.payload[3 + 3 * valueSize + 2];
+            altersCapabilities = !!(options1 & 0b1000_0000);
+            isReadonly = !!(options1 & 0b0100_0000);
+            isAdvanced = !!(options2 & 0b1);
+            noBulkSupport = !!(options2 & 0b10);
+        }
+        return new ConfigurationCCPropertiesReport_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+            valueFormat,
+            valueSize,
+            nextParameter,
+            minValue,
+            maxValue,
+            defaultValue,
+            altersCapabilities,
+            isReadonly,
+            isAdvanced,
+            noBulkSupport,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         // If we actually received parameter info, store it
         if (this.valueSize > 0) {
@@ -2197,14 +2251,14 @@ let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport exte
             };
             if (this.valueFormat !== safe_1.ConfigValueFormat.BitField) {
                 // Do not override param information from a config file
-                if (!this.paramExistsInConfigFile(applHost, this.parameter)) {
+                if (!this.paramExistsInConfigFile(ctx, this.parameter)) {
                     const paramInfo = (0, safe_1.stripUndefined)({
                         ...baseInfo,
                         min: this.minValue,
                         max: this.maxValue,
                         default: this.defaultValue,
                     });
-                    this.extendParamInformation(applHost, this.parameter, undefined, paramInfo);
+                    this.extendParamInformation(ctx, this.parameter, undefined, paramInfo);
                 }
             }
             else {
@@ -2216,14 +2270,14 @@ let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport exte
                     // Only create partials that exist
                     !!(mask & bits)
                         // Do not override param information from a config file
-                        && !this.paramExistsInConfigFile(applHost, this.parameter, mask)) {
+                        && !this.paramExistsInConfigFile(ctx, this.parameter, mask)) {
                         const paramInfo = (0, safe_1.stripUndefined)({
                             ...baseInfo,
                             min: 0,
                             max: 1,
                             default: this.defaultValue & mask ? 1 : 0,
                         });
-                        this.extendParamInformation(applHost, this.parameter, mask, paramInfo);
+                        this.extendParamInformation(ctx, this.parameter, mask, paramInfo);
                     }
                     // We must use multiplication here, as bitwise shifting works on signed 32-bit integers in JS
                     // which would create an infinite loop if maxValue === 0xffff_ffff
@@ -2244,7 +2298,7 @@ let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport exte
     isReadonly;
     isAdvanced;
     noBulkSupport;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(3 // preamble
             + 3 * this.valueSize // min, max, default value
             + 2 // next parameter
@@ -2269,9 +2323,9 @@ let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport exte
         const options2 = (this.isAdvanced ? 0b1 : 0)
             | (this.noBulkSupport ? 0b10 : 0);
         this.payload[offset] = options2;
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {
             "parameter #": this.parameter,
             "next param #": this.nextParameter,
@@ -2300,41 +2354,43 @@ let ConfigurationCCPropertiesReport = class ConfigurationCCPropertiesReport exte
             message["bulk support"] = !this.noBulkSupport;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.ConfigurationCCPropertiesReport = ConfigurationCCPropertiesReport;
-exports.ConfigurationCCPropertiesReport = ConfigurationCCPropertiesReport = __decorate([
+exports.ConfigurationCCPropertiesReport = ConfigurationCCPropertiesReport = ConfigurationCCPropertiesReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.PropertiesReport)
 ], ConfigurationCCPropertiesReport);
-let ConfigurationCCPropertiesGet = class ConfigurationCCPropertiesGet extends ConfigurationCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.parameter = this.payload.readUInt16BE(0);
-        }
-        else {
-            this.parameter = options.parameter;
-        }
+let ConfigurationCCPropertiesGet = ConfigurationCCPropertiesGet_1 = class ConfigurationCCPropertiesGet extends ConfigurationCC {
+    constructor(options) {
+        super(options);
+        this.parameter = options.parameter;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const parameter = raw.payload.readUInt16BE(0);
+        return new ConfigurationCCPropertiesGet_1({
+            nodeId: ctx.sourceNodeId,
+            parameter,
+        });
     }
     parameter;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.allocUnsafe(2);
         this.payload.writeUInt16BE(this.parameter, 0);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: { "parameter #": this.parameter },
         };
     }
 };
 exports.ConfigurationCCPropertiesGet = ConfigurationCCPropertiesGet;
-exports.ConfigurationCCPropertiesGet = ConfigurationCCPropertiesGet = __decorate([
+exports.ConfigurationCCPropertiesGet = ConfigurationCCPropertiesGet = ConfigurationCCPropertiesGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.ConfigurationCommand.PropertiesGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(ConfigurationCCPropertiesReport)
 ], ConfigurationCCPropertiesGet);