hoffmation-base 3.0.0-alpha.41 → 3.0.0-alpha.43

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -20,6 +20,8 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         this._movementDetected = false;
         this._battery = -99;
         this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         if (!services_1.Utils.anyDboActive) {
@@ -62,6 +64,10 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     get timeSinceLastMotion() {
         return this._timeSinceLastMotion;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
     /**
      * Adds a callback for when a motion state has changed.
      * @param pCallback - Function that accepts the new state as parameter
@@ -112,6 +118,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
@@ -153,5 +160,18 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this.updateMovement(false);
         }, 270000, this);
     }
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
+            return;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.ZigbeeMotionSensor = ZigbeeMotionSensor;

package/lib/server/devices/zigbee/zigbeeAquaraVibra.d.ts

@@ -1,3 +1,4 @@
+import { BatteryLevelChangeAction } from '../../../models';
 import { iBatteryDevice, iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
@@ -43,6 +44,8 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     private _alarmMessage;
     private _vibrationBlockedByGriff;
     private _vibrationBlockedByMotion;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
     get vibration(): boolean;
@@ -63,9 +66,15 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     /** @inheritDoc */
     set vibrationBlockedByMotion(pVal: boolean);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setSensitivity(pVal: number): void;
     /** @inheritDoc */
     persistBatteryDevice(): void;
     private alarmCheck;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeAquaraVibra.js

@@ -73,6 +73,8 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         this._idSensitivity = '';
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.vibrationSensor);
         this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
@@ -125,12 +127,17 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         this._vibrationBlockedByMotion = pVal;
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
@@ -222,5 +229,18 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         services_1.SonosService.speakOnAll(message);
         this.log(models_1.LogLevel.Alert, message);
     }
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
+            return;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.ZigbeeAquaraVibra = ZigbeeAquaraVibra;

package/lib/server/devices/zigbee/zigbeeAquaraWater.d.ts

@@ -1,14 +1,9 @@
 /// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryDevice {
-    private _battery;
-    private _lastBatteryPersist;
-    /** @inheritDoc */
-    get lastBatteryPersist(): number;
-    /** @inheritDoc */
-    get battery(): number;
     /**
      * Whether water is detected
      */
@@ -18,19 +13,33 @@ export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryD
      * @default undefined (no alarm active)
      */
     iAlarmTimeout: NodeJS.Timeout | undefined;
+    private _battery;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;
     private _supressAlarmTimeStamp;
-    constructor(pInfo: IoBrokerDeviceInfo);
     private _roomName;
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAlarm(quiet?: boolean, timeout?: number): void;
-    private startAlarm;
-    private alarm;
     /** @inheritDoc */
     persistBatteryDevice(): void;
     /** @inheritDoc */
     dispose(): void;
+    private startAlarm;
+    private alarm;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeAquaraWater.js

@@ -8,18 +8,8 @@ const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
 // TODO: Add iWaterSensor
 class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
-    /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
         /**
          * Whether water is detected
          */
@@ -29,6 +19,10 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
          * @default undefined (no alarm active)
          */
         this.iAlarmTimeout = undefined;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -40,12 +34,25 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
     }
     /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Water Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
@@ -82,6 +89,24 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message);
         });
     }
+    /** @inheritDoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
     startAlarm() {
         if (services_1.Utils.nowMS() < this._supressAlarmTimeStamp) {
             this.log(models_1.LogLevel.Warn, 'Would start alarm, but we are supressed.');
@@ -104,23 +129,18 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message, 80);
         });
     }
-    /** @inheritDoc */
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    /** @inheritDoc */
-    dispose() {
-        if (this.iAlarmTimeout) {
-            clearInterval(this.iAlarmTimeout);
-            this.iAlarmTimeout = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeAquaraWater = ZigbeeAquaraWater;

package/lib/server/devices/zigbee/zigbeeHeimanSmoke.d.ts

@@ -1,10 +1,23 @@
 /// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice, iSmokeDetectorDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryDevice, iSmokeDetectorDevice {
+    /**
+     * The timeout for the alarm to fire again
+     * @default undefined (no alarm active)
+     */
+    iAlarmTimeout: NodeJS.Timeout | undefined;
     private _battery;
     private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    private _smoke;
+    private _messageAlarmFirst;
+    private _messageAlarm;
+    private _messageAlarmEnd;
+    private _roomName;
     /**
      * Creates an instance of {@link DeviceType.ZigbeeHeimanSmoke}.
      * @param pInfo - Device creation information
@@ -14,30 +27,26 @@ export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryD
     get lastBatteryPersist(): number;
     /** @inheritDoc */
     get battery(): number;
-    private _smoke;
-    /**
-     * The timeout for the alarm to fire again
-     * @default undefined (no alarm active)
-     */
-    iAlarmTimeout: NodeJS.Timeout | undefined;
-    private _messageAlarmFirst;
-    private _messageAlarm;
-    private _messageAlarmEnd;
     /** @inheritDoc */
     get smoke(): boolean;
-    private _roomName;
     /**
      * The name of the room the device is in (Set during initialization)
      */
     set roomName(val: string);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
     stopAlarm(quiet?: boolean): void;
-    private startAlarm;
-    private alarm;
     /** @inheritdoc */
     persistBatteryDevice(): void;
     /** @inheritDoc */
     dispose(): void;
+    private startAlarm;
+    private alarm;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeHeimanSmoke.js

@@ -13,14 +13,16 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
      */
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
-        this._smoke = false;
         /**
          * The timeout for the alarm to fire again
          * @default undefined (no alarm active)
          */
         this.iAlarmTimeout = undefined;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
+        this._smoke = false;
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -56,12 +58,17 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         services_1.PollyService.preloadTTS(this._messageAlarmEnd);
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Smoke Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
@@ -96,6 +103,24 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message);
         });
     }
+    /** @inheritdoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
     startAlarm() {
         if (this.iAlarmTimeout !== undefined) {
             clearInterval(this.iAlarmTimeout);
@@ -118,23 +143,18 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
             services_1.RoomService.setAllShutterOfFloor(new models_1.FloorSetAllShuttersCommand(models_1.CommandSource.Force, 100, undefined, 'Fire alarm'));
         });
     }
-    /** @inheritdoc */
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    /** @inheritDoc */
-    dispose() {
-        if (this.iAlarmTimeout) {
-            clearInterval(this.iAlarmTimeout);
-            this.iAlarmTimeout = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeHeimanSmoke = ZigbeeHeimanSmoke;

package/lib/server/devices/zigbee/zigbeeSonoffTemp.d.ts

@@ -2,23 +2,26 @@
 import { ZigbeeDevice } from './BaseDevices';
 import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
+import { BatteryLevelChangeAction, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
-    private _battery;
-    private _lastBatteryPersist;
-    /** @inheritDoc */
-    get lastBatteryPersist(): number;
     /** @inheritDoc */
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
     /** @inheritDoc */
     readonly persistHumiditySensorInterval: NodeJS.Timeout;
-    /** @inheritDoc */
-    get battery(): number;
+    private _battery;
+    private _lastBatteryPersist;
     private _humidityCallbacks;
     private _temperaturCallbacks;
-    constructor(pInfo: IoBrokerDeviceInfo);
     private _humidity;
     private _roomTemperature;
+    private _temperature;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
     /** @inheritDoc */
     get roomTemperature(): number;
     /** @inheritDoc */
@@ -30,9 +33,10 @@ export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatu
     get iTemperature(): number;
     /** @inheritDoc */
     get sTemperature(): string;
-    private _temperature;
     private set temperature(value);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
     addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
@@ -48,4 +52,8 @@ export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatu
     persistBatteryDevice(): void;
     /** @inheritDoc */
     dispose(): void;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeSonoffTemp.js

@@ -8,18 +8,8 @@ const DeviceCapability_1 = require("../DeviceCapability");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
-    /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
         /** @inheritDoc */
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
@@ -28,16 +18,28 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistHumiditySensor();
         }, 5 * 60 * 1000, this, false);
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
         this._humidityCallbacks = [];
         this._temperaturCallbacks = [];
         this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
@@ -70,11 +72,16 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         }
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
@@ -136,5 +143,18 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         }
         super.dispose();
     }
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
+            return;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.ZigbeeSonoffTemp = ZigbeeSonoffTemp;

package/lib/server/services/ac/own-daikin-device.d.ts

@@ -36,6 +36,14 @@ export declare class OwnDaikinDevice extends AcDevice {
     protected automaticCheck(): void;
     private setDesiredInfo;
     private updateInfo;
+    /**
+     * Handles the situation when the device is unreachable, attempts to reconnect and log the outcome.
+     *
+     * This function logs a warning message indicating that the device is unreachable,
+     * then attempts to reconnect using the `DaikinService.reconnect` method.
+     * If the reconnection is successful, it sets the desired information and schedules a timeout of 5000ms.
+     * If the reconnection fails, it logs an error message with the reason for the failure.
+     */
     private handleDeviceUnreach;
     private handleParamNg;
     /** @inheritDoc */

package/lib/server/services/ac/own-daikin-device.js

@@ -161,6 +161,14 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             });
         });
     }
+    /**
+     * Handles the situation when the device is unreachable, attempts to reconnect and log the outcome.
+     *
+     * This function logs a warning message indicating that the device is unreachable,
+     * then attempts to reconnect using the `DaikinService.reconnect` method.
+     * If the reconnection is successful, it sets the desired information and schedules a timeout of 5000ms.
+     * If the reconnection fails, it logs an error message with the reason for the failure.
+     */
     handleDeviceUnreach() {
         this.log(models_1.LogLevel.Warn, `Detected EHOSTUNREACH for ${this.name}(${this.ip}), will try reconecting`);
         daikin_service_1.DaikinService.reconnect(this.name, this.ip, this._mac)

package/lib/server/services/victron/victron-device.d.ts

@@ -1,9 +1,8 @@
-import { DeviceInfo, DeviceType, iEnergyManager, iExcessEnergyConsumer } from '../../devices';
-import { LogLevel, VictronDeviceSettings } from '../../../models';
-import { DeviceCapability } from '../../devices/DeviceCapability';
+import { DeviceCapability, DeviceInfo, DeviceType, iBatteryDevice, iEnergyManager, iExcessEnergyConsumer } from '../../devices';
+import { BatteryLevelChangeAction, LogLevel, VictronDeviceSettings } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { VictronDeviceData, VictronMqttConnectionOptions, VictronMqttConsumer } from 'victron-mqtt-consumer';
-export declare class VictronDevice implements iEnergyManager {
+export declare class VictronDevice implements iEnergyManager, iBatteryDevice {
     private readonly _victronConsumer;
     /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
@@ -18,9 +17,16 @@ export declare class VictronDevice implements iEnergyManager {
     private _iDatabaseLoggerInterval;
     private _lastPersistenceCalculation;
     private _nextPersistEntry;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(opts: VictronMqttConnectionOptions);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
+    /** @inheritDoc */
+    get battery(): number;
     get victronConsumer(): VictronMqttConsumer;
     get data(): VictronDeviceData;
     private _excessEnergy;
@@ -28,6 +34,8 @@ export declare class VictronDevice implements iEnergyManager {
     get name(): string;
     get customName(): string;
     get id(): string;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     get injectingWattage(): number;
     get drawingWattage(): number;
@@ -39,6 +47,8 @@ export declare class VictronDevice implements iEnergyManager {
     loadDeviceSettings(): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     persistDeviceInfo(): void;
+    /** @inheritDoc */
+    persistBatteryDevice(): void;
     toJSON(): Partial<VictronDevice>;
     /**
      * Changes the grid set point of the Victron device, to the desired value.
@@ -50,4 +60,5 @@ export declare class VictronDevice implements iEnergyManager {
     private turnOffAdditionalConsumer;
     private persist;
     private calculatePersistenceValues;
+    private checkForBatteryChange;
 }