hoffmation-base 3.0.3 → 3.1.0

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

@@ -1,8 +1,8 @@
-import { RoomBase } from '../RoomBase';
-import { iRoomDefaultSettings } from './iRoomDefaultSettings';
-import { iTimePair, SunTimeOffsets } from '../../../server';
+import { iRoomBase, iRoomSettingsController, iTimePair } from '../../../interfaces';
+import { SunTimeOffsets } from '../../sun-time-offsets';
 import { RoomSettings } from './roomSettings';
-export declare class RoomSettingsController implements iRoomDefaultSettings {
+import { RoomBase } from '../../../services';
+export declare class RoomSettingsController {
     /**
      * The name of the room this settings are for
      */
@@ -36,9 +36,9 @@ export declare class RoomSettingsController implements iRoomDefaultSettings {
     get roomIsAlwaysDark(): boolean;
     get radioUrl(): string;
     get includeLampsInNormalMovementLightning(): boolean;
-    get room(): RoomBase | undefined;
-    toJSON(): Partial<RoomSettingsController>;
-    private onSettingChange;
-    private recalcRolloOffset;
-    private recalcLampOffset;
+    get room(): iRoomBase | undefined;
+    toJSON(): Partial<iRoomSettingsController>;
+    onSettingChange(): void;
+    recalcRolloOffset(): void;
+    recalcLampOffset(): void;
 }

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

@@ -4,19 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomSettingsController = void 0;
-const server_1 = require("../../../server");
 const lodash_1 = __importDefault(require("lodash"));
+const sun_time_offsets_1 = require("../../sun-time-offsets");
 const roomSettings_1 = require("./roomSettings");
-const logLevel_1 = require("../../logLevel");
+const weather_1 = require("../../../services/weather");
+const api_1 = require("../../../api");
+const utils_1 = require("../../../utils");
+const logging_1 = require("../../../logging");
+const enums_1 = require("../../../enums");
 class RoomSettingsController {
     constructor(room) {
         this._settingsContainer = new roomSettings_1.RoomSettings();
         this.roomName = room.roomName;
-        this.rolloOffset = new server_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
-        this.lampOffset = new server_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
+        this.rolloOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
+        this.lampOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
         this._settingsContainer.onChangeCb = this.onSettingChange.bind(this);
         this._settingsContainer.initializeFromDb(room);
-        server_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
+        weather_1.WeatherService.addWeatherUpdateCb(`ShutterWeatherUpdate${this.roomName}`, () => {
             var _a;
             if (this.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
                 (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
@@ -84,25 +88,25 @@ class RoomSettingsController {
         if (!this.roomName) {
             return undefined;
         }
-        return server_1.API.getRoom(this.roomName);
+        return api_1.API.getRoom(this.roomName);
     }
     toJSON() {
-        const result = server_1.Utils.jsonFilter(this);
+        const result = utils_1.Utils.jsonFilter(this);
         return lodash_1.default.omit(result, ['defaultSettings', 'deviceAddidngSettings']);
     }
     onSettingChange() {
-        server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `${this.roomName} RoomSettingsController.onSettingChange`);
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `${this.roomName} RoomSettingsController.onSettingChange`);
         this.recalcLampOffset();
         this.recalcRolloOffset();
     }
     recalcRolloOffset() {
         var _a;
-        this.rolloOffset = new server_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
+        this.rolloOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangRolloDelay, this.sonnenUntergangRolloDelay, this.sonnenAufgangRolloMinTime.hours, this.sonnenAufgangRolloMinTime.minutes, this.sonnenUntergangRolloMaxTime.hours, this.sonnenUntergangRolloMaxTime.minutes);
         (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
     }
     recalcLampOffset() {
         var _a;
-        this.lampOffset = new server_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
+        this.lampOffset = new sun_time_offsets_1.SunTimeOffsets(this.sonnenAufgangLampenDelay, this.sonnenUntergangLampenDelay);
         (_a = this.room) === null || _a === void 0 ? void 0 : _a.recalcTimeCallbacks();
     }
 }

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

@@ -1,7 +1,5 @@
-export * from './iRoomDefaultSettings';
-export * from './iRoomInitializationSettings';
-export * from './roomAddDeviceItem';
-export * from './roomDeviceAddingSettings';
-export * from './RoomInitializationSettings';
-export * from './roomSettings';
-export * from './RoomSettingsController';
+export { RoomAddDeviceItem } from './roomAddDeviceItem';
+export { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
+export { RoomInitializationSettings } from './RoomInitializationSettings';
+export { RoomSettings } from './roomSettings';
+export { RoomSettingsController } from './RoomSettingsController';

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

@@ -1,23 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./iRoomDefaultSettings"), exports);
-__exportStar(require("./iRoomInitializationSettings"), exports);
-__exportStar(require("./roomAddDeviceItem"), exports);
-__exportStar(require("./roomDeviceAddingSettings"), exports);
-__exportStar(require("./RoomInitializationSettings"), exports);
-__exportStar(require("./roomSettings"), exports);
-__exportStar(require("./RoomSettingsController"), exports);
+exports.RoomSettingsController = exports.RoomSettings = exports.RoomInitializationSettings = exports.RoomDeviceAddingSettings = exports.RoomAddDeviceItem = void 0;
+var roomAddDeviceItem_1 = require("./roomAddDeviceItem");
+Object.defineProperty(exports, "RoomAddDeviceItem", { enumerable: true, get: function () { return roomAddDeviceItem_1.RoomAddDeviceItem; } });
+var roomDeviceAddingSettings_1 = require("./roomDeviceAddingSettings");
+Object.defineProperty(exports, "RoomDeviceAddingSettings", { enumerable: true, get: function () { return roomDeviceAddingSettings_1.RoomDeviceAddingSettings; } });
+var RoomInitializationSettings_1 = require("./RoomInitializationSettings");
+Object.defineProperty(exports, "RoomInitializationSettings", { enumerable: true, get: function () { return RoomInitializationSettings_1.RoomInitializationSettings; } });
+var roomSettings_1 = require("./roomSettings");
+Object.defineProperty(exports, "RoomSettings", { enumerable: true, get: function () { return roomSettings_1.RoomSettings; } });
+var RoomSettingsController_1 = require("./RoomSettingsController");
+Object.defineProperty(exports, "RoomSettingsController", { enumerable: true, get: function () { return RoomSettingsController_1.RoomSettingsController; } });

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

@@ -1,9 +1,9 @@
-import { RoomBase } from '../RoomBase';
-export declare class RoomAddDeviceItem {
-    setID: (value: string) => RoomBase | undefined;
+import { iRoomAddDeviceItem, iRoomBase } from '../../../interfaces';
+export declare class RoomAddDeviceItem implements iRoomAddDeviceItem {
+    setID: (value: string) => iRoomBase | undefined;
     index: number;
     customName: string;
-    constructor(setID: (value: string) => RoomBase | undefined, index: number, customName: string);
+    constructor(setID: (value: string) => iRoomBase | undefined, index: number, customName: string);
     private _added;
     get added(): boolean;
     set added(value: boolean);

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomAddDeviceItem = void 0;
-const server_1 = require("../../../server");
-const logLevel_1 = require("../../logLevel");
+const enums_1 = require("../../../enums");
+const logging_1 = require("../../../logging");
 class RoomAddDeviceItem {
     constructor(setID, index, customName) {
         this.setID = setID;
@@ -15,7 +15,7 @@ class RoomAddDeviceItem {
     }
     set added(value) {
         if (this._added) {
-            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${this.customName} Added twice`);
+            logging_1.ServerLogService.writeLog(enums_1.LogLevel.Error, `${this.customName} Added twice`);
         }
         this._added = value;
     }

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

@@ -1,13 +1,12 @@
-import { DeviceType } from '../../../server';
-import { RoomAddDeviceItem } from './roomAddDeviceItem';
-import { RoomBase } from '../RoomBase';
-export declare class RoomDeviceAddingSettings {
+import { DeviceType } from '../../../enums';
+import { iRoomAddDeviceItem, iRoomBase, iRoomDeviceAddingSettings } from '../../../interfaces';
+export declare class RoomDeviceAddingSettings implements iRoomDeviceAddingSettings {
     RoomName: string;
     /**
      * The devices that are to be added to the room
      */
-    devices: RoomAddDeviceItem[][];
+    devices: iRoomAddDeviceItem[][];
     constructor(RoomName: string);
-    addDevice(deviceType: DeviceType, setID: (value: string) => RoomBase, index: number, customName?: string | undefined): void;
+    addDevice(deviceType: DeviceType, setID: (value: string) => iRoomBase, index: number, customName?: string | undefined): void;
     checkMissing(): void;
 }

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomDeviceAddingSettings = void 0;
-const server_1 = require("../../../server");
 const roomAddDeviceItem_1 = require("./roomAddDeviceItem");
-const logLevel_1 = require("../../logLevel");
+const enums_1 = require("../../../enums");
+const logging_1 = require("../../../logging");
 class RoomDeviceAddingSettings {
     constructor(RoomName) {
         this.RoomName = RoomName;
@@ -17,7 +17,7 @@ class RoomDeviceAddingSettings {
             this.devices[deviceType] = [];
         }
         if (customName === undefined) {
-            customName = `${this.RoomName} ${server_1.DeviceType[deviceType]}`;
+            customName = `${this.RoomName} ${enums_1.DeviceType[deviceType]}`;
         }
         this.devices[deviceType][index] = new roomAddDeviceItem_1.RoomAddDeviceItem(setID, index, customName);
     }
@@ -27,7 +27,7 @@ class RoomDeviceAddingSettings {
             for (const index in devs) {
                 const dev = devs[index];
                 if (!dev.added) {
-                    server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${dev.customName} fehlt in der Device JSON`);
+                    logging_1.ServerLogService.writeLog(enums_1.LogLevel.Error, `${dev.customName} fehlt in der Device JSON`);
                 }
             }
         }

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

@@ -1,6 +1,6 @@
-import { ObjectSettings } from '../../objectSettings';
-import { iTimePair } from '../../../server';
-export declare class RoomSettings extends ObjectSettings {
+import { iRoomSettings, iTimePair } from '../../../interfaces';
+import { ObjectSettings } from '../../../settingsObjects';
+export declare class RoomSettings extends ObjectSettings implements iRoomSettings {
     /**
      * Whether this room should always have ambient light on after sunset (regardless of motion e.g. Gardenlights).
      */

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

@@ -1,85 +1,85 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomSettings = void 0;
-const objectSettings_1 = require("../../objectSettings");
-const server_1 = require("../../../server");
-class RoomSettings extends objectSettings_1.ObjectSettings {
+const settings_service_1 = require("../../../settings-service");
+const settingsObjects_1 = require("../../../settingsObjects");
+class RoomSettings extends settingsObjects_1.ObjectSettings {
     constructor() {
         var _a;
         super(...arguments);
         /**
          * Whether this room should always have ambient light on after sunset (regardless of motion e.g. Gardenlights).
          */
-        this.ambientLightAfterSunset = server_1.SettingsService.settings.roomDefault.ambientLightAfterSunset;
+        this.ambientLightAfterSunset = settings_service_1.SettingsService.settings.roomDefault.ambientLightAfterSunset;
         /**
          * Should lights be turned off after sunrise
          */
-        this.lichtSonnenAufgangAus = server_1.SettingsService.settings.roomDefault.lichtSonnenAufgangAus;
+        this.lichtSonnenAufgangAus = settings_service_1.SettingsService.settings.roomDefault.lichtSonnenAufgangAus;
         /**
          * The default radio URL to use with speaker
          */
-        this.radioUrl = (_a = server_1.SettingsService.settings.roomDefault.radioUrl) !== null && _a !== void 0 ? _a : '';
+        this.radioUrl = (_a = settings_service_1.SettingsService.settings.roomDefault.radioUrl) !== null && _a !== void 0 ? _a : '';
         /**
          * Use shutter to reduce warming of rooms on hot days (detected by weather service)
          */
-        this.rolloHeatReduction = server_1.SettingsService.settings.roomDefault.rolloHeatReduction;
+        this.rolloHeatReduction = settings_service_1.SettingsService.settings.roomDefault.rolloHeatReduction;
         /**
          * Should lights be turned on at Movement
          */
-        this.lampenBeiBewegung = server_1.SettingsService.settings.roomDefault.lampenBeiBewegung;
+        this.lampenBeiBewegung = settings_service_1.SettingsService.settings.roomDefault.lampenBeiBewegung;
         /**
          * Should Light be turned on at day if there are no Windows configured for this room
          */
-        this.lightIfNoWindows = server_1.SettingsService.settings.roomDefault.lightIfNoWindows;
+        this.lightIfNoWindows = settings_service_1.SettingsService.settings.roomDefault.lightIfNoWindows;
         /**
          * Time in seconds after which detected movement is reseted
          */
-        this.movementResetTimer = server_1.SettingsService.settings.roomDefault.movementResetTimer;
+        this.movementResetTimer = settings_service_1.SettingsService.settings.roomDefault.movementResetTimer;
         /**
          * Indicates rooms, which are time independent always dark (like basement).
          * This results in lamps beeing turned on at motion regardless of windows and time.
          */
-        this.roomIsAlwaysDark = server_1.SettingsService.settings.roomDefault.roomIsAlwaysDark;
+        this.roomIsAlwaysDark = settings_service_1.SettingsService.settings.roomDefault.roomIsAlwaysDark;
         /**
          * +/- Offset for still turning on lamps at movement after/before sunrise
          */
-        this.sonnenAufgangLampenDelay = server_1.SettingsService.settings.roomDefault.sonnenAufgangLampenDelay;
+        this.sonnenAufgangLampenDelay = settings_service_1.SettingsService.settings.roomDefault.sonnenAufgangLampenDelay;
         /**
          * +/- Default Offset for shutters opening on sunrise in minutes
          */
-        this.sonnenAufgangRolloDelay = server_1.SettingsService.settings.roomDefault.sonnenAufgangRolloDelay;
+        this.sonnenAufgangRolloDelay = settings_service_1.SettingsService.settings.roomDefault.sonnenAufgangRolloDelay;
         /**
          * Should shutters be opened on sunrise
          */
-        this.sonnenAufgangRollos = server_1.SettingsService.settings.roomDefault.sonnenAufgangRollos;
+        this.sonnenAufgangRollos = settings_service_1.SettingsService.settings.roomDefault.sonnenAufgangRollos;
         /**
          * !Needs Weather Data! Additional Offset in Minutes per % Cloudiness
          */
-        this.sonnenUntergangRolloAdditionalOffsetPerCloudiness = server_1.SettingsService.settings.roomDefault.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
+        this.sonnenUntergangRolloAdditionalOffsetPerCloudiness = settings_service_1.SettingsService.settings.roomDefault.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
         /**
          * Latest time of shutter closing (regardless of geospecific sunset)
          */
-        this.sonnenUntergangRolloMaxTime = server_1.SettingsService.settings.roomDefault.sonnenUntergangRolloMaxTime;
+        this.sonnenUntergangRolloMaxTime = settings_service_1.SettingsService.settings.roomDefault.sonnenUntergangRolloMaxTime;
         /**
          * Earliest time of shutter opening (regardless of geospecific sunset)
          */
-        this.sonnenAufgangRolloMinTime = server_1.SettingsService.settings.roomDefault.sonnenAufgangRolloMinTime;
+        this.sonnenAufgangRolloMinTime = settings_service_1.SettingsService.settings.roomDefault.sonnenAufgangRolloMinTime;
         /**
          * +/- Offset for shutter closing on sunset in minutes
          */
-        this.sonnenUntergangRolloDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangRolloDelay;
+        this.sonnenUntergangRolloDelay = settings_service_1.SettingsService.settings.roomDefault.sonnenUntergangRolloDelay;
         /**
          * +/- Offset for turning on lamps at movement after/before sunset
          */
-        this.sonnenUntergangLampenDelay = server_1.SettingsService.settings.roomDefault.sonnenUntergangLampenDelay;
+        this.sonnenUntergangLampenDelay = settings_service_1.SettingsService.settings.roomDefault.sonnenUntergangLampenDelay;
         /**
          * Should shutters be closed on sunset (based on geolocation)
          */
-        this.sonnenUntergangRollos = server_1.SettingsService.settings.roomDefault.sonnenUntergangRollos;
+        this.sonnenUntergangRollos = settings_service_1.SettingsService.settings.roomDefault.sonnenUntergangRollos;
         /**
          * Whether normal ceiling lights should also be turned on by movement, even if there are LEDs and outlets
          */
-        this.includeLampsInNormalMovementLightning = server_1.SettingsService.settings.roomDefault.includeLampsInNormalMovementLightning;
+        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;

package/lib/models/rooms/index.d.ts

@@ -1,5 +1,2 @@
-export * from './iRoomBase';
-export * from './RoomBase';
-export * from './iRoomImportEnforcer';
-export * from './RoomSettings/index';
+export * from './RoomSettings';
 export * from './roomInfo';

package/lib/models/rooms/index.js

@@ -14,8 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./iRoomBase"), exports);
-__exportStar(require("./RoomBase"), exports);
-__exportStar(require("./iRoomImportEnforcer"), exports);
-__exportStar(require("./RoomSettings/index"), exports);
+__exportStar(require("./RoomSettings"), exports);
 __exportStar(require("./roomInfo"), exports);

package/lib/models/sun-time-offsets.d.ts

@@ -0,0 +1,12 @@
+import { iSunTimeOffsets } from '../interfaces';
+export declare class SunTimeOffsets implements iSunTimeOffsets {
+    sunrise: number;
+    sunset: number;
+    minimumHours: number;
+    minimumMinutes: number;
+    maximumHours: number;
+    maximumMinutes: number;
+    constructor(sunrise?: number, sunset?: number, minimumHours?: number, minimumMinutes?: number, maximumHours?: number, maximumMinutes?: number);
+    getNextMinimumSunrise(date?: Date): Date;
+    getNextMaximumSunset(date?: Date): Date;
+}

package/lib/models/sun-time-offsets.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SunTimeOffsets = void 0;
+class SunTimeOffsets {
+    constructor(sunrise = 0, sunset = 0, minimumHours = 6, minimumMinutes = 24, maximumHours = 22, maximumMinutes = 30) {
+        this.sunrise = sunrise;
+        this.sunset = sunset;
+        this.minimumHours = minimumHours;
+        this.minimumMinutes = minimumMinutes;
+        this.maximumHours = maximumHours;
+        this.maximumMinutes = maximumMinutes;
+    }
+    getNextMinimumSunrise(date = new Date()) {
+        const dateCopy = new Date(date);
+        const today = new Date(dateCopy.setHours(this.minimumHours, this.minimumMinutes, 0, 0));
+        if (today > date) {
+            return today;
+        }
+        return new Date(today.setDate(today.getDate() + 1));
+    }
+    getNextMaximumSunset(date = new Date()) {
+        const dateCopy = new Date(date);
+        const today = new Date(dateCopy.setHours(this.maximumHours, this.maximumMinutes, 0, 0));
+        if (today > date) {
+            return today;
+        }
+        return new Date(today.setDate(today.getDate() + 1));
+    }
+}
+exports.SunTimeOffsets = SunTimeOffsets;

package/lib/models/timeCallback.d.ts

@@ -1,16 +1,7 @@
-import { SunTimeOffsets } from '../server';
-export declare enum TimeCallbackType {
-    TimeOfDay = 1,
-    Sunrise = 2,
-    SunSet = 3
-}
-export declare enum TimeOfDay {
-    BeforeSunrise = 1,
-    Daylight = 2,
-    AfterSunset = 3,
-    Night = 4
-}
-export declare class TimeCallback {
+import { TimeCallbackType } from '../enums';
+import { ITimeCallback } from '../interfaces';
+import { SunTimeOffsets } from './sun-time-offsets';
+export declare class TimeCallback implements ITimeCallback {
     name: string;
     type: TimeCallbackType;
     private cFunction;
@@ -26,8 +17,7 @@ export declare class TimeCallback {
      */
     lastDone: Date;
     /**
-     * The calculated date when this callback should be fired next
-     * @warning This might have not yet been recalculated
+     *
      */
     nextToDo?: Date;
     private _calculationSunset?;

package/lib/models/timeCallback.js

@@ -1,29 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeCallback = exports.TimeOfDay = exports.TimeCallbackType = void 0;
-const server_1 = require("../server");
-const logLevel_1 = require("./logLevel");
-var TimeCallbackType;
-(function (TimeCallbackType) {
-    TimeCallbackType[TimeCallbackType["TimeOfDay"] = 1] = "TimeOfDay";
-    TimeCallbackType[TimeCallbackType["Sunrise"] = 2] = "Sunrise";
-    TimeCallbackType[TimeCallbackType["SunSet"] = 3] = "SunSet";
-})(TimeCallbackType || (exports.TimeCallbackType = TimeCallbackType = {}));
-var TimeOfDay;
-(function (TimeOfDay) {
-    TimeOfDay[TimeOfDay["BeforeSunrise"] = 1] = "BeforeSunrise";
-    TimeOfDay[TimeOfDay["Daylight"] = 2] = "Daylight";
-    TimeOfDay[TimeOfDay["AfterSunset"] = 3] = "AfterSunset";
-    TimeOfDay[TimeOfDay["Night"] = 4] = "Night";
-})(TimeOfDay || (exports.TimeOfDay = TimeOfDay = {}));
+exports.TimeCallback = void 0;
+const enums_1 = require("../enums");
+const services_1 = require("../services");
+const utils_1 = require("../utils");
+const logging_1 = require("../logging");
 class TimeCallback {
     get calculationSunrise() {
         var _a;
-        return (_a = this._calculationSunrise) !== null && _a !== void 0 ? _a : server_1.TimeCallbackService.nextSunRise;
+        return (_a = this._calculationSunrise) !== null && _a !== void 0 ? _a : services_1.TimeCallbackService.nextSunRise;
     }
     get calculationSunset() {
         var _a;
-        return (_a = this._calculationSunset) !== null && _a !== void 0 ? _a : server_1.TimeCallbackService.nextSunSet;
+        return (_a = this._calculationSunset) !== null && _a !== void 0 ? _a : services_1.TimeCallbackService.nextSunSet;
     }
     constructor(name, type, cFunction, minuteOffset, hours, minutes, sunTimeOffset, 
     // Additional Offset due to amount of clouds
@@ -47,7 +36,7 @@ class TimeCallback {
         today.setHours(0, 0, 0, 0);
         let nextCalculatedTime;
         switch (this.type) {
-            case TimeCallbackType.TimeOfDay:
+            case enums_1.TimeCallbackType.TimeOfDay:
                 // !!WARNING!! Changing to winter time, that day has 25 hours.
                 if (this.hours === undefined) {
                     this.hours = 0;
@@ -55,14 +44,14 @@ class TimeCallback {
                 if (this.minutes === undefined) {
                     this.minutes = 0;
                 }
-                nextCalculatedTime = server_1.Utils.nextMatchingDate(this.hours, this.minutes + this.minuteOffset);
+                nextCalculatedTime = utils_1.Utils.nextMatchingDate(this.hours, this.minutes + this.minuteOffset);
                 break;
-            case TimeCallbackType.Sunrise:
+            case enums_1.TimeCallbackType.Sunrise:
                 if (this.cloudOffset === undefined) {
                     this.cloudOffset = 0;
                 }
                 if (this.nextToDo === undefined || this.lastDone.getDate() === this.calculationSunrise.getDate()) {
-                    this._calculationSunrise = new Date(server_1.TimeCallbackService.nextSunRise.getTime());
+                    this._calculationSunrise = new Date(services_1.TimeCallbackService.nextSunRise.getTime());
                 }
                 nextCalculatedTime = new Date(this.calculationSunrise.getTime() + (this.minuteOffset + this.cloudOffset) * 60 * 1000);
                 if (this.sunTimeOffset) {
@@ -71,15 +60,15 @@ class TimeCallback {
                         nextCalculatedTime = nextMinSR;
                     }
                 }
-                if (server_1.TimeCallbackService.startTime > nextCalculatedTime &&
-                    now.getTime() > server_1.TimeCallbackService.nextSunSet.getTime() - 3600000) {
+                if (services_1.TimeCallbackService.startTime > nextCalculatedTime &&
+                    now.getTime() > services_1.TimeCallbackService.nextSunSet.getTime() - 3600000) {
                     // This combination is typical for a system restart at evening
                     return;
                 }
                 break;
-            case TimeCallbackType.SunSet:
+            case enums_1.TimeCallbackType.SunSet:
                 if (this.nextToDo === undefined || this.lastDone.getDate() === this.calculationSunset.getDate()) {
-                    this._calculationSunset = new Date(server_1.TimeCallbackService.nextSunSet.getTime());
+                    this._calculationSunset = new Date(services_1.TimeCallbackService.nextSunSet.getTime());
                 }
                 if (this.cloudOffset === undefined) {
                     this.cloudOffset = 0;
@@ -102,21 +91,21 @@ class TimeCallback {
         }
         if (this.nextToDo && this.nextToDo > this.lastDone) {
             if (nextCalculatedTime < now) {
-                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
+                logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Time Callback recalc results in the past, while previous target wasn't yet done --> fire immediately.`);
                 this.perform(now);
                 return;
             }
-            else if (nextCalculatedTime.getDay() !== this.nextToDo.getDay() && this.type === TimeCallbackType.SunSet) {
+            else if (nextCalculatedTime.getDay() !== this.nextToDo.getDay() && this.type === enums_1.TimeCallbackType.SunSet) {
                 // Recalculation between Sunset and delayed sunset action can result in the next day beeing calculated --> fire immediately
-                server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Time Callback recalc results in the next day, while previous action wasn't yet fired --> fire immediately.`);
+                logging_1.ServerLogService.writeLog(enums_1.LogLevel.Info, `Time Callback recalc results in the next day, while previous action wasn't yet fired --> fire immediately.`);
                 this.perform(now);
             }
         }
         this.nextToDo = nextCalculatedTime;
-        server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Next Time event for "${this.name}" at ${this.nextToDo.toLocaleString('de-DE')}`);
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `Next Time event for "${this.name}" at ${this.nextToDo.toLocaleString('de-DE')}`);
     }
     perform(now = new Date()) {
-        server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Timecallback '${this.name}' fired`);
+        logging_1.ServerLogService.writeLog(enums_1.LogLevel.Debug, `Timecallback '${this.name}' fired`);
         this.lastDone = now;
         this.nextToDo = undefined;
         this._calculationSunrise = undefined;

package/lib/server/config/exampleConfig.d.ts

@@ -0,0 +1,2 @@
+import { iConfig } from '../../interfaces';
+export declare const ExampleConfig: iConfig;