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

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/server/devices/deviceUpdater.js

@@ -37,7 +37,7 @@ class DeviceUpdater {
             classifier = devices_1.Devices.IDENTIFIER_ZIGBEE;
             devId = idSplit[2].substring(2);
         }
-        const device = services_1.API.getDevice(`${classifier}-${devId}`);
+        const device = services_1.API.getDevice(`${classifier}-${devId}`, false);
         if (typeof device === 'undefined' || device.update === undefined) {
             return;
         }

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/services/api/api-service.d.ts

@@ -19,7 +19,7 @@ export declare class API {
     static getDevices(): {
         [id: string]: iBaseDevice;
     };
-    static getDevice(id: string): iBaseDevice;
+    static getDevice(id: string, warnIfNotFound?: boolean): iBaseDevice;
     static getGroup(id: string): BaseGroup | undefined;
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;

package/lib/server/services/api/api-service.js

@@ -45,9 +45,9 @@ class API {
         return devices_1.Devices.alLDevices;
     }
     // TODO: Missing Comment
-    static getDevice(id) {
+    static getDevice(id, warnIfNotFound = true) {
         const d = devices_1.Devices.alLDevices[id];
-        if (d === undefined) {
+        if (d === undefined && warnIfNotFound) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Api.getDevice() --> "${id}" not found`);
         }
         return d;