feat: update zwave-js to 15.3.0, always add event handlers after driver ready event (#4219)

AlCalzone · web-flow · commit 64ae6b4fd529 · 2025-05-05T14:56:36.000+02:00
diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts
@@ -747,7 +747,6 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 	}
 	private _inclusionState: InclusionState = undefined
 
-	private _controllerListenersAdded: boolean = false
 	public get driverReady() {
 		return this.driver && this._driverReady && !this.closed
 	}
@@ -1179,7 +1178,6 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		if (this._driver) {
 			await this._driver.destroy()
 			this._driver = null
-			this._controllerListenersAdded = false
 		}
 
 		if (!keepListeners) {
@@ -2285,7 +2283,6 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 			// init driver here because if connect fails the driver is destroyed
 			// this could throw so include in the try/catch
 			this._driver = new Driver(this.cfg.port, zwaveOptions)
-			this._controllerListenersAdded = false
 			this._driver.on('error', this._onDriverError.bind(this))
 			this._driver.on('driver ready', this._onDriverReady.bind(this))
 			this._driver.on('all nodes ready', this._onScanComplete.bind(this))
@@ -4414,51 +4411,33 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 				/* ignore */
 			})
 
-			if (!this._controllerListenersAdded) {
-				this._controllerListenersAdded = true
-				this.driver.controller
-					.on(
-						'inclusion started',
-						this._onInclusionStarted.bind(this),
-					)
-					.on(
-						'exclusion started',
-						this._onExclusionStarted.bind(this),
-					)
-					.on(
-						'inclusion stopped',
-						this._onInclusionStopped.bind(this),
-					)
-					.on(
-						'exclusion stopped',
-						this._onExclusionStopped.bind(this),
-					)
-					.on(
-						'inclusion state changed',
-						this._onInclusionStateChanged.bind(this),
-					)
-					.on('inclusion failed', this._onInclusionFailed.bind(this))
-					.on('exclusion failed', this._onExclusionFailed.bind(this))
-					.on('node found', this._onNodeFound.bind(this))
-					.on('node added', this._onNodeAdded.bind(this))
-					.on('node removed', this._onNodeRemoved.bind(this))
-					.on(
-						'rebuild routes progress',
-						this._onRebuildRoutesProgress.bind(this),
-					)
-					.on(
-						'rebuild routes done',
-						this._onRebuildRoutesDone.bind(this),
-					)
-					.on(
-						'statistics updated',
-						this._onControllerStatisticsUpdated.bind(this),
-					)
-					.on(
-						'status changed',
-						this._onControllerStatusChanged.bind(this),
-					)
-			}
+			this.driver.controller
+				.on('inclusion started', this._onInclusionStarted.bind(this))
+				.on('exclusion started', this._onExclusionStarted.bind(this))
+				.on('inclusion stopped', this._onInclusionStopped.bind(this))
+				.on('exclusion stopped', this._onExclusionStopped.bind(this))
+				.on(
+					'inclusion state changed',
+					this._onInclusionStateChanged.bind(this),
+				)
+				.on('inclusion failed', this._onInclusionFailed.bind(this))
+				.on('exclusion failed', this._onExclusionFailed.bind(this))
+				.on('node found', this._onNodeFound.bind(this))
+				.on('node added', this._onNodeAdded.bind(this))
+				.on('node removed', this._onNodeRemoved.bind(this))
+				.on(
+					'rebuild routes progress',
+					this._onRebuildRoutesProgress.bind(this),
+				)
+				.on('rebuild routes done', this._onRebuildRoutesDone.bind(this))
+				.on(
+					'statistics updated',
+					this._onControllerStatisticsUpdated.bind(this),
+				)
+				.on(
+					'status changed',
+					this._onControllerStatusChanged.bind(this),
+				)
 		} catch (error) {
 			// Fixes freak error in "driver ready" handler #1309
 			logger.error(error.message)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "@kvaster/zwavejs-prom": "^0.0.3",
     "@mdi/js": "7.4.47",
     "@zwave-js/log-transport-json": "^3.0.0",
-    "@zwave-js/server": "^3.0.0",
+    "@zwave-js/server": "^3.0.1",
     "ansi_up": "^6.0.2",
     "archiver": "^7.0.1",
     "axios": "^1.7.2",
@@ -114,7 +114,7 @@
     "vuetify": "^2.7.2",
     "winston": "^3.13.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "zwave-js": "^15.2.1",
+    "zwave-js": "^15.3.0",
     "zxing-wasm": "^1.2.15"
   },
   "devDependencies": {
