Changeset 402 for binary-improvements2/WebServer/src/WebCommandResult.cs

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

File:

• binary-improvements2/WebServer/src/WebCommandResult.cs (modified) (5 diffs)

binary-improvements2/WebServer/src/WebCommandResult.cs

@@ -4 +4 @@
 using System.Net.Sockets;
 using System.Text;
-using AllocsFixes.JSON;
 using UnityEngine;
-using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
+using Utf8Json;
 
 namespace Webserver {
@@ -19 +18 @@
                 private readonly string parameters;
 
-                private readonly HttpListenerResponse response;
+                private readonly RequestContext context;
                 private readonly ResultType responseType;
 
-                public WebCommandResult (string _command, string _parameters, ResultType _responseType, HttpListenerResponse _response) {
-                        response = _response;
+                public WebCommandResult (string _command, string _parameters, ResultType _responseType, RequestContext _context) {
+                        context = _context;
                         command = _command;
                         parameters = _parameters;
@@ -29 +28 @@
                 }
 
+                private static readonly byte[] jsonRawKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("resultRaw");
+                
+                private static readonly byte[] jsonCommandKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("command");
+                private static readonly byte[] jsonParametersKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("parameters");
+                private static readonly byte[] jsonResultKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("result");
+                
                 public void SendLines (List<string> _output) {
                         StringBuilder sb = new StringBuilder ();
@@ -35 +40 @@
                         }
 
+                        string commandOutput = sb.ToString ();
+
                         try {
-                                response.SendChunked = false;
-
                                 if (responseType == ResultType.Raw) {
-                                        WebUtils.WriteText (response, sb.ToString ());
+                                        WebUtils.WriteText (context.Response, commandOutput);
                                 } else {
-                                        JsonNode result;
+                                        WebUtils.PrepareEnvelopedResult (out JsonWriter writer);
+                        
                                         if (responseType == ResultType.ResultOnly) {
-                                                result = new JsonString (sb.ToString ());
+                                                writer.WriteRaw (jsonRawKey);
+                                                writer.WriteString (commandOutput);
+                                                writer.WriteEndObject ();
                                         } 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 (jsonCommandKey);
+                                                writer.WriteString (command);
+                                                
+                                                writer.WriteRaw (jsonParametersKey);
+                                                writer.WriteString (parameters);
+                                                
+                                                writer.WriteRaw (jsonResultKey);
+                                                writer.WriteString (commandOutput);
+                                                
+                                                writer.WriteEndObject ();
                                         }
 
-                                        WebUtils.WriteJson (response, result);
+                                        WebUtils.SendEnvelopedResult (context, ref writer);
                                 }
                         } catch (IOException e) {
                                 if (e.InnerException is SocketException) {
-                                        Log.Warning ("[Web] Error in WebCommandResult.SendLines(): Remote host closed connection: " + e.InnerException.Message);
+                                        Log.Warning ($"[Web] Error in WebCommandResult.SendLines(): Remote host closed connection: {e.InnerException.Message}");
                                 } else {
-                                        Log.Warning ("[Web] Error (IO) in WebCommandResult.SendLines(): " + e);
+                                        Log.Warning ($"[Web] Error (IO) in WebCommandResult.SendLines(): {e}");
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("[Web] Error in WebCommandResult.SendLines(): " + e);
+                                Log.Warning ($"[Web] Error in WebCommandResult.SendLines(): {e}");
                         } finally {
-                                response?.Close ();
+                                context?.Response?.Close ();
                         }
                 }
@@ -82 +93 @@
 
                 public string GetDescription () {
-                        return "WebCommandResult_for_" + command;
+                        return $"WebCommandResult_for_{command}";
                 }
         }