Generic zclCommand handler allowing it to be sent from mqtt

src/converters/toZigbee.ts

@@ -238,6 +238,16 @@ const converters2 = {
             await entity.command('genIdentify', 'identify', {identifytime: identifyTimeout}, utils.getOptions(meta.mapped, entity));
         },
     } satisfies Tz.Converter,
+    zcl_command: {
+        key: ['zclcommand'],
+        convertSet: async (entity, key, value, meta) => {
+            utils.assertObject(value, key);
+            const payload = (value.hasOwnProperty('payload') ? value.payload : {});
+            utils.assertEndpoint(entity);
+            await entity.zclCommand(value.cluster, value.command, payload, (value.hasOwnProperty('options') ? value.options : {}));
+            meta.logger.info(`Invoked ZCL command ${value.cluster}.${value.command} with payload '${JSON.stringify(payload)}'`);
+        },
+    } satisfies Tz.Converter,
     arm_mode: {
         key: ['arm_mode'],
         convertSet: async (entity, key, value, meta) => {

src/index.ts

@@ -175,7 +175,7 @@ function prepareDefinition(definition: Definition): Definition {
     definition.toZigbee.push(
         toZigbee.scene_store, toZigbee.scene_recall, toZigbee.scene_add, toZigbee.scene_remove, toZigbee.scene_remove_all, 
         toZigbee.scene_rename, toZigbee.read, toZigbee.write,
-        toZigbee.command, toZigbee.factory_reset);
+        toZigbee.command, toZigbee.factory_reset, toZigbee.zcl_command);
 
     if (definition.exposes && Array.isArray(definition.exposes) && !definition.exposes.find((e) => e.name === 'linkquality')) {
         definition.exposes = definition.exposes.concat([exposesLib.presets.linkquality()]);

test/index.test.js

@@ -86,7 +86,7 @@ describe('index.js', () => {
         expect(definition.description).toBe('Automatically generated definition');
         expect(definition.extend).toBeUndefined();
         expect(definition.fromZigbee).toHaveLength(0);
-        expect(definition.toZigbee).toHaveLength(10);
+        expect(definition.toZigbee).toHaveLength(11);
         expect(definition.exposes).toHaveLength(1);
         expect(definition.options).toHaveLength(0);
     });

test/utils.ts

@@ -67,7 +67,7 @@ const MockLogger: Logger = {info: jest.fn(), error: jest.fn(), warn: jest.fn(),
 
 const DefaultTz = [
     tz.scene_store, tz.scene_recall, tz.scene_add, tz.scene_remove, tz.scene_remove_all, 
-    tz.scene_rename, tz.read, tz.write, tz.command, tz.factory_reset
+    tz.scene_rename, tz.read, tz.write, tz.command, tz.factory_reset, tz.zcl_command,
 ];
 
 export type AssertDefinitionArgs = {