hoffmation-base 3.2.10-alpha.4 → 3.2.10-alpha.6

package/lib/services/weather/weather-service.d.ts

@@ -23,6 +23,14 @@ export declare class WeatherService {
     private static latitude;
     private static longitude;
     private static appID?;
+    /**
+     * The highest maximum temperature forecast for today (prevents oscillation)
+     */
+    private static _todayMaxMaxTemperature;
+    /**
+     * The date of the last weather update (for daily reset)
+     */
+    private static _lastUpdateDate;
     static addWeatherUpdateCb(name: string, cb: () => void): void;
     static get todayMaxTemp(): number;
     static get todayCloudiness(): number | undefined;
@@ -31,6 +39,11 @@ export declare class WeatherService {
     static stopInterval(): void;
     static playWeatherInfo(speaker: iSpeaker, volume?: number, short?: boolean, retries?: number): void;
     static processHourlyWeather(response: WeatherResponse): void;
+    /**
+     * Updates the daily maximum temperature to prevent shutter oscillation
+     * Tracks the highest forecasted maximum temperature for today
+     */
+    private static updateDailyMaxTemperature;
     static get currentHumidity(): number;
     static get currentTemp(): number;
     static willOutsideBeWarmer(referenceTemperature: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void): boolean;

package/lib/services/weather/weather-service.js

@@ -18,7 +18,9 @@ class WeatherService {
     }
     static get todayMaxTemp() {
         var _a, _b, _c;
-        return (_c = (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.temp.max) !== null && _c !== void 0 ? _c : interfaces_1.UNDEFINED_TEMP_VALUE;
+        return this._todayMaxMaxTemperature !== interfaces_1.UNDEFINED_TEMP_VALUE
+            ? this._todayMaxMaxTemperature
+            : ((_c = (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.temp.max) !== null && _c !== void 0 ? _c : interfaces_1.UNDEFINED_TEMP_VALUE);
     }
     static get todayCloudiness() {
         var _a, _b;
@@ -111,6 +113,8 @@ class WeatherService {
     }
     static processHourlyWeather(response) {
         this.lastResponse = response;
+        // Update daily maximum temperature to prevent shutter oscillation
+        this.updateDailyMaxTemperature();
         logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Es sind gerade ${this.lastResponse.current.temp} Grad (gefühlt ${this.lastResponse.current.feels_like}).`);
         if (this.lastResponse.alerts !== undefined && this.lastResponse.alerts.length > 0) {
             const message = ['Es gibt folgende Wetterwarnungen:'];
@@ -120,6 +124,24 @@ class WeatherService {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, message.join('\n'));
         }
     }
+    /**
+     * Updates the daily maximum temperature to prevent shutter oscillation
+     * Tracks the highest forecasted maximum temperature for today
+     */
+    static updateDailyMaxTemperature() {
+        var _a, _b, _c, _d;
+        if (!((_d = (_c = (_b = (_a = this.lastResponse) === null || _a === void 0 ? void 0 : _a.daily) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.temp) === null || _d === void 0 ? void 0 : _d.max)) {
+            return;
+        }
+        const today = new Date().toDateString();
+        const currentForecastMax = this.lastResponse.daily[0].temp.max;
+        if (this._lastUpdateDate === today && currentForecastMax < this._todayMaxMaxTemperature) {
+            return;
+        }
+        this._todayMaxMaxTemperature = currentForecastMax;
+        this._lastUpdateDate = today;
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `Daily max temperature updated to ${currentForecastMax}°C`);
+    }
     static get currentHumidity() {
         var _a;
         if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
@@ -147,7 +169,7 @@ class WeatherService {
     }
     static weatherRolloPosition(normalPos, desiredTemperatur, currentTemperatur, logger, shutterSettings) {
         let result = normalPos;
-        if (currentTemperatur < desiredTemperatur && currentTemperatur < shutterSettings.heatReductionThreshold) {
+        if (currentTemperatur < desiredTemperatur && currentTemperatur < shutterSettings.heatReductionDirectionThreshold) {
             logger(enums_1.LogLevel.Trace, 'RolloWeatherPosition: Room needs to heat up anyways.');
             return result;
         }
@@ -155,8 +177,7 @@ class WeatherService {
             logger(enums_1.LogLevel.Trace, 'RolloWeatherPosition: Shutter should be down anyways.');
             return result;
         }
-        else if (this.willOutsideBeWarmer(shutterSettings.heatReductionThreshold, logger) &&
-            currentTemperatur > shutterSettings.heatReductionDirectionThreshold) {
+        else if (this.willOutsideBeWarmer(shutterSettings.heatReductionThreshold, logger)) {
             result = shutterSettings.heatReductionPosition;
         }
         else if (this.hoursTilSunset() < 1) {
@@ -265,3 +286,11 @@ WeatherService.active = false;
  */
 WeatherService.oneDay = 1000 * 60 * 60 * 24;
 WeatherService._dataUpdateCbs = {};
+/**
+ * The highest maximum temperature forecast for today (prevents oscillation)
+ */
+WeatherService._todayMaxMaxTemperature = interfaces_1.UNDEFINED_TEMP_VALUE;
+/**
+ * The date of the last weather update (for daily reset)
+ */
+WeatherService._lastUpdateDate = '';