Changeset 382 for binary-improvements2/MapRendering/Web/API

Timestamp:

Aug 1, 2022, 12:54:31 PM (2 years ago)

Author:

alloc

Message:

Switched to use SpaceWizards.HttpListener

Location:

binary-improvements2/MapRendering/Web/API

Files:

• ExecuteConsoleCommand.cs (modified) (1 diff)
• GetAllowedCommands.cs (modified) (1 diff)
• GetAnimalsLocation.cs (modified) (1 diff)
• GetHostileLocation.cs (modified) (1 diff)
• GetLandClaims.cs (modified) (1 diff)
• GetLog.cs (modified) (4 diffs)
• GetPlayerInventories.cs (modified) (1 diff)
• GetPlayerInventory.cs (modified) (1 diff)
• GetPlayerList.cs (modified) (1 diff)
• GetPlayersLocation.cs (modified) (1 diff)
• GetPlayersOnline.cs (modified) (1 diff)
• GetServerInfo.cs (modified) (1 diff)
• GetStats.cs (modified) (1 diff)
• GetWebUIUpdates.cs (modified) (1 diff)
• Null.cs (modified) (1 diff)
• WebAPI.cs (modified) (2 diffs)

binary-improvements2/MapRendering/Web/API/ExecuteConsoleCommand.cs

@@ -1 +1 @@
 using System;
 using System.Net;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetAllowedCommands.cs

@@ -1 +1 @@
 using System.Net;
 using AllocsFixes.JSON;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetAnimalsLocation.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetHostileLocation.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetLandClaims.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetLog.cs

@@ -2 +2 @@
 using System.Net;
 using AllocsFixes.JSON;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -9 +11 @@
                 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)) {
+                        if (_req.QueryString ["count"] == null || !int.TryParse (_req.QueryString ["count"], out int count)) {
                                 count = 50;
                         }
@@ -27 +27 @@
                         }
 
-                        if (_req.QueryString ["firstLine"] == null || !int.TryParse (_req.QueryString ["firstLine"], out firstLine)) {
-                                if (count > 0) {
-                                        firstLine = LogBuffer.Instance.OldestLine;
-                                } else {
-                                        firstLine = LogBuffer.Instance.LatestLine;
-                                }
+                        if (_req.QueryString ["firstLine"] == null || !int.TryParse (_req.QueryString ["firstLine"], out int firstLine)) {
+                                firstLine = count > 0 ? LogBuffer.Instance.OldestLine : LogBuffer.Instance.LatestLine;
                         }
 
                         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 int lastLine);
 
                         JSONArray entries = new JSONArray ();
@@ -44 +40 @@
                                 entry.Add ("date", new JSONString (logEntry.date));
                                 entry.Add ("time", new JSONString (logEntry.time));
-                                entry.Add ("uptime", new JSONString (logEntry.uptime));
+                                entry.Add ("isotime", new JSONString (logEntry.isoTime));
+                                entry.Add ("uptime", new JSONString (logEntry.uptime.ToString ()));
                                 entry.Add ("msg", new JSONString (logEntry.message));
                                 entry.Add ("trace", new JSONString (logEntry.trace));

binary-improvements2/MapRendering/Web/API/GetPlayerInventories.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetPlayerInventory.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
         public class GetPlayerInventory : WebAPI {
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel) {
+                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp,
+                        WebConnection _user, int _permissionLevel) {
                         if (_req.QueryString ["userid"] == null) {
                                 _resp.StatusCode = (int) HttpStatusCode.BadRequest;

binary-improvements2/MapRendering/Web/API/GetPlayerList.cs

@@ -6 +6 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetPlayersLocation.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetPlayersOnline.cs

@@ -3 +3 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetServerInfo.cs

@@ -2 +2 @@
 using System.Net;
 using AllocsFixes.JSON;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetStats.cs

@@ -2 +2 @@
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/GetWebUIUpdates.cs

@@ -2 +2 @@
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/Null.cs

@@ -1 +1 @@
 using System.Net;
 using System.Text;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {

binary-improvements2/MapRendering/Web/API/WebAPI.cs

@@ -1 @@
-using System.Net;
 using System.Text;
 using AllocsFixes.JSON;
+using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -44 +45 @@
                 }
 
-                public abstract void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
-                        int _permissionLevel);
+                public abstract void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp,
+                        WebConnection _user, int _permissionLevel);
 
                 public virtual int DefaultPermissionLevel () {