Changeset 454 for binary-improvements/MapRendering/WebCommandResult.cs

Timestamp:

Jul 28, 2023, 8:42:10 PM (16 months ago)

Author:

alloc

Message:

24_29_43
Switched over to vanilla Web infrastructure

File:

• binary-improvements/MapRendering/WebCommandResult.cs (moved) (moved from binary-improvements/MapRendering/Web/WebCommandResult.cs ) (5 diffs)

binary-improvements/MapRendering/WebCommandResult.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using AllocsFixes.JSON;
-using AllocsFixes.NetConnections.Servers.Web.API;
 using UnityEngine;
+using Webserver;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -24 +23 @@
                 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) {
+                public WebCommandResult (string _command, string _parameters, ResultType _resultType, RequestContext _context) {
                         Interlocked.Increment (ref handlingCount);
                         Interlocked.Increment (ref currentHandlers);
 
-                        response = _response;
+                        context = _context;
                         command = _command;
                         parameters = _parameters;
-                        responseType = _responseType;
+                        responseType = _resultType;
                 }
 
@@ -47 +45 @@
 
                         try {
-                                response.SendChunked = false;
+                                context.Response.SendChunked = false;
 
                                 if (responseType == ResultType.Raw) {
-                                        WebAPI.WriteText (response, sb.ToString ());
+                                        WebUtils.WriteText (context.Response, sb.ToString ());
                                 } else {
                                         JSONNode result;
@@ -65 +63 @@
                                         }
 
-                                        WebAPI.WriteJSON (response, result);
+                                        LegacyApiHelper.WriteJSON (context.Response, result);
                                 }
                         } 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);
@@ -77 +74 @@
                                 Log.Out ("Error in WebCommandResult.SendLines(): " + e);
                         } finally {
-                                if (response != null) {
-                                        response.Close ();
-                                }
+                                context.Response?.Close ();
 
-//                              msw.Stop ();
+                                //                              msw.Stop ();
 //                              if (GamePrefs.GetInt (EnumGamePrefs.HideCommandExecutionLog) < 1) {
 //                                      totalHandlingTime += msw.ElapsedMicroseconds;