hoffmation-base 2.23.0 → 3.0.0-alpha.0

package/lib/server/services/govee/own-govee-device.js

@@ -99,80 +99,69 @@ class OwnGoveeDevice {
     /**
      * @inheritDoc
      */
-    setTimeBased(time, timeout = -1, force = false) {
-        switch (time) {
-            case models_1.TimeOfDay.Night:
-                if (this.settings.nightOn) {
-                    this.setLight(true, timeout, force, this.settings.nightBrightness, undefined, this.settings.nightColor, this.settings.nightColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.AfterSunset:
-                if (this.settings.duskOn) {
-                    this.setLight(true, timeout, force, this.settings.duskBrightness, undefined, this.settings.duskColor, this.settings.duskColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.BeforeSunrise:
-                if (this.settings.dawnOn) {
-                    this.setLight(true, timeout, force, this.settings.dawnBrightness, undefined, this.settings.dawnColor, this.settings.dawnColorTemp);
-                }
-                break;
-            case models_1.TimeOfDay.Daylight:
-                if (this.settings.dayOn) {
-                    this.setLight(true, timeout, force, this.settings.dayBrightness, undefined, this.settings.dayColor, this.settings.dayColorTemp);
-                }
-                break;
-        }
+    setTimeBased(c) {
+        this.setLight(models_1.LedSetLightCommand.byTimeBased(this.settings, c));
     }
     /**
      * @inheritDoc
      */
-    setLight(pValue, timeout = -1, force, brightness = -1, _transitionTime, color = '', colorTemp = -1) {
-        if (pValue && brightness === -1 && this.brightness < 10) {
-            brightness = 10;
+    setLight(c) {
+        if (c.on && c.brightness === -1 && this.brightness < 10) {
+            c.brightness = 10;
         }
-        this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}`);
-        const formattedColor = utils_1.Utils.formatHex(color);
+        this.log(models_1.LogLevel.Debug, c.logMessage);
+        const formattedColor = utils_1.Utils.formatHex(c.color);
         if (formattedColor !== null) {
-            this.setColor(color);
+            this.setColor(c.color);
         }
-        const dontBlock = devices_1.LampUtils.checkUnBlock(this, force, pValue);
-        if (devices_1.LampUtils.checkBlockActive(this, force, pValue)) {
+        const dontBlock = devices_1.LampUtils.checkUnBlock(this, c);
+        if (devices_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, log_service_1.LogDebugType.SetActuator);
-        if (brightness > -1 && pValue) {
-            this.setBrightness(brightness, () => {
-                this.log(models_1.LogLevel.Debug, `Brightness set to ${brightness}`);
+        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${c.on}" with brightness ${c.brightness}`, log_service_1.LogDebugType.SetActuator);
+        if (c.brightness > -1 && c.on) {
+            this.setBrightness(c.brightness, () => {
+                this.log(models_1.LogLevel.Debug, `Brightness set to ${c.brightness}`);
                 this.turnOn();
             });
         }
-        else if (pValue) {
+        else if (c.on) {
             this.turnOn();
         }
         else {
             this.turnOff();
         }
-        if (timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
+        if (c.timeout > -1 && !dontBlock) {
+            this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
         }
     }
-    setActuator(pValue, timeout, force) {
-        this.setLight(pValue, timeout, force);
+    setActuator(c) {
+        this.setLight(new models_1.LedSetLightCommand(c, c.on, c.reason));
     }
-    restoreTargetAutomaticValue() {
+    restoreTargetAutomaticValue(c) {
         this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this.targetAutomaticState);
+        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore Target Automatic value'));
     }
     persist() {
         var _a;
         (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
     }
-    toggleActuator(_force) {
-        this.setLight(!this.on);
-        return this.on;
+    toggleActuator(c) {
+        const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
+        this.setActuator(setActuatorCommand);
+        return setActuatorCommand.on;
     }
-    toggleLight(time, _force = false, calculateTime = false) {
-        return devices_1.LampUtils.toggleLight(this, time, _force, calculateTime);
+    toggleLight(c) {
+        return devices_1.LampUtils.toggleLight(this, c);
+    }
+    writeActuatorStateToDevice(c) {
+        this.log(models_1.LogLevel.Debug, c.logMessage, log_service_1.LogDebugType.SetActuator);
+        if (c.stateValue) {
+            this.turnOn();
+        }
+        else {
+            this.turnOff();
+        }
     }
     update(data) {
         this.queuedValue = null;

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

@@ -1,5 +1,5 @@
 import { ringStorage } from '../utils';
-import { iRoomBase, RoomBase } from '../../../models';
+import { ActuatorSetStateCommand, FloorSetAllShuttersCommand, iRoomBase, RoomBase } from '../../../models';
 import { BaseGroup, iRoomDevice } from '../../devices';
 export declare class RoomService {
     static Rooms: Map<string, RoomBase>;
@@ -15,20 +15,16 @@ export declare class RoomService {
     static addToRoomList(room: RoomBase): void;
     static getAllRoomsOfFloor(floor: number): IterableIterator<[string, RoomBase]>;
     /**
-     * Set ALl Roolos of a specific floor
-     * !!floor -1 sets all rollos in house instead!!
-     * @param floor the level on which all rollos shall be changed -1 equals all rooms
-     * @param position (0 equals down, 100 up)
+     * Moves all shutters of the desired floor(s) to the desired position
      */
-    static setAllRolloOfFloor(floor?: number, position?: number): void;
+    static setAllShutterOfFloor(c: FloorSetAllShuttersCommand): void;
     /**
      * Set ALl Lamps of a specific floor
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
-     * @param status
-     * @param timeout
+     * @param command the command to be executed
      */
-    static setAllLampsOfFloor(floor: number, status?: boolean, timeout?: number): void;
+    static setAllLampsOfFloor(floor: number, command: ActuatorSetStateCommand): void;
     static clearAllAlarms(): void;
     static startAwayMode(): void;
     static startNightAlarmMode(): void;
@@ -37,6 +33,6 @@ export declare class RoomService {
     static getLastMovements(): string;
     private static stopIntrusionAlarm;
     private static performNextIntrusionLevel;
-    private static restoreRolloPosition;
+    private static restoreShutterPositions;
     private static restoreLight;
 }

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

@@ -15,34 +15,30 @@ class RoomService {
         return [...this.Rooms].filter(([_name, room]) => room.etage === floor).values();
     }
     /**
-     * Set ALl Roolos of a specific floor
-     * !!floor -1 sets all rollos in house instead!!
-     * @param floor the level on which all rollos shall be changed -1 equals all rooms
-     * @param position (0 equals down, 100 up)
+     * Moves all shutters of the desired floor(s) to the desired position
      */
-    static setAllRolloOfFloor(floor = -1, position = 0) {
+    static setAllShutterOfFloor(c) {
         var _a;
-        const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.Rooms.entries();
+        const rooms = c.specificFloor != undefined ? this.getAllRoomsOfFloor(c.specificFloor) : this.Rooms.entries();
         for (const [_name, room] of rooms) {
-            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(position, true);
+            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, c.position));
         }
     }
     /**
      * Set ALl Lamps of a specific floor
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
-     * @param status
-     * @param timeout
+     * @param command the command to be executed
      */
-    static setAllLampsOfFloor(floor, status = false, timeout) {
+    static setAllLampsOfFloor(floor, command) {
         var _a, _b, _c, _d;
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Schalte alle Lampen in Etage ${floor} auf den Wert ${status}`);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Schalte alle Lampen in Etage ${floor} auf den Wert ${command.on}`);
         const rooms = floor > -1 ? this.getAllRoomsOfFloor(floor) : this.Rooms.entries();
         for (const [_name, room] of rooms) {
-            (_a = room.LightGroup) === null || _a === void 0 ? void 0 : _a.setAllLampen(status, undefined, true, timeout);
-            (_b = room.LightGroup) === null || _b === void 0 ? void 0 : _b.setAllLED(status);
-            (_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.setAllStecker(status, undefined, true);
-            (_d = room.LightGroup) === null || _d === void 0 ? void 0 : _d.setAllWled(status);
+            (_a = room.LightGroup) === null || _a === void 0 ? void 0 : _a.setAllLampen(command);
+            (_b = room.LightGroup) === null || _b === void 0 ? void 0 : _b.setAllLED(new models_1.LedSetLightCommand(command, command.on));
+            (_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.setAllactuator(command);
+            (_d = room.LightGroup) === null || _d === void 0 ? void 0 : _d.setAllWled(new models_1.WledSetLightCommand(command, command.on));
         }
     }
     static clearAllAlarms() {
@@ -55,8 +51,6 @@ class RoomService {
             }
         }
         this.stopIntrusionAlarm();
-        this.restoreRolloPosition();
-        this.restoreLight();
     }
     static startAwayMode() {
         Sonos_1.SonosService.speakOnAll(Translation_1.Res.alarmArmed(), 40);
@@ -129,8 +123,8 @@ class RoomService {
         this._intrusionAlarmActive = false;
         this._intrusionAlarmLevel = 0;
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Alarm wurde beendet --> Fahre Rollos in Ausgangsposition.`);
-        this.restoreRolloPosition();
-        this.restoreLight();
+        this.restoreShutterPositions(new models_1.RoomRestoreShutterPositionCommand(models_1.CommandSource.Force, false, 'Resetting all shutter in all Rooms to last known position'));
+        this.restoreLight(new models_1.RoomRestoreLightCommand(models_1.CommandSource.Force, 'roomService.clearAllAlarms'));
     }
     static performNextIntrusionLevel() {
         this._intrusionAlarmTimeout = undefined;
@@ -149,8 +143,8 @@ class RoomService {
         else if (this._intrusionAlarmLevel === 2) {
             speakMessage = Translation_1.Res.intruderShutterUpPleaseLeave();
             utils_1.Utils.guardedNewThread(() => {
-                this.setAllRolloOfFloor(-1, 100);
-                this.setAllLampsOfFloor(-1, true);
+                this.setAllShutterOfFloor(new models_1.FloorSetAllShuttersCommand(models_1.CommandSource.Automatic, 100, undefined, 'Intrusion alarm level 2'));
+                this.setAllLampsOfFloor(-1, new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'Intrusion alarm level 2'));
             }, this);
         }
         else if (this._intrusionAlarmLevel === 3) {
@@ -178,15 +172,15 @@ class RoomService {
             Telegram_1.TelegramService.inform(`Eindringling erhielt folgende Nachricht: "${speakMessage}"\nAlarmlevel ist ${this._intrusionAlarmLevel}\t Automatisches Ende bei ${alarmAutomaticEnd}`);
         }, this);
     }
-    static restoreRolloPosition() {
+    static restoreShutterPositions(c) {
         var _a;
         for (const room of this.Rooms.values()) {
-            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.restoreRolloPosition();
+            (_a = room.WindowGroup) === null || _a === void 0 ? void 0 : _a.restoreRolloPosition(c);
         }
     }
-    static restoreLight() {
+    static restoreLight(c) {
         for (const room of this.Rooms.values()) {
-            room.setLightTimeBased(true);
+            room.setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(c, true, 'roomService.restoreLight'));
         }
     }
 }