diff --git a/PkSoftwareService.Custom.Backend/InMemorySink.cs b/PkSoftwareService.Custom.Backend/InMemorySink.cs new file mode 100644 index 000000000..a59c894f5 --- /dev/null +++ b/PkSoftwareService.Custom.Backend/InMemorySink.cs @@ -0,0 +1,66 @@ +using Serilog.Core; +using Serilog.Events; +using Serilog.Formatting.Display; + +namespace PkSoftwareService.Custom.Backend; + +public class InMemorySink : ILogEventSink +{ + private readonly int _capacity; + private readonly Queue _logMessages; + private readonly object _syncRoot = new object(); + private readonly MessageTemplateTextFormatter _formatter; + + /// + /// Creates a new InMemorySink. + /// + /// The output template (should match your Console sink). + /// Optional format provider. + /// Max number of messages to store. + public InMemorySink(string outputTemplate, IFormatProvider? formatProvider = null, int capacity = 20000) + { + _capacity = capacity; + _logMessages = new Queue(capacity); + _formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider); + } + + public void Emit(LogEvent logEvent) + { + // Format the log event into a string. + using var writer = new StringWriter(); + _formatter.Format(logEvent, writer); + var message = writer.ToString(); + + // Ensure thread safety while enqueuing/dequeuing. + lock (_syncRoot) + { + if (_logMessages.Count >= _capacity) + { + _logMessages.Dequeue(); // remove oldest + } + _logMessages.Enqueue(message); + } + } + + /// + /// Returns a snapshot of the current log messages. + /// + public List GetLogs() + { + lock (_syncRoot) + { + return _logMessages.Select(x => x.Trim()).ToList(); + } + } + + /// + /// Optionally clear all logs. + /// + public void Clear() + { + lock (_syncRoot) + { + _logMessages.Clear(); + } + } +} diff --git a/PkSoftwareService.Custom.Backend/PkSoftwareService.Custom.Backend.csproj b/PkSoftwareService.Custom.Backend/PkSoftwareService.Custom.Backend.csproj new file mode 100644 index 000000000..6e5fff9b8 --- /dev/null +++ b/PkSoftwareService.Custom.Backend/PkSoftwareService.Custom.Backend.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/TeslaSolarCharger.sln b/TeslaSolarCharger.sln index ada531858..a41ae7550 100644 --- a/TeslaSolarCharger.sln +++ b/TeslaSolarCharger.sln @@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeslaSolarCharger.SharedMod EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TeslaSolarCharger.Services", "TeslaSolarCharger.Services\TeslaSolarCharger.Services.csproj", "{21A8DB64-E449-474E-94DD-360C30D1756A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PkSoftwareService.Custom.Backend", "PkSoftwareService.Custom.Backend\PkSoftwareService.Custom.Backend.csproj", "{B9331EFC-2B31-4447-B6C3-3E898B560946}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -87,6 +89,10 @@ Global {21A8DB64-E449-474E-94DD-360C30D1756A}.Debug|Any CPU.Build.0 = Debug|Any CPU {21A8DB64-E449-474E-94DD-360C30D1756A}.Release|Any CPU.ActiveCfg = Release|Any CPU {21A8DB64-E449-474E-94DD-360C30D1756A}.Release|Any CPU.Build.0 = Release|Any CPU + {B9331EFC-2B31-4447-B6C3-3E898B560946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9331EFC-2B31-4447-B6C3-3E898B560946}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9331EFC-2B31-4447-B6C3-3E898B560946}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9331EFC-2B31-4447-B6C3-3E898B560946}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor index 2f4573b6a..f18168e25 100644 --- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -51,13 +51,21 @@ else + LabelText="TeslaMate Database Server Port" + UnitText="" + HelpText="You can use the internal port of the TeslaMate database container"> + + + + + Car Settings @@ -68,8 +70,8 @@ else @if (carBasicConfiguration.Item.UseFleetTelemetry && !carBasicConfiguration.Item.IncludeTrackingRelevantFields) { + NoIcon="true" + ContentAlignment="HorizontalAlignment.Left">
Home Address of Tesla is used to determine if car is at home
As tracking relevant fields are not included, the home address set in the car is used to determine if the car is at home. This means the Home Geofence set in Base Configuration is not used for this car. @@ -77,13 +79,27 @@ else @if (carBasicConfiguration.Item.UseFleetTelemetry) { + For="() => carBasicConfiguration.Item.IncludeTrackingRelevantFields" + OnValueChanged="Redraw" /> } } + @if (carBasicConfiguration.Item.ShouldBeManaged && carBasicConfiguration.Item.UseFleetTelemetry) + { +

Fleet Telemetry Config

+ @if (_fleetTelemetryConfigs.TryGetValue(carBasicConfiguration.Item.Vin, out var fleetTelemetryConfig)) + { +
+
Current Fleet Telemetry Config
+
@fleetTelemetryConfig
+
+ } + + } + @if (_vinsToShowBleTest.Contains(carBasicConfiguration.Item.Vin)) {
@@ -98,7 +114,6 @@ else

@result

- } @@ -152,6 +167,7 @@ else private Dictionary _pairingResults = new(); private Dictionary _bleTestResults = new(); private Dictionary _bleWakeUpTestResults = new(); + private Dictionary _fleetTelemetryConfigs = new(); private HashSet _loadingVins = new(); @@ -252,4 +268,19 @@ else } } + private async Task GetFleetTelemetryConfig(string vin) + { + var result = await HttpClientHelper.SendGetRequestAsync>($"api/Config/GetFleetTelemetryConfiguration?vin={Uri.EscapeDataString(vin)}"); + string stringToDisplay; + if (result.HasError) + { + stringToDisplay = result.ErrorMessage ?? "No error message"; + } + else + { + stringToDisplay = result.Data?.Value ?? "No data"; + } + _fleetTelemetryConfigs[vin] = stringToDisplay; + } + } \ No newline at end of file diff --git a/TeslaSolarCharger/Client/Pages/Support.razor b/TeslaSolarCharger/Client/Pages/Support.razor new file mode 100644 index 000000000..5f8cdfe92 --- /dev/null +++ b/TeslaSolarCharger/Client/Pages/Support.razor @@ -0,0 +1,142 @@ +@page "/support" +@using TeslaSolarCharger.Client.Helper.Contracts +@using TeslaSolarCharger.Shared.Dtos +@using TeslaSolarCharger.Shared.Dtos.Support + +@inject IHttpClientHelper HttpClientHelper +@inject ISnackbar Snackbar +@inject NavigationManager NavigationManager + +

Support

+ + +
Never share logs publicly
+ Logs might contain sensitive information like your vehicle's location. Do not share logs publicly. + +

General

+ + + +

Car Debug Details

+@if (_debugCars == default) +{ + +} +else +{ + + @foreach (var car in _debugCars) + { + +
ID: @car.Key
+
VIN: @car.Value.Vin
+
Name: @car.Value.Name
+
Is Available in Tesla account: @car.Value.IsAvailableInTeslaAccount
+
Should be managed: @car.Value.ShouldBeManaged
+ + + @if (car.Value.Vin != default && _fleetTelemetryGetConfigs.TryGetValue(car.Value.Vin, out var config)) + { +

Fleet Telemetry Config

+ 
@config
+ } + + + + @if (car.Value.Vin != default && _fleetTelemetrySetResults.TryGetValue(car.Value.Vin, out var result)) + { +

Fleet Telemetry SetResult

+ 
@result
+ } + + + + + } + +} + + + +@code { + private readonly Dictionary _fleetTelemetryGetConfigs = new(); + + private readonly Dictionary _fleetTelemetrySetResults = new(); + + private Dictionary? _debugCars; + + private bool _isFleetTelemetryLoading; + + + protected override async Task OnInitializedAsync() + { + var cars = await HttpClientHelper.SendGetRequestWithSnackbarAsync>("api/Debug/GetCars"); + if (cars != default) + { + _debugCars = cars; + } + } + + + private async Task GetFleetTelemetryConfig(string? vin) + { + if (vin == default) + { + Snackbar.Add("VIN is unknown", Severity.Error); + return; + } + + _isFleetTelemetryLoading = true; + var result = await HttpClientHelper.SendGetRequestAsync>($"api/Debug/GetFleetTelemetryConfiguration?vin={Uri.EscapeDataString(vin)}"); + string stringToDisplay; + if (result.HasError) + { + stringToDisplay = result.ErrorMessage ?? "No error message"; + } + else + { + stringToDisplay = result.Data?.Value ?? "No data"; + } + _fleetTelemetryGetConfigs[vin] = stringToDisplay; + _isFleetTelemetryLoading = false; + } + + private async Task SetFleetTelemetryConfig(string? vin, bool forceReconfiguration) + { + if (vin == default) + { + Snackbar.Add("VIN is unknown", Severity.Error); + return; + } + + _isFleetTelemetryLoading = true; + var result = await HttpClientHelper.SendPostRequestAsync>($"api/Debug/SetFleetTelemetryConfiguration?vin={Uri.EscapeDataString(vin)}&forceReconfiguration={forceReconfiguration}", null); + string stringToDisplay; + if (result.HasError) + { + stringToDisplay = result.ErrorMessage ?? "No error message"; + } + else + { + stringToDisplay = result.Data?.Value ?? "No data"; + } + _fleetTelemetrySetResults[vin] = stringToDisplay; + _isFleetTelemetryLoading = false; + } +} diff --git a/TeslaSolarCharger/Client/Shared/NavMenu.razor b/TeslaSolarCharger/Client/Shared/NavMenu.razor index fc02cbdc9..1b0937a23 100644 --- a/TeslaSolarCharger/Client/Shared/NavMenu.razor +++ b/TeslaSolarCharger/Client/Shared/NavMenu.razor @@ -36,6 +36,11 @@ Base Configuration +
+ + Support + +
Backup and Restore diff --git a/TeslaSolarCharger/Server/Controllers/ConfigController.cs b/TeslaSolarCharger/Server/Controllers/ConfigController.cs index 5204d79ff..c74b8a7b0 100644 --- a/TeslaSolarCharger/Server/Controllers/ConfigController.cs +++ b/TeslaSolarCharger/Server/Controllers/ConfigController.cs @@ -1,37 +1,29 @@ using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; using TeslaSolarCharger.Server.Contracts; -using TeslaSolarCharger.Server.Dtos.TscBackend; -using TeslaSolarCharger.Server.Services; using TeslaSolarCharger.Server.Services.Contracts; using TeslaSolarCharger.Shared.Dtos; using TeslaSolarCharger.Shared.Dtos.Contracts; -using TeslaSolarCharger.Shared.Dtos.Settings; using TeslaSolarCharger.SharedBackend.Abstracts; namespace TeslaSolarCharger.Server.Controllers { - public class ConfigController : ApiBaseController + public class ConfigController(IConfigJsonService configJsonService, + IFleetTelemetryConfigurationService fleetTelemetryConfigurationService) + : ApiBaseController { - private readonly IConfigJsonService _configJsonService; - private readonly ITeslaFleetApiService _teslaFleetApiService; - - public ConfigController(IConfigJsonService configJsonService, ITeslaFleetApiService teslaFleetApiService) - { - _configJsonService = configJsonService; - _teslaFleetApiService = teslaFleetApiService; - } /// /// Get all settings and status of all cars /// [HttpGet] - public ISettings GetSettings() => _configJsonService.GetSettings(); + public ISettings GetSettings() => configJsonService.GetSettings(); /// /// Get basic Configuration of cars, which are not often changed /// [HttpGet] - public Task> GetCarBasicConfigurations() => _configJsonService.GetCarBasicConfigurations(); + public Task> GetCarBasicConfigurations() => configJsonService.GetCarBasicConfigurations(); /// /// Update Car's configuration @@ -41,7 +33,7 @@ public ConfigController(IConfigJsonService configJsonService, ITeslaFleetApiServ [HttpPost] public Task UpdateCarBasicConfiguration(int carId, [FromBody] CarBasicConfiguration carBasicConfiguration) { - return _configJsonService.UpdateCarBasicConfiguration(carId, carBasicConfiguration); + return configJsonService.UpdateCarBasicConfiguration(carId, carBasicConfiguration); } } } diff --git a/TeslaSolarCharger/Server/Controllers/DebugController.cs b/TeslaSolarCharger/Server/Controllers/DebugController.cs new file mode 100644 index 000000000..8c4268c00 --- /dev/null +++ b/TeslaSolarCharger/Server/Controllers/DebugController.cs @@ -0,0 +1,73 @@ +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using PkSoftwareService.Custom.Backend; +using Serilog.Events; +using System.Text; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Shared.Dtos.Contracts; +using TeslaSolarCharger.SharedBackend.Abstracts; + +namespace TeslaSolarCharger.Server.Controllers; + +public class DebugController(InMemorySink inMemorySink, + Serilog.Core.LoggingLevelSwitch inMemoryLogLevelSwitch, + IFleetTelemetryConfigurationService fleetTelemetryConfigurationService,/*chaning log level switch is not tested*/ + ISettings settings, + IDebugService debugService) : ApiBaseController +{ + [HttpGet] + public IActionResult DownloadLogs() + { + // Get the logs from the in-memory sink. + var logs = inMemorySink.GetLogs(); + + // Join the log entries into a single string, separated by new lines. + var content = string.Join(Environment.NewLine, logs); + + // Convert the string content to a byte array (UTF8 encoding). + var bytes = Encoding.UTF8.GetBytes(content); + + // Return the file with the appropriate content type and file name. + return File(bytes, "text/plain", "logs.log"); + } + + /// + /// Adjusts the minimum log level for the in-memory sink. + /// + /// The new log level (e.g. Verbose, Debug, Information, Warning, Error, Fatal). + /// Status message. + [HttpPost] + public IActionResult SetLogLevel([FromQuery] string level) + { + if (!Enum.TryParse(level, true, out var newLevel)) + { + return BadRequest("Invalid log level. Use one of: Verbose, Debug, Information, Warning, Error, Fatal"); + } + inMemoryLogLevelSwitch.MinimumLevel = newLevel; + return Ok($"In-memory sink log level changed to {newLevel}"); + } + + [HttpGet] + public async Task GetFleetTelemetryConfiguration(string vin) + { + var config = await fleetTelemetryConfigurationService.GetFleetTelemetryConfiguration(vin); + var configString = JsonConvert.SerializeObject(config, Formatting.Indented); + return Ok(new DtoValue(configString)); + } + + [HttpPost] + public async Task SetFleetTelemetryConfiguration(string vin, bool forceReconfiguration) + { + var config = await fleetTelemetryConfigurationService.SetFleetTelemetryConfiguration(vin, forceReconfiguration); + var configString = JsonConvert.SerializeObject(config, Formatting.Indented); + return Ok(new DtoValue(configString)); + } + + [HttpGet] + public async Task GetCars() + { + var cars = await debugService.GetCars(); + return Ok(cars); + } +} diff --git a/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryConfigurationResult.cs b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryConfigurationResult.cs new file mode 100644 index 000000000..4fe468141 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryConfigurationResult.cs @@ -0,0 +1,14 @@ +using TeslaSolarCharger.Server.Enums; + +namespace TeslaSolarCharger.Server.Dtos.FleetTelemetry; + +public class DtoFleetTelemetryConfigurationResult +{ + public bool Success { get; set; } + public bool ConfigurationSent { get; set; } + public string? ReconfigurationReason { get; set; } + public string? ErrorMessage { get; set; } + public long? ValidUntil { get; set; } + + public TeslaFleetTelemetryConfigurationErrorType? ConfigurationErrorType { get; set; } +} diff --git a/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryErrorMessage.cs b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryErrorMessage.cs index 3e2dc2740..93073d022 100644 --- a/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryErrorMessage.cs +++ b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoFleetTelemetryErrorMessage.cs @@ -5,4 +5,5 @@ public class DtoFleetTelemetryErrorMessage public List MissingKeyVins { get; set; } = new List(); public List UnsupportedHardwareVins { get; set; } = new List(); public List UnsupportedFirmwareVins { get; set; } = new List(); + public List MaxConfigsVins { get; set; } = new List(); } diff --git a/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoGetFleetTelemetryConfiguration.cs b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoGetFleetTelemetryConfiguration.cs new file mode 100644 index 000000000..2765a3354 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/FleetTelemetry/DtoGetFleetTelemetryConfiguration.cs @@ -0,0 +1,72 @@ +using Newtonsoft.Json; + +namespace TeslaSolarCharger.Server.Dtos.FleetTelemetry; + +public class DtoGetFleetTelemetryConfiguration +{ + [JsonProperty("synced")] + public bool Synced { get; set; } + [JsonProperty("config")] + public Config? Config { get; set; } +} + +public class Config(string hostname, string ca, long exp, int port, bool preferTyped) +{ + [JsonProperty("hostname")] + public string Hostname { get; set; } = hostname; + + [JsonProperty("ca")] + public string Ca { get; set; } = ca; + + [JsonProperty("exp")] + public long Exp { get; set; } = exp; + + [JsonProperty("fields")] + public Dictionary Fields { get; set; } = new(); + [JsonProperty("alert_types")] + public List AlertTypes { get; set; } = new(); + [JsonProperty("port")] + public int Port { get; set; } = port; + [JsonProperty("prefer_typed")] + public bool PreferTyped { get; set; } = preferTyped; +} + +public class IntervalSetting +{ + [JsonConstructor] + // ReSharper disable once ConvertToPrimaryConstructor + public IntervalSetting(int intervalSeconds, int? resendIntervalSeconds = null, int? minimumDelta = null) + { + IntervalSeconds = intervalSeconds; + ResendIntervalSeconds = resendIntervalSeconds; + MinimumDelta = minimumDelta; + } + + public IntervalSetting(TimeSpan interval) + { + IntervalSeconds = (int)interval.TotalSeconds; + } + public IntervalSetting(TimeSpan interval, TimeSpan resendInterval) + { + IntervalSeconds = (int)interval.TotalSeconds; + ResendIntervalSeconds = (int)resendInterval.TotalSeconds; + } + public IntervalSetting(TimeSpan interval, int minimumDelta) + { + IntervalSeconds = (int)interval.TotalSeconds; + MinimumDelta = minimumDelta; + } + public IntervalSetting(TimeSpan interval, TimeSpan resendInterval, int minimumDelta) + { + IntervalSeconds = (int)interval.TotalSeconds; + ResendIntervalSeconds = (int)resendInterval.TotalSeconds; + MinimumDelta = minimumDelta; + } + + [JsonProperty("interval_seconds")] + public int IntervalSeconds { get; set; } + [JsonProperty("resend_interval_seconds", NullValueHandling = NullValueHandling.Ignore)] + public int? ResendIntervalSeconds { get; set; } + [JsonProperty("minimum_delta", NullValueHandling = NullValueHandling.Ignore)] + public int? MinimumDelta { get; set; } +} diff --git a/TeslaSolarCharger/Server/Enums/TeslaFleetTelemetryConfigurationErrorType.cs b/TeslaSolarCharger/Server/Enums/TeslaFleetTelemetryConfigurationErrorType.cs new file mode 100644 index 000000000..65c606f8f --- /dev/null +++ b/TeslaSolarCharger/Server/Enums/TeslaFleetTelemetryConfigurationErrorType.cs @@ -0,0 +1,9 @@ +namespace TeslaSolarCharger.Server.Enums; + +public enum TeslaFleetTelemetryConfigurationErrorType +{ + MissingKey, + UnsupportedFirmware, + UnsupportedHardware, + MaxConfigs, +} diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 35ab5f5ac..8719c0f79 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -1,7 +1,10 @@ using FluentValidation; using Microsoft.EntityFrameworkCore; +using PkSoftwareService.Custom.Backend; using Serilog; using Serilog.Context; +using Serilog.Core; +using Serilog.Events; using SharpGrip.FluentValidation.AutoValidation.Mvc.Extensions; using SharpGrip.FluentValidation.AutoValidation.Mvc.Interceptors; using System.Reflection; @@ -42,18 +45,31 @@ builder.Services.AddSharedDependencies(); builder.Services.AddServicesDependencies(); -builder.Host.UseSerilog((context, configuration) => configuration - .ReadFrom.Configuration(context.Configuration)); - builder.Services.AddFluentValidationAutoValidation(); builder.Services.AddValidatorsFromAssemblyContaining(); +builder.Host.UseSerilog(); +const string outputTemplate = "[{Timestamp:dd-MMM-yyyy HH:mm:ss.fff} {Level:u3} {SourceContext}] {Message:lj}{NewLine}{Exception}"; +var inMemoryLevelSwitch = new LoggingLevelSwitch(LogEventLevel.Verbose); +var inMemorySink = new InMemorySink(outputTemplate, capacity: 20000); + +builder.Services.AddSingleton(inMemoryLevelSwitch); +builder.Services.AddSingleton(inMemorySink); var app = builder.Build(); Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(app.Services.GetRequiredService()) - .Enrich.FromLogContext() + .MinimumLevel.Verbose()// overall minimum + .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) + .MinimumLevel.Override("System", LogEventLevel.Error) + .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning) + .MinimumLevel.Override("TeslaSolarCharger.Shared.Wrappers.ConfigurationWrapper", LogEventLevel.Information) + .MinimumLevel.Override("TeslaSolarCharger.Model.EntityFramework.DbConnectionStringHelper", LogEventLevel.Information) + .WriteTo.Console(outputTemplate: outputTemplate, restrictedToMinimumLevel: LogEventLevel.Debug) + // Send events to the in–memory sink using a sub–logger and the dynamic level switch. + .WriteTo.Logger(lc => lc + .MinimumLevel.ControlledBy(inMemoryLevelSwitch) + .WriteTo.Sink(inMemorySink)) .CreateLogger(); @@ -147,12 +163,14 @@ async Task DoStartupStuff(WebApplication webApplication, ILogger logger } } - - var tscConfigurationService = webApplication.Services.GetRequiredService(); var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); var backendApiService = webApplication.Services.GetRequiredService(); var version = await backendApiService.GetCurrentVersion().ConfigureAwait(false); + if (version != default && version.Contains('-')) + { + settings.IsPreRelease = true; + } LogContext.PushProperty("InstallationId", installationId); LogContext.PushProperty("Version", version); diff --git a/TeslaSolarCharger/Server/Scheduling/JobManager.cs b/TeslaSolarCharger/Server/Scheduling/JobManager.cs index 4e2d229d8..aaccf8976 100644 --- a/TeslaSolarCharger/Server/Scheduling/JobManager.cs +++ b/TeslaSolarCharger/Server/Scheduling/JobManager.cs @@ -101,6 +101,8 @@ public async Task StartJobs() .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(59)).Build(); var fleetApiTokenRefreshTrigger = TriggerBuilder.Create().WithIdentity("fleetApiTokenRefreshTrigger") + //start 5 seconds later, so backend token is already refreshed + .StartAt(currentDate.AddSeconds(5)) .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(58)).Build(); var vehicleDataRefreshTrigger = TriggerBuilder.Create().WithIdentity("vehicleDataRefreshTrigger") @@ -118,12 +120,13 @@ public async Task StartJobs() var errorDetectionTrigger = TriggerBuilder.Create() .WithIdentity("errorDetectionTrigger") - .StartAt(latestTriggerStartTime.Add(TimeSpan.FromSeconds(5))) + .StartAt(latestTriggerStartTime.Add(TimeSpan.FromSeconds(12))) .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(62)).Build(); var bleApiVersionDetectionTrigger = TriggerBuilder.Create().WithIdentity("bleApiVersionDetectionTrigger") .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(61)).Build(); var fleetTelemetryReconnectionTrigger = TriggerBuilder.Create().WithIdentity("fleetTelemetryReconnectionTrigger") + .StartAt(currentDate.AddSeconds(10)) .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(61)).Build(); var random = new Random(); diff --git a/TeslaSolarCharger/Server/Scheduling/Jobs/FleetTelemetryReconnectionJob.cs b/TeslaSolarCharger/Server/Scheduling/Jobs/FleetTelemetryReconnectionJob.cs index 46a899251..950701a88 100644 --- a/TeslaSolarCharger/Server/Scheduling/Jobs/FleetTelemetryReconnectionJob.cs +++ b/TeslaSolarCharger/Server/Scheduling/Jobs/FleetTelemetryReconnectionJob.cs @@ -5,11 +5,13 @@ namespace TeslaSolarCharger.Server.Scheduling.Jobs; public class FleetTelemetryReconnectionJob( ILogger logger, - IFleetTelemetryWebSocketService service) : IJob + IFleetTelemetryWebSocketService service, + IFleetTelemetryConfigurationService fleetTelemetryConfigurationService) : IJob { public async Task Execute(IJobExecutionContext context) { logger.LogTrace("{method}({context})", nameof(Execute), context); + await fleetTelemetryConfigurationService.ReconfigureAllCarsIfRequired(); await service.ReconnectWebSocketsForEnabledCars(); } } diff --git a/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs b/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs index e008e785c..af20d6326 100644 --- a/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs +++ b/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs @@ -115,6 +115,8 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi .AddTransient() .AddTransient() .AddTransient() + .AddTransient() + .AddTransient() //Needs to be Singleton due to WebSocketConnections and property updated dictionary .AddSingleton() .AddSingleton() diff --git a/TeslaSolarCharger/Server/Services/BackendApiService.cs b/TeslaSolarCharger/Server/Services/BackendApiService.cs index 77b954d21..235bc23a6 100644 --- a/TeslaSolarCharger/Server/Services/BackendApiService.cs +++ b/TeslaSolarCharger/Server/Services/BackendApiService.cs @@ -373,7 +373,7 @@ public async Task IsFleetApiLicensed(string vin, bool useCache) { var problemDetails = await response.Content.ReadFromJsonAsync(); var message = problemDetails != null - ? $"Cloud Error: {problemDetails.Detail}" + ? $"Cloud Error: Status Code: {response.StatusCode}, ProblemDetails: {problemDetails.Detail}" : "An error occurred while retrieving data from the backend server."; return new Dtos.Result(default, message, problemDetails); diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs index 7c5c74384..c0fdc21a9 100644 --- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs +++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs @@ -360,6 +360,27 @@ private async Task> GetCars() OtherCommandCalls = c.OtherCommandCalls, }) .ToListAsync().ConfigureAwait(false); + var teslaMateContext = teslaMateDbContextWrapper.GetTeslaMateContextIfAvailable(); + if (configurationWrapper.UseTeslaMateIntegration() && (teslaMateContext != default)) + { + foreach (var car in cars) + { + if (!string.IsNullOrEmpty(car.Vin)) + { + var teslaMateCarId = await teslaMateContext.Cars + .Where(c => c.Vin == car.Vin) + .Select(c => c.Id) + .FirstOrDefaultAsync(); + if (teslaMateCarId != default && car.TeslaMateCarId != teslaMateCarId) + { + var dbCar = await teslaSolarChargerContext.Cars.FirstAsync(c => c.Id == car.Id); + dbCar.TeslaMateCarId = teslaMateCarId; + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + car.TeslaMateCarId = teslaMateCarId; + } + } + } + } foreach (var car in cars) { var fleetTelemetryConfiguration = await teslaSolarChargerContext.Cars diff --git a/TeslaSolarCharger/Server/Services/Contracts/IDebugService.cs b/TeslaSolarCharger/Server/Services/Contracts/IDebugService.cs new file mode 100644 index 000000000..ae9da1632 --- /dev/null +++ b/TeslaSolarCharger/Server/Services/Contracts/IDebugService.cs @@ -0,0 +1,8 @@ +using TeslaSolarCharger.Shared.Dtos.Support; + +namespace TeslaSolarCharger.Server.Services.Contracts; + +public interface IDebugService +{ + Task> GetCars(); +} diff --git a/TeslaSolarCharger/Server/Services/Contracts/IFleetTelemetryConfigurationService.cs b/TeslaSolarCharger/Server/Services/Contracts/IFleetTelemetryConfigurationService.cs new file mode 100644 index 000000000..e4515206a --- /dev/null +++ b/TeslaSolarCharger/Server/Services/Contracts/IFleetTelemetryConfigurationService.cs @@ -0,0 +1,10 @@ +using TeslaSolarCharger.Server.Dtos.FleetTelemetry; + +namespace TeslaSolarCharger.Server.Services.Contracts; + +public interface IFleetTelemetryConfigurationService +{ + Task GetFleetTelemetryConfiguration(string vin); + Task SetFleetTelemetryConfiguration(string vin, bool forceReconfiguration); + Task ReconfigureAllCarsIfRequired(); +} diff --git a/TeslaSolarCharger/Server/Services/DebugService.cs b/TeslaSolarCharger/Server/Services/DebugService.cs new file mode 100644 index 000000000..3e9fad4e4 --- /dev/null +++ b/TeslaSolarCharger/Server/Services/DebugService.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore; +using TeslaSolarCharger.Model.Contracts; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Dtos.Support; + +namespace TeslaSolarCharger.Server.Services; + +public class DebugService(ILogger logger, + ITeslaSolarChargerContext context) : IDebugService +{ + public async Task> GetCars() + { + logger.LogTrace("{method}", nameof(GetCars)); + var cars = await context.Cars + .Where(x => x.Vin != null) + .ToDictionaryAsync(x => x.Id, x => new DtoDebugCar() + { + Name = x.Name, + Vin = x.Vin, + ShouldBeManaged = x.ShouldBeManaged == true, + IsAvailableInTeslaAccount = x.IsAvailableInTeslaAccount, + }).ConfigureAwait(false); + logger.LogDebug("Found {carCount} cars", cars.Count); + return cars; + } +} diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryConfigurationService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryConfigurationService.cs new file mode 100644 index 000000000..9257abe3d --- /dev/null +++ b/TeslaSolarCharger/Server/Services/FleetTelemetryConfigurationService.cs @@ -0,0 +1,197 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; +using TeslaSolarCharger.Model.Contracts; +using TeslaSolarCharger.Server.Dtos.FleetTelemetry; +using TeslaSolarCharger.Server.Enums; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Enums; +using TeslaSolarCharger.Shared.Resources.Contracts; + +namespace TeslaSolarCharger.Server.Services; + +public class FleetTelemetryConfigurationService(ILogger logger, + IBackendApiService backendApiService, + ITeslaSolarChargerContext teslaSolarChargerContext, + ITscConfigurationService tscConfigurationService, + ITeslaFleetApiService teslaFleetApiService, + IConstants constants, + IMemoryCache memoryCache, + IDateTimeProvider dateTimeProvider) : IFleetTelemetryConfigurationService +{ + public async Task GetFleetTelemetryConfiguration(string vin) + { + logger.LogTrace("{method}({vin})", nameof(GetFleetTelemetryConfiguration), vin); + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + var fleetApiProxyRequired = await teslaFleetApiService.IsFleetApiProxyEnabled(vin).ConfigureAwait(false); + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) + { + logger.LogError("Decryption key not found do not send command"); + throw new InvalidOperationException("Decryption key not found do not send command"); + } + var result = await backendApiService.SendRequestToBackend(HttpMethod.Get, token.AccessToken, + $"FleetTelemetryConfiguration/GetFleetTelemetryConfiguration?encryptionKey={Uri.EscapeDataString(decryptionKey)}&vin={vin}&carRequiresProxy={fleetApiProxyRequired.Value}", null); + if (result.HasError) + { + throw new InvalidOperationException(result.ErrorMessage); + } + + if (result.Data == default) + { + throw new InvalidOperationException("No data returned from backend"); + } + return result.Data; + } + + public async Task SetFleetTelemetryConfiguration(string vin, bool forceReconfiguration) + { + logger.LogTrace("{method}({vin}, {forceReconfiguration})", nameof(SetFleetTelemetryConfiguration), vin, forceReconfiguration); + if (!await backendApiService.IsBaseAppLicensed(true)) + { + logger.LogWarning("Base App is not licensed, do not connect to Fleet Telemetry"); + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = "Can not configure Fleet Telemetry as TSC is not licensed", + }; + } + var carSettings = teslaSolarChargerContext.Cars + .Where(c => c.Vin == vin) + .Select(c => new + { + c.IncludeTrackingRelevantFields, + c.IsFleetTelemetryHardwareIncompatible, + }) + .FirstOrDefault(); + if (carSettings == default) + { + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = "Car not found in local TSC database", + }; + } + + if (carSettings.IsFleetTelemetryHardwareIncompatible) + { + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = "Car hardware is not compatible with fleet telemetry", + ConfigurationErrorType = TeslaFleetTelemetryConfigurationErrorType.UnsupportedHardware, + }; + } + if (carSettings.IncludeTrackingRelevantFields && (!await backendApiService.IsFleetApiLicensed(vin, true))) + { + logger.LogWarning("Car {vin} is not licensed for Fleet API, do not connect as IncludeTrackingRelevant fields is enabled", vin); + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = "Fleet API license required for car {vin} as Include Tracking Relevant Fields is enabled", + }; + } + + + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + //Fleet API Proxy is required to set fleet Telemetry configuration + var fleetApiProxyRequired = true; + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) + { + logger.LogError("Decryption key not found do not send command"); + throw new InvalidOperationException("Decryption key not found do not send command"); + } + var result = await backendApiService.SendRequestToBackend(HttpMethod.Post, token.AccessToken, + $"FleetTelemetryConfiguration/SetFleetTelemetryConfiguration?encryptionKey={Uri.EscapeDataString(decryptionKey)}&vin={vin}&carRequiresProxy={fleetApiProxyRequired}&includeTrackingRelevantFields={carSettings.IncludeTrackingRelevantFields}&forceReconfiguration={forceReconfiguration}", null); + if (result.HasError) + { + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = result.ErrorMessage, + }; + } + var cloudData = result.Data; + if (cloudData == default) + { + return new DtoFleetTelemetryConfigurationResult + { + Success = false, + ErrorMessage = "No data returned from backend", + }; + } + + if (cloudData.ConfigurationErrorType != default) + { + logger.LogError("Error setting fleet telemetry configuration: {errorType}", cloudData.ConfigurationErrorType); + var car = await teslaSolarChargerContext.Cars.FirstAsync(c => c.Vin == vin); + switch (cloudData.ConfigurationErrorType) + { + case TeslaFleetTelemetryConfigurationErrorType.MissingKey: + car.TeslaFleetApiState = TeslaCarFleetApiState.NotWorking; + break; + case TeslaFleetTelemetryConfigurationErrorType.UnsupportedFirmware: + logger.LogWarning("Disable Fleet Telemetry for car {vin} as firmware is not supported", vin); + car.UseFleetTelemetry = false; + car.IncludeTrackingRelevantFields = false; + break; + case TeslaFleetTelemetryConfigurationErrorType.UnsupportedHardware: + logger.LogWarning("Disable Fleet Telemetry for car {vin} as hardware is not supported", vin); + car.IsFleetTelemetryHardwareIncompatible = true; + car.UseFleetTelemetry = false; + car.IncludeTrackingRelevantFields = false; + break; + case TeslaFleetTelemetryConfigurationErrorType.MaxConfigs: + logger.LogWarning("Disable Fleet Telemetry for car {vin} as max configurations reached", vin); + car.UseFleetTelemetry = false; + car.IncludeTrackingRelevantFields = false; + break; + case null: + break; + default: + throw new ArgumentOutOfRangeException(); + } + await teslaSolarChargerContext.SaveChangesAsync(); + } + return cloudData; + } + + public async Task ReconfigureAllCarsIfRequired() + { + logger.LogTrace("{method}", nameof(ReconfigureAllCarsIfRequired)); + var cars = await teslaSolarChargerContext.Cars + .Where(c => c.UseFleetTelemetry + && (c.ShouldBeManaged == true) + && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotWorking) + && (c.TeslaFleetApiState != TeslaCarFleetApiState.OpenedLinkButNotTested) + && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotConfigured) + && (c.IsFleetTelemetryHardwareIncompatible == false)) + .Select(c => new { c.Vin, IncludeTrackingRelevantFields = c.IncludeTrackingRelevantFields, }) + .ToListAsync(); + var currentDate = dateTimeProvider.DateTimeOffSetUtcNow(); + foreach (var car in cars) + { + if (car.Vin == default) + { + continue; + } + var reconfigurationRequired = + !memoryCache.TryGetValue(constants.FleetTelemetryConfigurationExpiryKey + car.Vin, out DateTimeOffset expiryTime); + if(!reconfigurationRequired) + { + reconfigurationRequired = expiryTime < currentDate; + } + if (!reconfigurationRequired) + { + logger.LogDebug("Fleet Telemetry reconfiguration for car {vin} not required as expires in the future", car.Vin); + continue; + } + var result = await SetFleetTelemetryConfiguration(car.Vin, false); + if (result.Success && (result.ValidUntil != default)) + { + memoryCache.Set(constants.FleetTelemetryConfigurationExpiryKey + car.Vin, DateTimeOffset.FromUnixTimeSeconds(result.ValidUntil.Value)); + } + } + } +} diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs index 6f314ba29..e3379d109 100644 --- a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs +++ b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs @@ -104,7 +104,7 @@ await existingClient.WebSocketClient.SendAsync(segment, WebSocketMessageType.Tex Clients.Remove(existingClient); } - ConnectToFleetTelemetryApi(car.Vin, car.IncludeTrackingRelevantFields); + ConnectToFleetTelemetryApi(car.Vin); } } @@ -126,24 +126,15 @@ await client.WebSocketClient } } - private async Task ConnectToFleetTelemetryApi(string vin, bool includeTrackingRelevantFields) + private async Task ConnectToFleetTelemetryApi(string vin) { logger.LogTrace("{method}({carId})", nameof(ConnectToFleetTelemetryApi), vin); var scope = serviceProvider.CreateScope(); var dateTimeProvider = scope.ServiceProvider.GetRequiredService(); var configurationWrapper = scope.ServiceProvider.GetRequiredService(); var context = scope.ServiceProvider.GetRequiredService(); - var tscConfigurationService = scope.ServiceProvider.GetRequiredService(); - var constants = scope.ServiceProvider.GetRequiredService(); var currentDate = dateTimeProvider.UtcNow(); - var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); - if (decryptionKey == default) - { - logger.LogError("Decryption key not found do not send command"); - throw new InvalidOperationException("No Decryption key found."); - } - var url = configurationWrapper.FleetTelemetryApiUrl() + - $"vin={vin}&forceReconfiguration=false&includeTrackingRelevantFields={includeTrackingRelevantFields}&encryptionKey={Uri.EscapeDataString(decryptionKey)}"; + var url = configurationWrapper.FleetTelemetryApiUrl() + $"vin={vin}"; var authToken = await context.BackendTokens.AsNoTracking().SingleOrDefaultAsync(); if(authToken == default) { @@ -388,24 +379,29 @@ private async Task HandleErrorMessage(string jsonMessage) { continue; } - logger.LogInformation("Set Fleet API state for car {vin} to not working", vin); + logger.LogError("Set Fleet API state for car {vin} to not working", vin); car.TeslaFleetApiState = TeslaCarFleetApiState.NotWorking; await context.SaveChangesAsync(); } foreach (var vin in message.UnsupportedFirmwareVins) { - logger.LogInformation("Disable Fleet Telemetry for car {vin} as firmware is not supported", vin); + logger.LogError("Disable Fleet Telemetry for car {vin} as firmware is not supported", vin); await DisableFleetTelemetryForCar(vin).ConfigureAwait(false); } foreach (var vin in message.UnsupportedHardwareVins) { - logger.LogInformation("Disable Fleet Telemetry for car {vin} as hardware is not supported", vin); + logger.LogError("Disable Fleet Telemetry for car {vin} as hardware is not supported", vin); await SetCarToFleetTelemetryHardwareIncompatible(vin).ConfigureAwait(false); await DisableFleetTelemetryForCar(vin).ConfigureAwait(false); } + foreach (var vin in message.MaxConfigsVins) + { + logger.LogError("Car {vin} has already has max allowed Fleet Telemetry configs", vin); + } + return true; } diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs index 1db6d9992..de49e5864 100644 --- a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs +++ b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs @@ -421,6 +421,10 @@ private async Task RefreshVehicleOnlineState(DtoCar car) else { carStateLog.BooleanValue = false; + if (car.State == CarStateEnum.Asleep || car.State == CarStateEnum.Offline) + { + car.State = CarStateEnum.Online; + } } teslaSolarChargerContext.CarValueLogs.Add(carStateLog); await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); diff --git a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj index e57fc5703..0e318cb45 100644 --- a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj +++ b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -65,8 +65,6 @@ - - @@ -74,6 +72,7 @@ + diff --git a/TeslaSolarCharger/Server/appsettings.Development.json b/TeslaSolarCharger/Server/appsettings.Development.json index 424d49e0f..6536ed37f 100644 --- a/TeslaSolarCharger/Server/appsettings.Development.json +++ b/TeslaSolarCharger/Server/appsettings.Development.json @@ -1,46 +1,10 @@ { - "Serilog": { - "Using": [ - "Serilog.Sinks.Console", - "Serilog.Sinks.Seq" - ], - "MinimumLevel": { - "Default": "Verbose", - "Override": { - "Microsoft": "Information", - "System": "Error", - "Microsoft.EntityFrameworkCore.Database.Command": "Information", - "Quartz": "Warning", - "TeslaSolarCharger.Server.Scheduling": "Information" - } - }, - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss.fff} {Level:u3} {SourceContext}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "Seq", - "Args": { - "serverUrl": "https://www.teslasolarcharger.de/seq-logging", - "restrictedToMinimumLevel": "Warning", - "outputTemplate": "[{Timestamp:dd-MMM-yyyy HH:mm:ss.fff} {Level:u3} {SourceContext} {InstallationId} {Version}] {Message:lj}{NewLine}{Exception}" - } - } - ], - "Enrich": [ - "FromLogContext" - ] - }, "AllowedHosts": "*", "AllowCORS": true, "DisplayApiRequestCounter": true, "ShouldUseFakeSolarValues": true, "IgnoreSslErrors": true, "BleBaseUrl": "http://raspible:7210/", - //"FleetTelemetryApiUrl": "wss://localhost:7281/ws?", "GridPriceProvider": { "EnergyProvider": "Tibber", "Octopus": { diff --git a/TeslaSolarCharger/Server/appsettings.json b/TeslaSolarCharger/Server/appsettings.json index e7b12f8fd..5ff48ea27 100644 --- a/TeslaSolarCharger/Server/appsettings.json +++ b/TeslaSolarCharger/Server/appsettings.json @@ -1,40 +1,4 @@ { - "Serilog": { - "Using": [ - "Serilog.Sinks.Console", - "Serilog.Sinks.Seq" - ], - "MinimumLevel": { - "Default": "Debug", - "Enrich": [ "SourceContext" ], - "Override": { - "Microsoft": "Warning", - "System": "Error", - "Microsoft.EntityFrameworkCore.Database.Command": "Warning", - "TeslaSolarCharger.Shared.Wrappers.ConfigurationWrapper": "Information", - "TeslaSolarCharger.Model.EntityFramework.DbConnectionStringHelper": "Information" - } - }, - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:dd-MMM-yyyy HH:mm:ss.fff} {Level:u3} {SourceContext}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "Seq", - "Args": { - "serverUrl": "https://seq-logging.teslasolarcharger.de/", - "restrictedToMinimumLevel": "Warning", - "outputTemplate": "[{Timestamp:dd-MMM-yyyy HH:mm:ss.fff} {Level:u3} {SourceContext} {InstallationId} {Version}] {Message:lj}{NewLine}{Exception}" - } - } - ], - "Enrich": [ - "FromLogContext" - ] - }, "AllowedHosts": "*", "ConfigFileLocation": "configs", "BackupCopyDestinationDirectory": "backups", @@ -59,6 +23,7 @@ "IgnoreSslErrors": false, "FleetApiClientId": "f29f71d6285a-4873-8b6b-80f15854892e", "BackendApiBaseUrl": "https://api.solar4car.com/api/", + "BetaBackendApiBaseUrl": "https://beta.api.solar4car.com/api/", "UseFleetApiProxy": false, "LogLocationData": false, "SendTeslaApiStatsToBackend": true, @@ -72,7 +37,8 @@ "CarRefreshAfterCommandSeconds": 11, "BleUsageStopAfterErrorSeconds": 300, "FleetApiRefreshIntervalSeconds": 500, - "FleetTelemetryApiUrl": "wss://api.fleet-telemetry.solar4car.com/ws?", + "FleetTelemetryApiUrl": "wss://api.fleet-telemetry.solar4car.com/notokenws?", + "BetaFleetTelemetryApiUrl": "wss://beta.api.fleet-telemetry.solar4car.com/notokenws?", "BackendPasswordDefaultLength": 25, "GridPriceProvider": { "EnergyProvider": "FixedPrice", diff --git a/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs b/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs index cabf59c04..b7c0fe571 100644 --- a/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs +++ b/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs @@ -25,4 +25,5 @@ public interface ISettings string? ChargePricesUpdateText { get; set; } DateTime StartupTime { get; set; } int LastPvDemoCase { get; set; } + bool IsPreRelease { get; set; } } diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs b/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs index 70a165d7b..b8563315d 100644 --- a/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs +++ b/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs @@ -34,4 +34,6 @@ public class Settings : ISettings public string? ChargePricesUpdateText { get; set; } public int LastPvDemoCase { get; set; } + + public bool IsPreRelease { get; set; } } diff --git a/TeslaSolarCharger/Shared/Dtos/Support/DtoDebugCar.cs b/TeslaSolarCharger/Shared/Dtos/Support/DtoDebugCar.cs new file mode 100644 index 000000000..e493e251e --- /dev/null +++ b/TeslaSolarCharger/Shared/Dtos/Support/DtoDebugCar.cs @@ -0,0 +1,9 @@ +namespace TeslaSolarCharger.Shared.Dtos.Support; + +public class DtoDebugCar +{ + public string? Vin { get; set; } + public string? Name { get; set; } + public bool ShouldBeManaged { get; set; } + public bool IsAvailableInTeslaAccount { get; set; } +} diff --git a/TeslaSolarCharger/Shared/Resources/Constants.cs b/TeslaSolarCharger/Shared/Resources/Constants.cs index 924a25670..6b8087587 100644 --- a/TeslaSolarCharger/Shared/Resources/Constants.cs +++ b/TeslaSolarCharger/Shared/Resources/Constants.cs @@ -44,6 +44,7 @@ public class Constants : IConstants public string BackendTokenStateKey => "BackendTokenState"; public string IsBaseAppLicensedKey => "IsBaseAppLicensed"; public string IsFleetApiLicensedKey => "IsFleetApiLicensed_"; + public string FleetTelemetryConfigurationExpiryKey => "FleetTelemetryConfigurationExpiry_"; public string GridPoleIcon => "power-pole"; } diff --git a/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs b/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs index 251901a17..7878ed5d9 100644 --- a/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs +++ b/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs @@ -44,4 +44,5 @@ public interface IConstants string BackendTokenStateKey { get; } string IsBaseAppLicensedKey { get; } string IsFleetApiLicensedKey { get; } + string FleetTelemetryConfigurationExpiryKey { get; } } diff --git a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj index cd080f382..ee0aa8a3d 100644 --- a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj +++ b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj @@ -12,6 +12,7 @@ + diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 33d5ffbc8..6cf8c48db 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Newtonsoft.Json; +using System.Configuration; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; using TeslaSolarCharger.Shared.Dtos.Contracts; @@ -209,6 +210,11 @@ public bool SendTeslaApiStatsToBackend() public string BackendApiBaseUrl() { var environmentVariableName = "BackendApiBaseUrl"; + if (settings.IsPreRelease) + { + logger.LogInformation("Use beta endpoints as is prerelease"); + environmentVariableName = "Beta" + environmentVariableName; + } var value = configuration.GetValue(environmentVariableName); return value; } @@ -216,6 +222,11 @@ public string BackendApiBaseUrl() public string FleetTelemetryApiUrl() { var environmentVariableName = "FleetTelemetryApiUrl"; + if (settings.IsPreRelease) + { + logger.LogInformation("Use beta endpoints as is prerelease"); + environmentVariableName = "Beta" + environmentVariableName; + } var value = configuration.GetValue(environmentVariableName); return value; }