hoffmation-base 3.2.31 → 3.3.2

package/lib/devices/groups/Window.js

@@ -86,7 +86,7 @@ class Window extends base_group_1.BaseGroup {
                 this.getVibration().forEach((element) => {
                     element.vibrationBlockedByHandle = true;
                 });
-                const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
+                const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset, new Date(), this.getRoom().settings.nightStart, this.getRoom().settings.nightEnd);
                 (_a = this.getShutter()) === null || _a === void 0 ? void 0 : _a.setLevel(new command_1.ShutterSetLevelCommand(enums_1.CommandSource.Force, services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay) ? 50 : 100, 'Window ajar by handle'));
             });
             griff.addOffenCallback((offen) => {

package/lib/devices/groups/windowGroup.js

@@ -80,7 +80,7 @@ class WindowGroup extends base_group_1.BaseGroup {
     }
     setRolloByWeatherStatus(c) {
         const room = this.getRoom();
-        const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset);
+        const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset, new Date(), room.settings.nightStart, room.settings.nightEnd);
         const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
         this.windows.forEach((f) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -176,7 +176,7 @@ class WindowGroup extends base_group_1.BaseGroup {
             this.sunsetShutterCallback = new models_1.TimeCallback(`${this.roomName} Sunset Shutter`, enums_1.TimeCallbackType.SunSet, () => {
                 this.sunsetDown(new command_1.ShutterSunsetDownCommand(enums_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunset);
-            if (services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
+            if (services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset, new Date(), room.settings.nightStart, room.settings.nightEnd))) {
                 utils_1.Utils.guardedTimeout(() => {
                     this.setWindowShutterBaseAutomaticLevel(0);
                     this.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(enums_1.CommandSource.Initial, 0, 'It is dark outside'));
@@ -219,7 +219,7 @@ class WindowGroup extends base_group_1.BaseGroup {
                 }
                 this.sunriseUp(new command_1.ShutterSunriseUpCommand(enums_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
-            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
+            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset, new Date(), room.settings.nightStart, room.settings.nightEnd))) {
                 if (!this.anyShutterDown) {
                     // Only set new desired position without applying it.
                     this.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(enums_1.CommandSource.Initial, 100, 'It is daytime during restart.', false));

package/lib/devices/sharedFunctions/lampUtils.js

@@ -47,10 +47,10 @@ class LampUtils {
         return dontBlock;
     }
     static toggleLight(device, c) {
-        var _a;
+        var _a, _b, _c;
         const newVal = device.queuedValue !== null ? !device.queuedValue : !device.actuatorOn;
         if (newVal && c.time === undefined && c.calculateTime && device.room !== undefined) {
-            c.time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+            c.time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset, new Date(), (_b = device.room) === null || _b === void 0 ? void 0 : _b.settings.nightStart, (_c = device.room) === null || _c === void 0 ? void 0 : _c.settings.nightEnd);
         }
         if (newVal && c.time !== undefined) {
             device.setTimeBased(new command_1.LampSetTimeBasedCommand(c, c.time, '', c.isForceAction ? undefined : null));

package/lib/devices/unifi/unifi-access.js

@@ -85,7 +85,7 @@ class UnifiAccess {
         // }
     }
     initializeDevice(data) {
-        if (!UnifiAccess.ownDoors.has(data.alias)) {
+        if (!data.alias || !UnifiAccess.ownDoors.has(data.alias)) {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Protect: Ignoring camera ${data.name}`);
             return;
         }

package/lib/devices/unifi/unifi-protect.js

@@ -100,7 +100,7 @@ class UnifiProtect {
         }
     }
     initializeCamera(data) {
-        if (!UnifiProtect.ownCameras.has(data.name)) {
+        if (!data.name || !UnifiProtect.ownCameras.has(data.name)) {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Unifi-Protect: Ignoring camera ${data.name}`);
             return;
         }

package/lib/interfaces/iRoomSettings.d.ts

@@ -33,6 +33,14 @@ export interface iRoomSettings extends iObjectSettings {
      *
      */
     movementResetTimer: number;
+    /**
+     * The custom start of night for this room
+     */
+    nightStart?: iTimePair;
+    /**
+     * The custom end of night for this room
+     */
+    nightEnd?: iTimePair;
     /**
      *
      */

package/lib/interfaces/iRoomSettingsController.d.ts

@@ -63,6 +63,14 @@ export interface iRoomSettingsController extends iRoomDefaultSettings {
      *
      */
     readonly movementResetTimer: number;
+    /**
+     * The custom start of night for this room
+     */
+    readonly nightStart?: iTimePair;
+    /**
+     * The custom end of night for this room
+     */
+    readonly nightEnd?: iTimePair;
     /**
      *
      */

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

@@ -28,6 +28,8 @@ export declare class RoomSettingsController {
     get lampenBeiBewegung(): boolean;
     get sonnenUntergangRollos(): boolean;
     get movementResetTimer(): number;
+    get nightStart(): iTimePair | undefined;
+    get nightEnd(): iTimePair | undefined;
     get sonnenUntergangRolloDelay(): number;
     get sonnenUntergangLampenDelay(): number;
     get sonnenUntergangRolloAdditionalOffsetPerCloudiness(): number;

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

@@ -63,6 +63,12 @@ class RoomSettingsController {
     get movementResetTimer() {
         return this._settingsContainer.movementResetTimer;
     }
+    get nightStart() {
+        return this._settingsContainer.nightStart;
+    }
+    get nightEnd() {
+        return this._settingsContainer.nightEnd;
+    }
     get sonnenUntergangRolloDelay() {
         return this._settingsContainer.sonnenUntergangRolloDelay;
     }

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

@@ -29,6 +29,10 @@ export declare class RoomSettings extends ObjectSettings implements iRoomSetting
      * Time in seconds after which detected movement is reseted
      */
     movementResetTimer: number;
+    /** @inheritDoc */
+    nightStart?: iTimePair;
+    /** @inheritDoc */
+    nightEnd?: iTimePair;
     /**
      * Indicates rooms, which are time independent always dark (like basement).
      * This results in lamps beeing turned on at motion regardless of windows and time.

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

@@ -82,29 +82,31 @@ class RoomSettings extends settingsObjects_1.ObjectSettings {
         this.includeLampsInNormalMovementLightning = settings_service_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, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         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;
         this.rolloHeatReduction = (_d = _obj.rolloHeatReduction) !== null && _d !== void 0 ? _d : this.rolloHeatReduction;
         this.lampenBeiBewegung = (_e = _obj.lampenBeiBewegung) !== null && _e !== void 0 ? _e : this.lampenBeiBewegung;
         this.lightIfNoWindows = (_f = _obj.lightIfNoWindows) !== null && _f !== void 0 ? _f : this.lightIfNoWindows;
-        this.movementResetTimer = (_g = _obj.movementResetTimer) !== null && _g !== void 0 ? _g : this.movementResetTimer;
-        this.roomIsAlwaysDark = (_h = _obj.roomIsAlwaysDark) !== null && _h !== void 0 ? _h : this.roomIsAlwaysDark;
-        this.sonnenAufgangLampenDelay = (_j = _obj.sonnenAufgangLampenDelay) !== null && _j !== void 0 ? _j : this.sonnenAufgangLampenDelay;
-        this.sonnenAufgangRolloDelay = (_k = _obj.sonnenAufgangRolloDelay) !== null && _k !== void 0 ? _k : this.sonnenAufgangRolloDelay;
-        this.sonnenAufgangRollos = (_l = _obj.sonnenAufgangRollos) !== null && _l !== void 0 ? _l : this.sonnenAufgangRollos;
+        this.nightStart = (_g = _obj.nightStart) !== null && _g !== void 0 ? _g : this.nightStart;
+        this.nightEnd = (_h = _obj.nightEnd) !== null && _h !== void 0 ? _h : this.nightEnd;
+        this.movementResetTimer = (_j = _obj.movementResetTimer) !== null && _j !== void 0 ? _j : this.movementResetTimer;
+        this.roomIsAlwaysDark = (_k = _obj.roomIsAlwaysDark) !== null && _k !== void 0 ? _k : this.roomIsAlwaysDark;
+        this.sonnenAufgangLampenDelay = (_l = _obj.sonnenAufgangLampenDelay) !== null && _l !== void 0 ? _l : this.sonnenAufgangLampenDelay;
+        this.sonnenAufgangRolloDelay = (_m = _obj.sonnenAufgangRolloDelay) !== null && _m !== void 0 ? _m : this.sonnenAufgangRolloDelay;
+        this.sonnenAufgangRollos = (_o = _obj.sonnenAufgangRollos) !== null && _o !== void 0 ? _o : this.sonnenAufgangRollos;
         this.sonnenUntergangRolloAdditionalOffsetPerCloudiness =
-            (_m = _obj.sonnenUntergangRolloAdditionalOffsetPerCloudiness) !== null && _m !== void 0 ? _m : this.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
-        this.sonnenUntergangRolloMaxTime = (_o = _obj.sonnenUntergangRolloMaxTime) !== null && _o !== void 0 ? _o : this.sonnenUntergangRolloMaxTime;
-        this.sonnenAufgangRolloMinTime = (_p = _obj.sonnenAufgangRolloMinTime) !== null && _p !== void 0 ? _p : this.sonnenAufgangRolloMinTime;
-        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.trilaterationEndPoint = (_t = _obj.trilaterationEndPoint) !== null && _t !== void 0 ? _t : this.trilaterationEndPoint;
-        this.trilaterationStartPoint = (_u = _obj.trilaterationStartPoint) !== null && _u !== void 0 ? _u : this.trilaterationStartPoint;
+            (_p = _obj.sonnenUntergangRolloAdditionalOffsetPerCloudiness) !== null && _p !== void 0 ? _p : this.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
+        this.sonnenUntergangRolloMaxTime = (_q = _obj.sonnenUntergangRolloMaxTime) !== null && _q !== void 0 ? _q : this.sonnenUntergangRolloMaxTime;
+        this.sonnenAufgangRolloMinTime = (_r = _obj.sonnenAufgangRolloMinTime) !== null && _r !== void 0 ? _r : this.sonnenAufgangRolloMinTime;
+        this.sonnenUntergangRolloDelay = (_s = _obj.sonnenUntergangRolloDelay) !== null && _s !== void 0 ? _s : this.sonnenUntergangRolloDelay;
+        this.sonnenUntergangLampenDelay = (_t = _obj.sonnenUntergangLampenDelay) !== null && _t !== void 0 ? _t : this.sonnenUntergangLampenDelay;
+        this.sonnenUntergangRollos = (_u = _obj.sonnenUntergangRollos) !== null && _u !== void 0 ? _u : this.sonnenUntergangRollos;
+        this.trilaterationEndPoint = (_v = _obj.trilaterationEndPoint) !== null && _v !== void 0 ? _v : this.trilaterationEndPoint;
+        this.trilaterationStartPoint = (_w = _obj.trilaterationStartPoint) !== null && _w !== void 0 ? _w : this.trilaterationStartPoint;
         this.includeLampsInNormalMovementLightning =
-            (_v = _obj.includeLampsInNormalMovementLightning) !== null && _v !== void 0 ? _v : this.includeLampsInNormalMovementLightning;
+            (_x = _obj.includeLampsInNormalMovementLightning) !== null && _x !== void 0 ? _x : this.includeLampsInNormalMovementLightning;
         super.fromPartialObject(_obj);
     }
 }

package/lib/models/timeCallback.d.ts

@@ -25,4 +25,5 @@ export declare class TimeCallback implements ITimeCallback {
     constructor(name: string, type: TimeCallbackType, cFunction: () => void, minuteOffset: number, hours?: number | undefined, minutes?: number | undefined, sunTimeOffset?: SunTimeOffsets | undefined, cloudOffset?: number | undefined);
     recalcNextToDo(now: Date): void;
     perform(now?: Date): void;
+    toJSON(): Partial<TimeCallback>;
 }

package/lib/models/timeCallback.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeCallback = void 0;
 const enums_1 = require("../enums");
 const services_1 = require("../services");
 const utils_1 = require("../utils");
 const logging_1 = require("../logging");
+const lodash_1 = __importDefault(require("lodash"));
 class TimeCallback {
     get calculationSunrise() {
         var _a;
@@ -112,5 +116,8 @@ class TimeCallback {
         this._calculationSunset = undefined;
         this.cFunction();
     }
+    toJSON() {
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['cFunction']));
+    }
 }
 exports.TimeCallback = TimeCallback;

package/lib/services/RoomBase.d.ts

@@ -1,9 +1,9 @@
 import { BaseGroup, DeviceCluster, HeatGroup, TasterGroup, WaterGroup } from '../devices';
 import { RoomSetLightTimeBasedCommand } from '../command';
-import { iIdHolder, iLightGroup, iPresenceGroup, iRoomBase, iSmokeGroup, iSpeakerGroup, ITimeCallback, iTrilaterationPoint, iWindowGroup } from '../interfaces';
+import { iIdHolder, iJsonCustomPrepend, iLightGroup, iPresenceGroup, iRoomBase, iSmokeGroup, iSpeakerGroup, ITimeCallback, iTrilaterationPoint, iWindowGroup } from '../interfaces';
 import { GroupType, LogLevel } from '../enums';
 import { RoomInfo, RoomSettingsController } from '../models';
-export declare class RoomBase implements iRoomBase, iIdHolder {
+export declare class RoomBase implements iRoomBase, iIdHolder, iJsonCustomPrepend {
     groupMap: Map<GroupType, BaseGroup>;
     startPoint?: iTrilaterationPoint | undefined;
     endPoint?: iTrilaterationPoint | undefined;
@@ -49,6 +49,7 @@ export declare class RoomBase implements iRoomBase, iIdHolder {
      */
     setLightTimeBased(c: RoomSetLightTimeBasedCommand): void;
     isNowLightTime(): boolean;
+    customPrepend(): Partial<unknown>;
     toJSON(): Partial<iRoomBase & {
         /**
          * The dictionary representation of the group map

package/lib/services/RoomBase.js

@@ -135,7 +135,7 @@ class RoomBase {
         }
         let timeOfDay = this.settings.roomIsAlwaysDark
             ? enums_1.TimeOfDay.Night
-            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
+            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset, new Date(), this.settings.nightStart, this.settings.nightEnd);
         if (timeOfDay === enums_1.TimeOfDay.Daylight &&
             ((this.settings.lightIfNoWindows && (!this.WindowGroup || this.WindowGroup.windows.length === 0)) ||
                 ((_a = this.WindowGroup) === null || _a === void 0 ? void 0 : _a.windows.some((f) => {
@@ -154,7 +154,7 @@ class RoomBase {
         }
         let timeOfDay = this.settings.roomIsAlwaysDark
             ? enums_1.TimeOfDay.Night
-            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset);
+            : time_callback_service_1.TimeCallbackService.dayType(this.settings.lampOffset, new Date(), this.settings.nightStart, this.settings.nightEnd);
         if (timeOfDay === enums_1.TimeOfDay.Daylight &&
             ((_a = this.WindowGroup) === null || _a === void 0 ? void 0 : _a.windows.some((f) => {
                 var _a;
@@ -164,8 +164,22 @@ class RoomBase {
         }
         return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
+    customPrepend() {
+        return {
+            sunriseShutterCallback: this.sunriseShutterCallback,
+            sunsetShutterCallback: this.sunsetShutterCallback,
+            sonnenUntergangLichtCallback: this.sonnenUntergangLichtCallback,
+            sonnenAufgangLichtCallback: this.sonnenAufgangLichtCallback,
+        };
+    }
     toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_deviceCluster']));
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const result = utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['_deviceCluster']));
+        result['sunriseShutterCallback'] = this.sunriseShutterCallback;
+        result['sunsetShutterCallback'] = this.sunsetShutterCallback;
+        result['sonnenUntergangLichtCallback'] = this.sonnenUntergangLichtCallback;
+        result['sonnenAufgangLichtCallback'] = this.sonnenAufgangLichtCallback;
+        return result;
     }
     log(level, message) {
         logging_1.ServerLogService.writeLog(level, message, {

package/lib/services/Sonos/sonos-service.js

@@ -89,7 +89,7 @@ class SonosService {
             for (const deviceName in this.ownDevices) {
                 const snDevice = this.ownDevices[deviceName];
                 const room = snDevice.room;
-                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset);
+                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset, new Date(), room.settings.nightStart, room.settings.nightEnd);
                 const volume = timeOfDay == enums_1.TimeOfDay.Night
                     ? snDevice.settings.defaultNightAnounceVolume
                     : snDevice.settings.defaultDayAnounceVolume;

package/lib/services/time-callback-service.d.ts

@@ -1,6 +1,6 @@
 import { TimeOfDay } from '../enums';
 import { TimeCallback } from '../models';
-import { iSunTimeOffsets, ITimeCallback } from '../interfaces';
+import { iSunTimeOffsets, ITimeCallback, iTimePair } from '../interfaces';
 export declare class TimeCallbackService {
     private static _startTime;
     private static _todaySunRise;
@@ -13,7 +13,7 @@ export declare class TimeCallbackService {
     static get nextSunRise(): Date;
     private static _nextSunSet;
     static get nextSunSet(): Date;
-    static dayType(pOffset: iSunTimeOffsets, now?: Date): TimeOfDay;
+    static dayType(pOffset: iSunTimeOffsets, now?: Date, customNightStart?: iTimePair, customNightEnd?: iTimePair): TimeOfDay;
     static darkOutsideOrNight(dayType: TimeOfDay): boolean;
     static stopInterval(): void;
     static init(startTime?: Date): void;

package/lib/services/time-callback-service.js

@@ -18,11 +18,11 @@ class TimeCallbackService {
     static get nextSunSet() {
         return TimeCallbackService._nextSunSet;
     }
-    static dayType(pOffset, now = new Date()) {
+    static dayType(pOffset, now = new Date(), customNightStart, customNightEnd) {
         const hours = now.getHours();
         const minutes = now.getMinutes();
-        const nightEnd = settings_service_1.SettingsService.settings.timeSettings.nightEnd;
-        const nightStart = settings_service_1.SettingsService.settings.timeSettings.nightStart;
+        const nightEnd = customNightEnd !== null && customNightEnd !== void 0 ? customNightEnd : settings_service_1.SettingsService.settings.timeSettings.nightEnd;
+        const nightStart = customNightStart !== null && customNightStart !== void 0 ? customNightStart : settings_service_1.SettingsService.settings.timeSettings.nightStart;
         if (nightStart.hours < nightEnd.hours) {
             if ((hours < nightEnd.hours && hours > nightStart.hours) ||
                 (hours === nightEnd.hours && minutes < nightEnd.minutes) ||