Improve request time

JonasMH · Jan 11, 2024 · 40983a8 · 40983a8
1 parent 25e1305
commit 40983a8
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1 +1 @@
-# Rejseplanen2Mqtt
+# Rejseplanen2Mqtt
diff --git a/src/Client/Models/Trip.cs b/src/Client/Models/Trip.cs
@@ -14,5 +14,5 @@ public class Trip
 public class TripResponse
 {
     public bool Cancelled { get; set; }
-    public List<TripLeg> Legs { get; set; } = new List<TripLeg>();
+    public List<TripLeg> Legs { get; set; } = [];
 }
diff --git a/src/Client/Models/TripRequestOptions.cs b/src/Client/Models/TripRequestOptions.cs
@@ -1,7 +1,11 @@
-namespace Rejseplanen2Mqtt.Client;
+using NodaTime;
+
+namespace Rejseplanen2Mqtt.Client;
 
 public class TripRequestOptions
 {
     public string OriginId { get; set; } = null!;
     public string DestId { get; set; } = null!;
+    public LocalDate? Date { get; set; }
+    public LocalTime? Time { get; set; }
 }
diff --git a/src/Client/RejseplanenClient.cs b/src/Client/RejseplanenClient.cs
@@ -1,11 +1,18 @@
-using System.Text.Json;
+using System.Collections.Specialized;
+using System.Text.Json;
+using Microsoft.AspNetCore.Http.Extensions;
+using NodaTime.Text;
 
 namespace Rejseplanen2Mqtt.Client;
 
 public class RejseplanenClient
 {
     private readonly HttpClient _httpClient;
 
+
+    public static LocalTimePattern TimePattern { get; } = LocalTimePattern.CreateWithInvariantCulture("HH:mm"); // 13:30
+    public static LocalDatePattern DatePattern { get; } = LocalDatePattern.CreateWithInvariantCulture("dd.MM.yy"); // 06.01.24
+
     public RejseplanenClient(HttpClient httpClient, RejseplanenClientOptions options)
     {
         _httpClient = httpClient;
@@ -27,9 +34,26 @@ public async Task<DepartureBoardResponse> DepartureBoardAsync(DeparturBoardReque
 
     public async Task<List<TripResponse>> TripAsync(TripRequestOptions options)
 	{
-		var request = new HttpRequestMessage()
+        var requestParameters = new QueryBuilder
+        {
+            { "format", "json" },
+            { "originId", options.OriginId },
+            { "destId", options.DestId }
+        };
+
+        if(options.Date.HasValue)
+        {
+            requestParameters.Add("date", DatePattern.Format(options.Date.Value));
+        }
+
+        if(options.Time.HasValue)
+        {
+            requestParameters.Add("time", TimePattern.Format(options.Time.Value));
+        }
+
+        var request = new HttpRequestMessage()
 		{
-			RequestUri = new Uri($"/bin/rest.exe/trip?originId={options.OriginId}&destId={options.DestId}&format=json", UriKind.Relative)
+			RequestUri = new Uri($"/bin/rest.exe/trip" + requestParameters.ToString(), UriKind.Relative)
 		};
 		var response = await _httpClient.SendAsync(request);
 

diff --git a/src/Program.cs b/src/Program.cs
@@ -3,6 +3,7 @@
 using MQTTnet.Client;
 using OpenTelemetry.Metrics;
 using Rejseplanen2Mqtt.Client;
+using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using ToMqttNet;
 
@@ -15,6 +16,7 @@
 	options.TimestampFormat = "HH:mm:ss ";
 });
 builder.Services.AddOptions<MqttOptions>().BindConfiguration("MqttConnectionOptions");
+builder.Services.AddOptions<RejseplanenToMqttOptions>().BindConfiguration("RejseplanenToMqttOptions");
 
 builder.Services.AddHealthChecks();
 builder.Services.AddOpenTelemetry()
@@ -32,6 +34,12 @@
 	{
 		var mqttConf = mqttConfI.Value;
 		options.NodeId = "rejseplanen";
+        options.OriginConfig = new HomeAssistantDiscoveryNet.MqttDiscoveryConfigOrigin
+        {
+            Name = "rejseplanen2mqtt",
+            SoftwareVersion = Assembly.GetExecutingAssembly().GetName().Version?.ToString(),
+            SupportUrl = "https://github.com/JonasMH/Rejseplanen2Mqtt"
+        };
 
 		var tcpOptions = new MqttClientTcpOptions
 		{

diff --git a/src/Properties/launchSettings.json b/src/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Rejseplanen2Mqtt": {
       "commandName": "Project",
-      "launchBrowser": true,
+      "launchBrowser": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

diff --git a/src/RejsePlanenToMqttBackgroundService.cs b/src/RejsePlanenToMqttBackgroundService.cs
@@ -1,40 +1,28 @@
 // See https://aka.ms/new-console-template for more information
 using HomeAssistantDiscoveryNet;
+using Microsoft.Extensions.Options;
 using MQTTnet;
 using NodaTime;
-using NodaTime.Text;
-using Rejseplanen2Mqtt.Client;
 using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using ToMqttNet;
 
 namespace Rejseplanen2Mqtt.Client;
 
 public class RejsePlanenToMqttBackgroundService(
     ILogger<RejsePlanenToMqttBackgroundService> logger,
+    IOptions<RejseplanenToMqttOptions> options,
     RejseplanenClient rejseplanenClient,
     MqttConnectionService mqtt) : BackgroundService
 {
 	private readonly ILogger<RejsePlanenToMqttBackgroundService> _logger = logger;
-	private readonly RejseplanenClient _rejseplanenClient = rejseplanenClient;
+    private readonly RejseplanenToMqttOptions options = options.Value;
+    private readonly RejseplanenClient _rejseplanenClient = rejseplanenClient;
 	private readonly MqttConnectionService _mqtt = mqtt;
-	private readonly List<TripToInform> _tripsToPublish = [
-		new TripToInform {
-			Name = "Aarhus to Hedensted",
-			OriginId = "8600053", // Aarhus H
-			DestId = "8600071", // Hedensted St.
-		},
-		new TripToInform {
-			Name = "Hedensted to Aarhus",
-			OriginId = "8600071", // Hedensted St.
-			DestId  = "8600053", // Aarhus H
-		},
-	];
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 	{
-		foreach (var trip in _tripsToPublish)
+		foreach (var trip in options.TripsToPublish)
 		{
 			var discoveryDoc = new MqttSensorDiscoveryConfig()
 			{
@@ -52,13 +40,26 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
 		while (!stoppingToken.IsCancellationRequested)
 		{
-			foreach (var tripToPublish in _tripsToPublish)
+			foreach (var tripToPublish in options.TripsToPublish)
 			{
-				var response = await _rejseplanenClient.TripAsync(new TripRequestOptions
-				{
-					OriginId = tripToPublish.OriginId,
-					DestId = tripToPublish.DestId
-				});
+                var localTime = SystemClock.Instance.GetCurrentInstant().InZone(DateTimeZoneProviders.Tzdb.GetZoneOrNull("Europe/Copenhagen")!).LocalDateTime;
+                var requestOptions = new TripRequestOptions
+                {
+                    OriginId = tripToPublish.OriginId,
+                    DestId = tripToPublish.DestId
+                };
+
+                if(tripToPublish.Time != null)
+                {
+                    requestOptions.Time = RejseplanenClient.TimePattern.Parse(tripToPublish.Time).Value;
+
+                    if(requestOptions.Time.Value.PlusHours(3) < localTime.TimeOfDay) // We're far enough away from the request time that we should switch to the next day
+                    {
+                        requestOptions.Date = localTime.Date.PlusDays(1);
+                    }
+                }
+
+                var response = await _rejseplanenClient.TripAsync(requestOptions);
 
 				var result = new TripMqttStatusUpdate
 				{
@@ -68,19 +69,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     }
 				};
 
-                // Filter out any trips with multiple legs
-                var localTime = SystemClock.Instance.GetCurrentInstant().InZone(DateTimeZoneProviders.Tzdb.GetZoneOrNull("Europe/Copenhagen")!).LocalDateTime;
 
                 foreach (var directTrip in response.Where(x => !x.Cancelled && x.Legs.Count == 1)) // Only show direct trips
                 {
                     var firstLeg = directTrip.Legs.First();
                     var tripStart = firstLeg.Origin;
 
-                    var timePattern = LocalTimePattern.CreateWithInvariantCulture("HH:mm"); // 13:30
-                    var datePattern = LocalDatePattern.CreateWithInvariantCulture("dd.MM.yy"); // 06.01.24
-
-                    var nextDepatureTime = timePattern.Parse(tripStart.RealtimeTime ?? tripStart.Time).Value;
-                    var nextDepatureDate = datePattern.Parse(tripStart.RealtimeDate ?? tripStart.Date).Value;
+                    var nextDepatureTime = RejseplanenClient.TimePattern.Parse(tripStart.RealtimeTime ?? tripStart.Time).Value;
+                    var nextDepatureDate = RejseplanenClient.DatePattern.Parse(tripStart.RealtimeDate ?? tripStart.Date).Value;
 
                     var nextDepature = nextDepatureTime.On(nextDepatureDate);
 
@@ -152,4 +148,5 @@ public class TripToInform
 	public string Name { get; set; } = null!;
     public string OriginId { get; set; } = null!;
     public string DestId { get; set; } = null!;
+    public string? Time { get; set; } = null!;
 }
diff --git a/src/RejseplanenToMqttOptions.cs b/src/RejseplanenToMqttOptions.cs
@@ -0,0 +1,20 @@
+// See https://aka.ms/new-console-template for more information
+namespace Rejseplanen2Mqtt.Client;
+
+public class RejseplanenToMqttOptions
+{
+    public List<TripToInform> TripsToPublish { get; set; } = [
+        new TripToInform {
+            Name = "Aarhus to Hedensted",
+            OriginId = "8600053", // Aarhus H
+			DestId = "8600071", // Hedensted St.
+            Time = "13:30"
+		},
+        new TripToInform {
+            Name = "Hedensted to Aarhus",
+            OriginId = "8600071", // Hedensted St.
+			DestId  = "8600053", // Aarhus H
+            Time = "6:50"
+        },
+    ];
+}