hoffmation-base 3.0.0-beta.11 → 3.0.0-beta.12

package/lib/server/devices/{blueIris/cameraDevice.d.ts → CameraDevice.d.ts}

@@ -1,14 +1,10 @@
-import { iBaseDevice, iCameraDevice, iRoomDevice } from '../baseDeviceInterfaces';
-import { CameraSettings, LogLevel, MotionSensorAction, RoomBase } from '../../../models';
-import { LogDebugType } from '../../services';
-import { DeviceInfo } from '../DeviceInfo';
-import { DeviceCapability } from '../DeviceCapability';
-import { DeviceType } from '../deviceType';
-export declare class CameraDevice implements iCameraDevice {
-    /**
-     * The name of the camera in BlueIris
-     */
-    readonly blueIrisName: string;
+import { iBaseDevice, iCameraDevice, iRoomDevice } from './baseDeviceInterfaces';
+import { DeviceType } from './deviceType';
+import { DeviceCapability } from './DeviceCapability';
+import { CameraSettings, LogLevel, MotionSensorAction, RoomBase } from '../../models';
+import { DeviceInfo } from './DeviceInfo';
+import { LogDebugType } from '../services';
+export declare abstract class CameraDevice implements iCameraDevice {
     /** @inheritDoc */
     settings: CameraSettings;
     /** @inheritDoc */
@@ -20,31 +16,28 @@ export declare class CameraDevice implements iCameraDevice {
      */
     readonly name: string;
     /** @inheritDoc */
-    readonly mpegStreamLink: string;
+    abstract readonly mpegStreamLink: string;
     /** @inheritDoc */
-    readonly h264IosStreamLink: string;
+    abstract readonly h264IosStreamLink: string;
     /** @inheritDoc */
-    readonly rtspStreamLink: string;
+    abstract readonly rtspStreamLink: string;
     /** @inheritDoc */
-    readonly currentImageLink: string;
+    abstract readonly currentImageLink: string;
     /** @inheritDoc */
     detectionsToday: number;
     protected _lastMotion: number;
+    protected _initialized: boolean;
+    protected _movementDetectedCallback: Array<(action: MotionSensorAction) => void>;
+    protected _lastImage: string;
+    protected _personDetected: boolean;
+    protected _dogDetected: boolean;
+    protected _devicesBlockingAlarmMap: Map<string, iBaseDevice>;
+    protected _movementDetected: boolean;
+    protected _info: DeviceInfo;
     private _personDetectFallbackTimeout;
     private _movementDetectFallbackTimeout;
     private _dogDetectFallbackTimeout;
-    private _personDetectedStateId;
-    private _dogDetectedStateId;
-    private _movementDetectedStateId;
-    private _initialized;
-    private _movementDetectedCallback;
-    private _lastImage;
-    private _personDetected;
-    private _dogDetected;
-    private _devicesBlockingAlarmMap;
-    private _movementDetected;
-    private _info;
-    constructor(mqttName: string, roomName: string, blueIrisName: string);
+    protected constructor(name: string, roomName: string);
     /** @inheritDoc */
     get lastImage(): string;
     /** @inheritDoc */
@@ -71,14 +64,19 @@ export declare class CameraDevice implements iCameraDevice {
     blockForDevice(device: iBaseDevice, block: boolean): void;
     /** @inheritDoc */
     persistMotionSensor(): void;
-    /** @inheritDoc */
-    update(idSplit: string[], state: ioBroker.State): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     toJSON(): Partial<iRoomDevice>;
     persistDeviceInfo(): void;
     loadDeviceSettings(): void;
+    protected onNewMotionDetectedValue(newValue: boolean): void;
+    protected onNewPersonDetectedValue(newValue: boolean): void;
+    protected onNewImageSnapshot(image: string): void;
+    protected onNewDogDetectionValue(newDogDetectionVal: boolean): void;
+    protected abstract resetPersonDetectedState(): void;
+    protected abstract resetDogDetectedState(): void;
+    protected abstract resetMovementDetectedState(): void;
     private updateMovement;
     private resetPersonDetectFallbackTimer;
-    private resetDogDetectFallbackTimer;
     private resetMovementFallbackTimer;
+    private resetDogDetectFallbackTimer;
 }

package/lib/server/devices/{blueIris/cameraDevice.js → CameraDevice.js}

@@ -4,17 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CameraDevice = void 0;
+const deviceType_1 = require("./deviceType");
+const DeviceCapability_1 = require("./DeviceCapability");
+const models_1 = require("../../models");
+const DeviceInfo_1 = require("./DeviceInfo");
+const devices_1 = require("./devices");
+const services_1 = require("../services");
 const lodash_1 = __importDefault(require("lodash"));
-const models_1 = require("../../../models");
-const blueIrisCoordinator_1 = require("./blueIrisCoordinator");
-const services_1 = require("../../services");
-const devices_1 = require("../devices");
-const DeviceInfo_1 = require("../DeviceInfo");
-const DeviceCapability_1 = require("../DeviceCapability");
-const deviceType_1 = require("../deviceType");
-const ioBroker_1 = require("../../ioBroker");
 class CameraDevice {
-    constructor(mqttName, roomName, blueIrisName) {
+    constructor(name, roomName) {
         var _a;
         /** @inheritDoc */
         this.settings = new models_1.CameraSettings();
@@ -23,22 +21,8 @@ class CameraDevice {
         /** @inheritDoc */
         this.deviceType = deviceType_1.DeviceType.Camera;
         /** @inheritDoc */
-        this.mpegStreamLink = '';
-        /** @inheritDoc */
-        this.h264IosStreamLink = '';
-        /** @inheritDoc */
-        this.rtspStreamLink = '';
-        /** @inheritDoc */
-        this.currentImageLink = '';
-        /** @inheritDoc */
         this.detectionsToday = 0;
         this._lastMotion = 0;
-        this._personDetectFallbackTimeout = null;
-        this._movementDetectFallbackTimeout = null;
-        this._dogDetectFallbackTimeout = null;
-        this._personDetectedStateId = undefined;
-        this._dogDetectedStateId = undefined;
-        this._movementDetectedStateId = undefined;
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._lastImage = '';
@@ -46,24 +30,18 @@ class CameraDevice {
         this._dogDetected = false;
         this._devicesBlockingAlarmMap = new Map();
         this._movementDetected = false;
-        this.blueIrisName = blueIrisName;
-        this.name = mqttName;
+        this._personDetectFallbackTimeout = null;
+        this._movementDetectFallbackTimeout = null;
+        this._dogDetectFallbackTimeout = null;
+        this.name = name;
         this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Camera ${roomName} ${mqttName}`;
-        this._info.customName = `Camera ${mqttName}`;
+        this._info.fullName = `Camera ${roomName} ${name}`;
+        this._info.customName = `Camera ${name}`;
         this._info.room = roomName;
-        this._info.allDevicesKey = `camera-${roomName}-${mqttName}`;
+        this._info.allDevicesKey = `camera-${roomName}-${name}`;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
-        blueIrisCoordinator_1.BlueIrisCoordinator.addDevice(this, mqttName);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
-        const blueIrisSettings = services_1.SettingsService.settings.blueIris;
-        if (blueIrisSettings !== undefined) {
-            this.mpegStreamLink = `${blueIrisSettings.serverAddress}/mjpg/${this.blueIrisName}/video.mjpg?user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
-            this.h264IosStreamLink = `${blueIrisSettings.serverAddress}/h264/${this.blueIrisName}/temp.m?user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
-            this.rtspStreamLink = `rtsp://${blueIrisSettings.username}:${blueIrisSettings.password}@${blueIrisSettings.serverAddress.replace('http://', '')}:80/${this.blueIrisName}`;
-            this.currentImageLink = `${blueIrisSettings.serverAddress}/image/${this.blueIrisName}.jpg?q=100&s=100&user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
-        }
         if (!services_1.Utils.anyDboActive) {
             this._initialized = true;
         }
@@ -139,58 +117,6 @@ class CameraDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
     }
-    /** @inheritDoc */
-    update(idSplit, state) {
-        const stateName = idSplit[4];
-        switch (stateName) {
-            case 'MotionDetected':
-                this._movementDetectedStateId = idSplit.join('.');
-                if (this.settings.movementDetectionOnPersonOnly) {
-                    return;
-                }
-                this.log(models_1.LogLevel.Debug, `Update for "${stateName}" to value: ${state.val}`);
-                const movementDetected = state.val === 1;
-                this.updateMovement(movementDetected);
-                if (movementDetected) {
-                    this.resetMovementFallbackTimer();
-                }
-                break;
-            case 'PersonDetected':
-                this._personDetectedStateId = idSplit.join('.');
-                const newValue = state.val === 1;
-                this.log(models_1.LogLevel.Debug, `Update for "${stateName}" to value: ${state.val}`);
-                if (newValue) {
-                    this.log(models_1.LogLevel.Info, 'Person Detected');
-                    this.resetPersonDetectFallbackTimer();
-                }
-                this._personDetected = newValue;
-                if (this.settings.movementDetectionOnPersonOnly) {
-                    this.updateMovement(newValue);
-                }
-                break;
-            case 'DogDetected':
-                this._dogDetectedStateId = idSplit.join('.');
-                const newDogDetectionVal = state.val === 1;
-                this.log(models_1.LogLevel.Debug, `Update for "${stateName}" to value: ${state.val}`);
-                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(() => {
-                    // Give Person Detected Update some time, as otherwise personDetected might still be false
-                    if (this.settings.alertPersonOnTelegram && this._personDetected && !this.alarmBlockedByDevices) {
-                        services_1.TelegramService.sendImage(`${this.name} detected Person`, new models_1.Base64Image(this._lastImage, 'person_alert'));
-                    }
-                }, 1000);
-        }
-    }
     log(level, message, debugType = services_1.LogDebugType.None) {
         var _a, _b;
         services_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
@@ -216,6 +142,46 @@ class CameraDevice {
         var _a;
         (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
     }
+    onNewMotionDetectedValue(newValue) {
+        if (this.settings.movementDetectionOnPersonOnly) {
+            return;
+        }
+        this.log(models_1.LogLevel.Debug, `Update for "Motion" to value: ${newValue}`);
+        this.updateMovement(newValue);
+        if (newValue) {
+            this.resetMovementFallbackTimer();
+        }
+    }
+    onNewPersonDetectedValue(newValue) {
+        this.log(models_1.LogLevel.Debug, `Update for PersonDetected to value: ${newValue}`);
+        if (newValue) {
+            this.log(models_1.LogLevel.Info, 'Person Detected');
+            this.resetPersonDetectFallbackTimer();
+        }
+        this._personDetected = newValue;
+        if (this.settings.movementDetectionOnPersonOnly) {
+            this.updateMovement(newValue);
+        }
+    }
+    onNewImageSnapshot(image) {
+        this._lastImage = image;
+        services_1.Utils.guardedTimeout(() => {
+            // Give Person Detected Update some time, as otherwise personDetected might still be false
+            if (this.settings.alertPersonOnTelegram && this._personDetected && !this.alarmBlockedByDevices) {
+                services_1.TelegramService.sendImage(`${this.name} detected Person`, new models_1.Base64Image(this._lastImage, 'person_alert'));
+            }
+        }, 1000);
+    }
+    onNewDogDetectionValue(newDogDetectionVal) {
+        if (newDogDetectionVal) {
+            this.log(models_1.LogLevel.Info, 'Dog Detected');
+            this.resetDogDetectFallbackTimer();
+        }
+        this._dogDetected = newDogDetectionVal;
+        if (this.settings.movementDetectionOnDogsToo) {
+            this.updateMovement(newDogDetectionVal);
+        }
+    }
     updateMovement(newState) {
         if (!this._initialized && newState) {
             this.log(models_1.LogLevel.Trace, 'Movement recognized, but database initialization has not finished yet --> delay.');
@@ -246,32 +212,12 @@ class CameraDevice {
             this._personDetectFallbackTimeout = null;
         }
         this._personDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
-            var _a;
             this._personDetectFallbackTimeout = null;
             this._personDetected = false;
             if (this.settings.movementDetectionOnPersonOnly) {
                 this.updateMovement(false);
             }
-            if (this._personDetectedStateId !== undefined) {
-                (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._personDetectedStateId, { val: 0, ack: true });
-            }
-        }, 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 });
-            }
+            this.resetPersonDetectedState();
         }, 120000, this);
     }
     resetMovementFallbackTimer() {
@@ -280,7 +226,6 @@ class CameraDevice {
             this._movementDetectFallbackTimeout = null;
         }
         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
@@ -288,9 +233,21 @@ class CameraDevice {
             }
             this._movementDetected = false;
             this.updateMovement(false);
-            if (this._movementDetectedStateId !== undefined) {
-                (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._movementDetectedStateId, { val: 0, ack: true });
+            this.resetMovementDetectedState();
+        }, 120000, this);
+    }
+    resetDogDetectFallbackTimer() {
+        if (this._dogDetectFallbackTimeout !== null) {
+            clearTimeout(this._dogDetectFallbackTimeout);
+            this._dogDetectFallbackTimeout = null;
+        }
+        this._dogDetectFallbackTimeout = services_1.Utils.guardedTimeout(() => {
+            this._dogDetectFallbackTimeout = null;
+            this._dogDetected = false;
+            if (this.settings.movementDetectionOnDogsToo) {
+                this.updateMovement(false);
             }
+            this.resetDogDetectedState();
         }, 120000, this);
     }
 }

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

@@ -47,11 +47,4 @@ export interface iCameraDevice extends iMotionSensor {
      * @param block - Whether to block the alarm for the device or lift the block
      */
     blockForDevice(device: iBaseDevice, block: boolean): void;
-    /**
-     * Inform this camera of state updates within iOBroker
-     * TODO: Make camera independent of iOBroker
-     * @param idSplit - The id split of the state
-     * @param state - The state that has been updated
-     */
-    update(idSplit: string[], state: ioBroker.State): void;
 }

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

@@ -0,0 +1,28 @@
+import { CameraDevice } from '../CameraDevice';
+export declare class BlueIrisCameraDevice extends CameraDevice {
+    /**
+     * The name of the camera in BlueIris
+     */
+    readonly blueIrisName: string;
+    /** @inheritDoc */
+    readonly mpegStreamLink: string;
+    /** @inheritDoc */
+    readonly h264IosStreamLink: string;
+    /** @inheritDoc */
+    readonly rtspStreamLink: string;
+    /** @inheritDoc */
+    readonly currentImageLink: string;
+    private _personDetectedStateId;
+    private _dogDetectedStateId;
+    private _movementDetectedStateId;
+    constructor(mqttName: string, roomName: string, blueIrisName: string);
+    /**
+     * Inform this camera of state updates within iOBroker
+     * @param idSplit - The id split of the state
+     * @param state - The state that has been updated
+     */
+    update(idSplit: string[], state: ioBroker.State): void;
+    protected resetPersonDetectedState(): void;
+    protected resetDogDetectedState(): void;
+    protected resetMovementDetectedState(): void;
+}

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

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlueIrisCameraDevice = void 0;
+const models_1 = require("../../../models");
+const blueIrisCoordinator_1 = require("./blueIrisCoordinator");
+const services_1 = require("../../services");
+const ioBroker_1 = require("../../ioBroker");
+const CameraDevice_1 = require("../CameraDevice");
+class BlueIrisCameraDevice extends CameraDevice_1.CameraDevice {
+    constructor(mqttName, roomName, blueIrisName) {
+        super(mqttName, roomName);
+        /** @inheritDoc */
+        this.mpegStreamLink = '';
+        /** @inheritDoc */
+        this.h264IosStreamLink = '';
+        /** @inheritDoc */
+        this.rtspStreamLink = '';
+        /** @inheritDoc */
+        this.currentImageLink = '';
+        this._personDetectedStateId = undefined;
+        this._dogDetectedStateId = undefined;
+        this._movementDetectedStateId = undefined;
+        this.blueIrisName = blueIrisName;
+        blueIrisCoordinator_1.BlueIrisCoordinator.addDevice(this, mqttName);
+        const blueIrisSettings = services_1.SettingsService.settings.blueIris;
+        if (blueIrisSettings !== undefined) {
+            this.mpegStreamLink = `${blueIrisSettings.serverAddress}/mjpg/${this.blueIrisName}/video.mjpg?user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
+            this.h264IosStreamLink = `${blueIrisSettings.serverAddress}/h264/${this.blueIrisName}/temp.m?user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
+            this.rtspStreamLink = `rtsp://${blueIrisSettings.username}:${blueIrisSettings.password}@${blueIrisSettings.serverAddress.replace('http://', '')}:80/${this.blueIrisName}`;
+            this.currentImageLink = `${blueIrisSettings.serverAddress}/image/${this.blueIrisName}.jpg?q=100&s=100&user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
+        }
+    }
+    /**
+     * Inform this camera of state updates within iOBroker
+     * @param idSplit - The id split of the state
+     * @param state - The state that has been updated
+     */
+    update(idSplit, state) {
+        const stateName = idSplit[4];
+        switch (stateName) {
+            case 'MotionDetected':
+                this._movementDetectedStateId = idSplit.join('.');
+                this.onNewMotionDetectedValue(state.val === 1);
+                break;
+            case 'PersonDetected':
+                this._personDetectedStateId = idSplit.join('.');
+                const newValue = state.val === 1;
+                this.onNewPersonDetectedValue(newValue);
+                break;
+            case 'DogDetected':
+                this._dogDetectedStateId = idSplit.join('.');
+                const newDogDetectionVal = state.val === 1;
+                this.log(models_1.LogLevel.Debug, `Update for "${stateName}" to value: ${state.val}`);
+                this.onNewDogDetectionValue(newDogDetectionVal);
+                break;
+            case 'MotionSnapshot':
+                this.onNewImageSnapshot(state.val);
+                break;
+        }
+    }
+    resetPersonDetectedState() {
+        var _a;
+        if (this._personDetectedStateId !== undefined) {
+            (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._personDetectedStateId, { val: 0, ack: true });
+        }
+    }
+    resetDogDetectedState() {
+        var _a;
+        if (this._dogDetectedStateId !== undefined) {
+            (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._dogDetectedStateId, { val: 0, ack: true });
+        }
+    }
+    resetMovementDetectedState() {
+        var _a;
+        if (this._movementDetectedStateId !== undefined) {
+            (_a = ioBroker_1.ioBrokerMain.iOConnection) === null || _a === void 0 ? void 0 : _a.setState(this._movementDetectedStateId, { val: 0, ack: true });
+        }
+    }
+}
+exports.BlueIrisCameraDevice = BlueIrisCameraDevice;

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

@@ -1,2 +1,2 @@
 export * from './blueIrisCoordinator';
-export * from './cameraDevice';
+export * from './blueIrisCameraDevice';

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

@@ -15,4 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./blueIrisCoordinator"), exports);
-__exportStar(require("./cameraDevice"), exports);
+__exportStar(require("./blueIrisCameraDevice"), exports);

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

@@ -31,3 +31,4 @@ export * from './IoBrokerBaseDevice';
 export * from './IoBrokerDeviceInfo';
 export { NameAmountValuePair } from './nameAmountValuePair';
 export * from './wledDevice';
+export * from './CameraDevice';

package/lib/server/devices/index.js

@@ -50,3 +50,4 @@ __exportStar(require("./IoBrokerDeviceInfo"), exports);
 var nameAmountValuePair_1 = require("./nameAmountValuePair");
 Object.defineProperty(exports, "NameAmountValuePair", { enumerable: true, get: function () { return nameAmountValuePair_1.NameAmountValuePair; } });
 __exportStar(require("./wledDevice"), exports);
+__exportStar(require("./CameraDevice"), exports);