hoffmation-base 3.0.0-beta.0 → 3.0.0-beta.10

package/lib/server/devices/zigbee/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeTuyaMotion = void 0;
 __exportStar(require("./BaseDevices/index"), exports);
 __exportStar(require("./zigbeeAqaraMagnetContact"), exports);
 __exportStar(require("./zigbeeAqaraOpple3Switch"), exports);
@@ -41,3 +42,5 @@ __exportStar(require("./zigbeeTuyaValve"), exports);
 __exportStar(require("./zigbeeUbisysActuator"), exports);
 __exportStar(require("./zigbeeUbisysLampe"), exports);
 __exportStar(require("./zigbeeUbisysShutter"), exports);
+var zigbeeTuyaMotion_1 = require("./zigbeeTuyaMotion");
+Object.defineProperty(exports, "ZigbeeTuyaMotion", { enumerable: true, get: function () { return zigbeeTuyaMotion_1.ZigbeeTuyaMotion; } });

package/lib/server/devices/zigbee/zigbeeEuroHeater.d.ts

@@ -22,7 +22,7 @@ export declare class ZigbeeEuroHeater extends ZigbeeHeater implements iDisposabl
     get desiredTemperature(): number;
     /** @inheritDoc */
     set desiredTemperature(val: number);
-    protected set roomTemperatur(value: number);
+    protected set roomTemperature(value: number);
     private get tempDiff();
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

package/lib/server/devices/zigbee/zigbeeEuroHeater.js

@@ -39,7 +39,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
     }
     /** @inheritDoc */
     get roomTemperature() {
-        return this._roomTemperature;
+        return super.roomTemperature;
     }
     /** @inheritDoc */
     get desiredTemperature() {
@@ -50,8 +50,8 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         this._desiredTemperatur = val;
         this.recalcLevel();
     }
-    set roomTemperatur(value) {
-        this._roomTemperature = value;
+    set roomTemperature(value) {
+        super.roomTemperature = value;
         if (this.settings.useOwnTemperatur) {
             return;
         }
@@ -134,7 +134,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
             return;
         }
         this._lastRecalc = services_1.Utils.nowMS();
-        const desiredDiff = services_1.Utils.round(this.desiredTemperature - this._roomTemperature, 1);
+        const desiredDiff = services_1.Utils.round(this.desiredTemperature - this.roomTemperature, 1);
         const currentDiff = this.tempDiff;
         const missingDiff = services_1.Utils.round(desiredDiff - currentDiff, 1);
         if (Math.abs(missingDiff) < 0.15) {
@@ -150,7 +150,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         }
         const newLocalDiff = Math.sign(desiredDiff) * -9;
         this.setLocalDiff(newLocalDiff);
-        this.setTargetTemperatur(this._temperatur + this._roomTemperature + newLocalDiff + this.desiredTemperature);
+        this.setTargetTemperatur(this._temperatur + this.roomTemperature + newLocalDiff + this.desiredTemperature);
     }
     setLocalDiff(newLocalDiff) {
         this.log(models_1.LogLevel.Debug, `Setting new Local Calibration Diff (${newLocalDiff}) for Euro Valve`);

package/lib/server/devices/zigbee/zigbeeSodaHandle.d.ts

@@ -3,6 +3,10 @@ import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HumiditySensor, TemperatureSensor } from '../sharedFunctions';
 import { HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
+/**
+ * A smart window handle with integrated temperature and humidity sensor.
+ * As the temperature sensor is so close to the window it might be off, which is why the correction coefficient is set to 0.21°C per outdoor diff to 21°C
+ */
 export declare class ZigbeeSodaHandle extends ZigbeeWindowHandle implements iTemperatureSensor, iHumiditySensor {
     /** @inheritDoc */
     temperatureSensor: TemperatureSensor;

package/lib/server/devices/zigbee/zigbeeSodaHandle.js

@@ -6,6 +6,10 @@ const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
 const sharedFunctions_1 = require("../sharedFunctions");
 const models_1 = require("../../../models");
+/**
+ * A smart window handle with integrated temperature and humidity sensor.
+ * As the temperature sensor is so close to the window it might be off, which is why the correction coefficient is set to 0.21°C per outdoor diff to 21°C
+ */
 class ZigbeeSodaHandle extends BaseDevices_1.ZigbeeWindowHandle {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSodaHandle);
@@ -15,6 +19,7 @@ class ZigbeeSodaHandle extends BaseDevices_1.ZigbeeWindowHandle {
         this.humiditySensor = new sharedFunctions_1.HumiditySensor(this);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
+        this.temperatureSensor.outdoorTemperatureCorrectionCoefficient = 0.21;
     }
     /** @inheritDoc */
     get roomTemperature() {
@@ -81,7 +86,7 @@ class ZigbeeSodaHandle extends BaseDevices_1.ZigbeeWindowHandle {
         if (!this.window) {
             return;
         }
-        const command = new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 0, 'Button on handle was pressed');
+        const command = new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 100, 'Button on handle was pressed');
         this.window.setDesiredPosition(command);
     }
     onButtonRightPressed() {
@@ -89,7 +94,7 @@ class ZigbeeSodaHandle extends BaseDevices_1.ZigbeeWindowHandle {
         if (!this.window) {
             return;
         }
-        const command = new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 100, 'Button on handle was pressed');
+        const command = new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 0, 'Button on handle was pressed');
         this.window.setDesiredPosition(command);
     }
 }

package/lib/server/devices/zigbee/zigbeeTuyaMotion.d.ts

@@ -0,0 +1,7 @@
+import { ZigbeeMotionSensor } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+export declare class ZigbeeTuyaMotion extends ZigbeeMotionSensor {
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+}

package/lib/server/devices/zigbee/zigbeeTuyaMotion.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeTuyaMotion = void 0;
+const BaseDevices_1 = require("./BaseDevices");
+const deviceType_1 = require("../deviceType");
+const models_1 = require("../../../models");
+class ZigbeeTuyaMotion extends BaseDevices_1.ZigbeeMotionSensor {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeTuyaMotion);
+        this._needsMovementResetFallback = false;
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false) {
+        this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        super.update(idSplit, state, initial, true);
+    }
+}
+exports.ZigbeeTuyaMotion = ZigbeeTuyaMotion;

package/lib/server/devices/zigbee/zigbeeTuyaValve.d.ts

@@ -16,8 +16,9 @@ export declare class ZigbeeTuyaValve extends ZigbeeHeater {
     set seasonTurnOff(value: boolean);
     /** @inheritDoc */
     set desiredTemperature(val: number);
+    get roomTemperature(): number;
     /** @inheritDoc */
-    protected set roomTemperatur(value: number);
+    protected set roomTemperature(value: number);
     private get tempDiff();
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

package/lib/server/devices/zigbee/zigbeeTuyaValve.js

@@ -31,9 +31,12 @@ class ZigbeeTuyaValve extends BaseDevices_1.ZigbeeHeater {
         this._desiredTemperatur = val;
         this.checkTempDiff();
     }
+    get roomTemperature() {
+        return super.roomTemperature;
+    }
     /** @inheritDoc */
-    set roomTemperatur(value) {
-        this._roomTemperature = value;
+    set roomTemperature(value) {
+        super.roomTemperature = value;
         if (this.settings.useOwnTemperatur) {
             return;
         }
@@ -81,7 +84,7 @@ class ZigbeeTuyaValve extends BaseDevices_1.ZigbeeHeater {
         if (this.settings.useOwnTemperatur) {
             return;
         }
-        const desiredDiff = services_1.Utils.round(this.desiredTemperature - this._roomTemperature, 1);
+        const desiredDiff = services_1.Utils.round(this.desiredTemperature - this.roomTemperature, 1);
         const currentDiff = this.tempDiff;
         const missingDiff = services_1.Utils.round(desiredDiff - currentDiff, 1);
         if (Math.abs(missingDiff) < 0.15) {
@@ -97,7 +100,7 @@ class ZigbeeTuyaValve extends BaseDevices_1.ZigbeeHeater {
         }
         const newLocalDiff = Math.sign(desiredDiff) * -9;
         this.setLocalDiff(newLocalDiff);
-        this.setTargetTemperatur(this._localTempVal + this._roomTemperature + newLocalDiff + this.desiredTemperature);
+        this.setTargetTemperatur(this._localTempVal + this.roomTemperature + newLocalDiff + this.desiredTemperature);
     }
     setLocalDiff(newLocalDiff) {
         this.log(models_1.LogLevel.Debug, `Setting new Local Calibration Diff (${newLocalDiff}) for Tuya Valve`);

package/lib/server/services/Sonos/mp3-server.js

@@ -44,6 +44,12 @@ class MP3Server {
                 response.end('ungültige Anfrage', 'utf-8');
                 return;
             }
+            req.on('error', (e) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `MP3-Server HTTP Error: ${e}`);
+            });
+            response.on('error', (e) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `MP3-Server HTTP Error: ${e}`);
+            });
             const q = url.parse(req.url, true).query;
             const fName = q.fname;
             if (!fName || fName.indexOf('.') >= 0) {

package/lib/server/services/Telegram/telegram-service.js

@@ -45,6 +45,15 @@ class TelegramService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Telegram Polling Error: ${e.message}`);
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Telegram Polling Error stack: ${e.stack}`);
         });
+        this.bot.on('webhook_error', (e) => {
+            /*
+            if (!this.reinitiliazeWithTimeout()) {
+              return;
+            }
+             */
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Telegram Webhook Error: ${e.message}`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Telegram Webhook Error stack: ${e.stack}`);
+        });
         TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('helpCommand', /\/help/, async (m) => {
             if (m.from === undefined)
                 return true;

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -5,7 +5,6 @@ const models_1 = require("../../../models");
 const devices_1 = require("../../devices");
 const pg_1 = require("pg");
 const log_service_1 = require("../log-service");
-const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const utils_1 = require("../utils");
 class PostgreSqlPersist {
     constructor(conf) {
@@ -17,36 +16,39 @@ class PostgreSqlPersist {
     /** @inheritDoc */
     addRoom(room) {
         this.query(`
-insert into hoffmation_schema."BasicRooms" (name, etage)
-values ('${room.roomName}',${room.etage})
-    ON CONFLICT (name)
-    DO UPDATE SET
-        etage = ${room.etage}
-;
+        insert into hoffmation_schema."BasicRooms" (name, etage)
+        values ('${room.roomName}', ${room.etage}) ON CONFLICT (name)
+    DO
+        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")
-    DO UPDATE SET
-        "roomname" = '${device.info.room}',
-        "alldeviceskey" = '${device.info.allDevicesKey}',
-        "customname" = '${device.info.customName}',
-        "devtype" = ${device.deviceType}
-;
+        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}
+        ;
     `);
     }
     /** @inheritDoc */
     async getLastDesiredPosition(device) {
         const dbResult = await this.query(`SELECT position
-from hoffmation_schema."ShutterDeviceData"
-WHERE "deviceID" = '${device.id}'
-and date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '1 DAY'
-ORDER BY date desc
-Limit 1`);
+       from hoffmation_schema."ShutterDeviceData"
+       WHERE "deviceID" = '${device.id}'
+         and date >= CURRENT_DATE
+         AND date
+           < CURRENT_DATE + INTERVAL '1 DAY'
+       ORDER BY date desc
+           Limit 1`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0];
         }
@@ -55,9 +57,13 @@ Limit 1`);
     }
     /** @inheritDoc */
     async motionSensorTodayCount(device) {
-        const dbResult = await this.query(`SELECT Count(*) 
-from hoffmation_schema."MotionSensorDeviceData" 
-WHERE "deviceID" = '${device.id}' and "movementDetected" and date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '1 DAY'`);
+        const dbResult = await this.query(`SELECT Count(*)
+       from hoffmation_schema."MotionSensorDeviceData"
+       WHERE "deviceID" = '${device.id}'
+         and "movementDetected"
+         and date >= CURRENT_DATE
+         AND date
+           < CURRENT_DATE + INTERVAL '1 DAY'`);
         if (dbResult !== null && dbResult.length > 0) {
             const result = dbResult[0];
             result.count = Number(result.count);
@@ -318,7 +324,7 @@ BEGIN
     create table if not exists hoffmation_schema."Settings"
     (
         "id"            varchar(60) not null,
-        "settings"      varchar not null,
+        "settings"      jsonb not null,
         "customname"    varchar(100) not null,
         date            timestamp   not null,
         constraint settings_pk
@@ -335,6 +341,15 @@ BEGIN
       add "batteryStoredKwH" double precision;
   END IF;
   
+  IF (SELECT COUNT(column_name) = 0
+    FROM information_schema.columns
+    WHERE table_name = 'HeaterDeviceData'
+      and column_name = 'windowOpen') Then
+    alter table hoffmation_schema."HeaterDeviceData"
+    add "windowOpen" boolean;
+  END IF;
+  
+  
   IF (SELECT COUNT(column_name) = 0
     FROM information_schema.columns
     WHERE table_name = 'EnergyCalculation'
@@ -342,6 +357,12 @@ BEGIN
     alter table hoffmation_schema."EnergyCalculation"
       add "batteryLevel" double precision;
   END IF;
+  IF (SELECT pg_typeof(settings) = to_regtype('varchar')
+      FROM hoffmation_schema."Settings"
+      LIMIT 1) THEN
+      alter table hoffmation_schema."Settings"
+          alter column settings type jsonb using settings::jsonb;
+  END IF;
 END
 $$;`);
         this.initialized = true;
@@ -350,19 +371,19 @@ $$;`);
     /** @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 */
     persistActuator(device) {
         let percentage = undefined;
-        if (device.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
+        if (device.deviceCapabilities.includes(devices_1.DeviceCapability.dimmablelamp)) {
             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 */
@@ -376,30 +397,31 @@ values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${p
             desiredTemperature = null;
         }
         void this.query(`
-insert into hoffmation_schema."HeaterDeviceData" ("deviceID", "level", "date", "roomTemperature", "desiredTemperature", "seasonTurnOff")
-values ('${device.id}', ${device.iLevel}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'}, ${desiredTemperature !== null && desiredTemperature !== void 0 ? desiredTemperature : 'null'}, ${device.seasonTurnOff});
+        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 */
@@ -407,8 +429,8 @@ values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}
         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 */
@@ -418,37 +440,38 @@ values ('${device.id}', ${currentLevel}, '${new Date().toISOString()}', ${desire
             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) {
@@ -457,31 +480,32 @@ values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString
     /** @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)
-    DO UPDATE SET
-        settings = '${settings}',
-        customname = '${customName}'
-;
+        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}'
+        ;
     `);
     }
     /** @inheritDoc */
     async loadSettings(id) {
-        const dbResult = await this.query(`SELECT settings, id, date
-from hoffmation_schema."Settings" 
-WHERE "id" = '${id}'
-ORDER BY "date" DESC
-LIMIT 1`);
+        const dbResult = await this.query(`SELECT settings::text, id, date
+       from hoffmation_schema."Settings"
+       WHERE "id" = '${id}'
+       ORDER BY "date" DESC
+           LIMIT 1`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0].settings;
         }

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

@@ -44,6 +44,9 @@ class HTTPSService {
                 var _a;
                 responseCallback(responseData.join(''), (_a = res.statusCode) !== null && _a !== void 0 ? _a : 0);
             });
+            res.on('error', (e) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `HTTPS Error: ${e}`);
+            });
         });
         req.on('error', (e) => {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `HTTPS Error: ${e}`);

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

@@ -219,6 +219,7 @@ class WeatherService {
         }
         const host = 'api.openweathermap.org';
         const path = `/data/3.0/onecall?lat=${WeatherService.latitude}&lon=${WeatherService.longitude}&appid=${WeatherService.appID}&units=metric&lang=de`;
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, 'Send WeatherAPi Request for data update.');
         https_service_1.HTTPSService.request(new HTTPSOptions_1.HTTPSOptions(host, path, {}, 'GET', 443), '', 5, (response) => {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, 'WeatherAPi Response erhalten');
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `WeatherAPi Response: ${response}`);