hoffmation-base 3.0.0-alpha.15 → 3.0.0-alpha.16

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

@@ -11,4 +11,5 @@ export declare abstract class BaseCommand {
     get isManual(): boolean;
     get isInitial(): boolean;
     get reasonTrace(): string;
+    containsType(type: CommandType): boolean;
 }

package/lib/models/command/baseCommand.js

@@ -39,5 +39,14 @@ class BaseCommand {
         }
         return `CommandType("${commandSource_1.CommandSource[this.source]}") stack => ${ownPart}`;
     }
+    containsType(type) {
+        if (this._commandType === type) {
+            return true;
+        }
+        if (this.source instanceof BaseCommand) {
+            return this.source.containsType(type);
+        }
+        return false;
+    }
 }
 exports.BaseCommand = BaseCommand;

package/lib/models/command/dimmerSetLightCommand.js

@@ -26,7 +26,7 @@ class DimmerSetLightCommand extends lampSetLightCommand_1.LampSetLightCommand {
         const manual = c.isForceAction;
         switch (c.time) {
             case timeCallback_1.TimeOfDay.Daylight:
-                return new DimmerSetLightCommand(c, true, 'Daylight', c.timeout, s.dayBrightness);
+                return new DimmerSetLightCommand(c, manual || s.dayOn, 'Daylight', c.timeout, s.dayBrightness);
             case timeCallback_1.TimeOfDay.BeforeSunrise:
                 return new DimmerSetLightCommand(c, manual || s.dawnOn, 'Dawn', c.timeout, s.dawnBrightness, undefined);
             case timeCallback_1.TimeOfDay.AfterSunset:

package/lib/models/deviceSettings/actuatorSettings.d.ts

@@ -1,8 +1,25 @@
 import { DeviceSettings } from './deviceSettings';
 export declare class ActuatorSettings extends DeviceSettings {
+    /**
+     * Whether to turn on the device at dawn in time-based commands or automatic.
+     * @type {boolean}
+     */
     dawnOn: boolean;
+    /**
+     * Whether to turn on the device at dusk in time-based commands or automatic.
+     * @type {boolean}
+     */
     duskOn: boolean;
+    /**
+     * Whether to turn on the device at night in time-based commands or automatic.
+     * @type {boolean}
+     */
     nightOn: boolean;
+    /**
+     * Whether to turn on the device at day in time-based commands or automatic.
+     * @type {boolean}
+     */
+    dayOn: boolean;
     /**
      * Indicates if this device controls e.g. an Eltako, which has it's own Turn Off Time logic.
      * @type {boolean}

package/lib/models/deviceSettings/actuatorSettings.js

@@ -6,9 +6,26 @@ const server_1 = require("../../server");
 class ActuatorSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
+        /**
+         * Whether to turn on the device at dawn in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.dawnOn = true;
+        /**
+         * Whether to turn on the device at dusk in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.duskOn = true;
+        /**
+         * Whether to turn on the device at night in time-based commands or automatic.
+         * @type {boolean}
+         */
         this.nightOn = true;
+        /**
+         * Whether to turn on the device at day in time-based commands or automatic.
+         * @type {boolean}
+         */
+        this.dayOn = false;
         /**
          * Indicates if this device controls e.g. an Eltako, which has it's own Turn Off Time logic.
          * @type {boolean}
@@ -33,15 +50,16 @@ class ActuatorSettings extends deviceSettings_1.DeviceSettings {
         this.includeInAmbientLight = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.dawnOn = (_a = data.dawnOn) !== null && _a !== void 0 ? _a : this.dawnOn;
         this.duskOn = (_b = data.duskOn) !== null && _b !== void 0 ? _b : this.duskOn;
         this.nightOn = (_c = data.nightOn) !== null && _c !== void 0 ? _c : this.nightOn;
-        this.isStromStoss = (_d = data.isStromStoss) !== null && _d !== void 0 ? _d : this.isStromStoss;
-        this.stromStossResendTime = (_e = data.stromStossResendTime) !== null && _e !== void 0 ? _e : this.stromStossResendTime;
+        this.dayOn = (_d = data.dayOn) !== null && _d !== void 0 ? _d : this.dayOn;
+        this.isStromStoss = (_e = data.isStromStoss) !== null && _e !== void 0 ? _e : this.isStromStoss;
+        this.stromStossResendTime = (_f = data.stromStossResendTime) !== null && _f !== void 0 ? _f : this.stromStossResendTime;
         this.resetToAutomaticOnForceOffAfterForceOn =
-            (_f = data.resetToAutomaticOnForceOffAfterForceOn) !== null && _f !== void 0 ? _f : this.resetToAutomaticOnForceOffAfterForceOn;
-        this.includeInAmbientLight = (_g = data.includeInAmbientLight) !== null && _g !== void 0 ? _g : this.includeInAmbientLight;
+            (_g = data.resetToAutomaticOnForceOffAfterForceOn) !== null && _g !== void 0 ? _g : this.resetToAutomaticOnForceOffAfterForceOn;
+        this.includeInAmbientLight = (_h = data.includeInAmbientLight) !== null && _h !== void 0 ? _h : this.includeInAmbientLight;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/ledSettings.js

@@ -25,24 +25,16 @@ class LedSettings extends dimmerSettings_1.DimmerSettings {
         this.nightColorTemp = -1;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        this.dayOn = (_a = data.dayOn) !== null && _a !== void 0 ? _a : this.dayOn;
-        this.dayBrightness = (_b = data.dayBrightness) !== null && _b !== void 0 ? _b : this.dayBrightness;
-        this.dayColorTemp = (_c = data.dayColorTemp) !== null && _c !== void 0 ? _c : this.dayColorTemp;
-        this.dawnOn = (_d = data.dawnOn) !== null && _d !== void 0 ? _d : this.dawnOn;
-        this.dawnBrightness = (_e = data.dawnBrightness) !== null && _e !== void 0 ? _e : this.dawnBrightness;
-        this.dawnColorTemp = (_f = data.dawnColorTemp) !== null && _f !== void 0 ? _f : this.dawnColorTemp;
-        this.duskOn = (_g = data.duskOn) !== null && _g !== void 0 ? _g : this.duskOn;
-        this.duskBrightness = (_h = data.duskBrightness) !== null && _h !== void 0 ? _h : this.duskBrightness;
-        this.duskColorTemp = (_j = data.duskColorTemp) !== null && _j !== void 0 ? _j : this.duskColorTemp;
-        this.nightOn = (_k = data.nightOn) !== null && _k !== void 0 ? _k : this.nightOn;
-        this.nightBrightness = (_l = data.nightBrightness) !== null && _l !== void 0 ? _l : this.nightBrightness;
-        this.nightColorTemp = (_m = data.nightColorTemp) !== null && _m !== void 0 ? _m : this.nightColorTemp;
-        this.defaultColor = (_p = server_1.Utils.formatHex((_o = data.defaultColor) !== null && _o !== void 0 ? _o : this.defaultColor)) !== null && _p !== void 0 ? _p : LedSettings.fallbackColor;
-        this.dayColor = (_r = server_1.Utils.formatHex((_q = data.dayColor) !== null && _q !== void 0 ? _q : this.dayColor)) !== null && _r !== void 0 ? _r : LedSettings.fallbackColor;
-        this.dawnColor = (_t = server_1.Utils.formatHex((_s = data.dawnColor) !== null && _s !== void 0 ? _s : this.dawnColor)) !== null && _t !== void 0 ? _t : LedSettings.fallbackColor;
-        this.duskColor = (_v = server_1.Utils.formatHex((_u = data.duskColor) !== null && _u !== void 0 ? _u : this.duskColor)) !== null && _v !== void 0 ? _v : LedSettings.fallbackColor;
-        this.nightColor = (_x = server_1.Utils.formatHex((_w = data.nightColor) !== null && _w !== void 0 ? _w : this.nightColor)) !== null && _x !== void 0 ? _x : LedSettings.fallbackColor;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        this.dayColorTemp = (_a = data.dayColorTemp) !== null && _a !== void 0 ? _a : this.dayColorTemp;
+        this.dawnColorTemp = (_b = data.dawnColorTemp) !== null && _b !== void 0 ? _b : this.dawnColorTemp;
+        this.duskColorTemp = (_c = data.duskColorTemp) !== null && _c !== void 0 ? _c : this.duskColorTemp;
+        this.nightColorTemp = (_d = data.nightColorTemp) !== null && _d !== void 0 ? _d : this.nightColorTemp;
+        this.defaultColor = (_f = server_1.Utils.formatHex((_e = data.defaultColor) !== null && _e !== void 0 ? _e : this.defaultColor)) !== null && _f !== void 0 ? _f : LedSettings.fallbackColor;
+        this.dayColor = (_h = server_1.Utils.formatHex((_g = data.dayColor) !== null && _g !== void 0 ? _g : this.dayColor)) !== null && _h !== void 0 ? _h : LedSettings.fallbackColor;
+        this.dawnColor = (_k = server_1.Utils.formatHex((_j = data.dawnColor) !== null && _j !== void 0 ? _j : this.dawnColor)) !== null && _k !== void 0 ? _k : LedSettings.fallbackColor;
+        this.duskColor = (_m = server_1.Utils.formatHex((_l = data.duskColor) !== null && _l !== void 0 ? _l : this.duskColor)) !== null && _m !== void 0 ? _m : LedSettings.fallbackColor;
+        this.nightColor = (_p = server_1.Utils.formatHex((_o = data.nightColor) !== null && _o !== void 0 ? _o : this.nightColor)) !== null && _p !== void 0 ? _p : LedSettings.fallbackColor;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/wledSettings.js

@@ -16,19 +16,11 @@ class WledSettings extends dimmerSettings_1.DimmerSettings {
         this.nightBrightness = 2;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        this.dayOn = (_a = data.dayOn) !== null && _a !== void 0 ? _a : this.dayOn;
-        this.dayBrightness = (_b = data.dayBrightness) !== null && _b !== void 0 ? _b : this.dayBrightness;
-        this.dawnOn = (_c = data.dawnOn) !== null && _c !== void 0 ? _c : this.dawnOn;
-        this.dawnBrightness = (_d = data.dawnBrightness) !== null && _d !== void 0 ? _d : this.dawnBrightness;
-        this.duskOn = (_e = data.duskOn) !== null && _e !== void 0 ? _e : this.duskOn;
-        this.duskBrightness = (_f = data.duskBrightness) !== null && _f !== void 0 ? _f : this.duskBrightness;
-        this.nightOn = (_g = data.nightOn) !== null && _g !== void 0 ? _g : this.nightOn;
-        this.nightBrightness = (_h = data.nightBrightness) !== null && _h !== void 0 ? _h : this.nightBrightness;
-        this.dawnPreset = (_j = data.dawnPreset) !== null && _j !== void 0 ? _j : this.dawnPreset;
-        this.dayPreset = (_k = data.dayPreset) !== null && _k !== void 0 ? _k : this.dayPreset;
-        this.duskPreset = (_l = data.duskPreset) !== null && _l !== void 0 ? _l : this.duskPreset;
-        this.nightPreset = (_m = data.nightPreset) !== null && _m !== void 0 ? _m : this.nightPreset;
+        var _a, _b, _c, _d;
+        this.dawnPreset = (_a = data.dawnPreset) !== null && _a !== void 0 ? _a : this.dawnPreset;
+        this.dayPreset = (_b = data.dayPreset) !== null && _b !== void 0 ? _b : this.dayPreset;
+        this.duskPreset = (_c = data.duskPreset) !== null && _c !== void 0 ? _c : this.duskPreset;
+        this.nightPreset = (_d = data.nightPreset) !== null && _d !== void 0 ? _d : this.nightPreset;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -135,7 +135,8 @@ class LightGroup extends base_group_1.BaseGroup {
     }
     setAllActuatorsTimeBased(c) {
         this.getOutlets().forEach((s) => {
-            if ((c.time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+            if ((c.time === models_1.TimeOfDay.Daylight && s.settings.dayOn) ||
+                (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/sharedFunctions/lampUtils.d.ts

@@ -1,6 +1,7 @@
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
 import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
 export declare class LampUtils {
+    private static stromStossContinueTimeouts;
     static stromStossOn(actuator: iActuator): void;
     static setTimeBased(device: iLamp, c: LampSetTimeBasedCommand): void;
     static checkUnBlock(device: iActuator, command: ActuatorSetStateCommand): boolean;

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

@@ -5,18 +5,22 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 class LampUtils {
     static stromStossOn(actuator) {
-        services_1.Utils.guardedTimeout(() => {
-            var _a, _b;
-            if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
-                actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, true, 'StromStoss On due to Presence'));
-            }
-        }, actuator.settings.stromStossResendTime * 1000, this);
+        if (!LampUtils.stromStossContinueTimeouts.has(actuator.id)) {
+            LampUtils.stromStossContinueTimeouts.set(actuator.id, services_1.Utils.guardedTimeout(() => {
+                var _a, _b;
+                LampUtils.stromStossContinueTimeouts.delete(actuator.id);
+                if ((_b = (_a = actuator.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) {
+                    actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'StromStoss On due to Presence'));
+                }
+            }, actuator.settings.stromStossResendTime * 1000, this));
+        }
         services_1.Utils.guardedTimeout(() => {
             actuator.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Force, false, 'StromStoss Off'));
         }, 3000, this);
     }
     static setTimeBased(device, c) {
         if (c.isManual ||
+            (c.time === models_1.TimeOfDay.Daylight && device.settings.dayOn) ||
             (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)) {
@@ -65,6 +69,12 @@ class LampUtils {
         return false;
     }
     static setActuator(device, c) {
+        if (device.settings.isStromStoss &&
+            c.on &&
+            c.containsType(models_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand)) {
+            // Don't restore automatic state on Strommstoss-Relais as this might result in a loop.
+            return;
+        }
         const dontBlock = LampUtils.checkUnBlock(device, c);
         if (LampUtils.checkBlockActive(device, c)) {
             return;
@@ -88,3 +98,4 @@ class LampUtils {
     }
 }
 exports.LampUtils = LampUtils;
+LampUtils.stromStossContinueTimeouts = new Map();

package/lib/server/services/blockAutomaticHandler.d.ts

@@ -2,6 +2,7 @@
 import { CollisionSolving, RestoreTargetAutomaticValueCommand } from '../../models';
 export declare class BlockAutomaticHandler {
     private readonly _restoreAutomatic;
+    private _delayedLiftTimeout;
     constructor(restoreAutomaticCb: (c: RestoreTargetAutomaticValueCommand) => void);
     private _automaticBlockedUntil;
     get automaticBlockedUntil(): Date;
@@ -11,7 +12,7 @@ export declare class BlockAutomaticHandler {
     get automaticBlockActive(): boolean;
     disableAutomatic(durationMS: number, onCollideAction?: CollisionSolving): void;
     disableAutomaticUntil(targetDate: Date, onCollideAction?: CollisionSolving): void;
-    liftAutomaticBlock(): void;
+    liftAutomaticBlock(delay?: number): void;
     private updateRestoreTimeout;
     toJSON(): Partial<BlockAutomaticHandler>;
 }

package/lib/server/services/blockAutomaticHandler.js

@@ -9,6 +9,7 @@ const utils_1 = require("./utils");
 const lodash_1 = __importDefault(require("lodash"));
 class BlockAutomaticHandler {
     constructor(restoreAutomaticCb) {
+        this._delayedLiftTimeout = null;
         this._automaticBlockedUntil = new Date(0);
         this._restoreAutomaticStateTimeout = null;
         this._restoreAutomatic = restoreAutomaticCb;
@@ -38,8 +39,22 @@ class BlockAutomaticHandler {
         }
         this.automaticBlockedUntil = targetDate;
     }
-    liftAutomaticBlock() {
-        this.automaticBlockedUntil = new Date(0);
+    // TODO: Missing conversion to command
+    liftAutomaticBlock(delay = 0) {
+        if (delay <= 0) {
+            this.automaticBlockedUntil = new Date(0);
+            return;
+        }
+        if (this._delayedLiftTimeout !== null) {
+            return;
+        }
+        const currentBlockedUntil = this._automaticBlockedUntil;
+        this._delayedLiftTimeout = utils_1.Utils.guardedTimeout(() => {
+            this._delayedLiftTimeout = null;
+            if (this.automaticBlockActive && this._automaticBlockedUntil.getTime() === currentBlockedUntil.getTime()) {
+                this.liftAutomaticBlock(0);
+            }
+        }, delay, this);
     }
     updateRestoreTimeout() {
         if (this._restoreAutomaticStateTimeout !== null) {