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

package/lib/server/devices/sharedFunctions/temperatureSensor.d.ts

@@ -1,6 +1,5 @@
-import { TemperatureSensorChangeAction } from '../../../models';
+import { iJsonOmitKeys, TemperatureSensorChangeAction } from '../../../models';
 import { iTemperatureSensor } from '../baseDeviceInterfaces';
-import { iJsonOmitKeys } from '../../../models/iJsonOmitKeys';
 export declare class TemperatureSensor implements iJsonOmitKeys {
     private readonly _device;
     /** @inheritDoc */
@@ -17,6 +16,7 @@ export declare class TemperatureSensor implements iJsonOmitKeys {
     private _temperaturCallbacks;
     constructor(_device: iTemperatureSensor);
     set temperature(val: number);
+    get temperature(): number;
     /**
      * Persists the current temperature sensor information to the database
      */

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

@@ -28,6 +28,9 @@ class TemperatureSensor {
             cb(new models_1.TemperatureSensorChangeAction(this._device, val));
         }
     }
+    get temperature() {
+        return this._temperature;
+    }
     /**
      * Persists the current temperature sensor information to the database
      */

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.js

@@ -206,7 +206,9 @@ 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(() => {
@@ -215,7 +217,7 @@ class WeatherService {
                 for (const dataUpdateCbsKey in this._dataUpdateCbs) {
                     this._dataUpdateCbs[dataUpdateCbsKey]();
                 }
-            }, this);
+            }, this, `Response from Weather API call at https://${host}/${path}: ${response}`);
         });
     }
     static recalcAzimuth() {