hoffmation-base 1.1.38 → 1.1.40

package/lib/index.js

@@ -37,7 +37,7 @@ class HoffmationBase {
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
         if (initObject.config.persistence) {
             if (initObject.config.persistence.postgreSql) {
-                server_1.Utils.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence);
+                server_1.Utils.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence.postgreSql);
             }
             await ((_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.initialize());
         }

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

@@ -67,7 +67,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         switch (idSplit[3]) {
             case 'valve_position':
                 this.log(models_1.LogLevel.Trace, `Euro Valve valve_position Update for ${this.info.customName} to "${state.val}"`);
-                this._level = state.val;
+                this._level = state.val / 100;
                 break;
             case 'local_temp':
                 this.log(models_1.LogLevel.Trace, `Euro Valve Local_Temp Update for ${this.info.customName} to "${state.val}"`);
@@ -87,13 +87,9 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
             case 'spz_trv_mode':
                 this.log(models_1.LogLevel.Trace, `Euro Valve mode Update for ${this.info.customName} to "${state.val}"`);
                 this._mode = state.val;
-                if (!this.settings.seasonalTurnOffActive) {
-                    if (this.settings.controlByPid && this._mode == 2) {
-                        this.setMode(1);
-                    }
-                    else if (this._mode == 1) {
-                        this.setMode(2);
-                    }
+                const desiredMode = this.settings.controlByPid ? 1 : 2;
+                if (!this.settings.seasonalTurnOffActive && this._mode !== desiredMode) {
+                    this.setMode(desiredMode);
                 }
                 break;
             case 'target_temperature':

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

@@ -42,7 +42,7 @@ class ZigbeeTuyaValve extends BaseDevices_1.ZigbeeHeater {
         switch (idSplit[3]) {
             case 'valve_position':
                 this.log(models_1.LogLevel.Trace, `Tuya Valve valve_position Update for ${this.info.customName} to "${state.val}"`);
-                this._level = state.val;
+                this._level = state.val / 100;
                 break;
             case 'local_temp':
                 this.log(models_1.LogLevel.Trace, `Tuya Valve Local_Temp Update for ${this.info.customName} to "${state.val}"`);

package/lib/server/services/ac/ac-device.js

@@ -108,7 +108,7 @@ class AcDevice {
     }
     persist() {
         var _a;
-        if (!utils_1.Utils.anyDboActive) {
+        if (!utils_1.Utils.anyDboActive || this.on === undefined) {
             return;
         }
         (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistAC(this);

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

@@ -1,11 +1,12 @@
 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 { iPersistenceSettings } from '../../config';
+import { PoolConfig } from 'pg';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
     private readonly psql;
-    constructor(config: iPersistenceSettings);
+    private readonly config;
+    constructor(conf: PoolConfig);
     addRoom(room: RoomBase): void;
     addDevice(device: iBaseDevice): void;
     addTemperaturDataPoint(heater: iHeater): void;

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

@@ -7,10 +7,10 @@ const pg_1 = require("pg");
 const log_service_1 = require("../log-service");
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class PostgreSqlPersist {
-    constructor(config) {
+    constructor(conf) {
         this.initialized = false;
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        this.psql = new pg_1.Pool(config.postgreSql);
+        this.config = conf;
+        this.psql = new pg_1.Pool(this.config);
     }
     addRoom(room) {
         this.query(`
@@ -39,7 +39,7 @@ values ('${device.id}','${device.info.room}','${device.info.allDevicesKey}','${d
         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},'${heater.info.customName}',${heater.desiredTemperature});`);
+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})
@@ -90,232 +90,233 @@ WHERE "deviceID" = '${device.id}' and "movementDetected" and date >= CURRENT_DAT
         await this.psql.query(`
 DO $$
 BEGIN
-    IF (SELECT to_regclass('hoffmation_schema."BasicRooms"') IS NULL) Then
-create table "BasicRooms"
-(
-    name  varchar(30) not null
-        constraint table_name_pk
-            primary key,
-    etage integer
-);
+  IF (SELECT to_regclass('hoffmation_schema."BasicRooms"') IS NULL) Then
+    create table "BasicRooms"
+    (
+        name  varchar(30) not null
+            constraint table_name_pk
+                primary key,
+        etage integer
+    );
 
-alter table "BasicRooms"
-    owner to postgres;
+    alter table hoffmation_schema."BasicRooms"
+        owner to "${this.config.user}";
 
-create unique index table_name_name_uindex
-    on "BasicRooms" (name);
+    create unique index table_name_name_uindex
+        on "BasicRooms" (name);
 
-    END IF;
-IF (SELECT to_regclass('hoffmation_schema."DeviceInfo"') IS NULL) Then    
+  END IF;
+  
+  IF (SELECT to_regclass('hoffmation_schema."DeviceInfo"') IS NULL) Then    
     create table hoffmation_schema."DeviceInfo"
-(
-    deviceid      varchar(60) not null
-        constraint deviceinfo_pk
-            primary key,
-    roomname      varchar(30)
-        constraint "DeviceInfo_BasicRooms_null_fk"
-            references hoffmation_schema."BasicRooms",
-    alldeviceskey varchar(30),
-    customname    varchar(60),
-    devtype       integer
-);
+    (
+        deviceid      varchar(60) not null
+            constraint deviceinfo_pk
+                primary key,
+        roomname      varchar(30)
+            constraint "DeviceInfo_BasicRooms_null_fk"
+                references hoffmation_schema."BasicRooms",
+        alldeviceskey varchar(30),
+        customname    varchar(60),
+        devtype       integer
+    );
 
-alter table hoffmation_schema."DeviceInfo"
-    owner to postgres;
+    alter table hoffmation_schema."DeviceInfo"
+        owner to "${this.config.user}";
 
-    END IF;
+  END IF;
 
-    IF (SELECT to_regclass('hoffmation_schema."CurrentIllumination"') IS NULL) Then
-create table "CurrentIllumination"
-(
-    "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
-);
+  IF (SELECT to_regclass('hoffmation_schema."CurrentIllumination"') IS NULL) Then
+    create table hoffmation_schema."CurrentIllumination"
+    (
+        "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
+    );
 
-alter table "CurrentIllumination"
-    owner to postgres;
-    END IF;
+    alter table hoffmation_schema."CurrentIllumination"
+        owner to "${this.config.user}";
+  END IF;
     
-    IF (SELECT to_regclass('hoffmation_schema."ButtonSwitchPresses"') IS NULL) Then
-create table if not exists hoffmation_schema."ButtonSwitchPresses"
-(
-    "deviceID"         varchar(60) not null
-        constraint "ButtonSwitchPresses_DeviceInfo_null_fk"
-            references hoffmation_schema."DeviceInfo"
-            on delete set null,
-    "pressType" int,
-    "buttonName" varchar(30),
-    date               timestamp   not null,
-    constraint buttonswitchpresses_pk
-        primary key ("deviceID", "pressType", date)
-);
+  IF (SELECT to_regclass('hoffmation_schema."ButtonSwitchPresses"') IS NULL) Then
+    create table if not exists hoffmation_schema."ButtonSwitchPresses"
+    (
+        "deviceID"         varchar(60) not null
+            constraint "ButtonSwitchPresses_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        "pressType" int,
+        "buttonName" varchar(30),
+        date               timestamp   not null,
+        constraint buttonswitchpresses_pk
+            primary key ("deviceID", "pressType", date)
+    );
 
-alter table hoffmation_schema."ButtonSwitchPresses"
-    owner to postgres;
-    END IF;
+    alter table hoffmation_schema."ButtonSwitchPresses"
+        owner to "${this.config.user}";
+  END IF;
     
-    IF (SELECT to_regclass('hoffmation_schema."EnergyCalculation"') IS NULL) Then
-create table "EnergyCalculation"
-(
-    "startDate"           timestamp not null
-        constraint energycalculation_pk
-            primary key,
-    "endDate"             timestamp,
-    "selfConsumedKwH" double precision,
-    "injectedKwH"     double precision,
-    "drawnKwH"        double precision
-);
-
-alter table "EnergyCalculation"
-    owner to postgres;
-
-create unique index energycalculation_startdate_uindex
-    on "EnergyCalculation" ("startDate");
-
-    END IF;
-    IF (SELECT to_regclass('hoffmation_schema."HeatGroupCollection"') IS NULL) Then
-create table "HeatGroupCollection"
-(
-    date             timestamp,
-    humidity         integer,
-    "istTemperatur"  double precision,
-    level            integer,
-    name             varchar(60) not null
-        constraint heatgroupcollection_pk
-            primary key,
-    "sollTemperatur" double precision
-);
+  IF (SELECT to_regclass('hoffmation_schema."EnergyCalculation"') IS NULL) Then
+    create table hoffmation_schema."EnergyCalculation"
+    (
+        "startDate"           timestamp not null
+            constraint energycalculation_pk
+                primary key,
+        "endDate"             timestamp,
+        "selfConsumedKwH" double precision,
+        "injectedKwH"     double precision,
+        "drawnKwH"        double precision
+    );
 
-alter table "HeatGroupCollection"
-    owner to postgres;
+    alter table hoffmation_schema."EnergyCalculation"
+      owner to "${this.config.user}";
 
-create unique index heatgroupcollection_name_uindex
-    on "HeatGroupCollection" (name);
+    create unique index energycalculation_startdate_uindex
+      on "EnergyCalculation" ("startDate");
 
-    END IF;
+  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
+    );
 
-IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then    
-  create table hoffmation_schema."AcDeviceData"
-  (
-      "deviceID" varchar(60) not null,
-      "on"       boolean,
-      "istTemperatur"  double precision,
-      date       timestamp   not null,
-      constraint acdevicedata_pk
-          primary key ("deviceID", date)
-  );
+    alter table hoffmation_schema."HeatGroupCollection"
+      owner to "${this.config.user}";
 
-  alter table hoffmation_schema."AcDeviceData"
-    owner to postgres;
-END IF;
+    create unique index heatgroupcollection_name_uindex
+      on "HeatGroupCollection" (name);
 
+  END IF;
 
-IF (SELECT to_regclass('hoffmation_schema."ActuatorDeviceData"') IS NULL) Then    
-  create table hoffmation_schema."ActuatorDeviceData"
-  (
-      "deviceID" varchar(60) not null,
-      "on"       boolean,
-      date       timestamp   not null,
-      constraint ActuatorDeviceData_pk
-          primary key ("deviceID", date)
-  );
-
-  alter table hoffmation_schema."ActuatorDeviceData"
-    owner to postgres;
-END IF;
-
-IF (SELECT to_regclass('hoffmation_schema."MotionSensorDeviceData"') IS NULL) Then    
-  create table hoffmation_schema."MotionSensorDeviceData"
-  (
-      "deviceID" varchar(60) not null,
-      "movementDetected"       boolean,
-      date       timestamp   not null,
-      constraint motionsensordevicedata_pk
-          primary key ("deviceID", date)
-  );
+  IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then    
+    create table hoffmation_schema."AcDeviceData"
+    (
+        "deviceID" varchar(60) not null,
+        "on"       boolean,
+        "istTemperatur"  double precision,
+        date       timestamp   not null,
+        constraint acdevicedata_pk
+            primary key ("deviceID", date)
+    );
+  
+    alter table hoffmation_schema."AcDeviceData"
+      owner to "${this.config.user}";
+  END IF;
 
-  alter table hoffmation_schema."MotionSensorDeviceData"
-    owner to postgres;
-END IF;
 
-IF (SELECT to_regclass('hoffmation_schema."ShutterDeviceData"') IS NULL) Then    
-  create table if not exists hoffmation_schema."ShutterDeviceData"
-(
-    "deviceID"         varchar(60) not null
-        constraint "ShutterDeviceData_DeviceInfo_null_fk"
-            references hoffmation_schema."DeviceInfo"
-            on delete set null,
-    "position" double precision,
-    date               timestamp   not null,
-    "desiredPosition" double precision,
-    constraint shutterdevicedata_pk
-        primary key ("deviceID", date)
-);
+  IF (SELECT to_regclass('hoffmation_schema."ActuatorDeviceData"') IS NULL) Then    
+    create table hoffmation_schema."ActuatorDeviceData"
+    (
+        "deviceID" varchar(60) not null,
+        "on"       boolean,
+        date       timestamp   not null,
+        constraint ActuatorDeviceData_pk
+            primary key ("deviceID", date)
+    );
+  
+    alter table hoffmation_schema."ActuatorDeviceData"
+      owner to "${this.config.user}";
+  END IF;
 
-alter table hoffmation_schema."ShutterDeviceData"
-    owner to postgres;
-END IF;
+  IF (SELECT to_regclass('hoffmation_schema."MotionSensorDeviceData"') IS NULL) Then    
+    create table hoffmation_schema."MotionSensorDeviceData"
+    (
+        "deviceID" varchar(60) not null,
+        "movementDetected"       boolean,
+        date       timestamp   not null,
+        constraint motionsensordevicedata_pk
+            primary key ("deviceID", date)
+    );
+  
+    alter table hoffmation_schema."MotionSensorDeviceData"
+      owner to "${this.config.user}";
+  END IF;
 
-IF (SELECT to_regclass('hoffmation_schema."TemperatureSensorDeviceData"') IS NULL) Then  
-  create table if not exists hoffmation_schema."TemperatureSensorDeviceData"
-(
-    "deviceID"        varchar(60) not null
-        constraint "TemperatureSensorDeviceData_DeviceInfo_null_fk"
-            references hoffmation_schema."DeviceInfo"
-            on delete set null,
-    temperature          double precision,
-    date              timestamp   not null,
-    "roomTemperature" double precision,
-    constraint temperaturesensordevicedata_pk
-        primary key ("deviceID", date)
-);
+  IF (SELECT to_regclass('hoffmation_schema."ShutterDeviceData"') IS NULL) Then    
+    create table if not exists hoffmation_schema."ShutterDeviceData"
+    (
+        "deviceID"         varchar(60) not null
+            constraint "ShutterDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        "position" double precision,
+        date               timestamp   not null,
+        "desiredPosition" double precision,
+        constraint shutterdevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+    alter table hoffmation_schema."ShutterDeviceData"
+        owner to "${this.config.user}";
+  END IF;
 
-alter table hoffmation_schema."TemperatureSensorDeviceData"
-    owner to postgres;
-END IF;
+  IF (SELECT to_regclass('hoffmation_schema."TemperatureSensorDeviceData"') IS NULL) Then  
+    create table if not exists hoffmation_schema."TemperatureSensorDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "TemperatureSensorDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo"
+                on delete set null,
+        temperature          double precision,
+        date              timestamp   not null,
+        "roomTemperature" double precision,
+        constraint temperaturesensordevicedata_pk
+            primary key ("deviceID", date)
+    );
+    
+    alter table hoffmation_schema."TemperatureSensorDeviceData"
+        owner to "${this.config.user}";
+  END IF;
 
   
     
   IF (SELECT to_regclass('hoffmation_schema."HeaterDeviceData"') IS NULL) Then
-create table if not exists hoffmation_schema."HeaterDeviceData"
-(
-    "deviceID"        varchar(60) not null
-        constraint "HeaterDeviceData_DeviceInfo_null_fk"
-            references hoffmation_schema."DeviceInfo",
-    "level"              double precision,
-    date              timestamp   not null,
-    "roomTemperature" double precision,
-    "desiredTemperature" double precision,
-    "seasonTurnOff" boolean,
-    constraint heaterevicedata_pk
-        primary key ("deviceID", date)
-);
-
-alter table hoffmation_schema."HeaterDeviceData"
-    owner to postgres;
-END IF;
+    create table if not exists hoffmation_schema."HeaterDeviceData"
+    (
+        "deviceID"        varchar(60) not null
+            constraint "HeaterDeviceData_DeviceInfo_null_fk"
+                references hoffmation_schema."DeviceInfo",
+        "level"              double precision,
+        date              timestamp   not null,
+        "roomTemperature" double precision,
+        "desiredTemperature" double precision,
+        "seasonTurnOff" boolean,
+        constraint heaterevicedata_pk
+            primary key ("deviceID", date)
+    );
     
-    IF (SELECT to_regclass('hoffmation_schema."TemperaturData"') IS NULL) Then
-create table "TemperaturData"
-(
-    date             timestamp,
-    humidity         integer,
-    "istTemperatur"  double precision,
-    level            integer,
-    name             text,
-    "sollTemperatur" double precision,
-    constraint temperaturdata_pk
-        unique (date, name)
-);
-
-alter table "TemperaturData"
-    owner to postgres;
-    END IF;
+    alter table hoffmation_schema."HeaterDeviceData"
+        owner to "${this.config.user}";
+  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)
+    );
+    
+    alter table hoffmation_schema."TemperaturData"
+        owner to "${this.config.user}";
+  END IF;
 END
 $$;`);
         this.initialized = true;