♻️ Remove etcd, replace with asprie. Move infra to aspire. Disable gateway for now

DysonNetwork.Ring/Connection/WebSocketService.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Net.WebSockets;
-using dotnet_etcd.interfaces;
 using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Proto;
 using Grpc.Core;
@@ -11,17 +10,14 @@ public class WebSocketService
 {
     private readonly IConfiguration _configuration;
     private readonly ILogger<WebSocketService> _logger;
-    private readonly IEtcdClient _etcdClient;
     private readonly IDictionary<string, IWebSocketPacketHandler> _handlerMap;
 
     public WebSocketService(
         IEnumerable<IWebSocketPacketHandler> handlers,
-        IEtcdClient etcdClient,
         ILogger<WebSocketService> logger,
         IConfiguration configuration
     )
     {
-        _etcdClient = etcdClient;
         _logger = logger;
         _configuration = configuration;
         _handlerMap = handlers.ToDictionary(h => h.PacketType);
@@ -59,8 +55,10 @@ public class WebSocketService
         }
         catch (Exception ex)
         {
-            _logger.LogWarning(ex, "Error while closing WebSocket for {AccountId}:{DeviceId}", key.AccountId, key.DeviceId);
+            _logger.LogWarning(ex, "Error while closing WebSocket for {AccountId}:{DeviceId}", key.AccountId,
+                key.DeviceId);
         }
+
         data.Cts.Cancel();
         ActiveConnections.TryRemove(key, out _);
     }
@@ -140,45 +138,24 @@ public class WebSocketService
         {
             try
             {
-                // Get the service URL from etcd for the specified endpoint
-                var serviceKey = $"/services/{packet.Endpoint}";
-                var response = await _etcdClient.GetAsync(serviceKey);
+                var serviceUrl = "https://" + packet.Endpoint;
 
-                if (response.Kvs.Count > 0)
+                var callInvoker = GrpcClientHelper.CreateCallInvoker(serviceUrl);
+                var client = new RingHandlerService.RingHandlerServiceClient(callInvoker);
+
+                try
                 {
-                    var serviceUrl = response.Kvs[0].Value.ToStringUtf8();
-
-                    var clientCertPath = _configuration["Service:ClientCert"]!;
-                    var clientKeyPath = _configuration["Service:ClientKey"]!;
-                    var clientCertPassword = _configuration["Service:CertPassword"];
-
-                    var callInvoker =
-                        GrpcClientHelper.CreateCallInvoker(
-                            serviceUrl,
-                            clientCertPath,
-                            clientKeyPath,
-                            clientCertPassword
-                        );
-                    var client = new RingHandlerService.RingHandlerServiceClient(callInvoker);
-
-                    try
+                    await client.ReceiveWebSocketPacketAsync(new ReceiveWebSocketPacketRequest
                     {
-                        await client.ReceiveWebSocketPacketAsync(new ReceiveWebSocketPacketRequest
-                        {
-                            Account = currentUser,
-                            DeviceId = deviceId,
-                            Packet = packet.ToProtoValue()
-                        });
-                    }
-                    catch (RpcException ex)
-                    {
-                        _logger.LogError(ex, $"Error forwarding packet to endpoint: {packet.Endpoint}");
-                    }
-
-                    return;
+                        Account = currentUser,
+                        DeviceId = deviceId,
+                        Packet = packet.ToProtoValue()
+                    });
+                }
+                catch (RpcException ex)
+                {
+                    _logger.LogError(ex, $"Error forwarding packet to endpoint: {packet.Endpoint}");
                 }
-
-                _logger.LogWarning($"No service registered for endpoint: {packet.Endpoint}");
             }
             catch (Exception ex)
             {
@@ -197,4 +174,4 @@ public class WebSocketService
             CancellationToken.None
         );
     }
-}
+}

DysonNetwork.Ring/DysonNetwork.Ring.csproj

@@ -42,6 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\DysonNetwork.ServiceDefaults\DysonNetwork.ServiceDefaults.csproj" />
       <ProjectReference Include="..\DysonNetwork.Shared\DysonNetwork.Shared.csproj" />
     </ItemGroup>
 

DysonNetwork.Ring/Program.cs

@@ -3,17 +3,16 @@ using DysonNetwork.Ring.Startup;
 using DysonNetwork.Shared.Auth;
 using DysonNetwork.Shared.Http;
 using DysonNetwork.Shared.Registry;
-using DysonNetwork.Shared.Stream;
 using Microsoft.EntityFrameworkCore;
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.AddServiceDefaults();
+
 // Configure Kestrel and server options
 builder.ConfigureAppKestrel(builder.Configuration);
 
 // Add application services
-builder.Services.AddRegistryService(builder.Configuration);
-builder.Services.AddStreamConnection(builder.Configuration);
 builder.Services.AddAppServices(builder.Configuration);
 builder.Services.AddAppRateLimiting();
 builder.Services.AddAppAuthentication();
@@ -32,6 +31,8 @@ builder.Services.AddAppScheduledJobs();
 
 var app = builder.Build();
 
+app.MapDefaultEndpoints();
+
 // Run database migrations
 using (var scope = app.Services.CreateScope())
 {

DysonNetwork.Ring/Services/PusherServiceGrpc.cs

@@ -2,7 +2,6 @@ using DysonNetwork.Ring.Connection;
 using DysonNetwork.Ring.Email;
 using DysonNetwork.Ring.Notification;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Registry;
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using System.Text.Json;

DysonNetwork.Ring/Services/QueueBackgroundService.cs

@@ -2,7 +2,6 @@ using System.Text.Json;
 using DysonNetwork.Ring.Email;
 using DysonNetwork.Ring.Notification;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Registry;
 using DysonNetwork.Shared.Stream;
 using Google.Protobuf;
 using NATS.Client.Core;

DysonNetwork.Ring/appsettings.json

@@ -45,9 +45,7 @@
   ],
   "Service": {
     "Name": "DysonNetwork.Ring",
-    "Url": "https://localhost:7259",
-    "ClientCert": "../Certificates/client.crt",
-    "ClientKey": "../Certificates/client.key"
+    "Url": "https://localhost:7259"
   },
   "Etcd": {
     "Insecure": true