hoffmation-base 1.1.48 → 1.2.1

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

@@ -10,11 +10,11 @@ const liquid_pid_1 = require("../../../../liquid-pid");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
+        this._battery = -99;
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
         this.settings = new models_1.HeaterSettings();
-        this.battery = -99;
         this._automaticPoints = {};
         this._initialSeasonCheckDone = false;
         this._level = 0;
@@ -41,6 +41,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    get battery() {
+        return this._battery;
+    }
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
@@ -85,12 +88,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     checkAutomaticChange() {
-        var _a, _b;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
         if (!this.settings.automaticMode || this.seasonTurnOff) {
-            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addTemperaturDataPoint(this);
             return;
         }
         const setting = models_1.TemperatureSettings.getActiveSetting(this._automaticPoints, new Date());
@@ -103,7 +104,6 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
             this.desiredTemperature = setting.temperature;
         }
-        (_b = services_1.Utils.dbo) === null || _b === void 0 ? void 0 : _b.addTemperaturDataPoint(this);
     }
     deleteAutomaticPoint(name) {
         if (this._automaticPoints[name] !== undefined)
@@ -128,8 +128,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     update(idSplit, state, initial = false, pOverride = false) {
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -153,5 +154,19 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
+    dispose() {
+        if (this.persistHeaterInterval) {
+            clearInterval(this.persistHeaterInterval);
+        }
+        if (this._iAutomaticInterval) {
+            clearInterval(this._iAutomaticInterval);
+            this._iAutomaticInterval = undefined;
+        }
+        super.dispose();
+    }
 }
 exports.ZigbeeHeater = ZigbeeHeater;

package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts

@@ -5,7 +5,8 @@ import { MagnetPosition } from '../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../../baseDeviceInterfaces';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice {
-    battery: number;
+    protected _battery: number;
+    get battery(): number;
     position: MagnetPosition;
     telegramOnOpen: boolean;
     speakOnOpen: boolean;
@@ -18,4 +19,6 @@ export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatter
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
     protected updatePosition(pValue: MagnetPosition): void;
+    dispose(): void;
+    persistBatteryDevice(): void;
 }

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

@@ -8,7 +8,7 @@ const models_2 = require("../../models");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
-        this.battery = -99;
+        this._battery = -99;
         this.position = models_2.MagnetPosition.closed;
         this.telegramOnOpen = false;
         this.speakOnOpen = false;
@@ -16,6 +16,9 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         this._openCallback = [];
         this.minutesOpen = 0;
     }
+    get battery() {
+        return this._battery;
+    }
     addOpenCallback(pCallback) {
         this._openCallback.push(pCallback);
     }
@@ -26,8 +29,9 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         super.update(idSplit, state, initial, pOverrride);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -90,5 +94,16 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
             }, 60000, this);
         }
     }
+    dispose() {
+        if (this._iOpenTimeout) {
+            clearInterval(this._iOpenTimeout);
+            this._iOpenTimeout = undefined;
+        }
+        super.dispose();
+    }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.ZigbeeMagnetContact = ZigbeeMagnetContact;

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -6,9 +6,10 @@ import { MotionSensorSettings } from '../../../../models';
 import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
+    private _battery;
     settings: MotionSensorSettings;
     movementDetected: boolean;
-    battery: number;
+    get battery(): number;
     protected _initialized: boolean;
     protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
     protected _needsMovementResetFallback: boolean;
@@ -29,4 +30,5 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     private resetFallbackTimeout;
     private startFallbackTimeout;
+    persistBatteryDevice(): void;
 }

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

@@ -9,9 +9,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
         super(pInfo, type);
+        this._battery = -99;
         this.settings = new models_1.MotionSensorSettings();
         this.movementDetected = false;
-        this.battery = -99;
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
@@ -34,6 +34,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             });
         }
     }
+    get battery() {
+        return this._battery;
+    }
     // Time since last motion in seconds
     get timeSinceLastMotion() {
         return this._timeSinceLastMotion;
@@ -90,8 +93,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -121,5 +125,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this.updateMovement(false);
         }, 270000, this);
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.ZigbeeMotionSensor = ZigbeeMotionSensor;

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

@@ -3,7 +3,8 @@ import { iBatteryDevice, iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor, iBatteryDevice {
-    battery: number;
+    private _battery;
+    get battery(): number;
     sensitivity: string;
     tiltAngle: number;
     tiltAngleX: number;
@@ -27,4 +28,5 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setSensitivity(pVal: number): void;
     alarmCheck(): void;
+    persistBatteryDevice(): void;
 }

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

@@ -9,7 +9,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
-        this.battery = -99;
+        this._battery = -99;
         this.sensitivity = '';
         this.tiltAngle = 0;
         this.tiltAngleX = 0;
@@ -31,6 +31,9 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;
     }
+    get battery() {
+        return this._battery;
+    }
     get vibrationBlockedByGriff() {
         return this._vibrationBlockedByGriff;
     }
@@ -56,8 +59,9 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -137,5 +141,9 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         services_1.SonosService.speakOnAll(message);
         this.log(models_1.LogLevel.Alert, message);
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.ZigbeeAquaraVibra = ZigbeeAquaraVibra;

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

@@ -4,7 +4,8 @@ import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryDevice {
-    battery: number;
+    private _battery;
+    get battery(): number;
     water: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
@@ -18,4 +19,6 @@ export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryD
     stopAlarm(quiet?: boolean, timeout?: number): void;
     private startAlarm;
     private alarm;
+    persistBatteryDevice(): void;
+    dispose(): void;
 }

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

@@ -9,7 +9,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
-        this.battery = -99;
+        this._battery = -99;
         this.water = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
@@ -22,6 +22,9 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
         this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
     }
+    get battery() {
+        return this._battery;
+    }
     set roomName(val) {
         this._roomName = val;
         this._messageAlarmFirst = services_1.Res.waterAlarmStart(this.info.customName, this._roomName);
@@ -36,8 +39,9 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -94,5 +98,16 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message, 80);
         });
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
 }
 exports.ZigbeeAquaraWater = ZigbeeAquaraWater;

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

@@ -1,15 +1,17 @@
 /// <reference types="iobroker" />
 import { ZigbeeHeater } from './BaseDevices';
+import { iDisposable } from '../../services';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeEuroHeater extends ZigbeeHeater {
-    private _setLocalTempCalibrationId;
+export declare class ZigbeeEuroHeater extends ZigbeeHeater implements iDisposable {
+    private readonly _setLocalTempCalibrationId;
     private _targetTempVal;
     private _localDiffTempVal;
-    private _setModeId;
-    private _valvePosId;
+    private readonly _setModeId;
+    private readonly _valvePosId;
     private _lastRecalc;
     private _mode;
     private _recalcTimeout;
+    private _forcedRefreshInterval;
     constructor(pInfo: IoBrokerDeviceInfo);
     get seasonTurnOff(): boolean;
     set seasonTurnOff(value: boolean);
@@ -23,11 +25,12 @@ export declare class ZigbeeEuroHeater extends ZigbeeHeater {
     private checkTempDiff;
     private setLocalDiff;
     private setTargetTemperatur;
+    dispose(): void;
+    private setValve;
     /**
      * Sets the mode (1 = manual valve, 2 = automatic temp based)
      * @param {1 | 2} targetMode
      * @private
      */
     private setMode;
-    private setValve;
 }

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

@@ -18,6 +18,9 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         this._setLocalTempCalibrationId = `${this.info.fullID}.local_temp_calibration`;
         this._setModeId = `${this.info.fullID}.spz_trv_mode`;
         this._valvePosId = `${this.info.fullID}.valve_position`;
+        this._forcedRefreshInterval = services_1.Utils.guardedInterval(() => {
+            this.triggerDeviceQuery();
+        }, 6 * 60 * 60 * 1000, this);
     }
     get seasonTurnOff() {
         return this._seasonTurnOff;
@@ -149,6 +152,12 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         this.log(models_1.LogLevel.Debug, `Setting new Target Temp (${targetTemp}) for Euro Valve`);
         this.setState(this._setPointTemperaturID, targetTemp);
     }
+    dispose() {
+        clearInterval(this._forcedRefreshInterval);
+    }
+    setValve(target) {
+        this.setState(this._valvePosId, target);
+    }
     /**
      * Sets the mode (1 = manual valve, 2 = automatic temp based)
      * @param {1 | 2} targetMode
@@ -156,9 +165,9 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
      */
     setMode(targetMode) {
         this.setState(this._setModeId, targetMode);
-    }
-    setValve(target) {
-        this.setState(this._valvePosId, target);
+        services_1.Utils.guardedTimeout(() => {
+            this.triggerDeviceQuery();
+        }, 10000, this);
     }
 }
 exports.ZigbeeEuroHeater = ZigbeeEuroHeater;

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

@@ -4,7 +4,8 @@ import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryDevice {
-    battery: number;
+    private _battery;
+    get battery(): number;
     smoke: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
@@ -17,4 +18,6 @@ export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryD
     stopAlarm(quiet?: boolean): void;
     private startAlarm;
     private alarm;
+    persistBatteryDevice(): void;
+    dispose(): void;
 }

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

@@ -9,7 +9,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
-        this.battery = -99;
+        this._battery = -99;
         this.smoke = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
@@ -21,6 +21,9 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
         this._messageAlarmEnd = services_1.Res.fireAlarmEnd(this._roomName);
     }
+    get battery() {
+        return this._battery;
+    }
     set roomName(val) {
         this._roomName = val;
         this._messageAlarmFirst = services_1.Res.fireAlarmStart(this._roomName, this.info.customName);
@@ -35,8 +38,9 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -90,5 +94,16 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
             services_1.RoomService.setAllRolloOfFloor(-1, 100);
         });
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
 }
 exports.ZigbeeHeimanSmoke = ZigbeeHeimanSmoke;

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

@@ -4,8 +4,10 @@ import { ZigbeeDevice } from './BaseDevices';
 import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
+    private _battery;
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
-    battery: number;
+    readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    get battery(): number;
     private _humidityCallbacks;
     private _temperaturCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
@@ -24,4 +26,7 @@ export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatu
     addTempChangeCallback(pCallback: (pValue: number) => void): void;
     onTemperaturChange(newTemperatur: number): void;
     persistTemperaturSensor(): void;
+    persistHumiditySensor(): void;
+    persistBatteryDevice(): void;
+    dispose(): void;
 }

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

@@ -10,10 +10,13 @@ const services_1 = require("../../services");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
+        this._battery = -99;
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
         }, 5 * 60 * 1000, this, false);
-        this.battery = -99;
+        this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
+            this.persistHumiditySensor();
+        }, 5 * 60 * 1000, this, false);
         this._humidityCallbacks = [];
         this._temperaturCallbacks = [];
         this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
@@ -23,6 +26,9 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get battery() {
+        return this._battery;
+    }
     get roomTemperature() {
         return this._roomTemperature;
     }
@@ -54,8 +60,9 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
+                this._battery = state.val;
+                this.persistBatteryDevice();
+                if (this._battery < 20) {
                     this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
                 }
                 break;
@@ -86,5 +93,22 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this);
     }
+    persistHumiditySensor() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this);
+    }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
+    dispose() {
+        if (this.persistTemperatureSensorInterval) {
+            clearInterval(this.persistTemperatureSensorInterval);
+        }
+        if (this.persistHumiditySensorInterval) {
+            clearInterval(this.persistHumiditySensorInterval);
+        }
+        super.dispose();
+    }
 }
 exports.ZigbeeSonoffTemp = ZigbeeSonoffTemp;

package/lib/server/ioBroker/connection.d.ts

@@ -3,9 +3,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
+import { iDisposable } from '../services';
 import { ConnectionCallbacks } from '../../models';
 import { SocketIOConnectOpts } from './socketIOConnectOptions';
-export declare class IOBrokerConnection {
+export declare class IOBrokerConnection implements iDisposable {
     private _authInfo;
     private _authRunning;
     private _cmdData;
@@ -156,4 +157,5 @@ export declare class IOBrokerConnection {
     private _fillChildren;
     private _queueCmdIfRequired;
     private _detectViews;
+    dispose(): void;
 }

package/lib/server/ioBroker/connection.js

@@ -1345,5 +1345,15 @@ class IOBrokerConnection {
             callback(err);
         });
     }
+    dispose() {
+        if (this._connectInterval) {
+            clearInterval(this._connectInterval);
+            this._connectInterval = undefined;
+        }
+        if (this._countInterval) {
+            clearInterval(this._countInterval);
+            this._countInterval = undefined;
+        }
+    }
 }
 exports.IOBrokerConnection = IOBrokerConnection;

package/lib/server/services/Telegram/telegram-Commands.js

@@ -78,12 +78,6 @@ class TelegramCommands {
             telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Heizgruppen.getProblems());
             return true;
         }, 'Zeigt Differenzen zwischen Heizungen und den jeweiligen Heizgruppen auf'));
-        telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungCheckOne', /\/check_1_temperatur.*/, async (m) => {
-            if (m.from === undefined)
-                return false;
-            telegram_service_1.TelegramService.sendMessage([m.chat.id], await devices_1.Heizgruppen.getSpecificInfo(m.text));
-            return true;
-        }, `Gibt den Verlauf der in \\"\\" übergebenen Heizgruppe aus.`, /\/check_1_temperatur/));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('AllRolloDown', /\/all_rollo_down/, async (m) => {
             if (m.from === undefined)
                 return false;

package/lib/server/services/dbo/iPersist.d.ts

@@ -1,13 +1,12 @@
-import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iIlluminationSensor, iMotionSensor, IoBrokerBaseDevice, iShutter, iTemperatureSensor } from '../../devices';
-import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iHeater, iHumiditySensor, iIlluminationSensor, iMotionSensor, iShutter, iTemperatureSensor, ZigbeeDevice } from '../../devices';
+import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration } from '../../../models';
 export interface iPersist {
     initialized: boolean;
-    addTemperaturDataPoint(heater: iHeater): void;
     addRoom(room: RoomBase): void;
     addDevice(device: iBaseDevice): void;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getLastDesiredPosition(device: iShutter): Promise<DesiredShutterPosition>;
-    getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
+    getShutterCalibration(device: iShutter): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistShutterCalibration(data: ShutterCalibration): void;
     persistIlluminationSensor(device: iIlluminationSensor): void;
@@ -19,5 +18,7 @@ export interface iPersist {
     persistSwitchInput(device: iButtonSwitch, pressType: ButtonPressType, buttonName: string): void;
     persistShutter(device: iShutter): void;
     persistTemperatureSensor(device: iTemperatureSensor): void;
-    readTemperaturDataPoint(hzGrp: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
+    persistHumiditySensor(device: iHumiditySensor): void;
+    persistBatteryDevice(device: iBatteryDevice): void;
+    persistZigbeeDevice(device: ZigbeeDevice): void;
 }

package/lib/server/services/dbo/postgreSqlPersist.d.ts

@@ -1,6 +1,6 @@
 import { iPersist } from './iPersist';
-import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iIlluminationSensor, iMotionSensor, IoBrokerBaseDevice, iShutter, iTemperatureSensor } from '../../devices';
+import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration } from '../../../models';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iHeater, iHumiditySensor, iIlluminationSensor, iMotionSensor, iShutter, iTemperatureSensor, ZigbeeDevice } from '../../devices';
 import { PoolConfig } from 'pg';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
@@ -9,10 +9,9 @@ export declare class PostgreSqlPersist implements iPersist {
     constructor(conf: PoolConfig);
     addRoom(room: RoomBase): void;
     addDevice(device: iBaseDevice): void;
-    addTemperaturDataPoint(heater: iHeater): void;
     getLastDesiredPosition(device: iShutter): Promise<DesiredShutterPosition>;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
-    getShutterCalibration(_device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
+    getShutterCalibration(_device: iShutter): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistAC(device: iAcDevice): void;
     persistActuator(device: iActuator): void;
@@ -21,9 +20,11 @@ export declare class PostgreSqlPersist implements iPersist {
     persistMotionSensor(device: iMotionSensor): void;
     persistShutter(device: iShutter): void;
     persistTemperatureSensor(device: iTemperatureSensor): void;
+    persistHumiditySensor(device: iHumiditySensor): void;
+    persistBatteryDevice(device: iBatteryDevice): void;
+    persistZigbeeDevice(device: ZigbeeDevice): void;
     persistIlluminationSensor(device: iIlluminationSensor): void;
     persistShutterCalibration(_data: ShutterCalibration): void;
-    readTemperaturDataPoint(heater: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
     persistEnergyManager(calc: EnergyCalculation): void;
     private query;
     private isPsqlReady;