hoffmation-base 3.0.0-alpha.10 → 3.0.0-alpha.12

package/lib/models/command/actuatorWriteStateToDeviceCommand.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActuatorWriteStateToDeviceCommand = void 0;
 const baseCommand_1 = require("./baseCommand");
 const commandType_1 = require("./commandType");
+const actuatorSetStateCommand_1 = require("./actuatorSetStateCommand");
 class ActuatorWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
     constructor(source, stateValue, reason = '') {
         super(source, reason);
@@ -10,6 +11,9 @@ class ActuatorWriteStateToDeviceCommand extends baseCommand_1.BaseCommand {
         this._commandType = commandType_1.CommandType.ActuatorWriteStateToDeviceCommand;
     }
     get logMessage() {
+        if (this.source instanceof actuatorSetStateCommand_1.ActuatorSetStateCommand) {
+            return `Actuator Write StateToDevice original Log-message: ${this.source.logMessage}`;
+        }
         return `Actuator writeStateToDevice(${this.stateValue}) for reason: ${this.reasonTrace}`;
     }
 }

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

@@ -1,6 +1,6 @@
 import { BaseGroup } from './base-group';
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, TimeOfDay, WledSetLightCommand } from '../../../models';
+import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, WledSetLightCommand } from '../../../models';
 import { WledDevice } from '../wledDevice';
 import { iLedRgbCct } from '../baseDeviceInterfaces/iLedRgbCct';
 export declare class LightGroup extends BaseGroup {
@@ -20,7 +20,7 @@ export declare class LightGroup extends BaseGroup {
     setAllLampen(c: LampSetLightCommand): void;
     setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
     setAllOutlets(c: ActuatorSetStateCommand): void;
-    setAllActuatorsTimeBased(time: TimeOfDay): void;
+    setAllActuatorsTimeBased(c: LampSetTimeBasedCommand): void;
     setAllLED(c: LedSetLightCommand): void;
     setAllWled(c: WledSetLightCommand): void;
     initialize(): void;

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

@@ -70,7 +70,7 @@ class LightGroup extends base_group_1.BaseGroup {
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
-                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
                 return;
             }
             a.setActuator(c);
@@ -106,16 +106,16 @@ class LightGroup extends base_group_1.BaseGroup {
             resultLampen = darkOutside;
         }
         if (resultLampen) {
-            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time, 'LightGroup switchTimeConditional'));
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllLampen(new models_1.LampSetLightCommand(c, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllLampen(new models_1.LampSetLightCommand(c, false));
         }
         if (resultSteckdosen) {
-            this.setAllActuatorsTimeBased(c.time);
+            this.setAllActuatorsTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false));
         }
     }
     setAllLampen(c) {
@@ -133,12 +133,12 @@ class LightGroup extends base_group_1.BaseGroup {
             s.setActuator(c);
         });
     }
-    setAllActuatorsTimeBased(time) {
+    setAllActuatorsTimeBased(c) {
         this.getOutlets().forEach((s) => {
-            if ((time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                s.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, `LightGroup setAllActuatorsTimeBased`));
+            if ((c.time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (c.time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (c.time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                s.setActuator(new models_1.ActuatorSetStateCommand(c, true, `LightGroup setAllActuatorsTimeBased`, c.timeout));
             }
         });
     }

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.js

@@ -59,14 +59,14 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
         if (c.on && c.brightness === -1 && this.brightness < 10) {
             c.brightness = 10;
         }
+        super.setLight(c);
         const formattedColor = services_1.Utils.formatHex(c.color);
-        if (formattedColor !== null && c.on) {
+        if (formattedColor !== null && c.on && (c.color !== this.color || c.isForceAction)) {
             this.setState(this._stateIdColor, formattedColor);
         }
-        if (c.colorTemp > -1 && c.on) {
+        if (c.colorTemp > -1 && c.on && (c.colorTemp !== this.colortemp || c.isForceAction)) {
             this.setState(this._stateIdColorTemp, c.colorTemp);
         }
-        super.setLight(c);
     }
 }
 exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;

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

@@ -77,7 +77,7 @@ class OwnGoveeDevice {
     }
     log(level, message, debugType = log_service_1.LogDebugType.None) {
         var _a, _b;
-        log_service_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
+        log_service_1.ServerLogService.writeLog(level, message, {
             debugType: debugType,
             room: (_b = (_a = this._room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
             deviceId: this.name,