hoffmation-base 3.0.0-alpha.51 → 3.0.0-alpha.53

package/lib/server/config/iSonosSettings.d.ts

@@ -11,4 +11,8 @@ export interface iSonosSettings {
      * @warning This can collide with AC-Control (@see {@link iDaikinSettings.buttonBotRightForAc})
      */
     buttonBotRightForRadio?: boolean;
+    /**
+     * The hostname to use for initialization (needed in some VLAN situation where discovery is not possible).
+     */
+    initialHost?: string;
 }

package/lib/server/services/Sonos/sonos-service.d.ts

@@ -5,6 +5,7 @@ export declare class SonosService {
     private static isInitialized;
     private static checkTimeCallback;
     private static reinitializationDevice;
+    private static get config();
     static addOwnDevices(snDevices: {
         [name: string]: OwnSonosDevice;
     }, reinitializationDevice?: OwnSonosDevice): void;

package/lib/server/services/Sonos/sonos-service.js

@@ -9,12 +9,15 @@ const Telegram_1 = require("../Telegram");
 const time_callback_service_1 = require("../time-callback-service");
 const settings_service_1 = require("../settings-service");
 class SonosService {
+    static get config() {
+        return settings_service_1.SettingsService.settings.sonos;
+    }
     static addOwnDevices(snDevices, reinitializationDevice) {
         this.ownDevices = snDevices;
         this.reinitializationDevice = reinitializationDevice;
     }
     static initialize(reinitialize = false) {
-        var _a;
+        var _a, _b;
         if (((_a = settings_service_1.SettingsService.settings.mp3Server) === null || _a === void 0 ? void 0 : _a.serverAddress) === undefined) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, 'SonosService needs properly configured mp3Server.');
         }
@@ -34,14 +37,16 @@ class SonosService {
             }, 'Spiele eine kurze Nachricht auf allen Sonos Geräten um diese zu identifizieren'));
         }
         this.sonosManager = new lib_1.SonosManager();
-        this.sonosManager
-            .InitializeWithDiscovery(10)
+        this.sonosManager.OnNewDevice((d) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `SonosDevice ${d.Name} joined`);
+            SonosService.initializeDevice(d);
+        });
+        const initialHost = (_b = this.config) === null || _b === void 0 ? void 0 : _b.initialHost;
+        (initialHost === undefined
+            ? this.sonosManager.InitializeWithDiscovery(10)
+            : this.sonosManager.InitializeFromDevice(initialHost))
             .then(() => {
             var _a;
-            this.sonosManager.OnNewDevice((d) => {
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `SonosDevice ${d.Name} joined`);
-                SonosService.initializeDevice(d);
-            });
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `${this.sonosManager.Devices.length} Sonos Geräte gefunden.`);
             this.sonosManager.Devices.forEach((d) => {
                 SonosService.initializeDevice(d);

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

@@ -14,6 +14,7 @@ const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const settings_service_1 = require("../settings-service");
 const config_1 = require("../../config");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
+const weather_1 = require("../weather");
 class AcDevice {
     /**
      * Whether the AC is allowed to cool (depends on the season
@@ -27,6 +28,12 @@ class AcDevice {
         if (this.settings.noCoolingOnMovement && ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent())) {
             return false;
         }
+        if (weather_1.WeatherService.active &&
+            weather_1.WeatherService.todayMaxTemp < 22 && // TODO: Make this value configurable
+            weather_1.WeatherService.todayMaxTemp !== devices_1.UNDEFINED_TEMP_VALUE) {
+            // As it is quite cold outside there is no need to cool
+            return false;
+        }
         return true;
     }
     /**

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

@@ -26,6 +26,7 @@ export declare class WeatherService {
     private static longitude;
     private static appID?;
     static addWeatherUpdateCb(name: string, cb: () => void): void;
+    static get todayMaxTemp(): number;
     static initialize(config: iWeatherSettings): void;
     static update(): void;
     static stopInterval(): void;

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

@@ -11,10 +11,15 @@ const utils_1 = require("../utils");
 const log_service_1 = require("../log-service");
 const suncalc_1 = __importDefault(require("suncalc"));
 const time_callback_service_1 = require("../time-callback-service");
+const devices_1 = require("../../devices");
 class WeatherService {
     static addWeatherUpdateCb(name, cb) {
         this._dataUpdateCbs[name] = cb;
     }
+    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 : devices_1.UNDEFINED_TEMP_VALUE;
+    }
     static initialize(config) {
         this.active = true;
         this.longitude = config.longitude;