zwave-js 15.25.0 → 15.25.2

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

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

package/build/cjs/lib/controller/Controller.d.ts

@@ -735,6 +735,7 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
      * @returns The raw NVM buffer
      */
     backupNVMRaw(onProgress?: (bytesRead: number, total: number) => void): Promise<BytesView>;
+    private getBackupNVMRawTask;
     private backupNVMRaw500;
     private backupNVMRaw700;
     /**
@@ -751,6 +752,7 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
      * @param migrateOptions Influence which data should be preserved during a migration
      */
     restoreNVM(nvmData: BytesView, convertProgress?: (bytesRead: number, total: number) => void, restoreProgress?: (bytesWritten: number, total: number) => void, migrateOptions?: MigrateNVMOptions): Promise<void>;
+    private getRestoreNVMTask;
     /**
      * Restores an NVM backup that was created with `backupNVMRaw`. The Z-Wave radio is turned off/on automatically.
      *
@@ -761,6 +763,7 @@ export declare class ZWaveController extends TypedEventTarget<ControllerEventCal
      * @param onProgress Can be used to monitor the progress of the operation, which may take several seconds up to a few minutes depending on the NVM size
      */
     restoreNVMRaw(nvmData: BytesView, onProgress?: (bytesWritten: number, total: number) => void): Promise<void>;
+    private getRestoreNVMRawTask;
     private restoreNVMRaw500;
     private restoreNVMRaw700;
     /**

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

@@ -4620,25 +4620,45 @@ let ZWaveController = (() => {
      * @param onProgress Can be used to monitor the progress of the operation, which may take several seconds up to a few minutes depending on the NVM size
      * @returns The raw NVM buffer
      */
-    async backupNVMRaw(onProgress) {
-      this.driver.controllerLog.print("Backing up NVM...");
-      if (!await this.toggleRF(false)) {
-        throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before creating NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
-      }
-      await this.stopWatchdog();
-      let ret;
-      try {
-        if (this.sdkVersionGte("7.0")) {
-          ret = await this.backupNVMRaw700(onProgress);
-          await this.driver.trySoftReset();
-        } else {
-          ret = await this.backupNVMRaw500(onProgress);
-        }
-        this.driver.controllerLog.print("NVM backup completed");
-      } finally {
-        await this.toggleRF(true);
-      }
-      return ret;
+    backupNVMRaw(onProgress) {
+      return this.driver.scheduler.queueTask(this.getBackupNVMRawTask(onProgress));
+    }
+    getBackupNVMRawTask(onProgress) {
+      const self = this;
+      let rfRestored = false;
+      return {
+        priority: import_Task.TaskPriority.Normal,
+        tag: { id: "nvm-backup" },
+        group: { id: "controller-exclusive" },
+        // The radio is off during the backup, so other tasks cannot communicate anyways
+        interrupt: import_Task.TaskInterruptBehavior.Forbidden,
+        task: /* @__PURE__ */ __name(async function* backupNVMRawTask() {
+          self.driver.controllerLog.print("Backing up NVM...");
+          if (!(yield* (0, import_waddle.waitFor)(self.toggleRF(false)))) {
+            throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before creating NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
+          }
+          yield* (0, import_waddle.waitFor)(self.stopWatchdog());
+          let ret;
+          try {
+            if (self.sdkVersionGte("7.0")) {
+              ret = yield* (0, import_waddle.waitFor)(self.backupNVMRaw700(onProgress));
+              yield* (0, import_waddle.waitFor)(self.driver.trySoftReset());
+            } else {
+              ret = yield* (0, import_waddle.waitFor)(self.backupNVMRaw500(onProgress));
+            }
+            self.driver.controllerLog.print("NVM backup completed");
+          } finally {
+            yield* (0, import_waddle.waitFor)(self.toggleRF(true));
+            rfRestored = true;
+          }
+          return ret;
+        }, "backupNVMRawTask"),
+        cleanup: /* @__PURE__ */ __name(async () => {
+          if (!rfRestored) {
+            await self.toggleRF(true);
+          }
+        }, "cleanup")
+      };
     }
     async backupNVMRaw500(onProgress) {
       const size = (0, import_serialapi.nvmSizeToBufferSize)((await this.getNVMId()).memorySize);
@@ -4718,45 +4738,67 @@ let ZWaveController = (() => {
      * @param restoreProgress Can be used to monitor the progress of the restore operation, which may take several seconds up to a few minutes depending on the NVM size
      * @param migrateOptions Influence which data should be preserved during a migration
      */
-    async restoreNVM(nvmData, convertProgress, restoreProgress, migrateOptions) {
-      if (!await this.toggleRF(false)) {
-        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 {
-        if (this.sdkVersionGte("7.0")) {
-          targetNVM = await this.backupNVMRaw700(convertProgress);
-        } else {
-          targetNVM = await this.backupNVMRaw500(convertProgress);
-        }
-        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);
-        } else {
-          await this.restoreNVMRaw500(convertedNVM, restoreProgress);
-        }
-        this.driver.controllerLog.print("NVM backup restored. Restarting to activate the restored backup...");
-      } 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();
+    restoreNVM(nvmData, convertProgress, restoreProgress, migrateOptions) {
+      return this.driver.scheduler.queueTask(this.getRestoreNVMTask(nvmData, convertProgress, restoreProgress, migrateOptions));
+    }
+    getRestoreNVMTask(nvmData, convertProgress, restoreProgress, migrateOptions) {
+      const self = this;
+      let rfRestored = false;
+      return {
+        priority: import_Task.TaskPriority.Normal,
+        tag: { id: "nvm-restore" },
+        group: { id: "controller-exclusive" },
+        // The radio is off during the restore, so other tasks cannot communicate anyways
+        interrupt: import_Task.TaskInterruptBehavior.Forbidden,
+        task: /* @__PURE__ */ __name(async function* restoreNVMTask() {
+          if (!(yield* (0, import_waddle.waitFor)(self.toggleRF(false)))) {
+            throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before restoring NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
+          }
+          yield* (0, import_waddle.waitFor)(self.stopWatchdog());
+          self.driver.controllerLog.print("Converting NVM to target format...");
+          let targetNVM;
+          let convertedNVM;
+          try {
+            if (self.sdkVersionGte("7.0")) {
+              targetNVM = yield* (0, import_waddle.waitFor)(self.backupNVMRaw700(convertProgress));
+            } else {
+              targetNVM = yield* (0, import_waddle.waitFor)(self.backupNVMRaw500(convertProgress));
+            }
+            convertedNVM = yield* (0, import_waddle.waitFor)((0, import_nvmedit.migrateNVM)(nvmData, targetNVM, migrateOptions));
+          } catch (e) {
+            yield* (0, import_waddle.waitFor)(self.toggleRF(true));
+            rfRestored = true;
+            const message = "Failed to convert NVM to target format: " + e.message;
+            self.driver.controllerLog.print(message, "error");
+            e.message = message;
+            throw e;
+          }
+          try {
+            self.driver.controllerLog.print("Restoring NVM backup...");
+            if (self.sdkVersionGte("7.0")) {
+              yield* (0, import_waddle.waitFor)(self.restoreNVMRaw700(convertedNVM, restoreProgress));
+            } else {
+              yield* (0, import_waddle.waitFor)(self.restoreNVMRaw500(convertedNVM, restoreProgress));
+            }
+            self.driver.controllerLog.print("NVM backup restored. Restarting to activate the restored backup...");
+          } catch (e) {
+            yield* (0, import_waddle.waitFor)(self.toggleRF(true));
+            rfRestored = true;
+            const message = "Failed to restore NVM backup: " + e.message;
+            self.driver.controllerLog.print(message, "error");
+            e.message = message;
+            throw e;
+          }
+          rfRestored = true;
+          self._nodes.clear();
+          yield* (0, import_waddle.waitFor)(self.driver.softResetAndRestart());
+        }, "restoreNVMTask"),
+        cleanup: /* @__PURE__ */ __name(async () => {
+          if (!rfRestored) {
+            await self.toggleRF(true);
+          }
+        }, "cleanup")
+      };
     }
     /**
      * Restores an NVM backup that was created with `backupNVMRaw`. The Z-Wave radio is turned off/on automatically.
@@ -4768,24 +4810,44 @@ let ZWaveController = (() => {
      * @param onProgress Can be used to monitor the progress of the operation, which may take several seconds up to a few minutes depending on the NVM size
      */
     async restoreNVMRaw(nvmData, onProgress) {
-      this.driver.controllerLog.print("Restoring NVM...");
-      if (!await this.toggleRF(false)) {
-        throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before restoring NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
-      }
-      try {
-        if (this.sdkVersionGte("7.0")) {
-          await this.restoreNVMRaw700(nvmData, onProgress);
-        } else {
-          await this.restoreNVMRaw500(nvmData, onProgress);
-        }
-        this.driver.controllerLog.print("NVM backup restored");
-      } finally {
-        await this.toggleRF(true);
-      }
+      await this.driver.scheduler.queueTask(this.getRestoreNVMRawTask(nvmData, onProgress));
       this.driver.controllerLog.print("Restarting driver to activate restored NVM backup...");
       this.driver.emit("error", new import_core.ZWaveError("Activating the NVM backup requires a driver restart!", import_core.ZWaveErrorCodes.Driver_Failed));
       await this.driver.destroy();
     }
+    getRestoreNVMRawTask(nvmData, onProgress) {
+      const self = this;
+      let rfRestored = false;
+      return {
+        priority: import_Task.TaskPriority.Normal,
+        tag: { id: "nvm-restore" },
+        group: { id: "controller-exclusive" },
+        // The radio is off during the restore, so other tasks cannot communicate anyways
+        interrupt: import_Task.TaskInterruptBehavior.Forbidden,
+        task: /* @__PURE__ */ __name(async function* restoreNVMRawTask() {
+          self.driver.controllerLog.print("Restoring NVM...");
+          if (!(yield* (0, import_waddle.waitFor)(self.toggleRF(false)))) {
+            throw new import_core.ZWaveError("Could not turn off the Z-Wave radio before restoring NVM backup!", import_core.ZWaveErrorCodes.Controller_ResponseNOK);
+          }
+          try {
+            if (self.sdkVersionGte("7.0")) {
+              yield* (0, import_waddle.waitFor)(self.restoreNVMRaw700(nvmData, onProgress));
+            } else {
+              yield* (0, import_waddle.waitFor)(self.restoreNVMRaw500(nvmData, onProgress));
+            }
+            self.driver.controllerLog.print("NVM backup restored");
+          } finally {
+            yield* (0, import_waddle.waitFor)(self.toggleRF(true));
+            rfRestored = true;
+          }
+        }, "restoreNVMRawTask"),
+        cleanup: /* @__PURE__ */ __name(async () => {
+          if (!rfRestored) {
+            await self.toggleRF(true);
+          }
+        }, "cleanup")
+      };
+    }
     async restoreNVMRaw500(nvmData, onProgress) {
       const size = (0, import_serialapi.nvmSizeToBufferSize)((await this.getNVMId()).memorySize);
       if (!size) {