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

package/lib/models/action/index.d.ts

@@ -6,3 +6,4 @@ export * from './presenceGroupFirstEnterAction';
 export * from './shutterPositionChangedAction';
 export * from './temperatureSensorChangeAction';
 export { BatteryLevelChangeAction } from './batteryLevelChangeAction';
+export { PresenceGroupAnyMovementAction } from './presenceGroupAnyMovementAction';

package/lib/models/action/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BatteryLevelChangeAction = exports.BaseAction = void 0;
+exports.PresenceGroupAnyMovementAction = exports.BatteryLevelChangeAction = exports.BaseAction = void 0;
 var baseAction_1 = require("./baseAction");
 Object.defineProperty(exports, "BaseAction", { enumerable: true, get: function () { return baseAction_1.BaseAction; } });
 __exportStar(require("./humiditySensorChangeAction"), exports);
@@ -25,3 +25,5 @@ __exportStar(require("./shutterPositionChangedAction"), exports);
 __exportStar(require("./temperatureSensorChangeAction"), exports);
 var batteryLevelChangeAction_1 = require("./batteryLevelChangeAction");
 Object.defineProperty(exports, "BatteryLevelChangeAction", { enumerable: true, get: function () { return batteryLevelChangeAction_1.BatteryLevelChangeAction; } });
+var presenceGroupAnyMovementAction_1 = require("./presenceGroupAnyMovementAction");
+Object.defineProperty(exports, "PresenceGroupAnyMovementAction", { enumerable: true, get: function () { return presenceGroupAnyMovementAction_1.PresenceGroupAnyMovementAction; } });

package/lib/models/action/presenceGroupAnyMovementAction.d.ts

@@ -0,0 +1,7 @@
+import { BaseAction } from './baseAction';
+import { CommandType } from '../command';
+export declare class PresenceGroupAnyMovementAction extends BaseAction {
+    /** @inheritDoc */
+    type: CommandType;
+    constructor(source?: BaseAction, reason?: string);
+}

package/lib/models/action/presenceGroupAnyMovementAction.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PresenceGroupAnyMovementAction = void 0;
+const baseAction_1 = require("./baseAction");
+const command_1 = require("../command");
+class PresenceGroupAnyMovementAction extends baseAction_1.BaseAction {
+    constructor(source, reason) {
+        super(source, reason);
+        /** @inheritDoc */
+        this.type = command_1.CommandType.PresenceGroupAnyMovementAction;
+    }
+}
+exports.PresenceGroupAnyMovementAction = PresenceGroupAnyMovementAction;

package/lib/models/command/commandType.d.ts

@@ -16,6 +16,7 @@ export declare enum CommandType {
     LedSetLightCommand = "LedSetLightCommand",
     LightGroupSwitchTimeConditional = "LightGroupSwitchTimeConditional",
     MotionSensorAction = "MotionSensorAction",
+    PresenceGroupAnyMovementAction = "PresenceGroupAnyMovementAction",
     PresenceGroupFirstEnterAction = "PresenceGroupFirstEnterAction",
     PresenceGroupLastLeftAction = "PresenceGroupLastLeftAction",
     RoomRestoreShutterPositionCommand = "RoomRestoreShutterPositionCommand",

package/lib/models/command/commandType.js

@@ -20,6 +20,7 @@ var CommandType;
     CommandType["LedSetLightCommand"] = "LedSetLightCommand";
     CommandType["LightGroupSwitchTimeConditional"] = "LightGroupSwitchTimeConditional";
     CommandType["MotionSensorAction"] = "MotionSensorAction";
+    CommandType["PresenceGroupAnyMovementAction"] = "PresenceGroupAnyMovementAction";
     CommandType["PresenceGroupFirstEnterAction"] = "PresenceGroupFirstEnterAction";
     CommandType["PresenceGroupLastLeftAction"] = "PresenceGroupLastLeftAction";
     CommandType["RoomRestoreShutterPositionCommand"] = "RoomRestoreShutterPositionCommand";

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

@@ -1,4 +1,4 @@
-import { PresenceGroupFirstEnterAction, PresenceGroupLastLeftAction } from '../../../models';
+import { PresenceGroupAnyMovementAction, PresenceGroupFirstEnterAction, PresenceGroupLastLeftAction } from '../../../models';
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PresenceGroup extends BaseGroup {
@@ -6,11 +6,13 @@ 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;
     private fireFistEnterCBs;
     addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
@@ -26,5 +28,6 @@ export declare class PresenceGroup extends BaseGroup {
      * In case of an existing delayed last left callback timeout, this removes it.
      */
     private resetLastLeftTimeout;
+    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() {
@@ -44,7 +45,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
             (_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(action, false, 'Presence Group LastLeftCallback'));
         });
-        this.addFirstEnterCallback((action) => {
+        this.addAnyMovementCallback((action) => {
             if (!this.getRoom().settings.lampenBeiBewegung) {
                 return;
             }
@@ -58,6 +59,9 @@ class PresenceGroup extends base_group_1.BaseGroup {
     addLastLeftCallback(cb) {
         this._lastLeftCbs.push(cb);
     }
+    addAnyMovementCallback(cb) {
+        this._anyMovementCbs.push(cb);
+    }
     anyPresent() {
         return this.getMotionDetector().find((b) => b.movementDetected) !== undefined;
     }
@@ -79,6 +83,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
             (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
         }
         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();
@@ -118,6 +123,11 @@ class PresenceGroup extends base_group_1.BaseGroup {
         clearTimeout(this._lastLeftTimeout);
         this._lastLeftTimeout = null;
     }
+    executeAnyMovementCbs(action) {
+        for (const cb of this._anyMovementCbs) {
+            cb(action);
+        }
+    }
     executeLastLeftCbs(action) {
         for (const cb of this._lastLeftCbs) {
             cb(action);

package/lib/server/services/ac/ac-device.d.ts

@@ -96,7 +96,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     /** @inheritDoc */
     persistDeviceInfo(): void;
     protected automaticCheck(): void;
-    private onRoomFirstEnter;
+    private onRoomAnyMovement;
     private onRoomLastLeave;
     /** @inheritDoc */
     toJSON(): Partial<AcDevice>;

package/lib/server/services/ac/ac-device.js

@@ -62,7 +62,7 @@ class AcDevice {
         if (room !== undefined && !this._movementCallbackAdded) {
             this._movementCallbackAdded = true;
             // TODO: Maybe change to any Movement
-            (_a = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.addFirstEnterCallback(this.onRoomFirstEnter.bind(this));
+            (_a = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.addAnyMovementCallback(this.onRoomAnyMovement.bind(this));
             (_b = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.addLastLeftCallback(this.onRoomLastLeave.bind(this));
         }
     }
@@ -295,11 +295,11 @@ class AcDevice {
         }
         this.turnOn();
     }
-    onRoomFirstEnter(_action) {
+    onRoomAnyMovement(_action) {
         if (!this.settings.noCoolingOnMovement || !this.on || this.mode === ac_mode_1.AcMode.Heating) {
             return;
         }
-        this.log(models_1.LogLevel.Info, 'Someone entered the room. Turning off AC');
+        this.log(models_1.LogLevel.Info, 'Something moved in the room. Turning off AC');
         this.turnOff();
     }
     onRoomLastLeave(action) {