hoffmation-base 2.9.16 → 2.9.18

package/lib/models/objectSettings.d.ts

@@ -2,7 +2,12 @@ import { iIdHolder } from './iIdHolder';
 export declare abstract class ObjectSettings {
     onChangeCb?: () => void;
     persist(holder: iIdHolder): void;
-    initializeFromDb(holder: iIdHolder): void;
+    /**
+     * Loads the settings from the database
+     * @param {iIdHolder} holder The holder of the settings (e.g. a device)
+     * @param {() => void} loadDoneCb Callback when loading is done
+     */
+    initializeFromDb(holder: iIdHolder, loadDoneCb?: () => void): void;
     fromPartialObject(_obj: Partial<ObjectSettings>): void;
     protected toJSON(): Partial<ObjectSettings>;
 }

package/lib/models/objectSettings.js

@@ -12,7 +12,12 @@ class ObjectSettings {
         var _a;
         (_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSettings(holder.id, JSON.stringify(this), holder.customName);
     }
-    initializeFromDb(holder) {
+    /**
+     * Loads the settings from the database
+     * @param {iIdHolder} holder The holder of the settings (e.g. a device)
+     * @param {() => void} loadDoneCb Callback when loading is done
+     */
+    initializeFromDb(holder, loadDoneCb) {
         var _a;
         (_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.loadSettings(holder.id).then((data) => {
             if (!data) {
@@ -33,6 +38,7 @@ class ObjectSettings {
             if (JSON.stringify(this) !== data) {
                 this.persist(holder);
             }
+            loadDoneCb === null || loadDoneCb === void 0 ? void 0 : loadDoneCb();
         });
     }
     fromPartialObject(_obj) {

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

@@ -19,6 +19,7 @@ export declare enum DeviceCapability {
     tv = 17,
     ledLamp = 18,
     smokeSensor = 19,
+    loadMetering = 20,
     bluetoothDetector = 101,
     trackableDevice = 102,
     scene = 103,

package/lib/server/devices/DeviceCapability.js

@@ -23,6 +23,7 @@ var DeviceCapability;
     DeviceCapability[DeviceCapability["tv"] = 17] = "tv";
     DeviceCapability[DeviceCapability["ledLamp"] = 18] = "ledLamp";
     DeviceCapability[DeviceCapability["smokeSensor"] = 19] = "smokeSensor";
+    DeviceCapability[DeviceCapability["loadMetering"] = 20] = "loadMetering";
     DeviceCapability[DeviceCapability["bluetoothDetector"] = 101] = "bluetoothDetector";
     DeviceCapability[DeviceCapability["trackableDevice"] = 102] = "trackableDevice";
     DeviceCapability[DeviceCapability["scene"] = 103] = "scene";

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

@@ -0,0 +1,6 @@
+export interface iLoadMeter {
+    /**
+     * The current load power in Watts
+     */
+    readonly loadPower: number;
+}

package/lib/server/devices/baseDeviceInterfaces/iLoadMeter.js

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

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

@@ -3,7 +3,8 @@ import { ActuatorSettings, ExcessEnergyConsumerSettings } from '../../../models'
 import { ZigbeeActuator } from './BaseDevices';
 import { iExcessEnergyConsumer } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEnergyConsumer {
+import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
+export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEnergyConsumer, iLoadMeter {
     private _steckerOn;
     get steckerOn(): boolean;
     private _current;

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

@@ -29,6 +29,7 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
         this._activatedByExcessEnergy = false;
         this.settings.energySettings = new models_1.ExcessEnergyConsumerSettings();
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.excessEnergyConsumer);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
     }
     get energySettings() {
         return this.settings.energySettings;

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

@@ -2,7 +2,8 @@
 import { ZigbeeActuator } from './BaseDevices';
 import { DeviceType } from '../deviceType';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeUbisysActuator extends ZigbeeActuator {
+import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
+export declare class ZigbeeUbisysActuator extends ZigbeeActuator implements iLoadMeter {
     private _loadPower;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
     get isActuatorOn(): boolean;

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

@@ -4,10 +4,12 @@ exports.ZigbeeUbisysActuator = void 0;
 const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeUbisysActuator extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeUbisysActuator) {
         super(pInfo, deviceType, `${pInfo.fullID}.state`);
         this._loadPower = 0;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
     }
     get isActuatorOn() {
         return this.actuatorOn;