hoffmation-base 2.8.3 → 2.8.5

package/lib/server/devices/baseDeviceInterfaces/iCameraDevice.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="iobroker" />
+import { iMotionSensor } from './iMotionSensor';
+import { CameraSettings } from '../../../models';
+export interface iCameraDevice extends iMotionSensor {
+    settings: CameraSettings;
+    readonly lastImage: string;
+    readonly mpegStreamLink: string;
+    readonly h264IosStreamLink: string;
+    readonly currentImageLink: string;
+    readonly alarmBlockedByGriff: boolean;
+    readonly alarmBlockedByGriffTimeStamp: number;
+    onGriffUpdate(open: boolean): void;
+    update(stateName: string, state: ioBroker.State): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iCameraDevice.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/index.d.ts

@@ -3,6 +3,7 @@ export * from './iActuator';
 export * from './iBaseDevice';
 export * from './iBatteryDevice';
 export * from './iButtonSwitch';
+export * from './iCameraDevice';
 export * from './iEnergyManager';
 export * from './iExcessEnergyConsumer';
 export * from './iHandleSensor';

package/lib/server/devices/baseDeviceInterfaces/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./iActuator"), exports);
 __exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iBatteryDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
+__exportStar(require("./iCameraDevice"), exports);
 __exportStar(require("./iEnergyManager"), exports);
 __exportStar(require("./iExcessEnergyConsumer"), exports);
 __exportStar(require("./iHandleSensor"), exports);

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
-import { CameraDevice } from './cameraDevice';
+import { iCameraDevice } from '../baseDeviceInterfaces';
 export declare class BlueIrisCoordinator {
     private static cameraDeviceMap;
-    static addDevice(device: CameraDevice, devName: string): void;
+    static addDevice(device: iCameraDevice, devName: string): void;
     static update(idSplit: string[], state: ioBroker.State): void;
 }

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

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
-import { iMotionSensor, iRoomDevice } from '../baseDeviceInterfaces';
+import { iCameraDevice, iRoomDevice } from '../baseDeviceInterfaces';
 import { CameraSettings, LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../../services';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
-export declare class CameraDevice implements iRoomDevice, iMotionSensor {
+export declare class CameraDevice implements iCameraDevice {
     readonly blueIrisName: string;
     get lastImage(): string;
     settings: CameraSettings;
@@ -17,9 +17,13 @@ export declare class CameraDevice implements iRoomDevice, iMotionSensor {
     private _movementDetectedCallback;
     private _lastImage;
     private _personDetected;
+    private _alarmGriffBlockCount;
+    private _alarmBlockedByGriffTimeStamp;
     readonly mpegStreamLink: string;
     readonly h264IosStreamLink: string;
     readonly currentImageLink: string;
+    get alarmBlockedByGriffTimeStamp(): number;
+    get alarmBlockedByGriff(): boolean;
     constructor(mqttName: string, roomName: string, blueIrisName: string);
     private _detectionsToday;
     get detectionsToday(): number;
@@ -42,6 +46,7 @@ export declare class CameraDevice implements iRoomDevice, iMotionSensor {
      * @param pCallback Function that accepts the new state as parameter
      */
     addMovementCallback(pCallback: (newState: boolean) => void): void;
+    onGriffUpdate(open: boolean): void;
     persistMotionSensor(): void;
     update(stateName: string, state: ioBroker.State): void;
     updateMovement(newState: boolean): void;

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

@@ -16,6 +16,12 @@ class CameraDevice {
     get lastImage() {
         return this._lastImage;
     }
+    get alarmBlockedByGriffTimeStamp() {
+        return this._alarmBlockedByGriffTimeStamp;
+    }
+    get alarmBlockedByGriff() {
+        return this._alarmGriffBlockCount > 0;
+    }
     constructor(mqttName, roomName, blueIrisName) {
         var _a;
         this.settings = new models_1.CameraSettings();
@@ -26,6 +32,8 @@ class CameraDevice {
         this._movementDetectedCallback = [];
         this._lastImage = '';
         this._personDetected = false;
+        this._alarmGriffBlockCount = 0;
+        this._alarmBlockedByGriffTimeStamp = 0;
         this.mpegStreamLink = '';
         this.h264IosStreamLink = '';
         this.currentImageLink = '';
@@ -102,6 +110,13 @@ class CameraDevice {
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);
     }
+    onGriffUpdate(open) {
+        this._alarmGriffBlockCount += open ? 1 : -1;
+        if (this._alarmGriffBlockCount == 1) {
+            this._alarmBlockedByGriffTimeStamp = new Date().getTime();
+        }
+        this.log(models_1.LogLevel.Debug, `Handle change to open (${open}), new open amount: ${this._alarmGriffBlockCount}`);
+    }
     persistMotionSensor() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
@@ -129,7 +144,7 @@ class CameraDevice {
                 this._lastImage = state.val;
                 services_1.Utils.guardedTimeout(() => {
                     // Give Person Detected Update some time, as otherwise personDetected might still be false
-                    if (this.settings.alertPersonOnTelegram && this._personDetected) {
+                    if (this.settings.alertPersonOnTelegram && this._personDetected && !this.alarmBlockedByGriff) {
                         services_1.TelegramService.sendImage(`${this.name} detected Person`, new models_1.Base64Image(this._lastImage, 'person_alert'));
                     }
                 }, 1000);