hoffmation-base 3.0.0-alpha.50 → 3.0.0-alpha.52

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/victron/victron-device.js

@@ -7,7 +7,6 @@ const models_1 = require("../../../models");
 const log_service_1 = require("../log-service");
 const victron_mqtt_consumer_1 = require("victron-mqtt-consumer");
 const time_callback_service_1 = require("../time-callback-service");
-const lodash_1 = require("lodash");
 class VictronDevice {
     constructor(opts) {
         /** @inheritDoc */
@@ -169,14 +168,17 @@ class VictronDevice {
         this._lastBatteryPersist = now;
     }
     toJSON() {
-        return (0, lodash_1.extend)(utils_1.Utils.jsonFilter(this, ['_victronConsumer', '_excessEnergyConsumer']), {
-            battery: this.battery,
-            acBlocked: this.acBlocked,
-            excessEnergy: this.excessEnergy,
-            drawingWattage: this.drawingWattage,
-            injectingWattage: this.injectingWattage,
-            selfConsumingWattage: this.selfConsumingWattage,
-        });
+        return {
+            ...{
+                battery: this.battery,
+                acBlocked: this.acBlocked,
+                excessEnergy: this.excessEnergy,
+                drawingWattage: this.drawingWattage,
+                injectingWattage: this.injectingWattage,
+                selfConsumingWattage: this.selfConsumingWattage,
+            },
+            ...utils_1.Utils.jsonFilter(this, ['_victronConsumer', '_excessEnergyConsumer']),
+        };
     }
     /**
      * Changes the grid set point of the Victron device, to the desired value.