zwave-js 15.4.2 → 15.6.0

package/build/cjs/lib/_version.d.ts

@@ -1,3 +1,3 @@
-export declare const PACKAGE_VERSION = "15.4.2";
+export declare const PACKAGE_VERSION = "15.6.0";
 export declare const PACKAGE_NAME = "zwave-js";
 //# sourceMappingURL=_version.d.ts.map

package/build/cjs/lib/_version.js

@@ -22,7 +22,7 @@ __export(version_exports, {
   PACKAGE_VERSION: () => PACKAGE_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const PACKAGE_VERSION = "15.4.2";
+const PACKAGE_VERSION = "15.6.0";
 const PACKAGE_NAME = "zwave-js";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/build/cjs/lib/_version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/_version.ts"],
-  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.4.2\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
+  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.6.0\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
   "names": []
 }

package/build/cjs/lib/controller/Controller.js

@@ -736,6 +736,8 @@ let ZWaveController = (() => {
         }
       }
       let desiredRFRegion;
+      let desiredTXPowerlevelMesh;
+      let desiredTXPowerlevelLR;
       if (this.driver.options.rf?.region != void 0) {
         desiredRFRegion = this.driver.options.rf.region;
       }
@@ -747,25 +749,48 @@ let ZWaveController = (() => {
       }
       if (this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.SetRFRegion) && desiredRFRegion != void 0 && this.rfRegion != desiredRFRegion) {
         this.driver.controllerLog.print(`Current RF region (${(0, import_shared.getEnumMemberName)(import_core.RFRegion, this.rfRegion ?? import_core.RFRegion.Unknown)}) differs from desired region (${(0, import_shared.getEnumMemberName)(import_core.RFRegion, desiredRFRegion)}), configuring it...`);
+        const isRegionActuallyDifferent = this.tryGetLRCapableRegion(this.rfRegion ?? import_core.RFRegion.Unknown) !== this.tryGetLRCapableRegion(desiredRFRegion);
         const resp = await this.setRFRegionInternal(
           desiredRFRegion,
           // Do not soft reset here, we'll do it later
           false
         ).catch((e) => e.message);
         if (resp === true) {
-          this.driver.controllerLog.print(`Changed RF region to ${(0, import_shared.getEnumMemberName)(import_core.RFRegion, desiredRFRegion)}`);
+          let message = `Changed RF region to ${(0, import_shared.getEnumMemberName)(import_core.RFRegion, desiredRFRegion)}.`;
+          const applyLimitsForProtocol = [];
+          if (isRegionActuallyDifferent && this.driver.options.rf?.txPower?.powerlevel === "auto") {
+            desiredTXPowerlevelMesh = (0, import_core.getLegalPowerlevelMesh)(desiredRFRegion);
+            applyLimitsForProtocol.push("Z-Wave Classic");
+          }
+          if (isRegionActuallyDifferent && this.driver.options.rf?.maxLongRangePowerlevel === "auto") {
+            desiredTXPowerlevelLR = (0, import_core.getLegalPowerlevelLR)(desiredRFRegion);
+            applyLimitsForProtocol.push("Long Range");
+          }
+          if (applyLimitsForProtocol.length > 0) {
+            message += ` The legal powerlevel limits for ${applyLimitsForProtocol.join(" and ")} will be applied.`;
+          }
+          this.driver.controllerLog.print(message);
         } else {
           this.driver.controllerLog.print(`Changing the RF region failed!${resp ? ` Reason: ${resp}` : ""}`, "warn");
         }
       }
-      if (this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.GetPowerlevel) && this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.SetPowerlevel) && this.driver.options.rf?.txPower != void 0) {
-        const desired = this.driver.options.rf.txPower;
+      if (typeof this.driver.options.rf?.txPower?.powerlevel === "number") {
+        desiredTXPowerlevelMesh = this.driver.options.rf.txPower.powerlevel;
+      }
+      if (typeof this.driver.options.rf?.maxLongRangePowerlevel === "number") {
+        desiredTXPowerlevelLR = this.driver.options.rf.maxLongRangePowerlevel;
+      }
+      if (this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.GetPowerlevel) && this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.SetPowerlevel) && desiredTXPowerlevelMesh != void 0) {
+        const desired = {
+          powerlevel: desiredTXPowerlevelMesh,
+          measured0dBm: this.driver.options.rf?.txPower?.measured0dBm
+        };
         this.driver.controllerLog.print(`Querying configured powerlevel...`);
         const current = await this.getPowerlevel().catch(() => void 0);
         if (current != void 0) {
-          if (current.powerlevel !== desired.powerlevel || current.measured0dBm !== desired.measured0dBm) {
-            this.driver.controllerLog.print(`Current powerlevel ${current.powerlevel} dBm (${current.measured0dBm} dBm) differs from desired powerlevel ${desired.powerlevel} dBm (${desired.measured0dBm} dBm), configuring it...`);
-            const resp = await this.setPowerlevel(desired.powerlevel, desired.measured0dBm).catch((e) => e.message);
+          if (current.powerlevel !== desired.powerlevel || desired.measured0dBm != void 0 && current.measured0dBm !== desired.measured0dBm) {
+            this.driver.controllerLog.print(`Current powerlevel ${current.powerlevel} dBm (${current.measured0dBm} dBm) differs from desired powerlevel ${desired.powerlevel} dBm (${desired.measured0dBm ?? current.measured0dBm} dBm), configuring it...`);
+            const resp = await this.setPowerlevel(desired.powerlevel, desired.measured0dBm ?? current.measured0dBm).catch((e) => e.message);
             if (resp === true) {
               this.driver.controllerLog.print(`Powerlevel updated`);
             } else {
@@ -785,10 +810,9 @@ let ZWaveController = (() => {
           this.driver.controllerLog.print(`Querying the max. Long Range powerlevel failed!`, "warn");
         }
       }
-      if (this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.SetLongRangeMaximumTxPower) && this.driver.options.rf?.maxLongRangePowerlevel != void 0 && this.maxLongRangePowerlevel !== this.driver.options.rf.maxLongRangePowerlevel) {
-        const desired = this.driver.options.rf.maxLongRangePowerlevel;
-        this.driver.controllerLog.print(`Current max. Long Range powerlevel ${this.maxLongRangePowerlevel?.toFixed(1)} dBm differs from desired powerlevel ${desired} dBm, configuring it...`);
-        const resp = await this.setMaxLongRangePowerlevel(desired).catch((e) => e.message);
+      if (this.isSerialAPISetupCommandSupported(import_serialapi.SerialAPISetupCommand.SetLongRangeMaximumTxPower) && desiredTXPowerlevelLR != void 0 && this.maxLongRangePowerlevel !== desiredTXPowerlevelLR) {
+        this.driver.controllerLog.print(`Current max. Long Range powerlevel ${this.maxLongRangePowerlevel?.toFixed(1)} dBm differs from desired powerlevel ${desiredTXPowerlevelLR} dBm, configuring it...`);
+        const resp = await this.setMaxLongRangePowerlevel(desiredTXPowerlevelLR).catch((e) => e.message);
         if (resp === true) {
           this.driver.controllerLog.print(`max. Long Range powerlevel updated`);
         } else {
@@ -2541,6 +2565,7 @@ let ZWaveController = (() => {
       return {
         priority: import_Task.TaskPriority.Lower,
         tag: { id: "rebuild-routes" },
+        // @ts-expect-error FIXME: Figure out why the return types are not compatible
         task: /* @__PURE__ */ __name(async function* rebuildRoutesTask() {
           try {
             const neighbors = await self.getNodeNeighbors(self._ownNodeId);
@@ -4610,10 +4635,9 @@ let ZWaveController = (() => {
           throw new import_core.ZWaveError(`Cannot check for firmware updates for node ${node.id}: Failed to query firmware version from the node!`, import_core.ZWaveErrorCodes.FWUpdateService_MissingInformation);
         }
       }
-      const { manufacturerId, productType, productId, firmwareVersion } = node;
-      if (manufacturerId !== node.manufacturerId || productType !== node.productType || productId !== node.productId) {
+      if (node.manufacturerId !== deviceId.manufacturerId || node.productType !== deviceId.productType || node.productId !== deviceId.productId) {
         throw new import_core.ZWaveError(`Cannot update firmware for node ${node.id}: The firmware update is for a different device!`, import_core.ZWaveErrorCodes.FWUpdateService_DeviceMismatch);
-      } else if (firmwareVersion !== deviceId.firmwareVersion) {
+      } else if (node.firmwareVersion !== deviceId.firmwareVersion) {
         throw new import_core.ZWaveError(`Cannot update firmware for node ${node.id}: The update is for a different original firmware version!`, import_core.ZWaveErrorCodes.FWUpdateService_DeviceMismatch);
       }
     }