hoffmation-base 3.0.0-alpha.19 → 3.0.0-alpha.20

package/lib/models/command/ShutterSetLevelCommand.js

@@ -4,6 +4,7 @@ exports.ShutterSetLevelCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class ShutterSetLevelCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, level, reason = '', skipOpenWarning = false) {
         super(source, reason);
         this.level = level;

package/lib/models/command/WindowRestoreDesiredPositionCommand.js

@@ -4,6 +4,7 @@ exports.WindowRestoreDesiredPositionCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class WindowRestoreDesiredPositionCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.WindowRestoreDesiredPositionCommand;

package/lib/models/command/WindowSetDesiredPositionCommand.js

@@ -4,6 +4,7 @@ exports.WindowSetDesiredPositionCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class WindowSetDesiredPositionCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, position, reason = '') {
         super(source, reason);
         this.position = position;

package/lib/models/command/WindowSetRolloByWeatherStatusCommand.js

@@ -4,6 +4,7 @@ exports.WindowSetRolloByWeatherStatusCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class WindowSetRolloByWeatherStatusCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.WindowSetRolloByWeatherStatusCommand;

package/lib/models/command/actuatorSetStateCommand.js

@@ -4,6 +4,7 @@ exports.ActuatorSetStateCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class ActuatorSetStateCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, on, reason = '', timeout = -1) {
         super(source, reason);
         this.on = on;

package/lib/models/command/actuatorToggleCommand.js

@@ -4,6 +4,7 @@ exports.ActuatorToggleCommand = void 0;
 const commandType_1 = require("./commandType");
 const baseCommand_1 = require("./baseCommand");
 class ActuatorToggleCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.ActuatorToggleCommand;

package/lib/models/command/actuatorWriteStateToDeviceCommand.js

@@ -5,6 +5,7 @@ const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 const actuatorSetStateCommand_1 = require("./actuatorSetStateCommand");
 class ActuatorWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, stateValue, reason = '') {
         super(source, reason);
         this.stateValue = stateValue;

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

@@ -5,7 +5,7 @@ export declare abstract class BaseCommand {
     readonly reason: string;
     readonly timestamp: Date;
     abstract _commandType: CommandType;
-    constructor(source?: CommandSource | BaseCommand, reason?: string);
+    protected constructor(source?: CommandSource | BaseCommand, reason?: string);
     get isAutomaticAction(): boolean;
     get isForceAction(): boolean;
     get isManual(): boolean;

package/lib/models/command/baseCommand.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommand = void 0;
 const commandSource_1 = require("./commandSource");
 class BaseCommand {
+    // TODO: Missing Comment
     constructor(source = commandSource_1.CommandSource.Unknown, reason = '') {
         this.source = source;
         this.reason = reason;

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

@@ -0,0 +1,17 @@
+import { CommandType } from './commandType';
+import { CommandSource } from './commandSource';
+import { CollisionSolving } from '../collisionSolving';
+import { BaseCommand } from './baseCommand';
+export declare class BlockAutomaticCommand extends BaseCommand {
+    durationMS: number;
+    onCollideAction: CollisionSolving;
+    _commandType: CommandType;
+    /**
+     * Command to disable automatic actions for a specific duration.
+     * @param {CommandSource} source The source of the command.
+     * @param {number} durationMS The duration in milliseconds for the automatic actions to be disabled.
+     * @param reason You can provide an individual reason here for debugging purpose.
+     * @param {CollisionSolving} onCollideAction The action to take if a block is already active. --> Default: overrideIfGreater
+     */
+    constructor(source: CommandSource | BaseCommand, durationMS: number, reason?: string, onCollideAction?: CollisionSolving);
+}

package/lib/models/command/blockAutomaticCommand.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockAutomaticCommand = void 0;
+const commandType_1 = require("./commandType");
+const collisionSolving_1 = require("../collisionSolving");
+const baseCommand_1 = require("./baseCommand");
+class BlockAutomaticCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command to disable automatic actions for a specific duration.
+     * @param {CommandSource} source The source of the command.
+     * @param {number} durationMS The duration in milliseconds for the automatic actions to be disabled.
+     * @param reason You can provide an individual reason here for debugging purpose.
+     * @param {CollisionSolving} onCollideAction The action to take if a block is already active. --> Default: overrideIfGreater
+     */
+    constructor(source, durationMS, reason = '', onCollideAction = collisionSolving_1.CollisionSolving.overrideIfGreater) {
+        super(source, reason);
+        this.durationMS = durationMS;
+        this.onCollideAction = onCollideAction;
+        this._commandType = commandType_1.CommandType.BlockAutomaticCommand;
+    }
+}
+exports.BlockAutomaticCommand = BlockAutomaticCommand;

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

@@ -0,0 +1,12 @@
+import { CommandType } from './commandType';
+import { CommandSource } from './commandSource';
+import { BaseCommand } from './baseCommand';
+export declare class BlockAutomaticLiftBlockCommand extends BaseCommand {
+    _commandType: CommandType;
+    /**
+     * Command to lift a block --> Restore the automatic actions.
+     * @param {CommandSource | BaseCommand} source The source of the command.
+     * @param {string} reason You can provide an individual reason here for debugging purpose.
+     */
+    constructor(source: CommandSource | BaseCommand, reason?: string);
+}

package/lib/models/command/blockAutomaticLiftBlockCommand.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockAutomaticLiftBlockCommand = void 0;
+const commandType_1 = require("./commandType");
+const baseCommand_1 = require("./baseCommand");
+class BlockAutomaticLiftBlockCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command to lift a block --> Restore the automatic actions.
+     * @param {CommandSource | BaseCommand} source The source of the command.
+     * @param {string} reason You can provide an individual reason here for debugging purpose.
+     */
+    constructor(source, reason = '') {
+        super(source, reason);
+        this._commandType = commandType_1.CommandType.BlockAutomaticLiftBlockCommand;
+    }
+}
+exports.BlockAutomaticLiftBlockCommand = BlockAutomaticLiftBlockCommand;

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

@@ -0,0 +1,17 @@
+import { CommandType } from './commandType';
+import { CommandSource } from './commandSource';
+import { CollisionSolving } from '../collisionSolving';
+import { BaseCommand } from './baseCommand';
+export declare class BlockAutomaticUntilCommand extends BaseCommand {
+    targetDate: Date;
+    onCollideAction: CollisionSolving;
+    _commandType: CommandType;
+    /**
+     * Command to disable automatic actions until a specific date.
+     * @param {CommandSource} source The source of the command.
+     * @param {Date} targetDate The date until the automatic actions will be disabled.
+     * @param reason You can provide an individual reason here for debugging purpose.
+     * @param {CollisionSolving} onCollideAction The action to take if a block is already active. --> Default: overrideIfGreater
+     */
+    constructor(source: CommandSource | BaseCommand, targetDate: Date, reason?: string, onCollideAction?: CollisionSolving);
+}

package/lib/models/command/blockAutomaticUntilCommand.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockAutomaticUntilCommand = void 0;
+const commandType_1 = require("./commandType");
+const collisionSolving_1 = require("../collisionSolving");
+const baseCommand_1 = require("./baseCommand");
+class BlockAutomaticUntilCommand extends baseCommand_1.BaseCommand {
+    /**
+     * Command to disable automatic actions until a specific date.
+     * @param {CommandSource} source The source of the command.
+     * @param {Date} targetDate The date until the automatic actions will be disabled.
+     * @param reason You can provide an individual reason here for debugging purpose.
+     * @param {CollisionSolving} onCollideAction The action to take if a block is already active. --> Default: overrideIfGreater
+     */
+    constructor(source, targetDate, reason = '', onCollideAction = collisionSolving_1.CollisionSolving.overrideIfGreater) {
+        super(source, reason);
+        this.targetDate = targetDate;
+        this.onCollideAction = onCollideAction;
+        this._commandType = commandType_1.CommandType.BlockAutomaticUntilCommand;
+    }
+}
+exports.BlockAutomaticUntilCommand = BlockAutomaticUntilCommand;

package/lib/models/command/commandSource.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandSource = void 0;
+// TODO: Missing Comment
 var CommandSource;
 (function (CommandSource) {
     CommandSource[CommandSource["Unknown"] = 0] = "Unknown";

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

@@ -1,4 +1,7 @@
 export declare enum CommandType {
+    BlockAutomaticLiftBlockCommand = "BlockAutomaticLiftBlockCommand",
+    BlockAutomaticCommand = "BlockAutomaticCommand",
+    BlockAutomaticUntilCommand = "BlockAutomaticUntilCommand",
     ActuatorToggleCommand = "ActuatorToggleCommand",
     ActuatorSetStateCommand = "ActuatorSetStateCommand",
     ActuatorRestoreTargetAutomaticValueCommand = "ActuatorRestoreTargetAutomaticValueCommand",

package/lib/models/command/commandType.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandType = void 0;
 var CommandType;
 (function (CommandType) {
+    CommandType["BlockAutomaticLiftBlockCommand"] = "BlockAutomaticLiftBlockCommand";
+    CommandType["BlockAutomaticCommand"] = "BlockAutomaticCommand";
+    CommandType["BlockAutomaticUntilCommand"] = "BlockAutomaticUntilCommand";
     CommandType["ActuatorToggleCommand"] = "ActuatorToggleCommand";
     CommandType["ActuatorSetStateCommand"] = "ActuatorSetStateCommand";
     CommandType["ActuatorRestoreTargetAutomaticValueCommand"] = "ActuatorRestoreTargetAutomaticValueCommand";

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

@@ -1,3 +1,6 @@
+export { BlockAutomaticCommand } from './blockAutomaticCommand';
+export { BlockAutomaticUntilCommand } from './blockAutomaticUntilCommand';
+export { BlockAutomaticLiftBlockCommand } from './blockAutomaticLiftBlockCommand';
 export { RestoreTargetAutomaticValueCommand } from './restoreTargetAutomaticValueCommand';
 export { ActuatorSetStateCommand } from './actuatorSetStateCommand';
 export { ActuatorToggleCommand } from './actuatorToggleCommand';

package/lib/models/command/index.js

@@ -1,6 +1,12 @@
 "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.CommandType = exports.CommandSource = exports.BaseCommand = exports.ActuatorWriteStateToDeviceCommand = exports.ActuatorToggleCommand = exports.ActuatorSetStateCommand = exports.RestoreTargetAutomaticValueCommand = 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.CommandType = exports.CommandSource = exports.BaseCommand = exports.ActuatorWriteStateToDeviceCommand = exports.ActuatorToggleCommand = exports.ActuatorSetStateCommand = 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");
+Object.defineProperty(exports, "BlockAutomaticUntilCommand", { enumerable: true, get: function () { return blockAutomaticUntilCommand_1.BlockAutomaticUntilCommand; } });
+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 actuatorSetStateCommand_1 = require("./actuatorSetStateCommand");

package/lib/models/command/lampSetLightCommand.js

@@ -4,6 +4,7 @@ exports.LampSetLightCommand = void 0;
 const commandType_1 = require("./commandType");
 const actuatorSetStateCommand_1 = require("./actuatorSetStateCommand");
 class LampSetLightCommand extends actuatorSetStateCommand_1.ActuatorSetStateCommand {
+    // TODO: Missing Comment
     constructor(source, on, reason = '', timeout = -1) {
         super(source, on, reason, timeout);
         this._commandType = commandType_1.CommandType.LampSetLightCommand;

package/lib/models/command/ledSetLightCommand.js

@@ -25,6 +25,7 @@ class LedSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand {
     get logMessage() {
         return `Led setLight to state: ${this.on}, timeout: ${this.timeout}, brightness: ${this.brightness}, color: ${this.color}, colorTemp: ${this.colorTemp} for reason: ${this.reasonTrace}`;
     }
+    // TODO: Missing Comment
     static byTimeBased(settings, c) {
         switch (c.time) {
             case timeCallback_1.TimeOfDay.Daylight:

package/lib/models/command/lightGroupSwitchTimeConditionalCommand.js

@@ -4,6 +4,7 @@ exports.LightGroupSwitchTimeConditionalCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class LightGroupSwitchTimeConditionalCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, time, reason = '') {
         super(source, reason);
         this.time = time;

package/lib/models/command/restoreTargetAutomaticValueCommand.js

@@ -4,6 +4,7 @@ exports.RestoreTargetAutomaticValueCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class RestoreTargetAutomaticValueCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand;

package/lib/models/command/roomRestoreLightCommand.js

@@ -4,6 +4,7 @@ exports.RoomRestoreLightCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class RoomRestoreLightCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.RoomRestoreLightCommand;

package/lib/models/command/roomRestoreShutterPositionCommand.js

@@ -4,6 +4,7 @@ exports.RoomRestoreShutterPositionCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class RoomRestoreShutterPositionCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, recalc = false, reason = '') {
         super(source, reason);
         this.recalc = recalc;

package/lib/models/command/shutterSunriseUpCommand.js

@@ -4,6 +4,7 @@ exports.ShutterSunriseUpCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class ShutterSunriseUpCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.ShutterSunriseUpCommand;

package/lib/models/command/shutterSunsetDownCommand.js

@@ -4,6 +4,7 @@ exports.ShutterSunsetDownCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
 class ShutterSunsetDownCommand extends baseCommand_1.BaseCommand {
+    // TODO: Missing Comment
     constructor(source, reason = '') {
         super(source, reason);
         this._commandType = commandType_1.CommandType.SunsetDownCommand;

package/lib/models/command/wledSetLightCommand.js

@@ -5,6 +5,7 @@ const commandType_1 = require("./commandType");
 const dimmerSetLightCommand_1 = require("./dimmerSetLightCommand");
 const timeCallback_1 = require("../timeCallback");
 class WledSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand {
+    // TODO: Missing Comment
     constructor(source, on, reason = '', timeout = -1, brightness = -1, transitionTime = -1, preset) {
         super(source, on, reason, timeout, brightness, transitionTime);
         this.preset = preset;

package/lib/server/devices/baseDeviceInterfaces/iAcDevice.d.ts

@@ -6,11 +6,6 @@ export interface iAcDevice extends iBaseDevice {
     readonly on: boolean;
     readonly temperature: number;
     readonly mode: AcMode;
-    /**
-     * Disable automatic Turn-On for given amount of ms and turn off immediately.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout: number): void;
     onTemperaturChange(newTemperatur: number): void;
     setDesiredMode(mode: AcMode, writeToDevice: boolean): void;
     turnOn(): void;

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

@@ -25,6 +25,7 @@ export declare class HeatGroup extends BaseGroup {
     initialize(): void;
     /**
      * Sets all ACs to new desired Value
+     * TODO: Migrate to new Command System
      * @param {boolean} newDesiredState
      * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */

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

@@ -127,6 +127,7 @@ class HeatGroup extends base_group_1.BaseGroup {
     }
     /**
      * Sets all ACs to new desired Value
+     * TODO: Migrate to new Command System
      * @param {boolean} newDesiredState
      * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */
@@ -139,9 +140,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/sharedFunctions/lampUtils.js

@@ -34,8 +34,7 @@ class LampUtils {
             !command.on &&
             device.blockAutomationHandler.automaticBlockActive) {
             dontBlock = true;
-            device.log(models_1.LogLevel.Debug, `Reset Automatic Block as we are turning off manually after a force on`);
-            device.blockAutomationHandler.liftAutomaticBlock();
+            device.blockAutomationHandler.liftAutomaticBlock(new models_1.BlockAutomaticLiftBlockCommand(command, 'Reset Automatic Block as we are turning off manually after a force on'));
         }
         return dontBlock;
     }
@@ -93,7 +92,7 @@ class LampUtils {
             LampUtils.stromStossOn(device);
         }
         if (c.timeout > -1 && !dontBlock) {
-            device.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+            device.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(c, c.timeout, '', models_1.CollisionSolving.overrideIfGreater));
         }
     }
 }

package/lib/server/devices/wledDevice.js

@@ -83,7 +83,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             });
         }
         if (c.timeout !== undefined && c.timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+            this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(c, c.timeout, '', models_1.CollisionSolving.overrideIfGreater));
         }
     }
     setTimeBased(c) {

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.js

@@ -93,7 +93,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             c.brightness = 10;
         }
         if (c.timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+            this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(c, c.timeout));
         }
         if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !c.on) {
             // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off

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

@@ -37,11 +37,6 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     restoreTargetAutomaticValue(): void;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout?: number): void;
     abstract setDesiredMode(mode: AcMode, writeToDevice: boolean, temp?: number): void;
     abstract turnOn(): void;
     onTemperaturChange(newTemperatur: number): void;

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

@@ -163,13 +163,6 @@ class AcDevice {
         }
         return desiredMode;
     }
-    /**
-     * Disable automatic Turn-On and Turn-Off for given amount of ms.
-     * @param {number} timeout
-     */
-    deactivateAutomaticChange(timeout = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(timeout);
-    }
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
@@ -191,8 +184,9 @@ class AcDevice {
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
+    // TODO: Migrate to new command system
     setState(mode, desiredTemp, forceTime = 60 * 60 * 1000) {
-        this.blockAutomationHandler.disableAutomatic(forceTime);
+        this.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, forceTime));
         this._mode = mode;
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();

package/lib/server/services/ac/daikin-service.js

@@ -68,6 +68,7 @@ class DaikinService {
             });
         });
     }
+    // TODO: Migrate to new command system
     static setAll(on, force = false) {
         if (!this.isInitialized) {
             return;
@@ -81,7 +82,7 @@ class DaikinService {
                 dev.turnOff();
             }
             if (force) {
-                dev.deactivateAutomaticChange(180 * 60 * 1000);
+                dev.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(models_1.CommandSource.Unknown, 180 * 60 * 1000));
             }
         }
     }

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

@@ -1,5 +1,5 @@
 import { BaseGroup, ButtonPosition, ButtonPressType, iBaseDevice } from '../../devices';
-import { CollisionSolving, DeviceSettings, RoomBase } from '../../../models';
+import { ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, CollisionSolving, DeviceSettings, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, RoomBase, ShutterSetLevelCommand } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice, AcMode } from '../ac';
 import { GroupSettings } from '../../../models/groupSettings/groupSettings';
@@ -40,14 +40,25 @@ export declare class API {
     static setAllAc(desiredState: boolean): void;
     /**
      * Changes the status of a given Lamp
+     * @deprecated Use "API.lampSetLight" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the lamp
      * @param {boolean} state The desired new state
      * @param timeout Desired time after which this should be reverted to normal state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setLamp(deviceId: string, state: boolean, timeout?: number): Error | null;
+    /**
+     * Changes the status of a given Lamp
+     * @param {string} deviceId The device Id of the lamp
+     * @param {LampSetLightCommand} c The command(stack) to perform on the lamp
+     * @returns {Error | null} In case it failed the Error containing the reason.
+     */
+    static lampSetLight(deviceId: string, c: LampSetLightCommand): Error | null;
     /**
      * Changes the status of a given actuator
+     * @deprecated Use "API.actuatorSetState" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout Desired time after which this should be reverted to automatic state
@@ -57,6 +68,15 @@ export declare class API {
     /**
      * Changes the status of a given actuator
      * @param {string} deviceId The device Id of the actuator
+     * @param {ActuatorSetStateCommand} c The command(stack) to perform on the actuator
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static actuatorSetState(deviceId: string, c: ActuatorSetStateCommand): Error | null;
+    /**
+     * Changes the status of the given dimmer
+     * @deprecated Use "API.dimmerSetLight" instead
+     * TODO: Remove deprecated API method
+     * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout A chosen Timeout after which the light should be reset
      * @param brightness The desired brightness
@@ -65,7 +85,16 @@ export declare class API {
      */
     static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
     /**
-     * Changes the status of a given actuator
+     * Changes the status of the given dimmer
+     * @param {string} deviceId The device Id of the dimmable device.
+     * @param {DimmerSetLightCommand} command The command(stack) to perform on the dimmer
+     * @returns {Error | null} In case it failed the Error containing the reason.
+     */
+    static dimmerSetLight(deviceId: string, command: DimmerSetLightCommand): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @deprecated Use "API.ledSetLight" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the actuator
      * @param {boolean} state The desired new state
      * @param timeout A chosen Timeout after which the light should be reset
@@ -76,14 +105,30 @@ export declare class API {
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setLedLamp(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): Error | null;
+    /**
+     * Changes the status of a given led-device
+     * @param {string} deviceId The device Id of the LED-Device
+     * @param {LedSetLightCommand} command The command(stack) to perform on the led-device
+     */
+    static ledSetLight(deviceId: string, command: LedSetLightCommand): Error | null;
     /**
      * Changes the position of a given shutter
      * if needed this updates the window position as well
+     * @deprecated Use "API.shutterSetLevel" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The device Id of the shutter
      * @param {number} level The desired new level (0 being open, 100 being closed)
      * @returns {Error | null} Error if there is no shutter with the given id
      */
     static setShutter(deviceId: string, level: number): Error | null;
+    /**
+     * Changes the position of a given shutter
+     * if needed this updates the window position as well
+     * @param {string} deviceId The device Id of the shutter
+     * @param {ShutterSetLevelCommand} command The command(stack) to perform on the shutter
+     * @returns {Error | null} Error if there is no shutter with the given id
+     */
+    static shutterSetLevel(deviceId: string, command: ShutterSetLevelCommand): Error | null;
     static speakOnDevice(deviceId: string, message: string, volume?: number): Error | null;
     /**
      * Starts a specified scene
@@ -113,17 +158,35 @@ export declare class API {
     static loadAllDeviceSettingsFromDb(): void;
     /**
      * Lifts a previously started Block of automatic
+     * @deprecated Use "API.blockAutomaticLiftAutomaticBlock" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The target device
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static liftAutomaticBlock(deviceId: string): Error | null;
+    /**
+     * Lifts a previously started Block of automatic
+     * @param {string} deviceId The target device
+     * @param {BlockAutomaticLiftBlockCommand} command The command to lift the automatic block
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static blockAutomaticLiftAutomaticBlock(deviceId: string, command: BlockAutomaticLiftBlockCommand): Error | null;
     /**
      * Blocks the automatic of the given device for provided Duration
+     * @deprecated Use "API.blockAutomaticDisable" instead
+     * TODO: Remove deprecated API method
      * @param {string} deviceId The target device
      * @param {number} duration The duration in ms for which the device should remain in current state
      * @param {CollisionSolving} onCollision The desired Collision Solving strategy, in case the automatic being blocked already
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static blockAutomatic(deviceId: string, duration: number, onCollision?: CollisionSolving): Error | null;
+    /**
+     * Blocks the automatic of the given device for provided Duration
+     * @param {string} deviceId The target device
+     * @param {BlockAutomaticCommand} command The command to block the automatic
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static blockAutomaticSetBlock(deviceId: string, command: BlockAutomaticCommand): Error | null;
     static pressButtonSwitch(deviceId: string, position: ButtonPosition, pressType: ButtonPressType): Error | null;
 }