zwave-js 15.10.0 → 15.11.0

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

@@ -1,3 +1,3 @@
-export declare const PACKAGE_VERSION = "15.10.0";
+export declare const PACKAGE_VERSION = "15.11.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.10.0";
+const PACKAGE_VERSION = "15.11.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.10.0\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
+  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.11.0\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
   "names": []
 }

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

@@ -491,6 +491,12 @@ let ZWaveController = (() => {
     set provisioningList(value) {
       this.driver.cacheSet(import_NetworkCache.cacheKeys.controller.provisioningList, value);
     }
+    /** @internal Tracks the number of failed SmartStart inclusion attempts per DSK */
+    _smartStartFailedAttempts = /* @__PURE__ */ new Map();
+    /** @internal Resets the SmartStart inclusion failure counter for the given DSK */
+    resetSmartStartFailureCount(dsk) {
+      this._smartStartFailedAttempts.delete(dsk);
+    }
     /** Adds the given entry (DSK and security classes) to the controller's SmartStart provisioning list or replaces an existing entry */
     provisionSmartStartNode(entry) {
       this.assertFeature(import_Features.ZWaveFeature.SmartStart);
@@ -503,6 +509,7 @@ let ZWaveController = (() => {
         provisioningList[index] = entry;
       }
       this.provisioningList = provisioningList;
+      this.resetSmartStartFailureCount(entry.dsk);
       this.autoProvisionSmartStart();
     }
     /**
@@ -519,6 +526,7 @@ let ZWaveController = (() => {
       if (index >= 0) {
         provisioningList.splice(index, 1);
         this.provisioningList = provisioningList;
+        this.resetSmartStartFailureCount(entry.dsk);
         this.autoProvisionSmartStart();
       }
     }
@@ -1398,6 +1406,33 @@ let ZWaveController = (() => {
         }
       }
       if (smartStartFailed) {
+        if (opts.strategy === import_Inclusion.InclusionStrategy.SmartStart && opts.provisioning?.dsk) {
+          const dsk = opts.provisioning.dsk;
+          const maxAttempts = this.driver.options.attempts.smartStartInclusion;
+          const currentAttempts = this._smartStartFailedAttempts.get(dsk) || 0;
+          const newAttempts = currentAttempts + 1;
+          this._smartStartFailedAttempts.set(dsk, newAttempts);
+          this.driver.controllerLog.logNode(newNode.id, {
+            message: `SmartStart inclusion failed for DSK ${dsk} (attempt ${newAttempts}/${maxAttempts}).`,
+            level: "warn"
+          });
+          if (newAttempts >= maxAttempts) {
+            const provisioningList = [...this.provisioningList];
+            const entryIndex = provisioningList.findIndex((e) => e.dsk === dsk);
+            if (entryIndex >= 0) {
+              provisioningList[entryIndex] = {
+                ...provisioningList[entryIndex],
+                status: import_Inclusion.ProvisioningEntryStatus.Inactive
+              };
+              this.provisioningList = provisioningList;
+              this.resetSmartStartFailureCount(dsk);
+              this.driver.controllerLog.logNode(newNode.id, {
+                message: `Provisioning entry for DSK ${dsk} has been disabled after ${maxAttempts} failed inclusion attempts.`,
+                level: "warn"
+              });
+            }
+          }
+        }
         try {
           this.driver.controllerLog.logNode(newNode.id, {
             message: "SmartStart inclusion failed. Checking if the node needs to be removed.",
@@ -1421,6 +1456,12 @@ let ZWaveController = (() => {
         lowSecurity: true,
         lowSecurityReason: bootstrapFailure
       } : { lowSecurity: false };
+      if (opts.strategy === import_Inclusion.InclusionStrategy.SmartStart && opts.provisioning?.dsk) {
+        const dsk = opts.provisioning.dsk;
+        if (this._smartStartFailedAttempts.has(dsk)) {
+          this._smartStartFailedAttempts.delete(dsk);
+        }
+      }
       this.emit("node added", newNode, result);
     }
     /**
@@ -4623,7 +4664,8 @@ let ZWaveController = (() => {
       }
       const ret = new import_shared.Bytes(size);
       let offset = 0;
-      let chunkSize = Math.min(65535, ret.length);
+      const initialChunkSize = this._manufacturerId === 134 && this._productType === 1 && this._productId === 90 ? 48 : 65535;
+      let chunkSize = Math.min(initialChunkSize, ret.length);
       while (offset < ret.length) {
         const chunk = await this.externalNVMReadBuffer(offset, Math.min(chunkSize, ret.length - offset));
         if (chunk.length === 0) {
@@ -4698,15 +4740,24 @@ let ZWaveController = (() => {
         throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before restoring NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
       }
       await this.stopWatchdog();
+      this.driver.controllerLog.print("Converting NVM to target format...");
+      let targetNVM;
+      let convertedNVM;
       try {
-        this.driver.controllerLog.print("Converting NVM to target format...");
-        let targetNVM;
         if (this.sdkVersionGte("7.0")) {
           targetNVM = await this.backupNVMRaw700(convertProgress);
         } else {
           targetNVM = await this.backupNVMRaw500(convertProgress);
         }
-        const convertedNVM = await (0, import_nvmedit.migrateNVM)(nvmData, targetNVM, migrateOptions);
+        convertedNVM = await (0, import_nvmedit.migrateNVM)(nvmData, targetNVM, migrateOptions);
+      } catch (e) {
+        await this.toggleRF(true);
+        const message = "Failed to convert NVM to target format: " + e.message;
+        this.driver.controllerLog.print(message, "error");
+        e.message = message;
+        throw e;
+      }
+      try {
         this.driver.controllerLog.print("Restoring NVM backup...");
         if (this.sdkVersionGte("7.0")) {
           await this.restoreNVMRaw700(convertedNVM, restoreProgress);
@@ -4714,8 +4765,12 @@ let ZWaveController = (() => {
           await this.restoreNVMRaw500(convertedNVM, restoreProgress);
         }
         this.driver.controllerLog.print("NVM backup restored. Restarting to activate the restored backup...");
-      } catch {
+      } catch (e) {
         await this.toggleRF(true);
+        const message = "Failed to restore NVM backup: " + e.message;
+        this.driver.controllerLog.print(message, "error");
+        e.message = message;
+        throw e;
       }
       this._nodes.clear();
       await this.driver.softResetAndRestart();