hoffmation-base 3.0.0-alpha.6 → 3.0.0-alpha.60

package/lib/server/devices/deviceUpdater.js

@@ -7,9 +7,6 @@ const devices_1 = require("./devices");
 const mqtt_1 = require("./mqtt");
 const IoBrokerDeviceInfo_1 = require("./IoBrokerDeviceInfo");
 class DeviceUpdater {
-    constructor(pDevices) {
-        this.devices = pDevices;
-    }
     updateObject(pId, pObj) {
         const idSplit = IoBrokerDeviceInfo_1.IoBrokerDeviceInfo.idSplitter(pId);
         if (idSplit.length < 2)
@@ -40,7 +37,7 @@ class DeviceUpdater {
             classifier = devices_1.Devices.IDENTIFIER_ZIGBEE;
             devId = idSplit[2].substring(2);
         }
-        const device = devices_1.Devices.alLDevices[`${classifier}-${devId}`];
+        const device = services_1.API.getDevice(`${classifier}-${devId}`, false);
         if (typeof device === 'undefined' || device.update === undefined) {
             return;
         }

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

@@ -3,18 +3,54 @@ import { iBaseDevice, iEnergyManager, iTemperatureSensor } from './baseDeviceInt
 import { Dachs } from './dachs';
 import { iConfig } from '../config';
 export declare class Devices {
-    static IDENTIFIER_HOMEMATIC: string;
-    static IDENTIFIER_JS: string;
-    static IDENTIFIER_Shelly: string;
-    static IDENTIFIER_TUYA: string;
-    static IDENTIFIER_ZIGBEE: string;
-    static IDENTIFIER_ZIGBEE2MQTT: string;
-    static IDENTIFIER_WLED: string;
+    /**
+     * A constant for the identifier of HM-IP Adapter devices
+     */
+    static readonly IDENTIFIER_HOMEMATIC: string;
+    /**
+     * A constant for the identifier of JavaScript Adapter devices
+     */
+    static readonly IDENTIFIER_JS: string;
+    /**
+     * A constant for the identifier of Shelly Adapter devices
+     */
+    static readonly IDENTIFIER_Shelly: string;
+    /**
+     * A constant for the identifier of Tuya Adapter devices
+     */
+    static readonly IDENTIFIER_TUYA: string;
+    /**
+     * A constant for the identifier of Zigbee Adapter devices
+     */
+    static readonly IDENTIFIER_ZIGBEE: string;
+    /**
+     * A constant for the identifier of Zigbee2Mqtt Adapter devices
+     */
+    static readonly IDENTIFIER_ZIGBEE2MQTT: string;
+    /**
+     * A constant for the identifier of WLED Adapter devices
+     */
+    static readonly IDENTIFIER_WLED: string;
+    /**
+     * A Map containing all devices
+     */
     static alLDevices: {
         [id: string]: iBaseDevice;
     };
+    /**
+     * A reference to globally active energy manager
+     * @default undefined (no Energy-Manager)
+     */
     static energymanager?: iEnergyManager;
+    /**
+     * A reference to the Dachs device
+     * @default undefined (no Dachs CHP)
+     */
     static dachs?: Dachs;
+    /**
+     * A reference to the temperature sensor measuring the warm water temperature
+     * @default undefined (no warm water temperature sensor)
+     */
     static temperatureWarmWater?: iTemperatureSensor;
     constructor(pDeviceData: {
         [id: string]: deviceConfig;

package/lib/server/devices/devices.js

@@ -12,12 +12,13 @@ const wledDevice_1 = require("./wledDevice");
 const DeviceCapability_1 = require("./DeviceCapability");
 const shelly_1 = require("./shelly");
 const tuya_1 = require("./tuya");
+const shellyActuator_1 = require("./shelly/shellyActuator");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer, config) {
         var _a;
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
         pRoomImportEnforcer === null || pRoomImportEnforcer === void 0 ? void 0 : pRoomImportEnforcer.addRoomConstructor();
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Constructing devices now`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Constructing devices now');
         for (const cID in pDeviceData) {
             const cDevConf = pDeviceData[cID];
             if (!cDevConf.common ||
@@ -46,7 +47,7 @@ class Devices {
             else if (cName.indexOf('00-EnergyManager') === 0 &&
                 cDevConf.type !== 'folder' &&
                 !((_a = config === null || config === void 0 ? void 0 : config.energyManager) === null || _a === void 0 ? void 0 : _a.disableJsEnergyManager)) {
-                services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Found Energy-Manager in Device json.`);
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Found Energy-Manager in Device json.');
                 Devices.createEnergyManager(cDevConf);
             }
         }
@@ -59,20 +60,20 @@ class Devices {
         // Nothing yet
     }
     static resetDetectionsToday() {
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `3 o'clock reset of motion sensors`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, "3 o'clock reset of motion sensors");
         for (const dID in Devices.alLDevices) {
             const d = Devices.alLDevices[dID];
             if (d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.motionSensor)) {
-                d.log(models_1.LogLevel.Debug, `3 o'clock reset of detections`);
+                d.log(models_1.LogLevel.Debug, "3 o'clock reset of detections");
                 d.detectionsToday = 0;
             }
         }
     }
     static getBatteryInfo() {
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Getting Battery Info`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Getting Battery Info');
         let data = [];
         const result = [
-            `These are the battery values for each device. Device dependandt some are in volts, some in %`,
+            'These are the battery values for each device. Device dependandt some are in volts, some in %',
         ];
         for (const key in this.alLDevices) {
             const d = this.alLDevices[key];
@@ -104,6 +105,9 @@ class Devices {
             case 'Trv':
                 d = new shelly_1.ShellyTrv(shellyInfo);
                 break;
+            case 'Actuator':
+                d = new shellyActuator_1.ShellyActuator(shellyInfo);
+                break;
             default:
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `No shelly Device Type for ${shellyInfo.deviceType} defined`);
                 d = new shelly_1.ShellyDevice(shellyInfo, deviceType_1.DeviceType.unknown);
@@ -296,14 +300,50 @@ class Devices {
     }
 }
 exports.Devices = Devices;
+/**
+ * A constant for the identifier of HM-IP Adapter devices
+ */
 Devices.IDENTIFIER_HOMEMATIC = 'hm-rpc';
+/**
+ * A constant for the identifier of JavaScript Adapter devices
+ */
 Devices.IDENTIFIER_JS = 'javascript';
+/**
+ * A constant for the identifier of Shelly Adapter devices
+ */
 Devices.IDENTIFIER_Shelly = 'shelly';
+/**
+ * A constant for the identifier of Tuya Adapter devices
+ */
 Devices.IDENTIFIER_TUYA = 'tuya';
+/**
+ * A constant for the identifier of Zigbee Adapter devices
+ */
 Devices.IDENTIFIER_ZIGBEE = 'zigbee';
+/**
+ * A constant for the identifier of Zigbee2Mqtt Adapter devices
+ */
 Devices.IDENTIFIER_ZIGBEE2MQTT = 'zigbee2mqtt';
+/**
+ * A constant for the identifier of WLED Adapter devices
+ */
 Devices.IDENTIFIER_WLED = 'wled';
+/**
+ * A Map containing all devices
+ */
 Devices.alLDevices = {};
+/**
+ * A reference to globally active energy manager
+ * @default undefined (no Energy-Manager)
+ */
 Devices.energymanager = undefined;
+/**
+ * A reference to the Dachs device
+ * @default undefined (no Dachs CHP)
+ */
 Devices.dachs = undefined;
+/**
+ * A reference to the temperature sensor measuring the warm water temperature
+ * @default undefined (no warm water temperature sensor)
+ */
 Devices.temperatureWarmWater = undefined;

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

@@ -9,12 +9,25 @@ import { TrackedDistanceData } from './trackedDistanceData';
 import { iBluetoothDetector } from '../baseDeviceInterfaces/iBluetoothDetector';
 export declare class DetectedBluetoothDevice implements iBaseDevice {
     id: string;
+    /** @inheritDoc */
     settings: undefined;
+    /**
+     * A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
+     */
     distanceMap: Map<string, TrackedDistanceData>;
+    /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
+    /** @inheritDoc */
     deviceType: DeviceType;
+    /** @inheritDoc */
     info: DeviceInfo;
+    /**
+     * The last room the device was guessed to be in {@link iRoomBase.roomName}
+     */
     lastRoom: string | undefined;
+    /**
+     * If the device is currently present
+     */
     present: boolean;
     constructor(id: string, settings?: iBluetoothTrackingSettings);
     get customName(): string;

package/lib/server/devices/espresense/detectedBluetoothDevice.js

@@ -13,12 +13,25 @@ const trilaterationPointDistance_1 = require("./trilaterationPointDistance");
 class DetectedBluetoothDevice {
     constructor(id, settings) {
         this.id = id;
+        /** @inheritDoc */
         this.settings = undefined;
+        /**
+         * A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
+         */
         this.distanceMap = new Map();
+        /** @inheritDoc */
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.trackableDevice];
+        /** @inheritDoc */
         this.deviceType = deviceType_1.DeviceType.TrackableDevice;
+        /** @inheritDoc */
         this.info = new DeviceInfo_1.DeviceInfo();
+        /**
+         * The last room the device was guessed to be in {@link iRoomBase.roomName}
+         */
         this.lastRoom = undefined;
+        /**
+         * If the device is currently present
+         */
         this.present = false;
         if (settings === undefined) {
             return;
@@ -77,7 +90,7 @@ class DetectedBluetoothDevice {
         const dataPoints = this.getDistances(maxAge);
         const result = [`Distances for ${this.info.customName}`];
         for (const data of dataPoints) {
-            result.push(`${data.trackerName}: ${services_1.Utils.round((_a = data.distance) !== null && _a !== void 0 ? _a : -99, 2)}m updated ${new Date(data.lastUpdate).toLocaleTimeString()}`);
+            result.push(`${data.trackerName}: ${services_1.Utils.round((_a = data.distance) !== null && _a !== void 0 ? _a : -99, 2)}m updated ${new Date(data.lastUpdate).toLocaleTimeString('de-DE')}`);
             services_1.Utils.nowTime();
         }
         return result.join('\n');

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

@@ -8,27 +8,57 @@ import { LogDebugType } from '../../services';
 import { ProximityCallback } from './proximityCallback';
 import { TrilaterationBasePoint } from './trilaterationBasePoint';
 export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector {
+    /** @inheritDoc */
     readonly position: TrilaterationBasePoint;
+    /** @inheritDoc */
     settings: undefined;
+    /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
+    /** @inheritDoc */
     deviceType: DeviceType;
+    /**
+     * The name of this device
+     */
     readonly name: string;
     private deviceMap;
     private proximityCallbackMap;
+    /**
+     * Creates a new instance of the EspresenseDevice class
+     * @param name - The desired name of the device
+     * @param roomName - The name of the room this device is in {@link iRoomBase.roomName}
+     * @param x - The x coordinate of the device in the house
+     * @param y - The y coordinate of the device in the house
+     * @param z - The z coordinate of the device in the house
+     */
     constructor(name: string, roomName: string, x: number, y: number, z: number);
+    /** @inheritDoc */
     get customName(): string;
     protected _info: DeviceInfo;
+    /** @inheritDoc */
     get info(): DeviceInfo;
-    set info(info: DeviceInfo);
+    /** @inheritDoc */
     get id(): string;
+    /** @inheritDoc */
     get room(): RoomBase | undefined;
+    /** @inheritDoc */
     distanceOfDevice(deviceName: string, maxAge?: number): number | undefined;
+    /** @inheritDoc */
     isDevicePresent(deviceName: string, maxDistance: number, maxAge?: number): boolean;
+    /**
+     * Updates the device with the given state
+     * @param devName - The name of the bluetooth device
+     * @param state - The state containing the json-formatted distance data
+     */
     update(devName: string, state: ioBroker.State): void;
+    /** @inheritDoc */
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
+    /** @inheritDoc */
     toJSON(): Partial<iRoomDevice>;
+    /** @inheritDoc */
     persistDeviceInfo(): void;
+    /** @inheritDoc */
     loadDeviceSettings(): void;
+    /** @inheritDoc */
     addProximityCallback(cb: ProximityCallback): void;
     private addDeviceTracking;
 }

package/lib/server/devices/espresense/espresenseDevice.js

@@ -12,9 +12,20 @@ const espresenseCoordinator_1 = require("./espresenseCoordinator");
 const trilaterationBasePoint_1 = require("./trilaterationBasePoint");
 const trilateration_1 = require("./trilateration");
 class EspresenseDevice {
+    /**
+     * Creates a new instance of the EspresenseDevice class
+     * @param name - The desired name of the device
+     * @param roomName - The name of the room this device is in {@link iRoomBase.roomName}
+     * @param x - The x coordinate of the device in the house
+     * @param y - The y coordinate of the device in the house
+     * @param z - The z coordinate of the device in the house
+     */
     constructor(name, roomName, x, y, z) {
+        /** @inheritDoc */
         this.settings = undefined;
+        /** @inheritDoc */
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.bluetoothDetector];
+        /** @inheritDoc */
         this.deviceType = deviceType_1.DeviceType.Espresense;
         this.deviceMap = new Map();
         this.proximityCallbackMap = new Map();
@@ -31,22 +42,24 @@ class EspresenseDevice {
         this.loadDeviceSettings();
         trilateration_1.Trilateration.basePoints.push(this.position);
     }
+    /** @inheritDoc */
     get customName() {
         return this.info.customName;
     }
+    /** @inheritDoc */
     get info() {
         return this._info;
     }
-    set info(info) {
-        this._info = info;
-    }
+    /** @inheritDoc */
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `espresense-${this.info.room}-${this.info.customName}`;
     }
+    /** @inheritDoc */
     get room() {
         return services_1.API.getRoom(this.info.room);
     }
+    /** @inheritDoc */
     distanceOfDevice(deviceName, maxAge = 60) {
         var _a;
         for (const dev of this.deviceMap.values()) {
@@ -57,10 +70,16 @@ class EspresenseDevice {
         }
         return undefined;
     }
+    /** @inheritDoc */
     isDevicePresent(deviceName, maxDistance, maxAge = 60) {
         var _a;
         return ((_a = this.distanceOfDevice(deviceName, maxAge)) !== null && _a !== void 0 ? _a : 99) < maxDistance;
     }
+    /**
+     * Updates the device with the given state
+     * @param devName - The name of the bluetooth device
+     * @param state - The state containing the json-formatted distance data
+     */
     update(devName, state) {
         var _a, _b;
         let data = null;
@@ -83,7 +102,7 @@ class EspresenseDevice {
         }
         const trackedDistance = dev.getDistance(this.id);
         if (trackedDistance === undefined) {
-            this.log(models_1.LogLevel.Error, `TrackedDistance Undefined directly after update`);
+            this.log(models_1.LogLevel.Error, 'TrackedDistance Undefined directly after update');
             return;
         }
         const distance = trackedDistance.distance;
@@ -103,6 +122,7 @@ class EspresenseDevice {
             }
         }
     }
+    /** @inheritDoc */
     log(level, message, debugType = services_1.LogDebugType.None) {
         var _a, _b;
         services_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
@@ -112,18 +132,22 @@ class EspresenseDevice {
             deviceName: this.name,
         });
     }
+    /** @inheritDoc */
     toJSON() {
         return services_1.Utils.jsonFilter(this);
     }
+    /** @inheritDoc */
     persistDeviceInfo() {
         services_1.Utils.guardedTimeout(() => {
             var _a;
             (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
         }, 5000, this);
     }
+    /** @inheritDoc */
     loadDeviceSettings() {
         // Nothing
     }
+    /** @inheritDoc */
     addProximityCallback(cb) {
         let currentValue = this.proximityCallbackMap.get(cb.deviceName);
         if (currentValue == undefined) {

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

@@ -1,8 +1,20 @@
 import { iBluetoothDetector } from '../baseDeviceInterfaces/iBluetoothDetector';
 export declare class TrackedDistanceData {
+    /**
+     * The name of the tracker who detected this device
+     */
     trackerName: string;
+    /**
+     * The distance to the tracker
+     */
     distance: number | undefined;
+    /**
+     * The time of the last update
+     */
     lastUpdate: number;
+    /**
+     * The distance to the tracker before the last update (if available) can be used to calculate certain movements
+     */
     previousDistance: number | undefined;
     constructor(tracker: iBluetoothDetector);
     update(distance: number): void;

package/lib/server/devices/espresense/trackedDistanceData.js

@@ -4,6 +4,9 @@ exports.TrackedDistanceData = void 0;
 const services_1 = require("../../services");
 class TrackedDistanceData {
     constructor(tracker) {
+        /**
+         * The time of the last update
+         */
         this.lastUpdate = 0;
         this.trackerName = tracker.info.customName;
     }

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

@@ -3,7 +3,14 @@ import { TrilaterationPoint } from './trilaterationPoint';
 import { TrilaterationPointDistance } from './trilaterationPointDistance';
 import { RoomBase } from '../../../models';
 export declare class Trilateration {
+    /**
+     * A list of all reference points for trilateration (e.g. Rooms, {@link iBluetoothDetector}s)
+     */
     static readonly basePoints: TrilaterationBasePoint[];
+    /**
+     * A list of all possible points for trilateration in this home, used for increased calculation speed
+     * This list is filled mostly by {@link Trilateration.addRoom} thus resulting in the air outside the house not being included
+     */
     static possiblePoints: TrilaterationPoint[];
     static addRoom(room: RoomBase, startPoint: TrilaterationPoint, endPoint: TrilaterationPoint): void;
     static initialize(): void;

package/lib/server/devices/espresense/trilateration.js

@@ -104,5 +104,12 @@ class Trilateration {
     }
 }
 exports.Trilateration = Trilateration;
+/**
+ * A list of all reference points for trilateration (e.g. Rooms, {@link iBluetoothDetector}s)
+ */
 Trilateration.basePoints = [];
+/**
+ * A list of all possible points for trilateration in this home, used for increased calculation speed
+ * This list is filled mostly by {@link Trilateration.addRoom} thus resulting in the air outside the house not being included
+ */
 Trilateration.possiblePoints = [];

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

@@ -6,7 +6,13 @@ export declare class TrilaterationBasePoint {
     readonly z: number;
     readonly roomName: string;
     private readonly _maximumDistance;
+    /**
+     * The coordinates of this point in Space
+     */
     readonly ownPoint: TrilaterationPoint;
+    /**
+     * A precalculated map of distances to all existing points in the home (@see {@link Trilateration.possiblePoints})
+     */
     readonly precalculatedDistancesMap: Map<number, string[]>;
     constructor(x: number, y: number, z: number, roomName: string, _maximumDistance?: number);
     getRatedCoordinates(distance: number): TrilaterationRatedCoordinate[];

package/lib/server/devices/espresense/trilaterationBasePoint.js

@@ -12,6 +12,9 @@ class TrilaterationBasePoint {
         this.z = z;
         this.roomName = roomName;
         this._maximumDistance = _maximumDistance;
+        /**
+         * A precalculated map of distances to all existing points in the home (@see {@link Trilateration.possiblePoints})
+         */
         this.precalculatedDistancesMap = new Map();
         this.ownPoint = new trilaterationPoint_1.TrilaterationPoint(x, y, z, roomName);
     }

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

@@ -4,8 +4,8 @@ export declare class TrilaterationPoint {
     z: number;
     roomName: string;
     static getPointsInRange(a: TrilaterationPoint, b: TrilaterationPoint, roomName?: string): TrilaterationPoint[];
-    readonly coordinateName: string;
     constructor(x: number, y: number, z: number, roomName: string);
+    get coordinateName(): string;
     getDistance(other: TrilaterationPoint): number;
     getDot5Distance(other: TrilaterationPoint): number;
 }

package/lib/server/devices/espresense/trilaterationPoint.js

@@ -22,7 +22,9 @@ class TrilaterationPoint {
         this.y = y;
         this.z = z;
         this.roomName = roomName;
-        this.coordinateName = `${this.x}-${this.y}-${this.z}`;
+    }
+    get coordinateName() {
+        return `${this.x}-${this.y}-${this.z}`;
     }
     getDistance(other) {
         return Math.sqrt((this.x - other.x) ** 2 + (this.y - other.y) ** 2 + (this.z - other.z) ** 2);

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

@@ -1,6 +1,6 @@
 import { HmIpGriff } from '../hmIPDevices';
 import { WindowPosition } from '../models';
-import { WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
+import { ShutterPositionChangedAction, WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand } from '../../../models';
 import { iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
@@ -9,10 +9,16 @@ export declare class Window extends BaseGroup {
     readonly vibrationIds: string[];
     readonly shutterIds: string[];
     readonly magnetIds: string[];
-    desiredPosition: number;
+    private _desiredPosition;
+    /**
+     * The desired shutter level for the window
+     * @returns {number} The level (0 closed, 100 open)
+     */
+    get desiredPosition(): number;
     constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[]);
     /**
      * sets the desired Pos and moves rollo to this level
+     * @param c - The command to execute
      */
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     getHandle(): HmIpGriff[];
@@ -21,6 +27,6 @@ export declare class Window extends BaseGroup {
     getVibration(): iVibrationSensor[];
     griffeInPosition(pPosition: WindowPosition): number;
     initialize(): void;
-    rolloPositionChange(pValue: number): void;
+    rolloPositionChange(action: ShutterPositionChangedAction): void;
     restoreDesiredPosition(c: WindowRestoreDesiredPositionCommand): void;
 }

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

@@ -9,13 +9,20 @@ const group_type_1 = require("./group-type");
 const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
 class Window extends base_group_1.BaseGroup {
+    /**
+     * The desired shutter level for the window
+     * @returns {number} The level (0 closed, 100 open)
+     */
+    get desiredPosition() {
+        return this._desiredPosition;
+    }
     constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = []) {
         super(roomName, group_type_1.GroupType.Window);
         this.handleIds = handleIds;
         this.vibrationIds = vibrationIds;
         this.shutterIds = shutterIds;
         this.magnetIds = magnetIds;
-        this.desiredPosition = 0;
+        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));
@@ -23,9 +30,10 @@ class Window extends base_group_1.BaseGroup {
     }
     /**
      * sets the desired Pos and moves rollo to this level
+     * @param c - The command to execute
      */
     setDesiredPosition(c) {
-        this.desiredPosition = c.position;
+        this._desiredPosition = c.position;
         this.restoreDesiredPosition(new models_2.WindowRestoreDesiredPositionCommand(c));
     }
     getHandle() {
@@ -56,7 +64,7 @@ class Window extends base_group_1.BaseGroup {
                     return;
                 }
                 this.getVibration().forEach((element) => {
-                    element.vibrationBlockedByGriff = true;
+                    element.vibrationBlockedByHandle = true;
                 });
                 const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
                 services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(models_2.CommandSource.Automatic, services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay) ? 50 : 100, 'Window ajar by handle'));
@@ -64,7 +72,7 @@ class Window extends base_group_1.BaseGroup {
             griff.addOffenCallback((offen) => {
                 if (offen) {
                     this.getVibration().forEach((element) => {
-                        element.vibrationBlockedByGriff = true;
+                        element.vibrationBlockedByHandle = true;
                     });
                     services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(models_2.CommandSource.Automatic, 100, 'Window opened by handle'));
                     return;
@@ -78,8 +86,8 @@ class Window extends base_group_1.BaseGroup {
                     this.getVibration().forEach((element) => {
                         this.log(models_2.LogLevel.Debug, `Starte Timeout für Vibrationsdeaktivierung für ${element.info.customName}`);
                         services_1.Utils.guardedTimeout(() => {
-                            if (element.vibrationBlockedByGriffTimeStamp < now) {
-                                element.vibrationBlockedByGriff = false;
+                            if (element.vibrationBlockedByHandleTimeStamp < now) {
+                                element.vibrationBlockedByHandle = false;
                             }
                         }, 12000);
                     });
@@ -96,14 +104,14 @@ class Window extends base_group_1.BaseGroup {
             });
         }, 5, this);
     }
-    rolloPositionChange(pValue) {
-        this.log(models_2.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`, pValue == this.desiredPosition ? services_1.LogDebugType.None : services_1.LogDebugType.ShutterPositionChange);
-        if (pValue === 0 || pValue === 100) {
-            this.getRoom().setLightTimeBased(new models_2.RoomSetLightTimeBasedCommand(models_2.CommandSource.Automatic, true, 'Window.rolloPositionChange'));
+    rolloPositionChange(action) {
+        this.log(models_2.LogLevel.Debug, `Rollo Position Change in ${this.roomName}: ${action.reasonTrace}`, action.newPosition == this._desiredPosition ? services_1.LogDebugType.None : services_1.LogDebugType.ShutterPositionChange);
+        if (action.newPosition === 0 || action.newPosition === 100) {
+            this.getRoom().setLightTimeBased(new models_2.RoomSetLightTimeBasedCommand(action, true));
         }
     }
     restoreDesiredPosition(c) {
-        services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(c, this.desiredPosition));
+        services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(c, this._desiredPosition));
     }
 }
 exports.Window = Window;

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

@@ -7,8 +7,12 @@ import { GroupSettings } from '../../../models/groupSettings/groupSettings';
 export declare class BaseGroup implements iIdHolder {
     roomName: string;
     type: GroupType;
+    /**
+     * The settings of the group
+     */
     settings: GroupSettings | undefined;
     get customName(): string;
+    /** @inheritDoc */
     id: string;
     constructor(roomName: string, type: GroupType);
     protected _deviceCluster: DeviceCluster;