hoffmation-base 1.1.48 → 1.2.0

package/lib/server/devices/Heizgruppen.d.ts

@@ -1,6 +1,5 @@
 import { HmIpHeizgruppe } from './hmIPDevices';
 export declare class Heizgruppen {
-    static getSpecificInfo(pText: string | undefined): Promise<string>;
     static getProblems(): string;
     static getAllGruppen(): HmIpHeizgruppe[];
     static getSpecificGroup(name: string): HmIpHeizgruppe | undefined;

package/lib/server/devices/Heizgruppen.js

@@ -3,27 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Heizgruppen = void 0;
 const deviceType_1 = require("./deviceType");
 const devices_1 = require("./devices");
-const services_1 = require("../services");
-const groups_1 = require("./groups");
 class Heizgruppen {
-    static async getSpecificInfo(pText) {
-        var _a, _b;
-        if (pText === undefined || !pText.includes('"')) {
-            return `Bitte übergeben Sie eine Heizgruppe innerhalb von "". z.B. "EG Flur HeizGr"`;
-        }
-        const searchText = pText.split('"')[1];
-        const group = this.getSpecificGroup(searchText);
-        if (group === undefined) {
-            return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${groups_1.HeatGroup.getInfo()}`;
-        }
-        const results = (_b = (await ((_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.readTemperaturDataPoint(group, 20)))) !== null && _b !== void 0 ? _b : [];
-        const response = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];
-        response.push(`Zeitpunkt\t\tIst-Temperatur\t\tSoll-Temperatur\t\tVentilstellung`);
-        for (const r of results) {
-            response.push(`${r.date.toLocaleTimeString('de-DE')}:\t\t${r.istTemperatur}°C\t\t${r.sollTemperatur}°C\t\t${r.level}%`);
-        }
-        return response.join('\n');
-    }
     static getProblems() {
         const groups = this.getAllGruppen();
         const response = [`Dies sind die bestehenden Differenzen:`];

package/lib/server/devices/baseDeviceInterfaces/iBatteryDevice.d.ts

@@ -4,5 +4,6 @@ export interface iBatteryDevice extends iRoomDevice {
      * The battery status of the device in percentage
      * @type {number}
      */
-    battery: number;
+    readonly battery: number;
+    persistBatteryDevice(): void;
 }

package/lib/server/devices/baseDeviceInterfaces/iHumiditySensor.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;
 export interface iHumiditySensor extends iRoomDevice {
-    humidity: number;
+    readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    readonly humidity: number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;
+    persistHumiditySensor(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpGriff.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="iobroker" />
+import { iDisposable } from '../../services';
 import { WindowPosition } from '../models';
 import { Window } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iHandleSensor } from '../baseDeviceInterfaces';
-export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBatteryDevice {
-    battery: number;
+export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBatteryDevice, iDisposable {
+    private _battery;
+    get battery(): number;
     position: WindowPosition;
     private _kippCallback;
     private _closedCallback;
@@ -22,5 +24,7 @@ export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBat
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePosition(pValue: WindowPosition): void;
+    persistBatteryDevice(): void;
+    dispose(): void;
     toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/server/devices/hmIPDevices/hmIpGriff.js

@@ -14,7 +14,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
-        this.battery = -99;
+        this._battery = -99;
         this.position = models_1.WindowPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
@@ -25,6 +25,9 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get battery() {
+        return this._battery;
+    }
     set window(value) {
         this._window = value;
     }
@@ -44,7 +47,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 0.9) / 0.6);
+                        this._battery = 100 * ((state.val - 0.9) / 0.6);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
@@ -54,7 +58,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                         this.updatePosition(state.val);
                         break;
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 0.9) / 0.6);
+                        this._battery = 100 * ((state.val - 0.9) / 0.6);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
@@ -132,6 +137,16 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }, 60000, this);
         }
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
+    dispose() {
+        if (this._iOpenTimeout) {
+            clearInterval(this._iOpenTimeout);
+            this._iOpenTimeout = undefined;
+        }
+    }
     toJSON() {
         return lodash_1.default.omit(super.toJSON(), ['_window']);
     }

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
+import { iDisposable } from '../../services';
 import { HeaterSettings, TemperatureSettings } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater {
+export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
     readonly persistHeaterInterval: NodeJS.Timeout;
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
+    readonly persistHumiditySensorInterval: NodeJS.Timeout;
     settings: HeaterSettings;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
@@ -46,6 +48,8 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     onTemperaturChange(newTemperatur: number): void;
     persistTemperaturSensor(): void;
     persistHeater(): void;
+    persistHumiditySensor(): void;
     private updateBaseInformation;
     private checkSeasonTurnOff;
+    dispose(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js

@@ -17,6 +17,9 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
         }, 5 * 60 * 1000, this, false);
+        this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
+            this.persistHumiditySensor();
+        }, 5 * 60 * 1000, this, false);
         this.settings = new models_1.HeaterSettings();
         this._initialSeasonCheckDone = false;
         this._level = 0;
@@ -134,12 +137,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b, _c;
+        var _a;
         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());
@@ -150,9 +152,8 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         if (this._desiredTemperature !== setting.temperature) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
-            this.desiredTemperature = (_b = setting.temperature) !== null && _b !== void 0 ? _b : this.settings.automaticFallBackTemperatur;
+            this.desiredTemperature = (_a = setting.temperature) !== null && _a !== void 0 ? _a : this.settings.automaticFallBackTemperatur;
         }
-        (_c = services_1.Utils.dbo) === null || _c === void 0 ? void 0 : _c.addTemperaturDataPoint(this);
     }
     addTempChangeCallback(pCallback) {
         this._temperatureCallbacks.push(pCallback);
@@ -171,6 +172,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    persistHumiditySensor() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this);
+    }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':
@@ -196,5 +201,20 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    dispose() {
+        if (this.persistTemperatureSensorInterval) {
+            clearInterval(this.persistTemperatureSensorInterval);
+        }
+        if (this.persistHumiditySensorInterval) {
+            clearInterval(this.persistHumiditySensorInterval);
+        }
+        if (this.persistHeaterInterval) {
+            clearInterval(this.persistHeaterInterval);
+        }
+        if (this._iAutomaticInterval) {
+            clearInterval(this._iAutomaticInterval);
+            this._iAutomaticInterval = undefined;
+        }
+    }
 }
 exports.HmIpHeizgruppe = HmIpHeizgruppe;

package/lib/server/devices/hmIPDevices/hmIpHeizung.d.ts

@@ -3,10 +3,11 @@ import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
+    private _battery;
     private _temperatur;
     private _level;
     private _adaptionState;
-    battery: number;
+    get battery(): number;
     constructor(pInfo: IoBrokerDeviceInfo);
     private _desiredTemperatur;
     get desiredTemperatur(): number;
@@ -14,4 +15,5 @@ export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
     get iTemperatur(): number;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     private updateBaseInformation;
+    persistBatteryDevice(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpHeizung.js

@@ -5,6 +5,7 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const hmIpDevice_1 = require("./hmIpDevice");
 const DeviceCapability_1 = require("../DeviceCapability");
+const services_1 = require("../../services");
 var HmIpHeizungAdaptionStates;
 (function (HmIpHeizungAdaptionStates) {
     HmIpHeizungAdaptionStates[HmIpHeizungAdaptionStates["StateNotAvailable"] = 0] = "StateNotAvailable";
@@ -20,12 +21,15 @@ var HmIpHeizungAdaptionStates;
 class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizung);
+        this._battery = -99;
         this._temperatur = 0;
         this._level = 0;
-        this.battery = -99;
         this._desiredTemperatur = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get battery() {
+        return this._battery;
+    }
     get desiredTemperatur() {
         return this._desiredTemperatur;
     }
@@ -42,7 +46,8 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 1.8) / 1.2);
+                        this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
@@ -72,5 +77,9 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.HmIpHeizung = HmIpHeizung;

package/lib/server/devices/hmIPDevices/hmIpPraezenz.d.ts

@@ -4,11 +4,12 @@ import { MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
+    private _battery;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     excludeFromNightAlarm: boolean;
     movementDetected: boolean;
-    battery: number;
+    get battery(): number;
     settings: MotionSensorSettings;
     private _movementDetectedCallback;
     private initialized;
@@ -25,4 +26,5 @@ export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSen
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;
     persistMotionSensor(): void;
+    persistBatteryDevice(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpPraezenz.js

@@ -10,9 +10,9 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
+        this._battery = -99;
         this.excludeFromNightAlarm = false;
         this.movementDetected = false;
-        this.battery = -99;
         this.settings = new models_1.MotionSensorSettings();
         this._movementDetectedCallback = [];
         // private presenceStateID: string;
@@ -38,6 +38,9 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    get battery() {
+        return this._battery;
+    }
     get timeSinceLastMotion() {
         return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
     }
@@ -65,7 +68,8 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 1.8) / 1.2);
+                        this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
@@ -109,6 +113,10 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.HmIpPraezenz = HmIpPraezenz;
 // TODO: Add iPresenceSensor

package/lib/server/devices/hmIPDevices/hmIpTaster.d.ts

@@ -4,6 +4,7 @@ import { iBatteryDevice, iButtonSwitch } from '../baseDeviceInterfaces';
 import { Button, ButtonPressType } from '../button';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBatteryDevice {
+    private _battery;
     private static readonly BUTTON_CAPABILLITIES;
     buttonTopLeft: Button;
     buttonMidLeft: Button;
@@ -13,9 +14,10 @@ export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBa
     buttonBotRight: Button;
     buttonBot: undefined;
     buttonTop: undefined;
-    battery: number;
+    get battery(): number;
     constructor(pInfo: IoBrokerDeviceInfo);
     persist(buttonName: string, pressType: ButtonPressType): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;
+    persistBatteryDevice(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpTaster.js

@@ -10,9 +10,9 @@ const services_1 = require("../../services");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
+        this._battery = -99;
         this.buttonBot = undefined;
         this.buttonTop = undefined;
-        this.battery = -99;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.buttonTopLeft = new button_1.Button('TopLeft', HmIpTaster.BUTTON_CAPABILLITIES);
@@ -22,6 +22,9 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this.buttonMidRight = new button_1.Button('MidRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
     }
+    get battery() {
+        return this._battery;
+    }
     persist(buttonName, pressType) {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSwitchInput(this, pressType, buttonName);
@@ -34,7 +37,8 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 1.8) / 1.2);
+                        this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
@@ -105,6 +109,10 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         result.push('____________');
         return result.join('\n');
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.HmIpTaster = HmIpTaster;
 HmIpTaster.BUTTON_CAPABILLITIES = {

package/lib/server/devices/hmIPDevices/hmIpTherm.d.ts

@@ -3,7 +3,9 @@ import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class HmIpTherm extends HmIPDevice implements iBatteryDevice {
-    battery: number;
+    private _battery;
+    get battery(): number;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    persistBatteryDevice(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpTherm.js

@@ -5,12 +5,16 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
+const services_1 = require("../../services");
 class HmIpTherm extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTherm);
-        this.battery = -99;
+        this._battery = -99;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    get battery() {
+        return this._battery;
+    }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Thermostat Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -18,11 +22,16 @@ class HmIpTherm extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this.battery = 100 * ((state.val - 1.8) / 1.2);
+                        this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.persistBatteryDevice();
                         break;
                 }
                 break;
         }
     }
+    persistBatteryDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+    }
 }
 exports.HmIpTherm = HmIpTherm;

package/lib/server/devices/hmIPDevices/hmIpTuer.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
+import { iDisposable } from '../../services';
 import { MagnetPosition } from '../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpTuer extends HmIPDevice {
+export declare class HmIpTuer extends HmIPDevice implements iDisposable {
     position: MagnetPosition;
     private _closedCallback;
     private _openCallback;
@@ -13,4 +14,5 @@ export declare class HmIpTuer extends HmIPDevice {
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePosition(pValue: MagnetPosition): void;
+    dispose(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpTuer.js

@@ -86,5 +86,11 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             }, 60000, this);
         }
     }
+    dispose() {
+        if (this._iOpenTimeout) {
+            clearInterval(this._iOpenTimeout);
+            this._iOpenTimeout = undefined;
+        }
+    }
 }
 exports.HmIpTuer = HmIpTuer;

package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { iEnergyManager, iExcessEnergyConsumer, PhaseState } from '../baseDeviceInterfaces';
+import { iDisposable } from '../../services';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements iEnergyManager {
+export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements iEnergyManager, iDisposable {
     private _excessEnergyConsumer;
     private _iCalculationInterval;
     private _iDatabaseLoggerInterval;
@@ -54,4 +55,5 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
     private persist;
     private turnOnAdditionalConsumer;
     private turnOffAdditionalConsumer;
+    dispose(): void;
 }

package/lib/server/devices/jsObject/jsObjectEnergyManager.js

@@ -226,5 +226,15 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         potentialDevices[0].turnOffDueToMissingEnergy();
         this._lastDeviceChange = { newState: false, device: potentialDevices[0] };
     }
+    dispose() {
+        if (this._iCalculationInterval) {
+            clearInterval(this._iCalculationInterval);
+            this._iCalculationInterval = null;
+        }
+        if (this._iDatabaseLoggerInterval) {
+            clearInterval(this._iDatabaseLoggerInterval);
+            this._iDatabaseLoggerInterval = null;
+        }
+    }
 }
 exports.JsObjectEnergyManager = JsObjectEnergyManager;

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

@@ -1,12 +1,20 @@
+/// <reference types="node" />
 /// <reference types="iobroker" />
 import { DeviceType } from '../../deviceType';
 import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-export declare class ZigbeeDevice extends IoBrokerBaseDevice {
-    available: boolean;
-    linkQuality: number;
-    voltage: string;
+import { iDisposable } from '../../../services';
+export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposable {
+    protected _available: boolean;
+    get available(): boolean;
+    protected _linkQuality: number;
+    readonly persistZigbeeInterval: NodeJS.Timeout;
+    get linkQuality(): number;
+    private _lastUpdate;
+    get lastUpdate(): Date;
     stateMap: Map<string, ioBroker.State>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    dispose(): void;
+    persistZigbeeDevice(): void;
 }

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

@@ -3,35 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeDevice = void 0;
 const models_1 = require("../../../../models");
 const IoBrokerBaseDevice_1 = require("../../IoBrokerBaseDevice");
+const services_1 = require("../../../services");
 class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
-        this.available = false;
-        this.linkQuality = 0;
-        this.voltage = '';
+        this._available = false;
+        this._linkQuality = 0;
+        this.persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
+            this.persistZigbeeDevice();
+        }, 15 * 60 * 1000, this, false);
+        this._lastUpdate = new Date(0);
         this.stateMap = new Map();
     }
+    get available() {
+        return this._available;
+    }
+    get linkQuality() {
+        return this._linkQuality;
+    }
+    get lastUpdate() {
+        return this._lastUpdate;
+    }
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Zigbee: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         if (!pOverride) {
             this.log(models_1.LogLevel.Warn, `Keine Update Überschreibung:\n\tID: ${idSplit.join('.')}\n\tData: ${JSON.stringify(state)}`);
         }
+        if (!initial) {
+            this._lastUpdate = new Date();
+        }
         switch (idSplit[3]) {
             case 'available':
-                this.available = state.val;
-                if (!this.available) {
+                this._available = state.val;
+                if (!this._available) {
                     this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät ist nicht erreichbar.`);
                 }
                 break;
             case 'link_quality':
-                this.linkQuality = state.val;
-                if (this.linkQuality < 5) {
-                    this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät hat eine schlechte Verbindung (${this.linkQuality}).`);
+                this._linkQuality = state.val;
+                if (this._linkQuality < 5) {
+                    this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät hat eine schlechte Verbindung (${this._linkQuality}).`);
                 }
                 break;
-            case 'voltage':
-                this.voltage = state.val.toString();
-                break;
         }
         this.stateMap.set(idSplit[3], state);
         const individualCallbacks = this.individualStateCallbacks.get(idSplit[3]);
@@ -41,5 +54,12 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             }
         }
     }
+    dispose() {
+        clearInterval(this.persistZigbeeInterval);
+    }
+    persistZigbeeDevice() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistZigbeeDevice(this);
+    }
 }
 exports.ZigbeeDevice = ZigbeeDevice;

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

@@ -7,9 +7,10 @@ import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
+    protected _battery: number;
     readonly persistHeaterInterval: NodeJS.Timeout;
     settings: HeaterSettings;
-    battery: number;
+    get battery(): number;
     protected _automaticPoints: {
         [name: string]: TemperatureSettings;
     };
@@ -44,4 +45,6 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     protected getNextPidLevel(): number;
     private checkSeasonTurnOff;
+    persistBatteryDevice(): void;
+    dispose(): void;
 }