hoffmation-base 1.1.4 → 1.1.7

package/lib/server/devices/models/WindowPosition.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WindowPosition = void 0;
+var WindowPosition;
+(function (WindowPosition) {
+    WindowPosition[WindowPosition["geschlossen"] = 0] = "geschlossen";
+    WindowPosition[WindowPosition["kipp"] = 1] = "kipp";
+    WindowPosition[WindowPosition["offen"] = 2] = "offen";
+})(WindowPosition = exports.WindowPosition || (exports.WindowPosition = {}));

package/lib/server/devices/models/index.d.ts

@@ -1,2 +1,2 @@
-export * from './FensterPosition';
+export * from './WindowPosition';
 export * from './MagnetPosition';

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

@@ -14,5 +14,5 @@ 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 });
-__exportStar(require("./FensterPosition"), exports);
+__exportStar(require("./WindowPosition"), exports);
 __exportStar(require("./MagnetPosition"), exports);

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

@@ -28,6 +28,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
                     this.log(models_1.LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
                 }
                 this.actuatorOn = state.val;
+                this.persist();
                 break;
         }
     }

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

@@ -4,7 +4,7 @@ import { DeviceType } from '../../deviceType';
 import { ShutterCalibration, ShutterSettings } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iShutter } from '../../baseDeviceInterfaces';
-import { Fenster } from '../../groups';
+import { Window } from '../../groups';
 import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
@@ -18,10 +18,10 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     protected _currentLevel: number;
     get currentLevel(): number;
     set currentLevel(value: number);
-    protected _fenster?: Fenster;
-    get fenster(): Fenster | undefined;
-    set fenster(value: Fenster | undefined);
-    get desiredFensterLevel(): number;
+    protected _window?: Window;
+    get window(): Window | undefined;
+    set window(value: Window | undefined);
+    get desiredWindowShutterLevel(): number;
     persist(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;

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

@@ -12,7 +12,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
-        var _a;
+        var _a, _b;
         super(pInfo, pType);
         this.settings = new models_1.ShutterSettings();
         this._iMovementFinishTimeout = null;
@@ -29,6 +29,12 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             var _a;
             this.log(models_1.LogLevel.Warn, `Failed to initialize Calibration data, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
         });
+        (_b = services_1.Utils.dbo) === null || _b === void 0 ? void 0 : _b.getLastDesiredPosition(this).then((val) => {
+            var _a;
+            if (val.desiredPosition >= -1) {
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(val.desiredPosition);
+            }
+        });
     }
     get currentLevel() {
         if (this._setLevel !== -1 && this._currentLevel !== this._setLevel) {
@@ -40,26 +46,26 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         if (value !== this._setLevel && services_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
             value = this._setLevel;
         }
-        if (value !== this._currentLevel && this._fenster) {
+        if (value !== this._currentLevel && this._window) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
             }, this);
             this.persist();
         }
         this._currentLevel = value;
     }
-    get fenster() {
-        return this._fenster;
+    get window() {
+        return this._window;
     }
-    set fenster(value) {
-        this._fenster = value;
+    set window(value) {
+        this._window = value;
     }
-    get desiredFensterLevel() {
-        if (this._fenster === undefined) {
+    get desiredWindowShutterLevel() {
+        if (this._window === undefined) {
             return -1;
         }
-        return this._fenster.desiredPosition;
+        return this._window.desiredPosition;
     }
     persist() {
         var _a;
@@ -80,17 +86,17 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`, services_1.LogDebugType.SkipUnchangedRolloPosition);
             return;
         }
-        if (this._fenster !== undefined) {
-            if (this._fenster.griffeInPosition(models_2.FensterPosition.offen) > 0 && pPosition < 100) {
+        if (this._window !== undefined) {
+            if (this._window.griffeInPosition(models_2.WindowPosition.offen) > 0 && pPosition < 100) {
                 if (!skipOpenWarning) {
-                    this.log(models_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster offen ist!`);
+                    this.log(models_1.LogLevel.Alert, `Not closing the shutter, as the window is open!`);
                 }
                 return;
             }
-            if (this._fenster.griffeInPosition(models_2.FensterPosition.kipp) > 0 && pPosition < 50) {
+            if (this._window.griffeInPosition(models_2.WindowPosition.kipp) > 0 && pPosition < 50) {
                 pPosition = 50;
                 if (!skipOpenWarning) {
-                    this.log(models_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster auf Kipp ist!`);
+                    this.log(models_1.LogLevel.Alert, `Not closing the shutter, as the window is half open!`);
                 }
             }
         }
@@ -99,7 +105,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         this.moveToPosition(pPosition);
     }
     toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_fenster']);
+        return lodash_1.default.omit(super.toJSON(), ['_window']);
     }
     moveToPosition(pPosition) {
         this.log(models_1.LogLevel.Error, `Implement own moveToPosition(${pPosition}) Function`);

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

@@ -35,7 +35,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         return this._vibrationBlockedByGriff;
     }
     set vibrationBlockedByGriff(pVal) {
-        this.log(models_1.LogLevel.Debug, `${pVal ? 'Dea' : 'A'}ktiviere Vibrationsalarm für ${this.info.customName} in Bezug auf den Fenstergriff`);
+        this.log(models_1.LogLevel.Debug, `${pVal ? 'disa' : 'a'}rming vibration alarm for ${this.info.customName} due to handle`);
         if (pVal) {
             this.vibrationBlockedByGriffTimeStamp = new Date().getTime();
         }
@@ -126,7 +126,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     alarmCheck() {
         this.log(models_1.LogLevel.Debug, `Alarmcheck für ${this.info.customName} Alarmblock Wert: ${this._vibrationBlockedByGriff}`);
         if (this._vibrationBlockedByGriff) {
-            this.log(models_1.LogLevel.Debug, `Fenster offen, ignoriere Vibrationsalarm bei ${this.info.customName}`);
+            this.log(models_1.LogLevel.Debug, `Window is open; ignoring vibration alarm.`);
             return;
         }
         if (this._vibrationBlockedByMotion) {

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

@@ -19,7 +19,6 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
         switch (idSplit[3]) {
             case 'state':
                 this.log(models_1.LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
-                this.persist();
                 break;
         }
     }

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

@@ -18,7 +18,6 @@ class ZigbeeIlluShutter extends BaseDevices_1.ZigbeeShutter {
         this._movementStartMs = -1;
         this._movementStartPos = -1;
         this._movementStateId = `${this.info.fullID}.position`;
-        // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
     }
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {

package/lib/server/services/ShutterService.d.ts

@@ -1,4 +1,4 @@
-import { Fenster, iShutter } from '../devices';
+import { iShutter, Window } from '../devices';
 export declare class ShutterService {
     static anyRolloDown(rollo: iShutter[]): boolean;
     static getRolladenPosition(): string;
@@ -6,8 +6,8 @@ export declare class ShutterService {
     static down(shutter: iShutter, initial?: boolean): void;
     static middle(shutter: iShutter): void;
     static up(shutter: iShutter, initial?: boolean): void;
-    static windowAllDown(f: Fenster, initial?: boolean): void;
-    static windowAllMiddle(f: Fenster, initial?: boolean): void;
-    static windowAllUp(f: Fenster, initial?: boolean): void;
-    static windowAllToPosition(f: Fenster, position: number, initial?: boolean, skipOpenWarning?: boolean): void;
+    static windowAllDown(f: Window, initial?: boolean): void;
+    static windowAllMiddle(f: Window, initial?: boolean): void;
+    static windowAllUp(f: Window, initial?: boolean): void;
+    static windowAllToPosition(f: Window, position: number, initial?: boolean, skipOpenWarning?: boolean): void;
 }

package/lib/server/services/ShutterService.js

@@ -19,15 +19,15 @@ class ShutterService {
         });
         const response = [`Dies sind die aktuellen Rollo Positionen:`];
         for (const r of rollos) {
-            response.push(`${r.currentLevel}% Rollo: "${r.info.customName}" Gewünschte Position: ${r.desiredFensterLevel}`);
+            response.push(`${r.currentLevel}% Rollo: "${r.info.customName}" Gewünschte Position: ${r.desiredWindowShutterLevel}`);
         }
         response.push(`\nDie nächsten Zeiten zum Hochfahren:`);
         const down = [`\nDie nächsten Zeiten zum Runterfahren:`];
         for (const r of api_1.API.getRooms().values()) {
-            if (!r.FensterGroup) {
+            if (!r.WindowGroup) {
                 continue;
             }
-            for (const f of r.FensterGroup.fenster) {
+            for (const f of r.WindowGroup.windows) {
                 f.getShutter().forEach((shutter) => {
                     var _a, _b, _c, _d;
                     response.push(`Rollo: "${shutter.info.customName}"\t${f.noRolloOnSunrise ? 'Hochfahren inaktiv' : (_b = (_a = r.sonnenAufgangCallback) === null || _a === void 0 ? void 0 : _a.nextToDo) === null || _b === void 0 ? void 0 : _b.toLocaleTimeString()}`);

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

@@ -54,12 +54,12 @@ class TelegramCommands {
             telegram_service_1.TelegramService.sendMessage([m.chat.id], ShutterService_1.ShutterService.getRolladenPosition());
             return true;
         }, 'Gibt die Positionen der Rollos aus, warnt über offene Rollos und nennt die nächsten Fahrten'));
-        telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('FensterCheck', /\/check_fenster/, async (m) => {
+        telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('WindowCheck', /\/check_windows/, async (m) => {
             if (m.from === undefined)
                 return false;
             telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Griffe.getGriffPosition());
             return true;
-        }, 'Gibt die Positionen der Fenstergriffe aus und warnt somit über offene Fenster'));
+        }, 'Returns the handle positions and warns about open windows.'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('BatteryCheck', /\/check_battery/, async (m) => {
             if (m.from === undefined)
                 return Promise.resolve(false);

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

@@ -1,11 +1,12 @@
 import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter } from '../../devices';
-import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
+import { CountToday, CurrentIlluminationDataPoint, DesiredShutterPosition, 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>;
+    getLastDesiredPosition(device: iShutter): Promise<DesiredShutterPosition>;
     getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistShutterCalibration(data: ShutterCalibration): void;

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

@@ -1,5 +1,5 @@
 import { iPersist } from './iPersist';
-import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
+import { CountToday, CurrentIlluminationDataPoint, DesiredShutterPosition, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
 import { ButtonPressType, iAcDevice, iActuator, iBaseDevice, iButtonSwitch, iHeater, iMotionSensor, IoBrokerBaseDevice, iShutter } from '../../devices';
 import { iPersistenceSettings } from '../../config';
 export declare class PostgreSqlPersist implements iPersist {
@@ -9,6 +9,7 @@ export declare class PostgreSqlPersist implements iPersist {
     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>;
     initialize(): Promise<void>;

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

@@ -52,6 +52,19 @@ values ('${new Date().toISOString()}',${heater.humidity},${heater.iTemperature},
 ;
     `);
     }
+    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`);
+        if (dbResult !== null && dbResult.length > 0) {
+            return dbResult[0];
+        }
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Es gibt noch keine persistierten Bewegungen für ${device.info.fullName}`);
+        return new models_1.DesiredShutterPosition(-1);
+    }
     async motionSensorTodayCount(device) {
         const dbResult = await this.query(`SELECT Count(*) 
 from hoffmation_schema."MotionSensorDeviceData" 
@@ -236,6 +249,7 @@ IF (SELECT to_regclass('hoffmation_schema."ShutterDeviceData"') IS NULL) Then
             on delete set null,
     "position" double precision,
     date               timestamp   not null,
+    "desiredPosition" double precision,
     constraint shutterdevicedata_pk
         primary key ("deviceID", date)
 );
@@ -294,9 +308,11 @@ values ('${device.id}', ${device.movementDetected}, '${new Date().toISOString()}
     `);
     }
     persistShutter(device) {
+        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")
-values ('${device.id}', ${device.currentLevel}, '${new Date().toISOString()}');
+insert into hoffmation_schema."ShutterDeviceData" ("deviceID", "position", "date", "desiredPosition")
+values ('${device.id}', ${currentLevel}, '${new Date().toISOString()}', ${desiredLevel});
     `);
     }
     persistCurrentIllumination(data) {

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

@@ -24,7 +24,7 @@ class RoomService {
         var _a;
         const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.Rooms.entries();
         for (const [_name, room] of rooms) {
-            (_a = room.FensterGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(position, true);
+            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(position, true);
         }
     }
     /**
@@ -181,7 +181,7 @@ class RoomService {
     static restoreRolloPosition() {
         var _a;
         for (const room of this.Rooms.values()) {
-            (_a = room.FensterGroup) === null || _a === void 0 ? void 0 : _a.restoreRolloPosition();
+            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.restoreRolloPosition();
         }
     }
     static restoreLight() {