hoffmation-base 0.1.29-5 → 0.1.29-9

package/README.md

@@ -1,2 +1,34 @@
 # Hoffmation-Base
 [![DeepSource](https://deepsource.io/gh/theimo1221/Hoffmation-Base.svg/?label=active+issues&show_trend=true&token=Ec4T7omgYOMMc4ezxv_9bHk9)](https://deepsource.io/gh/theimo1221/Hoffmation-Base/?ref=repository-badge)
+
+A home automation library specialized for Zigbee and Homematic IP devices in combination with ioBroker.
+## What does it do?
+This project serves as library for home automation projects. It provides services, models and utilities necessary to interact with rooms and smart devices via iobroker, but also to connect them to other services for textual/audio/visual notifications or really just any code or service you want the devices to connect to.
+
+Built on other open source projects that take care of the technical level, this project is made to provide a tool for the coding on the logical level. It is built as base to write automation code independent of the ioBroker user interface and currently provides support for the interaction with **devices** specified in [`src/server/devices`](src/server/devices) and **services** that can be found in [`src/server/services`](src/server/devices).
+
+Those include, but are not limited to:
+
+- **Devices**: Motion/Presence sensors, window handles, heating elements, lamps and dimmers, shutters, door contact sensors, physical buttons/switches, power sockets
+- **Services**: Interaction service for a telegram bot, weather, sonos control, waste calendar
+
+## How can I use it?
+This library *can* be used in conjunction with or as addition to own base projects, but it's intended to be used with the configuration project [Hoffmation-Express](https://github.com/theimo1221/Hoffmation-Express) which uses this library via a [npm package](https://www.npmjs.com/package/hoffmation-base).
+
+Whether you use it with Hoffmation-Express or with your own controller code, make sure you pass a valid config file (see [`src/server/config/private`](src/server/config/private) for an example) and a valid ioBroker device tree (you can find more information about that in the Hoffmation-Express project).
+
+### Base requirements
+In order to get the library running correctly, the following requirements should be met:
+* You use ioBroker for all devices that you want to control or read from
+  Make sure you got the [socket.io](https://github.com/ioBroker/ioBroker.socketio) adapter installed
+* You use devices that are supported or are able to use one of the supported devices as base for yours.  
+  (If you use a Zigbee or Homematic IP device that is not currently supported, don't hesitate to create a pull request and add it!)
+* You have a unix-based or windows device for the software you want to run this library with.
+
+### Build
+To build the library, make sure [Node.js](https://nodejs.org/en/download/) is installed.  
+Then, just run `npm run build`.
+
+## Why would I use it?
+Even if it looks simple at first, automating your entire home with a user interface can sometimes be more difficult than just *coding* your home.  
+Especially if you have a lot of specialized requirements that you want to satisfy, it can be simpler to just code your own rules and interfaces than to rely on user interfaces to do it for you.  

package/lib/index.js

@@ -26,7 +26,12 @@ class HoffmationBase {
     static async initializeBeforeIoBroker(initObject) {
         server_1.SettingsService.initialize(initObject.config);
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
-        await server_1.Persist.initialize(initObject.config.persistence);
+        if (initObject.config.persistence) {
+            await server_1.Persist.initialize(initObject.config.persistence);
+        }
+        else {
+            server_1.Persist.turnOff();
+        }
         this._app = initObject.app;
         if (server_1.SettingsService.settings.mp3Server) {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);

package/lib/models/persistence/ShutterCalibration.d.ts

@@ -0,0 +1,8 @@
+export declare class ShutterCalibration {
+    deviceID: string;
+    averageUp: number;
+    counterUp: number;
+    averageDown: number;
+    counterDown: number;
+    constructor(deviceID: string, averageUp: number, counterUp: number, averageDown: number, counterDown: number);
+}

package/lib/models/persistence/ShutterCalibration.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShutterCalibration = void 0;
+class ShutterCalibration {
+    constructor(deviceID, averageUp, counterUp, averageDown, counterDown) {
+        this.deviceID = deviceID;
+        this.averageUp = averageUp;
+        this.counterUp = counterUp;
+        this.averageDown = averageDown;
+        this.counterDown = counterDown;
+    }
+}
+exports.ShutterCalibration = ShutterCalibration;

package/lib/models/persistence/index.d.ts

@@ -1,6 +1,7 @@
-export * from './todaysCount';
 export * from './BasicRoomInfo';
-export * from './RoomDetailInfo';
+export * from './CurrentIlluminationDataPoint';
 export * from './DailyMovementCount';
+export * from './RoomDetailInfo';
+export * from './ShutterCalibration';
 export * from './temperaturDataPoint';
-export * from './CurrentIlluminationDataPoint';
+export * from './todaysCount';

package/lib/models/persistence/index.js

@@ -10,9 +10,10 @@ 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("./todaysCount"), exports);
 __exportStar(require("./BasicRoomInfo"), exports);
-__exportStar(require("./RoomDetailInfo"), exports);
+__exportStar(require("./CurrentIlluminationDataPoint"), exports);
 __exportStar(require("./DailyMovementCount"), exports);
+__exportStar(require("./RoomDetailInfo"), exports);
+__exportStar(require("./ShutterCalibration"), exports);
 __exportStar(require("./temperaturDataPoint"), exports);
-__exportStar(require("./CurrentIlluminationDataPoint"), exports);
+__exportStar(require("./todaysCount"), exports);

package/lib/server/config/iConfig.d.ts

@@ -8,7 +8,7 @@ export interface iConfig {
     ioBrokerUrl: string;
     mp3Server?: iMp3Settings;
     muell?: iMuellSettings;
-    persistence: iPersistenceSettings;
+    persistence?: iPersistenceSettings;
     polly?: iPollySettings;
     roomDefault: iRoomDefaultSettings;
     sonos?: iSonosSettings;

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

@@ -1,7 +1,7 @@
 import { HmIpGriff } from './hmIPDevices/hmIpGriff';
 import { RoomBase } from '../../models/rooms/RoomBase';
 import { ZigbeeAquaraVibra } from './zigbee/zigbeeAquaraVibra';
-import { FensterPosition } from './FensterPosition';
+import { FensterPosition } from './models/FensterPosition';
 import { iShutter } from './iShutter';
 export declare class Fenster {
     room: RoomBase;

package/lib/server/devices/Fenster.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fenster = void 0;
 const log_service_1 = require("../services/log-service");
 const utils_1 = require("../services/utils/utils");
-const FensterPosition_1 = require("./FensterPosition");
+const FensterPosition_1 = require("./models/FensterPosition");
 const time_callback_service_1 = require("../services/time-callback-service");
 const logLevel_1 = require("../../models/logLevel");
 const ShutterService_1 = require("../services/ShutterService");

package/lib/server/devices/Griffe.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Griffe = void 0;
 const deviceType_1 = require("./deviceType");
-const FensterPosition_1 = require("./FensterPosition");
+const FensterPosition_1 = require("./models/FensterPosition");
 const devices_1 = require("./devices");
 class Griffe {
     static getGriffPosition() {

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

@@ -23,5 +23,6 @@ export declare enum DeviceType {
     ZigbeeIlluActuator = 210,
     ZigbeeAquaraMotion = 211,
     ZigbeeIlluShutter = 212,
+    ZigbeeSMaBiTMagnetContact = 212,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -27,5 +27,6 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeIlluActuator"] = 210] = "ZigbeeIlluActuator";
     DeviceType[DeviceType["ZigbeeAquaraMotion"] = 211] = "ZigbeeAquaraMotion";
     DeviceType[DeviceType["ZigbeeIlluShutter"] = 212] = "ZigbeeIlluShutter";
+    DeviceType[DeviceType["ZigbeeSMaBiTMagnetContact"] = 212] = "ZigbeeSMaBiTMagnetContact";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

package/lib/server/devices/devices.js

@@ -29,6 +29,7 @@ const hmIpHeizung_1 = require("./hmIPDevices/hmIpHeizung");
 const hmIpTuer_1 = require("./hmIPDevices/hmIpTuer");
 const hmIpHeizgruppe_1 = require("./hmIPDevices/hmIpHeizgruppe");
 const zigbeeIlluShutter_1 = require("./zigbee/zigbeeIlluShutter");
+const zigbeeSMaBiTMagnetContact_1 = require("./zigbee/zigbeeSMaBiTMagnetContact");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -118,6 +119,9 @@ class Devices {
             case 'IlluShutter':
                 d = new zigbeeIlluShutter_1.ZigbeeIlluShutter(zigbeeInfo);
                 break;
+            case 'SMaBiTMagnet':
+                d = new zigbeeSMaBiTMagnetContact_1.ZigbeeSMaBiTMagnetContact(zigbeeInfo);
+                break;
             default:
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
                 d = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);

package/lib/server/devices/groups/fensterGroup.js

@@ -5,7 +5,7 @@ const timeCallback_1 = require("../../../models/timeCallback");
 const log_service_1 = require("../../services/log-service");
 const utils_1 = require("../../services/utils/utils");
 const weather_service_1 = require("../../services/weather/weather-service");
-const FensterPosition_1 = require("../FensterPosition");
+const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
 const time_callback_service_1 = require("../../services/time-callback-service");
 const ShutterService_1 = require("../../services/ShutterService");
@@ -35,6 +35,7 @@ class FensterGroup {
             if (savePosition) {
                 f.desiredPosition = 100;
             }
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Fenster.allRolloUp for ${f.rollo.info.customName}`);
             ShutterService_1.ShutterService.up(f.rollo, false);
         });
     }

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { FensterPosition } from '../FensterPosition';
+import { FensterPosition } from '../models/FensterPosition';
 import { Fenster } from '../Fenster';
 export declare class HmIpGriff extends HmIPDevice {
     position: FensterPosition;

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

@@ -7,7 +7,7 @@ const log_service_1 = require("../../services/log-service");
 const utils_1 = require("../../services/utils/utils");
 const weather_service_1 = require("../../services/weather/weather-service");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
-const FensterPosition_1 = require("../FensterPosition");
+const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {

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

@@ -5,7 +5,7 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
 const log_service_1 = require("../../services/log-service");
-const FensterPosition_1 = require("../FensterPosition");
+const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {

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

@@ -1,16 +1,16 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { TuerPosition } from './TuerPosition';
+import { MagnetPosition } from '../models/MagnetPosition';
 import { DeviceInfo } from '../DeviceInfo';
 export declare class HmIpTuer extends HmIPDevice {
-    position: TuerPosition;
+    position: MagnetPosition;
     private _closedCallback;
-    private _offenCallback;
+    private _openCallback;
     private _iOpen;
     private minutesOpen;
     constructor(pInfo: DeviceInfo);
-    addOffenCallback(pCallback: (pValue: boolean) => void): void;
+    addOpenCallback(pCallback: (pValue: boolean) => void): void;
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    updatePosition(pValue: TuerPosition): void;
+    updatePosition(pValue: MagnetPosition): void;
 }

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

@@ -5,20 +5,20 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const utils_1 = require("../../services/utils/utils");
-const TuerPosition_1 = require("./TuerPosition");
+const MagnetPosition_1 = require("../models/MagnetPosition");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const logLevel_1 = require("../../../models/logLevel");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
 class HmIpTuer extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTuer);
-        this.position = TuerPosition_1.TuerPosition.geschlossen;
+        this.position = MagnetPosition_1.MagnetPosition.closed;
         this._closedCallback = [];
-        this._offenCallback = [];
+        this._openCallback = [];
         this.minutesOpen = 0;
     }
-    addOffenCallback(pCallback) {
-        this._offenCallback.push(pCallback);
+    addOpenCallback(pCallback) {
+        this._openCallback.push(pCallback);
     }
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
@@ -30,7 +30,7 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             case '1':
                 if (idSplit[4] === 'STATE') {
                     if (initial) {
-                        this.position = TuerPosition_1.TuerPosition.geschlossen;
+                        this.position = MagnetPosition_1.MagnetPosition.closed;
                         return;
                     }
                     this.updatePosition(state.val);
@@ -42,20 +42,20 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
         if (pValue === this.position) {
             return;
         }
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Update Tür "${this.info.customName}"\nauf Position "${TuerPosition_1.TuerPosition[pValue]}"`);
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Update for Contact "${this.info.customName}" to position "${MagnetPosition_1.MagnetPosition[pValue]}"`);
         this.position = pValue;
         for (const c1 of this._closedCallback) {
             c1(pValue === 0);
         }
-        for (const c2 of this._offenCallback) {
+        for (const c2 of this._openCallback) {
             c2(pValue === 1);
         }
-        if (pValue === TuerPosition_1.TuerPosition.geschlossen) {
+        if (pValue === MagnetPosition_1.MagnetPosition.closed) {
             if (this._iOpen !== undefined) {
                 clearInterval(this._iOpen);
-                let message = `Die Haustür ist nun nach ${this.minutesOpen} Minuten wieder zu!`;
+                let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
                 if (this.minutesOpen === 0) {
-                    message = 'Die Haustür ist wieder zu.';
+                    message = `"${this.info.customName}" just closed`;
                 }
                 // const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde nach ${this.minutesOpen} Minuten geschlossen!`;
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
@@ -66,13 +66,13 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             return;
         }
         else if (this._iOpen === undefined) {
-            const message = `Die Haustür wurde geöffnet!`;
+            const message = `"${this.info.customName}" was opened`;
             //const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde geöfnet!`
             telegram_service_1.TelegramService.inform(message);
             sonos_service_1.SonosService.speakOnAll(message, 40);
             this._iOpen = utils_1.Utils.guardedInterval(() => {
                 this.minutesOpen++;
-                const message = `Tuer: "${this.info.customName}" seit ${this.minutesOpen} Minuten auf Position ${TuerPosition_1.TuerPosition[this.position]}`;
+                const message = `Contact: "${this.info.customName}" is  ${MagnetPosition_1.MagnetPosition[this.position]} since ${this.minutesOpen} minutes`;
                 switch (this.minutesOpen) {
                     case 2:
                     case 5:

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

@@ -10,7 +10,7 @@ export * from './hmIpTaster';
 export * from './hmIpHeizung';
 export * from './hmIpBewegung';
 export * from './hmIpPraezenz';
-export * from './TuerPosition';
+export * from '../models/MagnetPosition';
 export * from '../deviceType';
 export * from './hmIpHeizgruppe';
-export * from '../FensterPosition';
+export * from '../models/FensterPosition';

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

@@ -22,7 +22,7 @@ __exportStar(require("./hmIpTaster"), exports);
 __exportStar(require("./hmIpHeizung"), exports);
 __exportStar(require("./hmIpBewegung"), exports);
 __exportStar(require("./hmIpPraezenz"), exports);
-__exportStar(require("./TuerPosition"), exports);
+__exportStar(require("../models/MagnetPosition"), exports);
 __exportStar(require("../deviceType"), exports);
 __exportStar(require("./hmIpHeizgruppe"), exports);
-__exportStar(require("../FensterPosition"), exports);
+__exportStar(require("../models/FensterPosition"), exports);

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

@@ -14,4 +14,5 @@ export * from './IoBrokerBaseDevice';
 export * from './iIlluminationSensor';
 export * from './groups/index';
 export * from './hmIPDevices/index';
+export * from './models/index';
 export * from './zigbee/index';

package/lib/server/devices/index.js

@@ -26,4 +26,5 @@ __exportStar(require("./IoBrokerBaseDevice"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./groups/index"), exports);
 __exportStar(require("./hmIPDevices/index"), exports);
+__exportStar(require("./models/index"), exports);
 __exportStar(require("./zigbee/index"), exports);

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

@@ -0,0 +1,4 @@
+export declare enum MagnetPosition {
+    closed = 0,
+    open = 1
+}

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

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MagnetPosition = void 0;
+var MagnetPosition;
+(function (MagnetPosition) {
+    MagnetPosition[MagnetPosition["closed"] = 0] = "closed";
+    MagnetPosition[MagnetPosition["open"] = 1] = "open";
+})(MagnetPosition = exports.MagnetPosition || (exports.MagnetPosition = {}));

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

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

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

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./MagnetPosition"), exports);

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

@@ -11,4 +11,6 @@ export * from './zigbeeIlluDimmer';
 export * from './zigbeeIlluLampe';
 export * from './zigbeeIlluLedRGBCCT';
 export * from './zigbeeIlluShutter';
+export * from './zigbeeMagnetContact';
 export * from './zigbeeShutter';
+export * from './zigbeeSMaBiTMagnetContact';

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

@@ -23,4 +23,6 @@ __exportStar(require("./zigbeeIlluDimmer"), exports);
 __exportStar(require("./zigbeeIlluLampe"), exports);
 __exportStar(require("./zigbeeIlluLedRGBCCT"), exports);
 __exportStar(require("./zigbeeIlluShutter"), exports);
+__exportStar(require("./zigbeeMagnetContact"), exports);
 __exportStar(require("./zigbeeShutter"), exports);
+__exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);

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

@@ -8,10 +8,12 @@ export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _msTilTop;
     private _msTilBot;
     private _movementStartPos;
+    private _shutterCalibrationData;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(targetPosition: number): void;
     private changeMovementState;
     private processNewMovementState;
     private isCalibrated;
+    private persistCalibrationData;
 }

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

@@ -6,6 +6,8 @@ const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const logLevel_1 = require("../../../models/logLevel");
 const utils_1 = require("../../services/utils/utils");
+const persist_1 = require("../../services/dbo/persist");
+const ShutterCalibration_1 = require("../../../models/persistence/ShutterCalibration");
 var MovementState;
 (function (MovementState) {
     MovementState[MovementState["Down"] = 30] = "Down";
@@ -20,7 +22,17 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         this._msTilTop = -1;
         this._msTilBot = -1;
         this._movementStartPos = -1;
+        this._shutterCalibrationData = new ShutterCalibration_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
         this._movementStateId = `${this.info.fullID}.position`;
+        // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
+        persist_1.Persist.getShutterCalibration(this)
+            .then((calibrationData) => {
+            this._shutterCalibrationData = calibrationData;
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `IlluShutter "${this.info.customName}" initialized with calibration data`);
+        })
+            .catch((err) => {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Failed to initialize Calibration data for "${this.info.customName}", err ${err.message}`);
+        });
     }
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
@@ -74,12 +86,20 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
             this._msTilTop = timePassed;
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `New Time-Until-Top measurement for ${this.info.customName}: ${timePassed}ms`);
             this.currentLevel = this._setLevel;
+            this._shutterCalibrationData.counterUp++;
+            this._shutterCalibrationData.averageUp +=
+                (this._msTilTop - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
+            this.persistCalibrationData();
             return;
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
             this._msTilBot = timePassed;
             this.currentLevel = this._setLevel;
+            this._shutterCalibrationData.counterDown++;
+            this._shutterCalibrationData.averageDown +=
+                (this._msTilBot - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
+            this.persistCalibrationData();
             return;
         }
         if (!this.isCalibrated()) {
@@ -93,7 +113,10 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         }
     }
     isCalibrated() {
-        return this._msTilTop > 0 && this._msTilBot > 0;
+        return this._shutterCalibrationData.averageUp > 0 && this._shutterCalibrationData.averageDown > 0;
+    }
+    persistCalibrationData() {
+        persist_1.Persist.persistShutterCalibration(this._shutterCalibrationData);
     }
 }
 exports.ZigbeeIlluShutter = ZigbeeIlluShutter;

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

@@ -0,0 +1,17 @@
+/// <reference types="iobroker" />
+import { DeviceType } from '../deviceType';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDevice } from './zigbeeDevice';
+import { MagnetPosition } from '../models/MagnetPosition';
+export declare class ZigbeeMagnetContact extends ZigbeeDevice {
+    position: MagnetPosition;
+    private _closedCallback;
+    private _openCallback;
+    private _iOpen;
+    private minutesOpen;
+    constructor(pInfo: DeviceInfo, deviceType: DeviceType);
+    addOpenCallback(pCallback: (pValue: boolean) => void): void;
+    addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
+    protected updatePosition(pValue: MagnetPosition): void;
+}

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

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeMagnetContact = void 0;
+const log_service_1 = require("../../services/log-service");
+const utils_1 = require("../../services/utils/utils");
+const telegram_service_1 = require("../../services/Telegram/telegram-service");
+const logLevel_1 = require("../../../models/logLevel");
+const sonos_service_1 = require("../../services/Sonos/sonos-service");
+const zigbeeDevice_1 = require("./zigbeeDevice");
+const MagnetPosition_1 = require("../models/MagnetPosition");
+class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
+    constructor(pInfo, deviceType) {
+        super(pInfo, deviceType);
+        this.position = MagnetPosition_1.MagnetPosition.closed;
+        this._closedCallback = [];
+        this._openCallback = [];
+        this.minutesOpen = 0;
+    }
+    addOpenCallback(pCallback) {
+        this._openCallback.push(pCallback);
+    }
+    addClosedCallback(pCallback) {
+        this._closedCallback.push(pCallback);
+    }
+    update(idSplit, state, initial = false, pOverrride = false) {
+        super.update(idSplit, state, initial, pOverrride);
+    }
+    updatePosition(pValue) {
+        if (pValue === this.position) {
+            return;
+        }
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Update for Contact "${this.info.customName}" to position "${MagnetPosition_1.MagnetPosition[pValue]}"`);
+        this.position = pValue;
+        for (const c1 of this._closedCallback) {
+            c1(pValue === 0);
+        }
+        for (const c2 of this._openCallback) {
+            c2(pValue === 1);
+        }
+        if (pValue === MagnetPosition_1.MagnetPosition.closed) {
+            if (this._iOpen !== undefined) {
+                clearInterval(this._iOpen);
+                let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
+                if (this.minutesOpen === 0) {
+                    message = `"${this.info.customName}" just closed`;
+                }
+                // const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde nach ${this.minutesOpen} Minuten geschlossen!`;
+                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
+                telegram_service_1.TelegramService.inform(message);
+                this.minutesOpen = 0;
+                this._iOpen = undefined;
+            }
+            return;
+        }
+        else if (this._iOpen === undefined) {
+            const message = `"${this.info.customName}" was opened`;
+            //const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde geöfnet!`
+            telegram_service_1.TelegramService.inform(message);
+            sonos_service_1.SonosService.speakOnAll(message, 40);
+            this._iOpen = utils_1.Utils.guardedInterval(() => {
+                this.minutesOpen++;
+                const message = `Contact: "${this.info.customName}" is  ${MagnetPosition_1.MagnetPosition[this.position]} since ${this.minutesOpen} minutes`;
+                switch (this.minutesOpen) {
+                    case 2:
+                    case 5:
+                    case 10:
+                    case 20:
+                    case 45:
+                    case 60:
+                        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
+                        telegram_service_1.TelegramService.inform(message);
+                        break;
+                    default:
+                        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, message);
+                        break;
+                }
+            }, 60000, this);
+        }
+    }
+}
+exports.ZigbeeMagnetContact = ZigbeeMagnetContact;

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

@@ -0,0 +1,7 @@
+/// <reference types="iobroker" />
+import { ZigbeeMagnetContact } from './zigbeeMagnetContact';
+import { DeviceInfo } from '../DeviceInfo';
+export declare class ZigbeeSMaBiTMagnetContact extends ZigbeeMagnetContact {
+    constructor(pInfo: DeviceInfo);
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+}

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeSMaBiTMagnetContact = void 0;
+const zigbeeMagnetContact_1 = require("./zigbeeMagnetContact");
+const log_service_1 = require("../../services/log-service");
+const logLevel_1 = require("../../../models/logLevel");
+const MagnetPosition_1 = require("../models/MagnetPosition");
+const deviceType_1 = require("../deviceType");
+class ZigbeeSMaBiTMagnetContact extends zigbeeMagnetContact_1.ZigbeeMagnetContact {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeSMaBiTMagnetContact);
+    }
+    update(idSplit, state, initial = false) {
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Magnet Contact Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        super.update(idSplit, state, initial, true);
+        switch (idSplit[3]) {
+            case 'opened':
+                this.updatePosition(state.val ? MagnetPosition_1.MagnetPosition.open : MagnetPosition_1.MagnetPosition.closed);
+                break;
+        }
+    }
+}
+exports.ZigbeeSMaBiTMagnetContact = ZigbeeSMaBiTMagnetContact;