hoffmation-base 2.2.2 → 2.2.3

package/lib/server/config/heatingMode.d.ts

@@ -0,0 +1,5 @@
+export declare enum HeatingMode {
+    None = 0,
+    Winter = 1,
+    Sommer = 2
+}

package/lib/server/config/heatingMode.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HeatingMode = void 0;
+var HeatingMode;
+(function (HeatingMode) {
+    HeatingMode[HeatingMode["None"] = 0] = "None";
+    HeatingMode[HeatingMode["Winter"] = 1] = "Winter";
+    HeatingMode[HeatingMode["Sommer"] = 2] = "Sommer";
+})(HeatingMode = exports.HeatingMode || (exports.HeatingMode = {}));

package/lib/server/config/iAsusConfig.d.ts

@@ -0,0 +1,6 @@
+export interface iAsusConfig {
+    address: string;
+    ignoreSSL?: boolean;
+    password: string;
+    username: string;
+}

package/lib/server/config/iAsusConfig.js

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

package/lib/server/config/iBlueIrisSettings.d.ts

@@ -0,0 +1,5 @@
+export interface iBlueIrisSettings {
+    serverAddress: string;
+    username?: string;
+    password?: string;
+}

package/lib/server/config/iBlueIrisSettings.js

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

package/lib/server/config/iBluetoothTrackingSettings.d.ts

@@ -0,0 +1,4 @@
+export interface iBluetoothTrackingSettings {
+    customName: string;
+    activeTracking: boolean;
+}

package/lib/server/config/iBluetoothTrackingSettings.js

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

package/lib/server/config/iConfig.d.ts

@@ -1,37 +1,25 @@
-import { iRoomDefaultSettings, LogLevel } from '../../models';
-import { PoolConfig } from 'pg';
-interface iDaikinSettings {
-    active: boolean;
-    activateTracingLogger?: boolean;
-    useGetToPost?: boolean;
-    buttonBotRightForAc?: boolean;
-}
-interface iSonosSettings {
-    active: boolean;
-    buttonBotRightForRadio?: boolean;
-}
-export interface iAsusConfig {
-    address: string;
-    ignoreSSL?: boolean;
-    password: string;
-    username: string;
-}
-export interface iRestSettings {
-    active: boolean;
-    port?: number;
-}
-export interface iEspresenseSettings {
-    mqttInstance: number;
-    deviceMap: {
-        [folderId: string]: iBluetoothTrackingSettings;
-    };
-}
-export interface iBluetoothTrackingSettings {
-    customName: string;
-    activeTracking: boolean;
-}
+import { iLogSettings } from './iLogSettings';
+import { iSonosSettings } from './iSonosSettings';
+import { iRoomDefaultSettings } from '../../models';
+import { iNewsSettings } from './iNewsSettings';
+import { iIobrokerSettigns } from './iIobrokerSettigns';
+import { iPollySettings } from './iPollySettings';
+import { iTelegramSettings } from './iTelegramSettings';
+import { iWeatherSettings } from './iWeatherSettings';
+import { iMp3Settings } from './iMp3Settings';
+import { iPersistenceSettings } from './iPersistenceSettings';
+import { iTimeSettings } from './iTimeSettings';
+import { iAsusConfig } from './iAsusConfig';
+import { iTranslationSettings } from './iTranslationSettings';
+import { iMuellSettings } from './iMuellSettings';
+import { iDaikinSettings } from './iDaikinSettings';
+import { iHeaterSettings } from './iHeaterSettings';
+import { iBlueIrisSettings } from './iBlueIrisSettings';
+import { iRestSettings } from './iRestSettings';
+import { iEspresenseSettings } from './iEspresenseSettings';
 export interface iConfig {
     asusConfig?: iAsusConfig;
+    blueIris?: iBlueIrisSettings;
     daikin?: iDaikinSettings;
     espresense?: iEspresenseSettings;
     injectWattagePrice?: number;
@@ -53,80 +41,3 @@ export interface iConfig {
     wattagePrice?: number;
     weather?: iWeatherSettings;
 }
-export declare enum HeatingMode {
-    None = 0,
-    Winter = 1,
-    Sommer = 2
-}
-export interface iHeaterSettings {
-    /**
-     * Whether heating with ac is allowed
-     * This normally depends on the cost difference between ac heating and conventional heating
-     */
-    allowAcHeating?: boolean;
-    mode?: HeatingMode;
-}
-export interface iIobrokerSettigns {
-    /**
-     * Whether states should be initialized by processing each key on its own.
-     * This allows to detect states which crash the Websocket Payload limit
-     */
-    useSplitInitialization?: boolean;
-}
-export interface iLogSettings {
-    logLevel: number;
-    useTimestamp: boolean;
-    debugNewMovementState?: boolean;
-    debugShutterPositionChange?: boolean;
-    debugActuatorChange?: boolean;
-    debugUchangedShutterPosition?: boolean;
-    debugUnchangedActuator?: boolean;
-    debugDaikinSuccessfullControlInfo?: boolean;
-    debugEuroHeaterValve?: boolean;
-}
-export interface iTimePair {
-    hours: number;
-    minutes: number;
-}
-export interface iTimeSettings {
-    nightStart: iTimePair;
-    nightEnd: iTimePair;
-}
-export interface iTelegramSettings {
-    logLevel: LogLevel;
-    telegramToken: string;
-    allowedIDs: number[];
-    subscribedIDs: number[];
-}
-export interface iPersistenceSettings {
-    postgreSql?: PoolConfig;
-}
-export interface iPollySettings {
-    mp3Path: string;
-    region: string;
-    signatureVersion: string;
-    accessKeyId: string;
-    secretAccessKey: string;
-    voiceID: string;
-}
-export interface iMp3Settings {
-    path: string;
-    serverAddress: string;
-}
-export interface iWeatherSettings {
-    lattitude: string;
-    longitude: string;
-    appid?: string;
-}
-export interface iMuellSettings {
-    calendarURL: string;
-}
-export interface iNewsSettings {
-    rssUrl?: string;
-    requestInterval?: number;
-    keepMaxAge?: number;
-}
-export interface iTranslationSettings {
-    language: string;
-}
-export {};

package/lib/server/config/iConfig.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HeatingMode = void 0;
-var HeatingMode;
-(function (HeatingMode) {
-    HeatingMode[HeatingMode["None"] = 0] = "None";
-    HeatingMode[HeatingMode["Winter"] = 1] = "Winter";
-    HeatingMode[HeatingMode["Sommer"] = 2] = "Sommer";
-})(HeatingMode = exports.HeatingMode || (exports.HeatingMode = {}));

package/lib/server/config/iDaikinSettings.d.ts

@@ -0,0 +1,6 @@
+export interface iDaikinSettings {
+    active: boolean;
+    activateTracingLogger?: boolean;
+    useGetToPost?: boolean;
+    buttonBotRightForAc?: boolean;
+}

package/lib/server/config/iDaikinSettings.js

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

package/lib/server/config/iEspresenseSettings.d.ts

@@ -0,0 +1,7 @@
+import { iBluetoothTrackingSettings } from './iBluetoothTrackingSettings';
+export interface iEspresenseSettings {
+    mqttInstance: number;
+    deviceMap: {
+        [folderId: string]: iBluetoothTrackingSettings;
+    };
+}

package/lib/server/config/iEspresenseSettings.js

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

package/lib/server/config/iHeaterSettings.d.ts

@@ -0,0 +1,9 @@
+import { HeatingMode } from './heatingMode';
+export interface iHeaterSettings {
+    /**
+     * Whether heating with ac is allowed
+     * This normally depends on the cost difference between ac heating and conventional heating
+     */
+    allowAcHeating?: boolean;
+    mode?: HeatingMode;
+}

package/lib/server/config/iHeaterSettings.js

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

package/lib/server/config/iIobrokerSettigns.d.ts

@@ -0,0 +1,7 @@
+export interface iIobrokerSettigns {
+    /**
+     * Whether states should be initialized by processing each key on its own.
+     * This allows to detect states which crash the Websocket Payload limit
+     */
+    useSplitInitialization?: boolean;
+}

package/lib/server/config/iIobrokerSettigns.js

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

package/lib/server/config/iLogSettings.d.ts

@@ -0,0 +1,11 @@
+export interface iLogSettings {
+    logLevel: number;
+    useTimestamp: boolean;
+    debugNewMovementState?: boolean;
+    debugShutterPositionChange?: boolean;
+    debugActuatorChange?: boolean;
+    debugUchangedShutterPosition?: boolean;
+    debugUnchangedActuator?: boolean;
+    debugDaikinSuccessfullControlInfo?: boolean;
+    debugEuroHeaterValve?: boolean;
+}

package/lib/server/config/iLogSettings.js

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

package/lib/server/config/iMp3Settings.d.ts

@@ -0,0 +1,4 @@
+export interface iMp3Settings {
+    path: string;
+    serverAddress: string;
+}

package/lib/server/config/iMp3Settings.js

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

package/lib/server/config/iMuellSettings.d.ts

@@ -0,0 +1,3 @@
+export interface iMuellSettings {
+    calendarURL: string;
+}

package/lib/server/config/iMuellSettings.js

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

package/lib/server/config/iNewsSettings.d.ts

@@ -0,0 +1,5 @@
+export interface iNewsSettings {
+    rssUrl?: string;
+    requestInterval?: number;
+    keepMaxAge?: number;
+}

package/lib/server/config/iNewsSettings.js

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

package/lib/server/config/iPersistenceSettings.d.ts

@@ -0,0 +1,4 @@
+import { PoolConfig } from 'pg';
+export interface iPersistenceSettings {
+    postgreSql?: PoolConfig;
+}

package/lib/server/config/iPersistenceSettings.js

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

package/lib/server/config/iPollySettings.d.ts

@@ -0,0 +1,8 @@
+export interface iPollySettings {
+    mp3Path: string;
+    region: string;
+    signatureVersion: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    voiceID: string;
+}

package/lib/server/config/iPollySettings.js

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

package/lib/server/config/iRestSettings.d.ts

@@ -0,0 +1,4 @@
+export interface iRestSettings {
+    active: boolean;
+    port?: number;
+}

package/lib/server/config/iRestSettings.js

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

package/lib/server/config/iSonosSettings.d.ts

@@ -0,0 +1,4 @@
+export interface iSonosSettings {
+    active: boolean;
+    buttonBotRightForRadio?: boolean;
+}

package/lib/server/config/iSonosSettings.js

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

package/lib/server/config/iTelegramSettings.d.ts

@@ -0,0 +1,7 @@
+import { LogLevel } from '../../models';
+export interface iTelegramSettings {
+    logLevel: LogLevel;
+    telegramToken: string;
+    allowedIDs: number[];
+    subscribedIDs: number[];
+}

package/lib/server/config/iTelegramSettings.js

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

package/lib/server/config/iTimePair.d.ts

@@ -0,0 +1,4 @@
+export interface iTimePair {
+    hours: number;
+    minutes: number;
+}

package/lib/server/config/iTimePair.js

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

package/lib/server/config/iTimeSettings.d.ts

@@ -0,0 +1,5 @@
+import { iTimePair } from './iTimePair';
+export interface iTimeSettings {
+    nightStart: iTimePair;
+    nightEnd: iTimePair;
+}

package/lib/server/config/iTimeSettings.js

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

package/lib/server/config/iTranslationSettings.d.ts

@@ -0,0 +1,3 @@
+export interface iTranslationSettings {
+    language: string;
+}

package/lib/server/config/iTranslationSettings.js

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

package/lib/server/config/iWeatherSettings.d.ts

@@ -0,0 +1,5 @@
+export interface iWeatherSettings {
+    lattitude: string;
+    longitude: string;
+    appid?: string;
+}

package/lib/server/config/iWeatherSettings.js

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

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

@@ -1 +1,22 @@
 export * from './iConfig';
+export * from './iBlueIrisSettings';
+export * from './iBluetoothTrackingSettings';
+export * from './iEspresenseSettings';
+export * from './iRestSettings';
+export * from './iAsusConfig';
+export * from './iDaikinSettings';
+export * from './iSonosSettings';
+export * from './heatingMode';
+export * from './iHeaterSettings';
+export * from './iIobrokerSettigns';
+export * from './iLogSettings';
+export * from './iNewsSettings';
+export * from './iTranslationSettings';
+export * from './iMuellSettings';
+export * from './iMp3Settings';
+export * from './iWeatherSettings';
+export * from './iPollySettings';
+export * from './iPersistenceSettings';
+export * from './iTelegramSettings';
+export * from './iTimeSettings';
+export * from './iTimePair';

package/lib/server/config/index.js

@@ -15,3 +15,24 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./iConfig"), exports);
+__exportStar(require("./iBlueIrisSettings"), exports);
+__exportStar(require("./iBluetoothTrackingSettings"), exports);
+__exportStar(require("./iEspresenseSettings"), exports);
+__exportStar(require("./iRestSettings"), exports);
+__exportStar(require("./iAsusConfig"), exports);
+__exportStar(require("./iDaikinSettings"), exports);
+__exportStar(require("./iSonosSettings"), exports);
+__exportStar(require("./heatingMode"), exports);
+__exportStar(require("./iHeaterSettings"), exports);
+__exportStar(require("./iIobrokerSettigns"), exports);
+__exportStar(require("./iLogSettings"), exports);
+__exportStar(require("./iNewsSettings"), exports);
+__exportStar(require("./iTranslationSettings"), exports);
+__exportStar(require("./iMuellSettings"), exports);
+__exportStar(require("./iMp3Settings"), exports);
+__exportStar(require("./iWeatherSettings"), exports);
+__exportStar(require("./iPollySettings"), exports);
+__exportStar(require("./iPersistenceSettings"), exports);
+__exportStar(require("./iTelegramSettings"), exports);
+__exportStar(require("./iTimeSettings"), exports);
+__exportStar(require("./iTimePair"), exports);

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

@@ -6,6 +6,7 @@ import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 export declare class CameraDevice implements iRoomDevice, iMotionSensor {
+    readonly blueIrisName: string;
     get lastImage(): string;
     settings: CameraSettings;
     readonly deviceCapabilities: DeviceCapability[];
@@ -16,7 +17,9 @@ export declare class CameraDevice implements iRoomDevice, iMotionSensor {
     private _movementDetectedCallback;
     private _lastImage;
     private _personDetected;
-    constructor(name: string, roomName: string);
+    readonly videoStreamLink: string;
+    readonly currentImageLink: string;
+    constructor(mqttName: string, roomName: string, blueIrisName: string);
     private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);

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

@@ -16,7 +16,7 @@ class CameraDevice {
     get lastImage() {
         return this._lastImage;
     }
-    constructor(name, roomName) {
+    constructor(mqttName, roomName, blueIrisName) {
         var _a;
         this.settings = new models_1.CameraSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.camera, DeviceCapability_1.DeviceCapability.motionSensor];
@@ -26,18 +26,26 @@ class CameraDevice {
         this._movementDetectedCallback = [];
         this._lastImage = '';
         this._personDetected = false;
+        this.videoStreamLink = '';
+        this.currentImageLink = '';
         this._detectionsToday = 0;
         this._movementDetected = false;
-        this.name = name;
+        this.blueIrisName = blueIrisName;
+        this.name = mqttName;
         this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Camera ${roomName} ${name}`;
-        this._info.customName = `Camera ${name}`;
+        this._info.fullName = `Camera ${roomName} ${mqttName}`;
+        this._info.customName = `Camera ${mqttName}`;
         this._info.room = roomName;
-        this._info.allDevicesKey = `camera-${roomName}-${name}`;
+        this._info.allDevicesKey = `camera-${roomName}-${mqttName}`;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
-        blueIrisCoordinator_1.BlueIrisCoordinator.addDevice(this, name);
+        blueIrisCoordinator_1.BlueIrisCoordinator.addDevice(this, mqttName);
         this.persistDeviceInfo();
         this.loadDeviceSettings();
+        const blueIrisSettings = services_1.SettingsService.settings.blueIris;
+        if (blueIrisSettings) {
+            this.videoStreamLink = `${blueIrisSettings.serverAddress}/mjpg/${this.blueIrisName}/video.mjpg?user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
+            this.currentImageLink = `${blueIrisSettings.serverAddress}/image/${this.blueIrisName}?q=100&s=100user=${blueIrisSettings.username}&pw=${blueIrisSettings.password}`;
+        }
         if (!services_1.Utils.anyDboActive) {
             this._initialized = true;
         }