Changeset 454 for binary-improvements/MapRendering/API

Timestamp:

Jul 28, 2023, 8:42:10 PM (17 months ago)

Author:

alloc

Message:

24_29_43
Switched over to vanilla Web infrastructure

Location:

binary-improvements/MapRendering/API

Files:

• . (added)
• ExecuteConsoleCommand.cs (moved) (moved from binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs ) (3 diffs)
• GetAllowedCommands.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs ) (2 diffs)
• GetAnimalsLocation.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetAnimalsLocation.cs ) (2 diffs)
• GetHostileLocation.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetHostileLocation.cs ) (2 diffs)
• GetLandClaims.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetLandClaims.cs ) (3 diffs)
• GetLog.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetLog.cs ) (4 diffs)
• GetPlayerInventories.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs ) (2 diffs)
• GetPlayerInventory.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs ) (2 diffs)
• GetPlayerList.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetPlayerList.cs ) (5 diffs)
• GetPlayersLocation.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs ) (2 diffs)
• GetPlayersOnline.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs ) (2 diffs)
• GetServerInfo.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetServerInfo.cs ) (2 diffs)
• GetStats.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetStats.cs ) (2 diffs)
• GetWebUIUpdates.cs (moved) (moved from binary-improvements/MapRendering/Web/API/GetWebUIUpdates.cs ) (2 diffs)

binary-improvements/MapRendering/API/ExecuteConsoleCommand.cs

@@ -1 +1 @@
 using System;
 using System.Net;
+using Webserver;
+using Webserver.WebAPI;
+using WebCommandResult = AllocsFixes.NetConnections.Servers.Web.WebCommandResult;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class ExecuteConsoleCommand : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
-                        if (string.IsNullOrEmpty (_req.QueryString ["command"])) {
-                                _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                Web.SetResponseTextContent (_resp, "No command given");
+namespace AllocsFixes.WebAPIs {
+        public class ExecuteConsoleCommand : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
+                        if (string.IsNullOrEmpty (_context.Request.QueryString ["command"])) {
+                                WebUtils.WriteText (_context.Response, "No command given", HttpStatusCode.BadRequest);
                                 return;
                         }
 
                         WebCommandResult.ResultType responseType =
-                                _req.QueryString ["raw"] != null
+                                _context.Request.QueryString ["raw"] != null
                                         ? WebCommandResult.ResultType.Raw
-                                        : (_req.QueryString ["simple"] != null
+                                        : (_context.Request.QueryString ["simple"] != null
                                                 ? WebCommandResult.ResultType.ResultOnly
                                                 : WebCommandResult.ResultType.Full);
 
-                        string commandline = _req.QueryString ["command"];
+                        string commandline = _context.Request.QueryString ["command"];
                         string commandPart = commandline.Split (' ') [0];
                         string argumentsPart = commandline.Substring (Math.Min (commandline.Length, commandPart.Length + 1));
@@ -26 +27 @@
 
                         if (command == null) {
-                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
-                                Web.SetResponseTextContent (_resp, "Unknown command");
+                                WebUtils.WriteText (_context.Response, "Unknown command", HttpStatusCode.NotFound);
                                 return;
                         }
@@ -33 +33 @@
                         int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (command.GetCommands ());
 
-                        if (_permissionLevel > commandPermissionLevel) {
-                                _resp.StatusCode = (int) HttpStatusCode.Forbidden;
-                                Web.SetResponseTextContent (_resp, "You are not allowed to execute this command");
+                        if (_context.PermissionLevel > commandPermissionLevel) {
+                                WebUtils.WriteText (_context.Response, "You are not allowed to execute this command", HttpStatusCode.Forbidden);
                                 return;
                         }
 
-                        _resp.SendChunked = true;
-                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, _resp);
+                        _context.Response.SendChunked = true;
+                        WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, _context);
                         SdtdConsole.Instance.ExecuteAsync (commandline, wcr);
                 }

binary-improvements/MapRendering/API/GetAllowedCommands.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetAllowedCommands : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetAllowedCommands : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         JSONObject result = new JSONObject ();
                         JSONArray entries = new JSONArray ();
                         foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
                                 int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (cc.GetCommands ());
-                                if (_permissionLevel <= commandPermissionLevel) {
+                                if (_context.PermissionLevel <= commandPermissionLevel) {
                                         string cmd = string.Empty;
                                         foreach (string s in cc.GetCommands ()) {
@@ -28 +28 @@
                         result.Add ("commands", entries);
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
 

binary-improvements/MapRendering/API/GetAnimalsLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        internal class GetAnimalsLocation : WebAPI {
+namespace AllocsFixes.WebAPIs {
+        internal class GetAnimalsLocation : AbsWebAPI {
                 private readonly List<EntityAnimal> animals = new List<EntityAnimal> ();
 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+                public override void HandleRequest (RequestContext _context) {
                         JSONArray animalsJsResult = new JSONArray ();
 
@@ -36 +36 @@
                         }
 
-                        WriteJSON (_resp, animalsJsResult);
+                        LegacyApiHelper.WriteJSON (_context.Response, animalsJsResult);
                 }
         }

binary-improvements/MapRendering/API/GetHostileLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        internal class GetHostileLocation : WebAPI {
+namespace AllocsFixes.WebAPIs {
+        internal class GetHostileLocation : AbsWebAPI {
                 private readonly List<EntityEnemy> enemies = new List<EntityEnemy> ();
 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+                public override void HandleRequest (RequestContext _context) {
                         JSONArray hostilesJsResult = new JSONArray ();
 
@@ -36 +36 @@
                         }
 
-                        WriteJSON (_resp, hostilesJsResult);
+                        LegacyApiHelper.WriteJSON (_context.Response, hostilesJsResult);
                 }
         }

binary-improvements/MapRendering/API/GetLandClaims.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using Webserver;
+using Webserver.Permissions;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetLandClaims : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetLandClaims : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         PlatformUserIdentifierAbs requestedUserId = null;
-                        if (_req.QueryString ["userid"] != null) {
-                                if (!PlatformUserIdentifierAbs.TryFromCombinedString (_req.QueryString ["userid"], out requestedUserId)) {
-                                        _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                        Web.SetResponseTextContent (_resp, "Invalid user id given");
+                        if (_context.Request.QueryString ["userid"] != null) {
+                                if (!PlatformUserIdentifierAbs.TryFromCombinedString (_context.Request.QueryString ["userid"], out requestedUserId)) {
+                                        WebUtils.WriteText (_context.Response, "Invalid user id given", HttpStatusCode.BadRequest);
                                         return;
                                 }
@@ -18 +19 @@
 
                         // default user, cheap way to avoid 'null reference exception'
-                        PlatformUserIdentifierAbs userId = _user?.UserId;
+                        PlatformUserIdentifierAbs userId = _context.Connection?.UserId;
 
-                        bool bViewAll = WebConnection.CanViewAllClaims (_permissionLevel);
+                        bool bViewAll = PermissionUtils.CanViewAllClaims (_context.PermissionLevel);
 
                         JSONObject result = new JSONObject ();
@@ -73 +74 @@
                         }
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
         }

binary-improvements/MapRendering/API/GetLog.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetLog : WebAPI {
+namespace AllocsFixes.WebAPIs {
+        public class GetLog : AbsWebAPI {
                 private const int MAX_COUNT = 1000;
                 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
-                        int count, firstLine, lastLine;
-
-                        if (_req.QueryString ["count"] == null || !int.TryParse (_req.QueryString ["count"], out count)) {
+                public override void HandleRequest (RequestContext _context) {
+                        if (_context.Request.QueryString ["count"] == null || !int.TryParse (_context.Request.QueryString ["count"], out var count)) {
                                 count = 50;
                         }
@@ -27 +25 @@
                         }
 
-                        if (_req.QueryString ["firstLine"] == null || !int.TryParse (_req.QueryString ["firstLine"], out firstLine)) {
+                        if (_context.Request.QueryString ["firstLine"] == null || !int.TryParse (_context.Request.QueryString ["firstLine"], out var firstLine)) {
                                 if (count > 0) {
                                         firstLine = LogBuffer.Instance.OldestLine;
@@ -37 +35 @@
                         JSONObject result = new JSONObject ();
 
-                        List<LogBuffer.LogEntry> logEntries = LogBuffer.Instance.GetRange (ref firstLine, count, out lastLine);
+                        List<LogBuffer.LogEntry> logEntries = LogBuffer.Instance.GetRange (ref firstLine, count, out var lastLine);
 
                         JSONArray entries = new JSONArray ();
                         foreach (LogBuffer.LogEntry logEntry in logEntries) {
                                 JSONObject entry = new JSONObject ();
-                                entry.Add ("date", new JSONString (logEntry.date));
-                                entry.Add ("time", new JSONString (logEntry.time));
-                                entry.Add ("uptime", new JSONString (logEntry.uptime));
-                                entry.Add ("msg", new JSONString (logEntry.message));
-                                entry.Add ("trace", new JSONString (logEntry.trace));
-                                entry.Add ("type", new JSONString (logEntry.type.ToStringCached ()));
+                                var logEntryTimestamp = logEntry.Timestamp;
+                                entry.Add ("date", new JSONString ($"{logEntryTimestamp.Year:0000}-{logEntryTimestamp.Month:00}-{logEntryTimestamp.Day:00}"));
+                                entry.Add ("time", new JSONString ($"{logEntryTimestamp.Hour:00}:{logEntryTimestamp.Minute:00}:{logEntryTimestamp.Second:00}"));
+                                entry.Add ("uptime", new JSONString (logEntry.Uptime.ToString()));
+                                entry.Add ("msg", new JSONString (logEntry.Message));
+                                entry.Add ("trace", new JSONString (logEntry.Trace));
+                                entry.Add ("type", new JSONString (logEntry.Type.ToStringCached ()));
                                 entries.Add (entry);
                         }
@@ -55 +54 @@
                         result.Add ("entries", entries);
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
         }

binary-improvements/MapRendering/API/GetPlayerInventories.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayerInventories : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
-                        GetPlayerInventory.GetInventoryArguments (_req, out bool showIconColor, out bool showIconName);
+namespace AllocsFixes.WebAPIs {
+        public class GetPlayerInventories : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
+                        GetPlayerInventory.GetInventoryArguments (_context, out bool showIconColor, out bool showIconName);
 
                         JSONArray AllInventoriesResult = new JSONArray ();
@@ -24 +24 @@
                         }
 
-                        WriteJSON (_resp, AllInventoriesResult);
+                        LegacyApiHelper.WriteJSON (_context.Response, AllInventoriesResult);
                 }
         }

binary-improvements/MapRendering/API/GetPlayerInventory.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayerInventory : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
-                        if (_req.QueryString ["userid"] == null) {
-                                _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                Web.SetResponseTextContent (_resp, "No user id given");
+namespace AllocsFixes.WebAPIs {
+        public class GetPlayerInventory : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
+                        if (_context.Request.QueryString ["userid"] == null) {
+                                WebUtils.WriteText (_context.Response, "No user id given", HttpStatusCode.BadRequest);
                                 return;
                         }
 
-                        string userIdString = _req.QueryString ["userid"];
+                        string userIdString = _context.Request.QueryString ["userid"];
                         if (!PlatformUserIdentifierAbs.TryFromCombinedString (userIdString, out PlatformUserIdentifierAbs userId)) {
-                                _resp.StatusCode = (int) HttpStatusCode.BadRequest;
-                                Web.SetResponseTextContent (_resp, "Invalid user id given");
+                                WebUtils.WriteText (_context.Response, "Invalid user id given", HttpStatusCode.BadRequest);
                                 return;
                         }
@@ -23 +22 @@
                         Player p = PersistentContainer.Instance.Players.GetByUserId (userId);
                         if (p == null) {
-                                _resp.StatusCode = (int) HttpStatusCode.NotFound;
-                                Web.SetResponseTextContent (_resp, "Unknown user id given");
+                                WebUtils.WriteText (_context.Response, "Unknown user id given", HttpStatusCode.NotFound);
                                 return;
                         }
 
-                        GetInventoryArguments (_req, out bool showIconColor, out bool showIconName);
+                        GetInventoryArguments (_context, out bool showIconColor, out bool showIconName);
 
                         JSONObject result = DoPlayer (p, showIconColor, showIconName);
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
 
-                internal static void GetInventoryArguments (HttpListenerRequest _req, out bool _showIconColor, out bool _showIconName) {
-                        if (_req.QueryString ["showiconcolor"] == null || !bool.TryParse (_req.QueryString ["showiconcolor"], out _showIconColor)) {
+                internal static void GetInventoryArguments (RequestContext _context, out bool _showIconColor, out bool _showIconName) {
+                        if (_context.Request.QueryString ["showiconcolor"] == null || !bool.TryParse (_context.Request.QueryString ["showiconcolor"], out _showIconColor)) {
                                 _showIconColor = true;
                         }
                         
-                        if (_req.QueryString ["showiconname"] == null || !bool.TryParse (_req.QueryString ["showiconname"], out _showIconName)) {
+                        if (_context.Request.QueryString ["showiconname"] == null || !bool.TryParse (_context.Request.QueryString ["showiconname"], out _showIconName)) {
                                 _showIconName = true;
                         }

binary-improvements/MapRendering/API/GetPlayerList.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
-
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayerList : WebAPI {
+using Webserver;
+using Webserver.Permissions;
+using Webserver.WebAPI;
+
+namespace AllocsFixes.WebAPIs {
+        public class GetPlayerList : AbsWebAPI {
                 private static readonly Regex numberFilterMatcher =
                         new Regex (@"^(>=|=>|>|<=|=<|<|==|=)?\s*([0-9]+(\.[0-9]*)?)$");
@@ -16 +18 @@
 #endif
 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+                public override void HandleRequest (RequestContext _context) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        PlatformUserIdentifierAbs userId = _user?.UserId;
-
-                        bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel);
+                        PlatformUserIdentifierAbs userId = _context.Connection?.UserId;
+
+                        bool bViewAll = PermissionUtils.CanViewAllPlayers (_context.PermissionLevel);
 
                         // TODO: Sort (and filter?) prior to converting to JSON ... hard as how to get the correct column's data? (i.e. column name matches JSON object field names, not source data)
 
                         int rowsPerPage = 25;
-                        if (_req.QueryString ["rowsperpage"] != null) {
-                                int.TryParse (_req.QueryString ["rowsperpage"], out rowsPerPage);
+                        if (_context.Request.QueryString ["rowsperpage"] != null) {
+                                int.TryParse (_context.Request.QueryString ["rowsperpage"], out rowsPerPage);
                         }
 
                         int page = 0;
-                        if (_req.QueryString ["page"] != null) {
-                                int.TryParse (_req.QueryString ["page"], out page);
+                        if (_context.Request.QueryString ["page"] != null) {
+                                int.TryParse (_context.Request.QueryString ["page"], out page);
                         }
 
@@ -83 +84 @@
                         IEnumerable<JSONObject> list = playerList;
 
-                        foreach (string key in _req.QueryString.AllKeys) {
+                        foreach (string key in _context.Request.QueryString.AllKeys) {
                                 if (!string.IsNullOrEmpty (key) && key.StartsWith ("filter[")) {
                                         string filterCol = key.Substring (key.IndexOf ('[') + 1);
                                         filterCol = filterCol.Substring (0, filterCol.Length - 1);
-                                        string filterVal = _req.QueryString.Get (key).Trim ();
+                                        string filterVal = _context.Request.QueryString.Get (key).Trim ();
 
                                         list = ExecuteFilter (list, filterCol, filterVal);
@@ -95 +96 @@
                         int totalAfterFilter = list.Count ();
 
-                        foreach (string key in _req.QueryString.AllKeys) {
+                        foreach (string key in _context.Request.QueryString.AllKeys) {
                                 if (!string.IsNullOrEmpty (key) && key.StartsWith ("sort[")) {
                                         string sortCol = key.Substring (key.IndexOf ('[') + 1);
                                         sortCol = sortCol.Substring (0, sortCol.Length - 1);
-                                        string sortVal = _req.QueryString.Get (key);
+                                        string sortVal = _context.Request.QueryString.Get (key);
 
                                         list = ExecuteSort (list, sortCol, sortVal == "0");
@@ -120 +121 @@
                         result.Add ("players", playersJsResult);
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
 

binary-improvements/MapRendering/API/GetPlayersLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using Webserver;
+using Webserver.Permissions;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayersLocation : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetPlayersLocation : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        PlatformUserIdentifierAbs userId = _user?.UserId;
+                        PlatformUserIdentifierAbs userId = _context.Connection?.UserId;
 
                         bool listOffline = false;
-                        if (_req.QueryString ["offline"] != null) {
-                                bool.TryParse (_req.QueryString ["offline"], out listOffline);
+                        if (_context.Request.QueryString ["offline"] != null) {
+                                bool.TryParse (_context.Request.QueryString ["offline"], out listOffline);
                         }
 
-                        bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel);
+                        bool bViewAll = PermissionUtils.CanViewAllPlayers (_context.PermissionLevel);
 
                         JSONArray playersJsResult = new JSONArray ();
@@ -57 +58 @@
                         }
 
-                        WriteJSON (_resp, playersJsResult);
+                        LegacyApiHelper.WriteJSON (_context.Response, playersJsResult);
                 }
         }

binary-improvements/MapRendering/API/GetPlayersOnline.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetPlayersOnline : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetPlayersOnline : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         JSONArray players = new JSONArray ();
 
@@ -44 +44 @@
                         }
 
-                        WriteJSON (_resp, players);
+                        LegacyApiHelper.WriteJSON (_context.Response, players);
                 }
         }

binary-improvements/MapRendering/API/GetServerInfo.cs

@@ -1 +1 @@
 using System;
-using System.Net;
 using AllocsFixes.JSON;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetServerInfo : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetServerInfo : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         JSONObject serverInfo = new JSONObject ();
 
@@ -42 +42 @@
 
 
-                        WriteJSON (_resp, serverInfo);
+                        LegacyApiHelper.WriteJSON (_context.Response, serverInfo);
                 }
         }

binary-improvements/MapRendering/API/GetStats.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetStats : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetStats : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         JSONObject result = new JSONObject ();
 
@@ -19 +19 @@
                         result.Add ("animals", new JSONNumber (Animals.Instance.GetCount ()));
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }
 

binary-improvements/MapRendering/API/GetWebUIUpdates.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using Webserver;
+using Webserver.WebAPI;
 
-namespace AllocsFixes.NetConnections.Servers.Web.API {
-        public class GetWebUIUpdates : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+namespace AllocsFixes.WebAPIs {
+        public class GetWebUIUpdates : AbsWebAPI {
+                public override void HandleRequest (RequestContext _context) {
                         int latestLine;
-                        if (_req.QueryString ["latestLine"] == null ||
-                            !int.TryParse (_req.QueryString ["latestLine"], out latestLine)) {
+                        if (_context.Request.QueryString ["latestLine"] == null ||
+                            !int.TryParse (_context.Request.QueryString ["latestLine"], out latestLine)) {
                                 latestLine = 0;
                         }
@@ -27 +27 @@
                         result.Add ("newlogs", new JSONNumber (LogBuffer.Instance.LatestLine - latestLine));
 
-                        WriteJSON (_resp, result);
+                        LegacyApiHelper.WriteJSON (_context.Response, result);
                 }