Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6f785662b | ||
|
|
5d16bf4ade | ||
|
|
05bd609c7e | ||
|
|
9c47bbcb42 | ||
|
|
6063aafe8b | ||
|
|
fafc7111bb | ||
|
|
69cac934ec |
No files matched your search
+8
-6
@@ -1,8 +1,9 @@
|
|||||||
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
{ mkDerivation, aeson, annotated-exception, async, base, bytestring
|
||||||
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
, cereal, cereal-conduit, conduit, containers, directory, ekg-core
|
||||||
, filepath, hedgehog, hspec, hspec-hedgehog, http-types, katip
|
, exceptions, filepath, hedgehog, hspec, hspec-hedgehog, http-types
|
||||||
, lens, lens-aeson, lib, network, process, retry, scotty, stm, text
|
, katip, lens, lens-aeson, lib, network, process, retry, scotty
|
||||||
, time, unordered-containers, uuid, wai, warp, websockets
|
, servant, servant-server, stm, text, time, unliftio
|
||||||
|
, unordered-containers, uuid, wai, warp, websockets
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "home-assistant-controller";
|
pname = "home-assistant-controller";
|
||||||
@@ -12,9 +13,10 @@ mkDerivation {
|
|||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
libraryHaskellDepends = [
|
libraryHaskellDepends = [
|
||||||
aeson annotated-exception async base bytestring cereal
|
aeson annotated-exception async base bytestring cereal
|
||||||
cereal-conduit conduit containers directory ekg-core filepath
|
cereal-conduit conduit containers directory ekg-core exceptions
|
||||||
http-types katip lens lens-aeson network process retry scotty stm
|
filepath http-types katip lens lens-aeson network process retry
|
||||||
text time unordered-containers uuid wai warp websockets
|
scotty servant servant-server stm text time unliftio
|
||||||
|
unordered-containers uuid wai warp websockets
|
||||||
];
|
];
|
||||||
executableHaskellDepends = [ base ];
|
executableHaskellDepends = [ base ];
|
||||||
testHaskellDepends = [
|
testHaskellDepends = [
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ library
|
|||||||
, HomeAssistant.Runtime.Metrics
|
, HomeAssistant.Runtime.Metrics
|
||||||
, HomeAssistant.Runtime.Supervisor
|
, HomeAssistant.Runtime.Supervisor
|
||||||
, HomeAssistant.Runtime.RateLimit
|
, HomeAssistant.Runtime.RateLimit
|
||||||
|
, HttpServer
|
||||||
|
|
||||||
-- Modules included in this library but not exported.
|
-- Modules included in this library but not exported.
|
||||||
-- other-modules:
|
-- other-modules:
|
||||||
@@ -84,6 +85,7 @@ library
|
|||||||
-- Other library packages from which modules are imported.
|
-- Other library packages from which modules are imported.
|
||||||
build-depends: base ^>=4.20.2.0
|
build-depends: base ^>=4.20.2.0
|
||||||
, websockets
|
, websockets
|
||||||
|
, http-media
|
||||||
, aeson
|
, aeson
|
||||||
, lens-aeson
|
, lens-aeson
|
||||||
, lens
|
, lens
|
||||||
@@ -108,7 +110,8 @@ library
|
|||||||
, filepath
|
, filepath
|
||||||
, conduit
|
, conduit
|
||||||
, cereal-conduit
|
, cereal-conduit
|
||||||
, scotty
|
, servant
|
||||||
|
, servant-server
|
||||||
, http-types
|
, http-types
|
||||||
, warp
|
, warp
|
||||||
, wai
|
, wai
|
||||||
@@ -182,6 +185,7 @@ test-suite home-assistant-controller-test
|
|||||||
bytestring,
|
bytestring,
|
||||||
hspec,
|
hspec,
|
||||||
stm,
|
stm,
|
||||||
|
servant,
|
||||||
aeson,
|
aeson,
|
||||||
cereal,
|
cereal,
|
||||||
text,
|
text,
|
||||||
|
|||||||
@@ -57,14 +57,17 @@ bedroomPresenceController = proc x -> do
|
|||||||
callService (light bedroomLights Off) -< ()
|
callService (light bedroomLights Off) -< ()
|
||||||
Event LightsOn -> do
|
Event LightsOn -> do
|
||||||
sleepMode -< False
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
||||||
Event LightsSleep -> do
|
Event LightsSleep -> do
|
||||||
callService createBedroomScene -< ()
|
callService createBedroomScene -< ()
|
||||||
|
adaptiveMode -< True
|
||||||
sleepMode -< True
|
sleepMode -< True
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
|
||||||
where
|
where
|
||||||
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
||||||
|
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
||||||
|
|
||||||
|
|
||||||
data BedroomControls
|
data BedroomControls
|
||||||
@@ -87,20 +90,45 @@ bedroomButtonController = proc x -> do
|
|||||||
ev <- bedroomButton >>> traceEvent -< x
|
ev <- bedroomButton >>> traceEvent -< x
|
||||||
-- Any event will cause the sleep mode to be turned off
|
-- Any event will cause the sleep mode to be turned off
|
||||||
case ev of
|
case ev of
|
||||||
Event _ -> sleepMode -< False
|
Event (Masse (OnButton ShortRelease)) -> do
|
||||||
_ -> returnA -< ()
|
sleepMode -< False
|
||||||
case ev of
|
adaptiveMode -< False
|
||||||
Event (Masse (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_masse") -< ()
|
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||||
Event (Masse (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
Event (Masse (OnButton DoubleClick)) -> do
|
||||||
Event (Masse (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
sleepMode -< False
|
||||||
Event (Masse (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
adaptiveMode -< False
|
||||||
Event (Enishen (OnButton ShortRelease)) -> callService (activateScene "scene.makuuhuone_jemina") -< ()
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
Event (Enishen (OnButton DoubleClick)) -> callService (activateScene "scene.makuuhuone_keski") -< ()
|
Event (Masse (OnButton LongClick)) -> do
|
||||||
Event (Enishen (OnButton LongClick)) -> callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
sleepMode -< False
|
||||||
Event (Enishen (OffButton _)) -> callService (light [AreaId "makuuhuone"] Off) -< ()
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
|
Event (Masse (OffButton _)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
|
Event (Enishen (OnButton ShortRelease)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||||
|
Event (Enishen (OnButton DoubleClick)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
|
Event (Enishen (OnButton LongClick)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
|
Event (Enishen (OffButton _)) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
|
Event (Central _) -> do
|
||||||
|
sleepMode -< False
|
||||||
|
adaptiveMode -< False
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
where
|
where
|
||||||
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
||||||
|
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ import HomeAssistant.Controller.Livingroom (livingroomPresenceController)
|
|||||||
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
||||||
import UnliftIO.Async
|
import UnliftIO.Async
|
||||||
import HomeAssistant.Runtime.Supervisor (supervised)
|
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||||
import qualified HomeAssistant.Runtime.Graphing
|
|
||||||
import HomeAssistant.Controller.Hallway (hallwayLightsController)
|
import HomeAssistant.Controller.Hallway (hallwayLightsController)
|
||||||
|
import qualified HttpServer
|
||||||
|
|
||||||
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
step :: (MonadIO m) => FilePath -> UUID -> Auto m a b -> a -> m (b, Auto m a b)
|
||||||
step path trace st a = do
|
step path trace st a = do
|
||||||
@@ -115,7 +115,7 @@ defaultMain = withSocketsDo $ do
|
|||||||
[ ("reader", readerAction host 8123 token ents bus)
|
[ ("reader", readerAction host 8123 token ents bus)
|
||||||
, ("writer", writerAction writerLimiter bus)
|
, ("writer", writerAction writerLimiter bus)
|
||||||
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
, ("metrics", HomeAssistant.Runtime.Metrics.metricsAction store rrdPath rrdtool)
|
||||||
, ("metrics-http", HomeAssistant.Runtime.Graphing.graphAction rrdPath rrdtool metricsPort)
|
, ("metrics-http", HttpServer.runHttpServer (busLogEnv bus) rrdPath rrdtool metricsPort)
|
||||||
] ++ [ (name, runController rootPath bus c) | c@(Controller True name _) <- active ]
|
] ++ [ (name, runController rootPath bus c) | c@(Controller True name _) <- active ]
|
||||||
runKatipContextT (busLogEnv bus) () mempty $
|
runKatipContextT (busLogEnv bus) () mempty $
|
||||||
mapConcurrently_ (uncurry supervised) workers
|
mapConcurrently_ (uncurry supervised) workers
|
||||||
|
|||||||
@@ -11,37 +11,19 @@ module HomeAssistant.Runtime.Graphing
|
|||||||
, parseNameParam
|
, parseNameParam
|
||||||
, buildGraphArgs
|
, buildGraphArgs
|
||||||
, readProcessBytes
|
, readProcessBytes
|
||||||
, graphAction
|
, Graph(..)
|
||||||
|
, renderGraph
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Exception (evaluate)
|
import Control.Exception (evaluate)
|
||||||
import Control.Monad (forever)
|
|
||||||
import Control.Monad.IO.Class (liftIO, MonadIO)
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
import qualified Data.ByteString as BS
|
import qualified Data.ByteString as BS
|
||||||
import qualified Data.ByteString.Lazy as BL
|
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Text.Lazy as TL
|
|
||||||
import Data.Void (Void)
|
|
||||||
import Network.HTTP.Types.Status (Status, status400, status404, status500)
|
|
||||||
import Network.Wai.Handler.Warp (defaultSettings, setHost, setPort)
|
|
||||||
import System.Exit (ExitCode (..))
|
import System.Exit (ExitCode (..))
|
||||||
import System.IO (hGetContents)
|
import System.IO (hGetContents)
|
||||||
import System.Process (CreateProcess (..), StdStream (..), proc, waitForProcess, withCreateProcess)
|
import System.Process (CreateProcess (..), StdStream (..), proc, waitForProcess, withCreateProcess)
|
||||||
import Web.Scotty
|
import Servant.API (FromHttpApiData (..), ToHttpApiData (..))
|
||||||
( ActionM
|
|
||||||
, ScottyM
|
|
||||||
, defaultOptions
|
|
||||||
, get
|
|
||||||
, pathParam
|
|
||||||
, queryParamMaybe
|
|
||||||
, raw
|
|
||||||
, scottyOpts
|
|
||||||
, setHeader
|
|
||||||
, settings
|
|
||||||
, status
|
|
||||||
, text
|
|
||||||
)
|
|
||||||
|
|
||||||
data Range = TenMinutes | OneHour | OneDay | OneWeek | OneMonth
|
data Range = TenMinutes | OneHour | OneDay | OneWeek | OneMonth
|
||||||
deriving (Eq, Show, Bounded, Enum)
|
deriving (Eq, Show, Bounded, Enum)
|
||||||
@@ -56,6 +38,12 @@ rangeSuffix OneMonth = "30d"
|
|||||||
parseRange :: Text -> Maybe Range
|
parseRange :: Text -> Maybe Range
|
||||||
parseRange t = lookup t [(T.pack (rangeSuffix r), r) | r <- [minBound .. maxBound]]
|
parseRange t = lookup t [(T.pack (rangeSuffix r), r) | r <- [minBound .. maxBound]]
|
||||||
|
|
||||||
|
instance ToHttpApiData Range where
|
||||||
|
toQueryParam = T.pack . rangeSuffix
|
||||||
|
|
||||||
|
instance FromHttpApiData Range where
|
||||||
|
parseQueryParam x = maybe (Left ("Could not parse '" <> x <> "' as Range")) Right $ parseRange x
|
||||||
|
|
||||||
rangeStart :: Range -> String
|
rangeStart :: Range -> String
|
||||||
rangeStart r = "end-" ++ rangeSuffix r
|
rangeStart r = "end-" ++ rangeSuffix r
|
||||||
|
|
||||||
@@ -91,6 +79,7 @@ data GraphSpec = GraphSpec
|
|||||||
{ gsName :: Text
|
{ gsName :: Text
|
||||||
, gsTitle :: String
|
, gsTitle :: String
|
||||||
, gsPlots :: [Plot]
|
, gsPlots :: [Plot]
|
||||||
|
, gsIdentifier :: Graph
|
||||||
}
|
}
|
||||||
deriving (Eq, Show)
|
deriving (Eq, Show)
|
||||||
|
|
||||||
@@ -141,6 +130,7 @@ ratelimitGraph =
|
|||||||
, serLabel = "Requests exhausted/min"
|
, serLabel = "Requests exhausted/min"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
, gsIdentifier = RateLimit
|
||||||
}
|
}
|
||||||
|
|
||||||
trafficGraph :: GraphSpec
|
trafficGraph :: GraphSpec
|
||||||
@@ -164,6 +154,7 @@ trafficGraph =
|
|||||||
, serLabel = "Service calls out/min"
|
, serLabel = "Service calls out/min"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
, gsIdentifier = Traffic
|
||||||
}
|
}
|
||||||
|
|
||||||
memoryGraph :: GraphSpec
|
memoryGraph :: GraphSpec
|
||||||
@@ -174,17 +165,21 @@ memoryGraph =
|
|||||||
[ area "live" "#99ccff" (average "rts_gc_current__a7a")
|
[ area "live" "#99ccff" (average "rts_gc_current__a7a")
|
||||||
, line "peak" "#cc0000" (maximumCF "rts_gc_current__a7a")
|
, line "peak" "#cc0000" (maximumCF "rts_gc_current__a7a")
|
||||||
]
|
]
|
||||||
|
Memory
|
||||||
|
|
||||||
graphs :: [GraphSpec]
|
graphs :: [GraphSpec]
|
||||||
graphs = [memoryGraph, ratelimitGraph, trafficGraph]
|
graphs = [memoryGraph, ratelimitGraph, trafficGraph]
|
||||||
|
|
||||||
lookupGraph :: [GraphSpec] -> Text -> Maybe GraphSpec
|
-- XXX: Proper lookup..?
|
||||||
lookupGraph specs name = case [g | g <- specs, gsName g == name] of
|
lookupGraph :: [GraphSpec] -> Graph -> Maybe GraphSpec
|
||||||
|
lookupGraph specs graphMode = case [g | g <- specs, gsIdentifier g == graphMode] of
|
||||||
(g : _) -> Just g
|
(g : _) -> Just g
|
||||||
[] -> Nothing
|
[] -> Nothing
|
||||||
|
|
||||||
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
parseNameParam :: [GraphSpec] -> Text -> Maybe GraphSpec
|
||||||
parseNameParam specs t = T.stripSuffix ".png" t >>= lookupGraph specs
|
parseNameParam specs t = rightToMaybe (parseQueryParam t) >>= lookupGraph specs
|
||||||
|
where
|
||||||
|
rightToMaybe = either (const Nothing) Just
|
||||||
|
|
||||||
cfName :: CF -> String
|
cfName :: CF -> String
|
||||||
cfName = \case
|
cfName = \case
|
||||||
@@ -255,39 +250,32 @@ readProcessBytes cmd args =
|
|||||||
pure (code, out, err)
|
pure (code, out, err)
|
||||||
_ -> pure (ExitFailure 1, BS.empty, "failed to create pipes")
|
_ -> pure (ExitFailure 1, BS.empty, "failed to create pipes")
|
||||||
|
|
||||||
respond :: Status -> TL.Text -> ActionM ()
|
renderGraph :: MonadIO m => FilePath -> FilePath -> GraphSpec -> Range -> m (Either Text BS.ByteString)
|
||||||
respond st body = status st >> text body
|
renderGraph rrdPath rrdtool spec range = do
|
||||||
|
|
||||||
serve :: FilePath -> FilePath -> GraphSpec -> Range -> ActionM ()
|
|
||||||
serve rrdPath rrdtool spec range = do
|
|
||||||
(code, out, err) <- liftIO (readProcessBytes rrdtool (buildGraphArgs rrdPath spec range))
|
(code, out, err) <- liftIO (readProcessBytes rrdtool (buildGraphArgs rrdPath spec range))
|
||||||
case code of
|
case code of
|
||||||
ExitSuccess
|
ExitSuccess
|
||||||
| not (BS.null out) -> do
|
| not (BS.null out) -> pure $ Right out
|
||||||
setHeader "Content-Type" "image/png"
|
| otherwise -> pure $ Left "empty graph"
|
||||||
raw (BL.fromStrict out)
|
_ -> pure $ Left (T.pack $ take 200 err)
|
||||||
| otherwise -> respond status500 "empty graph"
|
|
||||||
_ -> respond status500 (TL.pack (take 200 err))
|
|
||||||
|
|
||||||
handler :: FilePath -> FilePath -> ActionM ()
|
|
||||||
handler rrdPath rrdtool = do
|
|
||||||
name <- pathParam "name"
|
|
||||||
case parseNameParam graphs name of
|
|
||||||
Nothing -> respond status404 "unknown graph"
|
|
||||||
Just spec -> do
|
|
||||||
rangeArg <- queryParamMaybe "range"
|
|
||||||
case rangeArg of
|
|
||||||
Nothing -> serve rrdPath rrdtool spec OneDay
|
|
||||||
Just t -> case parseRange t of
|
|
||||||
Nothing -> respond status400 "invalid range"
|
|
||||||
Just range -> serve rrdPath rrdtool spec range
|
|
||||||
|
|
||||||
app :: FilePath -> FilePath -> ScottyM ()
|
|
||||||
app rrdPath rrdtool = get "/metrics/:name" (handler rrdPath rrdtool)
|
|
||||||
|
|
||||||
graphAction :: MonadIO m => FilePath -> FilePath -> Int -> m Void
|
|
||||||
graphAction rrdPath rrdtool port = liftIO $ forever $ scottyOpts opts (app rrdPath rrdtool)
|
data Graph
|
||||||
where
|
= Memory
|
||||||
opts = defaultOptions
|
| Traffic
|
||||||
{ settings = setHost "0.0.0.0" (setPort port defaultSettings)
|
| RateLimit
|
||||||
}
|
deriving (Show, Eq, Enum, Bounded)
|
||||||
|
|
||||||
|
instance ToHttpApiData Graph where
|
||||||
|
toQueryParam Memory = "memory.png"
|
||||||
|
toQueryParam Traffic = "traffic.png"
|
||||||
|
toQueryParam RateLimit = "ratelimit.png"
|
||||||
|
|
||||||
|
instance FromHttpApiData Graph where
|
||||||
|
parseQueryParam "memory.png" = Right Memory
|
||||||
|
parseQueryParam "traffic.png" = Right Traffic
|
||||||
|
parseQueryParam "ratelimit.png" = Right RateLimit
|
||||||
|
parseQueryParam x = Left ("Can't parse '" <> x <> "' as Graph")
|
||||||
|
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE DerivingVia #-}
|
||||||
|
module HttpServer where
|
||||||
|
|
||||||
|
import Control.Monad (forever)
|
||||||
|
import Control.Monad.IO.Class (liftIO, MonadIO)
|
||||||
|
import qualified Data.ByteString as BS
|
||||||
|
import Data.Void (Void)
|
||||||
|
import Network.Wai.Handler.Warp (run)
|
||||||
|
import Servant.API ((:>), Capture, Get, QueryParam, (:-), MimeRender (..), Accept (..), NamedRoutes)
|
||||||
|
import Data.ByteString (ByteString)
|
||||||
|
import GHC.Generics (Generic)
|
||||||
|
import Servant (Handler, err404)
|
||||||
|
import Control.Monad.Catch (throwM, MonadCatch, MonadThrow)
|
||||||
|
import Servant.Server (err500, ServerT)
|
||||||
|
import Data.Maybe (fromMaybe)
|
||||||
|
import Control.Exception.Annotated (checkpoint, Annotation (Annotation))
|
||||||
|
import Servant.Server.Generic (genericServeT)
|
||||||
|
import Network.Wai (Application)
|
||||||
|
import Network.HTTP.Media ((//))
|
||||||
|
import HomeAssistant.Runtime.Graphing (Graph, Range (..), lookupGraph, graphs, renderGraph)
|
||||||
|
import Katip (KatipContextT, Katip, runKatipContextT, LogEnv, KatipContext, ls, Severity (..), logFM)
|
||||||
|
|
||||||
|
data ImagePng
|
||||||
|
|
||||||
|
instance MimeRender ImagePng ByteString where
|
||||||
|
mimeRender _ = BS.fromStrict
|
||||||
|
|
||||||
|
instance Accept ImagePng where
|
||||||
|
contentType _ = "image" // "png"
|
||||||
|
|
||||||
|
|
||||||
|
newtype API mode = API
|
||||||
|
{ getMetrics :: mode :- "metrics" :> Capture "graph" Graph :> QueryParam "range" Range :> Get '[ImagePng] ByteString
|
||||||
|
}
|
||||||
|
deriving Generic
|
||||||
|
|
||||||
|
|
||||||
|
getMetricsHandler :: FilePath -> FilePath -> Graph -> Maybe Range -> LoggingHandler ByteString
|
||||||
|
getMetricsHandler rrdPath rrdtool graphMode mRange = checkpoint (Annotation (graphMode, mRange)) $ do
|
||||||
|
case lookupGraph graphs graphMode of
|
||||||
|
Nothing -> throwM err404
|
||||||
|
Just spec -> do
|
||||||
|
let range = fromMaybe OneDay mRange
|
||||||
|
g <- renderGraph rrdPath rrdtool spec range
|
||||||
|
either (\e -> logFM ErrorS (ls e) >> throwM err500) pure g
|
||||||
|
|
||||||
|
-- server :: FilePath -> FilePath -> API AsServer
|
||||||
|
server :: FilePath -> FilePath -> ServerT (NamedRoutes API) LoggingHandler
|
||||||
|
server rrdPath rrdtool = API { getMetrics = getMetricsHandler rrdPath rrdtool }
|
||||||
|
|
||||||
|
servantApp :: LogEnv -> FilePath -> FilePath -> Application
|
||||||
|
servantApp le rrdPath rrdtool = genericServeT (toHandler le) (server rrdPath rrdtool)
|
||||||
|
|
||||||
|
runHttpServer :: MonadIO m => LogEnv -> FilePath -> FilePath -> Int -> m Void
|
||||||
|
runHttpServer le rrdPath rrdtool port = liftIO $ forever $ run port (servantApp le rrdPath rrdtool)
|
||||||
|
|
||||||
|
newtype LoggingHandler a = LoggingHandler (KatipContextT Handler a)
|
||||||
|
deriving (Functor, Applicative, Monad, MonadIO, Katip, KatipContext, MonadCatch, MonadThrow) via (KatipContextT Handler)
|
||||||
|
|
||||||
|
toHandler :: LogEnv -> (forall a. LoggingHandler a -> Handler a)
|
||||||
|
toHandler le (LoggingHandler k) = runKatipContextT le () "http" k
|
||||||
|
|
||||||
|
|
||||||
+17
-16
@@ -45,6 +45,7 @@ entitySpec = describe "entities" $ do
|
|||||||
`shouldBe` S.fromList
|
`shouldBe` S.fromList
|
||||||
[ "event.bedroom_quick_remote_masse_action"
|
[ "event.bedroom_quick_remote_masse_action"
|
||||||
, "event.bedroom_quick_jemina_action"
|
, "event.bedroom_quick_jemina_action"
|
||||||
|
, "event.bedroom_remote_action"
|
||||||
]
|
]
|
||||||
|
|
||||||
it "bedroomPresenceController subscribes to the presence sensor" $
|
it "bedroomPresenceController subscribes to the presence sensor" $
|
||||||
@@ -89,36 +90,36 @@ buttonSpec = describe "bedroomButtonController" $ do
|
|||||||
let area = AreaId "makuuhuone"
|
let area = AreaId "makuuhuone"
|
||||||
|
|
||||||
it "Masse single click turns on his nightstand scene (lowest)" $
|
it "Masse single click turns on his nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_masse"]]
|
`shouldContain` [activateScene "scene.makuuhuone_masse"]
|
||||||
|
|
||||||
it "Masse double click turns on the middle scene" $
|
it "Masse double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Masse long click turns on the bright scene" $
|
it "Masse long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [masseButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Masse off click turns the bedroom lights off" $
|
it "Masse off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [masseButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [masseButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "Enishen single click turns on her nightstand scene (lowest)" $
|
it "Enishen single click turns on her nightstand scene (lowest)" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_short_release"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_jemina"]]
|
`shouldContain` [activateScene "scene.makuuhuone_jemina"]
|
||||||
|
|
||||||
it "Enishen double click turns on the middle scene" $
|
it "Enishen double click turns on the middle scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_double_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_double_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_keski"]]
|
`shouldContain` [activateScene "scene.makuuhuone_keski"]
|
||||||
|
|
||||||
it "Enishen long click turns on the bright scene" $
|
it "Enishen long click turns on the bright scene" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "1_long_press"])
|
concat (services (runHASS bedroomButtonController [enishenButton "1_long_press"]))
|
||||||
`shouldBe` [[activateScene "scene.makuuhuone_kirkas"]]
|
`shouldContain` [activateScene "scene.makuuhuone_kirkas"]
|
||||||
|
|
||||||
it "Enishen off click turns the bedroom lights off" $
|
it "Enishen off click turns the bedroom lights off" $
|
||||||
services (runHASS bedroomButtonController [enishenButton "2_short_release"])
|
concat (services (runHASS bedroomButtonController [enishenButton "2_short_release"]))
|
||||||
`shouldBe` [[light [area] Off]]
|
`shouldContain` [light [area] Off]
|
||||||
|
|
||||||
it "ignores the initial press (scene only fires on release)" $
|
it "ignores the initial press (scene only fires on release)" $
|
||||||
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
services (runHASS bedroomButtonController [masseButton "1_initial_press"])
|
||||||
|
|||||||
+19
-1
@@ -20,15 +20,30 @@ import System.Directory (findExecutable, getTemporaryDirectory, removeFile)
|
|||||||
import System.Exit (ExitCode (..))
|
import System.Exit (ExitCode (..))
|
||||||
import System.Process (readProcessWithExitCode)
|
import System.Process (readProcessWithExitCode)
|
||||||
import Test.Hspec
|
import Test.Hspec
|
||||||
|
import Servant.API (FromHttpApiData(..), ToHttpApiData (..))
|
||||||
|
import HomeAssistant.Runtime.Graphing (Graph(..))
|
||||||
|
|
||||||
traffic :: GraphSpec
|
traffic :: GraphSpec
|
||||||
traffic = case lookupGraph graphs "traffic" of
|
traffic = case lookupGraph graphs Traffic of
|
||||||
Just s -> s
|
Just s -> s
|
||||||
Nothing -> error "traffic graph is missing from the table"
|
Nothing -> error "traffic graph is missing from the table"
|
||||||
|
|
||||||
spec :: Spec
|
spec :: Spec
|
||||||
spec = do
|
spec = do
|
||||||
|
describe "Graph HttpApiData" $ do
|
||||||
|
-- There's an enumerable amount of graphs, we can just enumerate through them all
|
||||||
|
it "satisfies roundtrip property" $ do
|
||||||
|
let modes = [minBound..maxBound]
|
||||||
|
let got = map (parseQueryParam . toQueryParam @Graph) modes
|
||||||
|
let wanted = map Right modes
|
||||||
|
got `shouldBe` wanted
|
||||||
describe "parseRange" $ do
|
describe "parseRange" $ do
|
||||||
|
-- Fully enumerable
|
||||||
|
it "the http-api-data satisfies roundtrip property" $ do
|
||||||
|
let rs = [minBound..maxBound]
|
||||||
|
let got = map (parseQueryParam . toQueryParam @Range) rs
|
||||||
|
let wanted = map Right rs
|
||||||
|
got `shouldBe` wanted
|
||||||
it "accepts every suffix in the closed set" $
|
it "accepts every suffix in the closed set" $
|
||||||
map parseRange ["10m", "1h", "24h", "7d", "30d"]
|
map parseRange ["10m", "1h", "24h", "7d", "30d"]
|
||||||
`shouldBe` [ Just TenMinutes
|
`shouldBe` [ Just TenMinutes
|
||||||
@@ -124,3 +139,6 @@ spec = do
|
|||||||
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
out `shouldSatisfy` BS.isPrefixOf pngMagic
|
||||||
)
|
)
|
||||||
`finally` cleanup
|
`finally` cleanup
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in new issue
Block a user