hoffmation-base 2.6.1 → 2.7.0

package/lib/index.js

@@ -93,6 +93,12 @@ class HoffmationBase {
                 server_1.WeatherService.initialize(server_1.SettingsService.settings.weather);
             }
         });
+        server_1.Utils.guardedNewThread(() => {
+            if (server_1.SettingsService.settings.victron) {
+                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Victron settings detected --> initializing`);
+                server_1.VictronService.initialize(server_1.SettingsService.settings.victron);
+            }
+        });
         if (server_1.SettingsService.TelegramActive)
             server_1.TelegramService.publishCommands();
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Post ioBrokerInitializations finished`);

package/lib/models/temperatureSettings.d.ts

@@ -7,5 +7,5 @@ export declare class TemperatureSettings {
     active: boolean;
     constructor(start: Daytime, end: Daytime, temperature: number, name: string, active?: boolean);
     static getActiveSetting(settings: TemperatureSettings[], date: Date): TemperatureSettings | undefined;
-    isNowInRange(date: Date): boolean;
+    static isNowInRange(setting: TemperatureSettings, date: Date): boolean;
 }

package/lib/models/temperatureSettings.js

@@ -11,18 +11,18 @@ class TemperatureSettings {
     }
     static getActiveSetting(settings, date) {
         for (const setting of settings) {
-            if (setting.isNowInRange(date)) {
+            if (TemperatureSettings.isNowInRange(setting, date)) {
                 return setting;
             }
         }
     }
-    isNowInRange(date) {
+    static isNowInRange(setting, date) {
         const now = date.getTime();
-        const todayStart = new Date(now).setHours(this.start.hour, this.start.minute);
+        const todayStart = new Date(now).setHours(setting.start.hour, setting.start.minute);
         if (now < todayStart) {
             return false;
         }
-        const todayEnd = new Date(now).setHours(this.end.hour, this.end.minute);
+        const todayEnd = new Date(now).setHours(setting.end.hour, setting.end.minute);
         return now < todayEnd;
     }
 }

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

@@ -18,6 +18,7 @@ import { iBlueIrisSettings } from './iBlueIrisSettings';
 import { iRestSettings } from './iRestSettings';
 import { iEspresenseSettings } from './iEspresenseSettings';
 import { iTibberSettings } from './iTibberSettings';
+import { iVictronSettings } from './iVictronSettings';
 export interface iConfig {
     asusConfig?: iAsusConfig;
     blueIris?: iBlueIrisSettings;
@@ -42,4 +43,5 @@ export interface iConfig {
     translationSettings: iTranslationSettings;
     wattagePrice?: number;
     weather?: iWeatherSettings;
+    victron?: iVictronSettings;
 }

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

@@ -0,0 +1,3 @@
+export interface iVictronSettings {
+    host: string;
+}

package/lib/server/config/iVictronSettings.js

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

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

@@ -21,3 +21,4 @@ export * from './iTelegramSettings';
 export * from './iTibberSettings';
 export * from './iTimeSettings';
 export * from './iTimePair';
+export * from './iVictronSettings';

package/lib/server/config/index.js

@@ -37,3 +37,4 @@ __exportStar(require("./iTelegramSettings"), exports);
 __exportStar(require("./iTibberSettings"), exports);
 __exportStar(require("./iTimeSettings"), exports);
 __exportStar(require("./iTimePair"), exports);
+__exportStar(require("./iVictronSettings"), exports);

package/lib/server/devices/devices.js

@@ -224,6 +224,9 @@ class Devices {
         Devices.alLDevices[fullName] = d;
     }
     static createEnergyManager(cDevConf) {
+        if (Devices.energymanager !== undefined) {
+            return;
+        }
         const devInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf, true);
         const fullName = `${Devices.IDENTIFIER_JS}-${devInfo.devID}`;
         devInfo.allDevicesKey = fullName;

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

@@ -16,4 +16,5 @@ export * from './news-service';
 export * from './settings-service';
 export * from './ShutterService';
 export * from './tibber-service';
+export * from './victron-service';
 export * from './time-callback-service';

package/lib/server/services/index.js

@@ -32,4 +32,5 @@ __exportStar(require("./news-service"), exports);
 __exportStar(require("./settings-service"), exports);
 __exportStar(require("./ShutterService"), exports);
 __exportStar(require("./tibber-service"), exports);
+__exportStar(require("./victron-service"), exports);
 __exportStar(require("./time-callback-service"), exports);

package/lib/server/services/victron-service.d.ts

@@ -0,0 +1,11 @@
+import { iVictronSettings } from '../config';
+import { VictronDeviceData } from 'victron-mqtt-consumer';
+export declare class VictronService {
+    private static _victronConsumer;
+    private static _settings;
+    static get settings(): iVictronSettings | undefined;
+    static get data(): VictronDeviceData | undefined;
+    private static _active;
+    static get active(): boolean;
+    static initialize(settings?: iVictronSettings): void;
+}

package/lib/server/services/victron-service.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VictronService = void 0;
+const victron_mqtt_consumer_1 = require("victron-mqtt-consumer");
+class VictronService {
+    static get settings() {
+        return this._settings;
+    }
+    static get data() {
+        var _a;
+        return (_a = this._victronConsumer) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    static get active() {
+        return this._active;
+    }
+    static initialize(settings) {
+        const newSettings = settings !== null && settings !== void 0 ? settings : this.settings;
+        if (newSettings === undefined) {
+            this._active = false;
+            return;
+        }
+        const opts = new victron_mqtt_consumer_1.VictronMqttConnectionOptions();
+        opts.ip = newSettings.host;
+        this._victronConsumer = new victron_mqtt_consumer_1.VictronMqttConsumer(opts);
+    }
+}
+exports.VictronService = VictronService;
+VictronService._victronConsumer = undefined;
+VictronService._settings = undefined;