hoffmation-base 3.2.1-alpha.0 → 3.2.1-alpha.10

package/lib/action/actuatorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class ActuatorChangeAction extends baseAction_1.BaseAction {
     constructor(device) {
-        super(undefined, `New Actuator state (${device.actuatorOn}) received`);
+        super(enums_1.CommandSource.Automatic, `New Actuator state (${device.actuatorOn}) received`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.ActuatorChangeAction;
         this.actuatorOn = device.actuatorOn;

package/lib/action/baseAction.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../command';
+import { CommandSource } from '../enums';
 export declare abstract class BaseAction extends BaseCommand {
-    protected constructor(source?: BaseAction, reason?: string);
+    protected constructor(source: BaseAction | CommandSource, reason?: string);
     get logMessage(): string;
 }

package/lib/action/baseAction.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAction = void 0;
 const command_1 = require("../command");
-const enums_1 = require("../enums");
 class BaseAction extends command_1.BaseCommand {
     constructor(source, reason) {
-        super(source !== null && source !== void 0 ? source : enums_1.CommandSource.Automatic, reason);
+        super(source, reason);
     }
     get logMessage() {
         return this.reasonTrace;

package/lib/action/batteryLevelChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class BatteryLevelChangeAction extends baseAction_1.BaseAction {
     constructor(device) {
-        super(undefined, `New Battery Level (${device.batteryLevel}%) received`);
+        super(enums_1.CommandSource.Automatic, `New Battery Level (${device.batteryLevel}%) received`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.BatteryManagerLevelChangeAction;
         this.newLevel = device.batteryLevel;

package/lib/action/handleChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class HandleChangeAction extends baseAction_1.BaseAction {
     constructor(handle) {
-        super(undefined, `${handle.customName} ${handle.position === enums_1.WindowPosition.closed ? 'opened' : 'closed'}`);
+        super(enums_1.CommandSource.Automatic, `${handle.customName} ${handle.position === enums_1.WindowPosition.closed ? 'opened' : 'closed'}`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.HandleChangedAction;
         this.handle = handle;

package/lib/action/humiditySensorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class HumiditySensorChangeAction extends baseAction_1.BaseAction {
     constructor(sensor, newHumidity) {
-        super(undefined, `${sensor.customName} detected ${newHumidity} humidity`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} detected ${newHumidity} humidity`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.HumiditySensorChangeAction;
         this.newHumidity = newHumidity;

package/lib/action/motionSensorAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class MotionSensorAction extends baseAction_1.BaseAction {
     constructor(sensor) {
-        super(undefined, `${sensor.customName} ${sensor.movementDetected ? 'detected' : 'cleared'} motion`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} ${sensor.movementDetected ? 'detected' : 'cleared'} motion`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.MotionSensorAction;
         this.motionDetected = sensor.movementDetected;

package/lib/action/presenceGroupAnyMovementAction.d.ts

@@ -1,7 +1,7 @@
 import { BaseAction } from './baseAction';
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 export declare class PresenceGroupAnyMovementAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/presenceGroupFirstEnterAction.d.ts

@@ -1,7 +1,7 @@
 import { BaseAction } from './baseAction';
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 export declare class PresenceGroupFirstEnterAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/presenceGroupLastLeftAction.d.ts

@@ -1,7 +1,7 @@
-import { CommandType } from '../enums';
+import { CommandSource, CommandType } from '../enums';
 import { BaseAction } from './baseAction';
 export declare class PresenceGroupLastLeftAction extends BaseAction {
     /** @inheritDoc */
     type: CommandType;
-    constructor(source?: BaseAction, reason?: string);
+    constructor(source: BaseAction | CommandSource, reason?: string);
 }

package/lib/action/shutterPositionChangedAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class ShutterPositionChangedAction extends baseAction_1.BaseAction {
     constructor(shutter, newPosition) {
-        super(undefined, `${shutter.customName} changed position to ${newPosition}`);
+        super(enums_1.CommandSource.Automatic, `${shutter.customName} changed position to ${newPosition}`);
         this.newPosition = newPosition;
         /** @inheritDoc */
         this.type = enums_1.CommandType.ShutterPositionChangedAction;

package/lib/action/temperatureSensorChangeAction.js

@@ -5,7 +5,7 @@ const baseAction_1 = require("./baseAction");
 const enums_1 = require("../enums");
 class TemperatureSensorChangeAction extends baseAction_1.BaseAction {
     constructor(sensor, newTemperature) {
-        super(undefined, `${sensor.customName} detected ${newTemperature} °C`);
+        super(enums_1.CommandSource.Automatic, `${sensor.customName} detected ${newTemperature} °C`);
         /** @inheritDoc */
         this.type = enums_1.CommandType.TemperatureSensorChangeAction;
         this.newTemperature = newTemperature;

package/lib/command/baseCommand.d.ts

@@ -1,8 +1,13 @@
 import { CommandSource, CommandType } from '../enums';
 import { iBaseCommand } from './iBaseCommand';
-export declare abstract class BaseCommand implements iBaseCommand {
+import { iJsonCustomPrepend, iJsonOmitKeys } from '../interfaces';
+export declare abstract class BaseCommand implements iBaseCommand, iJsonOmitKeys, iJsonCustomPrepend {
     readonly source: CommandSource | iBaseCommand;
     readonly reason: string;
+    /**
+     *
+     */
+    jsonOmitKeys: string[];
     /**
      * The timestamp of the command being created
      */
@@ -35,5 +40,6 @@ export declare abstract class BaseCommand implements iBaseCommand {
     get reasonTrace(): string;
     containsType(type: CommandType): boolean;
     get logMessage(): string;
+    customPrepend(): Partial<unknown>;
     toJSON(): Partial<BaseCommand>;
 }

package/lib/command/baseCommand.js

@@ -15,13 +15,17 @@ class BaseCommand {
     constructor(source = enums_1.CommandSource.Unknown, reason = '') {
         this.source = source;
         this.reason = reason;
+        /**
+         *
+         */
+        this.jsonOmitKeys = ['source'];
         this.timestamp = new Date();
     }
     get isAutomaticAction() {
         if (this.overrideCommandSource !== undefined) {
             return this.overrideCommandSource === enums_1.CommandSource.Automatic;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.isAutomaticAction;
         }
         return this.source === enums_1.CommandSource.Automatic;
@@ -32,7 +36,7 @@ class BaseCommand {
                 this.overrideCommandSource === enums_1.CommandSource.API ||
                 this.overrideCommandSource === enums_1.CommandSource.Force);
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.isForceAction;
         }
         return (this.source === enums_1.CommandSource.Manual || this.source === enums_1.CommandSource.API || this.source === enums_1.CommandSource.Force);
@@ -41,7 +45,7 @@ class BaseCommand {
         if (this.overrideCommandSource !== undefined) {
             return this.overrideCommandSource === enums_1.CommandSource.Manual || this.overrideCommandSource === enums_1.CommandSource.API;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.isManual;
         }
         return this.source === enums_1.CommandSource.Manual || this.source === enums_1.CommandSource.API;
@@ -50,14 +54,14 @@ class BaseCommand {
         if (this.overrideCommandSource !== undefined) {
             return this.overrideCommandSource === enums_1.CommandSource.Initial;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.isInitial;
         }
         return this.source === enums_1.CommandSource.Initial;
     }
     get reasonTrace() {
         let ownPart = `${this.type}`;
-        if (this.reason !== undefined) {
+        if (this.reason) {
             ownPart += `("${this.reason}")`;
         }
         if (this.ignoreReason !== undefined) {
@@ -66,13 +70,13 @@ class BaseCommand {
         if (typeof this.source === 'object') {
             return `${this.source.reasonTrace} -> ${ownPart}`;
         }
-        return `CommandType("${enums_1.CommandSource[this.source]}") stack => ${ownPart}`;
+        return `CommandSource("${enums_1.CommandSource[this.source]}") stack => ${ownPart}`;
     }
     containsType(type) {
         if (this.type === type) {
             return true;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.containsType(type);
         }
         return false;
@@ -80,8 +84,13 @@ class BaseCommand {
     get logMessage() {
         return this.reasonTrace;
     }
+    customPrepend() {
+        return {
+            logMessage: this.logMessage,
+        };
+    }
     toJSON() {
-        // eslint-disable-next-line
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const result = lodash_1.default.omit(this, ['source']);
         result['logMessage'] = this.logMessage;
         return result;

package/lib/devices/BaseDevice.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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");
+const lodash_1 = __importDefault(require("lodash"));
 class BaseDevice {
     constructor(_info, deviceType) {
         this._info = _info;
@@ -86,7 +90,10 @@ class BaseDevice {
     }
     /** @inheritDoc */
     toJSON() {
-        return utils_1.Utils.jsonFilter(this, this.jsonOmitKeys);
+        // eslint-disable-next-line
+        const returnValue = lodash_1.default.omit(this, 'lastCommands');
+        returnValue['lastCommands'] = this.lastCommands.readAmount(this.lastCommands.maximumSize);
+        return utils_1.Utils.jsonFilter(returnValue, this.jsonOmitKeys);
     }
 }
 exports.BaseDevice = BaseDevice;

package/lib/devices/CameraDevice.d.ts

@@ -1,4 +1,4 @@
-import { iBaseDevice, iCameraDevice, iCameraSettings, iRoomDevice } from '../interfaces';
+import { iBaseDevice, iCameraDevice, iCameraSettings } from '../interfaces';
 import { LogDebugType, LogLevel } from '../enums';
 import { MotionSensorAction } from '../action';
 import { DeviceInfo } from './DeviceInfo';
@@ -34,7 +34,6 @@ export declare abstract class CameraDevice extends RoomBaseDevice implements iCa
     protected _lastUpdate: Date;
     get lastUpdate(): Date;
     protected constructor(name: string, roomName: string);
-    toJSON(): Partial<iRoomDevice>;
     /** @inheritDoc */
     get lastImage(): string;
     /** @inheritDoc */

package/lib/devices/CameraDevice.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.CameraDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const settingsObjects_1 = require("../settingsObjects");
 const enums_1 = require("../enums");
 const models_1 = require("../models");
@@ -43,18 +39,13 @@ class CameraDevice extends RoomBaseDevice_1.RoomBaseDevice {
         this._movementDetectFallbackTimeout = null;
         this._dogDetectFallbackTimeout = null;
         this._lastUpdate = new Date(0);
+        this.jsonOmitKeys.push('_lastImage');
         this.deviceCapabilities.push(enums_1.DeviceCapability.camera);
         this.deviceCapabilities.push(enums_1.DeviceCapability.motionSensor);
         this.name = name;
         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() {
         return this._lastImage;

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

@@ -57,8 +57,6 @@ export declare class Dachs extends RoomBaseDevice implements iBaseDevice, iActua
     /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     /** @inheritDoc */
-    toJSON(): Partial<Dachs>;
-    /** @inheritDoc */
     persist(): void;
     private loadData;
     /** @inheritDoc */

package/lib/devices/dachs/dachs.js

@@ -48,6 +48,17 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         this._dachsOn = false;
         this._tempWarmWater = 0;
         this._tempHeatStorage = 0;
+        this.jsonOmitKeys.push(...[
+            'client',
+            'config',
+            '_influxClient',
+            'warmWaterSensor',
+            'heatStorageTempSensor',
+            'warmWaterPump',
+            'heatingRod',
+            'blockDachsStart',
+            'warmWaterDachsAlternativeActuator',
+        ]);
         devices_1.Devices.alLDevices[allDevicesKey] = this;
         this.deviceCapabilities.push(enums_1.DeviceCapability.actuator);
         if (options.influxDb) {
@@ -84,21 +95,6 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         this.setActuator(new command_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore Target Automatic value'));
     }
     /** @inheritDoc */
-    toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(super.toJSON(), [
-            'room',
-            'client',
-            'config',
-            '_influxClient',
-            'warmWaterSensor',
-            'heatStorageTempSensor',
-            'warmWaterPump',
-            'heatingRod',
-            'blockDachsStart',
-            'warmWaterDachsAlternativeActuator',
-        ]));
-    }
-    /** @inheritDoc */
     persist() {
         var _a;
         (_a = services_1.Persistence.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);

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

@@ -26,11 +26,5 @@ export declare class DachsTemperatureSensor extends RoomBaseDevice implements iT
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */
-    toJSON(): Partial<DachsTemperatureSensor>;
-    /** @inheritDoc */
-    persistDeviceInfo(): void;
-    /** @inheritDoc */
-    loadDeviceSettings(): void;
-    /** @inheritDoc */
     dispose(): void;
 }

package/lib/devices/dachs/dachsTemperatureSensor.js

@@ -1,16 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DachsTemperatureSensor = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const enums_1 = require("../../enums");
 const sharedFunctions_1 = require("../sharedFunctions");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
-const utils_1 = require("../../utils");
-const services_1 = require("../../services");
 const RoomBaseDevice_1 = require("../RoomBaseDevice");
 class DachsTemperatureSensor extends RoomBaseDevice_1.RoomBaseDevice {
     constructor(roomName, shortKey, longKey) {
@@ -26,6 +20,7 @@ class DachsTemperatureSensor extends RoomBaseDevice_1.RoomBaseDevice {
         /** @inheritDoc */
         this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
         this.deviceCapabilities.push(enums_1.DeviceCapability.temperatureSensor);
+        this.jsonOmitKeys.push(...['client', 'config', '_influxClient']);
         devices_1.Devices.alLDevices[allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
     }
@@ -65,22 +60,6 @@ class DachsTemperatureSensor extends RoomBaseDevice_1.RoomBaseDevice {
         this.roomTemperature = newTemperatur;
     }
     /** @inheritDoc */
-    toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(super.toJSON(), ['room', 'client', 'config', '_influxClient']));
-    }
-    /** @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() {
-        var _a;
-        (_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
-    }
-    /** @inheritDoc */
     dispose() {
         this.temperatureSensor.dispose();
     }

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

@@ -1,5 +1,5 @@
 import { LogDebugType, LogLevel } from '../../enums';
-import { iBaseDevice, iBluetoothTrackingSettings } from '../../interfaces';
+import { iBluetoothTrackingSettings } from '../../interfaces';
 import { TrackedDistanceData } from './trackedDistanceData';
 import { iBluetoothDetector } from '../../interfaces/baseDevices/iBluetoothDetector';
 import { BaseDevice } from '../BaseDevice';
@@ -19,16 +19,15 @@ export declare class DetectedBluetoothDevice extends BaseDevice {
      * If the device is currently present
      */
     present: boolean;
-    constructor(trackedDeviceId: string, settings?: iBluetoothTrackingSettings);
+    constructor(trackedDeviceId: string, settings: iBluetoothTrackingSettings);
     get customName(): string;
     get name(): string;
     updateDistance(tracker: iBluetoothDetector, distance: number): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    toJSON(): Partial<iBaseDevice>;
     getDistance(id: string, maxAge?: number): TrackedDistanceData | undefined;
     getDistances(maxAge?: number): Array<TrackedDistanceData>;
     getDistanceReport(maxAge?: number): string;
-    static getOrCreate(devName: string): DetectedBluetoothDevice;
+    static getOrCreate(devName: string): DetectedBluetoothDevice | undefined;
     private static deviceKeyBySettings;
     persistDeviceInfo(): void;
     loadDeviceSettings(): void;

package/lib/devices/espresense/detectedBluetoothDevice.js

@@ -15,9 +15,6 @@ 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);
@@ -65,9 +62,6 @@ class DetectedBluetoothDevice extends BaseDevice_1.BaseDevice {
             deviceName: this.name,
         });
     }
-    toJSON() {
-        return utils_1.Utils.jsonFilter(this);
-    }
     getDistance(id, maxAge = 120) {
         const data = this.distanceMap.get(id);
         if (data === undefined) {
@@ -99,7 +93,7 @@ class DetectedBluetoothDevice extends BaseDevice_1.BaseDevice {
         var _a, _b;
         const settings = (_a = settings_service_1.SettingsService.settings.espresense) === null || _a === void 0 ? void 0 : _a.deviceMap[devName];
         if (settings === undefined) {
-            return new DetectedBluetoothDevice(devName);
+            return undefined;
         }
         const dev = api_1.API.getDevice(this.deviceKeyBySettings(settings));
         return (_b = dev) !== null && _b !== void 0 ? _b : new DetectedBluetoothDevice(devName, settings);

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

@@ -1,4 +1,4 @@
-import { iRoomDevice, iTrilaterationBasePoint } from '../../interfaces';
+import { iTrilaterationBasePoint } from '../../interfaces';
 import { iBluetoothDetector } from '../../interfaces/baseDevices/iBluetoothDetector';
 import { ProximityCallback } from './proximityCallback';
 import { RoomBaseDevice } from '../RoomBaseDevice';
@@ -35,8 +35,6 @@ export declare class EspresenseDevice extends RoomBaseDevice implements iBluetoo
      */
     update(devName: string, state: ioBroker.State): void;
     /** @inheritDoc */
-    toJSON(): Partial<iRoomDevice>;
-    /** @inheritDoc */
     loadDeviceSettings(): void;
     /** @inheritDoc */
     addProximityCallback(cb: ProximityCallback): void;

package/lib/devices/espresense/espresenseDevice.js

@@ -8,7 +8,6 @@ const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const espresenseCoordinator_1 = require("./espresenseCoordinator");
 const trilateration_1 = require("./trilateration");
-const utils_1 = require("../../utils");
 const RoomBaseDevice_1 = require("../RoomBaseDevice");
 class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
     /**
@@ -65,7 +64,7 @@ class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
      * @param state - The state containing the json-formatted distance data
      */
     update(devName, state) {
-        var _a, _b;
+        var _a, _b, _c;
         let data = null;
         try {
             data = JSON.parse(state.val);
@@ -74,9 +73,9 @@ class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
             this.log(enums_1.LogLevel.Error, `Recieved malformed update data: ${state.val}`);
             return;
         }
-        let dev = this.deviceMap.get(devName);
+        const dev = (_a = this.deviceMap.get(devName)) !== null && _a !== void 0 ? _a : this.addDeviceTracking(devName);
         if (dev === undefined) {
-            dev = this.addDeviceTracking(devName);
+            return;
         }
         dev.updateDistance(this, data.distance);
         dev.guessRoom();
@@ -98,19 +97,15 @@ class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
                 }
                 continue;
             }
-            if (distance > cb.distanceTrigger && ((_a = trackedDistance.previousDistance) !== null && _a !== void 0 ? _a : 99) < cb.distanceTrigger) {
+            if (distance > cb.distanceTrigger && ((_b = trackedDistance.previousDistance) !== null && _b !== void 0 ? _b : 99) < cb.distanceTrigger) {
                 cb.callback(false, distance);
             }
-            else if (distance < cb.distanceTrigger && ((_b = trackedDistance.previousDistance) !== null && _b !== void 0 ? _b : 0) > cb.distanceTrigger) {
+            else if (distance < cb.distanceTrigger && ((_c = trackedDistance.previousDistance) !== null && _c !== void 0 ? _c : 0) > cb.distanceTrigger) {
                 cb.callback(true, distance);
             }
         }
     }
     /** @inheritDoc */
-    toJSON() {
-        return utils_1.Utils.jsonFilter(this);
-    }
-    /** @inheritDoc */
     loadDeviceSettings() {
         // Nothing
     }
@@ -125,7 +120,9 @@ class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
     }
     addDeviceTracking(devName) {
         const dev = detectedBluetoothDevice_1.DetectedBluetoothDevice.getOrCreate(devName);
-        this.deviceMap.set(devName, dev);
+        if (dev) {
+            this.deviceMap.set(devName, dev);
+        }
         return dev;
     }
 }

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

@@ -32,7 +32,6 @@ class OwnGoveeDevice extends RoomBaseDevice_1.RoomBaseDevice {
         this._color = '#fcba32';
         this._colortemp = 500;
         this._lastPersist = 0;
-        this.jsonOmitKeys.push('device');
         this.deviceId = deviceId;
         this.deviceCapabilities.push(...[
             enums_1.DeviceCapability.ledLamp,

package/lib/devices/hmIPDevices/hmIpRoll.d.ts

@@ -3,7 +3,6 @@ import { iShutter, iWindow } from '../../interfaces';
 import { ShutterSettings } from '../../settingsObjects';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ShutterSetLevelCommand } from '../../command';
-import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
     /** @inheritDoc */
     settings: ShutterSettings;
@@ -23,5 +22,4 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     persist(): void;
     private setCurrentLevel;
     setLevel(command: ShutterSetLevelCommand): void;
-    toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/devices/hmIPDevices/hmIpRoll.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.HmIpRoll = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const hmIpDevice_1 = require("./hmIpDevice");
 const settingsObjects_1 = require("../../settingsObjects");
 const enums_1 = require("../../enums");
@@ -21,6 +17,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;
+        this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
         this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {
@@ -117,8 +114,5 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this.log(enums_1.LogLevel.Debug, `Fahre Rollo auf Position ${targetLevel}`);
         this.setState(this._setLevelSwitchID, targetLevel);
     }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
 }
 exports.HmIpRoll = HmIpRoll;

package/lib/devices/sharedFunctions/lampUtils.js

@@ -115,7 +115,6 @@ 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/tv/tvDevice.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.TvDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const enums_1 = require("../../enums");
 const settingsObjects_1 = require("../../settingsObjects");
 const DeviceInfo_1 = require("../DeviceInfo");
@@ -45,9 +41,9 @@ class TvDevice extends RoomBaseDevice_1.RoomBaseDevice {
     }
     toJSON() {
         // eslint-disable-next-line
-        const result = lodash_1.default.omit(super.toJSON(), ['room']);
+        const result = super.toJSON();
         result['on'] = this.on;
-        return utils_1.Utils.jsonFilter(result);
+        return result;
     }
 }
 exports.TvDevice = TvDevice;