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

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 { iJsonOmitKeys } from '../interfaces';
+export declare abstract class BaseCommand implements iBaseCommand, iJsonOmitKeys {
     readonly source: CommandSource | iBaseCommand;
     readonly reason: string;
+    /**
+     *
+     */
+    jsonOmitKeys: string[];
     /**
      * The timestamp of the command being created
      */

package/lib/command/baseCommand.js

@@ -15,6 +15,10 @@ class BaseCommand {
     constructor(source = enums_1.CommandSource.Unknown, reason = '') {
         this.source = source;
         this.reason = reason;
+        /**
+         *
+         */
+        this.jsonOmitKeys = ['source'];
         this.timestamp = new Date();
     }
     get isAutomaticAction() {

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(...['room', '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

@@ -19,7 +19,7 @@ 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;
@@ -28,7 +28,7 @@ export declare class DetectedBluetoothDevice extends BaseDevice {
     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);
@@ -99,7 +96,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.js

@@ -65,7 +65,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 +74,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,10 +98,10 @@ 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);
             }
         }
@@ -125,7 +125,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;
     }
 }