hoffmation-base 3.2.24 → 3.2.25

package/lib/api/api-service.d.ts

@@ -1,7 +1,7 @@
 import { BaseGroup, DeviceSettings } from '../devices';
 import { AcMode, ButtonPosition, ButtonPressType, CollisionSolving } from '../enums';
 import { ActuatorSetStateCommand, BlockAutomaticCommand, BlockAutomaticLiftBlockCommand, DimmerSetLightCommand, LampSetLightCommand, LedSetLightCommand, ShutterSetLevelCommand } from '../command';
-import { iAcDevice, iBaseDevice, iRoomBase } from '../interfaces';
+import { iAcDevice, iBaseDevice, iRoomBase, iTemperatureMeasurement } from '../interfaces';
 import { LogObject } from '../logging';
 import { GroupSettings } from '../settingsObjects';
 export declare class API {
@@ -193,4 +193,12 @@ export declare class API {
      */
     static blockAutomaticSetBlock(deviceId: string, command: BlockAutomaticCommand): Error | null;
     static pressButtonSwitch(deviceId: string, position: ButtonPosition, pressType: ButtonPressType): Error | null;
+    /**
+     * Gets temperature history for a device
+     * @param deviceId - The ID of the device to get temperature history for
+     * @param startDate - Optional start date for the query (defaults to start of today)
+     * @param endDate - Optional end date for the query (defaults to end of today)
+     * @returns The temperature measurements or an error if the device is not found or not a temperature sensor
+     */
+    static getTemperatureHistory(deviceId: string, startDate?: Date, endDate?: Date): Promise<iTemperatureMeasurement[] | Error>;
 }

package/lib/api/api-service.js

@@ -477,5 +477,23 @@ class API {
         d.log(enums_1.LogLevel.Info, `API Call to press button ${position} with ${pressType}`);
         return d.pressButton(position, pressType);
     }
+    /**
+     * Gets temperature history for a device
+     * @param deviceId - The ID of the device to get temperature history for
+     * @param startDate - Optional start date for the query (defaults to start of today)
+     * @param endDate - Optional end date for the query (defaults to end of today)
+     * @returns The temperature measurements or an error if the device is not found or not a temperature sensor
+     */
+    static async getTemperatureHistory(deviceId, startDate, endDate) {
+        const d = this.getDevice(deviceId, false);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(enums_1.DeviceCapability.temperatureSensor)) {
+            return new Error(`Device with ID ${deviceId} is no temperature sensor`);
+        }
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `API Call to get temperature history for ${deviceId}`);
+        return d.temperatureSensor.getTemperatureHistory(startDate, endDate);
+    }
 }
 exports.API = API;

package/lib/devices/sharedFunctions/temperatureSensor.d.ts

@@ -1,5 +1,5 @@
 import { TemperatureSensorChangeAction } from '../../action';
-import { iTemperatureCollector, iTemperatureSensor } from '../../interfaces';
+import { iTemperatureCollector, iTemperatureMeasurement, iTemperatureSensor } from '../../interfaces';
 export declare class TemperatureSensor implements iTemperatureSensor {
     private readonly _device;
     /** @inheritDoc */
@@ -38,4 +38,6 @@ export declare class TemperatureSensor implements iTemperatureSensor {
     addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     dispose(): void;
     toJSON(): Partial<TemperatureSensor>;
+    /** @inheritDoc */
+    getTemperatureHistory(startDate?: Date, endDate?: Date): Promise<iTemperatureMeasurement[]>;
 }

package/lib/devices/sharedFunctions/temperatureSensor.js

@@ -4,7 +4,6 @@ exports.TemperatureSensor = void 0;
 const action_1 = require("../../action");
 const interfaces_1 = require("../../interfaces");
 const utils_1 = require("../../utils");
-const weather_1 = require("../../services/weather");
 const services_1 = require("../../services");
 class TemperatureSensor {
     constructor(_device) {
@@ -44,8 +43,8 @@ class TemperatureSensor {
     set temperature(val) {
         this.lastSeen = utils_1.Utils.nowMS();
         let correctedValue = val;
-        if (this.outdoorTemperatureCorrectionCoefficient !== 0 && weather_1.WeatherService.currentTemp !== interfaces_1.UNDEFINED_TEMP_VALUE) {
-            const tempDiff = 21 - weather_1.WeatherService.currentTemp;
+        if (this.outdoorTemperatureCorrectionCoefficient !== 0 && services_1.WeatherService.currentTemp !== interfaces_1.UNDEFINED_TEMP_VALUE) {
+            const tempDiff = 21 - services_1.WeatherService.currentTemp;
             // Use degressive correction: full coefficient up to 10K diff (=11°C outdoor), then reduce
             // This prevents over-correction at very low outdoor temperatures
             const maxLinearDiff = 10;
@@ -91,5 +90,12 @@ class TemperatureSensor {
     toJSON() {
         return utils_1.Utils.jsonFilter(this, this.jsonOmitKeys);
     }
+    /** @inheritDoc */
+    async getTemperatureHistory(startDate, endDate) {
+        if (!services_1.Persistence.dbo) {
+            return [];
+        }
+        return services_1.Persistence.dbo.getTemperatureHistory(this._device.id, startDate, endDate);
+    }
 }
 exports.TemperatureSensor = TemperatureSensor;

package/lib/interfaces/baseDevices/iTemperatureSensor.d.ts

@@ -1,5 +1,6 @@
 import { iJsonOmitKeys } from '../iJsonOmitKeys';
 import { TemperatureSensorChangeAction } from '../../action';
+import { iTemperatureMeasurement } from '../iTemperatureMeasurement';
 /**
  *
  */
@@ -37,4 +38,11 @@ export interface iTemperatureSensor extends iJsonOmitKeys {
      *
      */
     toJSON(): Partial<iTemperatureSensor>;
+    /**
+     * Gets temperature history from the database
+     * @param startDate - Optional start date for the query (defaults to start of today)
+     * @param endDate - Optional end date for the query (defaults to end of today)
+     * @returns The temperature measurements
+     */
+    getTemperatureHistory(startDate?: Date, endDate?: Date): Promise<iTemperatureMeasurement[]>;
 }

package/lib/interfaces/iPersist.d.ts

@@ -1,4 +1,5 @@
 import { iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iHandle, iHeater, iHumidityCollector, iIlluminationSensor, iMotionSensor, iShutter, iTemperatureCollector, iZigbeeDevice } from './baseDevices';
+import { iTemperatureMeasurement } from './iTemperatureMeasurement';
 import { iRoomBase } from './iRoomBase';
 import { ButtonPressType } from '../enums';
 import { iDesiredShutterPosition } from './IDesiredShutterPosition';
@@ -42,6 +43,14 @@ export interface iPersist {
      * @returns - The shutter calibration
      */
     getShutterCalibration(device: iShutter): Promise<iShutterCalibration>;
+    /**
+     * Gets temperature measurements for a device by its ID
+     * @param deviceId - The ID of the device to load temp measurements for
+     * @param startDate - Optional start date for the query (defaults to start of today)
+     * @param endDate - Optional end date for the query (defaults to end of today)
+     * @returns - The measurements
+     */
+    getTemperatureHistory(deviceId: string, startDate?: Date, endDate?: Date): Promise<iTemperatureMeasurement[]>;
     /**
      * Initializes the database-connection and prepares the database
      * @returns - The promise that resolves when the database is initialized

package/lib/interfaces/iTemperatureMeasurement.d.ts

@@ -0,0 +1,13 @@
+/**
+ * A measurement in persistence layer
+ */
+export interface iTemperatureMeasurement {
+    /**
+     * The measured temperature in Celsius
+     */
+    temperature: number;
+    /**
+     * The date of the measurement
+     */
+    date: Date;
+}

package/lib/interfaces/iTemperatureMeasurement.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/index.d.ts

@@ -52,3 +52,4 @@ export { iIOBrokerConnection } from './iIOBrokerConnection';
 export { iDeviceCluster } from './iDevicecluster';
 export { iDaytime } from './iDaytime';
 export { iBlockAutomaticHandler } from './iBlockAutomaticHandler';
+export { iTemperatureMeasurement } from './iTemperatureMeasurement';

package/lib/services/dbo/postgreSqlPersist.d.ts

@@ -1,5 +1,5 @@
 import { PoolConfig } from 'pg';
-import { iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iDesiredShutterPosition, iHandle, iHeater, iHumidityCollector, iIlluminationSensor, iMotionSensor, iPersist, iRoomBase, iShutter, iShutterCalibration, iTemperatureCollector, iZigbeeDevice } from '../../interfaces';
+import { iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iDesiredShutterPosition, iHandle, iHeater, iHumidityCollector, iIlluminationSensor, iMotionSensor, iPersist, iRoomBase, iShutter, iShutterCalibration, iTemperatureCollector, iTemperatureMeasurement, iZigbeeDevice } from '../../interfaces';
 import { CountToday, EnergyCalculation } from '../../models';
 import { ButtonPressType } from '../../enums';
 export declare class PostgreSqlPersist implements iPersist {
@@ -18,6 +18,9 @@ export declare class PostgreSqlPersist implements iPersist {
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     /** @inheritDoc */
     getShutterCalibration(_device: iShutter): Promise<iShutterCalibration>;
+    getTempMeasurements(device: iTemperatureCollector): Promise<iTemperatureMeasurement[]>;
+    /** @inheritDoc */
+    getTemperatureHistory(deviceId: string, startDate?: Date, endDate?: Date): Promise<iTemperatureMeasurement[]>;
     /** @inheritDoc */
     initialize(): Promise<void>;
     /** @inheritDoc */

package/lib/services/dbo/postgreSqlPersist.js

@@ -17,27 +17,27 @@ class PostgreSqlPersist {
     /** @inheritDoc */
     addRoom(room) {
         this.query(`
-        insert into hoffmation_schema."BasicRooms" (name, etage)
-        values ('${room.roomName}', ${room.etage}) ON CONFLICT (name)
+      insert into hoffmation_schema."BasicRooms" (name, etage)
+      values ('${room.roomName}', ${room.etage}) ON CONFLICT (name)
     DO
-        UPDATE SET
-            etage = ${room.etage}
-        ;
+      UPDATE SET
+        etage = ${room.etage}
+      ;
     `);
     }
     /** @inheritDoc */
     addDevice(device) {
         this.query(`
-        insert into hoffmation_schema."DeviceInfo" ("deviceid", "roomname", "alldeviceskey", "customname", "devtype")
-        values ('${device.id}', '${device.info.room}', '${device.info.allDevicesKey}', '${device.info.customName}',
-                ${device.deviceType}) ON CONFLICT ("deviceid")
+      insert into hoffmation_schema."DeviceInfo" ("deviceid", "roomname", "alldeviceskey", "customname", "devtype")
+      values ('${device.id}', '${device.info.room}', '${device.info.allDevicesKey}', '${device.info.customName}',
+              ${device.deviceType}) ON CONFLICT ("deviceid")
     DO
-        UPDATE SET
-            "roomname" = '${device.info.room}',
-            "alldeviceskey" = '${device.info.allDevicesKey}',
-            "customname" = '${device.info.customName}',
-            "devtype" = ${device.deviceType}
-        ;
+      UPDATE SET
+        "roomname" = '${device.info.room}',
+        "alldeviceskey" = '${device.info.allDevicesKey}',
+        "customname" = '${device.info.customName}',
+        "devtype" = ${device.deviceType}
+      ;
     `);
     }
     /** @inheritDoc */
@@ -49,7 +49,7 @@ class PostgreSqlPersist {
          AND date
            < CURRENT_DATE + INTERVAL '1 DAY'
        ORDER BY date desc
-           Limit 1`);
+         Limit 1`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0];
         }
@@ -80,6 +80,31 @@ class PostgreSqlPersist {
             reject('Not Implemented');
         });
     }
+    async getTempMeasurements(device) {
+        return this.getTemperatureHistory(device.id);
+    }
+    /** @inheritDoc */
+    async getTemperatureHistory(deviceId, startDate, endDate) {
+        const end = endDate !== null && endDate !== void 0 ? endDate : new Date();
+        const start = startDate !== null && startDate !== void 0 ? startDate : new Date(end.getTime() - 24 * 60 * 60 * 1000);
+        const dbResult = await this.query(`SELECT temperature, date
+       from hoffmation_schema."TemperatureSensorDeviceData"
+       WHERE "deviceID" = '${deviceId}'
+         and date >= '${start.toISOString()}'
+         AND date <= '${end.toISOString()}'
+       ORDER BY DATE DESC`);
+        if (dbResult === null || dbResult.length === 0) {
+            return [];
+        }
+        const result = [];
+        for (const entry of dbResult) {
+            result.push({
+                temperature: Number(entry.temperature),
+                date: new Date(entry.date),
+            });
+        }
+        return result;
+    }
     /** @inheritDoc */
     async initialize() {
         await this.psql.connect();
@@ -372,8 +397,8 @@ $$;`);
     /** @inheritDoc */
     persistAC(device) {
         this.query(`
-        insert into hoffmation_schema."AcDeviceData" ("deviceID", "on", "date", "roomTemperature")
-        values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.temperature});
+      insert into hoffmation_schema."AcDeviceData" ("deviceID", "on", "date", "roomTemperature")
+      values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.temperature});
     `);
     }
     /** @inheritDoc */
@@ -383,8 +408,8 @@ $$;`);
             percentage = device.brightness;
         }
         this.query(`
-        insert into hoffmation_schema."ActuatorDeviceData" ("deviceID", "on", "date", "percentage")
-        values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${percentage !== null && percentage !== void 0 ? percentage : 'null'});
+      insert into hoffmation_schema."ActuatorDeviceData" ("deviceID", "on", "date", "percentage")
+      values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${percentage !== null && percentage !== void 0 ? percentage : 'null'});
     `);
     }
     /** @inheritDoc */
@@ -398,31 +423,31 @@ $$;`);
             desiredTemperature = null;
         }
         void this.query(`
-        insert into hoffmation_schema."HeaterDeviceData"
-        ("deviceID", "level", "date", "roomTemperature", "desiredTemperature", "seasonTurnOff", "windowOpen")
-        values ('${device.id}', ${device.iLevel}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'}, ${desiredTemperature !== null && desiredTemperature !== void 0 ? desiredTemperature : 'null'}, ${device.seasonTurnOff}, ${device.windowOpen});
+      insert into hoffmation_schema."HeaterDeviceData"
+      ("deviceID", "level", "date", "roomTemperature", "desiredTemperature", "seasonTurnOff", "windowOpen")
+      values ('${device.id}', ${device.iLevel}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'}, ${desiredTemperature !== null && desiredTemperature !== void 0 ? desiredTemperature : 'null'}, ${device.seasonTurnOff}, ${device.windowOpen});
     `);
     }
     /** @inheritDoc */
     persistHandleSensor(device) {
         const currentPos = device.position;
         this.query(`
-        insert into hoffmation_schema."HandleDeviceData" ("deviceID", "position", "date")
-        values ('${device.id}', ${currentPos}, '${new Date().toISOString()}');
+      insert into hoffmation_schema."HandleDeviceData" ("deviceID", "position", "date")
+      values ('${device.id}', ${currentPos}, '${new Date().toISOString()}');
     `);
     }
     /** @inheritDoc */
     persistSwitchInput(device, pressType, buttonName) {
         this.query(`
-        insert into hoffmation_schema."ButtonSwitchPresses" ("deviceID", "pressType", "buttonName", "date")
-        values ('${device.id}', ${pressType}, '${buttonName}', '${new Date().toISOString()}');
+      insert into hoffmation_schema."ButtonSwitchPresses" ("deviceID", "pressType", "buttonName", "date")
+      values ('${device.id}', ${pressType}, '${buttonName}', '${new Date().toISOString()}');
     `);
     }
     /** @inheritDoc */
     persistMotionSensor(device) {
         this.query(`
-        insert into hoffmation_schema."MotionSensorDeviceData" ("deviceID", "movementDetected", "date")
-        values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}');
+      insert into hoffmation_schema."MotionSensorDeviceData" ("deviceID", "movementDetected", "date")
+      values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}');
     `);
     }
     /** @inheritDoc */
@@ -430,8 +455,8 @@ $$;`);
         const currentLevel = device.currentLevel >= 0 ? device.currentLevel : null;
         const desiredLevel = device.desiredWindowShutterLevel >= 0 ? device.desiredWindowShutterLevel : null;
         this.query(`
-        insert into hoffmation_schema."ShutterDeviceData" ("deviceID", "position", "date", "desiredPosition")
-        values ('${device.id}', ${currentLevel}, '${new Date().toISOString()}', ${desiredLevel});
+      insert into hoffmation_schema."ShutterDeviceData" ("deviceID", "position", "date", "desiredPosition")
+      values ('${device.id}', ${currentLevel}, '${new Date().toISOString()}', ${desiredLevel});
     `);
     }
     /** @inheritDoc */
@@ -441,38 +466,38 @@ $$;`);
             roomTemp = null;
         }
         this.query(`
-        insert into hoffmation_schema."TemperatureSensorDeviceData" ("deviceID", "temperature", "date", "roomTemperature")
-        values ('${device.id}', ${device.iTemperature}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'});
+      insert into hoffmation_schema."TemperatureSensorDeviceData" ("deviceID", "temperature", "date", "roomTemperature")
+      values ('${device.id}', ${device.iTemperature}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'});
     `);
     }
     /** @inheritDoc */
     persistHumiditySensor(device) {
         this.query(`
-        insert into hoffmation_schema."HumiditySensorDeviceData" ("deviceID", "humidity", "date")
-        values ('${device.id}', ${device.humidity}, '${new Date().toISOString()}');
+      insert into hoffmation_schema."HumiditySensorDeviceData" ("deviceID", "humidity", "date")
+      values ('${device.id}', ${device.humidity}, '${new Date().toISOString()}');
     `);
     }
     /** @inheritDoc */
     persistBatteryDevice(device) {
         this.query(`
-        insert into hoffmation_schema."BatteryDeviceData" ("deviceID", "battery", "date")
-        values ('${device.id}', ${utils_1.Utils.round(device.batteryLevel, 1)}, '${new Date().toISOString()}');
+      insert into hoffmation_schema."BatteryDeviceData" ("deviceID", "battery", "date")
+      values ('${device.id}', ${utils_1.Utils.round(device.batteryLevel, 1)}, '${new Date().toISOString()}');
     `);
     }
     /** @inheritDoc */
     persistZigbeeDevice(device) {
         const dateValue = device.lastUpdate.getTime() > 0 ? `'${device.lastUpdate.toISOString()}'` : 'null';
         this.query(`
-        insert into hoffmation_schema."ZigbeeDeviceData" ("deviceID", "date", "available", "linkQuality", "lastUpdate")
-        values ('${device.id}', '${new Date().toISOString()}', ${device.available}, ${device.linkQuality},
-                ${dateValue});
+      insert into hoffmation_schema."ZigbeeDeviceData" ("deviceID", "date", "available", "linkQuality", "lastUpdate")
+      values ('${device.id}', '${new Date().toISOString()}', ${device.available}, ${device.linkQuality},
+              ${dateValue});
     `);
     }
     /** @inheritDoc */
     persistIlluminationSensor(device) {
         this.query(`
-        insert into hoffmation_schema."IlluminationSensorDeviceData" ("deviceID", "illumination", "date")
-        values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString()}');`);
+      insert into hoffmation_schema."IlluminationSensorDeviceData" ("deviceID", "illumination", "date")
+      values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString()}');`);
     }
     /** @inheritDoc */
     persistShutterCalibration(_data) {
@@ -481,23 +506,23 @@ $$;`);
     /** @inheritDoc */
     persistEnergyManager(calc) {
         this.query(`
-        insert into hoffmation_schema."EnergyCalculation" ("startDate", "endDate", "selfConsumedKwH", "injectedKwH",
-                                                           "drawnKwH", "batteryStoredKwH", "batteryLevel")
-        values ('${new Date(calc.startMs).toISOString()}', '${new Date(calc.endMs).toISOString()}',
-                ${calc.selfConsumedKwH}, ${calc.injectedKwH}, ${calc.drawnKwH}, ${calc.batteryStoredKwH},
-                ${calc.batteryLevel});
+      insert into hoffmation_schema."EnergyCalculation" ("startDate", "endDate", "selfConsumedKwH", "injectedKwH",
+                                                         "drawnKwH", "batteryStoredKwH", "batteryLevel")
+      values ('${new Date(calc.startMs).toISOString()}', '${new Date(calc.endMs).toISOString()}',
+              ${calc.selfConsumedKwH}, ${calc.injectedKwH}, ${calc.drawnKwH}, ${calc.batteryStoredKwH},
+              ${calc.batteryLevel});
     `);
     }
     /** @inheritDoc */
     persistSettings(id, settings, customName) {
         this.query(`
-        insert into hoffmation_schema."Settings" (id, settings, customname, date)
-        values ('${id}', '${settings}', '${customName}', '${new Date().toISOString()}') ON CONFLICT (id, date)
+      insert into hoffmation_schema."Settings" (id, settings, customname, date)
+      values ('${id}', '${settings}', '${customName}', '${new Date().toISOString()}') ON CONFLICT (id, date)
     DO
-        UPDATE SET
-            settings = '${settings}',
-            customname = '${customName}'
-        ;
+      UPDATE SET
+        settings = '${settings}',
+        customname = '${customName}'
+      ;
     `);
     }
     /** @inheritDoc */
@@ -506,7 +531,7 @@ $$;`);
        from hoffmation_schema."Settings"
        WHERE "id" = '${id}'
        ORDER BY "date" DESC
-           LIMIT 1`);
+         LIMIT 1`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0].settings;
         }