hoffmation-base 0.1.37-2 → 0.1.38-1

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];

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

@@ -5,6 +5,7 @@ export * from './connectionCallbacks';
 export * from './daytime';
 export * from './deviceConfig';
 export * from './dimmerSettings';
+export * from './excessEnergyConsumerSettings';
 export * from './iTemperaturDataPoint';
 export * from './ledSettings';
 export * from './logLevel';

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];
@@ -17,6 +21,7 @@ __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);

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];

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/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/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_JSEnergyManager: 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,9 @@ class Devices {
             else if (cName.indexOf('00-Zigbee') === 0) {
                 this.processZigbeeDevice(cDevConf);
             }
+            else if (cName.indexOf('00-EnergyManager') === 0) {
+                this.createEnergyManager(cDevConf);
+            }
         }
         hmIpDevice_1.HmIPDevice.checkMissing();
         zigbeeDevice_1.ZigbeeDevice.checkMissing();
@@ -218,8 +222,17 @@ class Devices {
         }
         return result.join('\n');
     }
+    createEnergyManager(cDevConf) {
+        const devInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
+        const fullName = `${Devices.IDENTIFIER_JSEnergyManager}-${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_JSEnergyManager = 'jsEnergyManager';
 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];

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

@@ -4,6 +4,7 @@ import { BaseGroup } from './base-group';
 import { ZigbeeMotionSensor } from '../zigbee/zigbeeMotionSensor';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
+    private _lastLeftTimeout;
     getMotionDetector(): Array<HmIpBewegung | ZigbeeMotionSensor>;
     getPresenceSensors(): HmIpPraezenz[];
     constructor(roomName: string, presenceDetectorIds: string[], motionSensorIds: string[]);
@@ -11,6 +12,11 @@ export declare class PraesenzGroup extends BaseGroup {
     presentAmount(): number;
     anyPresent(): boolean;
     lastLeftCB(val: boolean, cb: () => void): void;
+    /**
+     * In case of an existing delayed last left callback timeout, this removes it.
+     * @private
+     */
+    private resetLastLeftTimeout;
     addLastLeftCallback(cb: () => void): void;
     private firstEnterCallback;
     addFirstEnterCallback(cb: () => void): void;

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

@@ -14,6 +14,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
     constructor(roomName, presenceDetectorIds, motionSensorIds) {
         super(roomName, group_type_1.GroupType.Presence);
         this._lastMovement = new Date(0);
+        this._lastLeftTimeout = null;
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.PresenceDetection, new device_list_1.DeviceList(presenceDetectorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
@@ -94,10 +95,8 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         return false;
     }
     lastLeftCB(val, cb) {
-        if (val) {
-            return;
-        }
-        if (this.anyPresent()) {
+        if (val || this.anyPresent()) {
+            this.resetLastLeftTimeout();
             return;
         }
         let timeAfterReset = utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
@@ -107,7 +106,8 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             return;
         }
         this.log(logLevel_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
-        utils_1.Utils.guardedTimeout(() => {
+        this.resetLastLeftTimeout();
+        this._lastLeftTimeout = utils_1.Utils.guardedTimeout(() => {
             timeAfterReset =
                 utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
             this.log(logLevel_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
@@ -116,6 +116,15 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
+    /**
+     * In case of an existing delayed last left callback timeout, this removes it.
+     * @private
+     */
+    resetLastLeftTimeout() {
+        if (this._lastLeftTimeout !== null) {
+            clearTimeout(this._lastLeftTimeout);
+        }
+    }
     addLastLeftCallback(cb) {
         this.getPresenceSensors().forEach((p) => {
             p.addPresenceCallback((val) => {

package/lib/server/devices/hmIPDevices/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/iEnergyManager.d.ts

@@ -0,0 +1,10 @@
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
+export interface iEnergyManager extends IoBrokerBaseDevice {
+    baseConsumption: number;
+    currentProduction: number;
+    excessEnergy: number;
+    excessEnergyConsumerConsumption: number;
+    addExcessConsumer(device: iExcessEnergyConsumer): void;
+    recalculatePowerSharing(): void;
+}

package/lib/server/devices/iEnergyManager.js

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

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

@@ -0,0 +1,6 @@
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+import { ExcessEnergyConsumerSettings } from '../../models/excessEnergyConsumerSettings';
+export interface iExcessEnergyConsumer extends IoBrokerBaseDevice {
+    energyConsumerSettings: ExcessEnergyConsumerSettings;
+    currentConsumption: number;
+}

package/lib/server/devices/iExcessEnergyConsumer.js

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

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

@@ -1,5 +1,6 @@
 export * from './groups/index';
 export * from './hmIPDevices/index';
+export * from './jsObject/index';
 export * from './models/index';
 export * from './zigbee/index';
 export * from './button';
@@ -14,9 +15,11 @@ export * from './Griffe';
 export * from './Heizgruppen';
 export * from './iButtonSwitch';
 export * from './iDeviceUpdater';
+export * from './iEnergyManager';
+export * from './iExcessEnergyConsumer';
 export * from './iHumiditySensor';
-export * from './iIlluminationSensor';
 export * from './iHeater';
+export * from './iIlluminationSensor';
 export * from './iLamp';
 export * from './IoBrokerBaseDevice';
 export * from './iShutter';

package/lib/server/devices/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];
@@ -12,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./groups/index"), exports);
 __exportStar(require("./hmIPDevices/index"), exports);
+__exportStar(require("./jsObject/index"), exports);
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./zigbee/index"), exports);
 __exportStar(require("./button"), exports);
@@ -26,9 +31,11 @@ __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
+__exportStar(require("./iEnergyManager"), exports);
+__exportStar(require("./iExcessEnergyConsumer"), exports);
 __exportStar(require("./iHumiditySensor"), exports);
-__exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./iHeater"), exports);
+__exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./iLamp"), exports);
 __exportStar(require("./IoBrokerBaseDevice"), exports);
 __exportStar(require("./iShutter"), exports);

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

@@ -0,0 +1 @@
+export * from './jsObjectEnergyManager';

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

@@ -0,0 +1,17 @@
+"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("./jsObjectEnergyManager"), exports);

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

@@ -0,0 +1,17 @@
+/// <reference types="iobroker" />
+import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
+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;
+    private _excessEnergyConsumer;
+    constructor(info: DeviceInfo);
+    addExcessConsumer(device: iExcessEnergyConsumer): void;
+    recalculatePowerSharing(): void;
+    update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride?: boolean): void;
+    private setExcessEnergy;
+}

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsObjectEnergyManager = void 0;
+const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
+const deviceType_1 = require("../deviceType");
+const logLevel_1 = require("../../../models/logLevel");
+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._excessEnergyConsumer = [];
+    }
+    addExcessConsumer(device) {
+        this._excessEnergyConsumer.push(device);
+    }
+    recalculatePowerSharing() {
+        // TODO Implement
+    }
+    update(idSplit, state, initial, pOverride = false) {
+        this.log(logLevel_1.LogLevel.DeepTrace, `EnergyManager: ${initial ? 'Initial ' : ''} update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}, override: ${pOverride}`);
+        switch (idSplit[3]) {
+            case 'CurrentExcessEnergy':
+                this.log(logLevel_1.LogLevel.Trace, `Current excess energy update to ${state.val}`);
+                this.setExcessEnergy(state.val);
+                break;
+            case 'CurrentProduction':
+                this.log(logLevel_1.LogLevel.Trace, `Current Production Update to ${state.val}`);
+                this.currentProduction = state.val;
+                break;
+        }
+    }
+    setExcessEnergy(val) {
+        this.excessEnergy = val;
+        this.recalculatePowerSharing();
+    }
+}
+exports.JsObjectEnergyManager = JsObjectEnergyManager;

package/lib/server/devices/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];

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

@@ -41,9 +41,9 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             this.log(logLevel_1.LogLevel.Debug, `Skip actuator command as it is already ${pValue}`);
             return;
         }
-        this.log(logLevel_1.LogLevel.Debug, `Stecker schalten Wert: ${pValue}`);
+        this.log(logLevel_1.LogLevel.Debug, `Switch actuator to: ${pValue}`);
         this.setState(this.actuatorOnSwitchID, pValue, undefined, (err) => {
-            console.log(`Stecker schalten ergab Fehler: ${err}`);
+            this.log(logLevel_1.LogLevel.Error, `Switching actuator resulted in error: ${err}`);
         });
         this.queuedValue = pValue;
         if (this._turnOffTimeout !== undefined) {

package/lib/server/devices/zigbee/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/zigbee/zigbeeBlitzShp.d.ts

@@ -2,14 +2,18 @@
 import { ActuatorSettings } from '../../../models/actuatorSettings';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
-export declare class ZigbeeBlitzShp extends ZigbeeDevice {
+import { ExcessEnergyConsumerSettings } from '../../../models/excessEnergyConsumerSettings';
+import { iExcessEnergyConsumer } from '../iExcessEnergyConsumer';
+export declare class ZigbeeBlitzShp extends ZigbeeDevice implements iExcessEnergyConsumer {
     steckerOn: boolean;
     current: number;
     energy: number;
     loadPower: number;
     settings: ActuatorSettings;
-    private steckerOnSwitchID;
+    energyConsumerSettings: ExcessEnergyConsumerSettings;
+    private readonly steckerOnSwitchID;
     constructor(pInfo: DeviceInfo);
+    get currentConsumption(): number;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setStecker(pValue: boolean): void;
     toggleStecker(): boolean;

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

@@ -5,6 +5,7 @@ const deviceType_1 = require("../deviceType");
 const actuatorSettings_1 = require("../../../models/actuatorSettings");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const logLevel_1 = require("../../../models/logLevel");
+const excessEnergyConsumerSettings_1 = require("../../../models/excessEnergyConsumerSettings");
 class ZigbeeBlitzShp extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
@@ -13,9 +14,13 @@ class ZigbeeBlitzShp extends zigbeeDevice_1.ZigbeeDevice {
         this.energy = 0;
         this.loadPower = 0;
         this.settings = new actuatorSettings_1.ActuatorSettings();
+        this.energyConsumerSettings = new excessEnergyConsumerSettings_1.ExcessEnergyConsumerSettings();
         this.steckerOnSwitchID = '';
         this.steckerOnSwitchID = `${this.info.fullID}.state`;
     }
+    get currentConsumption() {
+        return this.loadPower;
+    }
     update(idSplit, state, initial = false) {
         this.log(logLevel_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);

package/lib/server/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/ioBroker/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/services/Sonos/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/services/Sonos/mp3-server.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/services/Sonos/polly-service.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/services/Telegram/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];