hoffmation-base 3.0.0-alpha.36 → 3.0.0-alpha.38

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

@@ -23,4 +23,5 @@ export declare class BlockAutomaticUntilCommand extends BaseCommand {
      * @param revertToAutomaticAtBlockLift - Whether the device should revert to automatic afterward. --> Default: {@link SettingsService.settings.blockAutomaticHandlerDefaults.revertToAutomaticAtBlockLift}
      */
     constructor(source: CommandSource | BaseCommand, targetDate: Date, reason?: string, onCollideAction?: CollisionSolving, revertToAutomaticAtBlockLift?: boolean);
+    get logMessage(): string;
 }

package/lib/models/command/blockAutomaticUntilCommand.js

@@ -25,5 +25,8 @@ class BlockAutomaticUntilCommand extends baseCommand_1.BaseCommand {
         this.revertToAutomaticAtBlockLift =
             (_f = revertToAutomaticAtBlockLift !== null && revertToAutomaticAtBlockLift !== void 0 ? revertToAutomaticAtBlockLift : (_e = (_d = server_1.SettingsService.settings) === null || _d === void 0 ? void 0 : _d.blockAutomaticHandlerDefaults) === null || _e === void 0 ? void 0 : _e.revertToAutomaticAtBlockLift) !== null && _f !== void 0 ? _f : true;
     }
+    get logMessage() {
+        return `Block automatic until ${this.targetDate.toISOString()}, reason: ${this.reasonTrace}`;
+    }
 }
 exports.BlockAutomaticUntilCommand = BlockAutomaticUntilCommand;

package/lib/server/devices/dachs/dachs.js

@@ -57,7 +57,7 @@ class Dachs {
         this.warmWaterSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'ww', 'Water Temperature');
         this.heatStorageTempSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'hs', 'Heat Storage Temperature');
         services_1.Utils.guardedInterval(this.loadData, this.config.refreshInterval, this);
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     /** @inheritDoc */
     get info() {

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

@@ -23,7 +23,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     get actuatorOn() {
         return this._actuatorOn;

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

@@ -29,6 +29,10 @@ class LampUtils {
     }
     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 &&

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

@@ -23,8 +23,6 @@ export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableL
     /** @inheritDoc */
     get actuatorOn(): boolean;
     /** @inheritDoc */
-    get lightOn(): boolean;
-    /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
     /** @inheritDoc */

package/lib/server/devices/wledDevice.js

@@ -24,7 +24,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         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.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
     }
@@ -33,10 +33,6 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         return this.on;
     }
     /** @inheritDoc */
-    get lightOn() {
-        return this.on;
-    }
-    /** @inheritDoc */
     restoreTargetAutomaticValue(c) {
         this.setLight(new models_1.WledSetLightCommand(c, this.targetAutomaticState));
     }

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

@@ -21,7 +21,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         this._actuatorOn = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     /** @inheritDoc */
     get actuatorOn() {

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

@@ -11,11 +11,11 @@ export declare abstract class ZigbeeDimmer extends ZigbeeLamp implements iDimmab
     protected abstract readonly _stateIdTransitionTime: string;
     protected abstract readonly _stateNameBrightness: string;
     protected abstract readonly _stateNameTransitionTime: string;
-    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     protected _brightness: number;
+    protected _transitionTime: number;
+    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     /** @inheritDoc */
     get brightness(): number;
-    protected _transitionTime: number;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */

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

@@ -13,9 +13,7 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
         this.settings = new models_1.DimmerSettings();
         this._brightness = 0;
         this._transitionTime = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
     }
     /** @inheritDoc */
     get brightness() {

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

@@ -6,8 +6,6 @@ import { DeviceType } from '../../deviceType';
 export declare abstract class ZigbeeLamp extends ZigbeeActuator implements iLamp, iTemporaryDisableAutomatic {
     constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     /** @inheritDoc */
-    get lightOn(): boolean;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;

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

@@ -11,10 +11,6 @@ class ZigbeeLamp extends ZigbeeActuator_1.ZigbeeActuator {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     /** @inheritDoc */
-    get lightOn() {
-        return this.actuatorOn;
-    }
-    /** @inheritDoc */
     update(idSplit, state, initial = false, handledByChildObject = false) {
         if (!handledByChildObject) {
             this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);

package/lib/server/devices/zigbee/zigbeeIlluLampe.d.ts

@@ -3,6 +3,5 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ZigbeeLamp } from './BaseDevices';
 export declare class ZigbeeIlluLampe extends ZigbeeLamp implements iLamp {
     protected readonly _actuatorOnStateIdState: string;
-    protected readonly _stateNameState: string;
     constructor(pInfo: IoBrokerDeviceInfo);
 }

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -6,8 +6,7 @@ const BaseDevices_1 = require("./BaseDevices");
 class ZigbeeIlluLampe extends BaseDevices_1.ZigbeeLamp {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
-        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${pInfo.fullID}.state`;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.${this._stateNameState}`;
     }
 }
 exports.ZigbeeIlluLampe = ZigbeeIlluLampe;

package/lib/server/devices/zigbee/zigbeeUbisysLampe.d.ts

@@ -4,7 +4,6 @@ import { ZigbeeLamp } from './BaseDevices';
 import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
 export declare class ZigbeeUbisysLampe extends ZigbeeLamp implements iLamp, iLoadMeter {
     protected readonly _actuatorOnStateIdState: string;
-    protected readonly _stateNameState: string;
     private _loadPower;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */

package/lib/server/devices/zigbee/zigbeeUbisysLampe.js

@@ -11,7 +11,6 @@ class ZigbeeUbisysLampe extends BaseDevices_1.ZigbeeLamp {
         this._loadPower = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
         this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${pInfo.fullID}.state`;
     }
     /** @inheritDoc */
     get loadPower() {

package/lib/server/services/ac/ac-device.js

@@ -85,7 +85,7 @@ class AcDevice {
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     /** @inheritDoc */
     get energySettings() {

package/lib/server/services/blockAutomaticHandler.d.ts

@@ -1,13 +1,15 @@
-import { BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, BlockAutomaticUntilCommand, RestoreTargetAutomaticValueCommand } from '../../models';
+import { BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, BlockAutomaticUntilCommand, LogLevel, RestoreTargetAutomaticValueCommand } from '../../models';
+import { LogDebugType } from './log-service';
 /**
  * This class is responsible for blocking automatic actions for a specific duration.
  * It also provides the possibility to lift the block before the duration is over {@link BlockAutomaticLiftBlockCommand}.
  */
 export declare class BlockAutomaticHandler {
+    private readonly _logger;
     private readonly _restoreAutomatic;
     private _automaticBlockedUntil;
     private _restoreAutomaticStateTimeout;
-    constructor(restoreAutomaticCb: (c: RestoreTargetAutomaticValueCommand) => void);
+    constructor(restoreAutomaticCb: (c: RestoreTargetAutomaticValueCommand) => void, _logger: (level: LogLevel, message: string, logDebugType?: LogDebugType) => void);
     get automaticBlockedUntil(): Date;
     private set automaticBlockedUntil(value);
     get automaticBlockActive(): boolean;

package/lib/server/services/blockAutomaticHandler.js

@@ -12,7 +12,8 @@ const lodash_1 = __importDefault(require("lodash"));
  * It also provides the possibility to lift the block before the duration is over {@link BlockAutomaticLiftBlockCommand}.
  */
 class BlockAutomaticHandler {
-    constructor(restoreAutomaticCb) {
+    constructor(restoreAutomaticCb, _logger) {
+        this._logger = _logger;
         this._automaticBlockedUntil = new Date(0);
         this._restoreAutomaticStateTimeout = null;
         this._restoreAutomatic = restoreAutomaticCb;
@@ -34,8 +35,10 @@ class BlockAutomaticHandler {
         if (this._automaticBlockedUntil > now &&
             c.onCollideAction != models_1.CollisionSolving.override &&
             (c.onCollideAction != models_1.CollisionSolving.overrideIfGreater || c.targetDate < this._automaticBlockedUntil)) {
+            this._logger(models_1.LogLevel.Info, `Block already active until "${this.automaticBlockedUntil.toLocaleTimeString('de-DE')}" --> ignoring: ${c.logMessage}`);
             return;
         }
+        this._logger(models_1.LogLevel.Info, c.logMessage);
         this.automaticBlockedUntil = c.targetDate;
         if (c.revertToAutomaticAtBlockLift) {
             const revertCommand = new models_1.RestoreTargetAutomaticValueCommand(c, 'Restore to automatic state after block.');
@@ -66,7 +69,7 @@ class BlockAutomaticHandler {
         }, this._automaticBlockedUntil.getTime() - utils_1.Utils.nowMS() + 500, this);
     }
     toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_restoreAutomatic']));
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_restoreAutomatic', '_logger']));
     }
 }
 exports.BlockAutomaticHandler = BlockAutomaticHandler;

package/lib/server/services/govee/own-govee-device.d.ts

@@ -27,7 +27,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     /** @inheritDoc */
     targetAutomaticState: boolean;
     protected _info: DeviceInfo;
-    private _on;
+    private _actuatorOn;
     private _color;
     private _colortemp;
     private _room;
@@ -37,7 +37,6 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     get room(): RoomBase;
     get customName(): string;
     get actuatorOn(): boolean;
-    get lightOn(): boolean;
     get info(): DeviceInfo;
     get id(): string;
     get name(): string;

package/lib/server/services/govee/own-govee-device.js

@@ -32,7 +32,7 @@ class OwnGoveeDevice {
         this.brightness = -1;
         /** @inheritDoc */
         this.targetAutomaticState = false;
-        this._on = false;
+        this._actuatorOn = false;
         this._color = '#fcba32';
         this._colortemp = 500;
         this._room = undefined;
@@ -44,7 +44,7 @@ class OwnGoveeDevice {
         this._info.allDevicesKey = `govee-${roomName}-${deviceId}`;
         devices_1.Devices.alLDevices[`govee-${roomName}-${deviceId}`] = this;
         this.persistDeviceInfo();
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
     }
     get color() {
@@ -63,10 +63,7 @@ class OwnGoveeDevice {
         return this.info.customName;
     }
     get actuatorOn() {
-        return this._on;
-    }
-    get lightOn() {
-        return this._on;
+        return this._actuatorOn;
     }
     get info() {
         return this._info;
@@ -168,7 +165,7 @@ class OwnGoveeDevice {
     }
     update(data) {
         this.queuedValue = null;
-        this._on = data.onOff === 1;
+        this._actuatorOn = data.onOff === 1;
         this.brightness = data.brightness;
         this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
         this._colortemp = data.colorTemInKelvin;
@@ -199,7 +196,7 @@ class OwnGoveeDevice {
     }
     turnOn() {
         var _a;
-        if (this._on) {
+        if (this._actuatorOn) {
             return;
         }
         this.queuedValue = true;