Changeset 402 for binary-improvements2/WebServer/src/WebAPI/APIs/WebUiUpdates.cs

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/WebServer/src/WebAPI/APIs

Files:

• . (added)
• WebUiUpdates.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/GetWebUIUpdates.cs ) (1 diff)

binary-improvements2/WebServer/src/WebAPI/APIs/WebUiUpdates.cs

@@ -1 @@
-using AllocsFixes.JSON;
-using AllocsFixes.LiveData;
 using JetBrains.Annotations;
+using Utf8Json;
+using Webserver.LiveData;
 
-namespace Webserver.WebAPI {
+namespace Webserver.WebAPI.APIs {
         [UsedImplicitly]
-        public class GetWebUIUpdates : AbsWebAPI {
-                public override void HandleRequest (RequestContext _context) {
+        public class WebUiUpdates : AbsRestApi {
+                private static readonly byte[] jsonKeyGameTime = JsonWriter.GetEncodedPropertyNameWithBeginObject ("gameTime");
+                private static readonly byte[] jsonKeyPlayers = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("players");
+                private static readonly byte[] jsonKeyHostiles = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("hostiles");
+                private static readonly byte[] jsonKeyAnimals = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("animals");
+                private static readonly byte[] jsonKeyNewLogs = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("newLogs");
+                
+                private static readonly byte[] jsonKeyDays = JsonWriter.GetEncodedPropertyNameWithBeginObject ("days");
+                private static readonly byte[] jsonKeyHours = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("hours");
+                private static readonly byte[] jsonKeyMinutes = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("minutes");
+
+                
+                protected override void HandleRestGet (RequestContext _context) {
                         if (_context.Request.QueryString ["latestLine"] == null ||
                             !int.TryParse (_context.Request.QueryString ["latestLine"], out int latestLine)) {
                                 latestLine = 0;
                         }
+                        
+                        PrepareEnvelopedResult (out JsonWriter writer);
+                        
+                        writer.WriteRaw (jsonKeyGameTime);
 
-                        JsonObject result = new JsonObject ();
+                        (int days, int hours, int minutes) = GameUtils.WorldTimeToElements (GameManager.Instance.World.worldTime);
+                        
+                        writer.WriteRaw (jsonKeyDays);
+                        writer.WriteInt32 (days);
+                        
+                        writer.WriteRaw (jsonKeyHours);
+                        writer.WriteInt32 (hours);
+                        
+                        writer.WriteRaw (jsonKeyMinutes);
+                        writer.WriteInt32 (minutes);
+                        
+                        writer.WriteEndObject ();
 
-                        JsonObject time = new JsonObject ();
-                        time.Add ("days", new JsonNumber (GameUtils.WorldTimeToDays (GameManager.Instance.World.worldTime)));
-                        time.Add ("hours", new JsonNumber (GameUtils.WorldTimeToHours (GameManager.Instance.World.worldTime)));
-                        time.Add ("minutes", new JsonNumber (GameUtils.WorldTimeToMinutes (GameManager.Instance.World.worldTime)));
-                        result.Add ("gametime", time);
+                        writer.WriteRaw (jsonKeyPlayers);
+                        writer.WriteInt32 (GameManager.Instance.World.Players.Count);
+                        
+                        writer.WriteRaw (jsonKeyHostiles);
+                        writer.WriteInt32 (Hostiles.Instance.GetCount ());
+                        
+                        writer.WriteRaw (jsonKeyAnimals);
+                        writer.WriteInt32 (Animals.Instance.GetCount ());
+                        
+                        writer.WriteRaw (jsonKeyNewLogs);
+                        writer.WriteInt32 (LogBuffer.Instance.LatestLine - latestLine);
 
-                        result.Add ("players", new JsonNumber (GameManager.Instance.World.Players.Count));
-                        result.Add ("hostiles", new JsonNumber (Hostiles.Instance.GetCount ()));
-                        result.Add ("animals", new JsonNumber (Animals.Instance.GetCount ()));
+                        writer.WriteEndObject ();
 
-                        result.Add ("newlogs", new JsonNumber (LogBuffer.Instance.LatestLine - latestLine));
-
-                        WebUtils.WriteJson (_context.Response, result);
+                        SendEnvelopedResult (_context, ref writer);
                 }