@zwave-js/cc 15.9.0 → 15.10.0

package/build/esm/cc/IndicatorCC.d.ts

@@ -1,5 +1,5 @@
 import type { CCEncodingContext, CCParsingContext } from "@zwave-js/cc";
-import { CommandClasses, type EndpointId, type GetValueDB, type MaybeNotKnown, type MessageOrCCLogEntry, type SupervisionResult, type WithAddress } from "@zwave-js/core";
+import { CommandClasses, type EndpointId, type GetValueDB, type MaybeNotKnown, type MessageOrCCLogEntry, type SupervisionResult, type ValueID, type WithAddress } from "@zwave-js/core";
 import { Bytes } from "@zwave-js/shared";
 import { CCAPI, POLL_VALUE, type PollValueImplementation, SET_VALUE, type SetValueImplementation } from "../lib/API.js";
 import { type CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext } from "../lib/CommandClass.js";
@@ -15,7 +15,7 @@ export declare const IndicatorCCValues: Readonly<{
             readonly endpoint: number;
             readonly property: "supportedIndicatorIds";
         };
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         readonly meta: Readonly<{
             readonly type: "any";
             readonly readable: true;
@@ -40,7 +40,7 @@ export declare const IndicatorCCValues: Readonly<{
             readonly endpoint: number;
             readonly property: "value";
         };
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         readonly meta: {
             readonly label: "Indicator value";
             readonly ccSpecific: {
@@ -71,7 +71,7 @@ export declare const IndicatorCCValues: Readonly<{
             readonly endpoint: number;
             readonly property: "identify";
         };
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         readonly meta: {
             readonly label: "Identify";
             readonly states: {
@@ -90,86 +90,92 @@ export declare const IndicatorCCValues: Readonly<{
             readonly autoCreate: true;
         };
     };
-    timeout: {
+    supportedPropertyIDs: ((indicatorId: number) => {
         id: {
             readonly commandClass: CommandClasses.Indicator;
-            readonly property: "timeout";
+            readonly property: "supportedPropertyIDs";
+            readonly propertyKey: number;
         };
         endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "timeout";
+            readonly property: "supportedPropertyIDs";
+            readonly propertyKey: number;
         };
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
-        readonly meta: {
-            readonly label: "Timeout";
-            readonly type: "string";
+        readonly meta: Readonly<{
+            readonly type: "any";
             readonly readable: true;
             readonly writeable: true;
-        };
+        }>;
+    }) & {
+        is: (valueId: ValueID) => boolean;
         options: {
-            readonly internal: false;
-            readonly minVersion: 3;
+            readonly internal: true;
+            readonly minVersion: 1;
             readonly secret: false;
             readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
         };
     };
-    supportedPropertyIDs: ((indicatorId: number) => {
+    valueV2: ((indicatorId: number, propertyId: number) => {
         id: {
             readonly commandClass: CommandClasses.Indicator;
-            readonly property: "supportedPropertyIDs";
+            readonly property: number;
             readonly propertyKey: number;
         };
         endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
-            readonly property: "supportedPropertyIDs";
+            readonly property: number;
             readonly propertyKey: number;
         };
-        readonly meta: Readonly<{
+        readonly meta: {
+            readonly ccSpecific: {
+                readonly indicatorId: number;
+                readonly propertyId: number;
+            };
             readonly type: "any";
             readonly readable: true;
             readonly writeable: true;
-        }>;
+        };
     }) & {
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         options: {
-            readonly internal: true;
-            readonly minVersion: 1;
+            readonly internal: false;
+            readonly minVersion: 2;
             readonly secret: false;
             readonly stateful: true;
             readonly supportsEndpoints: true;
             readonly autoCreate: true;
         };
     };
-    valueV2: ((indicatorId: number, propertyId: number) => {
+    timeout: ((indicatorId: number) => {
         id: {
             readonly commandClass: CommandClasses.Indicator;
             readonly property: number;
-            readonly propertyKey: number;
+            readonly propertyKey: "timeout";
         };
         endpoint: (endpoint?: number) => {
             readonly commandClass: CommandClasses.Indicator;
             readonly endpoint: number;
             readonly property: number;
-            readonly propertyKey: number;
+            readonly propertyKey: "timeout";
         };
         readonly meta: {
+            readonly label: "Timeout";
             readonly ccSpecific: {
                 readonly indicatorId: number;
-                readonly propertyId: number;
             };
-            readonly type: "any";
+            readonly type: "string";
             readonly readable: true;
             readonly writeable: true;
         };
     }) & {
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         options: {
             readonly internal: false;
-            readonly minVersion: 2;
+            readonly minVersion: 3;
             readonly secret: false;
             readonly stateful: true;
             readonly supportsEndpoints: true;
@@ -192,7 +198,7 @@ export declare const IndicatorCCValues: Readonly<{
             readonly writeable: true;
         }>;
     }) & {
-        is: (valueId: import("@zwave-js/core").ValueID) => boolean;
+        is: (valueId: ValueID) => boolean;
         options: {
             readonly internal: true;
             readonly minVersion: 4;
@@ -203,6 +209,7 @@ export declare const IndicatorCCValues: Readonly<{
         };
     };
 }>;
+export declare function shouldExposeIndicatorValue(indicatorId: number, propertyId: number): boolean;
 export declare class IndicatorCCAPI extends CCAPI {
     supportsCommand(cmd: IndicatorCommand): MaybeNotKnown<boolean>;
     protected get [SET_VALUE](): SetValueImplementation;
@@ -242,6 +249,7 @@ export declare class IndicatorCC extends CommandClass {
     translatePropertyKey(ctx: GetValueDB, property: string | number, propertyKey: string | number): string | undefined;
     translateProperty(ctx: GetValueDB, property: string | number, propertyKey?: string | number): string;
     protected supportsV2Indicators(ctx: GetValueDB): boolean;
+    protected getManufacturerDefinedIndicatorLabel(ctx: GetValueDB, indicatorId: number): string | undefined;
     static getSupportedPropertyIDsCached(ctx: GetValueDB, endpoint: EndpointId, indicatorId: number): MaybeNotKnown<number[]>;
 }
 export interface IndicatorObject {

package/build/esm/cc/IndicatorCC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IndicatorCC.d.ts","sourceRoot":"","sources":["../../../src/cc/IndicatorCC.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IndicatorCC.d.ts","sourceRoot":"","sources":["../../../src/cc/IndicatorCC.ts"],"names":[],"mappings":"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"}

package/build/esm/cc/IndicatorCC.js

@@ -35,7 +35,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 import * as __validateArgs from "./IndicatorCC._validateArgs.js";
 const { validateArgs_IndicatorCCAPI_get, validateArgs_IndicatorCCAPI_set, validateArgs_IndicatorCCAPI_sendReport, validateArgs_IndicatorCCAPI_getSupported, validateArgs_IndicatorCCAPI_reportSupported, validateArgs_IndicatorCCAPI_reportDescription, validateArgs_IndicatorCCAPI_setTimeout, validateArgs_IndicatorCCAPI_getTimeout, validateArgs_IndicatorCCAPI_getDescription } = __validateArgs;
 import { CommandClasses, Indicator, MessagePriority, ValueMetadata, ZWaveError, ZWaveErrorCodes, encodeBitMask, getIndicatorProperty, parseBitMask, validatePayload, } from "@zwave-js/core";
-import { Bytes, num2hex } from "@zwave-js/shared";
+import { Bytes, getEnumMemberName, num2hex } from "@zwave-js/shared";
 import { clamp, roundTo } from "alcalzone-shared/math";
 import { isArray } from "alcalzone-shared/typeguards";
 import { CCAPI, POLL_VALUE, SET_VALUE, throwUnsupportedProperty, throwWrongValueType, } from "../lib/API.js";
@@ -47,6 +47,7 @@ function isManufacturerDefinedIndicator(indicatorId) {
     return indicatorId >= 0x80 && indicatorId <= 0x9f;
 }
 const timeoutStringRegex = /^(?:(?<hoursStr>\d+)h)?(?:(?<minutesStr>\d+)m)?(?:(?<secondsStr>\d+(?:\.\d+)?)s)?$/i;
+const MAX_INDICATOR_OBJECTS = 31;
 function parseIndicatorTimeoutString(text) {
     if (!text.length)
         return undefined;
@@ -69,6 +70,16 @@ function parseIndicatorTimeoutString(text) {
     }
     return ret;
 }
+function groupByIndicatorId(values) {
+    const ret = new Map();
+    for (const value of values) {
+        if (!ret.has(value.indicatorId)) {
+            ret.set(value.indicatorId, []);
+        }
+        ret.get(value.indicatorId).push(value);
+    }
+    return ret;
+}
 function indicatorObjectsToTimeout(values) {
     const timeoutValues = values.filter((v) => [0x0a, 0x06, 0x07, 0x08].includes(v.propertyId));
     if (!timeoutValues.length)
@@ -94,17 +105,10 @@ export { IndicatorCCValues };
  * Looks up the configured metadata for the given indicator and property
  */
 function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
-    const label = overrideIndicatorLabel
-        || getIndicatorName(indicatorId);
+    const label = getIndicatorLabel(indicatorId, propertyId, overrideIndicatorLabel);
     const prop = getIndicatorProperty(propertyId);
     const baseMetadata = IndicatorCCValues.valueV2(indicatorId, propertyId).meta;
-    if (!label && !prop) {
-        return {
-            ...baseMetadata,
-            ...ValueMetadata.UInt8,
-        };
-    }
-    else if (!prop) {
+    if (!prop) {
         return {
             ...baseMetadata,
             ...ValueMetadata.UInt8,
@@ -116,7 +120,7 @@ function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
             return {
                 ...baseMetadata,
                 ...ValueMetadata.Boolean,
-                label: `${label} - ${prop.label}`,
+                label,
                 description: prop.description,
                 readable: !prop.readonly,
             };
@@ -126,7 +130,7 @@ function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
             return {
                 ...baseMetadata,
                 ...ValueMetadata.UInt8,
-                label: `${label} - ${prop.label}`,
+                label,
                 description: prop.description,
                 min: prop.min,
                 max: prop.max,
@@ -137,13 +141,48 @@ function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
 }
 function getIndicatorName(indicatorId) {
     if (indicatorId) {
-        return `${num2hex(indicatorId)} (${indicatorId in Indicator ? Indicator[indicatorId] : "Unknown"})`;
+        return getEnumMemberName(Indicator, indicatorId);
     }
     else {
-        return "0 (default)";
+        return "Default";
     }
 }
-const MAX_INDICATOR_OBJECTS = 31;
+/** Returns a user-friendly label for an indicator */
+function getIndicatorLabel(indicatorId, propertyId, overrideIndicatorLabel, overridePropertyLabel) {
+    const defaultName = overrideIndicatorLabel || getIndicatorName(indicatorId);
+    // Without a defined property, we cannot suggest a better label
+    const prop = getIndicatorProperty(propertyId);
+    if (!prop)
+        return defaultName;
+    // For indicators that correspond to an LCD or buttons,
+    // the indicator enum names are enough
+    if (indicatorId >= Indicator["LCD backlight"]
+        && indicatorId <= Indicator["Button 12 indication"]
+        && (propertyId === 0x01 /* Multilevel */
+            || propertyId === 0x02 /* Binary */
+            || overridePropertyLabel) // custom property label
+    ) {
+        let ret = Indicator[indicatorId];
+        // Append the overridden property label if it exists
+        if (overridePropertyLabel) {
+            ret += ` - ${overridePropertyLabel}`;
+        }
+        return ret;
+    }
+    // Default to the current behavior of <indicator name> - <property label>
+    return `${defaultName} - ${overridePropertyLabel || prop.label}`;
+}
+export function shouldExposeIndicatorValue(indicatorId, propertyId) {
+    // Many possible indicator values are not suitable to be exposed as CC values,
+    // usually because they need to be set in groups.
+    // Indicator properties that should be exposed are marked as such
+    const prop = getIndicatorProperty(propertyId);
+    if (prop && !prop.exposeAsValue) {
+        return false;
+    }
+    // Unless we know better, expose anyways
+    return true;
+}
 let IndicatorCCAPI = (() => {
     let _classDecorators = [API(CommandClasses.Indicator)];
     let _classDescriptor;
@@ -205,6 +244,12 @@ let IndicatorCCAPI = (() => {
         }
         get [SET_VALUE]() {
             return async function ({ property, propertyKey }, value) {
+                const valueId = {
+                    commandClass: this.ccId,
+                    endpoint: this.endpoint.index,
+                    property,
+                    propertyKey,
+                };
                 if (property === "value") {
                     // V1 value
                     if (typeof value !== "number") {
@@ -212,8 +257,7 @@ let IndicatorCCAPI = (() => {
                     }
                     return this.set(value);
                 }
-                else if (typeof property === "number"
-                    && typeof propertyKey === "number") {
+                else if (IndicatorCCValues.valueV2.is(valueId)) {
                     const indicatorId = property;
                     const propertyId = propertyKey;
                     const expectedType = getIndicatorMetadata(indicatorId, propertyId).type;
@@ -223,13 +267,20 @@ let IndicatorCCAPI = (() => {
                     }
                     return this.set([
                         {
-                            indicatorId: property,
-                            propertyId: propertyKey,
+                            indicatorId,
+                            propertyId,
                             value: value,
                         },
                     ]);
                 }
-                else if (property === "identify") {
+                else if (IndicatorCCValues.timeout.is(valueId)) {
+                    const indicatorId = property;
+                    if (typeof value !== "string") {
+                        throwWrongValueType(this.ccId, property, "string", typeof value);
+                    }
+                    return this.setTimeout(indicatorId, value);
+                }
+                else if (IndicatorCCValues.identify.is(valueId)) {
                     if (typeof value !== "boolean") {
                         throwWrongValueType(this.ccId, property, "boolean", typeof value);
                     }
@@ -509,7 +560,9 @@ let IndicatorCC = (() => {
                         });
                         return;
                     }
-                    supportedIndicatorIds.push(supportedResponse.indicatorId ?? curId);
+                    if (supportedResponse.supportedProperties.length > 0) {
+                        supportedIndicatorIds.push(supportedResponse.indicatorId ?? curId);
+                    }
                     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
@@ -578,13 +631,19 @@ let IndicatorCC = (() => {
                 if (prop)
                     return prop.label;
             }
+            else if (typeof property === "number"
+                && propertyKey === "timeout") {
+                return "Timeout";
+            }
             return super.translatePropertyKey(ctx, property, propertyKey);
         }
         translateProperty(ctx, property, propertyKey) {
-            if (typeof property === "number" && typeof propertyKey === "number") {
-                // The indicator corresponds to our property
-                if (property in Indicator)
-                    return Indicator[property];
+            if (typeof property === "number") {
+                if (typeof propertyKey === "number" || propertyKey === "timeout") {
+                    // The indicator corresponds to our property
+                    if (property in Indicator)
+                        return Indicator[property];
+                }
             }
             return super.translateProperty(ctx, property, propertyKey);
         }
@@ -596,6 +655,11 @@ let IndicatorCC = (() => {
             // Then test if there are any property ids defined
             return supportedIndicatorIds.some((indicatorId) => !!this.getValue(ctx, IndicatorCCValues.supportedPropertyIDs(indicatorId))?.length);
         }
+        getManufacturerDefinedIndicatorLabel(ctx, indicatorId) {
+            if (isManufacturerDefinedIndicator(indicatorId)) {
+                return this.getValue(ctx, IndicatorCCValues.indicatorDescription(indicatorId));
+            }
+        }
         static getSupportedPropertyIDsCached(ctx, endpoint, indicatorId) {
             return ctx
                 .getValueDB(endpoint.nodeId)
@@ -812,17 +876,36 @@ let IndicatorCCReport = (() => {
                     this.setIndicatorValue(ctx, value);
                 }
                 // Then group values into the convenience properties
-                // ... timeout
-                const timeout = indicatorObjectsToTimeout(this.values);
-                if (timeout) {
-                    let timeoutString = "";
-                    if (timeout?.hours)
-                        timeoutString += `${timeout.hours}h`;
-                    if (timeout?.minutes)
-                        timeoutString += `${timeout.minutes}m`;
-                    if (timeout?.seconds)
-                        timeoutString += `${timeout.seconds}s`;
-                    this.setValue(ctx, IndicatorCCValues.timeout, timeoutString);
+                const groupedValues = groupByIndicatorId(this.values);
+                for (const [indicatorId, values] of groupedValues) {
+                    // Some devices report all properties it supports in every report,
+                    // even if it does not support all properties for the given indicator ID.
+                    // To avoid confusion, we need to filter out the unsupported properties
+                    const supportedPropertyIDs = this.getValue(ctx, IndicatorCCValues.supportedPropertyIDs(indicatorId)) ?? [];
+                    const filteredValues = values.filter((v) => supportedPropertyIDs.includes(v.propertyId));
+                    const overrideIndicatorLabel = this
+                        .getManufacturerDefinedIndicatorLabel(ctx, indicatorId);
+                    // ... timeout
+                    const timeout = indicatorObjectsToTimeout(filteredValues);
+                    if (timeout) {
+                        let timeoutString = "";
+                        if (timeout?.hours)
+                            timeoutString += `${timeout.hours}h`;
+                        if (timeout?.minutes) {
+                            timeoutString += `${timeout.minutes}m`;
+                        }
+                        if (timeout?.seconds) {
+                            timeoutString += `${timeout.seconds}s`;
+                        }
+                        const timeoutValue = IndicatorCCValues.timeout(indicatorId);
+                        const metadata = {
+                            ...timeoutValue.meta,
+                            label: getIndicatorLabel(indicatorId, 0x06, // This is actually ignored, but pass a valid ID for clarity
+                            overrideIndicatorLabel, "Timeout"),
+                        };
+                        this.setMetadata(ctx, timeoutValue, metadata);
+                        this.setValue(ctx, timeoutValue, timeoutString);
+                    }
                 }
             }
             return true;
@@ -831,14 +914,24 @@ let IndicatorCCReport = (() => {
         values;
         setIndicatorValue(ctx, value) {
             // Manufacturer-defined indicators may need a custom label
-            const overrideIndicatorLabel = isManufacturerDefinedIndicator(value.indicatorId)
-                ? this.getValue(ctx, IndicatorCCValues.indicatorDescription(value.indicatorId))
-                : undefined;
+            const overrideIndicatorLabel = this
+                .getManufacturerDefinedIndicatorLabel(ctx, value.indicatorId);
             const metadata = getIndicatorMetadata(value.indicatorId, value.propertyId, overrideIndicatorLabel);
             // Some values need to be converted
             if (metadata.type === "boolean") {
                 value.value = !!value.value;
             }
+            // Only expose the value if it should be user-facing
+            if (value.indicatorId === Indicator["Node Identify"]) {
+                return;
+            }
+            const prop = getIndicatorProperty(value.propertyId);
+            if (!prop?.exposeAsValue)
+                return;
+            // And only if it is actually supported and not just reported by accident
+            const supportedPropertyIDs = this.getValue(ctx, IndicatorCCValues.supportedPropertyIDs(value.indicatorId)) ?? [];
+            if (!supportedPropertyIDs.includes(value.propertyId))
+                return;
             // Publish the value
             const valueV2 = IndicatorCCValues.valueV2(value.indicatorId, value.propertyId);
             this.setMetadata(ctx, valueV2, metadata);