hoffmation-base 0.1.33-9 → 0.1.34-3

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

@@ -12,10 +12,13 @@ import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
 import { BaseGroup } from '../../server/devices/groups/base-group';
 import { GroupType } from '../../server/devices/groups/group-type';
+import { DeviceCluster } from '../../server/devices/device-cluster';
 export declare class RoomBase implements iRoomBase {
     settings: RoomSettings;
     groups: Map<GroupType, BaseGroup>;
     info: RoomInfo;
+    protected _deviceCluster: DeviceCluster;
+    get deviceCluster(): DeviceCluster;
     get FensterGroup(): FensterGroup | undefined;
     get PraesenzGroup(): PraesenzGroup | undefined;
     get LampenGroup(): LampenGroup | undefined;
@@ -45,4 +48,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");
@@ -14,16 +14,21 @@ 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");
 const lodash_1 = __importDefault(require("lodash"));
+const device_cluster_1 = require("../../server/devices/device-cluster");
 class RoomBase {
     constructor(roomName, settings, groups) {
         this.settings = settings;
         this.groups = groups;
+        this._deviceCluster = new device_cluster_1.DeviceCluster();
         this.skipNextRolloUp = false;
         this.info = new roomInfo_1.RoomInfo(roomName, settings);
         settings.roomName = roomName;
         this.settings = settings;
         room_service_1.RoomService.addToRoomList(this);
     }
+    get deviceCluster() {
+        return this._deviceCluster;
+    }
     get FensterGroup() {
         return this.groups.get(group_type_1.GroupType.Window);
     }
@@ -56,7 +61,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 +94,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 +120,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());
@@ -127,7 +138,12 @@ class RoomBase {
     toJSON() {
         const result = utils_1.Utils.jsonFilter(this);
         result.groupDict = Object.fromEntries(this.groups);
-        return lodash_1.default.omit(result, 'groups');
+        return lodash_1.default.omit(result, ['groups', '_deviceCluster']);
+    }
+    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

@@ -1,16 +1,20 @@
 export declare enum DeviceClusterType {
-    Buttons = 0,
-    Heater = 1,
-    LED = 2,
-    Lamps = 3,
-    MotionDetection = 4,
-    Outlets = 5,
-    PresenceDetection = 6,
-    Speaker = 7,
-    SmokeDetector = 8,
-    WaterDetectors = 9,
-    Windows = 10,
-    Handle = 11,
-    Vibration = 12,
-    Shutter = 13
+    all = 0,
+    Buttons = 1,
+    Heater = 2,
+    LED = 3,
+    Lamps = 4,
+    MotionDetection = 5,
+    Outlets = 6,
+    PresenceDetection = 7,
+    Speaker = 8,
+    SmokeDetector = 9,
+    WaterDetectors = 10,
+    Windows = 11,
+    Handle = 12,
+    Vibration = 13,
+    Shutter = 14,
+    MagnetContact = 15,
+    TemperaturSensor = 16,
+    HumiditySensor = 17
 }

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

@@ -3,18 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceClusterType = void 0;
 var DeviceClusterType;
 (function (DeviceClusterType) {
-    DeviceClusterType[DeviceClusterType["Buttons"] = 0] = "Buttons";
-    DeviceClusterType[DeviceClusterType["Heater"] = 1] = "Heater";
-    DeviceClusterType[DeviceClusterType["LED"] = 2] = "LED";
-    DeviceClusterType[DeviceClusterType["Lamps"] = 3] = "Lamps";
-    DeviceClusterType[DeviceClusterType["MotionDetection"] = 4] = "MotionDetection";
-    DeviceClusterType[DeviceClusterType["Outlets"] = 5] = "Outlets";
-    DeviceClusterType[DeviceClusterType["PresenceDetection"] = 6] = "PresenceDetection";
-    DeviceClusterType[DeviceClusterType["Speaker"] = 7] = "Speaker";
-    DeviceClusterType[DeviceClusterType["SmokeDetector"] = 8] = "SmokeDetector";
-    DeviceClusterType[DeviceClusterType["WaterDetectors"] = 9] = "WaterDetectors";
-    DeviceClusterType[DeviceClusterType["Windows"] = 10] = "Windows";
-    DeviceClusterType[DeviceClusterType["Handle"] = 11] = "Handle";
-    DeviceClusterType[DeviceClusterType["Vibration"] = 12] = "Vibration";
-    DeviceClusterType[DeviceClusterType["Shutter"] = 13] = "Shutter";
+    DeviceClusterType[DeviceClusterType["all"] = 0] = "all";
+    DeviceClusterType[DeviceClusterType["Buttons"] = 1] = "Buttons";
+    DeviceClusterType[DeviceClusterType["Heater"] = 2] = "Heater";
+    DeviceClusterType[DeviceClusterType["LED"] = 3] = "LED";
+    DeviceClusterType[DeviceClusterType["Lamps"] = 4] = "Lamps";
+    DeviceClusterType[DeviceClusterType["MotionDetection"] = 5] = "MotionDetection";
+    DeviceClusterType[DeviceClusterType["Outlets"] = 6] = "Outlets";
+    DeviceClusterType[DeviceClusterType["PresenceDetection"] = 7] = "PresenceDetection";
+    DeviceClusterType[DeviceClusterType["Speaker"] = 8] = "Speaker";
+    DeviceClusterType[DeviceClusterType["SmokeDetector"] = 9] = "SmokeDetector";
+    DeviceClusterType[DeviceClusterType["WaterDetectors"] = 10] = "WaterDetectors";
+    DeviceClusterType[DeviceClusterType["Windows"] = 11] = "Windows";
+    DeviceClusterType[DeviceClusterType["Handle"] = 12] = "Handle";
+    DeviceClusterType[DeviceClusterType["Vibration"] = 13] = "Vibration";
+    DeviceClusterType[DeviceClusterType["Shutter"] = 14] = "Shutter";
+    DeviceClusterType[DeviceClusterType["MagnetContact"] = 15] = "MagnetContact";
+    DeviceClusterType[DeviceClusterType["TemperaturSensor"] = 16] = "TemperaturSensor";
+    DeviceClusterType[DeviceClusterType["HumiditySensor"] = 17] = "HumiditySensor";
 })(DeviceClusterType = exports.DeviceClusterType || (exports.DeviceClusterType = {}));

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

@@ -7,6 +7,8 @@ export declare class DeviceCluster {
     constructor(deviceMap?: Map<DeviceClusterType, DeviceList>);
     getIoBrokerDevicesByType(type: DeviceClusterType): IoBrokerBaseDevice[];
     getDevicesByType(type: DeviceClusterType): Array<IoBrokerBaseDevice | OwnSonosDevice>;
+    addByDeviceType(device: IoBrokerBaseDevice): void;
+    addToList(type: DeviceClusterType, device: IoBrokerBaseDevice): void;
     toJSON(): Partial<DeviceCluster & {
         deviceDict?: {
             [p: string]: DeviceList;

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

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceCluster = void 0;
 const device_cluster_type_1 = require("./device-cluster-type");
+const device_list_1 = require("./device-list");
 const utils_1 = require("../services/utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
+const deviceType_1 = require("./deviceType");
 class DeviceCluster {
     constructor(deviceMap = new Map()) {
         this.deviceMap = deviceMap;
@@ -21,6 +23,91 @@ class DeviceCluster {
         var _a, _b;
         return (_b = (_a = this.deviceMap.get(type)) === null || _a === void 0 ? void 0 : _a.getDevices()) !== null && _b !== void 0 ? _b : [];
     }
+    addByDeviceType(device) {
+        const type = device.deviceType;
+        const clusterTypes = [device_cluster_type_1.DeviceClusterType.all];
+        switch (type) {
+            case deviceType_1.DeviceType.HmIpLampe:
+            case deviceType_1.DeviceType.ZigbeeIlluDimmer:
+            case deviceType_1.DeviceType.ZigbeeIlluLampe:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Lamps);
+                break;
+            case deviceType_1.DeviceType.HmIpWippe:
+            case deviceType_1.DeviceType.HmIpTaster:
+            case deviceType_1.DeviceType.ZigbeeIkeaFernbedienung:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Buttons);
+                break;
+            case deviceType_1.DeviceType.HmIpRoll:
+            case deviceType_1.DeviceType.ZigbeeIlluShutter:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Shutter);
+                break;
+            case deviceType_1.DeviceType.ZigbeeSonoffTemp:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
+            case deviceType_1.DeviceType.HmIpPraezenz:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.PresenceDetection);
+                break;
+            case deviceType_1.DeviceType.HmIpGriff:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
+                break;
+            case deviceType_1.DeviceType.HmIpHeizgruppe:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Heater);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
+            case deviceType_1.DeviceType.HmIpTuer:
+            case deviceType_1.DeviceType.ZigbeeSMaBiTMagnetContact:
+            case deviceType_1.DeviceType.ZigbeeAqaraMagnetContact:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.MagnetContact);
+                break;
+            case deviceType_1.DeviceType.HmIpBewegung:
+            case deviceType_1.DeviceType.ZigbeeAquaraMotion:
+            case deviceType_1.DeviceType.ZigbeeSonoffMotion:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIkeaSteckdose:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIlluLedRGBCCT:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.LED);
+                break;
+            case deviceType_1.DeviceType.ZigbeeAquaraVibra:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Vibration);
+                break;
+            case deviceType_1.DeviceType.ZigbeeHeimanSmoke:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.SmokeDetector);
+                break;
+            case deviceType_1.DeviceType.ZigbeeAquaraWater:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.WaterDetectors);
+                break;
+            case deviceType_1.DeviceType.ZigbeeBlitzShp:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIlluActuator: // Dependent on use case
+            case deviceType_1.DeviceType.HmIpTherm: // Humidity and temperatur not yet implemented
+            case deviceType_1.DeviceType.HmIpHeizung: // Setting/Controlling via HM-Ip Heizgruppe
+            case deviceType_1.DeviceType.unknown:
+            case deviceType_1.DeviceType.Wled: // TODO: Implement
+            case deviceType_1.DeviceType.HmIpAccessPoint: // You can't really do stuff with it.
+                break;
+        }
+        for (const type of clusterTypes) {
+            this.addToList(type, device);
+        }
+    }
+    addToList(type, device) {
+        var _a;
+        const list = (_a = this.deviceMap.get(type)) === null || _a === void 0 ? void 0 : _a.ids;
+        if (list !== undefined) {
+            if (list.indexOf(device.id) < 0) {
+                list.push(device.id);
+            }
+        }
+        else {
+            this.deviceMap.set(type, new device_list_1.DeviceList([device.id]));
+        }
+    }
     toJSON() {
         const result = utils_1.Utils.jsonFilter(this);
         result.deviceDict = Object.fromEntries(this.deviceMap);

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;