dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-14 06:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix crash on a null color in attribute output (#32784)

Browse Source
This commit is contained in:
Luan Taraschi
2026-08-08 21:27:36 +02:00
committed by GitHub
parent 046817624f
commit 3aaa8c1546
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/controller.ts
+4 -1
View File
@@ -465,7 +465,10 @@ export class Controller {
let message: string | undefined;
// Special cases
if (key === "color" && utils.objectHasProperties(subPayload, ["r", "g", "b"])) {
// `objectHasProperties` indexes its argument, so it has to be given an object.
// The null check three lines below is too late: `color` is nullable like any
// other attribute, and a null one reaches here before that branch runs.
if (key === "color" && subPayload != null && utils.objectHasProperties(subPayload, ["r", "g", "b"])) {
subPayload = [subPayload.r, subPayload.g, subPayload.b];
}
test/controller.test.ts
+11
View File
@@ -1061,6 +1061,17 @@ describe("Controller", () => {
);
});
it("Publish entity state attribute output with a null color", async () => {
await controller.start();
settings.set(["advanced", "output"], "attribute_and_json");
mockMQTTPublishAsync.mockClear();
const device = getZ2MDevice("bulb");
await controller.publishEntityState(device, {state: "ON", color: null});
await flushPromises();
expect(mockMQTTPublishAsync).toHaveBeenCalledWith("zigbee2mqtt/bulb/state", "ON", {qos: 0, retain: true});
expect(mockMQTTPublishAsync).toHaveBeenCalledWith("zigbee2mqtt/bulb/color", "", {qos: 0, retain: true});
});
it("Publish entity state attribute_json output filtered", async () => {
await controller.start();
settings.set(["advanced", "output"], "attribute_and_json");