hoffmation-base 0.1.41-1 → 0.1.41-13

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

@@ -1,21 +1,23 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
 import { DeviceType } from '../deviceType';
-import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
-export declare class ZigbeeMotionSensor extends ZigbeeDevice {
+import { MotionSensorSettings } from '../../../models';
+import { DeviceInfo } from '../DeviceInfo';
+import { iMotionSensor } from '../iMotionSensor';
+export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor {
+    settings: MotionSensorSettings;
     movementDetected: boolean;
-    excludeFromNightAlarm: boolean;
-    protected _timeSinceLastMotion: number;
-    protected _detectionsToday: number;
     protected _initialized: boolean;
     protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
+    constructor(pInfo: DeviceInfo, type: DeviceType);
+    protected _timeSinceLastMotion: number;
     get timeSinceLastMotion(): number;
+    protected _detectionsToday: number;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
-    constructor(pInfo: DeviceInfo, type: DeviceType);
     /**
      * Adds a callback for when a motion state has changed.
      * @param pCallback Function that accepts the new state as parameter

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

@@ -1,27 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeMotionSensor = void 0;
-const utils_1 = require("../../services/utils/utils");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const logLevel_1 = require("../../../models/logLevel");
-const index_1 = require("../../../index");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, type) {
+        var _a;
         super(pInfo, type);
+        this.settings = new models_1.MotionSensorSettings();
         this.movementDetected = false;
-        this.excludeFromNightAlarm = false;
-        this._timeSinceLastMotion = 0;
-        this._detectionsToday = 0;
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getCount(this).then((todayCount) => {
+        this._timeSinceLastMotion = 0;
+        this._detectionsToday = 0;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
-            this.log(logLevel_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);
+            this.log(models_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);
             this._initialized = true;
         }).catch((err) => {
             var _a;
-            this.log(logLevel_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            this.log(models_1.LogLevel.Warn, `Failed to initialize movement counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
         });
     }
     // Time since last motion in seconds
@@ -32,9 +32,10 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
+        var _a;
         const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistTodayCount(this, pVal, oldVal);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
     }
     /**
      * Adds a callback for when a motion state has changed.
@@ -45,14 +46,14 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
     }
     updateMovement(newState) {
         if (!this._initialized && newState) {
-            this.log(logLevel_1.LogLevel.Trace, `Movement recognized, but database initialization has not finished yet --> delay.`);
-            utils_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Trace, `Movement recognized, but database initialization has not finished yet --> delay.`);
+            services_1.Utils.guardedTimeout(() => {
                 this.updateMovement(newState);
             }, 1000, this);
             return;
         }
         if (newState === this.movementDetected) {
-            this.log(logLevel_1.LogLevel.Debug, `Skip movement because state is already ${newState}`);
+            this.log(models_1.LogLevel.Debug, `Skip movement because state is already ${newState}`);
             if (newState) {
                 // Wenn ein Sensor sich nicht von alleine zurücksetzt, hier erzwingen.
                 this.resetFallbackTimeout();
@@ -62,33 +63,33 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         }
         this.resetFallbackTimeout();
         this.movementDetected = newState;
-        this.log(logLevel_1.LogLevel.Debug, `New movement state: ${newState}`);
+        this.log(models_1.LogLevel.Debug, `New movement state: ${newState}`);
         if (newState) {
             this.startFallbackTimeout();
             this.detectionsToday++;
-            this.log(logLevel_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
+            this.log(models_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
         }
         for (const c of this._movementDetectedCallback) {
             c(newState);
         }
     }
     update(idSplit, state, initial = false, pOverride = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {
             case 'occupancy':
-                this.log(logLevel_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
                 this.updateMovement(state.val);
                 break;
             case 'no_motion':
-                this.log(state.val < 100 ? logLevel_1.LogLevel.Trace : logLevel_1.LogLevel.DeepTrace, `Motion sensor: Update for time since last motion of ${this.info.customName}: ${state.val}`);
+                this.log(state.val < 100 ? models_1.LogLevel.Trace : models_1.LogLevel.DeepTrace, `Motion sensor: Update for time since last motion of ${this.info.customName}: ${state.val}`);
                 this._timeSinceLastMotion = state.val;
                 break;
         }
     }
     resetFallbackTimeout() {
         if (this._fallBackTimeout) {
-            this.log(logLevel_1.LogLevel.Trace, `Fallback Timeout zurücksetzen`);
+            this.log(models_1.LogLevel.Trace, `Fallback Timeout zurücksetzen`);
             clearTimeout(this._fallBackTimeout);
         }
     }
@@ -96,8 +97,8 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         if (!this._needsMovementResetFallback) {
             return;
         }
-        this._fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
-            this.log(logLevel_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset`);
+        this._fallBackTimeout = services_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset`);
             this._fallBackTimeout = undefined;
             this.updateMovement(false);
         }, 270000, this);

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

@@ -1,32 +1,34 @@
+/// <reference types="node" />
 /// <reference types="iobroker" />
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
+import { ShutterCalibration, ShutterSettings } from '../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iShutter } from '../iShutter';
-import { Fenster } from '../groups/Fenster';
+import { Fenster } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
-import { ShutterSettings } from '../../../models/deviceSettings/shutterSettings';
-import { ShutterCalibration } from '../../../models/persistence/ShutterCalibration';
 export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     settings: ShutterSettings;
-    get currentLevel(): number;
-    set currentLevel(value: number);
-    get desiredFensterLevel(): number;
-    get fenster(): Fenster | undefined;
-    set fenster(value: Fenster | undefined);
-    protected _currentLevel: number;
-    protected _fenster?: Fenster;
+    protected _iMovementFinishTimeout: NodeJS.Timeout | null;
     protected _firstCommandRecieved: boolean;
     protected _setLevel: number;
     protected _setLevelTime: number;
     protected _shutterCalibrationData: ShutterCalibration;
     constructor(pInfo: DeviceInfo, pType: DeviceType);
+    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;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
     protected moveToPosition(pPosition: number): void;
     protected getAverageUp(): number;
     protected getAverageDown(): number;
     protected isCalibrated(): boolean;
     protected persistCalibrationData(): void;
-    toJSON(): Partial<IoBrokerBaseDevice>;
+    protected initializeMovementFinishTimeout(duration: number, endPosition: number): void;
 }

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

@@ -4,29 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeShutter = void 0;
-const utils_1 = require("../../services/utils/utils");
-const logLevel_1 = require("../../../models/logLevel");
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const FensterPosition_1 = require("../models/FensterPosition");
+const models_2 = require("../models");
 const lodash_1 = __importDefault(require("lodash"));
-const shutterSettings_1 = require("../../../models/deviceSettings/shutterSettings");
-const ShutterCalibration_1 = require("../../../models/persistence/ShutterCalibration");
-const index_1 = require("../../../index");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
+        var _a;
         super(pInfo, pType);
-        this.settings = new shutterSettings_1.ShutterSettings();
-        this._currentLevel = -1;
+        this.settings = new models_1.ShutterSettings();
+        this._iMovementFinishTimeout = null;
         this._firstCommandRecieved = false;
         this._setLevel = -1;
         this._setLevelTime = -1;
-        this._shutterCalibrationData = new ShutterCalibration_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getShutterCalibration(this).then((calibrationData) => {
+        this._shutterCalibrationData = new models_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
+        this._currentLevel = -1;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getShutterCalibration(this).then((calibrationData) => {
             this._shutterCalibrationData = calibrationData;
-            this.log(logLevel_1.LogLevel.DeepTrace, `ZigbeeShutter  initialized with calibration data`);
+            this.log(models_1.LogLevel.DeepTrace, `ZigbeeShutter  initialized with calibration data`);
         }).catch((err) => {
             var _a;
-            this.log(logLevel_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}`);
+            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}`);
         });
     }
     get currentLevel() {
@@ -36,29 +35,29 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         return this._currentLevel;
     }
     set currentLevel(value) {
-        if (value !== this._setLevel && utils_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
+        if (value !== this._setLevel && services_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
             value = this._setLevel;
         }
         if (value !== this._currentLevel && this._fenster) {
-            utils_1.Utils.guardedNewThread(() => {
+            services_1.Utils.guardedNewThread(() => {
                 var _a;
                 (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(value);
             }, this);
         }
         this._currentLevel = value;
     }
-    get desiredFensterLevel() {
-        if (this._fenster === undefined) {
-            return -1;
-        }
-        return this._fenster.desiredPosition;
-    }
     get fenster() {
         return this._fenster;
     }
     set fenster(value) {
         this._fenster = value;
     }
+    get desiredFensterLevel() {
+        if (this._fenster === undefined) {
+            return -1;
+        }
+        return this._fenster.desiredPosition;
+    }
     update(idSplit, state, initial = false, pOverride = false) {
         super.update(idSplit, state, initial, pOverride);
     }
@@ -67,33 +66,36 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
             this._firstCommandRecieved = true;
         }
         else if (this._firstCommandRecieved && initial) {
-            this.log(logLevel_1.LogLevel.Debug, `Skipped initial Rollo  to ${pPosition} as we recieved a command already`);
+            this.log(models_1.LogLevel.Debug, `Skipped initial Rollo  to ${pPosition} as we recieved a command already`);
             return;
         }
         if (this.currentLevel === pPosition) {
-            this.log(logLevel_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`);
+            this.log(models_1.LogLevel.Debug, `Skip Rollo command to Position ${pPosition} as this is the current one`);
             return;
         }
         if (this._fenster !== undefined) {
-            if (this._fenster.griffeInPosition(FensterPosition_1.FensterPosition.offen) > 0 && pPosition < 100) {
+            if (this._fenster.griffeInPosition(models_2.FensterPosition.offen) > 0 && pPosition < 100) {
                 if (!skipOpenWarning) {
-                    this.log(logLevel_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster offen ist!`);
+                    this.log(models_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster offen ist!`);
                 }
                 return;
             }
-            if (this._fenster.griffeInPosition(FensterPosition_1.FensterPosition.kipp) > 0 && pPosition < 50) {
+            if (this._fenster.griffeInPosition(models_2.FensterPosition.kipp) > 0 && pPosition < 50) {
                 pPosition = 50;
                 if (!skipOpenWarning) {
-                    this.log(logLevel_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster auf Kipp ist!`);
+                    this.log(models_1.LogLevel.Alert, `Fahre Rollo  nicht runter, weil das Fenster auf Kipp ist!`);
                 }
             }
         }
         this._setLevel = pPosition;
-        this.log(logLevel_1.LogLevel.Debug, `Move  to position ${pPosition}`);
+        this.log(models_1.LogLevel.Debug, `Move  to position ${pPosition}`);
         this.moveToPosition(pPosition);
     }
+    toJSON() {
+        return lodash_1.default.omit(super.toJSON(), ['_fenster']);
+    }
     moveToPosition(pPosition) {
-        this.log(logLevel_1.LogLevel.Error, `Implement own moveToPosition(${pPosition}) Function`);
+        this.log(models_1.LogLevel.Error, `Implement own moveToPosition(${pPosition}) Function`);
     }
     getAverageUp() {
         if (this._shutterCalibrationData.averageUp > 0) {
@@ -102,7 +104,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         if (this.settings.msTilTop > 0) {
             return this.settings.msTilTop;
         }
-        return 0;
+        return 30000;
     }
     getAverageDown() {
         if (this._shutterCalibrationData.averageDown > 0) {
@@ -111,17 +113,24 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         if (this.settings.msTilBot > 0) {
             return this.settings.msTilBot;
         }
-        return 0;
+        return 30000;
     }
     isCalibrated() {
         return this.getAverageDown() > 0 && this.getAverageUp() > 0;
     }
     persistCalibrationData() {
-        this.log(logLevel_1.LogLevel.Trace, `Persiting Calibration Data. Average Up: ${this._shutterCalibrationData.averageUp}, Down: ${this._shutterCalibrationData.averageDown}`);
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistShutterCalibration(this._shutterCalibrationData);
+        var _a;
+        this.log(models_1.LogLevel.Trace, `Persiting Calibration Data. Average Up: ${this._shutterCalibrationData.averageUp}, Down: ${this._shutterCalibrationData.averageDown}`);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistShutterCalibration(this._shutterCalibrationData);
     }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_fenster']);
+    initializeMovementFinishTimeout(duration, endPosition) {
+        if (this._iMovementFinishTimeout !== null) {
+            clearTimeout(this._iMovementFinishTimeout);
+        }
+        this._iMovementFinishTimeout = services_1.Utils.guardedTimeout(() => {
+            this.currentLevel = endPosition;
+            this._iMovementFinishTimeout = null;
+        }, duration, this);
     }
 }
 exports.ZigbeeShutter = ZigbeeShutter;

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

@@ -0,0 +1,9 @@
+/// <reference types="iobroker" />
+import { ZigbeeShutter } from './zigbeeShutter';
+import { DeviceInfo } from '../DeviceInfo';
+export declare class ZigbeeUbisysShutter extends ZigbeeShutter {
+    private _positionStateId;
+    constructor(pInfo: DeviceInfo);
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    protected moveToPosition(pPosition: number): void;
+}

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeUbisysShutter = void 0;
+const zigbeeShutter_1 = require("./zigbeeShutter");
+const deviceType_1 = require("../deviceType");
+const models_1 = require("../../../models");
+class ZigbeeUbisysShutter extends zigbeeShutter_1.ZigbeeShutter {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeUbisysShutter);
+        this._positionStateId = `${this.info.fullID}.position`;
+        // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
+    }
+    update(idSplit, state, initial = false) {
+        switch (idSplit[3]) {
+            case 'position':
+                this.log(models_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
+                this.currentLevel = state.val;
+                break;
+        }
+        super.update(idSplit, state, initial, true);
+    }
+    moveToPosition(pPosition) {
+        this.setState(this._positionStateId, pPosition);
+    }
+}
+exports.ZigbeeUbisysShutter = ZigbeeUbisysShutter;

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

@@ -1,5 +1,4 @@
-import { iShutter } from '../devices/iShutter';
-import { Fenster } from '../devices/groups/Fenster';
+import { Fenster, iShutter } from '../devices';
 export declare class ShutterService {
     static anyRolloDown(rollo: iShutter[]): boolean;
     static getRolladenPosition(): string;

package/lib/server/services/ShutterService.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShutterService = void 0;
-const deviceType_1 = require("../devices/deviceType");
-const devices_1 = require("../devices/devices");
-const api_service_1 = require("./api/api-service");
+const devices_1 = require("../devices");
+const api_1 = require("./api");
 class ShutterService {
     static anyRolloDown(rollo) {
         for (let i = 0; i < rollo.length; i++) {
@@ -24,7 +23,7 @@ class ShutterService {
         }
         response.push(`\nDie nächsten Zeiten zum Hochfahren:`);
         const down = [`\nDie nächsten Zeiten zum Runterfahren:`];
-        for (const r of api_service_1.API.getRooms().values()) {
+        for (const r of api_1.API.getRooms().values()) {
             if (!r.FensterGroup) {
                 continue;
             }
@@ -43,7 +42,9 @@ class ShutterService {
         const rollos = [];
         for (const dID in devices_1.Devices.alLDevices) {
             const d = devices_1.Devices.alLDevices[dID];
-            if (d.deviceType === deviceType_1.DeviceType.HmIpRoll || d.deviceType === deviceType_1.DeviceType.ZigbeeIlluShutter) {
+            if (d.deviceType === devices_1.DeviceType.HmIpRoll ||
+                d.deviceType === devices_1.DeviceType.ZigbeeIlluShutter ||
+                d.deviceType === devices_1.DeviceType.ZigbeeUbisysShutter) {
                 rollos.push(d);
             }
         }

package/lib/server/services/Telegram/telegram-service.d.ts

@@ -1,6 +1,6 @@
 import TelegramBot from 'node-telegram-bot-api';
 import { TelegramMessageCallback } from './telegramMessageCalback';
-import { iTelegramSettings } from '../../config/iConfig';
+import { iTelegramSettings } from '../../config';
 export declare class TelegramService {
     static subscribedIDs: number[];
     private static token;

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelegramService = void 0;
 const node_telegram_bot_api_1 = __importDefault(require("node-telegram-bot-api"));
 const telegramMessageCalback_1 = require("./telegramMessageCalback");
-const log_service_1 = require("../log-service/log-service");
-const utils_1 = require("../utils/utils");
-const logLevel_1 = require("../../../models/logLevel");
+const log_service_1 = require("../log-service");
+const utils_1 = require("../utils");
+const models_1 = require("../../../models");
 class TelegramService {
     static addMessageCallback(pCallback, reset = false) {
         if (!reset) {
@@ -20,7 +20,7 @@ class TelegramService {
             }
             pCallback.callback(msg);
         });
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Telegram Callback mit Namen ${pCallback.name} für Nachrichten mit "${pCallback.identifier}" hinzugefügt`);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Telegram Callback mit Namen ${pCallback.name} für Nachrichten mit "${pCallback.identifier}" hinzugefügt`);
     }
     static initialize(settings) {
         if (!settings && this.settings === undefined) {
@@ -42,8 +42,8 @@ class TelegramService {
               return;
             }
              */
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Telegram Polling Error: ${e.message}`);
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Telegram Polling Error stack: ${e.stack}`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Telegram Polling Error: ${e.message}`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Telegram Polling Error stack: ${e.stack}`);
         });
         TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('helpCommand', /\/help/, async (m) => {
             var _a;
@@ -70,8 +70,10 @@ class TelegramService {
                 .replace(/\\/g, '');
             commands.push({ command: commandIdentifier, description: telegramCb.helpMessage });
         }
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `New Telegram Commands: "${JSON.stringify(commands)}"`);
-        TelegramService.bot.setMyCommands(commands);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `New Telegram Commands: "${JSON.stringify(commands)}"`);
+        TelegramService.bot.setMyCommands(commands).catch((e) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Setting Telegram Commands failed with error: ${e}`);
+        });
     }
     static inform(message) {
         this.sendMessage(this.subscribedIDs, message);
@@ -87,7 +89,7 @@ class TelegramService {
             for (const id of ids) {
                 utils_1.Utils.guardedTimeout(() => {
                     this.bot.sendMessage(id, message.substring(i * 4095, i * 4095 + 4095)).catch((r) => {
-                        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Send Telegram Message to ${id} failed: ${r}`);
+                        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Send Telegram Message to ${id} failed: ${r}`);
                     });
                 }, 200 * i, this);
             }
@@ -96,10 +98,10 @@ class TelegramService {
     static checkAuthorized(msg) {
         var _a;
         if (msg.from !== undefined && this.allowedIDs.includes((_a = msg.from) === null || _a === void 0 ? void 0 : _a.id)) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Authorisierte Telegram Message erhalten: ${JSON.stringify(msg)}`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Authorisierte Telegram Message erhalten: ${JSON.stringify(msg)}`);
             return true;
         }
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Fremden Telegram Nutzer erkannt. Nachricht "${JSON.stringify(msg)}"`);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Fremden Telegram Nutzer erkannt. Nachricht "${JSON.stringify(msg)}"`);
         TelegramService.sendMessage([msg.chat.id], "Hello stranger,\nExcuse me, but you're not yet on the guest list.\nPlease contact our manager.\nHave a great day");
         return false;
     }

package/lib/server/services/api/api-service.d.ts

@@ -1,11 +1,11 @@
-import { RoomBase } from '../../../models/rooms/RoomBase';
-import { IoBrokerBaseDevice } from '../../devices/IoBrokerBaseDevice';
-import { LogObject } from '../log-service/log-object';
+import { IBaseDevice } from '../../devices';
+import { RoomBase } from '../../../models';
+import { LogObject } from '../log-service';
 export declare class API {
     static getDevices(): {
-        [id: string]: IoBrokerBaseDevice;
+        [id: string]: IBaseDevice;
     };
-    static getDevice(id: string): IoBrokerBaseDevice;
+    static getDevice(id: string): IBaseDevice;
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.API = void 0;
-const devices_1 = require("../../devices/devices");
-const room_service_1 = require("../room-service/room-service");
-const log_service_1 = require("../log-service/log-service");
-const logLevel_1 = require("../../../models/logLevel");
+const devices_1 = require("../../devices");
+const models_1 = require("../../../models");
+const room_service_1 = require("../room-service");
+const log_service_1 = require("../log-service");
 class API {
     static getDevices() {
         // console.log(inspect(Devices.alLDevices, false, 3));
@@ -13,7 +13,7 @@ class API {
     static getDevice(id) {
         const d = devices_1.Devices.alLDevices[id];
         if (d === undefined) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Api.getDevice() --> "${id}" not found`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Api.getDevice() --> "${id}" not found`);
         }
         return devices_1.Devices.alLDevices[id];
     }

package/lib/server/services/calendar/m/303/274ll-service.d.ts

@@ -1,6 +1,6 @@
-import { TimeCallback } from '../../../models/timeCallback';
-import { iMuellSettings } from '../../config/iConfig';
-import { OwnSonosDevice } from '../Sonos/sonos-service';
+import { TimeCallback } from '../../../models';
+import { iMuellSettings } from '../../config';
+import { OwnSonosDevice } from '../Sonos';
 import { MuellTonne } from './muell-tonne';
 export declare class MuellService {
     static alleTonnen: Array<{
@@ -13,11 +13,11 @@ export declare class MuellService {
     static brauneTonne: MuellTonne;
     static updateTimeCallback: TimeCallback;
     static checkTimeCallback: TimeCallback;
+    static months: string[];
     private static lastCheck;
     private static _calendarURL;
     private static _active;
     private static defaultSonosDevice;
-    static months: string[];
     static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void;
     static updateCalendar(checkAfterwards?: boolean): void;
     static checkAll(pRetries?: number): void;