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

package/lib/models/deviceSettings/actuatorSettings.js

@@ -6,9 +6,26 @@ const server_1 = require("../../server");
 class ActuatorSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
+        /**
+         * Whether to turn on the device at dawn in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.dawnOn = true;
+        /**
+         * Whether to turn on the device at dusk in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.duskOn = true;
+        /**
+         * Whether to turn on the device at night in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.nightOn = true;
+        /**
+         * Whether to turn on the device at day in time-based commands or automatic.
+         * @type {boolean}
+         */
+        this.dayOn = false;
         /**
          * Indicates if this device controls e.g. an Eltako, which has it's own Turn Off Time logic.
          * @type {boolean}
@@ -33,15 +50,16 @@ class ActuatorSettings extends deviceSettings_1.DeviceSettings {
         this.includeInAmbientLight = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.dawnOn = (_a = data.dawnOn) !== null && _a !== void 0 ? _a : this.dawnOn;
         this.duskOn = (_b = data.duskOn) !== null && _b !== void 0 ? _b : this.duskOn;
         this.nightOn = (_c = data.nightOn) !== null && _c !== void 0 ? _c : this.nightOn;
-        this.isStromStoss = (_d = data.isStromStoss) !== null && _d !== void 0 ? _d : this.isStromStoss;
-        this.stromStossResendTime = (_e = data.stromStossResendTime) !== null && _e !== void 0 ? _e : this.stromStossResendTime;
+        this.dayOn = (_d = data.dayOn) !== null && _d !== void 0 ? _d : this.dayOn;
+        this.isStromStoss = (_e = data.isStromStoss) !== null && _e !== void 0 ? _e : this.isStromStoss;
+        this.stromStossResendTime = (_f = data.stromStossResendTime) !== null && _f !== void 0 ? _f : this.stromStossResendTime;
         this.resetToAutomaticOnForceOffAfterForceOn =
-            (_f = data.resetToAutomaticOnForceOffAfterForceOn) !== null && _f !== void 0 ? _f : this.resetToAutomaticOnForceOffAfterForceOn;
-        this.includeInAmbientLight = (_g = data.includeInAmbientLight) !== null && _g !== void 0 ? _g : this.includeInAmbientLight;
+            (_g = data.resetToAutomaticOnForceOffAfterForceOn) !== null && _g !== void 0 ? _g : this.resetToAutomaticOnForceOffAfterForceOn;
+        this.includeInAmbientLight = (_h = data.includeInAmbientLight) !== null && _h !== void 0 ? _h : this.includeInAmbientLight;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/ledSettings.js

@@ -25,24 +25,16 @@ class LedSettings extends dimmerSettings_1.DimmerSettings {
         this.nightColorTemp = -1;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        this.dayOn = (_a = data.dayOn) !== null && _a !== void 0 ? _a : this.dayOn;
-        this.dayBrightness = (_b = data.dayBrightness) !== null && _b !== void 0 ? _b : this.dayBrightness;
-        this.dayColorTemp = (_c = data.dayColorTemp) !== null && _c !== void 0 ? _c : this.dayColorTemp;
-        this.dawnOn = (_d = data.dawnOn) !== null && _d !== void 0 ? _d : this.dawnOn;
-        this.dawnBrightness = (_e = data.dawnBrightness) !== null && _e !== void 0 ? _e : this.dawnBrightness;
-        this.dawnColorTemp = (_f = data.dawnColorTemp) !== null && _f !== void 0 ? _f : this.dawnColorTemp;
-        this.duskOn = (_g = data.duskOn) !== null && _g !== void 0 ? _g : this.duskOn;
-        this.duskBrightness = (_h = data.duskBrightness) !== null && _h !== void 0 ? _h : this.duskBrightness;
-        this.duskColorTemp = (_j = data.duskColorTemp) !== null && _j !== void 0 ? _j : this.duskColorTemp;
-        this.nightOn = (_k = data.nightOn) !== null && _k !== void 0 ? _k : this.nightOn;
-        this.nightBrightness = (_l = data.nightBrightness) !== null && _l !== void 0 ? _l : this.nightBrightness;
-        this.nightColorTemp = (_m = data.nightColorTemp) !== null && _m !== void 0 ? _m : this.nightColorTemp;
-        this.defaultColor = (_p = server_1.Utils.formatHex((_o = data.defaultColor) !== null && _o !== void 0 ? _o : this.defaultColor)) !== null && _p !== void 0 ? _p : LedSettings.fallbackColor;
-        this.dayColor = (_r = server_1.Utils.formatHex((_q = data.dayColor) !== null && _q !== void 0 ? _q : this.dayColor)) !== null && _r !== void 0 ? _r : LedSettings.fallbackColor;
-        this.dawnColor = (_t = server_1.Utils.formatHex((_s = data.dawnColor) !== null && _s !== void 0 ? _s : this.dawnColor)) !== null && _t !== void 0 ? _t : LedSettings.fallbackColor;
-        this.duskColor = (_v = server_1.Utils.formatHex((_u = data.duskColor) !== null && _u !== void 0 ? _u : this.duskColor)) !== null && _v !== void 0 ? _v : LedSettings.fallbackColor;
-        this.nightColor = (_x = server_1.Utils.formatHex((_w = data.nightColor) !== null && _w !== void 0 ? _w : this.nightColor)) !== null && _x !== void 0 ? _x : LedSettings.fallbackColor;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        this.dayColorTemp = (_a = data.dayColorTemp) !== null && _a !== void 0 ? _a : this.dayColorTemp;
+        this.dawnColorTemp = (_b = data.dawnColorTemp) !== null && _b !== void 0 ? _b : this.dawnColorTemp;
+        this.duskColorTemp = (_c = data.duskColorTemp) !== null && _c !== void 0 ? _c : this.duskColorTemp;
+        this.nightColorTemp = (_d = data.nightColorTemp) !== null && _d !== void 0 ? _d : this.nightColorTemp;
+        this.defaultColor = (_f = server_1.Utils.formatHex((_e = data.defaultColor) !== null && _e !== void 0 ? _e : this.defaultColor)) !== null && _f !== void 0 ? _f : LedSettings.fallbackColor;
+        this.dayColor = (_h = server_1.Utils.formatHex((_g = data.dayColor) !== null && _g !== void 0 ? _g : this.dayColor)) !== null && _h !== void 0 ? _h : LedSettings.fallbackColor;
+        this.dawnColor = (_k = server_1.Utils.formatHex((_j = data.dawnColor) !== null && _j !== void 0 ? _j : this.dawnColor)) !== null && _k !== void 0 ? _k : LedSettings.fallbackColor;
+        this.duskColor = (_m = server_1.Utils.formatHex((_l = data.duskColor) !== null && _l !== void 0 ? _l : this.duskColor)) !== null && _m !== void 0 ? _m : LedSettings.fallbackColor;
+        this.nightColor = (_p = server_1.Utils.formatHex((_o = data.nightColor) !== null && _o !== void 0 ? _o : this.nightColor)) !== null && _p !== void 0 ? _p : LedSettings.fallbackColor;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/wledSettings.js

@@ -16,19 +16,11 @@ class WledSettings extends dimmerSettings_1.DimmerSettings {
         this.nightBrightness = 2;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        this.dayOn = (_a = data.dayOn) !== null && _a !== void 0 ? _a : this.dayOn;
-        this.dayBrightness = (_b = data.dayBrightness) !== null && _b !== void 0 ? _b : this.dayBrightness;
-        this.dawnOn = (_c = data.dawnOn) !== null && _c !== void 0 ? _c : this.dawnOn;
-        this.dawnBrightness = (_d = data.dawnBrightness) !== null && _d !== void 0 ? _d : this.dawnBrightness;
-        this.duskOn = (_e = data.duskOn) !== null && _e !== void 0 ? _e : this.duskOn;
-        this.duskBrightness = (_f = data.duskBrightness) !== null && _f !== void 0 ? _f : this.duskBrightness;
-        this.nightOn = (_g = data.nightOn) !== null && _g !== void 0 ? _g : this.nightOn;
-        this.nightBrightness = (_h = data.nightBrightness) !== null && _h !== void 0 ? _h : this.nightBrightness;
-        this.dawnPreset = (_j = data.dawnPreset) !== null && _j !== void 0 ? _j : this.dawnPreset;
-        this.dayPreset = (_k = data.dayPreset) !== null && _k !== void 0 ? _k : this.dayPreset;
-        this.duskPreset = (_l = data.duskPreset) !== null && _l !== void 0 ? _l : this.duskPreset;
-        this.nightPreset = (_m = data.nightPreset) !== null && _m !== void 0 ? _m : this.nightPreset;
+        var _a, _b, _c, _d;
+        this.dawnPreset = (_a = data.dawnPreset) !== null && _a !== void 0 ? _a : this.dawnPreset;
+        this.dayPreset = (_b = data.dayPreset) !== null && _b !== void 0 ? _b : this.dayPreset;
+        this.duskPreset = (_c = data.duskPreset) !== null && _c !== void 0 ? _c : this.duskPreset;
+        this.nightPreset = (_d = data.nightPreset) !== null && _d !== void 0 ? _d : this.nightPreset;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/groupSettings/heatGroupSettings.d.ts

@@ -3,6 +3,10 @@ import { iIdHolder } from '../iIdHolder';
 import { GroupSettings } from './groupSettings';
 export declare class HeatGroupSettings extends GroupSettings {
     automaticPoints: TemperatureSettings[];
+    /**
+     * Whether the temperature should be calculated automatically, or the manualTemperature should be used
+     * @type {boolean}
+     */
     automaticMode: boolean;
     automaticFallBackTemperatur: number;
     /**

package/lib/models/groupSettings/heatGroupSettings.js

@@ -7,6 +7,10 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
     constructor() {
         super(...arguments);
         this.automaticPoints = [];
+        /**
+         * Whether the temperature should be calculated automatically, or the manualTemperature should be used
+         * @type {boolean}
+         */
         this.automaticMode = true;
         this.automaticFallBackTemperatur = 20;
         /**

package/lib/models/rooms/RoomBase.js

@@ -115,7 +115,7 @@ class RoomBase {
         }
         if (c.movementDependant && this.PraesenzGroup && !((_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
             this.log(logLevel_1.LogLevel.Trace, 'Turn off lights as no-one is present.');
-            this.LightGroup.switchAll(new command_1.ActuatorSetStateCommand(c, false, 'Room.setLightTimeBased but no one is present'));
+            this.LightGroup.switchAll(new command_1.ActuatorSetStateCommand(c, false, 'No one is present --> Turn off lights.'));
             return;
         }
         if (!this.settings.lampOffset && !this.settings.roomIsAlwaysDark) {
@@ -132,7 +132,7 @@ class RoomBase {
                 })))) {
             timeOfDay = server_1.Utils.nowTime().hours > 16 ? timeCallback_1.TimeOfDay.AfterSunset : timeCallback_1.TimeOfDay.BeforeSunrise;
         }
-        this.LightGroup.switchTimeConditional(new command_1.LightGroupSwitchTimeConditionalCommand(c, timeOfDay, 'Roombase.setLightTimeBased'));
+        this.LightGroup.switchTimeConditional(new command_1.LightGroupSwitchTimeConditionalCommand(c, timeOfDay));
     }
     isNowLightTime() {
         var _a;

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

@@ -14,6 +14,8 @@ export declare abstract class IoBrokerBaseDevice implements iRoomDevice {
     };
     private _room;
     readonly deviceCapabilities: DeviceCapability[];
+    protected _debounceStateDelay: number;
+    protected _lastWrite: number;
     get customName(): string;
     get room(): RoomBase;
     protected readonly individualStateCallbacks: Map<string, Array<(val: ioBroker.StateValue) => void>>;

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -20,6 +20,9 @@ class IoBrokerBaseDevice {
         this.settings = undefined;
         this._room = undefined;
         this.deviceCapabilities = [];
+        // If configured > 0, this indicates the minimum time between state writes in ms
+        this._debounceStateDelay = 0;
+        this._lastWrite = 0;
         this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
         this.persistDeviceInfo();
@@ -152,13 +155,21 @@ class IoBrokerBaseDevice {
         if (!this.checkIoConnection(true)) {
             return;
         }
+        if (this._debounceStateDelay > 0 && services_1.Utils.nowMS() - this._lastWrite < this._debounceStateDelay) {
+            services_1.Utils.guardedTimeout(() => {
+                this.log(models_1.LogLevel.Trace, `Debounced write for ${pointId} to ${state}`);
+                this.setState(pointId, state, onSuccess, onError);
+            }, this._debounceStateDelay, this);
+            return;
+        }
+        this._lastWrite = services_1.Utils.nowMS();
         (_a = this.ioConn) === null || _a === void 0 ? void 0 : _a.setState(pointId, state, (err) => {
             if (err) {
                 if (onError) {
                     onError(err);
                 }
                 else {
-                    console.log(`Error occured while setting state "${pointId}" to "${state}": ${err}`);
+                    this.log(models_1.LogLevel.Error, `Error occured while setting state "${pointId}" to "${state}": ${err}`);
                 }
                 return;
             }

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/groups/lightGroup.d.ts

@@ -1,6 +1,6 @@
 import { BaseGroup } from './base-group';
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, TimeOfDay, WledSetLightCommand } from '../../../models';
+import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, WledSetLightCommand } from '../../../models';
 import { WledDevice } from '../wledDevice';
 import { iLedRgbCct } from '../baseDeviceInterfaces/iLedRgbCct';
 export declare class LightGroup extends BaseGroup {
@@ -20,7 +20,7 @@ export declare class LightGroup extends BaseGroup {
     setAllLampen(c: LampSetLightCommand): void;
     setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
     setAllOutlets(c: ActuatorSetStateCommand): void;
-    setAllActuatorsTimeBased(time: TimeOfDay): void;
+    setAllActuatorsTimeBased(c: LampSetTimeBasedCommand): void;
     setAllLED(c: LedSetLightCommand): void;
     setAllWled(c: WledSetLightCommand): void;
     initialize(): void;

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

@@ -70,7 +70,7 @@ class LightGroup extends base_group_1.BaseGroup {
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
-                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
                 return;
             }
             a.setActuator(c);
@@ -106,16 +106,16 @@ class LightGroup extends base_group_1.BaseGroup {
             resultLampen = darkOutside;
         }
         if (resultLampen) {
-            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(models_1.CommandSource.Automatic, c.time, 'LightGroup switchTimeConditional'));
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllLampen(new models_1.LampSetLightCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllLampen(new models_1.LampSetLightCommand(c, false));
         }
         if (resultSteckdosen) {
-            this.setAllActuatorsTimeBased(c.time);
+            this.setAllActuatorsTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllOutlets(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false));
         }
     }
     setAllLampen(c) {
@@ -133,12 +133,13 @@ class LightGroup extends base_group_1.BaseGroup {
             s.setActuator(c);
         });
     }
-    setAllActuatorsTimeBased(time) {
+    setAllActuatorsTimeBased(c) {
         this.getOutlets().forEach((s) => {
-            if ((time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                s.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, `LightGroup setAllActuatorsTimeBased`));
+            if ((c.time === models_1.TimeOfDay.Daylight && s.settings.dayOn) ||
+                (c.time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (c.time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (c.time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                s.setActuator(new models_1.ActuatorSetStateCommand(c, true, `LightGroup setAllActuatorsTimeBased`, c.timeout));
             }
         });
     }

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

@@ -25,8 +25,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         return this.lightOn;
     }
     restoreTargetAutomaticValue(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
-        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState, 'Lampen RestoreTargetAutomaticValue'));
+        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState));
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);

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

@@ -77,7 +77,6 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         }
     }
     setLevel(command) {
-        this.log(models_2.LogLevel.Debug, command.logMessage);
         let targetLevel = command.level;
         if (!this._firstCommandRecieved && !command.isInitial) {
             this._firstCommandRecieved = true;
@@ -87,7 +86,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
             return;
         }
         if (this.currentLevel === targetLevel && !command.isForceAction) {
-            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.log(models_2.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one, commandLog: ${command.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         if (this._setLevelSwitchID === '') {
@@ -97,6 +96,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         if (!this.checkIoConnection(true)) {
             return;
         }
+        this.log(models_2.LogLevel.Debug, command.logMessage);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(models_1.WindowPosition.offen) > 0 && command.level < 100) {
                 if (!command.skipOpenWarning) {

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

@@ -1,6 +1,7 @@
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
 import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
 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;

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

@@ -5,21 +5,26 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 class LampUtils {
     static stromStossOn(actuator) {
-        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);
+        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'));
+                }
+            }, actuator.settings.stromStossResendTime * 1000, this));
+        }
         services_1.Utils.guardedTimeout(() => {
             actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, false, 'StromStoss Off'));
         }, 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.timeout));
         }
     }
     static checkUnBlock(device, command) {
@@ -29,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;
     }
@@ -42,15 +46,15 @@ class LampUtils {
             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, '', timeout));
             return true;
         }
-        device.setLight(new models_1.LampSetLightCommand(c, newVal, 'SetLight Due to toggle Light', timeout));
+        device.setLight(new models_1.LampSetLightCommand(c, newVal, '', timeout));
         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()}; command Log: ${c.logMessage}`);
             device.targetAutomaticState = c.on;
             return true;
         }
@@ -64,22 +68,33 @@ class LampUtils {
         return false;
     }
     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 (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            device.targetAutomaticState = c.on;
+        }
         if (LampUtils.checkUnchanged(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;
             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));
         }
     }
 }
 exports.LampUtils = LampUtils;
+LampUtils.stromStossContinueTimeouts = new Map();

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

@@ -11,6 +11,7 @@ export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableL
     settings: WledSettings;
     readonly blockAutomationHandler: BlockAutomaticHandler;
     targetAutomaticState: boolean;
+    protected readonly _debounceStateDelay: number;
     private readonly _onID;
     private readonly _presetID;
     private readonly _brightnessID;

package/lib/server/devices/wledDevice.js

@@ -7,6 +7,7 @@ const services_1 = require("../services");
 const models_1 = require("../../models");
 const blockAutomaticHandler_1 = require("../services/blockAutomaticHandler");
 const sharedFunctions_1 = require("./sharedFunctions");
+const DeviceCapability_1 = require("./DeviceCapability");
 class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.WledDevice);
@@ -16,10 +17,13 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.queuedValue = null;
         this.settings = new models_1.WledSettings();
         this.targetAutomaticState = false;
+        this._debounceStateDelay = 500;
         this._onID = `${this.info.fullID}.on`;
         this._presetID = `${this.info.fullID}.ps`;
         this._brightnessID = `${this.info.fullID}.bri`;
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
     }
     get actuatorOn() {
         return this.on;
@@ -28,8 +32,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         return this.on;
     }
     restoreTargetAutomaticValue(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
-        this.setLight(new models_1.WledSetLightCommand(c, this.targetAutomaticState, 'Lampen RestoreTargetAutomaticValue'));
+        this.setLight(new models_1.WledSetLightCommand(c, this.targetAutomaticState));
     }
     update(idSplit, state, initial = false, _pOverride = false) {
         this.queuedValue = null;
@@ -47,7 +50,6 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.setWled(new models_1.WledSetLightCommand(c, c.on, 'Set Wled due to DimmerSetLightCommand', c.timeout, c.brightness, c.transitionTime, undefined));
     }
     setWled(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -60,28 +62,31 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage);
         if (c.on && c.brightness !== -1 && this.brightness < 10) {
             c.brightness = 10;
         }
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `WLED Schalten: "${this.info.customName}" An: ${c.on}\tHelligkeit: ${c.brightness}%`);
         this.queuedValue = c.on;
-        this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c.on, c, 'WLED Schalten'));
-        if (c.preset !== undefined) {
+        if (!c.on) {
+            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'WLED ausschalten'));
+        }
+        else if (c.preset !== undefined) {
+            // This also turns the device on
             this.setState(this._presetID, c.preset, undefined, (err) => {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
             });
         }
         else if (c.brightness > -1) {
+            // This also turns the device on
             this.setState(this._brightnessID, c.brightness, undefined, (err) => {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
         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) {
-        this.log(models_1.LogLevel.Debug, `Wled setTimeBased ${c.time}`);
         this.setWled(models_1.WledSetLightCommand.byTimeBased(this.settings, c));
     }
     persist() {

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

@@ -23,8 +23,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
     restoreTargetAutomaticValue(c) {
-        this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore Target Automatic value'));
+        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState));
     }
     update(idSplit, state, initial = false, handledByChildObject = false) {
         if (!handledByChildObject) {

package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.d.ts

@@ -6,8 +6,6 @@ import { iDisposable } from '../../../services';
 export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposable {
     protected _available: boolean;
     protected _dontSendOnUnavailable: boolean;
-    protected _debounceStateDelay: number;
-    private _lastWrite;
     private readonly _deviceQueryId;
     get available(): boolean;
     protected _linkQuality: number;

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

@@ -18,9 +18,6 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         super(pInfo, pType);
         this._available = false;
         this._dontSendOnUnavailable = false;
-        // If configured > 0, this indicates the minimum time between state writes in ms
-        this._debounceStateDelay = 0;
-        this._lastWrite = 0;
         this._linkQuality = 0;
         this.persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
             this.persistZigbeeDevice();
@@ -40,16 +37,18 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
         switch (idSplit[3]) {
             case 'available':
-                this._available = state.val;
-                if (!this._available) {
-                    this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät ist nicht erreichbar.`);
+                const newAvailability = state.val;
+                if (this._available && !newAvailability) {
+                    this.log(models_1.LogLevel.Debug, `Device became unavailable.`);
                 }
+                this._available = newAvailability;
                 break;
             case 'link_quality':
-                this._linkQuality = state.val;
-                if (this._linkQuality < 5) {
-                    this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät hat eine schlechte Verbindung (${this._linkQuality}).`);
+                const newValue = state.val;
+                if (this._linkQuality > 5 && newValue <= 5) {
+                    this.log(models_1.LogLevel.Debug, `The link-quality dropped to a critical level: ${newValue}`);
                 }
+                this._linkQuality = state.val;
                 break;
         }
         this.stateMap.set(idSplit[3], state);
@@ -76,15 +75,7 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this.log(models_1.LogLevel.Warn, `Device unavailable --> Not changing ${pointId} to ${state}`);
             return;
         }
-        if (this._debounceStateDelay === 0 || services_1.Utils.nowMS() - this._lastWrite > this._debounceStateDelay) {
-            this._lastWrite = services_1.Utils.nowMS();
-            super.setState(pointId, state, onSuccess, onError);
-            return;
-        }
-        services_1.Utils.guardedTimeout(() => {
-            this.log(models_1.LogLevel.Trace, `Debounced write to ${pointId} to ${state}`);
-            this.setState(pointId, state, onSuccess, onError);
-        }, this._debounceStateDelay, this);
+        super.setState(pointId, state, onSuccess, onError);
     }
 }
 exports.ZigbeeDevice = ZigbeeDevice;