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

package/lib/models/command/baseCommand.d.ts

@@ -6,6 +6,7 @@ export declare abstract class BaseCommand {
     readonly timestamp: Date;
     abstract _commandType: CommandType;
     constructor(source?: CommandSource | BaseCommand, reason?: string);
+    get isAutomaticAction(): boolean;
     get isForceAction(): boolean;
     get isInitial(): boolean;
     get reasonTrace(): string;

package/lib/models/command/baseCommand.js

@@ -8,6 +8,12 @@ class BaseCommand {
         this.reason = reason;
         this.timestamp = new Date();
     }
+    get isAutomaticAction() {
+        if (this.source instanceof BaseCommand) {
+            return this.source.isAutomaticAction;
+        }
+        return this.source === commandSource_1.CommandSource.Automatic;
+    }
     get isForceAction() {
         if (this.source instanceof BaseCommand) {
             return this.source.isForceAction;

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -19,7 +19,7 @@ class LampUtils {
         if ((c.time === models_1.TimeOfDay.Night && device.settings.nightOn) ||
             (c.time === models_1.TimeOfDay.BeforeSunrise && device.settings.dawnOn) ||
             (c.time === models_1.TimeOfDay.AfterSunset && device.settings.duskOn)) {
-            device.setLight(new models_1.LampSetLightCommand(c, true, `SetLight due to TimeBased ${c.time}`, c.timeout));
+            device.setLight(new models_1.LampSetLightCommand(c, true, `SetLight due to TimeBased ${models_1.TimeOfDay[c.time]}`, c.timeout));
         }
     }
     static checkUnBlock(device, command) {
@@ -68,6 +68,10 @@ class LampUtils {
         if (LampUtils.checkBlockActive(device, c)) {
             return;
         }
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            device.targetAutomaticState = c.on;
+        }
         if (LampUtils.checkUnchanged(device, c)) {
             return;
         }