zwave-js 15.1.0 → 15.1.1

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

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

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

@@ -224,6 +224,7 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
     private _controllerInterviewed;
     private _nodesReady;
     private _nodesReadyEventEmitted;
+    private _isOpeningSerialPort;
     private openSerialport;
     /** Indicates whether all nodes are ready, i.e. the "all nodes ready" event has been emitted */
     get allNodesReady(): boolean;
@@ -287,6 +288,8 @@ export declare class Driver extends TypedEventTarget<DriverEventCallbacks> imple
     private compileAndSendStatistics;
     /** Is called when a node interview is completed */
     private onNodeInterviewCompleted;
+    /** This is called when a new node was found and is being added to the network */
+    private onNodeFound;
     /** This is called when a new node has been added to the network */
     private onNodeAdded;
     /** This is called when a node was removed from the network */

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

@@ -810,7 +810,9 @@ class Driver extends import_shared.TypedEventTarget {
       }
       if (this._options.testingHooks?.skipFirmwareIdentification) {
         await this.writeHeader(import_serial.MessageHeaders.NAK);
-        await (0, import_async.wait)(1e3);
+        if ((0, import_shared.getenv)("NODE_ENV") !== "test") {
+          await (0, import_async.wait)(1e3);
+        }
       } else {
         const mode = await this.detectMode();
         if (mode === import_DriverMode.DriverMode.CLI) {
@@ -897,13 +899,21 @@ class Driver extends import_shared.TypedEventTarget {
   _controllerInterviewed = false;
   _nodesReady = /* @__PURE__ */ new Set();
   _nodesReadyEventEmitted = false;
+  _isOpeningSerialPort = false;
   async openSerialport() {
     let lastError;
+    this._isOpeningSerialPort = true;
     for (let attempt = 1; attempt <= this._options.attempts.openSerialPort; attempt++) {
       try {
         this.serial = await this.serialFactory.createStream();
         void this.handleSerialData(this.serial);
-        return;
+        if ((0, import_shared.getenv)("NODE_ENV") !== "test") {
+          await (0, import_async.wait)(250);
+        }
+        if (this.serial.isOpen) {
+          this._isOpeningSerialPort = false;
+          return;
+        }
       } catch (e) {
         lastError = e;
       }
@@ -911,6 +921,7 @@ class Driver extends import_shared.TypedEventTarget {
         await (0, import_async.wait)(1e3);
       }
     }
+    this._isOpeningSerialPort = false;
     const message = `Failed to open the serial port: ${(0, import_shared.getErrorMessage)(lastError)}`;
     this.driverLog.print(message, "error");
     throw new import_core.ZWaveError(message, import_core.ZWaveErrorCodes.Driver_Failed);
@@ -999,7 +1010,7 @@ class Driver extends import_shared.TypedEventTarget {
   async initializeControllerAndNodes() {
     if (this._controller == void 0) {
       this._controller = new import_Controller.ZWaveController(this);
-      this._controller.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._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._options.testingHooks?.skipControllerIdentification) {
       const { nodeIds } = await this.controller.queryCapabilities();
@@ -1473,6 +1484,21 @@ class Driver extends import_shared.TypedEventTarget {
   onNodeInterviewCompleted(node) {
     this.debounceSendNodeToSleep(node);
   }
+  /** This is called when a new node was found and is being added to the network */
+  onNodeFound(node) {
+    const prefix = `{"nodeId":${node.id},`;
+    for (const key of this.valueDB.keys()) {
+      if (key.startsWith(prefix)) {
+        this.valueDB.delete(key);
+      }
+    }
+    for (const key of this.metadataDB.keys()) {
+      if (key.startsWith(prefix)) {
+        this.metadataDB.delete(key);
+      }
+    }
+    this.cachePurge(import_NetworkCache.cacheKeys.node(node.id)._baseKey);
+  }
   /** This is called when a new node has been added to the network */
   onNodeAdded(node) {
     this.addNodeEventHandlers(node);
@@ -1780,8 +1806,10 @@ class Driver extends import_shared.TypedEventTarget {
       });
     } catch (e) {
       this.controllerLog.print(`Soft reset failed: ${(0, import_shared.getErrorMessage)(e)}`, "error");
-      if ((0, import_core.isMissingControllerACK)(e))
+      if ((0, import_core.isMissingControllerACK)(e)) {
+        this.isSoftResetting = false;
         throw e;
+      }
     }
     if (this._controller) {
       this._controller["_nodeIdType"] = import_core.NodeIDType.Short;
@@ -2074,7 +2102,7 @@ class Driver extends import_shared.TypedEventTarget {
       if ((0, import_shared.isAbortError)(e)) {
         return;
       } else if ((0, import_core.isZWaveError)(e) && e.code === import_core.ZWaveErrorCodes.Driver_Failed) {
-        if (this.isSoftResetting)
+        if (this.isSoftResetting || this._isOpeningSerialPort)
           return;
         void this.destroyWithMessage(e.message);
         return;