From ad0696856a9a63fc74b9c2115f08d7fd97850545 Mon Sep 17 00:00:00 2001 From: Nerivec <62446222+Nerivec@users.noreply.github.com> Date: Tue, 25 Nov 2025 20:18:14 +0100 Subject: [PATCH] fix(ignore): prop name convention on new API endpoints (#29820) --- lib/extension/bind.ts | 4 ++-- lib/extension/bridge.ts | 6 +++--- lib/types/api.ts | 8 ++++---- test/extensions/bind.test.ts | 6 +++--- test/extensions/bridge.test.ts | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/extension/bind.ts b/lib/extension/bind.ts index 884c134f0..444ff2615 100755 --- a/lib/extension/bind.ts +++ b/lib/extension/bind.ts @@ -292,13 +292,13 @@ export default class Bind extends Extension { } // this list is raw (not resolved) to allow clearing any specific target (not only currently known) - const eui64List = message.ieeeList ?? ["0xffffffffffffffff"]; + const eui64List = message.ieee_list ?? ["0xffffffffffffffff"]; await target.zh.clearAllBindings(eui64List); const responseData: Zigbee2MQTTAPI["bridge/response/device/binds/clear"] = { target: message.target, - ieeeList: eui64List, + ieee_list: eui64List, }; await this.publishResponse("binds/clear", message, responseData); diff --git a/lib/extension/bridge.ts b/lib/extension/bridge.ts index c0b8a1dbb..3e8c0a3b1 100644 --- a/lib/extension/bridge.ts +++ b/lib/extension/bridge.ts @@ -543,7 +543,7 @@ export default class Bridge extends Extension { const response = await endpoint.readReportingConfig( message.cluster, message.configs, - message.manufacturerCode ? {manufacturerCode: message.manufacturerCode} : {}, + message.manufacturer_code ? {manufacturerCode: message.manufacturer_code} : {}, ); await this.publishDevices(); @@ -555,8 +555,8 @@ export default class Bridge extends Extension { configs: response, }; - if (message.manufacturerCode) { - responseData.manufacturerCode = message.manufacturerCode; + if (message.manufacturer_code) { + responseData.manufacturer_code = message.manufacturer_code; } return utils.getResponse(message, responseData); diff --git a/lib/types/api.ts b/lib/types/api.ts index fe6265c54..c851f6498 100644 --- a/lib/types/api.ts +++ b/lib/types/api.ts @@ -567,12 +567,12 @@ export interface Zigbee2MQTTAPI { "bridge/request/device/binds/clear": { target: string; - ieeeList?: Eui64[]; + ieee_list?: Eui64[]; }; "bridge/response/device/binds/clear": { target: string; - ieeeList?: Eui64[]; + ieee_list?: Eui64[]; }; "bridge/request/device/configure": @@ -729,7 +729,7 @@ export interface Zigbee2MQTTAPI { endpoint: string | number; cluster: string | number; configs: {direction?: number; attribute: string | number | {ID: number; type: number}}[]; - manufacturerCode?: number; + manufacturer_code?: number; }; "bridge/response/device/reporting/read": { @@ -737,7 +737,7 @@ export interface Zigbee2MQTTAPI { endpoint: string | number; cluster: string | number; configs: zigbeeHerdsman.Zcl.ClustersTypes.TFoundation["readReportConfigRsp"]; - manufacturerCode?: number; + manufacturer_code?: number; }; "bridge/request/group/remove": { diff --git a/test/extensions/bind.test.ts b/test/extensions/bind.test.ts index 8e409655f..aec4638fa 100644 --- a/test/extensions/bind.test.ts +++ b/test/extensions/bind.test.ts @@ -810,7 +810,7 @@ describe("Extension: Bind", () => { transaction: "1234", data: { target: "remote", - ieeeList: ["0xffffffffffffffff"], + ieee_list: ["0xffffffffffffffff"], }, status: "ok", }), @@ -826,7 +826,7 @@ describe("Extension: Bind", () => { device.mockClear(); mockMQTTEvents.message( "zigbee2mqtt/bridge/request/device/binds/clear", - stringify({transaction: "1234", target: "remote", ieeeList: [target.ieeeAddr]}), + stringify({transaction: "1234", target: "remote", ieee_list: [target.ieeeAddr]}), ); await flushPromises(); @@ -837,7 +837,7 @@ describe("Extension: Bind", () => { transaction: "1234", data: { target: "remote", - ieeeList: [target.ieeeAddr], + ieee_list: [target.ieeeAddr], }, status: "ok", }), diff --git a/test/extensions/bridge.test.ts b/test/extensions/bridge.test.ts index b959fb83d..af48f59fd 100644 --- a/test/extensions/bridge.test.ts +++ b/test/extensions/bridge.test.ts @@ -3977,7 +3977,7 @@ describe("Extension: Bridge", () => { endpoint: 1, cluster: "genLevelCtrl", configs: [{attribute: "currentLevel"}], - manufacturerCode: 0x1234, + manufacturer_code: 0x1234, }), ); await flushPromises(); @@ -4001,7 +4001,7 @@ describe("Extension: Bridge", () => { repChange: 2, }, ], - manufacturerCode: 0x1234, + manufacturer_code: 0x1234, }, status: "ok", }),