hoffmation-base 0.0.6 → 0.1.0

package/package.json

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

package/server/devices/groups/tasterGroup.ts

@@ -38,7 +38,7 @@ export class TasterGroup {
         pValue && this._room.LampenGroup.switchAll(false, true);
       });
 
-      if (this._room.SonosGroup.SNDevices.length > 0) {
+      if (this._room.SonosGroup.ownSonosDevices.length > 0) {
         t.tasten.UntenRechts.addLongCallback(() => {
           this._room.SonosGroup.trigger(this._room.Einstellungen.radioUrl);
         });

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

@@ -193,7 +193,7 @@ export class SonosService {
 
   private static initializeDevice(d: SonosDevice) {
     this.devicesDict[d.Name] = d;
-    this.ownDevices
+    this.ownDevices[d.Name].device = d;
     ServerLogService.writeLog(LogLevel.Debug, `Sonos ${d.Uuid} für ${d.Name} gefunden`);
   }
 }

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

@@ -0,0 +1,83 @@
+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";
+
+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 sortDates(): void {
+    this.dates = this.dates.sort((a, b) => a.getTime() - b.getTime());
+    this.removePassedDates();
+    ServerLogService.writeLog(
+      LogLevel.Info,
+      `Die "${this.name}" ist das nächste mal am ${this.nextDate.toLocaleDateString('de-DE')} zu leeren`,
+    );
+  }
+
+  public removePassedDates(): void {
+    const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
+    while (this.dates.length > 0 && this.dates[0].getTime() < todayMidnight) {
+      this.dates.shift();
+    }
+    this.nextDate = this.dates[0];
+  }
+
+  public check(): void {
+    this.removePassedDates();
+    if (this.nextDate === undefined) {
+      ServerLogService.writeLog(LogLevel.Alert, `Die Mülltonne mit dem Namen ${this.name} hat keine nächste Abholung!`);
+      return;
+    }
+    const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
+    const tomorowMidnight: number = todayMidnight + MuellTonne.oneDay;
+    const tomorowAfterMidnight: number = tomorowMidnight + MuellTonne.oneDay;
+    const nextTimestamp: number = this.nextDate.getTime();
+
+    const daysTilNextEvent: number = (nextTimestamp - todayMidnight) / MuellTonne.oneDay;
+    ServerLogService.writeLog(
+      LogLevel.Info,
+      `Die Mülltonne mit dem Namen ${this.name} wird in ${daysTilNextEvent} Tagen das nächste Mal abgeholt.`,
+    );
+
+    if (nextTimestamp >= tomorowAfterMidnight) {
+      ServerLogService.writeLog(
+        LogLevel.Trace,
+        `Die Mülltonne mit dem Namen ${this.name} wird erst nach Übermorgen abgeholt`,
+      );
+      return; // Es ist noch lange hin
+    }
+
+    if (nextTimestamp >= tomorowMidnight) {
+      const message = `Die Mülltonne mit dem Namen ${this.name} wird morgen abgeholt!`;
+      TelegramService.inform(message);
+
+      if (this.ownSonosDevice) {
+        SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
+      }
+      return;
+    }
+
+    if (nextTimestamp >= todayMidnight) {
+      if (new Date().getHours() > 10) {
+        const message = `Die Mülltonne mit dem Namen ${this.name} wurde heute abgeholt, Mülltonne zurückstellen!`;
+        TelegramService.inform(message);
+        if (this.ownSonosDevice) {
+          SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
+        }
+      } else {
+        const message = `Die Mülltonne mit dem Namen ${this.name} wird heute abgeholt!`;
+        TelegramService.inform(message);
+        if (this.ownSonosDevice) {
+          SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
+        }
+      }
+      return;
+    }
+  }
+}

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

@@ -1,91 +1,12 @@
 import { async, VEvent } from 'node-ical';
 import { ServerLogService } from '../log-service';
-import { OwnSonosDevice, SonosService } from '../Sonos/sonos-service';
-import { TelegramService } from '../Telegram/telegram-service';
 import { TimeCallbackService } from '../time-callback-service';
 import { LogLevel } from '../../../models/logLevel';
 import { TimeCallback, TimeCallbackType } from '../../../models/timeCallback';
 import { iMuellSettings } from '../../config/iConfig';
 import { Utils } from '../utils/utils';
-
-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 sortDates(): void {
-    this.dates = this.dates.sort((a, b) => a.getTime() - b.getTime());
-    this.removePassedDates();
-    ServerLogService.writeLog(
-      LogLevel.Info,
-      `Die "${this.name}" ist das nächste mal am ${this.nextDate.toLocaleDateString('de-DE')} zu leeren`,
-    );
-  }
-
-  public removePassedDates(): void {
-    const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
-    while (this.dates.length > 0 && this.dates[0].getTime() < todayMidnight) {
-      this.dates.shift();
-    }
-    this.nextDate = this.dates[0];
-  }
-
-  public check(): void {
-    this.removePassedDates();
-    if (this.nextDate === undefined) {
-      ServerLogService.writeLog(LogLevel.Alert, `Die Mülltonne mit dem Namen ${this.name} hat keine nächste Abholung!`);
-      return;
-    }
-    const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
-    const tomorowMidnight: number = todayMidnight + MuellTonne.oneDay;
-    const tomorowAfterMidnight: number = tomorowMidnight + MuellTonne.oneDay;
-    const nextTimestamp: number = this.nextDate.getTime();
-
-    const daysTilNextEvent: number = (nextTimestamp - todayMidnight) / MuellTonne.oneDay;
-    ServerLogService.writeLog(
-      LogLevel.Info,
-      `Die Mülltonne mit dem Namen ${this.name} wird in ${daysTilNextEvent} Tagen das nächste Mal abgeholt.`,
-    );
-
-    if (nextTimestamp >= tomorowAfterMidnight) {
-      ServerLogService.writeLog(
-        LogLevel.Trace,
-        `Die Mülltonne mit dem Namen ${this.name} wird erst nach Übermorgen abgeholt`,
-      );
-      return; // Es ist noch lange hin
-    }
-
-    if (nextTimestamp >= tomorowMidnight) {
-      const message = `Die Mülltonne mit dem Namen ${this.name} wird morgen abgeholt!`;
-      TelegramService.inform(message);
-
-      if (this.ownSonosDevice) {
-        SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-      }
-      return;
-    }
-
-    if (nextTimestamp >= todayMidnight) {
-      if (new Date().getHours() > 10) {
-        const message = `Die Mülltonne mit dem Namen ${this.name} wurde heute abgeholt, Mülltonne zurückstellen!`;
-        TelegramService.inform(message);
-        if (this.ownSonosDevice) {
-          SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-        }
-      } else {
-        const message = `Die Mülltonne mit dem Namen ${this.name} wird heute abgeholt!`;
-        TelegramService.inform(message);
-        if (this.ownSonosDevice) {
-          SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-        }
-      }
-      return;
-    }
-  }
-}
+import { MuellTonne } from "./muell-tonne";
+import { OwnSonosDevice } from "/server/config/private/server/services/Sonos/sonos-service";
 
 export class MuellService {
   public static alleTonnen: Array<{ name: string; date: Date }> = [];
@@ -98,10 +19,11 @@ export class MuellService {
   private static lastCheck: Date = new Date(0);
   private static _calendarURL: string;
   private static _active: boolean = false;
+  private static defaultSonosDevice: OwnSonosDevice | undefined = undefined;
 
   public static months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
-  public static intialize(config: iMuellSettings): void {
+  public static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void {
     this._active = true;
     this._calendarURL = config.calendarURL;
     this.updateTimeCallback = new TimeCallback(
@@ -134,10 +56,10 @@ export class MuellService {
   public static updateCalendar(checkAfterwards: boolean = true): void {
     ServerLogService.writeLog(LogLevel.Debug, `Muell Service wird nun initialisiert`);
     async.fromURL(this._calendarURL).then((data) => {
-      this.gelbeTonne = new MuellTonne('Gelbe Tonne');
-      this.graueTonne = new MuellTonne('Graue Tonne');
-      this.blaueTonne = new MuellTonne('Blaue Tonne');
-      this.brauneTonne = new MuellTonne('Braune Tonne');
+      this.gelbeTonne = new MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
+      this.graueTonne = new MuellTonne('Graue Tonne', this.defaultSonosDevice);
+      this.blaueTonne = new MuellTonne('Blaue Tonne', this.defaultSonosDevice);
+      this.brauneTonne = new MuellTonne('Braune Tonne', this.defaultSonosDevice);
       this.alleTonnen = [];
       const todayMidnight: number = new Date().setHours(0, 0, 0, 0);
       for (const k in data) {

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;