Feature/Http-Routes

src/Pryde.Api/Handlers.fs

@@ -0,0 +1,33 @@
+module Pryde.Api.Handlers
+
+open Giraffe
+open Pryde.Data
+
+let getCpuHandler : HttpHandler =
+    fun next ctx ->
+        json (DeviceMetrics.getCpuInfo ()) next ctx
+
+let getDiskHandler : HttpHandler =
+    fun next ctx ->
+        json (DeviceMetrics.getDiskInfo ()) next ctx
+
+let getGraphicsHandler : HttpHandler =
+    fun next ctx ->
+        json (DeviceMetrics.getGraphicsInfo ()) next ctx
+
+let getUptimeHandler : HttpHandler =
+    fun next ctx ->
+        json (DeviceMetrics.getUptime ()) next ctx
+
+let getNetworkThroughputHandler : HttpHandler =
+    fun next ctx ->
+        json (NetworkMetrics.getNetworkThroughput ()) next ctx
+
+let getPortHandler (port: int) : HttpHandler =
+    fun next ctx ->
+         if port < 1 || port > 65535 then
+             (setStatusCode 400 >=> json {| message = "Invalid port number" |}) next ctx
+         else
+             match NetworkMetrics.getPortInfo port with
+             | Some info -> json info next ctx
+             | None -> (setStatusCode 404 >=> json {| message = "Port not listening" |}) next ctx

src/Pryde.Api/Program.fs

@@ -1,24 +1,22 @@
-open System
+namespace Pryde.Api
+
+open Giraffe
+open Pryde.Api.Routes
 open Microsoft.AspNetCore.Builder
-open Microsoft.Extensions.Hosting
-open Pryde.Data
-open Pryde.Data.NetworkMetrics
+open Microsoft.Extensions.DependencyInjection
 
-[<EntryPoint>]
-let main args =
-    let cpu = DeviceMetrics.getCpuInfo ()
-    let disk = DeviceMetrics.getDiskInfo ()
-    let gpu = DeviceMetrics.getGraphicsInfo()
-    let networkThroughput = NetworkMetrics.getNetworkThroughput()
-
-    printfn "%A" cpu
-    printfn "%A" disk
-    printfn "%A" gpu
-    printfn "%A" networkThroughput
-
-    let builder = WebApplication.CreateBuilder(args)
-    let app = builder.Build()
 
-    app.Run()
+type Program() =
+    class end
 
-    0 // Exit code
+module Program =     
+    [<EntryPoint>]
+    let main args =
+        let builder = WebApplication.CreateBuilder(args)
+        builder.Services.AddGiraffe() |> ignore
+
+        let app = builder.Build()
+        app.UseGiraffe(webApp)
+
+        app.Run()
+        0  // Exit code

src/Pryde.Api/Pryde.Api.fsproj

@@ -5,15 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="Handlers.fs" />
+    <Compile Include="Routes.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Pryde.Core\Pryde.Core.fsproj" />
     <ProjectReference Include="..\Pryde.Polling\Pryde.Polling.fsproj" />
+    <ProjectReference Include="..\Pryde.Data\Pryde.Data.fsproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Giraffe" Version="8.3.0" />
     <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.7-pre714" />
   </ItemGroup>
 

src/Pryde.Api/Routes.fs

@@ -0,0 +1,15 @@
+module Pryde.Api.Routes
+
+open Giraffe
+open Pryde.Api.Handlers
+let webApp : HttpHandler =
+    choose [
+        GET >=> choose [
+            route "/system/cpu" >=> getCpuHandler
+            route "/system/disk" >=> getDiskHandler
+            route "/system/graphics" >=> getGraphicsHandler
+            route "/system/uptime" >=> getUptimeHandler
+            route "/network/throughput" >=> getNetworkThroughputHandler
+            routef "/network/port/%i" getPortHandler
+        ]
+    ]

src/Pryde.Data/NetworkMetrics.fs

@@ -9,7 +9,7 @@ module NetworkMetrics =
     let getNetworkThroughput () : NetworkInfo list =
         use searcher = new ManagementObjectSearcher(
             "SELECT Name, BytesReceivedPersec, BytesSentPersec FROM Win32_PerfFormattedData_Tcpip_NetworkInterface")
-        let results = searcher.Get()
+        use results = searcher.Get()
 
         [ for item in results do
               let name = item.["Name"] :?> string

tests/Pryde.Tests/Tests.fs → tests/Pryde.Tests/MetricTests.fs

@@ -46,7 +46,7 @@ module NetworkMetricsTest =
     [<Fact>]
     let ``isPortListening returns true for a port with an active listener`` () =
         let testPort = 54321
-        let listener = TcpListener(IPAddress.Loopback, testPort)
+        let listener = new TcpListener(IPAddress.Loopback, testPort)
         listener.Start()
 
         try

tests/Pryde.Tests/Pryde.Tests.fsproj

@@ -7,19 +7,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Tests.fs" />
+    <Compile Include="MetricTests.fs" />
+    <Compile Include="RouteTests.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Pryde.Data\Pryde.Data.fsproj" />
+    <ProjectReference Include="..\..\src\Pryde.Api\Pryde.Api.fsproj" />
   </ItemGroup>
 
 </Project>

tests/Pryde.Tests/RouteTests.fs

@@ -0,0 +1,37 @@
+module Pryde.Tests
+
+open Microsoft.AspNetCore.Mvc.Testing
+open Xunit
+open System.Net
+open Pryde.Api
+
+type RouteTests() =
+    let factory = new WebApplicationFactory<Program>()
+    let client = factory.CreateClient()
+
+    [<Fact>]
+    member _.``GET system cpu returns 200`` () = task {
+        let! response = client.GetAsync("/system/cpu")
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode)
+    }
+
+    [<Fact>]
+    member _. ``GET system disk returns 200`` () = task {
+        let! response = client.GetAsync("/system/disk")
+        Assert.Equal(HttpStatusCode.OK, response.StatusCode)
+    }
+
+    [<Fact>]
+    member _.``Get network port with invalid port returns 400`` () = task {
+        let! response = client.GetAsync("/network/port/-1")
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode)
+    }
+
+    [<Fact>]
+    member _.``Get network port with unused port returns 404`` () = task {
+        let! response = client.GetAsync("/network/port/59999")
+        Assert.Equal(HttpStatusCode.NotFound, response.StatusCode)
+    }
+
+    interface System.IDisposable with
+        member _.Dispose() = factory.Dispose()