hoffmation-base 3.0.0-alpha.92 → 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/utils/utils.d.ts

@@ -11,7 +11,7 @@ export declare class Utils {
     static get anyDboActive(): boolean;
     static get timeTilMidnight(): number;
     static catchEm<T>(promise: Promise<T>): Promise<CatchEmResult<T>>;
-    static guardedFunction(func: (...args: unknown[]) => void, thisContext: unknown | undefined): void;
+    static guardedFunction(func: (...args: unknown[]) => void, thisContext: unknown | undefined, additionalErrorMsg?: string): void;
     static nowMS(): number;
     static delay(ms: number): Promise<void>;
     static guardedNewThread(func: (...args: unknown[]) => void, thisContext?: unknown | undefined): void;

package/lib/server/services/utils/utils.js

@@ -29,7 +29,7 @@ class Utils {
             data: null,
         }));
     }
-    static guardedFunction(func, thisContext) {
+    static guardedFunction(func, thisContext, additionalErrorMsg) {
         try {
             if (thisContext) {
                 func.bind(thisContext)();
@@ -39,6 +39,11 @@ class Utils {
             }
         }
         catch (e) {
+            const message = `Guarded Function failed: ${e.message}\n Stack: ${e.stack}`;
+            if (additionalErrorMsg) {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `${message}\n${additionalErrorMsg}`);
+                return;
+            }
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Guarded Function failed: ${e.message}\n Stack: ${e.stack}`);
         }
     }

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

@@ -13,11 +13,15 @@ export interface WeatherCurrent {
     dew_point: number;
     uvi: number;
     clouds: number;
-    rain?: number;
-    snow?: number;
+    rain?: {
+        '1h': number;
+    };
+    snow?: {
+        '1h': number;
+    };
     visibility: number;
     wind_speed: number;
     wind_deg: number;
     wind_gust: number;
-    weather: WeatherItem[];
+    weather: WeatherItem;
 }

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

@@ -5,6 +5,10 @@ export interface WeatherDaily {
     dt: number;
     sunrise: number;
     sunset: number;
+    moonrise: number;
+    moonset: number;
+    moon_phase: number;
+    summary: string;
     pressure: number;
     humidity: number;
     dew_point: number;

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

@@ -13,4 +13,10 @@ export interface WeatherHourly {
     wind_deg: number;
     weather: WeatherItem[];
     pop: number;
+    rain?: {
+        '1h': number;
+    };
+    snow?: {
+        '1h': number;
+    };
 }

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();
@@ -206,16 +217,18 @@ class WeatherService {
         if (!this.appID) {
             return;
         }
-        https_service_1.HTTPSService.request(new HTTPSOptions_1.HTTPSOptions('api.openweathermap.org', `/data/2.5/onecall?lat=${WeatherService.latitude}&lon=${WeatherService.longitude}&appid=${WeatherService.appID}&units=metric&lang=de`, {}, 'GET', 443), '', 5, (response) => {
+        const host = 'api.openweathermap.org';
+        const path = `/data/3.0/onecall?lat=${WeatherService.latitude}&lon=${WeatherService.longitude}&appid=${WeatherService.appID}&units=metric&lang=de`;
+        https_service_1.HTTPSService.request(new HTTPSOptions_1.HTTPSOptions(host, path, {}, 'GET', 443), '', 5, (response) => {
             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]();
                 }
-            }, this);
+            }, this, `Response from Weather API call at https://${host}/${path}: ${response}`);
         });
     }
     static recalcAzimuth() {