fix: Fix power source unknown for some lights and switches Koenkk/zigbee2mqtt#24074

Author: Koenkk

src/lib/modernExtend.ts

@@ -32,7 +32,6 @@ import {
     addActionGroup,
     assertNumber,
     batteryVoltageToPercentage,
-    configureSetBatteryPowerSourceWhenUnknown,
     flatten,
     getEndpointName,
     getFromLookup,
@@ -49,6 +48,18 @@ import {
     precisionRound,
 } from './utils';
 
+const NS = 'zhc:modernextend';
+
+function configureSetPowerSourceWhenUnknown(powerSource: 'Battery' | 'Mains (single phase)'): Configure {
+    return async (device: Zh.Device): Promise<void> => {
+        if (!device.powerSource) {
+            logger.debug(`Device has no power source, forcing to '${powerSource}'`, NS);
+            device.powerSource = powerSource;
+            device.save();
+        }
+    };
+}
+
 function getEndpointsWithCluster(device: Zh.Device, cluster: string | number, type: 'input' | 'output') {
     if (!device.endpoints) {
         throw new Error(device.ieeeAddr + ' ' + device.endpoints);
@@ -395,7 +406,7 @@ export function battery(args?: BatteryArgs): ModernExtend {
         if (args.voltageReporting) {
             configure.push(setupConfigureForReporting('genPowerCfg', 'batteryVoltage', args.voltageReportingConfig, ea.STATE_GET));
         }
-        configure.push(configureSetBatteryPowerSourceWhenUnknown);
+        configure.push(configureSetPowerSourceWhenUnknown('Battery'));
         result.configure = configure;
     }
 
@@ -505,6 +516,7 @@ export function onOff(args?: OnOffArgs): ModernExtend {
                     }
                 }
             },
+            configureSetPowerSourceWhenUnknown('Mains (single phase)'),
         ];
     }
     return result;
@@ -1046,6 +1058,7 @@ export function light(args?: LightArgs): ModernExtend {
                 }
             }
         },
+        configureSetPowerSourceWhenUnknown('Mains (single phase)'),
     ];
 
     const result: ModernExtend = {exposes, fromZigbee, toZigbee, configure, meta, isModernExtend: true};

src/lib/utils.ts

@@ -6,7 +6,6 @@ import * as globalStore from './store';
 import {
     BatteryLinearVoltage,
     BatteryNonLinearVoltage,
-    Configure,
     Definition,
     Expose,
     Fz,
@@ -712,14 +711,6 @@ export function isLightExpose(expose: Expose): expose is Light {
     return expose?.type === 'light';
 }
 
-export const configureSetBatteryPowerSourceWhenUnknown: Configure = async (device) => {
-    if (!device.powerSource) {
-        logger.debug(`Device has no power source, forcing to 'Battery'`, NS);
-        device.powerSource = 'Battery';
-        device.save();
-    }
-};
-
 exports.noOccupancySince = noOccupancySince;
 exports.getOptions = getOptions;
 exports.isLegacyEnabled = isLegacyEnabled;