hoffmation-base 1.0.49 → 1.0.52

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

@@ -14,6 +14,7 @@ export declare abstract class IoBrokerBaseDevice implements iBaseDevice {
     };
     room: RoomBase | undefined;
     readonly deviceCapabilities: DeviceCapability[];
+    protected readonly individualStateCallbacks: Map<string, Array<(val: ioBroker.StateValue) => void>>;
     protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;
     /**
@@ -33,6 +34,12 @@ export declare abstract class IoBrokerBaseDevice implements iBaseDevice {
     get ioConn(): IOBrokerConnection | undefined;
     static addRoom(shortName: string, settings: RoomDeviceAddingSettings): void;
     static checkMissing(): void;
+    /**
+     * Allows to react on the state change of a given state with the passed cb
+     * @param {string} stateName Last part of the id e.g. "available" not "zigbee.0.00158d00053d3e4b.available"
+     * @param {(val: ioBroker.StateValue) => void} cb Desired Callback Action, with passed ioBroker.StateValue
+     */
+    addIndividualStateCallback(stateName: string, cb: (val: ioBroker.StateValue) => void): void;
     /**
      * Returns whether a connection to ioBroker is established or not
      * @param showError If true, an error message will be written to the log if the connection is not established

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -10,6 +10,7 @@ class IoBrokerBaseDevice {
         this.deviceType = deviceType;
         this.room = undefined;
         this.deviceCapabilities = [];
+        this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
     }
     get id() {
@@ -52,6 +53,21 @@ class IoBrokerBaseDevice {
             this.roomAddingSettings[rName].checkMissing();
         }
     }
+    /**
+     * Allows to react on the state change of a given state with the passed cb
+     * @param {string} stateName Last part of the id e.g. "available" not "zigbee.0.00158d00053d3e4b.available"
+     * @param {(val: ioBroker.StateValue) => void} cb Desired Callback Action, with passed ioBroker.StateValue
+     */
+    addIndividualStateCallback(stateName, cb) {
+        let arr = this.individualStateCallbacks.get(stateName);
+        if (arr === undefined) {
+            arr = [cb];
+        }
+        else {
+            arr.push(cb);
+        }
+        this.individualStateCallbacks.set(stateName, arr);
+    }
     /**
      * Returns whether a connection to ioBroker is established or not
      * @param showError If true, an error message will be written to the log if the connection is not established
@@ -71,7 +87,7 @@ class IoBrokerBaseDevice {
         });
     }
     toJSON() {
-        return services_1.Utils.jsonFilter(this);
+        return services_1.Utils.jsonFilter(this, ['individualStateCallbacks']);
     }
     addToCorrectRoom() {
         const settings = IoBrokerBaseDevice.roomAddingSettings[this.info.room];

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

@@ -2,7 +2,7 @@ import { HeaterSettings, TemperatureSettings } from '../../../models';
 import { iBaseDevice } from './iBaseDevice';
 export interface iHeater extends iBaseDevice {
     settings: HeaterSettings;
-    readonly desiredTemperature: number;
+    desiredTemperature: number;
     readonly humidity: number;
     readonly iLevel: number;
     readonly iTemperature: number;

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

@@ -19,14 +19,19 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         this._currentIllumination = -1;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
-            this.detectionsToday = todayCount.counter;
-            this.log(models_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
+        if (!services_1.Utils.anyDboActive) {
             this.initialized = true;
-        }).catch((err) => {
-            var _a;
-            this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
-        });
+        }
+        else {
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.counter;
+                this.log(models_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
+                this.initialized = true;
+            }).catch((err) => {
+                var _a;
+                this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            });
+        }
     }
     get timeSinceLastMotion() {
         return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);

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

@@ -4,6 +4,7 @@ import { DeviceType } from '../deviceType';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIPDevice extends IoBrokerBaseDevice {
     lowBattery: boolean;
+    stateMap: Map<string, ioBroker.StateValue>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
 }

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

@@ -7,6 +7,7 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this.lowBattery = false;
+        this.stateMap = new Map();
     }
     update(idSplit, state, initial = false, pOverride = false) {
         if (!pOverride) {
@@ -14,18 +15,22 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this.log(models_1.LogLevel.DeepTrace, `Data: ${JSON.stringify(state)}`);
         }
         this.log(models_1.LogLevel.DeepTrace, `Base-Device Update for ${this.info.customName}("${idSplit.join('.')}", ${state}, ${initial}, ${pOverride})`);
-        if (idSplit[3] !== '0') {
-            // Dies ist etwas Gerätespezifisches
-            return;
-        }
-        switch (idSplit[4]) {
-            case 'LOW_BAT':
+        const combinedStateName = `${idSplit[3]}.${idSplit[4]}`;
+        switch (combinedStateName) {
+            case '0.LOW_BAT':
                 const newBatLowVal = state.val;
                 if (newBatLowVal) {
                     this.log(models_1.LogLevel.Warn, `!!BATTERIE FAST LEER!!`);
                 }
                 break;
         }
+        this.stateMap.set(combinedStateName, state.val);
+        const individualCallbacks = this.individualStateCallbacks.get(combinedStateName);
+        if (individualCallbacks !== undefined) {
+            for (const cb of individualCallbacks) {
+                cb(state.val);
+            }
+        }
     }
 }
 exports.HmIPDevice = HmIPDevice;

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

@@ -21,14 +21,19 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
-            this.detectionsToday = todayCount.counter;
-            this.log(models_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
+        if (!services_1.Utils.anyDboActive) {
             this.initialized = true;
-        }).catch((err) => {
-            var _a;
-            this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
-        });
+        }
+        else {
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.counter;
+                this.log(models_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
+                this.initialized = true;
+            }).catch((err) => {
+                var _a;
+                this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            });
+        }
     }
     get detectionsToday() {
         return this._detectionsToday;

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

@@ -6,6 +6,7 @@ export declare class ZigbeeDevice extends IoBrokerBaseDevice {
     available: boolean;
     linkQuality: number;
     voltage: string;
+    stateMap: Map<string, ioBroker.StateValue>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
 }

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

@@ -9,6 +9,7 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.available = false;
         this.linkQuality = 0;
         this.voltage = '';
+        this.stateMap = new Map();
     }
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Zigbee: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
@@ -32,6 +33,13 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 this.voltage = state.val.toString();
                 break;
         }
+        this.stateMap.set(idSplit[3], state.val);
+        const individualCallbacks = this.individualStateCallbacks.get(idSplit[3]);
+        if (individualCallbacks !== undefined) {
+            for (const cb of individualCallbacks) {
+                cb(state.val);
+            }
+        }
     }
 }
 exports.ZigbeeDevice = ZigbeeDevice;

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

@@ -1,11 +1,13 @@
 /// <reference types="node" />
+/// <reference types="iobroker" />
 import { ZigbeeDevice } from './zigbeeDevice';
-import { iHeater } from '../../baseDeviceInterfaces';
+import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
 import { HeaterSettings, TemperatureSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
+export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
     settings: HeaterSettings;
+    battery: number;
     protected _automaticPoints: {
         [name: string]: TemperatureSettings;
     };
@@ -34,5 +36,6 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
     setAutomaticPoint(name: string, setting: TemperatureSettings): void;
     stopAutomaticCheck(): void;
     onTemperaturChange(newTemperatur: number): void;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     private checkSeasonTurnOff;
 }

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

@@ -10,6 +10,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this.settings = new models_1.HeaterSettings();
+        this.battery = -99;
         this._automaticPoints = {};
         this._initialSeasonCheckDone = false;
         this._level = 0;
@@ -20,6 +21,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._humidity = 0;
         this._roomTemperatur = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
         services_1.TimeCallbackService.addCallback(new models_1.TimeCallback(`${this.info.fullID} Season Check`, models_1.TimeCallbackType.TimeOfDay, () => {
             this.checkSeasonTurnOff();
@@ -66,7 +68,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperatur = val;
     }
     checkAutomaticChange() {
-        var _a, _b, _c;
+        var _a, _b;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -82,9 +84,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         if (this._desiredTemperatur !== 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 = setting.temperature;
         }
-        (_c = services_1.Utils.dbo) === null || _c === void 0 ? void 0 : _c.addTemperaturDataPoint(this);
+        (_b = services_1.Utils.dbo) === null || _b === void 0 ? void 0 : _b.addTemperaturDataPoint(this);
     }
     deleteAutomaticPoint(name) {
         if (this._automaticPoints[name] !== undefined)
@@ -102,6 +104,17 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
+    update(idSplit, state, initial = false, pOverride = false) {
+        switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
+        }
+        super.update(idSplit, state, initial, pOverride);
+    }
     checkSeasonTurnOff() {
         const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
         if (desiredState !== this.seasonTurnOff || !this._initialSeasonCheckDone) {

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

@@ -19,14 +19,19 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         this._detectionsToday = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
-            this.detectionsToday = todayCount.counter;
-            this.log(models_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);
+        if (!services_1.Utils.anyDboActive) {
             this._initialized = true;
-        }).catch((err) => {
-            var _a;
-            this.log(models_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
-        });
+        }
+        else {
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.counter;
+                this.log(models_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);
+                this._initialized = true;
+            }).catch((err) => {
+                var _a;
+                this.log(models_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            });
+        }
     }
     // Time since last motion in seconds
     get timeSinceLastMotion() {

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -23,17 +23,17 @@ values ('${room.roomName}',${room.settings.etage})
     addTemperaturDataPoint(heater) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
         this.query(`
-insert into hoffmation_schema."TemperaturData" ("date", humidity, "istTemperatur", level, name, "sollTemperatur")
+insert into hoffmation_schema."TemperaturData" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
 values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature});`);
         this.query(`
-insert into hoffmation_schema."HeatGroupCollection" ("date", humidity, "istTemperatur", level, name, "sollTemperatur")
+insert into hoffmation_schema."HeatGroupCollection" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
 values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature})
     ON CONFLICT (name)
     DO UPDATE SET
         "date" = '${new Date().toISOString()}',
-        humidity = ${heater.humidity},
+        "humidity" = ${heater.humidity},
         "istTemperatur" = ${heater.iTemperature},
-        level = ${heater.iLevel},
+        "level" = ${heater.iLevel},
         "sollTemperatur" = ${heater.desiredTemperature}
 ;
     `);
@@ -246,6 +246,7 @@ values ('${new Date(calc.startMs).toISOString()}','${new Date(calc.endMs).toISOS
             })
                 .catch((r) => {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres Query failed: ${r}`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Query: ${query}`);
                 resolve(null);
             });
         });

package/lib/server/services/utils/utils.d.ts

@@ -3,6 +3,7 @@ import { iPersist } from '../dbo';
 export declare const DAYMS: number;
 export declare class Utils {
     static dbo: iPersist | undefined;
+    static get anyDboActive(): boolean;
     static get timeTilMidnight(): number;
     static catchEm<T>(promise: Promise<T>): Promise<{
         reason: Error | null;
@@ -16,7 +17,7 @@ export declare class Utils {
     static guardedInterval(func: (...args: unknown[]) => void, time: number, thisContext?: unknown | undefined, fireImmediate?: boolean): NodeJS.Timeout;
     static nowString(): string;
     static guard<T>(object: T | undefined | null): T;
-    static jsonFilter(object: object): Partial<object>;
+    static jsonFilter(object: object, additionalOmitKeys?: string[]): Partial<object>;
     static testInitializeServices(): void;
     static kWh(wattage: number, durationInMs: number): number;
     static round(number: number, digits: number): number;

package/lib/server/services/utils/utils.js

@@ -11,6 +11,11 @@ const Translation_1 = require("../Translation");
 const settings_service_1 = require("../settings-service");
 exports.DAYMS = 24 * 60 * 60 * 1000;
 class Utils {
+    static get anyDboActive() {
+        var _a, _b;
+        return (((_a = settings_service_1.SettingsService.settings.persistence) === null || _a === void 0 ? void 0 : _a.mongo) !== undefined ||
+            ((_b = settings_service_1.SettingsService.settings.persistence) === null || _b === void 0 ? void 0 : _b.postgreSql) !== undefined);
+    }
     static get timeTilMidnight() {
         return new Date(Utils.nowMS() + exports.DAYMS).setHours(0, 0, 0, 0) - Utils.nowMS();
     }
@@ -75,8 +80,10 @@ class Utils {
         }
         return object;
     }
-    static jsonFilter(object) {
-        return this.deepOmit(object, ['timeout', 'interval', 'timeouts', 'callback']);
+    static jsonFilter(object, additionalOmitKeys = []) {
+        const keysToOmit = ['timeout', 'interval', 'timeouts', 'callback'];
+        keysToOmit.push(...additionalOmitKeys);
+        return this.deepOmit(object, keysToOmit);
     }
     static testInitializeServices() {
         log_service_1.ServerLogService.settings.logLevel = -1;