hoffmation-base 2.12.2 → 2.12.4

package/lib/models/persistence/EnergyCalculation.d.ts

@@ -1,3 +1,5 @@
+import { LogLevel } from '../logLevel';
+import { LogDebugType } from '../../server';
 export declare class EnergyCalculation {
     startMs: number;
     drawnKwH: number;
@@ -8,4 +10,5 @@ export declare class EnergyCalculation {
     savedSelfConsume: number;
     endMs: number;
     constructor(startMs: number);
+    static persist(obj: EnergyCalculation, endMs: number, logger: (level: LogLevel, message: string, logDebugType?: LogDebugType) => void): boolean;
 }

package/lib/models/persistence/EnergyCalculation.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnergyCalculation = void 0;
+const logLevel_1 = require("../logLevel");
+const server_1 = require("../../server");
 class EnergyCalculation {
     constructor(startMs) {
         this.startMs = startMs;
@@ -12,5 +14,25 @@ class EnergyCalculation {
         this.savedSelfConsume = 0;
         this.endMs = 0;
     }
+    static persist(obj, endMs, logger) {
+        var _a, _b, _c, _d;
+        if (obj.drawnKwH === 0 && obj.injectedKwH === 0 && obj.selfConsumedKwH === 0) {
+            logger(logLevel_1.LogLevel.Warn, `Not persisting energy Data, as all values are 0.`);
+            return false;
+        }
+        if (!server_1.SettingsService.settings.wattagePrice) {
+            logger(logLevel_1.LogLevel.Warn, `Wattage price not set, assuming average of 34ct.`);
+        }
+        obj.endMs = endMs;
+        obj.earnedInjected = server_1.Utils.round(obj.injectedKwH * ((_a = server_1.SettingsService.settings.injectWattagePrice) !== null && _a !== void 0 ? _a : 0.06), 4);
+        obj.savedSelfConsume = server_1.Utils.round(obj.selfConsumedKwH * ((_b = server_1.SettingsService.settings.wattagePrice) !== null && _b !== void 0 ? _b : 0.35), 4);
+        obj.costDrawn = server_1.Utils.round(obj.drawnKwH * ((_c = server_1.SettingsService.settings.wattagePrice) !== null && _c !== void 0 ? _c : 0.35), 4);
+        obj.injectedKwH = server_1.Utils.round(obj.injectedKwH, 4);
+        obj.selfConsumedKwH = server_1.Utils.round(obj.selfConsumedKwH, 4);
+        obj.drawnKwH = server_1.Utils.round(obj.drawnKwH, 4);
+        (_d = server_1.Utils.dbo) === null || _d === void 0 ? void 0 : _d.persistEnergyManager(obj);
+        logger(logLevel_1.LogLevel.Info, `Persisting energy Manager Data.`);
+        return true;
+    }
 }
 exports.EnergyCalculation = EnergyCalculation;

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

@@ -2,6 +2,9 @@ import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
 import { iBaseDevice } from './iBaseDevice';
 export interface iEnergyManager extends iBaseDevice {
     excessEnergy: number;
+    readonly injectingWattage: number;
+    readonly drawingWattage: number;
+    readonly selfConsumingWattage: number;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
     cleanup(): void;

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

@@ -148,25 +148,11 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._lastPersistenceCalculation = now;
     }
     persist() {
-        var _a, _b, _c, _d;
         const obj = JSON.parse(JSON.stringify(this._nextPersistEntry));
-        if (obj.drawnKwH === 0 && obj.injectedKwH === 0 && obj.selfConsumedKwH === 0) {
-            this.log(models_1.LogLevel.Warn, `Not persisting energy Data, as all values are 0.`);
+        if (!models_1.EnergyCalculation.persist(obj, this._lastPersistenceCalculation, this.log.bind(this))) {
             return;
         }
-        if (!services_1.SettingsService.settings.wattagePrice) {
-            this.log(models_1.LogLevel.Warn, `Wattage price not set, assuming average of 34ct.`);
-        }
         this._nextPersistEntry = new models_1.EnergyCalculation(this._lastPersistenceCalculation);
-        obj.endMs = this._lastPersistenceCalculation;
-        obj.earnedInjected = services_1.Utils.round(obj.injectedKwH * ((_a = services_1.SettingsService.settings.injectWattagePrice) !== null && _a !== void 0 ? _a : 0.06), 4);
-        obj.savedSelfConsume = services_1.Utils.round(obj.selfConsumedKwH * ((_b = services_1.SettingsService.settings.wattagePrice) !== null && _b !== void 0 ? _b : 0.35), 4);
-        obj.costDrawn = services_1.Utils.round(obj.drawnKwH * ((_c = services_1.SettingsService.settings.wattagePrice) !== null && _c !== void 0 ? _c : 0.35), 4);
-        obj.injectedKwH = services_1.Utils.round(obj.injectedKwH, 4);
-        obj.selfConsumedKwH = services_1.Utils.round(obj.selfConsumedKwH, 4);
-        obj.drawnKwH = services_1.Utils.round(obj.drawnKwH, 4);
-        (_d = services_1.Utils.dbo) === null || _d === void 0 ? void 0 : _d.persistEnergyManager(obj);
-        this.log(models_1.LogLevel.Info, `Persisting energy Manager Data.`);
     }
     turnOnAdditionalConsumer() {
         const result = services_1.EnergyManagerUtils.turnOnAdditionalConsumer(this._excessEnergyConsumer, this._lastDeviceChange);

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

@@ -16,6 +16,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     protected _info: DeviceInfo;
     protected _room: RoomBase | undefined;
     protected _mode: AcMode;
+    private _movementCallbackAdded;
     get temperature(): number;
     get customName(): string;
     get room(): RoomBase | undefined;

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

@@ -26,8 +26,12 @@ class AcDevice {
     }
     set room(room) {
         var _a, _b;
-        (_a = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.addFirstEnterCallback(this.onRoomFirstEnter.bind(this));
-        (_b = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.addLastLeftCallback(this.onRoomLastLeave.bind(this));
+        this._room = room;
+        if (room !== undefined && !this._movementCallbackAdded) {
+            this._movementCallbackAdded = true;
+            (_a = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.addFirstEnterCallback(this.onRoomFirstEnter.bind(this));
+            (_b = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.addLastLeftCallback(this.onRoomLastLeave.bind(this));
+        }
     }
     get mode() {
         return this._mode;
@@ -40,6 +44,7 @@ class AcDevice {
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac, DeviceCapability_1.DeviceCapability.blockAutomatic];
         this._activatedByExcessEnergy = false;
         this._mode = ac_mode_1.AcMode.Off;
+        this._movementCallbackAdded = false;
         this._roomTemperature = 0;
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `AC ${name}`;
@@ -168,6 +173,7 @@ class AcDevice {
     }
     setState(mode, forceTime = 60 * 60 * 1000) {
         this.blockAutomationHandler.disableAutomatic(forceTime);
+        this._mode = mode;
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();
             return;
@@ -219,7 +225,7 @@ class AcDevice {
         this.turnOn();
     }
     onRoomFirstEnter() {
-        if (!this.settings.noCoolingOnMovement || !this.on || this.mode !== ac_mode_1.AcMode.Cooling) {
+        if (!this.settings.noCoolingOnMovement || !this.on || this.mode === ac_mode_1.AcMode.Heating) {
             return;
         }
         this.log(models_1.LogLevel.Info, `Someone entered the room. Turning off AC`);

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

@@ -58,6 +58,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             return;
         }
         this.desiredMode = newMode;
+        this._mode = mode;
         if (writeToDevice) {
             this.setDesiredInfo();
         }
@@ -71,6 +72,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         this.log(models_1.LogLevel.Info, `Turning off`);
         this._activatedByExcessEnergy = false;
         this.desiredState = daikin_controller_1.Power.OFF;
+        this._mode = ac_mode_1.AcMode.Off;
         this.setDesiredInfo();
     }
     automaticCheck() {

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

@@ -11,6 +11,10 @@ export declare class VictronDevice implements iEnergyManager {
     private _excessEnergyConsumer;
     private blockDeviceChangeTime;
     private _lastDeviceChange;
+    private _iCalculationInterval;
+    private _iDatabaseLoggerInterval;
+    private _lastPersistenceCalculation;
+    private _nextPersistEntry;
     constructor(opts: VictronMqttConnectionOptions);
     protected _info: DeviceInfo;
     get info(): DeviceInfo;
@@ -22,6 +26,9 @@ export declare class VictronDevice implements iEnergyManager {
     get customName(): string;
     get id(): string;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
+    get injectingWattage(): number;
+    get drawingWattage(): number;
+    get selfConsumingWattage(): number;
     cleanup(): void;
     getReport(): string;
     recalculatePowerSharing(): void;
@@ -37,4 +44,6 @@ export declare class VictronDevice implements iEnergyManager {
     private calculateExcessEnergy;
     private turnOnAdditionalConsumer;
     private turnOffAdditionalConsumer;
+    private persist;
+    private calculatePersistenceValues;
 }

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

@@ -14,6 +14,9 @@ class VictronDevice {
         this.deviceType = devices_1.DeviceType.Victron;
         this._excessEnergyConsumer = [];
         this.blockDeviceChangeTime = -1;
+        this._iCalculationInterval = null;
+        this._iDatabaseLoggerInterval = null;
+        this._lastPersistenceCalculation = utils_1.Utils.nowMS();
         this._excessEnergy = 0;
         this.settings = new models_1.VictronDeviceSettings();
         this._info = new devices_1.DeviceInfo();
@@ -25,6 +28,13 @@ class VictronDevice {
         this.persistDeviceInfo();
         this.loadDeviceSettings();
         this._victronConsumer = new victron_mqtt_consumer_1.VictronMqttConsumer(opts);
+        this._iCalculationInterval = utils_1.Utils.guardedInterval(() => {
+            this.calculateExcessEnergy();
+        }, 5 * 1000, this);
+        this._iDatabaseLoggerInterval = utils_1.Utils.guardedInterval(() => {
+            this.persist();
+        }, 15 * 60 * 1000, this);
+        this._nextPersistEntry = new models_1.EnergyCalculation(utils_1.Utils.nowMS());
     }
     get info() {
         return this._info;
@@ -51,8 +61,28 @@ class VictronDevice {
     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;
+    }
+    get drawingWattage() {
+        var _a;
+        return Math.max((_a = this.victronConsumer.data.grid.power) !== null && _a !== void 0 ? _a : 0, 0);
+    }
+    get selfConsumingWattage() {
+        var _a;
+        return Math.max((_a = this.victronConsumer.data.system.power) !== null && _a !== void 0 ? _a : 0, 0) - this.drawingWattage;
+    }
     cleanup() {
         this._victronConsumer.disconnect();
+        if (this._iDatabaseLoggerInterval !== null) {
+            clearInterval(this._iDatabaseLoggerInterval);
+            this._iDatabaseLoggerInterval = null;
+        }
+        if (this._iCalculationInterval !== null) {
+            clearInterval(this._iCalculationInterval);
+            this._iCalculationInterval = null;
+        }
     }
     getReport() {
         return '';
@@ -126,6 +156,7 @@ class VictronDevice {
             this.data.battery.soc > (hoursTilSunset > 4 ? 0.7 : 0.8)) {
             this._excessEnergy = this.settings.maximumBatteryDischargeWattage - Math.max(this.data.battery.dcPower, 0);
         }
+        this.calculatePersistenceValues();
     }
     turnOnAdditionalConsumer() {
         const result = utils_1.EnergyManagerUtils.turnOnAdditionalConsumer(this._excessEnergyConsumer, this._lastDeviceChange);
@@ -153,5 +184,20 @@ class VictronDevice {
             this._lastDeviceChange = result;
         }
     }
+    persist() {
+        const obj = JSON.parse(JSON.stringify(this._nextPersistEntry));
+        if (!models_1.EnergyCalculation.persist(obj, this._lastPersistenceCalculation, this.log.bind(this))) {
+            return;
+        }
+        this._nextPersistEntry = new models_1.EnergyCalculation(this._lastPersistenceCalculation);
+    }
+    calculatePersistenceValues() {
+        const now = utils_1.Utils.nowMS();
+        const duration = now - this._lastPersistenceCalculation;
+        this._nextPersistEntry.drawnKwH += utils_1.Utils.kWh(this.drawingWattage, duration);
+        this._nextPersistEntry.injectedKwH += utils_1.Utils.kWh(this.injectingWattage, duration);
+        this._nextPersistEntry.selfConsumedKwH += utils_1.Utils.kWh(this.selfConsumingWattage, duration);
+        this._lastPersistenceCalculation = now;
+    }
 }
 exports.VictronDevice = VictronDevice;