hoffmation-base 2.19.1 → 2.19.4

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

@@ -5,21 +5,24 @@ import { LogDebugType, OwnSonosDevice } from '../../services';
 import { iDachsSettings } from '../../config/iDachsSettings';
 import { DachsDeviceSettings } from '../../../models/deviceSettings/dachsSettings';
 import { iFlattenedCompleteResponse } from './interfaces';
-import { DachsWarmWaterTemperature } from './dachsWarmWaterTemperature';
+import { DachsTemperatureSensor } from './dachsTemperatureSensor';
 export declare class Dachs implements iBaseDevice, iActuator {
     settings: DachsDeviceSettings;
     readonly deviceType: DeviceType;
     readonly deviceCapabilities: DeviceCapability[];
-    readonly warmWaterSensor: DachsWarmWaterTemperature;
+    readonly warmWaterSensor: DachsTemperatureSensor;
+    readonly heatStorageTempSensor: DachsTemperatureSensor;
     private readonly client;
     private readonly config;
     fetchedData: iFlattenedCompleteResponse | undefined;
     private readonly _influxClient;
     private _dachsOn;
     private _tempWarmWater;
+    private _tempHeatStorage;
     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

@@ -11,7 +11,7 @@ const services_1 = require("../../services");
 const lodash_1 = __importDefault(require("lodash"));
 const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
 const lib_1 = require("./lib");
-const dachsWarmWaterTemperature_1 = require("./dachsWarmWaterTemperature");
+const dachsTemperatureSensor_1 = require("./dachsTemperatureSensor");
 class Dachs {
     get customName() {
         return this.info.customName;
@@ -22,12 +22,16 @@ 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;
         this.deviceCapabilities = [];
         this._dachsOn = false;
         this._tempWarmWater = 0;
+        this._tempHeatStorage = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `Dachs`;
@@ -46,7 +50,8 @@ class Dachs {
         };
         this.config = modifiedOptions;
         this.client = new lib_1.DachsHttpClient(this.config.connectionOptions);
-        this.warmWaterSensor = new dachsWarmWaterTemperature_1.DachsWarmWaterTemperature(this.config.roomName);
+        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);
     }
     get info() {
@@ -74,7 +79,7 @@ class Dachs {
         });
     }
     toJSON() {
-        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient', 'warmWaterSensor']));
+        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient', 'warmWaterSensor', 'heatStorageTempSensor']));
     }
     persistDeviceInfo() {
         services_1.Utils.guardedTimeout(() => {
@@ -87,7 +92,7 @@ class Dachs {
     }
     loadData() {
         this.client.fetchAllKeys().then((data) => {
-            var _a;
+            var _a, _b;
             this.fetchedData = data;
             if (this._influxClient === undefined) {
                 return;
@@ -104,6 +109,8 @@ class Dachs {
             this._dachsOn = this.fetchedData['Hka_Mw1.usDrehzahl'] >= 1;
             this._tempWarmWater = (_a = this.fetchedData['Hka_Mw1.Temp.sbZS_Warmwasser']) !== null && _a !== void 0 ? _a : 0;
             this.warmWaterSensor.update(this._tempWarmWater);
+            this._tempHeatStorage = (_b = this.fetchedData['Hka_Mw1.Temp.sbFuehler1']) !== null && _b !== void 0 ? _b : 0;
+            this.heatStorageTempSensor.update(this._tempHeatStorage);
             this.persist();
         });
     }

package/lib/server/devices/dachs/{dachsWarmWaterTemperature.d.ts → dachsTemperatureSensor.d.ts}

@@ -5,7 +5,7 @@ import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceSettings, LogLevel, RoomBase } from '../../../models';
-export declare class DachsWarmWaterTemperature implements iTemperatureSensor {
+export declare class DachsTemperatureSensor implements iTemperatureSensor {
     settings: DeviceSettings | undefined;
     readonly deviceType: DeviceType;
     readonly deviceCapabilities: DeviceCapability[];
@@ -13,7 +13,7 @@ export declare class DachsWarmWaterTemperature implements iTemperatureSensor {
     private _temperaturCallbacks;
     private _roomTemperature;
     protected _info: DeviceInfo;
-    constructor(roomName: string);
+    constructor(roomName: string, shortKey: string, longKey: string);
     get customName(): string;
     get info(): DeviceInfo;
     set info(info: DeviceInfo);

package/lib/server/devices/dachs/{dachsWarmWaterTemperature.js → dachsTemperatureSensor.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DachsWarmWaterTemperature = void 0;
+exports.DachsTemperatureSensor = void 0;
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
@@ -11,8 +11,8 @@ const deviceType_1 = require("../deviceType");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const lodash_1 = __importDefault(require("lodash"));
-class DachsWarmWaterTemperature {
-    constructor(roomName) {
+class DachsTemperatureSensor {
+    constructor(roomName, shortKey, longKey) {
         this.settings = undefined;
         this.deviceType = deviceType_1.DeviceType.DachsWarmWaterTemperature;
         this.deviceCapabilities = [];
@@ -24,9 +24,9 @@ class DachsWarmWaterTemperature {
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Water Temperature`;
-        this._info.customName = `Water Temperature ${roomName}`;
-        this._info.allDevicesKey = `dachs-ww-${roomName}`;
+        this._info.fullName = longKey;
+        this._info.customName = `${longKey} ${roomName}`;
+        this._info.allDevicesKey = `dachs-${shortKey}-${roomName}`;
         this._info.room = roomName;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
@@ -44,7 +44,7 @@ class DachsWarmWaterTemperature {
     }
     get id() {
         var _a;
-        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
+        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `dachs-${this.info.room}-${this.info.customName}`;
     }
     get name() {
         return this.info.customName;
@@ -113,4 +113,4 @@ class DachsWarmWaterTemperature {
         }
     }
 }
-exports.DachsWarmWaterTemperature = DachsWarmWaterTemperature;
+exports.DachsTemperatureSensor = DachsTemperatureSensor;