zigbee-herdsman-converters 25.56.0 → 25.58.0

package/dist/lib/tuya.js

@@ -2063,7 +2063,9 @@ const tuyaModernExtend = {
                                     event.data.device.endpoints[0]
                                         .command("manuSpecificTuya", "dataQuery", {})
                                         .catch((error) => logger_1.logger.error(`Failed to query '${event.data.device.ieeeAddr}' on interval (${error})`, NS));
-                                    setTimer();
+                                    if (globalStore.getValue(event.data.device.ieeeAddr, "query_interval") === timer) {
+                                        setTimer();
+                                    }
                                 }, queryIntervalSeconds * 1000);
                                 globalStore.putValue(event.data.device.ieeeAddr, "query_interval", timer);
                             };
@@ -2347,7 +2349,7 @@ const tuyaModernExtend = {
         return result;
     },
     tuyaOnOff: (args = {}) => {
-        const { indicatorMode = false } = args;
+        const { indicatorMode = false, powerOutageMemory = false, childLock = false } = args;
         const exposes = args.endpoints
             ? args.endpoints.map((ee) => e.switch().withEndpoint(ee))
             : [e.switch()];
@@ -2367,11 +2369,16 @@ const tuyaModernExtend = {
         else {
             toZigbee.push(tz.on_off);
         }
-        if (args.powerOutageMemory) {
+        if (powerOutageMemory) {
             // Legacy, powerOnBehavior is preferred
             fromZigbee.push(tuyaFz.power_outage_memory);
             toZigbee.push(tuyaTz.power_on_behavior_1);
-            exposes.push(tuyaExposes.powerOutageMemory());
+            if (typeof powerOutageMemory === "function") {
+                exposes.push((d) => (powerOutageMemory(d.manufacturerName) ? [tuyaExposes.powerOutageMemory()] : []));
+            }
+            else {
+                exposes.push(tuyaExposes.powerOutageMemory());
+            }
         }
         else if (args.powerOnBehavior2) {
             fromZigbee.push(tuyaFz.power_on_behavior_2);
@@ -2415,13 +2422,13 @@ const tuyaModernExtend = {
         }
         if (indicatorMode) {
             fromZigbee.push(tuyaFz.indicator_mode);
+            toZigbee.push(tuyaTz.backlight_indicator_mode_1);
             if (typeof indicatorMode === "function") {
                 exposes.push((d) => (indicatorMode(d.manufacturerName) ? [tuyaExposes.indicatorMode()] : []));
             }
             else {
                 exposes.push(tuyaExposes.indicatorMode());
             }
-            toZigbee.push(tuyaTz.backlight_indicator_mode_1);
         }
         if (args.indicatorModeNoneRelayPos) {
             fromZigbee.push(tuyaFz.indicator_mode_none_relay_pos);
@@ -2432,10 +2439,15 @@ const tuyaModernExtend = {
             fromZigbee.push(args.electricalMeasurementsFzConverter || fz.electrical_measurement, fz.metering);
             exposes.push(e.power(), e.current(), e.voltage(), e.energy());
         }
-        if (args.childLock) {
+        if (childLock) {
             fromZigbee.push(tuyaFz.child_lock);
             toZigbee.push(tuyaTz.child_lock);
-            exposes.push(e.child_lock());
+            if (typeof childLock === "function") {
+                exposes.push((d) => (childLock(d.manufacturerName) ? [e.child_lock()] : []));
+            }
+            else {
+                exposes.push(e.child_lock());
+            }
         }
         if (args.switchMode) {
             if (args.endpoints) {