hoffmation-base 3.2.0 → 3.2.1-alpha.1

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; } });

package/lib/devices/scene/room-scene.d.ts

@@ -1,34 +1,21 @@
 import { iRoomBase, iScene } from '../../interfaces';
 import { SceneSettings } from '../../settingsObjects';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
-import { DeviceInfo } from '../DeviceInfo';
-import { TvDevice } from '../tv';
-export declare class RoomScene implements iScene {
+import { RoomBaseDevice } from '../RoomBaseDevice';
+export declare class RoomScene extends RoomBaseDevice implements iScene {
     /** @inheritDoc */
     description: string;
     /** @inheritDoc */
-    room: iRoomBase | undefined;
-    /** @inheritDoc */
     settings: SceneSettings;
-    protected _deviceType: DeviceType;
-    protected _info: DeviceInfo;
     private readonly _onSceneStart;
     private readonly _onSceneEnd;
     private _automaticEndTimeout;
-    private _deviceCapabilities;
     private _on;
     constructor(name: string, room: iRoomBase, onSceneStart: () => void, onSceneEnd: () => void, turnOffTimeout?: number);
     /** @inheritDoc */
     get customName(): string;
     /** @inheritDoc */
-    get deviceType(): DeviceType;
-    /** @inheritDoc */
-    get info(): DeviceInfo;
-    /** @inheritDoc */
     get automaticEndTimeout(): NodeJS.Timeout | null;
     /** @inheritDoc */
-    get deviceCapabilities(): DeviceCapability[];
-    /** @inheritDoc */
     get on(): boolean;
     get name(): string;
     /** @inheritDoc */
@@ -41,12 +28,4 @@ export declare class RoomScene implements iScene {
     startScene(timeout?: number | undefined): void;
     /** @inheritDoc */
     endScene(): void;
-    /** @inheritDoc */
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    /** @inheritDoc */
-    persistDeviceInfo(): void;
-    /** @inheritDoc */
-    loadDeviceSettings(): void;
-    /** @inheritDoc */
-    toJSON(): Partial<TvDevice>;
 }

package/lib/devices/scene/room-scene.js

@@ -1,61 +1,43 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomScene = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const services_1 = require("../../services");
 const settingsObjects_1 = require("../../settingsObjects");
 const enums_1 = require("../../enums");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const utils_1 = require("../../utils");
-const logging_1 = require("../../logging");
-class RoomScene {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+class RoomScene extends RoomBaseDevice_1.RoomBaseDevice {
     constructor(name, room, onSceneStart, onSceneEnd, turnOffTimeout) {
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = `Scene ${name}`;
+        info.customName = `${room.roomName} ${name}`;
+        info.room = room.roomName;
+        const allDevicesKey = `scene-${room.roomName}-${name}`;
+        info.allDevicesKey = allDevicesKey;
+        super(info, enums_1.DeviceType.RoomScene);
         /** @inheritDoc */
         this.description = '';
         /** @inheritDoc */
         this.settings = new settingsObjects_1.SceneSettings();
         this._automaticEndTimeout = null;
-        this._deviceCapabilities = [enums_1.DeviceCapability.scene];
         this._on = false;
+        this.jsonOmitKeys.push(...['_onSceneStart', '_onSceneEnd']);
+        this.deviceCapabilities.push(enums_1.DeviceCapability.scene);
+        devices_1.Devices.alLDevices[allDevicesKey] = this;
         this._onSceneStart = onSceneStart;
         this._onSceneEnd = onSceneEnd;
-        this.room = room;
         this.settings.defaultTurnOffTimeout = turnOffTimeout;
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Scene ${name}`;
-        this._info.customName = `${room.roomName} ${name}`;
-        this._info.room = room.roomName;
-        this._info.allDevicesKey = `scene-${room.roomName}-${name}`;
-        this._deviceType = enums_1.DeviceType.RoomScene;
-        devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
-        this.persistDeviceInfo();
-        this.loadDeviceSettings();
     }
     /** @inheritDoc */
     get customName() {
         return this.info.customName;
     }
     /** @inheritDoc */
-    get deviceType() {
-        return this._deviceType;
-    }
-    /** @inheritDoc */
-    get info() {
-        return this._info;
-    }
-    /** @inheritDoc */
     get automaticEndTimeout() {
         return this._automaticEndTimeout;
     }
     /** @inheritDoc */
-    get deviceCapabilities() {
-        return this._deviceCapabilities;
-    }
-    /** @inheritDoc */
     get on() {
         return this._on;
     }
@@ -105,32 +87,5 @@ class RoomScene {
         this._on = false;
         this._onSceneEnd();
     }
-    /** @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 */
-    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 */
-    toJSON() {
-        // eslint-disable-next-line
-        const result = lodash_1.default.omit(this, ['room', '_onSceneStart', '_onSceneEnd']);
-        return utils_1.Utils.jsonFilter(result);
-    }
 }
 exports.RoomScene = RoomScene;

package/lib/devices/sharedFunctions/lampUtils.js

@@ -61,7 +61,7 @@ class LampUtils {
     }
     static checkBlockActive(device, c) {
         if (!c.isForceAction && device.blockAutomationHandler.automaticBlockActive) {
-            device.log(enums_1.LogLevel.Debug, `Skip command to ${c.on} as it is locked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString('de-DE')}; command Log: ${c.logMessage}`);
+            device.logCommand(c, `Skip command to ${c.on} as it is locked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString('de-DE')}`);
             device.targetAutomaticState = c.on;
             return true;
         }
@@ -95,7 +95,7 @@ class LampUtils {
             return false;
         }
         if (!noLog) {
-            device.log(enums_1.LogLevel.DeepTrace, `Light command can be skipped as device is already in desired state; command: ${c.logMessage}`, enums_1.LogDebugType.SkipUnchangedActuatorCommand);
+            device.logCommand(c, `Light command can be skipped as device is already in desired state`, enums_1.LogDebugType.SkipUnchangedActuatorCommand);
         }
         return true;
     }
@@ -103,7 +103,7 @@ class LampUtils {
         if (device.settings.isStromStoss &&
             c.on &&
             c.containsType(enums_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand)) {
-            // Don't restore automatic state on Strommstoss-Relais as this might result in a loop.
+            device.logCommand(c, "Don't restore automatic state on Strommstoss-Relais as this might result in a loop.");
             return;
         }
         const dontBlock = LampUtils.checkUnBlock(device, c);
@@ -115,6 +115,7 @@ class LampUtils {
             device.targetAutomaticState = c.on;
         }
         if (LampUtils.canActuatorChangeBeSkipped(device, c)) {
+            device.logCommand(c, 'Actuator change can be skipped');
             return;
         }
         device.queuedValue = c.on;

package/lib/devices/shelly/shellyActuator.js

@@ -75,7 +75,7 @@ class ShellyActuator extends shellyDevice_1.ShellyDevice {
     }
     /** @inheritDoc */
     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._actuatorOnStateId, c.stateValue, undefined, (err) => {
             this.log(enums_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });

package/lib/devices/tv/tvDevice.d.ts

@@ -1,37 +1,25 @@
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel, TvDeviceType } from '../../enums';
+import { DeviceCapability, DeviceType, TvDeviceType } from '../../enums';
 import { iTvDevice } from '../../interfaces';
 import { TvSettings } from '../../settingsObjects';
-import { RoomBase } from '../../services';
-import { DeviceInfo } from '../DeviceInfo';
-export declare abstract class TvDevice implements iTvDevice {
+import { RoomBaseDevice } from '../RoomBaseDevice';
+export declare abstract class TvDevice extends RoomBaseDevice implements iTvDevice {
     ip: string;
     tvDeviceType: TvDeviceType;
     /** @inheritDoc */
     settings: TvSettings;
-    /**
-     * @inheritDoc
-     */
-    room: RoomBase | undefined;
     /**
      * @inheritDoc
      */
     deviceCapabilities: DeviceCapability[];
-    protected constructor(name: string, roomName: string, ip: string, tvDeviceType: TvDeviceType);
-    protected _info: DeviceInfo;
-    get info(): DeviceInfo;
-    abstract get deviceType(): DeviceType;
+    protected constructor(name: string, roomName: string, ip: string, tvDeviceType: TvDeviceType, deviceType: DeviceType);
     get name(): string;
     get id(): string;
-    get customName(): string;
     abstract get on(): boolean;
     abstract volumeDown(): void;
     abstract volumeUp(): void;
     abstract turnOn(): void;
     abstract turnOff(): void;
     turnOffDueToMissingEnergy(): void;
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     automaticCheck(): void;
-    persistDeviceInfo(): void;
-    loadDeviceSettings(): void;
     toJSON(): Partial<TvDevice>;
 }

package/lib/devices/tv/tvDevice.js

@@ -7,12 +7,18 @@ exports.TvDevice = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const enums_1 = require("../../enums");
 const settingsObjects_1 = require("../../settingsObjects");
-const services_1 = require("../../services");
 const DeviceInfo_1 = require("../DeviceInfo");
 const utils_1 = require("../../utils");
-const logging_1 = require("../../logging");
-class TvDevice {
-    constructor(name, roomName, ip, tvDeviceType) {
+const RoomBaseDevice_1 = require("../RoomBaseDevice");
+class TvDevice extends RoomBaseDevice_1.RoomBaseDevice {
+    constructor(name, roomName, ip, tvDeviceType, deviceType) {
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = `TV ${name}`;
+        info.customName = `${roomName} ${name}`;
+        info.room = roomName;
+        const allDevicesKey = `tv-${roomName}-${name}`;
+        info.allDevicesKey = allDevicesKey;
+        super(info, deviceType);
         this.ip = ip;
         this.tvDeviceType = tvDeviceType;
         /** @inheritDoc */
@@ -21,17 +27,8 @@ class TvDevice {
          * @inheritDoc
          */
         this.deviceCapabilities = [enums_1.DeviceCapability.tv];
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `TV ${name}`;
-        this._info.customName = `${roomName} ${name}`;
-        this._info.room = roomName;
-        this._info.allDevicesKey = `tv-${roomName}-${name}`;
+        this.deviceCapabilities.push(enums_1.DeviceCapability.tv);
         utils_1.Utils.guardedInterval(this.automaticCheck, 60000, this, false);
-        this.persistDeviceInfo();
-        this.loadDeviceSettings();
-    }
-    get info() {
-        return this._info;
     }
     get name() {
         return this.info.customName;
@@ -40,36 +37,15 @@ class TvDevice {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
     }
-    get customName() {
-        return this.info.customName;
-    }
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
-    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,
-        });
-    }
     automaticCheck() {
         // TODO: Implement automatic turn off
     }
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
-    loadDeviceSettings() {
-        this.settings.initializeFromDb(this);
-    }
     toJSON() {
         // eslint-disable-next-line
-        const result = lodash_1.default.omit(this, ['room']);
+        const result = lodash_1.default.omit(super.toJSON(), ['room']);
         result['on'] = this.on;
         return utils_1.Utils.jsonFilter(result);
     }

package/lib/devices/velux/veluxShutter.js

@@ -83,7 +83,7 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         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/victron/victron-device.d.ts

@@ -1,21 +1,13 @@
 import { iBatteryDevice, iEnergyManager, iExcessEnergyConsumer, iJsonOmitKeys } from '../../interfaces';
-import { DeviceCapability, DeviceType, LogDebugType, LogLevel } from '../../enums';
 import { VictronDeviceSettings } from '../../settingsObjects';
 import { Battery } from '../sharedFunctions';
-import { DeviceInfo } from '../DeviceInfo';
 import { VictronDeviceData, VictronMqttConnectionOptions, VictronMqttConsumer } from 'victron-mqtt-consumer';
-export declare class VictronDevice implements iEnergyManager, iBatteryDevice, iJsonOmitKeys {
-    /** @inheritDoc */
-    readonly jsonOmitKeys: string[];
-    /** @inheritDoc */
-    readonly deviceCapabilities: DeviceCapability[];
-    /** @inheritDoc */
-    deviceType: DeviceType;
+import { BaseDevice } from '../BaseDevice';
+export declare class VictronDevice extends BaseDevice implements iEnergyManager, iBatteryDevice, iJsonOmitKeys {
     /** @inheritDoc */
     readonly settings: VictronDeviceSettings;
     /** @inheritDoc */
     readonly battery: Battery;
-    protected _info: DeviceInfo;
     private readonly _victronConsumer;
     private _excessEnergyConsumer;
     private blockDeviceChangeTime;
@@ -28,14 +20,12 @@ export declare class VictronDevice implements iEnergyManager, iBatteryDevice, iJ
     constructor(opts: VictronMqttConnectionOptions);
     /** @inheritDoc */
     get acBlocked(): boolean;
-    get info(): DeviceInfo;
     /** @inheritDoc */
     get batteryLevel(): number;
     get victronConsumer(): VictronMqttConsumer;
     get data(): VictronDeviceData;
     get excessEnergy(): number;
     get name(): string;
-    get customName(): string;
     get id(): string;
     get injectingWattage(): number;
     get drawingWattage(): number;
@@ -45,9 +35,6 @@ export declare class VictronDevice implements iEnergyManager, iBatteryDevice, iJ
     dispose(): void;
     getReport(): string;
     recalculatePowerSharing(): void;
-    loadDeviceSettings(): void;
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    persistDeviceInfo(): void;
     toJSON(): Partial<VictronDevice>;
     /**
      * Changes the grid set point of the Victron device, to the desired value.

package/lib/devices/victron/victron-device.js

@@ -9,20 +9,15 @@ const victron_mqtt_consumer_1 = require("victron-mqtt-consumer");
 const utils_1 = require("../../utils");
 const models_1 = require("../../models");
 const devices_1 = require("../devices");
-const logging_1 = require("../../logging");
 const services_1 = require("../../services");
-const sun_time_offsets_1 = require("../../models/sun-time-offsets");
-class VictronDevice {
+const BaseDevice_1 = require("../BaseDevice");
+class VictronDevice extends BaseDevice_1.BaseDevice {
     constructor(opts) {
-        /** @inheritDoc */
-        this.jsonOmitKeys = ['_victronConsumer', '_excessEnergyConsumer'];
-        /** @inheritDoc */
-        this.deviceCapabilities = [
-            enums_1.DeviceCapability.energyManager,
-            enums_1.DeviceCapability.batteryDriven,
-        ];
-        /** @inheritDoc */
-        this.deviceType = enums_1.DeviceType.Victron;
+        const info = new DeviceInfo_1.DeviceInfo();
+        info.fullName = 'Victron Device';
+        info.customName = 'Victron';
+        info.allDevicesKey = 'victron';
+        super(info, enums_1.DeviceType.Victron);
         /** @inheritDoc */
         this.battery = new sharedFunctions_1.Battery(this);
         this._excessEnergyConsumer = [];
@@ -32,14 +27,10 @@ class VictronDevice {
         this._lastPersistenceCalculation = utils_1.Utils.nowMS();
         this._excessEnergy = 0;
         this.settings = new settingsObjects_1.VictronDeviceSettings();
-        this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = 'Victron Device';
-        this._info.customName = 'Victron';
-        this._info.allDevicesKey = 'victron';
+        this.deviceCapabilities.push(...[enums_1.DeviceCapability.energyManager, enums_1.DeviceCapability.batteryDriven]);
+        this.jsonOmitKeys.push(...['_victronConsumer', '_excessEnergyConsumer']);
         devices_1.Devices.alLDevices['victron'] = this;
         devices_1.Devices.energymanager = this;
-        this.persistDeviceInfo();
-        utils_1.Utils.guardedTimeout(this.loadDeviceSettings, 4500, this);
         this._victronConsumer = new victron_mqtt_consumer_1.VictronMqttConsumer(opts);
         this._iCalculationInterval = utils_1.Utils.guardedInterval(() => {
             if (this.data.battery.soc) {
@@ -66,9 +57,6 @@ class VictronDevice {
         }
         return false;
     }
-    get info() {
-        return this._info;
-    }
     /** @inheritDoc */
     get batteryLevel() {
         const level = this.data.battery.soc;
@@ -90,9 +78,6 @@ class VictronDevice {
     get name() {
         return this.info.customName;
     }
-    get customName() {
-        return this.info.customName;
-    }
     get id() {
         var _a;
         return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `victron-${this.info.room}-${this.info.customName}`;
@@ -140,23 +125,6 @@ class VictronDevice {
             this.turnOffAdditionalConsumer();
         }
     }
-    loadDeviceSettings() {
-        this.settings.initializeFromDb(this);
-    }
-    log(level, message, debugType = enums_1.LogDebugType.None) {
-        logging_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
-            debugType: debugType,
-            room: '',
-            deviceId: this.name,
-            deviceName: this.name,
-        });
-    }
-    persistDeviceInfo() {
-        utils_1.Utils.guardedTimeout(() => {
-            var _a;
-            (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
-        }, 5000, this);
-    }
     toJSON() {
         return {
             ...{
@@ -167,7 +135,7 @@ class VictronDevice {
                 injectingWattage: this.injectingWattage,
                 selfConsumingWattage: this.selfConsumingWattage,
             },
-            ...utils_1.Utils.jsonFilter(this, this.jsonOmitKeys),
+            ...utils_1.Utils.jsonFilter(super.toJSON(), this.jsonOmitKeys),
         };
     }
     /**
@@ -187,7 +155,7 @@ class VictronDevice {
         // Step 1: Calculate battery need
         const hoursTilSunset = services_1.TimeCallbackService.hoursTilSunset();
         let neededBatteryWattage = 0;
-        const timeOfDay = services_1.TimeCallbackService.dayType(new sun_time_offsets_1.SunTimeOffsets());
+        const timeOfDay = services_1.TimeCallbackService.dayType(new models_1.SunTimeOffsets());
         if (this.settings.hasBattery && timeOfDay !== enums_1.TimeOfDay.AfterSunset && timeOfDay !== enums_1.TimeOfDay.Night) {
             if (this.batteryLevel < 0) {
                 this.log(enums_1.LogLevel.Debug, 'No battery data available from Victron device.');

package/lib/devices/wledDevice.js

@@ -72,7 +72,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
             return;
         }
-        this.log(enums_1.LogLevel.Debug, c.logMessage);
+        this.logCommand(c);
         if (c.on && c.brightness !== -1 && this.brightness < 10) {
             c.brightness = 10;
         }
@@ -126,7 +126,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     }
     /** @inheritDoc */
     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._onID, c.stateValue, undefined, (err) => {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
         });

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

@@ -76,7 +76,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     }
     /** @inheritDoc */
     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._actuatorOnStateIdState, c.stateValue, undefined, (err) => {
             this.log(enums_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });

package/lib/devices/zigbee/BaseDevices/zigbeeShutter.d.ts

@@ -4,7 +4,6 @@ import { ShutterSettings } from '../../../settingsObjects';
 import { ShutterSetLevelCommand } from '../../../command';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { DeviceType } from '../../../enums';
-import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
 import { ShutterCalibration } from '../../../models';
 export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     /** @inheritDoc */
@@ -31,8 +30,6 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     /** @inheritDoc */
     setLevel(c: ShutterSetLevelCommand): void;
-    /** @inheritDoc */
-    toJSON(): Partial<IoBrokerBaseDevice>;
     protected setCurrentLevel(value: number, isInitial?: boolean): void;
     protected moveToPosition(pPosition: number): void;
     protected getAverageUp(): number;

package/lib/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeShutter = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const settingsObjects_1 = require("../../../settingsObjects");
 const command_1 = require("../../../command");
@@ -25,6 +21,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         this._shutterCalibrationData = new models_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
         this._currentLevel = -1;
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
+        this.jsonOmitKeys.push('_window');
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getShutterCalibration(this).then((calibrationData) => {
             this._shutterCalibrationData = calibrationData;
             this.log(enums_1.LogLevel.DeepTrace, 'ZigbeeShutter  initialized with calibration data');
@@ -77,14 +74,14 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             this._firstCommandRecieved = true;
         }
         else if (this._firstCommandRecieved && c.isInitial) {
-            this.log(enums_1.LogLevel.Debug, `Skipped initial shutter to ${pPosition} as we recieved a command already`);
+            this.logCommand(c, `Skipped initial shutter to ${pPosition} as we recieved a command already`);
             return;
         }
         if (this.currentLevel === pPosition && !c.isForceAction) {
-            this.log(enums_1.LogLevel.Debug, `Skip shutter command to Position ${pPosition} as this is the current one, commandLog: ${c.logMessage}`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
+            this.logCommand(c, `Skip shutter command to Position ${pPosition} as this is the current one`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
-        this.log(enums_1.LogLevel.Debug, c.logMessage);
+        this.logCommand(c);
         if (this._window !== undefined) {
             if (this._window.griffeInPosition(enums_1.WindowPosition.open) > 0 && pPosition < 100) {
                 if (!c.skipOpenWarning) {
@@ -103,10 +100,6 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         this.log(enums_1.LogLevel.Debug, `Move  to position ${pPosition}`);
         this.moveToPosition(pPosition);
     }
-    /** @inheritDoc */
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
     setCurrentLevel(value, isInitial = false) {
         if (value !== this._setLevel && utils_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
             value = this._setLevel;