hoffmation-base 3.0.0-alpha.23 → 3.0.0-alpha.25

package/lib/index.d.ts

@@ -8,9 +8,13 @@ export declare class HoffmationInitializationObject {
     constructor(config: iConfig);
 }
 export declare class HoffmationBase {
+    /**
+     * The iobroker Instance to interact with an ioBroker server
+     * @deprecated To ensure Hoffmation being capable of running without ioBroker, this property will be removed in the future.
+     */
     static ioMain: ioBrokerMain;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;
     static initializePostRoomCreationBeforeIoBroker(): void;
     static initializePostIoBroker(defaultMuellSonos?: iSpeaker): void;
-    static startIoBroker(devices: Devices): void;
+    static startIoBroker(_devices: Devices): void;
 }

package/lib/index.js

@@ -36,7 +36,7 @@ class HoffmationBase {
         if (initObject.config.logSettings) {
             server_1.ServerLogService.initialize(initObject.config.logSettings);
         }
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Startup');
         if (initObject.config.persistence) {
             if (initObject.config.persistence.postgreSql) {
                 server_1.Utils.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence.postgreSql);
@@ -44,39 +44,39 @@ class HoffmationBase {
             await ((_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.initialize());
         }
         if (server_1.SettingsService.settings.mp3Server) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Mp3Server settings detected --> initializing');
             new server_1.MP3Server(server_1.SettingsService.settings.mp3Server);
         }
         if (server_1.SettingsService.settings.telegram) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Telegram settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Telegram settings detected --> initializing');
             server_1.TelegramService.initialize(server_1.SettingsService.settings.telegram);
         }
         if (server_1.SettingsService.settings.tibber) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Tibber settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Tibber settings detected --> initializing');
             server_1.TibberService.initialize(server_1.SettingsService.settings.tibber);
         }
         if (server_1.SettingsService.settings.polly) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Amazon Polly settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Amazon Polly settings detected --> initializing');
             server_1.PollyService.initialize(server_1.SettingsService.settings.polly);
         }
         if (server_1.SettingsService.settings.asusConfig) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Asus Router settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Asus Router settings detected --> initializing');
             new server_1.AsusRouter(server_1.SettingsService.settings.asusConfig);
         }
         else if (server_1.SettingsService.settings.unifiSettings) {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Unifi Router settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Unifi Router settings detected --> initializing');
             new server_1.UnifiRouter(server_1.SettingsService.settings.unifiSettings);
         }
         server_1.TimeCallbackService.init();
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base First Initializations finished`);
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base First Initializations finished');
     }
     static initializePostRoomCreationBeforeIoBroker() {
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post Room Creation`);
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post Room Creation finished`);
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Post Room Creation');
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Post Room Creation finished');
     }
     static initializePostIoBroker(defaultMuellSonos) {
         var _a, _b;
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post ioBrokerInitializations`);
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Post ioBrokerInitializations');
         server_1.Trilateration.initialize();
         if (server_1.SettingsService.TelegramActive)
             server_1.TelegramCommands.initialize();
@@ -97,34 +97,34 @@ class HoffmationBase {
         }
         server_1.Utils.guardedNewThread(() => {
             if (server_1.SettingsService.settings.muell) {
-                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Muell settings detected --> initializing`);
+                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Muell settings detected --> initializing');
                 server_1.MuellService.intialize(server_1.SettingsService.settings.muell, defaultMuellSonos);
             }
         });
         server_1.Utils.guardedNewThread(() => {
-            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `News settings detected --> initializing`);
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'News settings detected --> initializing');
             server_1.NewsService.initialize(server_1.SettingsService.settings.news);
         });
         server_1.Utils.guardedNewThread(() => {
             if (server_1.SettingsService.settings.weather) {
-                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Weather settings detected --> initializing`);
+                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Weather settings detected --> initializing');
                 server_1.WeatherService.initialize(server_1.SettingsService.settings.weather);
             }
         });
         server_1.Utils.guardedNewThread(() => {
             if (server_1.SettingsService.settings.victron) {
-                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Victron settings detected --> initializing`);
+                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Victron settings detected --> initializing');
                 server_1.VictronService.initialize(server_1.SettingsService.settings.victron);
             }
         });
         if (server_1.SettingsService.TelegramActive)
             server_1.TelegramService.publishCommands();
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post ioBrokerInitializations finished`);
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Post ioBrokerInitializations finished');
     }
-    static startIoBroker(devices) {
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base: Starting ioBroker Connection`);
-        this.ioMain = new server_1.ioBrokerMain(new server_1.DeviceUpdater(devices));
-        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base: ioBroker Connection established`);
+    static startIoBroker(_devices) {
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base: Starting ioBroker Connection');
+        this.ioMain = new server_1.ioBrokerMain(new server_1.DeviceUpdater());
+        server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base: ioBroker Connection established');
     }
 }
 exports.HoffmationBase = HoffmationBase;

package/lib/liquid-pid.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PIDController = void 0;
+/* eslint-disable jsdoc/require-jsdoc */
 /**
  * !!Ported from liquid pid!!!!
  * Control the PWM relays from the temperature

package/lib/models/blockAutomaticSettings.d.ts

@@ -0,0 +1,23 @@
+import { CollisionSolving } from './collisionSolving';
+export declare class BlockAutomaticSettings {
+    /**
+     * The duration in ms at which the automatic block should be disabled on force actions.
+     * If not set {@link iBlockAutomaticHandlerDefaults.blockAutomaticDurationMS} will be used.
+     */
+    blockAutomaticDurationMS?: number;
+    /**
+     * If set to true, the automatic won't be blocked on force Action (unless explicitly provided).
+     */
+    dontBlockAutomaticIfNotProvided?: boolean;
+    /**
+     * The collision solving strategy to use
+     * If not set {@link iBlockAutomaticHandlerDefaults.defaultCollisionSolving} will be used.
+     */
+    defaultCollisionSolving?: CollisionSolving;
+    /**
+     * If set to true, the automatic will be reverted to the automatic state when the block is lifted.
+     * If not set {@link iBlockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift} will be used.
+     */
+    revertToAutomaticAtBlockLift?: boolean;
+    fromPartialObject(obj: Partial<BlockAutomaticSettings>): void;
+}

package/lib/models/blockAutomaticSettings.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockAutomaticSettings = void 0;
+class BlockAutomaticSettings {
+    constructor() {
+        /**
+         * If set to true, the automatic won't be blocked on force Action (unless explicitly provided).
+         */
+        this.dontBlockAutomaticIfNotProvided = false;
+    }
+    fromPartialObject(obj) {
+        var _a, _b, _c, _d;
+        this.blockAutomaticDurationMS = (_a = obj.blockAutomaticDurationMS) !== null && _a !== void 0 ? _a : this.blockAutomaticDurationMS;
+        this.dontBlockAutomaticIfNotProvided = (_b = obj.dontBlockAutomaticIfNotProvided) !== null && _b !== void 0 ? _b : this.dontBlockAutomaticIfNotProvided;
+        this.defaultCollisionSolving = (_c = obj.defaultCollisionSolving) !== null && _c !== void 0 ? _c : this.defaultCollisionSolving;
+        this.revertToAutomaticAtBlockLift = (_d = obj.revertToAutomaticAtBlockLift) !== null && _d !== void 0 ? _d : this.revertToAutomaticAtBlockLift;
+    }
+}
+exports.BlockAutomaticSettings = BlockAutomaticSettings;

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

@@ -4,6 +4,7 @@ import { CommandType } from './commandType';
 export declare class ShutterSetLevelCommand extends BaseCommand {
     readonly level: number;
     readonly skipOpenWarning: boolean;
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to set the level of a shutter

package/lib/models/command/ShutterSetLevelCommand.js

@@ -15,6 +15,7 @@ class ShutterSetLevelCommand extends baseCommand_1.BaseCommand {
         super(source, reason);
         this.level = level;
         this.skipOpenWarning = skipOpenWarning;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.ShutterSetLevelCommand;
     }
     get logMessage() {

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

@@ -2,6 +2,7 @@ import { BaseCommand } from './baseCommand';
 import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class WindowRestoreDesiredPositionCommand extends BaseCommand {
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to restore the desired position of the shutter of a window

package/lib/models/command/WindowRestoreDesiredPositionCommand.js

@@ -11,6 +11,7 @@ class WindowRestoreDesiredPositionCommand extends baseCommand_1.BaseCommand {
      */
     constructor(source, reason = '') {
         super(source, reason);
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.WindowRestoreDesiredPositionCommand;
     }
 }

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

@@ -3,6 +3,7 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class WindowSetDesiredPositionCommand extends BaseCommand {
     readonly position: number;
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to set the desired position of the shutter of a window

package/lib/models/command/WindowSetDesiredPositionCommand.js

@@ -13,6 +13,7 @@ class WindowSetDesiredPositionCommand extends baseCommand_1.BaseCommand {
     constructor(source, position, reason = '') {
         super(source, reason);
         this.position = position;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.WindowSetDesiredPositionCommand;
     }
 }

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

@@ -2,6 +2,7 @@ import { BaseCommand } from './baseCommand';
 import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class WindowSetRolloByWeatherStatusCommand extends BaseCommand {
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to set the desired position of the shutter of a window based on the weather status

package/lib/models/command/WindowSetRolloByWeatherStatusCommand.js

@@ -11,6 +11,7 @@ class WindowSetRolloByWeatherStatusCommand extends baseCommand_1.BaseCommand {
      */
     constructor(source, reason = '') {
         super(source, reason);
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.WindowSetRolloByWeatherStatusCommand;
     }
 }

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

@@ -3,18 +3,26 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 import { ActuatorToggleCommand } from './actuatorToggleCommand';
 import { iActuator } from '../../server';
+import { BlockAutomaticCommand } from './blockAutomaticCommand';
 export declare class ActuatorSetStateCommand extends BaseCommand {
     readonly on: boolean;
-    timeout: number;
+    /** @inheritDoc */
     _commandType: CommandType;
+    /**
+     * The command to disable automatic actions for a specific duration.
+     * Null = no automatic actions will be disabled.
+     * Undefined = use device or global default
+     */
+    disableAutomaticCommand: BlockAutomaticCommand | null | undefined;
     /**
      * Command to set the state of an actuator
      * @param source - The source of the command
      * @param on - The new state of the actuator
      * @param reason - You can provide a reason for clarification
-     * @param timeout - If provided, the device automatic will be turned off for the given time in ms
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
+     * If unset the default value in accordance to settings will be used
      */
-    constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, timeout?: number);
+    constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, disableAutomatic?: BlockAutomaticCommand | null);
     get logMessage(): string;
     static byActuatorAndToggleCommand(device: iActuator, c: ActuatorToggleCommand): ActuatorSetStateCommand;
 }

package/lib/models/command/actuatorSetStateCommand.js

@@ -9,21 +9,23 @@ class ActuatorSetStateCommand extends baseCommand_1.BaseCommand {
      * @param source - The source of the command
      * @param on - The new state of the actuator
      * @param reason - You can provide a reason for clarification
-     * @param timeout - If provided, the device automatic will be turned off for the given time in ms
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
+     * If unset the default value in accordance to settings will be used
      */
-    constructor(source, on, reason = '', timeout = -1) {
+    constructor(source, on, reason = '', disableAutomatic) {
         super(source, reason);
         this.on = on;
-        this.timeout = timeout;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.ActuatorSetStateCommand;
+        this.disableAutomaticCommand = disableAutomatic;
     }
     get logMessage() {
-        return `Actuator setState to ${this.on} with timeout ${this.timeout} for reason: ${this.reasonTrace}`;
+        var _a;
+        return `Actuator setState to ${this.on} with disableCommand ${(_a = this.disableAutomaticCommand) === null || _a === void 0 ? void 0 : _a.logMessage} for reason: ${this.reasonTrace}`;
     }
     static byActuatorAndToggleCommand(device, c) {
         const newVal = device.queuedValue !== null ? !device.queuedValue : !device.actuatorOn;
-        const timeout = newVal && c.isForceAction ? 30 * 60 * 1000 : -1;
-        return new ActuatorSetStateCommand(c, newVal, 'Due to ActuatorToggle', timeout);
+        return new ActuatorSetStateCommand(c, newVal, 'Due to ActuatorToggle', c.isForceAction ? undefined : null);
     }
 }
 exports.ActuatorSetStateCommand = ActuatorSetStateCommand;

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

@@ -2,6 +2,7 @@ import { CommandType } from './commandType';
 import { BaseCommand } from './baseCommand';
 import { CommandSource } from './commandSource';
 export declare class ActuatorToggleCommand extends BaseCommand {
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to toggle the state of an actuator
@@ -9,5 +10,4 @@ export declare class ActuatorToggleCommand extends BaseCommand {
      * @param reason - You can provide a reason for clarification
      */
     constructor(source: CommandSource | BaseCommand, reason?: string);
-    get logMessage(): string;
 }

package/lib/models/command/actuatorToggleCommand.js

@@ -11,10 +11,8 @@ class ActuatorToggleCommand extends baseCommand_1.BaseCommand {
      */
     constructor(source, reason = '') {
         super(source, reason);
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.ActuatorToggleCommand;
     }
-    get logMessage() {
-        return `Actuator toggle for reason: ${this.reasonTrace}`;
-    }
 }
 exports.ActuatorToggleCommand = ActuatorToggleCommand;

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

@@ -3,6 +3,7 @@ import { CommandType } from './commandType';
 import { CommandSource } from './commandSource';
 export declare class ActuatorWriteStateToDeviceCommand extends BaseCommand {
     readonly stateValue: boolean;
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to write the state of an actuator to the device

package/lib/models/command/actuatorWriteStateToDeviceCommand.js

@@ -14,6 +14,7 @@ class ActuatorWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
     constructor(source, stateValue, reason = '') {
         super(source, reason);
         this.stateValue = stateValue;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.ActuatorWriteStateToDeviceCommand;
     }
     get logMessage() {

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

@@ -3,7 +3,15 @@ import { CommandType } from './commandType';
 export declare abstract class BaseCommand {
     readonly source: CommandSource | BaseCommand;
     readonly reason: string;
+    /**
+     * The timestamp of the command being created
+     */
     readonly timestamp: Date;
+    /**
+     * The type of this command to be used for comparison.
+     *
+     * For checking if any command in the stack is of a specific type, use the {@link containsType} method.
+     */
     abstract _commandType: CommandType;
     /**
      * If set, this will be used in regards to checking if this is a force/manual/automatic action.

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

@@ -2,16 +2,31 @@ import { CommandType } from './commandType';
 import { CommandSource } from './commandSource';
 import { CollisionSolving } from '../collisionSolving';
 import { BaseCommand } from './baseCommand';
+import { DeviceSettings } from '../deviceSettings';
 export declare class BlockAutomaticCommand extends BaseCommand {
-    durationMS: number;
-    onCollideAction: CollisionSolving;
+    /** @inheritDoc */
     _commandType: CommandType;
+    /**
+     * Whether the device should revert to automatic afterward.
+     */
+    readonly revertToAutomaticAtBlockLift: boolean;
+    /**
+     * The duration in milliseconds for the automatic actions to be disabled.
+     */
+    readonly durationMS: number;
+    /**
+     * The action to take if a block is already active.
+     */
+    readonly onCollideAction: CollisionSolving;
     /**
      * Command to disable automatic actions for a specific duration.
      * @param source - The source of the command.
-     * @param durationMS - The duration in milliseconds for the automatic actions to be disabled.
+     * @param durationMS - The duration in milliseconds for the automatic actions to be disabled --> If unset the default value will be used {@link SettingsService.settings.blockAutomaticHandlerDefaults.blockAutomaticDurationMS}
      * @param reason - You can provide an individual reason here for debugging purpose.
-     * @param onCollideAction - The action to take if a block is already active. --> Default: overrideIfGreater
+     * @param onCollideAction - The action to take if a block is already active. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.defaultCollisionSolving}
+     * @param revertToAutomaticAtBlockLift - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source: CommandSource | BaseCommand, durationMS: number, reason?: string, onCollideAction?: CollisionSolving);
+    constructor(source: CommandSource | BaseCommand, durationMS?: number, reason?: string, onCollideAction?: CollisionSolving, revertToAutomaticAtBlockLift?: boolean);
+    get logMessage(): string;
+    static fromDeviceSettings(c: BaseCommand, deviceSettings: DeviceSettings): BlockAutomaticCommand | null;
 }

package/lib/models/command/blockAutomaticCommand.js

@@ -4,19 +4,37 @@ exports.BlockAutomaticCommand = void 0;
 const commandType_1 = require("./commandType");
 const collisionSolving_1 = require("../collisionSolving");
 const baseCommand_1 = require("./baseCommand");
+const server_1 = require("../../server");
 class BlockAutomaticCommand extends baseCommand_1.BaseCommand {
     /**
      * Command to disable automatic actions for a specific duration.
      * @param source - The source of the command.
-     * @param durationMS - The duration in milliseconds for the automatic actions to be disabled.
+     * @param durationMS - The duration in milliseconds for the automatic actions to be disabled --> If unset the default value will be used {@link SettingsService.settings.blockAutomaticHandlerDefaults.blockAutomaticDurationMS}
      * @param reason - You can provide an individual reason here for debugging purpose.
-     * @param onCollideAction - The action to take if a block is already active. --> Default: overrideIfGreater
+     * @param onCollideAction - The action to take if a block is already active. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.defaultCollisionSolving}
+     * @param revertToAutomaticAtBlockLift - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source, durationMS, reason = '', onCollideAction = collisionSolving_1.CollisionSolving.overrideIfGreater) {
+    constructor(source, durationMS, reason = '', onCollideAction, revertToAutomaticAtBlockLift) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         super(source, reason);
-        this.durationMS = durationMS;
-        this.onCollideAction = onCollideAction;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.BlockAutomaticCommand;
+        this.durationMS =
+            (_c = durationMS !== null && durationMS !== void 0 ? durationMS : (_b = (_a = server_1.SettingsService.settings) === null || _a === void 0 ? void 0 : _a.blockAutomaticHandlerDefaults) === null || _b === void 0 ? void 0 : _b.blockAutomaticDurationMS) !== null && _c !== void 0 ? _c : 30 * 60 * 1000;
+        this.revertToAutomaticAtBlockLift =
+            (_f = revertToAutomaticAtBlockLift !== null && revertToAutomaticAtBlockLift !== void 0 ? revertToAutomaticAtBlockLift : (_e = (_d = server_1.SettingsService.settings) === null || _d === void 0 ? void 0 : _d.blockAutomaticHandlerDefaults) === null || _e === void 0 ? void 0 : _e.revertToAutomaticAtBlockLift) !== null && _f !== void 0 ? _f : true;
+        this.onCollideAction =
+            (_j = onCollideAction !== null && onCollideAction !== void 0 ? onCollideAction : (_h = (_g = server_1.SettingsService.settings) === null || _g === void 0 ? void 0 : _g.blockAutomaticHandlerDefaults) === null || _h === void 0 ? void 0 : _h.defaultCollisionSolving) !== null && _j !== void 0 ? _j : collisionSolving_1.CollisionSolving.overrideIfGreater;
+    }
+    get logMessage() {
+        return `BlockAutomatic for ${this.durationMS}ms with onCollideAction ${this.onCollideAction} for reason: ${this.reasonTrace}`;
+    }
+    static fromDeviceSettings(c, deviceSettings) {
+        var _a, _b, _c, _d;
+        if ((_a = deviceSettings.blockAutomaticSettings) === null || _a === void 0 ? void 0 : _a.dontBlockAutomaticIfNotProvided) {
+            return null;
+        }
+        return new BlockAutomaticCommand(c, (_b = deviceSettings.blockAutomaticSettings) === null || _b === void 0 ? void 0 : _b.blockAutomaticDurationMS, '', (_c = deviceSettings.blockAutomaticSettings) === null || _c === void 0 ? void 0 : _c.defaultCollisionSolving, (_d = deviceSettings.blockAutomaticSettings) === null || _d === void 0 ? void 0 : _d.revertToAutomaticAtBlockLift);
     }
 }
 exports.BlockAutomaticCommand = BlockAutomaticCommand;

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

@@ -2,11 +2,17 @@ import { CommandType } from './commandType';
 import { CommandSource } from './commandSource';
 import { BaseCommand } from './baseCommand';
 export declare class BlockAutomaticLiftBlockCommand extends BaseCommand {
+    /** @inheritDoc */
     _commandType: CommandType;
+    /**
+     * Whether the device should revert to desired automatic value.
+     */
+    readonly revertToAutomatic: boolean;
     /**
      * Command to lift a block --> Restore the automatic actions.
      * @param source - The source of the command.
      * @param reason - You can provide an individual reason here for debugging purpose.
+     * @param revertToAutomatic - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source: CommandSource | BaseCommand, reason?: string);
+    constructor(source: CommandSource | BaseCommand, reason?: string, revertToAutomatic?: boolean);
 }

package/lib/models/command/blockAutomaticLiftBlockCommand.js

@@ -3,15 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockAutomaticLiftBlockCommand = void 0;
 const commandType_1 = require("./commandType");
 const baseCommand_1 = require("./baseCommand");
+const server_1 = require("../../server");
 class BlockAutomaticLiftBlockCommand extends baseCommand_1.BaseCommand {
     /**
      * Command to lift a block --> Restore the automatic actions.
      * @param source - The source of the command.
      * @param reason - You can provide an individual reason here for debugging purpose.
+     * @param revertToAutomatic - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source, reason = '') {
+    constructor(source, reason = '', revertToAutomatic) {
+        var _a, _b, _c;
         super(source, reason);
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.BlockAutomaticLiftBlockCommand;
+        this.revertToAutomatic =
+            (_c = revertToAutomatic !== null && revertToAutomatic !== void 0 ? revertToAutomatic : (_b = (_a = server_1.SettingsService.settings) === null || _a === void 0 ? void 0 : _a.blockAutomaticHandlerDefaults) === null || _b === void 0 ? void 0 : _b.revertToAutomaticAtBlockLift) !== null && _c !== void 0 ? _c : true;
     }
 }
 exports.BlockAutomaticLiftBlockCommand = BlockAutomaticLiftBlockCommand;

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

@@ -4,14 +4,23 @@ import { CollisionSolving } from '../collisionSolving';
 import { BaseCommand } from './baseCommand';
 export declare class BlockAutomaticUntilCommand extends BaseCommand {
     targetDate: Date;
-    onCollideAction: CollisionSolving;
+    /** @inheritDoc */
     _commandType: CommandType;
+    /**
+     * The action to take if a block is already active.
+     */
+    readonly onCollideAction: CollisionSolving;
+    /**
+     * Whether the device should revert to automatic afterward.
+     */
+    readonly revertToAutomaticAtBlockLift: boolean;
     /**
      * Command to disable automatic actions until a specific date.
      * @param source - The source of the command.
      * @param targetDate - The date until the automatic actions will be disabled.
      * @param reason - You can provide an individual reason here for debugging purpose.
-     * @param onCollideAction - The action to take if a block is already active. --> Default: overrideIfGreater
+     * @param onCollideAction - The action to take if a block is already active. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.defaultCollisionSolving}
+     * @param revertToAutomaticAtBlockLift - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source: CommandSource | BaseCommand, targetDate: Date, reason?: string, onCollideAction?: CollisionSolving);
+    constructor(source: CommandSource | BaseCommand, targetDate: Date, reason?: string, onCollideAction?: CollisionSolving, revertToAutomaticAtBlockLift?: boolean);
 }

package/lib/models/command/blockAutomaticUntilCommand.js

@@ -4,19 +4,26 @@ exports.BlockAutomaticUntilCommand = void 0;
 const commandType_1 = require("./commandType");
 const collisionSolving_1 = require("../collisionSolving");
 const baseCommand_1 = require("./baseCommand");
+const server_1 = require("../../server");
 class BlockAutomaticUntilCommand extends baseCommand_1.BaseCommand {
     /**
      * Command to disable automatic actions until a specific date.
      * @param source - The source of the command.
      * @param targetDate - The date until the automatic actions will be disabled.
      * @param reason - You can provide an individual reason here for debugging purpose.
-     * @param onCollideAction - The action to take if a block is already active. --> Default: overrideIfGreater
+     * @param onCollideAction - The action to take if a block is already active. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.defaultCollisionSolving}
+     * @param revertToAutomaticAtBlockLift - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
-    constructor(source, targetDate, reason = '', onCollideAction = collisionSolving_1.CollisionSolving.overrideIfGreater) {
+    constructor(source, targetDate, reason = '', onCollideAction, revertToAutomaticAtBlockLift) {
+        var _a, _b, _c, _d, _e, _f;
         super(source, reason);
         this.targetDate = targetDate;
-        this.onCollideAction = onCollideAction;
+        /** @inheritDoc */
         this._commandType = commandType_1.CommandType.BlockAutomaticUntilCommand;
+        this.onCollideAction =
+            (_c = onCollideAction !== null && onCollideAction !== void 0 ? onCollideAction : (_b = (_a = server_1.SettingsService.settings) === null || _a === void 0 ? void 0 : _a.blockAutomaticHandlerDefaults) === null || _b === void 0 ? void 0 : _b.defaultCollisionSolving) !== null && _c !== void 0 ? _c : collisionSolving_1.CollisionSolving.overrideIfGreater;
+        this.revertToAutomaticAtBlockLift =
+            (_f = revertToAutomaticAtBlockLift !== null && revertToAutomaticAtBlockLift !== void 0 ? revertToAutomaticAtBlockLift : (_e = (_d = server_1.SettingsService.settings) === null || _d === void 0 ? void 0 : _d.blockAutomaticHandlerDefaults) === null || _e === void 0 ? void 0 : _e.revertToAutomaticAtBlockLift) !== null && _f !== void 0 ? _f : true;
     }
 }
 exports.BlockAutomaticUntilCommand = BlockAutomaticUntilCommand;

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

@@ -4,20 +4,24 @@ import { CommandSource } from './commandSource';
 import { BaseCommand } from './baseCommand';
 import { LampSetTimeBasedCommand } from './lampSetTimeBasedCommand';
 import { DimmerSettings } from '../deviceSettings';
+import { BlockAutomaticCommand } from './blockAutomaticCommand';
 export declare class DimmerSetLightCommand extends LampSetLightCommand {
     brightness: number;
     transitionTime: number;
+    /** @inheritDoc */
     _commandType: CommandType;
     /**
      * Command to change the light of a dimmer
      * @param source - The source of the command
      * @param on - The desired value
      * @param reason - You can provide a reason for clarity
-     * @param timeout - A chosen Timeout after which the light should be reset
+     * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
+     * If unset the default value will be used: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The desired brightness
      * @param transitionTime - The transition time during turnOn/turnOff
      */
-    constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, timeout?: number, brightness?: number, transitionTime?: number);
+    constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, disableAutomatic?: BlockAutomaticCommand | null, brightness?: number, transitionTime?: number);
+    /** @inheritDoc */
     get logMessage(): string;
     static byTimeBased(s: DimmerSettings, c: LampSetTimeBasedCommand): DimmerSetLightCommand;
 }