diff --git a/.gitignore b/.gitignore index add57be..00b17c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,698 @@ -bin/ -obj/ -/packages/ -riderModule.iml -/_ReSharper.Caches/ \ No newline at end of file +# +# Generate by Git Ignore Generator for MacOS# + +macOS + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +Windows + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +JetBrains + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +# JetBrains - Path + +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +Rider + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +VisualStudio + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +VisualStudioCode + +.vscode/* +!.vscode/tasks.json +!.vscode/launch.json +*.code-workspace + +# VisualStudioCode - Path + +# Ignore all local history of files +.history +.ionide + +JetBrains+all + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +# JetBrains+all - Path + +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +# Sonarlint plugin +.idea/sonarlint + diff --git a/Automatic Parking.sln b/Automatic Parking.sln deleted file mode 100644 index a55ff74..0000000 --- a/Automatic Parking.sln +++ /dev/null @@ -1,8 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Source/Automatic Parking.sln b/Source/Automatic Parking.sln new file mode 100644 index 0000000..9e928dc --- /dev/null +++ b/Source/Automatic Parking.sln @@ -0,0 +1,21 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProofOfConcept", "ProofOfConcept\ProofOfConcept.csproj", "{93F01B86-2434-42E2-AE67-774BA61CFF7B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{76B8DCB6-06D8-4E9B-8144-693F7FC28DB9}" + ProjectSection(SolutionItems) = preProject + compose.yaml = compose.yaml + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {93F01B86-2434-42E2-AE67-774BA61CFF7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93F01B86-2434-42E2-AE67-774BA61CFF7B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93F01B86-2434-42E2-AE67-774BA61CFF7B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93F01B86-2434-42E2-AE67-774BA61CFF7B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Source/ProofOfConcept/Dockerfile b/Source/ProofOfConcept/Dockerfile index b944092..d5c64c3 100644 --- a/Source/ProofOfConcept/Dockerfile +++ b/Source/ProofOfConcept/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["ProofOfConcept/ProofOfConcept.csproj", "ProofOfConcept/"] diff --git a/Source/ProofOfConcept/Program.cs b/Source/ProofOfConcept/Program.cs new file mode 100644 index 0000000..3a66953 --- /dev/null +++ b/Source/ProofOfConcept/Program.cs @@ -0,0 +1,31 @@ +using Microsoft.Extensions.Caching.Memory; +using ProofOfConcept.Services; + +var builder = WebApplication.CreateSlimBuilder(args); + +// builder.Services.ConfigureHttpJsonOptions(options => { options.SerializerOptions.TypeInfoResolverChain.Insert(0, AppJsonSerializerContext.Default); }); + +builder.Services.AddOpenApi(); +builder.Services.AddMediator(); +builder.Services.AddMemoryCache(); +builder.Services.AddHybridCache(); + +builder.Services.AddSingleton(); + +builder.Services.AddHostedService(); +builder.Services.AddHostedService(); + +var app = builder.Build(); + +if (app.Environment.IsDevelopment()) +{ + app.MapOpenApi(); +} + +//Map tesla required public key file +app.MapGet("/.well-known/appspecific/com.tesla.3p.public-key.pem", (IMemoryCache memoryCache) => memoryCache.GetOrCreateAsync("publicKeyCert", async (_) => await File.ReadAllTextAsync("Resources/Signature/public-key.pem"))); + +//Map an under constrcution page... +app.Map("/", ()=> "Under construction..."); + +app.Run(); \ No newline at end of file diff --git a/Source/ProofOfConcept/ProofOfConcept.csproj b/Source/ProofOfConcept/ProofOfConcept.csproj new file mode 100644 index 0000000..ef4e7da --- /dev/null +++ b/Source/ProofOfConcept/ProofOfConcept.csproj @@ -0,0 +1,42 @@ + + + + net10.0 + enable + enable + true + true + true + Linux + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + .dockerignore + + + + + + + + + + + PreserveNewest + + + + diff --git a/Source/ProofOfConcept/Services/MQTTClient.cs b/Source/ProofOfConcept/Services/MQTTClient.cs index b4b6913..8d26691 100644 --- a/Source/ProofOfConcept/Services/MQTTClient.cs +++ b/Source/ProofOfConcept/Services/MQTTClient.cs @@ -1,20 +1,61 @@ +using Microsoft.Extensions.Options; +using MQTTnet; + namespace ProofOfConcept.Services; -public class MQTTClient +public class MQTTClient : IHostedService { private ILogger logger; private MQTTClientConfiguration configuration; + private MQTTServerConfiguration serverConfiguration; - public MQTTClient(ILogger logger, IOptionsMonitor options) + private readonly IMqttClient client; + + public MQTTClient(ILogger logger, IOptions options, IOptions serverOptions, IMessageProcessor messageProcessor) { this.logger = logger; - this.configuration = options.CurrentValue; - - options.OnChange(newValue => + this.configuration = options.Value; + this.serverConfiguration = serverOptions.Value; + + client = new MqttClientFactory().CreateMqttClient(); + + this.client.ApplicationMessageReceivedAsync += (e) => { - this.configuration = newValue; - logger.LogInformation("Configuration of {ClassName} changed", nameof(MQTTClient)); - }); + logger.LogInformation("Message received: {Message}", e.ApplicationMessage.Payload); + messageProcessor.ProcessMessage(e.ApplicationMessage.Payload.ToString()); + return Task.CompletedTask; + }; + } + + public async Task StartAsync(CancellationToken cancellationToken) + { + this.logger.LogTrace("Stating..."); + + MqttClientOptions options = new MqttClientOptionsBuilder() + .WithTcpServer("localhost", this.serverConfiguration.Port) + .WithClientId(this.serverConfiguration.LocalClient.ClientID) + .WithCredentials(this.serverConfiguration.LocalClient.Username, this.serverConfiguration.LocalClient.Password) + .Build(); + await this.client.ConnectAsync(options, cancellationToken); + this.logger.LogTrace("Connected"); + + await this.client.SubscribeAsync("telemetry", cancellationToken: cancellationToken); + this.logger.LogTrace("Subscribed"); + + this.logger.LogInformation("Started"); + } + + public async Task StopAsync(CancellationToken cancellationToken) + { + logger.LogTrace("Stopping..."); + + await this.client.UnsubscribeAsync("telemetry", cancellationToken: cancellationToken); + this.logger.LogTrace("Unsubscribed"); + + await this.client.DisconnectAsync(cancellationToken: cancellationToken); + this.logger.LogTrace("Disconnected"); + + logger.LogInformation("Stopped"); } } diff --git a/Source/ProofOfConcept/Services/MQTTServer.cs b/Source/ProofOfConcept/Services/MQTTServer.cs index 02102d7..cb1f2d9 100644 --- a/Source/ProofOfConcept/Services/MQTTServer.cs +++ b/Source/ProofOfConcept/Services/MQTTServer.cs @@ -1,24 +1,154 @@ +using System.Net; +using Microsoft.Extensions.Options; +using MQTTnet.Protocol; +using MQTTnet.Server; + namespace ProofOfConcept.Services; -public class MQTTServer +public class MQTTServer : IHostedService { - private ILogger logger; - private MQTTServerConfiguration configuration; + private readonly ILogger logger; + private readonly MQTTServerConfiguration configuration; - public MQTTServer(ILogger logger, IOptionsMonitor options) + private readonly MqttServer server; + + public MQTTServer(ILogger logger, IOptions options) { this.logger = logger; - this.configuration = options.CurrentValue; + this.configuration = options.Value; - options.OnChange(newValue => + MqttServerOptions mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().WithDefaultEndpointPort(this.configuration.Port).WithKeepAlive().Build(); + this.server = new MqttServerFactory().CreateMqttServer(mqttServerOptions); + + this.server.ClientConnectedAsync += (e) => { - this.configuration = newValue; - logger.LogInformation("Configuration of {ClassName} changed", nameof(MQTTServer)); - }); + logger.LogInformation("Client connected from: {IPAddress}. ClientID: {ClientID}", e.RemoteEndPoint.ToString(), e.ClientId); + return Task.CompletedTask; + }; + + this.server.ClientDisconnectedAsync += (e) => + { + logger.LogInformation("Client {ClientID} disconnected from: {IPAddress}. Reason: {ReasonString} ({ReasonCode})", e.ClientId, e.RemoteEndPoint.ToString(), e.ReasonString, e.ReasonCode); + return Task.CompletedTask; + }; + + this.server.ClientSubscribedTopicAsync += (e) => + { + logger.LogInformation("Client {ClientID} subscribed to topic: {Topic}", e.ClientId, e.TopicFilter.Topic); + return Task.CompletedTask; + }; + + this.server.ClientUnsubscribedTopicAsync += (e) => + { + logger.LogInformation("Client {ClientID} unsubscribed from topic: {Topic}", e.ClientId, e.TopicFilter); + return Task.CompletedTask; + }; + + this.server.InterceptingPublishAsync += (e) => + { + if (e.ApplicationMessage.Topic == "telemetry" && e.ClientId != this.configuration.TelemetryClient.ClientID) + { + logger.LogWarning("Client {ClientID} tried to publish to telemetry topic", e.ClientId); + + e.Response.ReasonCode = MqttPubAckReasonCode.NotAuthorized; + return Task.CompletedTask; + } + + logger.LogInformation("Client {ClientID} published message to topic: {Topic}", e.ClientId, e.ApplicationMessage.Topic); + return Task.CompletedTask; + }; + + this.server.ValidatingConnectionAsync += (e) => + { + //Local client (by clientID) + if (e.ClientId == this.configuration.LocalClient.ClientID) + { + //Not local connection (IP is not loopback) + if (e.RemoteEndPoint is IPEndPoint ipEndPoint && !IPAddress.IsLoopback(ipEndPoint.Address)) + { + logger.LogWarning("Local client tried to connect from non-loopback address: {IPAddress}", ipEndPoint.ToString()); + e.ReasonCode = MqttConnectReasonCode.NotAuthorized; + } + + //Invalid username or password + else if (e.UserName != configuration.LocalClient.Username || e.Password != configuration.LocalClient.Password) + { + logger.LogWarning("Local client tried to connect with invalid credentials"); + e.ReasonCode = MqttConnectReasonCode.NotAuthorized; + } + } + + //Telemetry client + else if (e.ClientId == this.configuration.TelemetryClient.ClientID) + { + if (e.UserName != configuration.TelemetryClient.Username || e.Password != configuration.TelemetryClient.Password) + { + logger.LogWarning("Telemetry client tried to connect with invalid credentials"); + e.ReasonCode = MqttConnectReasonCode.NotAuthorized; + } + } + + //Observer + else if ((this.configuration.Observer.ClientID is not null && e.ClientId == this.configuration.Observer.ClientID) || this.configuration.Observer.ClientID is null) + { + if (e.UserName != configuration.Observer.Username || e.Password != configuration.Observer.Password) + { + logger.LogWarning("Observer tried to connect with invalid credentials"); + e.ReasonCode = MqttConnectReasonCode.NotAuthorized; + } + } + + else + e.ReasonCode = MqttConnectReasonCode.Banned; + + return Task.CompletedTask; + }; + } + + public async Task StartAsync(CancellationToken cancellationToken) + { + this.logger.LogTrace("Starting MQTT Server..."); + + await this.server.StartAsync(); + + this.logger.LogInformation("MQTT Server started"); + } + + public async Task StopAsync(CancellationToken cancellationToken) + { + this.logger.LogTrace("Stopping MQTT Server..."); + + await this.server.StopAsync(); + + this.logger.LogInformation("MQTT Server stopped"); } } public class MQTTServerConfiguration { + public ushort Port { get; set; } = 1883; + public MQTTAuthenticationData TelemetryClient { get; set; } = new MQTTAuthenticationData("telemetry", "fleet", "9R0FXNs5NEIEbI4"); //Must have a known client id + public MQTTAuthenticationData LocalClient { get; set; } = new MQTTAuthenticationData("local", "client", "xuhvoc-parrox-xuzsE4"); //Must have a known client id + public MQTTAuthenticationData Observer { get; set; } = new MQTTAuthenticationData("observer", "JC740d4c4E9dveh"); +} + +public class MQTTAuthenticationData +{ + public string? ClientID { get; set; } + public string Username { get; set; } + public string Password { get; set; } + + public MQTTAuthenticationData(string clientId, string username, string password) + { + ClientID = clientId; + Username = username; + Password = password; + } + public MQTTAuthenticationData(string username, string password) + { + ClientID = null; + Username = username; + Password = password; + } } \ No newline at end of file diff --git a/Source/ProofOfConcept/Services/MessageProcessor.cs b/Source/ProofOfConcept/Services/MessageProcessor.cs index adc6587..0e3c1eb 100644 --- a/Source/ProofOfConcept/Services/MessageProcessor.cs +++ b/Source/ProofOfConcept/Services/MessageProcessor.cs @@ -1,20 +1,31 @@ +using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Options; + namespace ProofOfConcept.Services; -public class MessageProcessor +public interface IMessageProcessor { - private ILogger logger; + Task ProcessMessage(string jsonMessage); +} + +public class MessageProcessor : IMessageProcessor +{ + private readonly ILogger logger; private MessageProcessorConfiguration configuration; - public MessageProcessor(ILogger logger, IOptionsMonitor options) + private readonly IMemoryCache memoryCache; + + public MessageProcessor(ILogger logger, IOptions options, IMemoryCache memoryCache) { this.logger = logger; - this.configuration = options.CurrentValue; + this.configuration = options.Value; - options.OnChange(newValue => - { - this.configuration = newValue; - logger.LogInformation("Configuration of {ClassName} changed", nameof(MessageProcessor)); - }); + this.memoryCache = memoryCache; + } + + public async Task ProcessMessage(string jsonMessage) + { + this.logger.LogTrace("Processing message from Tesla: {Message}", jsonMessage); } } diff --git a/Source/ProofOfConcept/appsettings.Development.json b/Source/ProofOfConcept/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/Source/ProofOfConcept/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/Source/ProofOfConcept/appsettings.json b/Source/ProofOfConcept/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/Source/ProofOfConcept/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +}