hoffmation-base 1.1.46 → 1.2.0

package/lib/server/services/dbo/iPersist.d.ts

@@ -1,16 +1,15 @@
-import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter, iTemperatureSensor } from '../../devices';
-import { CountToday, CurrentIlluminationDataPoint, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iHeater, iHumiditySensor, iIlluminationSensor, iMotionSensor, iShutter, iTemperatureSensor, ZigbeeDevice } from '../../devices';
+import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration } from '../../../models';
 export interface iPersist {
     initialized: boolean;
-    addTemperaturDataPoint(heater: iHeater): void;
     addRoom(room: RoomBase): void;
     addDevice(device: iBaseDevice): void;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getLastDesiredPosition(device: iShutter): Promise<DesiredShutterPosition>;
-    getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
+    getShutterCalibration(device: iShutter): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistShutterCalibration(data: ShutterCalibration): void;
-    persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
+    persistIlluminationSensor(device: iIlluminationSensor): void;
     persistEnergyManager(energyData: EnergyCalculation): void;
     persistAC(device: iAcDevice): void;
     persistActuator(device: iActuator): void;
@@ -19,5 +18,7 @@ export interface iPersist {
     persistSwitchInput(device: iButtonSwitch, pressType: ButtonPressType, buttonName: string): void;
     persistShutter(device: iShutter): void;
     persistTemperatureSensor(device: iTemperatureSensor): void;
-    readTemperaturDataPoint(hzGrp: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
+    persistHumiditySensor(device: iHumiditySensor): void;
+    persistBatteryDevice(device: iBatteryDevice): void;
+    persistZigbeeDevice(device: ZigbeeDevice): void;
 }

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

@@ -1,6 +1,6 @@
 import { iPersist } from './iPersist';
-import { CountToday, CurrentIlluminationDataPoint, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter, iTemperatureSensor } from '../../devices';
+import { CountToday, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration } from '../../../models';
+import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iBatteryDevice, iButtonSwitch, iHeater, iHumiditySensor, iIlluminationSensor, iMotionSensor, iShutter, iTemperatureSensor, ZigbeeDevice } from '../../devices';
 import { PoolConfig } from 'pg';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
@@ -9,10 +9,9 @@ export declare class PostgreSqlPersist implements iPersist {
     constructor(conf: PoolConfig);
     addRoom(room: RoomBase): void;
     addDevice(device: iBaseDevice): void;
-    addTemperaturDataPoint(heater: iHeater): void;
     getLastDesiredPosition(device: iShutter): Promise<DesiredShutterPosition>;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
-    getShutterCalibration(_device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
+    getShutterCalibration(_device: iShutter): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistAC(device: iAcDevice): void;
     persistActuator(device: iActuator): void;
@@ -21,9 +20,11 @@ export declare class PostgreSqlPersist implements iPersist {
     persistMotionSensor(device: iMotionSensor): void;
     persistShutter(device: iShutter): void;
     persistTemperatureSensor(device: iTemperatureSensor): void;
-    persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
+    persistHumiditySensor(device: iHumiditySensor): void;
+    persistBatteryDevice(device: iBatteryDevice): void;
+    persistZigbeeDevice(device: ZigbeeDevice): void;
+    persistIlluminationSensor(device: iIlluminationSensor): void;
     persistShutterCalibration(_data: ShutterCalibration): void;
-    readTemperaturDataPoint(heater: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
     persistEnergyManager(calc: EnergyCalculation): void;
     private query;
     private isPsqlReady;

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

@@ -32,24 +32,6 @@ values ('${device.id}','${device.info.room}','${device.info.allDevicesKey}','${d
         "alldeviceskey" = '${device.info.allDevicesKey}',
         "customname" = '${device.info.customName}',
         "devtype" = ${device.deviceType}
-;
-    `);
-    }
-    addTemperaturDataPoint(heater) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
-        this.query(`
-insert into hoffmation_schema."TemperaturData" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel / 100},'${heater.info.customName}',${heater.desiredTemperature});`);
-        this.query(`
-insert into hoffmation_schema."HeatGroupCollection" ("date", "humidity", "istTemperatur", "level", "name", "sollTemperatur")
-values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},${heater.iLevel},'${heater.info.customName}',${heater.desiredTemperature})
-    ON CONFLICT (name)
-    DO UPDATE SET
-        "date" = '${new Date().toISOString()}',
-        "humidity" = ${heater.humidity},
-        "istTemperatur" = ${heater.iTemperature},
-        "level" = ${heater.iLevel},
-        "sollTemperatur" = ${heater.desiredTemperature}
 ;
     `);
     }
@@ -122,16 +104,17 @@ BEGIN
 
   END IF;
 
-  IF (SELECT to_regclass('hoffmation_schema."CurrentIllumination"') IS NULL) Then
-    create table hoffmation_schema."CurrentIllumination"
+  IF (SELECT to_regclass('hoffmation_schema."IlluminationSensorDeviceData"') IS NULL) Then
+    create table hoffmation_schema."IlluminationSensorDeviceData"
     (
-        "roomName"            varchar(30)
-            constraint currentillumination_basicrooms_name_fk
-                references hoffmation_schema."BasicRooms",
-        "deviceID"            integer not null,
-        "currentIllumination" double precision,
-        date                  timestamp with time zone,
-        "lightIsOn"           boolean
+        "deviceID"         varchar(60) not null
+            constraint "IlluminationSensorDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        "illumination" int,
+        date               timestamp   not null,
+        constraint IlluminationSensorDeviceData_pk
+          primary key ("deviceID", date)
     );
 
   END IF;
@@ -168,23 +151,6 @@ BEGIN
     create unique index energycalculation_startdate_uindex
       on hoffmation_schema."EnergyCalculation" ("startDate");
 
-  END IF;
-  IF (SELECT to_regclass('hoffmation_schema."HeatGroupCollection"') IS NULL) Then
-    create table hoffmation_schema."HeatGroupCollection"
-    (
-        date             timestamp,
-        humidity         integer,
-        "istTemperatur"  double precision,
-        level            integer,
-        name             varchar(60) not null
-            constraint heatgroupcollection_pk
-                primary key,
-        "sollTemperatur" double precision
-    );
-
-    create unique index heatgroupcollection_name_uindex
-      on hoffmation_schema."HeatGroupCollection" (name);
-
   END IF;
 
   IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then    
@@ -207,6 +173,7 @@ BEGIN
         "deviceID" varchar(60) not null,
         "on"       boolean,
         date       timestamp   not null,
+        percentage integer,
         constraint ActuatorDeviceData_pk
             primary key ("deviceID", date)
     );
@@ -257,6 +224,53 @@ BEGIN
     
   END IF;
 
+  IF (SELECT to_regclass('hoffmation_schema."HumiditySensorDeviceData"') IS NULL) Then  
+    create table if not exists hoffmation_schema."HumiditySensorDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "HumiditySensorDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        humidity          double precision,
+        date              timestamp   not null,
+        constraint humiditysensordevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+  END IF;
+
+  IF (SELECT to_regclass('hoffmation_schema."BatteryDeviceData"') IS NULL) Then  
+    create table if not exists hoffmation_schema."BatteryDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "BatteryDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        battery          double precision,
+        date              timestamp   not null,
+        constraint batterydevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+  END IF;
+
+  IF (SELECT to_regclass('hoffmation_schema."ZigbeeDeviceData"') IS NULL) Then
+    create table if not exists hoffmation_schema."ZigbeeDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "ZigbeeDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        date              timestamp   not null,
+        available          boolean,
+        linkQuality          double precision,
+        lastUpdate          timestamp,
+        constraint zigbeedevicedata_pk
+            primary key ("deviceID", date)
+    );
+
+  END IF;
+
   
     
   IF (SELECT to_regclass('hoffmation_schema."HeaterDeviceData"') IS NULL) Then
@@ -275,21 +289,6 @@ BEGIN
     );
     
   END IF;
-    
-  IF (SELECT to_regclass('hoffmation_schema."TemperaturData"') IS NULL) Then
-    create table hoffmation_schema."TemperaturData"
-    (
-        date             timestamp,
-        humidity         integer,
-        "istTemperatur"  double precision,
-        level            integer,
-        name             text,
-        "sollTemperatur" double precision,
-        constraint temperaturdata_pk
-            unique (date, name)
-    );
-    
-  END IF;
 END
 $$;`);
         this.initialized = true;
@@ -355,26 +354,32 @@ insert into hoffmation_schema."TemperatureSensorDeviceData" ("deviceID", "temper
 values ('${device.id}', ${device.iTemperature}, '${new Date().toISOString()}', ${roomTemp !== null && roomTemp !== void 0 ? roomTemp : 'null'});
     `);
     }
-    persistCurrentIllumination(data) {
+    persistHumiditySensor(device) {
         this.query(`
-insert into hoffmation_schema."CurrentIllumination" ("roomName", "deviceID", "currentIllumination", "date", "lightIsOn")
-values ('${data.roomName}','${data.deviceID}',${data.currentIllumination},'${data.date.toISOString()}',${data.lightIsOn});
+insert into hoffmation_schema."HumiditySensorDeviceData" ("deviceID", "humidity", "date")
+values ('${device.id}', ${device.humidity}, '${new Date().toISOString()}');
     `);
     }
-    persistShutterCalibration(_data) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres doesn't support Shutter Calibration yet.`);
+    persistBatteryDevice(device) {
+        this.query(`
+insert into hoffmation_schema."BatteryDeviceData" ("deviceID", "battery", "date")
+values ('${device.id}', ${device.battery}, '${new Date().toISOString()}');
+    `);
     }
-    async readTemperaturDataPoint(heater, limit) {
-        const dbResult = await this.query(`
-SELECT * FROM hoffmation_schema."TemperaturData" 
-WHERE name = '${heater.info.customName}'
-ORDER BY "date" DESC
-LIMIT ${limit}
+    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}');
     `);
-        if (dbResult !== null && dbResult.length > 0) {
-            return dbResult;
-        }
-        return [];
+    }
+    persistIlluminationSensor(device) {
+        this.query(`
+insert into hoffmation_schema."IlluminationSensorDeviceData" ("deviceID", "illumination", "date")
+values ('${device.id}', ${device.currentIllumination}, '${new Date().toISOString()}');`);
+    }
+    persistShutterCalibration(_data) {
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Postgres doesn't support Shutter Calibration yet.`);
     }
     persistEnergyManager(calc) {
         this.query(`

package/lib/server/services/time-callback-service.js

@@ -62,7 +62,7 @@ class TimeCallbackService {
             }
         }
         let sunset = new Date(TimeCallbackService._todaySunSet.getTime() + pOffset.sunset * 60 * 1000);
-        const maximumSunset = pOffset.getNextMaximumSunset();
+        const maximumSunset = pOffset.getNextMaximumSunset(now);
         if (maximumSunset.getDate() !== sunset.getDate()) {
             maximumSunset.setDate(maximumSunset.getDate() - 1);
         }
@@ -73,7 +73,7 @@ class TimeCallbackService {
         if (now > sunset) {
             return models_1.TimeOfDay.AfterSunset;
         }
-        const minimumSunrise = pOffset.getNextMinimumSunrise();
+        const minimumSunrise = pOffset.getNextMinimumSunrise(now);
         let sunrise = new Date(TimeCallbackService._todaySunRise.getTime() + pOffset.sunrise * 60 * 1000);
         if (minimumSunrise.getDate() !== sunrise.getDate()) {
             minimumSunrise.setDate(minimumSunrise.getDate() - 1);

package/lib/server/services/utils/iDisposeable.d.ts

@@ -0,0 +1,3 @@
+export interface iDisposable {
+    dispose(): void;
+}

package/lib/server/services/utils/iDisposeable.js

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

package/lib/server/services/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ringstorage';
 export * from './utils';
+export * from './iDisposeable';

package/lib/server/services/utils/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ringstorage"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./iDisposeable"), exports);