hoffmation-base 3.0.0-alpha.38 → 3.0.0-alpha.39

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

@@ -9,16 +9,22 @@ export declare class PresenceGroup extends BaseGroup {
     constructor(roomName: string, motionSensorIds: string[]);
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
-    addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     presentAmount(): number;
+    addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     anyPresent(): boolean;
+    private fireFistEnterCBs;
     addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
-    private motionSensorAnyMovement;
+    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 resetLastLeftTimeout;
-    private motionSensorOnFirstEnter;
     private executeLastLeftCbs;
 }

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

@@ -22,9 +22,21 @@ class PresenceGroup extends base_group_1.BaseGroup {
     initCallbacks() {
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((action) => {
-                this.motionSensorOnFirstEnter(action);
+                if (action.motionDetected) {
+                    this.motionSensorOnAnyMovement(action);
+                }
+                if (action.motionDetected || this.anyPresent()) {
+                    // TODO: Possible Edge Case, if the other motion sensor doesn't fire motion end event this will never be called
+                    this.resetLastLeftTimeout();
+                    return;
+                }
+                else if (!action.motionDetected && !this.anyPresent()) {
+                    this.motionSensorOnLastLeft(action);
+                }
+                if (action.motionDetected && this.presentAmount() === 1 && this._lastLeftTimeout === null) {
+                    this.fireFistEnterCBs(action);
+                }
                 this.motionSensorOnLastLeft(action);
-                this.motionSensorAnyMovement(action);
             });
         });
         this.addLastLeftCallback((action) => {
@@ -40,34 +52,26 @@ class PresenceGroup extends base_group_1.BaseGroup {
             this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(action, true));
         });
     }
+    presentAmount() {
+        return this.getMotionDetector().filter((b) => b.movementDetected).length;
+    }
     addLastLeftCallback(cb) {
         this._lastLeftCbs.push(cb);
     }
-    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 this.getMotionDetector().find((b) => b.movementDetected) !== undefined;
+    }
+    fireFistEnterCBs(action) {
+        for (const cb of this._firstEnterCbs) {
+            cb(new models_1.PresenceGroupFirstEnterAction(action));
         }
-        return false;
     }
     addFirstEnterCallback(cb) {
         this._firstEnterCbs.push(cb);
     }
-    motionSensorAnyMovement(action) {
+    motionSensorOnAnyMovement(action) {
         var _a;
-        if (!action.motionDetected) {
-            return;
-        }
+        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);
         }
@@ -77,11 +81,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
         services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${action.sensor.info.fullName}"`);
     }
     motionSensorOnLastLeft(action) {
-        if (action.motionDetected || this.anyPresent()) {
-            this.resetLastLeftTimeout();
-            return;
-        }
-        let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+        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(new models_1.PresenceGroupLastLeftAction(action));
@@ -90,15 +90,23 @@ class PresenceGroup extends base_group_1.BaseGroup {
         this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
         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}, action: ${action.reasonTrace}`);
+            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(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.
      */
@@ -107,18 +115,6 @@ class PresenceGroup extends base_group_1.BaseGroup {
             clearTimeout(this._lastLeftTimeout);
         }
     }
-    motionSensorOnFirstEnter(action) {
-        if (!action.motionDetected) {
-            return;
-        }
-        this._lastMovement = new Date();
-        if (this.presentAmount() > 1) {
-            return;
-        }
-        for (const cb of this._firstEnterCbs) {
-            cb(new models_1.PresenceGroupFirstEnterAction(action));
-        }
-    }
     executeLastLeftCbs(action) {
         for (const cb of this._lastLeftCbs) {
             cb(action);