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

binary-improvements/MapRendering/API/GetPlayersOnline.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.WebAPI;
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetPlayersOnline : AbsWebAPI {
+                private static readonly byte[] jsonKeySteamId = JsonWriter.GetEncodedPropertyNameWithBeginObject ("steamid");
+                private static readonly byte[] jsonKeyCrossPlatformId = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("crossplatformid");
+                private static readonly byte[] jsonKeyEntityId = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("entityid");
+                private static readonly byte[] jsonKeyIp = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("ip");
+                private static readonly byte[] jsonKeyName = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("name");
+                private static readonly byte[] jsonKeyOnline = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("online");
+                private static readonly byte[] jsonKeyPosition = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("position");
+
+                private static readonly byte[] jsonKeyLevel = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("level");
+                private static readonly byte[] jsonKeyHealth = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("health");
+                private static readonly byte[] jsonKeyStamina = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("stamina");
+                private static readonly byte[] jsonKeyZombieKills = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("zombiekills");
+                private static readonly byte[] jsonKeyPlayerKills = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("playerkills");
+                private static readonly byte[] jsonKeyPlayerDeaths = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("playerdeaths");
+                private static readonly byte[] jsonKeyScore = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("score");
+
+                private static readonly byte[] jsonKeyTotalPlaytime = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("totalplaytime");
+                private static readonly byte[] jsonKeyLastOnline = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("lastonline");
+                private static readonly byte[] jsonKeyPing = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("ping");
+
                 public override void HandleRequest (RequestContext _context) {
-                        JSONArray players = new JSONArray ();
+                        JsonWriter writer = new JsonWriter ();
+                        
+                        writer.WriteBeginArray ();
+                        
+                        bool first = true;
 
                         World w = GameManager.Instance.World;
@@ -15 +41 @@
                                 Player player = PersistentContainer.Instance.Players.GetByInternalId (ci.InternalId);
 
-                                JSONObject pos = new JSONObject ();
-                                pos.Add ("x", new JSONNumber ((int) current.Value.GetPosition ().x));
-                                pos.Add ("y", new JSONNumber ((int) current.Value.GetPosition ().y));
-                                pos.Add ("z", new JSONNumber ((int) current.Value.GetPosition ().z));
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
 
-                                JSONObject p = new JSONObject ();
-                                p.Add ("steamid", new JSONString (ci.PlatformId.CombinedString));
-                                p.Add ("crossplatformid", new JSONString (ci.CrossplatformId?.CombinedString ?? ""));
-                                p.Add ("entityid", new JSONNumber (ci.entityId));
-                                p.Add ("ip", new JSONString (ci.ip));
-                                p.Add ("name", new JSONString (current.Value.EntityName));
-                                p.Add ("online", new JSONBoolean (true));
-                                p.Add ("position", pos);
+                                first = false;
+                                
+                                writer.WriteRaw (jsonKeySteamId);
+                                writer.WriteString (ci.PlatformId.CombinedString);
+                                
+                                writer.WriteRaw (jsonKeyCrossPlatformId);
+                                writer.WriteString (ci.CrossplatformId?.CombinedString ?? "");
+                                
+                                writer.WriteRaw (jsonKeyEntityId);
+                                writer.WriteInt32 (ci.entityId);
+                                
+                                writer.WriteRaw (jsonKeyIp);
+                                writer.WriteString (ci.ip);
+                                
+                                writer.WriteRaw (jsonKeyName);
+                                writer.WriteString (current.Value.EntityName);
+                                
+                                writer.WriteRaw (jsonKeyOnline);
+                                writer.WriteBoolean (true);
+                                
+                                writer.WriteRaw (jsonKeyPosition);
+                                JsonCommons.WriteVector3I (ref writer, new Vector3i (current.Value.GetPosition ()));
+                                
+                                writer.WriteRaw (jsonKeyLevel);
+                                writer.WriteSingle (player?.Level ?? -1);
+                                
+                                writer.WriteRaw (jsonKeyHealth);
+                                writer.WriteInt32 (current.Value.Health);
+                                
+                                writer.WriteRaw (jsonKeyStamina);
+                                writer.WriteSingle (current.Value.Stamina);
+                                
+                                writer.WriteRaw (jsonKeyZombieKills);
+                                writer.WriteInt32 (current.Value.KilledZombies);
+                                
+                                writer.WriteRaw (jsonKeyPlayerKills);
+                                writer.WriteInt32 (current.Value.KilledPlayers);
+                                
+                                writer.WriteRaw (jsonKeyPlayerDeaths);
+                                writer.WriteInt32 (current.Value.Died);
+                                
+                                writer.WriteRaw (jsonKeyScore);
+                                writer.WriteInt32 (current.Value.Score);
 
-                                p.Add ("level", new JSONNumber (player?.Level ?? -1));
-                                p.Add ("health", new JSONNumber (current.Value.Health));
-                                p.Add ("stamina", new JSONNumber (current.Value.Stamina));
-                                p.Add ("zombiekills", new JSONNumber (current.Value.KilledZombies));
-                                p.Add ("playerkills", new JSONNumber (current.Value.KilledPlayers));
-                                p.Add ("playerdeaths", new JSONNumber (current.Value.Died));
-                                p.Add ("score", new JSONNumber (current.Value.Score));
+                                writer.WriteRaw (jsonKeyTotalPlaytime);
+                                writer.WriteInt64 (player?.TotalPlayTime ?? -1);
+                                
+                                writer.WriteRaw (jsonKeyLastOnline);
+                                writer.WriteString (player != null ? player.LastOnline.ToString ("s") : string.Empty);
 
-                                p.Add ("totalplaytime", new JSONNumber (player?.TotalPlayTime ?? -1));
-                                p.Add ("lastonline", new JSONString (player != null ? player.LastOnline.ToString ("s") : string.Empty));
-                                p.Add ("ping", new JSONNumber (ci.ping));
-
-                                players.Add (p);
+                                writer.WriteRaw (jsonKeyPing);
+                                writer.WriteInt32 (ci.ping);
+                                
+                                writer.WriteEndObject ();
                         }
-
-                        LegacyApiHelper.WriteJSON (_context.Response, players);
+                        
+                        writer.WriteEndArray ();
+                        
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }
         }