zwave-js
diff --git a/‎api/app.ts‎
Lines changed: 187 additions & 34 deletions b/‎api/app.ts‎
Lines changed: 187 additions & 34 deletions
diff --git a/‎api/lib/ZwaveClient.ts‎
Lines changed: 5 additions & 27 deletions b/‎api/lib/ZwaveClient.ts‎
Lines changed: 5 additions & 27 deletions
diff --git a/‎api/lib/utils.ts‎
Lines changed: 46 additions & 0 deletions b/‎api/lib/utils.ts‎
Lines changed: 46 additions & 0 deletions
@@ -12,7 +12,7 @@ import jsonStore from './lib/jsonStore.ts'
 import * as loggers from './lib/logger.ts'
 import MqttClient from './lib/MqttClient.ts'
 import SocketManager from './lib/SocketManager.ts'
-import type { CallAPIResult, SensorTypeScale } from './lib/ZwaveClient.ts'
+import type { CallAPIResult, ZwaveConfig } from './lib/ZwaveClient.ts'
 import ZWaveClient from './lib/ZwaveClient.ts'
 import multer, { diskStorage } from 'multer'
 import extract from 'extract-zip'
@@ -1068,7 +1068,7 @@ app.get(
 		const allSensors = getAllSensors()
 		const namedScaleGroups = getAllNamedScaleGroups()
 
-		const scales: SensorTypeScale[] = []
+		const scales: ZwaveConfig['scales'] = []
 
 		for (const group of namedScaleGroups) {
 			for (const scale of Object.values(group.scales)) {
@@ -1137,66 +1137,219 @@ app.post(
 			}
 			let settings = req.body
 
-			let restartAll = false
+			let shouldRestart = false
 			let shouldRestartGw = false
 			let shouldRestartZniffer = false
+			let canUpdateZwaveOptions = false
 
 			const actualSettings = jsonStore.get(store.settings) as Settings
 
 			// TODO: validate settings using calss-validator
 			// when settings is null consider a force restart
 			if (settings && Object.keys(settings).length > 0) {
-				shouldRestartGw = !utils.deepEqual(
-					{
-						zwave: actualSettings.zwave,
-						gateway: actualSettings.gateway,
-						mqtt: actualSettings.mqtt,
-					},
-					{
-						zwave: settings.zwave,
-						gateway: settings.gateway,
-						mqtt: settings.mqtt,
-					},
+				// Check if gateway settings changed
+				const gatewayChanged = !utils.deepEqual(
+					actualSettings.gateway,
+					settings.gateway,
+				)
+				const mqttChanged = !utils.deepEqual(
+					actualSettings.mqtt,
+					settings.mqtt,
 				)
 
+				if (gatewayChanged || mqttChanged) {
+					shouldRestartGw = true
+					shouldRestart = true
+				}
+
+				let changedZwaveKeys: string[] = []
+
+				// Check if Z-Wave settings changed
+				if (!utils.deepEqual(actualSettings.zwave, settings.zwave)) {
+					// These are ZwaveClient configuration properties that map to
+					// driver.updateOptions() parameters. The commented names show
+					// the corresponding driver option keys:
+					// - 'scales' maps to 'preferences.scales'
+					// - 'logEnabled', 'logLevel', etc. map to 'logConfig' properties
+					// - 'disableOptimisticValueUpdate' maps directly
+					const editableZWaveSettings = [
+						'disableOptimisticValueUpdate',
+						// preferences
+						'scales',
+						// logConfig
+						'logEnabled',
+						'logLevel',
+						'logToFile',
+						'maxFiles',
+						'nodeFilter',
+					]
+
+					// Find which Z-Wave settings actually changed
+					changedZwaveKeys = Object.keys(settings.zwave || {}).filter(
+						(key) => {
+							return !utils.deepEqual(
+								actualSettings.zwave?.[key],
+								settings.zwave?.[key],
+							)
+						},
+					)
+
+					// Check if only editable options changed
+					const onlyEditableChanged = changedZwaveKeys.every((key) =>
+						editableZWaveSettings.includes(key),
+					)
+
+					if (
+						onlyEditableChanged &&
+						changedZwaveKeys.length > 0 &&
+						gw?.zwave?.driver
+					) {
+						// Can update options without restart
+						canUpdateZwaveOptions = true
+					} else {
+						// Need full restart
+						shouldRestartGw = true
+						shouldRestart = true
+					}
+				}
+
+				// Check if Zniffer settings changed
 				shouldRestartZniffer = !utils.deepEqual(
 					actualSettings.zniffer,
 					settings.zniffer,
 				)
+				if (shouldRestartZniffer) {
+					shouldRestart = true
+				}
 
-				// nothing changed, consider it a forced restart
-				restartAll = !shouldRestartGw && !shouldRestartZniffer
-
+				// Save settings to file
 				await jsonStore.put(store.settings, settings)
+
+				// Update driver options if only editable options changed
+				if (canUpdateZwaveOptions && gw?.zwave?.driver) {
+					try {
+						// Build editable options object with only changed properties
+						// Map our settings to PartialZWaveOptions format
+						const editableOptions: any = {}
+
+						// Check disableOptimisticValueUpdate
+						if (
+							changedZwaveKeys.includes(
+								'disableOptimisticValueUpdate',
+							) &&
+							settings.zwave?.disableOptimisticValueUpdate !==
+								undefined
+						) {
+							editableOptions.disableOptimisticValueUpdate =
+								settings.zwave.disableOptimisticValueUpdate
+						}
+
+						// Check scales (maps to preferences.scales)
+						if (
+							changedZwaveKeys.includes('scales') &&
+							settings.zwave?.scales !== undefined
+						) {
+							const preferences = utils.buildPreferences(
+								settings.zwave || {},
+							)
+							if (preferences) {
+								editableOptions.preferences = preferences
+							}
+						}
+
+						// Check logConfig properties
+						const logConfigChanged =
+							[
+								'logEnabled',
+								'logLevel',
+								'logToFile',
+								'maxFiles',
+								'nodeFilter',
+							].filter((key) => {
+								return (
+									changedZwaveKeys.includes(key) &&
+									settings.zwave?.[key] !== undefined
+								)
+							}).length > 0
+
+						if (logConfigChanged) {
+							// Build logConfig object from our settings
+							editableOptions.logConfig = utils.buildLogConfig(
+								settings.zwave || {},
+							)
+						}
+
+						if (Object.keys(editableOptions).length > 0) {
+							gw.zwave.driver.updateOptions(editableOptions)
+							logger.info(
+								'Updated Z-Wave driver options without restart:',
+								Object.keys(editableOptions).join(', '),
+							)
+						}
+					} catch (error) {
+						logger.error('Error updating driver options', error)
+						// If update fails, require restart
+						shouldRestart = true
+						shouldRestartGw = true
+					}
+				}
 			} else {
-				restartAll = true
+				// Force restart if no settings provided
+				shouldRestart = true
 				settings = actualSettings
 			}
 
-			if (restartAll || shouldRestartGw) {
-				restarting = true
+			res.json({
+				success: true,
+				message: shouldRestart
+					? 'Configuration saved. Restart required to apply changes.'
+					: 'Configuration updated successfully',
+				data: settings,
+				shouldRestart,
+			})
+		} catch (error) {
+			restarting = false
+			logger.error(error)
+			res.json({ success: false, message: error.message })
+		}
+	},
+)
+
+// restart gateway
+app.post(
+	'/api/restart',
+	apisLimiter,
+	isAuthenticated,
+	async function (req, res) {
+		try {
+			if (restarting) {
+				throw Error(
+					'Gateway is already restarting, wait a moment before doing another request',
+				)
+			}
+
+			const settings = jsonStore.get(store.settings) as Settings
 
-				await gw.close()
+			restarting = true
 
-				await destroyPlugins()
-				// reload loggers settings
-				setupLogging(settings)
-				// restart clients and gateway
-				await startGateway(settings)
-				backupManager.init(gw.zwave)
+			// Close gateway and restart
+			await gw.close()
+			await destroyPlugins()
+			if (settings.gateway) {
+				setupLogging({ gateway: settings.gateway })
 			}
+			await startGateway(settings)
+			backupManager.init(gw.zwave)
 
-			if (restartAll || shouldRestartZniffer) {
-				if (zniffer) {
-					await zniffer.close()
-				}
-				startZniffer(settings.zniffer)
+			// Restart Zniffer if enabled
+			if (zniffer) {
+				await zniffer.close()
 			}
+			startZniffer(settings.zniffer)
 
 			res.json({
 				success: true,
-				message: 'Configuration updated successfully',
-				data: settings,
+				message: 'Gateway restarted successfully',
 			})
 		} catch (error) {
 			restarting = false
 
@@ -137,7 +137,6 @@ import { socketEvents } from './SocketEvents.ts'
 import { isUint8Array } from 'node:util/types'
 import { PkgFsBindings } from './PkgFsBindings.ts'
 import { regionSupportsAutoPowerlevel } from './shared.ts'
-import tripleBeam from 'triple-beam'
 import { deviceConfigPriorityDir } from './Constants.ts'
 
 export const configManager = new ConfigManager({
@@ -146,8 +145,6 @@ export const configManager = new ConfigManager({
 
 const logger = LogManager.module('Z-Wave')
 
-const loglevels = tripleBeam.configs.npm.levels
-
 const NEIGHBORS_LOCK_REFRESH = 60 * 1000
 
 function validateMethods<T extends readonly (keyof ZwaveClient)[]>(
@@ -345,8 +342,6 @@ export type SensorTypeScale = {
 
 export type AllowedApis = (typeof allowedApis)[number]
 
-const ZWAVEJS_LOG_FILE = utils.joinPath(logsDir, 'zwavejs_%DATE%.log')
-
 export type ZUIValueIdState = {
 	text: string
 	value: number | string | boolean
@@ -2182,21 +2177,8 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 				deviceConfigPriorityDir:
 					this.cfg.deviceConfigPriorityDir || deviceConfigPriorityDir,
 			},
-			logConfig: {
-				// https://zwave-js.github.io/node-zwave-js/#/api/driver?id=logconfig
-				enabled: this.cfg.logEnabled,
-				level: this.cfg.logLevel
-					? loglevels[this.cfg.logLevel]
-					: 'info',
-				logToFile: this.cfg.logToFile,
-				filename: ZWAVEJS_LOG_FILE,
-				forceConsole: isDocker() ? !this.cfg.logToFile : false,
-				maxFiles: this.cfg.maxFiles || 7,
-				nodeFilter:
-					this.cfg.nodeFilter && this.cfg.nodeFilter.length > 0
-						? this.cfg.nodeFilter.map((n) => parseInt(n))
-						: undefined,
-			},
+			// https://zwave-js.github.io/node-zwave-js/#/api/driver?id=logconfig
+			logConfig: utils.buildLogConfig(this.cfg),
 			emitValueUpdateAfterSetValue: true,
 			apiKeys: {
 				firmwareUpdateService:
@@ -2304,13 +2286,9 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 		}
 
 		if (this.cfg.scales) {
-			const scales: Record<string | number, string | number> = {}
-			for (const s of this.cfg.scales) {
-				scales[s.key] = s.label
-			}
-
-			zwaveOptions.preferences = {
-				scales,
+			const preferences = utils.buildPreferences(this.cfg)
+			if (preferences) {
+				zwaveOptions.preferences = preferences
 			}
 		}
 
 
@@ -7,6 +7,10 @@ import { isUint8Array } from 'node:util/types'
 import { createRequire } from 'node:module'
 import { mkdir, access } from 'node:fs/promises'
 import { fileURLToPath } from 'node:url'
+import { logsDir } from '../config/app.ts'
+import tripleBeam from 'triple-beam'
+
+const loglevels = tripleBeam.configs.npm.levels
 
 // don't use import here, it will break the build
 const require = createRequire(import.meta.url)
@@ -472,3 +476,45 @@ export async function pathExists(path: string): Promise<boolean> {
 		return false
 	}
 }
+
+/**
+ * Convert scales configuration to preferences format for Z-Wave driver options
+ * This converts the array format used in our settings to the Record format expected by the driver
+ */
+export function buildPreferences(
+	config: ZwaveConfig,
+): PartialZWaveOptions['preferences'] {
+	const { scales } = config
+	if (!scales || scales.length === 0) {
+		return undefined
+	}
+
+	const scalesRecord: Record<string | number, string | number> = {}
+	for (const s of scales) {
+		scalesRecord[s.key] = s.label
+	}
+
+	return {
+		scales: scalesRecord,
+	}
+}
+
+/**
+ * Build logConfig object for Z-Wave driver options from Z-Wave configuration
+ */
+export function buildLogConfig(
+	config: ZwaveConfig,
+): PartialZWaveOptions['logConfig'] {
+	return {
+		enabled: config.logEnabled,
+		level: config.logLevel ? loglevels[config.logLevel] : 'info',
+		logToFile: config.logToFile,
+		maxFiles: config.maxFiles || 7,
+		nodeFilter:
+			config.nodeFilter && config.nodeFilter.length > 0
+				? config.nodeFilter.map((n: string) => parseInt(n))
+				: undefined,
+		filename: joinPath(logsDir, 'zwavejs_%DATE%.log'),
+		forceConsole: isDocker() ? !this.cfg.logToFile : false,
+	}
+}