hoffmation-base 0.1.30-5 → 0.1.30-9

package/lib/index.d.ts

@@ -1,15 +1,12 @@
-import { Express } from 'express';
 import { Devices, iConfig, ioBrokerMain, OwnSonosDevice } from './server';
 export * from './models/index';
 export * from './server/index';
 export declare class HoffmationInitializationObject {
     config: iConfig;
-    readonly app: Express;
-    constructor(config: iConfig, app: Express);
+    constructor(config: iConfig);
 }
 export declare class HoffmationBase {
     static ioMain: ioBrokerMain;
-    private static _app;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;
     static initializePostIoBroker(defaultMuellSonos?: OwnSonosDevice): void;
     static startIoBroker(devices: Devices): void;

package/lib/index.js

@@ -16,9 +16,8 @@ const server_1 = require("./server");
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./server/index"), exports);
 class HoffmationInitializationObject {
-    constructor(config, app) {
+    constructor(config) {
         this.config = config;
-        this.app = app;
     }
 }
 exports.HoffmationInitializationObject = HoffmationInitializationObject;
@@ -36,7 +35,6 @@ class HoffmationBase {
         else {
             server_1.Persist.turnOff();
         }
-        this._app = initObject.app;
         if (server_1.SettingsService.settings.mp3Server) {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);
             new server_1.MP3Server(server_1.SettingsService.settings.mp3Server);
@@ -76,14 +74,6 @@ class HoffmationBase {
         });
         if (server_1.SettingsService.TelegramActive)
             server_1.TelegramService.publishCommands();
-        if (server_1.SettingsService.settings.expressPort) {
-            this._app.get('/isAlive', (_req, res) => {
-                res.send(`Hoffmation-Base active ${new Date()}`);
-            });
-            this._app.listen(server_1.SettingsService.settings.expressPort, () => {
-                console.log(`Example app listening at http://localhost:${server_1.SettingsService.settings.expressPort}`);
-            });
-        }
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post ioBrokerInitializations finished`);
     }
     static startIoBroker(devices) {

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

@@ -1,70 +1,37 @@
-import { ringStorage } from '../../server/services/utils/ringstorage';
 import { TimeCallback } from '../timeCallback';
 import { TasterGroup } from '../../server/devices/groups/tasterGroup';
 import { PraesenzGroup } from '../../server/devices/groups/praesenzGroup';
 import { HeatGroup } from '../../server/devices/groups/heatGroup';
 import { WaterGroup } from '../../server/devices/groups/waterGroup';
-import { IoBrokerBaseDevice } from '../../server/devices/IoBrokerBaseDevice';
 import { LampenGroup } from '../../server/devices/groups/lampenGroup';
 import { RoomSettings } from './RoomSettings/RoomSettings';
 import { SmokeGroup } from '../../server/devices/groups/smokeGroup';
 import { FensterGroup } from '../../server/devices/groups/fensterGroup';
 import { SonosGroup } from '../../server/devices/groups/sonosGroup';
 import { iRoomBase } from './iRoomBase';
+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 {
-    roomName: string;
     Einstellungen: RoomSettings;
-    static Rooms: {
-        [name: string]: RoomBase;
-    };
-    static allRooms: RoomBase[];
-    static floors: {
-        [level: number]: RoomBase[];
-    };
-    static awayModeActive: boolean;
-    static nightAlarmActive: boolean;
-    static movementHistory: ringStorage;
-    FensterGroup: FensterGroup;
-    PraesenzGroup: PraesenzGroup;
-    LampenGroup: LampenGroup;
-    TasterGroup: TasterGroup;
-    SonosGroup: SonosGroup;
-    SmokeGroup: SmokeGroup;
-    WaterGroup: WaterGroup;
-    HeatGroup: HeatGroup;
+    groups: Map<GroupType, BaseGroup>;
+    info: RoomInfo;
+    get FensterGroup(): FensterGroup | undefined;
+    get PraesenzGroup(): PraesenzGroup | undefined;
+    get LampenGroup(): LampenGroup | undefined;
+    get TasterGroup(): TasterGroup | undefined;
+    get SonosGroup(): SonosGroup | undefined;
+    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;
-    private static _awayModeTimer;
-    private static _nightModeTimer;
-    private static _intrusionAlarmActive;
-    private static _intrusionAlarmLevel;
-    private static _intrusionAlarmTimeout;
-    static addToRoomList(room: RoomBase): void;
-    static getAllRoomsOfFloor(floor: number): Array<RoomBase>;
-    /**
-     * Set ALl Roolos of a specific floor
-     * !!floor -1 sets all rollos in house instead!!
-     * @param floor the level on which all rollos shall be changed -1 equals all rooms
-     * @param position (0 equals down, 100 up)
-     */
-    static setAllRolloOfFloor(floor?: number, position?: number): void;
-    /**
-     * Set ALl Lamps of a specific floor
-     * !!floor -1 sets all lamps in house instead!!
-     * @param floor the level on which all lamps shall be changed -1 equals all rooms
-     * @param status
-     */
-    static setAllLampsOfFloor(floor: number, status?: boolean): void;
-    static clearAllAlarms(): void;
-    static startAwayMode(): void;
-    static startNightAlarmMode(): void;
-    static startIntrusionAlarm(room: iRoomBase, device: IoBrokerBaseDevice): void;
-    static endAlarmModes(): void;
-    static getLastMovements(): string;
-    constructor(roomName: string, Einstellungen: RoomSettings);
+    get roomName(): string;
+    get etage(): number | undefined;
+    constructor(roomName: string, Einstellungen: RoomSettings, groups: Map<GroupType, BaseGroup>);
     initializeBase(): void;
     persist(): void;
     recalcTimeCallbacks(): void;
@@ -74,8 +41,4 @@ export declare class RoomBase implements iRoomBase {
      */
     setLightTimeBased(movementDependant?: boolean): void;
     isNowLightTime(): boolean;
-    private static stopIntrusionAlarm;
-    private static performNextIntrusionLevel;
-    private static restoreRolloPosition;
-    private static restoreLight;
 }

package/lib/models/rooms/RoomBase.js

@@ -1,159 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomBase = void 0;
-const ringstorage_1 = require("../../server/services/utils/ringstorage");
-const tasterGroup_1 = require("../../server/devices/groups/tasterGroup");
-const praesenzGroup_1 = require("../../server/devices/groups/praesenzGroup");
-const telegram_service_1 = require("../../server/services/Telegram/telegram-service");
-const heatGroup_1 = require("../../server/devices/groups/heatGroup");
 const logLevel_1 = require("../logLevel");
-const waterGroup_1 = require("../../server/devices/groups/waterGroup");
 const log_service_1 = require("../../server/services/log-service");
-const utils_1 = require("../../server/services/utils/utils");
-const lampenGroup_1 = require("../../server/devices/groups/lampenGroup");
-const smokeGroup_1 = require("../../server/devices/groups/smokeGroup");
-const fensterGroup_1 = require("../../server/devices/groups/fensterGroup");
 const persist_1 = require("../../server/services/dbo/persist");
 const time_callback_service_1 = require("../../server/services/time-callback-service");
-const sonos_service_1 = require("../../server/services/Sonos/sonos-service");
-const sonosGroup_1 = require("../../server/devices/groups/sonosGroup");
-const res_1 = require("../../server/services/Translation/res");
+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");
 class RoomBase {
-    constructor(roomName, Einstellungen) {
-        this.roomName = roomName;
+    constructor(roomName, Einstellungen, groups) {
         this.Einstellungen = Einstellungen;
-        this.FensterGroup = new fensterGroup_1.FensterGroup(this, []);
-        this.PraesenzGroup = new praesenzGroup_1.PraesenzGroup(this, [], []);
-        this.LampenGroup = new lampenGroup_1.LampenGroup(this, [], [], []);
-        this.TasterGroup = new tasterGroup_1.TasterGroup(this, []);
-        this.SonosGroup = new sonosGroup_1.SonosGroup(this, []);
-        this.SmokeGroup = new smokeGroup_1.SmokeGroup(this, []);
-        this.WaterGroup = new waterGroup_1.WaterGroup(this, []);
-        this.HeatGroup = new heatGroup_1.HeatGroup(this, []);
+        this.groups = groups;
         this.skipNextRolloUp = false;
-        if (Einstellungen.etage !== undefined) {
-            const level = Einstellungen.etage;
-            if (RoomBase.floors[level] === undefined) {
-                RoomBase.floors[level] = [];
-            }
-            RoomBase.floors[level].push(this);
-        }
+        this.info = new roomInfo_1.RoomInfo(roomName, Einstellungen);
         Einstellungen.room = this;
         this.Settings = Einstellungen;
-        RoomBase.allRooms.push(this);
+        room_service_1.RoomService.addToRoomList(this);
     }
-    static addToRoomList(room) {
-        RoomBase.Rooms[room.roomName] = room;
+    get FensterGroup() {
+        return this.groups.get(group_type_1.GroupType.Window);
     }
-    static getAllRoomsOfFloor(floor) {
-        return this.floors[floor];
+    get PraesenzGroup() {
+        return this.groups.get(group_type_1.GroupType.Presence);
     }
-    /**
-     * Set ALl Roolos of a specific floor
-     * !!floor -1 sets all rollos in house instead!!
-     * @param floor the level on which all rollos shall be changed -1 equals all rooms
-     * @param position (0 equals down, 100 up)
-     */
-    static setAllRolloOfFloor(floor = -1, position = 0) {
-        const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.allRooms;
-        for (const room of rooms) {
-            room.FensterGroup.allRolloToLevel(position, true);
-        }
+    get LampenGroup() {
+        return this.groups.get(group_type_1.GroupType.Light);
     }
-    /**
-     * Set ALl Lamps of a specific floor
-     * !!floor -1 sets all lamps in house instead!!
-     * @param floor the level on which all lamps shall be changed -1 equals all rooms
-     * @param status
-     */
-    static setAllLampsOfFloor(floor, status = false) {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Schalte alle Lampen in Etage ${floor} auf den Wert ${status}`);
-        const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.allRooms;
-        for (const room of rooms) {
-            room.LampenGroup.setAllLampen(status, -1, true);
-            room.LampenGroup.setAllLED(status);
-            room.LampenGroup.setAllStecker(status, -1, true);
-        }
+    get TasterGroup() {
+        return this.groups.get(group_type_1.GroupType.Buttons);
     }
-    static clearAllAlarms() {
-        for (const r of RoomBase.allRooms) {
-            if (r.WaterGroup) {
-                r.WaterGroup.stopAlarm();
-            }
-            if (r.SmokeGroup) {
-                r.SmokeGroup.stopAlarm();
-            }
-        }
-        this.stopIntrusionAlarm();
-        this.restoreRolloPosition();
-        this.restoreLight();
+    get SonosGroup() {
+        return this.groups.get(group_type_1.GroupType.Speaker);
     }
-    static startAwayMode() {
-        sonos_service_1.SonosService.speakOnAll(res_1.Res.alarmArmed(), 40);
-        if (this._awayModeTimer) {
-            clearTimeout(this._awayModeTimer);
-        }
-        this._awayModeTimer = utils_1.Utils.guardedTimeout(() => {
-            this.awayModeActive = true;
-            this._awayModeTimer = undefined;
-            telegram_service_1.TelegramService.inform(`Alarm ist nun scharf. Gute Reise!`);
-        }, 60000, this);
+    get SmokeGroup() {
+        return this.groups.get(group_type_1.GroupType.Smoke);
     }
-    static startNightAlarmMode() {
-        sonos_service_1.SonosService.speakOnAll(res_1.Res.alarmNightModeArmed(), 30);
-        if (this._nightModeTimer) {
-            clearTimeout(this._nightModeTimer);
-        }
-        this._nightModeTimer = utils_1.Utils.guardedTimeout(() => {
-            this.nightAlarmActive = true;
-            this._nightModeTimer = undefined;
-            telegram_service_1.TelegramService.inform(`Alarm ist nun scharf. Süße Träume!`);
-        }, 60000, this);
+    get WaterGroup() {
+        return this.groups.get(group_type_1.GroupType.Water);
     }
-    static startIntrusionAlarm(room, device) {
-        const message = `!Potenzieller Eindringling! Bewegung in ${room.roomName} von ${device.info.fullName} festgestellt`;
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
-        if (!this.awayModeActive && !this.nightAlarmActive) {
-            this.stopIntrusionAlarm();
-            return;
-        }
-        utils_1.Utils.guardedNewThread(() => {
-            telegram_service_1.TelegramService.inform(message);
-        }, this);
-        if (this._intrusionAlarmActive) {
-            return;
-        }
-        this._intrusionAlarmActive = true;
-        this.performNextIntrusionLevel();
+    get HeatGroup() {
+        return this.groups.get(group_type_1.GroupType.Heating);
     }
-    static endAlarmModes() {
-        if (this.awayModeActive) {
-            telegram_service_1.TelegramService.sendMessage(telegram_service_1.TelegramService.subscribedIDs, `Alarmanalage entschärft`);
-            sonos_service_1.SonosService.speakOnAll(res_1.Res.welcomeHome(), 35);
-        }
-        if (this.nightAlarmActive) {
-            telegram_service_1.TelegramService.sendMessage(telegram_service_1.TelegramService.subscribedIDs, `Nachtmodus der Alarmanlage entschärft`);
-            sonos_service_1.SonosService.speakOnAll(res_1.Res.goodMorning(), 30);
-        }
-        if (this._nightModeTimer) {
-            clearTimeout(this._nightModeTimer);
-        }
-        if (this._awayModeTimer) {
-            clearTimeout(this._awayModeTimer);
-        }
-        this.awayModeActive = false;
-        this.nightAlarmActive = false;
-        this.stopIntrusionAlarm();
+    get roomName() {
+        return this.info.roomName;
     }
-    static getLastMovements() {
-        return this.movementHistory.readAmount(15).join('\n');
+    get etage() {
+        return this.info.etage;
     }
     initializeBase() {
+        var _a, _b, _c;
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `RoomBase Init für ${this.roomName}`);
         this.recalcTimeCallbacks();
-        this.PraesenzGroup.initCallbacks();
-        this.FensterGroup.initCallbacks();
-        this.TasterGroup.initCallbacks();
+        (_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.initCallbacks();
+        (_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.initCallbacks();
+        (_c = this.TasterGroup) === null || _c === void 0 ? void 0 : _c.initCallbacks();
     }
     persist() {
         persist_1.Persist.addRoom(this);
@@ -180,7 +81,11 @@ class RoomBase {
      * @param movementDependant Only turn light on if there was a movement in the same room
      */
     setLightTimeBased(movementDependant = false) {
-        if (movementDependant && !this.PraesenzGroup.anyPresent()) {
+        var _a, _b;
+        if (!this.LampenGroup) {
+            return;
+        }
+        if (movementDependant && this.PraesenzGroup && !((_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
             this.LampenGroup.switchAll(false);
             return;
         }
@@ -190,111 +95,30 @@ class RoomBase {
         }
         let timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.Einstellungen.lampOffset);
         if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
-            ((this.Einstellungen.lightIfNoWindows && this.FensterGroup.fenster.length === 0) ||
-                this.FensterGroup.fenster.some((f) => {
-                    var _a, _b;
-                    const rolloDown = ((_a = f.rollo) === null || _a === void 0 ? void 0 : _a.currentLevel) === 0;
-                    log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Rollo ${(_b = f.rollo) === null || _b === void 0 ? void 0 : _b.info.customName} for light in ${this.roomName} is ${rolloDown ? '' : 'not '}down`);
+            ((this.Einstellungen.lightIfNoWindows && (!this.FensterGroup || this.FensterGroup.fenster.length === 0)) ||
+                ((_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.fenster.some((f) => {
+                    const rolloDown = f.getShutter()[0].currentLevel === 0;
+                    log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Rollo ${f.getShutter()[0].info.customName} for light in ${this.roomName} is ${rolloDown ? '' : 'not '}down`);
                     return rolloDown;
-                }))) {
+                })))) {
             timeOfDay = time_callback_service_1.TimeOfDay.AfterSunset;
         }
         this.LampenGroup.switchTimeConditional(timeOfDay);
     }
     isNowLightTime() {
+        var _a;
         if (!this.Einstellungen.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);
         if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
-            this.FensterGroup.fenster.some((f) => {
-                var _a;
-                return ((_a = f.rollo) === null || _a === void 0 ? void 0 : _a.currentLevel) === 0;
-            })) {
+            ((_a = this.FensterGroup) === null || _a === void 0 ? void 0 : _a.fenster.some((f) => {
+                return f.getShutter()[0].currentLevel === 0;
+            }))) {
             timeOfDay = time_callback_service_1.TimeOfDay.AfterSunset;
         }
         return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
-    static stopIntrusionAlarm() {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Stoppe Intrusion Alarm`);
-        if (this._intrusionAlarmTimeout) {
-            clearTimeout(this._intrusionAlarmTimeout);
-        }
-        if (!this._intrusionAlarmActive) {
-            return;
-        }
-        this._intrusionAlarmActive = false;
-        this._intrusionAlarmLevel = 0;
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Alarm wurde beendet --> Fahre Rollos in Ausgangsposition.`);
-        this.restoreRolloPosition();
-        this.restoreLight();
-    }
-    static performNextIntrusionLevel() {
-        this._intrusionAlarmTimeout = undefined;
-        if (!this.awayModeActive && !this._intrusionAlarmActive) {
-            return;
-        }
-        this._intrusionAlarmLevel += 1;
-        let speakMessage;
-        let volume = 50;
-        let newTimeout = 20000;
-        const alarmAutomaticEnd = 15;
-        if (this._intrusionAlarmLevel === 1) {
-            speakMessage = res_1.Res.intruderGreeting();
-            volume = 40;
-        }
-        else if (this._intrusionAlarmLevel === 2) {
-            speakMessage = res_1.Res.intruderShutterUpPleaseLeave();
-            utils_1.Utils.guardedNewThread(() => {
-                this.setAllRolloOfFloor(-1, 100);
-                this.setAllLampsOfFloor(-1, true);
-            }, this);
-        }
-        else if (this._intrusionAlarmLevel === 3) {
-            volume = 70;
-            speakMessage = res_1.Res.intruderLeaveAndOwnerInformed();
-        }
-        else if (this._intrusionAlarmLevel <= 5) {
-            volume = 80;
-            speakMessage = res_1.Res.intruderAdditionalDefenseWarning();
-        }
-        else if (this._intrusionAlarmLevel >= alarmAutomaticEnd) {
-            this.stopIntrusionAlarm();
-            return;
-        }
-        else {
-            volume = 90;
-            speakMessage = res_1.Res.intruderAlarm();
-            newTimeout = 10000;
-        }
-        this._intrusionAlarmTimeout = utils_1.Utils.guardedTimeout(() => {
-            this.performNextIntrusionLevel();
-        }, newTimeout, this);
-        utils_1.Utils.guardedNewThread(() => {
-            sonos_service_1.SonosService.speakOnAll(speakMessage, volume);
-            telegram_service_1.TelegramService.inform(`Eindringling erhielt folgende Nachricht: "${speakMessage}"\nAlarmlevel ist ${this._intrusionAlarmLevel}\t Automatisches Ende bei ${alarmAutomaticEnd}`);
-        }, this);
-    }
-    static restoreRolloPosition() {
-        const rooms = this.allRooms;
-        for (const room of rooms) {
-            room.FensterGroup.restoreRolloPosition();
-        }
-    }
-    static restoreLight() {
-        const rooms = this.allRooms;
-        for (const room of rooms) {
-            room.setLightTimeBased(true);
-        }
-    }
 }
 exports.RoomBase = RoomBase;
-RoomBase.Rooms = {};
-RoomBase.allRooms = [];
-RoomBase.floors = {};
-RoomBase.awayModeActive = false;
-RoomBase.nightAlarmActive = false;
-RoomBase.movementHistory = new ringstorage_1.ringStorage(15);
-RoomBase._intrusionAlarmActive = false;
-RoomBase._intrusionAlarmLevel = 0;

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

@@ -2,3 +2,4 @@ export * from './iRoomBase';
 export * from './RoomBase';
 export * from './iRoomImportEnforcer';
 export * from './RoomSettings/index';
+export * from './roomInfo';

package/lib/models/rooms/index.js

@@ -14,3 +14,4 @@ __exportStar(require("./iRoomBase"), exports);
 __exportStar(require("./RoomBase"), exports);
 __exportStar(require("./iRoomImportEnforcer"), exports);
 __exportStar(require("./RoomSettings/index"), exports);
+__exportStar(require("./roomInfo"), exports);

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

@@ -0,0 +1,6 @@
+import { RoomSettings } from './RoomSettings/RoomSettings';
+export declare class RoomInfo {
+    roomName: string;
+    etage?: number;
+    constructor(roomName: string, settings: RoomSettings);
+}

package/lib/models/rooms/roomInfo.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoomInfo = void 0;
+class RoomInfo {
+    constructor(roomName, settings) {
+        this.roomName = roomName;
+        this.etage = settings.etage;
+    }
+}
+exports.RoomInfo = RoomInfo;

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

@@ -3,8 +3,11 @@ import { iRoomDefaultSettings } from '../../models/rooms/RoomSettings/iRoomDefau
 interface iSonosSettings {
     active: boolean;
 }
+export interface iRestSettings {
+    active: boolean;
+    port?: number;
+}
 export interface iConfig {
-    expressPort?: number;
     ioBrokerUrl: string;
     logSettings?: iLogSettings;
     translationSettings: iTranslationSettings;
@@ -12,6 +15,7 @@ export interface iConfig {
     muell?: iMuellSettings;
     persistence?: iPersistenceSettings;
     polly?: iPollySettings;
+    restServer?: iRestSettings;
     roomDefault: iRoomDefaultSettings;
     sonos?: iSonosSettings;
     telegram?: iTelegramSettings;

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

@@ -1,13 +1,9 @@
 import { HmIpGriff } from './hmIPDevices/hmIpGriff';
-import { RoomBase } from '../../models/rooms/RoomBase';
 import { ZigbeeAquaraVibra } from './zigbee/zigbeeAquaraVibra';
 import { FensterPosition } from './models/FensterPosition';
 import { iShutter } from './iShutter';
-export declare class Fenster {
-    room: RoomBase;
-    griffe: HmIpGriff[];
-    vibration: ZigbeeAquaraVibra[];
-    rollo: iShutter | undefined;
+import { BaseGroup } from './groups/base-group';
+export declare class Fenster extends BaseGroup {
     noRolloOnSunrise: boolean;
     desiredPosition: number;
     /**
@@ -15,7 +11,10 @@ export declare class Fenster {
      * @param {number} value
      */
     setDesiredPosition(value: number): void;
-    constructor(room: RoomBase, griffe: HmIpGriff[], vibration: ZigbeeAquaraVibra[], rollo?: iShutter | undefined, noRolloOnSunrise?: boolean);
+    constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], noRolloOnSunrise?: boolean);
+    getHandle(): HmIpGriff[];
+    getShutter(): iShutter[];
+    getVibration(): ZigbeeAquaraVibra[];
     griffeInPosition(pPosition: FensterPosition): number;
     rolloPositionChange(pValue: number): void;
     restoreDesiredPosition(): void;