hoffmation-base 3.0.0-alpha.26 → 3.0.0-alpha.28

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

@@ -16,7 +16,7 @@ export declare class DimmerSetLightCommand extends LampSetLightCommand {
      * @param on - The desired value
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The desired brightness
      * @param transitionTime - The transition time during turnOn/turnOff
      */

package/lib/models/command/dimmerSetLightCommand.js

@@ -11,7 +11,7 @@ class DimmerSetLightCommand extends lampSetLightCommand_1.LampSetLightCommand {
      * @param on - The desired value
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The desired brightness
      * @param transitionTime - The transition time during turnOn/turnOff
      */

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

@@ -12,7 +12,7 @@ export declare class LampSetLightCommand extends ActuatorSetStateCommand {
      * @param on - The new state of the light
      * @param reason - You can provide a reason for clarification
      * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
-     * If unset the default value will be used: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      */
     constructor(source: CommandSource | BaseCommand, on: boolean, reason?: string, disableAutomatic?: BlockAutomaticCommand | null);
     /** @inheritDoc */

package/lib/models/command/lampSetLightCommand.js

@@ -10,7 +10,7 @@ class LampSetLightCommand extends actuatorSetStateCommand_1.ActuatorSetStateComm
      * @param on - The new state of the light
      * @param reason - You can provide a reason for clarification
      * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
-     * If unset the default value will be used: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      */
     constructor(source, on, reason = '', disableAutomatic) {
         super(source, on, reason, disableAutomatic);

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

@@ -19,7 +19,7 @@ export declare class LampSetTimeBasedCommand extends BaseCommand {
      * @param time - The time to use for calculation of desired state
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      */
     constructor(source: CommandSource | BaseCommand, time: TimeOfDay, reason?: string, disableAutomatic?: BlockAutomaticCommand | null);
 }

package/lib/models/command/lampSetTimeBasedCommand.js

@@ -10,7 +10,7 @@ class LampSetTimeBasedCommand extends baseCommand_1.BaseCommand {
      * @param time - The time to use for calculation of desired state
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      */
     constructor(source, time, reason = '', disableAutomatic) {
         super(source, reason);

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

@@ -16,7 +16,7 @@ export declare class LedSetLightCommand extends DimmerSetLightCommand {
      * @param on - The desired state-value
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The desired brightness
      * @param transitionTime - The transition time during turnOn/turnOff
      * @param color - The desired color in 6 digit hex Code

package/lib/models/command/ledSetLightCommand.js

@@ -11,7 +11,7 @@ class LedSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand {
      * @param on - The desired state-value
      * @param reason - You can provide a reason for clarity
      * @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}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The desired brightness
      * @param transitionTime - The transition time during turnOn/turnOff
      * @param color - The desired color in 6 digit hex Code

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

@@ -15,7 +15,7 @@ export declare class WledSetLightCommand extends DimmerSetLightCommand {
      * @param on - The desired state of the light
      * @param reason - You can provide a reason for clarification
      * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
-     * If unset the default value will be used: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The brightness of the light
      * @param transitionTime - The time in milliseconds the transition should take
      * @param preset - The preset to use

package/lib/models/command/wledSetLightCommand.js

@@ -11,7 +11,7 @@ class WledSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand
      * @param on - The desired state of the light
      * @param reason - You can provide a reason for clarification
      * @param disableAutomatic - If provided, the device will remain in the desired state for the given disable action.
-     * If unset the default value will be used: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
+     * If undefined the default value will be used in case it's a non automatic action: {@link SettingsService.settings.blockAutomaticHandlerDefaults}
      * @param brightness - The brightness of the light
      * @param transitionTime - The time in milliseconds the transition should take
      * @param preset - The preset to use

package/lib/models/timeCallback.js

@@ -96,8 +96,8 @@ class TimeCallback {
                 }
                 break;
         }
-        if (nextCalculatedTime < now && this.nextToDo && this.nextToDo > now) {
-            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, 'Time Callback recalc results in the past, while previous target is still in future --> fire immediately.');
+        if (nextCalculatedTime < now && this.nextToDo && this.nextToDo > this.lastDone) {
+            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
             this.perform(now);
             return;
         }
@@ -110,11 +110,11 @@ class TimeCallback {
     }
     perform(now = new Date()) {
         server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Timecallback '${this.name}' fired`);
-        this.cFunction();
         this.lastDone = now;
         this.nextToDo = undefined;
         this._calculationSunrise = undefined;
         this._calculationSunset = undefined;
+        this.cFunction();
     }
 }
 exports.TimeCallback = TimeCallback;

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

@@ -79,11 +79,11 @@ class WindowGroup extends base_group_1.BaseGroup {
         });
     }
     sunriseUp(c) {
-        this.windows.forEach((f) => {
-            if (!this.getRoom().settings.sonnenAufgangRollos || f.getShutter().length === 0) {
+        this.windows.forEach((w) => {
+            if (!this.getRoom().settings.sonnenAufgangRollos || w.getShutter().length === 0) {
                 return;
             }
-            f.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 100));
+            w.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 100));
         });
     }
     restoreShutterPosition(c) {
@@ -164,7 +164,7 @@ class WindowGroup extends base_group_1.BaseGroup {
         }
         if (this.sunriseShutterCallback === undefined) {
             this.log(models_1.LogLevel.Debug, `Add Sunrise shutter TimeCallback for ${this.roomName}`);
-            this.sunriseShutterCallback = new models_1.TimeCallback(`${this.roomName} Sonnenaufgang Rollos`, models_1.TimeCallbackType.Sunrise, () => {
+            this.sunriseShutterCallback = new models_1.TimeCallback(`${this.roomName} Sunrise Shutter`, models_1.TimeCallbackType.Sunrise, () => {
                 if (room.skipNextRolloUp) {
                     this.log(models_1.LogLevel.Info, `${this.roomName} skipped sunrise up due to room.skipNextRolloUp`);
                     room.skipNextRolloUp = false;

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

@@ -69,7 +69,6 @@ class LampUtils {
         return false;
     }
     static setActuator(device, c) {
-        var _a;
         if (device.settings.isStromStoss &&
             c.on &&
             c.containsType(models_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand)) {
@@ -96,8 +95,13 @@ class LampUtils {
         if (dontBlock || c.disableAutomaticCommand === null) {
             return;
         }
-        (_a = c.disableAutomaticCommand) !== null && _a !== void 0 ? _a : (c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, device.settings));
-        if (c.disableAutomaticCommand !== null) {
+        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);
         }
     }

package/lib/server/devices/wledDevice.js

@@ -57,7 +57,6 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.setWled(new models_1.WledSetLightCommand(c, c.on, 'Set Wled due to DimmerSetLightCommand', c.disableAutomaticCommand, c.brightness, c.transitionTime, undefined));
     }
     setWled(c) {
-        var _a;
         if (this._onID === '') {
             services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Keine On ID für "${this.info.customName}" bekannt.`);
             return;
@@ -90,11 +89,14 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
             });
         }
-        if (!dontBlock && c.disableAutomaticCommand !== null) {
-            (_a = c.disableAutomaticCommand) !== null && _a !== void 0 ? _a : (c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings));
-            if (c.disableAutomaticCommand !== null) {
-                this.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
-            }
+        if (dontBlock || c.disableAutomaticCommand === null) {
+            return;
+        }
+        if (c.disableAutomaticCommand === undefined && c.isForceAction) {
+            c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings);
+        }
+        if (c.disableAutomaticCommand) {
+            this.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
         }
     }
     setTimeBased(c) {

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

@@ -79,7 +79,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
     }
     /** @inheritDoc */
     setLight(c) {
-        var _a, _b;
+        var _a;
         if (this._stateIdState === '') {
             this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
@@ -99,12 +99,14 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             c.brightness = 10;
         }
         if (!dontBlock && c.disableAutomaticCommand !== null) {
-            (_a = c.disableAutomaticCommand) !== null && _a !== void 0 ? _a : (c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings));
-            if (c.disableAutomaticCommand !== null) {
+            if (c.disableAutomaticCommand === undefined && c.isForceAction) {
+                c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings);
+            }
+            if (c.disableAutomaticCommand) {
                 this.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
             }
         }
-        if (((_b = services_1.SettingsService.settings.ioBroker) === null || _b === void 0 ? void 0 : _b.useZigbee2mqtt) && !c.on) {
+        if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !c.on) {
             // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
             this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on));
             this.queuedValue = c.on;

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

@@ -89,11 +89,11 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             this._firstCommandRecieved = true;
         }
         else if (this._firstCommandRecieved && c.isInitial) {
-            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo to ${pPosition} as we recieved a command already`);
+            this.log(models_1.LogLevel.Debug, `Skipped initial shutter to ${pPosition} as we recieved a command already`);
             return;
         }
         if (this.currentLevel === pPosition && !c.isForceAction) {
-            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one, commandLog: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.log(models_1.LogLevel.Debug, `Skip shutter command to Position ${pPosition} as this is the current one, commandLog: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         this.log(models_1.LogLevel.Debug, c.logMessage);

package/lib/server/services/blockAutomaticHandler.js

@@ -38,7 +38,9 @@ class BlockAutomaticHandler {
         }
         this.automaticBlockedUntil = c.targetDate;
         if (c.revertToAutomaticAtBlockLift) {
-            this.updateRestoreTimeout(new models_1.RestoreTargetAutomaticValueCommand(c, 'Restore to automatic state after block.'));
+            const revertCommand = new models_1.RestoreTargetAutomaticValueCommand(c, 'Restore to automatic state after block.');
+            revertCommand.overrideCommandSource = models_1.CommandSource.Automatic;
+            this.updateRestoreTimeout(revertCommand);
         }
         else {
             this.removeRestoreTimeout();