hoffmation-base 1.3.1 → 1.3.3

package/lib/models/deviceSettings/acSettings.d.ts

@@ -1,5 +1,7 @@
 import { DeviceSettings } from './deviceSettings';
+import { ExcessEnergyConsumerSettings } from '../excessEnergyConsumerSettings';
 export declare class AcSettings extends DeviceSettings {
+    energySettings: ExcessEnergyConsumerSettings;
     minimumHours: number;
     minimumMinutes: number;
     maximumHours: number;

package/lib/models/deviceSettings/acSettings.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcSettings = void 0;
 const deviceSettings_1 = require("./deviceSettings");
 const server_1 = require("../../server");
+const excessEnergyConsumerSettings_1 = require("../excessEnergyConsumerSettings");
 class AcSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
+        this.energySettings = new excessEnergyConsumerSettings_1.ExcessEnergyConsumerSettings();
         this.minimumHours = 0;
         this.minimumMinutes = 0;
         this.maximumHours = 24;

package/lib/models/deviceSettings/deviceSettings.d.ts

@@ -1,5 +1,7 @@
 import { iBaseDevice } from '../../server';
+import { ExcessEnergyConsumerSettings } from '../excessEnergyConsumerSettings';
 export declare abstract class DeviceSettings {
+    energySettings: ExcessEnergyConsumerSettings | undefined;
     persist(device: iBaseDevice): void;
     initializeFromDb(device: iBaseDevice): void;
     fromPartialObject(_obj: Partial<DeviceSettings>): void;

package/lib/models/deviceSettings/deviceSettings.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceSettings = void 0;
 const server_1 = require("../../server");
 const logLevel_1 = require("../logLevel");
+const excessEnergyConsumerSettings_1 = require("../excessEnergyConsumerSettings");
 class DeviceSettings {
+    constructor() {
+        this.energySettings = undefined;
+    }
     persist(device) {
         var _a;
         (_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistDeviceSettings(device, JSON.stringify(this));
@@ -32,7 +36,12 @@ class DeviceSettings {
         });
     }
     fromPartialObject(_obj) {
-        // Nothing
+        if (_obj.energySettings) {
+            if (this.energySettings === undefined) {
+                this.energySettings = new excessEnergyConsumerSettings_1.ExcessEnergyConsumerSettings();
+            }
+            this.energySettings.fromPartialObject(_obj.energySettings);
+        }
     }
     toJSON() {
         return server_1.Utils.jsonFilter(this);

package/lib/models/deviceSettings/sceneSettings.js

@@ -5,7 +5,8 @@ const deviceSettings_1 = require("./deviceSettings");
 const server_1 = require("../../server");
 class SceneSettings extends deviceSettings_1.DeviceSettings {
     fromPartialObject(data) {
-        this.defaultTurnOffTimeout = data.defaultTurnOffTimeout;
+        var _a;
+        this.defaultTurnOffTimeout = (_a = data.defaultTurnOffTimeout) !== null && _a !== void 0 ? _a : this.defaultTurnOffTimeout;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/excessEnergyConsumerSettings.d.ts

@@ -14,4 +14,5 @@ export declare class ExcessEnergyConsumerSettings {
      * Devices with same prio try to share as good as possible.
      */
     priority?: number, rampUpOnSpareEnergy?: boolean, powerReactionTime?: number);
+    fromPartialObject(obj: Partial<ExcessEnergyConsumerSettings>): void;
 }

package/lib/models/excessEnergyConsumerSettings.js

@@ -15,5 +15,11 @@ class ExcessEnergyConsumerSettings {
         this.rampUpOnSpareEnergy = rampUpOnSpareEnergy;
         this.powerReactionTime = powerReactionTime;
     }
+    fromPartialObject(obj) {
+        var _a, _b, _c;
+        this.priority = (_a = obj.priority) !== null && _a !== void 0 ? _a : this.priority;
+        this.rampUpOnSpareEnergy = (_b = obj.rampUpOnSpareEnergy) !== null && _b !== void 0 ? _b : this.rampUpOnSpareEnergy;
+        this.powerReactionTime = (_c = obj.powerReactionTime) !== null && _c !== void 0 ? _c : this.powerReactionTime;
+    }
 }
 exports.ExcessEnergyConsumerSettings = ExcessEnergyConsumerSettings;

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

@@ -1,6 +1,7 @@
 import { ExcessEnergyConsumerSettings, LogLevel } from '../../../models';
-export interface iExcessEnergyConsumer {
-    energyConsumerSettings: ExcessEnergyConsumerSettings;
+import { iBaseDevice } from './iBaseDevice';
+export interface iExcessEnergyConsumer extends iBaseDevice {
+    readonly energySettings: ExcessEnergyConsumerSettings;
     currentConsumption: number;
     on: boolean;
     isAvailableForExcessEnergy(): boolean;

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

@@ -172,7 +172,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         var _a;
         const potentialDevices = this._excessEnergyConsumer.filter((e) => {
             var _a;
-            if (e.energyConsumerSettings.priority === -1 || e.on || !e.isAvailableForExcessEnergy()) {
+            if (e.energySettings.priority === -1 || e.on || !e.isAvailableForExcessEnergy()) {
                 return false;
             }
             if (((_a = this._lastDeviceChange) === null || _a === void 0 ? void 0 : _a.newState) && e === this._lastDeviceChange.device) {
@@ -188,9 +188,9 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             return;
         }
         potentialDevices.sort((a, b) => {
-            return b.energyConsumerSettings.priority - a.energyConsumerSettings.priority;
+            return b.energySettings.priority - a.energySettings.priority;
         });
-        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energyConsumerSettings.powerReactionTime;
+        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energySettings.powerReactionTime;
         potentialDevices[0].log(models_1.LogLevel.Info, `Turning on, as we have ${this.excessEnergy}W to spare...`);
         potentialDevices[0].turnOnForExcessEnergy();
         this._lastDeviceChange = { newState: true, device: potentialDevices[0] };
@@ -199,7 +199,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         var _a;
         const potentialDevices = this._excessEnergyConsumer.filter((e) => {
             var _a;
-            if (e.energyConsumerSettings.priority === -1 || !e.on) {
+            if (e.energySettings.priority === -1 || !e.on) {
                 return false;
             }
             if (!e.wasActivatedByExcessEnergy()) {
@@ -219,10 +219,10 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             return;
         }
         potentialDevices.sort((a, b) => {
-            return a.energyConsumerSettings.priority - b.energyConsumerSettings.priority;
+            return a.energySettings.priority - b.energySettings.priority;
         });
         potentialDevices[0].log(models_1.LogLevel.Info, `Turning off, as we don't have energy to spare...`);
-        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energyConsumerSettings.powerReactionTime;
+        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energySettings.powerReactionTime;
         potentialDevices[0].turnOffDueToMissingEnergy();
         this._lastDeviceChange = { newState: false, device: potentialDevices[0] };
     }

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

@@ -13,10 +13,10 @@ export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEne
     private _loadPower;
     get loadPower(): number;
     settings: ActuatorSettings;
-    energyConsumerSettings: ExcessEnergyConsumerSettings;
     private readonly _availableForExcessEnergy;
     private _activatedByExcessEnergy;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get energySettings(): ExcessEnergyConsumerSettings;
     get currentConsumption(): number;
     get on(): boolean;
     isAvailableForExcessEnergy(): boolean;

package/lib/server/devices/zigbee/zigbeeBlitzShp.js

@@ -13,9 +13,9 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
         this._energy = 0;
         this._loadPower = 0;
         this.settings = new models_1.ActuatorSettings();
-        this.energyConsumerSettings = new models_1.ExcessEnergyConsumerSettings();
         this._availableForExcessEnergy = true;
         this._activatedByExcessEnergy = false;
+        this.settings.energySettings = new models_1.ExcessEnergyConsumerSettings();
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.excessEnergyConsumer);
     }
     get steckerOn() {
@@ -30,6 +30,9 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
     get loadPower() {
         return this._loadPower;
     }
+    get energySettings() {
+        return this.settings.energySettings;
+    }
     get currentConsumption() {
         return this._loadPower;
     }

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

@@ -8,13 +8,15 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
-    energyConsumerSettings: ExcessEnergyConsumerSettings;
     settings: AcSettings;
     room: RoomBase | undefined;
     deviceCapabilities: DeviceCapability[];
+    protected _activatedByExcessEnergy: boolean;
+    protected _blockAutomaticChangeMS: number;
     protected _info: DeviceInfo;
     get temperature(): number;
     protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
+    get energySettings(): ExcessEnergyConsumerSettings;
     private _roomTemperature;
     get roomTemperature(): number;
     get info(): DeviceInfo;
@@ -22,14 +24,12 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     set info(info: DeviceInfo);
     abstract get deviceType(): DeviceType;
     get name(): string;
-    protected _activatedByExcessEnergy: boolean;
-    protected _blockAutomaticTurnOnMS: number;
     get id(): string;
     abstract get on(): boolean;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
     /**
-     * Disable automatic Turn-On for given amount of ms and turn off immediately.
+     * Disable automatic Turn-On and Turn-Off for given amount of ms.
      * @param {number} timeout
      */
     deactivateAutomaticChange(timeout?: number): void;
@@ -40,6 +40,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     turnOnForExcessEnergy(): void;
     abstract turnOff(): void;
     turnOffDueToMissingEnergy(): void;
+    setState(mode: AcMode, forceTime?: number): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     wasActivatedByExcessEnergy(): boolean;
     loadDeviceSettings(): void;

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

@@ -18,12 +18,11 @@ class AcDevice {
         this.ip = ip;
         this.acDeviceType = acDeviceType;
         this.currentConsumption = -1;
-        this.energyConsumerSettings = new models_1.ExcessEnergyConsumerSettings();
         this.settings = new models_1.AcSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac];
-        this._roomTemperature = 0;
         this._activatedByExcessEnergy = false;
-        this._blockAutomaticTurnOnMS = -1;
+        this._blockAutomaticChangeMS = -1;
+        this._roomTemperature = 0;
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `AC ${name}`;
         this._info.customName = `${roomName} ${name}`;
@@ -37,6 +36,9 @@ class AcDevice {
     get temperature() {
         return this._roomTemperature;
     }
+    get energySettings() {
+        return this.settings.energySettings;
+    }
     get roomTemperature() {
         return this._roomTemperature;
     }
@@ -57,7 +59,7 @@ class AcDevice {
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
     }
     isAvailableForExcessEnergy() {
-        if (utils_1.Utils.nowMS() < this._blockAutomaticTurnOnMS) {
+        if (utils_1.Utils.nowMS() < this._blockAutomaticChangeMS) {
             return false;
         }
         const minimumStart = utils_1.Utils.dateByTimeSpan(this.settings.minimumHours, this.settings.minimumMinutes);
@@ -76,6 +78,14 @@ class AcDevice {
             return ac_mode_1.AcMode.Off;
         }
         const acOn = this.on;
+        // Check Turn Off Time
+        const maximumEnd = utils_1.Utils.dateByTimeSpan(this.settings.maximumHours, this.settings.maximumMinutes);
+        const minimumStart = utils_1.Utils.dateByTimeSpan(this.settings.minimumHours, this.settings.minimumMinutes);
+        const now = new Date();
+        if (acOn && (now > maximumEnd || now < minimumStart)) {
+            this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
+            return ac_mode_1.AcMode.Off;
+        }
         let threshold = acOn ? 0 : 1;
         let desiredMode = ac_mode_1.AcMode.Off;
         const excessEnergy = (_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.excessEnergy) !== null && _b !== void 0 ? _b : -1;
@@ -97,11 +107,11 @@ class AcDevice {
         return desiredMode;
     }
     /**
-     * Disable automatic Turn-On for given amount of ms and turn off immediately.
+     * Disable automatic Turn-On and Turn-Off for given amount of ms.
      * @param {number} timeout
      */
     deactivateAutomaticChange(timeout = 60 * 60 * 1000) {
-        this._blockAutomaticTurnOnMS = utils_1.Utils.nowMS() + timeout;
+        this._blockAutomaticChangeMS = utils_1.Utils.nowMS() + timeout;
     }
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
@@ -114,7 +124,7 @@ class AcDevice {
         (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistAC(this);
     }
     turnOnForExcessEnergy() {
-        if (this._blockAutomaticTurnOnMS > utils_1.Utils.nowMS()) {
+        if (this._blockAutomaticChangeMS > utils_1.Utils.nowMS()) {
             return;
         }
         this._activatedByExcessEnergy = true;
@@ -124,6 +134,15 @@ class AcDevice {
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
+    setState(mode, forceTime = 60 * 60 * 1000) {
+        this._blockAutomaticChangeMS = utils_1.Utils.nowMS() + forceTime;
+        if (mode == ac_mode_1.AcMode.Off) {
+            this.turnOff();
+            return;
+        }
+        this.setDesiredMode(mode, false);
+        this.turnOn();
+    }
     log(level, message, debugType = log_service_1.LogDebugType.None) {
         var _a, _b;
         log_service_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
@@ -147,8 +166,8 @@ class AcDevice {
     }
     automaticCheck() {
         var _a;
-        if (!this.on && utils_1.Utils.nowMS() < this._blockAutomaticTurnOnMS) {
-            // We aren't allowed to trun on anyway --> exit
+        if (utils_1.Utils.nowMS() < this._blockAutomaticChangeMS) {
+            // We aren't allowed to turn on or off anyway --> exit
             return;
         }
         const desiredMode = this.calculateDesiredMode();
@@ -165,13 +184,6 @@ class AcDevice {
             this.turnOff();
             return;
         }
-        // Check Cooling Turn Off
-        const maximumEnd = utils_1.Utils.dateByTimeSpan(this.settings.maximumHours, this.settings.maximumMinutes);
-        const now = new Date();
-        if (now > maximumEnd) {
-            this.turnOff();
-            return;
-        }
     }
     toJSON() {
         // eslint-disable-next-line

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

@@ -20,7 +20,6 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         this.desiredMode = daikin_controller_1.Mode.COLD;
         this.deviceType = devices_1.DeviceType.Daikin;
         this._on = false;
-        this.energyConsumerSettings.priority = 50;
         this._device = device;
     }
     get device() {

package/lib/server/services/api/api-service.d.ts

@@ -27,8 +27,9 @@ export declare class API {
      * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      * @param {AcMode} desiredMode
+     * @param forceTime The time in ms this should not change before automatic change is allowed again
      */
-    static setAc(id: string, desiredState: boolean, desiredMode?: AcMode): boolean;
+    static setAc(id: string, desiredState: boolean, desiredMode?: AcMode, forceTime?: number): boolean;
     /**
      * Turns on/off all AC´s in the home
      * @param {boolean} desiredState

package/lib/server/services/api/api-service.js

@@ -64,8 +64,9 @@ class API {
      * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      * @param {AcMode} desiredMode
+     * @param forceTime The time in ms this should not change before automatic change is allowed again
      */
-    static setAc(id, desiredState, desiredMode) {
+    static setAc(id, desiredState, desiredMode, forceTime = 60 * 60 * 1000) {
         const d = this.getAc(id);
         if (!d) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `AC Device for id ${id} not found`);
@@ -75,14 +76,15 @@ class API {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Device for id ${id} is not an ac`);
             return false;
         }
-        if (desiredState) {
-            d.setDesiredMode((desiredMode !== null && desiredMode !== void 0 ? desiredMode : settings_service_1.SettingsService.heatMode == config_1.HeatingMode.Winter) ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling, false);
-            d.turnOn();
+        if (desiredMode === undefined) {
+            if (!desiredState) {
+                desiredMode = ac_1.AcMode.Off;
+            }
+            else {
+                desiredMode = settings_service_1.SettingsService.heatMode == config_1.HeatingMode.Winter ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling;
+            }
         }
-        else {
-            d.turnOff();
-        }
-        d.deactivateAutomaticChange(60 * 60 * 1000);
+        d.setState(desiredMode, forceTime);
         return true;
     }
     /**