hoffmation-base 3.1.4 → 3.2.1-alpha.0

package/lib/devices/BaseDevice.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseDevice = void 0;
+const enums_1 = require("../enums");
+const utils_1 = require("../utils");
+const logging_1 = require("../logging");
+const services_1 = require("../services");
+class BaseDevice {
+    constructor(_info, deviceType) {
+        this._info = _info;
+        this.deviceType = deviceType;
+        /** @inheritDoc */
+        this.jsonOmitKeys = [];
+        /** @inheritDoc */
+        this.deviceCapabilities = [];
+        /**
+         * @inheritDoc
+         * @default undefined (no Settings)
+         */
+        this.settings = undefined;
+        /**
+         * The last actions this device performed
+         */
+        this.lastCommands = new utils_1.RingStorage(10);
+        this._lastWrite = 0;
+        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
+        this.persistDeviceInfo();
+    }
+    /**
+     * Getter info
+     * @returns The device info
+     */
+    get info() {
+        return this._info;
+    }
+    /** @inheritDoc */
+    get customName() {
+        return this.info.customName;
+    }
+    /** @inheritDoc */
+    get id() {
+        const result = utils_1.Utils.guard(this.info.allDevicesKey);
+        if (result === '0' || result === '1') {
+            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Warn, `Device "${this.info.fullName}" has an akward allDevicesKey of "${result}"`);
+        }
+        return result;
+    }
+    get dbo() {
+        return services_1.Persistence.dbo;
+    }
+    get anyDboActive() {
+        return services_1.Persistence.anyDboActive;
+    }
+    /** @inheritDoc */
+    loadDeviceSettings() {
+        utils_1.Utils.retryAction(() => {
+            var _a;
+            if (this.settings === undefined || services_1.Persistence.dbo === undefined) {
+                return false;
+            }
+            (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
+            return true;
+        }, this);
+    }
+    log(level, message, logDebugType = enums_1.LogDebugType.None) {
+        logging_1.ServerLogService.writeLog(level, message, {
+            room: this.info.room,
+            deviceId: this.id,
+            deviceName: this.info.customName,
+            debugType: logDebugType,
+        });
+    }
+    logCommand(c, ignoreReason, logDebugType, level = enums_1.LogLevel.Info) {
+        if (ignoreReason) {
+            c.ignoreReason = ignoreReason;
+        }
+        this.lastCommands.add(c);
+        this.log(level, c.logMessage, logDebugType);
+    }
+    /** @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 */
+    toJSON() {
+        return utils_1.Utils.jsonFilter(this, this.jsonOmitKeys);
+    }
+}
+exports.BaseDevice = BaseDevice;

package/lib/devices/CameraDevice.d.ts

@@ -1,14 +1,11 @@
-import { iBaseDevice, iCameraDevice, iCameraSettings, iDeviceInfo, iRoomBase, iRoomDevice } from '../interfaces';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../enums';
+import { iBaseDevice, iCameraDevice, iCameraSettings, iRoomDevice } from '../interfaces';
+import { LogDebugType, LogLevel } from '../enums';
 import { MotionSensorAction } from '../action';
 import { DeviceInfo } from './DeviceInfo';
-export declare abstract class CameraDevice implements iCameraDevice {
+import { RoomBaseDevice } from './RoomBaseDevice';
+export declare abstract class CameraDevice extends RoomBaseDevice implements iCameraDevice {
     /** @inheritDoc */
     settings: iCameraSettings;
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
-    deviceType: DeviceType;
     /**
      * The human readable name of this device
      */
@@ -31,13 +28,13 @@ export declare abstract class CameraDevice implements iCameraDevice {
     protected _dogDetected: boolean;
     protected _devicesBlockingAlarmMap: Map<string, iBaseDevice>;
     protected _movementDetected: boolean;
-    protected _info: iDeviceInfo;
     private _personDetectFallbackTimeout;
     private _movementDetectFallbackTimeout;
     private _dogDetectFallbackTimeout;
     protected _lastUpdate: Date;
     get lastUpdate(): Date;
     protected constructor(name: string, roomName: string);
+    toJSON(): Partial<iRoomDevice>;
     /** @inheritDoc */
     get lastImage(): string;
     /** @inheritDoc */
@@ -53,21 +50,15 @@ export declare abstract class CameraDevice implements iCameraDevice {
     /** @inheritDoc */
     get timeSinceLastMotion(): number;
     /** @inheritDoc */
-    get customName(): string;
-    /** @inheritDoc */
     get id(): string;
     /** @inheritDoc */
-    get room(): iRoomBase | undefined;
-    /** @inheritDoc */
     addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /** @inheritDoc */
     blockForDevice(device: iBaseDevice, block: boolean): void;
     /** @inheritDoc */
     persistMotionSensor(): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    toJSON(): Partial<iRoomDevice>;
-    persistDeviceInfo(): void;
-    loadDeviceSettings(): void;
+    private initializeMovementCounter;
     protected onNewMotionDetectedValue(newValue: boolean): void;
     protected onNewPersonDetectedValue(newValue: boolean): void;
     protected onNewImageSnapshot(image: string): void;

package/lib/devices/CameraDevice.js

@@ -13,21 +13,23 @@ const DeviceInfo_1 = require("./DeviceInfo");
 const devices_1 = require("./devices");
 const services_1 = require("../services");
 const utils_1 = require("../utils");
-const api_1 = require("../api");
 const logging_1 = require("../logging");
-class CameraDevice {
+const RoomBaseDevice_1 = require("./RoomBaseDevice");
+class CameraDevice extends RoomBaseDevice_1.RoomBaseDevice {
     get lastUpdate() {
         return this._lastUpdate;
     }
     constructor(name, roomName) {
-        var _a;
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = `Camera ${roomName} ${name}`;
+        info.customName = `Camera ${name}`;
+        info.room = roomName;
+        const allDevicesKey = `camera-${roomName}-${name}`;
+        info.allDevicesKey = allDevicesKey;
+        super(info, enums_1.DeviceType.Camera);
         /** @inheritDoc */
         this.settings = new settingsObjects_1.CameraSettings();
         /** @inheritDoc */
-        this.deviceCapabilities = [enums_1.DeviceCapability.camera, enums_1.DeviceCapability.motionSensor];
-        /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.Camera;
-        /** @inheritDoc */
         this.detectionsToday = 0;
         this._lastMotion = 0;
         this._initialized = false;
@@ -41,29 +43,17 @@ class CameraDevice {
         this._movementDetectFallbackTimeout = null;
         this._dogDetectFallbackTimeout = null;
         this._lastUpdate = new Date(0);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.camera);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.motionSensor);
         this.name = name;
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Camera ${roomName} ${name}`;
-        this._info.customName = `Camera ${name}`;
-        this._info.room = roomName;
-        this._info.allDevicesKey = `camera-${roomName}-${name}`;
-        devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
-        this.persistDeviceInfo();
-        this.loadDeviceSettings();
-        if (!services_1.Persistence.anyDboActive) {
-            this._initialized = true;
-        }
-        else {
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.motionSensorTodayCount(this).then((todayCount) => {
-                var _a;
-                this.detectionsToday = (_a = todayCount.count) !== null && _a !== void 0 ? _a : 0;
-                this.log(enums_1.LogLevel.Debug, `Reinitialized movement counter with ${this.detectionsToday}`);
-                this._initialized = true;
-            }).catch((err) => {
-                var _a;
-                this.log(enums_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
-            });
-        }
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
+        utils_1.Utils.guardedTimeout(this.initializeMovementCounter, 4000, this);
+    }
+    toJSON() {
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(super.toJSON(), [
+            // To reduce Byte-size on cyclic update
+            '_lastImage',
+        ]));
     }
     /** @inheritDoc */
     get lastImage() {
@@ -94,19 +84,11 @@ class CameraDevice {
         return Math.round((utils_1.Utils.nowMS() - this._lastMotion) / 1000);
     }
     /** @inheritDoc */
-    get customName() {
-        return this.info.customName;
-    }
-    /** @inheritDoc */
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `camera-${this.info.room}-${this.info.customName}`;
     }
     /** @inheritDoc */
-    get room() {
-        return api_1.API.getRoom(this.info.room);
-    }
-    /** @inheritDoc */
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);
     }
@@ -134,21 +116,21 @@ class CameraDevice {
             deviceName: this.name,
         });
     }
-    toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, [
-            // To reduce Byte-size on cyclic update
-            '_lastImage',
-        ]));
-    }
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
-    loadDeviceSettings() {
+    initializeMovementCounter() {
         var _a;
-        (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
+        if (!services_1.Persistence.anyDboActive) {
+            this._initialized = true;
+            return;
+        }
+        (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.motionSensorTodayCount(this).then((todayCount) => {
+            var _a;
+            this.detectionsToday = (_a = todayCount.count) !== null && _a !== void 0 ? _a : 0;
+            this.log(enums_1.LogLevel.Debug, `Reinitialized movement counter with ${this.detectionsToday}`);
+            this._initialized = true;
+        }).catch((err) => {
+            var _a;
+            this.log(enums_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+        });
     }
     onNewMotionDetectedValue(newValue) {
         if (this.settings.movementDetectionOnPersonOnly) {

package/lib/devices/IoBrokerBaseDevice.d.ts

@@ -1,49 +1,26 @@
-import { iIoBrokerBaseDevice, iIOBrokerConnection, iJsonOmitKeys, iPersist, iRoomBase, iRoomDeviceAddingSettings } from '../interfaces';
-import { DeviceSettings } from '../settingsObjects';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../enums';
+import { iIoBrokerBaseDevice, iIOBrokerConnection, iIoBrokerDeviceInfo, iJsonOmitKeys, iRoomDeviceAddingSettings } from '../interfaces';
+import { DeviceType } from '../enums';
 import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
-export declare abstract class IoBrokerBaseDevice implements iJsonOmitKeys, iIoBrokerBaseDevice {
-    protected _info: IoBrokerDeviceInfo;
-    deviceType: DeviceType;
-    /** @inheritDoc */
-    readonly jsonOmitKeys: string[];
+import { RoomBaseDevice } from './RoomBaseDevice';
+export declare abstract class IoBrokerBaseDevice extends RoomBaseDevice implements iJsonOmitKeys, iIoBrokerBaseDevice {
     /**
      * The settings for adding devices to Rooms
      */
     static roomAddingSettings: {
         [id: string]: iRoomDeviceAddingSettings;
     };
-    /**
-     * @inheritDoc
-     * @default undefined (no Settings)
-     */
-    settings: DeviceSettings | undefined;
-    private _room;
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
     protected _debounceStateDelay: number;
-    protected _lastWrite: number;
     protected stateMap: Map<string, ioBroker.State>;
-    /** @inheritDoc */
-    get room(): iRoomBase;
-    protected get dbo(): iPersist | undefined;
-    /** @inheritDoc */
-    get customName(): string;
-    protected get anyDboActive(): boolean;
     protected readonly individualStateCallbacks: Map<string, Array<(val: ioBroker.StateValue) => void>>;
-    protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
-    /** @inheritDoc */
-    get id(): string;
+    protected constructor(info: IoBrokerDeviceInfo, deviceType: DeviceType);
     /**
      * Getter info
      * @returns The device info
      */
-    get info(): IoBrokerDeviceInfo;
+    get info(): iIoBrokerDeviceInfo;
     get ioConn(): iIOBrokerConnection | undefined;
     static addRoom(shortName: string, settings: iRoomDeviceAddingSettings): void;
     static checkMissing(): void;
-    /** @inheritDoc */
-    loadDeviceSettings(): void;
     /**
      * Allows to react on the state change of a given state with the passed cb
      * @param stateName - Last part of the id e.g. "available" not "zigbee.0.00158d00053d3e4b.available"
@@ -64,11 +41,6 @@ export declare abstract class IoBrokerBaseDevice implements iJsonOmitKeys, iIoBr
      * @param {boolean} pOverride - Whether the child class did override this method
      */
     abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
-    log(level: LogLevel, message: string, logDebugType?: LogDebugType): void;
-    /** @inheritDoc */
-    toJSON(): Partial<IoBrokerBaseDevice>;
-    /** @inheritDoc */
-    persistDeviceInfo(): void;
     addToCorrectRoom(): void;
     /**
      * Sets the state of a given data point and returns true if that was successful.

package/lib/devices/IoBrokerBaseDevice.js

@@ -1,59 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IoBrokerBaseDevice = void 0;
-const services_1 = require("../services");
 const enums_1 = require("../enums");
 const utils_1 = require("../utils");
-const api_1 = require("../api");
 const logging_1 = require("../logging");
 const ioBroker_1 = require("../ioBroker");
-class IoBrokerBaseDevice {
-    /** @inheritDoc */
-    get room() {
-        if (this._room === undefined) {
-            this._room = utils_1.Utils.guard(api_1.API.getRoom(this.info.room));
-        }
-        return this._room;
-    }
-    get dbo() {
-        return services_1.Persistence.dbo;
-    }
-    /** @inheritDoc */
-    get customName() {
-        return this.info.customName;
-    }
-    get anyDboActive() {
-        return services_1.Persistence.anyDboActive;
-    }
-    constructor(_info, deviceType) {
-        this._info = _info;
-        this.deviceType = deviceType;
-        /** @inheritDoc */
-        this.jsonOmitKeys = ['individualStateCallbacks'];
-        /**
-         * @inheritDoc
-         * @default undefined (no Settings)
-         */
-        this.settings = undefined;
-        this._room = undefined;
-        /** @inheritDoc */
-        this.deviceCapabilities = [];
+const RoomBaseDevice_1 = require("./RoomBaseDevice");
+class IoBrokerBaseDevice extends RoomBaseDevice_1.RoomBaseDevice {
+    constructor(info, deviceType) {
+        super(info, deviceType);
         // If configured > 0, this indicates the minimum time between state writes in ms
         this._debounceStateDelay = 0;
-        this._lastWrite = 0;
         this.stateMap = new Map();
         this.individualStateCallbacks = new Map();
+        this.jsonOmitKeys.push('individualStateCallbacks');
         this.addToCorrectRoom();
-        this.persistDeviceInfo();
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 300, this);
-    }
-    /** @inheritDoc */
-    get id() {
-        const result = utils_1.Utils.guard(this.info.allDevicesKey);
-        if (result === '0' || result === '1') {
-            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Warn, `Device "${this.info.fullName}" has an akward allDevicesKey of "${result}"`);
-        }
-        return result;
     }
     /**
      * Getter info
@@ -77,11 +38,6 @@ class IoBrokerBaseDevice {
             this.roomAddingSettings[rName].checkMissing();
         }
     }
-    /** @inheritDoc */
-    loadDeviceSettings() {
-        var _a;
-        (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
-    }
     /**
      * Allows to react on the state change of a given state with the passed cb
      * @param stateName - Last part of the id e.g. "available" not "zigbee.0.00158d00053d3e4b.available"
@@ -108,25 +64,6 @@ class IoBrokerBaseDevice {
         }
         return this.ioConn !== undefined;
     }
-    log(level, message, logDebugType = enums_1.LogDebugType.None) {
-        logging_1.ServerLogService.writeLog(level, message, {
-            room: this.info.room,
-            deviceId: this.id,
-            deviceName: this.info.customName,
-            debugType: logDebugType,
-        });
-    }
-    /** @inheritDoc */
-    toJSON() {
-        return utils_1.Utils.jsonFilter(this, this.jsonOmitKeys, ['_room']);
-    }
-    /** @inheritDoc */
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
     addToCorrectRoom() {
         const settings = IoBrokerBaseDevice.roomAddingSettings[this.info.room];
         if (settings !== undefined) {

package/lib/devices/RoomBaseDevice.d.ts

@@ -0,0 +1,9 @@
+import { iDeviceInfo, iRoomBase, iRoomDevice } from '../interfaces';
+import { DeviceType } from '../enums';
+import { BaseDevice } from './BaseDevice';
+export declare abstract class RoomBaseDevice extends BaseDevice implements iRoomDevice {
+    protected _room: iRoomBase | undefined;
+    protected constructor(info: iDeviceInfo, type: DeviceType);
+    /** @inheritDoc */
+    get room(): iRoomBase;
+}

package/lib/devices/RoomBaseDevice.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RoomBaseDevice = void 0;
+const utils_1 = require("../utils");
+const api_1 = require("../api");
+const BaseDevice_1 = require("./BaseDevice");
+class RoomBaseDevice extends BaseDevice_1.BaseDevice {
+    constructor(info, type) {
+        super(info, type);
+        this._room = undefined;
+        this.jsonOmitKeys.push('_room');
+    }
+    /** @inheritDoc */
+    get room() {
+        if (this._room === undefined) {
+            this._room = utils_1.Utils.guard(api_1.API.getRoom(this.info.room));
+        }
+        return this._room;
+    }
+}
+exports.RoomBaseDevice = RoomBaseDevice;

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

@@ -1,17 +1,15 @@
-import { iActuator, iBaseDevice, iDachsDeviceSettings, iDachsSettings, iRoomBase } from '../../interfaces';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
+import { iActuator, iBaseDevice, iDachsDeviceSettings, iDachsSettings } from '../../interfaces';
+import { DeviceCapability } from '../../enums';
 import { DachsTemperatureSensor } from './dachsTemperatureSensor';
-import { DeviceInfo } from '../DeviceInfo';
 import { ActuatorSetStateCommand, ActuatorToggleCommand, ActuatorWriteStateToDeviceCommand, RestoreTargetAutomaticValueCommand } from '../../command';
 import { BlockAutomaticHandler } from '../../services';
-export declare class Dachs implements iBaseDevice, iActuator {
+import { RoomBaseDevice } from '../RoomBaseDevice';
+export declare class Dachs extends RoomBaseDevice implements iBaseDevice, iActuator {
     /** @inheritDoc */
     settings: iDachsDeviceSettings;
     /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
     /** @inheritDoc */
-    readonly deviceType: DeviceType;
-    /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
     /**
      * A reference to the Temperature measuring warm water temperature
@@ -54,24 +52,13 @@ export declare class Dachs implements iBaseDevice, iActuator {
     get actuatorOn(): boolean;
     constructor(options: iDachsSettings);
     /** @inheritDoc */
-    get info(): DeviceInfo;
-    protected _info: DeviceInfo;
-    /** @inheritDoc */
     get id(): string;
-    /** @inheritDoc */
-    get room(): iRoomBase | undefined;
     get name(): string;
     /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     /** @inheritDoc */
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    /** @inheritDoc */
     toJSON(): Partial<Dachs>;
     /** @inheritDoc */
-    persistDeviceInfo(): void;
-    /** @inheritDoc */
-    loadDeviceSettings(): void;
-    /** @inheritDoc */
     persist(): void;
     private loadData;
     /** @inheritDoc */

package/lib/devices/dachs/dachs.js

@@ -13,14 +13,13 @@ const lib_1 = require("./lib");
 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 sharedFunctions_1 = require("../sharedFunctions");
 const sun_time_offsets_1 = require("../../models/sun-time-offsets");
 const command_1 = require("../../command");
 const services_1 = require("../../services");
 const settings_service_1 = require("../../settings-service");
-class Dachs {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
     /** @inheritDoc */
     get customName() {
         return this.info.customName;
@@ -31,11 +30,16 @@ class Dachs {
     }
     constructor(options) {
         var _a, _b;
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = 'Dachs';
+        info.customName = `Dachs ${options.roomName}`;
+        const allDevicesKey = `dachs-${options.roomName}`;
+        info.allDevicesKey = allDevicesKey;
+        info.room = options.roomName;
+        super(info, enums_1.DeviceType.Dachs);
         /** @inheritDoc */
         this.settings = new settingsObjects_1.DachsDeviceSettings();
         /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.Dachs;
-        /** @inheritDoc */
         this.deviceCapabilities = [];
         /** @inheritDoc */
         this.queuedValue = null;
@@ -44,18 +48,11 @@ class Dachs {
         this._dachsOn = false;
         this._tempWarmWater = 0;
         this._tempHeatStorage = 0;
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
         this.deviceCapabilities.push(enums_1.DeviceCapability.actuator);
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = 'Dachs';
-        this._info.customName = `Dachs ${options.roomName}`;
-        this._info.allDevicesKey = `dachs-${options.roomName}`;
-        this._info.room = options.roomName;
-        devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         if (options.influxDb) {
             this._influxClient = new lib_1.DachsInfluxClient(options.influxDb);
         }
-        this.persistDeviceInfo();
-        this.loadDeviceSettings();
         const modifiedOptions = lodash_1.default.cloneDeep(options);
         modifiedOptions.connectionOptions.resultConfig = {
             flatten: true,
@@ -74,18 +71,10 @@ class Dachs {
         this.heatStorageTempSensor.addTempChangeCallback(this.onHeatStorageTempChange.bind(this));
     }
     /** @inheritDoc */
-    get info() {
-        return this._info;
-    }
-    /** @inheritDoc */
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
     }
-    /** @inheritDoc */
-    get room() {
-        return api_1.API.getRoom(this.info.room);
-    }
     get name() {
         return this.info.customName;
     }
@@ -95,17 +84,8 @@ class Dachs {
         this.setActuator(new command_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore Target Automatic value'));
     }
     /** @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, [
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(super.toJSON(), [
             'room',
             'client',
             'config',
@@ -119,17 +99,6 @@ class Dachs {
         ]));
     }
     /** @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() {
-        this.settings.initializeFromDb(this);
-    }
-    /** @inheritDoc */
     persist() {
         var _a;
         (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
@@ -190,7 +159,7 @@ class Dachs {
     }
     /** @inheritDoc */
     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) {
             return;
         }