hoffmation-base 3.0.0-alpha.63 → 3.0.0-alpha.65

package/lib/server/devices/deviceUpdater.js

@@ -39,8 +39,8 @@ class DeviceUpdater {
         }
         else if (idSplit[0] == devices_1.Devices.IDENTIFIER_SMART_GARDEN) {
             if (idSplit[1] === 'admin' ||
-                idSplit[2].indexOf('LOCATION') !== 0 ||
                 idSplit.length < 4 ||
+                idSplit[2].indexOf('LOCATION') !== 0 ||
                 idSplit[3].indexOf('DEVICE') !== 0) {
                 // This is no update for a smartgarden device
                 return;

package/lib/server/devices/groups/Window.d.ts

@@ -15,6 +15,11 @@ export declare class Window extends BaseGroup {
      * @returns {number} The level (0 closed, 100 open)
      */
     get desiredPosition(): number;
+    /**
+     * Checks if any shutter is down (0%)
+     * @returns {boolean} true if any shutter is down
+     */
+    get anyShutterDown(): boolean;
     constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[]);
     /**
      * sets the desired Pos and moves rollo to this level

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

@@ -16,6 +16,15 @@ class Window extends base_group_1.BaseGroup {
     get desiredPosition() {
         return this._desiredPosition;
     }
+    /**
+     * Checks if any shutter is down (0%)
+     * @returns {boolean} true if any shutter is down
+     */
+    get anyShutterDown() {
+        return this.getShutter().some((s) => {
+            return s.currentLevel === 0;
+        });
+    }
     constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = []) {
         super(roomName, group_type_1.GroupType.Window);
         this.handleIds = handleIds;

package/lib/server/devices/groups/windowGroup.d.ts

@@ -15,6 +15,11 @@ export declare class WindowGroup extends BaseGroup {
      * @warning Manual setting of this callback is not recommended. Prefer {@link recalcTimeCallbacks} after changing settings.
      */
     sunsetShutterCallback: TimeCallback | undefined;
+    /**
+     * Checks if any Shutter of any window is down
+     * @returns {boolean} True if there is atleast one shutte with level of 0%.
+     */
+    get anyShutterDown(): boolean;
     constructor(roomName: string, windows: Window[]);
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     initialize(): void;

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

@@ -9,6 +9,15 @@ const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 const device_cluster_type_1 = require("../device-cluster-type");
 class WindowGroup extends base_group_1.BaseGroup {
+    /**
+     * Checks if any Shutter of any window is down
+     * @returns {boolean} True if there is atleast one shutte with level of 0%.
+     */
+    get anyShutterDown() {
+        return this.windows.some((w) => {
+            w.anyShutterDown;
+        });
+    }
     constructor(roomName, windows) {
         super(roomName, group_type_1.GroupType.WindowGroup);
         this.windows = windows;
@@ -172,8 +181,9 @@ class WindowGroup extends base_group_1.BaseGroup {
                 }
                 this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
-            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
-                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day'));
+            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset)) &&
+                this.anyShutterDown) {
+                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day and at least 1 shutter is down.'));
             }
             services_1.TimeCallbackService.addCallback(this.sunriseShutterCallback);
         }

package/lib/server/ioBroker/ioBroker.main.js

@@ -52,8 +52,14 @@ class ioBrokerMain {
         this.connectionCallbacks.onUpdate = (id, state) => {
             services_1.Utils.guardedNewThread(() => {
                 // console.log('NEW VALUE of ' + id + ': ' + JSON.stringify(state));
-                this.states[id] = state;
-                this.deviceUpdater.updateState(id, state);
+                try {
+                    this.states[id] = state;
+                    this.deviceUpdater.updateState(id, state);
+                }
+                catch (e) {
+                    services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Update of state (${id}) to ${state} failed: ${e}`);
+                    return;
+                }
             }, this);
         };
         this.connectionCallbacks.onError = (err) => {