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

binary-improvements/MapRendering/WebCommandResult.cs

@@ -5 +5 @@
 using System.Text;
 using System.Threading;
-using AllocsFixes.JSON;
 using UnityEngine;
+using Utf8Json;
 using Webserver;
 
-namespace AllocsFixes.NetConnections.Servers.Web {
+namespace AllocsFixes.Web {
         public class WebCommandResult : IConsoleConnection {
                 public enum ResultType {
                         Full,
                         ResultOnly,
-                        Raw
+                        Raw,
                 }
 
@@ -35 +35 @@
                         responseType = _resultType;
                 }
+                
+                private static readonly byte[] jsonKeyCommand = JsonWriter.GetEncodedPropertyNameWithBeginObject ("command");
+                private static readonly byte[] jsonKeyParameters = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("parameters");
+                private static readonly byte[] jsonKeyResult = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("result");
 
                 public void SendLines (List<string> _output) {
@@ -44 +48 @@
                         }
 
+                        string result = sb.ToString ();
+
                         try {
                                 context.Response.SendChunked = false;
 
                                 if (responseType == ResultType.Raw) {
-                                        WebUtils.WriteText (context.Response, sb.ToString ());
+                                        WebUtils.WriteText (context.Response, result);
                                 } else {
-                                        JSONNode result;
+                                        JsonWriter writer = new JsonWriter ();
+
                                         if (responseType == ResultType.ResultOnly) {
-                                                result = new JSONString (sb.ToString ());
+                                                writer.WriteString (result);
                                         } else {
-                                                JSONObject resultObj = new JSONObject ();
-
-                                                resultObj.Add ("command", new JSONString (command));
-                                                resultObj.Add ("parameters", new JSONString (parameters));
-                                                resultObj.Add ("result", new JSONString (sb.ToString ()));
-
-                                                result = resultObj;
+                                                writer.WriteRaw (jsonKeyCommand);
+                                                writer.WriteString (command);
+                                                
+                                                writer.WriteRaw (jsonKeyParameters);
+                                                writer.WriteString (parameters);
+                                                
+                                                writer.WriteRaw (jsonKeyResult);
+                                                writer.WriteString (result);
+                                                
+                                                writer.WriteEndObject ();
                                         }
 
-                                        LegacyApiHelper.WriteJSON (context.Response, result);
+                                        WebUtils.WriteJsonData (context.Response, ref writer);
                                 }
                         } catch (IOException e) {
                                 if (e.InnerException is SocketException) {
-                                        Log.Out ("Error in WebCommandResult.SendLines(): Remote host closed connection: " + e.InnerException.Message);
+                                        Log.Out ($"Error in WebCommandResult.SendLines(): Remote host closed connection: {e.InnerException.Message}");
                                 } else {
-                                        Log.Out ("Error (IO) in WebCommandResult.SendLines(): " + e);
+                                        Log.Out ($"Error (IO) in WebCommandResult.SendLines(): {e}");
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in WebCommandResult.SendLines(): " + e);
+                                Log.Out ($"Error in WebCommandResult.SendLines(): {e}");
                         } finally {
                                 context.Response?.Close ();
@@ -99 +109 @@
 
                 public string GetDescription () {
-                        return "WebCommandResult_for_" + command;
+                        return $"WebCommandResult_for_{command}";
                 }
         }