@zwave-js/cc 15.1.1 → 15.2.0

package/build/cjs/cc/IndicatorCC.js

@@ -43,9 +43,7 @@ __export(IndicatorCC_exports, {
 module.exports = __toCommonJS(IndicatorCC_exports);
 var __validateArgs = __toESM(require("./IndicatorCC._validateArgs.js"), 1);
 var import_core = require("@zwave-js/core");
-var import_safe = require("@zwave-js/core/safe");
-var import_safe2 = require("@zwave-js/shared/safe");
-var import_safe3 = require("@zwave-js/shared/safe");
+var import_shared = require("@zwave-js/shared");
 var import_math = require("alcalzone-shared/math");
 var import_typeguards = require("alcalzone-shared/typeguards");
 var import_API = require("../lib/API.js");
@@ -138,24 +136,24 @@ function indicatorObjectsToTimeout(values) {
 __name(indicatorObjectsToTimeout, "indicatorObjectsToTimeout");
 function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
   const label = overrideIndicatorLabel || getIndicatorName(indicatorId);
-  const prop = (0, import_safe.getIndicatorProperty)(propertyId);
+  const prop = (0, import_core.getIndicatorProperty)(propertyId);
   const baseMetadata = import_CCValues_generated.IndicatorCCValues.valueV2(indicatorId, propertyId).meta;
   if (!label && !prop) {
     return {
       ...baseMetadata,
-      ...import_safe.ValueMetadata.UInt8
+      ...import_core.ValueMetadata.UInt8
     };
   } else if (!prop) {
     return {
       ...baseMetadata,
-      ...import_safe.ValueMetadata.UInt8,
+      ...import_core.ValueMetadata.UInt8,
       label
     };
   } else {
     if (prop.type === "boolean") {
       return {
         ...baseMetadata,
-        ...import_safe.ValueMetadata.Boolean,
+        ...import_core.ValueMetadata.Boolean,
         label: `${label} - ${prop.label}`,
         description: prop.description,
         readable: !prop.readonly
@@ -163,7 +161,7 @@ function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
     } else {
       return {
         ...baseMetadata,
-        ...import_safe.ValueMetadata.UInt8,
+        ...import_core.ValueMetadata.UInt8,
         label: `${label} - ${prop.label}`,
         description: prop.description,
         min: prop.min,
@@ -176,7 +174,7 @@ function getIndicatorMetadata(indicatorId, propertyId, overrideIndicatorLabel) {
 __name(getIndicatorMetadata, "getIndicatorMetadata");
 function getIndicatorName(indicatorId) {
   if (indicatorId) {
-    return `${(0, import_safe3.num2hex)(indicatorId)} (${indicatorId in import_core.Indicator ? import_core.Indicator[indicatorId] : "Unknown"})`;
+    return `${(0, import_shared.num2hex)(indicatorId)} (${indicatorId in import_core.Indicator ? import_core.Indicator[indicatorId] : "Unknown"})`;
   } else {
     return "0 (default)";
   }
@@ -184,7 +182,7 @@ function getIndicatorName(indicatorId) {
 __name(getIndicatorName, "getIndicatorName");
 const MAX_INDICATOR_OBJECTS = 31;
 let IndicatorCCAPI = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_safe.CommandClasses.Indicator)];
+  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_core.CommandClasses.Indicator)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -306,9 +304,9 @@ let IndicatorCCAPI = (() => {
     async set(value) {
       this.assertSupportsCommand(import_Types.IndicatorCommand, import_Types.IndicatorCommand.Set);
       if (this.version === 1 && typeof value !== "number") {
-        throw new import_safe.ZWaveError(`Node ${this.endpoint.nodeId} only supports IndicatorCC V1 which requires a single value to be set`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+        throw new import_core.ZWaveError(`Node ${this.endpoint.nodeId} only supports IndicatorCC V1 which requires a single value to be set`, import_core.ZWaveErrorCodes.Argument_Invalid);
       } else if (this.version >= 2 && (0, import_typeguards.isArray)(value) && value.length > MAX_INDICATOR_OBJECTS) {
-        throw new import_safe.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+        throw new import_core.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, import_core.ZWaveErrorCodes.Argument_Invalid);
       }
       const cc = new IndicatorCCSet({
         nodeId: this.endpoint.nodeId,
@@ -369,7 +367,7 @@ let IndicatorCCAPI = (() => {
      */
     async identify() {
       if (this.version < 3) {
-        throw new import_safe.ZWaveError(`The identify command is only supported in Indicator CC version 3 and above`, import_safe.ZWaveErrorCodes.CC_NotSupported);
+        throw new import_core.ZWaveError(`The identify command is only supported in Indicator CC version 3 and above`, import_core.ZWaveErrorCodes.CC_NotSupported);
       }
       return this.set([
         {
@@ -399,7 +397,7 @@ let IndicatorCCAPI = (() => {
     async setTimeout(indicatorId, timeout) {
       this.assertPhysicalEndpoint(this.endpoint);
       if (this.version < 3) {
-        throw new import_safe.ZWaveError(`The setTimeout command is only supported in Indicator CC version 3 and above`, import_safe.ZWaveErrorCodes.CC_NotSupported);
+        throw new import_core.ZWaveError(`The setTimeout command is only supported in Indicator CC version 3 and above`, import_core.ZWaveErrorCodes.CC_NotSupported);
       }
       if (typeof timeout === "string") {
         if (timeout === "") {
@@ -407,7 +405,7 @@ let IndicatorCCAPI = (() => {
         } else {
           const parsed = parseIndicatorTimeoutString(timeout);
           if (!parsed) {
-            throw new import_safe.ZWaveError(`The timeout string "${timeout}" is not valid`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+            throw new import_core.ZWaveError(`The timeout string "${timeout}" is not valid`, import_core.ZWaveErrorCodes.Argument_Invalid);
           }
           timeout = parsed;
         }
@@ -421,7 +419,7 @@ let IndicatorCCAPI = (() => {
         const hundredths = Math.round((timeout.seconds ?? 0) % 1 * 100);
         if (hours) {
           if (!supportedPropertyIDs?.includes(10)) {
-            throw new import_safe.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in hours`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+            throw new import_core.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in hours`, import_core.ZWaveErrorCodes.Argument_Invalid);
           }
           objects.push({
             indicatorId,
@@ -431,7 +429,7 @@ let IndicatorCCAPI = (() => {
         }
         if (minutes) {
           if (!supportedPropertyIDs?.includes(6)) {
-            throw new import_safe.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in minutes`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+            throw new import_core.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in minutes`, import_core.ZWaveErrorCodes.Argument_Invalid);
           }
           objects.push({
             indicatorId,
@@ -441,7 +439,7 @@ let IndicatorCCAPI = (() => {
         }
         if (seconds) {
           if (!supportedPropertyIDs?.includes(7)) {
-            throw new import_safe.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in seconds`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+            throw new import_core.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in seconds`, import_core.ZWaveErrorCodes.Argument_Invalid);
           }
           objects.push({
             indicatorId,
@@ -451,7 +449,7 @@ let IndicatorCCAPI = (() => {
         }
         if (hundredths) {
           if (!supportedPropertyIDs?.includes(8)) {
-            throw new import_safe.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in 1/100 seconds`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+            throw new import_core.ZWaveError(`The indicator ${indicatorId} does not support setting the timeout in 1/100 seconds`, import_core.ZWaveErrorCodes.Argument_Invalid);
           }
           objects.push({
             indicatorId,
@@ -496,7 +494,7 @@ let IndicatorCCAPI = (() => {
   return IndicatorCCAPI2 = _classThis;
 })();
 let IndicatorCC = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Indicator), (0, import_CommandClassDecorators.implementedVersion)(4), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.IndicatorCCValues)];
+  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_core.CommandClasses.Indicator), (0, import_CommandClassDecorators.implementedVersion)(4), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.IndicatorCCValues)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -518,8 +516,8 @@ let IndicatorCC = (() => {
     async interview(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
-      const api = import_API.CCAPI.create(import_safe.CommandClasses.Indicator, ctx, endpoint).withOptions({
-        priority: import_safe.MessagePriority.NodeQuery
+      const api = import_API.CCAPI.create(import_core.CommandClasses.Indicator, ctx, endpoint).withOptions({
+        priority: import_core.MessagePriority.NodeQuery
       });
       ctx.logNode(node.id, {
         endpoint: this.endpointIndex,
@@ -574,8 +572,8 @@ let IndicatorCC = (() => {
     async refreshValues(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
-      const api = import_API.CCAPI.create(import_safe.CommandClasses.Indicator, ctx, endpoint).withOptions({
-        priority: import_safe.MessagePriority.NodeQuery
+      const api = import_API.CCAPI.create(import_core.CommandClasses.Indicator, ctx, endpoint).withOptions({
+        priority: import_core.MessagePriority.NodeQuery
       });
       if (api.version === 1) {
         ctx.logNode(node.id, {
@@ -589,7 +587,7 @@ let IndicatorCC = (() => {
         for (const indicatorId of supportedIndicatorIds) {
           ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
-            message: `requesting current indicator value (id = ${(0, import_safe3.num2hex)(indicatorId)})...`,
+            message: `requesting current indicator value (id = ${(0, import_shared.num2hex)(indicatorId)})...`,
             direction: "outbound"
           });
           await api.get(indicatorId);
@@ -600,7 +598,7 @@ let IndicatorCC = (() => {
       if (property === "value") {
         return void 0;
       } else if (typeof property === "number" && typeof propertyKey === "number") {
-        const prop = (0, import_safe.getIndicatorProperty)(propertyKey);
+        const prop = (0, import_core.getIndicatorProperty)(propertyKey);
         if (prop)
           return prop.label;
       }
@@ -654,7 +652,7 @@ let IndicatorCCSet = (() => {
       }
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 1);
+      (0, import_core.validatePayload)(raw.payload.length >= 1);
       const objCount = raw.payload.length >= 2 ? raw.payload[1] & 31 : 0;
       if (objCount === 0) {
         const indicator0Value = raw.payload[0];
@@ -663,7 +661,7 @@ let IndicatorCCSet = (() => {
           value: indicator0Value
         });
       }
-      (0, import_safe.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
+      (0, import_core.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
       const values = [];
       for (let i = 0; i < objCount; i++) {
         const offset = 2 + 3 * i;
@@ -683,7 +681,7 @@ let IndicatorCCSet = (() => {
     values;
     serialize(ctx) {
       if (this.values != void 0) {
-        this.payload = import_safe2.Bytes.alloc(2 + 3 * this.values.length, 0);
+        this.payload = import_shared.Bytes.alloc(2 + 3 * this.values.length, 0);
         const objCount = this.values.length & MAX_INDICATOR_OBJECTS;
         this.payload[1] = objCount;
         for (let i = 0; i < objCount; i++) {
@@ -694,7 +692,7 @@ let IndicatorCCSet = (() => {
           this.payload[offset + 2] = value === true ? 255 : value === false ? 0 : value;
         }
       } else {
-        this.payload = import_safe2.Bytes.from([this.indicator0Value ?? 0]);
+        this.payload = import_shared.Bytes.from([this.indicator0Value ?? 0]);
       }
       return super.serialize(ctx);
     }
@@ -743,13 +741,13 @@ let IndicatorCCReport = (() => {
         this.indicator0Value = options.value;
       } else if ("values" in options) {
         if (options.values.length > MAX_INDICATOR_OBJECTS) {
-          throw new import_safe.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+          throw new import_core.ZWaveError(`Only ${MAX_INDICATOR_OBJECTS} indicator values can be set at a time!`, import_core.ZWaveErrorCodes.Argument_Invalid);
         }
         this.values = options.values;
       }
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 1);
+      (0, import_core.validatePayload)(raw.payload.length >= 1);
       const objCount = raw.payload.length >= 2 ? raw.payload[1] & 31 : 0;
       if (objCount === 0) {
         const indicator0Value = raw.payload[0];
@@ -758,7 +756,7 @@ let IndicatorCCReport = (() => {
           value: indicator0Value
         });
       }
-      (0, import_safe.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
+      (0, import_core.validatePayload)(raw.payload.length >= 2 + 3 * objCount);
       const values = [];
       for (let i = 0; i < objCount; i++) {
         const offset = 2 + 3 * i;
@@ -823,7 +821,7 @@ let IndicatorCCReport = (() => {
     }
     serialize(ctx) {
       if (this.values != void 0) {
-        this.payload = import_safe2.Bytes.alloc(2 + 3 * this.values.length, 0);
+        this.payload = import_shared.Bytes.alloc(2 + 3 * this.values.length, 0);
         const objCount = this.values.length & MAX_INDICATOR_OBJECTS;
         this.payload[1] = objCount;
         for (let i = 0; i < objCount; i++) {
@@ -834,7 +832,7 @@ let IndicatorCCReport = (() => {
           this.payload[offset + 2] = value === true ? 255 : value === false ? 0 : value;
         }
       } else {
-        this.payload = import_safe2.Bytes.from([this.indicator0Value ?? 0]);
+        this.payload = import_shared.Bytes.from([this.indicator0Value ?? 0]);
       }
       return super.serialize(ctx);
     }
@@ -894,7 +892,7 @@ let IndicatorCCGet = (() => {
     indicatorId;
     serialize(ctx) {
       if (this.indicatorId != void 0) {
-        this.payload = import_safe2.Bytes.from([this.indicatorId]);
+        this.payload = import_shared.Bytes.from([this.indicatorId]);
       }
       return super.serialize(ctx);
     }
@@ -936,7 +934,7 @@ let IndicatorCCSupportedReport = (() => {
       this.supportedProperties = options.supportedProperties;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 3);
+      (0, import_core.validatePayload)(raw.payload.length >= 3);
       const indicatorId = raw.payload[0];
       const nextIndicatorId = raw.payload[1];
       const bitMaskLength = raw.payload[2] & 31;
@@ -944,8 +942,8 @@ let IndicatorCCSupportedReport = (() => {
       if (bitMaskLength === 0) {
         supportedProperties = [];
       } else {
-        (0, import_safe.validatePayload)(raw.payload.length >= 3 + bitMaskLength);
-        supportedProperties = (0, import_safe.parseBitMask)(raw.payload.subarray(3, 3 + bitMaskLength), 0).filter((v) => v !== 0);
+        (0, import_core.validatePayload)(raw.payload.length >= 3 + bitMaskLength);
+        supportedProperties = (0, import_core.parseBitMask)(raw.payload.subarray(3, 3 + bitMaskLength), 0).filter((v) => v !== 0);
       }
       return new this({
         nodeId: ctx.sourceNodeId,
@@ -966,9 +964,9 @@ let IndicatorCCSupportedReport = (() => {
     nextIndicatorId;
     supportedProperties;
     serialize(ctx) {
-      const bitmask = this.supportedProperties.length > 0 ? (0, import_safe.encodeBitMask)(this.supportedProperties, void 0, 0) : new import_safe2.Bytes();
-      this.payload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([
+      const bitmask = this.supportedProperties.length > 0 ? (0, import_core.encodeBitMask)(this.supportedProperties, void 0, 0) : new import_shared.Bytes();
+      this.payload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([
           this.indicatorId,
           this.nextIndicatorId,
           bitmask.length
@@ -982,7 +980,7 @@ let IndicatorCCSupportedReport = (() => {
         ...super.toLogEntry(ctx),
         message: {
           indicator: getIndicatorName(this.indicatorId),
-          "supported properties": `${this.supportedProperties.map((id) => (0, import_safe.getIndicatorProperty)(id)?.label ?? `Unknown (${(0, import_safe3.num2hex)(id)})`).join(", ")}`,
+          "supported properties": `${this.supportedProperties.map((id) => (0, import_core.getIndicatorProperty)(id)?.label ?? `Unknown (${(0, import_shared.num2hex)(id)})`).join(", ")}`,
           "next indicator": getIndicatorName(this.nextIndicatorId)
         }
       };
@@ -1019,7 +1017,7 @@ let IndicatorCCSupportedGet = (() => {
       this.indicatorId = options.indicatorId;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 1);
+      (0, import_core.validatePayload)(raw.payload.length >= 1);
       const indicatorId = raw.payload[0];
       return new this({
         nodeId: ctx.sourceNodeId,
@@ -1028,7 +1026,7 @@ let IndicatorCCSupportedGet = (() => {
     }
     indicatorId;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.from([this.indicatorId]);
+      this.payload = import_shared.Bytes.from([this.indicatorId]);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {
@@ -1068,10 +1066,10 @@ let IndicatorCCDescriptionReport = (() => {
       this.description = options.description;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 2);
+      (0, import_core.validatePayload)(raw.payload.length >= 2);
       const indicatorId = raw.payload[0];
       const descrptionLength = raw.payload[1];
-      (0, import_safe.validatePayload)(raw.payload.length >= 2 + descrptionLength);
+      (0, import_core.validatePayload)(raw.payload.length >= 2 + descrptionLength);
       const description = raw.payload.subarray(2, 2 + descrptionLength).toString("utf8");
       return new this({
         nodeId: ctx.sourceNodeId,
@@ -1090,9 +1088,9 @@ let IndicatorCCDescriptionReport = (() => {
       return true;
     }
     serialize(ctx) {
-      const description = import_safe2.Bytes.from(this.description, "utf8");
-      this.payload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([this.indicatorId, description.length]),
+      const description = import_shared.Bytes.from(this.description, "utf8");
+      this.payload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([this.indicatorId, description.length]),
         description
       ]);
       return super.serialize(ctx);
@@ -1138,7 +1136,7 @@ let IndicatorCCDescriptionGet = (() => {
       this.indicatorId = options.indicatorId;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 1);
+      (0, import_core.validatePayload)(raw.payload.length >= 1);
       const indicatorId = raw.payload[0];
       return new this({
         nodeId: ctx.sourceNodeId,
@@ -1147,7 +1145,7 @@ let IndicatorCCDescriptionGet = (() => {
     }
     indicatorId;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.from([this.indicatorId]);
+      this.payload = import_shared.Bytes.from([this.indicatorId]);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {