hoffmation-base 3.2.1-alpha.10 → 3.2.1-alpha.12

package/lib/devices/BaseDevice.js

@@ -59,12 +59,14 @@ class BaseDevice {
     loadDeviceSettings() {
         utils_1.Utils.retryAction(() => {
             var _a;
-            if (this.settings === undefined || services_1.Persistence.dbo === undefined) {
+            if (this.settings === undefined || !services_1.Persistence.dboReady) {
                 return false;
             }
             (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
             return true;
-        }, this);
+        }, this, 5, 2000, undefined, () => {
+            this.log(enums_1.LogLevel.Error, 'Could not load device settings within 5 retries.');
+        });
     }
     log(level, message, logDebugType = enums_1.LogDebugType.None) {
         logging_1.ServerLogService.writeLog(level, message, {

package/lib/devices/dachs/dachs.js

@@ -14,7 +14,7 @@ const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const utils_1 = require("../../utils");
 const sharedFunctions_1 = require("../sharedFunctions");
-const sun_time_offsets_1 = require("../../models/sun-time-offsets");
+const models_1 = require("../../models");
 const command_1 = require("../../command");
 const services_1 = require("../../services");
 const settings_service_1 = require("../../settings-service");
@@ -61,6 +61,7 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         ]);
         devices_1.Devices.alLDevices[allDevicesKey] = this;
         this.deviceCapabilities.push(enums_1.DeviceCapability.actuator);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.blockAutomatic);
         if (options.influxDb) {
             this._influxClient = new lib_1.DachsInfluxClient(options.influxDb);
         }
@@ -189,6 +190,9 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         this.checkAllDesiredStates(action, action.newLevel);
     }
     checkAllDesiredStates(action, batteryLevel) {
+        if (this.blockAutomationHandler.automaticBlockActive) {
+            return;
+        }
         const shouldDachsBeStarted = this.shouldDachsBeStarted(action, batteryLevel);
         this.checkHeatingRod(action, batteryLevel);
         this.checkAlternativeActuator(shouldDachsBeStarted, action);
@@ -301,7 +305,7 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
             // It is winter and heat storage is kinda cold --> Start
             return true;
         }
-        const dayType = services_1.TimeCallbackService.dayType(new sun_time_offsets_1.SunTimeOffsets());
+        const dayType = services_1.TimeCallbackService.dayType(new models_1.SunTimeOffsets());
         if ((dayType === enums_1.TimeOfDay.Daylight || dayType === enums_1.TimeOfDay.BeforeSunrise) &&
             batteryLevel > this.settings.batteryLevelTurnOnThreshold) {
             // It is daytime (maybe solar power) and it is no critical battery level

package/lib/services/dbo/persistence.d.ts

@@ -1,8 +1,13 @@
 import { iPersist } from '../../interfaces';
 export declare class Persistence {
+    private static _dbo;
     /**
      * The persitence layer object
+     * @returns The persistence layer
      */
-    static dbo: iPersist | undefined;
+    static get dbo(): iPersist | undefined;
+    static set dbo(value: iPersist | undefined);
+    static get dboReady(): boolean;
+    static lazyDbo(retries?: number): Promise<iPersist | undefined>;
     static get anyDboActive(): boolean;
 }

package/lib/services/dbo/persistence.js

@@ -1,9 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Persistence = void 0;
+const logging_1 = require("../../logging");
+const enums_1 = require("../../enums");
+const utils_1 = require("../../utils");
 class Persistence {
+    /**
+     * The persitence layer object
+     * @returns The persistence layer
+     */
+    static get dbo() {
+        if (this._dbo === undefined) {
+            return undefined;
+        }
+        if (this._dbo.initialized === false) {
+            const err = new Error('Db is not yet initialized');
+            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Warn, 'Db is not yet initialized, Stack: ' + err.stack);
+            return undefined;
+        }
+        return this._dbo;
+    }
+    static set dbo(value) {
+        this._dbo = value;
+    }
+    static get dboReady() {
+        return this._dbo !== undefined && this._dbo.initialized;
+    }
+    static async lazyDbo(retries = 5) {
+        if (this.dbo === undefined) {
+            return undefined;
+        }
+        if (this.dbo.initialized) {
+            return this.dbo;
+        }
+        if (retries == 0) {
+            return undefined;
+        }
+        return new Promise((resolve) => {
+            utils_1.Utils.guardedTimeout(() => {
+                resolve(Persistence.lazyDbo(retries - 1));
+            }, 2000, this);
+        });
+    }
     static get anyDboActive() {
         return this.dbo !== undefined;
     }
 }
 exports.Persistence = Persistence;
+Persistence._dbo = undefined;