Compare commits
19
Commits
3d7f6cb3c6
...
servant
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6f785662b | ||
|
|
5d16bf4ade | ||
|
|
05bd609c7e | ||
|
|
9c47bbcb42 | ||
|
|
6063aafe8b | ||
|
|
fafc7111bb | ||
|
|
69cac934ec | ||
|
|
b2a74cbee4 | ||
|
|
769ab43fd2 | ||
|
|
15f3fe7c9e | ||
|
|
416a9484a5 | ||
|
|
e3bc25ce54 | ||
|
|
036473ab81 | ||
|
|
27f271691c | ||
|
|
73d546395b | ||
|
|
a969730de1 | ||
|
|
213f9d5d2a | ||
|
|
2cb8035ef4 | ||
|
|
1ec8c7211f |
No files matched your search
+8
-6
@@ -1,8 +1,9 @@
|
|||||||
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
||||||
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
||||||
, filepath, hedgehog, hspec, hspec-hedgehog, http-types, katip
|
, exceptions, filepath, hedgehog, hspec, hspec-hedgehog, http-types
|
||||||
, lens, lens-aeson, lib, network, process, retry, scotty, stm, text
|
, katip, lens, lens-aeson, lib, network, process, retry, scotty
|
||||||
, time, unordered-containers, uuid, wai, warp, websockets
|
, servant, servant-server, stm, text, time, unliftio
|
||||||
|
, unordered-containers, uuid, wai, warp, websockets
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "home-assistant-controller";
|
pname = "home-assistant-controller";
|
||||||
@@ -12,9 +13,10 @@ mkDerivation {
|
|||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
libraryHaskellDepends = [
|
libraryHaskellDepends = [
|
||||||
aeson annotated-exception async base bytestring cereal
|
aeson annotated-exception async base bytestring cereal
|
||||||
cereal-conduit conduit containers directory ekg-core filepath
|
cereal-conduit conduit containers directory ekg-core exceptions
|
||||||
http-types katip lens lens-aeson network process retry scotty stm
|
filepath http-types katip lens lens-aeson network process retry
|
||||||
text time unordered-containers uuid wai warp websockets
|
scotty servant servant-server stm text time unliftio
|
||||||
|
unordered-containers uuid wai warp websockets
|
||||||
];
|
];
|
||||||
executableHaskellDepends = [ base ];
|
executableHaskellDepends = [ base ];
|
||||||
testHaskellDepends = [
|
testHaskellDepends = [
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ library
|
|||||||
exposed-modules: AFRP
|
exposed-modules: AFRP
|
||||||
, HomeAssistant.Controller
|
, HomeAssistant.Controller
|
||||||
, HomeAssistant.Controller.Bedroom
|
, HomeAssistant.Controller.Bedroom
|
||||||
|
, HomeAssistant.Controller.Hallway
|
||||||
, HomeAssistant.Controller.Kitchen
|
, HomeAssistant.Controller.Kitchen
|
||||||
, HomeAssistant.Controller.Children
|
, HomeAssistant.Controller.Children
|
||||||
, HomeAssistant.Controller.Livingroom
|
, HomeAssistant.Controller.Livingroom
|
||||||
@@ -73,6 +74,7 @@ library
|
|||||||
, HomeAssistant.Runtime.Metrics
|
, HomeAssistant.Runtime.Metrics
|
||||||
, HomeAssistant.Runtime.Supervisor
|
, HomeAssistant.Runtime.Supervisor
|
||||||
, HomeAssistant.Runtime.RateLimit
|
, HomeAssistant.Runtime.RateLimit
|
||||||
|
, HttpServer
|
||||||
|
|
||||||
-- Modules included in this library but not exported.
|
-- Modules included in this library but not exported.
|
||||||
-- other-modules:
|
-- other-modules:
|
||||||
@@ -83,6 +85,7 @@ library
|
|||||||
-- Other library packages from which modules are imported.
|
-- Other library packages from which modules are imported.
|
||||||
build-depends: base ^>=4.20.2.0
|
build-depends: base ^>=4.20.2.0
|
||||||
, websockets
|
, websockets
|
||||||
|
, http-media
|
||||||
, aeson
|
, aeson
|
||||||
, lens-aeson
|
, lens-aeson
|
||||||
, lens
|
, lens
|
||||||
@@ -107,7 +110,8 @@ library
|
|||||||
, filepath
|
, filepath
|
||||||
, conduit
|
, conduit
|
||||||
, cereal-conduit
|
, cereal-conduit
|
||||||
, scotty
|
, servant
|
||||||
|
, servant-server
|
||||||
, http-types
|
, http-types
|
||||||
, warp
|
, warp
|
||||||
, wai
|
, wai
|
||||||
@@ -181,6 +185,7 @@ test-suite home-assistant-controller-test
|
|||||||
bytestring,
|
bytestring,
|
||||||
hspec,
|
hspec,
|
||||||
stm,
|
stm,
|
||||||
|
servant,
|
||||||
aeson,
|
aeson,
|
||||||
cereal,
|
cereal,
|
||||||
text,
|
text,
|
||||||
|
|||||||
@@ -28,6 +28,12 @@ module HomeAssistant.Controller
|
|||||||
, Target(..)
|
, Target(..)
|
||||||
, brightness
|
, brightness
|
||||||
, Light(..)
|
, Light(..)
|
||||||
|
, ikeaQuickButton
|
||||||
|
, IkeaButton(..)
|
||||||
|
, IkeaGesture(..)
|
||||||
|
, activateScene
|
||||||
|
, ikeaBoxRemote
|
||||||
|
, IkeaController(..)
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request, hold, lMerge, waitFor, tag, edge)
|
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request, hold, lMerge, waitFor, tag, edge)
|
||||||
@@ -36,7 +42,7 @@ import Control.Category ((>>>))
|
|||||||
import Data.Aeson (Value, object, (.=))
|
import Data.Aeson (Value, object, (.=))
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
import Control.Lens (has, only, (^?), to)
|
import Control.Lens (has, only, (^?), to, traversed)
|
||||||
import Data.Aeson.Lens (key, _String, _Integral)
|
import Data.Aeson.Lens (key, _String, _Integral)
|
||||||
import qualified Data.Text.Lens as TL
|
import qualified Data.Text.Lens as TL
|
||||||
import Data.Bool (bool)
|
import Data.Bool (bool)
|
||||||
@@ -191,3 +197,71 @@ brightness entityId =
|
|||||||
>>> AFRP.toEvent
|
>>> AFRP.toEvent
|
||||||
where
|
where
|
||||||
eventBrightness v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "brightness" . _Integral
|
eventBrightness v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "brightness" . _Integral
|
||||||
|
|
||||||
|
data IkeaGesture
|
||||||
|
= ShortClick
|
||||||
|
| ShortRelease
|
||||||
|
| DoubleClick
|
||||||
|
| LongClick
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
data IkeaButton a = OnButton !a | OffButton !a
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
|
||||||
|
toIkeaQuickButton :: T.Text -> Maybe (IkeaButton IkeaGesture)
|
||||||
|
toIkeaQuickButton = \case
|
||||||
|
-- 1 is on, 2 is off side of the button
|
||||||
|
"1_initial_press" -> Just $ OnButton ShortClick
|
||||||
|
"1_short_release" -> Just $ OnButton ShortRelease
|
||||||
|
"1_double_press" -> Just $ OnButton DoubleClick
|
||||||
|
"1_long_press" -> Just $ OnButton LongClick
|
||||||
|
"2_initial_press" -> Just $ OffButton ShortClick
|
||||||
|
"2_short_release" -> Just $ OffButton ShortRelease
|
||||||
|
"2_double_press" -> Just $ OffButton DoubleClick
|
||||||
|
"2_long_press" -> Just $ OffButton LongClick
|
||||||
|
_ -> Nothing
|
||||||
|
|
||||||
|
ikeaQuickButton :: T.Text -> HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
||||||
|
ikeaQuickButton entityId =
|
||||||
|
entityChangeEvent' entityId
|
||||||
|
>>| arr (maybe (Left ()) Right . eventType)
|
||||||
|
>>> toEvent
|
||||||
|
where
|
||||||
|
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaQuickButton . traversed
|
||||||
|
|
||||||
|
data IkeaController
|
||||||
|
= ControllerOn -- Short press on
|
||||||
|
| ControllerOff -- Short press off
|
||||||
|
| ControllerBrighnessUp -- Turn brightness up
|
||||||
|
| ControllerBrighnessDown -- Turn brighness down
|
||||||
|
| ControllerArrowRight -- Turn brighness down
|
||||||
|
| ControllerArrowLeft -- Turn brighness down
|
||||||
|
| ControllerBrighnessStop
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
toIkeaController :: T.Text -> Maybe IkeaController
|
||||||
|
toIkeaController = \case
|
||||||
|
"on" -> Just ControllerOn
|
||||||
|
"off" -> Just ControllerOff
|
||||||
|
"brightness_move_up" -> Just ControllerBrighnessUp
|
||||||
|
"brightness_move_down" -> Just ControllerBrighnessDown
|
||||||
|
"brightness_stop" -> Just ControllerBrighnessStop
|
||||||
|
"arrow_right_click" -> Just ControllerArrowRight
|
||||||
|
"arrow_left_click" -> Just ControllerArrowLeft
|
||||||
|
_ -> Nothing
|
||||||
|
|
||||||
|
ikeaBoxRemote :: T.Text -> HASS (Event Value) (Event IkeaController)
|
||||||
|
ikeaBoxRemote entityId = entityChangeEvent' entityId
|
||||||
|
>>| arr (maybe (Left ()) Right . eventType)
|
||||||
|
>>> toEvent
|
||||||
|
where
|
||||||
|
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaController . traversed
|
||||||
|
|
||||||
|
activateScene :: T.Text -> Service
|
||||||
|
activateScene sceneId = Service
|
||||||
|
{ serviceDomain="scene"
|
||||||
|
, serviceName= "turn_on"
|
||||||
|
, serviceTarget= [EntityId sceneId]
|
||||||
|
, serviceData = Nothing
|
||||||
|
}
|
||||||
@@ -4,11 +4,9 @@ module HomeAssistant.Controller.Bedroom where
|
|||||||
|
|
||||||
import HomeAssistant.Controller
|
import HomeAssistant.Controller
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import AFRP (Event (..), (>>|), toEvent, lMerge, duration, edge)
|
import AFRP (Event (..), lMerge, duration, edge)
|
||||||
import Data.Aeson (Value, object, (.=))
|
import Data.Aeson (Value, object, (.=))
|
||||||
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
||||||
import Control.Lens ((^?), to, traversed)
|
|
||||||
import Data.Aeson.Lens (key, _String)
|
|
||||||
import Data.Bool (bool)
|
import Data.Bool (bool)
|
||||||
import Data.Time (NominalDiffTime)
|
import Data.Time (NominalDiffTime)
|
||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
@@ -29,84 +27,108 @@ createBedroomScene = Service
|
|||||||
, serviceTarget= []
|
, serviceTarget= []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data PresenceLights
|
||||||
activateScene :: T.Text -> Service
|
= LightsOn -- Restore lights
|
||||||
activateScene sceneId = Service
|
| LightsOff -- Timer expired, darkness
|
||||||
{ serviceDomain="scene"
|
| LightsSleep -- No presence detected, sleep mode
|
||||||
, serviceName= "turn_on"
|
deriving Show
|
||||||
, serviceTarget= [EntityId sceneId]
|
|
||||||
, serviceData = Nothing
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Bedroom presence
|
-- Bedroom presence
|
||||||
bedroomPresence :: HASS (Event Value) (Event Presence)
|
bedroomPresence :: HASS (Event Value) (Event Presence)
|
||||||
bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy"
|
bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy"
|
||||||
|
|
||||||
|
presenceLightEvents :: HASS (Event Value) (Event PresenceLights)
|
||||||
|
presenceLightEvents =
|
||||||
|
bedroomPresence >>> AFRP.hold Unoccupied
|
||||||
|
>>> arr lightWanted
|
||||||
|
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||||
|
>>> arr (\(s,(o,n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||||
|
where
|
||||||
|
lightWanted o = o == Occupied
|
||||||
|
sleepEvent = arr not >>> AFRP.edge >>> arr (AFRP.tag LightsSleep)
|
||||||
|
onEvent = AFRP.edge >>> arr (AFRP.tag LightsOn)
|
||||||
|
offEvent = arr not >>> AFRP.waitFor 300 >>> arr (AFRP.tag LightsOff)
|
||||||
|
|
||||||
bedroomPresenceController :: HASS (Event Value) ()
|
bedroomPresenceController :: HASS (Event Value) ()
|
||||||
bedroomPresenceController = proc x -> do
|
bedroomPresenceController = proc x -> do
|
||||||
p <- bedroomPresence >>> traceEvent -< x
|
p <- presenceLightEvents >>> traceEvent -< x
|
||||||
case p of
|
case p of
|
||||||
Event Unoccupied -> callService createBedroomScene >>> callService (light bedroomLights Off) -< ()
|
Event LightsOff -> do
|
||||||
Event Occupied -> callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
callService (light bedroomLights Off) -< ()
|
||||||
|
Event LightsOn -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
||||||
|
Event LightsSleep -> do
|
||||||
|
callService createBedroomScene -< ()
|
||||||
|
adaptiveMode -< True
|
||||||
|
sleepMode -< True
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
|
||||||
data IkeaGesture
|
|
||||||
= ShortClick
|
|
||||||
| ShortRelease
|
|
||||||
| DoubleClick
|
|
||||||
| LongClick
|
|
||||||
deriving Show
|
|
||||||
data IkeaButton a = OnButton !a | OffButton !a
|
|
||||||
deriving Show
|
|
||||||
|
|
||||||
|
|
||||||
toIkeaQuickButton :: T.Text -> Maybe (IkeaButton IkeaGesture)
|
|
||||||
toIkeaQuickButton = \case
|
|
||||||
-- 1 is on, 2 is off side of the button
|
|
||||||
"1_initial_press" -> Just $ OnButton ShortClick
|
|
||||||
"1_short_release" -> Just $ OnButton ShortRelease
|
|
||||||
"1_double_press" -> Just $ OnButton DoubleClick
|
|
||||||
"1_long_press" -> Just $ OnButton LongClick
|
|
||||||
"2_initial_press" -> Just $ OffButton ShortClick
|
|
||||||
"2_short_release" -> Just $ OffButton ShortRelease
|
|
||||||
"2_double_press" -> Just $ OffButton DoubleClick
|
|
||||||
"2_long_press" -> Just $ OffButton LongClick
|
|
||||||
_ -> Nothing
|
|
||||||
|
|
||||||
ikeaQuickButton :: T.Text -> HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
|
||||||
ikeaQuickButton entityId =
|
|
||||||
entityChangeEvent' entityId
|
|
||||||
>>| arr (maybe (Left ()) Right . eventType)
|
|
||||||
>>> toEvent
|
|
||||||
where
|
where
|
||||||
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaQuickButton . traversed
|
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
||||||
|
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
||||||
|
|
||||||
|
|
||||||
data BedroomControls
|
data BedroomControls
|
||||||
= Masse (IkeaButton IkeaGesture)
|
= Masse (IkeaButton IkeaGesture)
|
||||||
| Enishen (IkeaButton IkeaGesture)
|
| Enishen (IkeaButton IkeaGesture)
|
||||||
|
| Central IkeaController
|
||||||
deriving Show
|
deriving Show
|
||||||
|
|
||||||
|
|
||||||
bedroomButton :: HASS (Event Value) (Event BedroomControls)
|
bedroomButton :: HASS (Event Value) (Event BedroomControls)
|
||||||
bedroomButton = (masseButton &&& enishenButton) >>> arr (uncurry lMerge)
|
bedroomButton = (masseButton &&& enishenButton &&& centralButton)
|
||||||
|
>>> arr (\(a,(b,c)) -> a `lMerge` b `lMerge` c)
|
||||||
where
|
where
|
||||||
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
||||||
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
||||||
|
centralButton = fmap Central <$> ikeaBoxRemote "event.bedroom_remote_action"
|
||||||
|
|
||||||
bedroomButtonController :: HASS (Event Value) ()
|
bedroomButtonController :: HASS (Event Value) ()
|
||||||
bedroomButtonController = proc x -> do
|
bedroomButtonController = proc x -> do
|
||||||
ev <- bedroomButton >>> traceEvent -< x
|
ev <- bedroomButton >>> traceEvent -< x
|
||||||
|
-- Any event will cause the sleep mode to be turned off
|
||||||
case ev of
|
case ev of
|
||||||
Event (Masse (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_masse") -< ()
|
Event (Masse (OnButton ShortRelease)) -> do
|
||||||
Event (Masse (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
sleepMode -< False
|
||||||
Event (Masse (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
adaptiveMode -< False
|
||||||
Event (Masse (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||||
Event (Enishen (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_jemina") -< ()
|
Event (Masse (OnButton DoubleClick)) -> do
|
||||||
Event (Enishen (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
sleepMode -< False
|
||||||
Event (Enishen (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
adaptiveMode -< False
|
||||||
Event (Enishen (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
|
Event (Masse (OnButton LongClick)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
|
Event (Masse (OffButton _)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
|
Event (Enishen (OnButton ShortRelease)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||||
|
Event (Enishen (OnButton DoubleClick)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
|
Event (Enishen (OnButton LongClick)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
|
Event (Enishen (OffButton _)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
|
Event (Central _) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
where
|
||||||
|
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
||||||
|
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
{-# LANGUAGE Arrows #-}
|
{-# LANGUAGE Arrows #-}
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
module HomeAssistant.Controller.Children where
|
module HomeAssistant.Controller.Children where
|
||||||
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..))
|
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..), ikeaQuickButton, IkeaGesture (..), IkeaButton (..), traceEvent, activateScene)
|
||||||
import AFRP (Event)
|
import AFRP (Event (..))
|
||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
import Control.Arrow (Arrow(..), (>>>))
|
import Control.Arrow (Arrow(..), (>>>), returnA)
|
||||||
import Data.Time (Day, TimeOfDay (..), localDay, LocalTime (..))
|
import Data.Time (Day, TimeOfDay (..), localDay, LocalTime (..))
|
||||||
import Data.Time.Calendar.OrdinalDate (WeekOfYear, mondayStartWeek)
|
import Data.Time.Calendar.OrdinalDate (WeekOfYear, mondayStartWeek)
|
||||||
import Data.Functor.Contravariant (Predicate (..), (>$<))
|
import Data.Functor.Contravariant (Predicate (..), (>$<))
|
||||||
|
import Data.Aeson (Value)
|
||||||
|
|
||||||
-- Let's see building some reasonable interface for utctime
|
-- Let's see building some reasonable interface for utctime
|
||||||
dow :: Day -> (WeekOfYear, Int)
|
dow :: Day -> (WeekOfYear, Int)
|
||||||
@@ -62,7 +63,6 @@ timersOn =
|
|||||||
, day 3 <> at (07,30)
|
, day 3 <> at (07,30)
|
||||||
, day 4 <> at (07,30)
|
, day 4 <> at (07,30)
|
||||||
, day 5 <> at (07,30)
|
, day 5 <> at (07,30)
|
||||||
, at (18,55) -- debug
|
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
dayOfWeek = snd . mondayStartWeek . localDay
|
dayOfWeek = snd . mondayStartWeek . localDay
|
||||||
@@ -80,3 +80,17 @@ lightsOn = foldMap atTime timersOn
|
|||||||
lightsOff :: HASS a ()
|
lightsOff :: HASS a ()
|
||||||
lightsOff = foldMap atTime timersOff
|
lightsOff = foldMap atTime timersOff
|
||||||
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] Off))
|
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] Off))
|
||||||
|
|
||||||
|
|
||||||
|
bedroomButton :: HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
||||||
|
bedroomButton = ikeaQuickButton "event.children_quick_remote_action"
|
||||||
|
|
||||||
|
childrenBedroomButtonController :: HASS (Event Value) ()
|
||||||
|
childrenBedroomButtonController = proc x -> do
|
||||||
|
ev <- bedroomButton >>> traceEvent -< x
|
||||||
|
case ev of
|
||||||
|
Event (OnButton ShortRelease) -> callService (activateScene "scene.lasten_nukkuvalmistelu") -< ()
|
||||||
|
Event (OnButton DoubleClick) -> callService (activateScene "scene.lasten_luku") -< ()
|
||||||
|
Event (OnButton LongClick) -> callService (activateScene "scene.lasten_kirkas") -< ()
|
||||||
|
Event (OffButton _) -> callService (light [AreaId "lasten_makuuhuone"] Off) -< ()
|
||||||
|
_ -> returnA -< ()
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE Arrows #-}
|
||||||
|
module HomeAssistant.Controller.Hallway where
|
||||||
|
|
||||||
|
import HomeAssistant.Controller (Presence (..), HASS, motion, motionToPresence, traceEvent, callServiceDyn, light, Target (..), Light (..))
|
||||||
|
import AFRP (Event (..))
|
||||||
|
import qualified AFRP
|
||||||
|
import Data.Aeson (Value)
|
||||||
|
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||||
|
import Data.Time (LocalTime(..), TimeOfDay (..))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
hallwayPresence :: HASS (Event Value) Presence
|
||||||
|
hallwayPresence = motion "binary_sensor.hallway_movement_occupancy" >>> motionToPresence 500
|
||||||
|
|
||||||
|
data Lights = LightsOn | LightsOff
|
||||||
|
deriving (Show)
|
||||||
|
|
||||||
|
eventLights :: HASS Presence (Event Lights)
|
||||||
|
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||||
|
where
|
||||||
|
presenceLights Occupied = LightsOn
|
||||||
|
presenceLights Unoccupied = LightsOff
|
||||||
|
|
||||||
|
hallwayLightsController :: HASS (Event Value) ()
|
||||||
|
hallwayLightsController = proc x -> do
|
||||||
|
now <- AFRP.currentTime -< ()
|
||||||
|
p <- hallwayPresence -< x
|
||||||
|
ev <- eventLights -< p
|
||||||
|
traceEvent -< ev
|
||||||
|
case ev of
|
||||||
|
-- The lights entity is a "group of lights" in hass
|
||||||
|
Event LightsOn | lightsAllowed now -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< On Nothing
|
||||||
|
Event LightsOff -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< Off
|
||||||
|
_ -> returnA -< ()
|
||||||
|
where
|
||||||
|
lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0)
|
||||||
@@ -6,14 +6,13 @@ import AFRP (Event (..))
|
|||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
import Data.Aeson (Value)
|
import Data.Aeson (Value)
|
||||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||||
import Data.Bool (bool)
|
|
||||||
import Prelude hiding (id)
|
import Prelude hiding (id)
|
||||||
import Data.Time (LocalTime(..), TimeOfDay (..))
|
import Data.Time (LocalTime(..), TimeOfDay (..))
|
||||||
|
|
||||||
|
|
||||||
-- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
|
-- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
|
||||||
|
|
||||||
data Lights = LightsOn | LightsOff
|
data Lights = LightsOn | LightsOff | LightsSleep
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
||||||
kitchenPresence :: HASS (Event Value) Presence
|
kitchenPresence :: HASS (Event Value) Presence
|
||||||
@@ -46,21 +45,43 @@ dinnerPresence :: HASS (Event Value) Presence
|
|||||||
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
||||||
|
|
||||||
dinnerLightEvents :: HASS (Event Value) (Event Lights)
|
dinnerLightEvents :: HASS (Event Value) (Event Lights)
|
||||||
dinnerLightEvents = ((,) <$> dinnerLightLevel <*> dinnerPresence)
|
dinnerLightEvents =
|
||||||
|
((,) <$> dinnerLightLevel <*> dinnerPresence)
|
||||||
>>> arr lightWanted
|
>>> arr lightWanted
|
||||||
>>> AFRP.changes
|
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||||
>>> arr (fmap (bool LightsOff LightsOn))
|
>>> arr (\(s, (o, n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||||
where
|
where
|
||||||
-- This means that both light level and occupancy can change the light state
|
|
||||||
lightWanted (lightLevel, occ) = occ == Occupied && lightLevel < 13
|
lightWanted (lightLevel, occ) = occ == Occupied && lightLevel < 13
|
||||||
|
|
||||||
|
onEvent =
|
||||||
|
AFRP.edge
|
||||||
|
>>> arr (fmap (const LightsOn))
|
||||||
|
|
||||||
|
sleepEvent =
|
||||||
|
arr not
|
||||||
|
>>> AFRP.edge
|
||||||
|
>>> arr (fmap (const LightsSleep))
|
||||||
|
|
||||||
|
offEvent =
|
||||||
|
arr not
|
||||||
|
>>> AFRP.waitFor 300
|
||||||
|
>>> arr (fmap (const LightsOff))
|
||||||
|
|
||||||
dinnerTableController :: HASS (Event Value) ()
|
dinnerTableController :: HASS (Event Value) ()
|
||||||
dinnerTableController = proc x -> do
|
dinnerTableController = proc x -> do
|
||||||
ev <- dinnerLightEvents -< x
|
ev <- dinnerLightEvents -< x
|
||||||
case ev of
|
case ev of
|
||||||
Event LightsOn -> callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< On Nothing
|
Event LightsOn -> do
|
||||||
Event LightsOff -> callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< Off
|
sleep -< False
|
||||||
|
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< On Nothing
|
||||||
|
Event LightsOff -> do
|
||||||
|
sleep -< False
|
||||||
|
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< Off
|
||||||
|
Event LightsSleep -> do
|
||||||
|
sleep -< True
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
where
|
||||||
|
sleep = callServiceDyn (switch [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"])
|
||||||
|
|
||||||
kitchenMotionController :: HASS (Event Value) ()
|
kitchenMotionController :: HASS (Event Value) ()
|
||||||
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
||||||
@@ -18,7 +18,7 @@ import Control.Concurrent.STM (atomically, dupTChan, readTChan)
|
|||||||
import Data.Aeson (Value)
|
import Data.Aeson (Value)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Data.Time (getCurrentTime, getCurrentTimeZone)
|
import Data.Time (getCurrentTime, getCurrentTimeZone)
|
||||||
import Data.Void (Void, absurd)
|
import Data.Void (Void)
|
||||||
import HomeAssistant.Controller (HASS, HASSEff (..))
|
import HomeAssistant.Controller (HASS, HASSEff (..))
|
||||||
import HomeAssistant.Runtime.Bus
|
import HomeAssistant.Runtime.Bus
|
||||||
import HomeAssistant.Runtime.Connection (writerAction, readerAction)
|
import HomeAssistant.Runtime.Connection (writerAction, readerAction)
|
||||||
@@ -29,8 +29,7 @@ import Data.UUID (UUID, toText)
|
|||||||
import qualified Data.UUID.V4 as UUID.V4
|
import qualified Data.UUID.V4 as UUID.V4
|
||||||
import Katip (runKatipT, logF, sl, Severity (..), ls, Namespace (Namespace), runKatipContextT)
|
import Katip (runKatipT, logF, sl, Severity (..), ls, Namespace (Namespace), runKatipContextT)
|
||||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
import HomeAssistant.Controller.Ruuvi (ruuviController)
|
import HomeAssistant.Controller.Children (schoolLightController, childrenBedroomButtonController)
|
||||||
import HomeAssistant.Controller.Children (schoolLightController)
|
|
||||||
import Data.Maybe (fromMaybe)
|
import Data.Maybe (fromMaybe)
|
||||||
import qualified System.Metrics
|
import qualified System.Metrics
|
||||||
import qualified HomeAssistant.Runtime.Metrics
|
import qualified HomeAssistant.Runtime.Metrics
|
||||||
@@ -41,7 +40,8 @@ import HomeAssistant.Controller.Livingroom (livingroomPresenceController)
|
|||||||
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
||||||
import UnliftIO.Async
|
import UnliftIO.Async
|
||||||
import HomeAssistant.Runtime.Supervisor (supervised)
|
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||||
import qualified HomeAssistant.Runtime.Graphing
|
import HomeAssistant.Controller.Hallway (hallwayLightsController)
|
||||||
|
import qualified HttpServer
|
||||||
|
|
||||||
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
||||||
step path trace st a = do
|
step path trace st a = do
|
||||||
@@ -50,25 +50,26 @@ step path trace st a = do
|
|||||||
let req = Request now tz trace
|
let req = Request now tz trace
|
||||||
stepAutoSerializing path st req a
|
stepAutoSerializing path st req a
|
||||||
|
|
||||||
data Controller = forall b. Controller T.Text (HASS (Event Value) b) Bool
|
data Controller = forall b. Controller Bool T.Text (HASS (Event Value) b)
|
||||||
|
|
||||||
controllers :: [Controller]
|
controllers :: [Controller]
|
||||||
controllers =
|
controllers =
|
||||||
[ Controller "bedroom-presence" bedroomPresenceController True
|
[ Controller True "bedroom-presence" bedroomPresenceController
|
||||||
, Controller "bedroom-button" bedroomButtonController True
|
, Controller True "bedroom-button" bedroomButtonController
|
||||||
, Controller "bedroom-drawer" bedroomDrawerController True
|
, Controller True "bedroom-drawer" bedroomDrawerController
|
||||||
, Controller "bedroom-humidifier" humidifierController True
|
, Controller True "bedroom-humidifier" humidifierController
|
||||||
, Controller "ruuvi-controller" ruuviController False
|
, Controller True "school-light-controller" schoolLightController
|
||||||
, Controller "school-light-controller" schoolLightController True
|
, Controller True "kitchen-motion-controller" kitchenMotionController
|
||||||
, Controller "kitchen-motion-controller" kitchenMotionController True
|
, Controller True "livingroom-presence" livingroomPresenceController
|
||||||
, Controller "livingroom-presence" livingroomPresenceController True
|
, Controller True "hallway-motion-controller" hallwayLightsController
|
||||||
|
, Controller True "children-button" childrenBedroomButtonController
|
||||||
]
|
]
|
||||||
|
|
||||||
-- | Steps the machine for every inbound message; service calls go to the
|
-- | Steps the machine for every inbound message; service calls go to the
|
||||||
-- bus. A restart re-dups the inbound channel and starts from the machine's
|
-- bus. A restart re-dups the inbound channel and starts from the machine's
|
||||||
-- initial state; messages broadcast during the restart window are lost.
|
-- initial state; messages broadcast during the restart window are lost.
|
||||||
runController :: MonadIO m => FilePath -> Bus -> Controller -> m Void
|
runController :: MonadIO m => FilePath -> Bus -> Controller -> m Void
|
||||||
runController rootDir bus (Controller name machine _enabled) = liftIO $ do
|
runController rootDir bus (Controller _enabled name machine ) = liftIO $ do
|
||||||
inbound <- atomically (dupTChan (busInbound bus))
|
inbound <- atomically (dupTChan (busInbound bus))
|
||||||
let ns = Namespace [name]
|
let ns = Namespace [name]
|
||||||
let workerDefinition = runMealy machine (runKatipContextT (busLogEnv bus) () ns . channelHassEval bus)
|
let workerDefinition = runMealy machine (runKatipContextT (busLogEnv bus) () ns . channelHassEval bus)
|
||||||
@@ -108,18 +109,16 @@ defaultMain = withSocketsDo $ do
|
|||||||
rrdtool <- fromMaybe "rrdtool" <$> lookupEnv "HA_RRDTOOL"
|
rrdtool <- fromMaybe "rrdtool" <$> lookupEnv "HA_RRDTOOL"
|
||||||
metricsPort <- lookupPort
|
metricsPort <- lookupPort
|
||||||
writerLimiter <- slidingWindowLimiter rateLimitMetrics 10 20
|
writerLimiter <- slidingWindowLimiter rateLimitMetrics 10 20
|
||||||
let active = [c | c@(Controller _ _ True) <- controllers]
|
let active = [c | c@(Controller True _ _) <- controllers]
|
||||||
ents = foldMap (\(Controller _ m _) -> entities m) active
|
ents = foldMap (\(Controller _ _ m) -> entities m) active
|
||||||
workers =
|
workers =
|
||||||
[ ("reader", readerAction host 8123 token ents bus)
|
[ ("reader", readerAction host 8123 token ents bus)
|
||||||
, ("writer", writerAction writerLimiter bus)
|
, ("writer", writerAction writerLimiter bus)
|
||||||
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
||||||
, ("metrics-http", HomeAssistant.Runtime.Graphing.graphAction rrdPath rrdtool metricsPort)
|
, ("metrics-http", HttpServer.runHttpServer (busLogEnv bus) rrdPath rrdtool metricsPort)
|
||||||
] ++ [ (name, runController rootPath bus c) | c@(Controller name _ True) <- controllers ]
|
] ++ [ (name, runController rootPath bus c) | c@(Controller True name _) <- active ]
|
||||||
as <- runKatipContextT (busLogEnv bus) () mempty $
|
runKatipContextT (busLogEnv bus) () mempty $
|
||||||
mapM (\(name, act) -> async (supervised name act)) workers
|
mapConcurrently_ (uncurry supervised) workers
|
||||||
(_, v) <- waitAny as
|
|
||||||
absurd v
|
|
||||||
|
|
||||||
dryRunHassEval :: Namespace -> Bus -> HASSEff a -> IO a
|
dryRunHassEval :: Namespace -> Bus -> HASSEff a -> IO a
|
||||||
dryRunHassEval ns bus = \case
|
dryRunHassEval ns bus = \case
|
||||||
|
|||||||
@@ -11,37 +11,19 @@ module HomeAssistant.Runtime.Graphing
|
|||||||
, parseNameParam
|
, parseNameParam
|
||||||
, buildGraphArgs
|
, buildGraphArgs
|
||||||
, readProcessBytes
|
, readProcessBytes
|
||||||
, graphAction
|
, Graph(..)
|
||||||
|
, renderGraph
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Exception (evaluate)
|
import Control.Exception (evaluate)
|
||||||
import Control.Monad (forever)
|
|
||||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
import qualified Data.ByteString as BS
|
import qualified Data.ByteString as BS
|
||||||
import qualified Data.ByteString.Lazy as BL
|
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Text.Lazy as TL
|
|
||||||
import Data.Void (Void)
|
|
||||||
import Network.HTTP.Types.Status (Status, status400, status404, status500)
|
|
||||||
import Network.Wai.Handler.Warp (defaultSettings, setHost, setPort)
|
|
||||||
import System.Exit (ExitCode (..))
|
import System.Exit (ExitCode (..))
|
||||||
import System.IO (hGetContents)
|
import System.IO (hGetContents)
|
||||||
import System.Process (CreateProcess (..), StdStream (..), proc, waitForProcess, withCreateProcess)
|
import System.Process (CreateProcess (..), StdStream (..), proc, waitForProcess, withCreateProcess)
|
||||||
import Web.Scotty
|
import Servant.API (FromHttpApiData (..), ToHttpApiData (..))
|
||||||
( ActionM
|
|
||||||
, ScottyM
|
|
||||||
, defaultOptions
|
|
||||||
, get
|
|
||||||
, pathParam
|
|
||||||
, queryParamMaybe
|
|
||||||
, raw
|
|
||||||
, scottyOpts
|
|
||||||
, setHeader
|
|
||||||
, settings
|
|
||||||
, status
|
|
||||||
, text
|
|
||||||
)
|
|
||||||
|
|
||||||
data Range = TenMinutes | OneHour | OneDay | OneWeek | OneMonth
|
data Range = TenMinutes | OneHour | OneDay | OneWeek | OneMonth
|
||||||
deriving (Eq, Show, Bounded, Enum)
|
deriving (Eq, Show, Bounded, Enum)
|
||||||
@@ -56,41 +38,190 @@ rangeSuffix OneMonth = "30d"
|
|||||||
parseRange :: Text -> Maybe Range
|
parseRange :: Text -> Maybe Range
|
||||||
parseRange t = lookup t [(T.pack (rangeSuffix r), r) | r <- [minBound .. maxBound]]
|
parseRange t = lookup t [(T.pack (rangeSuffix r), r) | r <- [minBound .. maxBound]]
|
||||||
|
|
||||||
|
instance ToHttpApiData Range where
|
||||||
|
toQueryParam = T.pack . rangeSuffix
|
||||||
|
|
||||||
|
instance FromHttpApiData Range where
|
||||||
|
parseQueryParam x = maybe (Left ("Could not parse '" <> x <> "' as Range")) Right $ parseRange x
|
||||||
|
|
||||||
rangeStart :: Range -> String
|
rangeStart :: Range -> String
|
||||||
rangeStart r = "end-" ++ rangeSuffix r
|
rangeStart r = "end-" ++ rangeSuffix r
|
||||||
|
|
||||||
data Series = Series
|
data CF = Average | Minimum | Maximum | Last
|
||||||
{ serDs :: String
|
deriving (Eq, Show)
|
||||||
, serAlias :: String
|
|
||||||
, serColor :: String
|
data Source = Source
|
||||||
, serLabel :: String
|
{ srcDs :: String
|
||||||
|
, srcCF :: CF
|
||||||
}
|
}
|
||||||
deriving (Eq, Show)
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Transform
|
||||||
|
= Identity
|
||||||
|
| Multiply Double
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Series = Series
|
||||||
|
{ serSource :: Source
|
||||||
|
, serTransform :: Transform
|
||||||
|
, serAlias :: String
|
||||||
|
, serColor :: String
|
||||||
|
, serLabel :: String
|
||||||
|
}
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Plot
|
||||||
|
= Line Int Series
|
||||||
|
| Area Series
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
data GraphSpec = GraphSpec
|
data GraphSpec = GraphSpec
|
||||||
{ gsName :: Text
|
{ gsName :: Text
|
||||||
, gsTitle :: String
|
, gsTitle :: String
|
||||||
, gsSeries :: [Series]
|
, gsPlots :: [Plot]
|
||||||
|
, gsIdentifier :: Graph
|
||||||
}
|
}
|
||||||
deriving (Eq, Show)
|
deriving (Eq, Show)
|
||||||
|
|
||||||
graphs :: [GraphSpec]
|
average :: String -> Source
|
||||||
graphs =
|
average ds = Source ds Average
|
||||||
[ GraphSpec
|
|
||||||
"traffic"
|
|
||||||
"Hass triggers in / services out"
|
|
||||||
[ Series "hass_trigger_in" "trig" "#0066cc" "triggers in/min"
|
|
||||||
, Series "hass_service_out" "svc" "#cc0000" "services out/min"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
|
|
||||||
lookupGraph :: [GraphSpec] -> Text -> Maybe GraphSpec
|
maximumCF :: String -> Source
|
||||||
lookupGraph specs name = case [g | g <- specs, gsName g == name] of
|
maximumCF ds = Source ds Maximum
|
||||||
|
|
||||||
|
line :: String -> String -> Source -> Plot
|
||||||
|
line alias color source =
|
||||||
|
Line 2 Series
|
||||||
|
{ serSource = source
|
||||||
|
, serTransform = Identity
|
||||||
|
, serAlias = alias
|
||||||
|
, serColor = color
|
||||||
|
, serLabel = alias
|
||||||
|
}
|
||||||
|
|
||||||
|
area :: String -> String -> Source -> Plot
|
||||||
|
area alias color source =
|
||||||
|
Area Series
|
||||||
|
{ serSource = source
|
||||||
|
, serTransform = Identity
|
||||||
|
, serAlias = alias
|
||||||
|
, serColor = color
|
||||||
|
, serLabel = alias
|
||||||
|
}
|
||||||
|
|
||||||
|
ratelimitGraph :: GraphSpec
|
||||||
|
ratelimitGraph =
|
||||||
|
GraphSpec
|
||||||
|
{ gsName = "ratelimit"
|
||||||
|
, gsTitle = "Rate limiting"
|
||||||
|
, gsPlots =
|
||||||
|
[ Line 2 Series
|
||||||
|
{ serSource = Source "ratelimit_retry" Average
|
||||||
|
, serTransform = Multiply 60
|
||||||
|
, serAlias = "retry"
|
||||||
|
, serColor = "#0066cc"
|
||||||
|
, serLabel = "Requests retried/min"
|
||||||
|
}
|
||||||
|
, Line 2 Series
|
||||||
|
{ serSource = Source "ratelimit_exhausted" Average
|
||||||
|
, serTransform = Multiply 60
|
||||||
|
, serAlias = "exhaust"
|
||||||
|
, serColor = "#cc0000"
|
||||||
|
, serLabel = "Requests exhausted/min"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
, gsIdentifier = RateLimit
|
||||||
|
}
|
||||||
|
|
||||||
|
trafficGraph :: GraphSpec
|
||||||
|
trafficGraph =
|
||||||
|
GraphSpec
|
||||||
|
{ gsName = "traffic"
|
||||||
|
, gsTitle = "Hass triggers in / services out"
|
||||||
|
, gsPlots =
|
||||||
|
[ Line 2 Series
|
||||||
|
{ serSource = Source "hass_trigger_in" Average
|
||||||
|
, serTransform = Multiply 60
|
||||||
|
, serAlias = "in"
|
||||||
|
, serColor = "#0066cc"
|
||||||
|
, serLabel = "Triggers in/min"
|
||||||
|
}
|
||||||
|
, Line 2 Series
|
||||||
|
{ serSource = Source "hass_service_out" Average
|
||||||
|
, serTransform = Multiply 60
|
||||||
|
, serAlias = "out"
|
||||||
|
, serColor = "#cc0000"
|
||||||
|
, serLabel = "Service calls out/min"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
, gsIdentifier = Traffic
|
||||||
|
}
|
||||||
|
|
||||||
|
memoryGraph :: GraphSpec
|
||||||
|
memoryGraph =
|
||||||
|
GraphSpec
|
||||||
|
"memory"
|
||||||
|
"Memory use"
|
||||||
|
[ area "live" "#99ccff" (average "rts_gc_current__a7a")
|
||||||
|
, line "peak" "#cc0000" (maximumCF "rts_gc_current__a7a")
|
||||||
|
]
|
||||||
|
Memory
|
||||||
|
|
||||||
|
graphs :: [GraphSpec]
|
||||||
|
graphs = [memoryGraph, ratelimitGraph, trafficGraph]
|
||||||
|
|
||||||
|
-- XXX: Proper lookup..?
|
||||||
|
lookupGraph :: [GraphSpec] -> Graph -> Maybe GraphSpec
|
||||||
|
lookupGraph specs graphMode = case [g | g <- specs, gsIdentifier g == graphMode] of
|
||||||
(g : _) -> Just g
|
(g : _) -> Just g
|
||||||
[] -> Nothing
|
[] -> Nothing
|
||||||
|
|
||||||
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
||||||
parseNameParam specs t = T.stripSuffix ".png" t >>= lookupGraph specs
|
parseNameParam specs t = rightToMaybe (parseQueryParam t) >>= lookupGraph specs
|
||||||
|
where
|
||||||
|
rightToMaybe = either (const Nothing) Just
|
||||||
|
|
||||||
|
cfName :: CF -> String
|
||||||
|
cfName = \case
|
||||||
|
Average -> "AVERAGE"
|
||||||
|
Minimum -> "MIN"
|
||||||
|
Maximum -> "MAX"
|
||||||
|
Last -> "LAST"
|
||||||
|
|
||||||
|
defArgs :: FilePath -> Series -> [String]
|
||||||
|
defArgs rrdPath series =
|
||||||
|
[ "DEF:" ++ rawF ++ "=" ++ rrdPath ++ ":"
|
||||||
|
++ srcDs source ++ ":" ++ cfName (srcCF source)
|
||||||
|
]
|
||||||
|
++ transformArgs
|
||||||
|
where
|
||||||
|
source = serSource series
|
||||||
|
alias = serAlias series
|
||||||
|
rawF = alias ++ "_raw"
|
||||||
|
|
||||||
|
transformArgs = case serTransform series of
|
||||||
|
Identity ->
|
||||||
|
[ "CDEF:" ++ alias ++ "=" ++ rawF ]
|
||||||
|
|
||||||
|
Multiply factor ->
|
||||||
|
[ "CDEF:" ++ alias ++ "=" ++ rawF
|
||||||
|
++ "," ++ show factor ++ ",*"
|
||||||
|
]
|
||||||
|
|
||||||
|
plotArg :: Plot -> String
|
||||||
|
plotArg = \case
|
||||||
|
Line width series ->
|
||||||
|
"LINE" ++ show width ++ ":" ++ serAlias series
|
||||||
|
++ serColor series ++ ":" ++ serLabel series
|
||||||
|
|
||||||
|
Area series ->
|
||||||
|
"AREA:" ++ serAlias series
|
||||||
|
++ serColor series ++ ":" ++ serLabel series
|
||||||
|
|
||||||
|
plotSeries :: Plot -> Series
|
||||||
|
plotSeries = \case
|
||||||
|
Line _ series -> series
|
||||||
|
Area series -> series
|
||||||
|
|
||||||
buildGraphArgs :: FilePath -> GraphSpec -> Range -> [String]
|
buildGraphArgs :: FilePath -> GraphSpec -> Range -> [String]
|
||||||
buildGraphArgs rrdPath spec range =
|
buildGraphArgs rrdPath spec range =
|
||||||
@@ -102,15 +233,9 @@ buildGraphArgs rrdPath spec range =
|
|||||||
, "--height", "250"
|
, "--height", "250"
|
||||||
, "--imgformat", "PNG"
|
, "--imgformat", "PNG"
|
||||||
]
|
]
|
||||||
++ concatMap defArgs (gsSeries spec)
|
++ concatMap (defArgs rrdPath . plotSeries) (gsPlots spec)
|
||||||
++ map line (gsSeries spec)
|
++ map plotArg (gsPlots spec)
|
||||||
where
|
|
||||||
defArgs (Series ds alias _ _) =
|
|
||||||
[ "DEF:" ++ alias ++ "=" ++ rrdPath ++ ":" ++ ds ++ ":AVERAGE"
|
|
||||||
, "CDEF:" ++ alias ++ "_min=" ++ alias ++ ",60,*"
|
|
||||||
]
|
|
||||||
line (Series _ alias color label) =
|
|
||||||
"LINE2:" ++ alias ++ "_min" ++ color ++ ":" ++ label
|
|
||||||
|
|
||||||
readProcessBytes :: FilePath -> [String] -> IO (ExitCode, BS.ByteString, String)
|
readProcessBytes :: FilePath -> [String] -> IO (ExitCode, BS.ByteString, String)
|
||||||
readProcessBytes cmd args =
|
readProcessBytes cmd args =
|
||||||
@@ -125,39 +250,32 @@ readProcessBytes cmd args =
|
|||||||
pure (code, out, err)
|
pure (code, out, err)
|
||||||
_ -> pure (ExitFailure 1, BS.empty, "failed to create pipes")
|
_ -> pure (ExitFailure 1, BS.empty, "failed to create pipes")
|
||||||
|
|
||||||
respond :: Status -> TL.Text -> ActionM ()
|
renderGraph :: MonadIO m => FilePath -> FilePath -> GraphSpec -> Range -> m (Either Text BS.ByteString)
|
||||||
respond st body = status st >> text body
|
renderGraph rrdPath rrdtool spec range = do
|
||||||
|
|
||||||
serve :: FilePath -> FilePath -> GraphSpec -> Range -> ActionM ()
|
|
||||||
serve rrdPath rrdtool spec range = do
|
|
||||||
(code, out, err) <- liftIO (readProcessBytes rrdtool (buildGraphArgs rrdPath spec range))
|
(code, out, err) <- liftIO (readProcessBytes rrdtool (buildGraphArgs rrdPath spec range))
|
||||||
case code of
|
case code of
|
||||||
ExitSuccess
|
ExitSuccess
|
||||||
| not (BS.null out) -> do
|
| not (BS.null out) -> pure $ Right out
|
||||||
setHeader "Content-Type" "image/png"
|
| otherwise -> pure $ Left "empty graph"
|
||||||
raw (BL.fromStrict out)
|
_ -> pure $ Left (T.pack $ take 200 err)
|
||||||
| otherwise -> respond status500 "empty graph"
|
|
||||||
_ -> respond status500 (TL.pack (take 200 err))
|
|
||||||
|
|
||||||
handler :: FilePath -> FilePath -> ActionM ()
|
|
||||||
handler rrdPath rrdtool = do
|
|
||||||
name <- pathParam "name"
|
|
||||||
case parseNameParam graphs name of
|
|
||||||
Nothing -> respond status404 "unknown graph"
|
|
||||||
Just spec -> do
|
|
||||||
rangeArg <- queryParamMaybe "range"
|
|
||||||
case rangeArg of
|
|
||||||
Nothing -> serve rrdPath rrdtool spec OneDay
|
|
||||||
Just t -> case parseRange t of
|
|
||||||
Nothing -> respond status400 "invalid range"
|
|
||||||
Just range -> serve rrdPath rrdtool spec range
|
|
||||||
|
|
||||||
app :: FilePath -> FilePath -> ScottyM ()
|
|
||||||
app rrdPath rrdtool = get "/metrics/:name" (handler rrdPath rrdtool)
|
|
||||||
|
|
||||||
graphAction :: MonadIO m => FilePath -> FilePath -> Int -> m Void
|
|
||||||
graphAction rrdPath rrdtool port = liftIO $ forever $ scottyOpts opts (app rrdPath rrdtool)
|
data Graph
|
||||||
where
|
= Memory
|
||||||
opts = defaultOptions
|
| Traffic
|
||||||
{ settings = setHost "127.0.0.1" (setPort port defaultSettings)
|
| RateLimit
|
||||||
}
|
deriving (Show, Eq, Enum, Bounded)
|
||||||
|
|
||||||
|
instance ToHttpApiData Graph where
|
||||||
|
toQueryParam Memory = "memory.png"
|
||||||
|
toQueryParam Traffic = "traffic.png"
|
||||||
|
toQueryParam RateLimit = "ratelimit.png"
|
||||||
|
|
||||||
|
instance FromHttpApiData Graph where
|
||||||
|
parseQueryParam "memory.png" = Right Memory
|
||||||
|
parseQueryParam "traffic.png" = Right Traffic
|
||||||
|
parseQueryParam "ratelimit.png" = Right RateLimit
|
||||||
|
parseQueryParam x = Left ("Can't parse '" <> x <> "' as Graph")
|
||||||
|
|
||||||
@@ -69,6 +69,6 @@ runRateLimited (RateLimiter metrics run) action = checkpointCallStack $ do
|
|||||||
run action
|
run action
|
||||||
maybe (incReject >> throw RateLimitExhausted) pure x
|
maybe (incReject >> throw RateLimitExhausted) pure x
|
||||||
where
|
where
|
||||||
retryPolicy = fullJitterBackoff 50000 <> limitRetries 5
|
retryPolicy = fullJitterBackoff 500_000 <> limitRetries 5
|
||||||
incRetry = liftIO $ Counter.inc (rlRetries metrics)
|
incRetry = liftIO $ Counter.inc (rlRetries metrics)
|
||||||
incReject = liftIO $ Counter.inc (rlRejects metrics)
|
incReject = liftIO $ Counter.inc (rlRejects metrics)
|
||||||
@@ -16,7 +16,7 @@ import Data.Void (Void)
|
|||||||
import Control.Monad.IO.Class (MonadIO)
|
import Control.Monad.IO.Class (MonadIO)
|
||||||
import Control.Monad.Catch (MonadCatch, MonadMask)
|
import Control.Monad.Catch (MonadCatch, MonadMask)
|
||||||
import Katip (KatipContext, logFM, ls)
|
import Katip (KatipContext, logFM, ls)
|
||||||
import Control.Retry (RetryStatus(..), recovering, limitRetries, fullJitterBackoff)
|
import Control.Retry (RetryStatus(..), recovering, fullJitterBackoff, capDelay, skipAsyncExceptions)
|
||||||
import Control.Monad (when)
|
import Control.Monad (when)
|
||||||
import Katip.Core (Severity(..))
|
import Katip.Core (Severity(..))
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ instance Exception SupervisorException
|
|||||||
-- restarted instead of escalated.
|
-- restarted instead of escalated.
|
||||||
supervised :: (MonadIO m, MonadCatch m, KatipContext m, MonadMask m) => Text -> m Void -> m Void
|
supervised :: (MonadIO m, MonadCatch m, KatipContext m, MonadMask m) => Text -> m Void -> m Void
|
||||||
supervised name action = checkpoint (Annotation name) $ do
|
supervised name action = checkpoint (Annotation name) $ do
|
||||||
recovering retryPolicy handlers $ \RetryStatus{rsIterNumber} -> do
|
recovering retryPolicy (skipAsyncExceptions ++ handlers) $ \RetryStatus{rsIterNumber} -> do
|
||||||
when (rsIterNumber > 0) $ logFM WarningS $ ls $ "Child crashed, retry no " <> show rsIterNumber
|
when (rsIterNumber > 0) $ logFM WarningS $ ls $ "Child crashed, retry no " <> show rsIterNumber
|
||||||
action
|
action
|
||||||
where
|
where
|
||||||
@@ -49,4 +49,4 @@ supervised name action = checkpoint (Annotation name) $ do
|
|||||||
[ \_retryStatus -> Handler $ \(_ :: Fatal) -> pure False
|
[ \_retryStatus -> Handler $ \(_ :: Fatal) -> pure False
|
||||||
, \_retryStatus -> Handler $ \(_ :: SomeException) -> pure True
|
, \_retryStatus -> Handler $ \(_ :: SomeException) -> pure True
|
||||||
]
|
]
|
||||||
retryPolicy = fullJitterBackoff 50000 <> limitRetries 5
|
retryPolicy = capDelay (15 * 1_000_000) (fullJitterBackoff 50_000)
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE DerivingVia #-}
|
||||||
|
module HttpServer where
|
||||||
|
|
||||||
|
import Control.Monad (forever)
|
||||||
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
|
import qualified Data.ByteString as BS
|
||||||
|
import Data.Void (Void)
|
||||||
|
import Network.Wai.Handler.Warp (run)
|
||||||
|
import Servant.API ((:>), Capture, Get, QueryParam, (:-), MimeRender (..), Accept (..), NamedRoutes)
|
||||||
|
import Data.ByteString (ByteString)
|
||||||
|
import GHC.Generics (Generic)
|
||||||
|
import Servant (Handler, err404)
|
||||||
|
import Control.Monad.Catch (throwM, MonadCatch, MonadThrow)
|
||||||
|
import Servant.Server (err500, ServerT)
|
||||||
|
import Data.Maybe (fromMaybe)
|
||||||
|
import Control.Exception.Annotated (checkpoint, Annotation (Annotation))
|
||||||
|
import Servant.Server.Generic (genericServeT)
|
||||||
|
import Network.Wai (Application)
|
||||||
|
import Network.HTTP.Media ((//))
|
||||||
|
import HomeAssistant.Runtime.Graphing (Graph, Range (..), lookupGraph, graphs, renderGraph)
|
||||||
|
import Katip (KatipContextT, Katip, runKatipContextT, LogEnv, KatipContext, ls, Severity (..), logFM)
|
||||||
|
|
||||||
|
data ImagePng
|
||||||
|
|
||||||
|
instance MimeRender ImagePng ByteString where
|
||||||
|
mimeRender _ = BS.fromStrict
|
||||||
|
|
||||||
|
instance Accept ImagePng where
|
||||||
|
contentType _ = "image" // "png"
|
||||||
|
|
||||||
|
|
||||||
|
newtype API mode = API
|
||||||
|
{ getMetrics :: mode :- "metrics" :> Capture "graph" Graph :> QueryParam "range" Range :> Get '[ImagePng] ByteString
|
||||||
|
}
|
||||||
|
deriving Generic
|
||||||
|
|
||||||
|
|
||||||
|
getMetricsHandler :: FilePath -> FilePath -> Graph -> Maybe Range -> LoggingHandler ByteString
|
||||||
|
getMetricsHandler rrdPath rrdtool graphMode mRange = checkpoint (Annotation (graphMode, mRange)) $ do
|
||||||
|
case lookupGraph graphs graphMode of
|
||||||
|
Nothing -> throwM err404
|
||||||
|
Just spec -> do
|
||||||
|
let range = fromMaybe OneDay mRange
|
||||||
|
g <- renderGraph rrdPath rrdtool spec range
|
||||||
|
either (\e -> logFM ErrorS (ls e) >> throwM err500) pure g
|
||||||
|
|
||||||
|
-- server :: FilePath -> FilePath -> API AsServer
|
||||||
|
server :: FilePath -> FilePath -> ServerT (NamedRoutes API) LoggingHandler
|
||||||
|
server rrdPath rrdtool = API { getMetrics = getMetricsHandler rrdPath rrdtool }
|
||||||
|
|
||||||
|
servantApp :: LogEnv -> FilePath -> FilePath -> Application
|
||||||
|
servantApp le rrdPath rrdtool = genericServeT (toHandler le) (server rrdPath rrdtool)
|
||||||
|
|
||||||
|
runHttpServer :: MonadIO m => LogEnv -> FilePath -> FilePath -> Int -> m Void
|
||||||
|
runHttpServer le rrdPath rrdtool port = liftIO $ forever $ run port (servantApp le rrdPath rrdtool)
|
||||||
|
|
||||||
|
newtype LoggingHandler a = LoggingHandler (KatipContextT Handler a)
|
||||||
|
deriving (Functor, Applicative, Monad, MonadIO, Katip, KatipContext, MonadCatch, MonadThrow) via (KatipContextT Handler)
|
||||||
|
|
||||||
|
toHandler :: LogEnv -> (forall a. LoggingHandler a -> Handler a)
|
||||||
|
toHandler le (LoggingHandler k) = runKatipContextT le () "http" k
|
||||||
|
|
||||||
|
|
||||||
+17
-16
@@ -45,6 +45,7 @@ entitySpec = describe "entities" $ do
|
|||||||
`shouldBe` S.fromList
|
`shouldBe` S.fromList
|
||||||
[ "event.bedroom_quick_remote_masse_action"
|
[ "event.bedroom_quick_remote_masse_action"
|
||||||
, "event.bedroom_quick_jemina_action"
|
, "event.bedroom_quick_jemina_action"
|
||||||
|
, "event.bedroom_remote_action"
|
||||||
]
|
]
|
||||||
|
|
||||||
it "bedroomPresenceController subscribes to the presence sensor" $
|
it "bedroomPresenceController subscribes to the presence sensor" $
|
||||||
@@ -89,36 +90,36 @@ buttonSpec = describe "bedroomButtonController" $ do
|
|||||||
let area = AreaId "makuuhuone"
|
let area = AreaId "makuuhuone"
|
||||||
|
|
||||||
it "Masse single click turns on his nightstand scene (lowest)" $
|
it "Masse single click turns on his nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_masse"]]
|
`shouldContain` [activateScene "scene.makuuhuone_masse"]
|
||||||
|
|
||||||
it "Masse double click turns on the middle scene" $
|
it "Masse double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Masse long click turns on the bright scene" $
|
it "Masse long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Masse off click turns the bedroom lights off" $
|
it "Masse off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [masseButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "Enishen single click turns on her nightstand scene (lowest)" $
|
it "Enishen single click turns on her nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_jemina"]]
|
`shouldContain` [activateScene "scene.makuuhuone_jemina"]
|
||||||
|
|
||||||
it "Enishen double click turns on the middle scene" $
|
it "Enishen double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Enishen long click turns on the bright scene" $
|
it "Enishen long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Enishen off click turns the bedroom lights off" $
|
it "Enishen off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "ignores the initial press (scene only fires on release)" $
|
it "ignores the initial press (scene only fires on release)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
||||||
|
|||||||
+25
-7
@@ -20,15 +20,30 @@ import System.Directory (findExecutable, getTemporaryDirectory, removeFile)
|
|||||||
import System.Exit (ExitCode (..))
|
import System.Exit (ExitCode (..))
|
||||||
import System.Process (readProcessWithExitCode)
|
import System.Process (readProcessWithExitCode)
|
||||||
import Test.Hspec
|
import Test.Hspec
|
||||||
|
import Servant.API (FromHttpApiData(..), ToHttpApiData (..))
|
||||||
|
import HomeAssistant.Runtime.Graphing (Graph(..))
|
||||||
|
|
||||||
traffic :: GraphSpec
|
traffic :: GraphSpec
|
||||||
traffic = case lookupGraph graphs "traffic" of
|
traffic = case lookupGraph graphs Traffic of
|
||||||
Just s -> s
|
Just s -> s
|
||||||
Nothing -> error "traffic graph is missing from the table"
|
Nothing -> error "traffic graph is missing from the table"
|
||||||
|
|
||||||
spec :: Spec
|
spec :: Spec
|
||||||
spec = do
|
spec = do
|
||||||
|
describe "Graph HttpApiData" $ do
|
||||||
|
-- There's an enumerable amount of graphs, we can just enumerate through them all
|
||||||
|
it "satisfies roundtrip property" $ do
|
||||||
|
let modes = [minBound..maxBound]
|
||||||
|
let got = map (parseQueryParam . toQueryParam @Graph) modes
|
||||||
|
let wanted = map Right modes
|
||||||
|
got `shouldBe` wanted
|
||||||
describe "parseRange" $ do
|
describe "parseRange" $ do
|
||||||
|
-- Fully enumerable
|
||||||
|
it "the http-api-data satisfies roundtrip property" $ do
|
||||||
|
let rs = [minBound..maxBound]
|
||||||
|
let got = map (parseQueryParam . toQueryParam @Range) rs
|
||||||
|
let wanted = map Right rs
|
||||||
|
got `shouldBe` wanted
|
||||||
it "accepts every suffix in the closed set" $
|
it "accepts every suffix in the closed set" $
|
||||||
map parseRange ["10m", "1h", "24h", "7d", "30d"]
|
map parseRange ["10m", "1h", "24h", "7d", "30d"]
|
||||||
`shouldBe` [ Just TenMinutes
|
`shouldBe` [ Just TenMinutes
|
||||||
@@ -83,12 +98,12 @@ spec = do
|
|||||||
, "--width", "800"
|
, "--width", "800"
|
||||||
, "--height", "250"
|
, "--height", "250"
|
||||||
, "--imgformat", "PNG"
|
, "--imgformat", "PNG"
|
||||||
, "DEF:trig=hass-controller.rrd:hass_trigger_in:AVERAGE"
|
, "DEF:in_raw=hass-controller.rrd:hass_trigger_in:AVERAGE"
|
||||||
, "CDEF:trig_min=trig,60,*"
|
, "CDEF:in=in_raw,60.0,*"
|
||||||
, "DEF:svc=hass-controller.rrd:hass_service_out:AVERAGE"
|
, "DEF:out_raw=hass-controller.rrd:hass_service_out:AVERAGE"
|
||||||
, "CDEF:svc_min=svc,60,*"
|
, "CDEF:out=out_raw,60.0,*"
|
||||||
, "LINE2:trig_min#0066cc:triggers in/min"
|
, "LINE2:in#0066cc:Triggers in/min"
|
||||||
, "LINE2:svc_min#cc0000:services out/min"
|
, "LINE2:out#cc0000:Service calls out/min"
|
||||||
]
|
]
|
||||||
|
|
||||||
describe "end-to-end (rrdtool-gated)" $ do
|
describe "end-to-end (rrdtool-gated)" $ do
|
||||||
@@ -124,3 +139,6 @@ spec = do
|
|||||||
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
||||||
)
|
)
|
||||||
`finally` cleanup
|
`finally` cleanup
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+24
-1
@@ -1,9 +1,32 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
|
||||||
module RuntimeSpec (spec) where
|
module RuntimeSpec (spec) where
|
||||||
|
|
||||||
|
import Control.Concurrent (threadDelay)
|
||||||
|
import Control.Concurrent.Async (async, cancel, race, waitCatch)
|
||||||
|
import Control.Exception (bracket)
|
||||||
|
import Control.Monad (forever)
|
||||||
|
import Control.Monad.IO.Class (liftIO)
|
||||||
|
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||||
|
import Katip (LogEnv, closeScribes, initLogEnv, runKatipContextT)
|
||||||
import Test.Hspec
|
import Test.Hspec
|
||||||
|
|
||||||
spec :: Spec
|
spec :: Spec
|
||||||
spec = pure ()
|
spec = describe "supervised" $ do
|
||||||
|
it "propagates ThreadKilled instead of retrying" $
|
||||||
|
withTestLogEnv $ \le -> do
|
||||||
|
worker <- async $ runKatipContextT le () mempty $
|
||||||
|
supervised "test" (liftIO (forever (threadDelay 100000)))
|
||||||
|
threadDelay 200000
|
||||||
|
cancel worker
|
||||||
|
result <- race (threadDelay 5000000) (waitCatch worker)
|
||||||
|
case result of
|
||||||
|
Left () -> expectationFailure
|
||||||
|
"supervised retried on ThreadKilled (process would hang)"
|
||||||
|
Right _ -> pure ()
|
||||||
|
|
||||||
|
withTestLogEnv :: (LogEnv -> IO a) -> IO a
|
||||||
|
withTestLogEnv = bracket (initLogEnv "test" "test") closeScribes
|
||||||
|
|
||||||
-- I'm commenting out the test as that specific controller
|
-- I'm commenting out the test as that specific controller
|
||||||
-- was just a dummy for seeing how the data flows (dead code)
|
-- was just a dummy for seeing how the data flows (dead code)
|
||||||
|
|||||||
Reference in new issue
Block a user