hoffmation-base 0.1.33-8 → 0.1.34-2

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

@@ -45,4 +45,5 @@ export declare class RoomBase implements iRoomBase {
             [p: string]: BaseGroup;
         };
     }>;
+    private log;
 }

package/lib/models/rooms/RoomBase.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomBase = void 0;
 const logLevel_1 = require("../logLevel");
-const log_service_1 = require("../../server/services/log-service");
+const log_service_1 = require("../../server/services/log-service/log-service");
 const persist_1 = require("../../server/services/dbo/persist");
 const time_callback_service_1 = require("../../server/services/time-callback-service");
 const room_service_1 = require("../../server/services/room-service/room-service");
@@ -56,7 +56,7 @@ class RoomBase {
     }
     initializeBase() {
         var _a, _b, _c;
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `RoomBase Init für ${this.roomName}`);
+        this.log(logLevel_1.LogLevel.Debug, `RoomBase Init für ${this.roomName}`);
         this.recalcTimeCallbacks();
         (_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.initCallbacks();
         (_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.initialize();
@@ -89,17 +89,21 @@ class RoomBase {
     setLightTimeBased(movementDependant = false) {
         var _a, _b;
         if (!this.LampenGroup) {
+            this.log(logLevel_1.LogLevel.Trace, 'Ignore "setLightTimeBased" as we have no lamps');
             return;
         }
         if (movementDependant && this.PraesenzGroup && !((_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
+            this.log(logLevel_1.LogLevel.Trace, 'Turn off lights as noone is present.');
             this.LampenGroup.switchAll(false);
             return;
         }
-        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`);
+        if (!this.settings.lampOffset && !this.settings.roomIsAlwaysDark) {
+            this.log(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.settings.lampOffset);
+        let timeOfDay = this.settings.roomIsAlwaysDark
+            ? time_callback_service_1.TimeOfDay.Night
+            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
         if (timeOfDay === time_callback_service_1.TimeOfDay.Daylight &&
             ((this.settings.lightIfNoWindows && (!this.FensterGroup || this.FensterGroup.fenster.length === 0)) ||
                 ((_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.fenster.some((f) => {
@@ -111,11 +115,13 @@ class RoomBase {
     }
     isNowLightTime() {
         var _a;
-        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`);
+        if (!this.settings.lampOffset && !this.settings.roomIsAlwaysDark) {
+            this.log(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.settings.lampOffset);
+        let timeOfDay = this.settings.roomIsAlwaysDark
+            ? time_callback_service_1.TimeOfDay.Night
+            : 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());
@@ -129,5 +135,10 @@ class RoomBase {
         result.groupDict = Object.fromEntries(this.groups);
         return lodash_1.default.omit(result, 'groups');
     }
+    log(level, message) {
+        log_service_1.ServerLogService.writeLog(level, message, {
+            room: this.roomName,
+        });
+    }
 }
 exports.RoomBase = RoomBase;

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

@@ -26,9 +26,12 @@ export declare class RoomSettings implements iRoomDefaultSettings, iRoomInitiali
     private _sonnenAufgangRolloMinTime;
     private _sonnenAufgangLampenDelay;
     private _lightIfNoWindows;
+    private _roomIsAlwaysDark;
     constructor(initSettings: iRoomInitializationSettings);
     private recalcRolloOffset;
     private recalcLampOffset;
+    get roomIsAlwaysDark(): boolean;
+    set roomIsAlwaysDark(value: boolean);
     get sonnenAufgangLampenDelay(): number;
     set sonnenAufgangLampenDelay(value: number);
     get sonnenAufgangRolloDelay(): number;

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

@@ -27,6 +27,7 @@ class RoomSettings {
         this._sonnenAufgangRolloMinTime = this.defaultSettings.sonnenAufgangRolloMinTime;
         this._sonnenAufgangLampenDelay = this.defaultSettings.sonnenAufgangLampenDelay;
         this._lightIfNoWindows = this.defaultSettings.lightIfNoWindows;
+        this._roomIsAlwaysDark = this.defaultSettings.roomIsAlwaysDark;
         this.shortName = initSettings.shortName;
         this.etage = initSettings.etage;
         this.deviceAddidngSettings = initSettings.deviceAddidngSettings;
@@ -43,6 +44,12 @@ class RoomSettings {
         this.lampOffset = new time_callback_service_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenAufgangRolloDelay);
         (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
     }
+    get roomIsAlwaysDark() {
+        return this._roomIsAlwaysDark;
+    }
+    set roomIsAlwaysDark(value) {
+        this._roomIsAlwaysDark = value;
+    }
     get sonnenAufgangLampenDelay() {
         return this._sonnenAufgangLampenDelay;
     }

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

@@ -1,6 +1,11 @@
 import { iTimePair } from '../../../server/config/iConfig';
 export interface iRoomDefaultSettings {
     rolloHeatReduction: boolean;
+    /**
+     * Indicates rooms, which are time independent always dark (like basement).
+     * This results in lamps beeing turned on on motion regardless of windows and time.
+     */
+    roomIsAlwaysDark: boolean;
     lampenBeiBewegung: boolean;
     lichtSonnenAufgangAus: boolean;
     sonnenUntergangRollos: boolean;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomAddDeviceItem = void 0;
-const log_service_1 = require("../../../server/services/log-service");
+const log_service_1 = require("../../../server/services/log-service/log-service");
 const logLevel_1 = require("../../logLevel");
 class RoomAddDeviceItem {
     constructor(setID, index, customName) {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomDeviceAddingSettings = void 0;
-const log_service_1 = require("../../../server/services/log-service");
+const log_service_1 = require("../../../server/services/log-service/log-service");
 const roomAddDeviceItem_1 = require("./roomAddDeviceItem");
 const logLevel_1 = require("../../logLevel");
 const deviceType_1 = require("../../../server/devices/deviceType");

package/lib/models/timeCallback.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeCallback = exports.TimeCallbackType = void 0;
-const log_service_1 = require("../server/services/log-service");
+const log_service_1 = require("../server/services/log-service/log-service");
 const time_callback_service_1 = require("../server/services/time-callback-service");
 const logLevel_1 = require("./logLevel");
 var TimeCallbackType;

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

@@ -2,6 +2,7 @@
 import { DeviceInfo } from './DeviceInfo';
 import { RoomDeviceAddingSettings } from '../../models/rooms/RoomSettings/roomDeviceAddingSettings';
 import { IOBrokerConnection } from '../ioBroker/connection';
+import { LogLevel } from '../../models/logLevel';
 import { DeviceType } from './deviceType';
 import { RoomBase } from '../../models/rooms/RoomBase';
 export declare abstract class IoBrokerBaseDevice {
@@ -38,6 +39,7 @@ export declare abstract class IoBrokerBaseDevice {
     checkIoConnection(showError?: boolean): boolean;
     abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
     protected addToCorrectRoom(): void;
+    protected log(level: LogLevel, message: string): void;
     /**
      * Sets the state of a given data point and returns true if that was successful.
      * @param pointId Data point to write to

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IoBrokerBaseDevice = void 0;
-const log_service_1 = require("../services/log-service");
+const log_service_1 = require("../services/log-service/log-service");
 const logLevel_1 = require("../../models/logLevel");
 const ioBroker_main_1 = require("../ioBroker/ioBroker.main");
 const utils_1 = require("../services/utils/utils");
@@ -88,6 +88,13 @@ class IoBrokerBaseDevice {
         }
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `${this.info.room} is noch kein bekannter Raum`);
     }
+    log(level, message) {
+        log_service_1.ServerLogService.writeLog(level, message, {
+            room: this.info.room,
+            deviceId: this.id,
+            deviceName: this.info.customName,
+        });
+    }
     /**
      * Sets the state of a given data point and returns true if that was successful.
      * @param pointId Data point to write to

package/lib/server/devices/device-cluster-type.d.ts

@@ -12,5 +12,8 @@ export declare enum DeviceClusterType {
     Windows = 10,
     Handle = 11,
     Vibration = 12,
-    Shutter = 13
+    Shutter = 13,
+    MagnetContact = 14,
+    TemperaturSensor = 15,
+    HumiditySensor = 16
 }

package/lib/server/devices/device-cluster-type.js

@@ -17,4 +17,7 @@ var DeviceClusterType;
     DeviceClusterType[DeviceClusterType["Handle"] = 11] = "Handle";
     DeviceClusterType[DeviceClusterType["Vibration"] = 12] = "Vibration";
     DeviceClusterType[DeviceClusterType["Shutter"] = 13] = "Shutter";
+    DeviceClusterType[DeviceClusterType["MagnetContact"] = 14] = "MagnetContact";
+    DeviceClusterType[DeviceClusterType["TemperaturSensor"] = 15] = "TemperaturSensor";
+    DeviceClusterType[DeviceClusterType["HumiditySensor"] = 16] = "HumiditySensor";
 })(DeviceClusterType = exports.DeviceClusterType || (exports.DeviceClusterType = {}));

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

@@ -11,6 +11,7 @@ export declare enum DeviceType {
     HmIpTuer = 109,
     HmIpHeizgruppe = 110,
     HmIpBewegung = 111,
+    HmIpAccessPoint = 112,
     ZigbeeIkeaFernbedienung = 201,
     ZigbeeIkeaSteckdose = 202,
     ZigbeeIlluLedRGBCCT = 203,
@@ -25,5 +26,7 @@ export declare enum DeviceType {
     ZigbeeIlluShutter = 212,
     ZigbeeSMaBiTMagnetContact = 213,
     ZigbeeSonoffMotion = 214,
+    ZigbeeAqaraMagnetContact = 215,
+    ZigbeeSonoffTemp = 216,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -15,6 +15,7 @@ var DeviceType;
     DeviceType[DeviceType["HmIpTuer"] = 109] = "HmIpTuer";
     DeviceType[DeviceType["HmIpHeizgruppe"] = 110] = "HmIpHeizgruppe";
     DeviceType[DeviceType["HmIpBewegung"] = 111] = "HmIpBewegung";
+    DeviceType[DeviceType["HmIpAccessPoint"] = 112] = "HmIpAccessPoint";
     DeviceType[DeviceType["ZigbeeIkeaFernbedienung"] = 201] = "ZigbeeIkeaFernbedienung";
     DeviceType[DeviceType["ZigbeeIkeaSteckdose"] = 202] = "ZigbeeIkeaSteckdose";
     DeviceType[DeviceType["ZigbeeIlluLedRGBCCT"] = 203] = "ZigbeeIlluLedRGBCCT";
@@ -29,5 +30,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeIlluShutter"] = 212] = "ZigbeeIlluShutter";
     DeviceType[DeviceType["ZigbeeSMaBiTMagnetContact"] = 213] = "ZigbeeSMaBiTMagnetContact";
     DeviceType[DeviceType["ZigbeeSonoffMotion"] = 214] = "ZigbeeSonoffMotion";
+    DeviceType[DeviceType["ZigbeeAqaraMagnetContact"] = 215] = "ZigbeeAqaraMagnetContact";
+    DeviceType[DeviceType["ZigbeeSonoffTemp"] = 216] = "ZigbeeSonoffTemp";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

package/lib/server/devices/deviceUpdater.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceUpdater = void 0;
-const log_service_1 = require("../services/log-service");
+const log_service_1 = require("../services/log-service/log-service");
 const logLevel_1 = require("../../models/logLevel");
 const devices_1 = require("./devices");
 class DeviceUpdater {

package/lib/server/devices/devices.js

@@ -5,7 +5,7 @@ const hmIpDevice_1 = require("./hmIPDevices/hmIpDevice");
 const zigbeeDevice_1 = require("./zigbee/zigbeeDevice");
 const deviceType_1 = require("./deviceType");
 const hmIpPraezenz_1 = require("./hmIPDevices/hmIpPraezenz");
-const log_service_1 = require("../services/log-service");
+const log_service_1 = require("../services/log-service/log-service");
 const DeviceInfo_1 = require("./DeviceInfo");
 const logLevel_1 = require("../../models/logLevel");
 const hmIpBewegung_1 = require("./hmIPDevices/hmIpBewegung");
@@ -31,6 +31,9 @@ const hmIpHeizgruppe_1 = require("./hmIPDevices/hmIpHeizgruppe");
 const zigbeeIlluShutter_1 = require("./zigbee/zigbeeIlluShutter");
 const zigbeeSMaBiTMagnetContact_1 = require("./zigbee/zigbeeSMaBiTMagnetContact");
 const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
+const hmIpAccessPoint_1 = require("./hmIPDevices/hmIpAccessPoint");
+const zigbeeAqaraMagnetContact_1 = require("./zigbee/zigbeeAqaraMagnetContact");
+const zigbeeSonoffTemp_1 = require("./zigbee/zigbeeSonoffTemp");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -71,6 +74,10 @@ class Devices {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
                 d.detectionsToday = 0;
             }
+            else if (d.deviceType === deviceType_1.DeviceType.ZigbeeSonoffMotion || d.deviceType === deviceType_1.DeviceType.ZigbeeAquaraMotion) {
+                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
+                d.detectionsToday = 0;
+            }
         }
     }
     processZigbeeDevice(cDevConf) {
@@ -83,23 +90,14 @@ class Devices {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `${zigbeeInfo.devID} with Type "${zigbeeInfo.deviceType}" doesn't exists --> create it`);
         let d;
         switch (zigbeeInfo.deviceType) {
-            case 'AquaraVibra':
-                d = new zigbeeAquaraVibra_1.ZigbeeAquaraVibra(zigbeeInfo);
+            case 'AqaraMagnetContact':
+                d = new zigbeeAqaraMagnetContact_1.ZigbeeAqaraMagnetContact(zigbeeInfo);
                 break;
             case 'AquaraMotion':
                 d = new zigbeeAquaraMotion_1.ZigbeeAquaraMotion(zigbeeInfo);
                 break;
-            case 'IkeaStecker':
-                d = new zigbeeIkeaSteckdose_1.ZigbeeIkeaSteckdose(zigbeeInfo);
-                break;
-            case 'LedRGBCCT':
-                d = new zigbeeIlluLedRGBCCT_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
-                break;
-            case 'IlluDimmer':
-                d = new zigbeeIlluDimmer_1.ZigbeeIlluDimmer(zigbeeInfo);
-                break;
-            case 'HeimanSmoke':
-                d = new zigbeeHeimanSmoke_1.ZigbeeHeimanSmoke(zigbeeInfo);
+            case 'AquaraVibra':
+                d = new zigbeeAquaraVibra_1.ZigbeeAquaraVibra(zigbeeInfo);
                 break;
             case 'AquaraWater':
                 d = new zigbeeAquaraWater_1.ZigbeeAquaraWater(zigbeeInfo);
@@ -107,21 +105,36 @@ class Devices {
             case 'BlitzShp':
                 d = new zigbeeBlitzShp_1.ZigbeeBlitzShp(zigbeeInfo);
                 break;
-            case 'IlluLampe':
-                d = new zigbeeIlluLampe_1.ZigbeeIlluLampe(zigbeeInfo);
+            case 'HeimanSmoke':
+                d = new zigbeeHeimanSmoke_1.ZigbeeHeimanSmoke(zigbeeInfo);
+                break;
+            case 'IkeaStecker':
+                d = new zigbeeIkeaSteckdose_1.ZigbeeIkeaSteckdose(zigbeeInfo);
                 break;
             case 'IlluActuator':
                 d = new zigbeeIlluActuator_1.ZigbeeIlluActuator(zigbeeInfo);
                 break;
+            case 'IlluDimmer':
+                d = new zigbeeIlluDimmer_1.ZigbeeIlluDimmer(zigbeeInfo);
+                break;
+            case 'IlluLampe':
+                d = new zigbeeIlluLampe_1.ZigbeeIlluLampe(zigbeeInfo);
+                break;
             case 'IlluShutter':
                 d = new zigbeeIlluShutter_1.ZigbeeIlluShutter(zigbeeInfo);
                 break;
+            case 'LedRGBCCT':
+                d = new zigbeeIlluLedRGBCCT_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
+                break;
             case 'SMaBiTMagnet':
                 d = new zigbeeSMaBiTMagnetContact_1.ZigbeeSMaBiTMagnetContact(zigbeeInfo);
                 break;
             case 'SonoffMotion':
                 d = new zigbeeSonoffMotion_1.ZigbeeSonoffMotion(zigbeeInfo);
                 break;
+            case 'SonoffTemp':
+                d = new zigbeeSonoffTemp_1.ZigbeeSonoffTemp(zigbeeInfo);
+                break;
             default:
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
                 d = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);
@@ -172,6 +185,9 @@ class Devices {
             case 'HeizGr':
                 d = new hmIpHeizgruppe_1.HmIpHeizgruppe(hmIPInfo);
                 break;
+            case 'AccessPoint':
+                d = new hmIpAccessPoint_1.HmIpAccessPoint(hmIPInfo);
+                break;
             default:
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No HmIP Device Type for ${hmIPInfo.deviceType} defined`);
                 d = new hmIpDevice_1.HmIPDevice(hmIPInfo, deviceType_1.DeviceType.unknown);

package/lib/server/devices/{Fenster.d.ts → groups/Fenster.d.ts}

@@ -1,8 +1,9 @@
-import { HmIpGriff } from './hmIPDevices/hmIpGriff';
-import { ZigbeeAquaraVibra } from './zigbee/zigbeeAquaraVibra';
-import { FensterPosition } from './models/FensterPosition';
-import { iShutter } from './iShutter';
-import { BaseGroup } from './groups/base-group';
+import { HmIpGriff } from '../hmIPDevices/hmIpGriff';
+import { ZigbeeAquaraVibra } from '../zigbee/zigbeeAquaraVibra';
+import { FensterPosition } from '../models/FensterPosition';
+import { iShutter } from '../iShutter';
+import { BaseGroup } from './base-group';
+import { ZigbeeMagnetContact } from '../zigbee/zigbeeMagnetContact';
 export declare class Fenster extends BaseGroup {
     noRolloOnSunrise: boolean;
     desiredPosition: number;
@@ -11,8 +12,9 @@ export declare class Fenster extends BaseGroup {
      * @param {number} value
      */
     setDesiredPosition(value: number): void;
-    constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], noRolloOnSunrise?: boolean);
+    constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[], noRolloOnSunrise?: boolean);
     getHandle(): HmIpGriff[];
+    getMagnetContact(): ZigbeeMagnetContact[];
     getShutter(): iShutter[];
     getVibration(): ZigbeeAquaraVibra[];
     griffeInPosition(pPosition: FensterPosition): number;

package/lib/server/devices/{Fenster.js → groups/Fenster.js}

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fenster = void 0;
-const log_service_1 = require("../services/log-service");
-const utils_1 = require("../services/utils/utils");
-const FensterPosition_1 = require("./models/FensterPosition");
-const time_callback_service_1 = require("../services/time-callback-service");
-const logLevel_1 = require("../../models/logLevel");
-const ShutterService_1 = require("../services/ShutterService");
-const base_group_1 = require("./groups/base-group");
-const group_type_1 = require("./groups/group-type");
-const device_cluster_type_1 = require("./device-cluster-type");
-const device_list_1 = require("./device-list");
+const utils_1 = require("../../services/utils/utils");
+const FensterPosition_1 = require("../models/FensterPosition");
+const time_callback_service_1 = require("../../services/time-callback-service");
+const logLevel_1 = require("../../../models/logLevel");
+const ShutterService_1 = require("../../services/ShutterService");
+const base_group_1 = require("./base-group");
+const group_type_1 = require("./group-type");
+const device_cluster_type_1 = require("../device-cluster-type");
+const device_list_1 = require("../device-list");
 class Fenster extends base_group_1.BaseGroup {
-    constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], noRolloOnSunrise = false) {
+    constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = [], noRolloOnSunrise = false) {
         super(roomName, group_type_1.GroupType.Window);
         this.noRolloOnSunrise = noRolloOnSunrise;
         this.desiredPosition = 0;
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Handle, new device_list_1.DeviceList(handleIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Vibration, new device_list_1.DeviceList(vibrationIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Shutter, new device_list_1.DeviceList(shutterIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MagnetContact, new device_list_1.DeviceList(magnetIds));
     }
     /**
      * sets the desired Pos and moves rollo to this level
@@ -31,6 +31,9 @@ class Fenster extends base_group_1.BaseGroup {
     getHandle() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Handle);
     }
+    getMagnetContact() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.MagnetContact);
+    }
     getShutter() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Shutter);
     }
@@ -78,7 +81,7 @@ class Fenster extends base_group_1.BaseGroup {
                     this.griffeInPosition(FensterPosition_1.FensterPosition.kipp) === 0) {
                     const now = new Date().getTime();
                     this.getVibration().forEach((element) => {
-                        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Starte Timeout für Vibrationsdeaktivierung für ${element.info.customName}`);
+                        this.log(logLevel_1.LogLevel.Debug, `Starte Timeout für Vibrationsdeaktivierung für ${element.info.customName}`);
                         utils_1.Utils.guardedTimeout(() => {
                             if (element.vibrationBlockedTimeStamp < now) {
                                 element.vibrationBlocked = false;
@@ -99,7 +102,7 @@ class Fenster extends base_group_1.BaseGroup {
         }, 5, this);
     }
     rolloPositionChange(pValue) {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`);
+        this.log(logLevel_1.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`);
         if (pValue === 0 || pValue === 100) {
             this.getRoom().setLightTimeBased(true);
         }

package/lib/server/devices/groups/base-group.d.ts

@@ -1,6 +1,7 @@
 import { GroupType } from './group-type';
 import { DeviceCluster } from '../device-cluster';
 import { RoomBase } from '../../../models/rooms/RoomBase';
+import { LogLevel } from '../../../models/logLevel';
 export declare class BaseGroup {
     roomName: string;
     type: GroupType;
@@ -8,4 +9,5 @@ export declare class BaseGroup {
     get deviceCluster(): DeviceCluster;
     constructor(roomName: string, type: GroupType);
     getRoom(): RoomBase;
+    protected log(level: LogLevel, message: string): void;
 }

package/lib/server/devices/groups/base-group.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGroup = void 0;
+const group_type_1 = require("./group-type");
 const device_cluster_1 = require("../device-cluster");
 const api_service_1 = require("../../services/api/api-service");
 const utils_1 = require("../../services/utils/utils");
+const log_service_1 = require("../../services/log-service/log-service");
 class BaseGroup {
     constructor(roomName, type) {
         this.roomName = roomName;
@@ -16,5 +18,11 @@ class BaseGroup {
     getRoom() {
         return utils_1.Utils.guard(api_service_1.API.getRoom(this.roomName));
     }
+    log(level, message) {
+        log_service_1.ServerLogService.writeLog(level, message, {
+            room: this.roomName,
+            groupType: group_type_1.GroupType[this.type],
+        });
+    }
 }
 exports.BaseGroup = BaseGroup;

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

@@ -1,4 +1,4 @@
-import { Fenster } from '../Fenster';
+import { Fenster } from './Fenster';
 import { BaseGroup } from './base-group';
 export declare class FensterGroup extends BaseGroup {
     fenster: Fenster[];

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FensterGroup = void 0;
 const timeCallback_1 = require("../../../models/timeCallback");
-const log_service_1 = require("../../services/log-service");
 const utils_1 = require("../../services/utils/utils");
 const weather_service_1 = require("../../services/weather/weather-service");
 const FensterPosition_1 = require("../models/FensterPosition");
@@ -42,7 +41,7 @@ class FensterGroup extends base_group_1.BaseGroup {
     initialize() {
         const room = this.getRoom();
         if (room.settings.sonnenAufgangRollos && room.settings.rolloOffset) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Sonnenaufgang TimeCallback für ${this.roomName} hinzufügen`);
+            this.log(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) {
                     room.skipNextRolloUp = false;
@@ -113,7 +112,7 @@ class FensterGroup extends base_group_1.BaseGroup {
             if (f.noRolloOnSunrise || f.getShutter().length === 0) {
                 return;
             }
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Fahre das Rollo zum Sonnenaufgang ${initial ? '(ggf. nachträglich)' : ''} hoch`);
+            this.log(logLevel_1.LogLevel.Debug, `Fahre das Rollo zum Sonnenaufgang ${initial ? '(ggf. nachträglich)' : ''} hoch`);
             f.setDesiredPosition(100);
         });
     }

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

@@ -1,8 +1,12 @@
 import { HmIpHeizgruppe } from '../hmIPDevices/hmIpHeizgruppe';
 import { BaseGroup } from './base-group';
+import { iTemperaturSensor } from '../iTemperaturSensor';
+import { iHumiditySensor } from '../iHumiditySensor';
 export declare class HeatGroup extends BaseGroup {
     get currentTemp(): number;
     get desiredTemp(): number;
     getHeater(): HmIpHeizgruppe[];
-    constructor(roomName: string, heaterIds: string[]);
+    getTempSensors(): iTemperaturSensor[];
+    getHumiditySensors(): iHumiditySensor[];
+    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[]);
 }

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

@@ -11,10 +11,11 @@ class HeatGroup extends base_group_1.BaseGroup {
             return -99;
         }
         let value = 0;
-        for (const h of this.getHeater()) {
+        const sensors = this.getTempSensors();
+        for (const h of sensors) {
             value += h.iTemperatur;
         }
-        return Math.round((value / this.getHeater().length) * 10) / 10;
+        return Math.round((value / sensors.length) * 10) / 10;
     }
     get desiredTemp() {
         if (this.getHeater().length === 0) {
@@ -29,9 +30,17 @@ class HeatGroup extends base_group_1.BaseGroup {
     getHeater() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
-    constructor(roomName, heaterIds) {
+    getTempSensors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+    }
+    getHumiditySensors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+    }
+    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
         super(roomName, group_type_1.GroupType.Heating);
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
     }
 }
 exports.HeatGroup = HeatGroup;

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

@@ -1,4 +1,5 @@
 export * from './base-group';
+export * from './Fenster';
 export * from './fensterGroup';
 export * from './group-type';
 export * from './heatGroup';

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

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base-group"), exports);
+__exportStar(require("./Fenster"), exports);
 __exportStar(require("./fensterGroup"), exports);
 __exportStar(require("./group-type"), exports);
 __exportStar(require("./heatGroup"), exports);

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

@@ -6,6 +6,7 @@ const base_group_1 = require("./base-group");
 const group_type_1 = require("./group-type");
 const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
+const logLevel_1 = require("../../../models/logLevel");
 class LampenGroup extends base_group_1.BaseGroup {
     constructor(roomName, lampenIds = [], steckerIds = [], ledIds = []) {
         super(roomName, group_type_1.GroupType.Light);
@@ -53,14 +54,17 @@ class LampenGroup extends base_group_1.BaseGroup {
         let resultLampen = false;
         let resultSteckdosen = false;
         if (this.getLED().length > 0) {
+            this.log(logLevel_1.LogLevel.Trace, `Set LEDs time based for time "${time_callback_service_1.TimeOfDay[time]}"`);
             this.getLED().forEach((s) => {
                 s.setTimeBased(time);
             });
         }
         else if (this.getStecker().length > 0) {
+            this.log(logLevel_1.LogLevel.Trace, `Set outlets time based for time "${time_callback_service_1.TimeOfDay[time]}"`);
             resultSteckdosen = darkOutside;
         }
         else {
+            this.log(logLevel_1.LogLevel.Trace, `Set Lamps time based for time "${time_callback_service_1.TimeOfDay[time]}"`);
             resultLampen = darkOutside;
         }
         this.setAllLampen(resultLampen, time);