hoffmation-base 2.22.7 → 2.22.9

package/lib/models/rooms/RoomSettings/RoomSettingsController.d.ts

@@ -26,6 +26,7 @@ export declare class RoomSettingsController implements iRoomDefaultSettings {
     get sonnenAufgangLampenDelay(): number;
     get roomIsAlwaysDark(): boolean;
     get radioUrl(): string;
+    get includeLampsInNormalMovementLightning(): boolean;
     get room(): RoomBase | undefined;
     toJSON(): Partial<RoomSettingsController>;
     private onSettingChange;

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

@@ -77,6 +77,9 @@ class RoomSettingsController {
     get radioUrl() {
         return this._settingsContainer.radioUrl;
     }
+    get includeLampsInNormalMovementLightning() {
+        return this._settingsContainer.includeLampsInNormalMovementLightning;
+    }
     get room() {
         if (!this.roomName) {
             return undefined;

package/lib/models/rooms/RoomSettings/iRoomDefaultSettings.d.ts

@@ -24,4 +24,5 @@ export interface iRoomDefaultSettings {
     readonly movementResetTimer: number;
     readonly lightIfNoWindows: boolean;
     readonly ambientLightAfterSunset: boolean;
+    readonly includeLampsInNormalMovementLightning: boolean;
 }

package/lib/models/rooms/RoomSettings/roomSettings.d.ts

@@ -18,5 +18,6 @@ export declare class RoomSettings extends ObjectSettings {
     sonnenUntergangRolloDelay: number;
     sonnenUntergangLampenDelay: number;
     sonnenUntergangRollos: boolean;
+    includeLampsInNormalMovementLightning: boolean;
     fromPartialObject(_obj: Partial<RoomSettings>): void;
 }

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

@@ -24,9 +24,10 @@ class RoomSettings extends objectSettings_1.ObjectSettings {
         this.sonnenUntergangRolloDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangRolloDelay;
         this.sonnenUntergangLampenDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangLampenDelay;
         this.sonnenUntergangRollos = server_1.SettingsService.settings.roomDefault.sonnenUntergangRollos;
+        this.includeLampsInNormalMovementLightning = server_1.SettingsService.settings.roomDefault.includeLampsInNormalMovementLightning;
     }
     fromPartialObject(_obj) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         this.ambientLightAfterSunset = (_a = _obj.ambientLightAfterSunset) !== null && _a !== void 0 ? _a : this.ambientLightAfterSunset;
         this.lichtSonnenAufgangAus = (_b = _obj.lichtSonnenAufgangAus) !== null && _b !== void 0 ? _b : this.lichtSonnenAufgangAus;
         this.radioUrl = (_c = _obj.radioUrl) !== null && _c !== void 0 ? _c : this.radioUrl;
@@ -45,6 +46,8 @@ class RoomSettings extends objectSettings_1.ObjectSettings {
         this.sonnenUntergangRolloDelay = (_q = _obj.sonnenUntergangRolloDelay) !== null && _q !== void 0 ? _q : this.sonnenUntergangRolloDelay;
         this.sonnenUntergangLampenDelay = (_r = _obj.sonnenUntergangLampenDelay) !== null && _r !== void 0 ? _r : this.sonnenUntergangLampenDelay;
         this.sonnenUntergangRollos = (_s = _obj.sonnenUntergangRollos) !== null && _s !== void 0 ? _s : this.sonnenUntergangRollos;
+        this.includeLampsInNormalMovementLightning =
+            (_t = _obj.includeLampsInNormalMovementLightning) !== null && _t !== void 0 ? _t : this.includeLampsInNormalMovementLightning;
         super.fromPartialObject(_obj);
     }
 }

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

@@ -100,7 +100,7 @@ class LightGroup extends base_group_1.BaseGroup {
             this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[time]}"`);
             resultSteckdosen = darkOutside;
         }
-        if (activatedGroups === 0) {
+        if (activatedGroups === 0 || this.getRoom().settings.includeLampsInNormalMovementLightning) {
             this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[time]}"`);
             resultLampen = darkOutside;
         }

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

@@ -23,6 +23,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.scene)) {
             return new Error(`Device with ID ${deviceId} is no scene`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to end this.`);
         d.endScene();
         return null;
     }
@@ -92,6 +93,7 @@ class API {
                 desiredMode = settings_service_1.SettingsService.heatMode == config_1.HeatingMode.Winter ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling;
             }
         }
+        d.log(models_1.LogLevel.Info, `API Call to set AC to ${desiredState} with mode ${desiredMode} for ${forceTime}ms`);
         d.setState(desiredMode, desiredTemperature, forceTime);
         return true;
     }
@@ -101,6 +103,7 @@ class API {
      */
     static setAllAc(desiredState) {
         ac_1.DaikinService.setAll(desiredState, true);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `API Call to set all AC´s to ${desiredState}`);
     }
     /**
      * Changes the status of a given Lamp
@@ -117,6 +120,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.lamp)) {
             return new Error(`Device with ID ${deviceId} is no Lamp`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to set Lamp to ${state} for ${timeout}ms`);
         d.setLight(state, timeout, true);
         return null;
     }
@@ -135,6 +139,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.actuator)) {
             return new Error(`Device with ID ${deviceId} is no actuator`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to set Actuator to ${state} for ${timeout}ms`);
         d.setActuator(state, timeout, true);
         return null;
     }
@@ -155,6 +160,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
             return new Error(`Device with ID ${deviceId} is no dimmablelamp`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to set Dimmer to ${state} with brightness ${brightness} for ${timeout}ms`);
         d.setLight(state, timeout, true, brightness, transitionTime);
         return null;
     }
@@ -177,6 +183,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ledLamp)) {
             return new Error(`Device with ID ${deviceId} is no dimmablelamp`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to set LED to ${state} with brightness ${brightness} and color ${color} for ${timeout}ms`);
         d.setLight(state, timeout, true, brightness, transitionTime, color, colorTemp);
         return null;
     }
@@ -202,6 +209,7 @@ class API {
         else {
             d.setLevel(level, false);
         }
+        d.log(models_1.LogLevel.Info, `API Call to set Shutter to ${level}`);
         return null;
     }
     static speakOnDevice(deviceId, message, volume = 30) {
@@ -212,6 +220,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.speaker)) {
             return new Error(`Device with ID ${deviceId} is no speaker`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to speak "${message}" on device with volume ${volume}`);
         d.speakOnDevice(message, volume);
         return null;
     }
@@ -229,6 +238,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.scene)) {
             return new Error(`Device with ID ${deviceId} is no scene`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to start this.`);
         d.startScene(turnOffTimeout);
         return null;
     }
@@ -241,9 +251,11 @@ class API {
             return new Error(`Device with ID ${deviceId} is no Garage Door Opener`);
         }
         if (open) {
+            d.log(models_1.LogLevel.Info, `API Call to open Garage Door`);
             d.open();
         }
         else {
+            d.log(models_1.LogLevel.Info, `API Call to close Garage Door`);
             d.close();
         }
         return null;
@@ -262,6 +274,7 @@ class API {
         if (d.settings === undefined) {
             return new Error(`Device with ID ${deviceId} has no settings`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to change settings to ${JSON.stringify(settings)})}`);
         d.settings.fromPartialObject(settings);
         d.settings.persist(d);
         return null;
@@ -274,6 +287,7 @@ class API {
         if (g.settings === undefined) {
             return new Error(`Group with ID ${groupId} has no settings`);
         }
+        g.log(models_1.LogLevel.Info, `API Call to change settings to ${JSON.stringify(settings)})}`);
         g.settings.fromPartialObject(settings);
         g.settings.persist(g);
         return null;
@@ -289,6 +303,7 @@ class API {
         if (r === undefined) {
             return new Error(`Room with ID ${roomName} not found`);
         }
+        r.log(models_1.LogLevel.Info, `API Call to change settings to ${JSON.stringify(settings)})}`);
         r.settings.settingsContainer.fromPartialObject(settings);
         r.settings.settingsContainer.persist(r);
         return null;
@@ -305,11 +320,13 @@ class API {
     }
     static persistAllDeviceSettings() {
         var _a;
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `API Call to persist all device settings`);
         for (const device of Object.values(devices_1.Devices.alLDevices)) {
             (_a = device.settings) === null || _a === void 0 ? void 0 : _a.persist(device);
         }
     }
     static loadAllDeviceSettingsFromDb() {
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `API Call to load all device settings`);
         for (const device of Object.values(devices_1.Devices.alLDevices)) {
             device.loadDeviceSettings();
         }
@@ -327,6 +344,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.blockAutomatic)) {
             return new Error(`Device with ID ${deviceId} is not capable of blocking automatic`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to lift automatic block`);
         d.blockAutomationHandler.liftAutomaticBlock();
         return null;
     }
@@ -345,6 +363,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.blockAutomatic)) {
             return new Error(`Device with ID ${deviceId} is not capable of blocking automatic`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to block automatic for ${duration}ms with ${onCollision} on collision`);
         d.blockAutomationHandler.disableAutomatic(duration, onCollision);
         return null;
     }
@@ -356,6 +375,7 @@ class API {
         if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.buttonSwitch)) {
             return new Error(`Device with ID ${deviceId} is no switch`);
         }
+        d.log(models_1.LogLevel.Info, `API Call to press button ${position} with ${pressType}`);
         return d.pressButton(position, pressType);
     }
 }

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

@@ -65,6 +65,7 @@ class SettingsService {
                 sonnenUntergangRolloAdditionalOffsetPerCloudiness: 0.25,
                 lightIfNoWindows: false,
                 ambientLightAfterSunset: false,
+                includeLampsInNormalMovementLightning: false,
             },
             timeSettings: {
                 nightStart: {

package/lib/server/services/utils/utils.js

@@ -126,6 +126,7 @@ class Utils {
                 sonnenUntergangRolloAdditionalOffsetPerCloudiness: 0.25,
                 lightIfNoWindows: false,
                 ambientLightAfterSunset: false,
+                includeLampsInNormalMovementLightning: false,
             },
         });
         Translation_1.Res.initialize(settings_service_1.SettingsService.settings.translationSettings);