Switch Websockets

.github/workflows/docker-deploy.yaml

@@ -1,8 +1,6 @@
 name: Build and Push Docker Image
 
 on:
-  pull_request:
-    branches: [ master ]
   push:
     branches: [ master ]
 
@@ -14,10 +12,24 @@ jobs:
     - name: Check out the repository
       uses: actions/checkout@v2
 
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.x'
+
     - name: Log in to Docker Hub
       run: |
         docker login guildwarspartysearch.azurecr.io --username "${{ secrets.DOCKERHUB_USERNAME }}" --password "${{ secrets.DOCKERHUB_PASSWORD }}"
 
+    - name: Replace Config Placeholders
+      shell: pwsh
+      run: |
+        cd GuildWarsPartySearch
+        $content = Get-Content Config.json
+        $updatedContent = $content -replace "[API_KEY_PLACEHOLDER]", "${{ secrets.APIKEY }}"
+        Set-Content -Path Config.json -Value $updatedContent
+        Write-Host "Placeholder replaced successfully in Config.json"
+
     - name: Build and push Docker image
       run: |
         cd GuildWarsPartySearch

.github/workflows/test.yaml

@@ -0,0 +1,23 @@
+name: Run tests
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repository
+      uses: actions/checkout@v2
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.x'
+
+    - name: Run tests
+      shell: pwsh
+      run: |
+        dotnet test .\GuildWarsPartySearch.Tests\

GuildWarsPartySearch.sln

@@ -15,6 +15,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{6C63473D-A6D9-400D-94AD-2E4DBA48B8B8}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\docker-deploy.yaml = .github\workflows\docker-deploy.yaml
+		.github\workflows\test.yaml = .github\workflows\test.yaml
 	EndProjectSection
 EndProject
 Global

GuildWarsPartySearch/Config.json

@@ -0,0 +1,5 @@
+{
+  "ServerOptions": {
+    "ApiKey": "[API_KEY_PLACEHOLDER]"
+  }
+}

GuildWarsPartySearch/Converters/NoneWebsocketMessageConverter.cs

@@ -0,0 +1,18 @@
+using GuildWarsPartySearch.Server.Models.Endpoints;
+using MTSC.Common.WebSockets;
+using MTSC.Common.WebSockets.RoutingModules;
+
+namespace GuildWarsPartySearch.Server.Converters;
+
+public sealed class NoneWebsocketMessageConverter : IWebsocketMessageConverter<None>
+{
+    public None ConvertFromWebsocketMessage(WebsocketMessage websocketMessage)
+    {
+        return new None();
+    }
+
+    public WebsocketMessage ConvertToWebsocketMessage(None message)
+    {
+        return new WebsocketMessage { FIN = true };
+    }
+}

GuildWarsPartySearch/Converters/PostPartyRequestWebsocketMessageConverter.cs

@@ -0,0 +1,39 @@
+using GuildWarsPartySearch.Server.Models.Endpoints;
+using MTSC.Common.WebSockets;
+using MTSC.Common.WebSockets.RoutingModules;
+using Newtonsoft.Json;
+using System.Text;
+
+namespace GuildWarsPartySearch.Server.Converters;
+
+public sealed class PostPartyRequestWebsocketMessageConverter : IWebsocketMessageConverter<PostPartySearchRequest>
+{
+    public PostPartyRequestWebsocketMessageConverter()
+    {
+    }
+
+    public WebsocketMessage ConvertToWebsocketMessage(PostPartySearchRequest message)
+    {
+        var serializedData = JsonConvert.SerializeObject(message);
+        var bytes = Encoding.UTF8.GetBytes(serializedData);
+        return new WebsocketMessage
+        {
+            Data = bytes,
+            Opcode = WebsocketMessage.Opcodes.Text
+        };
+    }
+
+    PostPartySearchRequest IWebsocketMessageConverter<PostPartySearchRequest>.ConvertFromWebsocketMessage(WebsocketMessage websocketMessage)
+    {
+        var bytes = websocketMessage.Data;
+        var serializedData = Encoding.UTF8.GetString(bytes);
+        try
+        {
+            return JsonConvert.DeserializeObject<PostPartySearchRequest>(serializedData)!;
+        }
+        catch(Exception ex)
+        {
+            return default!;
+        }
+    }
+}

GuildWarsPartySearch/Converters/PostPartyResponseWebsocketMessageConverter.cs

@@ -0,0 +1,29 @@
+using GuildWarsPartySearch.Server.Models.Endpoints;
+using MTSC.Common.WebSockets;
+using MTSC.Common.WebSockets.RoutingModules;
+using Newtonsoft.Json;
+using System.Text;
+
+namespace GuildWarsPartySearch.Server.Converters;
+
+public sealed class PostPartyResponseWebsocketMessageConverter : IWebsocketMessageConverter<PostPartySearchResponse>
+{
+    public WebsocketMessage ConvertToWebsocketMessage(PostPartySearchResponse message)
+    {
+        var serializedData = JsonConvert.SerializeObject(message);
+        var bytes = Encoding.UTF8.GetBytes(serializedData);
+        return new WebsocketMessage
+        {
+            Data = bytes,
+            Opcode = WebsocketMessage.Opcodes.Text,
+            FIN = true
+        };
+    }
+
+    PostPartySearchResponse IWebsocketMessageConverter<PostPartySearchResponse>.ConvertFromWebsocketMessage(WebsocketMessage websocketMessage)
+    {
+        var bytes = websocketMessage.Data;
+        var serializedData = Encoding.UTF8.GetString(bytes);
+        return JsonConvert.DeserializeObject<PostPartySearchResponse>(serializedData)!;
+    }
+}

GuildWarsPartySearch/Endpoints/LiveFeed.cs

@@ -0,0 +1,61 @@
+using GuildWarsPartySearch.Server.Models.Endpoints;
+using GuildWarsPartySearch.Server.Services.Feed;
+using GuildWarsPartySearch.Server.Services.PartySearch;
+using Microsoft.Extensions.Logging;
+using MTSC.Common.WebSockets;
+using MTSC.Common.WebSockets.RoutingModules;
+using Newtonsoft.Json;
+using System.Core.Extensions;
+using System.Extensions;
+using System.Text;
+
+namespace GuildWarsPartySearch.Server.Endpoints;
+
+public sealed class LiveFeed : WebsocketRouteBase<None>
+{
+    private readonly IPartySearchService partySearchService;
+    private readonly ILiveFeedService liveFeedService;
+    private readonly ILogger<LiveFeed> logger;
+
+    public LiveFeed(
+        IPartySearchService partySearchService,
+        ILiveFeedService liveFeedService,
+        ILogger<LiveFeed> logger)
+    {
+        this.partySearchService = partySearchService.ThrowIfNull();
+        this.liveFeedService = liveFeedService.ThrowIfNull();
+        this.logger = logger.ThrowIfNull();
+    }
+
+    public override void ConnectionClosed()
+    {
+        var scopedLogger = this.logger.CreateScopedLogger(nameof(this.ConnectionInitialized), this.ClientData.Socket.RemoteEndPoint?.ToString() ?? string.Empty);
+        scopedLogger.LogInformation("Client connected");
+        this.liveFeedService.RemoveClient(this.ClientData);
+    }
+
+    public override async void ConnectionInitialized()
+    {
+        var scopedLogger = this.logger.CreateScopedLogger(nameof(this.ConnectionInitialized), this.ClientData.Socket.RemoteEndPoint?.ToString() ?? string.Empty);
+        scopedLogger.LogInformation("Client connected");
+        this.liveFeedService.AddClient(this.ClientData);
+        scopedLogger.LogInformation("Sending all party searches");
+        var updates = await this.partySearchService.GetAllPartySearches();
+        var serialized = JsonConvert.SerializeObject(updates);
+        var payload = Encoding.UTF8.GetBytes(serialized);
+        this.SendMessage(new WebsocketMessage
+        {
+            Data = payload,
+            FIN = true,
+            Opcode = WebsocketMessage.Opcodes.Text
+        });
+    }
+
+    public override void HandleReceivedMessage(None message)
+    {
+    }
+
+    public override void Tick()
+    {
+    }
+}