zwave-js 15.2.0 → 15.3.0

package/build/cjs/lib/driver/Driver.d.ts

@@ -64,11 +64,15 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
     private serialAPIQueue;
     /** Gives access to the transaction queues, ordered by priority */
     private get queues();
+    private initTransactionQueues;
+    private destroyTransactionQueues;
     private _scheduler;
     get scheduler(): TaskScheduler;
     private queuePaused;
     /** Used to immediately abort ongoing Serial API commands */
     private abortSerialAPICommand;
+    private initSerialAPIQueue;
+    private destroySerialAPIQueue;
     private _queuesBusyFlags;
     private _queueIdle;
     /** Whether the queue is currently idle */
@@ -359,6 +363,8 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
      */
     softReset(): Promise<void>;
     private softResetInternal;
+    /** Soft-reset the Z-Wave module and restart the driver instance */
+    softResetAndRestart(): Promise<void>;
     /**
      * Checks whether recovering an unresponsive controller is enabled
      * and whether the driver is in a state where it makes sense.
@@ -394,6 +400,10 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
      * Must be called under any circumstances.
      */
     destroy(): Promise<void>;
+    /** Cleanly destroy the controller instance, but not the entire driver */
+    private destroyController;
+    private closeDatabases;
+    private clearAllTimeouts;
     private handleSerialData;
     /**
      * Is called when the serial port has received a single-byte message or a complete message buffer
@@ -653,9 +663,9 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
     private enterBootloaderFromCLI;
     private leaveBootloaderInternal;
     /**
-     * Leaves the bootloader and destroys the driver instance if desired
+     * Leaves the bootloader by running the application.
      */
-    leaveBootloader(destroy?: boolean): Promise<void>;
+    leaveBootloader(): Promise<void>;
     private serialport_onBootloaderData;
     /**
      * Waits until a specific chunk is received from the bootloader or a timeout has elapsed. Returns the received chunk.

package/build/cjs/lib/driver/Driver.js

@@ -305,24 +305,6 @@ class Driver extends import_shared.TypedEventTarget {
       },
       getSupportedCCVersion: /* @__PURE__ */ __name((cc, nodeId, endpointIndex) => this.getSupportedCCVersion(cc, nodeId, endpointIndex), "getSupportedCCVersion")
     };
-    this.immediateQueue = new import_Queue.TransactionQueue({
-      name: "immediate",
-      mayStartNextTransaction: /* @__PURE__ */ __name((t) => {
-        if (this.controller.status === import_core.ControllerStatus.Unresponsive) {
-          return t.message instanceof import_serialapi.SoftResetRequest || t.message instanceof import_serialapi.GetControllerVersionRequest;
-        }
-        if (this.controller.status === import_core.ControllerStatus.Jammed) {
-          return t.message instanceof import_serialapi.SoftResetRequest;
-        }
-        return !this.queuePaused && this.controller.status === import_core.ControllerStatus.Ready;
-      }, "mayStartNextTransaction")
-    });
-    this.queue = new import_Queue.TransactionQueue({
-      name: "normal",
-      mayStartNextTransaction: /* @__PURE__ */ __name((t) => this.mayStartTransaction(t), "mayStartNextTransaction")
-    });
-    this.serialAPIQueue = new import_shared.AsyncQueue();
-    this._queueIdle = false;
     this._scheduler = new import_Task.TaskScheduler();
   }
   serialFactory;
@@ -342,8 +324,10 @@ class Driver extends import_shared.TypedEventTarget {
       getDeviceConfig: /* @__PURE__ */ __name((nodeId) => this.getDeviceConfig(nodeId), "getDeviceConfig"),
       sdkVersion: this._controller?.sdkVersion,
       requestStorage: this._requestStorage,
-      ownNodeId: this.controller.ownNodeId,
-      homeId: this.controller.homeId,
+      ownNodeId: this._controller?.ownNodeId ?? 0,
+      // Unspecified node ID
+      homeId: this._controller?.homeId ?? 1431655765,
+      // Invalid home ID
       nodeIdType: this._controller?.nodeIdType ?? import_core.NodeIDType.Short
     };
   }
@@ -357,14 +341,51 @@ class Driver extends import_shared.TypedEventTarget {
   // We have multiple queues to achieve multiple "layers" of communication priority:
   // The default queue for most messages
   queue;
+  // Is initialized in initTransactionQueues()
   // An immediate queue for handling queries that need to be handled ASAP, e.g. Nonce Get
   immediateQueue;
+  // Is initialized in initTransactionQueues()
   // And all of them feed into the serial API queue, which contains commands that will be sent ASAP
   serialAPIQueue;
+  // Is initialized in initControllerAndNodes()
   /** Gives access to the transaction queues, ordered by priority */
   get queues() {
     return [this.immediateQueue, this.queue];
   }
+  initTransactionQueues() {
+    this.immediateQueue = new import_Queue.TransactionQueue({
+      name: "immediate",
+      mayStartNextTransaction: /* @__PURE__ */ __name((t) => {
+        if (this.controller.status === import_core.ControllerStatus.Unresponsive) {
+          return t.message instanceof import_serialapi.SoftResetRequest || t.message instanceof import_serialapi.GetControllerVersionRequest;
+        }
+        if (this.controller.status === import_core.ControllerStatus.Jammed) {
+          return t.message instanceof import_serialapi.SoftResetRequest;
+        }
+        return !this.queuePaused && this.controller.status === import_core.ControllerStatus.Ready;
+      }, "mayStartNextTransaction")
+    });
+    this.queue = new import_Queue.TransactionQueue({
+      name: "normal",
+      mayStartNextTransaction: /* @__PURE__ */ __name((t) => this.mayStartTransaction(t), "mayStartNextTransaction")
+    });
+    this._queueIdle = false;
+    for (const queue of this.queues) {
+      void this.drainTransactionQueue(queue);
+    }
+  }
+  async destroyTransactionQueues(reason, errorCode) {
+    for (const queue of this.queues) {
+      if (!queue)
+        return;
+    }
+    if ((0, import_shared.getenv)("NODE_ENV") !== "test") {
+      await this.rejectTransactions((_t) => true, reason, errorCode ?? import_core.ZWaveErrorCodes.Driver_TaskRemoved);
+    }
+    for (const queue of this.queues) {
+      queue.abort();
+    }
+  }
   _scheduler;
   get scheduler() {
     return this._scheduler;
@@ -372,9 +393,19 @@ class Driver extends import_shared.TypedEventTarget {
   queuePaused = false;
   /** Used to immediately abort ongoing Serial API commands */
   abortSerialAPICommand;
+  initSerialAPIQueue() {
+    this.serialAPIQueue = new import_shared.AsyncQueue();
+    void this.drainSerialAPIQueue();
+  }
+  destroySerialAPIQueue(reason, errorCode) {
+    if (!this.serialAPIQueue)
+      return;
+    this.serialAPIQueue.abort();
+    this.abortSerialAPICommand?.reject(new import_core.ZWaveError(reason, errorCode ?? import_core.ZWaveErrorCodes.Driver_Destroyed));
+  }
   // Keep track of which queues are currently busy
   _queuesBusyFlags = 0;
-  _queueIdle;
+  _queueIdle = false;
   /** Whether the queue is currently idle */
   get queueIdle() {
     return this._queueIdle;
@@ -668,7 +699,11 @@ class Driver extends import_shared.TypedEventTarget {
    */
   static async enumerateSerialPorts({ local = true, remote = true } = {}) {
     const ret = [];
-    const bindings = (await import("@zwave-js/serial/bindings/node")).serial;
+    const bindings = (
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore - For some reason, VSCode does not like this import, although tsc is fine with it
+      (await import("#default_bindings/serial")).serial
+    );
     if (local && typeof bindings.list === "function") {
       for (const port of await bindings.list()) {
         if (port.type === "custom")
@@ -742,10 +777,10 @@ class Driver extends import_shared.TypedEventTarget {
       return Promise.resolve();
     this._wasStarted = true;
     this.bindings = {
-      fs: this._options.host?.fs ?? (await import("@zwave-js/core/bindings/fs/node")).fs,
-      serial: this._options.host?.serial ?? (await import("@zwave-js/serial/bindings/node")).serial,
-      db: this._options.host?.db ?? (await import("@zwave-js/core/bindings/db/jsonl")).db,
-      log: this._options.host?.log ?? (await import("@zwave-js/core/bindings/log/node")).log
+      fs: this._options.host?.fs ?? (await import("#default_bindings/fs")).fs,
+      serial: this._options.host?.serial ?? (await import("#default_bindings/serial")).serial,
+      db: this._options.host?.db ?? (await import("#default_bindings/db")).db,
+      log: this._options.host?.log ?? (await import("#default_bindings/log")).log
     };
     this._logContainer = this.bindings.log(this._options.logConfig);
     this._driverLog = new import_Driver.DriverLogger(this, this._logContainer);
@@ -791,10 +826,6 @@ class Driver extends import_shared.TypedEventTarget {
       this.driverLog.print("serial port opened");
       this._isOpen = true;
       spOpenPromise.resolve();
-      for (const queue of this.queues) {
-        void this.drainTransactionQueue(queue);
-      }
-      void this.drainSerialAPIQueue();
       this._scheduler.start();
       if (typeof this._options.testingHooks?.onSerialPortOpen === "function") {
         await this._options.testingHooks.onSerialPortOpen(this.serial);
@@ -999,10 +1030,13 @@ class Driver extends import_shared.TypedEventTarget {
    * adds event handlers and starts the interview process.
    */
   async initializeControllerAndNodes() {
-    if (this._controller == void 0) {
-      this._controller = new import_Controller.ZWaveController(this);
-      this._controller.on("node found", this.onNodeFound.bind(this)).on("node added", this.onNodeAdded.bind(this)).on("node removed", this.onNodeRemoved.bind(this)).on("status changed", this.onControllerStatusChanged.bind(this)).on("network found", this.onNetworkFound.bind(this)).on("network joined", this.onNetworkJoined.bind(this)).on("network left", this.onNetworkLeft.bind(this));
+    if (this._controller) {
+      throw new import_core.ZWaveError("The controller was already initialized!", import_core.ZWaveErrorCodes.Driver_Failed);
     }
+    this._controller = new import_Controller.ZWaveController(this);
+    this._controller.on("node found", this.onNodeFound.bind(this)).on("node added", this.onNodeAdded.bind(this)).on("node removed", this.onNodeRemoved.bind(this)).on("status changed", this.onControllerStatusChanged.bind(this)).on("network found", this.onNetworkFound.bind(this)).on("network joined", this.onNetworkJoined.bind(this)).on("network left", this.onNetworkLeft.bind(this));
+    this.initTransactionQueues();
+    this.initSerialAPIQueue();
     if (!this._options.testingHooks?.skipControllerIdentification) {
       const { nodeIds } = await this.controller.queryCapabilities();
       await this.controller.queryAndConfigureRF();
@@ -1231,7 +1265,7 @@ class Driver extends import_shared.TypedEventTarget {
       this.retryNodeInterviewTimeouts.get(node.id)?.clear();
       this.retryNodeInterviewTimeouts.delete(node.id);
     }
-    this.rejectTransactions((t) => t.message.getNodeId() === node.id && (t.priority === import_core.MessagePriority.NodeQuery || t.tag === "interview"), "The interview was restarted", import_core.ZWaveErrorCodes.Controller_InterviewRestarted);
+    await this.rejectTransactions((t) => t.message.getNodeId() === node.id && (t.priority === import_core.MessagePriority.NodeQuery || t.tag === "interview"), "The interview was restarted", import_core.ZWaveErrorCodes.Controller_InterviewRestarted);
     const maxInterviewAttempts = this._options.attempts.nodeInterview;
     try {
       if (!await node.interviewInternal()) {
@@ -1296,7 +1330,7 @@ class Driver extends import_shared.TypedEventTarget {
   onNodeWakeUp(node, oldStatus) {
     this.controllerLog.logNode(node.id, `The node is ${oldStatus === import_Types.NodeStatus.Unknown ? "" : "now "}awake.`);
     if (oldStatus === import_Types.NodeStatus.Asleep) {
-      this.reduceQueues(({ message }) => {
+      void this.reduceQueues(({ message }) => {
         if (message.getNodeId() !== node.id)
           return { type: "keep" };
         if (messageIsPing(message)) {
@@ -1519,7 +1553,7 @@ class Driver extends import_shared.TypedEventTarget {
     this.securityManager?.deleteAllNoncesForReceiver(node.id);
     this.securityManager2?.deleteNonce(node.id);
     this.securityManagerLR?.deleteNonce(node.id);
-    this.rejectAllTransactionsForNode(node.id, "The node was removed from the network", import_core.ZWaveErrorCodes.Controller_NodeRemoved);
+    void this.rejectAllTransactionsForNode(node.id, "The node was removed from the network", import_core.ZWaveErrorCodes.Controller_NodeRemoved);
     const replaced = reason === import_Inclusion.RemoveNodeReason.Replaced || reason === import_Inclusion.RemoveNodeReason.ProxyReplaced;
     if (!replaced) {
       this.controller.removeNodeFromAllAssociations(node.id).catch((err) => {
@@ -1822,8 +1856,8 @@ class Driver extends import_shared.TypedEventTarget {
       this.unpauseSendQueue();
     }
   }
-  /** @internal */
-  async softResetAndRestart(restartLogMessage, restartReason) {
+  /** Soft-reset the Z-Wave module and restart the driver instance */
+  async softResetAndRestart() {
     this.controllerLog.print("Performing soft reset...");
     try {
       this.isSoftResetting = true;
@@ -1834,12 +1868,12 @@ class Driver extends import_shared.TypedEventTarget {
     } catch (e) {
       this.controllerLog.print(`Soft reset failed: ${(0, import_shared.getErrorMessage)(e)}`, "error");
     }
+    if (!await this.ensureSerialAPI()) {
+      await this.destroyWithMessage("The Serial API did not respond after soft-reset");
+    }
     this.isSoftResetting = false;
-    this.controllerLog.print(restartLogMessage);
-    await this.destroy();
-    process.nextTick(() => {
-      this.emit("error", new import_core.ZWaveError(restartReason, import_core.ZWaveErrorCodes.Driver_Failed));
-    });
+    await this.destroyController();
+    void this.initializeControllerAndNodes();
   }
   /**
    * Checks whether recovering an unresponsive controller is enabled
@@ -1856,7 +1890,9 @@ class Driver extends import_shared.TypedEventTarget {
     let waitResult = await this.waitForMessage((msg) => msg.functionType === import_serial.FunctionType.SerialAPIStarted, 1500).catch(() => false);
     if (waitResult) {
       this.controllerLog.print("reconnected and restarted");
-      this.controller["_supportsLongRange"] = waitResult.supportsLongRange;
+      if (this._controller) {
+        this._controller["_supportsLongRange"] = waitResult.supportsLongRange;
+      }
       return true;
     }
     if (!this.serial.isOpen) {
@@ -1873,7 +1909,9 @@ class Driver extends import_shared.TypedEventTarget {
     }, this._options.timeouts.serialAPIStarted).catch(() => false);
     if (waitResult) {
       this.controllerLog.print("Serial API started");
-      this.controller["_supportsLongRange"] = waitResult.supportsLongRange;
+      if (this._controller) {
+        this._controller["_supportsLongRange"] = waitResult.supportsLongRange;
+      }
       return true;
     }
     this.controllerLog.print("Did not receive notification that Serial API has started, checking if it responds...");
@@ -1944,20 +1982,7 @@ class Driver extends import_shared.TypedEventTarget {
     await this.scheduler.removeTasks(() => true, new import_core.ZWaveError("The controller is being hard-reset", import_core.ZWaveErrorCodes.Driver_TaskRemoved));
     await this.controller.setControllerNIF();
     await this.controller.hardReset();
-    this.rejectTransactions(() => true, `The controller was hard-reset`);
-    this.sendNodeToSleepTimers.forEach((timeout) => timeout.clear());
-    this.sendNodeToSleepTimers.clear();
-    for (const timer of this.retryNodeInterviewTimeouts.values()) {
-      timer.clear();
-    }
-    this.retryNodeInterviewTimeouts.clear();
-    for (const timer of this.autoRefreshNodeValueTimers.values()) {
-      timer.clear();
-    }
-    this.autoRefreshNodeValueTimers.clear();
-    this.pollBackgroundRSSITimer?.clear();
-    this.pollBackgroundRSSITimer = void 0;
-    this._controllerInterviewed = false;
+    await this.destroyController();
     void this.initializeControllerAndNodes();
     if (oldPrivateKey) {
       this.once("driver ready", () => {
@@ -2023,15 +2048,36 @@ class Driver extends import_shared.TypedEventTarget {
     this._destroyPromise = (0, import_deferred_promise.createDeferredPromise)();
     this.driverLog.print("destroying driver instance...");
     await this._scheduler.stop();
-    this.serialAPIQueue.abort();
-    for (const queue of this.queues) {
-      queue.abort();
-    }
+    await this.destroyTransactionQueues("driver instance destroyed", import_core.ZWaveErrorCodes.Driver_Destroyed);
+    this.destroySerialAPIQueue("driver instance destroyed", import_core.ZWaveErrorCodes.Driver_Destroyed);
     if (this.serial != void 0) {
       if (this.serial.isOpen)
         await this.serial.close();
       this.serial = void 0;
     }
+    await this.destroyController();
+    this.driverLog.print(`driver instance destroyed`);
+    this._logContainer.destroy();
+    this._destroyPromise.resolve();
+  }
+  /** Cleanly destroy the controller instance, but not the entire driver */
+  // FIXME: Too much overlap with destroy()
+  async destroyController() {
+    await this.scheduler.removeTasks(() => true, new import_core.ZWaveError("The controller instance is being destroyed", import_core.ZWaveErrorCodes.Driver_TaskRemoved));
+    await this.destroyTransactionQueues("The controller instance is being destroyed", import_core.ZWaveErrorCodes.Driver_TaskRemoved);
+    this.destroySerialAPIQueue("The controller instance is being destroyed", import_core.ZWaveErrorCodes.Driver_TaskRemoved);
+    this.requestHandlers.clear();
+    await this.closeDatabases();
+    this.clearAllTimeouts();
+    if (this._controller) {
+      this._controller.destroy();
+      this._controller = void 0;
+    }
+    this._controllerInterviewed = false;
+    this._nodesReady.clear();
+    this._nodesReadyEventEmitted = false;
+  }
+  async closeDatabases() {
     try {
       await this._valueDB?.close();
     } catch (e) {
@@ -2047,6 +2093,8 @@ class Driver extends import_shared.TypedEventTarget {
     } catch (e) {
       this.driverLog.print(`Closing the network cache failed: ${(0, import_shared.getErrorMessage)(e)}`, "error");
     }
+  }
+  clearAllTimeouts() {
     for (const timeout of [
       this._powerlevelTestNodeContext?.timeout
     ]) {
@@ -2067,13 +2115,6 @@ class Driver extends import_shared.TypedEventTarget {
     ]) {
       timeout?.clear();
     }
-    if (this._controller) {
-      this._controller.destroy();
-      this._controller = void 0;
-    }
-    this.driverLog.print(`driver instance destroyed`);
-    this._logContainer.destroy();
-    this._destroyPromise.resolve();
   }
   async handleSerialData(serial) {
     try {
@@ -2437,7 +2478,7 @@ ${(0, import_shared.buffer2hex)(data)}`, "warn");
         reason: errorMsg
       });
       transaction.abort(error);
-      this.rejectAllTransactionsForNode(node.id, errorMsg);
+      void this.rejectAllTransactionsForNode(node.id, errorMsg);
       return true;
     }
   }
@@ -2521,7 +2562,7 @@ ${(0, import_shared.buffer2hex)(data)}`, "warn");
           reason: errorMsg
         });
         transaction.abort(error);
-        this.rejectAllTransactionsForNode(node.id, errorMsg);
+        void this.rejectAllTransactionsForNode(node.id, errorMsg);
         handled = true;
       }
       if (this._recoveryPhase === 4) {
@@ -3578,8 +3619,6 @@ ${handlers.length} left`);
               } else {
                 throw e;
               }
-            } else if ((0, import_serialapi.isTransmitReport)(e.context) && e.context.transmitStatus === import_core.TransmitStatus.NoAck) {
-              waitDurationMs = 100;
             } else if (e.code === import_core.ZWaveErrorCodes.Controller_MessageDropped) {
               throw e;
             }
@@ -3610,6 +3649,7 @@ ${handlers.length} left`);
   async drainSerialAPIQueue() {
     for await (const item of this.serialAPIQueue) {
       const { msg, transactionSource, result } = item;
+      this._currentSerialAPICommandPromise = result;
       attempts: for (let attempt = 1; ; attempt++) {
         try {
           const ret = await this.executeSerialAPICommand(msg, transactionSource);
@@ -3638,7 +3678,10 @@ ${handlers.length} left`);
     this.serialAPIQueue.add({
       msg,
       transactionSource,
-      result
+      result,
+      [Symbol.dispose]: () => {
+        result.reject(new import_core.ZWaveError("The message has been removed from the queue", import_core.ZWaveErrorCodes.Controller_MessageDropped, void 0, transactionSource));
+      }
     });
     return result;
   }
@@ -3830,7 +3873,7 @@ ${handlers.length} left`);
     let expirationTimeout;
     if (options.expire) {
       expirationTimeout = (0, import_shared.setTimer)(() => {
-        this.reduceQueues((t, _source) => {
+        void this.reduceQueues((t, _source) => {
           if (t === transaction) {
             return {
               type: "reject",
@@ -4217,7 +4260,7 @@ ${handlers.length} left`);
       ...requeue,
       tag: "interview"
     };
-    this.reduceQueues((transaction, _source) => {
+    void this.reduceQueues((transaction, _source) => {
       const msg = transaction.message;
       if (msg.getNodeId() !== nodeId)
         return { type: "keep" };
@@ -4229,7 +4272,7 @@ ${handlers.length} left`);
    * Rejects all pending transactions that match a predicate and removes them from the send queue
    */
   rejectTransactions(predicate, errorMsg = `The message has been removed from the queue`, errorCode = import_core.ZWaveErrorCodes.Controller_MessageDropped) {
-    this.reduceQueues((transaction, _source) => {
+    return this.reduceQueues((transaction, _source) => {
       if (predicate(transaction)) {
         return {
           type: "reject",
@@ -4246,7 +4289,7 @@ ${handlers.length} left`);
    * Rejects all pending transactions for a node and removes them from the send queue
    */
   rejectAllTransactionsForNode(nodeId, errorMsg = `The node is dead`, errorCode = import_core.ZWaveErrorCodes.Controller_MessageDropped) {
-    this.rejectTransactions((t) => t.message.getNodeId() === nodeId, errorMsg, errorCode);
+    return this.rejectTransactions((t) => t.message.getNodeId() === nodeId, errorMsg, errorCode);
   }
   /**
    * Pauses the send queue, avoiding commands to be sent to the controller
@@ -4262,9 +4305,7 @@ ${handlers.length} left`);
     this.triggerQueues();
   }
   reduceQueues(reducer) {
-    for (const queue of this.queues) {
-      this.reduceQueue(queue, reducer);
-    }
+    return Promise.all(this.queues.map((queue) => this.reduceQueue(queue, reducer))).then(import_shared.noop);
   }
   reduceQueue(queue, reducer) {
     const dropQueued = [];
@@ -4329,8 +4370,9 @@ ${handlers.length} left`);
       t.setProgress({ state: import_core.TransactionState.Queued });
     }
     if ((0, import_serialapi.isSendData)(stopActive?.message)) {
-      void this.abortSendData();
+      return this.abortSendData();
     }
+    return Promise.resolve();
   }
   /** @internal */
   resolvePendingPings(nodeId) {
@@ -4615,7 +4657,8 @@ ${handlers.length} left`);
       } else if (this.controller.sdkVersionGte("6.50.0") && this.controller.supportedFunctionTypes?.includes(import_serial.FunctionType.FirmwareUpdateNVM)) {
         const wasUpdated = await this.firmwareUpdateOTW500(data);
         if (wasUpdated.success) {
-          await this.softResetAndRestart("Activating new firmware and restarting driver...", "Controller firmware updates require a driver restart!");
+          this.driverLog.print("Activating new firmware and restarting driver...");
+          await this.softResetAndRestart();
         }
         return wasUpdated;
       }
@@ -4684,7 +4727,6 @@ ${handlers.length} left`);
   }
   async firmwareUpdateOTW700(data) {
     this._otwFirmwareUpdateInProgress = true;
-    let destroy = false;
     try {
       await this.enterBootloader();
       this.controllerLog.print("Beginning firmware upload");
@@ -4734,7 +4776,6 @@ ${handlers.length} left`);
                 progress: (0, import_math.roundTo)(fragment / numFragments * 100, 2)
               };
               this.emit("firmware update progress", progress);
-              destroy = true;
               continue transfer;
             }
             case import_serial.XModemMessageHeaders.NAK:
@@ -4791,7 +4832,7 @@ ${handlers.length} left`);
       this.emit("firmware update finished", result);
       return result;
     } finally {
-      await this.leaveBootloader(destroy);
+      await this.leaveBootloader();
       this._otwFirmwareUpdateInProgress = false;
     }
   }
@@ -4824,12 +4865,10 @@ ${handlers.length} left`);
     }
   }
   async enterBootloaderFromSerialAPI() {
-    await this.scheduler.removeTasks(() => true, new import_core.ZWaveError("The controller is entering bootloader mode.", import_core.ZWaveErrorCodes.Driver_TaskRemoved));
-    this.rejectTransactions((_t) => true, "The controller is entering bootloader mode.");
-    await this.trySoftReset();
-    this.pauseSendQueue();
-    this.rejectTransactions((_t) => true, "The controller is entering bootloader mode.");
-    const promise = this.writeSerial(import_shared.Bytes.from("01030027db", "hex"));
+    const ctx = this.getEncodingContext();
+    await this.destroyController();
+    const msg = new import_serialapi.EnterBootloaderRequest();
+    const promise = this.writeSerial(await msg.serialize(ctx));
     this.serial.mode = import_serial.ZWaveSerialMode.Bootloader;
     await promise;
   }
@@ -4844,27 +4883,21 @@ ${handlers.length} left`);
     return promise;
   }
   /**
-   * Leaves the bootloader and destroys the driver instance if desired
+   * Leaves the bootloader by running the application.
    */
-  async leaveBootloader(destroy = false) {
+  async leaveBootloader() {
     this.controllerLog.print("Leaving bootloader...");
     await this.leaveBootloaderInternal();
-    await (0, import_async.wait)(1e3);
-    if (this.mode === import_DriverMode.DriverMode.CLI) {
+    const isSerialAPI = await this.waitForMessage((msg) => msg.functionType === import_serial.FunctionType.SerialAPIStarted, 1e3).then(() => true).catch(() => false);
+    if (isSerialAPI) {
+      await this.initializeControllerAndNodes();
+      return;
+    } else if (this.mode === import_DriverMode.DriverMode.CLI) {
       await this.ensureCLIReady();
       return;
     }
-    if (destroy) {
-      const restartReason = "Restarting driver after OTW update...";
-      this.controllerLog.print(restartReason);
-      await this.destroy();
-      setImmediate(() => {
-        this.emit("error", new import_core.ZWaveError(restartReason, import_core.ZWaveErrorCodes.Driver_Failed));
-      });
-    } else {
-      this.unpauseSendQueue();
-      await this.ensureSerialAPI();
-    }
+    this.unpauseSendQueue();
+    await this.ensureSerialAPI();
   }
   serialport_onBootloaderData(data) {
     switch (data.type) {