Changeset 455 for binary-improvements/MapRendering/API/GetServerInfo.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/GetServerInfo.cs (modified) (3 diffs)

binary-improvements/MapRendering/API/GetServerInfo.cs

@@ -1 +1 @@
 using System;
-using AllocsFixes.JSON;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.WebAPI;
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetServerInfo : AbsWebAPI {
+                private static readonly byte[] jsonKeyType = JsonWriter.GetEncodedPropertyNameWithBeginObject ("type");
+                private static readonly byte[] jsonKeyValue = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("value");
+
                 public override void HandleRequest (RequestContext _context) {
-                        JSONObject serverInfo = new JSONObject ();
+                        GameServerInfo gsi = ConnectionManager.Instance.LocalServerInfo;
 
-                        GameServerInfo gsi = ConnectionManager.Instance.LocalServerInfo;
+                        JsonWriter writer = new JsonWriter ();
+                        writer.WriteBeginObject ();
+
+                        bool first = true;
 
                         foreach (string stringGamePref in Enum.GetNames (typeof (GameInfoString))) {
                                 string value = gsi.GetValue ((GameInfoString) Enum.Parse (typeof (GameInfoString), stringGamePref));
+                                
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
 
-                                JSONObject singleStat = new JSONObject ();
-                                singleStat.Add ("type", new JSONString ("string"));
-                                singleStat.Add ("value", new JSONString (value));
+                                first = false;
 
-                                serverInfo.Add (stringGamePref, singleStat);
+                                writer.WritePropertyName (stringGamePref);
+                                writer.WriteRaw (jsonKeyType);
+                                writer.WriteString ("string");
+                                
+                                writer.WriteRaw (jsonKeyValue);
+                                writer.WriteString (value);
+                                
+                                writer.WriteEndObject ();
                         }
 
@@ -24 +41 @@
                                 int value = gsi.GetValue ((GameInfoInt) Enum.Parse (typeof (GameInfoInt), intGamePref));
 
-                                JSONObject singleStat = new JSONObject ();
-                                singleStat.Add ("type", new JSONString ("int"));
-                                singleStat.Add ("value", new JSONNumber (value));
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
 
-                                serverInfo.Add (intGamePref, singleStat);
+                                first = false;
+
+                                writer.WritePropertyName (intGamePref);
+                                writer.WriteRaw (jsonKeyType);
+                                writer.WriteString ("int");
+                                
+                                writer.WriteRaw (jsonKeyValue);
+                                writer.WriteInt32 (value);
+                                
+                                writer.WriteEndObject ();
                         }
 
@@ -34 +60 @@
                                 bool value = gsi.GetValue ((GameInfoBool) Enum.Parse (typeof (GameInfoBool), boolGamePref));
 
-                                JSONObject singleStat = new JSONObject ();
-                                singleStat.Add ("type", new JSONString ("bool"));
-                                singleStat.Add ("value", new JSONBoolean (value));
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
 
-                                serverInfo.Add (boolGamePref, singleStat);
+                                first = false;
+
+                                writer.WritePropertyName (boolGamePref);
+                                writer.WriteRaw (jsonKeyType);
+                                writer.WriteString ("bool");
+                                
+                                writer.WriteRaw (jsonKeyValue);
+                                writer.WriteBoolean (value);
+                                
+                                writer.WriteEndObject ();
                         }
-
-
-                        LegacyApiHelper.WriteJSON (_context.Response, serverInfo);
+                        
+                        writer.WriteEndObject ();
+                        
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }
         }