hoffmation-base 1.0.67 → 1.1.2

package/lib/server/devices/IoBrokerBaseDevice.d.ts

@@ -48,6 +48,7 @@ export declare abstract class IoBrokerBaseDevice implements iRoomDevice {
     abstract update(idSplit: string[], state: ioBroker.State, initial: boolean, pOverride: boolean): void;
     log(level: LogLevel, message: string, logDebugType?: LogDebugType): void;
     toJSON(): Partial<IoBrokerBaseDevice>;
+    persistDeviceInfo(): void;
     protected addToCorrectRoom(): void;
     /**
      * Sets the state of a given data point and returns true if that was successful.

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -12,6 +12,7 @@ class IoBrokerBaseDevice {
         this.deviceCapabilities = [];
         this.individualStateCallbacks = new Map();
         this.addToCorrectRoom();
+        this.persistDeviceInfo();
     }
     get id() {
         const result = services_1.Utils.guard(this.info.allDevicesKey);
@@ -89,6 +90,12 @@ class IoBrokerBaseDevice {
     toJSON() {
         return services_1.Utils.jsonFilter(this, ['individualStateCallbacks']);
     }
+    persistDeviceInfo() {
+        services_1.Utils.guardedTimeout(() => {
+            var _a;
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
+        }, 5000, this);
+    }
     addToCorrectRoom() {
         const settings = IoBrokerBaseDevice.roomAddingSettings[this.info.room];
         if (settings !== undefined) {

package/lib/server/devices/baseDeviceInterfaces/iActuator.d.ts

@@ -3,6 +3,7 @@ import { iRoomDevice } from './iRoomDevice';
 export interface iActuator extends iRoomDevice {
     settings: ActuatorSettings;
     actuatorOn: boolean;
+    persist(): void;
     /**
      * Controls the power state of this actuator
      * @param {boolean} pValue the new desired State

package/lib/server/devices/baseDeviceInterfaces/iBaseDevice.d.ts

@@ -8,5 +8,6 @@ export interface iBaseDevice {
     readonly deviceCapabilities: DeviceCapability[];
     readonly id: string;
     log(level: LogLevel, message: string): void;
+    persistDeviceInfo(): void;
     toJSON(): Partial<iBaseDevice>;
 }

package/lib/server/devices/baseDeviceInterfaces/iDimmableLamp.d.ts

@@ -2,6 +2,7 @@ import { iLamp } from './iLamp';
 import { DimmerSettings, TimeOfDay } from '../../../models';
 export interface iDimmableLamp extends iLamp {
     settings: DimmerSettings;
+    readonly brightness: number;
     toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
     /**
      * This function sets the light to a specific value

package/lib/server/devices/baseDeviceInterfaces/iLamp.d.ts

@@ -1,9 +1,7 @@
-import { ActuatorSettings, TimeOfDay } from '../../../models';
-import { iRoomDevice } from './iRoomDevice';
-export interface iLamp extends iRoomDevice {
-    settings: ActuatorSettings;
+import { TimeOfDay } from '../../../models';
+import { iActuator } from './iActuator';
+export interface iLamp extends iActuator {
     lightOn: boolean;
-    persist(): void;
     setTimeBased(time: TimeOfDay, timeout: number, force: boolean): void;
     toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
     /**

package/lib/server/devices/espresense/detectedBluetoothDevice.d.ts

@@ -23,4 +23,5 @@ export declare class DetectedBluetoothDevice implements iBaseDevice {
     getDistanceReport(maxAge?: number): string;
     static getOrCreate(devName: string): DetectedBluetoothDevice;
     private static deviceKeyBySettings;
+    persistDeviceInfo(): void;
 }

package/lib/server/devices/espresense/detectedBluetoothDevice.js

@@ -21,6 +21,7 @@ class DetectedBluetoothDevice {
         this.info.allDevicesKey = DetectedBluetoothDevice.deviceKeyBySettings(settings);
         if (settings.activeTracking) {
             devices_1.Devices.alLDevices[this.info.allDevicesKey] = this;
+            this.persistDeviceInfo();
         }
     }
     get name() {
@@ -83,5 +84,11 @@ class DetectedBluetoothDevice {
     static deviceKeyBySettings(settings) {
         return `trackedDevice-${settings.customName}`;
     }
+    persistDeviceInfo() {
+        services_1.Utils.guardedTimeout(() => {
+            var _a;
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
+        }, 5000, this);
+    }
 }
 exports.DetectedBluetoothDevice = DetectedBluetoothDevice;

package/lib/server/devices/espresense/espresenseDevice.d.ts

@@ -24,6 +24,7 @@ export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector
     update(devName: string, state: ioBroker.State): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     toJSON(): Partial<iRoomDevice>;
+    persistDeviceInfo(): void;
     addProximityCallback(cb: ProximityCallback): void;
     private addDeviceTracking;
 }

package/lib/server/devices/espresense/espresenseDevice.js

@@ -23,6 +23,7 @@ class EspresenseDevice {
         this._info.allDevicesKey = `espresense-${roomName}-${name}`;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         espresenseCoordinator_1.EspresenseCoordinator.addDevice(this, name);
+        this.persistDeviceInfo();
     }
     get info() {
         return this._info;
@@ -104,6 +105,12 @@ class EspresenseDevice {
     toJSON() {
         return services_1.Utils.jsonFilter(this);
     }
+    persistDeviceInfo() {
+        services_1.Utils.guardedTimeout(() => {
+            var _a;
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
+        }, 5000, this);
+    }
     addProximityCallback(cb) {
         let currentValue = this.proximityCallback.get(cb.deviceName);
         if (currentValue == undefined) {

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -11,7 +11,10 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp {
     private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get actuatorOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleActuator(force: boolean): boolean;
     /** @inheritdoc */
     setLight(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -18,6 +18,9 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
     }
+    get actuatorOn() {
+        return this.lightOn;
+    }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -31,6 +34,12 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
+    setActuator(pValue, timeout, force) {
+        this.setLight(pValue, timeout, force);
+    }
+    toggleActuator(force) {
+        return this.toggleLight(undefined, force);
+    }
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
         if (!force && pValue === this.lightOn && this.queuedLightValue === null) {
@@ -101,7 +110,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     }
     persist() {
         var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
 }
 exports.HmIpLampe = HmIpLampe;

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

@@ -14,5 +14,6 @@ export declare class ZigbeeActuator extends ZigbeeDevice implements iActuator {
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    persist(): void;
     toggleActuator(force?: boolean): boolean;
 }

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

@@ -68,6 +68,10 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             }
         }, timeout, this);
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+    }
     toggleActuator(force = false) {
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this.actuatorOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;

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

@@ -16,8 +16,11 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iDimmableL
     private turnOffTime;
     private _lastPersist;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get actuatorOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleActuator(force: boolean): boolean;
     /**
      * @inheritDoc
      * @param pValue The desired value

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

@@ -26,6 +26,9 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         this.brightnessID = `${this.info.fullID}.brightness`;
         this.transitionID = `${this.info.fullID}.transition_time`;
     }
+    get actuatorOn() {
+        return this.lightOn;
+    }
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
         this.log(models_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
@@ -63,6 +66,12 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
                 break;
         }
     }
+    setActuator(pValue, timeout, force) {
+        this.setLight(pValue, timeout, force);
+    }
+    toggleActuator(force) {
+        return this.toggleLight(undefined, force);
+    }
     /**
      * @inheritDoc
      * @param pValue The desired value
@@ -135,7 +144,7 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         if (this._lastPersist + 1000 < now) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
         this._lastPersist = now;
     }
     toggleLight(time, force = false, calculateTime = false) {

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

@@ -60,7 +60,7 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     }
     persist() {
         var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
 }
 exports.ZigbeeIlluLampe = ZigbeeIlluLampe;

package/lib/server/services/Sonos/own-sonos-device.d.ts

@@ -23,4 +23,5 @@ export declare class OwnSonosDevice implements iSpeaker {
     playUrl(url: string): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     toJSON(): Partial<OwnSonosDevice>;
+    persistDeviceInfo(): void;
 }

package/lib/server/services/Sonos/own-sonos-device.js

@@ -27,6 +27,7 @@ class OwnSonosDevice {
         this._info.room = roomName;
         this._info.allDevicesKey = `sonos-${roomName}-${discoveryName}`;
         devices_1.Devices.alLDevices[`sonos-${roomName}-${discoveryName}`] = this;
+        this.persistDeviceInfo();
     }
     get info() {
         return this._info;
@@ -108,5 +109,11 @@ class OwnSonosDevice {
     toJSON() {
         return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room']));
     }
+    persistDeviceInfo() {
+        utils_1.Utils.guardedTimeout(() => {
+            var _a;
+            (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
+        }, 5000, this);
+    }
 }
 exports.OwnSonosDevice = OwnSonosDevice;

package/lib/server/services/ac/ac-device.d.ts

@@ -44,5 +44,6 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     wasActivatedByExcessEnergy(): boolean;
     private automaticCheck;
+    persistDeviceInfo(): void;
     toJSON(): Partial<AcDevice>;
 }

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

@@ -30,6 +30,7 @@ class AcDevice {
         this._info.allDevicesKey = `ac-${roomName}-${name}`;
         utils_1.Utils.guardedInterval(this.automaticCheck, 60000, this, true);
         utils_1.Utils.guardedInterval(this.persist, 15 * 60 * 1000, this, true);
+        this.persistDeviceInfo();
     }
     get roomTemperature() {
         return this._roomTemperatur;
@@ -133,6 +134,12 @@ class AcDevice {
             return;
         }
     }
+    persistDeviceInfo() {
+        utils_1.Utils.guardedTimeout(() => {
+            var _a;
+            (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
+        }, 5000, this);
+    }
     toJSON() {
         // eslint-disable-next-line
         const result = lodash_1.default.omit(this, ['room']);

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

@@ -1,9 +1,10 @@
-import { iAcDevice, iHeater, iLamp, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { iAcDevice, iActuator, iBaseDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
 export interface iPersist {
     initialized: boolean;
     addTemperaturDataPoint(heater: iHeater): void;
     addRoom(room: RoomBase): void;
+    addDevice(device: iBaseDevice): void;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
@@ -11,7 +12,7 @@ export interface iPersist {
     persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     persistEnergyManager(energyData: EnergyCalculation): void;
     persistAC(device: iAcDevice): void;
-    persistLamp(device: iLamp): void;
+    persistActuator(device: iActuator): void;
     persistMotionSensor(device: iMotionSensor): void;
     readTemperaturDataPoint(hzGrp: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
 }

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

@@ -1,18 +1,19 @@
 import { iPersist } from './iPersist';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { iAcDevice, iHeater, iLamp, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { iAcDevice, iActuator, iBaseDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
 import { iPersistenceSettings } from '../../config';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
     private readonly psql;
     constructor(config: iPersistenceSettings);
     addRoom(room: RoomBase): void;
+    addDevice(device: iBaseDevice): void;
     addTemperaturDataPoint(heater: iHeater): void;
     motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getShutterCalibration(_device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistAC(device: iAcDevice): void;
-    persistLamp(device: iLamp): void;
+    persistActuator(device: iActuator): void;
     persistMotionSensor(device: iMotionSensor): void;
     persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     persistShutterCalibration(_data: ShutterCalibration): void;

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

@@ -4,6 +4,7 @@ exports.PostgreSqlPersist = void 0;
 const models_1 = require("../../../models");
 const pg_1 = require("pg");
 const log_service_1 = require("../log-service");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class PostgreSqlPersist {
     constructor(config) {
         this.initialized = false;
@@ -17,6 +18,19 @@ values ('${room.roomName}',${room.settings.etage})
     ON CONFLICT (name)
     DO UPDATE SET
         etage = ${room.settings.etage}
+;
+    `);
+    }
+    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}
 ;
     `);
     }
@@ -76,6 +90,25 @@ create unique index table_name_name_uindex
     on "BasicRooms" (name);
 
     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
+);
+
+alter table hoffmation_schema."DeviceInfo"
+    owner to postgres;
+
+    END IF;
+
     IF (SELECT to_regclass('hoffmation_schema."CurrentIllumination"') IS NULL) Then
 create table "CurrentIllumination"
 (
@@ -147,17 +180,17 @@ IF (SELECT to_regclass('hoffmation_schema."AcDeviceData"') IS NULL) Then
 END IF;
 
 
-IF (SELECT to_regclass('hoffmation_schema."LampDeviceData"') IS NULL) Then    
-  create table hoffmation_schema."LampDeviceData"
+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 lampdevicedata_pk
+      constraint ActuatorDeviceData_pk
           primary key ("deviceID", date)
   );
 
-  alter table hoffmation_schema."LampDeviceData"
+  alter table hoffmation_schema."ActuatorDeviceData"
     owner to postgres;
 END IF;
 
@@ -202,10 +235,14 @@ insert into hoffmation_schema."AcDeviceData" ("deviceID", "on", "date", "roomTem
 values ('${device.id}', ${device.on}, '${new Date().toISOString()}', ${device.temperature});
     `);
     }
-    persistLamp(device) {
+    persistActuator(device) {
+        let percentage = undefined;
+        if (device.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
+            percentage = device.brightness;
+        }
         this.query(`
-insert into hoffmation_schema."LampDeviceData" ("deviceID", "on", "date")
-values ('${device.id}', ${device.lightOn}, '${new Date().toISOString()}');
+insert into hoffmation_schema."ActuatorDeviceData" ("deviceID", "on", "date", "percentage")
+values ('${device.id}', ${device.actuatorOn}, '${new Date().toISOString()}', ${percentage !== null && percentage !== void 0 ? percentage : 'null'});
     `);
     }
     persistMotionSensor(device) {