fix: otw update and node firmware update progress hangs on finish (#4229)

robertsLando · web-flow · commit 5f36bc95d63d · 2025-05-15T11:28:53.000+02:00
diff --git a/api/lib/ZwaveClient.ts b/api/lib/ZwaveClient.ts
@@ -954,6 +954,16 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		}
 	}
 
+	private clearThrottle(key: string) {
+		const entry = this.throttledFunctions.get(key)
+		if (entry) {
+			if (entry.timeout) {
+				clearTimeout(entry.timeout)
+			}
+			this.throttledFunctions.delete(key)
+		}
+	}
+
 	/**
 	 * Returns the driver ZWaveNode object
 	 */
@@ -4528,6 +4538,9 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 	}
 
 	private _onOTWFirmwareUpdateFinished(result: OTWFirmwareUpdateResult) {
+		// prevent progress event to come after finish
+		this.clearThrottle(this._onOTWFirmwareUpdateProgress.name)
+
 		this.sendToSocket(socketEvents.otwFirmwareUpdate, {
 			result: {
 				success: result.success,
@@ -5835,6 +5848,10 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 			if (node) {
 				node.firmwareUpdate = undefined
 
+				this.clearThrottle(
+					this._onNodeFirmwareUpdateProgress.name + '_' + node.id,
+				)
+
 				this.emitNodeUpdate(node, {
 					firmwareUpdate: false,
 				} as any)
diff --git a/src/App.vue b/src/App.vue
@@ -684,11 +684,10 @@ export default {
 			const { progress, result } = data
 			if (progress) {
 				if (!this.dialogLoader) {
-					this.loaderTitle = ''
-					this.loaderText =
-						'Updating controller firmware, please wait...'
 					this.dialogLoader = true
 				}
+				this.loaderTitle = ''
+				this.loaderText = 'Updating controller firmware, please wait...'
 				this.loaderProgress = progress.progress
 				this.loaderIndeterminate = this.loaderProgress === 0
 			} else if (result) {
