hoffmation-base 3.4.8 → 3.5.0

package/lib/api/api-service.d.ts

@@ -1,6 +1,6 @@
 import { BaseGroup, DeviceSettings } from '../devices';
-import { AcMode, ButtonPosition, ButtonPressType, CollisionSolving } from '../enums';
-import { ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, ShutterSetLevelCommand } from '../command';
+import { ButtonPosition, ButtonPressType, CollisionSolving } from '../enums';
+import { AcSetStateCommand, AcWriteStateToDeviceCommand, ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, ShutterSetLevelCommand } from '../command';
 import { iAcDevice, iBaseDevice, iRoomBase, iTemperatureMeasurement } from '../interfaces';
 import { LogObject } from '../logging';
 import { GroupSettings } from '../settingsObjects';
@@ -26,20 +26,17 @@ export declare class API {
     static getRoom(id: string): iRoomBase | undefined;
     static getLog(): LogObject[];
     /**
-     * Turns on/off one AC identified by it's id
-     * @param id - The id of the device, if wrong false will be returned
-     * @param desiredState - The desired state for the AC
-     * @param desiredMode - The desired mode for the AC
-     * @param desiredTemperature - The desired temperature for the AC in Celsius
-     * @param forceTime - The time in ms this should not change before automatic change is allowed again
-     * @returns True if the AC was found and the state was changed
+     * Changes the state of a given AC
+     * @param deviceId - The device Id of the AC
+     * @param c - The command(stack) to perform on the AC including on/off, temp and so on.
+     * @returns In case it failed the Error containing the reason
      */
-    static setAc(id: string, desiredState: boolean, desiredMode?: AcMode, desiredTemperature?: number, forceTime?: number): boolean;
+    static acSetState(deviceId: string, c: AcSetStateCommand): Error | null;
     /**
      * Turns on/off all AC´s in the home
-     * @param desiredState - The desired state for all AC´s
+     * @param c - The command(stack) to perform, built by the caller so the origin is recorded
      */
-    static setAllAc(desiredState: boolean): void;
+    static setAllAc(c: AcWriteStateToDeviceCommand): void;
     /**
      * Changes the status of a given Lamp
      * @param deviceId - The device Id of the lamp

package/lib/api/api-service.js

@@ -72,43 +72,28 @@ class API {
         return logging_1.ServerLogService.getLog();
     }
     /**
-     * Turns on/off one AC identified by it's id
-     * @param id - The id of the device, if wrong false will be returned
-     * @param desiredState - The desired state for the AC
-     * @param desiredMode - The desired mode for the AC
-     * @param desiredTemperature - The desired temperature for the AC in Celsius
-     * @param forceTime - The time in ms this should not change before automatic change is allowed again
-     * @returns True if the AC was found and the state was changed
+     * Changes the state of a given AC
+     * @param deviceId - The device Id of the AC
+     * @param c - The command(stack) to perform on the AC including on/off, temp and so on.
+     * @returns In case it failed the Error containing the reason
      */
-    static setAc(id, desiredState, desiredMode, desiredTemperature, forceTime = 60 * 60 * 1000) {
-        const d = this.getAc(id);
+    static acSetState(deviceId, c) {
+        const d = this.getAc(deviceId);
         if (!d) {
-            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Warn, `AC Device for id ${id} not found`);
-            return false;
+            return new Error(`AC Device for id ${deviceId} not found`);
         }
         if (!d.deviceCapabilities.includes(enums_1.DeviceCapability.ac)) {
-            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Warn, `Device for id ${id} is not an ac`);
-            return false;
-        }
-        if (desiredMode === undefined) {
-            if (!desiredState) {
-                desiredMode = enums_1.AcMode.Off;
-            }
-            else {
-                desiredMode = d.heatingAllowed ? enums_1.AcMode.Heating : enums_1.AcMode.Cooling;
-            }
+            return new Error(`Device for id ${deviceId} is not an ac`);
         }
-        d.log(enums_1.LogLevel.Info, `API Call to set AC to ${desiredState} with mode ${desiredMode} for ${forceTime}ms`);
-        d.setState(desiredMode, desiredTemperature, forceTime);
-        return true;
+        d.setAcState(c);
+        return null;
     }
     /**
      * Turns on/off all AC´s in the home
-     * @param desiredState - The desired state for all AC´s
+     * @param c - The command(stack) to perform, built by the caller so the origin is recorded
      */
-    static setAllAc(desiredState) {
-        services_1.DaikinService.setAll(desiredState, true);
-        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `API Call to set all AC´s to ${desiredState}`);
+    static setAllAc(c) {
+        services_1.DaikinService.setAll(c, true);
     }
     /**
      * Changes the status of a given Lamp

package/lib/command/acPerformAutomaticCheckCommand.d.ts

@@ -0,0 +1,18 @@
+import { BaseCommand } from './baseCommand';
+import { CommandSource, CommandType } from '../enums';
+import { iBaseCommand } from './iBaseCommand';
+export declare class AcPerformAutomaticCheckCommand extends BaseCommand {
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * Command asking an air-conditioning device to re-evaluate what its state should be.
+     *
+     * The check itself has several possible triggers - the recurring interval, a lifted
+     * automatic block, or an outside caller. Each supplies its own source and reason here, so
+     * the resulting device command can be traced back to what asked for the re-evaluation.
+     * @param source - The event this check results from
+     * @param reason - What triggered the check
+     */
+    constructor(source: CommandSource | iBaseCommand, reason?: string);
+    get logMessage(): string;
+}

package/lib/command/acPerformAutomaticCheckCommand.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcPerformAutomaticCheckCommand = void 0;
+const baseCommand_1 = require("./baseCommand");
+const enums_1 = require("../enums");
+class AcPerformAutomaticCheckCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command asking an air-conditioning device to re-evaluate what its state should be.
+     *
+     * The check itself has several possible triggers - the recurring interval, a lifted
+     * automatic block, or an outside caller. Each supplies its own source and reason here, so
+     * the resulting device command can be traced back to what asked for the re-evaluation.
+     * @param source - The event this check results from
+     * @param reason - What triggered the check
+     */
+    constructor(source, reason = '') {
+        super(source, reason);
+        /** @inheritDoc */
+        this.type = enums_1.CommandType.AcPerformAutomaticCheckCommand;
+    }
+    get logMessage() {
+        return `Ac perform automatic check for reason: ${this.reasonTrace}`;
+    }
+}
+exports.AcPerformAutomaticCheckCommand = AcPerformAutomaticCheckCommand;

package/lib/command/acSetStateCommand.d.ts

@@ -0,0 +1,34 @@
+import { BaseCommand } from './baseCommand';
+import { AcMode, CommandSource, CommandType } from '../enums';
+import { BlockAutomaticCommand } from './blockAutomaticCommand';
+import { iBaseCommand } from './iBaseCommand';
+export declare class AcSetStateCommand extends BaseCommand {
+    readonly mode: AcMode | undefined;
+    readonly desiredTemperature: number | undefined;
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * The command to disable automatic actions for a specific duration.
+     * Null = no automatic actions will be disabled.
+     * Undefined = no automatic actions will be disabled.
+     */
+    disableAutomaticCommand: BlockAutomaticCommand | null | undefined;
+    /**
+     * Command to set the state of an air-conditioning device
+     * @param source - The source of the command
+     * @param mode - The desired mode; {@link AcMode.Off} turns the device off. Leave undefined
+     * to just switch it on and let the device pick the mode, which depends on season and settings
+     * it alone knows.
+     * @param desiredTemperature - The desired temperature; if unset the device calculates it
+     * @param reason - You can provide a reason for clarification
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the
+     * given disable action. Automatic decisions pass nothing here, so they do not block themselves.
+     */
+    constructor(source: CommandSource | iBaseCommand, mode: AcMode | undefined, desiredTemperature?: number | undefined, reason?: string, disableAutomatic?: BlockAutomaticCommand | null);
+    /**
+     * Whether this command results in the device running
+     * @returns True unless the desired mode is {@link AcMode.Off}
+     */
+    get on(): boolean;
+    get logMessage(): string;
+}

package/lib/command/acSetStateCommand.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcSetStateCommand = void 0;
+const baseCommand_1 = require("./baseCommand");
+const enums_1 = require("../enums");
+class AcSetStateCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command to set the state of an air-conditioning device
+     * @param source - The source of the command
+     * @param mode - The desired mode; {@link AcMode.Off} turns the device off. Leave undefined
+     * to just switch it on and let the device pick the mode, which depends on season and settings
+     * it alone knows.
+     * @param desiredTemperature - The desired temperature; if unset the device calculates it
+     * @param reason - You can provide a reason for clarification
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the
+     * given disable action. Automatic decisions pass nothing here, so they do not block themselves.
+     */
+    constructor(source, mode, desiredTemperature = undefined, reason = '', disableAutomatic) {
+        super(source, reason);
+        this.mode = mode;
+        this.desiredTemperature = desiredTemperature;
+        /** @inheritDoc */
+        this.type = enums_1.CommandType.AcSetStateCommand;
+        this.disableAutomaticCommand = disableAutomatic;
+    }
+    /**
+     * Whether this command results in the device running
+     * @returns True unless the desired mode is {@link AcMode.Off}
+     */
+    get on() {
+        return this.mode !== enums_1.AcMode.Off;
+    }
+    get logMessage() {
+        var _a;
+        const temp = this.desiredTemperature !== undefined ? ` at ${this.desiredTemperature}°C` : ' at calculated temperature';
+        const mode = this.mode !== undefined ? enums_1.AcMode[this.mode] : 'device default';
+        return `Ac setState to mode ${mode}${temp} with disableCommand ${(_a = this.disableAutomaticCommand) === null || _a === void 0 ? void 0 : _a.logMessage} for reason: ${this.reasonTrace}`;
+    }
+}
+exports.AcSetStateCommand = AcSetStateCommand;

package/lib/command/acWriteStateToDeviceCommand.d.ts

@@ -0,0 +1,25 @@
+import { BaseCommand } from './baseCommand';
+import { CommandSource, CommandType } from '../enums';
+import { BlockAutomaticCommand } from './blockAutomaticCommand';
+import { iBaseCommand } from './iBaseCommand';
+export declare class AcWriteStateToDeviceCommand extends BaseCommand {
+    readonly on: boolean;
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * The command to disable automatic actions for a specific duration.
+     * A block is not a device setting, so a pure power write can carry one too.
+     * Undefined = no automatic actions will be disabled.
+     */
+    disableAutomaticCommand: BlockAutomaticCommand | null | undefined;
+    /**
+     * Command to write the power state of an air-conditioning device to the device itself
+     * @param source - The source of the command
+     * @param on - The new power state
+     * @param reason - You can provide a reason for clarification
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the
+     * given disable action
+     */
+    constructor(source: CommandSource | iBaseCommand, on: boolean, reason?: string, disableAutomatic?: BlockAutomaticCommand | null);
+    get logMessage(): string;
+}

package/lib/command/acWriteStateToDeviceCommand.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcWriteStateToDeviceCommand = void 0;
+const baseCommand_1 = require("./baseCommand");
+const enums_1 = require("../enums");
+const acSetStateCommand_1 = require("./acSetStateCommand");
+class AcWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command to write the power state of an air-conditioning device to the device itself
+     * @param source - The source of the command
+     * @param on - The new power state
+     * @param reason - You can provide a reason for clarification
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the
+     * given disable action
+     */
+    constructor(source, on, reason = '', disableAutomatic) {
+        super(source, reason);
+        this.on = on;
+        /** @inheritDoc */
+        this.type = enums_1.CommandType.AcWriteStateToDeviceCommand;
+        this.disableAutomaticCommand = disableAutomatic;
+    }
+    get logMessage() {
+        if (this.source instanceof acSetStateCommand_1.AcSetStateCommand) {
+            return `Ac Write StateToDevice original Log-message: ${this.source.logMessage}`;
+        }
+        return `Ac writeStateToDevice(${this.on}) for reason: ${this.reasonTrace}`;
+    }
+}
+exports.AcWriteStateToDeviceCommand = AcWriteStateToDeviceCommand;

package/lib/command/excessEnergyConsumerSetStateCommand.d.ts

@@ -0,0 +1,19 @@
+import { BaseCommand } from './baseCommand';
+import { CommandSource, CommandType } from '../enums';
+import { iBaseCommand } from './iBaseCommand';
+export declare class ExcessEnergyConsumerSetStateCommand extends BaseCommand {
+    readonly on: boolean;
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * Command from the energy manager asking a consumer to start or stop.
+     *
+     * Carries the measurement the decision was based on, so the resulting device command can be
+     * traced back to why the manager acted rather than just that it did.
+     * @param source - The event this decision results from
+     * @param on - Whether the consumer should run
+     * @param reason - The energy situation that triggered the decision
+     */
+    constructor(source: CommandSource | iBaseCommand, on: boolean, reason?: string);
+    get logMessage(): string;
+}

package/lib/command/excessEnergyConsumerSetStateCommand.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExcessEnergyConsumerSetStateCommand = void 0;
+const baseCommand_1 = require("./baseCommand");
+const enums_1 = require("../enums");
+class ExcessEnergyConsumerSetStateCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command from the energy manager asking a consumer to start or stop.
+     *
+     * Carries the measurement the decision was based on, so the resulting device command can be
+     * traced back to why the manager acted rather than just that it did.
+     * @param source - The event this decision results from
+     * @param on - Whether the consumer should run
+     * @param reason - The energy situation that triggered the decision
+     */
+    constructor(source, on, reason = '') {
+        super(source, reason);
+        this.on = on;
+        /** @inheritDoc */
+        this.type = enums_1.CommandType.ExcessEnergyConsumerSetStateCommand;
+    }
+    get logMessage() {
+        return `Excess energy consumer setState to ${this.on} for reason: ${this.reasonTrace}`;
+    }
+}
+exports.ExcessEnergyConsumerSetStateCommand = ExcessEnergyConsumerSetStateCommand;

package/lib/command/index.d.ts

@@ -2,6 +2,10 @@ export { BlockAutomaticCommand } from './blockAutomaticCommand';
 export { BlockAutomaticUntilCommand } from './blockAutomaticUntilCommand';
 export { BlockAutomaticLiftBlockCommand } from './blockAutomaticLiftBlockCommand';
 export { RestoreTargetAutomaticValueCommand } from './restoreTargetAutomaticValueCommand';
+export { AcPerformAutomaticCheckCommand } from './acPerformAutomaticCheckCommand';
+export { ExcessEnergyConsumerSetStateCommand } from './excessEnergyConsumerSetStateCommand';
+export { AcSetStateCommand } from './acSetStateCommand';
+export { AcWriteStateToDeviceCommand } from './acWriteStateToDeviceCommand';
 export { ActuatorSetStateCommand } from './actuatorSetStateCommand';
 export { ActuatorToggleCommand } from './actuatorToggleCommand';
 export { ActuatorWriteStateToDeviceCommand } from './actuatorWriteStateToDeviceCommand';

package/lib/command/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WledSetLightCommand = exports.WindowSetRolloByWeatherStatusCommand = exports.WindowSetDesiredPositionCommand = exports.WindowRestoreDesiredPositionCommand = exports.ShutterSunsetDownCommand = exports.ShutterSunriseUpCommand = exports.ShutterSetLevelCommand = exports.RoomSetLightTimeBasedCommand = exports.RoomRestoreShutterPositionCommand = exports.RoomRestoreLightCommand = exports.LightGroupSwitchTimeConditionalCommand = exports.LedSetLightCommand = exports.LampToggleLightCommand = exports.LampSetTimeBasedCommand = exports.LampSetLightCommand = exports.FloorSetAllShuttersCommand = exports.DimmerSetLightCommand = exports.BaseCommand = exports.ActuatorWriteStateToDeviceCommand = exports.ActuatorToggleCommand = exports.ActuatorSetStateCommand = exports.RestoreTargetAutomaticValueCommand = exports.BlockAutomaticLiftBlockCommand = exports.BlockAutomaticUntilCommand = exports.BlockAutomaticCommand = void 0;
+exports.WledSetLightCommand = exports.WindowSetRolloByWeatherStatusCommand = exports.WindowSetDesiredPositionCommand = exports.WindowRestoreDesiredPositionCommand = exports.ShutterSunsetDownCommand = exports.ShutterSunriseUpCommand = exports.ShutterSetLevelCommand = exports.RoomSetLightTimeBasedCommand = exports.RoomRestoreShutterPositionCommand = exports.RoomRestoreLightCommand = exports.LightGroupSwitchTimeConditionalCommand = exports.LedSetLightCommand = exports.LampToggleLightCommand = exports.LampSetTimeBasedCommand = exports.LampSetLightCommand = exports.FloorSetAllShuttersCommand = exports.DimmerSetLightCommand = exports.BaseCommand = exports.ActuatorWriteStateToDeviceCommand = exports.ActuatorToggleCommand = exports.ActuatorSetStateCommand = exports.AcWriteStateToDeviceCommand = exports.AcSetStateCommand = exports.ExcessEnergyConsumerSetStateCommand = exports.AcPerformAutomaticCheckCommand = exports.RestoreTargetAutomaticValueCommand = exports.BlockAutomaticLiftBlockCommand = exports.BlockAutomaticUntilCommand = exports.BlockAutomaticCommand = void 0;
 var blockAutomaticCommand_1 = require("./blockAutomaticCommand");
 Object.defineProperty(exports, "BlockAutomaticCommand", { enumerable: true, get: function () { return blockAutomaticCommand_1.BlockAutomaticCommand; } });
 var blockAutomaticUntilCommand_1 = require("./blockAutomaticUntilCommand");
@@ -9,6 +9,14 @@ var blockAutomaticLiftBlockCommand_1 = require("./blockAutomaticLiftBlockCommand
 Object.defineProperty(exports, "BlockAutomaticLiftBlockCommand", { enumerable: true, get: function () { return blockAutomaticLiftBlockCommand_1.BlockAutomaticLiftBlockCommand; } });
 var restoreTargetAutomaticValueCommand_1 = require("./restoreTargetAutomaticValueCommand");
 Object.defineProperty(exports, "RestoreTargetAutomaticValueCommand", { enumerable: true, get: function () { return restoreTargetAutomaticValueCommand_1.RestoreTargetAutomaticValueCommand; } });
+var acPerformAutomaticCheckCommand_1 = require("./acPerformAutomaticCheckCommand");
+Object.defineProperty(exports, "AcPerformAutomaticCheckCommand", { enumerable: true, get: function () { return acPerformAutomaticCheckCommand_1.AcPerformAutomaticCheckCommand; } });
+var excessEnergyConsumerSetStateCommand_1 = require("./excessEnergyConsumerSetStateCommand");
+Object.defineProperty(exports, "ExcessEnergyConsumerSetStateCommand", { enumerable: true, get: function () { return excessEnergyConsumerSetStateCommand_1.ExcessEnergyConsumerSetStateCommand; } });
+var acSetStateCommand_1 = require("./acSetStateCommand");
+Object.defineProperty(exports, "AcSetStateCommand", { enumerable: true, get: function () { return acSetStateCommand_1.AcSetStateCommand; } });
+var acWriteStateToDeviceCommand_1 = require("./acWriteStateToDeviceCommand");
+Object.defineProperty(exports, "AcWriteStateToDeviceCommand", { enumerable: true, get: function () { return acWriteStateToDeviceCommand_1.AcWriteStateToDeviceCommand; } });
 var actuatorSetStateCommand_1 = require("./actuatorSetStateCommand");
 Object.defineProperty(exports, "ActuatorSetStateCommand", { enumerable: true, get: function () { return actuatorSetStateCommand_1.ActuatorSetStateCommand; } });
 var actuatorToggleCommand_1 = require("./actuatorToggleCommand");

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

@@ -1,6 +1,8 @@
 import { iHeater, iHeatGroup, iHumidityCollector, iTemperatureCollector } from '../../interfaces';
 import { HeatGroupSettings, TemperatureSettings } from '../../settingsObjects';
+import { CommandSource } from '../../enums';
 import { AcDevice } from '../../services';
+import { iBaseCommand } from '../../command';
 import { BaseGroup } from './base-group';
 export declare class HeatGroup extends BaseGroup implements iHeatGroup {
     /** @inheritDoc */
@@ -25,11 +27,12 @@ export declare class HeatGroup extends BaseGroup implements iHeatGroup {
     initialize(): void;
     /**
      * Sets all ACs to new desired Value
-     * 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
+     * @param source - The event this results from, so the device command can be traced back to it.
+     * Whether this counts as a force action is derived from it, which is what the former
+     * `force` flag encoded.
      */
-    setAc(newDesiredState: boolean, force?: boolean): void;
+    setAc(newDesiredState: boolean, source: CommandSource | iBaseCommand): void;
     deleteAutomaticPoint(name: string): void;
     setAutomaticPoint(setting: TemperatureSettings): void;
     recalcRoomTemperatur(): void;

package/lib/devices/groups/heatGroup.js

@@ -140,20 +140,21 @@ class HeatGroup extends base_group_1.BaseGroup {
     }
     /**
      * Sets all ACs to new desired Value
-     * 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
+     * @param source - The event this results from, so the device command can be traced back to it.
+     * Whether this counts as a force action is derived from it, which is what the former
+     * `force` flag encoded.
      */
-    setAc(newDesiredState, force = false) {
+    setAc(newDesiredState, source) {
         const devs = this.getOwnAcDevices();
         this.log(enums_1.LogLevel.Debug, `set ${devs.length} Ac's to new State: ${newDesiredState}`);
         for (const dev of devs) {
-            if (newDesiredState) {
-                dev.turnOn();
-                continue;
-            }
-            dev.turnOff();
-            dev.blockAutomationHandler.disableAutomatic(new command_1.BlockAutomaticCommand(force ? enums_1.CommandSource.Force : enums_1.CommandSource.Unknown, 60 * 60 * 1000));
+            dev.setAcState(new command_1.AcSetStateCommand(source, 
+            // Undefined mode means "just switch it on"; the device resolves which mode that is.
+            newDesiredState ? undefined : enums_1.AcMode.Off, undefined, 'HeatGroup setAc', 
+            // The block travels inside the command so setAcState applies it centrally. As
+            // before, only switching off pins the automatic.
+            newDesiredState ? undefined : new command_1.BlockAutomaticCommand(source, 60 * 60 * 1000)));
         }
     }
     deleteAutomaticPoint(name) {

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);
         });
     }

package/lib/devices/groups/tasterGroup.js

@@ -70,6 +70,9 @@ class TasterGroup extends base_group_1.BaseGroup {
                     }, 'Play Radio');
                 }
             }
+            // TODO: Migrate buttons to the new Command System. addCb only yields a boolean, so the
+            // press itself is not an action that could be chained - which button and whether it was
+            // short or long is therefore lost before it reaches the device.
             if (((_j = settings_service_1.SettingsService.settings.daikin) === null || _j === void 0 ? void 0 : _j.buttonBotRightForAc) === true) {
                 const heatGroup = this.getRoom().HeatGroup;
                 if (heatGroup !== undefined && heatGroup.getOwnAcDevices().length > 0) {
@@ -77,13 +80,13 @@ class TasterGroup extends base_group_1.BaseGroup {
                         if (!pValue) {
                             return;
                         }
-                        heatGroup.setAc(true, false);
+                        heatGroup.setAc(true, enums_1.CommandSource.Manual);
                     }, 'Turn Ac On');
                     (_l = t.buttonBotRight) === null || _l === void 0 ? void 0 : _l.addCb(enums_1.ButtonPressType.long, (pValue) => {
                         if (!pValue) {
                             return;
                         }
-                        heatGroup.setAc(false, true);
+                        heatGroup.setAc(false, enums_1.CommandSource.Force);
                     }, 'Turn Ac Off');
                 }
             }

package/lib/devices/jsObject/jsObjectEnergyManager.js

@@ -5,6 +5,7 @@ const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
 const utils_1 = require("../../utils");
 const models_1 = require("../../models");
 const enums_1 = require("../../enums");
+const command_1 = require("../../command");
 const models_2 = require("../models");
 class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(info) {
@@ -166,8 +167,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
         if (result.newState) {
             this.blockDeviceChangeTime = utils_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
-            result.device.log(enums_1.LogLevel.Info, `Turning on, as we have ${this.excessEnergy}W to spare...`);
-            result.device.turnOnForExcessEnergy();
+            result.device.setExcessEnergyState(new command_1.ExcessEnergyConsumerSetStateCommand(enums_1.CommandSource.Automatic, true, `Energy manager has ${this.excessEnergy}W to spare`));
             this._lastDeviceChange = result;
         }
     }
@@ -179,8 +179,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
         if (!result.newState) {
             this.blockDeviceChangeTime = utils_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
-            result.device.log(enums_1.LogLevel.Info, "Turning off, as we don't have energy to spare...");
-            result.device.turnOffDueToMissingEnergy();
+            result.device.setExcessEnergyState(new command_1.ExcessEnergyConsumerSetStateCommand(enums_1.CommandSource.Automatic, false, `Energy manager is short of energy at ${this.excessEnergy}W`));
             this._lastDeviceChange = result;
         }
     }

package/lib/devices/tv/tvDevice.d.ts

@@ -1,4 +1,5 @@
 import { DeviceCapability, DeviceType, TvDeviceType } from '../../enums';
+import { ExcessEnergyConsumerSetStateCommand } from '../../command';
 import { iTvDevice } from '../../interfaces';
 import { TvSettings } from '../../settingsObjects';
 import { RoomBaseDevice } from '../RoomBaseDevice';
@@ -19,7 +20,7 @@ export declare abstract class TvDevice extends RoomBaseDevice implements iTvDevi
     abstract volumeUp(): void;
     abstract turnOn(): void;
     abstract turnOff(): void;
-    turnOffDueToMissingEnergy(): void;
+    setExcessEnergyState(c: ExcessEnergyConsumerSetStateCommand): void;
     automaticCheck(): void;
     toJSON(): Partial<TvDevice>;
 }

package/lib/devices/tv/tvDevice.js

@@ -33,7 +33,11 @@ class TvDevice extends RoomBaseDevice_1.RoomBaseDevice {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
     }
-    turnOffDueToMissingEnergy() {
+    setExcessEnergyState(c) {
+        // A TV is never switched on to burn surplus energy, only off when it runs short.
+        if (c.on) {
+            return;
+        }
         this.turnOff();
     }
     automaticCheck() {

package/lib/devices/victron/victron-device.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VictronDevice = void 0;
 const enums_1 = require("../../enums");
+const command_1 = require("../../command");
 const settingsObjects_1 = require("../../settingsObjects");
 const sharedFunctions_1 = require("../sharedFunctions");
 const DeviceInfo_1 = require("../DeviceInfo");
@@ -212,8 +213,7 @@ class VictronDevice extends BaseDevice_1.BaseDevice {
         }
         if (result.newState) {
             this.blockDeviceChangeTime = utils_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
-            result.device.log(enums_1.LogLevel.Info, `Turning on, as we have ${this.excessEnergy}W to spare...`);
-            result.device.turnOnForExcessEnergy();
+            result.device.setExcessEnergyState(new command_1.ExcessEnergyConsumerSetStateCommand(enums_1.CommandSource.Automatic, true, `Energy manager has ${this.excessEnergy}W to spare`));
             this._lastDeviceChange = result;
         }
     }
@@ -225,8 +225,7 @@ class VictronDevice extends BaseDevice_1.BaseDevice {
         }
         if (!result.newState) {
             this.blockDeviceChangeTime = utils_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
-            result.device.log(enums_1.LogLevel.Info, "Turning off, as we don't have energy to spare...");
-            result.device.turnOffDueToMissingEnergy();
+            result.device.setExcessEnergyState(new command_1.ExcessEnergyConsumerSetStateCommand(enums_1.CommandSource.Automatic, false, `Energy manager is short of energy at ${this.excessEnergy}W`));
             this._lastDeviceChange = result;
         }
     }

package/lib/devices/zigbee/zigbeeBlitzShp.d.ts

@@ -3,6 +3,7 @@ import { ZigbeeActuator } from './BaseDevices';
 import { iExcessEnergyConsumer } from '../../interfaces';
 import { iLoadMeter } from '../../interfaces/baseDevices/iLoadMeter';
 import { ActuatorSettings, ExcessEnergyConsumerSettings } from '../../settingsObjects';
+import { ExcessEnergyConsumerSetStateCommand } from '../../command';
 export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEnergyConsumer, iLoadMeter {
     /** @inheritDoc */
     settings: ActuatorSettings;
@@ -29,9 +30,7 @@ export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEne
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
-    turnOnForExcessEnergy(): void;
-    /** @inheritDoc */
-    turnOffDueToMissingEnergy(): void;
+    setExcessEnergyState(c: ExcessEnergyConsumerSetStateCommand): void;
     /** @inheritDoc */
     wasActivatedByExcessEnergy(): boolean;
 }