hoffmation-base 3.0.0-alpha.30 → 3.0.0-alpha.31

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

@@ -2,29 +2,30 @@ import { HmIPDevice } from './hmIpDevice';
 import { MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     /** @inheritDoc */
     movementDetected: boolean;
-    get battery(): number;
     /** @inheritDoc */
     settings: MotionSensorSettings;
+    private _battery;
+    private _lastBatteryPersist;
     private _movementDetectedCallback;
     private initialized;
     private _lastMotionTime;
+    private _detectionsToday;
+    private _currentIllumination;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get lastBatteryPersist(): number;
+    get battery(): number;
     get timeSinceLastMotion(): number;
-    private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
-    private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    addMovementCallback(pCallback: (pValue: boolean) => void): void;
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;

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

@@ -6,22 +6,17 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
+const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
         /** @inheritDoc */
         this.movementDetected = false;
         /** @inheritDoc */
         this.settings = new models_1.MotionSensorSettings();
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
         this._movementDetectedCallback = [];
         // private presenceStateID: string;
         this.initialized = false;
@@ -46,6 +41,12 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    get battery() {
+        return this._battery;
+    }
     get timeSinceLastMotion() {
         return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
     }
@@ -112,7 +113,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._movementDetectedCallback) {
-            c(pVal);
+            c(new motionSensorAction_1.MotionSensorAction(this));
         }
     }
     persistMotionSensor() {

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

@@ -11,6 +11,7 @@ const models_1 = require("../models");
 const models_2 = require("../../../models");
 const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../DeviceCapability");
+const shutterPositionChangedAction_1 = require("../../../models/action/shutterPositionChangedAction");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -44,7 +45,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         if (value !== this._currentLevel && this._window) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new shutterPositionChangedAction_1.ShutterPositionChangedAction(this, value));
             }, this);
             this.persist();
         }

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

@@ -1,5 +1,6 @@
 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;
@@ -7,6 +8,13 @@ export declare class LampUtils {
     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 checkDimmerUnchanged(device: iDimmableLamp, c: DimmerSetLightCommand): boolean;
+    static checkUnchanged(device: iActuator, c: ActuatorSetStateCommand, noLog?: boolean): boolean;
     static setActuator(device: iActuator, c: ActuatorSetStateCommand): void;
 }

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

@@ -61,12 +61,36 @@ class LampUtils {
         }
         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 checkDimmerUnchanged(device, c) {
+        if (c.isForceAction) {
+            return false;
+        }
+        if (!this.checkUnchanged(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 checkUnchanged(device, c, noLog = false) {
+        if (c.isForceAction) {
+            return false;
         }
-        return false;
+        if (c.on !== device.queuedValue || (device.queuedValue === null && device.actuatorOn !== c.on)) {
+            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 &&

package/lib/server/devices/wledDevice.js

@@ -69,6 +69,13 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        if (sharedFunctions_1.LampUtils.checkDimmerUnchanged(this, c)) {
+            return;
+        }
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            this.targetAutomaticState = c.on;
+        }
         this.log(models_1.LogLevel.Debug, c.logMessage);
         if (c.on && c.brightness !== -1 && this.brightness < 10) {
             c.brightness = 10;

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

@@ -57,6 +57,13 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        if (sharedFunctions_1.LampUtils.checkDimmerUnchanged(this, c)) {
+            return;
+        }
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            this.targetAutomaticState = c.on;
+        }
         if (c.transitionTime > -1) {
             this.setState(this._stateIdTransitionTime, c.transitionTime);
         }

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

@@ -4,13 +4,14 @@ import { ZigbeeDevice } from './index';
 import { MotionSensorSettings } from '../../../../models';
 import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
+import { MotionSensorAction } from '../../../../models/action/motionSensorAction';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
     /** @inheritDoc */
     settings: MotionSensorSettings;
     /** @inheritDoc */
     detectionsToday: number;
     protected _initialized: boolean;
-    protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
+    protected _movementDetectedCallback: Array<(action: MotionSensorAction) => void>;
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
     protected _timeSinceLastMotion: number;
@@ -31,7 +32,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
      * @param pCallback - Function that accepts the new state as parameter
      */
     /** @inheritDoc */
-    addMovementCallback(pCallback: (newState: boolean) => void): void;
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /** @inheritDoc */
     persistMotionSensor(): void;
     updateMovement(newState: boolean): void;

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

@@ -5,6 +5,7 @@ const index_1 = require("./index");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
+const motionSensorAction_1 = require("../../../../models/action/motionSensorAction");
 class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
@@ -102,7 +103,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
         }
         for (const c of this._movementDetectedCallback) {
-            c(newState);
+            c(new motionSensorAction_1.MotionSensorAction(this));
         }
     }
     /** @inheritDoc */

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

@@ -19,7 +19,7 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     /** @inheritDoc */
     get currentLevel(): number;
     /** @inheritDoc */
-    set currentLevel(value: number);
+    protected set currentLevel(value: number);
     protected _window?: Window;
     /** @inheritDoc */
     get window(): Window | undefined;

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

@@ -10,6 +10,7 @@ const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../DeviceCapability");
+const shutterPositionChangedAction_1 = require("../../../../models/action/shutterPositionChangedAction");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         var _a, _b;
@@ -52,7 +53,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         if (value !== this._currentLevel && this._window) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new shutterPositionChangedAction_1.ShutterPositionChangedAction(this, value));
             }, this);
             this.persist();
         }

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

@@ -2,6 +2,8 @@
 import { ZigbeeDevice } from './BaseDevices';
 import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
+import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
     private _battery;
     private _lastBatteryPersist;
@@ -34,9 +36,9 @@ export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatu
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
-    addHumidityCallback(pCallback: (pValue: number) => void): void;
+    addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     /** @inheritDoc */
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */

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

@@ -7,6 +7,8 @@ const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const humiditySensorChangeAction_1 = require("../../../models/action/humiditySensorChangeAction");
+const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     /** @inheritDoc */
     get lastBatteryPersist() {
@@ -52,7 +54,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(val);
+            cb(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -66,7 +68,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperaturCallbacks) {
-            cb(val);
+            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -92,14 +94,14 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(this._humidity);
+            pCallback(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     /** @inheritDoc */
     addTempChangeCallback(pCallback) {
         this._temperaturCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(this._temperature);
+            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */

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

@@ -283,18 +283,18 @@ class AcDevice {
         }
         this.turnOn();
     }
-    onRoomFirstEnter() {
+    onRoomFirstEnter(_action) {
         if (!this.settings.noCoolingOnMovement || !this.on || this.mode === ac_mode_1.AcMode.Heating) {
             return;
         }
         this.log(models_1.LogLevel.Info, 'Someone entered the room. Turning off AC');
         this.turnOff();
     }
-    onRoomLastLeave() {
+    onRoomLastLeave(action) {
         if (!this.settings.noCoolingOnMovement) {
             return;
         }
-        this.log(models_1.LogLevel.Info, 'Last person left the room. Checking if we should turn on AC');
+        this.log(models_1.LogLevel.Info, `Last person left the room (${action.reasonTrace}). Checking if we should turn on AC`);
         this.restoreTargetAutomaticValue();
     }
     /** @inheritDoc */

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

@@ -117,6 +117,13 @@ class OwnGoveeDevice {
         if (devices_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        if (devices_1.LampUtils.checkDimmerUnchanged(this, c)) {
+            return;
+        }
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            this.targetAutomaticState = c.on;
+        }
         if (c.brightness > -1 && c.on) {
             this.setBrightness(c.brightness, () => {
                 this.turnOn();