hoffmation-base 3.2.1-alpha.6 → 3.2.1-alpha.8

package/lib/command/baseCommand.js

@@ -25,7 +25,7 @@ class BaseCommand {
         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;
@@ -36,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);
@@ -45,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;
@@ -54,7 +54,7 @@ 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;
@@ -67,7 +67,7 @@ class BaseCommand {
         if (this.ignoreReason !== undefined) {
             ownPart += ` ignored due to: "${this.ignoreReason}"`;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return `${this.source.reasonTrace} -> ${ownPart}`;
         }
         return `CommandType("${enums_1.CommandSource[this.source]}") stack => ${ownPart}`;
@@ -76,7 +76,7 @@ class BaseCommand {
         if (this.type === type) {
             return true;
         }
-        if (this.source instanceof BaseCommand) {
+        if (typeof this.source === 'object') {
             return this.source.containsType(type);
         }
         return false;

package/lib/devices/BaseDevice.js

@@ -93,7 +93,7 @@ class BaseDevice {
         // 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(this, this.jsonOmitKeys);
+        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/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';
@@ -24,7 +24,6 @@ export declare class DetectedBluetoothDevice extends BaseDevice {
     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;

package/lib/devices/espresense/detectedBluetoothDevice.js

@@ -62,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) {

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 {
     /**
@@ -107,10 +106,6 @@ class EspresenseDevice extends RoomBaseDevice_1.RoomBaseDevice {
         }
     }
     /** @inheritDoc */
-    toJSON() {
-        return utils_1.Utils.jsonFilter(this);
-    }
-    /** @inheritDoc */
     loadDeviceSettings() {
         // Nothing
     }

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/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;

package/lib/devices/velux/veluxShutter.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 VeluxShutter extends VeluxDevice implements iShutter {
     /** @inheritDoc */
     settings: ShutterSettings;
@@ -22,6 +21,5 @@ export declare class VeluxShutter extends VeluxDevice implements iShutter {
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     persist(): void;
     setLevel(command: ShutterSetLevelCommand): void;
-    toJSON(): Partial<IoBrokerBaseDevice>;
     private setCurrentLevel;
 }

package/lib/devices/velux/veluxShutter.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.VeluxShutter = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const veluxDevice_1 = require("./veluxDevice");
 const settingsObjects_1 = require("../../settingsObjects");
 const enums_1 = require("../../enums");
@@ -21,6 +17,7 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         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}.targetPosition`;
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {
@@ -103,9 +100,6 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         // Level is inverted for Velux Adapter (100 = 0, 0 = 100, 25 = 75, etc.)
         this.setState(this._setLevelSwitchID, Math.abs(targetLevel - 100));
     }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
     setCurrentLevel(value, initial = false) {
         let correctedValue = Math.abs(value - 100);
         if (correctedValue !== this._setLevel && utils_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {

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

@@ -135,7 +135,7 @@ class VictronDevice extends BaseDevice_1.BaseDevice {
                 injectingWattage: this.injectingWattage,
                 selfConsumingWattage: this.selfConsumingWattage,
             },
-            ...utils_1.Utils.jsonFilter(super.toJSON(), this.jsonOmitKeys),
+            ...super.toJSON(),
         };
     }
     /**

package/lib/services/ac/ac-device.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.AcDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const devices_1 = require("../../devices");
 const interfaces_1 = require("../../interfaces");
 const enums_1 = require("../../enums");
@@ -301,9 +297,9 @@ class AcDevice extends devices_1.RoomBaseDevice {
     /** @inheritDoc */
     toJSON() {
         // eslint-disable-next-line
-        const result = lodash_1.default.omit(super.toJSON(), ['room', '_room']);
+        const result = super.toJSON();
         result['on'] = this.on;
-        return utils_1.Utils.jsonFilter(result);
+        return result;
     }
 }
 exports.AcDevice = AcDevice;

package/lib/services/ac/own-daikin-device.d.ts

@@ -45,6 +45,4 @@ export declare class OwnDaikinDevice extends AcDevice {
      */
     private handleDeviceUnreach;
     private handleParamNg;
-    /** @inheritDoc */
-    toJSON(): Partial<OwnDaikinDevice>;
 }

package/lib/services/ac/own-daikin-device.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.OwnDaikinDevice = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const ac_device_1 = require("./ac-device");
 const daikin_controller_1 = require("daikin-controller");
 const enums_1 = require("../../enums");
@@ -35,6 +31,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         /** @inheritDoc */
         this.deviceType = enums_1.DeviceType.Daikin;
         this._on = false;
+        this.jsonOmitKeys.push('_device');
     }
     get device() {
         return this._device;
@@ -191,12 +188,5 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             }
         });
     }
-    /** @inheritDoc */
-    toJSON() {
-        // eslint-disable-next-line
-        const result = lodash_1.default.omit(super.toJSON(), ['device', '_device']);
-        result['on'] = this.on;
-        return utils_1.Utils.jsonFilter(result);
-    }
 }
 exports.OwnDaikinDevice = OwnDaikinDevice;