hoffmation-base 3.0.0-alpha.4 → 3.0.0-alpha.40

package/lib/server/devices/hmIPDevices/hmIpTuer.js

@@ -9,7 +9,12 @@ const models_2 = require("../../../models");
 class HmIpTuer extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTuer);
+        /** @inheritDoc */
         this.position = models_1.MagnetPosition.closed;
+        /** @inheritDoc */
+        this.telegramOnOpen = false;
+        /** @inheritDoc */
+        this.speakOnOpen = false;
         this._closedCallback = [];
         this._openCallback = [];
         this.minutesOpen = 0;
@@ -20,6 +25,7 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_2.LogLevel.DeepTrace, `Tuer Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -52,10 +58,12 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
                 clearInterval(this._iOpenTimeout);
                 let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
                 if (this.minutesOpen === 0) {
-                    message = `just closed`;
+                    message = 'just closed';
                 }
                 this.log(models_2.LogLevel.Info, message);
-                services_1.TelegramService.inform(message);
+                if (this.telegramOnOpen) {
+                    services_1.TelegramService.inform(message);
+                }
                 this.minutesOpen = 0;
                 this._iOpenTimeout = undefined;
             }
@@ -64,8 +72,12 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
         else if (this._iOpenTimeout === undefined) {
             const message = services_1.Res.wasOpened(this.info.customName);
             //const message: string = `Die Tür mit dem Namen wurde geöfnet!`
-            services_1.TelegramService.inform(message);
-            services_1.SonosService.speakOnAll(message, 40);
+            if (this.telegramOnOpen) {
+                services_1.TelegramService.inform(message);
+            }
+            if (this.speakOnOpen) {
+                services_1.SonosService.speakOnAll(message, 40);
+            }
             this._iOpenTimeout = services_1.Utils.guardedInterval(() => {
                 this.minutesOpen++;
                 const message = `Contact is  ${models_1.MagnetPosition[this.position]} since ${this.minutesOpen} minutes`;
@@ -86,6 +98,7 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             }, 60000, this);
         }
     }
+    /** @inheritDoc */
     dispose() {
         if (this._iOpenTimeout) {
             clearInterval(this._iOpenTimeout);

package/lib/server/devices/hmIPDevices/hmIpWippe.d.ts

@@ -4,15 +4,42 @@ import { iButtonSwitch } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
     private static readonly BUTTON_CAPABILLITIES;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonTopLeft: undefined;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonMidLeft: undefined;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonBotLeft: undefined;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonTopRight: undefined;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonMidRight: undefined;
+    /**
+     * Not present for HM-IP-Wippe
+     * @inheritDoc
+     */
     buttonBotRight: undefined;
+    /** @inheritDoc */
     buttonBot: Button;
+    /** @inheritDoc */
     buttonTop: Button;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     persist(buttonName: string, pressType: ButtonPressType): void;
     getButtonAssignment(): string;

package/lib/server/devices/hmIPDevices/hmIpWippe.js

@@ -10,10 +10,13 @@ const services_1 = require("../../services");
 class HmIpWippe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpWippe);
+        /** @inheritDoc */
         this.buttonBot = new button_1.Button('Bottom', HmIpWippe.BUTTON_CAPABILLITIES);
+        /** @inheritDoc */
         this.buttonTop = new button_1.Button('Top', HmIpWippe.BUTTON_CAPABILLITIES);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Wippe Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);

package/lib/server/devices/iDeviceUpdater.d.ts

@@ -1,4 +1,18 @@
+/**
+ * Service to update the state of any device
+ */
 export interface IDeviceUpdater {
+    /**
+     * Updates the state of a device
+     * @param id - The id of the device
+     * @param state - The new state
+     * @param initial - Whether this is an initial state update
+     */
     updateState(id: string, state: ioBroker.State, initial?: boolean): void;
+    /**
+     * Updates the given object
+     * @param pId - The id of the object
+     * @param pObj - The new object
+     */
     updateObject(pId: string, pObj: ioBroker.Object): void;
 }

package/lib/server/devices/index.d.ts

@@ -10,18 +10,21 @@ export * from './scene/index';
 export * from './sharedFunctions/index';
 export * from './shelly/index';
 export * from './tuya/index';
+export * from './tv/index';
 export * from './zigbee/index';
 export * from './device-cluster';
 export * from './device-cluster-type';
 export * from './device-list';
+export { DeviceCapability } from './DeviceCapability';
 export * from './DeviceInfo';
 export * from './devices';
 export * from './deviceType';
 export * from './deviceUpdater';
 export * from './Griffe';
 export * from './Heizgruppen';
-export * from './mqtt';
 export * from './iDeviceUpdater';
+export * from './mqtt';
 export * from './IoBrokerBaseDevice';
-export * from './tv';
+export * from './IoBrokerDeviceInfo';
+export { NameAmountValuePair } from './nameAmountValuePair';
 export * from './wledDevice';

package/lib/server/devices/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NameAmountValuePair = exports.DeviceCapability = void 0;
 __exportStar(require("./baseDeviceInterfaces/index"), exports);
 __exportStar(require("./blueIris/index"), exports);
 __exportStar(require("./button/index"), exports);
@@ -26,18 +27,23 @@ __exportStar(require("./scene/index"), exports);
 __exportStar(require("./sharedFunctions/index"), exports);
 __exportStar(require("./shelly/index"), exports);
 __exportStar(require("./tuya/index"), exports);
+__exportStar(require("./tv/index"), exports);
 __exportStar(require("./zigbee/index"), exports);
 __exportStar(require("./device-cluster"), exports);
 __exportStar(require("./device-cluster-type"), exports);
 __exportStar(require("./device-list"), exports);
+var DeviceCapability_1 = require("./DeviceCapability");
+Object.defineProperty(exports, "DeviceCapability", { enumerable: true, get: function () { return DeviceCapability_1.DeviceCapability; } });
 __exportStar(require("./DeviceInfo"), exports);
 __exportStar(require("./devices"), exports);
 __exportStar(require("./deviceType"), exports);
 __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
-__exportStar(require("./mqtt"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
+__exportStar(require("./mqtt"), exports);
 __exportStar(require("./IoBrokerBaseDevice"), exports);
-__exportStar(require("./tv"), exports);
+__exportStar(require("./IoBrokerDeviceInfo"), exports);
+var nameAmountValuePair_1 = require("./nameAmountValuePair");
+Object.defineProperty(exports, "NameAmountValuePair", { enumerable: true, get: function () { return nameAmountValuePair_1.NameAmountValuePair; } });
 __exportStar(require("./wledDevice"), exports);

package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts

@@ -38,7 +38,7 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
      * | drawing       |    0W |  100W | 1000W |
      * | selfConsume   |  900W | 1000W |    0W |
      * ________________________________________
-     **/
+     */
     get excessEnergyConsumerConsumption(): number;
     private _phaseAState;
     get phaseAState(): PhaseState;
@@ -49,12 +49,14 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
     cleanup(): void;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride?: boolean): void;
     private calculateExcessEnergy;
     private calculatePersistenceValues;
     private persist;
     private turnOnAdditionalConsumer;
     private turnOffAdditionalConsumer;
+    /** @inheritDoc */
     dispose(): void;
     getReport(): string;
 }

package/lib/server/devices/jsObject/jsObjectEnergyManager.js

@@ -24,7 +24,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._phaseBState = new models_2.PhaseState(0, 0);
         this._phaseCState = new models_2.PhaseState(0, 0);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.energyManager);
-        this.log(models_1.LogLevel.Info, `Creating Energy Manager Device`);
+        this.log(models_1.LogLevel.Info, 'Creating Energy Manager Device');
         this._iCalculationInterval = services_1.Utils.guardedInterval(() => {
             this.calculateExcessEnergy();
         }, 5 * 1000, this);
@@ -72,7 +72,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
      * | drawing       |    0W |  100W | 1000W |
      * | selfConsume   |  900W | 1000W |    0W |
      * ________________________________________
-     **/
+     */
     get excessEnergyConsumerConsumption() {
         return this._excessEnergyConsumerConsumption;
     }
@@ -110,6 +110,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this.turnOffAdditionalConsumer();
         }
     }
+    /** @inheritDoc */
     update(idSplit, state, initial, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `EnergyManager: ${initial ? 'Initial ' : ''} update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}, override: ${pOverride}`);
         switch (idSplit[3]) {
@@ -175,11 +176,12 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
         if (!result.newState) {
             this.blockDeviceChangeTime = services_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
-            result.device.log(models_1.LogLevel.Info, `Turning off, as we don't have energy to spare...`);
+            result.device.log(models_1.LogLevel.Info, "Turning off, as we don't have energy to spare...");
             result.device.turnOffDueToMissingEnergy();
             this._lastDeviceChange = result;
         }
     }
+    /** @inheritDoc */
     dispose() {
         if (this._iCalculationInterval) {
             clearInterval(this._iCalculationInterval);

package/lib/server/devices/nameAmountValuePair.d.ts

@@ -0,0 +1,5 @@
+export declare class NameAmountValuePair {
+    name: string;
+    amount: number;
+    constructor(name: string, amount: number);
+}

package/lib/server/devices/nameAmountValuePair.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NameAmountValuePair = void 0;
+class NameAmountValuePair {
+    constructor(name, amount) {
+        this.name = name;
+        this.amount = amount;
+    }
+}
+exports.NameAmountValuePair = NameAmountValuePair;

package/lib/server/devices/scene/room-scene.d.ts

@@ -7,32 +7,49 @@ import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 export declare class RoomScene implements iScene {
+    /** @inheritDoc */
     description: string;
+    /** @inheritDoc */
     room: RoomBase | undefined;
+    /** @inheritDoc */
     settings: SceneSettings;
+    protected _deviceType: DeviceType;
+    protected _info: DeviceInfo;
     private readonly _onSceneStart;
     private readonly _onSceneEnd;
+    private _automaticEndTimeout;
+    private _deviceCapabilities;
+    private _on;
     constructor(name: string, room: RoomBase, onSceneStart: () => void, onSceneEnd: () => void, turnOffTimeout?: number);
+    /** @inheritDoc */
     get customName(): string;
-    protected _deviceType: DeviceType;
+    /** @inheritDoc */
     get deviceType(): DeviceType;
-    protected _info: DeviceInfo;
+    /** @inheritDoc */
     get info(): DeviceInfo;
-    set info(info: DeviceInfo);
-    private _automaticEndTimeout;
+    /** @inheritDoc */
     get automaticEndTimeout(): NodeJS.Timeout | null;
-    private _deviceCapabilities;
+    /** @inheritDoc */
     get deviceCapabilities(): DeviceCapability[];
-    private _on;
+    /** @inheritDoc */
     get on(): boolean;
     get name(): string;
+    /** @inheritDoc */
     get id(): string;
+    /** @inheritDoc */
     get onSceneEnd(): () => void;
+    /** @inheritDoc */
     get onSceneStart(): () => void;
+    /** @inheritDoc */
     startScene(timeout?: number | undefined): void;
+    /** @inheritDoc */
     endScene(): void;
+    /** @inheritDoc */
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
+    /** @inheritDoc */
     persistDeviceInfo(): void;
+    /** @inheritDoc */
     loadDeviceSettings(): void;
+    /** @inheritDoc */
     toJSON(): Partial<TvDevice>;
 }

package/lib/server/devices/scene/room-scene.js

@@ -13,7 +13,9 @@ const devices_1 = require("../devices");
 const lodash_1 = __importDefault(require("lodash"));
 class RoomScene {
     constructor(name, room, onSceneStart, onSceneEnd, turnOffTimeout) {
+        /** @inheritDoc */
         this.description = '';
+        /** @inheritDoc */
         this.settings = new models_1.SceneSettings();
         this._automaticEndTimeout = null;
         this._deviceCapabilities = [DeviceCapability_1.DeviceCapability.scene];
@@ -32,40 +34,47 @@ class RoomScene {
         this.persistDeviceInfo();
         this.loadDeviceSettings();
     }
+    /** @inheritDoc */
     get customName() {
         return this.info.customName;
     }
+    /** @inheritDoc */
     get deviceType() {
         return this._deviceType;
     }
+    /** @inheritDoc */
     get info() {
         return this._info;
     }
-    set info(info) {
-        this._info = info;
-    }
+    /** @inheritDoc */
     get automaticEndTimeout() {
         return this._automaticEndTimeout;
     }
+    /** @inheritDoc */
     get deviceCapabilities() {
         return this._deviceCapabilities;
     }
+    /** @inheritDoc */
     get on() {
         return this._on;
     }
     get name() {
         return this.info.customName;
     }
+    /** @inheritDoc */
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
     }
+    /** @inheritDoc */
     get onSceneEnd() {
         return this._onSceneEnd;
     }
+    /** @inheritDoc */
     get onSceneStart() {
         return this._onSceneStart;
     }
+    /** @inheritDoc */
     startScene(timeout) {
         if (this._automaticEndTimeout != null) {
             clearTimeout(this._automaticEndTimeout);
@@ -82,6 +91,7 @@ class RoomScene {
             }, turnOffTimeout, this);
         }
     }
+    /** @inheritDoc */
     endScene() {
         if (this._automaticEndTimeout != null) {
             clearTimeout(this._automaticEndTimeout);
@@ -90,10 +100,11 @@ class RoomScene {
         if (!this._on) {
             return;
         }
-        this.log(models_1.LogLevel.Info, `Ending scene`);
+        this.log(models_1.LogLevel.Info, 'Ending scene');
         this._on = false;
         this._onSceneEnd();
     }
+    /** @inheritDoc */
     log(level, message, debugType = services_1.LogDebugType.None) {
         var _a, _b;
         services_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
@@ -103,15 +114,18 @@ class RoomScene {
             deviceName: this.name,
         });
     }
+    /** @inheritDoc */
     persistDeviceInfo() {
         services_1.Utils.guardedTimeout(() => {
             var _a;
             (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
         }, 5000, this);
     }
+    /** @inheritDoc */
     loadDeviceSettings() {
         this.settings.initializeFromDb(this);
     }
+    /** @inheritDoc */
     toJSON() {
         // eslint-disable-next-line
         const result = lodash_1.default.omit(this, ['room', '_onSceneStart', '_onSceneEnd']);

package/lib/server/devices/sharedFunctions/lampUtils.d.ts

@@ -1,11 +1,20 @@
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
+import { ActuatorSetStateCommand, DimmerSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
+import { iDimmableLamp } from '../baseDeviceInterfaces/iDimmableLamp';
 export declare class LampUtils {
+    private static stromStossContinueTimeouts;
     static stromStossOn(actuator: iActuator): void;
     static setTimeBased(device: iLamp, c: LampSetTimeBasedCommand): void;
     static checkUnBlock(device: iActuator, command: ActuatorSetStateCommand): boolean;
     static toggleLight(device: iLamp, c: LampToggleLightCommand): boolean;
     static checkBlockActive(device: iActuator, c: ActuatorSetStateCommand): boolean;
-    static checkUnchanged(device: iActuator, c: ActuatorSetStateCommand): boolean;
+    /**
+     * Check if the dimmer is already in the desired state thus allowing to skip this command
+     * @param {iDimmableLamp} device - The device to check
+     * @param {DimmerSetLightCommand} c - The command to check
+     * @returns {boolean} - True if the command can be skipped
+     */
+    static canDimmerChangeBeSkipped(device: iDimmableLamp, c: DimmerSetLightCommand): boolean;
+    static canActuatorChangeBeSkipped(device: iActuator, c: ActuatorSetStateCommand, noLog?: boolean): boolean;
     static setActuator(device: iActuator, c: ActuatorSetStateCommand): void;
 }

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -5,81 +5,135 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 class LampUtils {
     static stromStossOn(actuator) {
+        if (!LampUtils.stromStossContinueTimeouts.has(actuator.id)) {
+            LampUtils.stromStossContinueTimeouts.set(actuator.id, services_1.Utils.guardedTimeout(() => {
+                var _a, _b;
+                LampUtils.stromStossContinueTimeouts.delete(actuator.id);
+                if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
+                    actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'StromStoss On due to Presence', null));
+                }
+            }, actuator.settings.stromStossResendTime * 1000, this));
+        }
         services_1.Utils.guardedTimeout(() => {
-            var _a, _b;
-            if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
-                actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, true, 'StromStoss On due to Presence'));
-            }
-        }, actuator.settings.stromStossResendTime * 1000, this);
-        services_1.Utils.guardedTimeout(() => {
-            actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, false, 'StromStoss Off'));
+            actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, false, 'StromStoss Off', null));
         }, 3000, this);
     }
     static setTimeBased(device, c) {
-        if ((c.time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
+        if (c.isManual ||
+            (c.time === models_1.TimeOfDay.Daylight && device.settings.dayOn) ||
+            (c.time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
             (c.time === models_1.TimeOfDay.BeforeSunrise && device.settings.dawnOn) ||
             (c.time === models_1.TimeOfDay.AfterSunset && device.settings.duskOn)) {
-            device.setLight(new models_1.LampSetLightCommand(c, true, `SetLight due to TimeBased ${c.time}`, c.timeout));
+            device.setLight(new models_1.LampSetLightCommand(c, true, `SetLight due to TimeBased ${models_1.TimeOfDay[c.time]}`, c.disableAutomaticCommand));
         }
     }
     static checkUnBlock(device, command) {
         let dontBlock = false;
+        if (command.containsType(models_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand)) {
+            // We are restoring the automatic value, so we don't want to block the device
+            return true;
+        }
         if (command.isForceAction &&
             device.settings.resetToAutomaticOnForceOffAfterForceOn &&
             !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();
+            const liftCommand = new models_1.BlockAutomaticLiftBlockCommand(command, 'Reset Automatic Block as we are turning off manually after a force on');
+            liftCommand.overrideCommandSource = models_1.CommandSource.Automatic;
+            device.blockAutomationHandler.liftAutomaticBlock(liftCommand);
         }
         return dontBlock;
     }
     static toggleLight(device, c) {
         var _a;
-        const newVal = device.queuedValue !== null ? !device.queuedValue : !device.lightOn;
-        const timeout = newVal && c.isForceAction ? 30 * 60 * 1000 : -1;
+        const newVal = device.queuedValue !== null ? !device.queuedValue : !device.actuatorOn;
         if (newVal && c.time === undefined && c.calculateTime && device.room !== undefined) {
             c.time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
         }
         if (newVal && c.time !== undefined) {
-            device.setTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, 'SetLight Due to toggle Light', timeout));
+            device.setTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, '', c.isForceAction ? undefined : null));
             return true;
         }
-        device.setLight(new models_1.LampSetLightCommand(c, newVal, 'SetLight Due to toggle Light', timeout));
+        device.setLight(new models_1.LampSetLightCommand(c, newVal, '', c.isForceAction ? undefined : null));
         return newVal;
     }
     static checkBlockActive(device, c) {
         if (!c.isForceAction && device.blockAutomationHandler.automaticBlockActive) {
-            device.log(models_1.LogLevel.Debug, `Skip automatic command to ${c.on} as it is locked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString()}`);
+            device.log(models_1.LogLevel.Debug, `Skip command to ${c.on} as it is locked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString('de-DE')}; command Log: ${c.logMessage}`);
             device.targetAutomaticState = c.on;
             return true;
         }
         return false;
     }
-    static checkUnchanged(device, c) {
-        if (!c.isForceAction && c.on === device.actuatorOn && device.queuedValue === null) {
-            device.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${c.on}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
-            return true;
+    /**
+     * Check if the dimmer is already in the desired state thus allowing to skip this command
+     * @param {iDimmableLamp} device - The device to check
+     * @param {DimmerSetLightCommand} c - The command to check
+     * @returns {boolean} - True if the command can be skipped
+     */
+    static canDimmerChangeBeSkipped(device, c) {
+        if (c.isForceAction) {
+            return false;
         }
-        return false;
+        if (!this.canActuatorChangeBeSkipped(device, c, true)) {
+            return false;
+        }
+        if (c.brightness !== device.brightness) {
+            return false;
+        }
+        device.log(models_1.LogLevel.DeepTrace, `Light command can be skipped as the device is already in desired state: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
+        return true;
+    }
+    static canActuatorChangeBeSkipped(device, c, noLog = false) {
+        if (c.isForceAction) {
+            return false;
+        }
+        if ((device.queuedValue === null && device.actuatorOn !== c.on) ||
+            (device.queuedValue !== null && c.on === device.queuedValue)) {
+            return false;
+        }
+        if (!noLog) {
+            device.log(models_1.LogLevel.DeepTrace, `Light command can be skipped as device is already in desired state; command: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
+        }
+        return true;
     }
     static setActuator(device, c) {
+        if (device.settings.isStromStoss &&
+            c.on &&
+            c.containsType(models_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand)) {
+            // Don't restore automatic state on Strommstoss-Relais as this might result in a loop.
+            return;
+        }
         const dontBlock = LampUtils.checkUnBlock(device, c);
         if (LampUtils.checkBlockActive(device, c)) {
             return;
         }
-        if (LampUtils.checkUnchanged(device, c)) {
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            device.targetAutomaticState = c.on;
+        }
+        if (LampUtils.canActuatorChangeBeSkipped(device, c)) {
             return;
         }
         device.queuedValue = c.on;
-        device.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c.on, c));
+        device.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on));
         if (device.settings.isStromStoss && c.on) {
-            c.timeout = 3000;
+            c.disableAutomaticCommand = new models_1.BlockAutomaticCommand(c, 3000, 'StromStoss Off');
             LampUtils.stromStossOn(device);
         }
-        if (c.timeout > -1 && !dontBlock) {
-            device.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+        if (dontBlock || c.disableAutomaticCommand === null) {
+            return;
+        }
+        if (dontBlock) {
+            return;
+        }
+        if (c.disableAutomaticCommand === undefined && c.isForceAction) {
+            c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, device.settings);
+        }
+        if (c.disableAutomaticCommand) {
+            device.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
         }
     }
 }
 exports.LampUtils = LampUtils;
+LampUtils.stromStossContinueTimeouts = new Map();

package/lib/server/devices/shelly/shellyDevice.d.ts

@@ -5,8 +5,9 @@ import { DeviceType } from '../deviceType';
 export declare class ShellyDevice extends IoBrokerBaseDevice implements iDisposable {
     private _lastUpdate;
     get lastUpdate(): Date;
-    stateMap: Map<string, ioBroker.State>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    /** @inheritDoc */
     dispose(): void;
 }

package/lib/server/devices/shelly/shellyDevice.js

@@ -10,8 +10,8 @@ class ShellyDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this._lastUpdate = new Date(0);
-        this.stateMap = new Map();
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Shelly: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         if (!pOverride) {
@@ -29,6 +29,7 @@ class ShellyDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             }
         }
     }
+    /** @inheritDoc */
     dispose() {
         // Nothing yet
     }