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

binary-improvements/MapRendering/API/GetLog.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using AllocsFixes.JSON;
+using JetBrains.Annotations;
+using Utf8Json;
 using Webserver;
 using Webserver.WebAPI;
 
 namespace AllocsFixes.WebAPIs {
+        [UsedImplicitly]
         public class GetLog : AbsWebAPI {
                 private const int MAX_COUNT = 1000;
                 
+                private static readonly byte[] jsonKeyFirstLine = JsonWriter.GetEncodedPropertyNameWithBeginObject ("firstLine");
+                private static readonly byte[] jsonKeyLastLine = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("lastLine");
+                private static readonly byte[] jsonKeyEntries = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("entries");
+
+                private static readonly byte[] jsonKeyEntDate = JsonWriter.GetEncodedPropertyNameWithBeginObject ("date");
+                private static readonly byte[] jsonKeyEntTime = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("time");
+                private static readonly byte[] jsonKeyEntUptime = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("uptime");
+                private static readonly byte[] jsonKeyEntMsg = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("msg");
+                private static readonly byte[] jsonKeyEntTrace = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("trace");
+                private static readonly byte[] jsonKeyEntType = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("type");
+
                 public override void HandleRequest (RequestContext _context) {
                         if (_context.Request.QueryString ["count"] == null || !int.TryParse (_context.Request.QueryString ["count"], out var count)) {
@@ -26 +39 @@
 
                         if (_context.Request.QueryString ["firstLine"] == null || !int.TryParse (_context.Request.QueryString ["firstLine"], out var firstLine)) {
-                                if (count > 0) {
-                                        firstLine = LogBuffer.Instance.OldestLine;
-                                } else {
-                                        firstLine = LogBuffer.Instance.LatestLine;
-                                }
+                                firstLine = count > 0 ? LogBuffer.Instance.OldestLine : LogBuffer.Instance.LatestLine;
                         }
-
-                        JSONObject result = new JSONObject ();
 
                         List<LogBuffer.LogEntry> logEntries = LogBuffer.Instance.GetRange (ref firstLine, count, out var lastLine);
 
-                        JSONArray entries = new JSONArray ();
+                        JsonWriter writer = new JsonWriter ();
+                        
+                        writer.WriteRaw (jsonKeyFirstLine);
+                        writer.WriteInt32 (firstLine);
+                        
+                        writer.WriteRaw (jsonKeyLastLine);
+                        writer.WriteInt32 (lastLine);
+                        
+                        writer.WriteRaw (jsonKeyEntries);
+                        writer.WriteBeginArray ();
+                        
+                        bool first = true;
+
                         foreach (LogBuffer.LogEntry logEntry in logEntries) {
-                                JSONObject entry = new JSONObject ();
+                                if (!first) {
+                                        writer.WriteValueSeparator ();
+                                }
+
+                                first = false;
+                                
                                 var logEntryTimestamp = logEntry.Timestamp;
-                                entry.Add ("date", new JSONString ($"{logEntryTimestamp.Year:0000}-{logEntryTimestamp.Month:00}-{logEntryTimestamp.Day:00}"));
-                                entry.Add ("time", new JSONString ($"{logEntryTimestamp.Hour:00}:{logEntryTimestamp.Minute:00}:{logEntryTimestamp.Second:00}"));
-                                entry.Add ("uptime", new JSONString (logEntry.Uptime.ToString()));
-                                entry.Add ("msg", new JSONString (logEntry.Message));
-                                entry.Add ("trace", new JSONString (logEntry.Trace));
-                                entry.Add ("type", new JSONString (logEntry.Type.ToStringCached ()));
-                                entries.Add (entry);
+
+                                writer.WriteRaw (jsonKeyEntDate);
+                                writer.WriteString ($"{logEntryTimestamp.Year:0000}-{logEntryTimestamp.Month:00}-{logEntryTimestamp.Day:00}");
+                                
+                                writer.WriteRaw (jsonKeyEntTime);
+                                writer.WriteString ($"{logEntryTimestamp.Hour:00}:{logEntryTimestamp.Minute:00}:{logEntryTimestamp.Second:00}");
+                                
+                                writer.WriteRaw (jsonKeyEntUptime);
+                                writer.WriteString (logEntry.Uptime.ToString());
+                                
+                                writer.WriteRaw (jsonKeyEntMsg);
+                                writer.WriteString (logEntry.Message);
+                                
+                                writer.WriteRaw (jsonKeyEntTrace);
+                                writer.WriteString (logEntry.Trace);
+                                
+                                writer.WriteRaw (jsonKeyEntType);
+                                writer.WriteString (logEntry.Type.ToStringCached ());
+
+                                writer.WriteEndObject ();
                         }
 
-                        result.Add ("firstLine", new JSONNumber (firstLine));
-                        result.Add ("lastLine", new JSONNumber (lastLine));
-                        result.Add ("entries", entries);
-
-                        LegacyApiHelper.WriteJSON (_context.Response, result);
+                        writer.WriteEndArray ();
+                        
+                        writer.WriteEndObject ();
+                        WebUtils.WriteJsonData (_context.Response, ref writer);
                 }
         }