hoffmation-base 3.2.0 → 3.2.1-alpha.0

package/lib/devices/dachs/dachsTemperatureSensor.d.ts

@@ -1,31 +1,18 @@
-import { iRoomBase, iTemperatureCollector } from '../../interfaces';
+import { iTemperatureCollector } from '../../interfaces';
 import { DeviceSettings } from '../../settingsObjects';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
 import { TemperatureSensor } from '../sharedFunctions';
-import { DeviceInfo } from '../DeviceInfo';
-import { OwnSonosDevice } from '../../services';
 import { TemperatureSensorChangeAction } from '../../action';
-export declare class DachsTemperatureSensor implements iTemperatureCollector {
+import { RoomBaseDevice } from '../RoomBaseDevice';
+export declare class DachsTemperatureSensor extends RoomBaseDevice implements iTemperatureCollector {
     /** @inheritDoc */
     settings: DeviceSettings | undefined;
     /** @inheritDoc */
-    readonly deviceType: DeviceType;
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
     temperatureSensor: TemperatureSensor;
-    protected _info: DeviceInfo;
     constructor(roomName: string, shortKey: string, longKey: string);
     /** @inheritDoc */
-    get customName(): string;
-    /** @inheritDoc */
-    get info(): DeviceInfo;
-    /** @inheritDoc */
     get id(): string;
     get name(): string;
     /** @inheritDoc */
-    get room(): iRoomBase | undefined;
-    /** @inheritDoc */
     get roomTemperature(): number;
     /** @inheritDoc */
     set roomTemperature(value: number);
@@ -39,9 +26,7 @@ export declare class DachsTemperatureSensor implements iTemperatureCollector {
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    /** @inheritDoc */
-    toJSON(): Partial<OwnSonosDevice>;
+    toJSON(): Partial<DachsTemperatureSensor>;
     /** @inheritDoc */
     persistDeviceInfo(): void;
     /** @inheritDoc */

package/lib/devices/dachs/dachsTemperatureSensor.js

@@ -10,37 +10,24 @@ const sharedFunctions_1 = require("../sharedFunctions");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const utils_1 = require("../../utils");
-const api_1 = require("../../api");
-const logging_1 = require("../../logging");
 const services_1 = require("../../services");
-class DachsTemperatureSensor {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+class DachsTemperatureSensor extends RoomBaseDevice_1.RoomBaseDevice {
     constructor(roomName, shortKey, longKey) {
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = longKey;
+        info.customName = `${longKey} ${roomName}`;
+        const allDevicesKey = `dachs-${shortKey}-${roomName}`;
+        info.allDevicesKey = allDevicesKey;
+        info.room = roomName;
+        super(info, enums_1.DeviceType.DachsWarmWaterTemperature);
         /** @inheritDoc */
         this.settings = undefined;
         /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.DachsWarmWaterTemperature;
-        /** @inheritDoc */
-        this.deviceCapabilities = [];
-        /** @inheritDoc */
         this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
         this.deviceCapabilities.push(enums_1.DeviceCapability.temperatureSensor);
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = longKey;
-        this._info.customName = `${longKey} ${roomName}`;
-        this._info.allDevicesKey = `dachs-${shortKey}-${roomName}`;
-        this._info.room = roomName;
-        devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
-        this.persistDeviceInfo();
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
-    }
-    /** @inheritDoc */
-    get customName() {
-        return this.info.customName;
-    }
-    /** @inheritDoc */
-    get info() {
-        return this._info;
     }
     /** @inheritDoc */
     get id() {
@@ -51,10 +38,6 @@ class DachsTemperatureSensor {
         return this.info.customName;
     }
     /** @inheritDoc */
-    get room() {
-        return api_1.API.getRoom(this.info.room);
-    }
-    /** @inheritDoc */
     get roomTemperature() {
         return this.temperatureSensor.roomTemperature;
     }
@@ -82,17 +65,8 @@ class DachsTemperatureSensor {
         this.roomTemperature = newTemperatur;
     }
     /** @inheritDoc */
-    log(level, message, debugType = enums_1.LogDebugType.None) {
-        logging_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
-            debugType: debugType,
-            deviceId: this.name,
-            room: this._info.room,
-            deviceName: this.name,
-        });
-    }
-    /** @inheritDoc */
     toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient']));
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(super.toJSON(), ['room', 'client', 'config', '_influxClient']));
     }
     /** @inheritDoc */
     persistDeviceInfo() {

package/lib/devices/espresense/detectedBluetoothDevice.d.ts

@@ -1,22 +1,16 @@
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
+import { LogDebugType, LogLevel } from '../../enums';
 import { iBaseDevice, iBluetoothTrackingSettings } from '../../interfaces';
-import { DeviceInfo } from '../DeviceInfo';
 import { TrackedDistanceData } from './trackedDistanceData';
 import { iBluetoothDetector } from '../../interfaces/baseDevices/iBluetoothDetector';
-export declare class DetectedBluetoothDevice implements iBaseDevice {
-    id: string;
+import { BaseDevice } from '../BaseDevice';
+export declare class DetectedBluetoothDevice extends BaseDevice {
+    trackedDeviceId: string;
     /** @inheritDoc */
     settings: undefined;
     /**
      * A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
      */
     distanceMap: Map<string, TrackedDistanceData>;
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
-    deviceType: DeviceType;
-    /** @inheritDoc */
-    info: DeviceInfo;
     /**
      * The last room the device was guessed to be in {@link iRoomBase.roomName}
      */
@@ -25,7 +19,7 @@ export declare class DetectedBluetoothDevice implements iBaseDevice {
      * If the device is currently present
      */
     present: boolean;
-    constructor(id: string, settings?: iBluetoothTrackingSettings);
+    constructor(trackedDeviceId: string, settings?: iBluetoothTrackingSettings);
     get customName(): string;
     get name(): string;
     updateDistance(tracker: iBluetoothDetector, distance: number): void;

package/lib/devices/espresense/detectedBluetoothDevice.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DetectedBluetoothDevice = void 0;
 const enums_1 = require("../../enums");
-const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const trackedDistanceData_1 = require("./trackedDistanceData");
 const logging_1 = require("../../logging");
@@ -12,21 +11,25 @@ const api_1 = require("../../api");
 const trilaterationPointDistance_1 = require("./trilaterationPointDistance");
 const trilateration_1 = require("./trilateration");
 const settings_service_1 = require("../../settings-service");
-class DetectedBluetoothDevice {
-    constructor(id, settings) {
-        this.id = id;
+const BaseDevice_1 = require("../BaseDevice");
+const DeviceInfo_1 = require("../DeviceInfo");
+class DetectedBluetoothDevice extends BaseDevice_1.BaseDevice {
+    constructor(trackedDeviceId, settings) {
+        if (settings === undefined) {
+            return;
+        }
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.customName = settings.customName;
+        const allDevicesKey = DetectedBluetoothDevice.deviceKeyBySettings(settings);
+        info.allDevicesKey = allDevicesKey;
+        super(info, enums_1.DeviceType.TrackableDevice);
+        this.trackedDeviceId = trackedDeviceId;
         /** @inheritDoc */
         this.settings = undefined;
         /**
          * A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
          */
         this.distanceMap = new Map();
-        /** @inheritDoc */
-        this.deviceCapabilities = [enums_1.DeviceCapability.trackableDevice];
-        /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.TrackableDevice;
-        /** @inheritDoc */
-        this.info = new DeviceInfo_1.DeviceInfo();
         /**
          * The last room the device was guessed to be in {@link iRoomBase.roomName}
          */
@@ -35,13 +38,8 @@ class DetectedBluetoothDevice {
          * If the device is currently present
          */
         this.present = false;
-        if (settings === undefined) {
-            return;
-        }
-        this.info.customName = settings.customName;
-        this.info.allDevicesKey = DetectedBluetoothDevice.deviceKeyBySettings(settings);
         if (settings.activeTracking) {
-            devices_1.Devices.alLDevices[this.info.allDevicesKey] = this;
+            devices_1.Devices.alLDevices[allDevicesKey] = this;
             this.persistDeviceInfo();
             this.loadDeviceSettings();
         }
@@ -51,7 +49,7 @@ class DetectedBluetoothDevice {
     }
     get name() {
         var _a;
-        return (_a = this.info.customName) !== null && _a !== void 0 ? _a : `Unknown ${this.id}`;
+        return (_a = this.info.customName) !== null && _a !== void 0 ? _a : `Unknown ${this.trackedDeviceId}`;
     }
     updateDistance(tracker, distance) {
         var _a;

package/lib/devices/espresense/espresenseDevice.d.ts

@@ -1,17 +1,12 @@
-import { iRoomBase, iRoomDevice, iTrilaterationBasePoint } from '../../interfaces';
+import { iRoomDevice, iTrilaterationBasePoint } from '../../interfaces';
 import { iBluetoothDetector } from '../../interfaces/baseDevices/iBluetoothDetector';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
 import { ProximityCallback } from './proximityCallback';
-import { DeviceInfo } from '../DeviceInfo';
-export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector {
+import { RoomBaseDevice } from '../RoomBaseDevice';
+export declare class EspresenseDevice extends RoomBaseDevice implements iBluetoothDetector {
     /** @inheritDoc */
     readonly position: iTrilaterationBasePoint;
     /** @inheritDoc */
     settings: undefined;
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
-    deviceType: DeviceType;
     /**
      * The name of this device
      */
@@ -28,15 +23,8 @@ export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector
      */
     constructor(name: string, roomName: string, x: number, y: number, z: number);
     /** @inheritDoc */
-    get customName(): string;
-    protected _info: DeviceInfo;
-    /** @inheritDoc */
-    get info(): DeviceInfo;
-    /** @inheritDoc */
     get id(): string;
     /** @inheritDoc */
-    get room(): iRoomBase | undefined;
-    /** @inheritDoc */
     distanceOfDevice(deviceName: string, maxAge?: number): number | undefined;
     /** @inheritDoc */
     isDevicePresent(deviceName: string, maxDistance: number, maxAge?: number): boolean;
@@ -47,12 +35,8 @@ export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector
      */
     update(devName: string, state: ioBroker.State): void;
     /** @inheritDoc */
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    /** @inheritDoc */
     toJSON(): Partial<iRoomDevice>;
     /** @inheritDoc */
-    persistDeviceInfo(): void;
-    /** @inheritDoc */
     loadDeviceSettings(): void;
     /** @inheritDoc */
     addProximityCallback(cb: ProximityCallback): void;

package/lib/devices/espresense/espresenseDevice.js

@@ -8,11 +8,9 @@ const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const espresenseCoordinator_1 = require("./espresenseCoordinator");
 const trilateration_1 = require("./trilateration");
-const services_1 = require("../../services");
-const api_1 = require("../../api");
-const logging_1 = require("../../logging");
 const utils_1 = require("../../utils");
-class EspresenseDevice {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
     /**
      * Creates a new instance of the EspresenseDevice class
      * @param name - The desired name of the device
@@ -22,45 +20,30 @@ class EspresenseDevice {
      * @param z - The z coordinate of the device in the house
      */
     constructor(name, roomName, x, y, z) {
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = `Espresense ${roomName} ${name}`;
+        info.customName = `Espresense ${name}`;
+        info.room = roomName;
+        const allDevicesKey = `espresense-${roomName}-${name}`;
+        info.allDevicesKey = allDevicesKey;
+        super(info, enums_1.DeviceType.Espresense);
         /** @inheritDoc */
         this.settings = undefined;
-        /** @inheritDoc */
-        this.deviceCapabilities = [enums_1.DeviceCapability.bluetoothDetector];
-        /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.Espresense;
         this.deviceMap = new Map();
         this.proximityCallbackMap = new Map();
+        this.deviceCapabilities.push(enums_1.DeviceCapability.bluetoothDetector);
         this.position = new trilaterationBasePoint_1.TrilaterationBasePoint(x, y, z, roomName);
         this.name = name;
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Espresense ${roomName} ${name}`;
-        this._info.customName = `Espresense ${name}`;
-        this._info.room = roomName;
-        this._info.allDevicesKey = `espresense-${roomName}-${name}`;
-        devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
         espresenseCoordinator_1.EspresenseCoordinator.addDevice(this, name);
-        this.persistDeviceInfo();
-        this.loadDeviceSettings();
         trilateration_1.Trilateration.basePoints.push(this.position);
     }
     /** @inheritDoc */
-    get customName() {
-        return this.info.customName;
-    }
-    /** @inheritDoc */
-    get info() {
-        return this._info;
-    }
-    /** @inheritDoc */
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `espresense-${this.info.room}-${this.info.customName}`;
     }
     /** @inheritDoc */
-    get room() {
-        return api_1.API.getRoom(this.info.room);
-    }
-    /** @inheritDoc */
     distanceOfDevice(deviceName, maxAge = 60) {
         var _a;
         for (const dev of this.deviceMap.values()) {
@@ -124,27 +107,10 @@ class EspresenseDevice {
         }
     }
     /** @inheritDoc */
-    log(level, message, debugType = enums_1.LogDebugType.None) {
-        var _a, _b;
-        logging_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
-            debugType: debugType,
-            room: (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
-            deviceId: this.name,
-            deviceName: this.name,
-        });
-    }
-    /** @inheritDoc */
     toJSON() {
         return utils_1.Utils.jsonFilter(this);
     }
     /** @inheritDoc */
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
-    /** @inheritDoc */
     loadDeviceSettings() {
         // Nothing
     }

package/lib/devices/govee/own-govee-device.d.ts

@@ -1,21 +1,17 @@
 import { ActuatorSetStateCommand, ActuatorToggleCommand, ActuatorWriteStateToDeviceCommand, LampSetTimeBasedCommand, LampToggleLightCommand, LedSetLightCommand, RestoreTargetAutomaticValueCommand } from '../../command';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
 import { iLedRgbCct } from '../../interfaces/baseDevices/iLedRgbCct';
-import { GoveeDeviceData, iRoomBase, iTemporaryDisableAutomatic } from '../../interfaces';
-import { DeviceInfo, LedSettings } from '../index';
-import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
-export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAutomatic {
+import { GoveeDeviceData, iTemporaryDisableAutomatic } from '../../interfaces';
+import { BlockAutomaticHandler } from '../../services';
+import { RoomBaseDevice } from '../RoomBaseDevice';
+import { LedSettings } from '../../settingsObjects';
+export declare class OwnGoveeDevice extends RoomBaseDevice implements iLedRgbCct, iTemporaryDisableAutomatic {
     /** @inheritDoc */
     settings: LedSettings;
-    /** @inheritDoc */
-    readonly deviceType: DeviceType;
     /**
      * The id of the device
      */
     readonly deviceId: string;
     /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
     /** @inheritDoc */
     queuedValue: boolean | null;
@@ -23,25 +19,16 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     brightness: number;
     /** @inheritDoc */
     targetAutomaticState: boolean;
-    protected _info: DeviceInfo;
     private _actuatorOn;
     private _color;
     private _colortemp;
-    private _room;
     protected _lastPersist: number;
     constructor(deviceId: string, ownDeviceName: string, roomName: string);
     get color(): string;
     get colortemp(): number;
-    get room(): iRoomBase;
-    get customName(): string;
     get actuatorOn(): boolean;
-    get info(): DeviceInfo;
     get id(): string;
     get name(): string;
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    toJSON(): Partial<OwnGoveeDevice>;
-    persistDeviceInfo(): void;
-    loadDeviceSettings(): void;
     /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;
     /** @inheritDoc */

package/lib/devices/govee/own-govee-device.js

@@ -1,32 +1,27 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnGoveeDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const command_1 = require("../../command");
 const enums_1 = require("../../enums");
-const index_1 = require("../index");
-const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
+const services_1 = require("../../services");
 const utils_1 = require("../../utils");
-const api_1 = require("../../api");
-const logging_1 = require("../../logging");
-const dbo_1 = require("../../services/dbo");
 const govee_service_1 = require("./govee-service");
-class OwnGoveeDevice {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+const settingsObjects_1 = require("../../settingsObjects");
+const DeviceInfo_1 = require("../DeviceInfo");
+const devices_1 = require("../devices");
+const sharedFunctions_1 = require("../sharedFunctions");
+class OwnGoveeDevice extends RoomBaseDevice_1.RoomBaseDevice {
     constructor(deviceId, ownDeviceName, roomName) {
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = `Govee ${roomName} ${ownDeviceName}`;
+        info.customName = `Govee ${ownDeviceName}`;
+        info.room = roomName;
+        const allDevicesKey = `govee-${roomName}-${deviceId}`;
+        info.allDevicesKey = allDevicesKey;
+        super(info, enums_1.DeviceType.GoveeLed);
         /** @inheritDoc */
-        this.settings = new index_1.LedSettings();
-        /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.GoveeLed;
-        /** @inheritDoc */
-        this.deviceCapabilities = [
-            enums_1.DeviceCapability.ledLamp,
-            enums_1.DeviceCapability.lamp,
-            enums_1.DeviceCapability.dimmablelamp,
-            enums_1.DeviceCapability.blockAutomatic,
-        ];
+        this.settings = new settingsObjects_1.LedSettings();
         /** @inheritDoc */
         this.queuedValue = null;
         /** @inheritDoc */
@@ -36,18 +31,17 @@ class OwnGoveeDevice {
         this._actuatorOn = false;
         this._color = '#fcba32';
         this._colortemp = 500;
-        this._room = undefined;
         this._lastPersist = 0;
+        this.jsonOmitKeys.push('device');
         this.deviceId = deviceId;
-        this._info = new index_1.DeviceInfo();
-        this._info.fullName = `Govee ${roomName} ${ownDeviceName}`;
-        this._info.customName = `Govee ${ownDeviceName}`;
-        this._info.room = roomName;
-        this._info.allDevicesKey = `govee-${roomName}-${deviceId}`;
-        index_1.Devices.alLDevices[`govee-${roomName}-${deviceId}`] = this;
-        this.persistDeviceInfo();
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4800, this);
+        this.deviceCapabilities.push(...[
+            enums_1.DeviceCapability.ledLamp,
+            enums_1.DeviceCapability.lamp,
+            enums_1.DeviceCapability.dimmablelamp,
+            enums_1.DeviceCapability.blockAutomatic,
+        ]);
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
+        this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     get color() {
         return this._color;
@@ -55,21 +49,9 @@ class OwnGoveeDevice {
     get colortemp() {
         return this._colortemp;
     }
-    get room() {
-        if (this._room === undefined) {
-            this._room = utils_1.Utils.guard(api_1.API.getRoom(this.info.room));
-        }
-        return this._room;
-    }
-    get customName() {
-        return this.info.customName;
-    }
     get actuatorOn() {
         return this._actuatorOn;
     }
-    get info() {
-        return this._info;
-    }
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `govee-${this.info.room}-${this.info.customName}`;
@@ -77,27 +59,6 @@ class OwnGoveeDevice {
     get name() {
         return this.info.customName;
     }
-    log(level, message, debugType = enums_1.LogDebugType.None) {
-        var _a, _b;
-        logging_1.ServerLogService.writeLog(level, message, {
-            debugType: debugType,
-            room: (_b = (_a = this._room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
-            deviceId: this.name,
-            deviceName: this.name,
-        });
-    }
-    toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'device']));
-    }
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = dbo_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
-    loadDeviceSettings() {
-        this.settings.initializeFromDb(this);
-    }
     /** @inheritDoc */
     setTimeBased(c) {
         this.setLight(this.settings.buildLedSetLightCommand(c));
@@ -115,15 +76,15 @@ class OwnGoveeDevice {
                 this.setColor(c.color);
             }
         }
-        const dontBlock = index_1.LampUtils.checkUnBlock(this, c);
-        if (index_1.LampUtils.checkBlockActive(this, c)) {
+        const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, c);
+        if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
         if (c.isAutomaticAction) {
             // Preserve the target state for the automatic handler, as
             this.targetAutomaticState = c.on;
         }
-        if (index_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
+        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
             return;
         }
         if (c.brightness > -1 && c.on) {
@@ -153,7 +114,7 @@ class OwnGoveeDevice {
         if (this._lastPersist + 1000 > now) {
             return;
         }
-        (_a = dbo_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+        (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
         this._lastPersist = now;
     }
     toggleActuator(c) {
@@ -162,10 +123,10 @@ class OwnGoveeDevice {
         return setActuatorCommand.on;
     }
     toggleLight(c) {
-        return index_1.LampUtils.toggleLight(this, c);
+        return sharedFunctions_1.LampUtils.toggleLight(this, c);
     }
     writeActuatorStateToDevice(c) {
-        this.log(enums_1.LogLevel.Debug, c.logMessage, enums_1.LogDebugType.SetActuator);
+        this.logCommand(c, undefined, enums_1.LogDebugType.SetActuator);
         if (c.stateValue) {
             this.turnOn();
         }

package/lib/devices/groups/heatGroup.js

@@ -130,7 +130,7 @@ class HeatGroup extends base_group_1.BaseGroup {
             });
         });
         this.getOwnAcDevices().forEach((acDev) => {
-            acDev.room = this.getRoom();
+            acDev.initializeRoomCbs();
         });
         (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.addHandleChangeCallback((handleChangeAction) => {
             this.getHeater().forEach((heater) => {

package/lib/devices/groups/lightGroup.js

@@ -52,7 +52,7 @@ class LightGroup extends base_group_1.BaseGroup {
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
-                a.log(enums_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
+                a.logCommand(c, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`, enums_1.LogDebugType.None, enums_1.LogLevel.Info);
                 return;
             }
             a.setActuator(c);

package/lib/devices/hmIPDevices/hmIpLampe.js

@@ -61,7 +61,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         sharedFunctions_1.LampUtils.setActuator(this, c);
     }
     writeActuatorStateToDevice(c) {
-        this.log(enums_1.LogLevel.Debug, c.logMessage, enums_1.LogDebugType.SetActuator);
+        this.logCommand(c, undefined, enums_1.LogDebugType.SetActuator);
         this.setState(this.lightOnSwitchID, c.stateValue, undefined, (err) => {
             this.log(enums_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });

package/lib/devices/hmIPDevices/hmIpRoll.js

@@ -88,7 +88,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
             return;
         }
         if (this.currentLevel === targetLevel && !command.isForceAction) {
-            this.log(enums_1.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one, commandLog: ${command.logMessage}`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.logCommand(command, `Skip Rollo command to Position ${targetLevel} as this is the current one`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
         if (this._setLevelSwitchID === '') {
@@ -98,7 +98,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         if (!this.checkIoConnection(true)) {
             return;
         }
-        this.log(enums_1.LogLevel.Debug, command.logMessage);
+        this.logCommand(command);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(enums_1.WindowPosition.open) > 0 && command.level < 100) {
                 if (!command.skipOpenWarning) {

package/lib/devices/index.d.ts

@@ -31,3 +31,4 @@ export * from './CameraDevice';
 export * from './govee';
 export * from './unifi';
 export * from './victron';
+export { RoomBaseDevice } from './RoomBaseDevice';

package/lib/devices/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.NameAmountValuePair = void 0;
+exports.RoomBaseDevice = exports.NameAmountValuePair = void 0;
 __exportStar(require("../settingsObjects/deviceSettings"), exports);
 __exportStar(require("./blueIris"), exports);
 __exportStar(require("./button"), exports);
@@ -49,3 +49,5 @@ __exportStar(require("./CameraDevice"), exports);
 __exportStar(require("./govee"), exports);
 __exportStar(require("./unifi"), exports);
 __exportStar(require("./victron"), exports);
+var RoomBaseDevice_1 = require("./RoomBaseDevice");
+Object.defineProperty(exports, "RoomBaseDevice", { enumerable: true, get: function () { return RoomBaseDevice_1.RoomBaseDevice; } });