hoffmation-base 3.0.0-alpha.4 → 3.0.0-alpha.40

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;

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

@@ -11,6 +11,9 @@ class BaseGroup {
     constructor(roomName, type) {
         this.roomName = roomName;
         this.type = type;
+        /**
+         * The settings of the group
+         */
         this.settings = undefined;
         this._deviceCluster = new device_cluster_1.DeviceCluster();
         this.id = `${this.roomName}-${group_type_1.GroupType[this.type]}`;

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

@@ -4,16 +4,17 @@ import { AcDevice } from '../../services';
 import { HeatGroupSettings } from '../../../models/groupSettings/heatGroupSettings';
 import { TemperatureSettings } from '../../../models';
 export declare class HeatGroup extends BaseGroup {
+    /** @inheritDoc */
     settings: HeatGroupSettings;
     constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[], acIds: string[]);
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the combined humidity Level in this room
+     * @returns The humidity in percent
      */
     get humidity(): number;
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the temperature based on all available sensors.
+     * @returns The temperature in °C
      */
     get temperature(): number;
     get desiredTemp(): number;
@@ -25,8 +26,9 @@ export declare class HeatGroup extends BaseGroup {
     initialize(): void;
     /**
      * Sets all ACs to new desired Value
-     * @param {boolean} newDesiredState
-     * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
+     * TODO: Migrate to new Command System
+     * @param newDesiredState - The new desired (on/off) state
+     * @param force - Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */
     setAc(newDesiredState: boolean, force?: boolean): void;
     deleteAutomaticPoint(name: string): void;

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

@@ -12,6 +12,7 @@ const models_1 = require("../../../models");
 class HeatGroup extends base_group_1.BaseGroup {
     constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds, acIds) {
         super(roomName, group_type_1.GroupType.Heating);
+        /** @inheritDoc */
         this.settings = new heatGroupSettings_1.HeatGroupSettings();
         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));
@@ -19,8 +20,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds));
     }
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the combined humidity Level in this room
+     * @returns The humidity in percent
      */
     get humidity() {
         let humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
@@ -40,8 +41,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         return humidity;
     }
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the temperature based on all available sensors.
+     * @returns The temperature in °C
      */
     get temperature() {
         let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
@@ -93,8 +94,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         rooms.sort((a, b) => {
             return a.roomName.localeCompare(b.roomName);
         });
-        const response = [`Dies sind die aktuellen Informationen der Heizungen:`];
-        response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
+        const response = ['Dies sind die aktuellen Informationen der Heizungen:'];
+        response.push('Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung');
         for (const r of rooms) {
             response.push(`${r.roomName}:\t\t${(_a = r.HeatGroup) === null || _a === void 0 ? void 0 : _a.humidity}%\t\t${(_b = r.HeatGroup) === null || _b === void 0 ? void 0 : _b.temperature}°C\t\t${(_c = r.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp}°C`);
         }
@@ -127,8 +128,9 @@ class HeatGroup extends base_group_1.BaseGroup {
     }
     /**
      * Sets all ACs to new desired Value
-     * @param {boolean} newDesiredState
-     * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
+     * TODO: Migrate to new Command System
+     * @param newDesiredState - The new desired (on/off) state
+     * @param force - Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */
     setAc(newDesiredState, force = false) {
         const devs = this.getOwnAcDevices();
@@ -139,9 +141,7 @@ class HeatGroup extends base_group_1.BaseGroup {
                 continue;
             }
             dev.turnOff();
-            if (force) {
-                dev.deactivateAutomaticChange(60 * 60 * 1000);
-            }
+            dev.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(force ? models_1.CommandSource.Force : models_1.CommandSource.Unknown, 60 * 60 * 1000));
         }
     }
     deleteAutomaticPoint(name) {

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

@@ -1,10 +1,18 @@
 import { BaseGroup } from './base-group';
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, TimeOfDay, WledSetLightCommand } from '../../../models';
+import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, WledSetLightCommand } from '../../../models';
 import { WledDevice } from '../wledDevice';
 import { iLedRgbCct } from '../baseDeviceInterfaces/iLedRgbCct';
 export declare class LightGroup extends BaseGroup {
+    /**
+     * Time-Callback for the sunrise light off
+     * @remark This is undefined if the light should not be turned off at sunrise or no calculation has been done yet
+     */
     sonnenAufgangLichtCallback: TimeCallback | undefined;
+    /**
+     * Time-Callback for the sunset light on
+     * @remark This is undefined if the light should not be turned on at sunset or no calculation has been done yet
+     */
     sonnenUntergangLichtCallback: TimeCallback | undefined;
     private _ambientLightOn;
     constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[], wledIds?: string[]);
@@ -20,7 +28,7 @@ export declare class LightGroup extends BaseGroup {
     setAllLampen(c: LampSetLightCommand): void;
     setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
     setAllOutlets(c: ActuatorSetStateCommand): void;
-    setAllActuatorsTimeBased(time: TimeOfDay): void;
+    setAllActuatorsTimeBased(c: LampSetTimeBasedCommand): void;
     setAllLED(c: LedSetLightCommand): void;
     setAllWled(c: WledSetLightCommand): void;
     initialize(): void;

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

@@ -17,28 +17,9 @@ class LightGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.WLED, new device_list_1.DeviceList(wledIds));
     }
     anyLightsOn() {
-        let i;
-        for (i = 0; i < this.getLights().length; i++) {
-            if (this.getLights()[i].lightOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getLED().length; i++) {
-            if (this.getLED()[i].actuatorOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getOutlets().length; i++) {
-            if (this.getOutlets()[i].actuatorOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getWled().length; i++) {
-            if (this.getWled()[i].on) {
-                return true;
-            }
-        }
-        return false;
+        return (this.getAllAsActuator().find((a) => {
+            return a.actuatorOn;
+        }) !== undefined);
     }
     getLights() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Lamps);
@@ -70,7 +51,7 @@ class LightGroup extends base_group_1.BaseGroup {
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
-                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
                 return;
             }
             a.setActuator(c);
@@ -106,16 +87,16 @@ class LightGroup extends base_group_1.BaseGroup {
             resultLampen = darkOutside;
         }
         if (resultLampen) {
-            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(models_1.CommandSource.Automatic, c.time, 'LightGroup switchTimeConditional'));
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllLampen(new models_1.LampSetLightCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllLampen(new models_1.LampSetLightCommand(c, false));
         }
         if (resultSteckdosen) {
-            this.setAllActuatorsTimeBased(c.time);
+            this.setAllActuatorsTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllOutlets(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false));
         }
     }
     setAllLampen(c) {
@@ -133,12 +114,13 @@ class LightGroup extends base_group_1.BaseGroup {
             s.setActuator(c);
         });
     }
-    setAllActuatorsTimeBased(time) {
+    setAllActuatorsTimeBased(c) {
         this.getOutlets().forEach((s) => {
-            if ((time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                s.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, `LightGroup setAllActuatorsTimeBased`));
+            if ((c.time === models_1.TimeOfDay.Daylight && s.settings.dayOn) ||
+                (c.time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (c.time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (c.time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                s.setActuator(new models_1.ActuatorSetStateCommand(c, true, 'LightGroup setAllActuatorsTimeBased', c.disableAutomaticCommand));
             }
         });
     }
@@ -205,7 +187,7 @@ class LightGroup extends base_group_1.BaseGroup {
     }
     ambientLightStartCallback() {
         this._ambientLightOn = true;
-        this.log(models_1.LogLevel.Info, `Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung`);
+        this.log(models_1.LogLevel.Info, 'Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung');
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight) {
                 a.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'Ambient Light Start Callback'));
@@ -213,7 +195,7 @@ class LightGroup extends base_group_1.BaseGroup {
         });
         services_1.Utils.guardedTimeout(() => {
             var _a;
-            this.log(models_1.LogLevel.Info, `Ambientenbeleuchtung um Mitternacht abschalten.`);
+            this.log(models_1.LogLevel.Info, 'Ambientenbeleuchtung um Mitternacht abschalten.');
             this._ambientLightOn = false;
             if (((_a = this.getRoom().PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) !== true) {
                 this.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Ambient Light End Callback'));

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

@@ -1,3 +1,4 @@
+import { PresenceGroupFirstEnterAction, PresenceGroupLastLeftAction } from '../../../models';
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PresenceGroup extends BaseGroup {
@@ -9,15 +10,21 @@ export declare class PresenceGroup extends BaseGroup {
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
     presentAmount(): number;
+    addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     anyPresent(): boolean;
-    addLastLeftCallback(cb: () => void): void;
-    addFirstEnterCallback(cb: () => void): void;
+    private fireFistEnterCBs;
+    addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
+    private motionSensorOnAnyMovement;
     private motionSensorOnLastLeft;
+    /**
+     * Calculates whether we are after (negative if before) the time the movement
+     * reset timer should have reset the movement.
+     * @returns The time in milliseconds after the reset time.
+     */
+    private getTimeAfterReset;
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
-     * @private
      */
     private resetLastLeftTimeout;
-    private motionSensorOnFirstEnter;
     private executeLastLeftCbs;
 }