More proxy stuff

Elisa/Data/Table.cs

@@ -86,6 +86,10 @@ public static class Table
 
     public static void Load()
     {
+        int catchDataCount = 0;
+        int stcCount = 0;
+        int textCount = 0;
+
         foreach (PropertyInfo? prop in typeof(Table).GetProperties().Where(x => x.GetCustomAttribute<LoadDataAttribute>() is not null))
         {
             LoadDataAttribute attr = prop.GetCustomAttribute<LoadDataAttribute>()!;
@@ -98,18 +102,21 @@ public static class Table
                     object? value = JsonSerializer.Deserialize(entry.Value.GetRawText(), prop.PropertyType, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
                     prop.SetValue(null, value);
                     Log.Information($"Loaded {(prop.GetValue(null) as IList)?.Count} entries from {prop.Name} catchdata table");
+                    catchDataCount++;
                     break;
                 case LoadDataType.STC:
                     prop.SetValue(null, typeof(JSON).GetMethod(nameof(JSON.Load))!.MakeGenericMethod(prop.PropertyType).Invoke(null, [Path.Combine(GetPath(attr.DataType), attr.FileName), false]));
                     Log.Information($"Loaded {(prop.GetValue(null) as IList)?.Count} entries from {prop.Name} stc table");
+                    stcCount++;
                     break;
                 case LoadDataType.Text:
                     // TODO: textdata is just a flat list of key-value pairs that are looked up from stc
+                    textCount++;
                     break;
             }
         }
 
-        Log.Information("All data tables loaded");
+        Log.Information($"Finished loading data tables ({catchDataCount} catchdata, {stcCount} stc, {textCount} text)");
     }
 
     public static string GetPath(LoadDataType type)

Elisa/GameServer.cs

@@ -28,12 +28,13 @@ public static class GameServer
 
     static async Task HandleRequest(HttpContext context)
     {
+        // Is this even necessary?
         if (context.Request.Method == "CONNECT")
             context.Response.StatusCode = StatusCodes.Status200OK;
         else
         {
             context.Response.StatusCode = StatusCodes.Status405MethodNotAllowed;
-            await context.Response.WriteAsync("Method Not Allowed");
+            await context.Response.WriteAsync("Error 405: Method Not Allowed");
         }
     }
 }

Elisa/Proxy.cs

@@ -7,15 +7,16 @@ namespace Elisa;
 
 public static class Proxy
 {
+    static int port = 9000;
     static string serverUrl = "localhost";
 
     public static async Task Start()
     {
         Log.Information("Starting Proxy");
 
-        TcpListener listener = new TcpListener(IPAddress.Any, 9000);
+        TcpListener listener = new TcpListener(IPAddress.Any, port);
         listener.Start();
-        Log.Information($"Proxy: Listening on port 9000");
+        Log.Information($"Proxy: Listening on port {port}");
 
         while (true)
         {
@@ -23,25 +24,30 @@ public static class Proxy
             string clientAddress = ((IPEndPoint)client.Client.RemoteEndPoint).Address.ToString();
             Log.Information($"Proxy: Accepted client connection from {clientAddress}");
 
-            TcpClient server = new TcpClient();
+            using (TcpClient server = new TcpClient())
-            await server.ConnectAsync(serverUrl, 80);
+            {
-            Log.Information($"Proxy: Connected to Elisa");
+                await server.ConnectAsync(serverUrl, 80);
+                Log.Information($"Proxy: Connected to Elisa");
 
-            NetworkStream clientStream = client.GetStream();
+                using (NetworkStream clientStream = client.GetStream())
-            NetworkStream serverStream = server.GetStream();
+                using (NetworkStream serverStream = server.GetStream())
+                {
+                    byte[] buffer = new byte[256 * 256];
+                    int bytesRead;
+                    while ((bytesRead = await clientStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                    {
+                        string data = Encoding.UTF8.GetString(buffer, 0, bytesRead).Trim();
+                        Log.Information($"Received data from client: {data}");
+                    }
 
-            byte[] buffer = new byte[256 * 256];
+                    Task c2sTask = clientStream.CopyToAsync(serverStream);
-            int bytesRead;
+                    Task s2cTask = serverStream.CopyToAsync(clientStream);
-            while ((bytesRead = await clientStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                    await Task.WhenAll(c2sTask, s2cTask);
-                Log.Information($"Received data from client: {Encoding.UTF8.GetString(buffer, 0, bytesRead).Trim()}");
+                }
-
+            }
-            Task clientToServerTask = clientStream.CopyToAsync(serverStream);
-            Task serverToClientTask = serverStream.CopyToAsync(clientStream);
-            await Task.WhenAll(clientToServerTask, serverToClientTask);
 
             client.Close();
-            server.Close();
+            Log.Information($"Proxy: Closed client connection");
-            Log.Information($"Proxy: Closed client and server connections");
         }
     }
 }