hoffmation-base 0.1.38-1 → 0.1.38-2

package/lib/index.d.ts

@@ -1,10 +1,11 @@
-import { Devices, iConfig, ioBrokerMain, OwnSonosDevice } from './server';
+import { Devices, iConfig, ioBrokerMain, OwnSonosDevice, iPersist } from './server';
 export * from './models/index';
 export * from './server/index';
 export declare class HoffmationInitializationObject {
     config: iConfig;
     constructor(config: iConfig);
 }
+export declare let dbo: iPersist | undefined;
 export declare class HoffmationBase {
     static ioMain: ioBrokerMain;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;

package/lib/index.js

@@ -14,7 +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 });
-exports.HoffmationBase = exports.HoffmationInitializationObject = void 0;
+exports.HoffmationBase = exports.dbo = exports.HoffmationInitializationObject = void 0;
 const models_1 = require("./models");
 const server_1 = require("./server");
 __exportStar(require("./models/index"), exports);
@@ -34,10 +34,13 @@ class HoffmationBase {
         }
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
         if (initObject.config.persistence) {
-            await server_1.Persist.initialize(initObject.config.persistence);
-        }
-        else {
-            server_1.Persist.turnOff();
+            if (initObject.config.persistence.mongo) {
+                exports.dbo = new server_1.MongoPersistance(initObject.config.persistence);
+            }
+            else if (initObject.config.persistence.postgreSql) {
+                exports.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence);
+            }
+            await (exports.dbo === null || exports.dbo === void 0 ? void 0 : exports.dbo.initialize());
         }
         if (server_1.SettingsService.settings.mp3Server) {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);

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

@@ -0,0 +1,5 @@
+export * from './actuatorSettings';
+export * from './deviceSettings';
+export * from './dimmerSettings';
+export * from './ledSettings';
+export * from './shutterSettings';

package/lib/models/deviceSettings/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./actuatorSettings"), exports);
+__exportStar(require("./deviceSettings"), exports);
+__exportStar(require("./dimmerSettings"), exports);
+__exportStar(require("./ledSettings"), exports);
+__exportStar(require("./shutterSettings"), exports);

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

@@ -0,0 +1,5 @@
+import { DeviceSettings } from './deviceSettings';
+export declare class ShutterSettings extends DeviceSettings {
+    msTilTop: number;
+    msTilBot: number;
+}

package/lib/models/deviceSettings/shutterSettings.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShutterSettings = void 0;
+const deviceSettings_1 = require("./deviceSettings");
+class ShutterSettings extends deviceSettings_1.DeviceSettings {
+    constructor() {
+        super(...arguments);
+        this.msTilTop = -1;
+        this.msTilBot = -1;
+    }
+}
+exports.ShutterSettings = ShutterSettings;

package/lib/models/index.d.ts

@@ -1,13 +1,11 @@
 export * from './rooms/index';
+export * from './deviceSettings/index';
 export * from './persistence/index';
-export * from './actuatorSettings';
 export * from './connectionCallbacks';
 export * from './daytime';
 export * from './deviceConfig';
-export * from './dimmerSettings';
 export * from './excessEnergyConsumerSettings';
 export * from './iTemperaturDataPoint';
-export * from './ledSettings';
 export * from './logLevel';
 export * from './temperaturSettings';
 export * from './timeCallback';

package/lib/models/index.js

@@ -15,15 +15,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./rooms/index"), exports);
+__exportStar(require("./deviceSettings/index"), exports);
 __exportStar(require("./persistence/index"), exports);
-__exportStar(require("./actuatorSettings"), exports);
 __exportStar(require("./connectionCallbacks"), exports);
 __exportStar(require("./daytime"), exports);
 __exportStar(require("./deviceConfig"), exports);
-__exportStar(require("./dimmerSettings"), exports);
 __exportStar(require("./excessEnergyConsumerSettings"), exports);
 __exportStar(require("./iTemperaturDataPoint"), exports);
-__exportStar(require("./ledSettings"), exports);
 __exportStar(require("./logLevel"), exports);
 __exportStar(require("./temperaturSettings"), exports);
 __exportStar(require("./timeCallback"), exports);

package/lib/models/persistence/EnergyCalculation.d.ts

@@ -0,0 +1,11 @@
+export declare class EnergyCalculation {
+    startMs: number;
+    drawnWattage: number;
+    injectedWattage: number;
+    selfConsumedWattage: number;
+    costDrawn: number;
+    earnedInjected: number;
+    savedSelfConsume: number;
+    endMs: number;
+    constructor(startMs: number);
+}

package/lib/models/persistence/EnergyCalculation.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnergyCalculation = void 0;
+class EnergyCalculation {
+    constructor(startMs) {
+        this.startMs = startMs;
+        this.drawnWattage = 0;
+        this.injectedWattage = 0;
+        this.selfConsumedWattage = 0;
+        this.costDrawn = 0;
+        this.earnedInjected = 0;
+        this.savedSelfConsume = 0;
+        this.endMs = 0;
+    }
+}
+exports.EnergyCalculation = EnergyCalculation;

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

@@ -1,6 +1,7 @@
 export * from './BasicRoomInfo';
 export * from './CurrentIlluminationDataPoint';
 export * from './DailyMovementCount';
+export * from './EnergyCalculation';
 export * from './RoomDetailInfo';
 export * from './ShutterCalibration';
 export * from './temperaturDataPoint';

package/lib/models/persistence/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BasicRoomInfo"), exports);
 __exportStar(require("./CurrentIlluminationDataPoint"), exports);
 __exportStar(require("./DailyMovementCount"), exports);
+__exportStar(require("./EnergyCalculation"), exports);
 __exportStar(require("./RoomDetailInfo"), exports);
 __exportStar(require("./ShutterCalibration"), exports);
 __exportStar(require("./temperaturDataPoint"), exports);

package/lib/models/rooms/RoomBase.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomBase = void 0;
 const logLevel_1 = require("../logLevel");
 const log_service_1 = require("../../server/services/log-service/log-service");
-const persist_1 = require("../../server/services/dbo/persist");
 const time_callback_service_1 = require("../../server/services/time-callback-service");
 const room_service_1 = require("../../server/services/room-service/room-service");
 const roomInfo_1 = require("./roomInfo");
@@ -15,6 +14,7 @@ const ShutterService_1 = require("../../server/services/ShutterService");
 const utils_1 = require("../../server/services/utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
 const device_cluster_1 = require("../../server/devices/device-cluster");
+const index_1 = require("../../index");
 class RoomBase {
     constructor(roomName, settings, groups) {
         this.settings = settings;
@@ -68,7 +68,7 @@ class RoomBase {
         (_c = this.TasterGroup) === null || _c === void 0 ? void 0 : _c.initCallbacks();
     }
     persist() {
-        persist_1.Persist.addRoom(this);
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addRoom(this);
     }
     recalcTimeCallbacks() {
         const now = new Date();

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

@@ -1,5 +1,6 @@
 import { LogLevel } from '../../models/logLevel';
 import { iRoomDefaultSettings } from '../../models/rooms/RoomSettings/iRoomDefaultSettings';
+import { PoolConfig } from 'pg';
 interface iSonosSettings {
     active: boolean;
 }
@@ -8,6 +9,8 @@ export interface iRestSettings {
     port?: number;
 }
 export interface iConfig {
+    wattagePrice: number;
+    injectWattagePrice?: number;
     ioBrokerUrl: string;
     logSettings?: iLogSettings;
     translationSettings: iTranslationSettings;
@@ -42,6 +45,10 @@ export interface iTelegramSettings {
     subscribedIDs: number[];
 }
 export interface iPersistenceSettings {
+    mongo?: iMongoSettings;
+    postgreSql?: PoolConfig;
+}
+export interface iMongoSettings {
     mongoConnection: string;
     mongoDbName: string;
 }

package/lib/server/devices/Heizgruppen.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Heizgruppen = void 0;
 const deviceType_1 = require("./deviceType");
-const persist_1 = require("../services/dbo/persist");
 const devices_1 = require("./devices");
+const index_1 = require("../../index");
 class Heizgruppen {
     static getInfo() {
         const gruppen = Heizgruppen.getAllGruppen();
@@ -18,6 +18,7 @@ class Heizgruppen {
         return response.join('\n');
     }
     static async getSpecificInfo(pText) {
+        var _a;
         if (pText === undefined || !pText.includes('"')) {
             return `Bitte übergeben Sie eine Heizgruppe innerhalb von "". z.B. "EG Flur HeizGr"`;
         }
@@ -26,7 +27,7 @@ class Heizgruppen {
         if (group === undefined) {
             return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${this.getInfo()}`;
         }
-        const results = await persist_1.Persist.readTemperaturDataPoint(group, 20);
+        const results = (_a = (await (index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.readTemperaturDataPoint(group, 20)))) !== null && _a !== void 0 ? _a : [];
         const response = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];
         response.push(`Zeitpunkt\t\tIst-Temperatur\t\tSoll-Temperatur\t\tVentilstellung`);
         for (const r of results) {

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

@@ -4,9 +4,9 @@ exports.HmIpBewegung = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
-const persist_1 = require("../../services/dbo/persist");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 const logLevel_1 = require("../../../models/logLevel");
+const index_1 = require("../../../index");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpBewegung);
@@ -16,13 +16,11 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         this._movementDetectedCallback = [];
         this.initialized = false;
         this._currentIllumination = -1;
-        persist_1.Persist.getCount(this)
-            .then((todayCount) => {
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
             this.log(logLevel_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
             this.initialized = true;
-        })
-            .catch((err) => {
+        }).catch((err) => {
             this.log(logLevel_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${err.message}`);
         });
     }
@@ -32,7 +30,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     set currentIllumination(value) {
         var _a, _b, _c;
         this._currentIllumination = value;
-        persist_1.Persist.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
     }
     get detectionsToday() {
         return this._detectionsToday;
@@ -40,7 +38,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     set detectionsToday(pVal) {
         const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        persist_1.Persist.persistTodayCount(this, pVal, oldVal);
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistTodayCount(this, pVal, oldVal);
     }
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);

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

@@ -4,9 +4,9 @@ exports.HmIpHeizgruppe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
-const persist_1 = require("../../services/dbo/persist");
 const logLevel_1 = require("../../../models/logLevel");
 const device_cluster_type_1 = require("../device-cluster-type");
+const index_1 = require("../../../index");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -108,7 +108,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     checkAutomaticChange() {
         var _a;
         if (!this._automaticMode) {
-            persist_1.Persist.addTemperaturDataPoint(this);
+            index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addTemperaturDataPoint(this);
             return;
         }
         for (const name in this._automaticPoints) {
@@ -125,7 +125,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             }
             break;
         }
-        persist_1.Persist.addTemperaturDataPoint(this);
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addTemperaturDataPoint(this);
     }
 }
 exports.HmIpHeizgruppe = HmIpHeizgruppe;

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { ActuatorSettings } from '../../../models/actuatorSettings';
+import { ActuatorSettings } from '../../../models/deviceSettings/actuatorSettings';
 import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../iLamp';
 import { TimeOfDay } from '../../services/time-callback-service';

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

@@ -4,7 +4,7 @@ exports.HmIpLampe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
-const actuatorSettings_1 = require("../../../models/actuatorSettings");
+const actuatorSettings_1 = require("../../../models/deviceSettings/actuatorSettings");
 const logLevel_1 = require("../../../models/logLevel");
 const time_callback_service_1 = require("../../services/time-callback-service");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {

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

@@ -4,9 +4,9 @@ exports.HmIpPraezenz = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
-const persist_1 = require("../../services/dbo/persist");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 const logLevel_1 = require("../../../models/logLevel");
+const index_1 = require("../../../index");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
@@ -18,13 +18,11 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this.initialized = false;
         this._currentIllumination = -1;
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
-        persist_1.Persist.getCount(this)
-            .then((todayCount) => {
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
             this.log(logLevel_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
             this.initialized = true;
-        })
-            .catch((err) => {
+        }).catch((err) => {
             this.log(logLevel_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${err.message}`);
         });
     }
@@ -34,7 +32,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     set detectionsToday(pVal) {
         const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        persist_1.Persist.persistTodayCount(this, pVal, oldVal);
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistTodayCount(this, pVal, oldVal);
     }
     get currentIllumination() {
         return this._currentIllumination;
@@ -42,7 +40,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     set currentIllumination(value) {
         var _a, _b, _c;
         this._currentIllumination = value;
-        persist_1.Persist.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
     }
     addPresenceCallback(pCallback) {
         this._presenceDetectedCallback.push(pCallback);

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

@@ -5,6 +5,7 @@ export interface iEnergyManager extends IoBrokerBaseDevice {
     currentProduction: number;
     excessEnergy: number;
     excessEnergyConsumerConsumption: number;
+    totalConsumption: number;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
 }

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

@@ -1,4 +1,4 @@
-import { ActuatorSettings } from '../../models/actuatorSettings';
+import { ActuatorSettings } from '../../models/deviceSettings/actuatorSettings';
 import { RoomBase } from '../../models/rooms/RoomBase';
 import { TimeOfDay } from '../services/time-callback-service';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';

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

@@ -4,14 +4,24 @@ import { iEnergyManager } from '../iEnergyManager';
 import { iExcessEnergyConsumer } from '../iExcessEnergyConsumer';
 import { DeviceInfo } from '../DeviceInfo';
 export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements iEnergyManager {
-    baseConsumption: number;
-    currentProduction: number;
-    excessEnergy: number;
-    excessEnergyConsumerConsumption: number;
+    get excessEnergyConsumerConsumption(): number;
+    get excessEnergy(): number;
+    get baseConsumption(): number;
+    get totalConsumption(): number;
+    get currentProduction(): number;
+    private _currentProduction;
+    private _excessEnergy;
+    private _excessEnergyConsumerConsumption;
     private _excessEnergyConsumer;
+    private _iDatabaseLoggerInterval;
+    private _nextPersistEntry;
+    private _lastPersistenceCalculation;
     constructor(info: DeviceInfo);
+    cleanup(): void;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
     update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride?: boolean): void;
     private setExcessEnergy;
+    private calculatePersistenceValues;
+    private persist;
 }

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

@@ -4,14 +4,42 @@ exports.JsObjectEnergyManager = void 0;
 const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
 const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
+const utils_1 = require("../../services/utils/utils");
+const index_1 = require("../../../index");
 class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(info) {
         super(info, deviceType_1.DeviceType.JsEnergyManager);
-        this.baseConsumption = -1;
-        this.currentProduction = -1;
-        this.excessEnergy = -1;
-        this.excessEnergyConsumerConsumption = -1;
+        this._currentProduction = -1;
+        this._excessEnergy = -1;
+        this._excessEnergyConsumerConsumption = 0;
         this._excessEnergyConsumer = [];
+        this._iDatabaseLoggerInterval = null;
+        this._lastPersistenceCalculation = utils_1.Utils.nowMS();
+        this._iDatabaseLoggerInterval = utils_1.Utils.guardedInterval(() => {
+            this.persist();
+        }, 15 * 60 * 1000, this);
+        this._nextPersistEntry = new index_1.EnergyCalculation(utils_1.Utils.nowMS());
+    }
+    get excessEnergyConsumerConsumption() {
+        return this._excessEnergyConsumerConsumption;
+    }
+    get excessEnergy() {
+        return this._excessEnergy;
+    }
+    get baseConsumption() {
+        return this.totalConsumption - this._excessEnergyConsumerConsumption;
+    }
+    get totalConsumption() {
+        return this._currentProduction - this._excessEnergy;
+    }
+    get currentProduction() {
+        return this._currentProduction;
+    }
+    cleanup() {
+        if (this._iDatabaseLoggerInterval !== null) {
+            clearInterval(this._iDatabaseLoggerInterval);
+            this._iDatabaseLoggerInterval = null;
+        }
     }
     addExcessConsumer(device) {
         this._excessEnergyConsumer.push(device);
@@ -28,13 +56,42 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                 break;
             case 'CurrentProduction':
                 this.log(logLevel_1.LogLevel.Trace, `Current Production Update to ${state.val}`);
-                this.currentProduction = state.val;
+                this._currentProduction = state.val;
                 break;
         }
     }
     setExcessEnergy(val) {
-        this.excessEnergy = val;
+        this._excessEnergy = val;
+        this.calculatePersistenceValues();
         this.recalculatePowerSharing();
     }
+    calculatePersistenceValues() {
+        const now = utils_1.Utils.nowMS();
+        const duration = now - this._lastPersistenceCalculation;
+        if (this.excessEnergy < 0) {
+            this._nextPersistEntry.drawnWattage += utils_1.Utils.kWh(this.excessEnergy * -1, duration);
+        }
+        else {
+            this._nextPersistEntry.injectedWattage += utils_1.Utils.kWh(this.excessEnergy, duration);
+            this._nextPersistEntry.selfConsumedWattage += utils_1.Utils.kWh(this.totalConsumption, duration);
+        }
+        this._lastPersistenceCalculation = now;
+    }
+    persist() {
+        var _a;
+        const obj = JSON.parse(JSON.stringify(this._nextPersistEntry));
+        if (obj.drawnWattage === 0 && obj.injectedWattage === 0 && obj.selfConsumedWattage === 0) {
+            return;
+        }
+        this._nextPersistEntry = new index_1.EnergyCalculation(this._lastPersistenceCalculation);
+        obj.endMs = this._lastPersistenceCalculation;
+        obj.earnedInjected = utils_1.Utils.round(obj.injectedWattage * ((_a = index_1.SettingsService.settings.injectWattagePrice) !== null && _a !== void 0 ? _a : 0.06), 4);
+        obj.savedSelfConsume = utils_1.Utils.round(obj.selfConsumedWattage * index_1.SettingsService.settings.wattagePrice, 4);
+        obj.costDrawn = utils_1.Utils.round(obj.selfConsumedWattage * index_1.SettingsService.settings.wattagePrice, 4);
+        obj.injectedWattage = utils_1.Utils.round(obj.injectedWattage, 4);
+        obj.selfConsumedWattage = utils_1.Utils.round(obj.selfConsumedWattage, 4);
+        obj.drawnWattage = utils_1.Utils.round(obj.drawnWattage, 4);
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistEnergyManager(obj);
+    }
 }
 exports.JsObjectEnergyManager = JsObjectEnergyManager;

package/lib/server/devices/zigbee/ZigbeeActuator.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { ActuatorSettings } from '../../../models/actuatorSettings';
+import { ActuatorSettings } from '../../../models/deviceSettings/actuatorSettings';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { DeviceType } from '../deviceType';

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeActuator = void 0;
 const utils_1 = require("../../services/utils/utils");
-const actuatorSettings_1 = require("../../../models/actuatorSettings");
+const actuatorSettings_1 = require("../../../models/deviceSettings/actuatorSettings");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const logLevel_1 = require("../../../models/logLevel");
 class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraMotion = void 0;
 const deviceType_1 = require("../deviceType");
-const persist_1 = require("../../services/dbo/persist");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 const logLevel_1 = require("../../../models/logLevel");
 const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
+const index_1 = require("../../../index");
 class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
@@ -21,7 +21,7 @@ class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
     set currentIllumination(value) {
         var _a, _b, _c;
         this._illuminance = value;
-        persist_1.Persist.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
+        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
     }
     // Time after the last trigger until a motion event gets triggered again
     get motionTimeout() {

package/lib/server/devices/zigbee/zigbeeBlitzShp.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { ActuatorSettings } from '../../../models/actuatorSettings';
+import { ActuatorSettings } from '../../../models/deviceSettings/actuatorSettings';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ExcessEnergyConsumerSettings } from '../../../models/excessEnergyConsumerSettings';

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeBlitzShp = void 0;
 const deviceType_1 = require("../deviceType");
-const actuatorSettings_1 = require("../../../models/actuatorSettings");
+const actuatorSettings_1 = require("../../../models/deviceSettings/actuatorSettings");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const logLevel_1 = require("../../../models/logLevel");
 const excessEnergyConsumerSettings_1 = require("../../../models/excessEnergyConsumerSettings");

package/lib/server/devices/zigbee/zigbeeIlluDimmer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { DimmerSettings } from '../../../models/dimmerSettings';
+import { DimmerSettings } from '../../../models/deviceSettings/dimmerSettings';
 import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../iLamp';
 import { ZigbeeDevice } from './zigbeeDevice';

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluDimmer = void 0;
-const dimmerSettings_1 = require("../../../models/dimmerSettings");
+const dimmerSettings_1 = require("../../../models/deviceSettings/dimmerSettings");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
 const zigbeeDevice_1 = require("./zigbeeDevice");