hoffmation-base 0.1.0 → 0.1.4

package/models/persistence/temperaturDataPoint.ts

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

package/package.json

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

package/server/ioBroker/ioBroker.main.ts

@@ -8,7 +8,7 @@ import { IOBrokerConnection } from './connection';
 import { ConnectionCallbacks } from '../../models/connectionCallbacks';
 import { RoomBase } from '../../models/rooms/RoomBase';
 import { Utils } from '../services/utils/utils';
-import { SettingsService } from "../services/settings-service";
+import { SettingsService } from '../services/settings-service';
 
 export class ioBrokerMain {
   private static roomConstructors: { [roomName: string]: { new (): RoomBase } } = {};

package/server/services/Sonos/OwnSonosDevices.ts

@@ -0,0 +1,9 @@
+import { OwnSonosDevice } from './sonos-service';
+
+export class OwnSonosDevices {
+  public static ownDevices: { [name: string]: OwnSonosDevice } = {};
+
+  public static addDevice(device: OwnSonosDevice) {
+    this.ownDevices[device.name] = device;
+  }
+}

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

@@ -13,11 +13,7 @@ export class OwnSonosDevice {
   public playTestMessage() {
     SonosService.speakOnDevice(`Ich bin ${this.name}`, this);
   }
-  public constructor(
-    public name: string,
-    public roomName: string,
-    public device: SonosDevice | undefined,
-  ) {};
+  public constructor(public name: string, public roomName: string, public device: SonosDevice | undefined) {}
 }
 
 export class SonosService {
@@ -32,7 +28,7 @@ export class SonosService {
 
   public static addOwnDevices(
     snDevices: { [name: string]: OwnSonosDevice },
-    reinitializationDevice?: OwnSonosDevice
+    reinitializationDevice?: OwnSonosDevice,
   ): void {
     this.ownDevices = snDevices;
     this.reinitializationDevice = reinitializationDevice;
@@ -71,7 +67,7 @@ export class SonosService {
           this.speakOnDevice(
             `Sonos System initialisiert und bereit für Sprachausgaben.`,
             this.reinitializationDevice,
-            30
+            30,
           );
         }
       })
@@ -83,18 +79,18 @@ export class SonosService {
     try {
       for (const deviceName in this.ownDevices) {
         currentDevice = this.ownDevices[deviceName];
-        if(currentDevice?.device === undefined) {
+        if (currentDevice?.device === undefined) {
           throw `${currentDevice?.name} is missing`;
         }
         await currentDevice.device.GetState();
       }
-      if(currentDevice !== undefined) {
+      if (currentDevice !== undefined) {
         ServerLogService.writeLog(LogLevel.Info, `Alle Geräte okay --> Last checked ${currentDevice.name}`);
       }
     } catch (e) {
       ServerLogService.writeLog(
         LogLevel.Error,
-        `Atleast one device failed --> Last checked ${(currentDevice?.name ?? "undefined")}`
+        `Atleast one device failed --> Last checked ${currentDevice?.name ?? 'undefined'}`,
       );
       TelegramService.inform(`Sonos device is failing --> Reinitialize whole system`);
       this.initialize(true);
@@ -107,14 +103,14 @@ export class SonosService {
     }
     PollyService.tts(pMessage, (networkPath: string, duration: number) => {
       const hours: number = new Date().getHours();
-      let volume: number = hours < 10 || hours > 22 ? 40 : 80;
+      const volume: number = hours < 10 || hours > 22 ? 40 : 80;
 
       for (const deviceName in this.ownDevices) {
         SonosService.playOnDevice(
           this.ownDevices[deviceName],
           networkPath,
           duration,
-          (volumeOverride > -1) ? volumeOverride : Math.min(volume, this.ownDevices[deviceName].maxPlayOnAllVolume)
+          volumeOverride > -1 ? volumeOverride : Math.min(volume, this.ownDevices[deviceName].maxPlayOnAllVolume),
         );
       }
     });
@@ -139,12 +135,14 @@ export class SonosService {
       notificationFired: (played) => {
         ServerLogService.writeLog(
           LogLevel.Trace,
-          `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played in ${ownSnDevice.roomName} (duration: "${specificTimeout}")`,
+          `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played in ${
+            ownSnDevice.roomName
+          } (duration: "${specificTimeout}")`,
         );
       },
     };
     try {
-      const device: SonosDevice| undefined = ownSnDevice.device;
+      const device: SonosDevice | undefined = ownSnDevice.device;
       if (device === undefined) {
         ServerLogService.writeLog(LogLevel.Alert, `Sonos Geräte ${ownSnDevice.name} ist nicht initialisiert`);
         Utils.guardedTimeout(
@@ -156,10 +154,7 @@ export class SonosService {
         );
         return;
       }
-      ServerLogService.writeLog(
-        LogLevel.Trace,
-        `Spiele nun die Ausgabe für "${mp3Name}" auf "${ownSnDevice.name}"`,
-      );
+      ServerLogService.writeLog(LogLevel.Trace, `Spiele nun die Ausgabe für "${mp3Name}" auf "${ownSnDevice.name}"`);
       device.PlayNotificationTwo(options).then((played) => {
         ServerLogService.writeLog(
           LogLevel.Debug,

package/server/services/calendar/muell-tonne.ts

@@ -1,15 +1,14 @@
-import { OwnSonosDevice, SonosService } from "/server/config/private/server/services/Sonos/sonos-service";
-import { ServerLogService } from "/server/config/private/server/services/log-service";
-import { LogLevel } from "/server/config/private/models/logLevel";
-import { TelegramService } from "/server/config/private/server/services/Telegram/telegram-service";
+import { OwnSonosDevice, SonosService } from '../Sonos/sonos-service';
+import { ServerLogService } from '../log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { TelegramService } from '../Telegram/telegram-service';
 
 export class MuellTonne {
   public static oneDay: number = 1000 * 60 * 60 * 24;
   public nextDate: Date | undefined = undefined;
   public dates: Date[] = [];
 
-  public constructor(public name: string, public ownSonosDevice?: OwnSonosDevice) {
-  }
+  public constructor(public name: string, public ownSonosDevice?: OwnSonosDevice) {}
 
   public sortDates(): void {
     this.dates = this.dates.sort((a, b) => a.getTime() - b.getTime());

package/server/services/calendar/m/303/274ll-service.ts

@@ -5,8 +5,8 @@ import { LogLevel } from '../../../models/logLevel';
 import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
 import { iMuellSettings } from '../../config/iConfig';
 import { Utils } from '../utils/utils';
-import { MuellTonne } from "./muell-tonne";
-import { OwnSonosDevice } from "/server/config/private/server/services/Sonos/sonos-service";
+import { MuellTonne } from './muell-tonne';
+import { OwnSonosDevice } from '../Sonos/sonos-service';
 
 export class MuellService {
   public static alleTonnen: Array<{ name: string; date: Date }> = [];
@@ -24,6 +24,7 @@ export class MuellService {
   public static months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
   public static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void {
+    this.defaultSonosDevice = defaultSonosDevice;
     this._active = true;
     this._calendarURL = config.calendarURL;
     this.updateTimeCallback = new TimeCallback(
@@ -83,7 +84,7 @@ export class MuellService {
           continue;
         }
 
-        this.alleTonnen.push({name: ev.summary, date: ev.start});
+        this.alleTonnen.push({ name: ev.summary, date: ev.start });
         switch (ev.summary) {
           case this.gelbeTonne.name:
             this.gelbeTonne.dates.push(ev.start);

package/server/services/dbo/persist.ts

@@ -9,7 +9,7 @@ import { RoomBase } from '../../../models/rooms/RoomBase';
 import { BasicRoomInfo } from '../../../models/persistence/BasicRoomInfo';
 import { RoomDetailInfo } from '../../../models/persistence/RoomDetailInfo';
 import { DailyMovementCount } from '../../../models/persistence/DailyMovementCount';
-import { iTemperaturDataPoint } from "../../../models/iTemperaturDataPoint";
+import { iTemperaturDataPoint } from '../../../models/iTemperaturDataPoint';
 
 export const TemperatureHistoryCollection = new Mongo.Collection<TemperaturDataPoint>('TemperaturData');
 export const HeatGroupCollection = new Mongo.Collection<TemperaturDataPoint>('HeatGroupCollection');