hoffmation-base 1.0.41 → 1.0.45

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { Devices, iConfig, ioBrokerMain, OwnSonosDevice } from './server';
+import { Devices, iConfig, ioBrokerMain, ISpeaker } from './server';
 export * from './models/index';
 export * from './server/index';
 export declare class HoffmationInitializationObject {
@@ -8,6 +8,6 @@ export declare class HoffmationInitializationObject {
 export declare class HoffmationBase {
     static ioMain: ioBrokerMain;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;
-    static initializePostIoBroker(defaultMuellSonos?: OwnSonosDevice): void;
+    static initializePostIoBroker(defaultMuellSonos?: ISpeaker): void;
     static startIoBroker(devices: Devices): void;
 }

package/lib/models/rooms/RoomBase.d.ts

@@ -1,5 +1,5 @@
 import { TimeCallback } from '../timeCallback';
-import { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SonosGroup, TasterGroup, WaterGroup } from '../../server';
+import { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SpeakerGroup, TasterGroup, WaterGroup } from '../../server';
 import { RoomSettings } from './RoomSettings';
 import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
@@ -19,7 +19,7 @@ export declare class RoomBase implements iRoomBase {
     get PraesenzGroup(): PraesenzGroup | undefined;
     get LampenGroup(): LampenGroup | undefined;
     get TasterGroup(): TasterGroup | undefined;
-    get SonosGroup(): SonosGroup | undefined;
+    get SonosGroup(): SpeakerGroup | undefined;
     get SmokeGroup(): SmokeGroup | undefined;
     get WaterGroup(): WaterGroup | undefined;
     get HeatGroup(): HeatGroup | undefined;

package/lib/server/devices/DeviceCapability.d.ts

@@ -0,0 +1,17 @@
+export declare enum DeviceCapability {
+    ac = 0,
+    actuator = 1,
+    buttonSwitch = 2,
+    energyManager = 3,
+    excessEnergyConsumer = 4,
+    heater = 5,
+    humiditySensor = 6,
+    illuminationSensor = 7,
+    lamp = 8,
+    dimmablelamp = 9,
+    motionSensor = 10,
+    shutter = 11,
+    temperatureSensor = 12,
+    vibrationSensor = 13,
+    speaker = 14
+}

package/lib/server/devices/DeviceCapability.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceCapability = void 0;
+var DeviceCapability;
+(function (DeviceCapability) {
+    DeviceCapability[DeviceCapability["ac"] = 0] = "ac";
+    DeviceCapability[DeviceCapability["actuator"] = 1] = "actuator";
+    DeviceCapability[DeviceCapability["buttonSwitch"] = 2] = "buttonSwitch";
+    DeviceCapability[DeviceCapability["energyManager"] = 3] = "energyManager";
+    DeviceCapability[DeviceCapability["excessEnergyConsumer"] = 4] = "excessEnergyConsumer";
+    DeviceCapability[DeviceCapability["heater"] = 5] = "heater";
+    DeviceCapability[DeviceCapability["humiditySensor"] = 6] = "humiditySensor";
+    DeviceCapability[DeviceCapability["illuminationSensor"] = 7] = "illuminationSensor";
+    DeviceCapability[DeviceCapability["lamp"] = 8] = "lamp";
+    DeviceCapability[DeviceCapability["dimmablelamp"] = 9] = "dimmablelamp";
+    DeviceCapability[DeviceCapability["motionSensor"] = 10] = "motionSensor";
+    DeviceCapability[DeviceCapability["shutter"] = 11] = "shutter";
+    DeviceCapability[DeviceCapability["temperatureSensor"] = 12] = "temperatureSensor";
+    DeviceCapability[DeviceCapability["vibrationSensor"] = 13] = "vibrationSensor";
+    DeviceCapability[DeviceCapability["speaker"] = 14] = "speaker";
+})(DeviceCapability = exports.DeviceCapability || (exports.DeviceCapability = {}));

package/lib/server/devices/IoBrokerBaseDevice.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="iobroker" />
-import { IBaseDevice } from './baseDeviceInterfaces';
+import { iBaseDevice } from './baseDeviceInterfaces';
 import { LogDebugType } from '../services';
 import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
 import { IOBrokerConnection } from '../ioBroker';
 import { DeviceType } from './deviceType';
 import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
-export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
+import { DeviceCapability } from './DeviceCapability';
+export declare abstract class IoBrokerBaseDevice implements iBaseDevice {
     protected _info: IoBrokerDeviceInfo;
     deviceType: DeviceType;
     static roomAddingSettings: {
@@ -13,6 +14,7 @@ export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
     };
     room: RoomBase | undefined;
     battery: number | undefined;
+    readonly deviceCapabilities: DeviceCapability[];
     protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;
     /**

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -9,6 +9,7 @@ class IoBrokerBaseDevice {
         this._info = _info;
         this.deviceType = deviceType;
         this.room = undefined;
+        this.deviceCapabilities = [];
         this.addToCorrectRoom();
     }
     get id() {

package/lib/server/devices/baseDeviceInterfaces/iAcDevice.d.ts

@@ -0,0 +1,14 @@
+import { AcSettings } from '../../../models/deviceSettings/acSettings';
+import { AcMode } from '../../services';
+export interface iAcDevice {
+    acSettings: AcSettings;
+    readonly on: boolean;
+    /**
+     * Disable automatic Turn-On for given amount of ms and turn off immediately.
+     * @param {number} timeout
+     */
+    deactivateAutomaticTurnOn(timeout: number): void;
+    setDesiredMode(mode: AcMode, writeToDevice: boolean): void;
+    turnOn(): void;
+    turnOff(): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iAcDevice.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/iActuator.d.ts

@@ -0,0 +1,15 @@
+import { ActuatorSettings } from '../../../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iActuator extends iBaseDevice {
+    settings: ActuatorSettings;
+    actuatorOn: boolean;
+    /**
+     * Controls the power state of this actuator
+     * @param {boolean} pValue the new desired State
+     * @param {number} timeout if positive the time in ms, after which state should reset
+     * @param {boolean} force if true, this command isn't overwritten by automatic actions
+     * Accessible in API
+     */
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleActuator(force: boolean): boolean;
+}

package/lib/server/devices/baseDeviceInterfaces/iActuator.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/iBaseDevice.d.ts

@@ -1,11 +1,13 @@
 import { LogLevel, RoomBase } from '../../../models';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
-export interface IBaseDevice {
+import { DeviceCapability } from '../DeviceCapability';
+export interface iBaseDevice {
     room: RoomBase | undefined;
     deviceType: DeviceType;
     info: DeviceInfo;
+    readonly deviceCapabilities: DeviceCapability[];
     readonly id: string;
     log(level: LogLevel, message: string): void;
-    toJSON(): Partial<IBaseDevice>;
+    toJSON(): Partial<iBaseDevice>;
 }

package/lib/server/devices/baseDeviceInterfaces/iButtonSwitch.d.ts

@@ -1,6 +1,6 @@
 import { Button } from '../button';
-import { IBaseDevice } from './iBaseDevice';
-export interface iButtonSwitch extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iButtonSwitch extends iBaseDevice {
     buttonTopLeft: Button | undefined;
     buttonTopRight: Button | undefined;
     buttonMidLeft: Button | undefined;

package/lib/server/devices/baseDeviceInterfaces/iDimmableLamp.d.ts

@@ -0,0 +1,16 @@
+import { iLamp } from './iLamp';
+import { DimmerSettings, TimeOfDay } from '../../../models';
+export interface iDimmableLamp extends iLamp {
+    settings: DimmerSettings;
+    toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
+    /**
+     * This function sets the light to a specific value
+     * @param pValue The desired value
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param force Wether it is a action based on a user action, to override certain rules
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * Accessible in API
+     */
+    setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iDimmableLamp.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/iEnergyManager.d.ts

@@ -1,5 +1,5 @@
 import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare class PhaseState {
     private readonly _meterValue;
     private readonly _production;
@@ -13,7 +13,7 @@ export declare class PhaseState {
     get injectingWattage(): number;
     get totalConsumptionWattage(): number;
 }
-export interface iEnergyManager extends IBaseDevice {
+export interface iEnergyManager extends iBaseDevice {
     baseConsumption: number;
     currentProduction: number;
     excessEnergy: number;

package/lib/server/devices/baseDeviceInterfaces/iHandleSensor.d.ts

@@ -0,0 +1,9 @@
+import { FensterPosition } from '../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iHandleSensor extends iBaseDevice {
+    position: FensterPosition;
+    minutesOpen: number;
+    addOffenCallback(pCallback: (pValue: boolean) => void): void;
+    addKippCallback(pCallback: (pValue: boolean) => void): void;
+    addClosedCallback(pCallback: (pValue: boolean) => void): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iHandleSensor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/iHeater.d.ts

@@ -1,6 +1,6 @@
 import { HeaterSettings, TemperatureSettings } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iHeater extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iHeater extends iBaseDevice {
     settings: HeaterSettings;
     readonly desiredTemperature: number;
     readonly humidity: number;

package/lib/server/devices/baseDeviceInterfaces/iHumiditySensor.d.ts

@@ -1,6 +1,6 @@
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;
-export interface iHumiditySensor extends IBaseDevice {
+export interface iHumiditySensor extends iBaseDevice {
     humidity: number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;
 }

package/lib/server/devices/baseDeviceInterfaces/iLamp.d.ts

@@ -1,9 +1,8 @@
-import { ActuatorSettings, RoomBase, TimeOfDay } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iLamp extends IBaseDevice {
+import { ActuatorSettings, TimeOfDay } from '../../../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iLamp extends iBaseDevice {
     settings: ActuatorSettings;
     lightOn: boolean;
-    room: RoomBase | undefined;
     setTimeBased(time: TimeOfDay, timeout: number, force: boolean): void;
     toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
     /**
@@ -11,6 +10,7 @@ export interface iLamp extends IBaseDevice {
      * @param pValue The desired value
      * @param timeout A chosen Timeout after which the light should be reset
      * @param force Wether it is a action based on a user action, to override certain rules
+     * Accessible in API
      */
     setLight(pValue: boolean, timeout: number, force: boolean): void;
 }

package/lib/server/devices/baseDeviceInterfaces/iMotionSensor.d.ts

@@ -1,6 +1,6 @@
 import { MotionSensorSettings } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iMotionSensor extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iMotionSensor extends iBaseDevice {
     settings: MotionSensorSettings;
     movementDetected: boolean;
     readonly timeSinceLastMotion: number;

package/lib/server/devices/baseDeviceInterfaces/iShutter.d.ts

@@ -1,6 +1,6 @@
 import { Fenster } from '../groups';
-import { IBaseDevice } from './iBaseDevice';
-export interface iShutter extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iShutter extends iBaseDevice {
     currentLevel: number;
     desiredFensterLevel: number;
     fenster: Fenster | undefined;

package/lib/server/devices/baseDeviceInterfaces/iSpeaker.d.ts

@@ -0,0 +1,8 @@
+import { iBaseDevice } from './iBaseDevice';
+export interface ISpeaker extends iBaseDevice {
+    playOnDevice(mp3Name: string, duration: number, volume?: number, onlyWhenPlaying?: boolean, resolveAfterRevert?: boolean): void;
+    playTestMessage(): void;
+    playUrl(url: string): void;
+    stop(): void;
+    speakOnDevice(pMessage: string, volume?: number, onlyWhenPlaying?: boolean, resolveAfterRevert?: boolean): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iSpeaker.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/devices/baseDeviceInterfaces/iTemperatureSensor.d.ts

@@ -1,6 +1,6 @@
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare const UNDEFINED_TEMP_VALUE = -99;
-export interface iTemperatureSensor extends IBaseDevice {
+export interface iTemperatureSensor extends iBaseDevice {
     iTemperature: number;
     sTemperature: string;
     addTempChangeCallback(pCallback: (pValue: number) => void): void;

package/lib/server/devices/baseDeviceInterfaces/iVibrationSensor.d.ts

@@ -1,5 +1,5 @@
-import { IBaseDevice } from './iBaseDevice';
-export interface iVibrationSensor extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iVibrationSensor extends iBaseDevice {
     vibrationBlockedByGriff: boolean;
     vibrationBlockedByGriffTimeStamp: number;
     vibrationBlockedByMotion: boolean;

package/lib/server/devices/baseDeviceInterfaces/index.d.ts

@@ -1,12 +1,16 @@
+export * from './iAcDevice';
+export * from './iActuator';
 export * from './iBaseDevice';
 export * from './iButtonSwitch';
 export * from './iEnergyManager';
 export * from './iExcessEnergyConsumer';
+export * from './iHandleSensor';
 export * from './iHeater';
 export * from './iHumiditySensor';
 export * from './iIlluminationSensor';
 export * from './iLamp';
 export * from './iMotionSensor';
 export * from './iShutter';
+export * from './iSpeaker';
 export * from './iTemperatureSensor';
 export * from './iVibrationSensor';

package/lib/server/devices/baseDeviceInterfaces/index.js

@@ -14,15 +14,19 @@ 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 });
+__exportStar(require("./iAcDevice"), exports);
+__exportStar(require("./iActuator"), exports);
 __exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iEnergyManager"), exports);
 __exportStar(require("./iExcessEnergyConsumer"), exports);
+__exportStar(require("./iHandleSensor"), exports);
 __exportStar(require("./iHeater"), exports);
 __exportStar(require("./iHumiditySensor"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./iLamp"), exports);
 __exportStar(require("./iMotionSensor"), exports);
 __exportStar(require("./iShutter"), exports);
+__exportStar(require("./iSpeaker"), exports);
 __exportStar(require("./iTemperatureSensor"), exports);
 __exportStar(require("./iVibrationSensor"), exports);

package/lib/server/devices/device-cluster.d.ts

@@ -1,15 +1,14 @@
 import { DeviceClusterType } from './device-cluster-type';
 import { DeviceList } from './device-list';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { AcDevice, OwnSonosDevice } from '../services';
-import { IBaseDevice } from './baseDeviceInterfaces';
+import { iBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceCluster {
     deviceMap: Map<DeviceClusterType, DeviceList>;
     constructor(deviceMap?: Map<DeviceClusterType, DeviceList>);
     getIoBrokerDevicesByType(type: DeviceClusterType): IoBrokerBaseDevice[];
-    getDevicesByType(type: DeviceClusterType): Array<IBaseDevice | OwnSonosDevice | AcDevice>;
-    addByDeviceType(device: IBaseDevice): void;
-    addToList(type: DeviceClusterType, device: IBaseDevice): void;
+    getDevicesByType(type: DeviceClusterType): Array<iBaseDevice>;
+    addByDeviceType(device: iBaseDevice): void;
+    addToList(type: DeviceClusterType, device: iBaseDevice): void;
     toJSON(): Partial<DeviceCluster & {
         deviceDict?: {
             [p: string]: DeviceList;

package/lib/server/devices/device-cluster.js

@@ -23,6 +23,12 @@ class DeviceCluster {
         const type = device.deviceType;
         const clusterTypes = [device_cluster_type_1.DeviceClusterType.all];
         switch (type) {
+            case deviceType_1.DeviceType.Daikin:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Ac);
+                break;
+            case deviceType_1.DeviceType.Sonos:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Speaker);
+                break;
             case deviceType_1.DeviceType.HmIpLampe:
             case deviceType_1.DeviceType.ZigbeeIlluDimmer:
             case deviceType_1.DeviceType.ZigbeeIlluLampe:

package/lib/server/devices/device-list.d.ts

@@ -1,9 +1,7 @@
-import { AcDevice, OwnSonosDevice } from '../services';
-import { IBaseDevice } from './baseDeviceInterfaces';
+import { iBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceList {
     private _ids;
-    private readonly _isSonos;
-    constructor(_ids?: string[], _isSonos?: boolean);
+    constructor(_ids?: string[]);
     get ids(): string[];
-    getDevices(): Array<IBaseDevice | OwnSonosDevice | AcDevice>;
+    getDevices(): Array<iBaseDevice>;
 }

package/lib/server/devices/device-list.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceList = void 0;
 const services_1 = require("../services");
 class DeviceList {
-    constructor(_ids = [], _isSonos = false) {
+    constructor(_ids = []) {
         this._ids = _ids;
-        this._isSonos = _isSonos;
         // Empty
     }
     get ids() {
@@ -14,17 +13,9 @@ class DeviceList {
     getDevices() {
         const result = [];
         for (const dID of this._ids) {
-            if (this._isSonos) {
-                const s = services_1.OwnSonosDevices.ownDevices[dID];
-                if (s !== undefined) {
-                    result.push(services_1.OwnSonosDevices.ownDevices[dID]);
-                }
-            }
-            else {
-                const d = services_1.API.getDevice(dID);
-                if (d !== undefined) {
-                    result.push(d);
-                }
+            const d = services_1.API.getDevice(dID);
+            if (d !== undefined) {
+                result.push(d);
             }
         }
         return result;

package/lib/server/devices/deviceUpdater.js

@@ -17,6 +17,7 @@ class DeviceUpdater {
         }
     }
     updateState(id, state, initial = false) {
+        var _a;
         if (state === null) {
             // Ignore null states
             return;
@@ -32,7 +33,7 @@ class DeviceUpdater {
             device.update(idSplit, state, initial, false);
         }
         catch (e) {
-            services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${(_a = e === null || e === void 0 ? void 0 : e.stack) !== null && _a !== void 0 ? _a : ''}`);
         }
     }
 }

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

@@ -1,12 +1,12 @@
 import { deviceConfig, iRoomImportEnforcer } from '../../models';
-import { IBaseDevice, iEnergyManager } from './baseDeviceInterfaces';
+import { iBaseDevice, iEnergyManager } from './baseDeviceInterfaces';
 export declare class Devices {
     static IDENTIFIER_HOMEMATIC: string;
     static IDENTIFIER_JS: string;
     static IDENTIFIER_ZIGBEE: string;
     static IDENTIFIER_WLED: string;
     static alLDevices: {
-        [id: string]: IBaseDevice;
+        [id: string]: iBaseDevice;
     };
     static energymanager?: iEnergyManager;
     constructor(pDeviceData: {

package/lib/server/devices/groups/heatGroup.js

@@ -14,7 +14,7 @@ class HeatGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds, false));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds));
     }
     /**
      * The current measured temperature of the room in Celsius

package/lib/server/devices/groups/index.d.ts

@@ -6,6 +6,6 @@ export * from './heatGroup';
 export * from './lampenGroup';
 export * from './praesenzGroup';
 export * from './smokeGroup';
-export * from './sonosGroup';
+export * from './speakerGroup';
 export * from './tasterGroup';
 export * from './waterGroup';

package/lib/server/devices/groups/index.js

@@ -22,6 +22,6 @@ __exportStar(require("./heatGroup"), exports);
 __exportStar(require("./lampenGroup"), exports);
 __exportStar(require("./praesenzGroup"), exports);
 __exportStar(require("./smokeGroup"), exports);
-__exportStar(require("./sonosGroup"), exports);
+__exportStar(require("./speakerGroup"), exports);
 __exportStar(require("./tasterGroup"), exports);
 __exportStar(require("./waterGroup"), exports);

package/lib/server/devices/groups/lampenGroup.d.ts

@@ -1,6 +1,6 @@
-import { ZigbeeIkeaSteckdose, ZigbeeIlluLedRGBCCT } from '../zigbee';
+import { ZigbeeIlluLedRGBCCT } from '../zigbee';
 import { BaseGroup } from './base-group';
-import { iLamp } from '../baseDeviceInterfaces';
+import { iActuator, iLamp } from '../baseDeviceInterfaces';
 import { TimeOfDay } from '../../../models';
 import { WledDevice } from '../wledDevice';
 export declare class LampenGroup extends BaseGroup {
@@ -9,7 +9,7 @@ export declare class LampenGroup extends BaseGroup {
     getLampen(): iLamp[];
     getLED(): ZigbeeIlluLedRGBCCT[];
     getWled(): WledDevice[];
-    getStecker(): ZigbeeIkeaSteckdose[];
+    getStecker(): iActuator[];
     handleSunriseOff(): void;
     switchAll(target: boolean, force?: boolean): void;
     switchTimeConditional(time: TimeOfDay): void;

package/lib/server/devices/groups/lampenGroup.js

@@ -28,7 +28,7 @@ class LampenGroup extends base_group_1.BaseGroup {
             }
         }
         for (i = 0; i < this.getStecker().length; i++) {
-            if (this.getStecker()[i].steckerOn) {
+            if (this.getStecker()[i].actuatorOn) {
                 return true;
             }
         }
@@ -49,7 +49,7 @@ class LampenGroup extends base_group_1.BaseGroup {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.WLED);
     }
     getStecker() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
     }
     handleSunriseOff() {
         if (!this.anyLightsOn()) {
@@ -120,7 +120,7 @@ class LampenGroup extends base_group_1.BaseGroup {
                 (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
                 (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
                 const timeout = pValue && force ? 30 * 60 * 1000 : -1;
-                s.setStecker(pValue, timeout, force);
+                s.setActuator(pValue, timeout, force);
             }
         });
     }

package/lib/server/devices/groups/{sonosGroup.d.ts → speakerGroup.d.ts}

@@ -1,9 +1,9 @@
-import { OwnSonosDevice } from '../../services';
 import { BaseGroup } from './base-group';
-export declare class SonosGroup extends BaseGroup {
+import { ISpeaker } from '../baseDeviceInterfaces';
+export declare class SpeakerGroup extends BaseGroup {
     private _playing;
     constructor(roomName: string, speakerIds: string[]);
-    getOwnSonosDevices(): OwnSonosDevice[];
+    getOwnSonosDevices(): ISpeaker[];
     playRadio(radioUrl: string): void;
     turnOff(): void;
     trigger(track: string): void;

package/lib/server/devices/groups/{sonosGroup.js → speakerGroup.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SonosGroup = void 0;
+exports.SpeakerGroup = void 0;
 const services_1 = require("../../services");
 const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
-class SonosGroup extends base_group_1.BaseGroup {
+class SpeakerGroup extends base_group_1.BaseGroup {
     constructor(roomName, speakerIds) {
         super(roomName, group_type_1.GroupType.Speaker);
         this._playing = false;
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds, true));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds));
     }
     getOwnSonosDevices() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Speaker);
@@ -18,16 +18,14 @@ class SonosGroup extends base_group_1.BaseGroup {
     playRadio(radioUrl) {
         this.getOwnSonosDevices().forEach((s) => {
             services_1.Utils.guardedTimeout(() => {
-                var _a;
-                (_a = s.device) === null || _a === void 0 ? void 0 : _a.SetAVTransportURI(radioUrl);
+                s.playUrl(radioUrl);
             }, 1500);
         });
         this._playing = true;
     }
     turnOff() {
         this.getOwnSonosDevices().forEach((s) => {
-            var _a;
-            (_a = s.device) === null || _a === void 0 ? void 0 : _a.Stop();
+            s.stop();
         });
         this._playing = false;
     }
@@ -39,4 +37,4 @@ class SonosGroup extends base_group_1.BaseGroup {
         this.playRadio(track);
     }
 }
-exports.SonosGroup = SonosGroup;
+exports.SpeakerGroup = SpeakerGroup;

package/lib/server/devices/hmIPDevices/hmIpBewegung.js

@@ -5,6 +5,7 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -16,6 +17,8 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         this._lastMotionTime = 0;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
             this.log(models_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);