hoffmation-base 0.1.37 → 0.1.38-11

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -10,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);
@@ -30,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/excessEnergyConsumerSettings.d.ts

@@ -0,0 +1,9 @@
+export declare class ExcessEnergyConsumerSettings {
+    /**
+     * Priority in comparision to other ExcessEnergyConsumer Devices
+     * (-1 = off, 1= lowest, 99 = highest, 100 = Always on)
+     * Devices with same prio try to share as good as possible.
+     */
+    priority: number;
+    rampUpOnSpareEnergy: boolean;
+}

package/lib/models/excessEnergyConsumerSettings.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExcessEnergyConsumerSettings = void 0;
+class ExcessEnergyConsumerSettings {
+    constructor() {
+        /**
+         * Priority in comparision to other ExcessEnergyConsumer Devices
+         * (-1 = off, 1= lowest, 99 = highest, 100 = Always on)
+         * Devices with same prio try to share as good as possible.
+         */
+        this.priority = -1;
+        this.rampUpOnSpareEnergy = false;
+    }
+}
+exports.ExcessEnergyConsumerSettings = ExcessEnergyConsumerSettings;

package/lib/models/index.d.ts

@@ -1,12 +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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -11,14 +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;
+    drawnKwH: number;
+    injectedKwH: number;
+    selfConsumedKwH: 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.drawnKwH = 0;
+        this.injectedKwH = 0;
+        this.selfConsumedKwH = 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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -13,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/models/rooms/RoomSettings/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/lib/models/rooms/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/lib/models/temperaturSettings.d.ts

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

package/lib/models/temperaturSettings.js

@@ -8,14 +8,25 @@ class TemperaturSettings {
         this.temperatur = temperatur;
         this.active = active;
     }
-    isNowInRange() {
-        const now = new Date().getTime();
-        const todayStart = new Date().setHours(this.start.hour, this.start.minute);
+    isNowInRange(date) {
+        const now = date.getTime();
+        const todayStart = new Date(now).setHours(this.start.hour, this.start.minute);
         if (now < todayStart) {
             return false;
         }
-        const todayEnd = new Date().setHours(this.end.hour, this.end.minute);
+        const todayEnd = new Date(now).setHours(this.end.hour, this.end.minute);
         return now < todayEnd;
     }
+    static getActiveSetting(settings, date) {
+        for (const name of Object.keys(settings)) {
+            if (settings[name] === undefined) {
+                continue;
+            }
+            const setting = settings[name];
+            if (setting.isNowInRange(date)) {
+                return setting;
+            }
+        }
+    }
 }
 exports.TemperaturSettings = TemperaturSettings;

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -12,7 +12,13 @@ export declare class DeviceInfo {
     valueName?: string;
     devConf: deviceConfig;
     allDevicesKey?: string;
-    constructor(pDevConf: deviceConfig);
+    /**
+     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
+     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
+     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
+     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
+     */
+    constructor(pDevConf: deviceConfig, isJsStateChildObject?: boolean);
     set customName(val: string);
     get customName(): string;
     toJSON(): Partial<DeviceInfo>;

package/lib/server/devices/DeviceInfo.js

@@ -6,38 +6,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceInfo = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 class DeviceInfo {
-    constructor(pDevConf) {
+    /**
+     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
+     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
+     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
+     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
+     */
+    constructor(pDevConf, isJsStateChildObject = false) {
         this.devConf = pDevConf;
         this.type = pDevConf.type;
-        this.fullID = pDevConf._id;
-        /**
-         * 0: hm-rpc
-         * 1: rcpInstance
-         * 2: Device ID
-         * 3?: Channel
-         * 4?: ValueName
-         */
         const idSplit = pDevConf._id.split('.');
+        this.fullID = pDevConf._id;
         this.devID = idSplit[2];
-        if (idSplit.length > 3) {
-            this.channel = Number(idSplit[3]);
-        }
-        if (idSplit.length > 4) {
-            this.valueName = idSplit[4];
-        }
         this.fullName = pDevConf.common.name;
-        /**
-         * 0: Indikator own "00"
-         * 1: "HmIP"
-         * 2: Raum
-         * 3: Was für ein Gerät
-         * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
-         * 5?: Name des Wertes
-         */
         const nameSplit = pDevConf.common.name.split('-');
-        this.room = nameSplit[2];
-        this.deviceType = nameSplit[3];
-        this.deviceRoomIndex = Number(nameSplit[4].split(':')[0]);
+        if (!isJsStateChildObject) {
+            /**
+             * 0: hm-rpc
+             * 1: rcpInstance
+             * 2: Device ID
+             * 3?: Channel
+             * 4?: ValueName
+             */
+            if (idSplit.length > 3) {
+                this.channel = Number(idSplit[3]);
+            }
+            if (idSplit.length > 4) {
+                this.valueName = idSplit[4];
+            }
+            /** Name-Split
+             * 0: Indikator own "00"
+             * 1: "HmIP"
+             * 2: Raum
+             * 3: Was für ein Gerät
+             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
+             * 5?: Name des Wertes
+             */
+            this.room = nameSplit[2];
+            this.deviceType = nameSplit[3];
+            this.deviceRoomIndex = Number(nameSplit[4].split(':')[0]);
+            return;
+        }
+        else {
+            /** Name-Split
+             * 0: Indikator own "00"
+             * 1: "EnergyManager"
+             * 2: Raum
+             * 3: Was für ein Gerät
+             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
+             * 5?: Name des Wertes
+             */
+            this.deviceType = nameSplit[1];
+            this.room = nameSplit.length >= 3 ? nameSplit[2] : '';
+            this.deviceRoomIndex = nameSplit.length >= 4 ? Number(nameSplit[3]) : 0;
+        }
     }
     set customName(val) {
         this._customName = val;

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/deviceType.d.ts

@@ -29,5 +29,6 @@ export declare enum DeviceType {
     ZigbeeAqaraMagnetContact = 215,
     ZigbeeSonoffTemp = 216,
     ZigbeeAqaraOpple3Switch = 217,
+    JsEnergyManager = 301,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -33,5 +33,6 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeAqaraMagnetContact"] = 215] = "ZigbeeAqaraMagnetContact";
     DeviceType[DeviceType["ZigbeeSonoffTemp"] = 216] = "ZigbeeSonoffTemp";
     DeviceType[DeviceType["ZigbeeAqaraOpple3Switch"] = 217] = "ZigbeeAqaraOpple3Switch";
+    DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

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

@@ -1,12 +1,15 @@
 import { deviceConfig } from '../../models/deviceConfig';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { iRoomImportEnforcer } from '../../models/rooms/iRoomImportEnforcer';
+import { iEnergyManager } from './iEnergyManager';
 export declare class Devices {
     static IDENTIFIER_HOMEMATIC: string;
+    static IDENTIFIER_JS: string;
     static IDENTIFIER_ZIGBEE: string;
     static alLDevices: {
         [id: string]: IoBrokerBaseDevice;
     };
+    static energymanager?: iEnergyManager;
     constructor(pDeviceData: {
         [id: string]: deviceConfig;
     }, pRoomImportEnforcer?: iRoomImportEnforcer);
@@ -15,4 +18,5 @@ export declare class Devices {
     private processZigbeeDevice;
     private processHMIPDevice;
     static getBatteryInfo(): string;
+    private createEnergyManager;
 }

package/lib/server/devices/devices.js

@@ -35,6 +35,7 @@ const hmIpAccessPoint_1 = require("./hmIPDevices/hmIpAccessPoint");
 const zigbeeAqaraMagnetContact_1 = require("./zigbee/zigbeeAqaraMagnetContact");
 const zigbeeSonoffTemp_1 = require("./zigbee/zigbeeSonoffTemp");
 const zigbeeAqaraOpple3Switch_1 = require("./zigbee/zigbeeAqaraOpple3Switch");
+const jsObjectEnergyManager_1 = require("./jsObject/jsObjectEnergyManager");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -56,6 +57,10 @@ class Devices {
             else if (cName.indexOf('00-Zigbee') === 0) {
                 this.processZigbeeDevice(cDevConf);
             }
+            else if (cName.indexOf('00-EnergyManager') === 0) {
+                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Found Energy-Manager in Device json.`);
+                this.createEnergyManager(cDevConf);
+            }
         }
         hmIpDevice_1.HmIPDevice.checkMissing();
         zigbeeDevice_1.ZigbeeDevice.checkMissing();
@@ -218,8 +223,17 @@ class Devices {
         }
         return result.join('\n');
     }
+    createEnergyManager(cDevConf) {
+        const devInfo = new DeviceInfo_1.DeviceInfo(cDevConf, true);
+        const fullName = `${Devices.IDENTIFIER_JS}-${devInfo.devID}`;
+        devInfo.allDevicesKey = fullName;
+        Devices.energymanager = new jsObjectEnergyManager_1.JsObjectEnergyManager(devInfo);
+        Devices.alLDevices[fullName] = Devices.energymanager;
+    }
 }
 exports.Devices = Devices;
 Devices.IDENTIFIER_HOMEMATIC = 'hm-rpc';
+Devices.IDENTIFIER_JS = 'javascript';
 Devices.IDENTIFIER_ZIGBEE = 'zigbee';
 Devices.alLDevices = {};
+Devices.energymanager = undefined;

package/lib/server/devices/groups/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];