hoffmation-base 0.1.32 → 0.1.33-4

package/lib/models/rooms/RoomBase.d.ts

@@ -13,7 +13,7 @@ import { RoomInfo } from './roomInfo';
 import { BaseGroup } from '../../server/devices/groups/base-group';
 import { GroupType } from '../../server/devices/groups/group-type';
 export declare class RoomBase implements iRoomBase {
-    Einstellungen: RoomSettings;
+    settings: RoomSettings;
     groups: Map<GroupType, BaseGroup>;
     info: RoomInfo;
     get FensterGroup(): FensterGroup | undefined;
@@ -24,14 +24,13 @@ export declare class RoomBase implements iRoomBase {
     get SmokeGroup(): SmokeGroup | undefined;
     get WaterGroup(): WaterGroup | undefined;
     get HeatGroup(): HeatGroup | undefined;
-    Settings: RoomSettings;
     sonnenAufgangCallback: TimeCallback | undefined;
     sonnenUntergangCallback: TimeCallback | undefined;
     sonnenAufgangLichtCallback: TimeCallback | undefined;
     skipNextRolloUp: boolean;
     get roomName(): string;
     get etage(): number | undefined;
-    constructor(roomName: string, Einstellungen: RoomSettings, groups: Map<GroupType, BaseGroup>);
+    constructor(roomName: string, settings: RoomSettings, groups: Map<GroupType, BaseGroup>);
     initializeBase(): void;
     persist(): void;
     recalcTimeCallbacks(): void;
@@ -41,4 +40,5 @@ export declare class RoomBase implements iRoomBase {
      */
     setLightTimeBased(movementDependant?: boolean): void;
     isNowLightTime(): boolean;
+    toJSON(): Partial<RoomBase>;
 }

package/lib/models/rooms/RoomBase.js

@@ -9,14 +9,15 @@ const room_service_1 = require("../../server/services/room-service/room-service"
 const roomInfo_1 = require("./roomInfo");
 const group_type_1 = require("../../server/devices/groups/group-type");
 const ShutterService_1 = require("../../server/services/ShutterService");
+const utils_1 = require("../../server/services/utils/utils");
 class RoomBase {
-    constructor(roomName, Einstellungen, groups) {
-        this.Einstellungen = Einstellungen;
+    constructor(roomName, settings, groups) {
+        this.settings = settings;
         this.groups = groups;
         this.skipNextRolloUp = false;
-        this.info = new roomInfo_1.RoomInfo(roomName, Einstellungen);
-        Einstellungen.room = this;
-        this.Settings = Einstellungen;
+        this.info = new roomInfo_1.RoomInfo(roomName, settings);
+        settings.roomName = roomName;
+        this.settings = settings;
         room_service_1.RoomService.addToRoomList(this);
     }
     get FensterGroup() {
@@ -62,18 +63,18 @@ class RoomBase {
     }
     recalcTimeCallbacks() {
         const now = new Date();
-        if (this.sonnenAufgangCallback && this.Einstellungen.rolloOffset) {
-            this.sonnenAufgangCallback.minuteOffset = this.Einstellungen.rolloOffset.sunrise;
-            this.sonnenAufgangCallback.sunTimeOffset = this.Einstellungen.rolloOffset;
+        if (this.sonnenAufgangCallback && this.settings.rolloOffset) {
+            this.sonnenAufgangCallback.minuteOffset = this.settings.rolloOffset.sunrise;
+            this.sonnenAufgangCallback.sunTimeOffset = this.settings.rolloOffset;
             this.sonnenAufgangCallback.recalcNextToDo(now);
         }
-        if (this.sonnenUntergangCallback && this.Einstellungen.rolloOffset) {
-            this.sonnenUntergangCallback.minuteOffset = this.Einstellungen.rolloOffset.sunset;
-            this.sonnenUntergangCallback.sunTimeOffset = this.Einstellungen.rolloOffset;
+        if (this.sonnenUntergangCallback && this.settings.rolloOffset) {
+            this.sonnenUntergangCallback.minuteOffset = this.settings.rolloOffset.sunset;
+            this.sonnenUntergangCallback.sunTimeOffset = this.settings.rolloOffset;
             this.sonnenUntergangCallback.recalcNextToDo(now);
         }
-        if (this.sonnenAufgangLichtCallback && this.Einstellungen.lampOffset) {
-            this.sonnenAufgangLichtCallback.minuteOffset = this.Einstellungen.lampOffset.sunrise;
+        if (this.sonnenAufgangLichtCallback && this.settings.lampOffset) {
+            this.sonnenAufgangLichtCallback.minuteOffset = this.settings.lampOffset.sunrise;
             this.sonnenAufgangLichtCallback.recalcNextToDo(now);
         }
     }
@@ -90,13 +91,13 @@ class RoomBase {
             this.LampenGroup.switchAll(false);
             return;
         }
-        if (!this.Einstellungen.lampOffset) {
+        if (!this.settings.lampOffset) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Beim Aufruf von "setLightTimeBased" im Raum ${this.roomName} liegt kein Lampen Offset vor`);
             return;
         }
-        let timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.Einstellungen.lampOffset);
+        let timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
         if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
-            ((this.Einstellungen.lightIfNoWindows && (!this.FensterGroup || this.FensterGroup.fenster.length === 0)) ||
+            ((this.settings.lightIfNoWindows && (!this.FensterGroup || this.FensterGroup.fenster.length === 0)) ||
                 ((_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.fenster.some((f) => {
                     return ShutterService_1.ShutterService.anyRolloDown(f.getShutter());
                 })))) {
@@ -106,11 +107,11 @@ class RoomBase {
     }
     isNowLightTime() {
         var _a;
-        if (!this.Einstellungen.lampOffset) {
+        if (!this.settings.lampOffset) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Beim Aufruf von "setLightTimeBased" im Raum ${this.roomName} liegt kein Lampen Offset vor`);
             return false;
         }
-        let timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.Einstellungen.lampOffset);
+        let timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
         if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
             ((_a = this.FensterGroup) === null || _a === void 0 ? void 0 : _a.fenster.some((f) => {
                 return ShutterService_1.ShutterService.anyRolloDown(f.getShutter());
@@ -119,5 +120,9 @@ class RoomBase {
         }
         return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
+    toJSON() {
+        const result = utils_1.Utils.jsonFilter(this);
+        return result;
+    }
 }
 exports.RoomBase = RoomBase;

package/lib/models/rooms/RoomSettings/RoomSettings.d.ts

@@ -7,6 +7,13 @@ import { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
 export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitializationSettings {
     shortName: string;
     defaultSettings: iRoomDefaultSettings;
+    deviceAddidngSettings?: RoomDeviceAddingSettings;
+    radioUrl: string;
+    etage: number;
+    rolloOffset: SunTimeOffsets;
+    lampOffset: SunTimeOffsets;
+    roomName?: string;
+    rolloHeatReduction: boolean;
     private _lampenBeiBewegung;
     private _lichtSonnenAufgangAus;
     private _sonnenUntergangRollos;
@@ -19,13 +26,6 @@ export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitiali
     private _sonnenAufgangRolloMinTime;
     private _sonnenAufgangLampenDelay;
     private _lightIfNoWindows;
-    deviceAddidngSettings?: RoomDeviceAddingSettings;
-    radioUrl: string;
-    etage: number;
-    rolloOffset: SunTimeOffsets;
-    lampOffset: SunTimeOffsets;
-    room?: RoomBase;
-    rolloHeatReduction: boolean;
     constructor(initSettings: iRoomInitializationSettings);
     private recalcRolloOffset;
     private recalcLampOffset;
@@ -53,4 +53,5 @@ export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitiali
     set sonnenAufgangRolloMinTime(value: iTimePair);
     get lightIfNoWindows(): boolean;
     set lightIfNoWindows(value: boolean);
+    get room(): RoomBase | undefined;
 }

package/lib/models/rooms/RoomSettings/RoomSettings.js

@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomSettings = void 0;
 const time_callback_service_1 = require("../../../server/services/time-callback-service");
 const settings_service_1 = require("../../../server/services/settings-service");
+const api_service_1 = require("../../../server/services/api/api-service");
 class RoomSettings {
     constructor(initSettings) {
         this.defaultSettings = settings_service_1.SettingsService.settings.roomDefault;
+        this.radioUrl = 'https://hermes.bcs-systems.de/hitradio-rtl_top40_64k_aac'; // Radio RTL
+        this.etage = -1;
+        this.rolloHeatReduction = this.defaultSettings.rolloHeatReduction;
         this._lampenBeiBewegung = this.defaultSettings.lampenBeiBewegung;
         this._lichtSonnenAufgangAus = this.defaultSettings.lichtSonnenAufgangAus;
         this._sonnenUntergangRollos = this.defaultSettings.sonnenUntergangRollos;
@@ -18,9 +22,6 @@ class RoomSettings {
         this._sonnenAufgangRolloMinTime = this.defaultSettings.sonnenAufgangRolloMinTime;
         this._sonnenAufgangLampenDelay = this.defaultSettings.sonnenAufgangLampenDelay;
         this._lightIfNoWindows = this.defaultSettings.lightIfNoWindows;
-        this.radioUrl = 'https://hermes.bcs-systems.de/hitradio-rtl_top40_64k_aac'; // Radio RTL
-        this.etage = -1;
-        this.rolloHeatReduction = this.defaultSettings.rolloHeatReduction;
         this.shortName = initSettings.shortName;
         this.etage = initSettings.etage;
         this.deviceAddidngSettings = initSettings.deviceAddidngSettings;
@@ -28,16 +29,14 @@ class RoomSettings {
         this.lampOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
     }
     recalcRolloOffset() {
+        var _a;
         this.rolloOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
-        if (this.room) {
-            this.room.recalcTimeCallbacks();
-        }
+        (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
     }
     recalcLampOffset() {
+        var _a;
         this.lampOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenAufgangRolloDelay);
-        if (this.room) {
-            this.room.recalcTimeCallbacks();
-        }
+        (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
     }
     get sonnenAufgangLampenDelay() {
         return this._sonnenAufgangLampenDelay;
@@ -118,5 +117,11 @@ class RoomSettings {
     set lightIfNoWindows(value) {
         this._lightIfNoWindows = value;
     }
+    get room() {
+        if (!this.roomName) {
+            return undefined;
+        }
+        return api_service_1.API.getRoom(this.roomName);
+    }
 }
 exports.RoomSettings = RoomSettings;

package/lib/server/devices/DeviceInfo.d.ts

@@ -15,4 +15,5 @@ export declare class DeviceInfo {
     constructor(pDevConf: deviceConfig);
     set customName(val: string);
     get customName(): string;
+    toJSON(): Partial<DeviceInfo>;
 }

package/lib/server/devices/DeviceInfo.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceInfo = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 class DeviceInfo {
     constructor(pDevConf) {
         this.devConf = pDevConf;
@@ -44,5 +48,8 @@ class DeviceInfo {
         }
         return this.fullName;
     }
+    toJSON() {
+        return lodash_1.default.omit(this, ['devConf']);
+    }
 }
 exports.DeviceInfo = DeviceInfo;

package/lib/server/devices/Fenster.js

@@ -55,7 +55,7 @@ class Fenster extends base_group_1.BaseGroup {
                 this.getVibration().forEach((element) => {
                     element.vibrationBlocked = true;
                 });
-                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.getRoom().Einstellungen.rolloOffset);
+                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
                 if (time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay)) {
                     ShutterService_1.ShutterService.windowAllMiddle(this);
                 }

package/lib/server/devices/IoBrokerBaseDevice.d.ts

@@ -46,4 +46,5 @@ export declare abstract class IoBrokerBaseDevice {
      * @param onError Callback to run if an error has occurred during writing the data
      */
     protected setState(pointId: string, state: string | number | boolean | ioBroker.State | ioBroker.SettableState | null, onSuccess?: (() => void) | undefined, onError?: ((error: Error) => void) | undefined): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -115,6 +115,10 @@ class IoBrokerBaseDevice {
             }
         });
     }
+    toJSON() {
+        const result = utils_1.Utils.jsonFilter(this);
+        return result;
+    }
 }
 exports.IoBrokerBaseDevice = IoBrokerBaseDevice;
 IoBrokerBaseDevice.roomAddingSettings = {};

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

@@ -9,7 +9,7 @@ export declare class Devices {
     };
     constructor(pDeviceData: {
         [id: string]: deviceConfig;
-    }, pRoomImportEnforcer: iRoomImportEnforcer);
+    }, pRoomImportEnforcer?: iRoomImportEnforcer);
     static midnightReset(): void;
     static resetPraesenzCount(): void;
     private processZigbeeDevice;

package/lib/server/devices/devices.js

@@ -34,7 +34,7 @@ const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
-        pRoomImportEnforcer.addRoomConstructor();
+        pRoomImportEnforcer === null || pRoomImportEnforcer === void 0 ? void 0 : pRoomImportEnforcer.addRoomConstructor();
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Constructing devices now`);
         for (const cID in pDeviceData) {
             const cDevConf = pDeviceData[cID];

package/lib/server/devices/groups/fensterGroup.js

@@ -41,7 +41,7 @@ class FensterGroup extends base_group_1.BaseGroup {
     }
     initialize() {
         const room = this.getRoom();
-        if (room.Einstellungen.sonnenAufgangRollos && room.Einstellungen.rolloOffset) {
+        if (room.settings.sonnenAufgangRollos && room.settings.rolloOffset) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Sonnenaufgang TimeCallback für ${this.roomName} hinzufügen`);
             room.sonnenAufgangCallback = new timeCallback_1.TimeCallback(`${this.roomName} Sonnenaufgang Rollos`, timeCallback_1.TimeCallbackType.Sunrise, () => {
                 if (room.skipNextRolloUp) {
@@ -49,24 +49,24 @@ class FensterGroup extends base_group_1.BaseGroup {
                     return;
                 }
                 this.sunriseUp();
-            }, room.Einstellungen.rolloOffset.sunrise, undefined, undefined, room.Einstellungen.rolloOffset);
-            if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.Einstellungen.rolloOffset))) {
+            }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
+            if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
                 this.sunriseUp(true);
             }
             time_callback_service_1.TimeCallbackService.addCallback(room.sonnenAufgangCallback);
         }
-        if (room.Einstellungen.sonnenUntergangRollos && room.Einstellungen.rolloOffset) {
+        if (room.settings.sonnenUntergangRollos && room.settings.rolloOffset) {
             room.sonnenUntergangCallback = new timeCallback_1.TimeCallback(`${this.roomName} Sonnenuntergang Rollo`, timeCallback_1.TimeCallbackType.SunSet, () => {
                 this.sunsetDown();
-            }, room.Einstellungen.rolloOffset.sunset);
-            if (time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.Einstellungen.rolloOffset))) {
+            }, room.settings.rolloOffset.sunset);
+            if (time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
                 utils_1.Utils.guardedTimeout(() => {
                     this.allRolloDown(true, true);
                 }, 60000, this);
             }
             time_callback_service_1.TimeCallbackService.addCallback(room.sonnenUntergangCallback);
         }
-        if (room.Einstellungen.rolloHeatReduction) {
+        if (room.settings.rolloHeatReduction) {
             utils_1.Utils.guardedInterval(this.setRolloByWeatherStatus, 15 * 60 * 1000, this, true);
             utils_1.Utils.guardedTimeout(this.setRolloByWeatherStatus, 2 * 60 * 1000, this);
         }
@@ -78,13 +78,13 @@ class FensterGroup extends base_group_1.BaseGroup {
         var _a, _b;
         this.allRolloToLevel(0, true);
         const room = this.getRoom();
-        if (((_a = room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) && room.Einstellungen.lampOffset) {
-            (_b = room.LampenGroup) === null || _b === void 0 ? void 0 : _b.switchTimeConditional(time_callback_service_1.TimeCallbackService.dayType(room.Einstellungen.lampOffset));
+        if (((_a = room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) && room.settings.lampOffset) {
+            (_b = room.LampenGroup) === null || _b === void 0 ? void 0 : _b.switchTimeConditional(time_callback_service_1.TimeCallbackService.dayType(room.settings.lampOffset));
         }
     }
     setRolloByWeatherStatus() {
         const room = this.getRoom();
-        const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.Einstellungen.rolloOffset);
+        const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset);
         const darkOutside = time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
         this.fenster.forEach((f) => {
             var _a, _b, _c, _d;
@@ -124,7 +124,7 @@ class FensterGroup extends base_group_1.BaseGroup {
             });
             return;
         }
-        if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(this.getRoom().Einstellungen.rolloOffset))) {
+        if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset))) {
             this.sunriseUp(true);
         }
         else {

package/lib/server/devices/groups/praesenzGroup.js

@@ -47,12 +47,12 @@ class PraesenzGroup extends base_group_1.BaseGroup {
                 room_service_1.RoomService.movementHistory.add(`${utils_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${b.info.fullName}"`);
             });
         });
-        if (this.getRoom().Einstellungen.lichtSonnenAufgangAus && this.getRoom().Einstellungen.lampOffset) {
+        if (this.getRoom().settings.lichtSonnenAufgangAus && this.getRoom().settings.lampOffset) {
             const cb = new timeCallback_1.TimeCallback(`${this.roomName} Morgens Lampe aus`, timeCallback_1.TimeCallbackType.Sunrise, () => {
                 var _a;
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Es ist hell genug --> Schalte Lampen im ${this.roomName} aus`);
                 (_a = this.getRoom().LampenGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false);
-            }, this.getRoom().Einstellungen.lampOffset.sunrise);
+            }, this.getRoom().settings.lampOffset.sunrise);
             this.getRoom().sonnenAufgangLichtCallback = cb;
             time_callback_service_1.TimeCallbackService.addCallback(cb);
         }
@@ -60,7 +60,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             var _a;
             (_a = this.getRoom().LampenGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false);
         });
-        if (this.getRoom().Einstellungen.lampenBeiBewegung) {
+        if (this.getRoom().settings.lampenBeiBewegung) {
             this.addFirstEnterCallback(() => {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
                 this.getRoom().setLightTimeBased();
@@ -101,7 +101,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         if (this.anyPresent()) {
             return;
         }
-        let timeAfterReset = utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().Einstellungen.movementResetTimer * 1000;
+        let timeAfterReset = utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
         if (timeAfterReset > 0) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Movement reset in ${this.roomName}.\nActive Motions: ${this.presentAmount()}\nTime after Last Movement including Reset: ${timeAfterReset}`);
             cb();
@@ -110,7 +110,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
         utils_1.Utils.guardedTimeout(() => {
             timeAfterReset =
-                utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().Einstellungen.movementResetTimer * 1000;
+                utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Delayed Movement reset in ${this.roomName}.\nActive Motions: ${this.presentAmount()}\nTime after Last Movement including Reset: ${timeAfterReset}`);
             if (!this.anyPresent() && timeAfterReset > 0) {
                 cb();

package/lib/server/devices/groups/tasterGroup.js

@@ -45,7 +45,7 @@ class TasterGroup extends base_group_1.BaseGroup {
             const sonosGroup = this.getRoom().SonosGroup;
             if (sonosGroup !== undefined && sonosGroup.getOwnSonosDevices().length > 0) {
                 t.tasten.UntenRechts.addLongCallback(() => {
-                    sonosGroup.trigger(this.getRoom().Einstellungen.radioUrl);
+                    sonosGroup.trigger(this.getRoom().settings.radioUrl);
                 });
             }
         });

package/lib/server/devices/hmIPDevices/hmIpBewegung.d.ts

@@ -10,7 +10,7 @@ export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSen
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;
     private initialized;
-    private fallBackTimeout;
+    private _fallBackTimeout;
     private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);

package/lib/server/devices/hmIPDevices/hmIpBewegung.js

@@ -91,15 +91,15 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         }
     }
     resetFallbackTimeout() {
-        if (this.fallBackTimeout) {
+        if (this._fallBackTimeout) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Fallback Timeout für "${this.info.customName}" zurücksetzen`);
-            clearTimeout(this.fallBackTimeout);
+            clearTimeout(this._fallBackTimeout);
         }
     }
     startFallbackTimeout() {
-        this.fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset für "${this.info.customName}"`);
-            this.fallBackTimeout = undefined;
+            this._fallBackTimeout = undefined;
             this.updateMovement(false);
         }, 270000, this);
     }

package/lib/server/devices/hmIPDevices/hmIpGriff.d.ts

@@ -3,12 +3,13 @@ import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 import { FensterPosition } from '../models/FensterPosition';
 import { Fenster } from '../Fenster';
+import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 export declare class HmIpGriff extends HmIPDevice {
     position: FensterPosition;
     private _kippCallback;
     private _closedCallback;
     private _offenCallback;
-    private _iOpen;
+    private _iOpenTimeout;
     private minutesOpen;
     private _fenster;
     private _helpingRoomTemp;
@@ -19,4 +20,5 @@ export declare class HmIpGriff extends HmIPDevice {
     set Fenster(value: Fenster);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePosition(pValue: FensterPosition): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/server/devices/hmIPDevices/hmIpGriff.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpGriff = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
@@ -9,6 +12,7 @@ const weather_service_1 = require("../../services/weather/weather-service");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
+const lodash_1 = __importDefault(require("lodash"));
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
@@ -59,16 +63,16 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             c3(pValue === 2);
         }
         if (pValue === FensterPosition_1.FensterPosition.geschlossen) {
-            if (this._iOpen !== undefined) {
-                clearInterval(this._iOpen);
+            if (this._iOpenTimeout !== undefined) {
+                clearInterval(this._iOpenTimeout);
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Fenster: "${this.info.customName}" nach ${this.minutesOpen} Minuten geschlossen`);
                 this.minutesOpen = 0;
-                this._iOpen = undefined;
+                this._iOpenTimeout = undefined;
             }
             return;
         }
-        else if (this._iOpen === undefined) {
-            this._iOpen = utils_1.Utils.guardedInterval(() => {
+        else if (this._iOpenTimeout === undefined) {
+            this._iOpenTimeout = utils_1.Utils.guardedInterval(() => {
                 var _a;
                 this.minutesOpen++;
                 const heatgroup = (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.getRoom().HeatGroup;
@@ -115,5 +119,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }, 60000, this);
         }
     }
+    toJSON() {
+        return lodash_1.default.omit(super.toJSON(), ['_fenster']);
+    }
 }
 exports.HmIpGriff = HmIpGriff;

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -10,7 +10,7 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp {
     isStromStoss: boolean;
     settings: ActuatorSettings;
     private lightOnSwitchID;
-    private turnOffTimeout;
+    private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -16,7 +16,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.isStromStoss = false;
         this.settings = new actuatorSettings_1.ActuatorSettings();
         this.lightOnSwitchID = '';
-        this.turnOffTimeout = undefined;
+        this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
     }
@@ -58,17 +58,17 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         if (this.isStromStoss) {
             timeout = 5000;
         }
-        if (this.turnOffTimeout !== undefined) {
-            clearTimeout(this.turnOffTimeout);
-            this.turnOffTimeout = undefined;
+        if (this._turnOffTimeout !== undefined) {
+            clearTimeout(this._turnOffTimeout);
+            this._turnOffTimeout = undefined;
         }
         if (timeout < 0 || !pValue) {
             return;
         }
         this.turnOffTime = utils_1.Utils.nowMS() + timeout;
-        this.turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Delayed Turnoff for "${this.info.customName}" initiated`);
-            this.turnOffTimeout = undefined;
+            this._turnOffTimeout = undefined;
             if (!this.room) {
                 this.setLight(false, -1, true);
             }

package/lib/server/devices/hmIPDevices/hmIpRoll.d.ts

@@ -3,6 +3,7 @@ import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 import { Fenster } from '../Fenster';
 import { iShutter } from '../iShutter';
+import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
     get currentLevel(): number;
     set currentLevel(value: number);
@@ -18,4 +19,5 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/server/devices/hmIPDevices/hmIpRoll.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpRoll = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
@@ -7,6 +10,7 @@ const utils_1 = require("../../services/utils/utils");
 const log_service_1 = require("../../services/log-service");
 const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
+const lodash_1 = __importDefault(require("lodash"));
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpRoll);
@@ -94,5 +98,8 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Fahre Rollo "${this.info.customName}" auf Position ${pPosition}`);
         this.setState(this._setLevelSwitchID, pPosition);
     }
+    toJSON() {
+        return lodash_1.default.omit(super.toJSON(), ['_fenster']);
+    }
 }
 exports.HmIpRoll = HmIpRoll;

package/lib/server/devices/hmIPDevices/hmIpTuer.d.ts

@@ -6,7 +6,7 @@ export declare class HmIpTuer extends HmIPDevice {
     position: MagnetPosition;
     private _closedCallback;
     private _openCallback;
-    private _iOpen;
+    private _iOpenTimeout;
     private minutesOpen;
     constructor(pInfo: DeviceInfo);
     addOpenCallback(pCallback: (pValue: boolean) => void): void;

package/lib/server/devices/hmIPDevices/hmIpTuer.js

@@ -52,8 +52,8 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             c2(pValue === 1);
         }
         if (pValue === MagnetPosition_1.MagnetPosition.closed) {
-            if (this._iOpen !== undefined) {
-                clearInterval(this._iOpen);
+            if (this._iOpenTimeout !== undefined) {
+                clearInterval(this._iOpenTimeout);
                 let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
                 if (this.minutesOpen === 0) {
                     message = `"${this.info.customName}" just closed`;
@@ -62,16 +62,16 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
                 telegram_service_1.TelegramService.inform(message);
                 this.minutesOpen = 0;
-                this._iOpen = undefined;
+                this._iOpenTimeout = undefined;
             }
             return;
         }
-        else if (this._iOpen === undefined) {
+        else if (this._iOpenTimeout === undefined) {
             const message = res_1.Res.wasOpened(this.info.customName);
             //const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde geöfnet!`
             telegram_service_1.TelegramService.inform(message);
             sonos_service_1.SonosService.speakOnAll(message, 40);
-            this._iOpen = utils_1.Utils.guardedInterval(() => {
+            this._iOpenTimeout = utils_1.Utils.guardedInterval(() => {
                 this.minutesOpen++;
                 const message = `Contact: "${this.info.customName}" is  ${MagnetPosition_1.MagnetPosition[this.position]} since ${this.minutesOpen} minutes`;
                 switch (this.minutesOpen) {

package/lib/server/devices/zigbee/ZigbeeActuator.d.ts

@@ -8,7 +8,7 @@ export declare class ZigbeeActuator extends ZigbeeDevice {
     protected readonly actuatorOnSwitchID: string;
     protected queuedValue: boolean | null;
     protected actuatorOn: boolean;
-    private turnOffTimeout;
+    private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: DeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;