fix: correct serialization of Uint8Array in MQTT messages (#4215)

robertsLando · web-flow · commit d2c182d7ba13 · 2025-04-30T10:27:36.000+02:00
diff --git a/api/lib/MqttClient.ts b/api/lib/MqttClient.ts
@@ -7,7 +7,13 @@ import {
 	IClientSubscribeOptions,
 	connect,
 } from 'mqtt'
-import { allSettled, parseJSON, sanitizeTopic, pkgJson } from './utils'
+import {
+	allSettled,
+	parseJSON,
+	sanitizeTopic,
+	pkgJson,
+	stringifyJSON,
+} from './utils'
 import { module } from './logger'
 import { TypedEventEmitter } from './EventEmitter'
 import { storeDir } from '../config/app'
@@ -311,7 +317,7 @@ class MqttClient extends TypedEventEmitter<MqttClientEventCallbacks> {
 
 			this.client.publish(
 				topic,
-				JSON.stringify(data),
+				stringifyJSON(data),
 				options,
 				function (err) {
 					if (err) {
diff --git a/api/lib/utils.ts b/api/lib/utils.ts
@@ -4,6 +4,7 @@ import path, { resolve } from 'path'
 import crypto from 'crypto'
 import { readFileSync, statSync } from 'fs'
 import type { ZwaveConfig } from './ZwaveClient'
+import { isUint8Array } from 'util/types'
 
 // don't use import here, it will break the build
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -313,6 +314,21 @@ export function parseJSON(str: string): any {
 	})
 }
 
+/**
+ * Correctly stringify a JSON object with uint8array support
+ */
+export function stringifyJSON(obj: any): string {
+	return JSON.stringify(obj, (k, v) => {
+		if (isUint8Array(v)) {
+			return {
+				type: 'Buffer',
+				data: Array.from(v.values()),
+			}
+		}
+		return v
+	})
+}
+
 export function parseSecurityKeys(
 	config: ZwaveConfig,
 	options: PartialZWaveOptions | ZnifferOptions,
