hoffmation-base 1.0.41 → 1.0.45

package/lib/server/services/Sonos/own-sonos-device.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnSonosDevice = void 0;
+const devices_1 = require("../../devices");
+const models_1 = require("../../../models");
+const log_service_1 = require("../log-service");
+const utils_1 = require("../utils");
+const lodash_1 = __importDefault(require("lodash"));
+const sonos_service_1 = require("./sonos-service");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
+const settings_service_1 = require("../settings-service");
+const polly_service_1 = require("./polly-service");
+class OwnSonosDevice {
+    constructor(discoveryName, roomName, device) {
+        this.device = device;
+        this.maxPlayOnAllVolume = 80;
+        this.deviceType = devices_1.DeviceType.Sonos;
+        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.speaker];
+        this.discoveryName = discoveryName;
+        this._info = new devices_1.DeviceInfo();
+        this._info.fullName = `Sonos ${roomName} ${discoveryName}`;
+        this._info.customName = `Sonos ${discoveryName}`;
+        this._info.room = roomName;
+        this._info.allDevicesKey = `sonos-${roomName}-${discoveryName}`;
+        devices_1.Devices.alLDevices[`sonos-${roomName}-${discoveryName}`] = this;
+    }
+    get info() {
+        return this._info;
+    }
+    set info(info) {
+        this._info = info;
+    }
+    get id() {
+        var _a;
+        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
+    }
+    get name() {
+        return this.info.customName;
+    }
+    playOnDevice(mp3Name, duration, volume = undefined, onlyWhenPlaying = undefined, resolveAfterRevert = false) {
+        var _a, _b;
+        if (((_a = settings_service_1.SettingsService.settings.mp3Server) === null || _a === void 0 ? void 0 : _a.serverAddress) === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Sonos: Can't speak as we have no mp3Server`);
+            return;
+        }
+        const specificTimeout = Math.ceil(duration / 1000) + 5;
+        const options = {
+            catchQueueErrors: true,
+            trackUri: `${(_b = settings_service_1.SettingsService.settings.mp3Server) === null || _b === void 0 ? void 0 : _b.serverAddress}/file.mp3?fname=${mp3Name}`,
+            delayMs: 750,
+            onlyWhenPlaying: onlyWhenPlaying,
+            resolveAfterRevert: resolveAfterRevert,
+            volume: volume,
+            specificTimeout: specificTimeout,
+            notificationFired: (played) => {
+                this.log(models_1.LogLevel.Trace, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
+            },
+        };
+        try {
+            if (this.device === undefined) {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Sonos Geräte ${this.name} ist nicht initialisiert`);
+                utils_1.Utils.guardedTimeout(() => {
+                    sonos_service_1.SonosService.initialize();
+                }, 500, this);
+                return;
+            }
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Spiele nun die Ausgabe für "${mp3Name}" auf "${this.name}"`);
+            this.device.PlayNotificationTwo(options).then((played) => {
+                this.log(models_1.LogLevel.Debug, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
+            });
+        }
+        catch (err) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Sonos Error ${err.message}: ${err.stack}`);
+        }
+    }
+    playTestMessage() {
+        this.speakOnDevice(`Ich bin ${this.name}`);
+    }
+    speakOnDevice(pMessage, volume = undefined, onlyWhenPlaying = undefined, resolveAfterRevert = undefined) {
+        polly_service_1.PollyService.tts(pMessage, (networkPath, duration) => {
+            this.playOnDevice(networkPath, duration, volume, onlyWhenPlaying, resolveAfterRevert);
+        });
+    }
+    stop() {
+        var _a;
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.Stop();
+    }
+    playUrl(url) {
+        var _a;
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.SetAVTransportURI(url);
+    }
+    log(level, message, debugType = log_service_1.LogDebugType.None) {
+        var _a, _b;
+        log_service_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
+            debugType: debugType,
+            room: (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
+            deviceId: this.name,
+            deviceName: this.name,
+        });
+    }
+    toJSON() {
+        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room']));
+    }
+}
+exports.OwnSonosDevice = OwnSonosDevice;

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

@@ -1,22 +1,5 @@
 import { SonosDevice } from '@svrooij/sonos/lib';
-import { LogLevel, RoomBase } from '../../../models';
-import { LogDebugType } from '../log-service';
-import { DeviceInfo, DeviceType, IBaseDevice } from '../../devices';
-export declare class OwnSonosDevice implements IBaseDevice {
-    device: SonosDevice | undefined;
-    maxPlayOnAllVolume: number;
-    room: RoomBase | undefined;
-    readonly deviceType: DeviceType;
-    constructor(name: string, roomName: string, device: SonosDevice | undefined);
-    protected _info: DeviceInfo;
-    get info(): DeviceInfo;
-    set info(info: DeviceInfo);
-    get id(): string;
-    get name(): string;
-    playTestMessage(): void;
-    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
-    toJSON(): Partial<OwnSonosDevice>;
-}
+import { OwnSonosDevice } from './own-sonos-device';
 export declare class SonosService {
     static all: SonosDevice[];
     static devicesDict: {
@@ -33,8 +16,6 @@ export declare class SonosService {
     static initialize(reinitialize?: boolean): void;
     static checkAll(): Promise<void>;
     static speakOnAll(pMessage: string, volumeOverride?: number): void;
-    static playOnDevice(ownSnDevice: OwnSonosDevice, mp3Name: string, duration: number, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
-    static speakOnDevice(pMessage: string, ownSnDevice: OwnSonosDevice, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
     static speakTestMessageOnEachDevice(): void;
     private static initializeDevice;
 }

package/lib/server/services/Sonos/sonos-service.js

@@ -1,61 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SonosService = exports.OwnSonosDevice = void 0;
+exports.SonosService = void 0;
 const lib_1 = require("@svrooij/sonos/lib");
 const models_1 = require("../../../models");
 const log_service_1 = require("../log-service");
-const utils_1 = require("../utils");
 const polly_service_1 = require("./polly-service");
 const Telegram_1 = require("../Telegram");
 const time_callback_service_1 = require("../time-callback-service");
 const settings_service_1 = require("../settings-service");
-const devices_1 = require("../../devices");
-const lodash_1 = __importDefault(require("lodash"));
-class OwnSonosDevice {
-    constructor(name, roomName, device) {
-        this.device = device;
-        this.maxPlayOnAllVolume = 80;
-        this.deviceType = devices_1.DeviceType.Sonos;
-        this._info = new devices_1.DeviceInfo();
-        this._info.fullName = `Sonos ${name}`;
-        this._info.customName = `${roomName} ${name}`;
-        this._info.room = roomName;
-        this._info.allDevicesKey = `sonos-${roomName}-${name}`;
-        devices_1.Devices.alLDevices[`sonos-${roomName}-${name}`] = this;
-    }
-    get info() {
-        return this._info;
-    }
-    set info(info) {
-        this._info = info;
-    }
-    get id() {
-        var _a;
-        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
-    }
-    get name() {
-        return this.info.customName;
-    }
-    playTestMessage() {
-        SonosService.speakOnDevice(`Ich bin ${this.name}`, this);
-    }
-    log(level, message, debugType = log_service_1.LogDebugType.None) {
-        var _a, _b;
-        log_service_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
-            debugType: debugType,
-            room: (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
-            deviceId: this.name,
-            deviceName: this.name,
-        });
-    }
-    toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room']));
-    }
-}
-exports.OwnSonosDevice = OwnSonosDevice;
 class SonosService {
     static addOwnDevices(snDevices, reinitializationDevice) {
         this.ownDevices = snDevices;
@@ -86,6 +38,7 @@ class SonosService {
         this.sonosManager
             .InitializeWithDiscovery(10)
             .then(() => {
+            var _a;
             this.sonosManager.OnNewDevice((d) => {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `SonosDevice ${d.Name} joined`);
                 SonosService.initializeDevice(d);
@@ -95,8 +48,8 @@ class SonosService {
                 SonosService.initializeDevice(d);
             });
             this.isInitialized = true;
-            if (!reinitialize && this.reinitializationDevice !== undefined) {
-                this.speakOnDevice(`Sonos System initialisiert und bereit für Sprachausgaben.`, this.reinitializationDevice, 30);
+            if (!reinitialize) {
+                (_a = this.reinitializationDevice) === null || _a === void 0 ? void 0 : _a.speakOnDevice(`Sonos System initialisiert und bereit für Sprachausgaben.`, 30);
             }
         })
             .catch(console.error);
@@ -131,52 +84,10 @@ class SonosService {
             const hours = new Date().getHours();
             const volume = 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));
+                this.ownDevices[deviceName].playOnDevice(networkPath, duration, volumeOverride > -1 ? volumeOverride : Math.min(volume, this.ownDevices[deviceName].maxPlayOnAllVolume));
             }
         });
     }
-    static playOnDevice(ownSnDevice, mp3Name, duration, volume = undefined, onlyWhenPlaying = undefined, resolveAfterRevert = false) {
-        var _a, _b;
-        if (((_a = settings_service_1.SettingsService.settings.mp3Server) === null || _a === void 0 ? void 0 : _a.serverAddress) === undefined) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Sonos: Can't speak as we have no mp3Server`);
-            return;
-        }
-        const specificTimeout = Math.ceil(duration / 1000) + 5;
-        const options = {
-            catchQueueErrors: true,
-            trackUri: `${(_b = settings_service_1.SettingsService.settings.mp3Server) === null || _b === void 0 ? void 0 : _b.serverAddress}/file.mp3?fname=${mp3Name}`,
-            delayMs: 750,
-            onlyWhenPlaying: onlyWhenPlaying,
-            resolveAfterRevert: resolveAfterRevert,
-            volume: volume,
-            specificTimeout: specificTimeout,
-            notificationFired: (played) => {
-                ownSnDevice.log(models_1.LogLevel.Trace, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
-            },
-        };
-        try {
-            const device = ownSnDevice.device;
-            if (device === undefined) {
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Sonos Geräte ${ownSnDevice.name} ist nicht initialisiert`);
-                utils_1.Utils.guardedTimeout(() => {
-                    this.initialize();
-                }, 500, this);
-                return;
-            }
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Spiele nun die Ausgabe für "${mp3Name}" auf "${ownSnDevice.name}"`);
-            device.PlayNotificationTwo(options).then((played) => {
-                ownSnDevice.log(models_1.LogLevel.Debug, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
-            });
-        }
-        catch (err) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Sonos Error ${err.message}: ${err.stack}`);
-        }
-    }
-    static speakOnDevice(pMessage, ownSnDevice, volume = undefined, onlyWhenPlaying = undefined, resolveAfterRevert = undefined) {
-        polly_service_1.PollyService.tts(pMessage, (networkPath, duration) => {
-            SonosService.playOnDevice(ownSnDevice, networkPath, duration, volume, onlyWhenPlaying, resolveAfterRevert);
-        });
-    }
     static speakTestMessageOnEachDevice() {
         for (const deviceName in this.ownDevices) {
             this.ownDevices[deviceName].playTestMessage();

package/lib/server/services/ac/ac-device.d.ts

@@ -1,16 +1,18 @@
-import { DeviceInfo, DeviceType, IBaseDevice, iExcessEnergyConsumer } from '../../devices';
+import { DeviceInfo, DeviceType, iAcDevice, iBaseDevice, iExcessEnergyConsumer } from '../../devices';
 import { ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { AcMode } from './ac-mode';
 import { AcSettings } from '../../../models/deviceSettings/acSettings';
 import { AcDeviceType } from './acDeviceType';
-export declare abstract class AcDevice implements iExcessEnergyConsumer, IBaseDevice {
+import { DeviceCapability } from '../../devices/DeviceCapability';
+export declare abstract class AcDevice implements iExcessEnergyConsumer, iBaseDevice, iAcDevice {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     acSettings: AcSettings;
     room: RoomBase | undefined;
+    deviceCapabilities: DeviceCapability[];
     protected _info: DeviceInfo;
     protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
     get info(): DeviceInfo;

package/lib/server/services/ac/ac-device.js

@@ -11,6 +11,7 @@ const log_service_1 = require("../log-service");
 const ac_mode_1 = require("./ac-mode");
 const acSettings_1 = require("../../../models/deviceSettings/acSettings");
 const lodash_1 = __importDefault(require("lodash"));
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class AcDevice {
     constructor(name, roomName, ip, acDeviceType) {
         this.ip = ip;
@@ -18,6 +19,7 @@ class AcDevice {
         this.currentConsumption = -1;
         this.energyConsumerSettings = new models_1.ExcessEnergyConsumerSettings();
         this.acSettings = new acSettings_1.AcSettings();
+        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac];
         this._activatedByExcessEnergy = false;
         this._blockAutomaticTurnOnMS = -1;
         this._info = new devices_1.DeviceInfo();

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

@@ -1,18 +1,18 @@
-import { IBaseDevice } from '../../devices';
+import { iBaseDevice } from '../../devices';
 import { RoomBase } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice } from '../ac';
 export declare class API {
     /**
-     * Gets the instance of an Ac Device identified by name
+     * Gets the instance of an Ac Device identified by id
      * @param {string} id
      * @returns {OwnDaikinDevice | undefined}
      */
     static getAc(id: string): AcDevice | undefined;
     static getDevices(): {
-        [id: string]: IBaseDevice;
+        [id: string]: iBaseDevice;
     };
-    static getDevice(id: string): IBaseDevice;
+    static getDevice(id: string): iBaseDevice;
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];
@@ -33,5 +33,22 @@ export declare class API {
      * @param {boolean} state The desired new state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
-    static setLight(deviceId: string, state: boolean): Error | null;
+    static setLamp(deviceId: string, state: boolean): Error | null;
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setActuator(deviceId: string, state: boolean): Error | null;
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
 }

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

@@ -6,15 +6,16 @@ const models_1 = require("../../../models");
 const room_service_1 = require("../room-service");
 const log_service_1 = require("../log-service");
 const ac_1 = require("../ac");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class API {
     /**
-     * Gets the instance of an Ac Device identified by name
+     * Gets the instance of an Ac Device identified by id
      * @param {string} id
      * @returns {OwnDaikinDevice | undefined}
      */
     static getAc(id) {
         const result = this.getDevice(id);
-        if ((result === null || result === void 0 ? void 0 : result.deviceType) !== devices_1.DeviceType.Daikin) {
+        if (!result.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ac)) {
             return undefined;
         }
         return result;
@@ -48,7 +49,11 @@ class API {
     static setAc(id, desiredState) {
         const d = this.getAc(id);
         if (!d) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Daikin Device for name ${name} not found`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `AC Device for id ${id} not found`);
+            return false;
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ac)) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Device for id ${id} is not an ac`);
             return false;
         }
         if (desiredState) {
@@ -72,16 +77,53 @@ class API {
      * @param {boolean} state The desired new state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
-    static setLight(deviceId, state) {
+    static setLamp(deviceId, state) {
         const d = this.getDevice(deviceId);
         if (d === undefined) {
             return new Error(`Device with ID ${deviceId} not found`);
         }
-        if (typeof d.setLight !== 'function') {
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.lamp)) {
             return new Error(`Device with ID ${deviceId} is no Lamp`);
         }
         d.setLight(state, 60 * 60 * 1000, true);
         return null;
     }
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setActuator(deviceId, state) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.actuator)) {
+            return new Error(`Device with ID ${deviceId} is no actuator`);
+        }
+        d.setActuator(state, 60 * 60 * 1000, true);
+        return null;
+    }
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setDimmer(deviceId, state, timeout, brightness, transitionTime) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
+            return new Error(`Device with ID ${deviceId} is no dimmablelamp`);
+        }
+        d.setLight(state, timeout, true, brightness, transitionTime);
+        return null;
+    }
 }
 exports.API = API;

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

@@ -1,11 +1,11 @@
-import { OwnSonosDevice } from '../Sonos';
+import { ISpeaker } from '../../devices';
 export declare class MuellTonne {
     name: string;
-    ownSonosDevice?: OwnSonosDevice | undefined;
+    ownSpeaker?: ISpeaker | undefined;
     static oneDay: number;
     nextDate: Date | undefined;
     dates: Date[];
-    constructor(name: string, ownSonosDevice?: OwnSonosDevice | undefined);
+    constructor(name: string, ownSpeaker?: ISpeaker | undefined);
     sortDates(): void;
     removePassedDates(): void;
     check(): void;

package/lib/server/services/calendar/muell-tonne.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MuellTonne = void 0;
-const Sonos_1 = require("../Sonos");
 const log_service_1 = require("../log-service");
 const Telegram_1 = require("../Telegram");
 const models_1 = require("../../../models");
 class MuellTonne {
-    constructor(name, ownSonosDevice) {
+    constructor(name, ownSpeaker) {
         this.name = name;
-        this.ownSonosDevice = ownSonosDevice;
+        this.ownSpeaker = ownSpeaker;
         this.nextDate = undefined;
         this.dates = [];
     }
@@ -27,6 +26,7 @@ class MuellTonne {
         this.nextDate = this.dates[0];
     }
     check() {
+        var _a, _b, _c;
         this.removePassedDates();
         if (this.nextDate === undefined) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Die Mülltonne mit dem Namen ${this.name} hat keine nächste Abholung!`);
@@ -46,25 +46,19 @@ class MuellTonne {
         if (nextTimestamp >= tomorowMidnight) {
             const message = `Die Mülltonne mit dem Namen ${this.name} wird morgen abgeholt!`;
             Telegram_1.TelegramService.inform(message);
-            if (this.ownSonosDevice) {
-                Sonos_1.SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-            }
+            (_a = this.ownSpeaker) === null || _a === void 0 ? void 0 : _a.speakOnDevice(message, 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!`;
                 Telegram_1.TelegramService.inform(message);
-                if (this.ownSonosDevice) {
-                    Sonos_1.SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-                }
+                (_b = this.ownSpeaker) === null || _b === void 0 ? void 0 : _b.speakOnDevice(message, 30);
             }
             else {
                 const message = `Die Mülltonne mit dem Namen ${this.name} wird heute abgeholt!`;
                 Telegram_1.TelegramService.inform(message);
-                if (this.ownSonosDevice) {
-                    Sonos_1.SonosService.speakOnDevice(message, this.ownSonosDevice, 30);
-                }
+                (_c = this.ownSpeaker) === null || _c === void 0 ? void 0 : _c.speakOnDevice(message, 30);
             }
             return;
         }

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

@@ -1,7 +1,7 @@
 import { TimeCallback } from '../../../models';
 import { iMuellSettings } from '../../config';
-import { OwnSonosDevice } from '../Sonos';
 import { MuellTonne } from './muell-tonne';
+import { ISpeaker } from '../../devices';
 export declare class MuellService {
     static alleTonnen: Array<{
         name: string;
@@ -18,8 +18,8 @@ export declare class MuellService {
     private static lastCheck;
     private static _calendarURL;
     private static _active;
-    private static defaultSonosDevice;
-    static intialize(config: iMuellSettings, defaultSonosDevice: OwnSonosDevice | undefined): void;
+    private static defaultSpeaker;
+    static intialize(config: iMuellSettings, defaultSpeaker: ISpeaker | undefined): void;
     static updateCalendar(checkAfterwards?: boolean): void;
     static checkAll(pRetries?: number): void;
 }

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

@@ -8,8 +8,8 @@ const utils_1 = require("../utils");
 const muell_tonne_1 = require("./muell-tonne");
 const time_callback_service_1 = require("../time-callback-service");
 class MuellService {
-    static intialize(config, defaultSonosDevice) {
-        this.defaultSonosDevice = defaultSonosDevice;
+    static intialize(config, defaultSpeaker) {
+        this.defaultSpeaker = defaultSpeaker;
         this._active = true;
         this._calendarURL = config.calendarURL;
         this.updateTimeCallback = new models_1.TimeCallback('MuelltonnenServiceUpdater', models_1.TimeCallbackType.TimeOfDay, () => {
@@ -28,10 +28,10 @@ class MuellService {
             .fromURL(this._calendarURL)
             .then((data) => {
             this.loadingPending = false;
-            this.gelbeTonne = new muell_tonne_1.MuellTonne('Gelbe Tonne', this.defaultSonosDevice);
-            this.graueTonne = new muell_tonne_1.MuellTonne('Graue Tonne', this.defaultSonosDevice);
-            this.blaueTonne = new muell_tonne_1.MuellTonne('Blaue Tonne', this.defaultSonosDevice);
-            this.brauneTonne = new muell_tonne_1.MuellTonne('Braune Tonne', this.defaultSonosDevice);
+            this.gelbeTonne = new muell_tonne_1.MuellTonne('Gelbe Tonne', this.defaultSpeaker);
+            this.graueTonne = new muell_tonne_1.MuellTonne('Graue Tonne', this.defaultSpeaker);
+            this.blaueTonne = new muell_tonne_1.MuellTonne('Blaue Tonne', this.defaultSpeaker);
+            this.brauneTonne = new muell_tonne_1.MuellTonne('Braune Tonne', this.defaultSpeaker);
             this.alleTonnen = [];
             const todayMidnight = new Date().setHours(0, 0, 0, 0);
             for (const k in data) {
@@ -112,4 +112,4 @@ MuellService.loadingPending = true;
 MuellService.months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 MuellService.lastCheck = new Date(0);
 MuellService._active = false;
-MuellService.defaultSonosDevice = undefined;
+MuellService.defaultSpeaker = undefined;

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/room-service/room-service.d.ts

@@ -1,6 +1,6 @@
 import { ringStorage } from '../utils';
 import { iRoomBase, RoomBase } from '../../../models';
-import { IBaseDevice } from '../../devices';
+import { iBaseDevice } from '../../devices';
 export declare class RoomService {
     static Rooms: Map<string, RoomBase>;
     static awayModeActive: boolean;
@@ -25,12 +25,13 @@ export declare class RoomService {
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
      * @param status
+     * @param timeout
      */
     static setAllLampsOfFloor(floor: number, status?: boolean, timeout?: number): void;
     static clearAllAlarms(): void;
     static startAwayMode(): void;
     static startNightAlarmMode(): void;
-    static startIntrusionAlarm(room: iRoomBase, device: IBaseDevice): void;
+    static startIntrusionAlarm(room: iRoomBase, device: iBaseDevice): void;
     static endAlarmModes(): void;
     static getLastMovements(): string;
     private static stopIntrusionAlarm;

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

@@ -32,6 +32,7 @@ class RoomService {
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
      * @param status
+     * @param timeout
      */
     static setAllLampsOfFloor(floor, status = false, timeout) {
         var _a, _b, _c, _d;