hoffmation-base 3.2.1-alpha.11 → 3.2.1-alpha.13

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/index.js

@@ -48,7 +48,7 @@ class HoffmationInitializationObject {
 exports.HoffmationInitializationObject = HoffmationInitializationObject;
 class HoffmationBase {
     static async initializeBeforeIoBroker(initObject) {
-        var _a, _b;
+        var _a;
         settings_service_1.SettingsService.initialize(initObject.config);
         i18n_1.Res.initialize(initObject.config.translationSettings);
         if (initObject.config.logSettings) {
@@ -57,9 +57,12 @@ class HoffmationBase {
         logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Hoffmation-Base Startup');
         if (initObject.config.persistence) {
             if (initObject.config.persistence.postgreSql) {
-                services_1.Persistence.dbo = new services_1.PostgreSqlPersist(initObject.config.persistence.postgreSql);
+                logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Creating PostgresSQL Client');
+                const dbo = new services_1.PostgreSqlPersist(initObject.config.persistence.postgreSql);
+                await dbo.initialize();
+                services_1.Persistence.dbo = dbo;
+                logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Persistence initialized');
             }
-            await ((_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.initialize());
         }
         if (settings_service_1.SettingsService.settings.mp3Server) {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Mp3Server settings detected --> initializing');
@@ -81,7 +84,7 @@ class HoffmationBase {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Asus Router settings detected --> initializing');
             new services_1.AsusRouter(settings_service_1.SettingsService.settings.asusConfig);
         }
-        else if ((_b = settings_service_1.SettingsService.settings.unifiSettings) === null || _b === void 0 ? void 0 : _b.loginOptions) {
+        else if ((_a = settings_service_1.SettingsService.settings.unifiSettings) === null || _a === void 0 ? void 0 : _a.loginOptions) {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, 'Unifi Router settings detected --> initializing');
             new services_1.UnifiRouter(settings_service_1.SettingsService.settings.unifiSettings.loginOptions);
         }

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) {
+            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;