hoffmation-base 2.12.3 → 2.13.0

package/lib/server/devices/zigbee/zigbeeUbisysShutter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="iobroker" />
 import { ZigbeeShutter } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeUbisysShutter extends ZigbeeShutter {

package/lib/server/ioBroker/connection.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="iobroker" />
-/// <reference types="iobroker" />
 /// <reference types="node" />
 /// <reference types="node" />
 import { IncomingMessage } from 'http';

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

@@ -98,6 +98,10 @@ class AcDevice {
     calculateDesiredMode() {
         var _a, _b, _c, _d, _e, _f;
         const acOn = this.on;
+        if (this.settings.manualDisabled) {
+            acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
+            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.`);
@@ -225,7 +229,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

@@ -72,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;