Enable commented code and add missing imports

argon-chat · Nov 5, 2024 · cdb3913 · cdb3913
1 parent dce1dcc
commit cdb3913
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 40 deletions.
diff --git a/src/Argon.Api/Controllers/MetadataController.cs b/src/Argon.Api/Controllers/MetadataController.cs
@@ -1,39 +1,38 @@
-// namespace Argon.Api.Controllers;
-//
-// using Microsoft.AspNetCore.Authorization;
-// using Microsoft.AspNetCore.Mvc;
-//
-// [ApiController]
-// public class MetadataController : ControllerBase
-// {
-//     [Route("/cfg.json")]
-//     [AllowAnonymous]
-//     public ValueTask<HeadRoutingConfig> GetHead()
-//     {
-//         return new ValueTask<HeadRoutingConfig>(new HeadRoutingConfig(
-//             $"{GlobalVersion.FullSemVer}.{GlobalVersion.ShortSha}",
-//             "api.argon.gl",
-//             "argon-f14ic5ia.livekit.cloud",
-//             [
-//                 new RegionalNode("cdn-ru1.argon.gl", "ru1"),
-//                 new RegionalNode("cdn-ru2.argon.gl", "ru1"),
-//                 new RegionalNode("cdn-as1.argon.gl", "as1")
-//             ], [
-//                 new FeatureFlag("dev.window", true),
-//                 new FeatureFlag("user.allowServerCreation", true)
-//             ]));
-//     }
-// }
-//
-// public record HeadRoutingConfig(
-//     string version,
-//     string masterEndpoint,
-//     string webRtcEndpoint,
-//     List<RegionalNode> cdnAddresses,
-//     List<FeatureFlag> features
-// );
-//
-// public record RegionalNode(string url, string code);
-//
-// public record FeatureFlag(string code, bool enabled);
+namespace Argon.Api.Controllers;
 
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+[ApiController]
+public class MetadataController : ControllerBase
+{
+    [Route("/cfg.json")]
+    [AllowAnonymous]
+    public ValueTask<HeadRoutingConfig> GetHead()
+    {
+        return new ValueTask<HeadRoutingConfig>(new HeadRoutingConfig(
+            $"{GlobalVersion.FullSemVer}.{GlobalVersion.ShortSha}",
+            "api.argon.gl",
+            "argon-f14ic5ia.livekit.cloud",
+            [
+                new RegionalNode("cdn-ru1.argon.gl", "ru1"),
+                new RegionalNode("cdn-ru2.argon.gl", "ru1"),
+                new RegionalNode("cdn-as1.argon.gl", "as1")
+            ], [
+                new FeatureFlag("dev.window", true),
+                new FeatureFlag("user.allowServerCreation", true)
+            ]));
+    }
+}
+
+public record HeadRoutingConfig(
+    string version,
+    string masterEndpoint,
+    string webRtcEndpoint,
+    List<RegionalNode> cdnAddresses,
+    List<FeatureFlag> features
+);
+
+public record RegionalNode(string url, string code);
+
+public record FeatureFlag(string code, bool enabled);
diff --git a/src/Argon.Api/Program.cs b/src/Argon.Api/Program.cs
@@ -1,3 +1,6 @@
+using ActualLab.Fusion;
+using ActualLab.Rpc;
+using ActualLab.Rpc.Server;
 using Argon.Api;
 using Argon.Api.Entities;
 using Argon.Api.Extensions;
@@ -16,7 +19,7 @@
 builder.AddNpgsqlDbContext<ApplicationDbContext>("DefaultConnection");
 builder.Services.AddSingleton<IPasswordHashingService, PasswordHashingService>();
 builder.Services.AddControllers();
-// builder.Services.AddFusion(RpcServiceMode.Server, true);
+builder.Services.AddFusion(RpcServiceMode.Server, true);
 // .Rpc.AddServer<IUserAuthorization, UserAuthorization>()
 // .AddServer<IUserInteraction, UserInteractionService>()
 // .AddWebSocketServer(true);
@@ -35,6 +38,6 @@
 app.MapControllers();
 app.MapDefaultEndpoints();
 app.UseWebSockets();
-// app.MapRpcWebSocketServer();
+app.MapRpcWebSocketServer();
 app.MapGet("/", () => new { version = $"{GlobalVersion.FullSemVer}.{GlobalVersion.ShortSha}" });
 await app.WarpUp<ApplicationDbContext>().RunAsync();