hoffmation-base 3.0.0-alpha.83 → 3.0.0-alpha.85

package/lib/models/deviceSettings/dachsSettings.d.ts

@@ -20,6 +20,10 @@ export declare class DachsDeviceSettings extends ActuatorSettings {
      * Defines the battery level above which the dachs should be prevented from starting/running.
      */
     batteryLevelPreventStartThreshold: number;
+    /**
+     * Defines the battery level above which the external heating rod should be turned on
+     */
+    batteryLevelHeatingRodThreshold: number;
     /**
      * Defines the desired minimum temperature for warm water.
      */

package/lib/models/deviceSettings/dachsSettings.js

@@ -26,6 +26,10 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
          * Defines the battery level above which the dachs should be prevented from starting/running.
          */
         this.batteryLevelPreventStartThreshold = 70;
+        /**
+         * Defines the battery level above which the external heating rod should be turned on
+         */
+        this.batteryLevelHeatingRodThreshold = 80;
         /**
          * Defines the desired minimum temperature for warm water.
          */

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

@@ -26,6 +26,10 @@ export declare class Dachs implements iBaseDevice, iActuator {
      * An external actuator controlling the warm water pump
      */
     warmWaterPump?: iActuator;
+    /**
+     * An external actuator controlling the heat rod.
+     */
+    heatingRod?: iActuator;
     /**
      * An external actuator to prevent the Dachs from starting.
      */
@@ -79,4 +83,5 @@ export declare class Dachs implements iBaseDevice, iActuator {
      */
     private onBatteryLevelChange;
     private onTempChange;
+    private checkHeatingRod;
 }

package/lib/server/devices/dachs/dachs.js

@@ -12,6 +12,7 @@ const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
 const lib_1 = require("./lib");
 const dachsTemperatureSensor_1 = require("./dachsTemperatureSensor");
 const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
+const config_1 = require("../../config");
 class Dachs {
     /** @inheritDoc */
     get customName() {
@@ -105,6 +106,7 @@ class Dachs {
             'warmWaterSensor',
             'heatStorageTempSensor',
             'warmWaterPump',
+            'heatingRod',
             'blockDachsStart',
         ]));
     }
@@ -197,6 +199,7 @@ class Dachs {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     onBatteryLevelChange(action) {
+        this.checkHeatingRod(action);
         if (this.blockDachsStart !== undefined) {
             if (action.newLevel > this.settings.batteryLevelPreventStartThreshold) {
                 const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${action.newLevel}%, Dachs should not run any more`, null);
@@ -257,5 +260,18 @@ class Dachs {
         const setAction = new models_1.ActuatorSetStateCommand(action, desiredState, reason, null);
         this.warmWaterPump.setActuator(setAction);
     }
+    checkHeatingRod(action) {
+        var _a;
+        if (this.heatingRod === undefined) {
+            return;
+        }
+        const shouldBeOff = ((_a = services_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.mode) === config_1.HeatingMode.Winter ||
+            action.newLevel < this.settings.batteryLevelHeatingRodThreshold;
+        if (this.heatingRod.actuatorOn !== shouldBeOff) {
+            return;
+        }
+        const setAction = new models_1.ActuatorSetStateCommand(action, !shouldBeOff, `Battery reached ${action.newLevel}%, heating rod should be turned ${shouldBeOff ? 'off' : 'on'}`, null);
+        this.heatingRod.setActuator(setAction);
+    }
 }
 exports.Dachs = Dachs;

package/lib/server/devices/espresense/espresenseDevice.js

@@ -86,7 +86,7 @@ class EspresenseDevice {
         try {
             data = JSON.parse(state.val);
         }
-        catch (e) {
+        catch (_e) {
             this.log(models_1.LogLevel.Error, `Recieved malformed update data: ${state.val}`);
             return;
         }

package/lib/server/devices/groups/tasterGroup.js

@@ -65,7 +65,10 @@ class TasterGroup extends base_group_1.BaseGroup {
                 const sonosGroup = this.getRoom().SonosGroup;
                 if (sonosGroup !== undefined && sonosGroup.getOwnSonosDevices().length > 0) {
                     (_h = t.buttonBotRight) === null || _h === void 0 ? void 0 : _h.addCb(button_1.ButtonPressType.long, (pValue) => {
-                        pValue && sonosGroup.trigger(this.getRoom().settings.radioUrl);
+                        if (!pValue) {
+                            return;
+                        }
+                        sonosGroup.trigger(this.getRoom().settings.radioUrl);
                     });
                 }
             }
@@ -73,10 +76,16 @@ class TasterGroup extends base_group_1.BaseGroup {
                 const heatGroup = this.getRoom().HeatGroup;
                 if (heatGroup !== undefined && heatGroup.getOwnAcDevices().length > 0) {
                     (_k = t.buttonBotRight) === null || _k === void 0 ? void 0 : _k.addCb(button_1.ButtonPressType.short, (pValue) => {
-                        pValue && heatGroup.setAc(true);
+                        if (!pValue) {
+                            return;
+                        }
+                        heatGroup.setAc(true);
                     });
                     (_l = t.buttonBotRight) === null || _l === void 0 ? void 0 : _l.addCb(button_1.ButtonPressType.long, (pValue) => {
-                        pValue && heatGroup.setAc(false, true);
+                        if (!pValue) {
+                            return;
+                        }
+                        heatGroup.setAc(false, true);
                     });
                 }
             }

package/lib/server/devices/groups/windowGroup.js

@@ -15,7 +15,7 @@ class WindowGroup extends base_group_1.BaseGroup {
      */
     get anyShutterDown() {
         return this.windows.some((w) => {
-            w.anyShutterDown;
+            return w.anyShutterDown;
         });
     }
     constructor(roomName, windows) {

package/lib/server/ioBroker/connection.js

@@ -240,7 +240,7 @@ class IOBrokerConnection {
                     try {
                         state.val = JSON.parse(state.val);
                     }
-                    catch (e) {
+                    catch (_e) {
                         iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Debug, 'Command seems to be an object, but cannot parse it: ' + state.val);
                     }
                 }
@@ -643,7 +643,9 @@ class IOBrokerConnection {
         const adapter = parts[1];
         parts.splice(0, 2);
         this._socket.emit('mkdir', adapter, parts.join('/'), (err) => {
-            callback && callback(err);
+            if (callback) {
+                callback(err);
+            }
         });
     }
     unlink(name, callback) {
@@ -651,7 +653,9 @@ class IOBrokerConnection {
         const adapter = parts[1];
         parts.splice(0, 2);
         this._socket.emit('unlink', adapter, parts.join('/'), (err) => {
-            callback && callback(err);
+            if (callback) {
+                callback(err);
+            }
         });
     }
     renameFile(oldname, newname, callback) {
@@ -661,7 +665,9 @@ class IOBrokerConnection {
         const parts2 = newname.split('/');
         parts2.splice(0, 2);
         this._socket.emit('rename', adapter, parts1.join('/'), parts2.join('/'), (err) => {
-            callback && callback(err);
+            if (callback) {
+                callback(err);
+            }
         });
     }
     setState(pointId, state, callback) {
@@ -708,7 +714,9 @@ class IOBrokerConnection {
         }
         this._socket.emit('getStates', idPattern, (err, data) => {
             iobrokerConnectionLogging_1.iobrokerConnectionLogging.writeLog(iobrokerConnectionLogging_1.iobrokerConnectionLogLevel.Debug, `getStates Callback; Error: "${err}"`);
-            this._gettingStates !== undefined && this._gettingStates--;
+            if (this._gettingStates !== undefined) {
+                this._gettingStates--;
+            }
             if (err || !data) {
                 if (callback) {
                     callback(err || new Error('Authentication required'));

package/lib/server/services/Sonos/sonos-service.js

@@ -74,7 +74,7 @@ class SonosService {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Alle Geräte okay --> Last checked ${currentDevice.name}`);
             }
         }
-        catch (e) {
+        catch (_e) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Atleast one device failed --> Last checked ${(_a = currentDevice === null || currentDevice === void 0 ? void 0 : currentDevice.name) !== null && _a !== void 0 ? _a : 'undefined'}`);
             Telegram_1.TelegramService.inform('Sonos device is failing --> Reinitialize whole system');
             this.initialize(true);

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

@@ -153,16 +153,22 @@ class AcDevice {
         }
         this._desiredTemperatur = heatGroup.desiredTemp;
         if (this.settings.manualDisabled) {
-            acOn && this.log(models_1.LogLevel.Info, 'We should turn off now, as manual disable force is set.');
+            if (acOn) {
+                this.log(models_1.LogLevel.Info, 'We should turn off now, as manual disable force is set.');
+            }
             return ac_mode_1.AcMode.Off;
         }
         if ((_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.acBlocked) {
-            acOn && this.log(models_1.LogLevel.Info, 'We should turn off now, as energy-manager demands off.');
+            if (acOn) {
+                this.log(models_1.LogLevel.Info, 'We should turn off now, as energy-manager demands off.');
+            }
             return ac_mode_1.AcMode.Off;
         }
         // Check Turn Off Time
         if (!utils_1.Utils.timeWithinBorders(this.settings.minimumHours, this.settings.minimumMinutes, this.settings.maximumHours, this.settings.maximumMinutes)) {
-            acOn && this.log(models_1.LogLevel.Info, 'We should turn off now, to respect night settings.');
+            if (acOn) {
+                this.log(models_1.LogLevel.Info, 'We should turn off now, to respect night settings.');
+            }
             return ac_mode_1.AcMode.Off;
         }
         if (this.settings.useOwnTemperature) {

package/lib/server/services/weather/weather-service.js

@@ -89,9 +89,9 @@ class WeatherService {
                 break;
         }
         speaker.speakOnDevice(message, volume, false);
-        !short &&
-            precipitation > 0 &&
+        if (!short && precipitation > 0) {
             speaker.speakOnDevice(`Es werden etwa ${precipitation} Millimeter Niederschlag in den nächsten ${minutes} Minuten fallen`, volume, false);
+        }
         const alerts = WeatherService.getActiveAlerts();
         if (alerts.length > 0) {
             const alertMessage = ['Achtung, vorliegende Wetterwarnungen:'];