hoffmation-base 0.1.41-5 → 0.1.41-8

package/lib/models/deviceSettings/shutterSettings.d.ts

@@ -2,4 +2,10 @@ import { DeviceSettings } from './deviceSettings';
 export declare class ShutterSettings extends DeviceSettings {
     msTilTop: number;
     msTilBot: number;
+    /**
+     * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
+     * we can programmatically trigger the callbacks.
+     * @type {boolean}
+     */
+    triggerPositionUpdateByTime: boolean;
 }

package/lib/models/deviceSettings/shutterSettings.js

@@ -7,6 +7,12 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
         super(...arguments);
         this.msTilTop = -1;
         this.msTilBot = -1;
+        /**
+         * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
+         * we can programmatically trigger the callbacks.
+         * @type {boolean}
+         */
+        this.triggerPositionUpdateByTime = false;
     }
 }
 exports.ShutterSettings = ShutterSettings;

package/lib/models/rooms/RoomSettings/RoomSettings.js

@@ -76,6 +76,7 @@ class RoomSettings {
     }
     set sonnenUntergangRolloDelay(value) {
         this._sonnenUntergangRolloDelay = value;
+        this.recalcRolloOffset();
     }
     get movementResetTimer() {
         return this._movementResetTimer;

package/lib/models/timeCallback.js

@@ -42,7 +42,7 @@ class TimeCallback {
             case TimeCallbackType.Sunrise:
                 let fixedSRDate = new Date(time_callback_service_1.TimeCallbackService.nextSunRise.getTime() + this.minuteOffset * 60 * 1000);
                 if (this.sunTimeOffset) {
-                    const nextMinSR = this.sunTimeOffset.getNextMinimumSunrise();
+                    const nextMinSR = this.sunTimeOffset.getNextMinimumSunrise(now);
                     if (nextMinSR > fixedSRDate && fixedSRDate.getDate() === nextMinSR.getDate()) {
                         fixedSRDate = nextMinSR;
                     }
@@ -56,7 +56,7 @@ class TimeCallback {
             case TimeCallbackType.SunSet:
                 let fixedSSDate = new Date(time_callback_service_1.TimeCallbackService.nextSunSet.getTime() + this.minuteOffset * 60 * 1000);
                 if (this.sunTimeOffset) {
-                    const nextMaxSS = this.sunTimeOffset.getNextMaximumSunset();
+                    const nextMaxSS = this.sunTimeOffset.getNextMaximumSunset(now);
                     if (nextMaxSS < fixedSSDate && fixedSSDate.getDate() === nextMaxSS.getDate()) {
                         fixedSSDate = nextMaxSS;
                     }

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

@@ -5,8 +5,6 @@ export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _movementStateId;
     private _movementState;
     private _movementStartMs;
-    private _msTilTop;
-    private _msTilBot;
     private _movementStartPos;
     private _iMovementTimeout;
     constructor(pInfo: DeviceInfo);

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluShutter = void 0;
 const zigbeeShutter_1 = require("./zigbeeShutter");
 const deviceType_1 = require("../deviceType");
-const logLevel_1 = require("../../../models/logLevel");
-const utils_1 = require("../../services/utils/utils");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 var MovementState;
 (function (MovementState) {
     MovementState[MovementState["Down"] = 30] = "Down";
@@ -16,8 +16,6 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluShutter);
         this._movementState = MovementState.Stop;
         this._movementStartMs = -1;
-        this._msTilTop = -1;
-        this._msTilBot = -1;
         this._movementStartPos = -1;
         this._movementStateId = `${this.info.fullID}.position`;
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
@@ -25,7 +23,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
             case 'position':
-                this.log(logLevel_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
+                this.log(models_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
                 this.processNewMovementState(state.val);
                 break;
         }
@@ -33,12 +31,12 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     }
     moveToPosition(targetPosition) {
         if (this._movementState !== MovementState.Stop) {
-            this.log(logLevel_1.LogLevel.Info, `Delaying movement command for ${this.info.customName} as it is moving to prevent actuator damage`);
+            this.log(models_1.LogLevel.Info, `Delaying movement command for ${this.info.customName} as it is moving to prevent actuator damage`);
             this.changeMovementState(MovementState.Stop);
             if (this._iMovementTimeout !== undefined) {
                 clearTimeout(this._iMovementTimeout);
             }
-            this._iMovementTimeout = utils_1.Utils.guardedTimeout(() => {
+            this._iMovementTimeout = services_1.Utils.guardedTimeout(() => {
                 this._iMovementTimeout = undefined;
                 this.moveToPosition(targetPosition);
             }, 2000, this);
@@ -47,28 +45,34 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         this._movementStartPos = this._currentLevel;
         if (targetPosition === 100) {
             this.changeMovementState(MovementState.Up);
+            this.initializeMovementFinishTimeout(this.getAverageUp(), 100);
             return;
         }
         if (targetPosition === 0) {
             this.changeMovementState(MovementState.Down);
+            this.initializeMovementFinishTimeout(this.getAverageUp(), 0);
+            services_1.Utils.guardedTimeout(() => {
+                this.changeMovementState(MovementState.Stop);
+            }, this.getAverageDown() + 1000, this);
             return;
         }
         if (!this.isCalibrated()) {
-            this.log(logLevel_1.LogLevel.Alert, `Can't move  to position "${targetPosition}" as it is not calibrated (Move it completly up, down, up first)`);
+            this.log(models_1.LogLevel.Alert, `Can't move  to position "${targetPosition}" as it is not calibrated (Move it completly up, down, up first)`);
             return;
         }
         const distance = Math.abs(this._currentLevel - targetPosition);
         const direction = this._currentLevel > targetPosition ? MovementState.Down : MovementState.Up;
-        const duration = Math.round(distance / 100) * (this._currentLevel > targetPosition ? this._msTilBot : this._msTilTop);
+        const duration = Math.round(distance / 100) * (this._currentLevel > targetPosition ? this.getAverageDown() : this.getAverageUp());
         this.changeMovementState(direction);
-        utils_1.Utils.guardedTimeout(() => {
+        this.initializeMovementFinishTimeout(duration, targetPosition);
+        services_1.Utils.guardedTimeout(() => {
             this.changeMovementState(MovementState.Stop);
         }, duration, this);
     }
     changeMovementState(direction) {
-        this.log(logLevel_1.LogLevel.Debug, `Set new MovementState to "${MovementState[direction]}"`);
+        this.log(models_1.LogLevel.Debug, `Set new MovementState to "${MovementState[direction]}"`);
         if (direction !== MovementState.Stop) {
-            this._movementStartMs = utils_1.Utils.nowMS();
+            this._movementStartMs = services_1.Utils.nowMS();
         }
         this.setState(this._movementStateId, direction, () => {
             this._movementState = direction;
@@ -76,43 +80,41 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     }
     processNewMovementState(val) {
         const newState = val <= 30 ? MovementState.Down : val >= 70 ? MovementState.Up : MovementState.Stop;
-        this.log(logLevel_1.LogLevel.Trace, `New Movementstate "${MovementState[val]}"`);
+        this.log(models_1.LogLevel.Trace, `New Movementstate "${MovementState[val]}"`);
         if (newState !== MovementState.Stop) {
             this._movementState = newState;
             return;
         }
-        const timePassed = utils_1.Utils.nowMS() - this._movementStartMs;
+        const timePassed = services_1.Utils.nowMS() - this._movementStartMs;
         const oldState = this._movementState;
         if (this._movementStartPos === 0 && oldState === MovementState.Up && this._setLevel === 100) {
-            this._msTilTop = timePassed;
-            this.log(logLevel_1.LogLevel.Debug, `New Time-Until-Top measurement for ${this.info.customName}: ${timePassed}ms`);
+            this.log(models_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;
+                (timePassed - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
             this.persistCalibrationData();
-            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter up (${this._msTilTop}ms), new Average: ${this._shutterCalibrationData.averageUp}`);
+            this.log(models_1.LogLevel.Trace, `New Measurment for shutter up (${this.getAverageUp()}ms), new Average: ${this._shutterCalibrationData.averageUp}`);
             return;
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
-            this.log(logLevel_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
-            this._msTilBot = timePassed;
+            this.log(models_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
             this.currentLevel = this._setLevel;
             this._shutterCalibrationData.counterDown++;
             this._shutterCalibrationData.averageDown +=
-                (this._msTilBot - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
+                (timePassed - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
             this.persistCalibrationData();
-            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter down (${this._msTilBot}ms), new Average: ${this._shutterCalibrationData.averageDown}`);
+            this.log(models_1.LogLevel.Trace, `New Measurment for shutter down (${this.getAverageDown()}ms), new Average: ${this._shutterCalibrationData.averageDown}`);
             return;
         }
         if (!this.isCalibrated()) {
             return;
         }
         if (oldState === MovementState.Down) {
-            this.currentLevel = Math.min(this._currentLevel - Math.round((timePassed * 100) / this._msTilBot), 0);
+            this.currentLevel = Math.min(this._currentLevel - Math.round((timePassed * 100) / this.getAverageDown()), 0);
         }
         else if (oldState === MovementState.Up) {
-            this.currentLevel = Math.max(this._currentLevel + Math.round((timePassed * 100) / this._msTilBot), 100);
+            this.currentLevel = Math.max(this._currentLevel + Math.round((timePassed * 100) / this.getAverageUp()), 100);
         }
     }
 }

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

@@ -1,14 +1,15 @@
+/// <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;
+    protected _iMovementFinishTimeout: NodeJS.Timeout | null;
     get currentLevel(): number;
     set currentLevel(value: number);
     get desiredFensterLevel(): number;
@@ -28,5 +29,6 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     protected getAverageDown(): number;
     protected isCalibrated(): boolean;
     protected persistCalibrationData(): void;
+    protected initializeMovementFinishTimeout(duration: number, endPosition: number): void;
     toJSON(): Partial<IoBrokerBaseDevice>;
 }

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) {
         super(pInfo, pType);
-        this.settings = new shutterSettings_1.ShutterSettings();
+        this.settings = new models_1.ShutterSettings();
+        this._iMovementFinishTimeout = null;
         this._currentLevel = -1;
         this._firstCommandRecieved = false;
         this._setLevel = -1;
         this._setLevelTime = -1;
-        this._shutterCalibrationData = new ShutterCalibration_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
+        this._shutterCalibrationData = new models_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 = 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,11 +35,11 @@ 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);
@@ -67,33 +66,33 @@ 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);
     }
     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 +101,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,15 +110,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}`);
+        this.log(models_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);
     }
+    initializeMovementFinishTimeout(duration, endPosition) {
+        if (this._iMovementFinishTimeout !== null) {
+            clearTimeout(this._iMovementFinishTimeout);
+        }
+        this._iMovementFinishTimeout = services_1.Utils.guardedTimeout(() => {
+            this.currentLevel = endPosition;
+            this._iMovementFinishTimeout = null;
+        }, duration, this);
+    }
     toJSON() {
         return lodash_1.default.omit(super.toJSON(), ['_fenster']);
     }

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;

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

@@ -2,30 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MuellService = void 0;
 const node_ical_1 = require("node-ical");
-const timeCallback_1 = require("../../../models/timeCallback");
-const log_service_1 = require("../log-service/log-service");
-const utils_1 = require("../utils/utils");
+const models_1 = require("../../../models");
+const log_service_1 = require("../log-service");
+const utils_1 = require("../utils");
 const muell_tonne_1 = require("./muell-tonne");
 const time_callback_service_1 = require("../time-callback-service");
-const logLevel_1 = require("../../../models/logLevel");
 class MuellService {
     static intialize(config, defaultSonosDevice) {
         this.defaultSonosDevice = defaultSonosDevice;
         this._active = true;
         this._calendarURL = config.calendarURL;
-        this.updateTimeCallback = new timeCallback_1.TimeCallback('MuelltonnenServiceUpdater', timeCallback_1.TimeCallbackType.TimeOfDay, () => {
+        this.updateTimeCallback = new models_1.TimeCallback('MuelltonnenServiceUpdater', models_1.TimeCallbackType.TimeOfDay, () => {
             this.updateCalendar(false);
         }, 0, 2, 0);
         time_callback_service_1.TimeCallbackService.addCallback(this.updateTimeCallback);
-        this.checkTimeCallback = new timeCallback_1.TimeCallback('MuelltonnenServiceChecker', timeCallback_1.TimeCallbackType.TimeOfDay, () => {
+        this.checkTimeCallback = new models_1.TimeCallback('MuelltonnenServiceChecker', models_1.TimeCallbackType.TimeOfDay, () => {
             this.checkAll();
         }, 0, 18, 0);
         time_callback_service_1.TimeCallbackService.addCallback(this.checkTimeCallback);
         this.updateCalendar();
     }
     static updateCalendar(checkAfterwards = true) {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Muell Service wird nun initialisiert`);
-        node_ical_1.async.fromURL(this._calendarURL).then((data) => {
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Muell Service wird nun initialisiert`);
+        node_ical_1.async
+            .fromURL(this._calendarURL)
+            .then((data) => {
             this.gelbeTonne = new muell_tonne_1.MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
             this.graueTonne = new muell_tonne_1.MuellTonne('Graue Tonne', this.defaultSonosDevice);
             this.blaueTonne = new muell_tonne_1.MuellTonne('Blaue Tonne', this.defaultSonosDevice);
@@ -40,7 +41,7 @@ class MuellService {
                     continue;
                 }
                 const ev = data[k];
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${this.months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('en-GB')}`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${this.months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('en-GB')}`);
                 if (ev.start.getTime() < todayMidnight) {
                     continue;
                 }
@@ -59,7 +60,7 @@ class MuellService {
                         this.brauneTonne.dates.push(ev.start);
                         break;
                     default:
-                        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Unbekannte Mülltonne (${ev.summary})`);
+                        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Unbekannte Mülltonne (${ev.summary})`);
                 }
             }
             this.gelbeTonne.sortDates();
@@ -70,6 +71,9 @@ class MuellService {
             if (checkAfterwards) {
                 this.checkAll();
             }
+        })
+            .catch((r) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Loading Trash Calendar failed with error: "${r}"`);
         });
     }
     static checkAll(pRetries = 10) {
@@ -78,18 +82,18 @@ class MuellService {
         }
         const now = new Date();
         if (now.getTime() - this.lastCheck.getTime() < 60000 && now.getDate() === this.lastCheck.getDate()) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `MüllService.checkAll: Skipped weil wir gerade erst geprüft hatten.`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `MüllService.checkAll: Skipped weil wir gerade erst geprüft hatten.`);
             return;
         }
         if (this.gelbeTonne === undefined) {
             if (pRetries > 0) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Der Müllservice ist noch nicht bereit --> warten`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Der Müllservice ist noch nicht bereit --> warten`);
                 utils_1.Utils.guardedTimeout(() => {
                     MuellService.checkAll(pRetries - 1);
                 }, 1000);
             }
             else {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `Der Müllservice ist trotz Warten nicht bereit --> Abbruch`);
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Der Müllservice ist trotz Warten nicht bereit --> Abbruch`);
             }
             return;
         }
@@ -102,7 +106,7 @@ class MuellService {
 }
 exports.MuellService = MuellService;
 MuellService.alleTonnen = [];
+MuellService.months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 MuellService.lastCheck = new Date(0);
 MuellService._active = false;
 MuellService.defaultSonosDevice = undefined;
-MuellService.months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];

package/lib/server/services/time-callback-service.d.ts

@@ -13,8 +13,8 @@ export declare class SunTimeOffsets {
     maximumHours: number;
     maximumMinutes: number;
     constructor(sunrise?: number, sunset?: number, minimumHours?: number, minimumMinutes?: number, maximumHours?: number, maximumMinutes?: number);
-    getNextMinimumSunrise(): Date;
-    getNextMaximumSunset(): Date;
+    getNextMinimumSunrise(date?: Date): Date;
+    getNextMaximumSunset(date?: Date): Date;
 }
 export declare class TimeCallbackService {
     private static _todaySunRise;
@@ -34,6 +34,6 @@ export declare class TimeCallbackService {
     static performCheck(): void;
     static recalcSunTimes(): void;
     static removeCallback(pCallback: TimeCallback): void;
-    static updateSunRise(pDay?: Date): void;
-    static updateSunSet(pDay?: Date): void;
+    static updateSunRise(pDay?: Date, lat?: number, long?: number): void;
+    static updateSunSet(pDay?: Date, lat?: number, long?: number): void;
 }

package/lib/server/services/time-callback-service.js

@@ -24,19 +24,21 @@ class SunTimeOffsets {
         this.maximumHours = maximumHours;
         this.maximumMinutes = maximumMinutes;
     }
-    getNextMinimumSunrise() {
-        const today = new Date(new Date().setHours(this.minimumHours, this.minimumMinutes));
-        if (today > new Date()) {
+    getNextMinimumSunrise(date = new Date()) {
+        const dateCopy = new Date(date);
+        const today = new Date(dateCopy.setHours(this.minimumHours, this.minimumMinutes, 0, 0));
+        if (today > date) {
             return today;
         }
-        return new Date(today.getTime() + 24 * 60 * 60 * 1000);
+        return new Date(today.setDate(today.getDate() + 1));
     }
-    getNextMaximumSunset() {
-        const today = new Date(new Date().setHours(this.maximumHours, this.maximumMinutes));
-        if (today > new Date()) {
+    getNextMaximumSunset(date = new Date()) {
+        const dateCopy = new Date(date);
+        const today = new Date(dateCopy.setHours(this.maximumHours, this.maximumMinutes, 0, 0));
+        if (today > date) {
             return today;
         }
-        return new Date(today.getTime() + 24 * 60 * 60 * 1000);
+        return new Date(today.setDate(today.getDate() + 1));
     }
 }
 exports.SunTimeOffsets = SunTimeOffsets;
@@ -170,11 +172,11 @@ Nächster Sonnenuntergang um ${TimeCallbackService._nextSunSet.toLocaleTimeStrin
             return;
         }
     }
-    static updateSunRise(pDay = new Date()) {
-        TimeCallbackService._nextSunRise = (0, sunrise_sunset_js_1.getSunrise)(51.529556852253826, 7.097266042276687, pDay);
+    static updateSunRise(pDay = new Date(), lat = 51.529556852253826, long = 7.097266042276687) {
+        TimeCallbackService._nextSunRise = (0, sunrise_sunset_js_1.getSunrise)(lat, long, pDay);
     }
-    static updateSunSet(pDay = new Date()) {
-        TimeCallbackService._nextSunSet = (0, sunrise_sunset_js_1.getSunset)(51.529556852253826, 7.097266042276687, pDay);
+    static updateSunSet(pDay = new Date(), lat = 51.529556852253826, long = 7.097266042276687) {
+        TimeCallbackService._nextSunSet = (0, sunrise_sunset_js_1.getSunset)(lat, long, pDay);
     }
 }
 exports.TimeCallbackService = TimeCallbackService;