hoffmation-base 3.0.0-alpha.93 → 3.0.0-alpha.94

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

@@ -64,7 +64,7 @@ class HandleSensor {
             if (heatgroup !== undefined) {
                 const desiredTemp = heatgroup.desiredTemp;
                 const currentTemp = heatgroup.temperature;
-                const outSideTemp = services_1.WeatherService.getCurrentTemp();
+                const outSideTemp = services_1.WeatherService.currentTemp;
                 // Check if any of these values are unavailable
                 if (desiredTemp > -99 && currentTemp > -99 && outSideTemp > -99) {
                     const wouldHelp = (desiredTemp < currentTemp && outSideTemp < currentTemp) ||

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

@@ -15,7 +15,7 @@ export declare class WeatherService {
     /**
      * The last weather response
      */
-    static lastResponse: WeatherResponse;
+    static lastResponse: WeatherResponse | undefined;
     /**
      * The sun horizontal degree (0 is North)
      */
@@ -31,8 +31,9 @@ export declare class WeatherService {
     static update(): void;
     static stopInterval(): void;
     static playWeatherInfo(speaker: iSpeaker, volume?: number, short?: boolean, retries?: number): void;
-    static processHourlyWeather(): void;
-    static getCurrentTemp(): number;
+    static processHourlyWeather(response: WeatherResponse): void;
+    static get currentHumidity(): number;
+    static get currentTemp(): number;
     static willOutsideBeWarmer(referenceTemperature: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void): boolean;
     static weatherRolloPosition(normalPos: number, desiredTemperatur: number, currentTemperatur: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void, shutterSettings: ShutterSettings): number;
     static getCurrentCloudiness(): number;

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

@@ -105,7 +105,8 @@ class WeatherService {
             speaker.speakOnDevice('Für heute liegt keine Unwetterwarnungen vor', volume, false);
         }
     }
-    static processHourlyWeather() {
+    static processHourlyWeather(response) {
+        this.lastResponse = response;
         log_service_1.ServerLogService.writeLog(models_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:'];
@@ -115,13 +116,21 @@ class WeatherService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, message.join('\n'));
         }
     }
-    static getCurrentTemp() {
-        const wData = WeatherService.lastResponse;
-        if (wData === undefined || wData.current === undefined) {
+    static get currentHumidity() {
+        var _a;
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'WeatherService.currentHumidity: There is no data yet');
+            return -1;
+        }
+        return WeatherService.lastResponse.current.humidity;
+    }
+    static get currentTemp() {
+        var _a;
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'WeatherService.isOutsideWarmer(): There are no data yet');
             return -99;
         }
-        return wData.current.temp;
+        return WeatherService.lastResponse.current.temp;
     }
     static willOutsideBeWarmer(referenceTemperature, logger) {
         const wData = WeatherService.lastResponse;
@@ -171,7 +180,8 @@ class WeatherService {
         return wData.current.clouds;
     }
     static getRainNextMinutes() {
-        const minutes = WeatherService.lastResponse.minutely;
+        var _a;
+        const minutes = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.minutely;
         let minutesUsed = 0;
         let precipitation = 0;
         if (minutes !== undefined) {
@@ -186,8 +196,9 @@ class WeatherService {
         return { minutes: minutesUsed, precipitation: precipitation };
     }
     static getActiveAlerts() {
+        var _a;
         const result = [];
-        if (WeatherService.lastResponse.alerts === undefined || WeatherService.lastResponse.alerts.length === 0) {
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.alerts) === undefined || WeatherService.lastResponse.alerts.length === 0) {
             return result;
         }
         const now = new Date().getTime();
@@ -212,8 +223,8 @@ class WeatherService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, 'WeatherAPi Response erhalten');
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `WeatherAPi Response: ${response}`);
             utils_1.Utils.guardedFunction(() => {
-                WeatherService.lastResponse = JSON.parse(response);
-                WeatherService.processHourlyWeather();
+                const responseObj = JSON.parse(response);
+                WeatherService.processHourlyWeather(responseObj);
                 for (const dataUpdateCbsKey in this._dataUpdateCbs) {
                     this._dataUpdateCbs[dataUpdateCbsKey]();
                 }