hoffmation-base 3.0.0-alpha.3 → 3.0.0-alpha.30
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.
- package/lib/index.d.ts +5 -1
- package/lib/index.js +20 -20
- package/lib/liquid-pid.d.ts +2 -5
- package/lib/liquid-pid.js +3 -5
- package/lib/models/blockAutomaticSettings.d.ts +23 -0
- package/lib/models/blockAutomaticSettings.js +19 -0
- package/lib/models/command/ShutterSetLevelCommand.d.ts +8 -0
- package/lib/models/command/ShutterSetLevelCommand.js +9 -1
- package/lib/models/command/WindowRestoreDesiredPositionCommand.d.ts +6 -0
- package/lib/models/command/WindowRestoreDesiredPositionCommand.js +6 -0
- package/lib/models/command/WindowSetDesiredPositionCommand.d.ts +7 -0
- package/lib/models/command/WindowSetDesiredPositionCommand.js +7 -0
- package/lib/models/command/WindowSetRolloByWeatherStatusCommand.d.ts +6 -0
- package/lib/models/command/WindowSetRolloByWeatherStatusCommand.js +6 -0
- package/lib/models/command/actuatorSetStateCommand.d.ts +17 -2
- package/lib/models/command/actuatorSetStateCommand.js +15 -6
- package/lib/models/command/actuatorToggleCommand.d.ts +6 -1
- package/lib/models/command/actuatorToggleCommand.js +6 -3
- package/lib/models/command/actuatorWriteStateToDeviceCommand.d.ts +8 -1
- package/lib/models/command/actuatorWriteStateToDeviceCommand.js +13 -2
- package/lib/models/command/baseCommand.d.ts +22 -1
- package/lib/models/command/baseCommand.js +43 -9
- package/lib/models/command/blockAutomaticCommand.d.ts +32 -0
- package/lib/models/command/blockAutomaticCommand.js +40 -0
- package/lib/models/command/blockAutomaticLiftBlockCommand.d.ts +18 -0
- package/lib/models/command/blockAutomaticLiftBlockCommand.js +23 -0
- package/lib/models/command/blockAutomaticUntilCommand.d.ts +26 -0
- package/lib/models/command/blockAutomaticUntilCommand.js +29 -0
- package/lib/models/command/commandSource.d.ts +19 -0
- package/lib/models/command/commandSource.js +20 -0
- package/lib/models/command/commandType.d.ts +3 -0
- package/lib/models/command/commandType.js +3 -0
- package/lib/models/command/dimmerSetLightCommand.d.ts +12 -7
- package/lib/models/command/dimmerSetLightCommand.js +19 -13
- package/lib/models/command/floorSetAllShuttersCommand.d.ts +5 -4
- package/lib/models/command/floorSetAllShuttersCommand.js +5 -4
- package/lib/models/command/index.d.ts +3 -0
- package/lib/models/command/index.js +7 -1
- package/lib/models/command/lampSetLightCommand.d.ts +12 -1
- package/lib/models/command/lampSetLightCommand.js +14 -3
- package/lib/models/command/lampSetTimeBasedCommand.d.ts +14 -7
- package/lib/models/command/lampSetTimeBasedCommand.js +8 -10
- package/lib/models/command/lampToggleLightCommand.d.ts +6 -5
- package/lib/models/command/lampToggleLightCommand.js +7 -6
- package/lib/models/command/ledSetLightCommand.d.ts +20 -10
- package/lib/models/command/ledSetLightCommand.js +26 -16
- package/lib/models/command/lightGroupSwitchTimeConditionalCommand.d.ts +7 -0
- package/lib/models/command/lightGroupSwitchTimeConditionalCommand.js +7 -0
- package/lib/models/command/restoreTargetAutomaticValueCommand.d.ts +6 -1
- package/lib/models/command/restoreTargetAutomaticValueCommand.js +6 -3
- package/lib/models/command/roomRestoreLightCommand.d.ts +6 -0
- package/lib/models/command/roomRestoreLightCommand.js +6 -0
- package/lib/models/command/roomRestoreShutterPositionCommand.d.ts +7 -0
- package/lib/models/command/roomRestoreShutterPositionCommand.js +7 -0
- package/lib/models/command/roomSetLightTimeBasedCommand.d.ts +4 -3
- package/lib/models/command/roomSetLightTimeBasedCommand.js +4 -3
- package/lib/models/command/shutterSunriseUpCommand.d.ts +6 -0
- package/lib/models/command/shutterSunriseUpCommand.js +6 -0
- package/lib/models/command/shutterSunsetDownCommand.d.ts +6 -0
- package/lib/models/command/shutterSunsetDownCommand.js +6 -0
- package/lib/models/command/wledSetLightCommand.d.ts +15 -1
- package/lib/models/command/wledSetLightCommand.js +22 -6
- package/lib/models/connectionCallbacks.d.ts +4 -4
- package/lib/models/connectionCallbacks.js +1 -0
- package/lib/models/deviceConfig.d.ts +3 -3
- package/lib/models/deviceSettings/acSettings.d.ts +19 -5
- package/lib/models/deviceSettings/acSettings.js +23 -8
- package/lib/models/deviceSettings/actuatorSettings.d.ts +13 -4
- package/lib/models/deviceSettings/actuatorSettings.js +19 -9
- package/lib/models/deviceSettings/cameraSettings.d.ts +12 -0
- package/lib/models/deviceSettings/cameraSettings.js +12 -0
- package/lib/models/deviceSettings/dachsSettings.d.ts +3 -0
- package/lib/models/deviceSettings/dachsSettings.js +3 -0
- package/lib/models/deviceSettings/deviceSettings.d.ts +10 -0
- package/lib/models/deviceSettings/deviceSettings.js +16 -0
- package/lib/models/deviceSettings/dimmerSettings.d.ts +20 -0
- package/lib/models/deviceSettings/dimmerSettings.js +20 -0
- package/lib/models/deviceSettings/garageDoorOpenerSettings.d.ts +0 -1
- package/lib/models/deviceSettings/garageDoorOpenerSettings.js +0 -1
- package/lib/models/deviceSettings/handleSettings.d.ts +9 -0
- package/lib/models/deviceSettings/handleSettings.js +9 -0
- package/lib/models/deviceSettings/heaterSettings.d.ts +21 -9
- package/lib/models/deviceSettings/heaterSettings.js +21 -9
- package/lib/models/deviceSettings/ledSettings.d.ts +66 -0
- package/lib/models/deviceSettings/ledSettings.js +76 -18
- package/lib/models/deviceSettings/motionSensorSettings.d.ts +5 -1
- package/lib/models/deviceSettings/motionSensorSettings.js +5 -1
- package/lib/models/deviceSettings/sceneSettings.d.ts +4 -0
- package/lib/models/deviceSettings/shutterSettings.d.ts +11 -3
- package/lib/models/deviceSettings/shutterSettings.js +11 -3
- package/lib/models/deviceSettings/sonosDeviceSettings.d.ts +4 -0
- package/lib/models/deviceSettings/sonosDeviceSettings.js +4 -0
- package/lib/models/deviceSettings/tvSettings.d.ts +4 -0
- package/lib/models/deviceSettings/victronDeviceSettings.d.ts +34 -0
- package/lib/models/deviceSettings/victronDeviceSettings.js +34 -0
- package/lib/models/deviceSettings/wledSettings.d.ts +48 -0
- package/lib/models/deviceSettings/wledSettings.js +37 -13
- package/lib/models/groupSettings/heatGroupSettings.d.ts +12 -1
- package/lib/models/groupSettings/heatGroupSettings.js +12 -1
- package/lib/models/iIdHolder.d.ts +18 -0
- package/lib/models/index.d.ts +1 -1
- package/lib/models/index.js +3 -1
- package/lib/models/objectSettings.d.ts +5 -2
- package/lib/models/objectSettings.js +2 -2
- package/lib/models/persistence/EnergyCalculation.d.ts +27 -0
- package/lib/models/persistence/EnergyCalculation.js +30 -4
- package/lib/models/persistence/index.d.ts +0 -2
- package/lib/models/persistence/index.js +0 -2
- package/lib/models/rooms/RoomBase.d.ts +12 -1
- package/lib/models/rooms/RoomBase.js +5 -3
- package/lib/models/rooms/RoomSettings/RoomInitializationSettings.d.ts +2 -1
- package/lib/models/rooms/RoomSettings/RoomInitializationSettings.js +2 -2
- package/lib/models/rooms/RoomSettings/RoomSettingsController.d.ts +9 -0
- package/lib/models/rooms/RoomSettings/RoomSettingsController.js +1 -1
- package/lib/models/rooms/RoomSettings/iRoomDefaultSettings.d.ts +53 -3
- package/lib/models/rooms/RoomSettings/iRoomInitializationSettings.d.ts +10 -1
- package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.d.ts +4 -1
- package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.js +3 -0
- package/lib/models/rooms/RoomSettings/roomSettings.d.ts +55 -0
- package/lib/models/rooms/RoomSettings/roomSettings.js +55 -0
- package/lib/models/rooms/iRoomBase.d.ts +39 -0
- package/lib/models/rooms/iRoomImportEnforcer.d.ts +8 -0
- package/lib/models/timeCallback.d.ts +7 -0
- package/lib/models/timeCallback.js +6 -3
- package/lib/server/config/heatingMode.d.ts +2 -1
- package/lib/server/config/heatingMode.js +2 -1
- package/lib/server/config/iAsusConfig.d.ts +15 -0
- package/lib/server/config/iBlockAutomaticHandlerDefaults.d.ts +23 -0
- package/lib/server/config/iBlueIrisSettings.d.ts +14 -0
- package/lib/server/config/iBluetoothTrackingSettings.d.ts +9 -0
- package/lib/server/config/iConfig.d.ts +92 -5
- package/lib/server/config/iDachsSettings.d.ts +16 -0
- package/lib/server/config/iDaikinSettings.d.ts +17 -0
- package/lib/server/config/iEnergyManagerSettings.d.ts +13 -0
- package/lib/server/config/iEspresenseSettings.d.ts +10 -0
- package/lib/server/config/iHeaterSettings.d.ts +8 -0
- package/lib/server/config/iIobrokerSettigns.d.ts +8 -0
- package/lib/server/config/iLogSettings.d.ts +36 -1
- package/lib/server/config/iMp3Settings.d.ts +10 -0
- package/lib/server/config/iMuellSettings.d.ts +7 -0
- package/lib/server/config/iNewsSettings.d.ts +13 -0
- package/lib/server/config/iPersistenceSettings.d.ts +10 -0
- package/lib/server/config/iPollySettings.d.ts +22 -0
- package/lib/server/config/iRestSettings.d.ts +10 -0
- package/lib/server/config/iSonosSettings.d.ts +10 -0
- package/lib/server/config/iTelegramSettings.d.ts +17 -0
- package/lib/server/config/iTibberSettings.d.ts +10 -0
- package/lib/server/config/iTimePair.d.ts +9 -0
- package/lib/server/config/iTimeSettings.d.ts +9 -0
- package/lib/server/config/iTranslationSettings.d.ts +10 -0
- package/lib/server/config/iUnifiConnectionOptions.d.ts +31 -0
- package/lib/server/config/iUnifiSettings.d.ts +8 -0
- package/lib/server/config/iVictronSettings.d.ts +14 -0
- package/lib/server/config/iWeatherSettings.d.ts +13 -0
- package/lib/server/config/index.d.ts +1 -0
- package/lib/server/devices/DeviceCapability.d.ts +1 -0
- package/lib/server/devices/DeviceCapability.js +1 -0
- package/lib/server/devices/DeviceInfo.d.ts +9 -0
- package/lib/server/devices/DeviceInfo.js +6 -0
- package/lib/server/devices/Griffe.js +1 -2
- package/lib/server/devices/Heizgruppen.js +2 -2
- package/lib/server/devices/IoBrokerBaseDevice.d.ts +34 -18
- package/lib/server/devices/IoBrokerBaseDevice.js +37 -21
- package/lib/server/devices/IoBrokerDeviceInfo.d.ts +2 -2
- package/lib/server/devices/IoBrokerDeviceInfo.js +6 -4
- package/lib/server/devices/baseDeviceInterfaces/iAcDevice.d.ts +41 -3
- package/lib/server/devices/baseDeviceInterfaces/iActuator.d.ts +18 -0
- package/lib/server/devices/baseDeviceInterfaces/iBaseDevice.d.ts +26 -1
- package/lib/server/devices/baseDeviceInterfaces/iBatteryDevice.d.ts +12 -1
- package/lib/server/devices/baseDeviceInterfaces/iBluetoothDetector.d.ts +15 -7
- package/lib/server/devices/baseDeviceInterfaces/iButtonSwitch.d.ts +42 -0
- package/lib/server/devices/baseDeviceInterfaces/iCameraDevice.d.ts +46 -3
- package/lib/server/devices/baseDeviceInterfaces/iDimmableLamp.d.ts +17 -2
- package/lib/server/devices/baseDeviceInterfaces/iEnergyManager.d.ts +32 -2
- package/lib/server/devices/baseDeviceInterfaces/iExcessEnergyConsumer.d.ts +30 -2
- package/lib/server/devices/baseDeviceInterfaces/iGarageDoorOpener.d.ts +21 -0
- package/lib/server/devices/baseDeviceInterfaces/iHandleSensor.d.ts +24 -0
- package/lib/server/devices/baseDeviceInterfaces/iHeater.d.ts +40 -4
- package/lib/server/devices/baseDeviceInterfaces/iHumiditySensor.d.ts +19 -0
- package/lib/server/devices/baseDeviceInterfaces/iIlluminationSensor.d.ts +11 -0
- package/lib/server/devices/baseDeviceInterfaces/iLamp.d.ts +9 -0
- package/lib/server/devices/baseDeviceInterfaces/iLedRgbCct.d.ts +20 -0
- package/lib/server/devices/baseDeviceInterfaces/iLoadMeter.d.ts +5 -0
- package/lib/server/devices/baseDeviceInterfaces/iMagnetSensor.d.ts +31 -0
- package/lib/server/devices/baseDeviceInterfaces/iMagnetSensor.js +2 -0
- package/lib/server/devices/baseDeviceInterfaces/iMotionSensor.d.ts +21 -1
- package/lib/server/devices/baseDeviceInterfaces/iRoomDevice.d.ts +6 -0
- package/lib/server/devices/baseDeviceInterfaces/iScene.d.ts +31 -1
- package/lib/server/devices/baseDeviceInterfaces/iShutter.d.ts +24 -0
- package/lib/server/devices/baseDeviceInterfaces/iSmokeDetectorDevice.d.ts +12 -0
- package/lib/server/devices/baseDeviceInterfaces/iSpeaker.d.ts +30 -0
- package/lib/server/devices/baseDeviceInterfaces/iTemperatureSensor.d.ts +30 -1
- package/lib/server/devices/baseDeviceInterfaces/iTemporaryDisableAutomatic.d.ts +13 -0
- package/lib/server/devices/baseDeviceInterfaces/iTvDevice.d.ts +20 -0
- package/lib/server/devices/baseDeviceInterfaces/iVibrationSensor.d.ts +24 -5
- package/lib/server/devices/baseDeviceInterfaces/index.d.ts +1 -0
- package/lib/server/devices/blueIris/cameraDevice.d.ts +47 -32
- package/lib/server/devices/blueIris/cameraDevice.js +75 -75
- package/lib/server/devices/button/button.d.ts +0 -1
- package/lib/server/devices/button/button.js +0 -4
- package/lib/server/devices/button/buttonCallback.d.ts +5 -0
- package/lib/server/devices/button/buttonCallback.js +10 -0
- package/lib/server/devices/button/buttonCapabilities.d.ts +12 -0
- package/lib/server/devices/button/buttonCapabilities.js +12 -0
- package/lib/server/devices/button/index.d.ts +1 -0
- package/lib/server/devices/button/index.js +3 -0
- package/lib/server/devices/dachs/dachs.d.ts +31 -9
- package/lib/server/devices/dachs/dachs.js +27 -17
- package/lib/server/devices/dachs/dachsTemperatureSensor.d.ts +20 -1
- package/lib/server/devices/dachs/dachsTemperatureSensor.js +20 -3
- package/lib/server/devices/dachs/interfaces/DachsClientOptions.d.ts +30 -0
- package/lib/server/devices/dachs/interfaces/KeyListEntity.d.ts +0 -8
- package/lib/server/devices/dachs/interfaces/KeyListEntity.js +0 -8
- package/lib/server/devices/dachs/interfaces/dachsInfluxDataPoint.d.ts +12 -0
- package/lib/server/devices/dachs/interfaces/influxDbConnectionOptions.d.ts +21 -1
- package/lib/server/devices/dachs/lib/dachsHttpClient.d.ts +1 -1
- package/lib/server/devices/dachs/lib/dachsHttpClient.js +2 -2
- package/lib/server/devices/device-cluster.d.ts +3 -0
- package/lib/server/devices/device-cluster.js +1 -1
- package/lib/server/devices/deviceUpdater.d.ts +0 -3
- package/lib/server/devices/deviceUpdater.js +1 -4
- package/lib/server/devices/devices.d.ts +43 -7
- package/lib/server/devices/devices.js +42 -6
- package/lib/server/devices/espresense/detectedBluetoothDevice.d.ts +13 -0
- package/lib/server/devices/espresense/detectedBluetoothDevice.js +14 -1
- package/lib/server/devices/espresense/espresenseDevice.d.ts +31 -1
- package/lib/server/devices/espresense/espresenseDevice.js +28 -4
- package/lib/server/devices/espresense/trackedDistanceData.d.ts +12 -0
- package/lib/server/devices/espresense/trackedDistanceData.js +3 -0
- package/lib/server/devices/espresense/trilateration.d.ts +7 -0
- package/lib/server/devices/espresense/trilateration.js +7 -0
- package/lib/server/devices/espresense/trilaterationBasePoint.d.ts +6 -0
- package/lib/server/devices/espresense/trilaterationBasePoint.js +3 -0
- package/lib/server/devices/espresense/trilaterationPoint.d.ts +1 -1
- package/lib/server/devices/espresense/trilaterationPoint.js +3 -1
- package/lib/server/devices/groups/Window.d.ts +7 -1
- package/lib/server/devices/groups/Window.js +16 -8
- package/lib/server/devices/groups/base-group.d.ts +4 -0
- package/lib/server/devices/groups/base-group.js +3 -0
- package/lib/server/devices/groups/heatGroup.d.ts +8 -6
- package/lib/server/devices/groups/heatGroup.js +11 -11
- package/lib/server/devices/groups/lightGroup.d.ts +10 -2
- package/lib/server/devices/groups/lightGroup.js +14 -13
- package/lib/server/devices/groups/presenceGroup.d.ts +0 -1
- package/lib/server/devices/groups/presenceGroup.js +0 -1
- package/lib/server/devices/groups/tasterGroup.js +6 -6
- package/lib/server/devices/groups/windowGroup.d.ts +11 -1
- package/lib/server/devices/groups/windowGroup.js +6 -6
- package/lib/server/devices/hmIPDevices/hmIpAccessPoint.d.ts +1 -0
- package/lib/server/devices/hmIPDevices/hmIpAccessPoint.js +1 -0
- package/lib/server/devices/hmIPDevices/hmIpBewegung.d.ts +7 -4
- package/lib/server/devices/hmIPDevices/hmIpBewegung.js +9 -10
- package/lib/server/devices/hmIPDevices/hmIpDevice.d.ts +1 -2
- package/lib/server/devices/hmIPDevices/hmIpDevice.js +2 -3
- package/lib/server/devices/hmIPDevices/hmIpGriff.d.ts +27 -5
- package/lib/server/devices/hmIPDevices/hmIpGriff.js +59 -37
- package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.d.ts +22 -2
- package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js +23 -10
- package/lib/server/devices/hmIPDevices/hmIpHeizung.d.ts +1 -0
- package/lib/server/devices/hmIPDevices/hmIpHeizung.js +1 -0
- package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts +6 -0
- package/lib/server/devices/hmIPDevices/hmIpLampe.js +7 -3
- package/lib/server/devices/hmIPDevices/hmIpPraezenz.d.ts +3 -1
- package/lib/server/devices/hmIPDevices/hmIpPraezenz.js +4 -2
- package/lib/server/devices/hmIPDevices/hmIpRoll.d.ts +2 -0
- package/lib/server/devices/hmIPDevices/hmIpRoll.js +7 -5
- package/lib/server/devices/hmIPDevices/hmIpTaster.d.ts +15 -0
- package/lib/server/devices/hmIPDevices/hmIpTaster.js +9 -0
- package/lib/server/devices/hmIPDevices/hmIpTherm.d.ts +1 -0
- package/lib/server/devices/hmIPDevices/hmIpTherm.js +1 -0
- package/lib/server/devices/hmIPDevices/hmIpTuer.d.ts +9 -1
- package/lib/server/devices/hmIPDevices/hmIpTuer.js +17 -4
- package/lib/server/devices/hmIPDevices/hmIpWippe.d.ts +27 -0
- package/lib/server/devices/hmIPDevices/hmIpWippe.js +3 -0
- package/lib/server/devices/iDeviceUpdater.d.ts +14 -0
- package/lib/server/devices/index.d.ts +1 -0
- package/lib/server/devices/index.js +3 -0
- package/lib/server/devices/jsObject/jsObjectEnergyManager.d.ts +3 -1
- package/lib/server/devices/jsObject/jsObjectEnergyManager.js +5 -3
- package/lib/server/devices/nameAmountValuePair.d.ts +5 -0
- package/lib/server/devices/nameAmountValuePair.js +10 -0
- package/lib/server/devices/scene/room-scene.d.ts +23 -6
- package/lib/server/devices/scene/room-scene.js +18 -4
- package/lib/server/devices/sharedFunctions/lampUtils.d.ts +1 -0
- package/lib/server/devices/sharedFunctions/lampUtils.js +44 -19
- package/lib/server/devices/shelly/shellyDevice.d.ts +2 -1
- package/lib/server/devices/shelly/shellyDevice.js +2 -1
- package/lib/server/devices/shelly/shellyTrv.d.ts +28 -16
- package/lib/server/devices/shelly/shellyTrv.js +46 -45
- package/lib/server/devices/tuya/tuyaDevice.d.ts +2 -1
- package/lib/server/devices/tuya/tuyaDevice.js +2 -1
- package/lib/server/devices/tuya/tuyaGarageOpener.d.ts +3 -0
- package/lib/server/devices/tuya/tuyaGarageOpener.js +3 -0
- package/lib/server/devices/tv/samsungTv.d.ts +1 -0
- package/lib/server/devices/tv/samsungTv.js +1 -0
- package/lib/server/devices/tv/tvDevice.d.ts +7 -1
- package/lib/server/devices/tv/tvDevice.js +4 -3
- package/lib/server/devices/wledDevice.d.ts +16 -2
- package/lib/server/devices/wledDevice.js +35 -12
- package/lib/server/devices/zigbee/BaseDevices/ZigbeeActuator.d.ts +15 -3
- package/lib/server/devices/zigbee/BaseDevices/ZigbeeActuator.js +23 -9
- package/lib/server/devices/zigbee/BaseDevices/index.d.ts +1 -0
- package/lib/server/devices/zigbee/BaseDevices/index.js +3 -0
- package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.d.ts +4 -5
- package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.js +15 -22
- package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.d.ts +8 -23
- package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.js +21 -61
- package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.d.ts +17 -4
- package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js +17 -11
- package/lib/server/devices/zigbee/BaseDevices/zigbeeLamp.d.ts +20 -0
- package/lib/server/devices/zigbee/BaseDevices/zigbeeLamp.js +47 -0
- package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.d.ts +9 -8
- package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.js +15 -13
- package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts +12 -2
- package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.js +11 -1
- package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts +20 -12
- package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.js +45 -41
- package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.d.ts +10 -0
- package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.js +16 -6
- package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.d.ts +9 -1
- package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.js +8 -1
- package/lib/server/devices/zigbee/zigbeeAqaraMagnetContact.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeAqaraMagnetContact.js +1 -0
- package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.d.ts +16 -0
- package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.js +16 -0
- package/lib/server/devices/zigbee/zigbeeAquaraMotion.d.ts +6 -0
- package/lib/server/devices/zigbee/zigbeeAquaraMotion.js +7 -3
- package/lib/server/devices/zigbee/zigbeeAquaraVibra.d.ts +49 -11
- package/lib/server/devices/zigbee/zigbeeAquaraVibra.js +98 -30
- package/lib/server/devices/zigbee/zigbeeAquaraWater.d.ts +12 -1
- package/lib/server/devices/zigbee/zigbeeAquaraWater.js +15 -11
- package/lib/server/devices/zigbee/zigbeeBlitzShp.d.ts +15 -5
- package/lib/server/devices/zigbee/zigbeeBlitzShp.js +22 -14
- package/lib/server/devices/zigbee/zigbeeEuroHeater.d.ts +10 -4
- package/lib/server/devices/zigbee/zigbeeEuroHeater.js +16 -10
- package/lib/server/devices/zigbee/zigbeeHeimanSmoke.d.ts +19 -1
- package/lib/server/devices/zigbee/zigbeeHeimanSmoke.js +25 -7
- package/lib/server/devices/zigbee/zigbeeIkeaShutter.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeIkeaShutter.js +1 -0
- package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.d.ts +2 -0
- package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.js +3 -1
- package/lib/server/devices/zigbee/zigbeeIlluActuator.d.ts +1 -2
- package/lib/server/devices/zigbee/zigbeeIlluActuator.js +2 -11
- package/lib/server/devices/zigbee/zigbeeIlluLampe.d.ts +4 -10
- package/lib/server/devices/zigbee/zigbeeIlluLampe.js +4 -32
- package/lib/server/devices/zigbee/zigbeeIlluShutter.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeIlluShutter.js +1 -0
- package/lib/server/devices/zigbee/zigbeeSMaBiTMagnetContact.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeSMaBiTMagnetContact.js +1 -0
- package/lib/server/devices/zigbee/zigbeeSonoffMotion.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeSonoffMotion.js +1 -0
- package/lib/server/devices/zigbee/zigbeeSonoffTemp.d.ts +17 -0
- package/lib/server/devices/zigbee/zigbeeSonoffTemp.js +18 -1
- package/lib/server/devices/zigbee/zigbeeTuyaValve.d.ts +10 -3
- package/lib/server/devices/zigbee/zigbeeTuyaValve.js +11 -6
- package/lib/server/devices/zigbee/zigbeeUbisysActuator.d.ts +9 -2
- package/lib/server/devices/zigbee/zigbeeUbisysActuator.js +10 -8
- package/lib/server/devices/zigbee/zigbeeUbisysLampe.d.ts +9 -9
- package/lib/server/devices/zigbee/zigbeeUbisysLampe.js +15 -24
- package/lib/server/devices/zigbee/zigbeeUbisysShutter.d.ts +1 -0
- package/lib/server/devices/zigbee/zigbeeUbisysShutter.js +1 -0
- package/lib/server/ioBroker/connection.d.ts +21 -20
- package/lib/server/ioBroker/connection.js +37 -28
- package/lib/server/ioBroker/ioBroker.main.d.ts +3 -0
- package/lib/server/ioBroker/ioBroker.main.js +4 -3
- package/lib/server/ioBroker/iobrokerConnectionLogging.d.ts +3 -0
- package/lib/server/ioBroker/iobrokerConnectionLogging.js +4 -0
- package/lib/server/ioBroker/socketIOConnectOptions.d.ts +2 -2
- package/lib/server/ioBroker/socketIOConnectOptions.js +1 -0
- package/lib/server/ioBroker/socketIOVisCommand.d.ts +5 -1
- package/lib/server/ioBroker/socketIOVisCommand.js +1 -0
- package/lib/server/services/ShutterService.js +6 -6
- package/lib/server/services/Sonos/OwnSonosDevices.d.ts +3 -0
- package/lib/server/services/Sonos/OwnSonosDevices.js +3 -0
- package/lib/server/services/Sonos/mp3-server.d.ts +3 -1
- package/lib/server/services/Sonos/mp3-server.js +3 -1
- package/lib/server/services/Sonos/own-sonos-device.d.ts +4 -1
- package/lib/server/services/Sonos/own-sonos-device.js +4 -4
- package/lib/server/services/Sonos/polly-service.d.ts +7 -1
- package/lib/server/services/Sonos/polly-service.js +10 -8
- package/lib/server/services/Sonos/sonos-service.d.ts +0 -5
- package/lib/server/services/Sonos/sonos-service.js +6 -10
- package/lib/server/services/Telegram/telegram-Commands.js +5 -5
- package/lib/server/services/Telegram/telegram-service.d.ts +2 -1
- package/lib/server/services/Telegram/telegram-service.js +8 -3
- package/lib/server/services/Translation/IRessourceObject.d.ts +13 -0
- package/lib/server/services/Translation/IRessourceObject.js +2 -0
- package/lib/server/services/Translation/iRessources.d.ts +1 -4
- package/lib/server/services/Translation/index.d.ts +1 -0
- package/lib/server/services/Translation/res.d.ts +34 -19
- package/lib/server/services/Translation/res.js +34 -19
- package/lib/server/services/ac/ac-device.d.ts +48 -6
- package/lib/server/services/ac/ac-device.js +83 -33
- package/lib/server/services/ac/daikin-service.js +4 -3
- package/lib/server/services/ac/own-ac-devices.d.ts +3 -0
- package/lib/server/services/ac/own-ac-devices.js +3 -0
- package/lib/server/services/ac/own-daikin-device.d.ts +17 -0
- package/lib/server/services/ac/own-daikin-device.js +32 -7
- package/lib/server/services/api/api-service.d.ts +118 -53
- package/lib/server/services/api/api-service.js +170 -80
- package/lib/server/services/blockAutomaticHandler.d.ts +11 -8
- package/lib/server/services/blockAutomaticHandler.js +29 -13
- package/lib/server/services/calendar/index.d.ts +1 -0
- package/lib/server/services/calendar/index.js +3 -0
- package/lib/server/services/calendar/muell-tonne.d.ts +11 -1
- package/lib/server/services/calendar/muell-tonne.js +10 -0
- package/lib/server/services/calendar/m/303/274ll-service.d.ts +23 -8
- package/lib/server/services/calendar/m/303/274ll-service.js +11 -5
- package/lib/server/services/calendar/name-date-pair.d.ts +5 -0
- package/lib/server/services/calendar/name-date-pair.js +10 -0
- package/lib/server/services/dbo/iPersist.d.ts +103 -0
- package/lib/server/services/dbo/postgreSqlPersist.d.ts +23 -0
- package/lib/server/services/dbo/postgreSqlPersist.js +28 -5
- package/lib/server/services/file-info.d.ts +5 -0
- package/lib/server/services/file-info.js +10 -0
- package/lib/server/services/govee/govee-service.d.ts +1 -5
- package/lib/server/services/govee/govee-service.js +3 -5
- package/lib/server/services/govee/own-govee-device.d.ts +17 -12
- package/lib/server/services/govee/own-govee-device.js +20 -24
- package/lib/server/services/govee/own-govee-devices.d.ts +3 -0
- package/lib/server/services/govee/own-govee-devices.js +3 -0
- package/lib/server/services/https-service.d.ts +3 -2
- package/lib/server/services/https-service.js +4 -3
- package/lib/server/services/index.d.ts +1 -0
- package/lib/server/services/index.js +3 -0
- package/lib/server/services/log-service/index.d.ts +1 -0
- package/lib/server/services/log-service/index.js +3 -0
- package/lib/server/services/log-service/log-debug-type.d.ts +12 -0
- package/lib/server/services/log-service/log-debug-type.js +16 -0
- package/lib/server/services/log-service/log-filter-data.d.ts +21 -12
- package/lib/server/services/log-service/log-filter-data.js +6 -15
- package/lib/server/services/log-service/log-service.d.ts +17 -4
- package/lib/server/services/log-service/log-service.js +30 -17
- package/lib/server/services/news-service.d.ts +9 -7
- package/lib/server/services/news-service.js +14 -15
- package/lib/server/services/room-service/room-service.d.ts +20 -4
- package/lib/server/services/room-service/room-service.js +26 -10
- package/lib/server/services/settings-service.d.ts +6 -2
- package/lib/server/services/settings-service.js +3 -2
- package/lib/server/services/time-callback-service.js +1 -1
- package/lib/server/services/utils/RGB.d.ts +6 -0
- package/lib/server/services/utils/RGB.js +11 -0
- package/lib/server/services/utils/catchEmResult.d.ts +5 -0
- package/lib/server/services/utils/catchEmResult.js +10 -0
- package/lib/server/services/utils/energy-consumer-state-change.d.ts +6 -0
- package/lib/server/services/utils/energy-consumer-state-change.js +10 -0
- package/lib/server/services/utils/energy-manager-utils.d.ts +3 -14
- package/lib/server/services/utils/energy-manager-utils.js +2 -2
- package/lib/server/services/utils/iDisposeable.d.ts +6 -0
- package/lib/server/services/utils/index.d.ts +4 -1
- package/lib/server/services/utils/index.js +8 -1
- package/lib/server/services/utils/{ringstorage.d.ts → ringStorage.d.ts} +1 -1
- package/lib/server/services/utils/{ringstorage.js → ringStorage.js} +3 -3
- package/lib/server/services/utils/utils.d.ts +9 -13
- package/lib/server/services/victron/victron-device.d.ts +6 -2
- package/lib/server/services/victron/victron-device.js +12 -9
- package/lib/server/services/weather/index.d.ts +2 -0
- package/lib/server/services/weather/index.js +3 -0
- package/lib/server/services/weather/rain-next-minutes-info.d.ts +5 -0
- package/lib/server/services/weather/rain-next-minutes-info.js +10 -0
- package/lib/server/services/weather/weather-current.d.ts +0 -2
- package/lib/server/services/weather/weather-feelsLike.d.ts +15 -0
- package/lib/server/services/weather/weather-response.d.ts +16 -0
- package/lib/server/services/weather/weather-response.js +2 -0
- package/lib/server/services/weather/weather-service.d.ts +15 -18
- package/lib/server/services/weather/weather-service.js +32 -22
- package/lib/server/services/weather/weather-temp.d.ts +21 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -7
- package/lib/models/iTemperaturDataPoint.d.ts +0 -9
- package/lib/models/persistence/RoomDetailInfo.d.ts +0 -6
- package/lib/models/persistence/RoomDetailInfo.js +0 -11
- package/lib/models/persistence/temperaturDataPoint.d.ts +0 -10
- package/lib/models/persistence/temperaturDataPoint.js +0 -14
- /package/lib/{models/iTemperaturDataPoint.js → server/config/iBlockAutomaticHandlerDefaults.js} +0 -0
|
@@ -13,9 +13,13 @@ const devices_1 = require("../devices");
|
|
|
13
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
14
|
class DachsTemperatureSensor {
|
|
15
15
|
constructor(roomName, shortKey, longKey) {
|
|
16
|
+
/** @inheritDoc */
|
|
16
17
|
this.settings = undefined;
|
|
18
|
+
/** @inheritDoc */
|
|
17
19
|
this.deviceType = deviceType_1.DeviceType.DachsWarmWaterTemperature;
|
|
20
|
+
/** @inheritDoc */
|
|
18
21
|
this.deviceCapabilities = [];
|
|
22
|
+
/** @inheritDoc */
|
|
19
23
|
this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
|
|
20
24
|
this.persistTemperaturSensor();
|
|
21
25
|
}, 5 * 60 * 1000, this, false);
|
|
@@ -33,15 +37,15 @@ class DachsTemperatureSensor {
|
|
|
33
37
|
this.persistDeviceInfo();
|
|
34
38
|
services_1.Utils.guardedTimeout(this.loadDeviceSettings, 200, this);
|
|
35
39
|
}
|
|
40
|
+
/** @inheritDoc */
|
|
36
41
|
get customName() {
|
|
37
42
|
return this.info.customName;
|
|
38
43
|
}
|
|
44
|
+
/** @inheritDoc */
|
|
39
45
|
get info() {
|
|
40
46
|
return this._info;
|
|
41
47
|
}
|
|
42
|
-
|
|
43
|
-
this._info = info;
|
|
44
|
-
}
|
|
48
|
+
/** @inheritDoc */
|
|
45
49
|
get id() {
|
|
46
50
|
var _a;
|
|
47
51
|
return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `dachs-${this.info.room}-${this.info.customName}`;
|
|
@@ -49,18 +53,23 @@ class DachsTemperatureSensor {
|
|
|
49
53
|
get name() {
|
|
50
54
|
return this.info.customName;
|
|
51
55
|
}
|
|
56
|
+
/** @inheritDoc */
|
|
52
57
|
get room() {
|
|
53
58
|
return services_1.API.getRoom(this.info.room);
|
|
54
59
|
}
|
|
60
|
+
/** @inheritDoc */
|
|
55
61
|
get roomTemperature() {
|
|
56
62
|
return this._roomTemperature;
|
|
57
63
|
}
|
|
64
|
+
/** @inheritDoc */
|
|
58
65
|
set roomTemperature(value) {
|
|
59
66
|
this._roomTemperature = value;
|
|
60
67
|
}
|
|
68
|
+
/** @inheritDoc */
|
|
61
69
|
get iTemperature() {
|
|
62
70
|
return this._temperature;
|
|
63
71
|
}
|
|
72
|
+
/** @inheritDoc */
|
|
64
73
|
get sTemperature() {
|
|
65
74
|
return `${this._temperature}°C`;
|
|
66
75
|
}
|
|
@@ -73,19 +82,23 @@ class DachsTemperatureSensor {
|
|
|
73
82
|
update(newTemp) {
|
|
74
83
|
this.temperature = newTemp;
|
|
75
84
|
}
|
|
85
|
+
/** @inheritDoc */
|
|
76
86
|
addTempChangeCallback(pCallback) {
|
|
77
87
|
this._temperaturCallbacks.push(pCallback);
|
|
78
88
|
if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
|
|
79
89
|
pCallback(this._temperature);
|
|
80
90
|
}
|
|
81
91
|
}
|
|
92
|
+
/** @inheritDoc */
|
|
82
93
|
onTemperaturChange(newTemperatur) {
|
|
83
94
|
this.roomTemperature = newTemperatur;
|
|
84
95
|
}
|
|
96
|
+
/** @inheritDoc */
|
|
85
97
|
persistTemperaturSensor() {
|
|
86
98
|
var _a;
|
|
87
99
|
(_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this);
|
|
88
100
|
}
|
|
101
|
+
/** @inheritDoc */
|
|
89
102
|
log(level, message, debugType = services_1.LogDebugType.None) {
|
|
90
103
|
services_1.ServerLogService.writeLog(level, `${this.name}: ${message}`, {
|
|
91
104
|
debugType: debugType,
|
|
@@ -94,19 +107,23 @@ class DachsTemperatureSensor {
|
|
|
94
107
|
deviceName: this.name,
|
|
95
108
|
});
|
|
96
109
|
}
|
|
110
|
+
/** @inheritDoc */
|
|
97
111
|
toJSON() {
|
|
98
112
|
return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient']));
|
|
99
113
|
}
|
|
114
|
+
/** @inheritDoc */
|
|
100
115
|
persistDeviceInfo() {
|
|
101
116
|
services_1.Utils.guardedTimeout(() => {
|
|
102
117
|
var _a;
|
|
103
118
|
(_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addDevice(this);
|
|
104
119
|
}, 5000, this);
|
|
105
120
|
}
|
|
121
|
+
/** @inheritDoc */
|
|
106
122
|
loadDeviceSettings() {
|
|
107
123
|
var _a;
|
|
108
124
|
(_a = this.settings) === null || _a === void 0 ? void 0 : _a.initializeFromDb(this);
|
|
109
125
|
}
|
|
126
|
+
/** @inheritDoc */
|
|
110
127
|
dispose() {
|
|
111
128
|
if (this.persistTemperatureSensorInterval) {
|
|
112
129
|
clearInterval(this.persistTemperatureSensorInterval);
|
|
@@ -1,12 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Options to connect to a Dachs CHP device
|
|
3
|
+
*/
|
|
1
4
|
export interface DachsClientOptions {
|
|
5
|
+
/**
|
|
6
|
+
* The hostname or IP address of the Dachs device
|
|
7
|
+
*/
|
|
2
8
|
host: string;
|
|
9
|
+
/**
|
|
10
|
+
* The protocol to use
|
|
11
|
+
*/
|
|
3
12
|
protocol?: 'http' | 'https';
|
|
13
|
+
/**
|
|
14
|
+
* The port to use
|
|
15
|
+
*/
|
|
4
16
|
port?: number;
|
|
17
|
+
/**
|
|
18
|
+
* The username to use for authentication
|
|
19
|
+
*/
|
|
5
20
|
username?: string;
|
|
21
|
+
/**
|
|
22
|
+
* The password to use for authentication
|
|
23
|
+
*/
|
|
6
24
|
password?: string;
|
|
25
|
+
/**
|
|
26
|
+
* Settings to define the result of requests
|
|
27
|
+
*/
|
|
7
28
|
resultConfig?: {
|
|
29
|
+
/**
|
|
30
|
+
* Whether to add the raw value to the result
|
|
31
|
+
*/
|
|
8
32
|
addRawValue?: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* Whether to add the key object to the result
|
|
35
|
+
*/
|
|
9
36
|
addKeyObject?: boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Whether to flatten the result
|
|
39
|
+
*/
|
|
10
40
|
flatten?: boolean;
|
|
11
41
|
};
|
|
12
42
|
}
|
|
@@ -1,6 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Represents a data point that can be written to the persistence layer
|
|
3
|
+
*/
|
|
1
4
|
export interface DachsInfluxDataPoint {
|
|
5
|
+
/**
|
|
6
|
+
* The timestamp of the data point
|
|
7
|
+
*/
|
|
2
8
|
timestamp: Date;
|
|
9
|
+
/**
|
|
10
|
+
* The measurement of the data point
|
|
11
|
+
*/
|
|
3
12
|
measurement: string;
|
|
13
|
+
/**
|
|
14
|
+
* The fields of the data point
|
|
15
|
+
*/
|
|
4
16
|
fields: {
|
|
5
17
|
[key: string]: string | number | boolean;
|
|
6
18
|
};
|
|
@@ -1,9 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The options needed for connecting to an InfluxDB database
|
|
3
|
+
*/
|
|
1
4
|
export interface InfluxDbConnectionOptions {
|
|
5
|
+
/**
|
|
6
|
+
* The host address of the InfluxDB server (or its ip address)
|
|
7
|
+
*/
|
|
2
8
|
host: string;
|
|
9
|
+
/**
|
|
10
|
+
* The port of the InfluxDB server
|
|
11
|
+
*/
|
|
3
12
|
port: number;
|
|
13
|
+
/**
|
|
14
|
+
* The name of the database to connect to
|
|
15
|
+
*/
|
|
4
16
|
database: string;
|
|
17
|
+
/**
|
|
18
|
+
* The username to use for authentication
|
|
19
|
+
*/
|
|
5
20
|
username: string;
|
|
21
|
+
/**
|
|
22
|
+
* The password to use for authentication
|
|
23
|
+
*/
|
|
6
24
|
password: string;
|
|
25
|
+
/**
|
|
26
|
+
* The retention policy to use for writing data (if not specified, the default retention policy is used)
|
|
27
|
+
*/
|
|
7
28
|
retentionPolicy?: string;
|
|
8
|
-
batchIntervalSeconds?: number;
|
|
9
29
|
}
|
|
@@ -9,7 +9,7 @@ import { DachsClientOptions, iFlattenedCompleteResponse, KeyListEntityResponse }
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class DachsHttpClient {
|
|
11
11
|
private options;
|
|
12
|
-
private url;
|
|
12
|
+
private readonly url;
|
|
13
13
|
private axiosInstance;
|
|
14
14
|
constructor(options: DachsClientOptions);
|
|
15
15
|
/**
|
|
@@ -89,7 +89,7 @@ class DachsHttpClient {
|
|
|
89
89
|
fetchByKeys(...keys) {
|
|
90
90
|
return new Promise((resolve, reject) => {
|
|
91
91
|
this.axiosInstance
|
|
92
|
-
.get(
|
|
92
|
+
.get("/getKey" + this.urlBuilder(keys))
|
|
93
93
|
.then((res) => {
|
|
94
94
|
if (!res.data)
|
|
95
95
|
reject('No data received');
|
|
@@ -117,7 +117,7 @@ class DachsHttpClient {
|
|
|
117
117
|
setKeys(data) {
|
|
118
118
|
return new Promise((resolve, reject) => {
|
|
119
119
|
this.axiosInstance
|
|
120
|
-
.post(
|
|
120
|
+
.post("/setKeys", Object.entries(data)
|
|
121
121
|
.map(([key, value]) => `${key}=${value}`)
|
|
122
122
|
.join('&'))
|
|
123
123
|
.then((res) => {
|
|
@@ -10,6 +10,9 @@ export declare class DeviceCluster {
|
|
|
10
10
|
addByDeviceType(device: iBaseDevice): void;
|
|
11
11
|
addToList(type: DeviceClusterType, device: iBaseDevice): void;
|
|
12
12
|
toJSON(): Partial<DeviceCluster & {
|
|
13
|
+
/**
|
|
14
|
+
* Dictionary representation of the normal device map
|
|
15
|
+
*/
|
|
13
16
|
deviceDict?: {
|
|
14
17
|
[p: string]: DeviceList;
|
|
15
18
|
};
|
|
@@ -11,7 +11,7 @@ class DeviceCluster {
|
|
|
11
11
|
}
|
|
12
12
|
getIoBrokerDevicesByType(type) {
|
|
13
13
|
if (type === device_cluster_type_1.DeviceClusterType.Speaker) {
|
|
14
|
-
throw new Error(
|
|
14
|
+
throw new Error('This is no IoBroker Device');
|
|
15
15
|
}
|
|
16
16
|
return this.getDevicesByType(type);
|
|
17
17
|
}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { IDeviceUpdater } from './iDeviceUpdater';
|
|
2
|
-
import { Devices } from './devices';
|
|
3
2
|
export declare class DeviceUpdater implements IDeviceUpdater {
|
|
4
|
-
devices: Devices;
|
|
5
|
-
constructor(pDevices: Devices);
|
|
6
3
|
updateObject(pId: string, pObj: ioBroker.Object): void;
|
|
7
4
|
updateState(id: string, state: ioBroker.State, initial?: boolean): void;
|
|
8
5
|
}
|
|
@@ -7,9 +7,6 @@ const devices_1 = require("./devices");
|
|
|
7
7
|
const mqtt_1 = require("./mqtt");
|
|
8
8
|
const IoBrokerDeviceInfo_1 = require("./IoBrokerDeviceInfo");
|
|
9
9
|
class DeviceUpdater {
|
|
10
|
-
constructor(pDevices) {
|
|
11
|
-
this.devices = pDevices;
|
|
12
|
-
}
|
|
13
10
|
updateObject(pId, pObj) {
|
|
14
11
|
const idSplit = IoBrokerDeviceInfo_1.IoBrokerDeviceInfo.idSplitter(pId);
|
|
15
12
|
if (idSplit.length < 2)
|
|
@@ -40,7 +37,7 @@ class DeviceUpdater {
|
|
|
40
37
|
classifier = devices_1.Devices.IDENTIFIER_ZIGBEE;
|
|
41
38
|
devId = idSplit[2].substring(2);
|
|
42
39
|
}
|
|
43
|
-
const device =
|
|
40
|
+
const device = services_1.API.getDevice(`${classifier}-${devId}`, false);
|
|
44
41
|
if (typeof device === 'undefined' || device.update === undefined) {
|
|
45
42
|
return;
|
|
46
43
|
}
|
|
@@ -3,18 +3,54 @@ import { iBaseDevice, iEnergyManager, iTemperatureSensor } from './baseDeviceInt
|
|
|
3
3
|
import { Dachs } from './dachs';
|
|
4
4
|
import { iConfig } from '../config';
|
|
5
5
|
export declare class Devices {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
static
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
6
|
+
/**
|
|
7
|
+
* A constant for the identifier of HM-IP Adapter devices
|
|
8
|
+
*/
|
|
9
|
+
static readonly IDENTIFIER_HOMEMATIC: string;
|
|
10
|
+
/**
|
|
11
|
+
* A constant for the identifier of JavaScript Adapter devices
|
|
12
|
+
*/
|
|
13
|
+
static readonly IDENTIFIER_JS: string;
|
|
14
|
+
/**
|
|
15
|
+
* A constant for the identifier of Shelly Adapter devices
|
|
16
|
+
*/
|
|
17
|
+
static readonly IDENTIFIER_Shelly: string;
|
|
18
|
+
/**
|
|
19
|
+
* A constant for the identifier of Tuya Adapter devices
|
|
20
|
+
*/
|
|
21
|
+
static readonly IDENTIFIER_TUYA: string;
|
|
22
|
+
/**
|
|
23
|
+
* A constant for the identifier of Zigbee Adapter devices
|
|
24
|
+
*/
|
|
25
|
+
static readonly IDENTIFIER_ZIGBEE: string;
|
|
26
|
+
/**
|
|
27
|
+
* A constant for the identifier of Zigbee2Mqtt Adapter devices
|
|
28
|
+
*/
|
|
29
|
+
static readonly IDENTIFIER_ZIGBEE2MQTT: string;
|
|
30
|
+
/**
|
|
31
|
+
* A constant for the identifier of WLED Adapter devices
|
|
32
|
+
*/
|
|
33
|
+
static readonly IDENTIFIER_WLED: string;
|
|
34
|
+
/**
|
|
35
|
+
* A Map containing all devices
|
|
36
|
+
*/
|
|
13
37
|
static alLDevices: {
|
|
14
38
|
[id: string]: iBaseDevice;
|
|
15
39
|
};
|
|
40
|
+
/**
|
|
41
|
+
* A reference to globally active energy manager
|
|
42
|
+
* @default undefined (no Energy-Manager)
|
|
43
|
+
*/
|
|
16
44
|
static energymanager?: iEnergyManager;
|
|
45
|
+
/**
|
|
46
|
+
* A reference to the Dachs device
|
|
47
|
+
* @default undefined (no Dachs CHP)
|
|
48
|
+
*/
|
|
17
49
|
static dachs?: Dachs;
|
|
50
|
+
/**
|
|
51
|
+
* A reference to the temperature sensor measuring the warm water temperature
|
|
52
|
+
* @default undefined (no warm water temperature sensor)
|
|
53
|
+
*/
|
|
18
54
|
static temperatureWarmWater?: iTemperatureSensor;
|
|
19
55
|
constructor(pDeviceData: {
|
|
20
56
|
[id: string]: deviceConfig;
|
|
@@ -17,7 +17,7 @@ class Devices {
|
|
|
17
17
|
var _a;
|
|
18
18
|
// This forces import of rooms at correct timing, to allow devices to land in proper rooms.
|
|
19
19
|
pRoomImportEnforcer === null || pRoomImportEnforcer === void 0 ? void 0 : pRoomImportEnforcer.addRoomConstructor();
|
|
20
|
-
services_1.ServerLogService.writeLog(models_1.LogLevel.Info,
|
|
20
|
+
services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Constructing devices now');
|
|
21
21
|
for (const cID in pDeviceData) {
|
|
22
22
|
const cDevConf = pDeviceData[cID];
|
|
23
23
|
if (!cDevConf.common ||
|
|
@@ -46,7 +46,7 @@ class Devices {
|
|
|
46
46
|
else if (cName.indexOf('00-EnergyManager') === 0 &&
|
|
47
47
|
cDevConf.type !== 'folder' &&
|
|
48
48
|
!((_a = config === null || config === void 0 ? void 0 : config.energyManager) === null || _a === void 0 ? void 0 : _a.disableJsEnergyManager)) {
|
|
49
|
-
services_1.ServerLogService.writeLog(models_1.LogLevel.Info,
|
|
49
|
+
services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Found Energy-Manager in Device json.');
|
|
50
50
|
Devices.createEnergyManager(cDevConf);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -59,20 +59,20 @@ class Devices {
|
|
|
59
59
|
// Nothing yet
|
|
60
60
|
}
|
|
61
61
|
static resetDetectionsToday() {
|
|
62
|
-
services_1.ServerLogService.writeLog(models_1.LogLevel.Info,
|
|
62
|
+
services_1.ServerLogService.writeLog(models_1.LogLevel.Info, "3 o'clock reset of motion sensors");
|
|
63
63
|
for (const dID in Devices.alLDevices) {
|
|
64
64
|
const d = Devices.alLDevices[dID];
|
|
65
65
|
if (d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.motionSensor)) {
|
|
66
|
-
d.log(models_1.LogLevel.Debug,
|
|
66
|
+
d.log(models_1.LogLevel.Debug, "3 o'clock reset of detections");
|
|
67
67
|
d.detectionsToday = 0;
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
static getBatteryInfo() {
|
|
72
|
-
services_1.ServerLogService.writeLog(models_1.LogLevel.Info,
|
|
72
|
+
services_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Getting Battery Info');
|
|
73
73
|
let data = [];
|
|
74
74
|
const result = [
|
|
75
|
-
|
|
75
|
+
'These are the battery values for each device. Device dependandt some are in volts, some in %',
|
|
76
76
|
];
|
|
77
77
|
for (const key in this.alLDevices) {
|
|
78
78
|
const d = this.alLDevices[key];
|
|
@@ -296,14 +296,50 @@ class Devices {
|
|
|
296
296
|
}
|
|
297
297
|
}
|
|
298
298
|
exports.Devices = Devices;
|
|
299
|
+
/**
|
|
300
|
+
* A constant for the identifier of HM-IP Adapter devices
|
|
301
|
+
*/
|
|
299
302
|
Devices.IDENTIFIER_HOMEMATIC = 'hm-rpc';
|
|
303
|
+
/**
|
|
304
|
+
* A constant for the identifier of JavaScript Adapter devices
|
|
305
|
+
*/
|
|
300
306
|
Devices.IDENTIFIER_JS = 'javascript';
|
|
307
|
+
/**
|
|
308
|
+
* A constant for the identifier of Shelly Adapter devices
|
|
309
|
+
*/
|
|
301
310
|
Devices.IDENTIFIER_Shelly = 'shelly';
|
|
311
|
+
/**
|
|
312
|
+
* A constant for the identifier of Tuya Adapter devices
|
|
313
|
+
*/
|
|
302
314
|
Devices.IDENTIFIER_TUYA = 'tuya';
|
|
315
|
+
/**
|
|
316
|
+
* A constant for the identifier of Zigbee Adapter devices
|
|
317
|
+
*/
|
|
303
318
|
Devices.IDENTIFIER_ZIGBEE = 'zigbee';
|
|
319
|
+
/**
|
|
320
|
+
* A constant for the identifier of Zigbee2Mqtt Adapter devices
|
|
321
|
+
*/
|
|
304
322
|
Devices.IDENTIFIER_ZIGBEE2MQTT = 'zigbee2mqtt';
|
|
323
|
+
/**
|
|
324
|
+
* A constant for the identifier of WLED Adapter devices
|
|
325
|
+
*/
|
|
305
326
|
Devices.IDENTIFIER_WLED = 'wled';
|
|
327
|
+
/**
|
|
328
|
+
* A Map containing all devices
|
|
329
|
+
*/
|
|
306
330
|
Devices.alLDevices = {};
|
|
331
|
+
/**
|
|
332
|
+
* A reference to globally active energy manager
|
|
333
|
+
* @default undefined (no Energy-Manager)
|
|
334
|
+
*/
|
|
307
335
|
Devices.energymanager = undefined;
|
|
336
|
+
/**
|
|
337
|
+
* A reference to the Dachs device
|
|
338
|
+
* @default undefined (no Dachs CHP)
|
|
339
|
+
*/
|
|
308
340
|
Devices.dachs = undefined;
|
|
341
|
+
/**
|
|
342
|
+
* A reference to the temperature sensor measuring the warm water temperature
|
|
343
|
+
* @default undefined (no warm water temperature sensor)
|
|
344
|
+
*/
|
|
309
345
|
Devices.temperatureWarmWater = undefined;
|
|
@@ -9,12 +9,25 @@ import { TrackedDistanceData } from './trackedDistanceData';
|
|
|
9
9
|
import { iBluetoothDetector } from '../baseDeviceInterfaces/iBluetoothDetector';
|
|
10
10
|
export declare class DetectedBluetoothDevice implements iBaseDevice {
|
|
11
11
|
id: string;
|
|
12
|
+
/** @inheritDoc */
|
|
12
13
|
settings: undefined;
|
|
14
|
+
/**
|
|
15
|
+
* A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
|
|
16
|
+
*/
|
|
13
17
|
distanceMap: Map<string, TrackedDistanceData>;
|
|
18
|
+
/** @inheritDoc */
|
|
14
19
|
readonly deviceCapabilities: DeviceCapability[];
|
|
20
|
+
/** @inheritDoc */
|
|
15
21
|
deviceType: DeviceType;
|
|
22
|
+
/** @inheritDoc */
|
|
16
23
|
info: DeviceInfo;
|
|
24
|
+
/**
|
|
25
|
+
* The last room the device was guessed to be in {@link iRoomBase.roomName}
|
|
26
|
+
*/
|
|
17
27
|
lastRoom: string | undefined;
|
|
28
|
+
/**
|
|
29
|
+
* If the device is currently present
|
|
30
|
+
*/
|
|
18
31
|
present: boolean;
|
|
19
32
|
constructor(id: string, settings?: iBluetoothTrackingSettings);
|
|
20
33
|
get customName(): string;
|
|
@@ -13,12 +13,25 @@ const trilaterationPointDistance_1 = require("./trilaterationPointDistance");
|
|
|
13
13
|
class DetectedBluetoothDevice {
|
|
14
14
|
constructor(id, settings) {
|
|
15
15
|
this.id = id;
|
|
16
|
+
/** @inheritDoc */
|
|
16
17
|
this.settings = undefined;
|
|
18
|
+
/**
|
|
19
|
+
* A Map matching the distances to the trackers identified by {@link iBluetoothDetector.id}
|
|
20
|
+
*/
|
|
17
21
|
this.distanceMap = new Map();
|
|
22
|
+
/** @inheritDoc */
|
|
18
23
|
this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.trackableDevice];
|
|
24
|
+
/** @inheritDoc */
|
|
19
25
|
this.deviceType = deviceType_1.DeviceType.TrackableDevice;
|
|
26
|
+
/** @inheritDoc */
|
|
20
27
|
this.info = new DeviceInfo_1.DeviceInfo();
|
|
28
|
+
/**
|
|
29
|
+
* The last room the device was guessed to be in {@link iRoomBase.roomName}
|
|
30
|
+
*/
|
|
21
31
|
this.lastRoom = undefined;
|
|
32
|
+
/**
|
|
33
|
+
* If the device is currently present
|
|
34
|
+
*/
|
|
22
35
|
this.present = false;
|
|
23
36
|
if (settings === undefined) {
|
|
24
37
|
return;
|
|
@@ -77,7 +90,7 @@ class DetectedBluetoothDevice {
|
|
|
77
90
|
const dataPoints = this.getDistances(maxAge);
|
|
78
91
|
const result = [`Distances for ${this.info.customName}`];
|
|
79
92
|
for (const data of dataPoints) {
|
|
80
|
-
result.push(`${data.trackerName}: ${services_1.Utils.round((_a = data.distance) !== null && _a !== void 0 ? _a : -99, 2)}m updated ${new Date(data.lastUpdate).toLocaleTimeString()}`);
|
|
93
|
+
result.push(`${data.trackerName}: ${services_1.Utils.round((_a = data.distance) !== null && _a !== void 0 ? _a : -99, 2)}m updated ${new Date(data.lastUpdate).toLocaleTimeString('de-DE')}`);
|
|
81
94
|
services_1.Utils.nowTime();
|
|
82
95
|
}
|
|
83
96
|
return result.join('\n');
|
|
@@ -8,27 +8,57 @@ import { LogDebugType } from '../../services';
|
|
|
8
8
|
import { ProximityCallback } from './proximityCallback';
|
|
9
9
|
import { TrilaterationBasePoint } from './trilaterationBasePoint';
|
|
10
10
|
export declare class EspresenseDevice implements iRoomDevice, iBluetoothDetector {
|
|
11
|
+
/** @inheritDoc */
|
|
11
12
|
readonly position: TrilaterationBasePoint;
|
|
13
|
+
/** @inheritDoc */
|
|
12
14
|
settings: undefined;
|
|
15
|
+
/** @inheritDoc */
|
|
13
16
|
readonly deviceCapabilities: DeviceCapability[];
|
|
17
|
+
/** @inheritDoc */
|
|
14
18
|
deviceType: DeviceType;
|
|
19
|
+
/**
|
|
20
|
+
* The name of this device
|
|
21
|
+
*/
|
|
15
22
|
readonly name: string;
|
|
16
23
|
private deviceMap;
|
|
17
24
|
private proximityCallbackMap;
|
|
25
|
+
/**
|
|
26
|
+
* Creates a new instance of the EspresenseDevice class
|
|
27
|
+
* @param name - The desired name of the device
|
|
28
|
+
* @param roomName - The name of the room this device is in {@link iRoomBase.roomName}
|
|
29
|
+
* @param x - The x coordinate of the device in the house
|
|
30
|
+
* @param y - The y coordinate of the device in the house
|
|
31
|
+
* @param z - The z coordinate of the device in the house
|
|
32
|
+
*/
|
|
18
33
|
constructor(name: string, roomName: string, x: number, y: number, z: number);
|
|
34
|
+
/** @inheritDoc */
|
|
19
35
|
get customName(): string;
|
|
20
36
|
protected _info: DeviceInfo;
|
|
37
|
+
/** @inheritDoc */
|
|
21
38
|
get info(): DeviceInfo;
|
|
22
|
-
|
|
39
|
+
/** @inheritDoc */
|
|
23
40
|
get id(): string;
|
|
41
|
+
/** @inheritDoc */
|
|
24
42
|
get room(): RoomBase | undefined;
|
|
43
|
+
/** @inheritDoc */
|
|
25
44
|
distanceOfDevice(deviceName: string, maxAge?: number): number | undefined;
|
|
45
|
+
/** @inheritDoc */
|
|
26
46
|
isDevicePresent(deviceName: string, maxDistance: number, maxAge?: number): boolean;
|
|
47
|
+
/**
|
|
48
|
+
* Updates the device with the given state
|
|
49
|
+
* @param devName - The name of the bluetooth device
|
|
50
|
+
* @param state - The state containing the json-formatted distance data
|
|
51
|
+
*/
|
|
27
52
|
update(devName: string, state: ioBroker.State): void;
|
|
53
|
+
/** @inheritDoc */
|
|
28
54
|
log(level: LogLevel, message: string, debugType?: LogDebugType): void;
|
|
55
|
+
/** @inheritDoc */
|
|
29
56
|
toJSON(): Partial<iRoomDevice>;
|
|
57
|
+
/** @inheritDoc */
|
|
30
58
|
persistDeviceInfo(): void;
|
|
59
|
+
/** @inheritDoc */
|
|
31
60
|
loadDeviceSettings(): void;
|
|
61
|
+
/** @inheritDoc */
|
|
32
62
|
addProximityCallback(cb: ProximityCallback): void;
|
|
33
63
|
private addDeviceTracking;
|
|
34
64
|
}
|