fix: Define endpoint in definition.toZigbee containing key 'state' (#…

…8190) * Define endpoint in definition.toZigbee containing key 'state' To allow the selection of the proper converter with multi endpoints divice at zigbee2mqtt-master\lib\extension\publish.ts at line "const converter = converters.find...c.endpoint == endpointName" This change corrects issue Koenkk/zigbee2mqtt#24352 * Code format with Prettier * Simplify Tz.Converter.endpoints type to string[] array only
Koenkk · Nov 1, 2024 · f54366e · LaurentChardin · Nov 2, 2024 · Zitrium31
1 parent 0012650
commit f54366e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/lib/modernExtend.ts b/src/lib/modernExtend.ts
@@ -530,7 +530,7 @@ export function onOff(args?: OnOffArgs): ModernExtend {
         : exposeEndpoints(e.switch(), args.endpointNames);
 
     const fromZigbee: Fz.Converter[] = [args.skipDuplicateTransaction ? fz.on_off_skip_duplicate_transaction : fz.on_off];
-    const toZigbee: Tz.Converter[] = [tz.on_off];
+    const toZigbee: Tz.Converter[] = [{...tz.on_off, endpoints: args?.endpointNames}];
 
     if (args.powerOnBehavior) {
         exposes.push(...exposeEndpoints(e.power_on_behavior(['off', 'on', 'toggle', 'previous']), args.endpointNames));
@@ -1005,7 +1005,7 @@ export function light(args?: LightArgs): ModernExtend {
 
     const fromZigbee: Fz.Converter[] = [fz.on_off, fz.brightness, fz.ignore_basic_report, fz.level_config];
     const toZigbee: Tz.Converter[] = [
-        tz.light_onoff_brightness,
+        {...tz.light_onoff_brightness, endpoints: args?.endpointNames},
         tz.ignore_transition,
         tz.level_config,
         tz.ignore_rate,
@@ -1287,12 +1287,19 @@ export function commandsColorCtrl(args?: CommandsColorCtrl): ModernExtend {
 
 export interface LockArgs {
     pinCodeCount: number;
+    endpointNames?: string[];
 }
 export function lock(args?: LockArgs): ModernExtend {
     args = {...args};
 
     const fromZigbee = [fz.lock, fz.lock_operation_event, fz.lock_programming_event, fz.lock_pin_code_response, fz.lock_user_status_response];
-    const toZigbee = [tz.lock, tz.pincode_lock, tz.lock_userstatus, tz.lock_auto_relock_time, tz.lock_sound_volume];
+    const toZigbee = [
+        {...tz.lock, endpoints: args?.endpointNames},
+        tz.pincode_lock,
+        tz.lock_userstatus,
+        tz.lock_auto_relock_time,
+        tz.lock_sound_volume,
+    ];
     const exposes = [
         e.lock(),
         e.pincode(),
@@ -1326,7 +1333,7 @@ export function windowCovering(args: WindowCoveringArgs): ModernExtend {
     const exposes: Expose[] = [coverExpose];
 
     const fromZigbee: Fz.Converter[] = [fz.cover_position_tilt];
-    const toZigbee: Tz.Converter[] = [tz.cover_state, tz.cover_position_tilt];
+    const toZigbee: Tz.Converter[] = [{...tz.cover_state, endpoints: args?.endpointNames}, tz.cover_position_tilt];
 
     const result: ModernExtend = {exposes, fromZigbee, toZigbee, isModernExtend: true};
 

diff --git a/src/lib/tuya.ts b/src/lib/tuya.ts
@@ -1800,7 +1800,7 @@ export function getHandlersForDP(
         : [
               {
                   key: [name],
-                  endpoint: endpoint,
+                  endpoints: [endpoint],
                   convertSet: async (entity, key, value, meta) => {
                       // A set converter is only called once; therefore we need to loop
                       const state: KeyValue = {};

diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -331,7 +331,7 @@ export namespace Tz {
     export interface Converter {
         key?: string[];
         options?: Option[] | ((definition: Definition) => Option[]);
-        endpoint?: string;
+        endpoints?: string[];
         convertSet?: (entity: Zh.Endpoint | Zh.Group, key: string, value: unknown, meta: Tz.Meta) => Promise<ConvertSetResult>;
         convertGet?: (entity: Zh.Endpoint | Zh.Group, key: string, meta: Tz.Meta) => Promise<void>;
     }