Changeset 387 for binary-improvements2/MapRendering/Web/SSE

Timestamp:

Aug 6, 2022, 11:32:32 PM (3 years ago)

Author:

alloc

Message:

Big refactoring in Web to pass around a Context instead of a bunch of individual arguments all the time

Location:

binary-improvements2/MapRendering/Web/SSE

Files:

• EventLog.cs (modified) (2 diffs)
• SseHandler.cs (modified) (3 diffs)

binary-improvements2/MapRendering/Web/SSE/EventLog.cs

@@ -10 +10 @@
 
                 private void LogCallback (string _formattedMsg, string _plainMsg, string _trace, LogType _type, DateTime _timestamp, long _uptime) {
-                        string date = $"{_timestamp.Year:0000}-{_timestamp.Month:00}-{_timestamp.Day:00}";
-                        string time = $"{_timestamp.Hour:00}:{_timestamp.Minute:00}:{_timestamp.Second:00}";
                         string isotime = _timestamp.ToString ("o");
                         string uptime = _uptime.ToString ();
@@ -20 +18 @@
                         data.Add ("type", new JSONString (_type.ToStringCached ()));
                         data.Add ("trace", new JSONString (_trace));
-                        data.Add ("date", new JSONString (date));
-                        data.Add ("time", new JSONString (time));
                         data.Add ("isotime", new JSONString (isotime));
                         data.Add ("uptime", new JSONString (uptime));

binary-improvements2/MapRendering/Web/SSE/SseHandler.cs

@@ -5 +5 @@
 using System.Threading;
 using AllocsFixes.NetConnections.Servers.Web.Handlers;
-using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
-using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 // Implemented following HTML spec
@@ -52 +50 @@
                 }
 
-                public override void HandleRequest (string _requestPath, HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _con,
-                        int _permissionLevel) {
-                        string eventName = _requestPath.Remove (0, urlBasePath.Length);
+                public override void HandleRequest (RequestContext _context) {
+                        string eventName = _context.RequestPath.Remove (0, urlBasePath.Length);
 
                         if (!events.TryGetValue (eventName, out EventBase eventInstance)) {
                                 Log.Out ($"Error in {nameof (SseHandler)}.HandleRequest(): No handler found for event \"{eventName}\"");
-                                _resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                _context.Response.StatusCode = (int)HttpStatusCode.NotFound;
                                 return;
                         }
 
-                        if (!IsAuthorizedForEvent (eventName, _permissionLevel)) {
-                                _resp.StatusCode = (int)HttpStatusCode.Forbidden;
-                                if (_con != null) {
+                        if (!IsAuthorizedForEvent (eventName, _context.PermissionLevel)) {
+                                _context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                                if (_context.Connection != null) {
                                         //Log.Out ($"{nameof(SseHandler)}: user '{user.SteamID}' not allowed to access '{eventName}'");
                                 }
@@ -72 +69 @@
 
                         try {
-                                eventInstance.AddListener (_resp);
+                                eventInstance.AddListener (_context.Response);
 
                                 // Keep the request open
-                                _resp.SendChunked = true;
+                                _context.Response.SendChunked = true;
 
-                                _resp.AddHeader ("Content-Type", "text/event-stream");
-                                _resp.OutputStream.Flush ();
+                                _context.Response.AddHeader ("Content-Type", "text/event-stream");
+                                _context.Response.OutputStream.Flush ();
                         } catch (Exception e) {
                                 Log.Error ($"Error in {nameof (SseHandler)}.HandleRequest(): Handler {eventInstance.Name} threw an exception:");
                                 Log.Exception (e);
-                                _resp.StatusCode = (int)HttpStatusCode.InternalServerError;
+                                _context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
                         }
                 }