Changeset 455 for binary-improvements/MapRendering/API/GetWebUIUpdates.cs

Timestamp:

Jul 31, 2023, 4:06:13 PM (16 months ago)

Author:

alloc

Message:

25_30_44

• Got rid (mostly) of custom JSON serialization
• Some code cleanup

File:

• binary-improvements/MapRendering/API/GetWebUIUpdates.cs (modified) (2 diffs)

binary-improvements/MapRendering/API/GetWebUIUpdates.cs

@@ -1 @@
-using AllocsFixes.JSON;
 using AllocsFixes.LiveData;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.WebAPI;
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetWebUIUpdates : AbsWebAPI {
+                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");
+
                 public override void HandleRequest (RequestContext _context) {
                         int latestLine;
@@ -13 +22 @@
                         }
 
-                        JSONObject result = new JSONObject ();
+                        JsonWriter writer = new JsonWriter ();
 
-                        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);
-
-                        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 ()));
-
-                        result.Add ("newlogs", new JSONNumber (LogBuffer.Instance.LatestLine - latestLine));
-
-                        LegacyApiHelper.WriteJSON (_context.Response, result);
+                        writer.WriteRaw (jsonKeyGameTime);
+                        (int days, int hours, int minutes) = GameUtils.WorldTimeToElements (GameManager.Instance.World.worldTime);
+                        JsonCommons.WriteGameTimeObject (ref writer, days, hours, minutes);
+                        
+                        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);
+                        
+                        writer.WriteEndObject ();
+                        
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }