hoffmation-base 3.4.8 → 3.4.9

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

@@ -24,6 +24,19 @@ export declare class LightGroup extends BaseGroup implements iLightGroup {
     getOutlets(): iActuator[];
     getAllAsActuator(): iActuator[];
     handleSunriseOff(): void;
+    /**
+     * Whether a switch-off has to be skipped because ambient light owns this actuator.
+     *
+     * Ambient light has priority: while it is active, automation must not switch a
+     * participating actuator off. Only an explicit force action may.
+     *
+     * Callers pass the command that would switch the actuator off; the caller decides
+     * what "off" means, since the time based commands resolve that per device.
+     * @param a - The actuator about to be switched
+     * @param c - The command that would switch it off
+     * @returns Whether the caller has to skip this actuator
+     */
+    private isProtectedByAmbientLight;
     switchAll(c: ActuatorSetStateCommand): void;
     switchTimeConditional(c: LightGroupSwitchTimeConditionalCommand): void;
     setAllLampen(c: LampSetLightCommand): void;

package/lib/devices/groups/lightGroup.js

@@ -49,10 +49,28 @@ class LightGroup extends base_group_1.BaseGroup {
         this.log(enums_1.LogLevel.Info, `Es ist hell genug --> Schalte Lampen im ${this.roomName} aus`);
         this.switchAll(new command_1.ActuatorSetStateCommand(enums_1.CommandSource.Automatic, false, 'LightGroup handleSunriseOff'));
     }
+    /**
+     * Whether a switch-off has to be skipped because ambient light owns this actuator.
+     *
+     * Ambient light has priority: while it is active, automation must not switch a
+     * participating actuator off. Only an explicit force action may.
+     *
+     * Callers pass the command that would switch the actuator off; the caller decides
+     * what "off" means, since the time based commands resolve that per device.
+     * @param a - The actuator about to be switched
+     * @param c - The command that would switch it off
+     * @returns Whether the caller has to skip this actuator
+     */
+    isProtectedByAmbientLight(a, c) {
+        if (!this._ambientLightOn || !a.settings.includeInAmbientLight || c.isForceAction) {
+            return false;
+        }
+        a.logCommand(c, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`, enums_1.LogDebugType.None, enums_1.LogLevel.Info);
+        return true;
+    }
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
-            if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
-                a.logCommand(c, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`, enums_1.LogDebugType.None, enums_1.LogLevel.Info);
+            if (!c.on && this.isProtectedByAmbientLight(a, c)) {
                 return;
             }
             a.setActuator(c);
@@ -101,16 +119,28 @@ class LightGroup extends base_group_1.BaseGroup {
     }
     setAllLampen(c) {
         this.getLights().forEach((s) => {
+            if (!c.on && this.isProtectedByAmbientLight(s, c)) {
+                return;
+            }
             s.setLight(c);
         });
     }
     setAllLampenTimeBased(c) {
         this.getLights().forEach((s) => {
+            // The lamp resolves this to on or off from its own time settings, so it can turn
+            // an ambient lamp off. While ambient light is active a participating lamp is
+            // already on, so skipping can only ever drop a redundant on - never a wanted one.
+            if (this.isProtectedByAmbientLight(s, c)) {
+                return;
+            }
             s.setTimeBased(c);
         });
     }
     setAllOutlets(c) {
         this.getOutlets().forEach((s) => {
+            if (!c.on && this.isProtectedByAmbientLight(s, c)) {
+                return;
+            }
             s.setActuator(c);
         });
     }