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

package/build/cc/IndicatorCC.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 IndicatorCCSet_1, IndicatorCCReport_1, IndicatorCCGet_1, IndicatorCCSupportedReport_1, IndicatorCCSupportedGet_1, IndicatorCCDescriptionReport_1, IndicatorCCDescriptionGet_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndicatorCCDescriptionGet = exports.IndicatorCCDescriptionReport = exports.IndicatorCCSupportedGet = exports.IndicatorCCSupportedReport = exports.IndicatorCCGet = exports.IndicatorCCReport = exports.IndicatorCCSet = exports.IndicatorCC = exports.IndicatorCCAPI = exports.IndicatorCCValues = void 0;
 function __assertType(argName, typeName, boundHasError) {
@@ -93,7 +94,7 @@ const __assertType__su__number_sa__5_ea_5_5_5_eu = $o => {
     }
     return su__number_sa__5_ea_5_5_5_eu($o);
 };
-const __assertType__IndicatorCCReportSpecificOptions = $o => {
+const __assertType__IndicatorCCReportOptions = $o => {
     function _number($o) {
         return typeof $o !== "number" ? {} : null;
     }
@@ -352,7 +353,7 @@ exports.IndicatorCCValues = Object.freeze({
 /**
  * Looks up the configured metadata for the given indicator and property
  */
-function getIndicatorMetadata(configManager, indicatorId, propertyId, overrideIndicatorLabel) {
+function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
     const label = overrideIndicatorLabel
         || getIndicatorName(indicatorId);
     const prop = (0, safe_1.getIndicatorProperty)(propertyId);
@@ -433,7 +434,7 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
                 && typeof propertyKey === "number") {
                 const indicatorId = property;
                 const propertyId = propertyKey;
-                const expectedType = getIndicatorMetadata(this.applHost.configManager, indicatorId, propertyId).type;
+                const expectedType = getIndicatorMetadata(indicatorId, propertyId).type;
                 // V2+ value
                 if (typeof value !== expectedType) {
                     (0, API_1.throwWrongValueType)(this.ccId, property, expectedType, typeof value);
@@ -470,12 +471,12 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
     async get(indicatorId) {
         __assertType("indicatorId", "(optional) number", __assertType__optional_number.bind(void 0, indicatorId));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.Get);
-        const cc = new IndicatorCCGet(this.applHost, {
+        const cc = new IndicatorCCGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             indicatorId,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (!response)
             return;
         if (response.values)
@@ -485,32 +486,41 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
     async set(value) {
         __assertType("value", undefined, __assertType__su__number_sa__5_ea_5_5_5_eu.bind(void 0, value));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.Set);
-        const cc = new IndicatorCCSet(this.applHost, {
+        if (this.version === 1 && typeof value !== "number") {
+            throw new safe_1.ZWaveError(`Node ${this.endpoint
+                .nodeId} only supports IndicatorCC V1 which requires a single value to be set`, safe_1.ZWaveErrorCodes.Argument_Invalid);
+        }
+        else if (this.version >= 2
+            && (0, typeguards_1.isArray)(value)
+            && value.length > MAX_INDICATOR_OBJECTS) {
+            throw new safe_1.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
+        }
+        const cc = new IndicatorCCSet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...(typeof value === "number" ? { value } : { values: value }),
         });
-        return this.applHost.sendCommand(cc, this.commandOptions);
+        return this.host.sendCommand(cc, this.commandOptions);
     }
     async sendReport(options) {
-        __assertType("options", "IndicatorCCReportSpecificOptions", __assertType__IndicatorCCReportSpecificOptions.bind(void 0, options));
+        __assertType("options", "IndicatorCCReportOptions", __assertType__IndicatorCCReportOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.Report);
-        const cc = new IndicatorCCReport(this.applHost, {
+        const cc = new IndicatorCCReport({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             ...options,
         });
-        await this.applHost.sendCommand(cc, this.commandOptions);
+        await this.host.sendCommand(cc, this.commandOptions);
     }
     async getSupported(indicatorId) {
         __assertType("indicatorId", "number", __assertType__number.bind(void 0, indicatorId));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.SupportedGet);
-        const cc = new IndicatorCCSupportedGet(this.applHost, {
+        const cc = new IndicatorCCSupportedGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             indicatorId,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         if (response) {
             return {
                 // Include the actual indicator ID if 0x00 was requested
@@ -527,26 +537,26 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
         __assertType("supportedProperties", undefined, __assertType__sa__number_ea_2.bind(void 0, supportedProperties));
         __assertType("nextIndicatorId", "number", __assertType__number.bind(void 0, nextIndicatorId));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.SupportedReport);
-        const cc = new IndicatorCCSupportedReport(this.applHost, {
+        const cc = new IndicatorCCSupportedReport({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             indicatorId,
             supportedProperties,
             nextIndicatorId,
         });
-        await this.applHost.sendCommand(cc, this.commandOptions);
+        await this.host.sendCommand(cc, this.commandOptions);
     }
     async reportDescription(indicatorId, description) {
         __assertType("indicatorId", "number", __assertType__number.bind(void 0, indicatorId));
         __assertType("description", "string", __assertType__string.bind(void 0, description));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.DescriptionReport);
-        const cc = new IndicatorCCDescriptionReport(this.applHost, {
+        const cc = new IndicatorCCDescriptionReport({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             indicatorId,
             description,
         });
-        await this.applHost.sendCommand(cc, this.commandOptions);
+        await this.host.sendCommand(cc, this.commandOptions);
     }
     /**
      * Instructs the node to identify itself. Available starting with V3 of this CC.
@@ -599,7 +609,7 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
                 timeout = parsed;
             }
         }
-        const supportedPropertyIDs = IndicatorCC.getSupportedPropertyIDsCached(this.applHost, this.endpoint, indicatorId);
+        const supportedPropertyIDs = IndicatorCC.getSupportedPropertyIDsCached(this.host, this.endpoint, indicatorId);
         const objects = [];
         if (timeout) {
             const hours = timeout.hours ?? 0;
@@ -669,12 +679,12 @@ let IndicatorCCAPI = class IndicatorCCAPI extends API_1.CCAPI {
     async getDescription(indicatorId) {
         __assertType("indicatorId", "number", __assertType__number.bind(void 0, indicatorId));
         this.assertSupportsCommand(_Types_1.IndicatorCommand, _Types_1.IndicatorCommand.DescriptionGet);
-        const cc = new IndicatorCCDescriptionGet(this.applHost, {
+        const cc = new IndicatorCCDescriptionGet({
             nodeId: this.endpoint.nodeId,
-            endpoint: this.endpoint.index,
+            endpointIndex: this.endpoint.index,
             indicatorId,
         });
-        const response = await this.applHost.sendCommand(cc, this.commandOptions);
+        const response = await this.host.sendCommand(cc, this.commandOptions);
         return response?.description;
     }
 };
@@ -683,19 +693,19 @@ exports.IndicatorCCAPI = IndicatorCCAPI = __decorate([
     (0, CommandClassDecorators_1.API)(safe_1.CommandClasses.Indicator)
 ], IndicatorCCAPI);
 let IndicatorCC = class IndicatorCC 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.Indicator, 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.Indicator, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        applHost.controllerLog.logNode(node.id, {
+        ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: `Interviewing ${this.ccName}...`,
             direction: "none",
         });
-        if (this.version > 1) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version > 1) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "scanning supported indicator IDs...",
                 direction: "outbound",
@@ -706,7 +716,7 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
             do {
                 const supportedResponse = await api.getSupported(curId);
                 if (!supportedResponse) {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: "Time out while scanning supported indicator IDs, skipping interview...",
                         level: "warn",
@@ -717,18 +727,18 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
                 curId = supportedResponse.nextIndicatorId;
             } while (curId !== 0x00);
             // The IDs are not stored by the report CCs so store them here once we have all of them
-            this.setValue(applHost, exports.IndicatorCCValues.supportedIndicatorIds, supportedIndicatorIds);
+            this.setValue(ctx, exports.IndicatorCCValues.supportedIndicatorIds, supportedIndicatorIds);
             const logMessage = `supported indicator IDs: ${supportedIndicatorIds.join(", ")}`;
-            applHost.controllerLog.logNode(node.id, {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: logMessage,
                 direction: "inbound",
             });
-            if (this.version >= 4) {
+            if (api.version >= 4) {
                 const manufacturerDefinedIndicatorIds = supportedIndicatorIds
                     .filter((id) => isManufacturerDefinedIndicator(id));
                 if (manufacturerDefinedIndicatorIds.length > 0) {
-                    applHost.controllerLog.logNode(node.id, {
+                    ctx.logNode(node.id, {
                         endpoint: this.endpointIndex,
                         message: "retrieving description for manufacturer-defined indicator IDs...",
                         direction: "outbound",
@@ -740,18 +750,18 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
             }
         }
         // Query current values
-        await this.refreshValues(applHost);
+        await this.refreshValues(ctx);
         // Remember that the interview is complete
-        this.setInterviewComplete(applHost, true);
+        this.setInterviewComplete(ctx, true);
     }
-    async refreshValues(applHost) {
-        const node = this.getNode(applHost);
-        const endpoint = this.getEndpoint(applHost);
-        const api = API_1.CCAPI.create(safe_1.CommandClasses.Indicator, 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.Indicator, ctx, endpoint).withOptions({
             priority: safe_1.MessagePriority.NodeQuery,
         });
-        if (this.version === 1) {
-            applHost.controllerLog.logNode(node.id, {
+        if (api.version === 1) {
+            ctx.logNode(node.id, {
                 endpoint: this.endpointIndex,
                 message: "requesting current indicator value...",
                 direction: "outbound",
@@ -759,9 +769,9 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
             await api.get();
         }
         else {
-            const supportedIndicatorIds = this.getValue(applHost, exports.IndicatorCCValues.supportedIndicatorIds) ?? [];
+            const supportedIndicatorIds = this.getValue(ctx, exports.IndicatorCCValues.supportedIndicatorIds) ?? [];
             for (const indicatorId of supportedIndicatorIds) {
-                applHost.controllerLog.logNode(node.id, {
+                ctx.logNode(node.id, {
                     endpoint: this.endpointIndex,
                     message: `requesting current indicator value (id = ${(0, safe_2.num2hex)(indicatorId)})...`,
                     direction: "outbound",
@@ -770,7 +780,7 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
             }
         }
     }
-    translatePropertyKey(applHost, property, propertyKey) {
+    translatePropertyKey(ctx, property, propertyKey) {
         if (property === "value") {
             // CC version 1 only has a single value that doesn't need to be translated
             return undefined;
@@ -782,26 +792,26 @@ let IndicatorCC = class IndicatorCC extends CommandClass_1.CommandClass {
             if (prop)
                 return prop.label;
         }
-        return super.translatePropertyKey(applHost, property, propertyKey);
+        return super.translatePropertyKey(ctx, property, propertyKey);
     }
-    translateProperty(applHost, property, propertyKey) {
+    translateProperty(ctx, property, propertyKey) {
         if (typeof property === "number" && typeof propertyKey === "number") {
             // The indicator corresponds to our property
             if (property in safe_1.Indicator)
                 return safe_1.Indicator[property];
         }
-        return super.translateProperty(applHost, property, propertyKey);
+        return super.translateProperty(ctx, property, propertyKey);
     }
-    supportsV2Indicators(applHost) {
+    supportsV2Indicators(ctx) {
         // First test if there are any indicator ids defined
-        const supportedIndicatorIds = this.getValue(applHost, exports.IndicatorCCValues.supportedIndicatorIds);
+        const supportedIndicatorIds = this.getValue(ctx, exports.IndicatorCCValues.supportedIndicatorIds);
         if (!supportedIndicatorIds?.length)
             return false;
         // Then test if there are any property ids defined
-        return supportedIndicatorIds.some((indicatorId) => !!this.getValue(applHost, exports.IndicatorCCValues.supportedPropertyIDs(indicatorId))?.length);
+        return supportedIndicatorIds.some((indicatorId) => !!this.getValue(ctx, exports.IndicatorCCValues.supportedPropertyIDs(indicatorId))?.length);
     }
-    static getSupportedPropertyIDsCached(applHost, endpoint, indicatorId) {
-        return applHost
+    static getSupportedPropertyIDsCached(ctx, endpoint, indicatorId) {
+        return ctx
             .getValueDB(endpoint.nodeId)
             .getValue(exports.IndicatorCCValues.supportedPropertyIDs(indicatorId).endpoint(endpoint.index));
     }
@@ -812,55 +822,47 @@ exports.IndicatorCC = IndicatorCC = __decorate([
     (0, CommandClassDecorators_1.implementedVersion)(4),
     (0, CommandClassDecorators_1.ccValues)(exports.IndicatorCCValues)
 ], IndicatorCC);
-let IndicatorCCSet = class IndicatorCCSet extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            const objCount = this.payload.length >= 2
-                ? this.payload[1] & 0b11111
-                : 0;
-            if (objCount === 0) {
-                this.indicator0Value = this.payload[0];
-            }
-            else {
-                (0, safe_1.validatePayload)(this.payload.length >= 2 + 3 * objCount);
-                this.values = [];
-                for (let i = 0; i < objCount; i++) {
-                    const offset = 2 + 3 * i;
-                    const value = {
-                        indicatorId: this.payload[offset],
-                        propertyId: this.payload[offset + 1],
-                        value: this.payload[offset + 2],
-                    };
-                    this.values.push(value);
-                }
-            }
+let IndicatorCCSet = IndicatorCCSet_1 = class IndicatorCCSet extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        if ("value" in options) {
+            this.indicator0Value = options.value;
         }
         else {
-            if (this.version === 1) {
-                if (!("value" in options)) {
-                    throw new safe_1.ZWaveError(`Node ${this
-                        .nodeId} only supports IndicatorCC V1 which requires a single value to be set`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
-                this.indicator0Value = options.value;
-            }
-            else {
-                if ("value" in options) {
-                    this.indicator0Value = options.value;
-                }
-                else {
-                    if (options.values.length > MAX_INDICATOR_OBJECTS) {
-                        throw new safe_1.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-                    }
-                    this.values = options.values;
-                }
-            }
+            this.values = options.values;
+        }
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const objCount = raw.payload.length >= 2
+            ? raw.payload[1] & 0b11111
+            : 0;
+        if (objCount === 0) {
+            const indicator0Value = raw.payload[0];
+            return new IndicatorCCSet_1({
+                nodeId: ctx.sourceNodeId,
+                value: indicator0Value,
+            });
+        }
+        (0, safe_1.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
+        const values = [];
+        for (let i = 0; i < objCount; i++) {
+            const offset = 2 + 3 * i;
+            const value = {
+                indicatorId: raw.payload[offset],
+                propertyId: raw.payload[offset + 1],
+                value: raw.payload[offset + 2],
+            };
+            values.push(value);
         }
+        return new IndicatorCCSet_1({
+            nodeId: ctx.sourceNodeId,
+            values,
+        });
     }
     indicator0Value;
     values;
-    serialize() {
+    serialize(ctx) {
         if (this.values != undefined) {
             // V2+
             this.payload = Buffer.alloc(2 + 3 * this.values.length, 0);
@@ -883,9 +885,9 @@ let IndicatorCCSet = class IndicatorCCSet extends IndicatorCC {
             // V1
             this.payload = Buffer.from([this.indicator0Value ?? 0]);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         if (this.indicator0Value != undefined) {
             message["indicator 0 value"] = this.indicator0Value;
@@ -899,91 +901,95 @@ let IndicatorCCSet = class IndicatorCCSet extends IndicatorCC {
                 .join("")}`;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.IndicatorCCSet = IndicatorCCSet;
-exports.IndicatorCCSet = IndicatorCCSet = __decorate([
+exports.IndicatorCCSet = IndicatorCCSet = IndicatorCCSet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.Set),
     (0, CommandClassDecorators_1.useSupervision)()
 ], IndicatorCCSet);
-let IndicatorCCReport = class IndicatorCCReport extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            const objCount = this.payload.length >= 2
-                ? this.payload[1] & 0b11111
-                : 0;
-            if (objCount === 0) {
-                this.indicator0Value = this.payload[0];
-            }
-            else {
-                (0, safe_1.validatePayload)(this.payload.length >= 2 + 3 * objCount);
-                this.values = [];
-                for (let i = 0; i < objCount; i++) {
-                    const offset = 2 + 3 * i;
-                    const value = {
-                        indicatorId: this.payload[offset],
-                        propertyId: this.payload[offset + 1],
-                        value: this.payload[offset + 2],
-                    };
-                    this.values.push(value);
-                }
-                // TODO: Think if we want this:
-                // // If not all Property IDs are included in the command for the actual Indicator ID,
-                // // a controlling node MUST assume non-specified Property IDs values to be 0x00.
-                // const indicatorId = this.values[0].indicatorId;
-                // const supportedIndicatorProperties =
-                // 	valueDB.getValue<number[]>(
-                // 		getSupportedPropertyIDsValueID(
-                // 			this.endpointIndex,
-                // 			indicatorId,
-                // 		),
-                // 	) ?? [];
-                // // Find out which ones are missing
-                // const missingIndicatorProperties = supportedIndicatorProperties.filter(
-                // 	prop =>
-                // 		!this.values!.find(({ propertyId }) => prop === propertyId),
-                // );
-                // // And assume they are 0 (false)
-                // for (const missing of missingIndicatorProperties) {
-                // 	this.setIndicatorValue({
-                // 		indicatorId,
-                // 		propertyId: missing,
-                // 		value: 0,
-                // 	});
-                // }
-            }
+let IndicatorCCReport = IndicatorCCReport_1 = class IndicatorCCReport extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        if ("value" in options) {
+            this.indicator0Value = options.value;
         }
-        else {
-            if ("value" in options) {
-                this.indicator0Value = options.value;
-            }
-            else if ("values" in options) {
-                if (options.values.length > MAX_INDICATOR_OBJECTS) {
-                    throw new safe_1.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-                }
-                this.values = options.values;
+        else if ("values" in options) {
+            if (options.values.length > MAX_INDICATOR_OBJECTS) {
+                throw new safe_1.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
             }
+            this.values = options.values;
         }
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const objCount = raw.payload.length >= 2
+            ? raw.payload[1] & 0b11111
+            : 0;
+        if (objCount === 0) {
+            const indicator0Value = raw.payload[0];
+            return new IndicatorCCReport_1({
+                nodeId: ctx.sourceNodeId,
+                value: indicator0Value,
+            });
+        }
+        (0, safe_1.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
+        const values = [];
+        for (let i = 0; i < objCount; i++) {
+            const offset = 2 + 3 * i;
+            const value = {
+                indicatorId: raw.payload[offset],
+                propertyId: raw.payload[offset + 1],
+                value: raw.payload[offset + 2],
+            };
+            values.push(value);
+        }
+        return new IndicatorCCReport_1({
+            nodeId: ctx.sourceNodeId,
+            values,
+        });
+        // TODO: Think if we want this:
+        // // If not all Property IDs are included in the command for the actual Indicator ID,
+        // // a controlling node MUST assume non-specified Property IDs values to be 0x00.
+        // const indicatorId = this.values[0].indicatorId;
+        // const supportedIndicatorProperties =
+        // 	valueDB.getValue<number[]>(
+        // 		getSupportedPropertyIDsValueID(
+        // 			this.endpointIndex,
+        // 			indicatorId,
+        // 		),
+        // 	) ?? [];
+        // // Find out which ones are missing
+        // const missingIndicatorProperties = supportedIndicatorProperties.filter(
+        // 	prop =>
+        // 		!this.values!.find(({ propertyId }) => prop === propertyId),
+        // );
+        // // And assume they are 0 (false)
+        // for (const missing of missingIndicatorProperties) {
+        // 	this.setIndicatorValue({
+        // 		indicatorId,
+        // 		propertyId: missing,
+        // 		value: 0,
+        // 	});
+        // }
+    }
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         if (this.indicator0Value != undefined) {
-            if (!this.supportsV2Indicators(applHost)) {
+            if (!this.supportsV2Indicators(ctx)) {
                 // Publish the value
                 const valueV1 = exports.IndicatorCCValues.valueV1;
-                this.setMetadata(applHost, valueV1);
-                this.setValue(applHost, valueV1, this.indicator0Value);
+                this.setMetadata(ctx, valueV1);
+                this.setValue(ctx, valueV1, this.indicator0Value);
             }
             else {
                 if (this.isSinglecast()) {
                     // Don't!
-                    applHost.controllerLog.logNode(this.nodeId, {
+                    ctx.logNode(this.nodeId, {
                         message: `ignoring V1 indicator report because the node supports V2 indicators`,
                         direction: "none",
                         endpoint: this.endpointIndex,
@@ -994,7 +1000,7 @@ let IndicatorCCReport = class IndicatorCCReport extends IndicatorCC {
         else if (this.values) {
             // Store the simple values first
             for (const value of this.values) {
-                this.setIndicatorValue(applHost, value);
+                this.setIndicatorValue(ctx, value);
             }
             // Then group values into the convenience properties
             // ... timeout
@@ -1007,29 +1013,29 @@ let IndicatorCCReport = class IndicatorCCReport extends IndicatorCC {
                     timeoutString += `${timeout.minutes}m`;
                 if (timeout?.seconds)
                     timeoutString += `${timeout.seconds}s`;
-                this.setValue(applHost, exports.IndicatorCCValues.timeout, timeoutString);
+                this.setValue(ctx, exports.IndicatorCCValues.timeout, timeoutString);
             }
         }
         return true;
     }
     indicator0Value;
     values;
-    setIndicatorValue(applHost, value) {
+    setIndicatorValue(ctx, value) {
         // Manufacturer-defined indicators may need a custom label
         const overrideIndicatorLabel = isManufacturerDefinedIndicator(value.indicatorId)
-            ? this.getValue(applHost, exports.IndicatorCCValues.indicatorDescription(value.indicatorId))
+            ? this.getValue(ctx, exports.IndicatorCCValues.indicatorDescription(value.indicatorId))
             : undefined;
-        const metadata = getIndicatorMetadata(applHost.configManager, value.indicatorId, value.propertyId, overrideIndicatorLabel);
+        const metadata = getIndicatorMetadata(value.indicatorId, value.propertyId, overrideIndicatorLabel);
         // Some values need to be converted
         if (metadata.type === "boolean") {
             value.value = !!value.value;
         }
         // Publish the value
         const valueV2 = exports.IndicatorCCValues.valueV2(value.indicatorId, value.propertyId);
-        this.setMetadata(applHost, valueV2, metadata);
-        this.setValue(applHost, valueV2, value.value);
+        this.setMetadata(ctx, valueV2, metadata);
+        this.setValue(ctx, valueV2, value.value);
     }
-    serialize() {
+    serialize(ctx) {
         if (this.values != undefined) {
             // V2+
             this.payload = Buffer.alloc(2 + 3 * this.values.length, 0);
@@ -1052,9 +1058,9 @@ let IndicatorCCReport = class IndicatorCCReport extends IndicatorCC {
             // V1
             this.payload = Buffer.from([this.indicator0Value ?? 0]);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         const message = {};
         if (this.indicator0Value != undefined) {
             message["indicator 0 value"] = this.indicator0Value;
@@ -1068,37 +1074,40 @@ let IndicatorCCReport = class IndicatorCCReport extends IndicatorCC {
                 .join("")}`;
         }
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message,
         };
     }
 };
 exports.IndicatorCCReport = IndicatorCCReport;
-exports.IndicatorCCReport = IndicatorCCReport = __decorate([
+exports.IndicatorCCReport = IndicatorCCReport = IndicatorCCReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.Report)
 ], IndicatorCCReport);
-let IndicatorCCGet = class IndicatorCCGet extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            if (this.payload.length > 0) {
-                this.indicatorId = this.payload[0];
-            }
-        }
-        else {
-            this.indicatorId = options.indicatorId;
+let IndicatorCCGet = IndicatorCCGet_1 = class IndicatorCCGet extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        this.indicatorId = options.indicatorId;
+    }
+    static from(raw, ctx) {
+        let indicatorId;
+        if (raw.payload.length > 0) {
+            indicatorId = raw.payload[0];
         }
+        return new IndicatorCCGet_1({
+            nodeId: ctx.sourceNodeId,
+            indicatorId,
+        });
     }
     indicatorId;
-    serialize() {
+    serialize(ctx) {
         if (this.indicatorId != undefined) {
             this.payload = Buffer.from([this.indicatorId]);
         }
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 indicator: getIndicatorName(this.indicatorId),
             },
@@ -1106,46 +1115,51 @@ let IndicatorCCGet = class IndicatorCCGet extends IndicatorCC {
     }
 };
 exports.IndicatorCCGet = IndicatorCCGet;
-exports.IndicatorCCGet = IndicatorCCGet = __decorate([
+exports.IndicatorCCGet = IndicatorCCGet = IndicatorCCGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.Get),
     (0, CommandClassDecorators_1.expectedCCResponse)(IndicatorCCReport)
 ], IndicatorCCGet);
-let IndicatorCCSupportedReport = class IndicatorCCSupportedReport extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 3);
-            this.indicatorId = this.payload[0];
-            this.nextIndicatorId = this.payload[1];
-            const bitMaskLength = this.payload[2] & 0b11111;
-            if (bitMaskLength === 0) {
-                this.supportedProperties = [];
-            }
-            else {
-                (0, safe_1.validatePayload)(this.payload.length >= 3 + bitMaskLength);
-                // The bit mask starts at 0, but bit 0 is not used
-                this.supportedProperties = (0, safe_1.parseBitMask)(this.payload.subarray(3, 3 + bitMaskLength), 0).filter((v) => v !== 0);
-            }
+let IndicatorCCSupportedReport = IndicatorCCSupportedReport_1 = class IndicatorCCSupportedReport extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        this.indicatorId = options.indicatorId;
+        this.nextIndicatorId = options.nextIndicatorId;
+        this.supportedProperties = options.supportedProperties;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 3);
+        const indicatorId = raw.payload[0];
+        const nextIndicatorId = raw.payload[1];
+        const bitMaskLength = raw.payload[2] & 0b11111;
+        let supportedProperties;
+        if (bitMaskLength === 0) {
+            supportedProperties = [];
         }
         else {
-            this.indicatorId = options.indicatorId;
-            this.nextIndicatorId = options.nextIndicatorId;
-            this.supportedProperties = options.supportedProperties;
+            (0, safe_1.validatePayload)(raw.payload.length >= 3 + bitMaskLength);
+            // The bit mask starts at 0, but bit 0 is not used
+            supportedProperties = (0, safe_1.parseBitMask)(raw.payload.subarray(3, 3 + bitMaskLength), 0).filter((v) => v !== 0);
         }
+        return new IndicatorCCSupportedReport_1({
+            nodeId: ctx.sourceNodeId,
+            indicatorId,
+            nextIndicatorId,
+            supportedProperties,
+        });
     }
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         if (this.indicatorId !== 0x00) {
             // Remember which property IDs are supported
-            this.setValue(applHost, exports.IndicatorCCValues.supportedPropertyIDs(this.indicatorId), this.supportedProperties);
+            this.setValue(ctx, exports.IndicatorCCValues.supportedPropertyIDs(this.indicatorId), this.supportedProperties);
         }
         return true;
     }
     indicatorId;
     nextIndicatorId;
     supportedProperties;
-    serialize() {
+    serialize(ctx) {
         const bitmask = this.supportedProperties.length > 0
             ? (0, safe_1.encodeBitMask)(this.supportedProperties, undefined, 0)
             : Buffer.from([]);
@@ -1157,11 +1171,11 @@ let IndicatorCCSupportedReport = class IndicatorCCSupportedReport extends Indica
             ]),
             bitmask,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 indicator: getIndicatorName(this.indicatorId),
                 "supported properties": `${this.supportedProperties
@@ -1174,31 +1188,33 @@ let IndicatorCCSupportedReport = class IndicatorCCSupportedReport extends Indica
     }
 };
 exports.IndicatorCCSupportedReport = IndicatorCCSupportedReport;
-exports.IndicatorCCSupportedReport = IndicatorCCSupportedReport = __decorate([
+exports.IndicatorCCSupportedReport = IndicatorCCSupportedReport = IndicatorCCSupportedReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.SupportedReport)
 ], IndicatorCCSupportedReport);
 function testResponseForIndicatorSupportedGet(sent, received) {
     return sent.indicatorId === 0 || received.indicatorId === sent.indicatorId;
 }
-let IndicatorCCSupportedGet = class IndicatorCCSupportedGet extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.indicatorId = this.payload[0];
-        }
-        else {
-            this.indicatorId = options.indicatorId;
-        }
+let IndicatorCCSupportedGet = IndicatorCCSupportedGet_1 = class IndicatorCCSupportedGet extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        this.indicatorId = options.indicatorId;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const indicatorId = raw.payload[0];
+        return new IndicatorCCSupportedGet_1({
+            nodeId: ctx.sourceNodeId,
+            indicatorId,
+        });
     }
     indicatorId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.indicatorId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 indicator: getIndicatorName(this.indicatorId),
             },
@@ -1206,48 +1222,51 @@ let IndicatorCCSupportedGet = class IndicatorCCSupportedGet extends IndicatorCC
     }
 };
 exports.IndicatorCCSupportedGet = IndicatorCCSupportedGet;
-exports.IndicatorCCSupportedGet = IndicatorCCSupportedGet = __decorate([
+exports.IndicatorCCSupportedGet = IndicatorCCSupportedGet = IndicatorCCSupportedGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.SupportedGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(IndicatorCCSupportedReport, testResponseForIndicatorSupportedGet)
 ], IndicatorCCSupportedGet);
-let IndicatorCCDescriptionReport = class IndicatorCCDescriptionReport extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.indicatorId = this.payload[0];
-            const descrptionLength = this.payload[1];
-            (0, safe_1.validatePayload)(this.payload.length >= 2 + descrptionLength);
-            this.description = this.payload
-                .subarray(2, 2 + descrptionLength)
-                .toString("utf8");
-        }
-        else {
-            this.indicatorId = options.indicatorId;
-            this.description = options.description;
-        }
+let IndicatorCCDescriptionReport = IndicatorCCDescriptionReport_1 = class IndicatorCCDescriptionReport extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        this.indicatorId = options.indicatorId;
+        this.description = options.description;
+    }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 2);
+        const indicatorId = raw.payload[0];
+        const descrptionLength = raw.payload[1];
+        (0, safe_1.validatePayload)(raw.payload.length >= 2 + descrptionLength);
+        const description = raw.payload
+            .subarray(2, 2 + descrptionLength)
+            .toString("utf8");
+        return new IndicatorCCDescriptionReport_1({
+            nodeId: ctx.sourceNodeId,
+            indicatorId,
+            description,
+        });
     }
     indicatorId;
     description;
-    persistValues(applHost) {
-        if (!super.persistValues(applHost))
+    persistValues(ctx) {
+        if (!super.persistValues(ctx))
             return false;
         if (this.description) {
-            this.setValue(applHost, exports.IndicatorCCValues.indicatorDescription(this.indicatorId), this.description);
+            this.setValue(ctx, exports.IndicatorCCValues.indicatorDescription(this.indicatorId), this.description);
         }
         return true;
     }
-    serialize() {
+    serialize(ctx) {
         const description = Buffer.from(this.description, "utf8");
         this.payload = Buffer.concat([
             Buffer.from([this.indicatorId, description.length]),
             description,
         ]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "indicator ID": this.indicatorId,
                 description: this.description || "(none)",
@@ -1256,34 +1275,36 @@ let IndicatorCCDescriptionReport = class IndicatorCCDescriptionReport extends In
     }
 };
 exports.IndicatorCCDescriptionReport = IndicatorCCDescriptionReport;
-exports.IndicatorCCDescriptionReport = IndicatorCCDescriptionReport = __decorate([
+exports.IndicatorCCDescriptionReport = IndicatorCCDescriptionReport = IndicatorCCDescriptionReport_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.DescriptionReport)
 ], IndicatorCCDescriptionReport);
 function testResponseForIndicatorDescriptionGet(sent, received) {
     return received.indicatorId === sent.indicatorId;
 }
-let IndicatorCCDescriptionGet = class IndicatorCCDescriptionGet extends IndicatorCC {
-    constructor(host, options) {
-        super(host, options);
-        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 1);
-            this.indicatorId = this.payload[0];
-        }
-        else {
-            this.indicatorId = options.indicatorId;
-            if (!isManufacturerDefinedIndicator(this.indicatorId)) {
-                throw new safe_1.ZWaveError("The indicator ID must be between 0x80 and 0x9f", safe_1.ZWaveErrorCodes.Argument_Invalid);
-            }
+let IndicatorCCDescriptionGet = IndicatorCCDescriptionGet_1 = class IndicatorCCDescriptionGet extends IndicatorCC {
+    constructor(options) {
+        super(options);
+        this.indicatorId = options.indicatorId;
+        if (!isManufacturerDefinedIndicator(this.indicatorId)) {
+            throw new safe_1.ZWaveError("The indicator ID must be between 0x80 and 0x9f", safe_1.ZWaveErrorCodes.Argument_Invalid);
         }
     }
+    static from(raw, ctx) {
+        (0, safe_1.validatePayload)(raw.payload.length >= 1);
+        const indicatorId = raw.payload[0];
+        return new IndicatorCCDescriptionGet_1({
+            nodeId: ctx.sourceNodeId,
+            indicatorId,
+        });
+    }
     indicatorId;
-    serialize() {
+    serialize(ctx) {
         this.payload = Buffer.from([this.indicatorId]);
-        return super.serialize();
+        return super.serialize(ctx);
     }
-    toLogEntry(host) {
+    toLogEntry(ctx) {
         return {
-            ...super.toLogEntry(host),
+            ...super.toLogEntry(ctx),
             message: {
                 "indicator ID": this.indicatorId,
             },
@@ -1291,7 +1312,7 @@ let IndicatorCCDescriptionGet = class IndicatorCCDescriptionGet extends Indicato
     }
 };
 exports.IndicatorCCDescriptionGet = IndicatorCCDescriptionGet;
-exports.IndicatorCCDescriptionGet = IndicatorCCDescriptionGet = __decorate([
+exports.IndicatorCCDescriptionGet = IndicatorCCDescriptionGet = IndicatorCCDescriptionGet_1 = __decorate([
     (0, CommandClassDecorators_1.CCCommand)(_Types_1.IndicatorCommand.DescriptionGet),
     (0, CommandClassDecorators_1.expectedCCResponse)(IndicatorCCDescriptionReport, testResponseForIndicatorDescriptionGet)
 ], IndicatorCCDescriptionGet);