hoffmation-base 3.0.0-alpha.32 → 3.0.0-alpha.33

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

@@ -16,7 +16,7 @@ class RoomSettingsController {
         this.lampOffset = new server_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
         this._settingsContainer.onChangeCb = this.onSettingChange.bind(this);
         this._settingsContainer.initializeFromDb(room);
-        server_1.WeatherService.addWeatherUpdateCb(`RolloWeatherUpdate${this.roomName}`, () => {
+        server_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
             var _a;
             if (this.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
                 (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();

package/lib/models/timeCallback.js

@@ -96,15 +96,22 @@ class TimeCallback {
                 }
                 break;
         }
-        if (nextCalculatedTime < now && this.nextToDo && this.nextToDo > this.lastDone) {
-            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
-            this.perform(now);
-            return;
-        }
         if (((_a = this.nextToDo) === null || _a === void 0 ? void 0 : _a.getTime()) == nextCalculatedTime.getTime()) {
             // No change
             return;
         }
+        if (this.nextToDo && this.nextToDo > this.lastDone) {
+            if (nextCalculatedTime < now) {
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
+                this.perform(now);
+                return;
+            }
+            else if (nextCalculatedTime.getDay() !== this.nextToDo.getDay() && this.type === TimeCallbackType.SunSet) {
+                // Recalculation between Sunset and delayed sunset action can result in the next day beeing calculated --> fire immediately
+                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the next day, while previous action wasn't yet fired --> fire immediately.`);
+                this.perform(now);
+            }
+        }
         this.nextToDo = nextCalculatedTime;
         server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Next Time event for "${this.name}" at ${this.nextToDo.toLocaleString('de-DE')}`);
     }