hoffmation-base 0.0.3 → 0.0.7

package/models/iTemperaturDataPoint.ts

@@ -0,0 +1,9 @@
+export interface iTemperaturDataPoint {
+  _id?: string;
+  name: string;
+  istTemperatur: number;
+  sollTemperatur: number;
+  level: number;
+  humidity: number;
+  date: Date;
+}

package/models/persistence/temperaturDataPoint.ts

@@ -1,4 +1,4 @@
-import { iTemperaturDataPoint } from '/imports/api/heizung';
+import { iTemperaturDataPoint } from "../iTemperaturDataPoint";
 
 export class TemperaturDataPoint implements iTemperaturDataPoint {
   constructor(

package/models/timeCallback.ts

@@ -1,6 +1,6 @@
 import { LogLevel } from './logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { SunTimeOffsets, TimeCallbackService } from '/server/services/time-callback-service';
+import { ServerLogService } from '../server/services/log-service';
+import { SunTimeOffsets, TimeCallbackService } from '../server/services/time-callback-service';
 
 export class TimeCallback {
   public lastDone: Date = new Date(0);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoffmation-base",
   "description": "Base Libraries and functions for own Hoffmation projects",
-  "version": "0.0.3",
+  "version": "0.0.7",
   "main": "index.js",
   "repository": {
     "type": "git",

package/server/config/private/mainConfig.json

@@ -0,0 +1,64 @@
+{
+  "ioBrokerUrl": "http://xxx.xxx.xxx.xxx:8xx4",
+  "timeSettings": {
+    "nightStart": {
+      "hours": 23,
+      "minutes": 45
+    },
+    "nightEnd": {
+      "hours": 6,
+      "minutes": 30
+    }
+  },
+  "roomDefault": {
+    "lampenBeiBewegung": true,
+    "lichtSonnenAufgangAus": true,
+    "sonnenUntergangRollos": true,
+    "sonnenAufgangRollos": true,
+    "movementResetTimer": 240,
+    "sonnenUntergangRolloDelay": 15,
+    "sonnenUntergangLampenDelay": 15,
+    "sonnenUntergangRolloMaxTime": {
+      "hours": 21,
+      "minutes": 30
+    },
+    "sonnenAufgangRolloMinTime": {
+      "hours": 7,
+      "minutes": 30
+    },
+    "sonnenAufgangRolloDelay": 35,
+    "sonnenAufgangLampenDelay": 15,
+    "lightIfNoWindows": false
+  },
+  "telegram": {
+    "logLevel": 1,
+    "telegramToken": "15xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxXU",
+    "allowedIDs": [
+      111111111,
+      111111111
+    ],
+    "subscribedIDs": [
+      111111111,
+      111111111
+    ]
+  },
+  "mp3Server": {
+    "path": "//XXXXXXXXXX/XXXXX/XXXXXX/XXX/ttsMP3/"
+  },
+  "muell": {
+    "calendarURL": "https://xxxxxxxxxxxxxxxxxxxxx.de/abfuhrkalender?format=ical&street=xxxxxxxx&number=xx"
+  },
+  "polly": {
+    "mp3Path": "//xxxxxxxxxxxxxxxxxxxxxxx/xxxxxxxxx/ttsMP3/",
+    "region": "eu-central-1",
+    "signatureVersion":  "v4",
+    "accessKeyId": "xxxxxxxxxxxxxxxxxxxx",
+    "secretAccessKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+    "voiceID": "Vicki"
+  },
+  "weather": {
+    "lattitude": "xx.xxxxxx",
+    "longitude": "xx.xxxxx",
+    "appid": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  }
+}

package/server/devices/DeviceInfo.ts

@@ -1,4 +1,4 @@
-import { deviceConfig } from '/models/deviceConfig';
+import { deviceConfig } from '../../models/deviceConfig';
 
 export class DeviceInfo {
   public devID: string;

package/server/devices/Heizgruppen.ts

@@ -3,7 +3,7 @@ import { Devices } from './devices';
 import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
 import { HmIpHeizgruppe } from './hmIPDevices/hmIpHeizgruppe';
 import { HmIpHeizung } from './hmIPDevices/hmIpHeizung';
-import { TemperaturDataPoint } from '/models/persistence/temperaturDataPoint';
+import { TemperaturDataPoint } from '../../models/persistence/temperaturDataPoint';
 
 export class Heizgruppen {
   public static getInfo(): string {

package/server/devices/Rollos.ts

@@ -1,7 +1,7 @@
 import { Devices } from './devices';
 import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
 import { HmIpRoll } from './hmIPDevices/hmIpRoll';
-import { RoomBase } from '/models/rooms/RoomBase';
+import { RoomBase } from '../../models/rooms/RoomBase';
 
 export class Rolladen {
   public static getRolladenPosition(): string {

package/server/devices/deviceUpdater.ts

@@ -1,9 +1,9 @@
+import { LogLevel } from '../../models/logLevel';
 import { ServerLogService } from '../services/log-service';
 import { Devices } from './devices';
 import { HmIPDevice } from './hmIPDevices/hmIpDevice';
 import { IDeviceUpdater } from './iDeviceUpdater';
 import { ZigbeeDevice } from './zigbee/zigbeeDevice';
-import { LogLevel } from '/models/logLevel';
 
 export class DeviceUpdater implements IDeviceUpdater {
   private static IDENTIFIER_HOMEMATIC: string = 'hm-rpc';

package/server/devices/devices.ts

@@ -1,3 +1,4 @@
+import { LogLevel } from '../../models/logLevel';
 import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
 import { ZigbeeDeviceType } from './zigbee/zigbeeDeviceType';
 import { IOBrokerConnection } from '../ioBroker/connection';
@@ -14,20 +15,19 @@ import { HmIpTaster } from './hmIPDevices/hmIpTaster';
 import { HmIpTherm } from './hmIPDevices/hmIpTherm';
 import { HmIpTuer } from './hmIPDevices/hmIpTuer';
 import { HmIpWippe } from './hmIPDevices/hmIpWippe';
-import { deviceConfig } from '/models/deviceConfig';
-import { LogLevel } from '/models/logLevel';
+import { deviceConfig } from '../../models/deviceConfig';
 import { HmIpHeizgruppe } from './hmIPDevices/hmIpHeizgruppe';
 import { HmIpBewegung } from './hmIPDevices/hmIpBewegung';
 import { ZigbeeIkeaSteckdose } from './zigbee/zigbeeIkeaSteckdose';
 import { ZigbeeIlluLedRGBCCT } from './zigbee/zigbeeIlluLedRGBCCT';
 import { ZigbeeAquaraVibra } from './zigbee/zigbeeAquaraVibra';
 import { ZigbeeIlluDimmer } from './zigbee/zigbeeIlluDimmer';
-import { ZigbeeHeimanSmoke } from '/server/devices/zigbee/zigbeeHeimanSmoke';
-import { ZigbeeAquaraWater } from '/server/devices/zigbee/zigbeeAquaraWater';
-import { ZigbeeBlitzShp } from '/server/devices/zigbee/zigbeeBlitzShp';
-import { ZigbeeIlluLampe } from '/server/devices/zigbee/zigbeeIlluLampe';
-import { ZigbeeIlluActuator } from '/server/devices/zigbee/zigbeeIlluActuator';
-import { iRoomImportEnforcer } from '/models/rooms/iRoomImportEnforcer';
+import { ZigbeeHeimanSmoke } from './zigbee/zigbeeHeimanSmoke';
+import { ZigbeeAquaraWater } from './zigbee/zigbeeAquaraWater';
+import { ZigbeeBlitzShp } from './zigbee/zigbeeBlitzShp';
+import { ZigbeeIlluLampe } from './zigbee/zigbeeIlluLampe';
+import { ZigbeeIlluActuator } from './zigbee/zigbeeIlluActuator';
+import { iRoomImportEnforcer } from '../../models/rooms/iRoomImportEnforcer';
 
 export class Devices {
   public static hmIP: { [id: string]: HmIPDevice } = {};

package/server/devices/groups/fensterGroup.ts

@@ -1,7 +1,7 @@
+import { LogLevel } from '../../../models/logLevel';
 import { Fenster } from '../hmIPDevices/Fenster';
 import { FensterPosition } from '../hmIPDevices/FensterPosition';
 import { ServerLogService } from '../../services/log-service';
-import { LogLevel } from '../../../models/logLevel';
 import { RoomBase } from '../../../models/rooms/RoomBase';
 import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
 import { TimeCallbackService, TimeOfDay } from '../../services/time-callback-service';

package/server/devices/hmIPDevices/Fenster.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
 import { ZigbeeAquaraVibra } from '../zigbee/zigbeeAquaraVibra';
 import { FensterPosition } from './FensterPosition';
 import { HmIpGriff } from './hmIpGriff';
 import { HmIpRoll } from './hmIpRoll';
-import { LogLevel } from '../../../models/logLevel';
 import { ServerLogService } from '../../services/log-service';
 import { TimeCallbackService, TimeOfDay } from '../../services/time-callback-service';
 import { Utils } from '../../services/utils/utils';

package/server/devices/hmIPDevices/hmIpBewegung.ts

@@ -1,7 +1,7 @@
+import { LogLevel } from '../../../models/logLevel';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '../../../models/logLevel';
 import { ServerLogService } from '../../services/log-service';
 import { Persist } from '../../services/dbo/persist';
 import { CountToday } from '../../../models/persistence/todaysCount';

package/server/devices/hmIPDevices/hmIpDevice.ts

@@ -1,6 +1,6 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { HmIpDeviceType } from './hmIpDeviceType';
-import { LogLevel } from '../../../models/logLevel';
 import { HmIpAddDeviceItem, HmIpRoomSettings } from '../../../models/rooms/RoomSettings/hmIPRoomSettings';
 import { ServerLogService } from '../../services/log-service';
 import { ioBrokerBaseDevice } from '../iIoBrokerDevice';

package/server/devices/hmIPDevices/hmIpGriff.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
 import { FensterPosition } from './FensterPosition';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '../../../models/logLevel';
 import { ServerLogService } from '../../services/log-service';
 import { TelegramService } from '../../services/Telegram/telegram-service';
 import { Utils } from '../../services/utils/utils';

package/server/devices/hmIPDevices/hmIpHeizgruppe.ts

@@ -1,13 +1,13 @@
+import { LogLevel } from '../../../models/logLevel';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { TemperaturSettings } from '/models/temperaturSettings';
-import { Persist } from '/server/services/dbo/persist';
+import { ServerLogService } from '../../services/log-service';
+import { TemperaturSettings } from '../../../models/temperaturSettings';
+import { Persist } from '../../services/dbo/persist';
 import { HmIpHeizung } from './hmIpHeizung';
 import { Devices } from '../devices';
-import { Utils } from '/server/services/utils/utils';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIpHeizgruppe extends HmIPDevice {
   private _automaticMode: boolean = true;

package/server/devices/hmIPDevices/hmIpHeizung.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
 
 export class HmIpHeizung extends HmIPDevice {
   private _temperatur: number = 0;

package/server/devices/hmIPDevices/hmIpLampe.ts

@@ -1,10 +1,10 @@
+import { LogLevel } from '../../../models/logLevel';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { LampSettings } from '/models/lampSettings';
-import { Utils } from '/server/services/utils/utils';
+import { ServerLogService } from '../../services/log-service';
+import { LampSettings } from '../../../models/lampSettings';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIpLampe extends HmIPDevice {
   public lightOn: boolean | undefined = undefined;

package/server/devices/hmIPDevices/hmIpPraezenz.ts

@@ -1,11 +1,11 @@
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { Persist } from '/server/services/dbo/persist';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
+import { Persist } from '../../services/dbo/persist';
 import { CountToday } from '../../../models/persistence/todaysCount';
-import { Utils } from '/server/services/utils/utils';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIpPraezenz extends HmIPDevice {
   public excludeFromNightAlarm: boolean = false;

package/server/devices/hmIPDevices/hmIpRoll.ts

@@ -1,11 +1,11 @@
+import { LogLevel } from '../../../models/logLevel';
 import { Fenster } from './Fenster';
 import { FensterPosition } from './FensterPosition';
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { Utils } from '/server/services/utils/utils';
+import { ServerLogService } from '../../services/log-service';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIpRoll extends HmIPDevice {
   public get currentLevel(): number {

package/server/devices/hmIPDevices/hmIpTaste.ts

@@ -1,4 +1,4 @@
-import { Utils } from '/server/services/utils/utils';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIPTaste {
   public shortPressed: boolean = false;

package/server/devices/hmIPDevices/hmIpTaster.ts

@@ -2,8 +2,8 @@ import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { HmIPTaste } from './hmIpTaste';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 
 export class HmIpTaster extends HmIPDevice {
   public tasten: {

package/server/devices/hmIPDevices/hmIpTherm.ts

@@ -1,8 +1,8 @@
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 
 export class HmIpTherm extends HmIPDevice {
   public constructor(pInfo: DeviceInfo) {

package/server/devices/hmIPDevices/hmIpTuer.ts

@@ -1,12 +1,12 @@
 import { HmIPDevice } from './hmIpDevice';
 import { HmIpDeviceType } from './hmIpDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { TuerPosition } from './TuerPosition';
-import { SonosService } from '/server/services/Sonos/sonos-service';
-import { TelegramService } from '/server/services/Telegram/telegram-service';
-import { Utils } from '/server/services/utils/utils';
+import { SonosService } from '../../services/Sonos/sonos-service';
+import { TelegramService } from '../../services/Telegram/telegram-service';
+import { Utils } from '../../services/utils/utils';
 
 export class HmIpTuer extends HmIPDevice {
   public position: TuerPosition = TuerPosition.geschlossen;

package/server/devices/wledDevice.ts

@@ -1,7 +1,7 @@
+import { LogLevel } from '../../models/logLevel';
+import { ServerLogService } from '../services/log-service';
 import { IOBrokerConnection } from '../ioBroker/connection';
 import { DeviceInfo } from './DeviceInfo';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
 
 export class WledDevice {
   public on: boolean = false;

package/server/devices/zigbee/ZigbeeActuator.ts

@@ -1,10 +1,10 @@
-import { ZigbeeDevice } from '/server/devices/zigbee/zigbeeDevice';
-import { DeviceInfo } from '/server/devices/DeviceInfo';
-import { ZigbeeDeviceType } from '/server/devices/zigbee/zigbeeDeviceType';
-import { ServerLogService } from '/server/services/log-service';
-import { LogLevel } from '/models/logLevel';
-import { Utils } from '/server/services/utils/utils';
-import { LampSettings } from '/models/lampSettings';
+import { LogLevel } from '../../../models/logLevel';
+import { ZigbeeDevice } from './zigbeeDevice';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { ServerLogService } from '../../services/log-service';
+import { Utils } from '../../services/utils/utils';
+import { LampSettings } from '../../../models/lampSettings';
 
 export class ZigbeeActuator extends ZigbeeDevice {
   public settings: LampSettings = new LampSettings();

package/server/devices/zigbee/zigbeeAquaraVibra.ts

@@ -1,11 +1,11 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { SonosService } from '/server/services/Sonos/sonos-service';
-import { Utils } from '/server/services/utils/utils';
-import { PollyService } from '/server/services/Sonos/polly-service';
+import { ServerLogService } from '../../services/log-service';
+import { SonosService } from '../../services/Sonos/sonos-service';
+import { Utils } from '../../services/utils/utils';
+import { PollyService } from '../../services/Sonos/polly-service';
 
 export class ZigbeeAquaraVibra extends ZigbeeDevice {
   public sensitivity: string = '';

package/server/devices/zigbee/zigbeeAquaraWater.ts

@@ -1,11 +1,11 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { SonosService } from '/server/services/Sonos/sonos-service';
-import { Utils } from '/server/services/utils/utils';
-import { PollyService } from '/server/services/Sonos/polly-service';
+import { ServerLogService } from '../../services/log-service';
+import { SonosService } from '../../services/Sonos/sonos-service';
+import { Utils } from '../../services/utils/utils';
+import { PollyService } from '../../services/Sonos/polly-service';
 
 export class ZigbeeAquaraWater extends ZigbeeDevice {
   public water: boolean = false;

package/server/devices/zigbee/zigbeeBlitzShp.ts

@@ -1,9 +1,9 @@
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LampSettings } from '/models/lampSettings';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
+import { LampSettings } from '../../../models/lampSettings';
 
 export class ZigbeeBlitzShp extends ZigbeeDevice {
   public steckerOn: boolean = false;

package/server/devices/zigbee/zigbeeDevice.ts

@@ -1,7 +1,7 @@
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { LogLevel } from '../../../models/logLevel';
-import { ZigbeeAddDeviceItem, ZigbeeRoomSettings } from '/models/rooms/RoomSettings/zigbeeRoomSettings';
+import { ZigbeeAddDeviceItem, ZigbeeRoomSettings } from '../../../models/rooms/RoomSettings/zigbeeRoomSettings';
 import { ServerLogService } from '../../services/log-service';
 import { ioBrokerBaseDevice } from '../iIoBrokerDevice';
 import { RoomBase } from '../../../models/rooms/RoomBase';

package/server/devices/zigbee/zigbeeHeimanSmoke.ts

@@ -1,12 +1,12 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { SonosService } from '/server/services/Sonos/sonos-service';
-import { RoomBase } from '/models/rooms/RoomBase';
-import { Utils } from '/server/services/utils/utils';
-import { PollyService } from '/server/services/Sonos/polly-service';
+import { ServerLogService } from '../../services/log-service';
+import { SonosService } from '../../services/Sonos/sonos-service';
+import { RoomBase } from '../../../models/rooms/RoomBase';
+import { Utils } from '../../services/utils/utils';
+import { PollyService } from '../../services/Sonos/polly-service';
 
 export class ZigbeeHeimanSmoke extends ZigbeeDevice {
   public smoke: boolean = false;

package/server/devices/zigbee/zigbeeIkeaSteckdose.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { ZigbeeActuator } from '/server/devices/zigbee/ZigbeeActuator';
+import { ServerLogService } from '../../services/log-service';
+import { ZigbeeActuator } from './ZigbeeActuator';
 
 export class ZigbeeIkeaSteckdose extends ZigbeeActuator {
   public get steckerOn(): boolean {

package/server/devices/zigbee/zigbeeIlluActuator.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { ZigbeeActuator } from '/server/devices/zigbee/ZigbeeActuator';
+import { ServerLogService } from '../../services/log-service';
+import { ZigbeeActuator } from './ZigbeeActuator';
 
 export class ZigbeeIlluActuator extends ZigbeeActuator {
   public get isActuatorOn(): boolean {

package/server/devices/zigbee/zigbeeIlluDimmer.ts

@@ -1,11 +1,11 @@
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { DimmerSettings } from '/models/dimmerSettings';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { TimeOfDay } from '/server/services/time-callback-service';
-import { Utils } from '/server/services/utils/utils';
+import { DimmerSettings } from '../../../models/dimmerSettings';
+import { TimeOfDay } from '../../services/time-callback-service';
+import { Utils } from '../../services/utils/utils';
 
 export class ZigbeeIlluDimmer extends ZigbeeDevice {
   public on: boolean = false;

package/server/devices/zigbee/zigbeeIlluLampe.ts

@@ -1,8 +1,8 @@
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { ZigbeeIlluActuator } from '/server/devices/zigbee/zigbeeIlluActuator';
+import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
 
 export class ZigbeeIlluLampe extends ZigbeeIlluActuator {
   public get lampOn(): boolean {

package/server/devices/zigbee/zigbeeIlluLedRGBCCT.ts

@@ -1,10 +1,10 @@
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { LedSettings } from '/models/ledSettings';
-import { LogLevel } from '/models/logLevel';
-import { ServerLogService } from '/server/services/log-service';
-import { TimeOfDay } from '/server/services/time-callback-service';
+import { LedSettings } from '../../../models/ledSettings';
+import { TimeOfDay } from '../../services/time-callback-service';
 
 export class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
   public static DEFAULT_COLOR_WARM: string = '#f2b200';

package/server/ioBroker/ioBroker.main.ts

@@ -1,14 +1,14 @@
-import { LogLevel } from '/models/logLevel';
+import { LogLevel } from '../../models/logLevel';
 import { Devices } from '../devices/devices';
 import { DeviceUpdater } from '../devices/deviceUpdater';
 import { IDeviceUpdater } from '../devices/iDeviceUpdater';
 import { ServerLogService } from '../services/log-service';
 import { TimeCallbackService } from '../services/time-callback-service';
 import { IOBrokerConnection } from './connection';
-import { ConnectionCallbacks } from '/models/connectionCallbacks';
-import { RoomBase } from '/models/rooms/RoomBase';
-import { Utils } from '/server/services/utils/utils';
-import { SettingsService } from "/server/services/settings-service";
+import { ConnectionCallbacks } from '../../models/connectionCallbacks';
+import { RoomBase } from '../../models/rooms/RoomBase';
+import { Utils } from '../services/utils/utils';
+import { SettingsService } from "../services/settings-service";
 
 export class ioBrokerMain {
   private static roomConstructors: { [roomName: string]: { new (): RoomBase } } = {};

package/server/services/Sonos/sonos-service.ts

@@ -2,11 +2,11 @@ import { SonosDevice, SonosManager } from '@svrooij/sonos/lib';
 import { PlayNotificationOptions } from '@svrooij/sonos/lib/models';
 import { ServerLogService } from '../log-service';
 import { PollyService } from './polly-service';
-import { LogLevel } from '/models/logLevel';
-import { Utils } from '/server/services/utils/utils';
-import { TelegramService } from '/server/services/Telegram/telegram-service';
-import { TimeCallback, TimeCallbackType } from '/models/timeCallback';
-import { TimeCallbackService } from '/server/services/time-callback-service';
+import { LogLevel } from '../../../models/logLevel';
+import { Utils } from '../utils/utils';
+import { TelegramService } from '../Telegram/telegram-service';
+import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
+import { TimeCallbackService } from '../time-callback-service';
 
 export class OwnSonosDevice {
   public maxPlayOnAllVolume: number = 80;

package/server/services/dbo/persist.ts

@@ -8,8 +8,8 @@ import { HmIPDevice } from '../../devices/hmIPDevices/hmIpDevice';
 import { RoomBase } from '../../../models/rooms/RoomBase';
 import { BasicRoomInfo } from '../../../models/persistence/BasicRoomInfo';
 import { RoomDetailInfo } from '../../../models/persistence/RoomDetailInfo';
-import { iTemperaturDataPoint } from '/imports/api/heizung';
 import { DailyMovementCount } from '../../../models/persistence/DailyMovementCount';
+import { iTemperaturDataPoint } from "../../../models/iTemperaturDataPoint";
 
 export const TemperatureHistoryCollection = new Mongo.Collection<TemperaturDataPoint>('TemperaturData');
 export const HeatGroupCollection = new Mongo.Collection<TemperaturDataPoint>('HeatGroupCollection');

package/server/services/news-service.ts

@@ -6,7 +6,7 @@ import * as fs from 'fs';
 import { OwnSonosDevice, SonosService } from './Sonos/sonos-service';
 import { PollyService } from './Sonos/polly-service';
 import { Utils } from './utils/utils';
-import { SettingsService } from "/server/services/settings-service";
+import { SettingsService } from './settings-service';
 
 export class NewsService {
   public static oneDay: number = 1000 * 60 * 60 * 24;

package/server/services/settings-service.ts

@@ -1,7 +1,9 @@
+// @ts-ignore
+import config from '/server/config/private/mainConfig.json';
 import { iConfig } from '../config/iConfig';
 
 export class SettingsService {
-  public static settings: iConfig;
+  public static settings: iConfig = config as iConfig;
 
   public static get TelegramActive(): boolean {
     return this.settings.telegram !== undefined;
@@ -10,14 +12,4 @@ export class SettingsService {
   public static get Mp3Active(): boolean {
     return this.settings.mp3Server !== undefined;
   }
-
-  public static initialize(config: iConfig): void {
-    if (this.validateConfig(config)) {
-      this.settings = config;
-    }
-  }
-
-  private static validateConfig(config: iConfig): boolean {
-    return true;
-  }
 }

package/server/services/weather/weather-service.ts

@@ -1,3 +1,4 @@
+import { LogLevel } from '../../../models/logLevel';
 import { HTTPSService } from '../https-service';
 import { HTTPSOptions } from '../HTTPSOptions';
 import { ServerLogService } from '../log-service';
@@ -7,7 +8,6 @@ import { WeatherCurrent } from './weather-current';
 import { WeatherDaily } from './weather-daily';
 import { WeatherHourly } from './weather-hourly';
 import { WeatherMinutes } from './weather-minutes';
-import { LogLevel } from '../../../models/logLevel';
 import { iWeatherSettings } from '../../config/iConfig';
 import { Utils } from '../utils/utils';
 

package/tsconfig.json

@@ -22,11 +22,10 @@
     "noFallthroughCasesInSwitch": false,
 
     /* Module Resolution Options */
-    "baseUrl": ".",
     "paths": {
-      /* Support absolute /imports/* with a leading '/' */
-      "/*": ["*"]
+      "/server/config/private/*": ["*"]
     },
+    "baseUrl": ".",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "typeRoots": ["./node_modules/@types", "./types"],
@@ -41,7 +40,7 @@
       "node",
       "node-telegram-bot-api",
       "prop-types",
-      "react", 
+      "react",
       "react-dom",
       "react-router",
       "react-router-dom",