hoffmation-base 3.0.0-alpha.7 → 3.0.0-alpha.71

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

@@ -9,13 +9,29 @@ 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;
+    }
+    /**
+     * Checks if any shutter is down (0%)
+     * @returns {boolean} true if any shutter is down
+     */
+    get anyShutterDown() {
+        return this.getShutter().some((s) => {
+            return s.currentLevel === 0;
+        });
+    }
     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 +39,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 +73,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 +81,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 +95,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 +113,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,14 +51,13 @@ 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);
         });
     }
     switchTimeConditional(c) {
-        const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(c.time);
         let resultLampen = false;
         let resultSteckdosen = false;
         let activatedGroups = 0;
@@ -99,23 +79,23 @@ class LightGroup extends base_group_1.BaseGroup {
         if (this.getOutlets().length > 0) {
             activatedGroups++;
             this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[c.time]}"`);
-            resultSteckdosen = darkOutside;
+            resultSteckdosen = true;
         }
         if (activatedGroups === 0 || this.getRoom().settings.includeLampsInNormalMovementLightning) {
             this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[c.time]}"`);
-            resultLampen = darkOutside;
+            resultLampen = true;
         }
         if (resultLampen) {
-            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, 'LightGroup switchTimeConditional'));
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllLampen(new models_1.LampSetLightCommand(c, 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(c, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false));
         }
     }
     setAllLampen(c) {
@@ -133,12 +113,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 +186,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 +194,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 { PresenceGroupAnyMovementAction, PresenceGroupFirstEnterAction, PresenceGroupLastLeftAction } from '../../../models';
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PresenceGroup extends BaseGroup {
@@ -5,19 +6,28 @@ export declare class PresenceGroup extends BaseGroup {
     private _lastLeftTimeout;
     private _lastLeftCbs;
     private _firstEnterCbs;
+    private _anyMovementCbs;
     constructor(roomName: string, motionSensorIds: string[]);
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
     presentAmount(): number;
+    addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
+    addAnyMovementCallback(cb: (action: PresenceGroupAnyMovementAction) => 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 executeAnyMovementCbs;
     private executeLastLeftCbs;
 }

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

@@ -14,6 +14,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
         this._lastLeftTimeout = null;
         this._lastLeftCbs = [];
         this._firstEnterCbs = [];
+        this._anyMovementCbs = [];
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
     getMotionDetector() {
@@ -21,113 +22,115 @@ class PresenceGroup extends base_group_1.BaseGroup {
     }
     initCallbacks() {
         this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                var _a;
-                if (!val) {
+            b.addMovementCallback((action) => {
+                if (!action.motionDetected && !this.anyPresent()) {
+                    this.motionSensorOnLastLeft(action);
                     return;
                 }
-                if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !b.settings.excludeFromNightAlarm)) {
-                    services_1.RoomService.startIntrusionAlarm(this.getRoom(), b);
+                if (!action.motionDetected && this.anyPresent()) {
+                    this.resetLastLeftTimeout();
+                    return;
                 }
-                if (!b.settings.seesWindow) {
-                    (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
+                // At this Point we can be certain about motion being detected.
+                this.log(models_1.LogLevel.Debug, `New Motion detected, present Amount: ${this.presentAmount()}`, services_1.LogDebugType.NewMovementState);
+                this.motionSensorOnAnyMovement(action);
+                if (this.presentAmount() === 1 && this._lastLeftTimeout === null) {
+                    this.fireFistEnterCBs(action);
                 }
-                services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${b.info.fullName}"`);
+                this.resetLastLeftTimeout();
             });
         });
-        this.addLastLeftCallback(() => {
+        this.addLastLeftCallback((action) => {
             var _a, _b;
             (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
-            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Presence Group LastLeftCallback'));
+            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(new models_1.ActuatorSetStateCommand(action, false, 'Presence Group LastLeftCallback'));
         });
-        this.addFirstEnterCallback(() => {
+        this.addAnyMovementCallback((action) => {
             if (!this.getRoom().settings.lampenBeiBewegung) {
                 return;
             }
             this.log(models_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
-            this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(models_1.CommandSource.Automatic, true, 'Motion detected'));
-        });
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.motionSensorOnFirstEnter(val);
-            });
-        });
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.motionSensorOnLastLeft(val);
-            });
+            this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(action, true));
         });
     }
     presentAmount() {
-        let count = 0;
-        for (let i = 0; i < this.getMotionDetector().length; i++) {
-            if (this.getMotionDetector()[i].movementDetected) {
-                count++;
-            }
-        }
-        return count;
-    }
-    anyPresent() {
-        for (let i = 0; i < this.getMotionDetector().length; i++) {
-            if (this.getMotionDetector()[i].movementDetected) {
-                return true;
-            }
-        }
-        return false;
+        return this.getMotionDetector().filter((b) => b.movementDetected).length;
     }
     addLastLeftCallback(cb) {
         this._lastLeftCbs.push(cb);
     }
+    addAnyMovementCallback(cb) {
+        this._anyMovementCbs.push(cb);
+    }
+    anyPresent() {
+        return this.getMotionDetector().find((b) => b.movementDetected) !== undefined;
+    }
+    fireFistEnterCBs(action) {
+        for (const cb of this._firstEnterCbs) {
+            cb(new models_1.PresenceGroupFirstEnterAction(action));
+        }
+    }
     addFirstEnterCallback(cb) {
         this._firstEnterCbs.push(cb);
     }
-    motionSensorOnLastLeft(val) {
-        if (val || this.anyPresent()) {
-            this.resetLastLeftTimeout();
-            return;
+    motionSensorOnAnyMovement(action) {
+        var _a;
+        this._lastMovement = new Date();
+        if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !action.sensor.settings.excludeFromNightAlarm)) {
+            services_1.RoomService.startIntrusionAlarm(this.getRoom(), action.sensor);
+        }
+        if (!action.sensor.settings.seesWindow) {
+            (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
         }
-        let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+        services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${action.sensor.info.fullName}"`);
+        this.executeAnyMovementCbs(new models_1.PresenceGroupAnyMovementAction(action));
+    }
+    motionSensorOnLastLeft(action) {
+        let timeAfterReset = this.getTimeAfterReset();
         if (timeAfterReset > 0) {
             this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
-            this.executeLastLeftCbs();
+            this.executeLastLeftCbs(new models_1.PresenceGroupLastLeftAction(action));
             return;
         }
-        this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
+        const newResetTime = new Date(services_1.Utils.nowMS() + Math.abs(timeAfterReset));
+        this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed to ${newResetTime.toLocaleTimeString('de-DE')}.`);
         this.resetLastLeftTimeout();
         this._lastLeftTimeout = services_1.Utils.guardedTimeout(() => {
-            timeAfterReset =
-                services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+            this._lastLeftTimeout = null;
+            timeAfterReset = this.getTimeAfterReset();
             const presentAmount = this.presentAmount();
-            this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
+            this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${presentAmount}\tTime after Last Movement including Reset: ${timeAfterReset}, action: ${action.reasonTrace}`);
             if (presentAmount <= 0 && timeAfterReset > 0) {
-                this.executeLastLeftCbs();
+                this.executeLastLeftCbs(new models_1.PresenceGroupLastLeftAction(action));
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
+    /**
+     * 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.
+     */
+    getTimeAfterReset() {
+        return services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+    }
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
-     * @private
      */
     resetLastLeftTimeout() {
-        if (this._lastLeftTimeout !== null) {
-            clearTimeout(this._lastLeftTimeout);
-        }
-    }
-    motionSensorOnFirstEnter(val) {
-        if (!val) {
-            return;
-        }
-        this._lastMovement = new Date();
-        if (this.presentAmount() > 1) {
+        if (this._lastLeftTimeout === null) {
             return;
         }
-        for (const cb of this._firstEnterCbs) {
-            cb();
+        clearTimeout(this._lastLeftTimeout);
+        this._lastLeftTimeout = null;
+    }
+    executeAnyMovementCbs(action) {
+        for (const cb of this._anyMovementCbs) {
+            cb(action);
         }
     }
-    executeLastLeftCbs() {
+    executeLastLeftCbs(action) {
         for (const cb of this._lastLeftCbs) {
-            cb();
+            cb(action);
         }
     }
 }

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

@@ -25,42 +25,42 @@ class TasterGroup extends base_group_1.BaseGroup {
                     return;
                 }
                 (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 0, 'Button Top Left pressed long'));
-            }, `Close all Rollos in this room`);
+            }, 'Close all Rollos in this room');
             (_b = t.buttonTopLeft) === null || _b === void 0 ? void 0 : _b.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 25, 'Button Top Left pressed short'));
-            }, `Nearly closes all Rollos in this room`);
+            }, 'Nearly closes all Rollos in this room');
             (_c = t.buttonTopRight) === null || _c === void 0 ? void 0 : _c.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 100, 'Button Top Right pressed long'));
-            }, `Open all Rollos in this room`);
+            }, 'Open all Rollos in this room');
             (_d = t.buttonTopRight) === null || _d === void 0 ? void 0 : _d.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 50, 'Button Top Right pressed short'));
-            }, `All Rollos in this room to middle`);
+            }, 'All Rollos in this room to middle');
             (_e = t.buttonMidLeft) === null || _e === void 0 ? void 0 : _e.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Manual, true, 'Button press to turn all lights on'));
-            }, `Turn all Lights in this room on`);
+            }, 'Turn all Lights in this room on');
             (_f = t.buttonMidRight) === null || _f === void 0 ? void 0 : _f.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Manual, false, 'Button press to turn all lights off'));
-            }, `Turn all Lights in this room off`);
+            }, 'Turn all Lights in this room off');
             if (((_g = services_1.SettingsService.settings.sonos) === null || _g === void 0 ? void 0 : _g.buttonBotRightForRadio) === true) {
                 const sonosGroup = this.getRoom().SonosGroup;
                 if (sonosGroup !== undefined && sonosGroup.getOwnSonosDevices().length > 0) {