hoffmation-base 3.0.0-alpha.47 → 3.0.0-alpha.49

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

@@ -13,6 +13,10 @@ export interface iEnergyManager extends iBaseDevice, iDisposable {
      * For devices with {@link DeviceCapability.energyManager} capability.
      */
     excessEnergy: number;
+    /**
+     * Whether the Energy Manager actively blocks AC
+     */
+    readonly acBlocked: boolean;
     /**
      * The total wattaage being injected into the grid at the moment of last calculation.
      */

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

@@ -23,6 +23,8 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
     get drawingWattage(): number;
     get selfConsumingWattage(): number;
     get excessEnergy(): number;
+    /** @inheritDoc */
+    get acBlocked(): boolean;
     private _excessEnergyConsumerConsumption;
     /**
      * Example:

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

@@ -58,6 +58,10 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     get excessEnergy() {
         return this._powerValuePhaseA + this._powerValuePhaseB + this._powerValuePhaseC;
     }
+    /** @inheritDoc */
+    get acBlocked() {
+        return this.excessEnergy < 200;
+    }
     /**
      * Example:
      * ________________________________________

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

@@ -136,7 +136,7 @@ class AcDevice {
     }
     /** @inheritDoc */
     calculateDesiredMode() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const acOn = this.on;
         const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
         if (!heatGroup) {
@@ -148,6 +148,10 @@ class AcDevice {
             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.');
+            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.');
@@ -178,7 +182,7 @@ class AcDevice {
         let threshold = acOn ? 0.5 : 1.5;
         let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_c = (_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.excessEnergy) !== null && _c !== void 0 ? _c : -1;
+        const excessEnergy = (_d = (_c = devices_1.Devices.energymanager) === null || _c === void 0 ? void 0 : _c.excessEnergy) !== null && _d !== void 0 ? _d : -1;
         if ((acOn ? 200 : 1000) < excessEnergy) {
             // As there is plenty of energy to spare we plan to overshoot the target by 1 degree
             threshold = -0.5;

package/lib/server/services/victron/victron-device.d.ts

@@ -3,13 +3,14 @@ import { BatteryLevelChangeAction, LogLevel, VictronDeviceSettings } from '../..
 import { LogDebugType } from '../log-service';
 import { VictronDeviceData, VictronMqttConnectionOptions, VictronMqttConsumer } from 'victron-mqtt-consumer';
 export declare class VictronDevice implements iEnergyManager, iBatteryDevice {
-    private readonly _victronConsumer;
     /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
     /** @inheritDoc */
     deviceType: DeviceType;
     /** @inheritDoc */
     readonly settings: VictronDeviceSettings;
+    protected _info: DeviceInfo;
+    private readonly _victronConsumer;
     private _excessEnergyConsumer;
     private blockDeviceChangeTime;
     private _lastDeviceChange;
@@ -20,27 +21,28 @@ export declare class VictronDevice implements iEnergyManager, iBatteryDevice {
     private _lastBatteryPersist;
     private _lastBatteryLevel;
     private _batteryLevelCallbacks;
+    private _excessEnergy;
     constructor(opts: VictronMqttConnectionOptions);
     /** @inheritDoc */
+    get acBlocked(): boolean;
+    /** @inheritDoc */
     get lastBatteryPersist(): number;
-    protected _info: DeviceInfo;
     get info(): DeviceInfo;
     /** @inheritDoc */
     get battery(): number;
     get victronConsumer(): VictronMqttConsumer;
     get data(): VictronDeviceData;
-    private _excessEnergy;
     get excessEnergy(): number;
     get name(): string;
     get customName(): string;
     get id(): string;
-    /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    addExcessConsumer(device: iExcessEnergyConsumer): void;
     get injectingWattage(): number;
     get drawingWattage(): number;
     get selfConsumingWattage(): number;
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    addExcessConsumer(device: iExcessEnergyConsumer): void;
+    /** @inheritDoc */
     dispose(): void;
     getReport(): string;
     recalculatePowerSharing(): void;

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

@@ -7,6 +7,7 @@ const models_1 = require("../../../models");
 const log_service_1 = require("../log-service");
 const victron_mqtt_consumer_1 = require("victron-mqtt-consumer");
 const time_callback_service_1 = require("../time-callback-service");
+const lodash_1 = require("lodash");
 class VictronDevice {
     constructor(opts) {
         /** @inheritDoc */
@@ -45,6 +46,20 @@ class VictronDevice {
         this._nextPersistEntry = new models_1.EnergyCalculation(utils_1.Utils.nowMS());
     }
     /** @inheritDoc */
+    get acBlocked() {
+        if (this.settings.hasBattery) {
+            const hours = new Date().getHours();
+            if (hours < 6 || hours > 18) {
+                return this.battery < 70;
+            }
+            if (hours < 10 || hours > 16) {
+                return this.battery < 60;
+            }
+            return this.battery < 50;
+        }
+        return false;
+    }
+    /** @inheritDoc */
     get lastBatteryPersist() {
         return this._lastBatteryPersist;
     }
@@ -79,13 +94,6 @@ class VictronDevice {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `victron-${this.info.room}-${this.info.customName}`;
     }
-    /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
-    addExcessConsumer(device) {
-        this._excessEnergyConsumer.push(device);
-    }
     get injectingWattage() {
         var _a;
         return Math.min((_a = this.victronConsumer.data.grid.power) !== null && _a !== void 0 ? _a : 0, 0) * -1;
@@ -99,6 +107,13 @@ class VictronDevice {
         return Math.max((_a = this.victronConsumer.data.system.power) !== null && _a !== void 0 ? _a : 0, 0) - this.drawingWattage;
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    addExcessConsumer(device) {
+        this._excessEnergyConsumer.push(device);
+    }
+    /** @inheritDoc */
     dispose() {
         this._victronConsumer.disconnect();
         if (this._iDatabaseLoggerInterval !== null) {
@@ -154,7 +169,14 @@ class VictronDevice {
         this._lastBatteryPersist = now;
     }
     toJSON() {
-        return utils_1.Utils.jsonFilter(this, ['_victronConsumer']);
+        return (0, lodash_1.extend)(utils_1.Utils.jsonFilter(this, ['_victronConsumer', '_excessEnergyConsumer']), {
+            battery: this.battery,
+            acBlocked: this.acBlocked,
+            excessEnergy: this.excessEnergy,
+            drawingWattage: this.drawingWattage,
+            injectingWattage: this.injectingWattage,
+            selfConsumingWattage: this.selfConsumingWattage,
+        });
     }
     /**
      * Changes the grid set point of the Victron device, to the desired value.