hoffmation-base 2.7.0 → 2.7.1

package/lib/models/deviceSettings/index.d.ts

@@ -10,5 +10,6 @@ export * from './sceneSettings';
 export * from './shutterSettings';
 export * from './sonosDeviceSettings';
 export * from './tvSettings';
+export * from './victronDeviceSettings';
 export * from './windowSettings';
 export * from './wledSettings';

package/lib/models/deviceSettings/index.js

@@ -26,5 +26,6 @@ __exportStar(require("./sceneSettings"), exports);
 __exportStar(require("./shutterSettings"), exports);
 __exportStar(require("./sonosDeviceSettings"), exports);
 __exportStar(require("./tvSettings"), exports);
+__exportStar(require("./victronDeviceSettings"), exports);
 __exportStar(require("./windowSettings"), exports);
 __exportStar(require("./wledSettings"), exports);

package/lib/models/deviceSettings/victronDeviceSettings.d.ts

@@ -0,0 +1,10 @@
+import { DeviceSettings } from './deviceSettings';
+export declare class VictronDeviceSettings extends DeviceSettings {
+    maxBatteryLoadWattage: number;
+    hasBattery: boolean;
+    hasGrid: boolean;
+    hasSolar: boolean;
+    batteryCapacityWattage: number;
+    fromPartialObject(data: Partial<VictronDeviceSettings>): void;
+    protected toJSON(): Partial<VictronDeviceSettings>;
+}

package/lib/models/deviceSettings/victronDeviceSettings.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VictronDeviceSettings = void 0;
+const deviceSettings_1 = require("./deviceSettings");
+const server_1 = require("../../server");
+class VictronDeviceSettings extends deviceSettings_1.DeviceSettings {
+    constructor() {
+        super(...arguments);
+        this.maxBatteryLoadWattage = 1700;
+        this.hasBattery = true;
+        this.hasGrid = true;
+        this.hasSolar = true;
+        this.batteryCapacityWattage = 10000;
+    }
+    fromPartialObject(data) {
+        var _a, _b, _c, _d, _e;
+        this.maxBatteryLoadWattage = (_a = data.maxBatteryLoadWattage) !== null && _a !== void 0 ? _a : this.maxBatteryLoadWattage;
+        this.hasBattery = (_b = data.hasBattery) !== null && _b !== void 0 ? _b : this.hasBattery;
+        this.hasGrid = (_c = data.hasGrid) !== null && _c !== void 0 ? _c : this.hasGrid;
+        this.hasSolar = (_d = data.hasSolar) !== null && _d !== void 0 ? _d : this.hasSolar;
+        this.batteryCapacityWattage = (_e = data.batteryCapacityWattage) !== null && _e !== void 0 ? _e : this.batteryCapacityWattage;
+        super.fromPartialObject(data);
+    }
+    toJSON() {
+        return server_1.Utils.jsonFilter(this);
+    }
+}
+exports.VictronDeviceSettings = VictronDeviceSettings;

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -159,5 +159,5 @@ class IoBrokerBaseDevice {
         });
     }
 }
-exports.IoBrokerBaseDevice = IoBrokerBaseDevice;
 IoBrokerBaseDevice.roomAddingSettings = {};
+exports.IoBrokerBaseDevice = IoBrokerBaseDevice;

package/lib/server/devices/baseDeviceInterfaces/iEnergyManager.d.ts

@@ -1,5 +1,5 @@
 import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
-import { iRoomDevice } from './iRoomDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare class PhaseState {
     private readonly _meterValue;
     private readonly _production;
@@ -13,19 +13,10 @@ export declare class PhaseState {
     get injectingWattage(): number;
     get totalConsumptionWattage(): number;
 }
-export interface iEnergyManager extends iRoomDevice {
-    baseConsumption: number;
-    currentProduction: number;
+export interface iEnergyManager extends iBaseDevice {
     excessEnergy: number;
-    excessEnergyConsumerConsumption: number;
-    totalConsumption: number;
-    drawingWattage: number;
-    selfConsumingWattage: number;
-    injectingWattage: number;
-    phaseAState: PhaseState;
-    phaseBState: PhaseState;
-    phaseCState: PhaseState;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
     cleanup(): void;
+    getReport(): string;
 }

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

@@ -20,5 +20,5 @@ class BlueIrisCoordinator {
         dev.update(idSplit[4], state);
     }
 }
-exports.BlueIrisCoordinator = BlueIrisCoordinator;
 BlueIrisCoordinator.cameraDeviceMap = new Map();
+exports.BlueIrisCoordinator = BlueIrisCoordinator;

package/lib/server/devices/deviceType.d.ts

@@ -43,5 +43,6 @@ export declare enum DeviceType {
     Espresense = 4001,
     TrackableDevice = 4002,
     SamsungTv = 5001,
-    Camera = 6001
+    Camera = 6001,
+    Victron = 7001
 }

package/lib/server/devices/deviceType.js

@@ -48,4 +48,5 @@ var DeviceType;
     DeviceType[DeviceType["TrackableDevice"] = 4002] = "TrackableDevice";
     DeviceType[DeviceType["SamsungTv"] = 5001] = "SamsungTv";
     DeviceType[DeviceType["Camera"] = 6001] = "Camera";
+    DeviceType[DeviceType["Victron"] = 7001] = "Victron";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

package/lib/server/devices/devices.js

@@ -234,10 +234,10 @@ class Devices {
         Devices.alLDevices[fullName] = Devices.energymanager;
     }
 }
-exports.Devices = Devices;
 Devices.IDENTIFIER_HOMEMATIC = 'hm-rpc';
 Devices.IDENTIFIER_JS = 'javascript';
 Devices.IDENTIFIER_ZIGBEE = 'zigbee';
 Devices.IDENTIFIER_WLED = 'wled';
 Devices.alLDevices = {};
 Devices.energymanager = undefined;
+exports.Devices = Devices;

package/lib/server/devices/espresense/espresenseCoordinator.js

@@ -17,5 +17,5 @@ class EspresenseCoordinator {
         dev.update(idSplit[4], state);
     }
 }
-exports.EspresenseCoordinator = EspresenseCoordinator;
 EspresenseCoordinator.espDeviceMap = new Map();
+exports.EspresenseCoordinator = EspresenseCoordinator;

package/lib/server/devices/hmIPDevices/hmIpBewegung.js

@@ -117,7 +117,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         }, 270000, this);
     }
 }
-exports.HmIpBewegung = HmIpBewegung;
 HmIpBewegung.MOVEMENT_DETECTION = 'MOTION';
 // private static ILLUMINATION_DURING_MOVEMENT: string = 'CURRENT_ILLUMINATION';
 HmIpBewegung.CURRENT_ILLUMINATION = 'ILLUMINATION';
+exports.HmIpBewegung = HmIpBewegung;

package/lib/server/devices/hmIPDevices/hmIpPraezenz.js

@@ -127,8 +127,8 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this._lastBatteryPersist = now;
     }
 }
-exports.HmIpPraezenz = HmIpPraezenz;
 // TODO: Add iPresenceSensor
 HmIpPraezenz.PRESENCE_DETECTION = 'PRESENCE_DETECTION_STATE';
 // private static ILLUMINATION_DURING_MOVEMENT: string = 'CURRENT_ILLUMINATION';
 HmIpPraezenz.CURRENT_ILLUMINATION = 'ILLUMINATION';
+exports.HmIpPraezenz = HmIpPraezenz;

package/lib/server/devices/hmIPDevices/hmIpTaster.js

@@ -123,10 +123,10 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this._lastBatteryPersist = now;
     }
 }
-exports.HmIpTaster = HmIpTaster;
 HmIpTaster.BUTTON_CAPABILLITIES = {
     shortPress: true,
     longPress: true,
     doublePress: false,
     triplePress: false,
 };
+exports.HmIpTaster = HmIpTaster;

package/lib/server/devices/hmIPDevices/hmIpWippe.js

@@ -70,10 +70,10 @@ class HmIpWippe extends hmIpDevice_1.HmIPDevice {
         return result.join('\n');
     }
 }
-exports.HmIpWippe = HmIpWippe;
 HmIpWippe.BUTTON_CAPABILLITIES = {
     shortPress: true,
     longPress: true,
     doublePress: false,
     triplePress: false,
 };
+exports.HmIpWippe = HmIpWippe;

package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts

@@ -56,4 +56,5 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
     private turnOnAdditionalConsumer;
     private turnOffAdditionalConsumer;
     dispose(): void;
+    getReport(): string;
 }

package/lib/server/devices/jsObject/jsObjectEnergyManager.js

@@ -169,62 +169,30 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this.log(models_1.LogLevel.Info, `Persisting energy Manager Data.`);
     }
     turnOnAdditionalConsumer() {
-        var _a;
-        const potentialDevices = this._excessEnergyConsumer.filter((e) => {
-            var _a;
-            if (e.energySettings.priority === -1 || e.on || !e.isAvailableForExcessEnergy()) {
-                return false;
-            }
-            if (((_a = this._lastDeviceChange) === null || _a === void 0 ? void 0 : _a.newState) && e === this._lastDeviceChange.device) {
-                e.log(models_1.LogLevel.Debug, `This woould have been a matching energy consumer, but apperantly last turn on failed...`);
-                return false;
-            }
-            return true;
-        });
-        if (potentialDevices.length === 0) {
-            if (((_a = this._lastDeviceChange) === null || _a === void 0 ? void 0 : _a.newState) === true) {
-                this._lastDeviceChange = undefined;
-            }
+        const result = services_1.EnergyManagerUtils.turnOnAdditionalConsumer(this._excessEnergyConsumer, this._lastDeviceChange);
+        if (result == undefined) {
+            this._lastDeviceChange = undefined;
             return;
         }
-        potentialDevices.sort((a, b) => {
-            return b.energySettings.priority - a.energySettings.priority;
-        });
-        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energySettings.powerReactionTime;
-        potentialDevices[0].log(models_1.LogLevel.Info, `Turning on, as we have ${this.excessEnergy}W to spare...`);
-        potentialDevices[0].turnOnForExcessEnergy();
-        this._lastDeviceChange = { newState: true, device: potentialDevices[0] };
+        if (result.newState) {
+            this.blockDeviceChangeTime = services_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
+            result.device.log(models_1.LogLevel.Info, `Turning on, as we have ${this.excessEnergy}W to spare...`);
+            result.device.turnOnForExcessEnergy();
+            this._lastDeviceChange = result;
+        }
     }
     turnOffAdditionalConsumer() {
-        var _a;
-        const potentialDevices = this._excessEnergyConsumer.filter((e) => {
-            var _a;
-            if (e.energySettings.priority === -1 || !e.on) {
-                return false;
-            }
-            if (!e.wasActivatedByExcessEnergy()) {
-                e.log(models_1.LogLevel.Info, 'This would have been turned off, but was activated manually....');
-                return false;
-            }
-            if (((_a = this._lastDeviceChange) === null || _a === void 0 ? void 0 : _a.newState) === false && e === this._lastDeviceChange.device) {
-                e.log(models_1.LogLevel.Debug, `This woould have been a matching turn off energy consumer, but apperantly last turn off failed...`);
-                return false;
-            }
-            return true;
-        });
-        if (potentialDevices.length === 0) {
-            if (((_a = this._lastDeviceChange) === null || _a === void 0 ? void 0 : _a.newState) === false) {
-                this._lastDeviceChange = undefined;
-            }
+        const result = services_1.EnergyManagerUtils.turnOffAdditionalConsumer(this._excessEnergyConsumer, this._lastDeviceChange);
+        if (result == undefined) {
+            this._lastDeviceChange = undefined;
             return;
         }
-        potentialDevices.sort((a, b) => {
-            return a.energySettings.priority - b.energySettings.priority;
-        });
-        potentialDevices[0].log(models_1.LogLevel.Info, `Turning off, as we don't have energy to spare...`);
-        this.blockDeviceChangeTime = services_1.Utils.nowMS() + potentialDevices[0].energySettings.powerReactionTime;
-        potentialDevices[0].turnOffDueToMissingEnergy();
-        this._lastDeviceChange = { newState: false, device: potentialDevices[0] };
+        if (!result.newState) {
+            this.blockDeviceChangeTime = services_1.Utils.nowMS() + result.device.energySettings.powerReactionTime;
+            result.device.log(models_1.LogLevel.Info, `Turning off, as we don't have energy to spare...`);
+            result.device.turnOffDueToMissingEnergy();
+            this._lastDeviceChange = result;
+        }
     }
     dispose() {
         if (this._iCalculationInterval) {
@@ -236,5 +204,15 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             this._iDatabaseLoggerInterval = null;
         }
     }
+    getReport() {
+        const response = [];
+        response.push(`Production: ${this.currentProduction}W`);
+        response.push(`Total Consumption: ${this.totalConsumption}W`);
+        response.push(`Excess Consumption: ${this.excessEnergyConsumerConsumption}W`);
+        response.push(`Drawing Wattage: ${this.drawingWattage}W`);
+        response.push(`Self Consuming Wattage: ${this.selfConsumingWattage}W`);
+        response.push(`Injecting Wattage: ${this.injectingWattage}W`);
+        return response.join('');
+    }
 }
 exports.JsObjectEnergyManager = JsObjectEnergyManager;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.js

@@ -99,5 +99,5 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
         });
     }
 }
-exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;
 ZigbeeLedRGBCCT.DEFAULT_COLOR_WARM = '#f2b200';
+exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;

package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.js

@@ -102,10 +102,10 @@ class ZigbeeAqaraOpple3Switch extends BaseDevices_1.ZigbeeSwitch {
         taste.updateState(pressType, val);
     }
 }
-exports.ZigbeeAqaraOpple3Switch = ZigbeeAqaraOpple3Switch;
 ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES = {
     shortPress: true,
     longPress: true,
     doublePress: true,
     triplePress: true,
 };
+exports.ZigbeeAqaraOpple3Switch = ZigbeeAqaraOpple3Switch;

package/lib/server/ioBroker/ioBroker.main.js

@@ -100,6 +100,6 @@ class ioBrokerMain {
         services_1.TimeCallbackService.performCheck();
     }
 }
-exports.ioBrokerMain = ioBrokerMain;
 ioBrokerMain.SplitKeys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
 ioBrokerMain.roomConstructors = {};
+exports.ioBrokerMain = ioBrokerMain;

package/lib/server/ioBroker/iobrokerConnectionLogging.js

@@ -29,5 +29,5 @@ class iobrokerConnectionLogging {
         }
     }
 }
-exports.iobrokerConnectionLogging = iobrokerConnectionLogging;
 iobrokerConnectionLogging.LogLevel = 5;
+exports.iobrokerConnectionLogging = iobrokerConnectionLogging;

package/lib/server/services/Sonos/OwnSonosDevices.js

@@ -9,5 +9,5 @@ class OwnSonosDevices {
         this.ownDevices[device.discoveryName] = device;
     }
 }
-exports.OwnSonosDevices = OwnSonosDevices;
 OwnSonosDevices.ownDevices = {};
+exports.OwnSonosDevices = OwnSonosDevices;

package/lib/server/services/Sonos/mp3-server.js

@@ -90,5 +90,5 @@ class MP3Server {
             .listen(8081);
     }
 }
-exports.MP3Server = MP3Server;
 MP3Server.active = false;
+exports.MP3Server = MP3Server;

package/lib/server/services/Sonos/polly-service.js

@@ -118,5 +118,5 @@ class PollyService {
         });
     }
 }
-exports.PollyService = PollyService;
 PollyService.active = false;
+exports.PollyService = PollyService;

package/lib/server/services/Sonos/sonos-service.js

@@ -105,7 +105,7 @@ class SonosService {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Sonos ${d.Uuid} für ${d.Name} gefunden`);
     }
 }
-exports.SonosService = SonosService;
 SonosService.all = [];
 SonosService.devicesDict = {};
 SonosService.ownDevices = {};
+exports.SonosService = SonosService;

package/lib/server/services/Telegram/telegram-Commands.js

@@ -112,16 +112,11 @@ class TelegramCommands {
         }, `Retrieves the button assignments for all buttons in home`));
         if (devices_1.Devices.energymanager !== undefined) {
             telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('EnergyManager', /\/get_energy_values/, async (m) => {
-                var _a, _b, _c, _d, _e, _f;
+                var _a, _b;
                 if (m.from === undefined)
                     return false;
-                const response = ['Current Energy Manager values:'];
-                response.push(`Production: ${(_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.currentProduction}W`);
-                response.push(`Total Consumption: ${(_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.totalConsumption}W`);
-                response.push(`Excess Consumption: ${(_c = devices_1.Devices.energymanager) === null || _c === void 0 ? void 0 : _c.excessEnergyConsumerConsumption}W`);
-                response.push(`Drawing Wattage: ${(_d = devices_1.Devices.energymanager) === null || _d === void 0 ? void 0 : _d.drawingWattage}W`);
-                response.push(`Self Consuming Wattage: ${(_e = devices_1.Devices.energymanager) === null || _e === void 0 ? void 0 : _e.selfConsumingWattage}W`);
-                response.push(`Injecting Wattage: ${(_f = devices_1.Devices.energymanager) === null || _f === void 0 ? void 0 : _f.injectingWattage}W`);
+                const response = ['Current Energy Manager report:'];
+                response.push((_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.getReport()) !== null && _b !== void 0 ? _b : 'No Energy Manager found');
                 telegram_service_1.TelegramService.sendMessage([m.chat.id], response.join('\n'));
                 return true;
             }, `Retrieves the current energy manager values`));

package/lib/server/services/Telegram/telegram-service.js

@@ -153,8 +153,8 @@ class TelegramService {
         }
     }
 }
-exports.TelegramService = TelegramService;
 TelegramService.active = false;
 TelegramService.settings = undefined;
 // private static restartTimeout: NodeJS.Timeout | undefined = undefined;
 TelegramService.callbacks = {};
+exports.TelegramService = TelegramService;

package/lib/server/services/ac/daikin-service.js

@@ -114,5 +114,5 @@ class DaikinService {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Daikin ${name} gefunden`);
     }
 }
-exports.DaikinService = DaikinService;
 DaikinService._ownDevices = {};
+exports.DaikinService = DaikinService;

package/lib/server/services/ac/own-ac-devices.js

@@ -11,5 +11,5 @@ class OwnAcDevices {
         devices_1.Devices.alLDevices[device.id] = device;
     }
 }
-exports.OwnAcDevices = OwnAcDevices;
 OwnAcDevices.ownDevices = {};
+exports.OwnAcDevices = OwnAcDevices;

package/lib/server/services/calendar/muell-tonne.js

@@ -64,5 +64,5 @@ class MuellTonne {
         }
     }
 }
-exports.MuellTonne = MuellTonne;
 MuellTonne.oneDay = 1000 * 60 * 60 * 24;
+exports.MuellTonne = MuellTonne;

package/lib/server/services/calendar/m/303/274ll-service.js

@@ -106,10 +106,10 @@ class MuellService {
         this.brauneTonne.check();
     }
 }
-exports.MuellService = MuellService;
 MuellService.alleTonnen = [];
 MuellService.loadingPending = true;
 MuellService.months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 MuellService.lastCheck = new Date(0);
 MuellService._active = false;
 MuellService.defaultSpeaker = undefined;
+exports.MuellService = MuellService;

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

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

package/lib/server/services/index.js

@@ -32,5 +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("./victron/index"), exports);
 __exportStar(require("./time-callback-service"), exports);

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

@@ -112,7 +112,6 @@ class ServerLogService {
         return true;
     }
 }
-exports.ServerLogService = ServerLogService;
 ServerLogService.telegramLevel = -1; // Controlled from within Config File
 ServerLogService.storageLevel = 5; // Controlled from within Config File
 ServerLogService.storage = new utils_1.ringStorage(10000);
@@ -120,3 +119,4 @@ ServerLogService.settings = {
     logLevel: 4,
     useTimestamp: false,
 };
+exports.ServerLogService = ServerLogService;

package/lib/server/services/network/router.js

@@ -9,5 +9,5 @@ class Router {
         this._router = router;
     }
 }
-exports.Router = Router;
 Router._router = undefined;
+exports.Router = Router;

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

@@ -203,6 +203,6 @@ class NewsService {
         }
     }
 }
-exports.NewsService = NewsService;
 // prefix for all downloaded files of the news service
 NewsService.newsFilePrefix = `news$`;
+exports.NewsService = NewsService;

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

@@ -39,9 +39,9 @@ class RoomService {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Schalte alle Lampen in Etage ${floor} auf den Wert ${status}`);
         const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.Rooms.entries();
         for (const [_name, room] of rooms) {
-            (_a = room.LightGroup) === null || _a === void 0 ? void 0 : _a.setAllLampen(status, -1, true, timeout);
+            (_a = room.LightGroup) === null || _a === void 0 ? void 0 : _a.setAllLampen(status, undefined, true, timeout);
             (_b = room.LightGroup) === null || _b === void 0 ? void 0 : _b.setAllLED(status);
-            (_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.setAllStecker(status, -1, true);
+            (_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.setAllStecker(status, undefined, true);
             (_d = room.LightGroup) === null || _d === void 0 ? void 0 : _d.setAllWled(status);
         }
     }
@@ -190,10 +190,10 @@ class RoomService {
         }
     }
 }
-exports.RoomService = RoomService;
 RoomService.Rooms = new Map();
 RoomService.awayModeActive = false;
 RoomService.nightAlarmActive = false;
 RoomService.movementHistory = new utils_1.ringStorage(15);
 RoomService._intrusionAlarmActive = false;
 RoomService._intrusionAlarmLevel = 0;
+exports.RoomService = RoomService;

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

@@ -39,5 +39,5 @@ class TibberService {
         this._tibberFeed = new tibber_api_1.TibberFeed(this.tibberQueryBase);
     }
 }
-exports.TibberService = TibberService;
 TibberService._settings = undefined;
+exports.TibberService = TibberService;

package/lib/server/services/time-callback-service.js

@@ -178,6 +178,6 @@ Next Sunset: ${TimeCallbackService._nextSunSet.toLocaleString('de-DE')}`);
         return (0, sunrise_sunset_js_1.getSunset)(lat !== null && lat !== void 0 ? lat : settings_service_1.SettingsService.latitude, long !== null && long !== void 0 ? long : settings_service_1.SettingsService.longitude, pDay);
     }
 }
-exports.TimeCallbackService = TimeCallbackService;
 TimeCallbackService._callbacks = new Map();
 TimeCallbackService._lastCheck = new Date(0);
+exports.TimeCallbackService = TimeCallbackService;

package/lib/server/services/utils/energy-manager-utils.d.ts

@@ -0,0 +1,17 @@
+import { iExcessEnergyConsumer } from '../../devices';
+export declare class EnergyManagerUtils {
+    static turnOnAdditionalConsumer(excessEnergyConsumer: iExcessEnergyConsumer[], lastDeviceChange: {
+        newState: boolean;
+        device: iExcessEnergyConsumer;
+    } | undefined): void | undefined | {
+        newState: boolean;
+        device: iExcessEnergyConsumer;
+    };
+    static turnOffAdditionalConsumer(excessEnergyConsumer: iExcessEnergyConsumer[], lastDeviceChange: {
+        newState: boolean;
+        device: iExcessEnergyConsumer;
+    } | undefined): void | undefined | {
+        newState: boolean;
+        device: iExcessEnergyConsumer;
+    };
+}

package/lib/server/services/utils/energy-manager-utils.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnergyManagerUtils = void 0;
+const models_1 = require("../../../models");
+class EnergyManagerUtils {
+    static turnOnAdditionalConsumer(excessEnergyConsumer, lastDeviceChange) {
+        const potentialDevices = excessEnergyConsumer.filter((e) => {
+            if (e.energySettings.priority === -1 || e.on || !e.isAvailableForExcessEnergy()) {
+                return false;
+            }
+            if ((lastDeviceChange === null || lastDeviceChange === void 0 ? void 0 : lastDeviceChange.newState) && e === lastDeviceChange.device) {
+                e.log(models_1.LogLevel.Debug, `This woould have been a matching energy consumer, but apperantly last turn on failed...`);
+                return false;
+            }
+            return true;
+        });
+        if (potentialDevices.length === 0) {
+            if ((lastDeviceChange === null || lastDeviceChange === void 0 ? void 0 : lastDeviceChange.newState) === true) {
+                return undefined;
+            }
+            return;
+        }
+        potentialDevices.sort((a, b) => {
+            return b.energySettings.priority - a.energySettings.priority;
+        });
+        return { newState: true, device: potentialDevices[0] };
+    }
+    static turnOffAdditionalConsumer(excessEnergyConsumer, lastDeviceChange) {
+        const potentialDevices = excessEnergyConsumer.filter((e) => {
+            if (e.energySettings.priority === -1 || !e.on) {
+                return false;
+            }
+            if (!e.wasActivatedByExcessEnergy()) {
+                e.log(models_1.LogLevel.Info, 'This would have been turned off, but was activated manually....');
+                return false;
+            }
+            if ((lastDeviceChange === null || lastDeviceChange === void 0 ? void 0 : lastDeviceChange.newState) === false && e === lastDeviceChange.device) {
+                e.log(models_1.LogLevel.Debug, `This woould have been a matching turn off energy consumer, but apperantly last turn off failed...`);
+                return false;
+            }
+            return true;
+        });
+        if (potentialDevices.length === 0) {
+            if ((lastDeviceChange === null || lastDeviceChange === void 0 ? void 0 : lastDeviceChange.newState) === false) {
+                return undefined;
+            }
+            return;
+        }
+        potentialDevices.sort((a, b) => {
+            return a.energySettings.priority - b.energySettings.priority;
+        });
+        return { newState: false, device: potentialDevices[0] };
+    }
+}
+exports.EnergyManagerUtils = EnergyManagerUtils;

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

@@ -1,3 +1,4 @@
+export * from './energy-manager-utils';
 export * from './ringstorage';
 export * from './utils';
 export * from './iDisposeable';

package/lib/server/services/utils/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./energy-manager-utils"), exports);
 __exportStar(require("./ringstorage"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./iDisposeable"), exports);

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

@@ -0,0 +1,2 @@
+export * from './victron-device';
+export * from './victron-service';