Merge branch 'master' into release

Author: Rene-Sackers

README.md

@@ -32,6 +32,8 @@ services:
   vattenfalldynamicpriceapi:
     container_name: vattenfalldynamicpriceapi
     image: ghcr.io/rene-sackers/vattenfall-dynamic-price-api:latest
+    environment:
+      - TZ=Europe/Amsterdam
     ports:
       - 8080:8080
 ```

src/VattenfallDynamicPriceApi/Models/Application/SettingsData.cs

@@ -9,4 +9,13 @@ public class SettingsData
 	public string KnownApiBaseUrl { get; set; } = string.Empty;
 
 	public string KnownApiKey { get; set; } = string.Empty;
+
+	public LoggingSettings Logging { get; set; } = new();
+}
+
+public class LoggingSettings
+{
+	public string LogLevel { get; set; }
+
+	public string AspNetLogLevel { get; set; }
 }

src/VattenfallDynamicPriceApi/Program.cs

@@ -1,21 +1,68 @@
+using Serilog;
+using Serilog.Events;
 using VattenfallDynamicPriceApi;
 using VattenfallDynamicPriceApi.Services;
 
-var builder = WebApplication.CreateSlimBuilder(args);
+try
+{
+	SetUpSerilog();
+	await RunAppAsync(args);
+}
+catch (Exception ex)
+{
+	Console.WriteLine("Application crashed on startup: " + ex);
+	Log.Fatal(ex, "Application crashed on startup");
+}
+finally
+{
+	await Log.CloseAndFlushAsync();
+}
 
-builder.Services.ConfigureHttpJsonOptions(options =>
+return;
+
+static async Task RunAppAsync(string[] args)
 {
-	options.SerializerOptions.TypeInfoResolverChain.Insert(0, SourceGenerationContext.Default);
-});
+	var builder = WebApplication.CreateSlimBuilder(args);
+	
+	builder.Host.UseSerilog();
+
+	builder.Services.ConfigureHttpJsonOptions(options =>
+	{
+		options.SerializerOptions.TypeInfoResolverChain.Insert(0, SourceGenerationContext.Default);
+	});
+
+	var app = builder.Build();
+	var dataService = new VattenfallDataService();
+	await dataService.InitializeAsync();
+
+	var version1Group = app.MapGroup("/v1");
+	version1Group.MapGet("/data", () => dataService.Data);
+	version1Group.MapGet("/evcc", () => dataService.EvccData);
+	version1Group.MapGet("/now/electricity", () => dataService.GetCurrentElectricityTariff());
+	version1Group.MapGet("/now/gas", () => dataService.GetCurrentGasTariff());
+
+	await app.RunAsync();
+}
+
+static void SetUpSerilog()
+{
+	if (!Enum.TryParse(SettingsProvider.Instance.Settings.Logging.LogLevel, out LogEventLevel logLevel))
+		logLevel = LogEventLevel.Warning;
+
+	if (!Enum.TryParse(SettingsProvider.Instance.Settings.Logging.AspNetLogLevel, out LogEventLevel aspNetLogLevel))
+		aspNetLogLevel = LogEventLevel.Warning;
 
-var app = builder.Build();
-var dataService = new VattenfallDataService();
-await dataService.InitializeAsync();
+	var loggerConfiguration = new LoggerConfiguration();
 
-var version1Group = app.MapGroup("/v1");
-version1Group.MapGet("/data", () => dataService.Data);
-version1Group.MapGet("/evcc", () => dataService.EvccData);
-version1Group.MapGet("/now/electricity", () => dataService.GetCurrentElectricityTariff());
-version1Group.MapGet("/now/gas", () => dataService.GetCurrentGasTariff());
+	loggerConfiguration
+		.Enrich.FromLogContext()
+		.MinimumLevel.Is(logLevel)
+		.MinimumLevel.Override("Microsoft.Hosting.Lifetime", logLevel)
+		.MinimumLevel.Override("Microsoft.Hosting", aspNetLogLevel)
+		.MinimumLevel.Override("Microsoft.AspNetCore", aspNetLogLevel);
+		
+	loggerConfiguration = loggerConfiguration.WriteTo.Console(
+		outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}");
 
-await app.RunAsync();
+	Log.Logger = loggerConfiguration.CreateLogger();
+}

src/VattenfallDynamicPriceApi/Services/SettingsProvider.cs

@@ -24,6 +24,8 @@ public class SettingsProvider : IDisposable
 	private SettingsProvider()
 	{
 		var configurationRoot = new ConfigurationBuilder()
+			.AddJsonFile($"{SettingsFileName}.json", optional: true, reloadOnChange: true)
+			.AddJsonFile($"{SettingsFileName}.Development.json", optional: true, reloadOnChange: true)
 			.AddEnvironmentVariables(prefix: "VFAPI_")
 			.Build();
 

src/VattenfallDynamicPriceApi/Services/VattenfallDataService.cs

@@ -1,34 +1,37 @@
 using System.Net;
 using System.Text.Json;
 using System.Text.RegularExpressions;
+using Serilog;
 using VattenfallDynamicPriceApi.Extensions;
 using VattenfallDynamicPriceApi.Models.Evcc;
 using VattenfallDynamicPriceApi.Models.Vattenfall;
 
 namespace VattenfallDynamicPriceApi.Services;
 
-public partial class VattenfallDataService
+public partial class VattenfallDataService : IDisposable, IAsyncDisposable
 {
-	private static readonly TimeSpan CacheDuration = TimeSpan.FromHours(1);
+	private static readonly TimeSpan CacheDuration = TimeSpan.FromSeconds(60);
 
 	public FlexTariffData[]? Data { get; private set; } = [];
 
 	public EvccApiHourlyData[]? EvccData { get; private set; } = [];
+	
+	private Timer? _timer;
 
 	public async Task InitializeAsync()
 	{
-		Console.WriteLine("Refresh interval: " + CacheDuration);
+		Log.Information("Refresh interval: " + CacheDuration);
 
 		await UpdateDataAsync();
-		_ = new Timer(RefreshTimerElapsed, null, CacheDuration, CacheDuration);
+		_timer = new Timer(RefreshTimerElapsed, null, CacheDuration, CacheDuration);
 	}
 
 	private decimal GetCurrentTariffForProductType(string productType, string description)
 	{
 		var productData = Data?.FirstOrDefault(d => d.Product == productType);
 		if (productData == null)
 		{
-			Console.WriteLine($"Could not get current {description} tariff, no data");
+			Log.Error("Could not get current {Description} tariff, no data", description);
 			return 999;
 		}
 
@@ -38,7 +41,7 @@ private decimal GetCurrentTariffForProductType(string productType, string descri
 			return currentTariff.AmountInclVat;
 
 		var highestTariff = productData.TariffData.Max(t => t.AmountInclVat);
-		Console.WriteLine($"Could not get current {description} tariff, no value found for current time, returning highest value:" + highestTariff);
+		Log.Error("Could not get current {Description} tariff, no value found for current time, returning highest value: {HighestTariff}", description, highestTariff);
 
 		return highestTariff;
 	}
@@ -53,13 +56,13 @@ private void RefreshTimerElapsed(object? _)
 	{
 		try
 		{
-			Console.WriteLine("Updating data");
+			Log.Information("Updating data");
 			Task.Run(UpdateDataAsync).Wait();
-			Console.WriteLine("Updated data");
+			Log.Information("Updated data");
 		}
 		catch (Exception e)
 		{
-			Console.WriteLine("Failed to update data: " + e);
+			Log.Error(e, "Failed to update data");
 		}
 	}
 
@@ -71,7 +74,7 @@ private async Task UpdateDataAsync()
 		var electricityData = Data.FirstOrDefault(d => d.Product == "E");
 		if (electricityData == null)
 		{
-			Console.WriteLine("Could not find electricity data in API response");
+			Log.Error("Could not find electricity data in API response");
 			return;
 		}
 
@@ -110,7 +113,7 @@ private static async Task<FlexTariffData[]> GetFlexTariffDataAsync(string apiBas
 		}
 		catch (Exception e)
 		{
-			Console.WriteLine("Failed to get API URL and key dynamically, falling back to known values: " + e);
+			Log.Error(e, "Failed to get API URL and key dynamically, falling back to known values");
 			return (SettingsProvider.Instance.Settings.KnownApiBaseUrl, SettingsProvider.Instance.Settings.KnownApiKey);
 		}
 	}
@@ -133,22 +136,22 @@ private static async Task<FlexTariffData[]> GetFlexTariffDataAsync(string apiBas
 		if (string.IsNullOrWhiteSpace(scriptUrl) || !Uri.IsWellFormedUriString(scriptUrl, UriKind.Absolute))
 			throw new Exception("Could not find the epi-es2015.js script URL");
 
-		Console.WriteLine("Found epi JS script: " + scriptUrl);
+		Log.Information("Found epi JS script: {Url}", scriptUrl);
 
 		// Find API base URL in page script
 		var js = await httpClient.GetStringAsync(scriptUrl);
 		var apiBaseUrl = ApiBaseUrlRegex().Match(js).Groups["url"].Value.TrimEnd('/');
 		if (string.IsNullOrWhiteSpace(apiBaseUrl))
 			throw new Exception("Could not find the API base URL");
 
-		Console.WriteLine("API base URL: " + apiBaseUrl);
+		Log.Information("API base URL: {ApiBaseUrl}", apiBaseUrl);
 
 		// Find API key in page script
 		var apiKey = TariffApiKeyRegex().Match(js).Groups["key"].Value;
 		if (string.IsNullOrWhiteSpace(apiKey))
 			throw new Exception("Could not find the API key");
 
-		Console.WriteLine("API key: " + apiKey);
+		Log.Information("API key: {ApiKey}", apiKey);
 
 		// Update known values
 		SettingsProvider.Instance.Settings.KnownApiBaseUrl = apiBaseUrl;
@@ -165,4 +168,15 @@ private static async Task<FlexTariffData[]> GetFlexTariffDataAsync(string apiBas
 
 	[GeneratedRegex(@"ocpApimSubscriptionFeaturesDynamicTariffsKey:""(?<key>[^""]*)")]
 	private static partial Regex TariffApiKeyRegex();
+
+	public void Dispose()
+	{
+		_timer?.Dispose();
+	}
+
+	public async ValueTask DisposeAsync()
+	{
+		if (_timer != null)
+			await _timer.DisposeAsync();
+	}
 }

src/VattenfallDynamicPriceApi/VattenfallDynamicPriceApi.csproj

@@ -18,4 +18,10 @@
 	  </Content>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="Serilog" Version="4.3.0" />
+	  <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
+	  <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+	</ItemGroup>
+
 </Project>

src/VattenfallDynamicPriceApi/appsettings.json

@@ -1,9 +1,8 @@
 {
 	"Logging": {
-		"LogLevel": {
-			"Default": "Information",
-			"Microsoft.AspNetCore": "Warning"
-		}
+		"LogLevel": "Information",
+		"AspNetLogLevel": "Warning"
 	},
+	"RefreshIntervalSeconds": 3600,
 	"AllowedHosts": "*"
 }