hoffmation-base 2.18.13 → 2.19.0

package/lib/models/rooms/RoomSettings/roomAddDeviceItem.d.ts

@@ -1,9 +1,9 @@
 import { RoomBase } from '../RoomBase';
 export declare class RoomAddDeviceItem {
-    setID: (value: string) => RoomBase;
+    setID: (value: string) => RoomBase | undefined;
     index: number;
     customName: string;
-    constructor(setID: (value: string) => RoomBase, index: number, customName: string);
+    constructor(setID: (value: string) => RoomBase | undefined, index: number, customName: string);
     private _added;
     get added(): boolean;
     set added(value: boolean);

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

@@ -12,9 +12,10 @@ export declare abstract class IoBrokerBaseDevice implements iRoomDevice {
     static roomAddingSettings: {
         [id: string]: RoomDeviceAddingSettings;
     };
-    room: RoomBase | undefined;
+    private _room;
     readonly deviceCapabilities: DeviceCapability[];
     get customName(): string;
+    get room(): RoomBase;
     protected readonly individualStateCallbacks: Map<string, Array<(val: ioBroker.StateValue) => void>>;
     protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -8,11 +8,17 @@ class IoBrokerBaseDevice {
     get customName() {
         return this.info.customName;
     }
+    get room() {
+        if (this._room === undefined) {
+            this._room = services_1.Utils.guard(services_1.API.getRoom(this.info.room));
+        }
+        return this._room;
+    }
     constructor(_info, deviceType) {
         this._info = _info;
         this.deviceType = deviceType;
         this.settings = undefined;
-        this.room = undefined;
+        this._room = undefined;
         this.deviceCapabilities = [];
         this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
@@ -97,7 +103,7 @@ class IoBrokerBaseDevice {
         });
     }
     toJSON() {
-        return services_1.Utils.jsonFilter(this, ['individualStateCallbacks']);
+        return services_1.Utils.jsonFilter(this, ['individualStateCallbacks'], ['_room']);
     }
     persistDeviceInfo() {
         services_1.Utils.guardedTimeout(() => {
@@ -124,7 +130,10 @@ class IoBrokerBaseDevice {
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `AllDevicesKey for Device "${this.info.fullName}"/"${this.info.fullID}" missing.`);
                 return;
             }
-            this.room = deviceSettings.setID(this.info.allDevicesKey);
+            const room = deviceSettings.setID(this.info.allDevicesKey);
+            if (room !== undefined) {
+                this._room = room;
+            }
             deviceSettings.added = true;
             services_1.ServerLogService.addedDeviceToRoom(settings.RoomName, this.deviceType, this.info.deviceRoomIndex);
             return;

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

@@ -108,9 +108,6 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     getBelongingHeizungen() {
-        if (!this.room) {
-            return [];
-        }
         return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
     update(idSplit, state, initial = false) {
@@ -129,7 +126,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -137,8 +134,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         if (!this.settings.automaticMode || this.seasonTurnOff || (heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) === false) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
-        const targetTemp = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
+        const targetTemp = (_d = (_c = this.room.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp) !== null && _d !== void 0 ? _d : 20;
         if (this._desiredTemperature !== targetTemp) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemp}°C`);
             this.desiredTemperature = targetTemp;

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

@@ -70,7 +70,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
             timeout = 3000;
             services_1.Utils.guardedTimeout(() => {
                 var _a;
-                if (this.room && ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
+                if ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) {
                     this.setLight(true, -1, true);
                 }
             }, this.settings.stromStossResendTime * 1000, this);
@@ -83,11 +83,10 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         }
     }
     toggleLight(time, force = false, calculateTime = false) {
-        var _a;
         const newVal = this.queuedLightValue !== null ? !this.queuedLightValue : !this.lightOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        if (newVal && time === undefined && calculateTime) {
+            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
         }
         if (newVal && time !== undefined) {
             this.setTimeBased(time, timeout, force);

package/lib/server/devices/shelly/shellyTrv.js

@@ -122,7 +122,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b;
+        var _a;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -135,7 +135,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this.settings.useOwnTemperatur && !this.settings.controlByPid) {
             this.setExternalTemperatureEnabled(true);
         }
-        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        const heatGroup = this.room.HeatGroup;
         if (heatGroup === undefined) {
             this.log(models_1.LogLevel.Warn, `HeatGroup is undefined for ${this.info.customName}`);
             return;
@@ -148,7 +148,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this.settings.automaticMode) {
             return;
         }
-        const targetTemperature = (_b = heatGroup.desiredTemp) !== null && _b !== void 0 ? _b : 20;
+        const targetTemperature = (_a = heatGroup.desiredTemp) !== null && _a !== void 0 ? _a : 20;
         if (this._desiredTemperatur !== targetTemperature) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
             this.desiredTemperature = targetTemperature;

package/lib/server/devices/wledDevice.js

@@ -102,10 +102,9 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         return this.on;
     }
     toggleLight(time, _force = false, calculateTime = false) {
-        var _a;
         const newVal = !this.lightOn;
-        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        if (newVal && time === undefined && calculateTime) {
+            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
         }
         if (newVal && time !== undefined) {
             this.setTimeBased(time);

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

@@ -151,11 +151,10 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         this._lastPersist = now;
     }
     toggleLight(time, force = false, calculateTime = false) {
-        var _a;
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        if (newVal && time === undefined && calculateTime && this.room) {
+            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
         }
         if (newVal && time !== undefined) {
             this.setTimeBased(time, timeout, force);

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

@@ -91,16 +91,19 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
-        const heatGroupSettings = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings;
-        if (!this.settings.automaticMode || this.seasonTurnOff || (heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) === false) {
+        const heatGroup = this.room.HeatGroup;
+        if (!this.settings.automaticMode || this.seasonTurnOff || ((_a = heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings) === null || _a === void 0 ? void 0 : _a.automaticMode) === false) {
+            return;
+        }
+        if (heatGroup === undefined) {
+            this.log(models_1.LogLevel.Warn, `Heat-Group is undefined for ${this.info.customName}.`);
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
-        const targetTemperature = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
+        const targetTemperature = heatGroup.desiredTemp;
         if (this._desiredTemperatur !== targetTemperature) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
             this.desiredTemperature = targetTemperature;

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

@@ -29,7 +29,7 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
             timeout = 3000;
             services_1.Utils.guardedTimeout(() => {
                 var _a;
-                if (this.room && ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
+                if ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) {
                     this.setLight(true, -1, true);
                 }
             }, this.settings.stromStossResendTime * 1000, this);
@@ -37,11 +37,10 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
         super.setActuator(pValue, timeout, force);
     }
     toggleLight(time, force = false, calculateTime = false) {
-        var _a;
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;
-        if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+        if (newVal && time === undefined && calculateTime) {
+            time = services_1.TimeCallbackService.dayType(this.room.settings.lampOffset);
         }
         if (newVal && time !== undefined) {
             this.setTimeBased(time, timeout, force);

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

@@ -17,7 +17,7 @@ export declare class Utils {
     static guardedInterval(func: (...args: unknown[]) => void, time: number, thisContext?: unknown | undefined, fireImmediate?: boolean): NodeJS.Timeout;
     static nowString(): string;
     static guard<T>(object: T | undefined | null): T & {};
-    static jsonFilter(object: object, additionalOmitKeys?: string[]): Partial<object>;
+    static jsonFilter(object: object, additionalOmitKeys?: string[], topLevelOmmitKeys?: string[]): Partial<object>;
     static testInitializeServices(): void;
     static kWh(wattage: number, durationInMs: number): number;
     static round(number: number, digits: number): number;

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

@@ -79,10 +79,12 @@ class Utils {
         }
         return object;
     }
-    static jsonFilter(object, additionalOmitKeys = []) {
+    static jsonFilter(object, additionalOmitKeys = [], topLevelOmmitKeys = []) {
         const keysToOmit = ['timeout', 'interval', 'timeouts', 'callback', 'otaInfo'];
         keysToOmit.push(...additionalOmitKeys);
-        return this.deepOmit(object, keysToOmit);
+        const loweredOmitKeys = keysToOmit.map((key) => key.toLowerCase());
+        const loweredTopLevelOmitKeys = topLevelOmmitKeys.map((key) => key.toLowerCase());
+        return this.deepOmit(object, loweredOmitKeys, loweredTopLevelOmitKeys);
     }
     static testInitializeServices() {
         log_service_1.ServerLogService.settings.logLevel = -1;
@@ -163,7 +165,7 @@ class Utils {
         const modToCheck = this.positiveMod(degreeToCheck, 360);
         return modMin < modMax ? modToCheck <= modMax && modToCheck >= modMin : modToCheck > modMin || modToCheck < modMax;
     }
-    static deepOmit(obj, keysToOmit, level = 1, currentKey = '') {
+    static deepOmit(obj, keysToOmit, topLevelOmitKeys, level = 1, currentKey = '') {
         if (level > 10 && level < 20) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `DeepOmit Loop Level ${level} reached for ${currentKey}`);
         }
@@ -174,13 +176,16 @@ class Utils {
             }
             if (typeof key == 'string') {
                 const lowerKey = key.toLowerCase();
-                // transform to a new object
                 for (const checkKey of keysToOmit) {
                     // if the key is in the index skip it
-                    if (lowerKey.includes(checkKey.toLowerCase())) {
+                    if (lowerKey.includes(checkKey)) {
                         return;
                     }
                 }
+                // transform to a new object
+                if (level === 1 && topLevelOmitKeys.includes(lowerKey)) {
+                    return;
+                }
                 if (lowerKey.endsWith('map')) {
                     const newKey = lowerKey.replace('map', 'dict');
                     const dict = {};
@@ -191,7 +196,7 @@ class Utils {
                     }
                     for (const mapName of map.keys()) {
                         dict[mapName] = lodash_1.default.isObject(map.get(mapName))
-                            ? this.deepOmit(map.get(mapName), keysToOmit, level + 1, `${currentKey}.${lowerKey}.${mapName}`)
+                            ? this.deepOmit(map.get(mapName), keysToOmit, [], level + 1, `${currentKey}.${lowerKey}.${mapName}`)
                             : map.get(mapName);
                     }
                     result[newKey] = dict;
@@ -203,7 +208,7 @@ class Utils {
                 return;
             }
             // if the key is an object run it through the inner function - omitFromObject
-            result[key] = lodash_1.default.isObject(value) ? this.deepOmit(value, keysToOmit, level + 1, `${currentKey}.${key}`) : value;
+            result[key] = lodash_1.default.isObject(value) ? this.deepOmit(value, keysToOmit, [], level + 1, `${currentKey}.${key}`) : value;
         });
     }
     static nextMatchingDate(hours = 0, minutes = 0, now = new Date()) {