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

Timestamp:

Aug 1, 2022, 12:54:31 PM (2 years ago)

Author:

alloc

Message:

Switched to use SpaceWizards.HttpListener

Location:

binary-improvements2/MapRendering/Web/SSE

Files:

• EventBase.cs (modified) (2 diffs)
• EventLog.cs (modified) (2 diffs)
• SseHandler.cs (modified) (7 diffs)

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using AllocsFixes.JSON;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace AllocsFixes.NetConnections.Servers.Web.SSE {
@@ -116 +116 @@
                                                         Log.Exception (e);
                                                 }
-
-                                                resp.Close ();
                                         } catch (Exception e) {
                                                 currentlyOpen--;

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

@@ -12 +12 @@
                         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 ();
                         string message = _plainMsg;
@@ -21 +22 @@
                         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
@@ -10 +12 @@
 
 namespace AllocsFixes.NetConnections.Servers.Web.SSE {
-        public class SseHandler : PathHandler {
+        public class SseHandler : AbsHandler {
                 private readonly Dictionary<string, EventBase> events = new CaseInsensitiveStringDictionary<EventBase> ();
-                
+
                 private ThreadManager.ThreadInfo queueThead;
                 private readonly AutoResetEvent evSendRequest = new AutoResetEvent (false);
@@ -18 +20 @@
 
                 public SseHandler (string _moduleName = null) : base (_moduleName) {
-                        Type[] ctorTypes = {typeof (SseHandler)};
-                        object[] ctorParams = {this};
+                        Type[] ctorTypes = { typeof (SseHandler) };
+                        object[] ctorParams = { this };
 
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
@@ -25 +27 @@
                                         ConstructorInfo ctor = t.GetConstructor (ctorTypes);
                                         if (ctor != null) {
-                                                EventBase apiInstance = (EventBase) ctor.Invoke (ctorParams);
-                                                addEvent (apiInstance.Name, apiInstance);
+                                                EventBase apiInstance = (EventBase)ctor.Invoke (ctorParams);
+                                                AddEvent (apiInstance.Name, apiInstance);
                                         }
                                 }
@@ -34 +36 @@
                 public override void SetBasePathAndParent (Web _parent, string _relativePath) {
                         base.SetBasePathAndParent (_parent, _relativePath);
-                        
+
                         queueThead = ThreadManager.StartThread ("SSE-Processing_" + urlBasePath, QueueProcessThread, ThreadPriority.BelowNormal,
                                 _useRealThread: true);
@@ -45 +47 @@
                 }
 
-                private void addEvent (string _eventName, EventBase _eventInstance) {
+                public void AddEvent (string _eventName, EventBase _eventInstance) {
                         events.Add (_eventName, _eventInstance);
                         WebPermissions.Instance.AddKnownModule ("webevent." + _eventName, _eventInstance.DefaultPermissionLevel ());
                 }
 
-                public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
+                public override void HandleRequest (string _requestPath, HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _con,
                         int _permissionLevel) {
-                        string eventName = _req.Url.AbsolutePath.Remove (0, urlBasePath.Length);
+                        string eventName = _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;
+                                _resp.StatusCode = (int)HttpStatusCode.NotFound;
                                 return;
                         }
 
-                        if (!AuthorizeForEvent (eventName, _permissionLevel)) {
-                                _resp.StatusCode = (int) HttpStatusCode.Forbidden;
-                                if (_user != null) {
+                        if (!IsAuthorizedForEvent (eventName, _permissionLevel)) {
+                                _resp.StatusCode = (int)HttpStatusCode.Forbidden;
+                                if (_con != null) {
                                         //Log.Out ($"{nameof(SseHandler)}: user '{user.SteamID}' not allowed to access '{eventName}'");
                                 }
@@ -80 +82 @@
                                 Log.Error ($"Error in {nameof (SseHandler)}.HandleRequest(): Handler {eventInstance.Name} threw an exception:");
                                 Log.Exception (e);
-                                _resp.StatusCode = (int) HttpStatusCode.InternalServerError;
+                                _resp.StatusCode = (int)HttpStatusCode.InternalServerError;
                         }
                 }
 
-                private bool AuthorizeForEvent (string _eventName, int _permissionLevel) {
+                private bool IsAuthorizedForEvent (string _eventName, int _permissionLevel) {
                         return WebPermissions.Instance.ModuleAllowedWithLevel ("webevent." + _eventName, _permissionLevel);
                 }
 
                 private void QueueProcessThread (ThreadManager.ThreadInfo _threadInfo) {
-                        try {
-                                while (!shutdown && !_threadInfo.TerminationRequested ()) {
-                                        evSendRequest.WaitOne (500);
+                        while (!shutdown && !_threadInfo.TerminationRequested ()) {
+                                evSendRequest.WaitOne (500);
 
-                                        foreach (KeyValuePair<string, EventBase> kvp in events) {
+                                foreach (KeyValuePair<string, EventBase> kvp in events) {
+                                        try {
                                                 kvp.Value.ProcessSendQueue ();
+                                        } catch (Exception e) {
+                                                Log.Error ($"SSE ({kvp.Key}): Error processing send queue");
+                                                Log.Exception (e);
                                         }
                                 }
-                        } catch (Exception e) {
-                                Log.Error ("SSE: Error processing send queue");
-                                Log.Exception (e);
                         }
                 }