hoffmation-base 2.19.2 → 2.19.5

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

@@ -2,6 +2,7 @@ import { MotionSensorSettings } from './motionSensorSettings';
 export declare class CameraSettings extends MotionSensorSettings {
     alertPersonOnTelegram: boolean;
     movementDetectionOnPersonOnly: boolean;
+    movementDetectionOnDogsToo: boolean;
     hasAudio: boolean;
     fromPartialObject(data: Partial<CameraSettings>): void;
     protected toJSON(): Partial<MotionSensorSettings>;

package/lib/models/deviceSettings/cameraSettings.js

@@ -8,13 +8,15 @@ class CameraSettings extends motionSensorSettings_1.MotionSensorSettings {
         super(...arguments);
         this.alertPersonOnTelegram = false;
         this.movementDetectionOnPersonOnly = false;
+        this.movementDetectionOnDogsToo = false;
         this.hasAudio = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.alertPersonOnTelegram = (_a = data.alertPersonOnTelegram) !== null && _a !== void 0 ? _a : this.alertPersonOnTelegram;
         this.movementDetectionOnPersonOnly = (_b = data.movementDetectionOnPersonOnly) !== null && _b !== void 0 ? _b : this.movementDetectionOnPersonOnly;
-        this.hasAudio = (_c = data.hasAudio) !== null && _c !== void 0 ? _c : this.hasAudio;
+        this.movementDetectionOnDogsToo = (_c = data.movementDetectionOnDogsToo) !== null && _c !== void 0 ? _c : this.movementDetectionOnDogsToo;
+        this.hasAudio = (_d = data.hasAudio) !== null && _d !== void 0 ? _d : this.hasAudio;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/server/devices/blueIris/cameraDevice.d.ts

@@ -8,7 +8,9 @@ export declare class CameraDevice implements iCameraDevice {
     readonly blueIrisName: string;
     private _personDetectFallbackTimeout;
     private _movementDetectFallbackTimeout;
+    private _dogDetectFallbackTimeout;
     private _personDetectedStateId;
+    private _dogDetectedStateId;
     private _movementDetectedStateId;
     get lastImage(): string;
     settings: CameraSettings;
@@ -20,12 +22,15 @@ export declare class CameraDevice implements iCameraDevice {
     private _movementDetectedCallback;
     private _lastImage;
     private _personDetected;
+    private _dogDetected;
     private _alarmGriffBlockCount;
     private _alarmBlockedByGriffTimeStamp;
     readonly mpegStreamLink: string;
     readonly h264IosStreamLink: string;
     readonly rtspStreamLink: string;
     readonly currentImageLink: string;
+    get dogDetected(): boolean;
+    get personDetected(): boolean;
     get alarmBlockedByGriffTimeStamp(): number;
     get alarmBlockedByGriff(): boolean;
     constructor(mqttName: string, roomName: string, blueIrisName: string);
@@ -59,5 +64,6 @@ export declare class CameraDevice implements iCameraDevice {
     persistDeviceInfo(): void;
     loadDeviceSettings(): void;
     private resetPersonDetectFallbackTimer;
+    private resetDogDetectFallbackTimer;
     private resetMovementFallbackTimer;
 }

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

@@ -17,6 +17,12 @@ class CameraDevice {
     get lastImage() {
         return this._lastImage;
     }
+    get dogDetected() {
+        return this._dogDetected;
+    }
+    get personDetected() {
+        return this._personDetected;
+    }
     get alarmBlockedByGriffTimeStamp() {
         return this._alarmBlockedByGriffTimeStamp;
     }
@@ -27,7 +33,9 @@ class CameraDevice {
         var _a;
         this._personDetectFallbackTimeout = null;
         this._movementDetectFallbackTimeout = null;
+        this._dogDetectFallbackTimeout = null;
         this._personDetectedStateId = undefined;
+        this._dogDetectedStateId = undefined;
         this._movementDetectedStateId = undefined;
         this.settings = new models_1.CameraSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.camera, DeviceCapability_1.DeviceCapability.motionSensor];
@@ -37,6 +45,7 @@ class CameraDevice {
         this._movementDetectedCallback = [];
         this._lastImage = '';
         this._personDetected = false;
+        this._dogDetected = false;
         this._alarmGriffBlockCount = 0;
         this._alarmBlockedByGriffTimeStamp = 0;
         this.mpegStreamLink = '';
@@ -158,6 +167,18 @@ class CameraDevice {
                     this.updateMovement(newValue);
                 }
                 break;
+            case 'DogDetected':
+                this._dogDetectedStateId = idSplit.join('.');
+                const newDogDetectionVal = state.val === 1;
+                if (newDogDetectionVal) {
+                    this.log(models_1.LogLevel.Info, `Dog Detected`);
+                    this.resetDogDetectFallbackTimer();
+                }
+                this._dogDetected = newDogDetectionVal;
+                if (this.settings.movementDetectionOnDogsToo) {
+                    this.updateMovement(newDogDetectionVal);
+                }
+                break;
             case 'MotionSnapshot':
                 this._lastImage = state.val;
                 services_1.Utils.guardedTimeout(() => {
@@ -234,6 +255,23 @@ class CameraDevice {
             }
         }, 120000, this);
     }
+    resetDogDetectFallbackTimer() {
+        if (this._dogDetectFallbackTimeout !== null) {
+            clearTimeout(this._dogDetectFallbackTimeout);
+            this._dogDetectFallbackTimeout = null;
+        }
+        this._dogDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
+            var _a;
+            this._dogDetectFallbackTimeout = null;
+            this._dogDetected = false;
+            if (this.settings.movementDetectionOnDogsToo) {
+                this.updateMovement(false);
+            }
+            if (this._dogDetectedStateId !== undefined) {
+                (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._dogDetectedStateId, { val: 0, ack: true });
+            }
+        }, 120000, this);
+    }
     resetMovementFallbackTimer() {
         if (this._movementDetectFallbackTimeout !== null) {
             clearTimeout(this._movementDetectFallbackTimeout);

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

@@ -22,6 +22,7 @@ export declare class Dachs implements iBaseDevice, iActuator {
     get customName(): string;
     get actuatorOn(): boolean;
     get tempWarmWater(): number;
+    get tempHeatStorage(): number;
     constructor(options: iDachsSettings);
     protected _info: DeviceInfo;
     get info(): DeviceInfo;

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

@@ -22,6 +22,9 @@ class Dachs {
     get tempWarmWater() {
         return this._tempWarmWater;
     }
+    get tempHeatStorage() {
+        return this._tempHeatStorage;
+    }
     constructor(options) {
         this.settings = new dachsSettings_1.DachsDeviceSettings();
         this.deviceType = devices_1.DeviceType.Dachs;

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

@@ -13,6 +13,7 @@ export declare class LightGroup extends BaseGroup {
     getLED(): iLedRgbCct[];
     getWled(): WledDevice[];
     getOutlets(): iActuator[];
+    getAllAsActuator(): iActuator[];
     handleSunriseOff(): void;
     switchAll(target: boolean, force?: boolean): void;
     switchTimeConditional(time: TimeOfDay): void;

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

@@ -52,6 +52,14 @@ class LightGroup extends base_group_1.BaseGroup {
     getOutlets() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
     }
+    getAllAsActuator() {
+        const result = [];
+        result.push(...this.getLights());
+        result.push(...this.getOutlets());
+        result.push(...this.getLED());
+        result.push(...this.getWled());
+        return result;
+    }
     handleSunriseOff() {
         if (!this.anyLightsOn()) {
             return;
@@ -60,17 +68,12 @@ class LightGroup extends base_group_1.BaseGroup {
         this.switchAll(false);
     }
     switchAll(target, force = false) {
-        if (!force && !target && this._ambientLightOn) {
-            this.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
-            return;
-        }
-        this.setAllLampen(target, undefined, force);
-        this.setAllStecker(target, undefined, force);
-        this.getLED().forEach((s) => {
-            s.setLight(target);
-        });
-        this.getWled().forEach((wled) => {
-            wled.setLight(target);
+        this.getAllAsActuator().forEach((a) => {
+            if (a.settings.includeInAmbientLight && !force && !target && this._ambientLightOn) {
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
+                return;
+            }
+            a.setActuator(target, undefined, force);
         });
     }
     switchTimeConditional(time) {
@@ -193,24 +196,9 @@ class LightGroup extends base_group_1.BaseGroup {
     ambientLightStartCallback() {
         this._ambientLightOn = true;
         this.log(models_1.LogLevel.Info, `Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung`);
-        this.getLights().forEach((l) => {
-            if (l.settings.includeInAmbientLight) {
-                l.setLight(true, -1, false);
-            }
-        });
-        this.getOutlets().forEach((o) => {
-            if (o.settings.includeInAmbientLight) {
-                o.setActuator(true);
-            }
-        });
-        this.getLED().forEach((s) => {
-            if (s.settings.includeInAmbientLight) {
-                s.setLight(true, -1, false);
-            }
-        });
-        this.getWled().forEach((wled) => {
-            if (wled.settings.includeInAmbientLight) {
-                wled.setLight(true);
+        this.getAllAsActuator().forEach((a) => {
+            if (a.settings.includeInAmbientLight) {
+                a.setActuator(true);
             }
         });
         services_1.Utils.guardedTimeout(() => {