hoffmation-base 2.15.5 → 2.15.6

package/lib/server/config/iLogSettings.d.ts

@@ -8,4 +8,5 @@ export interface iLogSettings {
     debugUnchangedActuator?: boolean;
     debugDaikinSuccessfullControlInfo?: boolean;
     debugEuroHeaterValve?: boolean;
+    debugTrilateration?: boolean;
 }

package/lib/server/devices/espresense/detectedBluetoothDevice.js

@@ -4,6 +4,7 @@ exports.DetectedBluetoothDevice = void 0;
 const DeviceInfo_1 = require("../DeviceInfo");
 const DeviceCapability_1 = require("../DeviceCapability");
 const deviceType_1 = require("../deviceType");
+const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const devices_1 = require("../devices");
 const trackedDistanceData_1 = require("./trackedDistanceData");
@@ -105,15 +106,16 @@ class DetectedBluetoothDevice {
         const distances = [];
         for (const key of this.distanceMap.keys()) {
             const tracker = services_1.API.getDevice(key);
-            if (tracker === undefined) {
+            if (tracker === undefined || tracker.position === undefined) {
                 continue;
             }
-            const distance = this.getDistance(key);
+            const distance = this.getDistance(key, 60);
             if ((distance === null || distance === void 0 ? void 0 : distance.distance) === undefined) {
                 continue;
             }
             distances.push(new trilaterationPointDistance_1.TrilaterationPointDistance(tracker.position.ownPoint.coordinateName, distance.distance));
         }
+        this.log(models_1.LogLevel.Debug, `Guessing room from ${distances.length} distance(s).`, services_1.LogDebugType.Trilateration);
         this.lastRoom = trilateration_1.Trilateration.checkRoom(distances);
     }
 }

package/lib/server/devices/espresense/trilateration.js

@@ -19,6 +19,9 @@ class Trilateration {
     static getBestMatches(distances) {
         const bestRatedCoordinates = this.getBestRatedCoordinates(distances);
         if (bestRatedCoordinates.length === 0) {
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `No best rated coordinates found for ${distances.length} distances.`, {
+                debugType: services_1.LogDebugType.Trilateration,
+            });
             return [];
         }
         const bestMatches = [];
@@ -36,6 +39,11 @@ class Trilateration {
         for (const dist of distances) {
             const point = this.basePoints.find((basePoint) => basePoint.ownPoint.coordinateName === dist.pointName);
             if (point === undefined) {
+                const possiblePoints = [];
+                for (const basePoint of this.basePoints) {
+                    possiblePoints.push(basePoint.ownPoint.coordinateName);
+                }
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Could not find base point for ${dist.pointName}, possible points: ${possiblePoints.join(', ')}`);
                 continue;
             }
             const ratedCoordinates = point.getRatedCoordinates(dist.distance);
@@ -54,6 +62,7 @@ class Trilateration {
     static checkRoom(distances) {
         var _a;
         const bestMatches = this.getBestMatches(distances);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Found ${bestMatches.length} best matches for ${distances.length} distances.`, { debugType: services_1.LogDebugType.Trilateration });
         if (bestMatches.length === 0) {
             return undefined;
         }
@@ -76,6 +85,9 @@ class Trilateration {
             }
             return b.rating - a.rating;
         });
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `First sorted coordinate: ${JSON.stringify(sortedCoordinates[0])}`, {
+            debugType: services_1.LogDebugType.Trilateration,
+        });
         const possibleWinner = [];
         for (const coordinate of sortedCoordinates) {
             if (possibleWinner.length === 0) {

package/lib/server/devices/espresense/trilaterationPoint.d.ts

@@ -3,10 +3,9 @@ export declare class TrilaterationPoint {
     y: number;
     z: number;
     roomName: string;
-    matchPoints: number;
     static getPointsInRange(a: TrilaterationPoint, b: TrilaterationPoint, roomName?: string): TrilaterationPoint[];
     readonly coordinateName: string;
-    constructor(x: number, y: number, z: number, roomName: string, matchPoints?: number);
+    constructor(x: number, y: number, z: number, roomName: string);
     getDistance(other: TrilaterationPoint): number;
     getDot5Distance(other: TrilaterationPoint): number;
 }

package/lib/server/devices/espresense/trilaterationPoint.js

@@ -17,12 +17,11 @@ class TrilaterationPoint {
         }
         return points;
     }
-    constructor(x, y, z, roomName, matchPoints = 0) {
+    constructor(x, y, z, roomName) {
         this.x = x;
         this.y = y;
         this.z = z;
         this.roomName = roomName;
-        this.matchPoints = matchPoints;
         this.coordinateName = `${this.x}-${this.y}-${this.z}`;
     }
     getDistance(other) {

package/lib/server/services/log-service/log-filter-data.d.ts

@@ -8,7 +8,8 @@ export declare enum LogDebugType {
     NewMovementState = 5,
     SkipUnchangedMovementState = 6,
     DaikinSuccessfullControlInfo = 7,
-    EuroHeaterValveLogging = 8
+    EuroHeaterValveLogging = 8,
+    Trilateration = 9
 }
 export declare class LogFilterData {
     room?: string;

package/lib/server/services/log-service/log-filter-data.js

@@ -12,6 +12,7 @@ var LogDebugType;
     LogDebugType[LogDebugType["SkipUnchangedMovementState"] = 6] = "SkipUnchangedMovementState";
     LogDebugType[LogDebugType["DaikinSuccessfullControlInfo"] = 7] = "DaikinSuccessfullControlInfo";
     LogDebugType[LogDebugType["EuroHeaterValveLogging"] = 8] = "EuroHeaterValveLogging";
+    LogDebugType[LogDebugType["Trilateration"] = 9] = "Trilateration";
 })(LogDebugType || (exports.LogDebugType = LogDebugType = {}));
 class LogFilterData {
     constructor() {

package/lib/server/services/log-service/log-service.js

@@ -64,7 +64,7 @@ class ServerLogService {
      * @returns {boolean} If the Message should be skipped
      */
     static checkDebugLogSkip(debugType) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         switch (debugType) {
             case log_filter_data_1.LogDebugType.None:
                 return false;
@@ -108,6 +108,11 @@ class ServerLogService {
                     return false;
                 }
                 break;
+            case log_filter_data_1.LogDebugType.Trilateration:
+                if (((_j = settings_service_1.SettingsService.settings.logSettings) === null || _j === void 0 ? void 0 : _j.debugTrilateration) === true) {
+                    return false;
+                }
+                break;
         }
         return true;
     }