Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7becaf2d4 | ||
|
|
9c47bbcb42 | ||
|
|
6063aafe8b | ||
|
|
fafc7111bb | ||
|
|
69cac934ec | ||
|
|
b2a74cbee4 | ||
|
|
769ab43fd2 | ||
|
|
15f3fe7c9e | ||
|
|
416a9484a5 | ||
|
|
e3bc25ce54 | ||
|
|
036473ab81 | ||
|
|
27f271691c | ||
|
|
73d546395b | ||
|
|
a969730de1 | ||
|
|
213f9d5d2a | ||
|
|
2cb8035ef4 | ||
|
|
1ec8c7211f | ||
|
|
3d7f6cb3c6 | ||
|
|
64561718a5 | ||
|
|
7570711768 | ||
|
|
7c2cfde814 |
No files matched your search
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
||||||
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
||||||
, filepath, hedgehog, hspec, hspec-hedgehog, http-types, katip
|
, filepath, hedgehog, hspec, hspec-hedgehog, http-types, katip
|
||||||
, lens, lens-aeson, lib, network, process, scotty, stm, text, time
|
, lens, lens-aeson, lib, network, process, retry, scotty, stm, text
|
||||||
, unordered-containers, uuid, wai, warp, websockets
|
, time, unordered-containers, uuid, wai, warp, websockets
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "home-assistant-controller";
|
pname = "home-assistant-controller";
|
||||||
@@ -13,8 +13,8 @@ mkDerivation {
|
|||||||
libraryHaskellDepends = [
|
libraryHaskellDepends = [
|
||||||
aeson annotated-exception async base bytestring cereal
|
aeson annotated-exception async base bytestring cereal
|
||||||
cereal-conduit conduit containers directory ekg-core filepath
|
cereal-conduit conduit containers directory ekg-core filepath
|
||||||
http-types katip lens lens-aeson network process scotty stm text
|
http-types katip lens lens-aeson network process retry scotty stm
|
||||||
time unordered-containers uuid wai warp websockets
|
text time unordered-containers uuid wai warp websockets
|
||||||
];
|
];
|
||||||
executableHaskellDepends = [ base ];
|
executableHaskellDepends = [ base ];
|
||||||
testHaskellDepends = [
|
testHaskellDepends = [
|
||||||
|
|||||||
@@ -62,8 +62,10 @@ library
|
|||||||
exposed-modules: AFRP
|
exposed-modules: AFRP
|
||||||
, HomeAssistant.Controller
|
, HomeAssistant.Controller
|
||||||
, HomeAssistant.Controller.Bedroom
|
, HomeAssistant.Controller.Bedroom
|
||||||
|
, HomeAssistant.Controller.Hallway
|
||||||
, HomeAssistant.Controller.Kitchen
|
, HomeAssistant.Controller.Kitchen
|
||||||
, HomeAssistant.Controller.Children
|
, HomeAssistant.Controller.Children
|
||||||
|
, HomeAssistant.Controller.Livingroom
|
||||||
, HomeAssistant.Controller.Ruuvi
|
, HomeAssistant.Controller.Ruuvi
|
||||||
, HomeAssistant.Runtime
|
, HomeAssistant.Runtime
|
||||||
, HomeAssistant.Runtime.Bus
|
, HomeAssistant.Runtime.Bus
|
||||||
@@ -71,6 +73,7 @@ library
|
|||||||
, HomeAssistant.Runtime.Graphing
|
, HomeAssistant.Runtime.Graphing
|
||||||
, HomeAssistant.Runtime.Metrics
|
, HomeAssistant.Runtime.Metrics
|
||||||
, HomeAssistant.Runtime.Supervisor
|
, HomeAssistant.Runtime.Supervisor
|
||||||
|
, HomeAssistant.Runtime.RateLimit
|
||||||
|
|
||||||
-- Modules included in this library but not exported.
|
-- Modules included in this library but not exported.
|
||||||
-- other-modules:
|
-- other-modules:
|
||||||
@@ -84,7 +87,9 @@ library
|
|||||||
, aeson
|
, aeson
|
||||||
, lens-aeson
|
, lens-aeson
|
||||||
, lens
|
, lens
|
||||||
|
, exceptions
|
||||||
, text
|
, text
|
||||||
|
, unliftio
|
||||||
, network
|
, network
|
||||||
, bytestring
|
, bytestring
|
||||||
, time
|
, time
|
||||||
@@ -107,6 +112,7 @@ library
|
|||||||
, http-types
|
, http-types
|
||||||
, warp
|
, warp
|
||||||
, wai
|
, wai
|
||||||
|
, retry
|
||||||
|
|
||||||
-- Directories containing source files.
|
-- Directories containing source files.
|
||||||
hs-source-dirs: src
|
hs-source-dirs: src
|
||||||
@@ -149,14 +155,12 @@ test-suite home-assistant-controller-test
|
|||||||
-- Modules included in this executable, other than Main.
|
-- Modules included in this executable, other than Main.
|
||||||
other-modules: AFRPLawsSpec
|
other-modules: AFRPLawsSpec
|
||||||
, AFRPSpec
|
, AFRPSpec
|
||||||
, BackoffProp
|
|
||||||
, BedroomSpec
|
, BedroomSpec
|
||||||
, BusSpec
|
, BusSpec
|
||||||
, ConnectionSpec
|
, ConnectionSpec
|
||||||
, GraphingSpec
|
, GraphingSpec
|
||||||
, MetricsSpec
|
, MetricsSpec
|
||||||
, RuntimeSpec
|
, RuntimeSpec
|
||||||
, SupervisorSpec
|
|
||||||
, Support
|
, Support
|
||||||
|
|
||||||
-- LANGUAGE extensions used by modules in this package.
|
-- LANGUAGE extensions used by modules in this package.
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ module HomeAssistant.Controller
|
|||||||
, light
|
, light
|
||||||
, Presence(..)
|
, Presence(..)
|
||||||
, presence
|
, presence
|
||||||
|
, motion
|
||||||
|
, motionToPresence
|
||||||
, debug
|
, debug
|
||||||
, traceEvent
|
, traceEvent
|
||||||
, traceValue
|
, traceValue
|
||||||
@@ -26,20 +28,27 @@ module HomeAssistant.Controller
|
|||||||
, Target(..)
|
, Target(..)
|
||||||
, brightness
|
, brightness
|
||||||
, Light(..)
|
, Light(..)
|
||||||
|
, ikeaQuickButton
|
||||||
|
, IkeaButton(..)
|
||||||
|
, IkeaGesture(..)
|
||||||
|
, activateScene
|
||||||
|
, ikeaBoxRemote
|
||||||
|
, IkeaController(..)
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request)
|
import AFRP (Mealy (..), eff, Event(..), events, filterA, (>>|), toEvent, Request, hold, lMerge, waitFor, tag, edge)
|
||||||
import Control.Arrow (Arrow(..), returnA)
|
import Control.Arrow (Arrow(..), returnA)
|
||||||
import Control.Category ((>>>))
|
import Control.Category ((>>>))
|
||||||
import Data.Aeson (Value, object, (.=))
|
import Data.Aeson (Value, object, (.=))
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
import Control.Lens (has, only, (^?), to)
|
import Control.Lens (has, only, (^?), to, traversed)
|
||||||
import Data.Aeson.Lens (key, _String, _Integral)
|
import Data.Aeson.Lens (key, _String, _Integral)
|
||||||
import qualified Data.Text.Lens as TL
|
import qualified Data.Text.Lens as TL
|
||||||
import Data.Bool (bool)
|
import Data.Bool (bool)
|
||||||
import Data.Serialize (Serialize)
|
import Data.Serialize (Serialize)
|
||||||
import GHC.Generics (Generic)
|
import GHC.Generics (Generic)
|
||||||
|
import Data.Time (NominalDiffTime)
|
||||||
|
|
||||||
data Target = EntityId !T.Text | AreaId !T.Text
|
data Target = EntityId !T.Text | AreaId !T.Text
|
||||||
deriving (Show,Eq,Ord)
|
deriving (Show,Eq,Ord)
|
||||||
@@ -93,10 +102,35 @@ data Presence = Occupied | Unoccupied
|
|||||||
instance Serialize Presence
|
instance Serialize Presence
|
||||||
|
|
||||||
presence :: T.Text -> HASS (Event Value) (Event Presence)
|
presence :: T.Text -> HASS (Event Value) (Event Presence)
|
||||||
presence entityId =entityBool entityId
|
presence entityId = entityBool entityId
|
||||||
>>> arr (fmap (bool Unoccupied Occupied))
|
>>> 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
|
data Light
|
||||||
= Off
|
= Off
|
||||||
@@ -163,3 +197,71 @@ brightness entityId =
|
|||||||
>>> AFRP.toEvent
|
>>> AFRP.toEvent
|
||||||
where
|
where
|
||||||
eventBrightness v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "brightness" . _Integral
|
eventBrightness v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "brightness" . _Integral
|
||||||
|
|
||||||
|
data IkeaGesture
|
||||||
|
= ShortClick
|
||||||
|
| ShortRelease
|
||||||
|
| DoubleClick
|
||||||
|
| LongClick
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
data IkeaButton a = OnButton !a | OffButton !a
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
|
||||||
|
toIkeaQuickButton :: T.Text -> Maybe (IkeaButton IkeaGesture)
|
||||||
|
toIkeaQuickButton = \case
|
||||||
|
-- 1 is on, 2 is off side of the button
|
||||||
|
"1_initial_press" -> Just $ OnButton ShortClick
|
||||||
|
"1_short_release" -> Just $ OnButton ShortRelease
|
||||||
|
"1_double_press" -> Just $ OnButton DoubleClick
|
||||||
|
"1_long_press" -> Just $ OnButton LongClick
|
||||||
|
"2_initial_press" -> Just $ OffButton ShortClick
|
||||||
|
"2_short_release" -> Just $ OffButton ShortRelease
|
||||||
|
"2_double_press" -> Just $ OffButton DoubleClick
|
||||||
|
"2_long_press" -> Just $ OffButton LongClick
|
||||||
|
_ -> Nothing
|
||||||
|
|
||||||
|
ikeaQuickButton :: T.Text -> HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
||||||
|
ikeaQuickButton entityId =
|
||||||
|
entityChangeEvent' entityId
|
||||||
|
>>| arr (maybe (Left ()) Right . eventType)
|
||||||
|
>>> toEvent
|
||||||
|
where
|
||||||
|
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaQuickButton . traversed
|
||||||
|
|
||||||
|
data IkeaController
|
||||||
|
= ControllerOn -- Short press on
|
||||||
|
| ControllerOff -- Short press off
|
||||||
|
| ControllerBrighnessUp -- Turn brightness up
|
||||||
|
| ControllerBrighnessDown -- Turn brighness down
|
||||||
|
| ControllerArrowRight -- Turn brighness down
|
||||||
|
| ControllerArrowLeft -- Turn brighness down
|
||||||
|
| ControllerBrighnessStop
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
toIkeaController :: T.Text -> Maybe IkeaController
|
||||||
|
toIkeaController = \case
|
||||||
|
"on" -> Just ControllerOn
|
||||||
|
"off" -> Just ControllerOff
|
||||||
|
"brightness_move_up" -> Just ControllerBrighnessUp
|
||||||
|
"brightness_move_down" -> Just ControllerBrighnessDown
|
||||||
|
"brightness_stop" -> Just ControllerBrighnessStop
|
||||||
|
"arrow_right_click" -> Just ControllerArrowRight
|
||||||
|
"arrow_left_click" -> Just ControllerArrowLeft
|
||||||
|
_ -> Nothing
|
||||||
|
|
||||||
|
ikeaBoxRemote :: T.Text -> HASS (Event Value) (Event IkeaController)
|
||||||
|
ikeaBoxRemote entityId = entityChangeEvent' entityId
|
||||||
|
>>| arr (maybe (Left ()) Right . eventType)
|
||||||
|
>>> toEvent
|
||||||
|
where
|
||||||
|
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaController . traversed
|
||||||
|
|
||||||
|
activateScene :: T.Text -> Service
|
||||||
|
activateScene sceneId = Service
|
||||||
|
{ serviceDomain="scene"
|
||||||
|
, serviceName= "turn_on"
|
||||||
|
, serviceTarget= [EntityId sceneId]
|
||||||
|
, serviceData = Nothing
|
||||||
|
}
|
||||||
@@ -4,11 +4,9 @@ module HomeAssistant.Controller.Bedroom where
|
|||||||
|
|
||||||
import HomeAssistant.Controller
|
import HomeAssistant.Controller
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import AFRP (Event (..), (>>|), toEvent, lMerge, duration, edge)
|
import AFRP (Event (..), lMerge, duration, edge)
|
||||||
import Data.Aeson (Value, object, (.=))
|
import Data.Aeson (Value, object, (.=))
|
||||||
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
||||||
import Control.Lens ((^?), to, traversed)
|
|
||||||
import Data.Aeson.Lens (key, _String)
|
|
||||||
import Data.Bool (bool)
|
import Data.Bool (bool)
|
||||||
import Data.Time (NominalDiffTime)
|
import Data.Time (NominalDiffTime)
|
||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
@@ -29,83 +27,78 @@ createBedroomScene = Service
|
|||||||
, serviceTarget= []
|
, serviceTarget= []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data PresenceLights
|
||||||
activateScene :: T.Text -> Service
|
= LightsOn -- Restore lights
|
||||||
activateScene sceneId = Service
|
| LightsOff -- Timer expired, darkness
|
||||||
{ serviceDomain="scene"
|
| LightsSleep -- No presence detected, sleep mode
|
||||||
, serviceName= "turn_on"
|
deriving Show
|
||||||
, serviceTarget= [EntityId sceneId]
|
|
||||||
, serviceData = Nothing
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Bedroom presence
|
-- Bedroom presence
|
||||||
bedroomPresence :: HASS (Event Value) (Event Presence)
|
bedroomPresence :: HASS (Event Value) (Event Presence)
|
||||||
bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy"
|
bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy"
|
||||||
|
|
||||||
|
presenceLightEvents :: HASS (Event Value) (Event PresenceLights)
|
||||||
|
presenceLightEvents =
|
||||||
|
bedroomPresence >>> AFRP.hold Unoccupied
|
||||||
|
>>> arr lightWanted
|
||||||
|
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||||
|
>>> arr (\(s,(o,n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||||
|
where
|
||||||
|
lightWanted o = o == Occupied
|
||||||
|
sleepEvent = arr not >>> AFRP.edge >>> arr (AFRP.tag LightsSleep)
|
||||||
|
onEvent = AFRP.edge >>> arr (AFRP.tag LightsOn)
|
||||||
|
offEvent = arr not >>> AFRP.waitFor 300 >>> arr (AFRP.tag LightsOff)
|
||||||
|
|
||||||
bedroomPresenceController :: HASS (Event Value) ()
|
bedroomPresenceController :: HASS (Event Value) ()
|
||||||
bedroomPresenceController = proc x -> do
|
bedroomPresenceController = proc x -> do
|
||||||
p <- bedroomPresence -< x
|
p <- presenceLightEvents >>> traceEvent -< x
|
||||||
case p of
|
case p of
|
||||||
Event Unoccupied -> callService createBedroomScene >>> callService (light bedroomLights Off) -< ()
|
Event LightsOff -> do
|
||||||
Event Occupied -> callService (activateScene "makuuhuone_lights_snapshot") -< ()
|
callService (light bedroomLights Off) -< ()
|
||||||
|
Event LightsOn -> do
|
||||||
|
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
||||||
|
Event LightsSleep -> do
|
||||||
|
callService createBedroomScene -< ()
|
||||||
|
callService (activateScene "scene.makuuhuone_lepotila") -< ()
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
|
||||||
data IkeaGesture
|
|
||||||
= ShortClick
|
|
||||||
| ShortRelease
|
|
||||||
| DoubleClick
|
|
||||||
| LongClick
|
|
||||||
deriving Show
|
|
||||||
data IkeaButton a = OnButton !a | OffButton !a
|
|
||||||
deriving Show
|
|
||||||
|
|
||||||
|
|
||||||
toIkeaQuickButton :: T.Text -> Maybe (IkeaButton IkeaGesture)
|
|
||||||
toIkeaQuickButton = \case
|
|
||||||
-- 1 is on, 2 is off side of the button
|
|
||||||
"1_initial_press" -> Just $ OnButton ShortClick
|
|
||||||
"1_short_release" -> Just $ OnButton ShortRelease
|
|
||||||
"1_double_press" -> Just $ OnButton DoubleClick
|
|
||||||
"1_long_press" -> Just $ OnButton LongClick
|
|
||||||
"2_initial_press" -> Just $ OffButton ShortClick
|
|
||||||
"2_short_release" -> Just $ OffButton ShortRelease
|
|
||||||
"2_double_press" -> Just $ OffButton DoubleClick
|
|
||||||
"2_long_press" -> Just $ OffButton LongClick
|
|
||||||
_ -> Nothing
|
|
||||||
|
|
||||||
ikeaQuickButton :: T.Text -> HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
|
||||||
ikeaQuickButton entityId =
|
|
||||||
entityChangeEvent' entityId
|
|
||||||
>>| arr (maybe (Left ()) Right . eventType)
|
|
||||||
>>> toEvent
|
|
||||||
where
|
|
||||||
eventType v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "event_type" . _String . to toIkeaQuickButton . traversed
|
|
||||||
|
|
||||||
|
|
||||||
data BedroomControls
|
data BedroomControls
|
||||||
= Masse (IkeaButton IkeaGesture)
|
= Masse (IkeaButton IkeaGesture)
|
||||||
| Enishen (IkeaButton IkeaGesture)
|
| Enishen (IkeaButton IkeaGesture)
|
||||||
|
| Central IkeaController
|
||||||
deriving Show
|
deriving Show
|
||||||
|
|
||||||
|
|
||||||
bedroomButton :: HASS (Event Value) (Event BedroomControls)
|
bedroomButton :: HASS (Event Value) (Event BedroomControls)
|
||||||
bedroomButton = (masseButton &&& enishenButton) >>> arr (uncurry lMerge)
|
bedroomButton = (masseButton &&& enishenButton &&& centralButton)
|
||||||
|
>>> arr (\(a,(b,c)) -> a `lMerge` b `lMerge` c)
|
||||||
where
|
where
|
||||||
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
||||||
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
||||||
|
centralButton = fmap Central <$> ikeaBoxRemote "event.bedroom_remote_action"
|
||||||
|
|
||||||
bedroomButtonController :: HASS (Event Value) ()
|
bedroomButtonController :: HASS (Event Value) ()
|
||||||
bedroomButtonController = proc x -> do
|
bedroomButtonController = proc x -> do
|
||||||
ev <- bedroomButton >>> traceEvent -< x
|
ev <- bedroomButton >>> traceEvent -< x
|
||||||
|
-- Any event will cause the sleep mode to be turned off
|
||||||
case ev of
|
case ev of
|
||||||
Event (Masse (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_masse") -< ()
|
Event (Masse (OnButton ShortRelease)) -> do
|
||||||
Event (Masse (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||||
Event (Masse (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
Event (Masse (OnButton DoubleClick)) -> do
|
||||||
Event (Masse (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
Event (Enishen (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_jemina") -< ()
|
Event (Masse (OnButton LongClick)) -> do
|
||||||
Event (Enishen (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
Event (Enishen (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
Event (Masse (OffButton _)) -> do
|
||||||
Event (Enishen (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
|
Event (Enishen (OnButton ShortRelease)) -> do
|
||||||
|
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||||
|
Event (Enishen (OnButton DoubleClick)) -> do
|
||||||
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
|
Event (Enishen (OnButton LongClick)) -> do
|
||||||
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
|
Event (Enishen (OffButton _)) -> do
|
||||||
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
{-# LANGUAGE Arrows #-}
|
{-# LANGUAGE Arrows #-}
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
module HomeAssistant.Controller.Children where
|
module HomeAssistant.Controller.Children where
|
||||||
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..))
|
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, Light(..), ikeaQuickButton, IkeaGesture (..), IkeaButton (..), traceEvent, activateScene)
|
||||||
import AFRP (Event)
|
import AFRP (Event (..))
|
||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
import Control.Arrow (Arrow(..), (>>>))
|
import Control.Arrow (Arrow(..), (>>>), returnA)
|
||||||
import Data.Time (Day, TimeOfDay (..), localDay, LocalTime (..))
|
import Data.Time (Day, TimeOfDay (..), localDay, LocalTime (..))
|
||||||
import Data.Time.Calendar.OrdinalDate (WeekOfYear, mondayStartWeek)
|
import Data.Time.Calendar.OrdinalDate (WeekOfYear, mondayStartWeek)
|
||||||
import Data.Functor.Contravariant (Predicate (..), (>$<))
|
import Data.Functor.Contravariant (Predicate (..), (>$<))
|
||||||
|
import Data.Aeson (Value)
|
||||||
|
|
||||||
-- Let's see building some reasonable interface for utctime
|
-- Let's see building some reasonable interface for utctime
|
||||||
dow :: Day -> (WeekOfYear, Int)
|
dow :: Day -> (WeekOfYear, Int)
|
||||||
@@ -62,7 +63,6 @@ timersOn =
|
|||||||
, day 3 <> at (07,30)
|
, day 3 <> at (07,30)
|
||||||
, day 4 <> at (07,30)
|
, day 4 <> at (07,30)
|
||||||
, day 5 <> at (07,30)
|
, day 5 <> at (07,30)
|
||||||
, at (18,55) -- debug
|
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
dayOfWeek = snd . mondayStartWeek . localDay
|
dayOfWeek = snd . mondayStartWeek . localDay
|
||||||
@@ -80,3 +80,17 @@ lightsOn = foldMap atTime timersOn
|
|||||||
lightsOff :: HASS a ()
|
lightsOff :: HASS a ()
|
||||||
lightsOff = foldMap atTime timersOff
|
lightsOff = foldMap atTime timersOff
|
||||||
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] Off))
|
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] Off))
|
||||||
|
|
||||||
|
|
||||||
|
bedroomButton :: HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
||||||
|
bedroomButton = ikeaQuickButton "event.children_quick_remote_action"
|
||||||
|
|
||||||
|
childrenBedroomButtonController :: HASS (Event Value) ()
|
||||||
|
childrenBedroomButtonController = proc x -> do
|
||||||
|
ev <- bedroomButton >>> traceEvent -< x
|
||||||
|
case ev of
|
||||||
|
Event (OnButton ShortRelease) -> callService (activateScene "scene.lasten_nukkuvalmistelu") -< ()
|
||||||
|
Event (OnButton DoubleClick) -> callService (activateScene "scene.lasten_luku") -< ()
|
||||||
|
Event (OnButton LongClick) -> callService (activateScene "scene.lasten_kirkas") -< ()
|
||||||
|
Event (OffButton _) -> callService (light [AreaId "lasten_makuuhuone"] Off) -< ()
|
||||||
|
_ -> returnA -< ()
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE Arrows #-}
|
||||||
|
module HomeAssistant.Controller.Hallway where
|
||||||
|
|
||||||
|
import HomeAssistant.Controller (Presence (..), HASS, motion, motionToPresence, traceEvent, callServiceDyn, light, Target (..), Light (..))
|
||||||
|
import AFRP (Event (..))
|
||||||
|
import qualified AFRP
|
||||||
|
import Data.Aeson (Value)
|
||||||
|
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||||
|
import Data.Time (LocalTime(..), TimeOfDay (..))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
hallwayPresence :: HASS (Event Value) Presence
|
||||||
|
hallwayPresence = motion "binary_sensor.hallway_movement_occupancy" >>> motionToPresence 500
|
||||||
|
|
||||||
|
data Lights = LightsOn | LightsOff
|
||||||
|
deriving (Show)
|
||||||
|
|
||||||
|
eventLights :: HASS Presence (Event Lights)
|
||||||
|
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||||
|
where
|
||||||
|
presenceLights Occupied = LightsOn
|
||||||
|
presenceLights Unoccupied = LightsOff
|
||||||
|
|
||||||
|
hallwayLightsController :: HASS (Event Value) ()
|
||||||
|
hallwayLightsController = proc x -> do
|
||||||
|
now <- AFRP.currentTime -< ()
|
||||||
|
p <- hallwayPresence -< x
|
||||||
|
ev <- eventLights -< p
|
||||||
|
traceEvent -< ev
|
||||||
|
case ev of
|
||||||
|
-- The lights entity is a "group of lights" in hass
|
||||||
|
Event LightsOn | lightsAllowed now -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< On Nothing
|
||||||
|
Event LightsOff -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< Off
|
||||||
|
_ -> returnA -< ()
|
||||||
|
where
|
||||||
|
lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0)
|
||||||
@@ -6,38 +6,17 @@ import AFRP (Event (..))
|
|||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
import Data.Aeson (Value)
|
import Data.Aeson (Value)
|
||||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||||
import Data.Bool (bool)
|
|
||||||
import GHC.Generics (Generic)
|
|
||||||
import Data.Serialize (Serialize)
|
|
||||||
import Prelude hiding (id)
|
import Prelude hiding (id)
|
||||||
import Data.Time (LocalTime(..), TimeOfDay (..))
|
import Data.Time (LocalTime(..), TimeOfDay (..))
|
||||||
|
|
||||||
|
|
||||||
-- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
|
-- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
|
||||||
data Motion = MotionDetected | MotionNotDetected | MotionUnknown
|
|
||||||
deriving (Show, Eq, Generic)
|
|
||||||
|
|
||||||
instance Serialize Motion
|
data Lights = LightsOn | LightsOff | LightsSleep
|
||||||
|
|
||||||
data Lights = LightsOn | LightsOff
|
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
||||||
kitchenMotion :: HASS (Event Value) Motion
|
kitchenPresence :: HASS (Event Value) Presence
|
||||||
kitchenMotion = entityBool "binary_sensor.kitchen_movement_occupancy"
|
kitchenPresence = motion "binary_sensor.kitchen_movement_occupancy" >>> motionToPresence 500
|
||||||
>>> 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)
|
|
||||||
|
|
||||||
eventLights :: HASS Presence (Event Lights)
|
eventLights :: HASS Presence (Event Lights)
|
||||||
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
||||||
@@ -48,7 +27,7 @@ eventLights = AFRP.changes >>> arr (fmap presenceLights)
|
|||||||
kitchenCeilingController :: HASS (Event Value) ()
|
kitchenCeilingController :: HASS (Event Value) ()
|
||||||
kitchenCeilingController = proc x -> do
|
kitchenCeilingController = proc x -> do
|
||||||
now <- AFRP.currentTime -< ()
|
now <- AFRP.currentTime -< ()
|
||||||
p <- kitchenMotion >>> kitchenPresence -< x
|
p <- kitchenPresence -< x
|
||||||
ev <- eventLights -< p
|
ev <- eventLights -< p
|
||||||
traceEvent -< ev
|
traceEvent -< ev
|
||||||
case ev of
|
case ev of
|
||||||
@@ -66,21 +45,43 @@ dinnerPresence :: HASS (Event Value) Presence
|
|||||||
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
||||||
|
|
||||||
dinnerLightEvents :: HASS (Event Value) (Event Lights)
|
dinnerLightEvents :: HASS (Event Value) (Event Lights)
|
||||||
dinnerLightEvents = ((,) <$> dinnerLightLevel <*> dinnerPresence)
|
dinnerLightEvents =
|
||||||
|
((,) <$> dinnerLightLevel <*> dinnerPresence)
|
||||||
>>> arr lightWanted
|
>>> arr lightWanted
|
||||||
>>> AFRP.changes
|
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||||
>>> arr (fmap (bool LightsOff LightsOn))
|
>>> arr (\(s, (o, n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||||
where
|
where
|
||||||
-- This means that both light level and occupancy can change the light state
|
|
||||||
lightWanted (lightLevel, occ) = occ == Occupied && lightLevel < 13
|
lightWanted (lightLevel, occ) = occ == Occupied && lightLevel < 13
|
||||||
|
|
||||||
|
onEvent =
|
||||||
|
AFRP.edge
|
||||||
|
>>> arr (fmap (const LightsOn))
|
||||||
|
|
||||||
|
sleepEvent =
|
||||||
|
arr not
|
||||||
|
>>> AFRP.edge
|
||||||
|
>>> arr (fmap (const LightsSleep))
|
||||||
|
|
||||||
|
offEvent =
|
||||||
|
arr not
|
||||||
|
>>> AFRP.waitFor 300
|
||||||
|
>>> arr (fmap (const LightsOff))
|
||||||
|
|
||||||
dinnerTableController :: HASS (Event Value) ()
|
dinnerTableController :: HASS (Event Value) ()
|
||||||
dinnerTableController = proc x -> do
|
dinnerTableController = proc x -> do
|
||||||
ev <- dinnerLightEvents -< x
|
ev <- dinnerLightEvents -< x
|
||||||
case ev of
|
case ev of
|
||||||
Event LightsOn -> callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< On Nothing
|
Event LightsOn -> do
|
||||||
Event LightsOff -> callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< Off
|
sleep -< False
|
||||||
|
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< On Nothing
|
||||||
|
Event LightsOff -> do
|
||||||
|
sleep -< False
|
||||||
|
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< Off
|
||||||
|
Event LightsSleep -> do
|
||||||
|
sleep -< True
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
where
|
||||||
|
sleep = callServiceDyn (switch [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"])
|
||||||
|
|
||||||
kitchenMotionController :: HASS (Event Value) ()
|
kitchenMotionController :: HASS (Event Value) ()
|
||||||
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
||||||
@@ -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
|
) where
|
||||||
|
|
||||||
import AFRP (Event (..), Mealy (..), Request (..), Auto, stepAutoSerializing, load, DecodedAuto (..))
|
import AFRP (Event (..), Mealy (..), Request (..), Auto, stepAutoSerializing, load, DecodedAuto (..))
|
||||||
import Control.Concurrent.Async (async, waitAny)
|
|
||||||
import Control.Concurrent.STM (atomically, dupTChan, readTChan)
|
import Control.Concurrent.STM (atomically, dupTChan, readTChan)
|
||||||
import Data.Aeson (Value)
|
import Data.Aeson (Value)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Data.Time (getCurrentTime, getCurrentTimeZone)
|
import Data.Time (getCurrentTime, getCurrentTimeZone)
|
||||||
import Data.Void (Void, absurd)
|
import Data.Void (Void)
|
||||||
import HomeAssistant.Controller (HASS, HASSEff (..))
|
import HomeAssistant.Controller (HASS, HASSEff (..))
|
||||||
import HomeAssistant.Runtime.Bus
|
import HomeAssistant.Runtime.Bus
|
||||||
import HomeAssistant.Runtime.Connection (readerAction, writerAction)
|
import HomeAssistant.Runtime.Connection (writerAction, readerAction)
|
||||||
import HomeAssistant.Runtime.Supervisor (defaultBackoff, supervised)
|
|
||||||
import Network.Socket (withSocketsDo)
|
import Network.Socket (withSocketsDo)
|
||||||
import System.Environment (getEnv, lookupEnv)
|
import System.Environment (getEnv, lookupEnv)
|
||||||
import HomeAssistant.Controller.Bedroom (bedroomPresenceController, bedroomButtonController, bedroomDrawerController, humidifierController)
|
import HomeAssistant.Controller.Bedroom (bedroomPresenceController, bedroomButtonController, bedroomDrawerController, humidifierController)
|
||||||
@@ -31,15 +29,19 @@ import Data.UUID (UUID, toText)
|
|||||||
import qualified Data.UUID.V4 as UUID.V4
|
import qualified Data.UUID.V4 as UUID.V4
|
||||||
import Katip (runKatipT, logF, sl, Severity (..), ls, Namespace (Namespace), runKatipContextT)
|
import Katip (runKatipT, logF, sl, Severity (..), ls, Namespace (Namespace), runKatipContextT)
|
||||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
import HomeAssistant.Controller.Ruuvi (ruuviController)
|
import HomeAssistant.Controller.Children (schoolLightController, childrenBedroomButtonController)
|
||||||
import HomeAssistant.Controller.Children (schoolLightController)
|
|
||||||
import Data.Maybe (fromMaybe)
|
import Data.Maybe (fromMaybe)
|
||||||
import qualified System.Metrics
|
import qualified System.Metrics
|
||||||
import qualified HomeAssistant.Runtime.Metrics
|
import qualified HomeAssistant.Runtime.Metrics
|
||||||
import qualified HomeAssistant.Runtime.Graphing
|
|
||||||
import System.FilePath ((</>))
|
import System.FilePath ((</>))
|
||||||
import Text.Read (readMaybe)
|
import Text.Read (readMaybe)
|
||||||
import HomeAssistant.Controller.Kitchen (kitchenMotionController)
|
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 qualified HomeAssistant.Runtime.Graphing
|
||||||
|
import HomeAssistant.Controller.Hallway (hallwayLightsController)
|
||||||
|
|
||||||
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
||||||
step path trace st a = do
|
step path trace st a = do
|
||||||
@@ -48,24 +50,26 @@ step path trace st a = do
|
|||||||
let req = Request now tz trace
|
let req = Request now tz trace
|
||||||
stepAutoSerializing path st req a
|
stepAutoSerializing path st req a
|
||||||
|
|
||||||
data Controller = forall b. Controller T.Text (HASS (Event Value) b) Bool
|
data Controller = forall b. Controller Bool T.Text (HASS (Event Value) b)
|
||||||
|
|
||||||
controllers :: [Controller]
|
controllers :: [Controller]
|
||||||
controllers =
|
controllers =
|
||||||
[ Controller "bedroom-presence" bedroomPresenceController False
|
[ Controller True "bedroom-presence" bedroomPresenceController
|
||||||
, Controller "bedroom-button" bedroomButtonController True
|
, Controller True "bedroom-button" bedroomButtonController
|
||||||
, Controller "bedroom-drawer" bedroomDrawerController True
|
, Controller True "bedroom-drawer" bedroomDrawerController
|
||||||
, Controller "bedroom-humidifier" humidifierController True
|
, Controller True "bedroom-humidifier" humidifierController
|
||||||
, Controller "ruuvi-controller" ruuviController False
|
, Controller True "school-light-controller" schoolLightController
|
||||||
, Controller "school-light-controller" schoolLightController True
|
, Controller True "kitchen-motion-controller" kitchenMotionController
|
||||||
, Controller "kitchen-motion-controller" kitchenMotionController True
|
, Controller True "livingroom-presence" livingroomPresenceController
|
||||||
|
, Controller True "hallway-motion-controller" hallwayLightsController
|
||||||
|
, Controller True "children-button" childrenBedroomButtonController
|
||||||
]
|
]
|
||||||
|
|
||||||
-- | Steps the machine for every inbound message; service calls go to the
|
-- | Steps the machine for every inbound message; service calls go to the
|
||||||
-- bus. A restart re-dups the inbound channel and starts from the machine's
|
-- bus. A restart re-dups the inbound channel and starts from the machine's
|
||||||
-- initial state; messages broadcast during the restart window are lost.
|
-- initial state; messages broadcast during the restart window are lost.
|
||||||
runController :: FilePath -> Bus -> Controller -> IO Void
|
runController :: MonadIO m => FilePath -> Bus -> Controller -> m Void
|
||||||
runController rootDir bus (Controller name machine _enabled) = do
|
runController rootDir bus (Controller _enabled name machine ) = liftIO $ do
|
||||||
inbound <- atomically (dupTChan (busInbound bus))
|
inbound <- atomically (dupTChan (busInbound bus))
|
||||||
let ns = Namespace [name]
|
let ns = Namespace [name]
|
||||||
let workerDefinition = runMealy machine (runKatipContextT (busLogEnv bus) () ns . channelHassEval bus)
|
let workerDefinition = runMealy machine (runKatipContextT (busLogEnv bus) () ns . channelHassEval bus)
|
||||||
@@ -96,6 +100,7 @@ defaultMain = withSocketsDo $ do
|
|||||||
store <- System.Metrics.newStore
|
store <- System.Metrics.newStore
|
||||||
System.Metrics.registerGcMetrics store
|
System.Metrics.registerGcMetrics store
|
||||||
appMetrics <- HomeAssistant.Runtime.Metrics.registerAppMetrics store
|
appMetrics <- HomeAssistant.Runtime.Metrics.registerAppMetrics store
|
||||||
|
rateLimitMetrics <- registerRateLimitMetrics store
|
||||||
withBus severity appMetrics $ \bus -> do
|
withBus severity appMetrics $ \bus -> do
|
||||||
token <- getEnv "HA_TOKEN"
|
token <- getEnv "HA_TOKEN"
|
||||||
host <- getEnv "HA_HOST"
|
host <- getEnv "HA_HOST"
|
||||||
@@ -103,18 +108,17 @@ defaultMain = withSocketsDo $ do
|
|||||||
rrdPath <- fromMaybe "hass-controller.rrd" <$> lookupEnv "HA_RRD_PATH"
|
rrdPath <- fromMaybe "hass-controller.rrd" <$> lookupEnv "HA_RRD_PATH"
|
||||||
rrdtool <- fromMaybe "rrdtool" <$> lookupEnv "HA_RRDTOOL"
|
rrdtool <- fromMaybe "rrdtool" <$> lookupEnv "HA_RRDTOOL"
|
||||||
metricsPort <- lookupPort
|
metricsPort <- lookupPort
|
||||||
let active = [c | c@(Controller _ _ True) <- controllers]
|
writerLimiter <- slidingWindowLimiter rateLimitMetrics 10 20
|
||||||
ents = foldMap (\(Controller _ m _) -> entities m) active
|
let active = [c | c@(Controller True _ _) <- controllers]
|
||||||
|
ents = foldMap (\(Controller _ _ m) -> entities m) active
|
||||||
workers =
|
workers =
|
||||||
[ ("reader", readerAction host 8123 token ents bus)
|
[ ("reader", readerAction host 8123 token ents bus)
|
||||||
, ("writer", writerAction bus)
|
, ("writer", writerAction writerLimiter bus)
|
||||||
] ++ [ (name, runController rootPath bus c) | c@(Controller name _ True) <- controllers ]
|
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
||||||
++ [ ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
, ("metrics-http", HomeAssistant.Runtime.Graphing.graphAction rrdPath rrdtool metricsPort)
|
||||||
, ("metrics-http", HomeAssistant.Runtime.Graphing.graphAction rrdPath rrdtool metricsPort)
|
] ++ [ (name, runController rootPath bus c) | c@(Controller True name _) <- active ]
|
||||||
]
|
runKatipContextT (busLogEnv bus) () mempty $
|
||||||
as <- mapM (\(name, act) -> async (supervised name defaultBackoff act)) workers
|
mapConcurrently_ (uncurry supervised) workers
|
||||||
(_, v) <- waitAny as
|
|
||||||
absurd v
|
|
||||||
|
|
||||||
dryRunHassEval :: Namespace -> Bus -> HASSEff a -> IO a
|
dryRunHassEval :: Namespace -> Bus -> HASSEff a -> IO a
|
||||||
dryRunHassEval ns bus = \case
|
dryRunHassEval ns bus = \case
|
||||||
|
|||||||
@@ -5,17 +5,14 @@ module HomeAssistant.Runtime.Connection
|
|||||||
( readerAction
|
( readerAction
|
||||||
, writerAction
|
, writerAction
|
||||||
, encodeService
|
, encodeService
|
||||||
, dedupeBatch
|
|
||||||
, isTriggerEvent
|
, isTriggerEvent
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Concurrent.STM
|
import Control.Concurrent.STM
|
||||||
( TChan
|
( atomically
|
||||||
, atomically
|
|
||||||
, readTChan
|
, readTChan
|
||||||
, readTVar
|
, readTVar
|
||||||
, retry
|
, retry
|
||||||
, tryReadTChan
|
|
||||||
, writeTChan
|
, writeTChan
|
||||||
, writeTVar
|
, writeTVar
|
||||||
)
|
)
|
||||||
@@ -27,8 +24,6 @@ import Control.Lens ((^?))
|
|||||||
import Control.Monad (forever, forM_, when)
|
import Control.Monad (forever, forM_, when)
|
||||||
import Data.Aeson (Value, eitherDecode, encode, object, (.=))
|
import Data.Aeson (Value, eitherDecode, encode, object, (.=))
|
||||||
import Data.Aeson.Lens (key, _String)
|
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.Set as S
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Data.Void (Void)
|
import Data.Void (Void)
|
||||||
@@ -36,15 +31,18 @@ import HomeAssistant.Controller (Service (..), Target (..))
|
|||||||
import HomeAssistant.Runtime.Bus
|
import HomeAssistant.Runtime.Bus
|
||||||
import HomeAssistant.Runtime.Supervisor (Fatal (..))
|
import HomeAssistant.Runtime.Supervisor (Fatal (..))
|
||||||
import qualified Network.WebSockets as WS
|
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 Data.UUID (toText)
|
||||||
import AFRP (Request(..), Event(..))
|
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.
|
-- | Connect, authenticate, subscribe, then receive and broadcast forever.
|
||||||
-- Restarting this action reconnects. All setup sends happen before the
|
-- Restarting this action reconnects. All setup sends happen before the
|
||||||
-- connection is published in the bus, so only the writer sends afterwards.
|
-- connection is published in the bus, so only the writer sends afterwards.
|
||||||
readerAction :: String -> Int -> String -> S.Set T.Text -> Bus -> IO Void
|
readerAction :: MonadIO m => String -> Int -> String -> S.Set T.Text -> Bus -> m Void
|
||||||
readerAction host port token ents bus =
|
readerAction host port token ents bus = liftIO $
|
||||||
WS.runClient host port "/api/websocket" $ \conn -> do
|
WS.runClient host port "/api/websocket" $ \conn -> do
|
||||||
handshake conn token
|
handshake conn token
|
||||||
subscribe bus conn ents
|
subscribe bus conn ents
|
||||||
@@ -111,41 +109,23 @@ receiveJSON conn = do
|
|||||||
Left err -> throw (Fatal $ "Invalid JSON from Home Assistant: " <> T.pack err)
|
Left err -> throw (Fatal $ "Invalid JSON from Home Assistant: " <> T.pack err)
|
||||||
Right x -> pure x
|
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 :: (MonadIO m, KatipContext m) => Bus -> WS.Connection -> Service -> RateLimited m ()
|
||||||
sendWithId bus conn request svc = do
|
sendWithId bus conn svc = katipAddNamespace "connection" $ do
|
||||||
callId <- generateCallId (busGen bus)
|
callId <- liftIO $ generateCallId (busGen bus)
|
||||||
let textData = encode $ encodeService callId svc
|
let textData = encode $ encodeService callId svc
|
||||||
runKatipContextT (busLogEnv bus) (sl "traceId" (toText (requestTraceId request))) "connection" $
|
logFM DebugS (ls textData)
|
||||||
logFM DebugS (ls textData)
|
liftIO $ recordOutbound bus
|
||||||
recordOutbound bus
|
liftIO $ WS.sendTextData conn textData
|
||||||
WS.sendTextData conn textData
|
|
||||||
|
|
||||||
writerAction :: Bus -> IO Void
|
writerAction :: (MonadIO m, KatipContext m, MonadCatch m) => RateLimiter -> Bus -> m Void
|
||||||
writerAction bus = forever $ do
|
writerAction rateLimiter bus = forever $ do
|
||||||
first <- atomically $ readTChan (busOutbound bus)
|
(request, svc) <- liftIO $ atomically $ readTChan (busOutbound bus)
|
||||||
rest <- drainTry (busOutbound bus)
|
katipAddContext (sl "traceId" (toText (requestTraceId request))) $ do
|
||||||
let deduped = dedupeBatch (first : rest)
|
conn <- liftIO $ atomically $ readTVar (busConn bus) >>= maybe retry pure
|
||||||
conn <- atomically $ readTVar (busConn bus) >>= maybe retry pure
|
-- runRateLimited rateLimiter $ sendWithId bus conn request svc
|
||||||
forM_ deduped $ \(request, svc) -> do
|
runRateLimited rateLimiter $ sendWithId bus conn svc
|
||||||
sendWithId bus conn request svc
|
|
||||||
threadDelay minInterval
|
|
||||||
|
|
||||||
encodeService :: Int -> Service -> Value
|
encodeService :: Int -> Service -> Value
|
||||||
encodeService callId Service{..} = object $
|
encodeService callId Service{..} = object $
|
||||||
@@ -156,17 +136,6 @@ encodeService callId Service{..} = object $
|
|||||||
, "target" .= targetObject serviceTarget
|
, "target" .= targetObject serviceTarget
|
||||||
] <> maybe [] (\d -> ["service_data" .= d]) serviceData
|
] <> 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
|
-- | A single target encodes as a scalar; multiple encode as a list. Empty
|
||||||
-- lists are omitted so Home Assistant receives only populated keys.
|
-- lists are omitted so Home Assistant receives only populated keys.
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ module HomeAssistant.Runtime.Graphing
|
|||||||
|
|
||||||
import Control.Exception (evaluate)
|
import Control.Exception (evaluate)
|
||||||
import Control.Monad (forever)
|
import Control.Monad (forever)
|
||||||
import Control.Monad.IO.Class (liftIO)
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
import qualified Data.ByteString as BS
|
import qualified Data.ByteString as BS
|
||||||
import qualified Data.ByteString.Lazy as BL
|
import qualified Data.ByteString.Lazy as BL
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
@@ -59,30 +59,124 @@ parseRange t = lookup t [(T.pack (rangeSuffix r), r) | r <- [minBound .. maxBoun
|
|||||||
rangeStart :: Range -> String
|
rangeStart :: Range -> String
|
||||||
rangeStart r = "end-" ++ rangeSuffix r
|
rangeStart r = "end-" ++ rangeSuffix r
|
||||||
|
|
||||||
data Series = Series
|
data CF = Average | Minimum | Maximum | Last
|
||||||
{ serDs :: String
|
deriving (Eq, Show)
|
||||||
, serAlias :: String
|
|
||||||
, serColor :: String
|
data Source = Source
|
||||||
, serLabel :: String
|
{ srcDs :: String
|
||||||
|
, srcCF :: CF
|
||||||
}
|
}
|
||||||
deriving (Eq, Show)
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Transform
|
||||||
|
= Identity
|
||||||
|
| Multiply Double
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Series = Series
|
||||||
|
{ serSource :: Source
|
||||||
|
, serTransform :: Transform
|
||||||
|
, serAlias :: String
|
||||||
|
, serColor :: String
|
||||||
|
, serLabel :: String
|
||||||
|
}
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
|
data Plot
|
||||||
|
= Line Int Series
|
||||||
|
| Area Series
|
||||||
|
deriving (Eq, Show)
|
||||||
|
|
||||||
data GraphSpec = GraphSpec
|
data GraphSpec = GraphSpec
|
||||||
{ gsName :: Text
|
{ gsName :: Text
|
||||||
, gsTitle :: String
|
, gsTitle :: String
|
||||||
, gsSeries :: [Series]
|
, gsPlots :: [Plot]
|
||||||
}
|
}
|
||||||
deriving (Eq, Show)
|
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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
memoryGraph :: GraphSpec
|
||||||
|
memoryGraph =
|
||||||
|
GraphSpec
|
||||||
|
"memory"
|
||||||
|
"Memory use"
|
||||||
|
[ area "live" "#99ccff" (average "rts_gc_current__a7a")
|
||||||
|
, line "peak" "#cc0000" (maximumCF "rts_gc_current__a7a")
|
||||||
|
]
|
||||||
|
|
||||||
graphs :: [GraphSpec]
|
graphs :: [GraphSpec]
|
||||||
graphs =
|
graphs = [memoryGraph, ratelimitGraph, trafficGraph]
|
||||||
[ GraphSpec
|
|
||||||
"traffic"
|
|
||||||
"Hass triggers in / services out"
|
|
||||||
[ Series "hass_trigger_in" "trig" "#0066cc" "triggers in/min"
|
|
||||||
, Series "hass_service_out" "svc" "#cc0000" "services out/min"
|
|
||||||
]
|
|
||||||
]
|
|
||||||
|
|
||||||
lookupGraph :: [GraphSpec] -> Text -> Maybe GraphSpec
|
lookupGraph :: [GraphSpec] -> Text -> Maybe GraphSpec
|
||||||
lookupGraph specs name = case [g | g <- specs, gsName g == name] of
|
lookupGraph specs name = case [g | g <- specs, gsName g == name] of
|
||||||
@@ -92,6 +186,48 @@ lookupGraph specs name = case [g | g <- specs, gsName g == name] of
|
|||||||
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
||||||
parseNameParam specs t = T.stripSuffix ".png" t >>= lookupGraph specs
|
parseNameParam specs t = T.stripSuffix ".png" t >>= lookupGraph specs
|
||||||
|
|
||||||
|
cfName :: CF -> String
|
||||||
|
cfName = \case
|
||||||
|
Average -> "AVERAGE"
|
||||||
|
Minimum -> "MIN"
|
||||||
|
Maximum -> "MAX"
|
||||||
|
Last -> "LAST"
|
||||||
|
|
||||||
|
defArgs :: FilePath -> Series -> [String]
|
||||||
|
defArgs rrdPath series =
|
||||||
|
[ "DEF:" ++ rawF ++ "=" ++ rrdPath ++ ":"
|
||||||
|
++ srcDs source ++ ":" ++ cfName (srcCF source)
|
||||||
|
]
|
||||||
|
++ transformArgs
|
||||||
|
where
|
||||||
|
source = serSource series
|
||||||
|
alias = serAlias series
|
||||||
|
rawF = alias ++ "_raw"
|
||||||
|
|
||||||
|
transformArgs = case serTransform series of
|
||||||
|
Identity ->
|
||||||
|
[ "CDEF:" ++ alias ++ "=" ++ rawF ]
|
||||||
|
|
||||||
|
Multiply factor ->
|
||||||
|
[ "CDEF:" ++ alias ++ "=" ++ rawF
|
||||||
|
++ "," ++ show factor ++ ",*"
|
||||||
|
]
|
||||||
|
|
||||||
|
plotArg :: Plot -> String
|
||||||
|
plotArg = \case
|
||||||
|
Line width series ->
|
||||||
|
"LINE" ++ show width ++ ":" ++ serAlias series
|
||||||
|
++ serColor series ++ ":" ++ serLabel series
|
||||||
|
|
||||||
|
Area series ->
|
||||||
|
"AREA:" ++ serAlias series
|
||||||
|
++ serColor series ++ ":" ++ serLabel series
|
||||||
|
|
||||||
|
plotSeries :: Plot -> Series
|
||||||
|
plotSeries = \case
|
||||||
|
Line _ series -> series
|
||||||
|
Area series -> series
|
||||||
|
|
||||||
buildGraphArgs :: FilePath -> GraphSpec -> Range -> [String]
|
buildGraphArgs :: FilePath -> GraphSpec -> Range -> [String]
|
||||||
buildGraphArgs rrdPath spec range =
|
buildGraphArgs rrdPath spec range =
|
||||||
[ "graph"
|
[ "graph"
|
||||||
@@ -102,15 +238,9 @@ buildGraphArgs rrdPath spec range =
|
|||||||
, "--height", "250"
|
, "--height", "250"
|
||||||
, "--imgformat", "PNG"
|
, "--imgformat", "PNG"
|
||||||
]
|
]
|
||||||
++ concatMap defArgs (gsSeries spec)
|
++ concatMap (defArgs rrdPath . plotSeries) (gsPlots spec)
|
||||||
++ map line (gsSeries spec)
|
++ map plotArg (gsPlots spec)
|
||||||
where
|
|
||||||
defArgs (Series ds alias _ _) =
|
|
||||||
[ "DEF:" ++ alias ++ "=" ++ rrdPath ++ ":" ++ ds ++ ":AVERAGE"
|
|
||||||
, "CDEF:" ++ alias ++ "_min=" ++ alias ++ ",60,*"
|
|
||||||
]
|
|
||||||
line (Series _ alias color label) =
|
|
||||||
"LINE2:" ++ alias ++ "_min" ++ color ++ ":" ++ label
|
|
||||||
|
|
||||||
readProcessBytes :: FilePath -> [String] -> IO (ExitCode, BS.ByteString, String)
|
readProcessBytes :: FilePath -> [String] -> IO (ExitCode, BS.ByteString, String)
|
||||||
readProcessBytes cmd args =
|
readProcessBytes cmd args =
|
||||||
@@ -155,9 +285,9 @@ handler rrdPath rrdtool = do
|
|||||||
app :: FilePath -> FilePath -> ScottyM ()
|
app :: FilePath -> FilePath -> ScottyM ()
|
||||||
app rrdPath rrdtool = get "/metrics/:name" (handler rrdPath rrdtool)
|
app rrdPath rrdtool = get "/metrics/:name" (handler rrdPath rrdtool)
|
||||||
|
|
||||||
graphAction :: FilePath -> FilePath -> Int -> IO Void
|
graphAction :: MonadIO m => FilePath -> FilePath -> Int -> m Void
|
||||||
graphAction rrdPath rrdtool port = forever $ scottyOpts opts (app rrdPath rrdtool)
|
graphAction rrdPath rrdtool port = liftIO $ forever $ scottyOpts opts (app rrdPath rrdtool)
|
||||||
where
|
where
|
||||||
opts = defaultOptions
|
opts = defaultOptions
|
||||||
{ settings = setHost "127.0.0.1" (setPort port defaultSettings)
|
{ settings = setHost "0.0.0.0" (setPort port defaultSettings)
|
||||||
}
|
}
|
||||||
@@ -35,6 +35,9 @@ import System.Metrics.Counter (Counter)
|
|||||||
import System.Directory (doesFileExist, renameFile)
|
import System.Directory (doesFileExist, renameFile)
|
||||||
import System.Exit (ExitCode (..))
|
import System.Exit (ExitCode (..))
|
||||||
import System.Process (callProcess, readProcessWithExitCode)
|
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
|
data DsType = Derive | Gauge
|
||||||
deriving (Eq, Ord, Show)
|
deriving (Eq, Ord, Show)
|
||||||
@@ -81,6 +84,8 @@ registerAppMetrics store =
|
|||||||
<$> M.createCounter "hass.trigger.in" store
|
<$> M.createCounter "hass.trigger.in" store
|
||||||
<*> M.createCounter "hass.service.out" store
|
<*> M.createCounter "hass.service.out" store
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
buildCreateArgs :: FilePath -> Int -> [(String, DsType)] -> [String]
|
buildCreateArgs :: FilePath -> Int -> [(String, DsType)] -> [String]
|
||||||
buildCreateArgs path step specs =
|
buildCreateArgs path step specs =
|
||||||
["create", path, "--step", show step]
|
["create", path, "--step", show step]
|
||||||
@@ -134,44 +139,44 @@ lookupValue sample name = case HM.lookup name sample of
|
|||||||
Just (M.Gauge n) -> Just n
|
Just (M.Gauge n) -> Just n
|
||||||
_ -> Nothing
|
_ -> Nothing
|
||||||
|
|
||||||
readExistingDs :: FilePath -> FilePath -> IO [(String, DsType)]
|
readExistingDs :: (MonadCatch m, MonadIO m) => FilePath -> FilePath -> m [(String, DsType)]
|
||||||
readExistingDs rrdtool rrdPath = do
|
readExistingDs rrdtool rrdPath = checkpointCallStack $ do
|
||||||
(code, out, _) <- readProcessWithExitCode rrdtool ["info", rrdPath] ""
|
(code, out, _) <- liftIO $ readProcessWithExitCode rrdtool ["info", rrdPath] ""
|
||||||
pure $ case code of
|
pure $ case code of
|
||||||
ExitSuccess -> parseInfoDs out
|
ExitSuccess -> parseInfoDs out
|
||||||
_ -> []
|
_ -> []
|
||||||
|
|
||||||
backupPath :: FilePath -> IO FilePath
|
backupPath :: MonadIO m => FilePath -> m FilePath
|
||||||
backupPath path = do
|
backupPath path = liftIO $ do
|
||||||
now <- getCurrentTime
|
now <- getCurrentTime
|
||||||
pure $ path ++ ".bak-" ++ formatTime defaultTimeLocale "%Y%m%dT%H%M%S" now
|
pure $ path ++ ".bak-" ++ formatTime defaultTimeLocale "%Y%m%dT%H%M%S" now
|
||||||
|
|
||||||
ensureRrd :: FilePath -> FilePath -> [DsSpec] -> IO ()
|
ensureRrd :: (MonadCatch m, MonadIO m) => FilePath -> FilePath -> [DsSpec] -> m ()
|
||||||
ensureRrd rrdtool rrdPath schema = do
|
ensureRrd rrdtool rrdPath schema = checkpointCallStack $ do
|
||||||
exists <- doesFileExist rrdPath
|
exists <- liftIO $ doesFileExist rrdPath
|
||||||
if not exists
|
if not exists
|
||||||
then create
|
then create
|
||||||
else do
|
else do
|
||||||
current <- readExistingDs rrdtool rrdPath
|
current <- readExistingDs rrdtool rrdPath
|
||||||
unless (schemaMatches schema current) $ do
|
unless (schemaMatches schema current) $ do
|
||||||
backup <- backupPath rrdPath
|
backup <- backupPath rrdPath
|
||||||
renameFile rrdPath backup
|
liftIO $ renameFile rrdPath backup
|
||||||
create
|
create
|
||||||
where
|
where
|
||||||
create = callProcess rrdtool (buildCreateArgs rrdPath 10 (map toPair schema))
|
create = liftIO $ callProcess rrdtool (buildCreateArgs rrdPath 10 (map toPair schema))
|
||||||
toPair s = (dsName s, dsType s)
|
toPair s = (dsName s, dsType s)
|
||||||
|
|
||||||
sampleAndUpdate :: M.Store -> FilePath -> FilePath -> [DsSpec] -> IO ()
|
sampleAndUpdate :: (MonadCatch m, MonadIO m) => M.Store -> FilePath -> FilePath -> [DsSpec] -> m ()
|
||||||
sampleAndUpdate store rrdtool rrdPath schema = do
|
sampleAndUpdate store rrdtool rrdPath schema = checkpointCallStack $ do
|
||||||
sample <- M.sampleAll store
|
sample <- liftIO $ M.sampleAll store
|
||||||
let names = map dsName schema
|
let names = map dsName schema
|
||||||
values = map (lookupValue sample . dsEkgName) 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 :: (MonadCatch m, MonadIO m) => M.Store -> FilePath -> FilePath -> m Void
|
||||||
metricsAction store rrdPath rrdtool = do
|
metricsAction store rrdPath rrdtool = checkpointCallStack $ do
|
||||||
schema <- buildSchema <$> M.sampleAll store
|
schema <- buildSchema <$> liftIO (M.sampleAll store)
|
||||||
ensureRrd rrdtool rrdPath schema
|
ensureRrd rrdtool rrdPath schema
|
||||||
forever $ do
|
forever $ do
|
||||||
sampleAndUpdate store rrdtool rrdPath schema
|
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
|
module HomeAssistant.Runtime.Supervisor
|
||||||
( supervised
|
( supervised
|
||||||
, Backoff(..)
|
|
||||||
, defaultBackoff
|
|
||||||
, backoffDelay
|
|
||||||
, nextAttempt
|
|
||||||
, Fatal(..)
|
, Fatal(..)
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Concurrent (threadDelay)
|
|
||||||
import Control.Exception.Annotated
|
import Control.Exception.Annotated
|
||||||
( Exception
|
( Exception
|
||||||
, Handler (..)
|
, Handler (..)
|
||||||
, SomeException
|
, SomeException
|
||||||
, catches
|
, checkpoint, Annotation (..)
|
||||||
, displayException
|
|
||||||
, throw
|
|
||||||
)
|
)
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
import qualified Data.Text as T
|
|
||||||
import Data.Time (NominalDiffTime, diffUTCTime, getCurrentTime)
|
|
||||||
import Data.Void (Void)
|
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
|
-- | A failure that cannot be fixed by restarting; propagates out of
|
||||||
-- 'supervised' and terminates the process.
|
-- 'supervised' and terminates the process.
|
||||||
@@ -30,28 +27,11 @@ newtype Fatal = Fatal Text
|
|||||||
|
|
||||||
instance Exception Fatal
|
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
|
data SupervisorException = RetriesExhausted
|
||||||
defaultBackoff = Backoff 0.1 30 30
|
deriving Show
|
||||||
|
|
||||||
-- | Delay before the @attempt@-th restart: doubles from base, clamped at cap.
|
instance Exception SupervisorException
|
||||||
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
|
|
||||||
|
|
||||||
-- | Runs the action forever, restarting it with backoff after synchronous
|
-- | Runs the action forever, restarting it with backoff after synchronous
|
||||||
-- exceptions; async exceptions propagate. 'Fatal' is rethrown (crashing the
|
-- 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
|
-- must not be wrapped in checkpoints around 'Fatal'-throwing code: a
|
||||||
-- doubly-wrapped 'Fatal' is indistinguishable from a crash and would be
|
-- doubly-wrapped 'Fatal' is indistinguishable from a crash and would be
|
||||||
-- restarted instead of escalated.
|
-- restarted instead of escalated.
|
||||||
supervised :: Text -> Backoff -> IO Void -> IO Void
|
supervised :: (MonadIO m, MonadCatch m, KatipContext m, MonadMask m) => Text -> m Void -> m Void
|
||||||
supervised name backoff action = go 1
|
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
|
where
|
||||||
go attempt = do
|
handlers =
|
||||||
start <- getCurrentTime
|
[ \_retryStatus -> Handler $ \(_ :: Fatal) -> pure False
|
||||||
outcome <- (action >> pure (Nothing :: Maybe (Either Fatal SomeException))) `catches`
|
, \_retryStatus -> Handler $ \(_ :: SomeException) -> pure True
|
||||||
[ Handler $ \(f :: Fatal) -> pure (Just (Left f))
|
|
||||||
, Handler $ \(e :: SomeException) -> pure (Just (Right e))
|
|
||||||
]
|
]
|
||||||
end <- getCurrentTime
|
retryPolicy = capDelay (15 * 1_000_000) (fullJitterBackoff 50_000)
|
||||||
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)
|
|
||||||
@@ -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
|
`shouldBe` S.fromList
|
||||||
[ "event.bedroom_quick_remote_masse_action"
|
[ "event.bedroom_quick_remote_masse_action"
|
||||||
, "event.bedroom_quick_jemina_action"
|
, "event.bedroom_quick_jemina_action"
|
||||||
|
, "event.bedroom_remote_action"
|
||||||
]
|
]
|
||||||
|
|
||||||
it "bedroomPresenceController subscribes to the presence sensor" $
|
it "bedroomPresenceController subscribes to the presence sensor" $
|
||||||
@@ -89,36 +90,36 @@ buttonSpec = describe "bedroomButtonController" $ do
|
|||||||
let area = AreaId "makuuhuone"
|
let area = AreaId "makuuhuone"
|
||||||
|
|
||||||
it "Masse single click turns on his nightstand scene (lowest)" $
|
it "Masse single click turns on his nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_masse"]]
|
`shouldContain` [activateScene "scene.makuuhuone_masse"]
|
||||||
|
|
||||||
it "Masse double click turns on the middle scene" $
|
it "Masse double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Masse long click turns on the bright scene" $
|
it "Masse long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Masse off click turns the bedroom lights off" $
|
it "Masse off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [masseButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "Enishen single click turns on her nightstand scene (lowest)" $
|
it "Enishen single click turns on her nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_jemina"]]
|
`shouldContain` [activateScene "scene.makuuhuone_jemina"]
|
||||||
|
|
||||||
it "Enishen double click turns on the middle scene" $
|
it "Enishen double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Enishen long click turns on the bright scene" $
|
it "Enishen long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Enishen off click turns the bedroom lights off" $
|
it "Enishen off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "ignores the initial press (scene only fires on release)" $
|
it "ignores the initial press (scene only fires on release)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
||||||
|
|||||||
+1
-29
@@ -9,7 +9,7 @@ import Data.Text (Text)
|
|||||||
import Data.Time (UTCTime (..), utc)
|
import Data.Time (UTCTime (..), utc)
|
||||||
import Data.UUID (fromString)
|
import Data.UUID (fromString)
|
||||||
import HomeAssistant.Controller (Service (..), Target(..))
|
import HomeAssistant.Controller (Service (..), Target(..))
|
||||||
import HomeAssistant.Runtime.Connection (encodeService, dedupeBatch, isTriggerEvent)
|
import HomeAssistant.Runtime.Connection (encodeService, isTriggerEvent)
|
||||||
import Test.Hspec
|
import Test.Hspec
|
||||||
|
|
||||||
spec :: Spec
|
spec :: Spec
|
||||||
@@ -44,34 +44,6 @@ spec = do
|
|||||||
it "is false when there is no type" $
|
it "is false when there is no type" $
|
||||||
isTriggerEvent (object ["id" .= (1 :: Int)]) `shouldBe` False
|
isTriggerEvent (object ["id" .= (1 :: Int)]) `shouldBe` False
|
||||||
|
|
||||||
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"])]
|
|
||||||
|
|
||||||
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 :: Int -> Request
|
||||||
req n = Request (UTCTime (toEnum 0) (fromIntegral (0 :: Int))) utc
|
req n = Request (UTCTime (toEnum 0) (fromIntegral (0 :: Int))) utc
|
||||||
|
|||||||
@@ -83,12 +83,12 @@ spec = do
|
|||||||
, "--width", "800"
|
, "--width", "800"
|
||||||
, "--height", "250"
|
, "--height", "250"
|
||||||
, "--imgformat", "PNG"
|
, "--imgformat", "PNG"
|
||||||
, "DEF:trig=hass-controller.rrd:hass_trigger_in:AVERAGE"
|
, "DEF:in_raw=hass-controller.rrd:hass_trigger_in:AVERAGE"
|
||||||
, "CDEF:trig_min=trig,60,*"
|
, "CDEF:in=in_raw,60.0,*"
|
||||||
, "DEF:svc=hass-controller.rrd:hass_service_out:AVERAGE"
|
, "DEF:out_raw=hass-controller.rrd:hass_service_out:AVERAGE"
|
||||||
, "CDEF:svc_min=svc,60,*"
|
, "CDEF:out=out_raw,60.0,*"
|
||||||
, "LINE2:trig_min#0066cc:triggers in/min"
|
, "LINE2:in#0066cc:Triggers in/min"
|
||||||
, "LINE2:svc_min#cc0000:services out/min"
|
, "LINE2:out#cc0000:Service calls out/min"
|
||||||
]
|
]
|
||||||
|
|
||||||
describe "end-to-end (rrdtool-gated)" $ do
|
describe "end-to-end (rrdtool-gated)" $ do
|
||||||
@@ -123,4 +123,4 @@ spec = do
|
|||||||
code `shouldBe` ExitSuccess
|
code `shouldBe` ExitSuccess
|
||||||
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
||||||
)
|
)
|
||||||
`finally` cleanup
|
`finally` cleanup
|
||||||
@@ -3,14 +3,12 @@ module Main (main) where
|
|||||||
import Test.Hspec (hspec)
|
import Test.Hspec (hspec)
|
||||||
import qualified AFRPLawsSpec
|
import qualified AFRPLawsSpec
|
||||||
import qualified AFRPSpec
|
import qualified AFRPSpec
|
||||||
import qualified BackoffProp
|
|
||||||
import qualified BedroomSpec
|
import qualified BedroomSpec
|
||||||
import qualified BusSpec
|
import qualified BusSpec
|
||||||
import qualified ConnectionSpec
|
import qualified ConnectionSpec
|
||||||
import qualified GraphingSpec
|
import qualified GraphingSpec
|
||||||
import qualified MetricsSpec
|
import qualified MetricsSpec
|
||||||
import qualified RuntimeSpec
|
import qualified RuntimeSpec
|
||||||
import qualified SupervisorSpec
|
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = hspec $ do
|
main = hspec $ do
|
||||||
@@ -22,5 +20,3 @@ main = hspec $ do
|
|||||||
GraphingSpec.spec
|
GraphingSpec.spec
|
||||||
MetricsSpec.spec
|
MetricsSpec.spec
|
||||||
RuntimeSpec.spec
|
RuntimeSpec.spec
|
||||||
SupervisorSpec.spec
|
|
||||||
BackoffProp.spec
|
|
||||||
+24
-1
@@ -1,9 +1,32 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
|
||||||
module RuntimeSpec (spec) where
|
module RuntimeSpec (spec) where
|
||||||
|
|
||||||
|
import Control.Concurrent (threadDelay)
|
||||||
|
import Control.Concurrent.Async (async, cancel, race, waitCatch)
|
||||||
|
import Control.Exception (bracket)
|
||||||
|
import Control.Monad (forever)
|
||||||
|
import Control.Monad.IO.Class (liftIO)
|
||||||
|
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||||
|
import Katip (LogEnv, closeScribes, initLogEnv, runKatipContextT)
|
||||||
import Test.Hspec
|
import Test.Hspec
|
||||||
|
|
||||||
spec :: Spec
|
spec :: Spec
|
||||||
spec = pure ()
|
spec = describe "supervised" $ do
|
||||||
|
it "propagates ThreadKilled instead of retrying" $
|
||||||
|
withTestLogEnv $ \le -> do
|
||||||
|
worker <- async $ runKatipContextT le () mempty $
|
||||||
|
supervised "test" (liftIO (forever (threadDelay 100000)))
|
||||||
|
threadDelay 200000
|
||||||
|
cancel worker
|
||||||
|
result <- race (threadDelay 5000000) (waitCatch worker)
|
||||||
|
case result of
|
||||||
|
Left () -> expectationFailure
|
||||||
|
"supervised retried on ThreadKilled (process would hang)"
|
||||||
|
Right _ -> pure ()
|
||||||
|
|
||||||
|
withTestLogEnv :: (LogEnv -> IO a) -> IO a
|
||||||
|
withTestLogEnv = bracket (initLogEnv "test" "test") closeScribes
|
||||||
|
|
||||||
-- I'm commenting out the test as that specific controller
|
-- I'm commenting out the test as that specific controller
|
||||||
-- was just a dummy for seeing how the data flows (dead code)
|
-- was just a dummy for seeing how the data flows (dead code)
|
||||||
|
|||||||
@@ -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