Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f8b3cbe00 | ||
|
|
078f24e4b9 | ||
|
|
15e50322c4 | ||
|
|
617bd255ff | ||
|
|
022342af32 | ||
|
|
6caa2acafb | ||
|
|
7d5103ac90 | ||
|
|
3a6fe26d0c | ||
|
|
45277e02da | ||
|
|
87dda96e7e | ||
|
|
55855db55b | ||
|
|
8a4a5aef33 | ||
|
|
d33c2cf268 |
No files matched your search
+6
-6
@@ -2,9 +2,9 @@
|
||||
, cereal, cereal-conduit, cereal-text, conduit, containers
|
||||
, data-default, directory, ekg-core, exceptions, filepath, hedgehog
|
||||
, hspec, hspec-hedgehog, http-media, http-types, katip, lens
|
||||
, lens-aeson, lib, libsystemd-journal, network, process, retry
|
||||
, servant, servant-server, stm, temporary, text, time, unliftio
|
||||
, unordered-containers, uuid, wai, warp, websockets
|
||||
, lens-aeson, lib, libsystemd-journal, lucid2, network, process
|
||||
, retry, servant, servant-server, stm, temporary, text, time
|
||||
, unliftio, unordered-containers, uuid, wai, warp, websockets
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "home-assistant-controller";
|
||||
@@ -16,9 +16,9 @@ mkDerivation {
|
||||
aeson annotated-exception async base bytestring cereal
|
||||
cereal-conduit cereal-text conduit containers data-default
|
||||
directory ekg-core exceptions filepath http-media http-types katip
|
||||
lens lens-aeson libsystemd-journal network process retry servant
|
||||
servant-server stm text time unliftio unordered-containers uuid wai
|
||||
warp websockets
|
||||
lens lens-aeson libsystemd-journal lucid2 network process retry
|
||||
servant servant-server stm text time unliftio unordered-containers
|
||||
uuid wai warp websockets
|
||||
];
|
||||
executableHaskellDepends = [ base ];
|
||||
testHaskellDepends = [
|
||||
|
||||
@@ -60,6 +60,7 @@ library
|
||||
|
||||
-- Modules exported by the library.
|
||||
exposed-modules: AFRP
|
||||
, AFRP.Diagram
|
||||
, HomeAssistant.Controller
|
||||
, HomeAssistant.Controller.Bedroom
|
||||
, HomeAssistant.Controller.Children
|
||||
@@ -132,6 +133,8 @@ library
|
||||
, wai
|
||||
, retry
|
||||
, libsystemd-journal
|
||||
, lucid2
|
||||
, http-api-data
|
||||
|
||||
-- Directories containing source files.
|
||||
hs-source-dirs: src
|
||||
@@ -179,6 +182,7 @@ test-suite home-assistant-controller-test
|
||||
, ConnectionSpec
|
||||
, FlagsSpec
|
||||
, GraphingSpec
|
||||
, HttpServerSpec
|
||||
, KitchenSpec
|
||||
, LivingroomSpec
|
||||
, MetricsSpec
|
||||
@@ -222,4 +226,5 @@ test-suite home-assistant-controller-test
|
||||
unordered-containers,
|
||||
process,
|
||||
directory,
|
||||
temporary
|
||||
temporary,
|
||||
lucid2
|
||||
+55
-23
@@ -1,13 +1,16 @@
|
||||
{-# LANGUAGE LambdaCase #-}
|
||||
{-# LANGUAGE Arrows #-}
|
||||
{-# LANGUAGE TypeOperators #-}
|
||||
|
||||
module AFRP
|
||||
( Mealy(..)
|
||||
, Auto(..)
|
||||
, DecodedAuto(..)
|
||||
, eff
|
||||
, withEntities
|
||||
, named
|
||||
, Event(..)
|
||||
, hold
|
||||
, holdKnown
|
||||
, events
|
||||
-- , switch
|
||||
, preMapAccum
|
||||
@@ -17,8 +20,10 @@ module AFRP
|
||||
, changes
|
||||
, whenA
|
||||
, filterA
|
||||
, filterEvent
|
||||
, thenA
|
||||
, (>>|)
|
||||
, (>>||)
|
||||
, toEvent
|
||||
, lMerge
|
||||
, Pair(..)
|
||||
@@ -66,6 +71,8 @@ import qualified Data.Conduit.Cereal as CC
|
||||
import qualified Conduit as C
|
||||
import Control.Monad.Catch (MonadCatch, handle)
|
||||
import Control.Exception.Annotated (throw)
|
||||
import AFRP.Diagram
|
||||
import Data.Text (Text)
|
||||
|
||||
|
||||
data Codec s = Codec { getter :: !(Get s), putter :: !(Putter s) }
|
||||
@@ -256,54 +263,58 @@ load path a = handle defaultOnMissingFile (flip deserialize a <$> liftIO (B.read
|
||||
| isDoesNotExistError e = pure $ FailDecode "State doesn't exist yet" a
|
||||
| otherwise = throw e
|
||||
|
||||
|
||||
-- | The set of entity ids an arrow subscribes to. Static: it does not
|
||||
-- change as the machine steps, so the runtime can read it once to build
|
||||
-- trigger subscriptions.
|
||||
data Mealy eff a b = Mealy
|
||||
{ entities :: S.Set T.Text
|
||||
, runDiagramC :: forall x. (DiagramF x -> x) -> x
|
||||
, runMealy :: forall m. Monad m => (forall x. eff x -> m x) -> Auto m a b
|
||||
}
|
||||
|
||||
-- Provide a name
|
||||
named :: Text -> Mealy eff a b -> Mealy eff a b
|
||||
named n f = f{runDiagramC = \run -> run (Step n (runDiagramC f run))}
|
||||
|
||||
instance Semigroup b => Semigroup (Mealy eff a b) where
|
||||
Mealy ast af <> Mealy bst bf = Mealy (ast <> bst) $ \nt -> af nt <> bf nt
|
||||
Mealy ast ad af <> Mealy bst bd bf = Mealy (ast <> bst) (combineDiagram Merge ad bd) $ \nt -> af nt <> bf nt
|
||||
|
||||
|
||||
instance Monoid b => Monoid (Mealy eff a b) where
|
||||
mempty = Mealy mempty $ \_nt -> mempty
|
||||
mempty = Mealy mempty emptyDiagram $ \_nt -> mempty
|
||||
|
||||
eff :: (Request -> a -> eff b) -> Mealy eff a b
|
||||
eff f = Mealy mempty $ \nt -> do
|
||||
eff f = Mealy mempty emptyDiagram $ \nt -> do
|
||||
Stateful (Codec get put) (State () False) $ \s req a -> do
|
||||
b <- nt (f req a)
|
||||
pure (b, s)
|
||||
|
||||
-- | Override the static entity set of an arrow. Use when a combinator
|
||||
-- (e.g. 'switch') hides continuation entities from the runtime's
|
||||
-- startup subscription scan.
|
||||
withEntities :: S.Set T.Text -> Mealy eff a b -> Mealy eff a b
|
||||
withEntities es (Mealy _ f) = Mealy es f
|
||||
|
||||
instance Category (Mealy eff) where
|
||||
{- HLINT ignore "Use const" -}
|
||||
id = Mealy mempty $ \_nt -> id
|
||||
(Mealy ast f) . (Mealy bst g) = Mealy (ast <> bst) $ \nt -> do
|
||||
id = Mealy mempty emptyDiagram $ \_nt -> id
|
||||
(Mealy ast ad f) . (Mealy bst bd g) = Mealy (ast <> bst) (combineDiagram Then bd ad) $ \nt -> do
|
||||
f nt . g nt
|
||||
|
||||
instance Arrow (Mealy eff) where
|
||||
arr f = Mealy mempty $ \_nt -> arr f
|
||||
first (Mealy st f) = Mealy st $ \nt -> first (f nt)
|
||||
arr f = Mealy mempty emptyDiagram $ \_nt -> arr f
|
||||
first (Mealy st d f) = Mealy st d $ \nt -> first (f nt)
|
||||
(Mealy ast ad f) &&& (Mealy bst bd g) = Mealy (ast <> bst) (combineDiagram Both ad bd) $ \nt -> do
|
||||
f nt &&& g nt
|
||||
|
||||
instance ArrowChoice (Mealy eff) where
|
||||
left (Mealy st f) = Mealy st $ \nt -> left (f nt)
|
||||
left (Mealy st d f) = Mealy st d $ \nt -> left (f nt)
|
||||
(Mealy ast ad f) +++ (Mealy bst bd g) = Mealy (ast <> bst) (combineDiagram Branch ad bd) $ \nt -> do
|
||||
f nt +++ g nt
|
||||
|
||||
|
||||
instance Functor (Mealy eff a) where
|
||||
fmap f (Mealy st g) = Mealy st $ \nt -> fmap f (g nt)
|
||||
fmap f (Mealy st d g) = Mealy st d $ \nt -> fmap f (g nt)
|
||||
|
||||
instance Applicative (Mealy eff a) where
|
||||
pure b = Mealy mempty $ \_ -> pure b
|
||||
Mealy ast f <*> Mealy bst x = Mealy (ast <> bst) $ \nt ->
|
||||
pure b = Mealy mempty emptyDiagram $ \_ -> pure b
|
||||
Mealy ast ad f <*> Mealy bst bd x = Mealy (ast <> bst) (combineDiagram Compose ad bd) $ \nt ->
|
||||
f nt <*> x nt
|
||||
|
||||
data Event a
|
||||
@@ -326,7 +337,12 @@ hold def = mapAccum step def id
|
||||
Tick -> prev
|
||||
Event new -> new
|
||||
|
||||
snapshot :: (Serialize a, Eq a) => a -> Mealy m (Event (), a) a
|
||||
|
||||
-- A variant of 'hold' which makes it explicit whether we have a previous value
|
||||
holdKnown :: (Serialize a, Eq a) => Mealy m (Event a) (Maybe a)
|
||||
holdKnown = arr (fmap Just) >>> hold Nothing
|
||||
|
||||
snapshot :: (Serialize a, Eq a) => a -> Mealy m (Event x, a) a
|
||||
snapshot def = mapAccum step def id
|
||||
where
|
||||
step prev (Tick, _) = prev
|
||||
@@ -363,10 +379,10 @@ preMapAccum' f x extract = Stateful (Codec get put) (pure x) (\s _req a -> pure
|
||||
|
||||
|
||||
mapAccum :: (Eq x, Serialize x) => (x -> a -> x) -> x -> (x -> b) -> Mealy eff a b
|
||||
mapAccum step x extract = Mealy mempty $ \_nt -> mapAccum' step x extract
|
||||
mapAccum step x extract = Mealy mempty emptyDiagram $ \_nt -> mapAccum' step x extract
|
||||
|
||||
preMapAccum :: (Eq x, Serialize x) => (x -> a -> x) -> x -> (x -> b) -> Mealy eff a b
|
||||
preMapAccum step x extract = Mealy mempty $ \_nt -> preMapAccum' step x extract
|
||||
preMapAccum step x extract = Mealy mempty emptyDiagram $ \_nt -> preMapAccum' step x extract
|
||||
|
||||
mapAccum' :: forall m x a b. (Monad m, Eq x, Serialize x) => (x -> a -> x) -> x -> (x -> b) -> Auto m a b
|
||||
mapAccum' f x extract = Stateful (Codec get put) (pure x) (\s _req a -> pure $ step s a)
|
||||
@@ -375,7 +391,7 @@ mapAccum' f x extract = Stateful (Codec get put) (pure x) (\s _req a -> pure $ s
|
||||
step s a = let s' = f (state s) a in (extract s', State s' (dirty s || state s /= s'))
|
||||
|
||||
preMapAccumRequest :: (Serialize x, Eq x) => (Request -> x -> a -> x) -> x -> (x -> b) -> Mealy eff a b
|
||||
preMapAccumRequest step x extract = Mealy mempty $ \_ -> preMapAccumRequest' step x extract
|
||||
preMapAccumRequest step x extract = Mealy mempty emptyDiagram $ \_ -> preMapAccumRequest' step x extract
|
||||
|
||||
preMapAccumRequest' :: forall m x a b. (Serialize x, Eq x, Monad m) => (Request -> x -> a -> x) -> x -> (x -> b) -> Auto m a b
|
||||
preMapAccumRequest' f x extract = Stateful (Codec get put) (State x False) (\s req a -> pure $ step s req a)
|
||||
@@ -384,7 +400,7 @@ preMapAccumRequest' f x extract = Stateful (Codec get put) (State x False) (\s r
|
||||
step s req a = let s' = f req (state s) a in (extract (state s), State s' (dirty s || state s /= s'))
|
||||
|
||||
mapAccumRequest :: (Serialize x, Eq x) => (Request -> x -> a -> x) -> x -> (x -> b) -> Mealy eff a b
|
||||
mapAccumRequest step x extract = Mealy mempty $ \_ -> mapAccumRequest' step x extract
|
||||
mapAccumRequest step x extract = Mealy mempty emptyDiagram $ \_ -> mapAccumRequest' step x extract
|
||||
|
||||
mapAccumRequest' :: forall m x a b. (Monad m, Serialize x, Eq x) => (Request -> x -> a -> x) -> x -> (x -> b) -> Auto m a b
|
||||
mapAccumRequest' f x extract = Stateful (Codec get put) (State x False) (\s req a -> pure $ step s req a)
|
||||
@@ -478,6 +494,13 @@ whenA predicate auto = arr (\a -> if predicate a then Left a else Right ()) >>>
|
||||
filterA :: (a -> Bool) -> Mealy eff a (Either () a)
|
||||
filterA f = arr $ \a -> bool (Left ()) (Right a) (f a)
|
||||
|
||||
-- filters events through if they match the predicate
|
||||
filterEvent :: (ArrowChoice cat, Arrow cat) => (a -> Bool) -> Event a `cat` Event a
|
||||
filterEvent predicate = proc ev -> do
|
||||
case ev of
|
||||
Event a | predicate a -> id -< ev
|
||||
_ -> arr (const Tick) -< ()
|
||||
|
||||
thenA :: (ArrowChoice cat, Arrow cat) => cat a (Either b1 c) -> cat c (Either b1 b2) -> cat a (Either b1 b2)
|
||||
thenA f g = f >>> arr Left ||| g
|
||||
|
||||
@@ -486,6 +509,15 @@ thenA f g = f >>> arr Left ||| g
|
||||
|
||||
infixl 2 >>|
|
||||
|
||||
(>>||) :: (ArrowChoice cat, Arrow cat) => cat a (Event b) -> cat b c -> cat a (Event c)
|
||||
f >>|| g = proc x -> do
|
||||
e <- f -< x
|
||||
case e of
|
||||
Event e' -> g >>> arr Event -< e'
|
||||
Tick -> arr (const Tick) -< ()
|
||||
|
||||
infixr 1 >>||
|
||||
|
||||
toEvent :: Mealy eff (Either () a) (Event a)
|
||||
toEvent = arr (either (const Tick) Event)
|
||||
|
||||
@@ -600,7 +632,7 @@ requestLocalTime :: Request -> LocalTime
|
||||
requestLocalTime Request{requestTime, requestTimeZone} = utcToLocalTime requestTimeZone requestTime
|
||||
|
||||
currentTime :: Mealy eff a LocalTime
|
||||
currentTime = Mealy mempty $ \_nt -> Fun $ \req _ ->
|
||||
currentTime = Mealy mempty emptyDiagram $ \_nt -> Fun $ \req _ ->
|
||||
requestLocalTime req
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module AFRP.Diagram where
|
||||
import Data.Text (Text)
|
||||
import qualified Text.Printf as Text
|
||||
import qualified Data.Text as T
|
||||
|
||||
-- For rendering the arrows
|
||||
data DiagramF f
|
||||
= Empty
|
||||
| Step Text f -- Named step
|
||||
| Then f f -- >>>
|
||||
| Both f f -- &&&
|
||||
| Branch f f -- |||
|
||||
| Merge f f -- <>
|
||||
| Compose f f -- <*>
|
||||
|
||||
type DiagramAlgebra a = DiagramF a -> a
|
||||
type DiagramC= forall a. DiagramAlgebra a -> a
|
||||
|
||||
combineDiagram :: (forall a. a -> a -> DiagramF a) -> DiagramC -> DiagramC -> DiagramC
|
||||
combineDiagram constructor a b r = r (constructor (a r) (b r))
|
||||
|
||||
emptyDiagram :: DiagramC
|
||||
emptyDiagram r = r Empty
|
||||
|
||||
|
||||
renderF :: DiagramF (Maybe T.Text) -> Maybe T.Text
|
||||
renderF = \case
|
||||
Empty -> Nothing
|
||||
Step n x -> Just $ n <> T.pack (maybe "" (Text.printf "( %s )") x)
|
||||
Then (Just a) (Just b) -> Just $ a <> " -> " <> b
|
||||
Then (Just a) _ -> Just a
|
||||
Then _ b -> b
|
||||
Both (Just a) (Just b) -> Just $ T.pack $ Text.printf "(%s, %s)" a b
|
||||
Both (Just a) _ -> Just a
|
||||
Both _ b -> b
|
||||
Branch (Just a) (Just b) -> Just $ T.pack $ Text.printf "(%s || %s)" a b
|
||||
-- I'm leaving this here. This would be technically more correct (showing
|
||||
-- the empty branch, ie. the full if-then-else, but often we care about a
|
||||
-- more simplistic `when` style structure
|
||||
-- Branch (Just a) Nothing -> Just $ T.pack $ Text.printf "(%s || <skip>)" a
|
||||
Branch (Just a) Nothing -> Just $ T.pack $ Text.printf "%s" a
|
||||
Branch _ b -> b
|
||||
Merge (Just a) (Just b) -> Just $ T.pack $ Text.printf "(%s, %s)" a b
|
||||
Merge (Just a) _ -> Just a
|
||||
Merge _ b -> b
|
||||
Compose (Just a) (Just b) -> Just $ T.pack $ Text.printf "(%s, %s)" a b
|
||||
Compose (Just a) _ -> Just a
|
||||
Compose _ b -> b
|
||||
@@ -5,7 +5,7 @@ module HomeAssistant.Controller.Bedroom where
|
||||
|
||||
import HomeAssistant.Controller
|
||||
import qualified Data.Text as T
|
||||
import AFRP (Event (..), lMerge, duration, edge)
|
||||
import AFRP (Event (..), lMerge, duration, edge, filterEvent, named, (>>||))
|
||||
import Data.Aeson (Value, object, (.=))
|
||||
import Control.Arrow ((>>>), returnA, arr, Arrow (..))
|
||||
import Data.Bool (bool)
|
||||
@@ -69,12 +69,12 @@ bedroomPresenceController = proc x -> do
|
||||
_ <- AFRP.changes >>> traceEvent -< snap
|
||||
case p of
|
||||
Event LightingOff -> do
|
||||
callService (light bedroomLightTargets Off) -< ()
|
||||
callService "Turn off lights" (light bedroomLightTargets Off) -< ()
|
||||
Event LightingOn -> do
|
||||
callServicesDyn (\(c,xs) -> concatMap (uncurry (toLight c)) xs) -< (capped, M.toList (getSnapshot snap))
|
||||
callServicesDyn "Turn on lights (capped)" (\(c,xs) -> concatMap (uncurry (toLight c)) xs) -< (capped, M.toList (getSnapshot snap))
|
||||
returnA -< ()
|
||||
Event LightingSleep -> do
|
||||
callService (activateScene "scene.makuuhuone_lepotila") -< ()
|
||||
callService "Turn on sleep" (activateScene "scene.makuuhuone_lepotila") -< ()
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
toLight :: Bool -> T.Text -> LightObservation -> [Service]
|
||||
@@ -98,7 +98,7 @@ data BedroomControls
|
||||
|
||||
bedroomButton :: HASS (Event Value) (Event BedroomControls)
|
||||
bedroomButton = (masseButton &&& enishenButton &&& centralButton)
|
||||
>>> arr (\(a,(b,c)) -> a `lMerge` b `lMerge` c)
|
||||
>>> arr (\(a,(b,c)) -> a <> b <> c)
|
||||
where
|
||||
masseButton = fmap Masse <$> ikeaQuickButton "event.bedroom_quick_remote_masse_action"
|
||||
enishenButton = fmap Enishen <$> ikeaQuickButton "event.bedroom_quick_jemina_action"
|
||||
@@ -110,21 +110,21 @@ bedroomButtonController = proc x -> do
|
||||
-- Any event will cause the sleep mode to be turned off
|
||||
case ev of
|
||||
Event (Masse (OnButton ShortRelease)) -> do
|
||||
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||
callService "scene.makuuhuone_masse" (activateScene "scene.makuuhuone_masse") -< ()
|
||||
Event (Masse (OnButton DoubleClick)) -> do
|
||||
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||
callService "scene.makuuhuone_keski" (activateScene "scene.makuuhuone_keski") -< ()
|
||||
Event (Masse (OnButton LongClick)) -> do
|
||||
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
callService "scene.makuuhuone_kirkas" (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
Event (Masse (OffButton _)) -> do
|
||||
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||
callService "Lights off" (light [AreaId "makuuhuone"] Off) -< ()
|
||||
Event (Enishen (OnButton ShortRelease)) -> do
|
||||
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||
callService "scene.makuuhuone_jemina" (activateScene "scene.makuuhuone_jemina") -< ()
|
||||
Event (Enishen (OnButton DoubleClick)) -> do
|
||||
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||
callService "scene.makuuhuone_keski" (activateScene "scene.makuuhuone_keski") -< ()
|
||||
Event (Enishen (OnButton LongClick)) -> do
|
||||
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
callService "scene.makuuhuone_kirkas" (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||
Event (Enishen (OffButton _)) -> do
|
||||
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||
callService "Lights off" (light [AreaId "makuuhuone"] Off) -< ()
|
||||
_ -> returnA -< ()
|
||||
|
||||
|
||||
@@ -134,14 +134,16 @@ drawer = entityBool "binary_sensor.bedroom_nightstand_drawer_sensor_masse_contac
|
||||
>>> arr (fmap (bool Closed Open))
|
||||
|
||||
bedroomDrawerController :: HASS (Event Value) ()
|
||||
bedroomDrawerController = proc x -> do
|
||||
st <- drawer >>> traceEvent -< x
|
||||
case st of
|
||||
Event Open -> callService (switchService [entity] True) -< ()
|
||||
Event Closed -> callService (switchService [entity] False) -< ()
|
||||
_ -> returnA -< ()
|
||||
bedroomDrawerController =
|
||||
drawer >>>
|
||||
(named "Drawer opened" lightOn <> named "Drawer closed" lightOff)
|
||||
>>> arr (const ())
|
||||
where
|
||||
entity = EntityId "switch.bedroom_drawer_light_masse"
|
||||
lightOff = filterEvent (== Closed)
|
||||
>>|| callService "drawer light off" (switchService [entity] False)
|
||||
lightOn = filterEvent (== Open)
|
||||
>>|| callService "drawer light on" (switchService [entity] True)
|
||||
|
||||
door :: HASS (Event Value) (Event DoorState)
|
||||
door = entityBool "binary_sensor.makuuhuone_ovi_contact"
|
||||
@@ -163,8 +165,8 @@ humidifierController = proc x -> do
|
||||
case st of
|
||||
-- Turn the humidifier on when the door is closed
|
||||
-- the humidifier is low-powered, no point in losing all the humidity
|
||||
Event Open -> callService (humidifier False) -< ()
|
||||
Event Closed -> callService (humidifier True) -< ()
|
||||
Event Open -> callService "Humidifier off" (humidifier False) -< ()
|
||||
Event Closed -> callService "Humidifier on" (humidifier True) -< ()
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
humidifier state = Service
|
||||
|
||||
@@ -1,15 +1,25 @@
|
||||
{-# LANGUAGE Arrows #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE DerivingVia #-}
|
||||
module HomeAssistant.Controller.Children where
|
||||
import HomeAssistant.Controller (HASS, callService, Target (AreaId), light, LightCommand(..), ikeaQuickButton, IkeaGesture (..), IkeaButton (..), traceEvent, activateScene, LightAttributes (..), Brightness (..))
|
||||
import HomeAssistant.Controller (HASS, callService, light, LightCommand(..), ikeaQuickButton, IkeaGesture (..), IkeaButton (..), traceEvent, activateScene, LightAttributes (..), Brightness (..), entityRead, entityChangeEvent)
|
||||
import AFRP (Event (..))
|
||||
import qualified AFRP
|
||||
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)
|
||||
import Data.Aeson (Value, object, (.=))
|
||||
import Data.Default (Default(..))
|
||||
import Data.Serialize (Serialize)
|
||||
import Data.Serialize.Text ()
|
||||
import GHC.Generics (Generic)
|
||||
import HomeAssistant.Controller.Service (Service(..), Target(..))
|
||||
import Data.Aeson.Types (ToJSON (..))
|
||||
import Data.Aeson.Lens (key, _String)
|
||||
import Control.Lens ((^?), to)
|
||||
import Data.Text (Text)
|
||||
import Control.Monad (join)
|
||||
|
||||
-- Let's see building some reasonable interface for utctime
|
||||
dow :: Day -> (WeekOfYear, Int)
|
||||
@@ -75,11 +85,11 @@ schoolLightController = lightsOn <> lightsOff
|
||||
|
||||
lightsOn :: HASS a ()
|
||||
lightsOn = foldMap atTime timersOn
|
||||
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] (On def{lightBrightness=Just $ BrightnessPercent 100} )))
|
||||
>>> AFRP.onEvent (callService "Lights on" (light [AreaId "lasten_makuuhuone"] (On def{lightBrightness=Just $ BrightnessPercent 100} )))
|
||||
|
||||
lightsOff :: HASS a ()
|
||||
lightsOff = foldMap atTime timersOff
|
||||
>>> AFRP.onEvent (callService (light [AreaId "lasten_makuuhuone"] Off))
|
||||
>>> AFRP.onEvent (callService "Lights off" (light [AreaId "lasten_makuuhuone"] Off))
|
||||
|
||||
|
||||
childrenBedroomButton :: HASS (Event Value) (Event (IkeaButton IkeaGesture))
|
||||
@@ -89,8 +99,67 @@ childrenBedroomButtonController :: HASS (Event Value) ()
|
||||
childrenBedroomButtonController = proc x -> do
|
||||
ev <- childrenBedroomButton >>> 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) -< ()
|
||||
Event (OnButton ShortRelease) -> callService "scene.lasten_nukkuvalmistelu" (activateScene "scene.lasten_nukkuvalmistelu") -< ()
|
||||
Event (OnButton DoubleClick) -> callService "scene.lasten_luku" (activateScene "scene.lasten_luku") -< ()
|
||||
Event (OnButton LongClick) -> callService "scene.lasten_kirkas" (activateScene "scene.lasten_kirkas") -< ()
|
||||
Event (OffButton _) -> callService "Lights off" (light [AreaId "lasten_makuuhuone"] Off) -< ()
|
||||
_ -> returnA -< ()
|
||||
|
||||
newtype PM25 = PM25 Float
|
||||
deriving (Serialize, Eq, Ord) via Float
|
||||
deriving Show
|
||||
|
||||
data PM25Level = PM25High | PM25Low
|
||||
deriving (Eq, Generic, Show)
|
||||
|
||||
instance Serialize PM25Level
|
||||
|
||||
pm25 :: HASS (Event Value) PM25
|
||||
pm25 = fmap PM25 (entityRead "sensor.children_temp_pm25" >>> AFRP.hold 0)
|
||||
|
||||
pm25Level :: HASS PM25 PM25Level
|
||||
pm25Level = (tagHigh &&& tagLow) >>> arr (uncurry AFRP.lMerge) >>> AFRP.hold PM25Low
|
||||
where
|
||||
-- Band between 8 and 12 to avoid oscillation near the ~10 mark
|
||||
tagHigh = arr (> PM25 12) >>> AFRP.edge >>> arr (AFRP.tag PM25High)
|
||||
tagLow = arr (< PM25 8) >>> AFRP.edge >>> arr (AFRP.tag PM25Low)
|
||||
|
||||
data HumidifierAction
|
||||
= Idle
|
||||
| Humidifying
|
||||
| Other Text
|
||||
deriving (Show, Eq, Generic)
|
||||
instance Serialize HumidifierAction
|
||||
|
||||
-- what is the humidifer doing right now?
|
||||
humidifierOperatingState :: HASS (Event Value) (Event (Maybe HumidifierAction))
|
||||
humidifierOperatingState = entityChangeEvent "humidifier.lapset_ilmankostutin"
|
||||
>>> arr (fmap entityAction)
|
||||
where
|
||||
entityAction v = v ^? key "event" . key "variables" . key "trigger" . key "to_state" . key "attributes" . key "action" . _String . to humidifierAction
|
||||
humidifierAction = \case
|
||||
"idle" -> Idle
|
||||
"humidifying" -> Humidifying
|
||||
other -> Other other
|
||||
|
||||
-- TODO: There's some other percentages elsewhere that could be replaced with this
|
||||
newtype Percentage = Percentage Int
|
||||
instance ToJSON Percentage where
|
||||
toJSON (Percentage p) = object ["percentage" .= p]
|
||||
|
||||
childrenAirFilterController :: HASS (Event Value) ()
|
||||
childrenAirFilterController = proc ev -> do
|
||||
level <- pm25 >>> pm25Level >>> AFRP.changes >>> traceEvent -< ev
|
||||
humidifier <- humidifierOperatingState >>> AFRP.holdKnown >>> arr join -< ev
|
||||
case level of
|
||||
Event PM25High ->
|
||||
AFRP.whenA (== Just Idle) (callService "Fan strong" (fanOnTo (Percentage 80))) -< humidifier
|
||||
Event PM25Low -> callService "Fan low" (fanOnTo (Percentage 20)) -< ()
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
fanOnTo percentage = Service
|
||||
{ serviceDomain = "fan"
|
||||
, serviceName = "set_percentage"
|
||||
, serviceTarget = [EntityId "fan.children_fan"]
|
||||
, serviceData = Just $ toJSON percentage
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
{-# LANGUAGE Arrows #-}
|
||||
{-# LANGUAGE GADTs #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module HomeAssistant.Controller.Effect
|
||||
( HASSEff(..)
|
||||
@@ -13,9 +14,10 @@ module HomeAssistant.Controller.Effect
|
||||
, traceValue
|
||||
) where
|
||||
|
||||
import AFRP (Mealy, eff, Event (..), Request)
|
||||
import AFRP (Mealy, eff, Event (..), Request, named)
|
||||
import Control.Arrow (returnA)
|
||||
import HomeAssistant.Controller.Service (Service)
|
||||
import HomeAssistant.Controller.Service (Service (..))
|
||||
import qualified Data.Text as T
|
||||
|
||||
data HASSEff a where
|
||||
CallService :: Request -> Service -> HASSEff ()
|
||||
@@ -25,17 +27,20 @@ data HASSEff a where
|
||||
|
||||
type HASS a b = Mealy HASSEff a b
|
||||
|
||||
callService :: Service -> HASS a ()
|
||||
callService service = eff (\req _ -> CallService req service)
|
||||
serviceLabel :: T.Text -> HASS a b -> HASS a b
|
||||
serviceLabel lbl = named ("Service: " <> lbl)
|
||||
|
||||
callServices :: [Service] -> HASS a ()
|
||||
callServices service = eff (\req _ -> CallServices req service)
|
||||
callService :: T.Text -> Service -> HASS a ()
|
||||
callService lbl service = serviceLabel lbl $ eff (\req _ -> CallService req service)
|
||||
|
||||
callServiceDyn :: (a -> Service) -> HASS a ()
|
||||
callServiceDyn mkService = eff (\req a -> CallService req (mkService a))
|
||||
callServices :: T.Text -> [Service] -> HASS a ()
|
||||
callServices lbl service = serviceLabel lbl $ eff (\req _ -> CallServices req service)
|
||||
|
||||
callServicesDyn :: (a -> [Service]) -> HASS a ()
|
||||
callServicesDyn mkService = eff (\req a -> CallServices req (mkService a))
|
||||
callServiceDyn :: T.Text -> (a -> Service) -> HASS a ()
|
||||
callServiceDyn lbl mkService = serviceLabel lbl $ eff (\req a -> CallService req (mkService a))
|
||||
|
||||
callServicesDyn :: T.Text -> (a -> [Service]) -> HASS a ()
|
||||
callServicesDyn lbl mkService = serviceLabel lbl $ eff (\req a -> CallServices req (mkService a))
|
||||
|
||||
debug :: Show a => HASS a a
|
||||
debug = proc x -> do
|
||||
|
||||
@@ -10,7 +10,7 @@ module HomeAssistant.Controller.Entity
|
||||
, entityBool'
|
||||
) where
|
||||
|
||||
import AFRP (Mealy (..), Event, events, filterA, (>>|), toEvent)
|
||||
import AFRP (Mealy (..), Event, events, filterA, (>>|), toEvent, named)
|
||||
import Control.Arrow (arr)
|
||||
import Control.Category ((>>>))
|
||||
import Data.Aeson (Value)
|
||||
@@ -19,12 +19,13 @@ import qualified Data.Text as T
|
||||
import qualified Data.Set as S
|
||||
import Control.Lens (has, only, (^?), to)
|
||||
import qualified Data.Text.Lens as TL
|
||||
import AFRP.Diagram (emptyDiagram)
|
||||
|
||||
entityChangeEvent :: T.Text -> Mealy eff (Event Value) (Event Value)
|
||||
entityChangeEvent entityId = entityChangeEvent' entityId >>> toEvent
|
||||
|
||||
entityChangeEvent' :: T.Text -> Mealy eff (Event Value) (Either () Value)
|
||||
entityChangeEvent' entityId = Mealy (S.singleton entityId) $ runMealy (events >>| filterA isEntity)
|
||||
entityChangeEvent' entityId = named entityId $ Mealy (S.singleton entityId) emptyDiagram $ runMealy (events >>| filterA isEntity)
|
||||
where
|
||||
isEntity :: Value -> Bool
|
||||
isEntity = has (key "event" . key "variables" . key "trigger" . key "entity_id" . _String . only entityId)
|
||||
|
||||
@@ -24,8 +24,8 @@ hallwayLightsController = proc x -> do
|
||||
traceEvent -< ev
|
||||
case ev of
|
||||
-- The lights entity is a "group of lights" in hass
|
||||
Event LightingOn | lightsAllowed now -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< On def
|
||||
Event LightingOff -> callServiceDyn (light [EntityId "light.hallway_lights"]) -< Off
|
||||
Event LightingOn | lightsAllowed now -> callServiceDyn "Lights on" (light [EntityId "light.hallway_lights"]) -< On def
|
||||
Event LightingOff -> callServiceDyn "Lights off" (light [EntityId "light.hallway_lights"]) -< Off
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0)
|
||||
@@ -2,7 +2,7 @@
|
||||
{-# LANGUAGE Arrows #-}
|
||||
module HomeAssistant.Controller.Kitchen where
|
||||
import HomeAssistant.Controller
|
||||
import AFRP (Event (..))
|
||||
import AFRP (Event (..), (>>||))
|
||||
import qualified AFRP
|
||||
import Data.Aeson (Value)
|
||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||
@@ -23,8 +23,8 @@ kitchenCeilingController = proc x -> do
|
||||
ev <- lightingModeEvents -< p
|
||||
traceEvent -< ev
|
||||
case ev of
|
||||
Event LightingOn | lightsAllowed now -> callServiceDyn (light [EntityId "light.kitchen_ceiling"]) -< On def
|
||||
Event LightingOff -> callServiceDyn (light [EntityId "light.kitchen_ceiling"]) -< Off
|
||||
Event LightingOn | lightsAllowed now -> callServiceDyn "light.kitchen_ceiling on" (light [EntityId "light.kitchen_ceiling"]) -< On def
|
||||
Event LightingOff -> callServiceDyn "light.kitchen_ceiling off" (light [EntityId "light.kitchen_ceiling"]) -< Off
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0)
|
||||
@@ -36,44 +36,39 @@ dinnerLightLevel = entityRead "sensor.sijainti_keittio_light_level" >>> AFRP.hol
|
||||
dinnerPresence :: HASS (Event Value) Presence
|
||||
dinnerPresence = presence "binary_sensor.sijainti_keittio_occupancy" >>> AFRP.hold Unoccupied
|
||||
|
||||
dinnerLightEvents :: HASS (Event Value) (Event LightingMode)
|
||||
dinnerLightEvents =
|
||||
|
||||
dinnerTableController :: HASS (Event Value) ()
|
||||
dinnerTableController =
|
||||
((,) <$> dinnerLightLevel <*> dinnerPresence)
|
||||
>>> arr lightWanted
|
||||
>>> (sleepEvent &&& offEvent &&& onEvent)
|
||||
>>> arr (\(s, (o, n)) -> s `AFRP.lMerge` o `AFRP.lMerge` n)
|
||||
-- These are done "in parallel", there is a chance that two services are called in one go
|
||||
>>> mconcat
|
||||
[ AFRP.named "Lights on" lightsOn
|
||||
, AFRP.named "Lights sleep" lightsSleep
|
||||
, AFRP.named "Lights off" lightsOff ]
|
||||
>>> arr (const ()) -- I don't like this extra arr here
|
||||
where
|
||||
lightWanted (lightLevel, occ) = occ == Occupied && lightLevel < 13
|
||||
|
||||
onEvent =
|
||||
lightsOn =
|
||||
AFRP.edge
|
||||
>>> arr (fmap (const LightingOn))
|
||||
>>|| sleep "sleep off" False
|
||||
>>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] $ On def)
|
||||
|
||||
sleepEvent =
|
||||
lightsSleep =
|
||||
arr not
|
||||
>>> AFRP.edge
|
||||
>>> arr (fmap (const LightingSleep))
|
||||
>>|| sleep "sleep on" True
|
||||
|
||||
offEvent =
|
||||
lightsOff =
|
||||
arr not
|
||||
>>> AFRP.waitFor 300
|
||||
>>> arr (fmap (const LightingOff))
|
||||
>>|| sleep "sleep off" False
|
||||
>>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] Off)
|
||||
|
||||
|
||||
sleep lbl b = callService lbl (switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] b)
|
||||
|
||||
dinnerTableController :: HASS (Event Value) ()
|
||||
dinnerTableController = proc x -> do
|
||||
ev <- dinnerLightEvents -< x
|
||||
case ev of
|
||||
Event LightingOn -> do
|
||||
sleep -< False
|
||||
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< On def
|
||||
Event LightingOff -> do
|
||||
sleep -< False
|
||||
callServiceDyn (light [EntityId "light.kitchen_dining_large"]) -< Off
|
||||
Event LightingSleep -> do
|
||||
sleep -< True
|
||||
_ -> returnA -< ()
|
||||
where
|
||||
sleep = callServiceDyn (switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"])
|
||||
|
||||
kitchenMotionController :: HASS (Event Value) ()
|
||||
kitchenMotionController = kitchenCeilingController <> dinnerTableController
|
||||
@@ -39,8 +39,8 @@ livingroomPresenceController = proc x -> do
|
||||
ev <- lightingModeEvents . livingroomPresence -< x
|
||||
traceEvent -< ev
|
||||
case ev of
|
||||
AFRP.Event LightingOn -> callServiceDyn (light livingroomLightTargets) -< On def
|
||||
AFRP.Event LightingOff -> callServiceDyn (light livingroomLightTargets) -< Off
|
||||
AFRP.Event LightingOn -> callServiceDyn "Lights on" (light livingroomLightTargets) -< On def
|
||||
AFRP.Event LightingOff -> callServiceDyn "Lights off" (light livingroomLightTargets) -< Off
|
||||
_ -> returnA -< ()
|
||||
returnA -< ()
|
||||
|
||||
@@ -88,6 +88,6 @@ livingroomPlantLights = (season &&& tod)
|
||||
where
|
||||
setLights = proc mode -> do
|
||||
case mode of
|
||||
AFRP.Event Growth -> callService (activateScene "scene.olohuoneen_kasvivalo") -< ()
|
||||
AFRP.Event Ambience -> callService (activateScene "scene.kasvivalo_iltatila") -< ()
|
||||
AFRP.Event Growth -> callService "scene.olohuoneen_kasvivalo" (activateScene "scene.olohuoneen_kasvivalo") -< ()
|
||||
AFRP.Event Ambience -> callService "scene.kasvivalo_iltatila" (activateScene "scene.kasvivalo_iltatila") -< ()
|
||||
_ -> returnA -< ()
|
||||
@@ -28,7 +28,7 @@ import Data.Void (Void)
|
||||
import GHC.Stack (HasCallStack)
|
||||
import HomeAssistant.Controller (HASS, HASSEff (..))
|
||||
import HomeAssistant.Controller.Bedroom (bedroomButtonController, bedroomDrawerController, bedroomPresenceController, humidifierController)
|
||||
import HomeAssistant.Controller.Children (childrenBedroomButtonController, schoolLightController)
|
||||
import HomeAssistant.Controller.Children (childrenBedroomButtonController, schoolLightController, childrenAirFilterController)
|
||||
import HomeAssistant.Controller.Hallway (hallwayLightsController)
|
||||
import HomeAssistant.Controller.Kitchen (kitchenMotionController)
|
||||
import HomeAssistant.Controller.Livingroom (livingroomPlantLights, livingroomPresenceController)
|
||||
@@ -48,6 +48,7 @@ import Text.Read (readMaybe)
|
||||
import UnliftIO.Async
|
||||
import Control.Monad.Catch (MonadCatch)
|
||||
import Control.Exception.Annotated (checkpoint, Annotation (..))
|
||||
import AFRP.Diagram (renderF)
|
||||
|
||||
step :: (MonadIO m) => FilePath -> T.Text -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
||||
step path name trace st a = do
|
||||
@@ -69,7 +70,8 @@ controllers =
|
||||
Controller "livingroom-presence" livingroomPresenceController,
|
||||
Controller "hallway-motion-controller" hallwayLightsController,
|
||||
Controller "children-button" childrenBedroomButtonController,
|
||||
Controller "livingroom-plants" livingroomPlantLights
|
||||
Controller "livingroom-plants" livingroomPlantLights,
|
||||
Controller "children-filter" childrenAirFilterController
|
||||
]
|
||||
|
||||
-- | Steps the machine for every inbound message; service calls go to the
|
||||
@@ -121,6 +123,8 @@ defaultMain =
|
||||
rrdtool <- fromMaybe "rrdtool" <$> liftIO (lookupEnv "HA_RRDTOOL")
|
||||
metricsPort <- lookupPort
|
||||
writerLimiter <- slidingWindowLimiter rateLimitMetrics 10 20
|
||||
forM_ controllers $ \(Controller n m) ->
|
||||
logLocM InfoS $ ls $ n <> ": " <> fromMaybe "" (runDiagramC m renderF)
|
||||
let ents = foldMap (\(Controller _ m) -> entities m) controllers
|
||||
workers =
|
||||
[ ("reader", readerAction host 8123 token ents bus),
|
||||
|
||||
@@ -13,6 +13,7 @@ module HomeAssistant.Runtime.Graphing
|
||||
, readProcessBytes
|
||||
, Graph(..)
|
||||
, renderGraph
|
||||
, rangeSuffix
|
||||
) where
|
||||
|
||||
import Control.Exception (evaluate)
|
||||
|
||||
+173
-18
@@ -7,71 +7,225 @@ 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, JSON, ReqBody, Put)
|
||||
import Servant.API ((:>), Capture, Get, QueryParam, (:-), MimeRender (..), Accept (..), NamedRoutes, JSON, ReqBody, Put, Post, FormUrlEncoded, Header)
|
||||
import Data.ByteString (ByteString)
|
||||
import GHC.Generics (Generic)
|
||||
import Servant (Handler, err404)
|
||||
import Servant (Handler, err404, fieldLink, toUrlPiece)
|
||||
import Control.Monad.Catch (throwM, catch, MonadCatch, MonadThrow, SomeException)
|
||||
import Servant.Server (err500, ServerT)
|
||||
import Data.Maybe (fromMaybe)
|
||||
import Data.Map.Strict (Map)
|
||||
import qualified Data.Set as S
|
||||
import Data.Text (Text)
|
||||
import HomeAssistant.Runtime.Flags (Flags, allFlags, setEnabled, validNames)
|
||||
import HomeAssistant.Runtime.Flags (Flags, allFlags, setEnabled, validNames, isEnabled)
|
||||
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)
|
||||
import HomeAssistant.Runtime.Graphing (Graph (..), Range (..), lookupGraph, graphs, renderGraph, rangeSuffix)
|
||||
import Katip (KatipContextT, Katip, runKatipContextT, LogEnv, KatipContext, ls, Severity (..), logFM, katipAddContext, sl)
|
||||
import Data.Aeson (ToJSON (toJSON), FromJSON, object, (.=))
|
||||
import Lucid (ToHtml, toHtml, renderBS, toHtmlRaw, HtmlT, Attributes)
|
||||
import qualified Lucid.Html5 as H5
|
||||
import qualified Data.Map.Strict as M
|
||||
import Data.Foldable (for_)
|
||||
import qualified Data.Text as T
|
||||
import Web.FormUrlEncoded (FromForm, fromForm, parseUnique)
|
||||
import Lucid.Base (makeAttributes)
|
||||
import Data.Aeson.Key (fromText)
|
||||
|
||||
data ImagePng
|
||||
|
||||
instance MimeRender ImagePng ByteString where
|
||||
mimeRender _ = BS.fromStrict
|
||||
instance MimeRender ImagePng GraphPng where
|
||||
mimeRender _ (GraphPng bs) = BS.fromStrict bs
|
||||
|
||||
instance Accept ImagePng where
|
||||
contentType _ = "image" // "png"
|
||||
|
||||
-- `servant-lucid` package would provide this and the instance for the original lucid(1) package
|
||||
-- but we have lucid2
|
||||
data HTML
|
||||
|
||||
instance Accept HTML where
|
||||
contentType _ = "text" // "html"
|
||||
|
||||
instance ToHtml a => MimeRender HTML a where
|
||||
mimeRender _ = renderBS . toHtml
|
||||
|
||||
newtype StatsPage = StatsPage (forall m. Monad m => HtmlT m ())
|
||||
|
||||
instance ToHtml StatsPage where
|
||||
toHtml (StatsPage inner) = inner
|
||||
toHtmlRaw = toHtml
|
||||
|
||||
page_ :: Monad m => HtmlT m () -> HtmlT m ()
|
||||
page_ inner = H5.doctypehtml_ $ do
|
||||
H5.head_ $ do
|
||||
H5.script_
|
||||
[ H5.src_ "https://cdn.jsdelivr.net/npm/htmx.org@2.0.11/dist/htmx.min.js"
|
||||
, H5.integrity_ "sha384-2OatzQy1H+Zd/IIrjr1TcuDGqLXeHhbooAyJY1KdQMKnr4LZ22k31GBLdYKHmVjg"
|
||||
, H5.crossorigin_ "anonymous"
|
||||
]
|
||||
("" :: Text)
|
||||
H5.style_ css
|
||||
H5.body_ inner
|
||||
|
||||
css :: Text
|
||||
css = T.unlines
|
||||
[ "body { font-family: system-ui, sans-serif; margin: 1rem auto; max-width: 40rem; padding: 0 1rem; }"
|
||||
, "table { border-collapse: collapse; }"
|
||||
, "th, td { padding: 0.4rem 0.75rem; border-bottom: 1px solid #ddd; text-align: left; }"
|
||||
, "input[type=submit] { padding: 0.25rem 0.75rem; cursor: pointer; }"
|
||||
, "img { max-width: 100%; }"
|
||||
]
|
||||
|
||||
|
||||
type HxRequest = Header "HX-Request" Bool
|
||||
|
||||
data API mode = API
|
||||
{ getMetrics :: mode :- "metrics" :> Capture "graph" Graph :> QueryParam "range" Range :> Get '[ImagePng] ByteString
|
||||
, getFlags :: mode :- "flags" :> Get '[JSON] (Map Text Bool)
|
||||
, putFlag :: mode :- "flags" :> Capture "name" Text :> ReqBody '[JSON] Bool :> Put '[JSON] (Map Text Bool)
|
||||
{ getMetrics :: mode :- "metrics" :> Capture "graph" Graph :> QueryParam "range" Range :> Get '[ImagePng] GraphPng
|
||||
, getStats :: mode :- "stats" :> HxRequest :> QueryParam "range" Range :> Get '[HTML] StatsPage
|
||||
, getFlags :: mode :- "flags" :> Get '[JSON, HTML] FlagsResponse
|
||||
, putFlag :: mode :- "flags" :> Capture "name" Text :> ReqBody '[JSON, FormUrlEncoded] FlagValue :> Put '[HTML, JSON] FlagResponse
|
||||
, postFlag :: mode :- "flags" :> Capture "name" Text :> ReqBody '[JSON, FormUrlEncoded] FlagValue :> Post '[JSON, HTML] FlagResponse
|
||||
}
|
||||
deriving Generic
|
||||
|
||||
newtype GraphPng = GraphPng ByteString
|
||||
|
||||
getFlagsHandler :: Flags -> LoggingHandler (Map Text Bool)
|
||||
getFlagsHandler = allFlags
|
||||
newtype FlagValue = FlagValue Bool
|
||||
deriving FromJSON via Bool
|
||||
|
||||
putFlagHandler :: Flags -> Text -> Bool -> LoggingHandler (Map Text Bool)
|
||||
putFlagHandler flags name val
|
||||
instance FromForm FlagValue where
|
||||
fromForm f = FlagValue <$> parseUnique "flag-value" f
|
||||
|
||||
newtype FlagsResponse = FlagsResponse (Map Text Bool)
|
||||
deriving (ToJSON) via (Map Text Bool)
|
||||
|
||||
data FlagResponse = FlagResponse Text Bool
|
||||
|
||||
instance ToHtml FlagResponse where
|
||||
toHtml (FlagResponse name value) = flagRow name value
|
||||
toHtmlRaw = toHtml
|
||||
|
||||
instance ToJSON FlagResponse where
|
||||
toJSON (FlagResponse k v) = object [fromText k .= v]
|
||||
|
||||
flagsPage :: Monad m => FlagsResponse -> HtmlT m ()
|
||||
flagsPage (FlagsResponse f) = page_ $
|
||||
H5.table_ $ do
|
||||
H5.tr_ $ do
|
||||
H5.th_ "Name"
|
||||
H5.th_ "Value"
|
||||
H5.th_ ""
|
||||
for_ (M.toList f) $ uncurry flagRow
|
||||
|
||||
flagRow :: Monad m => Text -> Bool -> HtmlT m ()
|
||||
flagRow name value = H5.tr_ [H5.id_ (rowId name)] $ do
|
||||
H5.td_ (toHtml name)
|
||||
H5.td_ (toHtml (if value then "on" else "off" :: Text))
|
||||
H5.td_ (toggle name value)
|
||||
where
|
||||
toggle :: Monad m => Text -> Bool -> HtmlT m ()
|
||||
toggle key current = H5.form_ [H5.method_ "post", H5.action_ (postFlagsLink key)] $ do
|
||||
H5.input_ [H5.name_ "flag-value", H5.type_ "hidden", H5.value_ (T.pack (show (not current)))]
|
||||
H5.input_
|
||||
[ H5.type_ "submit"
|
||||
, H5.value_ (if current then "Disable" else "Enable")
|
||||
, hxTrigger "click"
|
||||
, hxTarget ("#" <> rowId key)
|
||||
, hxPut (postFlagsLink key)
|
||||
, hxSwap "outerHTML"
|
||||
]
|
||||
postFlagsLink k = "/" <> toUrlPiece (fieldLink putFlag k)
|
||||
|
||||
rowId :: Text -> Text
|
||||
rowId = ("status-" <>)
|
||||
|
||||
hxTrigger :: Text -> Attributes
|
||||
hxTrigger = makeAttributes "hx-trigger"
|
||||
|
||||
hxTarget :: Text -> Attributes
|
||||
hxTarget = makeAttributes "hx-target"
|
||||
|
||||
hxPut :: Text -> Attributes
|
||||
hxPut = makeAttributes "hx-put"
|
||||
|
||||
hxGet :: Text -> Attributes
|
||||
hxGet = makeAttributes "hx-get"
|
||||
|
||||
hxPushUrl :: Text -> Attributes
|
||||
hxPushUrl = makeAttributes "hx-push-url"
|
||||
|
||||
hxSwap :: Text -> Attributes
|
||||
hxSwap = makeAttributes "hx-swap"
|
||||
|
||||
instance ToHtml FlagsResponse where
|
||||
toHtml = flagsPage
|
||||
toHtmlRaw = toHtml
|
||||
|
||||
getFlagsHandler :: Flags -> LoggingHandler FlagsResponse
|
||||
getFlagsHandler = fmap FlagsResponse . allFlags
|
||||
|
||||
putFlagHandler :: Flags -> Text -> FlagValue -> LoggingHandler FlagResponse
|
||||
putFlagHandler flags name (FlagValue val)
|
||||
| name `S.notMember` validNames flags = throwM err404
|
||||
| otherwise = do
|
||||
| otherwise = checkpoint (Annotation (name, val)) $ katipAddContext (sl "flag" (name, val)) $ do
|
||||
setEnabled flags name val `catch` \e -> do
|
||||
logFM ErrorS (ls ("failed to persist handler flag: " <> show (e :: SomeException)))
|
||||
throwM err500
|
||||
allFlags flags
|
||||
FlagResponse name <$> isEnabled flags name
|
||||
|
||||
|
||||
getMetricsHandler :: FilePath -> FilePath -> Graph -> Maybe Range -> LoggingHandler ByteString
|
||||
getMetricsHandler :: FilePath -> FilePath -> Graph -> Maybe Range -> LoggingHandler GraphPng
|
||||
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
|
||||
either (\e -> logFM ErrorS (ls e) >> throwM err500) (pure . GraphPng) g
|
||||
|
||||
-- server :: FilePath -> FilePath -> API AsServer
|
||||
server :: FilePath -> FilePath -> Flags -> ServerT (NamedRoutes API) LoggingHandler
|
||||
server rrdPath rrdtool flags = API
|
||||
{ getMetrics = getMetricsHandler rrdPath rrdtool
|
||||
, getStats = getStatsHandler
|
||||
, getFlags = getFlagsHandler flags
|
||||
, putFlag = putFlagHandler flags
|
||||
, postFlag = putFlagHandler flags -- This exists only for html forms
|
||||
}
|
||||
|
||||
statsPage :: Maybe Bool -> Maybe Range -> StatsPage
|
||||
statsPage hx r = StatsPage $
|
||||
if hx == Just True
|
||||
then statsContent r
|
||||
else page_ (statsContent r)
|
||||
|
||||
statsContent :: Monad m => Maybe Range -> HtmlT m ()
|
||||
statsContent r = H5.div_ [H5.id_ "stats"] $ do
|
||||
H5.ul_ $ for_ [minBound..maxBound] $ \range ->
|
||||
H5.li_ $ H5.a_ (link range) $ toHtml $ rangeSuffix range
|
||||
H5.h2_ "Traffic"
|
||||
H5.img_ [H5.src_ (src Traffic)]
|
||||
H5.h2_ "Memory"
|
||||
H5.img_ [H5.src_ (src Memory)]
|
||||
H5.h2_ "Ratelimit"
|
||||
H5.img_ [H5.src_ (src RateLimit)]
|
||||
where
|
||||
src m = "/" <> toUrlPiece (fieldLink getMetrics m r)
|
||||
link range =
|
||||
let url = "/" <> toUrlPiece (fieldLink getStats (Just range))
|
||||
in [ H5.href_ url
|
||||
, hxGet url
|
||||
, hxTarget "#stats"
|
||||
, hxSwap "outerHTML"
|
||||
, hxPushUrl "true"
|
||||
]
|
||||
|
||||
getStatsHandler :: Maybe Bool -> Maybe Range -> LoggingHandler StatsPage
|
||||
getStatsHandler hx r = pure (statsPage hx r)
|
||||
|
||||
servantApp :: LogEnv -> FilePath -> FilePath -> Flags -> Application
|
||||
servantApp le rrdPath rrdtool flags = genericServeT (toHandler le) (server rrdPath rrdtool flags)
|
||||
|
||||
@@ -85,3 +239,4 @@ toHandler :: LogEnv -> (forall a. LoggingHandler a -> Handler a)
|
||||
toHandler le (LoggingHandler k) = runKatipContextT le () "http" k
|
||||
|
||||
|
||||
|
||||
+3
-2
@@ -20,6 +20,7 @@ import qualified Hedgehog.Range as Range
|
||||
import Test.Hspec
|
||||
import Test.Hspec.Hedgehog
|
||||
import Data.Maybe (listToMaybe)
|
||||
import AFRP.Diagram (emptyDiagram)
|
||||
|
||||
fakeRequest :: Request
|
||||
fakeRequest = Request (sec 0) utc nil "test"
|
||||
@@ -536,11 +537,11 @@ sampleSpec = describe "sample" $ do
|
||||
|
||||
-- | A stateless arrow carrying a fixed entity set, for testing propagation.
|
||||
subscribed :: S.Set T.Text -> Mealy Identity Int Int
|
||||
subscribed ents = Mealy ents $ \_ -> Fun $ \_ a -> a
|
||||
subscribed ents = Mealy ents emptyDiagram $ \_ -> Fun $ \_ a -> a
|
||||
|
||||
-- | Same as 'subscribed' but yields a function, for testing '<*>'.
|
||||
subscribedF :: S.Set T.Text -> Mealy Identity Int (Int -> Int)
|
||||
subscribedF ents = Mealy ents $ \_ -> Fun $ \_ a -> (a +)
|
||||
subscribedF ents = Mealy ents emptyDiagram $ \_ -> Fun $ \_ a -> (a +)
|
||||
|
||||
entitiesSpec :: Spec
|
||||
entitiesSpec = describe "entities" $ do
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module HttpServerSpec (spec) where
|
||||
|
||||
import qualified Data.Map.Strict as M
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import Data.Text.Lazy.Encoding (decodeUtf8)
|
||||
import qualified Data.Text.Lazy as TL
|
||||
import Lucid (Html, renderBS, toHtml)
|
||||
import Test.Hspec
|
||||
|
||||
import HomeAssistant.Runtime.Graphing (Range (..))
|
||||
import HttpServer
|
||||
|
||||
render :: Html () -> String
|
||||
render = TL.unpack . decodeUtf8 . renderBS
|
||||
|
||||
spec :: Spec
|
||||
spec = describe "HttpServer" $ do
|
||||
describe "flagRow" $ do
|
||||
it "renders the whole row so htmx can outerHTML-swap it" $
|
||||
render (flagRow "tea" True) `shouldContain` "<tr id=\"status-tea\">"
|
||||
|
||||
it "requests an outerHTML swap (htmx casing)" $
|
||||
render (flagRow "tea" True) `shouldContain` "hx-swap=\"outerHTML\""
|
||||
|
||||
it "displays on with a Disable button when enabled" $ do
|
||||
let html = render (flagRow "tea" True)
|
||||
html `shouldContain` "<td>on</td>"
|
||||
html `shouldContain` "value=\"Disable\""
|
||||
|
||||
it "displays off with an Enable button when disabled" $ do
|
||||
let html = render (flagRow "tea" False)
|
||||
html `shouldContain` "<td>off</td>"
|
||||
html `shouldContain` "value=\"Enable\""
|
||||
|
||||
describe "flagsPage" $ do
|
||||
let page = flagsPage (FlagsResponse (M.fromList [("tea" :: Text, True)]))
|
||||
it "uses the shared page shell with a style block" $
|
||||
render page `shouldContain` "<style"
|
||||
|
||||
it "has a header row" $ do
|
||||
let html = render page
|
||||
html `shouldContain` "<th>Name</th>"
|
||||
html `shouldContain` "<th>Value</th>"
|
||||
|
||||
it "carries each row id exactly once" $
|
||||
T.count "id=\"status-tea\"" (T.pack (render page)) `shouldBe` 1
|
||||
|
||||
describe "statsPage" $ do
|
||||
it "uses the shared page shell with a style block (full page)" $
|
||||
render (toHtml (statsPage Nothing Nothing)) `shouldContain` "<style"
|
||||
|
||||
it "serves a bare fragment for htmx requests" $ do
|
||||
let html = render (toHtml (statsPage (Just True) (Just OneDay)))
|
||||
html `shouldNotContain` "DOCTYPE"
|
||||
html `shouldContain` "<div id=\"stats\">"
|
||||
|
||||
it "range links swap the stats fragment in place" $ do
|
||||
let html = render (toHtml (statsPage Nothing (Just OneDay)))
|
||||
html `shouldContain` "hx-get=\"/stats?range=24h\""
|
||||
html `shouldContain` "hx-target=\"#stats\""
|
||||
html `shouldContain` "hx-push-url=\"true\""
|
||||
+9
-2
@@ -11,6 +11,7 @@ import HomeAssistant.Controller.Kitchen
|
||||
import Support
|
||||
import Test.Hspec
|
||||
import Data.Default (def)
|
||||
import Data.Time (getCurrentTime, addUTCTime)
|
||||
|
||||
-- Helper functions for creating test events
|
||||
testDinnerLightLevel :: Int -> Event Value
|
||||
@@ -37,9 +38,15 @@ dinnerTableSpec = describe "dinnerTableController" $ do
|
||||
services (runHASS dinnerTableController [testDinnerLightLevel 10, testDinnerPresence "on"])
|
||||
`shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] False, light [EntityId "light.kitchen_dining_large"] (On def)]]
|
||||
|
||||
it "turns lights off when presence is unoccupied" $ do
|
||||
services (runHASS dinnerTableController [testDinnerLightLevel 10, testDinnerPresence "off"])
|
||||
it "turns lights to sleep when presence is unoccupied" $ do
|
||||
now <- getCurrentTime
|
||||
services (runHASSTimed dinnerTableController [(now, testDinnerLightLevel 10), (now, testDinnerPresence "off")])
|
||||
`shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], []]
|
||||
it "turns lights off when no presence for 300 seconds" $ do
|
||||
now <- getCurrentTime
|
||||
let later = 305 `addUTCTime` now
|
||||
services (runHASSTimed dinnerTableController [(now, testDinnerLightLevel 10), (now, testDinnerPresence "off"), (later, Tick)])
|
||||
`shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], [], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] False, light [EntityId "light.kitchen_dining_large"] Off]]
|
||||
|
||||
it "does nothing on Tick" $ do
|
||||
services (runHASS dinnerTableController [Tick])
|
||||
|
||||
@@ -8,6 +8,7 @@ import qualified BusSpec
|
||||
import qualified ConnectionSpec
|
||||
import qualified FlagsSpec
|
||||
import qualified GraphingSpec
|
||||
import qualified HttpServerSpec
|
||||
import qualified KitchenSpec
|
||||
import qualified LivingroomSpec
|
||||
import qualified MetricsSpec
|
||||
@@ -23,6 +24,7 @@ main = hspec $ do
|
||||
ConnectionSpec.spec
|
||||
FlagsSpec.spec
|
||||
GraphingSpec.spec
|
||||
HttpServerSpec.spec
|
||||
KitchenSpec.spec
|
||||
LivingroomSpec.spec
|
||||
MetricsSpec.spec
|
||||
|
||||
Reference in new issue
Block a user