hoffmation-base 3.1.3 → 3.2.0

package/lib/devices/CameraDevice.d.ts

@@ -35,6 +35,8 @@ export declare abstract class CameraDevice implements iCameraDevice {
     private _personDetectFallbackTimeout;
     private _movementDetectFallbackTimeout;
     private _dogDetectFallbackTimeout;
+    protected _lastUpdate: Date;
+    get lastUpdate(): Date;
     protected constructor(name: string, roomName: string);
     /** @inheritDoc */
     get lastImage(): string;

package/lib/devices/CameraDevice.js

@@ -16,6 +16,9 @@ const utils_1 = require("../utils");
 const api_1 = require("../api");
 const logging_1 = require("../logging");
 class CameraDevice {
+    get lastUpdate() {
+        return this._lastUpdate;
+    }
     constructor(name, roomName) {
         var _a;
         /** @inheritDoc */
@@ -37,6 +40,7 @@ class CameraDevice {
         this._personDetectFallbackTimeout = null;
         this._movementDetectFallbackTimeout = null;
         this._dogDetectFallbackTimeout = null;
+        this._lastUpdate = new Date(0);
         this.name = name;
         this._info = new DeviceInfo_1.DeviceInfo();
         this._info.fullName = `Camera ${roomName} ${name}`;
@@ -45,7 +49,7 @@ class CameraDevice {
         this._info.allDevicesKey = `camera-${roomName}-${name}`;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         this.persistDeviceInfo();
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
         if (!services_1.Persistence.anyDboActive) {
             this._initialized = true;
         }

package/lib/devices/blueIris/blueIrisCameraDevice.js

@@ -57,6 +57,7 @@ class BlueIrisCameraDevice extends CameraDevice_1.CameraDevice {
                 this.onNewImageSnapshot(state.val);
                 break;
         }
+        this._lastUpdate = new Date();
     }
     resetPersonDetectedState() {
         var _a;

package/lib/devices/dachs/dachs.js

@@ -55,7 +55,7 @@ class Dachs {
             this._influxClient = new lib_1.DachsInfluxClient(options.influxDb);
         }
         this.persistDeviceInfo();
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
         const modifiedOptions = lodash_1.default.cloneDeep(options);
         modifiedOptions.connectionOptions.resultConfig = {
             flatten: true,

package/lib/devices/dachs/dachsTemperatureSensor.js

@@ -32,7 +32,7 @@ class DachsTemperatureSensor {
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
         this.persistDeviceInfo();
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 200, this);
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
     }
     /** @inheritDoc */
     get customName() {

package/lib/devices/govee/own-govee-device.js

@@ -47,7 +47,7 @@ class OwnGoveeDevice {
         index_1.Devices.alLDevices[`govee-${roomName}-${deviceId}`] = this;
         this.persistDeviceInfo();
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4800, this);
     }
     get color() {
         return this._color;

package/lib/devices/unifi/own-unifi-camera.js

@@ -23,6 +23,7 @@ class OwnUnifiCamera extends index_1.CameraDevice {
      */
     update(packet) {
         this.checkForMotionUpdate(packet);
+        this._lastUpdate = new Date();
     }
     checkForMotionUpdate(packet) {
         var _a;

package/lib/devices/unifi/unifi-protect.d.ts

@@ -9,7 +9,9 @@ export declare class UnifiProtect implements iDisposable {
     static readonly ownCameras: Map<string, OwnUnifiCamera>;
     private _deviceStates;
     private _idMap;
+    private _lastUpdate;
     constructor(settings: iUnifiProtectOptions);
+    private reconnect;
     dispose(): void;
     static addDevice(camera: OwnUnifiCamera): void;
     private initialize;

package/lib/devices/unifi/unifi-protect.js

@@ -4,12 +4,24 @@ exports.UnifiProtect = void 0;
 const unifi_protect_1 = require("unifi-protect");
 const enums_1 = require("../../enums");
 const logging_1 = require("../../logging");
+const utils_1 = require("../../utils");
 class UnifiProtect {
     constructor(settings) {
         this.unifiLogger = new UnifiLogger();
         this._deviceStates = new Map();
         this._idMap = new Map();
+        this._lastUpdate = new Date(0);
         this._api = new unifi_protect_1.ProtectApi(this.unifiLogger);
+        this.reconnect(settings);
+        utils_1.Utils.guardedInterval(() => {
+            if (new Date().getTime() - this._lastUpdate.getTime() < 180 * 1000) {
+                // We had an update within the last 3 minutes --> no need to reconnect
+                return;
+            }
+            this.reconnect(settings);
+        }, 5 * 60 * 1000);
+    }
+    reconnect(settings) {
         this._api
             .login(settings.nvrAddress, settings.username, settings.password)
             .then((_loggedIn) => {
@@ -41,6 +53,7 @@ class UnifiProtect {
     onMessage(packet) {
         var _a, _b;
         const payload = packet.payload;
+        this._lastUpdate = new Date();
         switch (packet.header.modelKey) {
             case 'nvr':
                 break;
@@ -67,12 +80,13 @@ class UnifiProtect {
         }
     }
     initializeCamera(data) {
-        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Protect: Camera ${data.name} initialized`);
         if (!UnifiProtect.ownCameras.has(data.name)) {
+            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Protect: Ignoring camera ${data.name}`);
             return;
         }
         const camera = UnifiProtect.ownCameras.get(data.name);
         camera.initialize(data);
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Protect: Camera ${data.name} (re)initialized`);
         this._idMap.set(data.id, data.name);
     }
 }

package/lib/devices/victron/victron-device.js

@@ -39,7 +39,7 @@ class VictronDevice {
         devices_1.Devices.alLDevices['victron'] = this;
         devices_1.Devices.energymanager = this;
         this.persistDeviceInfo();
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
         this._victronConsumer = new victron_mqtt_consumer_1.VictronMqttConsumer(opts);
         this._iCalculationInterval = utils_1.Utils.guardedInterval(() => {
             if (this.data.battery.soc) {

package/lib/index.js

@@ -23,7 +23,6 @@ const services_1 = require("./services");
 const ioBroker_1 = require("./ioBroker");
 const devices_1 = require("./devices");
 const utils_1 = require("./utils");
-const weather_1 = require("./services/weather");
 const i18n_1 = require("./i18n");
 __exportStar(require("./enums"), exports);
 __exportStar(require("./action"), exports);
@@ -131,7 +130,7 @@ class HoffmationBase {
         utils_1.Utils.guardedNewThread(() => {
             if (settings_service_1.SettingsService.settings.weather) {
                 logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Weather settings detected --> initializing');
-                weather_1.WeatherService.initialize(settings_service_1.SettingsService.settings.weather);
+                services_1.WeatherService.initialize(settings_service_1.SettingsService.settings.weather);
             }
         });
         utils_1.Utils.guardedNewThread(() => {

package/lib/interfaces/baseDevices/iCameraDevice.d.ts

@@ -37,6 +37,10 @@ export interface iCameraDevice extends iMotionSensor {
      * Whether the camera has currently detected a human
      */
     readonly personDetected: boolean;
+    /**
+     *
+     */
+    readonly lastUpdate: Date;
     /**
      * Inform this camera of a device, which blocks the alarm (or should unlift its block)
      * @param device - The device to block/unblock the alarm for

package/lib/services/Sonos/own-sonos-device.js

@@ -34,7 +34,7 @@ class OwnSonosDevice {
         this._info.allDevicesKey = `sonos-${roomName}-${discoveryName}`;
         devices_1.Devices.alLDevices[`sonos-${roomName}-${discoveryName}`] = this;
         this.persistDeviceInfo();
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
     }
     get info() {
         return this._info;

package/lib/services/ac/ac-device.js

@@ -88,7 +88,7 @@ class AcDevice {
         utils_1.Utils.guardedInterval(this.automaticCheck, 5 * 60 * 1000, this, false);
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
         this.persistDeviceInfo();
-        this.loadDeviceSettings();
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     /** @inheritDoc */