hoffmation-base 2.20.3 → 2.20.5

package/lib/models/deviceSettings/ledSettings.d.ts

@@ -1,5 +1,6 @@
 import { DimmerSettings } from './dimmerSettings';
 export declare class LedSettings extends DimmerSettings {
+    static fallbackColor: string;
     defaultColor: string;
     dayOn: boolean;
     dayBrightness: number;

package/lib/models/deviceSettings/ledSettings.js

@@ -6,7 +6,7 @@ const server_1 = require("../../server");
 class LedSettings extends dimmerSettings_1.DimmerSettings {
     constructor() {
         super(...arguments);
-        this.defaultColor = '#fbbc32';
+        this.defaultColor = LedSettings.fallbackColor;
         this.dayOn = false;
         this.dayBrightness = 100;
         this.dayColor = this.defaultColor;
@@ -25,24 +25,24 @@ 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;
-        this.defaultColor = (_a = data.defaultColor) !== null && _a !== void 0 ? _a : this.defaultColor;
-        this.dayOn = (_b = data.dayOn) !== null && _b !== void 0 ? _b : this.dayOn;
-        this.dayBrightness = (_c = data.dayBrightness) !== null && _c !== void 0 ? _c : this.dayBrightness;
-        this.dayColor = (_d = data.dayColor) !== null && _d !== void 0 ? _d : this.dayColor;
-        this.dayColorTemp = (_e = data.dayColorTemp) !== null && _e !== void 0 ? _e : this.dayColorTemp;
-        this.dawnOn = (_f = data.dawnOn) !== null && _f !== void 0 ? _f : this.dawnOn;
-        this.dawnBrightness = (_g = data.dawnBrightness) !== null && _g !== void 0 ? _g : this.dawnBrightness;
-        this.dawnColor = (_h = data.dawnColor) !== null && _h !== void 0 ? _h : this.dawnColor;
-        this.dawnColorTemp = (_j = data.dawnColorTemp) !== null && _j !== void 0 ? _j : this.dawnColorTemp;
-        this.duskOn = (_k = data.duskOn) !== null && _k !== void 0 ? _k : this.duskOn;
-        this.duskBrightness = (_l = data.duskBrightness) !== null && _l !== void 0 ? _l : this.duskBrightness;
-        this.duskColor = (_m = data.duskColor) !== null && _m !== void 0 ? _m : this.duskColor;
-        this.duskColorTemp = (_o = data.duskColorTemp) !== null && _o !== void 0 ? _o : this.duskColorTemp;
-        this.nightOn = (_p = data.nightOn) !== null && _p !== void 0 ? _p : this.nightOn;
-        this.nightBrightness = (_q = data.nightBrightness) !== null && _q !== void 0 ? _q : this.nightBrightness;
-        this.nightColor = (_r = data.nightColor) !== null && _r !== void 0 ? _r : this.nightColor;
-        this.nightColorTemp = (_s = data.nightColorTemp) !== null && _s !== void 0 ? _s : this.nightColorTemp;
+        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;
         super.fromPartialObject(data);
     }
     toJSON() {
@@ -50,3 +50,4 @@ class LedSettings extends dimmerSettings_1.DimmerSettings {
     }
 }
 exports.LedSettings = LedSettings;
+LedSettings.fallbackColor = '#fbbc32';

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -23,7 +23,7 @@ class IoBrokerBaseDevice {
         this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
         this.persistDeviceInfo();
-        services_1.Utils.guardedTimeout(this.loadDeviceSettings, 200, this);
+        services_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
     }
     get id() {
         const result = services_1.Utils.guard(this.info.allDevicesKey);

package/lib/server/devices/blueIris/cameraDevice.js

@@ -282,6 +282,10 @@ class CameraDevice {
         this._movementDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
             var _a;
             this._movementDetectFallbackTimeout = null;
+            if (!this._movementDetected) {
+                // Der Fallback wird nicht benötigt, da bereits das Movement zurückgesetzt wurde
+                return;
+            }
             this._movementDetected = false;
             this.updateMovement(false);
             if (this._movementDetectedStateId !== undefined) {

package/lib/server/devices/groups/presenceGroup.d.ts

@@ -3,18 +3,21 @@ import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PresenceGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;
+    private _lastLeftCbs;
+    private _firstEnterCbs;
     constructor(roomName: string, motionSensorIds: string[]);
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
     presentAmount(): number;
     anyPresent(): boolean;
-    lastLeftCB(val: boolean, cb: () => void): void;
     addLastLeftCallback(cb: () => void): void;
     addFirstEnterCallback(cb: () => void): void;
+    private motionSensorOnLastLeft;
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
      * @private
      */
     private resetLastLeftTimeout;
-    private firstEnterCallback;
+    private motionSensorOnFirstEnter;
+    private executeLastLeftCbs;
 }

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

@@ -12,6 +12,8 @@ class PresenceGroup extends base_group_1.BaseGroup {
         super(roomName, group_type_1.GroupType.Presence);
         this._lastMovement = new Date(0);
         this._lastLeftTimeout = null;
+        this._lastLeftCbs = [];
+        this._firstEnterCbs = [];
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
     getMotionDetector() {
@@ -34,8 +36,9 @@ class PresenceGroup extends base_group_1.BaseGroup {
             });
         });
         this.addLastLeftCallback(() => {
-            var _a;
-            (_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false);
+            var _a, _b;
+            (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
+            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(false);
         });
         this.addFirstEnterCallback(() => {
             if (!this.getRoom().settings.lampenBeiBewegung) {
@@ -44,6 +47,16 @@ class PresenceGroup extends base_group_1.BaseGroup {
             this.log(models_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
             this.getRoom().setLightTimeBased();
         });
+        this.getMotionDetector().forEach((b) => {
+            b.addMovementCallback((val) => {
+                this.motionSensorOnFirstEnter(val);
+            });
+        });
+        this.getMotionDetector().forEach((b) => {
+            b.addMovementCallback((val) => {
+                this.motionSensorOnLastLeft(val);
+            });
+        });
     }
     presentAmount() {
         let count = 0;
@@ -62,8 +75,13 @@ class PresenceGroup extends base_group_1.BaseGroup {
         }
         return false;
     }
-    lastLeftCB(val, cb) {
-        var _a;
+    addLastLeftCallback(cb) {
+        this._lastLeftCbs.push(cb);
+    }
+    addFirstEnterCallback(cb) {
+        this._firstEnterCbs.push(cb);
+    }
+    motionSensorOnLastLeft(val) {
         if (val || this.anyPresent()) {
             this.resetLastLeftTimeout();
             return;
@@ -71,37 +89,21 @@ class PresenceGroup extends base_group_1.BaseGroup {
         let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
         if (timeAfterReset > 0) {
             this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
-            (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
-            cb();
+            this.executeLastLeftCbs();
             return;
         }
         this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
         this.resetLastLeftTimeout();
         this._lastLeftTimeout = services_1.Utils.guardedTimeout(() => {
-            var _a;
             timeAfterReset =
                 services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+            const presentAmount = this.presentAmount();
             this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
-            if (!this.anyPresent() && timeAfterReset > 0) {
-                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
-                cb();
+            if (presentAmount <= 0 && timeAfterReset > 0) {
+                this.executeLastLeftCbs();
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
-    addLastLeftCallback(cb) {
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.lastLeftCB(val, cb);
-            });
-        });
-    }
-    addFirstEnterCallback(cb) {
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.firstEnterCallback(val, cb);
-            });
-        });
-    }
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
      * @private
@@ -111,7 +113,7 @@ class PresenceGroup extends base_group_1.BaseGroup {
             clearTimeout(this._lastLeftTimeout);
         }
     }
-    firstEnterCallback(val, cb) {
+    motionSensorOnFirstEnter(val) {
         if (!val) {
             return;
         }
@@ -119,7 +121,14 @@ class PresenceGroup extends base_group_1.BaseGroup {
         if (this.presentAmount() > 1) {
             return;
         }
-        cb();
+        for (const cb of this._firstEnterCbs) {
+            cb();
+        }
+    }
+    executeLastLeftCbs() {
+        for (const cb of this._lastLeftCbs) {
+            cb();
+        }
     }
 }
 exports.PresenceGroup = PresenceGroup;

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

@@ -4,6 +4,7 @@ exports.ZigbeeLedRGBCCT = void 0;
 const models_1 = require("../../../../models");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const zigbeeDimmer_1 = require("./zigbeeDimmer");
+const services_1 = require("../../../services");
 class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
@@ -77,7 +78,8 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}`);
-        if (color !== '') {
+        const formattedColor = services_1.Utils.formatHex(color);
+        if (formattedColor !== null) {
             this.ioConn.setState(this._stateIdColor, color, (err) => {
                 if (err) {
                     this.log(models_1.LogLevel.Error, `LED Farbe schalten ergab Fehler: ${err}`);

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

@@ -39,7 +39,7 @@ class OwnGoveeDevice {
         devices_1.Devices.alLDevices[`govee-${roomName}-${deviceId}`] = this;
         this.persistDeviceInfo();
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
     }
     get color() {
         return this._color;
@@ -131,7 +131,8 @@ class OwnGoveeDevice {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}`);
-        if (color !== '') {
+        const formattedColor = utils_1.Utils.formatHex(color);
+        if (formattedColor !== null) {
             this.setColor(color);
         }
         let dontBlock = false;

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

@@ -33,4 +33,5 @@ export declare class Utils {
     private static deepOmit;
     static nextMatchingDate(hours?: number, minutes?: number, now?: Date): Date;
     static timeWithinBorders(minimumHours: number, minimumMinutes: number, maxHours: number, maxMinutes: number, now?: Date): boolean;
+    static formatHex(hex: string): string | null;
 }

package/lib/server/services/utils/utils.js

@@ -234,5 +234,14 @@ class Utils {
         }
         return true;
     }
+    static formatHex(hex) {
+        if (hex === undefined || hex === null || hex === '') {
+            return null;
+        }
+        if (!hex.startsWith('#')) {
+            return `#${hex}`;
+        }
+        return hex;
+    }
 }
 exports.Utils = Utils;