hoffmation-base 3.0.0-alpha.13 → 3.0.0-alpha.14

package/lib/models/command/baseCommand.d.ts

@@ -8,6 +8,7 @@ export declare abstract class BaseCommand {
     constructor(source?: CommandSource | BaseCommand, reason?: string);
     get isAutomaticAction(): boolean;
     get isForceAction(): boolean;
+    get isManual(): boolean;
     get isInitial(): boolean;
     get reasonTrace(): string;
 }

package/lib/models/command/baseCommand.js

@@ -20,6 +20,12 @@ class BaseCommand {
         }
         return (this.source === commandSource_1.CommandSource.Manual || this.source === commandSource_1.CommandSource.API || this.source === commandSource_1.CommandSource.Force);
     }
+    get isManual() {
+        if (this.source instanceof BaseCommand) {
+            return this.source.isManual;
+        }
+        return this.source === commandSource_1.CommandSource.Manual || this.source === commandSource_1.CommandSource.API;
+    }
     get isInitial() {
         if (this.source instanceof BaseCommand) {
             return this.source.isInitial;

package/lib/models/command/dimmerSetLightCommand.js

@@ -23,15 +23,16 @@ class DimmerSetLightCommand extends lampSetLightCommand_1.LampSetLightCommand {
         return `Dimmer setLight to ${this.on} for reason: ${this.reasonTrace}`;
     }
     static byTimeBased(s, c) {
+        const manual = c.isForceAction;
         switch (c.time) {
             case timeCallback_1.TimeOfDay.Daylight:
-                return new DimmerSetLightCommand(c, true, 'By TimeBased Daylight', c.timeout, s.dayBrightness);
+                return new DimmerSetLightCommand(c, true, 'Daylight', c.timeout, s.dayBrightness);
             case timeCallback_1.TimeOfDay.BeforeSunrise:
-                return new DimmerSetLightCommand(c, s.dawnOn, '', c.timeout, s.dawnBrightness, undefined);
+                return new DimmerSetLightCommand(c, manual || s.dawnOn, 'Dawn', c.timeout, s.dawnBrightness, undefined);
             case timeCallback_1.TimeOfDay.AfterSunset:
-                return new DimmerSetLightCommand(c, s.duskOn, '', c.timeout, s.duskBrightness, undefined);
+                return new DimmerSetLightCommand(c, manual || s.duskOn, 'Dusk', c.timeout, s.duskBrightness, undefined);
             case timeCallback_1.TimeOfDay.Night:
-                return new DimmerSetLightCommand(c, s.nightOn, '', c.timeout, s.nightBrightness, undefined);
+                return new DimmerSetLightCommand(c, manual || s.nightOn, 'Night', c.timeout, s.nightBrightness, undefined);
             default:
                 throw new Error(`TimeOfDay ${c.time} not supported`);
         }

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -16,7 +16,8 @@ class LampUtils {
         }, 3000, this);
     }
     static setTimeBased(device, c) {
-        if ((c.time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
+        if (c.isManual ||
+            (c.time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
             (c.time === models_1.TimeOfDay.BeforeSunrise && device.settings.dawnOn) ||
             (c.time === models_1.TimeOfDay.AfterSunset && device.settings.duskOn)) {
             device.setLight(new models_1.LampSetLightCommand(c, true, `SetLight due to TimeBased ${models_1.TimeOfDay[c.time]}`, c.timeout));
@@ -42,10 +43,10 @@ class LampUtils {
             c.time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
         }
         if (newVal && c.time !== undefined) {
-            device.setTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, 'SetLight Due to toggle Light', timeout));
+            device.setTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, '', timeout));
             return true;
         }
-        device.setLight(new models_1.LampSetLightCommand(c, newVal, 'SetLight Due to toggle Light', timeout));
+        device.setLight(new models_1.LampSetLightCommand(c, newVal, '', timeout));
         return newVal;
     }
     static checkBlockActive(device, c) {

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

@@ -52,7 +52,7 @@ class AcDevice {
         this._info.customName = `${roomName} ${name}`;
         this._info.room = roomName;
         this._info.allDevicesKey = `ac-${roomName}-${name}`;
-        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, true);
+        utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, false);
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
@@ -97,9 +97,14 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g;
         const acOn = this.on;
-        this._desiredTemperatur = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.desiredTemp) !== null && _c !== void 0 ? _c : 0;
+        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        if (!heatGroup) {
+            this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no heat group`);
+            return ac_mode_1.AcMode.Off;
+        }
+        this._desiredTemperatur = heatGroup.desiredTemp;
         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;
@@ -109,7 +114,6 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        const heatGroup = (_d = this.room) === null || _d === void 0 ? void 0 : _d.HeatGroup;
         if (this.settings.useOwnTemperatureAndAutomatic) {
             // Device is in automatic mode so ignore energy and room temperature
             if ((heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) === false) {
@@ -118,7 +122,7 @@ class AcDevice {
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_f = (_e = this.room) === null || _e === void 0 ? void 0 : _e.PraesenzGroup) === null || _f === void 0 ? void 0 : _f.anyPresent()) !== true) {
+            if (!this.settings.noCoolingOnMovement || ((_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.PraesenzGroup) === null || _c === void 0 ? void 0 : _c.anyPresent()) !== true) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
@@ -135,7 +139,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 = (_h = (_g = devices_1.Devices.energymanager) === null || _g === void 0 ? void 0 : _g.excessEnergy) !== null && _h !== void 0 ? _h : -1;
+        const excessEnergy = (_e = (_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.excessEnergy) !== null && _e !== void 0 ? _e : -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;
@@ -146,7 +150,7 @@ class AcDevice {
         const heatUntil = targetTemp - thresholdHeating;
         if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
             desiredMode = ac_mode_1.AcMode.Cooling;
-            if (this.settings.noCoolingOnMovement && ((_k = (_j = this.room) === null || _j === void 0 ? void 0 : _j.PraesenzGroup) === null || _k === void 0 ? void 0 : _k.anyPresent()) === true) {
+            if (this.settings.noCoolingOnMovement && ((_g = (_f = this.room) === null || _f === void 0 ? void 0 : _f.PraesenzGroup) === null || _g === void 0 ? void 0 : _g.anyPresent()) === true) {
                 return ac_mode_1.AcMode.Off;
             }
         }

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

@@ -86,7 +86,15 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         });
     }
     setDesiredInfo(retry = false, forceTemp) {
-        var _a;
+        var _a, _b;
+        if (this._desiredTemperatur === devices_1.UNDEFINED_TEMP_VALUE) {
+            if (((_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === undefined) {
+                this.log(models_1.LogLevel.Error, `Neither desired temperature nor HeatGroup is set for ${this.name}(${this.ip})`);
+                return;
+            }
+            this._desiredTemperatur = this.room.HeatGroup.desiredTemp;
+            return;
+        }
         let targetTemp = this._desiredTemperatur;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
             targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
@@ -100,7 +108,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetHumidity: this.desiredHum,
             targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
+        (_b = this.device) === null || _b === void 0 ? void 0 : _b.setACControlInfo(changeObject, (err, res) => {
             var _a;
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);