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

binary-improvements/MapRendering/API/GetPlayersLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.Permissions;
@@ -7 +8 @@
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetPlayersLocation : AbsWebAPI {
+                private static readonly byte[] jsonKeySteamId = JsonWriter.GetEncodedPropertyNameWithBeginObject ("steamid");
+                private static readonly byte[] jsonKeyCrossPlatformId = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("crossplatformid");
+                private static readonly byte[] jsonKeyName = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("name");
+                private static readonly byte[] jsonKeyOnline = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("online");
+                private static readonly byte[] jsonKeyPosition = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("position");
+
                 public override void HandleRequest (RequestContext _context) {
                         AdminTools admTools = GameManager.Instance.adminTools;
@@ -19 +27 @@
                         bool bViewAll = PermissionUtils.CanViewAllPlayers (_context.PermissionLevel);
 
-                        JSONArray playersJsResult = new JSONArray ();
+                        JsonWriter writer = new JsonWriter ();
+                        
+                        writer.WriteBeginArray ();
+                        
+                        bool first = true;
 
                         Players playersList = PersistentContainer.Instance.Players;
@@ -34 +46 @@
                                 if (listOffline || p.IsOnline) {
                                         if (bViewAll || p.InternalId.Equals (userId)) {
-                                                JSONObject pos = new JSONObject ();
-                                                pos.Add ("x", new JSONNumber (p.LastPosition.x));
-                                                pos.Add ("y", new JSONNumber (p.LastPosition.y));
-                                                pos.Add ("z", new JSONNumber (p.LastPosition.z));
 
-                                                JSONObject pJson = new JSONObject ();
-                                                pJson.Add ("steamid", new JSONString (kvp.Value.PlatformId.CombinedString));
-                                                pJson.Add ("crossplatformid", new JSONString (kvp.Value.CrossPlatformId?.CombinedString ?? ""));
+                                                if (!first) {
+                                                        writer.WriteValueSeparator ();
+                                                }
 
-                                                //                                      pJson.Add("entityid", new JSONNumber (p.EntityID));
-                                                //                    pJson.Add("ip", new JSONString (p.IP));
-                                                pJson.Add ("name", new JSONString (p.Name));
-                                                pJson.Add ("online", new JSONBoolean (p.IsOnline));
-                                                pJson.Add ("position", pos);
-
-                                                //                                      pJson.Add ("totalplaytime", new JSONNumber (p.TotalPlayTime));
-                                                //                                      pJson.Add ("lastonline", new JSONString (p.LastOnline.ToString ("s")));
-                                                //                                      pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
-
-                                                playersJsResult.Add (pJson);
+                                                first = false;
+                                
+                                                writer.WriteRaw (jsonKeySteamId);
+                                                writer.WriteString (kvp.Value.PlatformId.CombinedString);
+                                
+                                                writer.WriteRaw (jsonKeyCrossPlatformId);
+                                                writer.WriteString (kvp.Value.CrossPlatformId?.CombinedString ?? "");
+                                
+                                                writer.WriteRaw (jsonKeyName);
+                                                writer.WriteString (p.Name);
+                                
+                                                writer.WriteRaw (jsonKeyOnline);
+                                                writer.WriteBoolean (p.IsOnline);
+                                
+                                                writer.WriteRaw (jsonKeyPosition);
+                                                JsonCommons.WriteVector3I (ref writer, p.LastPosition);
+                                
+                                                writer.WriteEndObject ();
                                         }
                                 }
                         }
-
-                        LegacyApiHelper.WriteJSON (_context.Response, playersJsResult);
+                        
+                        writer.WriteEndArray ();
+                        
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }
         }