zigbee-herdsman-converters 24.13.0 → 25.0.0

package/dist/lib/lumi.js

@@ -1809,16 +1809,13 @@ exports.lumiModernExtend = {
         ...args,
     }),
     lumiPreventReset: () => {
-        const onEvent = [
-            async (type, data, device) => {
-                if (
-                // options.allow_reset ||
-                type !== "message" ||
-                    data.type !== "attributeReport" ||
-                    data.cluster !== "genBasic" ||
-                    !data.data[0xfff0] ||
+        const converter = {
+            cluster: "genBasic",
+            type: ["attributeReport"],
+            convert: (model, msg, publish, options, meta) => {
+                if (!msg.data[0xfff0] ||
                     // eg: [0xaa, 0x10, 0x05, 0x41, 0x87, 0x01, 0x01, 0x10, 0x00]
-                    !data.data[0xfff0].slice(0, 5).equals(node_buffer_1.Buffer.from([0xaa, 0x10, 0x05, 0x41, 0x87]))) {
+                    !msg.data[0xfff0].slice(0, 5).equals(node_buffer_1.Buffer.from([0xaa, 0x10, 0x05, 0x41, 0x87]))) {
                     return;
                 }
                 const payload = {
@@ -1827,10 +1824,13 @@ exports.lumiModernExtend = {
                         type: 0x41,
                     },
                 };
-                await device.getEndpoint(1).write("genBasic", payload, { manufacturerCode: exports.manufacturerCode });
+                msg.device
+                    .getEndpoint(1)
+                    .write("genBasic", payload, { manufacturerCode: exports.manufacturerCode })
+                    .catch((error) => logger_1.logger.error(`Failed to prevent reset of '${msg.device.ieeeAddr}' (${error})`, NS));
             },
-        ];
-        return { onEvent, isModernExtend: true };
+        };
+        return { fromZigbee: [converter], isModernExtend: true };
     },
     lumiClickMode: (args) => modernExtend.enumLookup({
         name: "click_mode",
@@ -2189,20 +2189,25 @@ exports.lumiModernExtend = {
         ...args,
     }),
     lumiPreventLeave: () => {
-        const onEvent = [
-            async (type, data, device) => {
-                if (type === "message" && data.type === "attributeReport" && data.cluster === "manuSpecificLumi" && data.data[0x00fc] === false) {
+        const converter = {
+            cluster: "manuSpecificLumi",
+            type: ["attributeReport"],
+            convert: (model, msg, publish, options, meta) => {
+                if (msg.cluster === "manuSpecificLumi" && msg.data[0x00fc] === false) {
                     const payload = {
                         [0x00fc]: {
                             value: true,
                             type: 0x10,
                         },
                     };
-                    await device.getEndpoint(1).write("manuSpecificLumi", payload, { manufacturerCode: exports.manufacturerCode });
+                    msg.device
+                        .getEndpoint(1)
+                        .write("manuSpecificLumi", payload, { manufacturerCode: exports.manufacturerCode })
+                        .catch((error) => logger_1.logger.error(`Failed to prevent leave of '${msg.device.ieeeAddr}' (${error})`, NS));
                 }
             },
-        ];
-        return { onEvent, isModernExtend: true };
+        };
+        return { fromZigbee: [converter], isModernExtend: true };
     },
     lumiExternalSensor: () => {
         return {
@@ -2412,6 +2417,55 @@ exports.lumiModernExtend = {
             ],
         };
     },
+    lumiReadPositionOnReport: (type) => {
+        let converter;
+        if (type === "genAnalogOutput") {
+            converter = {
+                cluster: "genAnalogOutput",
+                type: ["attributeReport"],
+                convert: (model, msg, publish, options, meta) => {
+                    // The position (genAnalogOutput.presentValue) reported via an attribute contains an invalid value
+                    // however when reading it will provide the correct value.
+                    msg.device.endpoints[0]
+                        .read("genAnalogOutput", ["presentValue"])
+                        .catch((error) => logger_1.logger.error(`Failed to read position '${msg.device.ieeeAddr}' (${error})`, NS));
+                },
+            };
+        }
+        else if (type === "genMultistateOutput") {
+            converter = {
+                cluster: "genMultistateOutput",
+                type: ["attributeReport"],
+                convert: (model, msg, publish, options, meta) => {
+                    if (msg.data.presentValue !== undefined && msg.data.presentValue > 1) {
+                        // Try to read the position after the motor stops, the device occasionally report wrong data right after stopping
+                        // Might need to add delay, seems to be working without one but needs more tests.
+                        msg.device
+                            .getEndpoint(1)
+                            .read("genAnalogOutput", ["presentValue"])
+                            .catch((error) => logger_1.logger.error(`Failed to read position '${msg.device.ieeeAddr}' (${error})`, NS));
+                    }
+                },
+            };
+        }
+        else if (type === "genBasic") {
+            converter = {
+                cluster: "genBasic",
+                type: ["attributeReport"],
+                convert: (model, msg, publish, options, meta) => {
+                    if (msg.data["1028"] === 0) {
+                        // Try to read the position after the motor stops, the device occasionally report wrong data right after stopping
+                        // Might need to add delay, seems to be working without one but needs more tests.
+                        msg.device
+                            .getEndpoint(1)
+                            .read("genAnalogOutput", ["presentValue"])
+                            .catch((error) => logger_1.logger.error(`Failed to read position '${msg.device.ieeeAddr}' (${error})`, NS));
+                    }
+                },
+            };
+        }
+        return { fromZigbee: [converter], isModernExtend: true };
+    },
 };
 exports.modernExtend = exports.lumiModernExtend;
 const feederDaysLookup = {