hoffmation-base 3.0.0-beta.8 → 3.0.0

package/lib/server/devices/zigbee/BaseDevices/zigbeeWindowHandle.d.ts

@@ -5,6 +5,7 @@ import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { WindowPosition } from '../../models';
 import { Window } from '../../groups';
+import { HandleChangeAction } from '../../../../models';
 import { HandleSettings } from '../../../../models/deviceSettings/handleSettings';
 export declare class ZigbeeWindowHandle extends ZigbeeDevice implements iHandleSensor, iBatteryDevice {
     /** @inheritDoc */
@@ -31,6 +32,8 @@ export declare class ZigbeeWindowHandle extends ZigbeeDevice implements iHandleS
     /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     /** @inheritDoc */
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     private toWindowPosition;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeWindowHandle.js

@@ -52,6 +52,10 @@ class ZigbeeWindowHandle extends index_1.ZigbeeDevice {
         this.handleSensor.addClosedCallback(pCallback);
     }
     /** @inheritDoc */
+    addHandleChangeCallback(cb) {
+        this.handleSensor.addHandleChangeCallback(cb);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {

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);
@@ -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'
@@ -356,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 */
@@ -382,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 */
@@ -413,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 */
@@ -424,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) {
@@ -463,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::text, id, date
-from hoffmation_schema."Settings" 
-WHERE "id" = '${id}'
-ORDER BY "date" DESC
-LIMIT 1`);
+       from hoffmation_schema."Settings"
+       WHERE "id" = '${id}'
+       ORDER BY "date" DESC
+           LIMIT 1`);
         if (dbResult !== null && dbResult.length > 0) {
             return dbResult[0].settings;
         }