hoffmation-base 1.0.36 → 1.0.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/lib/server/devices/DeviceInfo.d.ts +1 -17
  2. package/lib/server/devices/DeviceInfo.js +4 -59
  3. package/lib/server/devices/IoBrokerBaseDevice.d.ts +7 -7
  4. package/lib/server/devices/IoBrokerBaseDevice.js +2 -2
  5. package/lib/server/devices/IoBrokerDeviceInfo.d.ts +20 -0
  6. package/lib/server/devices/IoBrokerDeviceInfo.js +70 -0
  7. package/lib/server/devices/baseDeviceInterfaces/iBaseDevice.d.ts +0 -1
  8. package/lib/server/devices/device-list.d.ts +1 -2
  9. package/lib/server/devices/device-list.js +1 -8
  10. package/lib/server/devices/deviceType.d.ts +2 -1
  11. package/lib/server/devices/deviceType.js +1 -0
  12. package/lib/server/devices/devices.js +9 -9
  13. package/lib/server/devices/groups/heatGroup.js +1 -1
  14. package/lib/server/devices/groups/sonosGroup.js +1 -1
  15. package/lib/server/devices/hmIPDevices/hmIpAccessPoint.d.ts +2 -2
  16. package/lib/server/devices/hmIPDevices/hmIpBewegung.d.ts +2 -2
  17. package/lib/server/devices/hmIPDevices/hmIpDevice.d.ts +2 -2
  18. package/lib/server/devices/hmIPDevices/hmIpGriff.d.ts +2 -2
  19. package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.d.ts +2 -2
  20. package/lib/server/devices/hmIPDevices/hmIpHeizung.d.ts +2 -2
  21. package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts +2 -2
  22. package/lib/server/devices/hmIPDevices/hmIpPraezenz.d.ts +2 -2
  23. package/lib/server/devices/hmIPDevices/hmIpRoll.d.ts +2 -2
  24. package/lib/server/devices/hmIPDevices/hmIpTaster.d.ts +2 -2
  25. package/lib/server/devices/hmIPDevices/hmIpTherm.d.ts +2 -2
  26. package/lib/server/devices/hmIPDevices/hmIpTuer.d.ts +2 -2
  27. package/lib/server/devices/hmIPDevices/hmIpWippe.d.ts +2 -2
  28. package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts +2 -2
  29. package/lib/server/devices/wledDevice.d.ts +2 -2
  30. package/lib/server/devices/zigbee/BaseDevices/ZigbeeActuator.d.ts +2 -2
  31. package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.d.ts +2 -2
  32. package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.d.ts +2 -2
  33. package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts +2 -2
  34. package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.d.ts +2 -2
  35. package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.d.ts +2 -2
  36. package/lib/server/devices/zigbee/zigbeeAqaraMagnetContact.d.ts +2 -2
  37. package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.d.ts +2 -2
  38. package/lib/server/devices/zigbee/zigbeeAquaraMotion.d.ts +2 -2
  39. package/lib/server/devices/zigbee/zigbeeAquaraVibra.d.ts +2 -2
  40. package/lib/server/devices/zigbee/zigbeeAquaraWater.d.ts +2 -2
  41. package/lib/server/devices/zigbee/zigbeeBlitzShp.d.ts +2 -2
  42. package/lib/server/devices/zigbee/zigbeeEuroHeater.d.ts +2 -2
  43. package/lib/server/devices/zigbee/zigbeeHeimanSmoke.d.ts +2 -2
  44. package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.d.ts +2 -2
  45. package/lib/server/devices/zigbee/zigbeeIlluActuator.d.ts +2 -2
  46. package/lib/server/devices/zigbee/zigbeeIlluDimmer.d.ts +2 -2
  47. package/lib/server/devices/zigbee/zigbeeIlluLampe.d.ts +2 -2
  48. package/lib/server/devices/zigbee/zigbeeIlluLedRGBCCT.d.ts +2 -2
  49. package/lib/server/devices/zigbee/zigbeeIlluShutter.d.ts +2 -2
  50. package/lib/server/devices/zigbee/zigbeeMotionSensor.d.ts +2 -2
  51. package/lib/server/devices/zigbee/zigbeeSMaBiTMagnetContact.d.ts +2 -2
  52. package/lib/server/devices/zigbee/zigbeeSonoffMotion.d.ts +2 -2
  53. package/lib/server/devices/zigbee/zigbeeSonoffTemp.d.ts +2 -2
  54. package/lib/server/devices/zigbee/zigbeeTuyaValve.d.ts +2 -2
  55. package/lib/server/devices/zigbee/zigbeeUbisysShutter.d.ts +2 -2
  56. package/lib/server/services/Sonos/OwnSonosDevices.js +1 -1
  57. package/lib/server/services/Sonos/sonos-service.d.ts +13 -3
  58. package/lib/server/services/Sonos/sonos-service.js +39 -4
  59. package/lib/server/services/ac/ac-device.d.ts +10 -5
  60. package/lib/server/services/ac/ac-device.js +26 -2
  61. package/lib/server/services/ac/own-ac-devices.js +3 -1
  62. package/lib/server/services/ac/own-daikin-device.d.ts +2 -0
  63. package/lib/server/services/ac/own-daikin-device.js +2 -0
  64. package/lib/tsconfig.tsbuildinfo +1 -1
  65. package/package.json +1 -1
@@ -1,8 +1,8 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ActuatorSettings } from '../../../../models';
3
- import { DeviceInfo } from '../../DeviceInfo';
4
3
  import { ZigbeeDevice } from './zigbeeDevice';
5
4
  import { DeviceType } from '../../deviceType';
5
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
6
6
  export declare class ZigbeeActuator extends ZigbeeDevice {
7
7
  settings: ActuatorSettings;
8
8
  protected readonly actuatorOnSwitchID: string;
@@ -10,7 +10,7 @@ export declare class ZigbeeActuator extends ZigbeeDevice {
10
10
  protected actuatorOn: boolean;
11
11
  private _turnOffTimeout;
12
12
  private turnOffTime;
13
- constructor(pInfo: DeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
13
+ constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
14
14
  update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
15
15
  setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
16
16
  toggleActuator(force?: boolean): boolean;
@@ -1,11 +1,11 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { DeviceType } from '../../deviceType';
3
3
  import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
4
- import { DeviceInfo } from '../../DeviceInfo';
4
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeDevice extends IoBrokerBaseDevice {
6
6
  available: boolean;
7
7
  linkQuality: number;
8
8
  voltage: string;
9
- constructor(pInfo: DeviceInfo, pType: DeviceType);
9
+ constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
10
10
  update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
11
11
  }
@@ -2,8 +2,8 @@
2
2
  import { ZigbeeDevice } from './zigbeeDevice';
3
3
  import { iHeater } from '../../baseDeviceInterfaces';
4
4
  import { HeaterSettings, TemperatureSettings } from '../../../../models';
5
- import { DeviceInfo } from '../../DeviceInfo';
6
5
  import { DeviceType } from '../../deviceType';
6
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
7
7
  export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
8
8
  settings: HeaterSettings;
9
9
  protected _automaticPoints: {
@@ -15,7 +15,7 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
15
15
  protected _setPointTemperaturID: string;
16
16
  protected _temperatur: number;
17
17
  protected _desiredTemperatur: number;
18
- constructor(pInfo: DeviceInfo, pType: DeviceType);
18
+ constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
19
19
  protected _seasonTurnOff: boolean;
20
20
  get seasonTurnOff(): boolean;
21
21
  set seasonTurnOff(value: boolean);
@@ -1,8 +1,8 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { DeviceType } from '../../deviceType';
3
- import { DeviceInfo } from '../../DeviceInfo';
4
3
  import { ZigbeeDevice } from './zigbeeDevice';
5
4
  import { MagnetPosition } from '../../models';
5
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
6
6
  export declare class ZigbeeMagnetContact extends ZigbeeDevice {
7
7
  position: MagnetPosition;
8
8
  telegramOnOpen: boolean;
@@ -11,7 +11,7 @@ export declare class ZigbeeMagnetContact extends ZigbeeDevice {
11
11
  private _openCallback;
12
12
  private _iOpenTimeout;
13
13
  private minutesOpen;
14
- constructor(pInfo: DeviceInfo, deviceType: DeviceType);
14
+ constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
15
15
  addOpenCallback(pCallback: (pValue: boolean) => void): void;
16
16
  addClosedCallback(pCallback: (pValue: boolean) => void): void;
17
17
  update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
@@ -1,12 +1,12 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="iobroker" />
3
3
  import { DeviceType } from '../../deviceType';
4
- import { DeviceInfo } from '../../DeviceInfo';
5
4
  import { ShutterCalibration, ShutterSettings } from '../../../../models';
6
5
  import { ZigbeeDevice } from './zigbeeDevice';
7
6
  import { iShutter } from '../../baseDeviceInterfaces';
8
7
  import { Fenster } from '../../groups';
9
8
  import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
9
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
10
10
  export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
11
11
  settings: ShutterSettings;
12
12
  protected _iMovementFinishTimeout: NodeJS.Timeout | null;
@@ -14,7 +14,7 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
14
14
  protected _setLevel: number;
15
15
  protected _setLevelTime: number;
16
16
  protected _shutterCalibrationData: ShutterCalibration;
17
- constructor(pInfo: DeviceInfo, pType: DeviceType);
17
+ constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
18
18
  protected _currentLevel: number;
19
19
  get currentLevel(): number;
20
20
  set currentLevel(value: number);
@@ -1,9 +1,9 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { iButtonSwitch } from '../../baseDeviceInterfaces';
3
3
  import { ZigbeeDevice } from './zigbeeDevice';
4
- import { DeviceInfo } from '../../DeviceInfo';
5
4
  import { DeviceType } from '../../deviceType';
6
5
  import { Button } from '../../button';
6
+ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
7
7
  export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButtonSwitch {
8
8
  abstract buttonBot: Button | undefined;
9
9
  abstract buttonBotLeft: Button | undefined;
@@ -13,7 +13,7 @@ export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButt
13
13
  abstract buttonTop: Button | undefined;
14
14
  abstract buttonTopLeft: Button | undefined;
15
15
  abstract buttonTopRight: Button | undefined;
16
- constructor(pInfo: DeviceInfo, deviceType: DeviceType);
16
+ constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
17
17
  update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
18
18
  abstract getButtonAssignment(): string;
19
19
  }
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeMagnetContact } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeAqaraMagnetContact extends ZigbeeMagnetContact {
5
- constructor(pInfo: DeviceInfo);
5
+ constructor(pInfo: IoBrokerDeviceInfo);
6
6
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
7
7
  }
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeSwitch } from './BaseDevices';
3
3
  import { Button } from '../button';
4
- import { DeviceInfo } from '../DeviceInfo';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeAqaraOpple3Switch extends ZigbeeSwitch {
6
6
  private static readonly BUTTON_CAPABILLITIES;
7
7
  buttonTopLeft: Button;
@@ -12,7 +12,7 @@ export declare class ZigbeeAqaraOpple3Switch extends ZigbeeSwitch {
12
12
  buttonBotRight: Button;
13
13
  buttonBot: undefined;
14
14
  buttonTop: undefined;
15
- constructor(pInfo: DeviceInfo);
15
+ constructor(pInfo: IoBrokerDeviceInfo);
16
16
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
17
17
  getButtonAssignment(): string;
18
18
  private updateButton;
@@ -1,11 +1,11 @@
1
1
  /// <reference types="iobroker" />
2
- import { DeviceInfo } from '../DeviceInfo';
3
2
  import { iIlluminationSensor } from '../baseDeviceInterfaces';
4
3
  import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iIlluminationSensor {
6
6
  private _illuminance;
7
7
  private occupancyTimeoutID;
8
- constructor(pInfo: DeviceInfo);
8
+ constructor(pInfo: IoBrokerDeviceInfo);
9
9
  private _motionTimeout;
10
10
  get motionTimeout(): number;
11
11
  set motionTimeout(value: number);
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
- import { DeviceInfo } from '../DeviceInfo';
3
2
  import { iVibrationSensor } from '../baseDeviceInterfaces';
4
3
  import { ZigbeeDevice } from './BaseDevices';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor {
6
6
  sensitivity: string;
7
7
  tiltAngle: number;
@@ -16,7 +16,7 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
16
16
  vibrationBlockedByMotionTimeStamp: number;
17
17
  private _idSensitivity;
18
18
  private _alarmMessage;
19
- constructor(pInfo: DeviceInfo);
19
+ constructor(pInfo: IoBrokerDeviceInfo);
20
20
  private _vibrationBlockedByGriff;
21
21
  get vibrationBlockedByGriff(): boolean;
22
22
  set vibrationBlockedByGriff(pVal: boolean);
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="iobroker" />
3
- import { DeviceInfo } from '../DeviceInfo';
4
3
  import { ZigbeeDevice } from './BaseDevices';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeAquaraWater extends ZigbeeDevice {
6
6
  water: boolean;
7
7
  iAlarmTimeout: NodeJS.Timeout | undefined;
@@ -9,7 +9,7 @@ export declare class ZigbeeAquaraWater extends ZigbeeDevice {
9
9
  private _messageAlarm;
10
10
  private _messageAlarmEnd;
11
11
  private _supressAlarmTimeStamp;
12
- constructor(pInfo: DeviceInfo);
12
+ constructor(pInfo: IoBrokerDeviceInfo);
13
13
  private _roomName;
14
14
  set roomName(val: string);
15
15
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
@@ -1,8 +1,8 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ActuatorSettings, ExcessEnergyConsumerSettings } from '../../../models';
3
- import { DeviceInfo } from '../DeviceInfo';
4
3
  import { ZigbeeDevice } from './BaseDevices';
5
4
  import { iExcessEnergyConsumer } from '../baseDeviceInterfaces';
5
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
6
6
  export declare class ZigbeeBlitzShp extends ZigbeeDevice implements iExcessEnergyConsumer {
7
7
  steckerOn: boolean;
8
8
  current: number;
@@ -13,7 +13,7 @@ export declare class ZigbeeBlitzShp extends ZigbeeDevice implements iExcessEnerg
13
13
  private readonly _availableForExcessEnergy;
14
14
  private readonly steckerOnSwitchID;
15
15
  private _activatedByExcessEnergy;
16
- constructor(pInfo: DeviceInfo);
16
+ constructor(pInfo: IoBrokerDeviceInfo);
17
17
  get currentConsumption(): number;
18
18
  get on(): boolean;
19
19
  isAvailableForExcessEnergy(): boolean;
@@ -1,6 +1,6 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeHeater } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeEuroHeater extends ZigbeeHeater {
5
5
  private _setLocalTempCalibrationId;
6
6
  private _targetTempVal;
@@ -9,7 +9,7 @@ export declare class ZigbeeEuroHeater extends ZigbeeHeater {
9
9
  private _setModeId;
10
10
  private _valvePosId;
11
11
  private _mode;
12
- constructor(pInfo: DeviceInfo);
12
+ constructor(pInfo: IoBrokerDeviceInfo);
13
13
  set seasonTurnOff(value: boolean);
14
14
  set roomTemperatur(value: number);
15
15
  set desiredTemperature(val: number);
@@ -1,14 +1,14 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="iobroker" />
3
- import { DeviceInfo } from '../DeviceInfo';
4
3
  import { ZigbeeDevice } from './BaseDevices';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeHeimanSmoke extends ZigbeeDevice {
6
6
  smoke: boolean;
7
7
  iAlarmTimeout: NodeJS.Timeout | undefined;
8
8
  private _messageAlarmFirst;
9
9
  private _messageAlarm;
10
10
  private _messageAlarmEnd;
11
- constructor(pInfo: DeviceInfo);
11
+ constructor(pInfo: IoBrokerDeviceInfo);
12
12
  private _roomName;
13
13
  set roomName(val: string);
14
14
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
@@ -1,8 +1,8 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeActuator } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeIkeaSteckdose extends ZigbeeActuator {
5
- constructor(pInfo: DeviceInfo);
5
+ constructor(pInfo: IoBrokerDeviceInfo);
6
6
  get steckerOn(): boolean;
7
7
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
8
8
  setStecker(pValue: boolean, timeout?: number, force?: boolean): void;
@@ -1,9 +1,9 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeActuator } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
4
3
  import { DeviceType } from '../deviceType';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeIlluActuator extends ZigbeeActuator {
6
- constructor(pInfo: DeviceInfo, deviceType?: DeviceType);
6
+ constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
7
7
  get isActuatorOn(): boolean;
8
8
  update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
9
9
  setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
@@ -1,8 +1,8 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { DimmerSettings, TimeOfDay } from '../../../models';
3
- import { DeviceInfo } from '../DeviceInfo';
4
3
  import { iLamp } from '../baseDeviceInterfaces';
5
4
  import { ZigbeeDevice } from './BaseDevices';
5
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
6
6
  export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
7
7
  lightOn: boolean;
8
8
  queuedValue: boolean | null;
@@ -14,7 +14,7 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
14
14
  private transitionID;
15
15
  private _turnOffTimeout;
16
16
  private turnOffTime;
17
- constructor(pInfo: DeviceInfo);
17
+ constructor(pInfo: IoBrokerDeviceInfo);
18
18
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
19
19
  setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
20
20
  /**
@@ -1,10 +1,10 @@
1
1
  /// <reference types="iobroker" />
2
- import { DeviceInfo } from '../DeviceInfo';
3
2
  import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
4
3
  import { TimeOfDay } from '../../../models';
5
4
  import { iLamp } from '../baseDeviceInterfaces';
5
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
6
6
  export declare class ZigbeeIlluLampe extends ZigbeeIlluActuator implements iLamp {
7
- constructor(pInfo: DeviceInfo);
7
+ constructor(pInfo: IoBrokerDeviceInfo);
8
8
  get lightOn(): boolean;
9
9
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
10
10
  /** @inheritdoc */
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
- import { DeviceInfo } from '../DeviceInfo';
3
2
  import { LedSettings, TimeOfDay } from '../../../models';
4
3
  import { ZigbeeDevice } from './BaseDevices';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
6
6
  static DEFAULT_COLOR_WARM: string;
7
7
  on: boolean;
@@ -13,7 +13,7 @@ export declare class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
13
13
  private brightnessID;
14
14
  private colorID;
15
15
  private colorTempID;
16
- constructor(pInfo: DeviceInfo);
16
+ constructor(pInfo: IoBrokerDeviceInfo);
17
17
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
18
18
  setTimeBased(time: TimeOfDay): void;
19
19
  setLight(pValue: boolean, brightness?: number, color?: string, colortemp?: number): void;
@@ -1,13 +1,13 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeShutter } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeIlluShutter extends ZigbeeShutter {
5
5
  private _movementStateId;
6
6
  private _movementState;
7
7
  private _movementStartMs;
8
8
  private _movementStartPos;
9
9
  private _iMovementTimeout;
10
- constructor(pInfo: DeviceInfo);
10
+ constructor(pInfo: IoBrokerDeviceInfo);
11
11
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
12
12
  protected moveToPosition(targetPosition: number): void;
13
13
  private changeMovementState;
@@ -3,8 +3,8 @@
3
3
  import { DeviceType } from '../deviceType';
4
4
  import { ZigbeeDevice } from './BaseDevices';
5
5
  import { MotionSensorSettings } from '../../../models';
6
- import { DeviceInfo } from '../DeviceInfo';
7
6
  import { iMotionSensor } from '../baseDeviceInterfaces';
7
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
8
8
  export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor {
9
9
  settings: MotionSensorSettings;
10
10
  movementDetected: boolean;
@@ -12,7 +12,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
12
12
  protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
13
13
  protected _needsMovementResetFallback: boolean;
14
14
  protected _fallBackTimeout: NodeJS.Timeout | undefined;
15
- constructor(pInfo: DeviceInfo, type: DeviceType);
15
+ constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
16
16
  protected _timeSinceLastMotion: number;
17
17
  get timeSinceLastMotion(): number;
18
18
  protected _detectionsToday: number;
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeMagnetContact } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeSMaBiTMagnetContact extends ZigbeeMagnetContact {
5
- constructor(pInfo: DeviceInfo);
5
+ constructor(pInfo: IoBrokerDeviceInfo);
6
6
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
7
7
  }
@@ -1,7 +1,7 @@
1
1
  /// <reference types="iobroker" />
2
- import { DeviceInfo } from '../DeviceInfo';
3
2
  import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeSonoffMotion extends ZigbeeMotionSensor {
5
- constructor(pInfo: DeviceInfo);
5
+ constructor(pInfo: IoBrokerDeviceInfo);
6
6
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
7
7
  }
@@ -1,11 +1,11 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeDevice } from './BaseDevices';
3
3
  import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
4
- import { DeviceInfo } from '../DeviceInfo';
4
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
5
5
  export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor {
6
6
  private _humidityCallbacks;
7
7
  private _temperaturCallbacks;
8
- constructor(pInfo: DeviceInfo);
8
+ constructor(pInfo: IoBrokerDeviceInfo);
9
9
  private _humidity;
10
10
  get humidity(): number;
11
11
  private set humidity(value);
@@ -1,6 +1,6 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeHeater } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeTuyaValve extends ZigbeeHeater {
5
5
  private _setLocalTempCalibrationId;
6
6
  private _targetTempVal;
@@ -8,7 +8,7 @@ export declare class ZigbeeTuyaValve extends ZigbeeHeater {
8
8
  private _localDiffTempVal;
9
9
  private _setModeId;
10
10
  private _mode;
11
- constructor(pInfo: DeviceInfo);
11
+ constructor(pInfo: IoBrokerDeviceInfo);
12
12
  set seasonTurnOff(value: boolean);
13
13
  set roomTemperatur(value: number);
14
14
  set desiredTemperature(val: number);
@@ -1,9 +1,9 @@
1
1
  /// <reference types="iobroker" />
2
2
  import { ZigbeeShutter } from './BaseDevices';
3
- import { DeviceInfo } from '../DeviceInfo';
3
+ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
4
4
  export declare class ZigbeeUbisysShutter extends ZigbeeShutter {
5
5
  private _positionStateId;
6
- constructor(pInfo: DeviceInfo);
6
+ constructor(pInfo: IoBrokerDeviceInfo);
7
7
  update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
8
8
  protected moveToPosition(pPosition: number): void;
9
9
  }
@@ -5,7 +5,7 @@ const log_service_1 = require("../log-service");
5
5
  const models_1 = require("../../../models");
6
6
  class OwnSonosDevices {
7
7
  static addDevice(device) {
8
- log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.roomName}" addded`);
8
+ log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.info.room}" addded`);
9
9
  this.ownDevices[device.name] = device;
10
10
  }
11
11
  }
@@ -1,11 +1,21 @@
1
1
  import { SonosDevice } from '@svrooij/sonos/lib';
2
- export declare class OwnSonosDevice {
3
- name: string;
4
- roomName: string;
2
+ import { LogLevel, RoomBase } from '../../../models';
3
+ import { LogDebugType } from '../log-service';
4
+ import { DeviceInfo, DeviceType, IBaseDevice } from '../../devices';
5
+ export declare class OwnSonosDevice implements IBaseDevice {
5
6
  device: SonosDevice | undefined;
6
7
  maxPlayOnAllVolume: number;
8
+ room: RoomBase | undefined;
9
+ readonly deviceType: DeviceType;
7
10
  constructor(name: string, roomName: string, device: SonosDevice | undefined);
11
+ protected _info: DeviceInfo;
12
+ get info(): DeviceInfo;
13
+ set info(info: DeviceInfo);
14
+ get id(): string;
15
+ get name(): string;
8
16
  playTestMessage(): void;
17
+ log(level: LogLevel, message: string, debugType?: LogDebugType): void;
18
+ toJSON(): Partial<OwnSonosDevice>;
9
19
  }
10
20
  export declare class SonosService {
11
21
  static all: SonosDevice[];
@@ -1,4 +1,7 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.SonosService = exports.OwnSonosDevice = void 0;
4
7
  const lib_1 = require("@svrooij/sonos/lib");
@@ -9,16 +12,48 @@ const polly_service_1 = require("./polly-service");
9
12
  const Telegram_1 = require("../Telegram");
10
13
  const time_callback_service_1 = require("../time-callback-service");
11
14
  const settings_service_1 = require("../settings-service");
15
+ const devices_1 = require("../../devices");
16
+ const lodash_1 = __importDefault(require("lodash"));
12
17
  class OwnSonosDevice {
13
18
  constructor(name, roomName, device) {
14
- this.name = name;
15
- this.roomName = roomName;
16
19
  this.device = device;
17
20
  this.maxPlayOnAllVolume = 80;
21
+ this.deviceType = devices_1.DeviceType.Sonos;
22
+ this._info = new devices_1.DeviceInfo();
23
+ this._info.fullName = `Sonos ${name}`;
24
+ this._info.customName = `${roomName} ${name}`;
25
+ this._info.room = roomName;
26
+ this._info.allDevicesKey = `sonos-${roomName}-${name}`;
27
+ devices_1.Devices.alLDevices[`sonos-${roomName}-${name}`] = this;
28
+ }
29
+ get info() {
30
+ return this._info;
31
+ }
32
+ set info(info) {
33
+ this._info = info;
34
+ }
35
+ get id() {
36
+ var _a;
37
+ return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
38
+ }
39
+ get name() {
40
+ return this.info.customName;
18
41
  }
19
42
  playTestMessage() {
20
43
  SonosService.speakOnDevice(`Ich bin ${this.name}`, this);
21
44
  }
45
+ log(level, message, debugType = log_service_1.LogDebugType.None) {
46
+ var _a, _b;
47
+ log_service_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
48
+ debugType: debugType,
49
+ room: (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
50
+ deviceId: this.name,
51
+ deviceName: this.name,
52
+ });
53
+ }
54
+ toJSON() {
55
+ return utils_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room']));
56
+ }
22
57
  }
23
58
  exports.OwnSonosDevice = OwnSonosDevice;
24
59
  class SonosService {
@@ -116,7 +151,7 @@ class SonosService {
116
151
  volume: volume,
117
152
  specificTimeout: specificTimeout,
118
153
  notificationFired: (played) => {
119
- log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played in ${ownSnDevice.roomName} (duration: "${specificTimeout}")`);
154
+ ownSnDevice.log(models_1.LogLevel.Trace, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
120
155
  },
121
156
  };
122
157
  try {
@@ -130,7 +165,7 @@ class SonosService {
130
165
  }
131
166
  log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Spiele nun die Ausgabe für "${mp3Name}" auf "${ownSnDevice.name}"`);
132
167
  device.PlayNotificationTwo(options).then((played) => {
133
- log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played in ${ownSnDevice.roomName} (duration: "${specificTimeout}")`);
168
+ ownSnDevice.log(models_1.LogLevel.Debug, `Sonos Notification ("${mp3Name}") was${played ? '' : "n't"} played (duration: "${specificTimeout}")`);
134
169
  });
135
170
  }
136
171
  catch (err) {
@@ -1,21 +1,25 @@
1
- import { iExcessEnergyConsumer } from '../../devices';
1
+ import { DeviceInfo, DeviceType, IBaseDevice, iExcessEnergyConsumer } from '../../devices';
2
2
  import { ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
3
3
  import { LogDebugType } from '../log-service';
4
4
  import { AcMode } from './ac-mode';
5
5
  import { AcSettings } from '../../../models/deviceSettings/acSettings';
6
6
  import { AcDeviceType } from './acDeviceType';
7
- export declare abstract class AcDevice implements iExcessEnergyConsumer {
8
- name: string;
9
- roomName: string;
7
+ export declare abstract class AcDevice implements iExcessEnergyConsumer, IBaseDevice {
10
8
  ip: string;
11
9
  acDeviceType: AcDeviceType;
12
10
  currentConsumption: number;
13
11
  energyConsumerSettings: ExcessEnergyConsumerSettings;
14
12
  acSettings: AcSettings;
15
13
  room: RoomBase | undefined;
14
+ protected _info: DeviceInfo;
15
+ protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
16
+ get info(): DeviceInfo;
17
+ set info(info: DeviceInfo);
18
+ abstract get deviceType(): DeviceType;
19
+ get name(): string;
16
20
  protected _activatedByExcessEnergy: boolean;
17
21
  protected _blockAutomaticTurnOnMS: number;
18
- protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
22
+ get id(): string;
19
23
  abstract get on(): boolean;
20
24
  isAvailableForExcessEnergy(): boolean;
21
25
  calculateDesiredMode(): AcMode;
@@ -32,4 +36,5 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer {
32
36
  log(level: LogLevel, message: string, debugType?: LogDebugType): void;
33
37
  wasActivatedByExcessEnergy(): boolean;
34
38
  private automaticCheck;
39
+ toJSON(): Partial<AcDevice>;
35
40
  }