hoffmation-base 3.0.0-alpha.99 → 3.0.0-beta.0

package/lib/models/action/actuatorChangeAction.d.ts

@@ -0,0 +1,13 @@
+import { BaseAction } from './baseAction';
+import { CommandType } from '../command';
+import { iActuator } from '../../server';
+export declare class ActuatorChangeAction extends BaseAction {
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * The new state
+     * @type {boolean}
+     */
+    readonly actuatorOn: boolean;
+    constructor(device: iActuator);
+}

package/lib/models/action/actuatorChangeAction.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActuatorChangeAction = void 0;
+const baseAction_1 = require("./baseAction");
+const command_1 = require("../command");
+class ActuatorChangeAction extends baseAction_1.BaseAction {
+    constructor(device) {
+        super(undefined, `New Actuator state (${device.actuatorOn}) received`);
+        /** @inheritDoc */
+        this.type = command_1.CommandType.ActuatorChangeAction;
+        this.actuatorOn = device.actuatorOn;
+    }
+}
+exports.ActuatorChangeAction = ActuatorChangeAction;

package/lib/models/action/index.d.ts

@@ -5,5 +5,6 @@ export * from './presenceGroupLastLeftAction';
 export * from './presenceGroupFirstEnterAction';
 export * from './shutterPositionChangedAction';
 export * from './temperatureSensorChangeAction';
+export { ActuatorChangeAction } from './actuatorChangeAction';
 export { BatteryLevelChangeAction } from './batteryLevelChangeAction';
 export { PresenceGroupAnyMovementAction } from './presenceGroupAnyMovementAction';

package/lib/models/action/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PresenceGroupAnyMovementAction = exports.BatteryLevelChangeAction = exports.BaseAction = void 0;
+exports.PresenceGroupAnyMovementAction = exports.BatteryLevelChangeAction = exports.ActuatorChangeAction = exports.BaseAction = void 0;
 var baseAction_1 = require("./baseAction");
 Object.defineProperty(exports, "BaseAction", { enumerable: true, get: function () { return baseAction_1.BaseAction; } });
 __exportStar(require("./humiditySensorChangeAction"), exports);
@@ -23,6 +23,8 @@ __exportStar(require("./presenceGroupLastLeftAction"), exports);
 __exportStar(require("./presenceGroupFirstEnterAction"), exports);
 __exportStar(require("./shutterPositionChangedAction"), exports);
 __exportStar(require("./temperatureSensorChangeAction"), exports);
+var actuatorChangeAction_1 = require("./actuatorChangeAction");
+Object.defineProperty(exports, "ActuatorChangeAction", { enumerable: true, get: function () { return actuatorChangeAction_1.ActuatorChangeAction; } });
 var batteryLevelChangeAction_1 = require("./batteryLevelChangeAction");
 Object.defineProperty(exports, "BatteryLevelChangeAction", { enumerable: true, get: function () { return batteryLevelChangeAction_1.BatteryLevelChangeAction; } });
 var presenceGroupAnyMovementAction_1 = require("./presenceGroupAnyMovementAction");

package/lib/models/command/commandType.d.ts

@@ -1,4 +1,5 @@
 export declare enum CommandType {
+    ActuatorChangeAction = "ActuatorChangeAction",
     BatteryManagerLevelChangeAction = "BatteryManagerLevelChangeAction",
     BlockAutomaticLiftBlockCommand = "BlockAutomaticLiftBlockCommand",
     BlockAutomaticCommand = "BlockAutomaticCommand",

package/lib/models/command/commandType.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandType = void 0;
 var CommandType;
 (function (CommandType) {
+    CommandType["ActuatorChangeAction"] = "ActuatorChangeAction";
     CommandType["BatteryManagerLevelChangeAction"] = "BatteryManagerLevelChangeAction";
     CommandType["BlockAutomaticLiftBlockCommand"] = "BlockAutomaticLiftBlockCommand";
     CommandType["BlockAutomaticCommand"] = "BlockAutomaticCommand";

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

@@ -86,8 +86,10 @@ export declare class Dachs implements iBaseDevice, iActuator {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     private onBatteryLevelChange;
+    private checkAllDesiredStates;
     private onTempChange;
     private checkHeatingRod;
     private shouldDachsBeStarted;
     private checkAlternativeActuator;
+    private onDachsRunningStateChange;
 }

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

@@ -141,11 +141,17 @@ class Dachs {
                 this._influxClient.addMeasurementToQueue(key, value ? '1' : '0');
             }
             this._influxClient.flush();
+            const isDachsOn = this.fetchedData['Hka_Mw1.usDrehzahl'] >= 1;
+            const didDachsChange = this._dachsOn !== isDachsOn;
+            this._dachsOn = isDachsOn;
             this._dachsOn = this.fetchedData['Hka_Mw1.usDrehzahl'] >= 1;
             this._tempWarmWater = (_a = this.fetchedData['Hka_Mw1.Temp.sbZS_Warmwasser']) !== null && _a !== void 0 ? _a : 0;
             this.warmWaterSensor.update(this._tempWarmWater);
             this._tempHeatStorage = (_b = this.fetchedData['Hka_Mw1.Temp.sbFuehler1']) !== null && _b !== void 0 ? _b : 0;
             this.heatStorageTempSensor.update(this._tempHeatStorage);
+            if (didDachsChange) {
+                this.onDachsRunningStateChange(new models_1.ActuatorChangeAction(this));
+            }
             this.persist();
         })
             .catch((error) => {
@@ -208,8 +214,11 @@ class Dachs {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     onBatteryLevelChange(action) {
-        const shouldDachsBeStarted = this.shouldDachsBeStarted(action);
-        this.checkHeatingRod(action);
+        this.checkAllDesiredStates(action, action.newLevel);
+    }
+    checkAllDesiredStates(action, batteryLevel) {
+        const shouldDachsBeStarted = this.shouldDachsBeStarted(action, batteryLevel);
+        this.checkHeatingRod(action, batteryLevel);
         this.checkAlternativeActuator(shouldDachsBeStarted, action);
         if (!shouldDachsBeStarted) {
             return;
@@ -267,34 +276,34 @@ class Dachs {
         const setAction = new models_1.ActuatorSetStateCommand(action, desiredWwPumpState, reason, null);
         this.warmWaterPump.setActuator(setAction);
     }
-    checkHeatingRod(action) {
+    checkHeatingRod(action, batteryLevel) {
         if (this.heatingRod === undefined) {
             return;
         }
-        const shouldBeOff = action.newLevel < this.settings.batteryLevelHeatingRodThreshold;
+        const shouldBeOff = batteryLevel < 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);
+        const setAction = new models_1.ActuatorSetStateCommand(action, !shouldBeOff, `Battery reached ${batteryLevel}%, heating rod should be turned ${shouldBeOff ? 'off' : 'on'}`, null);
         this.heatingRod.setActuator(setAction);
     }
-    shouldDachsBeStarted(action) {
+    shouldDachsBeStarted(action, batteryLevel) {
         var _a;
         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);
+            if (batteryLevel > this.settings.batteryLevelPreventStartThreshold) {
+                const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${batteryLevel}%, Dachs should not run any more`, null);
                 blockAction.overrideCommandSource = models_1.CommandSource.Force;
                 this.blockDachsStart.setActuator(blockAction);
                 return false;
             }
-            else if (action.newLevel < this.settings.batteryLevelAllowStartThreshold) {
-                const liftAction = new models_1.ActuatorSetStateCommand(action, false, `Battery reached ${action.newLevel}%, Dachs is now allowed to run if needed`, null);
+            else if (batteryLevel < this.settings.batteryLevelAllowStartThreshold) {
+                const liftAction = new models_1.ActuatorSetStateCommand(action, false, `Battery reached ${batteryLevel}%, Dachs is now allowed to run if needed`, null);
                 this.blockDachsStart.setActuator(liftAction);
             }
             else if (((_a = services_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.mode) === config_1.HeatingMode.Winter &&
                 this.heatStorageTempSensor.temperatureSensor.temperature < 60 &&
                 services_1.Utils.dateByTimeSpan(21, 30) < new Date()) {
-                const liftWinterAction = new models_1.ActuatorSetStateCommand(action, false, `Battery at ${action.newLevel}% but it is winter, we are nearing night and heat storage is kinda cold: Dachs is now allowed to run if needed`, null);
+                const liftWinterAction = new models_1.ActuatorSetStateCommand(action, false, `Battery at ${batteryLevel}% but it is winter, we are nearing night and heat storage is kinda cold: Dachs is now allowed to run if needed`, null);
                 this.blockDachsStart.setActuator(liftWinterAction);
             }
             else if (this.blockDachsStart.actuatorOn) {
@@ -308,11 +317,11 @@ class Dachs {
         }
         const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
         if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
-            action.newLevel > this.settings.batteryLevelTurnOnThreshold) {
+            batteryLevel > this.settings.batteryLevelTurnOnThreshold) {
             // It is daytime (maybe solar power) and it is no critical battery level
             return false;
         }
-        if (action.newLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
+        if (batteryLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
             // It is not daylight but battery level is high enough
             return false;
         }
@@ -340,5 +349,9 @@ class Dachs {
         command.overrideCommandSource = models_1.CommandSource.Force;
         this.warmWaterDachsAlternativeActuator.setActuator(command);
     }
+    onDachsRunningStateChange(runStateChange) {
+        var _a, _b;
+        this.checkAllDesiredStates(runStateChange, (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.batteryLevel) !== null && _b !== void 0 ? _b : 0);
+    }
 }
 exports.Dachs = Dachs;