hoffmation-base 1.0.41 → 1.0.43

package/lib/server/services/news-service.d.ts

@@ -1,5 +1,5 @@
-import { OwnSonosDevice } from './Sonos';
 import { iNewsSettings } from '../config';
+import { ISpeaker } from '../devices';
 export declare class NewsService {
     static lastNewsAudioFile: string;
     private static readonly newsFilePrefix;
@@ -25,11 +25,11 @@ export declare class NewsService {
     static getLatestNews(): void;
     /**
      * Plays the latest news on a sonos device
-     * @param ownSonosDevice Sonos device to play from
+     * @param speaker Sonos device to play from
      * @param volume volume to play at
      * @param retries Number of times playing should be tried if there is currently no audio file available
      */
-    static playLastNews(ownSonosDevice: OwnSonosDevice, volume?: number, retries?: number): void;
+    static playLastNews(speaker: ISpeaker, volume?: number, retries?: number): void;
     private static downloadLatestFileFromFeed;
     /**
      * Deletes all files in the given directory that are older than the given age.

package/lib/server/services/news-service.js

@@ -96,18 +96,18 @@ class NewsService {
     }
     /**
      * Plays the latest news on a sonos device
-     * @param ownSonosDevice Sonos device to play from
+     * @param speaker Sonos device to play from
      * @param volume volume to play at
      * @param retries Number of times playing should be tried if there is currently no audio file available
      */
-    static playLastNews(ownSonosDevice, volume = 30, retries = 5) {
+    static playLastNews(speaker, volume = 30, retries = 5) {
         if (!NewsService.lastNewsAudioFile) {
             if (retries > 0) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Service not ready yet --> waiting, remaining tries: ${retries - 1}`, {
                     source: logSource_1.LogSource.News,
                 });
                 utils_1.Utils.guardedTimeout(() => {
-                    NewsService.playLastNews(ownSonosDevice, volume, retries - 1);
+                    NewsService.playLastNews(speaker, volume, retries - 1);
                 }, 1000);
             }
             else {
@@ -117,7 +117,7 @@ class NewsService {
             }
             return;
         }
-        Sonos_1.SonosService.playOnDevice(ownSonosDevice, path_1.default.basename(NewsService.lastNewsAudioFile, path_1.default.extname(NewsService.lastNewsAudioFile)), Sonos_1.PollyService.getDuration(NewsService.lastNewsAudioFile), volume);
+        speaker.playOnDevice(path_1.default.basename(NewsService.lastNewsAudioFile, path_1.default.extname(NewsService.lastNewsAudioFile)), Sonos_1.PollyService.getDuration(NewsService.lastNewsAudioFile), volume);
     }
     static downloadLatestFileFromFeed(rssUrl, targetDir) {
         const parser = new rss_parser_1.default();

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

@@ -4,9 +4,9 @@ import { WeatherMinutes } from './weather-minutes';
 import { WeatherAlert } from './weather-alert';
 import { iWeatherSettings } from '../../config';
 import { LogLevel } from '../../../models';
-import { OwnSonosDevice } from '../Sonos';
 import { LogDebugType } from '../log-service';
 import { WeatherDaily } from './weather-daily';
+import { ISpeaker } from '../../devices';
 export interface WeatherResponse {
     lat: number;
     lon: number;
@@ -36,7 +36,7 @@ export declare class WeatherService {
     static initialize(config: iWeatherSettings): void;
     static update(): void;
     static stopInterval(): void;
-    static playWeatherInfo(sonosDevice: OwnSonosDevice, volume?: number, short?: boolean, retries?: number): void;
+    static playWeatherInfo(speaker: ISpeaker, volume?: number, short?: boolean, retries?: number): void;
     static processHourlyWeather(): void;
     static getCurrentTemp(): number;
     static willOutsideBeWarmer(referenceTemperature: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void): boolean;

package/lib/server/services/weather/weather-service.js

@@ -8,7 +8,6 @@ const models_1 = require("../../../models");
 const HTTPSOptions_1 = require("../HTTPSOptions");
 const https_service_1 = require("../https-service");
 const utils_1 = require("../utils");
-const Sonos_1 = require("../Sonos");
 const log_service_1 = require("../log-service");
 const suncalc_1 = __importDefault(require("suncalc"));
 const time_callback_service_1 = require("../time-callback-service");
@@ -33,13 +32,13 @@ class WeatherService {
             this._refreshInterval = undefined;
         }
     }
-    static playWeatherInfo(sonosDevice, volume = 30, short = false, retries = 5) {
+    static playWeatherInfo(speaker, volume = 30, short = false, retries = 5) {
         const wData = WeatherService.lastResponse;
         if (wData === undefined) {
             if (retries > 0) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `WeatherService.playWeatherInfo(): Der Wetterbericht ist noch nicht bereit --> warten`);
                 setTimeout(() => {
-                    WeatherService.playWeatherInfo(sonosDevice, volume, short, retries - 1);
+                    WeatherService.playWeatherInfo(speaker, volume, short, retries - 1);
                 }, 1000);
             }
             else {
@@ -47,19 +46,19 @@ class WeatherService {
             }
             return;
         }
-        Sonos_1.SonosService.speakOnDevice(short ? `Kurze Wetterinfo:` : `HoffMation Wetter-Bericht:`, sonosDevice, volume, false);
-        Sonos_1.SonosService.speakOnDevice(`Wetterbeschreibung für heute:  ${wData.daily[0].weather[0].description}`, sonosDevice, volume, false);
-        Sonos_1.SonosService.speakOnDevice(`Aktuell sind es ${Math.round(wData.current.temp)} Grad.`, sonosDevice, volume, false);
+        speaker.speakOnDevice(short ? `Kurze Wetterinfo:` : `HoffMation Wetter-Bericht:`, volume, false);
+        speaker.speakOnDevice(`Wetterbeschreibung für heute:  ${wData.daily[0].weather[0].description}`, volume, false);
+        speaker.speakOnDevice(`Aktuell sind es ${Math.round(wData.current.temp)} Grad.`, volume, false);
         if (!short) {
-            Sonos_1.SonosService.speakOnDevice(`Heute sollen es im Durchschnitt ${Math.round(wData.daily[0].temp.day)} Grad sein.`, sonosDevice, volume, false);
-            Sonos_1.SonosService.speakOnDevice(`Die Höchsttemperatur liegt heute bei ${Math.round(wData.daily[0].temp.max)} Grad.`, sonosDevice, volume, false);
-            Sonos_1.SonosService.speakOnDevice(`Die Tiefsttemperatur soll heute ${Math.round(wData.daily[0].temp.min)} Grad betragen.`, sonosDevice, volume, false);
+            speaker.speakOnDevice(`Heute sollen es im Durchschnitt ${Math.round(wData.daily[0].temp.day)} Grad sein.`, volume, false);
+            speaker.speakOnDevice(`Die Höchsttemperatur liegt heute bei ${Math.round(wData.daily[0].temp.max)} Grad.`, volume, false);
+            speaker.speakOnDevice(`Die Tiefsttemperatur soll heute ${Math.round(wData.daily[0].temp.min)} Grad betragen.`, volume, false);
             if (wData.daily[0].rain !== undefined) {
-                Sonos_1.SonosService.speakOnDevice(`Es sollen heute etwa ${Math.round(wData.daily[0].rain)} Millimeter Regen fallen.`, sonosDevice, volume, false);
+                speaker.speakOnDevice(`Es sollen heute etwa ${Math.round(wData.daily[0].rain)} Millimeter Regen fallen.`, volume, false);
             }
         }
         if (wData.daily[0].snow !== undefined && wData.daily[0].snow > 0) {
-            Sonos_1.SonosService.speakOnDevice(`Heute wird es Schneien! Es werden etwa ${Math.round(wData.daily[0].snow)} Millimeter Schnee erwartet.`, sonosDevice, volume, false);
+            speaker.speakOnDevice(`Heute wird es Schneien! Es werden etwa ${Math.round(wData.daily[0].snow)} Millimeter Schnee erwartet.`, volume, false);
         }
         const { minutes, precipitation } = WeatherService.getRainNextMinutes();
         const ratio = minutes <= 0 ? 0 : (precipitation / minutes) * 60;
@@ -84,10 +83,10 @@ class WeatherService {
                 message += `bleibt es trocken.`;
                 break;
         }
-        Sonos_1.SonosService.speakOnDevice(message, sonosDevice, volume, false);
+        speaker.speakOnDevice(message, volume, false);
         !short &&
             precipitation > 0 &&
-            Sonos_1.SonosService.speakOnDevice(`Es werden etwa ${precipitation} Millimeter Niederschlag in den nächsten ${minutes} Minuten fallen`, sonosDevice, volume, false);
+            speaker.speakOnDevice(`Es werden etwa ${precipitation} Millimeter Niederschlag in den nächsten ${minutes} Minuten fallen`, volume, false);
         const alerts = WeatherService.getActiveAlerts();
         if (alerts.length > 0) {
             const alertMessage = [`Achtung, vorliegende Wetterwarnungen:`];
@@ -95,10 +94,10 @@ class WeatherService {
                 alertMessage.push(`${element.event} von ${new Date(element.start * 1000).toLocaleString('de-DE')} bis ${new Date(element.end * 1000).toLocaleString('de-DE')}`);
                 // } bis ${new Date(element.end * 1000).toLocaleString("de-DE")}; Beschreibung: ${element.description} Herausgeber: ${element.sender_name}`)
             });
-            Sonos_1.SonosService.speakOnDevice(alertMessage.join('\n'), sonosDevice, volume, false);
+            speaker.speakOnDevice(alertMessage.join('\n'), volume, false);
         }
         else if (!short) {
-            Sonos_1.SonosService.speakOnDevice(`Für heute liegt keine Unwetterwarnungen vor`, sonosDevice, volume, false);
+            speaker.speakOnDevice(`Für heute liegt keine Unwetterwarnungen vor`, volume, false);
         }
     }
     static processHourlyWeather() {