hoffmation-base 2.9.1 → 2.9.7

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

@@ -1,18 +1,19 @@
-import { DeviceInfo, DeviceType, iAcDevice, iExcessEnergyConsumer, iRoomDevice } from '../../devices';
+import { DeviceInfo, DeviceType, iAcDevice, iExcessEnergyConsumer, iRoomDevice, iTemporaryDisableAutomatic } from '../../devices';
 import { AcSettings, ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { AcMode } from './ac-mode';
 import { AcDeviceType } from './acDeviceType';
 import { DeviceCapability } from '../../devices/DeviceCapability';
-export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDevice, iAcDevice {
+import { BlockAutomaticHandler } from '../blockAutomaticHandler';
+export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDevice, iAcDevice, iTemporaryDisableAutomatic {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
     settings: AcSettings;
     room: RoomBase | undefined;
     deviceCapabilities: DeviceCapability[];
+    readonly blockAutomationHandler: BlockAutomaticHandler;
     protected _activatedByExcessEnergy: boolean;
-    protected _blockAutomaticChangeMS: number;
     protected _info: DeviceInfo;
     get temperature(): number;
     get customName(): string;
@@ -27,6 +28,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     get name(): string;
     get id(): string;
     abstract get on(): boolean;
+    restoreTargetAutomaticValue(): void;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
     /**

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

@@ -13,6 +13,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const settings_service_1 = require("../settings-service");
 const config_1 = require("../../config");
+const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
 class AcDevice {
     get temperature() {
         return this._roomTemperature;
@@ -25,9 +26,8 @@ class AcDevice {
         this.acDeviceType = acDeviceType;
         this.currentConsumption = -1;
         this.settings = new models_1.AcSettings();
-        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac];
+        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac, DeviceCapability_1.DeviceCapability.blockAutomatic];
         this._activatedByExcessEnergy = false;
-        this._blockAutomaticChangeMS = -1;
         this._roomTemperature = 0;
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `AC ${name}`;
@@ -38,6 +38,7 @@ class AcDevice {
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
     get energySettings() {
         return this.settings.energySettings;
@@ -61,11 +62,15 @@ class AcDevice {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
     }
+    restoreTargetAutomaticValue() {
+        this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
+        this.automaticCheck();
+    }
     isAvailableForExcessEnergy() {
         if (this.settings.useOwnTemperatureAndAutomatic) {
             return false;
         }
-        if (utils_1.Utils.nowMS() < this._blockAutomaticChangeMS) {
+        if (this.blockAutomationHandler.automaticBlockActive) {
             return false;
         }
         if (!utils_1.Utils.timeWithinBorders(this.settings.minimumHours, this.settings.minimumMinutes, this.settings.maximumHours, this.settings.maximumMinutes)) {
@@ -117,7 +122,7 @@ class AcDevice {
      * @param {number} timeout
      */
     deactivateAutomaticChange(timeout = 60 * 60 * 1000) {
-        this._blockAutomaticChangeMS = utils_1.Utils.nowMS() + timeout;
+        this.blockAutomationHandler.disableAutomatic(timeout);
     }
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
@@ -130,7 +135,7 @@ class AcDevice {
         (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistAC(this);
     }
     turnOnForExcessEnergy() {
-        if (this._blockAutomaticChangeMS > utils_1.Utils.nowMS()) {
+        if (this.blockAutomationHandler.automaticBlockActive) {
             return;
         }
         this._activatedByExcessEnergy = true;
@@ -141,7 +146,7 @@ class AcDevice {
         this.turnOff();
     }
     setState(mode, forceTime = 60 * 60 * 1000) {
-        this._blockAutomaticChangeMS = utils_1.Utils.nowMS() + forceTime;
+        this.blockAutomationHandler.disableAutomatic(forceTime);
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();
             return;
@@ -172,7 +177,7 @@ class AcDevice {
     }
     automaticCheck() {
         var _a;
-        if (utils_1.Utils.nowMS() < this._blockAutomaticChangeMS) {
+        if (this.blockAutomationHandler.automaticBlockActive) {
             // We aren't allowed to turn on or off anyway --> exit
             return;
         }
@@ -190,6 +195,7 @@ class AcDevice {
             this.turnOff();
             return;
         }
+        this.turnOn();
     }
     toJSON() {
         // eslint-disable-next-line

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

@@ -63,10 +63,12 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         }
     }
     turnOn() {
+        this.log(models_1.LogLevel.Info, `Turning on`);
         this.desiredState = daikin_controller_1.Power.ON;
         this.setDesiredInfo();
     }
     turnOff() {
+        this.log(models_1.LogLevel.Info, `Turning off`);
         this._activatedByExcessEnergy = false;
         this.desiredState = daikin_controller_1.Power.OFF;
         this.setDesiredInfo();

package/lib/server/services/blockAutomaticHandler.d.ts

@@ -9,7 +9,7 @@ export declare class BlockAutomaticHandler {
     private _restoreAutomaticStateTimeout;
     get restoreAutomaticStateTimeout(): NodeJS.Timeout | null;
     get automaticBlockActive(): boolean;
-    disableAutomatic(duration: number, onCollideAction?: CollisionSolving): void;
+    disableAutomatic(durationMS: number, onCollideAction?: CollisionSolving): void;
     disableAutomaticUntil(targetDate: Date, onCollideAction?: CollisionSolving): void;
     liftAutomaticBlock(): void;
     private updateRestoreTimeout;

package/lib/server/services/blockAutomaticHandler.js

@@ -26,8 +26,8 @@ class BlockAutomaticHandler {
     get automaticBlockActive() {
         return this._automaticBlockedUntil > new Date();
     }
-    disableAutomatic(duration, onCollideAction = models_1.CollisionSolving.overrideIfGreater) {
-        this.disableAutomaticUntil(new Date(utils_1.Utils.nowMS() + duration), onCollideAction);
+    disableAutomatic(durationMS, onCollideAction = models_1.CollisionSolving.overrideIfGreater) {
+        this.disableAutomaticUntil(new Date(utils_1.Utils.nowMS() + durationMS), onCollideAction);
     }
     disableAutomaticUntil(targetDate, onCollideAction = models_1.CollisionSolving.overrideIfGreater) {
         const now = new Date();
@@ -45,7 +45,7 @@ class BlockAutomaticHandler {
         if (this._restoreAutomaticStateTimeout !== null) {
             clearTimeout(this._restoreAutomaticStateTimeout);
         }
-        this._restoreAutomaticStateTimeout = utils_1.Utils.guardedTimeout(this._restoreAutomatic, this._automaticBlockedUntil.getTime() - utils_1.Utils.nowMS(), this);
+        this._restoreAutomaticStateTimeout = utils_1.Utils.guardedTimeout(this._restoreAutomatic, this._automaticBlockedUntil.getTime() - utils_1.Utils.nowMS() + 500, this);
     }
     toJSON() {
         return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_restoreAutomatic']));