Compare commits
35
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6f785662b | ||
|
|
5d16bf4ade | ||
|
|
05bd609c7e | ||
|
|
9c47bbcb42 | ||
|
|
6063aafe8b | ||
|
|
fafc7111bb | ||
|
|
69cac934ec | ||
|
|
b2a74cbee4 | ||
|
|
769ab43fd2 | ||
|
|
15f3fe7c9e | ||
|
|
416a9484a5 | ||
|
|
e3bc25ce54 | ||
|
|
036473ab81 | ||
|
|
27f271691c | ||
|
|
73d546395b | ||
|
|
a969730de1 | ||
|
|
213f9d5d2a | ||
|
|
2cb8035ef4 | ||
|
|
1ec8c7211f | ||
|
|
3d7f6cb3c6 | ||
|
|
64561718a5 | ||
|
|
7570711768 | ||
|
|
7c2cfde814 | ||
|
|
9fda48f589 | ||
|
|
319104641b | ||
|
|
9861266c1e | ||
|
|
0893862f3a | ||
|
|
6078a64d00 | ||
|
|
7d08acec9d | ||
|
|
2a477b4977 | ||
|
|
09479b5c48 | ||
|
|
a19e5afd5e | ||
|
|
af46776bb0 | ||
|
|
d1bdd2eb67 | ||
|
|
9108ba9c8f |
No files matched your search
+11
-9
@@ -1,8 +1,9 @@
|
||||
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
||||
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
||||
, filepath, hedgehog, hspec, hspec-hedgehog, katip, lens
|
||||
, lens-aeson, lib, network, process, stm, text, time
|
||||
, unordered-containers, uuid, websockets
|
||||
, exceptions, filepath, hedgehog, hspec, hspec-hedgehog, http-types
|
||||
, katip, lens, lens-aeson, lib, network, process, retry, scotty
|
||||
, servant, servant-server, stm, text, time, unliftio
|
||||
, unordered-containers, uuid, wai, warp, websockets
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "home-assistant-controller";
|
||||
@@ -12,15 +13,16 @@ mkDerivation {
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson annotated-exception async base bytestring cereal
|
||||
cereal-conduit conduit containers directory ekg-core filepath katip
|
||||
lens lens-aeson network process stm text time unordered-containers
|
||||
uuid websockets
|
||||
cereal-conduit conduit containers directory ekg-core exceptions
|
||||
filepath http-types katip lens lens-aeson network process retry
|
||||
scotty servant servant-server stm text time unliftio
|
||||
unordered-containers uuid wai warp websockets
|
||||
];
|
||||
executableHaskellDepends = [ base ];
|
||||
testHaskellDepends = [
|
||||
aeson annotated-exception async base cereal containers directory
|
||||
ekg-core hedgehog hspec hspec-hedgehog katip process stm text time
|
||||
unordered-containers uuid
|
||||
aeson annotated-exception async base bytestring cereal containers
|
||||
directory ekg-core hedgehog hspec hspec-hedgehog katip process stm
|
||||
text time unordered-containers uuid
|
||||
];
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
mainProgram = "home-assistant-controller";
|
||||
|
||||
@@ -62,14 +62,19 @@ library
|
||||
exposed-modules: AFRP
|
||||
, HomeAssistant.Controller
|
||||
, HomeAssistant.Controller.Bedroom
|
||||
, HomeAssistant.Controller.Hallway
|
||||
, HomeAssistant.Controller.Kitchen
|
||||
, HomeAssistant.Controller.Children
|
||||
, HomeAssistant.Controller.Livingroom
|
||||
, HomeAssistant.Controller.Ruuvi
|
||||
, HomeAssistant.Runtime
|
||||
, HomeAssistant.Runtime.Bus
|
||||
, HomeAssistant.Runtime.Connection
|
||||
, HomeAssistant.Runtime.Graphing
|
||||
, HomeAssistant.Runtime.Metrics
|
||||
, HomeAssistant.Runtime.Supervisor
|
||||
, HomeAssistant.Runtime.RateLimit
|
||||
, HttpServer
|
||||
|
||||
-- Modules included in this library but not exported.
|
||||
-- other-modules:
|
||||
@@ -80,10 +85,13 @@ library
|
||||
-- Other library packages from which modules are imported.
|
||||
build-depends: base ^>=4.20.2.0
|
||||
, websockets
|
||||
, http-media
|
||||
, aeson
|
||||
, lens-aeson
|
||||
, lens
|
||||
, exceptions
|
||||
, text
|
||||
, unliftio
|
||||
, network
|
||||
, bytestring
|
||||
, time
|
||||
@@ -102,6 +110,12 @@ library
|
||||
, filepath
|
||||
, conduit
|
||||
, cereal-conduit
|
||||
, servant
|
||||
, servant-server
|
||||
, http-types
|
||||
, warp
|
||||
, wai
|
||||
, retry
|
||||
|
||||
-- Directories containing source files.
|
||||
hs-source-dirs: src
|
||||
@@ -144,13 +158,12 @@ test-suite home-assistant-controller-test
|
||||
-- Modules included in this executable, other than Main.
|
||||
other-modules: AFRPLawsSpec
|
||||
, AFRPSpec
|
||||
, BackoffProp
|
||||
, BedroomSpec
|
||||
, BusSpec
|
||||
, ConnectionSpec
|
||||
, GraphingSpec
|
||||
, MetricsSpec
|
||||
, RuntimeSpec
|
||||
, SupervisorSpec
|
||||
, Support
|
||||
|
||||
-- LANGUAGE extensions used by modules in this package.
|
||||
@@ -169,8 +182,10 @@ test-suite home-assistant-controller-test
|
||||
build-depends:
|
||||
base ^>=4.20.2.0,
|
||||
home-assistant-controller,
|
||||
bytestring,
|
||||
hspec,
|
||||
stm,
|
||||
servant,
|
||||
aeson,
|
||||
cereal,
|
||||
text,
|
||||
|
||||
@@ -19,6 +19,8 @@ module HomeAssistant.Controller
|
||||
, light
|
||||
, Presence(..)
|
||||
, presence
|
||||
, motion
|
||||
, motionToPresence
|
||||
, debug
|
||||
, traceEvent
|
||||
, traceValue
|
||||
@@ -26,20 +28,27 @@ module HomeAssistant.Controller
|
||||
, Target(..)
|
||||
, brightness
|
||||
, Light(..)
|
||||
, ikeaQuickButton
|
||||
, IkeaButton(..)
|
||||
, IkeaGesture(..)
|
||||
, activateScene
|
||||
, ikeaBoxRemote
|
||||
, IkeaController(..)
|
||||
) where
|
||||
|
||||
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request)
|
||||
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request, hold, lMerge, waitFor, tag, edge)
|
||||
import Control.Arrow (Arrow(..), returnA)
|
||||
import Control.Category ((>>>))
|
||||
import Data.Aeson (Value, object, (.=))
|
||||
import qualified Data.Text as T
|
||||
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 qualified Data.Text.Lens as TL
|
||||
import Data.Bool (bool)
|
||||
import Data.Serialize (Serialize)
|
||||
import GHC.Generics (Generic)
|
||||
import Data.Time (NominalDiffTime)
|
||||
|
||||
data Target = EntityId !T.Text | AreaId !T.Text
|
||||
deriving (Show,Eq,Ord)
|
||||
@@ -93,10 +102,35 @@ data Presence = Occupied | Unoccupied
|
||||
instance Serialize Presence
|
||||
|
||||
presence :: T.Text -> HASS (Event Value) (Event Presence)
|
||||
presence entityId =entityBool entityId
|
||||
presence entityId = entityBool entityId
|
||||
>>> arr (fmap (bool Unoccupied Occupied))
|
||||
|
||||
|
||||
data Motion = MotionDetected | MotionNotDetected | MotionUnknown
|
||||
deriving (Show, Eq, Generic)
|
||||
|
||||
|
||||
motion :: T.Text -> HASS (Event Value) Motion
|
||||
motion entityId = entityBool entityId
|
||||
>>> arr (fmap (bool MotionNotDetected MotionDetected))
|
||||
>>> hold MotionUnknown
|
||||
|
||||
|
||||
-- Convert a motion status into a simulated presence
|
||||
--
|
||||
-- A motion tracker detects _motion_, but if you are still, it can't detect you.
|
||||
-- A simple and cheap heuristic is to assume the person is a bit longer there
|
||||
motionToPresence :: NominalDiffTime -> HASS Motion Presence
|
||||
motionToPresence delay = (eventOccupied &&& eventUnoccupied)
|
||||
>>> arr (uncurry lMerge)
|
||||
>>> AFRP.hold Unoccupied
|
||||
where
|
||||
eventOccupied :: HASS Motion (Event Presence)
|
||||
eventOccupied = arr (== MotionDetected) >>> edge >>> arr (fmap (const Occupied))
|
||||
eventUnoccupied :: HASS Motion (Event Presence)
|
||||
eventUnoccupied = arr (== MotionNotDetected) >>> waitFor delay >>> arr (tag Unoccupied)
|
||||
|
||||
instance Serialize Motion
|
||||
|
||||
data Light
|
||||
= Off
|
||||
@@ -163,3 +197,71 @@ brightness entityId =
|
||||
>>> AFRP.toEvent
|
||||
where
|
||||
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 qualified Data.Text as T
|
||||
import AFRP (Event (..), (>>|), toEvent, lMerge, duration, edge)
|
||||
import AFRP (Event (..), lMerge, duration, edge)
|
||||
import Data.Aeson (Value, object, (.=))
|
||||
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
||||
import Control.Lens ((^?), to, traversed)
|
||||
import Data.Aeson.Lens (key, _String)
|
||||
import Data.Bool (bool)
|
||||
import Data.Time (NominalDiffTime)
|
||||
import qualified AFRP
|
||||
@@ -29,84 +27,108 @@ createBedroomScene = Service
|
||||
, serviceTarget= []
|
||||
}
|
||||
|
||||
|
||||
activateScene :: T.Text -> Service
|
||||
activateScene sceneId = Service
|
||||
{ serviceDomain="scene"
|
||||
, serviceName= "turn_on"
|
||||
, serviceTarget= [EntityId sceneId]
|
||||
, serviceData = Nothing
|
||||
}
|
||||
data PresenceLights
|
||||
= LightsOn -- Restore lights
|
||||
| LightsOff -- Timer expired, darkness
|
||||
| LightsSleep -- No presence detected, sleep mode
|
||||
deriving Show
|
||||
|
||||
-- Bedroom presence
|
||||
bedroomPresence :: HASS (Event Value) (Event Presence)
|
||||
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 = proc x -> do
|
||||
p <- bedroomPresence -< x
|
||||
p <- presenceLightEvents >>> traceEvent -< x
|
||||
case p of
|
||||
Event Unoccupied -> callService createBedroomScene >>> callService (light bedroomLights Off) -< ()
|
||||
Event Occupied -> callService (activateScene "makuuhuone_lights_snapshot") -< ()
|
||||
Event LightsOff -> do
|
||||
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 -< ()
|
||||
|
||||
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
|
||||
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
||||
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
||||
|
||||
|
||||
data BedroomControls
|
||||
= Masse (IkeaButton IkeaGesture)
|
||||
| Enishen (IkeaButton IkeaGesture)
|
||||
| Central IkeaController
|
||||
deriving Show
|
||||
|
||||
|
||||
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
|
||||
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
||||
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
||||
centralButton = fmap Central <$> ikeaBoxRemote "event.bedroom_remote_action"
|
||||
|
||||
bedroomButtonController :: HASS (Event Value) ()
|
||||
bedroomButtonController = proc x -> do
|
||||
ev <- bedroomButton >>> traceEvent -< x
|
||||
-- Any event will cause the sleep mode to be turned off
|
||||
case ev of
|
||||
Event (Masse (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||
Event (Masse (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||
Event (Masse (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
Event (Masse (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||
Event (Enishen (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||
Event (Enishen (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||
Event (Enishen (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
Event (Enishen (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||
Event (Masse (OnButton ShortRelease)) -> do
|
||||
sleepMode -< False
|
||||
adaptiveMode -< False
|
||||
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||
Event (Masse (OnButton DoubleClick)) -> do
|
||||
sleepMode -< False
|
||||
adaptiveMode -< False
|
||||
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 -< ()
|
||||
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 OverloadedStrings #-}
|
||||
module HomeAssistant.Controller.Children where
|
||||
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..))
|
||||
import AFRP (Event)
|
||||
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..), ikeaQuickButton, IkeaGesture (..), IkeaButton (..), traceEvent, activateScene)
|
||||
import AFRP (Event (..))
|
||||
import qualified AFRP
|
||||
import Control.Arrow (Arrow(..), (>>>))
|
||||
import Control.Arrow (Arrow(..), (>>>), returnA)
|
||||
import Data.Time (Day, TimeOfDay (..), localDay, LocalTime (..))
|
||||
import Data.Time.Calendar.OrdinalDate (WeekOfYear, mondayStartWeek)
|
||||
import Data.Functor.Contravariant (Predicate (..), (>$<))
|
||||
import Data.Aeson (Value)
|
||||
|
||||
-- Let's see building some reasonable interface for utctime
|
||||
dow :: Day -> (WeekOfYear, Int)
|
||||
@@ -62,7 +63,6 @@ timersOn =
|
||||
, day 3 <> at (07,30)
|
||||
, day 4 <> at (07,30)
|
||||
, day 5 <> at (07,30)
|
||||
, at (18,55) -- debug
|
||||
]
|
||||
where
|
||||
dayOfWeek = snd . mondayStartWeek . localDay
|
||||
@@ -80,3 +80,17 @@ lightsOn = foldMap atTime timersOn
|
||||
lightsOff :: HASS a ()
|
||||
lightsOff = foldMap atTime timersOff
|
||||
>>> 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,38 +6,17 @@ import AFRP (Event (..))
|
||||
import qualified AFRP
|
||||
import Data.Aeson (Value)
|
||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||
import Data.Bool (bool)
|
||||
import GHC.Generics (Generic)
|
||||
import Data.Serialize (Serialize)
|
||||
import Prelude hiding (id)
|
||||
import Data.Time (LocalTime(..), TimeOfDay (..))
|
||||
|
||||
|
||||
-- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
|
||||
data Motion = MotionDetected | MotionNotDetected | MotionUnknown
|
||||
deriving (Show, Eq, Generic)
|
||||
|
||||
instance Serialize Motion
|
||||
|
||||
data Lights = LightsOn | LightsOff
|
||||
data Lights = LightsOn | LightsOff | LightsSleep
|
||||
deriving (Show)
|
||||
|
||||
kitchenMotion :: HASS (Event Value) Motion
|
||||
kitchenMotion = entityBool "binary_sensor.kitchen_movement_occupancy"
|
||||
>>> arr (fmap (bool MotionNotDetected MotionDetected))
|
||||
>>> traceEvent
|
||||
>>> AFRP.hold MotionUnknown
|
||||
|
||||
|
||||
kitchenPresence :: HASS Motion Presence
|
||||
kitchenPresence = (eventOccupied &&& eventUnoccupied)
|
||||
>>> arr (uncurry AFRP.lMerge) >>> traceEvent
|
||||
>>> AFRP.hold Unoccupied
|
||||
where
|
||||
eventOccupied :: HASS Motion (Event Presence)
|
||||
eventOccupied = arr (== MotionDetected) >>> AFRP.edge >>> arr (fmap (const Occupied))
|
||||
eventUnoccupied :: HASS Motion (Event Presence)
|
||||
eventUnoccupied = arr (== MotionNotDetected) >>> AFRP.waitFor 300 >>> arr (AFRP.tag Unoccupied)
|
||||
kitchenPresence :: HASS (Event Value) Presence
|
||||
kitchenPresence = motion "binary_sensor.kitchen_movement_occupancy" >>> motionToPresence 500
|
||||
|
||||
eventLights :: HASS Presence (Event Lights)
|
||||
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||
@@ -45,10 +24,10 @@ eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||
presenceLights Occupied = LightsOn
|
||||
presenceLights Unoccupied = LightsOff
|
||||
|
||||
kitchenMotionController :: HASS (Event Value) ()
|
||||
kitchenMotionController = proc x -> do
|
||||
kitchenCeilingController :: HASS (Event Value) ()
|
||||
kitchenCeilingController = proc x -> do
|
||||
now <- AFRP.currentTime -< ()
|
||||
p <- kitchenMotion >>> kitchenPresence -< x
|
||||
p <- kitchenPresence -< x
|
||||
ev <- eventLights -< p
|
||||
traceEvent -< ev
|
||||
case ev of
|
||||
@@ -57,3 +36,52 @@ kitchenMotionController = proc x -> do
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0)
|
||||
|
||||
|
||||
dinnerLightLevel :: HASS (Event Value) Int
|
||||
dinnerLightLevel = entityRead "sensor.sijainti_keittio_light_level" >>> AFRP.hold 0
|
||||
|
||||
dinnerPresence :: HASS (Event Value) Presence
|
||||
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
||||
|
||||
dinnerLightEvents :: HASS (Event Value) (Event Lights)
|
||||
dinnerLightEvents =
|
||||
((,) <$> dinnerLightLevel <*> dinnerPresence)
|
||||
>>> arr lightWanted
|
||||
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||
>>> arr (\(s, (o, n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||
where
|
||||
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 = proc x -> do
|
||||
ev <- dinnerLightEvents -< x
|
||||
case ev of
|
||||
Event LightsOn -> do
|
||||
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 -< ()
|
||||
where
|
||||
sleep = callServiceDyn (switch [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"])
|
||||
|
||||
kitchenMotionController :: HASS (Event Value) ()
|
||||
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
||||
@@ -0,0 +1,51 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE Arrows #-}
|
||||
module HomeAssistant.Controller.Livingroom where
|
||||
|
||||
import HomeAssistant.Controller (HASS, Presence (..), Target (..), presence, callServiceDyn, light, Light (..), traceEvent)
|
||||
import qualified AFRP
|
||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||
import Data.Aeson (Value)
|
||||
import Prelude hiding ((.))
|
||||
import Control.Category ((.))
|
||||
|
||||
data Lights = LightsOn | LightsOff
|
||||
deriving (Show)
|
||||
|
||||
livingroomPresence :: HASS (AFRP.Event Value) Presence
|
||||
livingroomPresence = presence "binary_sensor.occupancy_olohuone_derived" >>> AFRP.hold Unoccupied
|
||||
|
||||
eventLights :: HASS Presence (AFRP.Event Lights)
|
||||
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||
where
|
||||
presenceLights Occupied = LightsOn
|
||||
presenceLights Unoccupied = LightsOff
|
||||
|
||||
|
||||
-- There's a small race condition / corner case bug in the og implementation
|
||||
-- I have a couple of lights in the Livingroom
|
||||
--
|
||||
-- - Ceiling ilght
|
||||
-- - "Sofa light", a small reading nook light
|
||||
-- - A few strong lights at a plant corner
|
||||
--
|
||||
-- The plant corner lights are not started by the automation. They are started by a separate schedule
|
||||
-- But, they are turned off by the automation
|
||||
-- So their status gets messed if their schedule turns on while there is nobody in the room
|
||||
--
|
||||
--
|
||||
-- With that in mind, I'll be explicitly controlling the two lights, without any scene shenanigans
|
||||
|
||||
|
||||
lights :: [Target]
|
||||
lights = [EntityId "light.livingroom_ceiling", EntityId "light.livingroom_sofa"]
|
||||
|
||||
livingroomPresenceController :: HASS (AFRP.Event Value) ()
|
||||
livingroomPresenceController = proc x -> do
|
||||
ev <- eventLights . livingroomPresence -< x
|
||||
traceEvent -< ev
|
||||
case ev of
|
||||
AFRP.Event LightsOn -> callServiceDyn (light lights) -< On Nothing
|
||||
AFRP.Event LightsOff -> callServiceDyn (light lights) -< Off
|
||||
_ -> returnA -< ()
|
||||
returnA -< ()
|
||||
@@ -14,16 +14,14 @@ module HomeAssistant.Runtime
|
||||
) where
|
||||
|
||||
import AFRP (Event (..), Mealy (..), Request (..), Auto, stepAutoSerializing, load, DecodedAuto (..))
|
||||
import Control.Concurrent.Async (async, waitAny)
|
||||
import Control.Concurrent.STM (atomically, dupTChan, readTChan)
|
||||
import Data.Aeson (Value)
|
||||
import qualified Data.Text as T
|
||||
import Data.Time (getCurrentTime, getCurrentTimeZone)
|
||||
import Data.Void (Void, absurd)
|
||||
import Data.Void (Void)
|
||||
import HomeAssistant.Controller (HASS, HASSEff (..))
|
||||
import HomeAssistant.Runtime.Bus
|
||||
import HomeAssistant.Runtime.Connection (readerAction, writerAction)
|
||||
import HomeAssistant.Runtime.Supervisor (defaultBackoff, supervised)
|
||||
import HomeAssistant.Runtime.Connection (writerAction, readerAction)
|
||||
import Network.Socket (withSocketsDo)
|
||||
import System.Environment (getEnv, lookupEnv)
|
||||
import HomeAssistant.Controller.Bedroom (bedroomPresenceController, bedroomButtonController, bedroomDrawerController, humidifierController)
|
||||
@@ -31,13 +29,19 @@ import Data.UUID (UUID, toText)
|
||||
import qualified Data.UUID.V4 as UUID.V4
|
||||
import Katip (runKatipT, logF, sl, Severity (..), ls, Namespace (Namespace), runKatipContextT)
|
||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||
import HomeAssistant.Controller.Ruuvi (ruuviController)
|
||||
import HomeAssistant.Controller.Children (schoolLightController)
|
||||
import HomeAssistant.Controller.Children (schoolLightController, childrenBedroomButtonController)
|
||||
import Data.Maybe (fromMaybe)
|
||||
import qualified System.Metrics
|
||||
import qualified HomeAssistant.Runtime.Metrics
|
||||
import System.FilePath ((</>))
|
||||
import Text.Read (readMaybe)
|
||||
import HomeAssistant.Controller.Kitchen (kitchenMotionController)
|
||||
import HomeAssistant.Controller.Livingroom (livingroomPresenceController)
|
||||
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
||||
import UnliftIO.Async
|
||||
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||
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 path trace st a = do
|
||||
@@ -46,24 +50,26 @@ step path trace st a = do
|
||||
let req = Request now tz trace
|
||||
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 "bedroom-presence" bedroomPresenceController False
|
||||
, Controller "bedroom-button" bedroomButtonController False -- This works but leaving for vacation
|
||||
, Controller "bedroom-drawer" bedroomDrawerController True
|
||||
, Controller "bedroom-humidifier" humidifierController True
|
||||
, Controller "ruuvi-controller" ruuviController False
|
||||
, Controller "school-light-controller" schoolLightController True
|
||||
, Controller "kitchen-motion-controller" kitchenMotionController True
|
||||
[ Controller True "bedroom-presence" bedroomPresenceController
|
||||
, Controller True "bedroom-button" bedroomButtonController
|
||||
, Controller True "bedroom-drawer" bedroomDrawerController
|
||||
, Controller True "bedroom-humidifier" humidifierController
|
||||
, Controller True "school-light-controller" schoolLightController
|
||||
, Controller True "kitchen-motion-controller" kitchenMotionController
|
||||
, Controller True "livingroom-presence" livingroomPresenceController
|
||||
, Controller True "hallway-motion-controller" hallwayLightsController
|
||||
, Controller True "children-button" childrenBedroomButtonController
|
||||
]
|
||||
|
||||
-- | 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
|
||||
-- initial state; messages broadcast during the restart window are lost.
|
||||
runController :: FilePath -> Bus -> Controller -> IO Void
|
||||
runController rootDir bus (Controller name machine _enabled) = do
|
||||
runController :: MonadIO m => FilePath -> Bus -> Controller -> m Void
|
||||
runController rootDir bus (Controller _enabled name machine ) = liftIO $ do
|
||||
inbound <- atomically (dupTChan (busInbound bus))
|
||||
let ns = Namespace [name]
|
||||
let workerDefinition = runMealy machine (runKatipContextT (busLogEnv bus) () ns . channelHassEval bus)
|
||||
@@ -79,27 +85,40 @@ runController rootDir bus (Controller name machine _enabled) = do
|
||||
(_, next) <- step path uuid f msg
|
||||
go path inbound next
|
||||
|
||||
lookupPort :: IO Int
|
||||
lookupPort = do
|
||||
m <- lookupEnv "HA_METRICS_PORT"
|
||||
case m of
|
||||
Nothing -> pure 8124
|
||||
Just s -> case readMaybe s of
|
||||
Just p | p >= 1 && p <= 65535 -> pure p
|
||||
_ -> fail ("HA_METRICS_PORT must be a port in 1..65535: " <> s)
|
||||
|
||||
defaultMain :: IO ()
|
||||
defaultMain = withSocketsDo $ do
|
||||
severity <- maybe InfoS (const DebugS) <$> lookupEnv "HA_DEBUG"
|
||||
withBus severity $ \bus -> do
|
||||
store <- System.Metrics.newStore
|
||||
System.Metrics.registerGcMetrics store
|
||||
appMetrics <- HomeAssistant.Runtime.Metrics.registerAppMetrics store
|
||||
rateLimitMetrics <- registerRateLimitMetrics store
|
||||
withBus severity appMetrics $ \bus -> do
|
||||
token <- getEnv "HA_TOKEN"
|
||||
host <- getEnv "HA_HOST"
|
||||
rootPath <- fromMaybe "/tmp/" <$> lookupEnv "HA_LIB_DIR"
|
||||
store <- System.Metrics.newStore
|
||||
System.Metrics.registerGcMetrics store
|
||||
rrdPath <- fromMaybe "hass-controller.rrd" <$> lookupEnv "HA_RRD_PATH"
|
||||
rrdtool <- fromMaybe "rrdtool" <$> lookupEnv "HA_RRDTOOL"
|
||||
let active = [c | c@(Controller _ _ True) <- controllers]
|
||||
ents = foldMap (\(Controller _ m _) -> entities m) active
|
||||
metricsPort <- lookupPort
|
||||
writerLimiter <- slidingWindowLimiter rateLimitMetrics 10 20
|
||||
let active = [c | c@(Controller True _ _) <- controllers]
|
||||
ents = foldMap (\(Controller _ _ m) -> entities m) active
|
||||
workers =
|
||||
[ ("reader", readerAction host 8123 token ents bus)
|
||||
, ("writer", writerAction bus)
|
||||
] ++ [ (name, runController rootPath bus c) | c@(Controller name _ True) <- controllers ]
|
||||
++ [("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)]
|
||||
as <- mapM (\(name, act) -> async (supervised name defaultBackoff act)) workers
|
||||
(_, v) <- waitAny as
|
||||
absurd v
|
||||
, ("writer", writerAction writerLimiter bus)
|
||||
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
||||
, ("metrics-http", HttpServer.runHttpServer (busLogEnv bus) rrdPath rrdtool metricsPort)
|
||||
] ++ [ (name, runController rootPath bus c) | c@(Controller True name _) <- active ]
|
||||
runKatipContextT (busLogEnv bus) () mempty $
|
||||
mapConcurrently_ (uncurry supervised) workers
|
||||
|
||||
dryRunHassEval :: Namespace -> Bus -> HASSEff a -> IO a
|
||||
dryRunHassEval ns bus = \case
|
||||
|
||||
@@ -6,6 +6,8 @@ module HomeAssistant.Runtime.Bus
|
||||
, CallIdGen(..)
|
||||
, mkCallIdGen
|
||||
, withBus
|
||||
, recordInbound
|
||||
, recordOutbound
|
||||
, channelHassEval
|
||||
) where
|
||||
|
||||
@@ -21,10 +23,12 @@ import Control.Concurrent.STM
|
||||
import Data.Aeson (Value)
|
||||
import Data.IORef (atomicModifyIORef', newIORef)
|
||||
import HomeAssistant.Controller (HASSEff (..), Service)
|
||||
import HomeAssistant.Runtime.Metrics (AppMetrics (..))
|
||||
import Network.WebSockets (Connection)
|
||||
import Katip (LogEnv, closeScribes, mkHandleScribe, ColorStrategy (..), permitItem, Severity (..), Verbosity (V2), registerScribe, defaultScribeSettings, initLogEnv, ls, sl, logFM, katipAddContext, KatipContext)
|
||||
import Control.Exception (bracket)
|
||||
import System.IO (stdout)
|
||||
import System.Metrics.Counter (inc)
|
||||
import Data.UUID (toText)
|
||||
import AFRP (Request(..), Event(..))
|
||||
import Control.Monad.IO.Class (MonadIO, liftIO)
|
||||
@@ -38,10 +42,11 @@ data Bus = Bus
|
||||
, busConn :: TVar (Maybe Connection)
|
||||
, busGen :: CallIdGen
|
||||
, busLogEnv :: LogEnv
|
||||
, busMetrics :: AppMetrics
|
||||
}
|
||||
|
||||
withBus :: Severity -> (Bus -> IO a) -> IO a
|
||||
withBus severity callback = do
|
||||
withBus :: Severity -> AppMetrics -> (Bus -> IO a) -> IO a
|
||||
withBus severity metrics callback = do
|
||||
handleScribe <- mkHandleScribe ColorIfTerminal stdout (permitItem severity) V2
|
||||
let makeLogEnv = registerScribe "stdout" handleScribe defaultScribeSettings =<< initLogEnv "hass-controller" "production"
|
||||
-- closeScribes will stop accepting new logs, flush existing ones and clean up resources
|
||||
@@ -52,8 +57,15 @@ withBus severity callback = do
|
||||
<*> newTVarIO Nothing
|
||||
<*> mkCallIdGen 0
|
||||
<*> pure le
|
||||
<*> pure metrics
|
||||
callback bus
|
||||
|
||||
recordInbound :: Bus -> IO ()
|
||||
recordInbound bus = inc (amTriggersIn (busMetrics bus))
|
||||
|
||||
recordOutbound :: Bus -> IO ()
|
||||
recordOutbound bus = inc (amServicesOut (busMetrics bus))
|
||||
|
||||
channelHassEval :: (MonadIO m, KatipContext m) => Bus -> HASSEff a -> m a
|
||||
channelHassEval bus = \case
|
||||
CallService req svc -> katipAddContext (sl "traceId" (toText (requestTraceId req))) $ do
|
||||
|
||||
@@ -5,16 +5,14 @@ module HomeAssistant.Runtime.Connection
|
||||
( readerAction
|
||||
, writerAction
|
||||
, encodeService
|
||||
, dedupeBatch
|
||||
, isTriggerEvent
|
||||
) where
|
||||
|
||||
import Control.Concurrent.STM
|
||||
( TChan
|
||||
, atomically
|
||||
( atomically
|
||||
, readTChan
|
||||
, readTVar
|
||||
, retry
|
||||
, tryReadTChan
|
||||
, writeTChan
|
||||
, writeTVar
|
||||
)
|
||||
@@ -23,11 +21,9 @@ import Control.Concurrent (threadDelay)
|
||||
import Control.Exception (onException)
|
||||
import Control.Exception.Annotated (throw)
|
||||
import Control.Lens ((^?))
|
||||
import Control.Monad (forever, forM_)
|
||||
import Control.Monad (forever, forM_, when)
|
||||
import Data.Aeson (Value, eitherDecode, encode, object, (.=))
|
||||
import Data.Aeson.Lens (key, _String)
|
||||
import Data.List (sort)
|
||||
import qualified Data.Map.Strict as M
|
||||
import qualified Data.Set as S
|
||||
import qualified Data.Text as T
|
||||
import Data.Void (Void)
|
||||
@@ -35,15 +31,18 @@ import HomeAssistant.Controller (Service (..), Target (..))
|
||||
import HomeAssistant.Runtime.Bus
|
||||
import HomeAssistant.Runtime.Supervisor (Fatal (..))
|
||||
import qualified Network.WebSockets as WS
|
||||
import Katip (runKatipContextT, sl, logFM, Severity (..), ls)
|
||||
import Katip (sl, logFM, Severity (..), ls, KatipContext, katipAddNamespace, katipAddContext)
|
||||
import Data.UUID (toText)
|
||||
import AFRP (Request(..), Event(..))
|
||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||
import HomeAssistant.Runtime.RateLimit (RateLimited, RateLimiter, runRateLimited)
|
||||
import Control.Monad.Catch (MonadCatch)
|
||||
|
||||
-- | Connect, authenticate, subscribe, then receive and broadcast forever.
|
||||
-- Restarting this action reconnects. All setup sends happen before the
|
||||
-- connection is published in the bus, so only the writer sends afterwards.
|
||||
readerAction :: String -> Int -> String -> S.Set T.Text -> Bus -> IO Void
|
||||
readerAction host port token ents bus =
|
||||
readerAction :: MonadIO m => String -> Int -> String -> S.Set T.Text -> Bus -> m Void
|
||||
readerAction host port token ents bus = liftIO $
|
||||
WS.runClient host port "/api/websocket" $ \conn -> do
|
||||
handshake conn token
|
||||
subscribe bus conn ents
|
||||
@@ -69,6 +68,9 @@ expectType expected msg =
|
||||
Just t | t == expected -> pure ()
|
||||
_ -> throw (Fatal $ "expected " <> expected <> ", got: " <> T.pack (show msg))
|
||||
|
||||
isTriggerEvent :: Value -> Bool
|
||||
isTriggerEvent v = v ^? key "type" . _String == Just "event"
|
||||
|
||||
subscribe :: Bus -> WS.Connection -> S.Set T.Text -> IO ()
|
||||
subscribe bus conn ents =
|
||||
forM_ (S.toList ents) $ \entityId -> do
|
||||
@@ -96,7 +98,9 @@ receiveLoop bus conn = forever $ do
|
||||
Left () -> atomically $ writeTChan (busInbound bus) Tick
|
||||
Right msg -> case eitherDecode msg of
|
||||
Left err -> putStrLn $ "[reader] skipping undecodable message: " <> err
|
||||
Right v -> atomically $ writeTChan (busInbound bus) (Event v)
|
||||
Right v -> do
|
||||
when (isTriggerEvent v) (recordInbound bus)
|
||||
atomically $ writeTChan (busInbound bus) (Event v)
|
||||
|
||||
receiveJSON :: WS.Connection -> IO Value
|
||||
receiveJSON conn = do
|
||||
@@ -105,40 +109,23 @@ receiveJSON conn = do
|
||||
Left err -> throw (Fatal $ "Invalid JSON from Home Assistant: " <> T.pack err)
|
||||
Right x -> pure x
|
||||
|
||||
-- | Floor between sends within a batch: 100ms, so a many-distinct-target
|
||||
-- flood still caps at ~10 sends/sec even after dedupe.
|
||||
minInterval :: Int
|
||||
minInterval = 100000
|
||||
|
||||
-- | Non-blocking drain of everything queued on a channel. Returns items
|
||||
-- oldest-first (FIFO from the channel), so prepending the blocking
|
||||
-- `readTChan` item keeps the whole batch oldest-first for `dedupeBatch`.
|
||||
drainTry :: TChan a -> IO [a]
|
||||
drainTry chan = go []
|
||||
where
|
||||
go acc = do
|
||||
m <- atomically $ tryReadTChan chan
|
||||
case m of
|
||||
Nothing -> pure (reverse acc)
|
||||
Just x -> go (x : acc)
|
||||
|
||||
sendWithId :: Bus -> WS.Connection -> Request -> Service -> IO ()
|
||||
sendWithId bus conn request svc = do
|
||||
callId <- generateCallId (busGen bus)
|
||||
sendWithId :: (MonadIO m, KatipContext m) => Bus -> WS.Connection -> Service -> RateLimited m ()
|
||||
sendWithId bus conn svc = katipAddNamespace "connection" $ do
|
||||
callId <- liftIO $ generateCallId (busGen bus)
|
||||
let textData = encode $ encodeService callId svc
|
||||
runKatipContextT (busLogEnv bus) (sl "traceId" (toText (requestTraceId request))) "connection" $
|
||||
logFM DebugS (ls textData)
|
||||
WS.sendTextData conn textData
|
||||
liftIO $ recordOutbound bus
|
||||
liftIO $ WS.sendTextData conn textData
|
||||
|
||||
writerAction :: Bus -> IO Void
|
||||
writerAction bus = forever $ do
|
||||
first <- atomically $ readTChan (busOutbound bus)
|
||||
rest <- drainTry (busOutbound bus)
|
||||
let deduped = dedupeBatch (first : rest)
|
||||
conn <- atomically $ readTVar (busConn bus) >>= maybe retry pure
|
||||
forM_ deduped $ \(request, svc) -> do
|
||||
sendWithId bus conn request svc
|
||||
threadDelay minInterval
|
||||
writerAction :: (MonadIO m, KatipContext m, MonadCatch m) => RateLimiter -> Bus -> m Void
|
||||
writerAction rateLimiter bus = forever $ do
|
||||
(request, svc) <- liftIO $ atomically $ readTChan (busOutbound bus)
|
||||
katipAddContext (sl "traceId" (toText (requestTraceId request))) $ do
|
||||
conn <- liftIO $ atomically $ readTVar (busConn bus) >>= maybe retry pure
|
||||
-- runRateLimited rateLimiter $ sendWithId bus conn request svc
|
||||
runRateLimited rateLimiter $ sendWithId bus conn svc
|
||||
|
||||
encodeService :: Int -> Service -> Value
|
||||
encodeService callId Service{..} = object $
|
||||
@@ -149,17 +136,6 @@ encodeService callId Service{..} = object $
|
||||
, "target" .= targetObject serviceTarget
|
||||
] <> maybe [] (\d -> ["service_data" .= d]) serviceData
|
||||
|
||||
-- | Collapse a drained batch of outbound calls: the newest call per
|
||||
-- `(domain, service, sorted-targets)` survives; older duplicates are
|
||||
-- dropped. `serviceData` is not part of the key, so a newer `turn_on`
|
||||
-- with different brightness supersedes an older one to the same target.
|
||||
dedupeBatch :: [(Request, Service)] -> [(Request, Service)]
|
||||
dedupeBatch = M.elems . foldl' ins M.empty
|
||||
where
|
||||
ins m (req, svc) = M.insert (dedupeKey svc) (req, svc) m
|
||||
|
||||
dedupeKey :: Service -> (T.Text, T.Text, [Target])
|
||||
dedupeKey Service{..} = (serviceDomain, serviceName, sort serviceTarget)
|
||||
|
||||
-- | A single target encodes as a scalar; multiple encode as a list. Empty
|
||||
-- lists are omitted so Home Assistant receives only populated keys.
|
||||
|
||||
@@ -0,0 +1,281 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module HomeAssistant.Runtime.Graphing
|
||||
( Range (..)
|
||||
, parseRange
|
||||
, rangeStart
|
||||
, Series (..)
|
||||
, GraphSpec (..)
|
||||
, graphs
|
||||
, lookupGraph
|
||||
, parseNameParam
|
||||
, buildGraphArgs
|
||||
, readProcessBytes
|
||||
, Graph(..)
|
||||
, renderGraph
|
||||
) where
|
||||
|
||||
import Control.Exception (evaluate)
|
||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||
import qualified Data.ByteString as BS
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import System.Exit (ExitCode (..))
|
||||
import System.IO (hGetContents)
|
||||
import System.Process (CreateProcess (..), StdStream (..), proc, waitForProcess, withCreateProcess)
|
||||
import Servant.API (FromHttpApiData (..), ToHttpApiData (..))
|
||||
|
||||
data Range = TenMinutes | OneHour | OneDay | OneWeek | OneMonth
|
||||
deriving (Eq, Show, Bounded, Enum)
|
||||
|
||||
rangeSuffix :: Range -> String
|
||||
rangeSuffix TenMinutes = "10m"
|
||||
rangeSuffix OneHour = "1h"
|
||||
rangeSuffix OneDay = "24h"
|
||||
rangeSuffix OneWeek = "7d"
|
||||
rangeSuffix OneMonth = "30d"
|
||||
|
||||
parseRange :: Text -> Maybe Range
|
||||
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 r = "end-" ++ rangeSuffix r
|
||||
|
||||
data CF = Average | Minimum | Maximum | Last
|
||||
deriving (Eq, Show)
|
||||
|
||||
data Source = Source
|
||||
{ srcDs :: String
|
||||
, srcCF :: CF
|
||||
}
|
||||
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
|
||||
{ gsName :: Text
|
||||
, gsTitle :: String
|
||||
, gsPlots :: [Plot]
|
||||
, gsIdentifier :: Graph
|
||||
}
|
||||
deriving (Eq, Show)
|
||||
|
||||
average :: String -> Source
|
||||
average ds = Source ds Average
|
||||
|
||||
maximumCF :: String -> Source
|
||||
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
|
||||
[] -> Nothing
|
||||
|
||||
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
||||
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 rrdPath spec range =
|
||||
[ "graph"
|
||||
, "-"
|
||||
, "--start", rangeStart range
|
||||
, "--title", gsTitle spec
|
||||
, "--width", "800"
|
||||
, "--height", "250"
|
||||
, "--imgformat", "PNG"
|
||||
]
|
||||
++ concatMap (defArgs rrdPath . plotSeries) (gsPlots spec)
|
||||
++ map plotArg (gsPlots spec)
|
||||
|
||||
|
||||
readProcessBytes :: FilePath -> [String] -> IO (ExitCode, BS.ByteString, String)
|
||||
readProcessBytes cmd args =
|
||||
withCreateProcess (proc cmd args) { std_out = CreatePipe, std_err = CreatePipe } $
|
||||
\_ mout merr ph ->
|
||||
case (mout, merr) of
|
||||
(Just hout, Just herr) -> do
|
||||
out <- BS.hGetContents hout
|
||||
err <- hGetContents herr
|
||||
code <- waitForProcess ph
|
||||
_ <- evaluate (length err)
|
||||
pure (code, out, err)
|
||||
_ -> pure (ExitFailure 1, BS.empty, "failed to create pipes")
|
||||
|
||||
renderGraph :: MonadIO m => FilePath -> FilePath -> GraphSpec -> Range -> m (Either Text BS.ByteString)
|
||||
renderGraph rrdPath rrdtool spec range = do
|
||||
(code, out, err) <- liftIO (readProcessBytes rrdtool (buildGraphArgs rrdPath spec range))
|
||||
case code of
|
||||
ExitSuccess
|
||||
| not (BS.null out) -> pure $ Right out
|
||||
| otherwise -> pure $ Left "empty graph"
|
||||
_ -> pure $ Left (T.pack $ take 200 err)
|
||||
|
||||
|
||||
|
||||
|
||||
data Graph
|
||||
= Memory
|
||||
| Traffic
|
||||
| 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")
|
||||
|
||||
@@ -8,6 +8,10 @@ module HomeAssistant.Runtime.Metrics
|
||||
, buildSchema
|
||||
, buildCreateArgs
|
||||
, buildUpdateArgs
|
||||
, parseInfoDs
|
||||
, schemaMatches
|
||||
, AppMetrics (..)
|
||||
, registerAppMetrics
|
||||
, ensureRrd
|
||||
, sampleAndUpdate
|
||||
, metricsAction
|
||||
@@ -17,19 +21,26 @@ import Control.Concurrent (threadDelay)
|
||||
import Control.Monad (forever, unless)
|
||||
import Data.Char (ord)
|
||||
import Data.Int (Int64)
|
||||
import Data.List (intercalate, sortBy)
|
||||
import Data.List (intercalate, sort, sortBy, stripPrefix)
|
||||
import Data.Maybe (mapMaybe)
|
||||
import Data.Ord (comparing)
|
||||
import Data.Text (Text)
|
||||
import Data.Time (defaultTimeLocale, formatTime, getCurrentTime)
|
||||
import Data.Void (Void)
|
||||
import Numeric (showHex)
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.HashMap.Strict as HM
|
||||
import qualified System.Metrics as M (Value (..), Sample, Store, sampleAll)
|
||||
import System.Directory (doesFileExist)
|
||||
import System.Process (callProcess)
|
||||
import qualified System.Metrics as M (Value (..), Sample, Store, createCounter, sampleAll)
|
||||
import System.Metrics.Counter (Counter)
|
||||
import System.Directory (doesFileExist, renameFile)
|
||||
import System.Exit (ExitCode (..))
|
||||
import System.Process (callProcess, readProcessWithExitCode)
|
||||
import Control.Monad.IO.Class (MonadIO, liftIO)
|
||||
import Control.Exception.Annotated (checkpointCallStack)
|
||||
import Control.Monad.Catch (MonadCatch)
|
||||
|
||||
data DsType = Derive | Gauge
|
||||
deriving (Eq, Show)
|
||||
deriving (Eq, Ord, Show)
|
||||
|
||||
data DsSpec = DsSpec
|
||||
{ dsEkgName :: Text
|
||||
@@ -62,6 +73,19 @@ buildSchema sample =
|
||||
, Just dt <- [dsTypeOf val]
|
||||
]
|
||||
|
||||
data AppMetrics = AppMetrics
|
||||
{ amTriggersIn :: Counter
|
||||
, amServicesOut :: Counter
|
||||
}
|
||||
|
||||
registerAppMetrics :: M.Store -> IO AppMetrics
|
||||
registerAppMetrics store =
|
||||
AppMetrics
|
||||
<$> M.createCounter "hass.trigger.in" store
|
||||
<*> M.createCounter "hass.service.out" store
|
||||
|
||||
|
||||
|
||||
buildCreateArgs :: FilePath -> Int -> [(String, DsType)] -> [String]
|
||||
buildCreateArgs path step specs =
|
||||
["create", path, "--step", show step]
|
||||
@@ -89,31 +113,70 @@ buildUpdateArgs path names values =
|
||||
renderValue Nothing = "U"
|
||||
renderValue (Just n) = show n
|
||||
|
||||
dsTypeFromString :: String -> Maybe DsType
|
||||
dsTypeFromString "DERIVE" = Just Derive
|
||||
dsTypeFromString "GAUGE" = Just Gauge
|
||||
dsTypeFromString _ = Nothing
|
||||
|
||||
parseInfoDs :: String -> [(String, DsType)]
|
||||
parseInfoDs = mapMaybe parseLine . lines
|
||||
where
|
||||
parseLine line = do
|
||||
rest0 <- stripPrefix "ds[" line
|
||||
let (name, rest1) = break (== ']') rest0
|
||||
rest2 <- stripPrefix "].type = \"" rest1
|
||||
let (ty, _) = break (== '"') rest2
|
||||
dt <- dsTypeFromString ty
|
||||
pure (name, dt)
|
||||
|
||||
schemaMatches :: [DsSpec] -> [(String, DsType)] -> Bool
|
||||
schemaMatches schema existing =
|
||||
sort (map (\s -> (dsName s, dsType s)) schema) == sort existing
|
||||
|
||||
lookupValue :: M.Sample -> Text -> Maybe Int64
|
||||
lookupValue sample name = case HM.lookup name sample of
|
||||
Just (M.Counter n) -> Just n
|
||||
Just (M.Gauge n) -> Just n
|
||||
_ -> Nothing
|
||||
|
||||
ensureRrd :: FilePath -> FilePath -> [DsSpec] -> IO ()
|
||||
ensureRrd rrdtool rrdPath schema = do
|
||||
exists <- doesFileExist rrdPath
|
||||
unless exists $
|
||||
callProcess rrdtool (buildCreateArgs rrdPath 10 (map toPair schema))
|
||||
readExistingDs :: (MonadCatch m, MonadIO m) => FilePath -> FilePath -> m [(String, DsType)]
|
||||
readExistingDs rrdtool rrdPath = checkpointCallStack $ do
|
||||
(code, out, _) <- liftIO $ readProcessWithExitCode rrdtool ["info", rrdPath] ""
|
||||
pure $ case code of
|
||||
ExitSuccess -> parseInfoDs out
|
||||
_ -> []
|
||||
|
||||
backupPath :: MonadIO m => FilePath -> m FilePath
|
||||
backupPath path = liftIO $ do
|
||||
now <- getCurrentTime
|
||||
pure $ path ++ ".bak-" ++ formatTime defaultTimeLocale "%Y%m%dT%H%M%S" now
|
||||
|
||||
ensureRrd :: (MonadCatch m, MonadIO m) => FilePath -> FilePath -> [DsSpec] -> m ()
|
||||
ensureRrd rrdtool rrdPath schema = checkpointCallStack $ do
|
||||
exists <- liftIO $ doesFileExist rrdPath
|
||||
if not exists
|
||||
then create
|
||||
else do
|
||||
current <- readExistingDs rrdtool rrdPath
|
||||
unless (schemaMatches schema current) $ do
|
||||
backup <- backupPath rrdPath
|
||||
liftIO $ renameFile rrdPath backup
|
||||
create
|
||||
where
|
||||
create = liftIO $ callProcess rrdtool (buildCreateArgs rrdPath 10 (map toPair schema))
|
||||
toPair s = (dsName s, dsType s)
|
||||
|
||||
sampleAndUpdate :: M.Store -> FilePath -> FilePath -> [DsSpec] -> IO ()
|
||||
sampleAndUpdate store rrdtool rrdPath schema = do
|
||||
sample <- M.sampleAll store
|
||||
sampleAndUpdate :: (MonadCatch m, MonadIO m) => M.Store -> FilePath -> FilePath -> [DsSpec] -> m ()
|
||||
sampleAndUpdate store rrdtool rrdPath schema = checkpointCallStack $ do
|
||||
sample <- liftIO $ M.sampleAll store
|
||||
let names = map dsName schema
|
||||
values = map (lookupValue sample . dsEkgName) schema
|
||||
callProcess rrdtool (buildUpdateArgs rrdPath names values)
|
||||
liftIO $ callProcess rrdtool (buildUpdateArgs rrdPath names values)
|
||||
|
||||
metricsAction :: M.Store -> FilePath -> FilePath -> IO Void
|
||||
metricsAction store rrdPath rrdtool = do
|
||||
schema <- buildSchema <$> M.sampleAll store
|
||||
metricsAction :: (MonadCatch m, MonadIO m) => M.Store -> FilePath -> FilePath -> m Void
|
||||
metricsAction store rrdPath rrdtool = checkpointCallStack $ do
|
||||
schema <- buildSchema <$> liftIO (M.sampleAll store)
|
||||
ensureRrd rrdtool rrdPath schema
|
||||
forever $ do
|
||||
sampleAndUpdate store rrdtool rrdPath schema
|
||||
threadDelay 10000000
|
||||
liftIO $ threadDelay 10000000
|
||||
@@ -0,0 +1,74 @@
|
||||
{-# Language DerivingVia #-}
|
||||
{-# Language OverloadedStrings #-}
|
||||
module HomeAssistant.Runtime.RateLimit where
|
||||
import Control.Monad.IO.Class (MonadIO, liftIO)
|
||||
import Data.Time (NominalDiffTime)
|
||||
import Control.Concurrent.STM (newTVarIO, atomically, readTVar, writeTVar)
|
||||
import Data.Time.Clock.POSIX (getPOSIXTime)
|
||||
import Katip.Monadic (KatipContext(..))
|
||||
import Control.Retry (fullJitterBackoff, limitRetries, retrying, RetryStatus (..))
|
||||
import Data.Maybe (isNothing)
|
||||
import Control.Exception.Annotated (Exception, checkpointCallStack, throw)
|
||||
import Control.Monad.Catch (MonadCatch)
|
||||
import Katip (Katip, Severity (WarningS), logFM, ls)
|
||||
import Control.Monad (when)
|
||||
import System.Metrics.Counter (Counter)
|
||||
import qualified System.Metrics.Counter as Counter
|
||||
import System.Metrics (Store, createCounter)
|
||||
|
||||
data RateLimitMetrics = RateLimitMetrics
|
||||
{ rlRetries :: Counter
|
||||
, rlRejects :: Counter
|
||||
}
|
||||
|
||||
|
||||
registerRateLimitMetrics :: MonadIO m => Store -> m RateLimitMetrics
|
||||
registerRateLimitMetrics store = liftIO $ RateLimitMetrics
|
||||
<$> createCounter "ratelimit.retry" store
|
||||
<*> createCounter "ratelimit.exhausted" store
|
||||
|
||||
newtype RateLimited m a = RateLimited (m a)
|
||||
deriving (Functor, Applicative, Monad, MonadIO, KatipContext, Katip) via m
|
||||
|
||||
|
||||
data RateLimiter = RateLimiter
|
||||
{ metrics :: RateLimitMetrics
|
||||
, limiter :: forall m a. (KatipContext m, MonadIO m) => RateLimited m a -> m (Maybe a)
|
||||
}
|
||||
|
||||
|
||||
slidingWindowLimiter
|
||||
:: RateLimitMetrics
|
||||
-> NominalDiffTime -- ^ Within how many seconds
|
||||
-> Int -- ^ How many requests we can make
|
||||
-> IO RateLimiter
|
||||
slidingWindowLimiter metrics timeWindow size = do
|
||||
window <- newTVarIO []
|
||||
return $ RateLimiter metrics $ \(RateLimited action) -> do
|
||||
now <- liftIO getPOSIXTime
|
||||
allowed <- liftIO $ atomically $ do
|
||||
elements <- takeWhile (\x -> x > now - timeWindow) <$> readTVar window
|
||||
if length elements >= size
|
||||
then pure False
|
||||
else True <$ writeTVar window (now : elements)
|
||||
if allowed
|
||||
then Just <$> action
|
||||
else pure Nothing
|
||||
|
||||
data RateLimitException = RateLimitExhausted
|
||||
deriving Show
|
||||
|
||||
instance Exception RateLimitException
|
||||
|
||||
runRateLimited :: (MonadIO m, KatipContext m, MonadCatch m) => RateLimiter -> RateLimited m a -> m a
|
||||
runRateLimited (RateLimiter metrics run) action = checkpointCallStack $ do
|
||||
x <- retrying retryPolicy (const $ pure . isNothing) $ \RetryStatus{rsIterNumber} -> do
|
||||
when (rsIterNumber > 0) $ do
|
||||
logFM WarningS $ ls $ "Rate limited, attempt no. " <> show rsIterNumber
|
||||
incRetry
|
||||
run action
|
||||
maybe (incReject >> throw RateLimitExhausted) pure x
|
||||
where
|
||||
retryPolicy = fullJitterBackoff 500_000 <> limitRetries 5
|
||||
incRetry = liftIO $ Counter.inc (rlRetries metrics)
|
||||
incReject = liftIO $ Counter.inc (rlRejects metrics)
|
||||
@@ -2,26 +2,23 @@
|
||||
|
||||
module HomeAssistant.Runtime.Supervisor
|
||||
( supervised
|
||||
, Backoff(..)
|
||||
, defaultBackoff
|
||||
, backoffDelay
|
||||
, nextAttempt
|
||||
, Fatal(..)
|
||||
) where
|
||||
|
||||
import Control.Concurrent (threadDelay)
|
||||
import Control.Exception.Annotated
|
||||
( Exception
|
||||
, Handler (..)
|
||||
, SomeException
|
||||
, catches
|
||||
, displayException
|
||||
, throw
|
||||
, checkpoint, Annotation (..)
|
||||
)
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import Data.Time (NominalDiffTime, diffUTCTime, getCurrentTime)
|
||||
import Data.Void (Void)
|
||||
import Control.Monad.IO.Class (MonadIO)
|
||||
import Control.Monad.Catch (MonadCatch, MonadMask)
|
||||
import Katip (KatipContext, logFM, ls)
|
||||
import Control.Retry (RetryStatus(..), recovering, fullJitterBackoff, capDelay, skipAsyncExceptions)
|
||||
import Control.Monad (when)
|
||||
import Katip.Core (Severity(..))
|
||||
|
||||
-- | A failure that cannot be fixed by restarting; propagates out of
|
||||
-- 'supervised' and terminates the process.
|
||||
@@ -30,28 +27,11 @@ newtype Fatal = Fatal Text
|
||||
|
||||
instance Exception Fatal
|
||||
|
||||
data Backoff = Backoff
|
||||
{ backoffBase :: NominalDiffTime -- ^ Delay before the first restart
|
||||
, backoffCap :: NominalDiffTime -- ^ Maximum delay between restarts
|
||||
, backoffQuiet :: NominalDiffTime -- ^ Uptime after which the delay resets
|
||||
}
|
||||
deriving (Eq, Show)
|
||||
|
||||
defaultBackoff :: Backoff
|
||||
defaultBackoff = Backoff 0.1 30 30
|
||||
data SupervisorException = RetriesExhausted
|
||||
deriving Show
|
||||
|
||||
-- | Delay before the @attempt@-th restart: doubles from base, clamped at cap.
|
||||
backoffDelay :: Backoff -> Int -> NominalDiffTime
|
||||
backoffDelay (Backoff base cap _) attempt = go (max 0 (attempt - 1)) base
|
||||
where
|
||||
go 0 d = d
|
||||
go n d = go (n - 1) (min cap (d * 2))
|
||||
|
||||
-- | Attempt number to use after a crash that ran for the given uptime.
|
||||
nextAttempt :: Backoff -> NominalDiffTime -> Int -> Int
|
||||
nextAttempt (Backoff _ _ quiet) uptime attempt
|
||||
| uptime >= quiet = 1
|
||||
| otherwise = attempt + 1
|
||||
instance Exception SupervisorException
|
||||
|
||||
-- | Runs the action forever, restarting it with backoff after synchronous
|
||||
-- exceptions; async exceptions propagate. 'Fatal' is rethrown (crashing the
|
||||
@@ -59,22 +39,14 @@ nextAttempt (Backoff _ _ quiet) uptime attempt
|
||||
-- must not be wrapped in checkpoints around 'Fatal'-throwing code: a
|
||||
-- doubly-wrapped 'Fatal' is indistinguishable from a crash and would be
|
||||
-- restarted instead of escalated.
|
||||
supervised :: Text -> Backoff -> IO Void -> IO Void
|
||||
supervised name backoff action = go 1
|
||||
supervised :: (MonadIO m, MonadCatch m, KatipContext m, MonadMask m) => Text -> m Void -> m Void
|
||||
supervised name action = checkpoint (Annotation name) $ do
|
||||
recovering retryPolicy (skipAsyncExceptions ++ handlers) $ \RetryStatus{rsIterNumber} -> do
|
||||
when (rsIterNumber > 0) $ logFM WarningS $ ls $ "Child crashed, retry no " <> show rsIterNumber
|
||||
action
|
||||
where
|
||||
go attempt = do
|
||||
start <- getCurrentTime
|
||||
outcome <- (action >> pure (Nothing :: Maybe (Either Fatal SomeException))) `catches`
|
||||
[ Handler $ \(f :: Fatal) -> pure (Just (Left f))
|
||||
, Handler $ \(e :: SomeException) -> pure (Just (Right e))
|
||||
handlers =
|
||||
[ \_retryStatus -> Handler $ \(_ :: Fatal) -> pure False
|
||||
, \_retryStatus -> Handler $ \(_ :: SomeException) -> pure True
|
||||
]
|
||||
end <- getCurrentTime
|
||||
case outcome of
|
||||
Nothing -> error "unreachable: supervised action returned"
|
||||
Just (Left f) -> throw f
|
||||
Just (Right e) -> do
|
||||
putStrLn $ "[" <> T.unpack name <> "] attempt " <> show attempt <> " crashed: " <> displayException e
|
||||
let delay = backoffDelay backoff attempt
|
||||
putStrLn $ "[" <> T.unpack name <> "] restarting in " <> show delay
|
||||
threadDelay (round (realToFrac delay * 1000000 :: Double))
|
||||
go (nextAttempt backoff (diffUTCTime end start) attempt)
|
||||
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
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
module BackoffProp (spec) where
|
||||
|
||||
import Data.Maybe (listToMaybe)
|
||||
import Data.Time (NominalDiffTime)
|
||||
import qualified Hedgehog.Gen as Gen
|
||||
import qualified Hedgehog.Range as Range
|
||||
import HomeAssistant.Runtime.Supervisor (Backoff (..), backoffDelay)
|
||||
import Test.Hspec (Spec, describe, it)
|
||||
import Test.Hspec.Hedgehog (hedgehog, forAll, (===))
|
||||
|
||||
spec :: Spec
|
||||
spec = describe "backoffDelay" $
|
||||
it "doubles from base, clamped at cap" $ hedgehog $ do
|
||||
baseD <- forAll $ Gen.double (Range.constant 0.0001 10)
|
||||
ratio <- forAll $ Gen.double (Range.constant 1 100)
|
||||
let base = realToFrac baseD :: NominalDiffTime
|
||||
cap = realToFrac (baseD * ratio) :: NominalDiffTime
|
||||
backoff = Backoff base cap 1
|
||||
delays = map (backoffDelay backoff) [1 .. 100 :: Int]
|
||||
listToMaybe delays === Just (min cap base)
|
||||
mapM_ (\(a, b) -> b === min cap (a * 2)) (zip delays (drop 1 delays))
|
||||
+17
-16
@@ -45,6 +45,7 @@ entitySpec = describe "entities" $ do
|
||||
`shouldBe` S.fromList
|
||||
[ "event.bedroom_quick_remote_masse_action"
|
||||
, "event.bedroom_quick_jemina_action"
|
||||
, "event.bedroom_remote_action"
|
||||
]
|
||||
|
||||
it "bedroomPresenceController subscribes to the presence sensor" $
|
||||
@@ -89,36 +90,36 @@ buttonSpec = describe "bedroomButtonController" $ do
|
||||
let area = AreaId "makuuhuone"
|
||||
|
||||
it "Masse single click turns on his nightstand scene (lowest)" $
|
||||
services (runHASS bedroomButtonController [masseButton "1_short_release"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_masse"]]
|
||||
concat (services (runHASS bedroomButtonController [masseButton "1_short_release"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_masse"]
|
||||
|
||||
it "Masse double click turns on the middle scene" $
|
||||
services (runHASS bedroomButtonController [masseButton "1_double_press"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
||||
concat (services (runHASS bedroomButtonController [masseButton "1_double_press"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||
|
||||
it "Masse long click turns on the bright scene" $
|
||||
services (runHASS bedroomButtonController [masseButton "1_long_press"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
||||
concat (services (runHASS bedroomButtonController [masseButton "1_long_press"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||
|
||||
it "Masse off click turns the bedroom lights off" $
|
||||
services (runHASS bedroomButtonController [masseButton "2_short_release"])
|
||||
`shouldBe` [[light [area] Off]]
|
||||
concat (services (runHASS bedroomButtonController [masseButton "2_short_release"]))
|
||||
`shouldContain` [light [area] Off]
|
||||
|
||||
it "Enishen single click turns on her nightstand scene (lowest)" $
|
||||
services (runHASS bedroomButtonController [enishenButton "1_short_release"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_jemina"]]
|
||||
concat (services (runHASS bedroomButtonController [enishenButton "1_short_release"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_jemina"]
|
||||
|
||||
it "Enishen double click turns on the middle scene" $
|
||||
services (runHASS bedroomButtonController [enishenButton "1_double_press"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
||||
concat (services (runHASS bedroomButtonController [enishenButton "1_double_press"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||
|
||||
it "Enishen long click turns on the bright scene" $
|
||||
services (runHASS bedroomButtonController [enishenButton "1_long_press"])
|
||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
||||
concat (services (runHASS bedroomButtonController [enishenButton "1_long_press"]))
|
||||
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||
|
||||
it "Enishen off click turns the bedroom lights off" $
|
||||
services (runHASS bedroomButtonController [enishenButton "2_short_release"])
|
||||
`shouldBe` [[light [area] Off]]
|
||||
concat (services (runHASS bedroomButtonController [enishenButton "2_short_release"]))
|
||||
`shouldContain` [light [area] Off]
|
||||
|
||||
it "ignores the initial press (scene only fires on release)" $
|
||||
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
||||
|
||||
+23
-2
@@ -10,16 +10,19 @@ import Control.Concurrent.STM
|
||||
, writeTChan
|
||||
)
|
||||
import Data.Aeson (Value (..))
|
||||
import qualified Data.HashMap.Strict as HM
|
||||
import Data.Time (UTCTime (..), utc)
|
||||
import Data.UUID (nil)
|
||||
import HomeAssistant.Controller (HASSEff (..), Service (..), Target(..))
|
||||
import HomeAssistant.Runtime.Bus
|
||||
import HomeAssistant.Runtime.Metrics (registerAppMetrics)
|
||||
import Katip (Namespace (Namespace), runKatipContextT, Severity (..))
|
||||
import qualified System.Metrics as Metrics
|
||||
import Test.Hspec
|
||||
|
||||
spec :: Spec
|
||||
spec = describe "Bus" $ do
|
||||
it "broadcasts inbound messages to every dup'd channel in order" $ withBus InfoS $ \bus -> do
|
||||
it "broadcasts inbound messages to every dup'd channel in order" $ withTestBus $ \bus -> do
|
||||
p1 <- atomically $ dupTChan (busInbound bus)
|
||||
p2 <- atomically $ dupTChan (busInbound bus)
|
||||
atomically $ writeTChan (busInbound bus) (Event (Number 1))
|
||||
@@ -29,7 +32,7 @@ spec = describe "Bus" $ do
|
||||
r1 `shouldBe` (Event (Number 1), Event (Number 2))
|
||||
r2 `shouldBe` (Event (Number 1), Event (Number 2))
|
||||
|
||||
it "channelHassEval writes CallService to the outbound channel" $ withBus InfoS $ \bus -> do
|
||||
it "channelHassEval writes CallService to the outbound channel" $ withTestBus $ \bus -> do
|
||||
let req = Request (UTCTime (toEnum 0) 0) utc nil
|
||||
svc = Service "light" "turn_on" Nothing [EntityId "light.bedroom_masse"]
|
||||
runKatipContextT (busLogEnv bus) () (Namespace ["test"]) $
|
||||
@@ -43,3 +46,21 @@ spec = describe "Bus" $ do
|
||||
a <- generateCallId gen
|
||||
b <- generateCallId gen
|
||||
(a, b) `shouldBe` (1, 2)
|
||||
|
||||
describe "recordInbound / recordOutbound" $ do
|
||||
it "increments the trigger and service counters" $ do
|
||||
store <- Metrics.newStore
|
||||
m <- registerAppMetrics store
|
||||
withBus InfoS m $ \bus -> do
|
||||
recordInbound bus
|
||||
recordInbound bus
|
||||
recordOutbound bus
|
||||
sample <- Metrics.sampleAll store
|
||||
HM.lookup "hass.trigger.in" sample `shouldBe` Just (Metrics.Counter 2)
|
||||
HM.lookup "hass.service.out" sample `shouldBe` Just (Metrics.Counter 1)
|
||||
|
||||
withTestBus :: (Bus -> IO a) -> IO a
|
||||
withTestBus action = do
|
||||
store <- Metrics.newStore
|
||||
m <- registerAppMetrics store
|
||||
withBus InfoS m action
|
||||
+8
-28
@@ -9,7 +9,7 @@ import Data.Text (Text)
|
||||
import Data.Time (UTCTime (..), utc)
|
||||
import Data.UUID (fromString)
|
||||
import HomeAssistant.Controller (Service (..), Target(..))
|
||||
import HomeAssistant.Runtime.Connection (encodeService, dedupeBatch)
|
||||
import HomeAssistant.Runtime.Connection (encodeService, isTriggerEvent)
|
||||
import Test.Hspec
|
||||
|
||||
spec :: Spec
|
||||
@@ -36,34 +36,14 @@ spec = do
|
||||
, "service_data" .= object ["brightness" .= (200 :: Int)]
|
||||
]
|
||||
|
||||
describe "dedupeBatch" $ do
|
||||
it "collapses identical calls to one" $
|
||||
let batch = [ (req 1, lightOn [AreaId "x"])
|
||||
, (req 2, lightOn [AreaId "x"])
|
||||
, (req 3, lightOn [AreaId "x"])
|
||||
]
|
||||
in dedupeBatch batch `shouldBe` [(req 3, lightOn [AreaId "x"])]
|
||||
describe "isTriggerEvent" $ do
|
||||
it "is true for event frames" $
|
||||
isTriggerEvent (object ["type" .= ("event" :: Text)]) `shouldBe` True
|
||||
it "is false for result frames" $
|
||||
isTriggerEvent (object ["type" .= ("result" :: Text)]) `shouldBe` False
|
||||
it "is false when there is no type" $
|
||||
isTriggerEvent (object ["id" .= (1 :: Int)]) `shouldBe` False
|
||||
|
||||
it "keeps same-target different-service calls separate" $
|
||||
let batch = [ (req 1, lightOn [AreaId "x"])
|
||||
, (req 2, lightOff [AreaId "x"])
|
||||
]
|
||||
result = dedupeBatch batch
|
||||
in length result `shouldBe` 2
|
||||
|
||||
it "newest call wins for the same key" $
|
||||
let batch = [ (req 1, lightOn [AreaId "x"])
|
||||
, (req 2, lightOn [AreaId "x"])
|
||||
, (req 3, lightOn [AreaId "x"])
|
||||
]
|
||||
in map requestTraceId (map fst (dedupeBatch batch)) `shouldBe`
|
||||
[fromJust (fromString "00000000-0000-0000-0000-000000000003")]
|
||||
|
||||
it "treats target lists in different order as the same key" $
|
||||
let batch = [ (req 1, lightOn [EntityId "a", EntityId "b"])
|
||||
, (req 2, lightOn [EntityId "b", EntityId "a"])
|
||||
]
|
||||
in length (dedupeBatch batch) `shouldBe` 1
|
||||
|
||||
req :: Int -> Request
|
||||
req n = Request (UTCTime (toEnum 0) (fromIntegral (0 :: Int))) utc
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module GraphingSpec (spec) where
|
||||
|
||||
import Control.Exception (SomeException, finally, try)
|
||||
import qualified Data.ByteString as BS
|
||||
import HomeAssistant.Runtime.Graphing
|
||||
( GraphSpec (..)
|
||||
, Range (..)
|
||||
, buildGraphArgs
|
||||
, graphs
|
||||
, lookupGraph
|
||||
, parseNameParam
|
||||
, parseRange
|
||||
, rangeStart
|
||||
, readProcessBytes
|
||||
)
|
||||
import qualified HomeAssistant.Runtime.Metrics as Metrics
|
||||
import System.Directory (findExecutable, getTemporaryDirectory, removeFile)
|
||||
import System.Exit (ExitCode (..))
|
||||
import System.Process (readProcessWithExitCode)
|
||||
import Test.Hspec
|
||||
import Servant.API (FromHttpApiData(..), ToHttpApiData (..))
|
||||
import HomeAssistant.Runtime.Graphing (Graph(..))
|
||||
|
||||
traffic :: GraphSpec
|
||||
traffic = case lookupGraph graphs Traffic of
|
||||
Just s -> s
|
||||
Nothing -> error "traffic graph is missing from the table"
|
||||
|
||||
spec :: Spec
|
||||
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
|
||||
-- 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" $
|
||||
map parseRange ["10m", "1h", "24h", "7d", "30d"]
|
||||
`shouldBe` [ Just TenMinutes
|
||||
, Just OneHour
|
||||
, Just OneDay
|
||||
, Just OneWeek
|
||||
, Just OneMonth
|
||||
]
|
||||
|
||||
it "rejects everything outside the closed set" $
|
||||
map parseRange
|
||||
[ ""
|
||||
, "1h "
|
||||
, " 1h"
|
||||
, "1h; rm -rf /"
|
||||
, "end-1h"
|
||||
, "../../etc/passwd"
|
||||
, "1y"
|
||||
, "30m"
|
||||
, "1H"
|
||||
]
|
||||
`shouldBe` replicate 9 Nothing
|
||||
|
||||
describe "rangeStart" $ do
|
||||
it "renders rrdtool end- relative starts" $
|
||||
map rangeStart [TenMinutes, OneHour, OneDay, OneWeek, OneMonth]
|
||||
`shouldBe` ["end-10m", "end-1h", "end-24h", "end-7d", "end-30d"]
|
||||
|
||||
describe "parseNameParam" $ do
|
||||
it "resolves the traffic graph only with a .png suffix" $ do
|
||||
fmap gsName (parseNameParam graphs "traffic.png") `shouldBe` Just "traffic"
|
||||
parseNameParam graphs "traffic" `shouldBe` Nothing
|
||||
|
||||
it "rejects unknown, malformed, and traversing names" $
|
||||
map (parseNameParam graphs)
|
||||
[ "unknown.png"
|
||||
, "../traffic.png"
|
||||
, "traffic.png.png"
|
||||
, ""
|
||||
, "nope"
|
||||
]
|
||||
`shouldBe` replicate 5 Nothing
|
||||
|
||||
describe "buildGraphArgs" $ do
|
||||
it "builds the traffic argv for a range" $
|
||||
buildGraphArgs "hass-controller.rrd" traffic OneHour
|
||||
`shouldBe`
|
||||
[ "graph"
|
||||
, "-"
|
||||
, "--start", "end-1h"
|
||||
, "--title", "Hass triggers in / services out"
|
||||
, "--width", "800"
|
||||
, "--height", "250"
|
||||
, "--imgformat", "PNG"
|
||||
, "DEF:in_raw=hass-controller.rrd:hass_trigger_in:AVERAGE"
|
||||
, "CDEF:in=in_raw,60.0,*"
|
||||
, "DEF:out_raw=hass-controller.rrd:hass_service_out:AVERAGE"
|
||||
, "CDEF:out=out_raw,60.0,*"
|
||||
, "LINE2:in#0066cc:Triggers in/min"
|
||||
, "LINE2:out#cc0000:Service calls out/min"
|
||||
]
|
||||
|
||||
describe "end-to-end (rrdtool-gated)" $ do
|
||||
it "renders a PNG for the traffic graph" $ do
|
||||
mRrdtool <- findExecutable "rrdtool"
|
||||
case mRrdtool of
|
||||
Nothing -> pendingWith "rrdtool not on PATH"
|
||||
Just rrdtool -> do
|
||||
tmp <- getTemporaryDirectory
|
||||
let rrdPath = tmp ++ "/hass-controller-graph-test.rrd"
|
||||
cleanup = try (removeFile rrdPath) :: IO (Either SomeException ())
|
||||
schema =
|
||||
[ ("hass_trigger_in", Metrics.Derive)
|
||||
, ("hass_service_out", Metrics.Derive)
|
||||
]
|
||||
pngMagic = BS.pack [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]
|
||||
_ <- cleanup
|
||||
( do
|
||||
(createCode, _, _) <-
|
||||
readProcessWithExitCode rrdtool (Metrics.buildCreateArgs rrdPath 10 schema) ""
|
||||
createCode `shouldBe` ExitSuccess
|
||||
(updateCode, _, _) <-
|
||||
readProcessWithExitCode
|
||||
rrdtool
|
||||
(Metrics.buildUpdateArgs
|
||||
rrdPath
|
||||
["hass_trigger_in", "hass_service_out"]
|
||||
[Just 5, Just 3])
|
||||
""
|
||||
updateCode `shouldBe` ExitSuccess
|
||||
(code, out, _) <- readProcessBytes rrdtool (buildGraphArgs rrdPath traffic OneHour)
|
||||
code `shouldBe` ExitSuccess
|
||||
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
||||
)
|
||||
`finally` cleanup
|
||||
|
||||
|
||||
|
||||
+2
-4
@@ -3,13 +3,12 @@ module Main (main) where
|
||||
import Test.Hspec (hspec)
|
||||
import qualified AFRPLawsSpec
|
||||
import qualified AFRPSpec
|
||||
import qualified BackoffProp
|
||||
import qualified BedroomSpec
|
||||
import qualified BusSpec
|
||||
import qualified ConnectionSpec
|
||||
import qualified GraphingSpec
|
||||
import qualified MetricsSpec
|
||||
import qualified RuntimeSpec
|
||||
import qualified SupervisorSpec
|
||||
|
||||
main :: IO ()
|
||||
main = hspec $ do
|
||||
@@ -18,7 +17,6 @@ main = hspec $ do
|
||||
BedroomSpec.spec
|
||||
BusSpec.spec
|
||||
ConnectionSpec.spec
|
||||
GraphingSpec.spec
|
||||
MetricsSpec.spec
|
||||
RuntimeSpec.spec
|
||||
SupervisorSpec.spec
|
||||
BackoffProp.spec
|
||||
+80
-4
@@ -4,8 +4,9 @@ module MetricsSpec (spec) where
|
||||
|
||||
import Data.HashMap.Strict (HashMap)
|
||||
import qualified Data.HashMap.Strict as HM
|
||||
import Data.Int (Int64)
|
||||
import Data.List (isPrefixOf)
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import HomeAssistant.Runtime.Metrics
|
||||
( DsType (..)
|
||||
, DsSpec (..)
|
||||
@@ -16,12 +17,16 @@ import HomeAssistant.Runtime.Metrics
|
||||
, buildUpdateArgs
|
||||
, ensureRrd
|
||||
, sampleAndUpdate
|
||||
, metricsAction
|
||||
, parseInfoDs
|
||||
, schemaMatches
|
||||
, AppMetrics (..)
|
||||
, registerAppMetrics
|
||||
)
|
||||
import qualified System.Metrics as M (Value (..))
|
||||
import Test.Hspec
|
||||
import Control.Exception (try, SomeException)
|
||||
import System.Directory (findExecutable, getTemporaryDirectory, removeFile)
|
||||
import Control.Exception (try, SomeException, finally)
|
||||
import Control.Monad (forM_)
|
||||
import System.Directory (findExecutable, getTemporaryDirectory, listDirectory, removeFile)
|
||||
import System.Exit (ExitCode (ExitSuccess))
|
||||
import System.Process (readProcessWithExitCode)
|
||||
import qualified System.Metrics as Metrics
|
||||
@@ -126,6 +131,49 @@ spec = do
|
||||
, "N:U"
|
||||
]
|
||||
|
||||
describe "parseInfoDs" $ do
|
||||
it "extracts DS names and types from rrdtool info output" $
|
||||
let info = unlines
|
||||
[ "filename = \"test.rrd\""
|
||||
, "step = 10"
|
||||
, "ds[foo].index = 0"
|
||||
, "ds[foo].type = \"DERIVE\""
|
||||
, "ds[bar].type = \"GAUGE\""
|
||||
, "rra[0].cf = \"AVERAGE\""
|
||||
]
|
||||
in parseInfoDs info `shouldBe` [("foo", Derive), ("bar", Gauge)]
|
||||
|
||||
it "ignores lines that are not ds type declarations" $
|
||||
parseInfoDs "step = 10\nrra[0].cf = \"AVERAGE\"\n" `shouldBe` []
|
||||
|
||||
describe "schemaMatches" $ do
|
||||
let ds name ty = DsSpec (T.pack name) name ty
|
||||
it "is true for identical schemas regardless of order" $
|
||||
schemaMatches [ds "b" Gauge, ds "a" Derive] [("a", Derive), ("b", Gauge)]
|
||||
`shouldBe` True
|
||||
|
||||
it "is false when the derived schema has an added DS" $
|
||||
schemaMatches [ds "a" Derive, ds "b" Gauge] [("a", Derive)]
|
||||
`shouldBe` False
|
||||
|
||||
it "is false when the derived schema has a removed DS" $
|
||||
schemaMatches [ds "a" Derive] [("a", Derive), ("b", Gauge)]
|
||||
`shouldBe` False
|
||||
|
||||
it "is false when a DS type changed" $
|
||||
schemaMatches [ds "a" Derive] [("a", Gauge)]
|
||||
`shouldBe` False
|
||||
|
||||
describe "registerAppMetrics" $ do
|
||||
it "registers both counters with the store" $ do
|
||||
store <- Metrics.newStore
|
||||
m <- registerAppMetrics store
|
||||
Counter.inc (amTriggersIn m)
|
||||
Counter.inc (amServicesOut m)
|
||||
sample <- Metrics.sampleAll store
|
||||
HM.lookup "hass.trigger.in" sample `shouldBe` Just (M.Counter 1)
|
||||
HM.lookup "hass.service.out" sample `shouldBe` Just (M.Counter 1)
|
||||
|
||||
describe "end-to-end (rrdtool-gated)" $ do
|
||||
it "creates an rrd, samples, and updates it" $ do
|
||||
mRrdtool <- findExecutable "rrdtool"
|
||||
@@ -148,3 +196,31 @@ spec = do
|
||||
length out `shouldSatisfy` (> 0)
|
||||
_ <- try (removeFile rrdPath) :: IO (Either SomeException ())
|
||||
return ()
|
||||
|
||||
it "backs up and recreates the rrd when the schema changes" $ do
|
||||
mRrdtool <- findExecutable "rrdtool"
|
||||
case mRrdtool of
|
||||
Nothing -> pendingWith "rrdtool not on PATH"
|
||||
Just rrdtool -> do
|
||||
tmp <- getTemporaryDirectory
|
||||
let rrdPath = tmp ++ "/hass-controller-schema-change-test.rrd"
|
||||
bakPrefix = "hass-controller-schema-change-test.rrd.bak-"
|
||||
base = [ DsSpec "a" "a" Derive, DsSpec "b" "b" Gauge ]
|
||||
expanded = base ++ [ DsSpec "c" "c" Derive ]
|
||||
clean = do
|
||||
stale <- filter (isPrefixOf bakPrefix) <$> listDirectory tmp
|
||||
forM_ (rrdPath : map (\f -> tmp ++ "/" ++ f) stale) $ \f ->
|
||||
try (removeFile f) :: IO (Either SomeException ())
|
||||
clean
|
||||
( do
|
||||
ensureRrd rrdtool rrdPath base
|
||||
ensureRrd rrdtool rrdPath base
|
||||
noBackups <- filter (isPrefixOf bakPrefix) <$> listDirectory tmp
|
||||
noBackups `shouldBe` []
|
||||
ensureRrd rrdtool rrdPath expanded
|
||||
backups <- filter (isPrefixOf bakPrefix) <$> listDirectory tmp
|
||||
length backups `shouldBe` 1
|
||||
(rc, out, _) <- readProcessWithExitCode rrdtool ["info", rrdPath] ""
|
||||
rc `shouldBe` ExitSuccess
|
||||
out `shouldContain` "ds[c].type"
|
||||
) `finally` clean
|
||||
+25
-2
@@ -1,9 +1,32 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
-- was just a dummy for seeing how the data flows (dead code)
|
||||
@@ -11,7 +34,7 @@ spec = pure ()
|
||||
--
|
||||
-- spec :: Spec
|
||||
-- spec = describe "runController" $ do
|
||||
-- it "feeds inbound events through the machine and forwards service calls" $ withBus InfoS $ \bus -> do
|
||||
-- it "feeds inbound events through the machine and forwards service calls" $ withBus severity appMetrics $ \bus -> do
|
||||
-- _ <- async (runController bus (Controller "test" lightController True))
|
||||
-- putStrLn "Before the delay"
|
||||
-- threadDelay 100000 -- let the controller dup its inbound channel
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module SupervisorSpec (spec) where
|
||||
|
||||
import Control.Concurrent (newEmptyMVar, putMVar, readMVar, threadDelay)
|
||||
import Control.Concurrent.Async (async, cancel, poll, waitCatch)
|
||||
import Control.Exception (fromException)
|
||||
import Control.Exception.Annotated (AnnotatedException (..), throw)
|
||||
import Control.Monad (forever)
|
||||
import Data.IORef (atomicModifyIORef', newIORef, readIORef)
|
||||
import Data.Maybe (isJust, isNothing)
|
||||
import HomeAssistant.Runtime.Supervisor
|
||||
import Test.Hspec
|
||||
|
||||
tinyBackoff :: Backoff
|
||||
tinyBackoff = Backoff 0.001 0.002 0.001
|
||||
|
||||
spec :: Spec
|
||||
spec = describe "supervised" $ do
|
||||
it "restarts a crashing action until it stays up" $ do
|
||||
counter <- newIORef (0 :: Int)
|
||||
up <- newEmptyMVar
|
||||
let action = do
|
||||
n <- atomicModifyIORef' counter (\c -> (c + 1, c + 1))
|
||||
if n < 3
|
||||
then ioError (userError "boom")
|
||||
else do putMVar up (); forever (threadDelay 1000000)
|
||||
sup <- async (supervised "test" tinyBackoff action)
|
||||
readMVar up
|
||||
threadDelay 50000
|
||||
status <- poll sup
|
||||
isNothing status `shouldBe` True
|
||||
readIORef counter `shouldReturn` 3
|
||||
cancel sup
|
||||
|
||||
it "rethrows Fatal instead of restarting" $ do
|
||||
counter <- newIORef (0 :: Int)
|
||||
let action = do
|
||||
_ <- atomicModifyIORef' counter (\c -> (c + 1, c + 1))
|
||||
throw (Fatal "auth_invalid")
|
||||
sup <- async (supervised "test" tinyBackoff action)
|
||||
res <- waitCatch sup
|
||||
case res of
|
||||
Left se -> case fromException se :: Maybe (AnnotatedException Fatal) of
|
||||
Just _ -> pure ()
|
||||
Nothing -> expectationFailure "expected Fatal to propagate"
|
||||
Right _ -> expectationFailure "supervised returned"
|
||||
threadDelay 50000
|
||||
readIORef counter `shouldReturn` 1
|
||||
|
||||
it "does not restart on async exceptions" $ do
|
||||
counter <- newIORef (0 :: Int)
|
||||
let action = do
|
||||
_ <- atomicModifyIORef' counter (\c -> (c + 1, c + 1))
|
||||
forever (threadDelay 1000000)
|
||||
sup <- async (supervised "test" tinyBackoff action)
|
||||
threadDelay 100000
|
||||
cancel sup
|
||||
threadDelay 100000
|
||||
readIORef counter `shouldReturn` 1
|
||||
status <- poll sup
|
||||
isJust status `shouldBe` True
|
||||
|
||||
describe "nextAttempt" $ do
|
||||
it "resets after a quiet period" $
|
||||
nextAttempt tinyBackoff 0.001 5 `shouldBe` 1
|
||||
it "increments otherwise" $
|
||||
nextAttempt tinyBackoff 0.0005 5 `shouldBe` 6
|
||||
|
||||
describe "backoffDelay" $ do
|
||||
it "starts at base" $ backoffDelay tinyBackoff 1 `shouldBe` 0.001
|
||||
it "doubles" $ backoffDelay tinyBackoff 2 `shouldBe` 0.002
|
||||
it "clamps at cap" $ backoffDelay tinyBackoff 3 `shouldBe` 0.002
|
||||
Reference in new issue
Block a user