hoffmation-base 1.0.39 → 1.0.43

package/lib/server/devices/zigbee/zigbeeAquaraVibra.js

@@ -5,6 +5,7 @@ const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapabilities_1 = require("../DeviceCapabilities");
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
@@ -23,6 +24,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         // TODO Set Sensitivity
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.vibrationSensor);
         this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
         services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;

package/lib/server/devices/zigbee/zigbeeBlitzShp.js

@@ -4,6 +4,7 @@ exports.ZigbeeBlitzShp = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapabilities_1 = require("../DeviceCapabilities");
 class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
@@ -16,6 +17,7 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
         this._availableForExcessEnergy = true;
         this.steckerOnSwitchID = '';
         this._activatedByExcessEnergy = false;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.excessEnergyConsumer);
         this.steckerOnSwitchID = `${this.info.fullID}.state`;
     }
     get currentConsumption() {

package/lib/server/devices/zigbee/zigbeeIlluDimmer.js

@@ -5,6 +5,7 @@ const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapabilities_1 = require("../DeviceCapabilities");
 class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
@@ -18,6 +19,7 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         this.transitionID = 'transition_time';
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.lamp);
         this.stateID = `${this.info.fullID}.state`;
         this.brightnessID = `${this.info.fullID}.brightness`;
         this.transitionID = `${this.info.fullID}.transition_time`;

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -5,9 +5,11 @@ const deviceType_1 = require("../deviceType");
 const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const DeviceCapabilities_1 = require("../DeviceCapabilities");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.lamp);
     }
     get lightOn() {
         return super.actuatorOn;

package/lib/server/devices/zigbee/zigbeeSonoffMotion.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
+import { ZigbeeMotionSensor } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeSonoffMotion extends ZigbeeMotionSensor {
     constructor(pInfo: IoBrokerDeviceInfo);

package/lib/server/devices/zigbee/zigbeeSonoffMotion.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeSonoffMotion = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
-const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
-class ZigbeeSonoffMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
+const BaseDevices_1 = require("./BaseDevices");
+class ZigbeeSonoffMotion extends BaseDevices_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffMotion);
         this._needsMovementResetFallback = false;

package/lib/server/devices/zigbee/zigbeeSonoffTemp.js

@@ -4,6 +4,7 @@ exports.ZigbeeSonoffTemp = void 0;
 const BaseDevices_1 = require("./BaseDevices");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const deviceType_1 = require("../deviceType");
+const DeviceCapabilities_1 = require("../DeviceCapabilities");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
@@ -11,6 +12,8 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         this._temperaturCallbacks = [];
         this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.temperatureSensor);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.humiditySensor);
     }
     get humidity() {
         return this._humidity;

package/lib/server/devices/zigbee/zigbeeUbisysShutter.d.ts

@@ -2,7 +2,7 @@
 import { ZigbeeShutter } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeUbisysShutter extends ZigbeeShutter {
-    private _positionStateId;
+    private readonly _positionStateId;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(pPosition: number): void;

package/lib/server/services/Sonos/OwnSonosDevices.d.ts

@@ -1,4 +1,4 @@
-import { OwnSonosDevice } from './sonos-service';
+import { OwnSonosDevice } from './own-sonos-device';
 export declare class OwnSonosDevices {
     static ownDevices: {
         [name: string]: OwnSonosDevice;

package/lib/server/services/Sonos/OwnSonosDevices.js

@@ -6,7 +6,7 @@ const models_1 = require("../../../models");
 class OwnSonosDevices {
     static addDevice(device) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.info.room}" addded`);
-        this.ownDevices[device.name] = device;
+        this.ownDevices[device.discoveryName] = device;
     }
 }
 exports.OwnSonosDevices = OwnSonosDevices;

package/lib/server/services/Sonos/index.d.ts

@@ -2,3 +2,4 @@ export * from './mp3-server';
 export * from './OwnSonosDevices';
 export * from './polly-service';
 export * from './sonos-service';
+export { OwnSonosDevice } from './own-sonos-device';

package/lib/server/services/Sonos/index.js

@@ -14,7 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnSonosDevice = void 0;
 __exportStar(require("./mp3-server"), exports);
 __exportStar(require("./OwnSonosDevices"), exports);
 __exportStar(require("./polly-service"), exports);
 __exportStar(require("./sonos-service"), exports);
+var own_sonos_device_1 = require("./own-sonos-device");
+Object.defineProperty(exports, "OwnSonosDevice", { enumerable: true, get: function () { return own_sonos_device_1.OwnSonosDevice; } });

package/lib/server/services/Sonos/own-sonos-device.d.ts

@@ -0,0 +1,26 @@
+import { DeviceInfo, DeviceType, ISpeaker } from '../../devices';
+import { LogLevel, RoomBase } from '../../../models';
+import { SonosDevice } from '@svrooij/sonos/lib';
+import { LogDebugType } from '../log-service';
+import { DeviceCapabilities } from '../../devices/DeviceCapabilities';
+export declare class OwnSonosDevice implements ISpeaker {
+    device: SonosDevice | undefined;
+    maxPlayOnAllVolume: number;
+    room: RoomBase | undefined;
+    readonly deviceType: DeviceType;
+    readonly discoveryName: string;
+    readonly deviceCapabilities: DeviceCapabilities[];
+    constructor(discoveryName: string, roomName: string, device: SonosDevice | undefined);
+    protected _info: DeviceInfo;
+    get info(): DeviceInfo;
+    set info(info: DeviceInfo);
+    get id(): string;
+    get name(): string;
+    playOnDevice(mp3Name: string, duration: number, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
+    playTestMessage(): void;
+    speakOnDevice(pMessage: string, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
+    stop(): void;
+    playUrl(url: string): void;
+    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
+    toJSON(): Partial<OwnSonosDevice>;
+}

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 DeviceCapabilities_1 = require("../../devices/DeviceCapabilities");
+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 = [DeviceCapabilities_1.DeviceCapabilities.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 { DeviceCapabilities } from '../../devices/DeviceCapabilities';
+export declare abstract class AcDevice implements iExcessEnergyConsumer, IBaseDevice, iAcDevice {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     acSettings: AcSettings;
     room: RoomBase | undefined;
+    deviceCapabilities: DeviceCapabilities[];
     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 DeviceCapabilities_1 = require("../../devices/DeviceCapabilities");
 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 = [DeviceCapabilities_1.DeviceCapabilities.ac];
         this._activatedByExcessEnergy = false;
         this._blockAutomaticTurnOnMS = -1;
         this._info = new devices_1.DeviceInfo();
@@ -111,7 +113,10 @@ class AcDevice {
         }
     }
     toJSON() {
-        return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room']));
+        // eslint-disable-next-line
+        const result = lodash_1.default.omit(this, ['room']);
+        result['on'] = this.on;
+        return utils_1.Utils.jsonFilter(result);
     }
 }
 exports.AcDevice = AcDevice;

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

@@ -4,11 +4,11 @@ import { LogObject } from '../log-service';
 import { AcDevice } from '../ac';
 export declare class API {
     /**
-     * Gets the instance of an Ac Device identified by name
-     * @param {string} name
+     * Gets the instance of an Ac Device identified by id
+     * @param {string} id
      * @returns {OwnDaikinDevice | undefined}
      */
-    static getAc(name: string): AcDevice | undefined;
+    static getAc(id: string): AcDevice | undefined;
     static getDevices(): {
         [id: string]: IBaseDevice;
     };
@@ -17,11 +17,11 @@ export declare class API {
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];
     /**
-     * Turns on/off one AC identified by it's name
-     * @param name The name of the device, if wrong false will be returned
+     * Turns on/off one AC identified by it's id
+     * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      */
-    static setAc(name: string, desiredState: boolean): boolean;
+    static setAc(id: string, desiredState: boolean): boolean;
     /**
      * Turns on/off all AC´s in the home
      * @param {boolean} desiredState

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

@@ -8,12 +8,16 @@ const log_service_1 = require("../log-service");
 const ac_1 = require("../ac");
 class API {
     /**
-     * Gets the instance of an Ac Device identified by name
-     * @param {string} name
+     * Gets the instance of an Ac Device identified by id
+     * @param {string} id
      * @returns {OwnDaikinDevice | undefined}
      */
-    static getAc(name) {
-        return ac_1.OwnAcDevices.ownDevices[name];
+    static getAc(id) {
+        const result = this.getDevice(id);
+        if ((result === null || result === void 0 ? void 0 : result.deviceType) !== devices_1.DeviceType.Daikin) {
+            return undefined;
+        }
+        return result;
     }
     static getDevices() {
         // console.log(Util.inspect(Devices.alLDevices, false, 5));
@@ -37,14 +41,14 @@ class API {
         return log_service_1.ServerLogService.getLog();
     }
     /**
-     * Turns on/off one AC identified by it's name
-     * @param name The name of the device, if wrong false will be returned
+     * Turns on/off one AC identified by it's id
+     * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      */
-    static setAc(name, desiredState) {
-        const d = this.getAc(name);
+    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, `Daikin Device for id ${id} not found`);
             return false;
         }
         if (desiredState) {

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;
         }