Changeset 367 for binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

Timestamp:

Aug 11, 2021, 6:22:03 PM (3 years ago)

Author:

alloc

Message:

Web:

• Added SSE (ServerSentEvents) subsystem
• Added log endpoint to SSE. Less heavy weight and more responsive way of watching the server log
• Bunch of refactoring

File:

• binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (modified) (4 diffs)

binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

@@ -4 +4 @@
 using System.Reflection;
 using AllocsFixes.NetConnections.Servers.Web.API;
-using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
         public class ApiHandler : PathHandler {
                 private readonly Dictionary<string, WebAPI> apis = new CaseInsensitiveStringDictionary<WebAPI> ();
-                private readonly string staticPart;
 
-                public ApiHandler (string _staticPart, string _moduleName = null) : base (_moduleName) {
-                        staticPart = _staticPart;
+                public ApiHandler (string _moduleName = null) : base (_moduleName) {
 
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
@@ -19 +16 @@
                                         if (ctor != null) {
                                                 WebAPI apiInstance = (WebAPI) ctor.Invoke (new object [0]);
-                                                addApi (apiInstance.Name, apiInstance);
+                                                addApi (apiInstance);
                                         }
                                 }
                         }
 
-                        // Add dummy types
-                        Type dummy_t = typeof (Null);
-                        ConstructorInfo dummy_ctor = dummy_t.GetConstructor (new Type [0]);
-                        if (dummy_ctor != null) {
-                                WebAPI dummy_apiInstance = (WebAPI) dummy_ctor.Invoke (new object[0]);
-
-                                // Permissions that don't map to a real API
-                                addApi ("viewallclaims", dummy_apiInstance);
-                                addApi ("viewallplayers", dummy_apiInstance);
-                        }
+                        // Permissions that don't map to a real API
+                        addApi (new Null ("viewallclaims"));
+                        addApi (new Null ("viewallplayers"));
                 }
 
-                private void addApi (string _apiName, WebAPI _api) {
-                        apis.Add (_apiName, _api);
-                        WebPermissions.Instance.AddKnownModule ("webapi." + _apiName, _api.DefaultPermissionLevel ());
+                private void addApi (WebAPI _api) {
+                        apis.Add (_api.Name, _api);
+                        WebPermissions.Instance.AddKnownModule ("webapi." + _api.Name, _api.DefaultPermissionLevel ());
                 }
 
 #if ENABLE_PROFILER
-                private static readonly CustomSampler apiHandlerSampler = CustomSampler.Create ("API_Handler");
+                private static readonly UnityEngine.Profiling.CustomSampler apiHandlerSampler = UnityEngine.Profiling.CustomSampler.Create ("API_Handler");
 #endif
 
                 public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user,
                         int _permissionLevel) {
-                        string apiName = _req.Url.AbsolutePath.Remove (0, staticPart.Length);
+                        string apiName = _req.Url.AbsolutePath.Remove (0, urlBasePath.Length);
 
-                        WebAPI api;
-                        if (!apis.TryGetValue (apiName, out api)) {
-                                Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\"");
+                        if (!apis.TryGetValue (apiName, out WebAPI api)) {
+                                Log.Out ($"Error in {nameof(ApiHandler)}.HandleRequest(): No handler found for API \"{apiName}\"");
                                 _resp.StatusCode = (int) HttpStatusCode.NotFound;
                                 return;
                         }
 
-                        if (!AuthorizeForCommand (apiName, _user, _permissionLevel)) {
+                        if (!AuthorizeForApi (apiName, _permissionLevel)) {
                                 _resp.StatusCode = (int) HttpStatusCode.Forbidden;
                                 if (_user != null) {
-                                        //Log.Out ("ApiHandler: user '{0}' not allowed to execute '{1}'", user.SteamID, apiName);
+                                        //Log.Out ($"{nameof(ApiHandler)}: user '{user.SteamID}' not allowed to execute '{apiName}'");
                                 }
 
@@ -74 +63 @@
 #endif
                         } catch (Exception e) {
-                                Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name);
+                                Log.Error ($"Error in {nameof(ApiHandler)}.HandleRequest(): Handler {api.Name} threw an exception:");
                                 Log.Exception (e);
                                 _resp.StatusCode = (int) HttpStatusCode.InternalServerError;
@@ -80 +69 @@
                 }
 
-                private bool AuthorizeForCommand (string _apiName, WebConnection _user, int _permissionLevel) {
+                private bool AuthorizeForApi (string _apiName, int _permissionLevel) {
                         return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + _apiName, _permissionLevel);
                 }