Changeset 389 for binary-improvements2/MapRendering/Web

Timestamp:

Aug 7, 2022, 1:11:51 AM (2 years ago)

Author:

alloc

Message:

Finished up REST API base
Made API handler look for APIs in all loaded mods

Location:

binary-improvements2

Files:

• . (modified) (1 prop)
• MapRendering (modified) (1 prop)
• MapRendering/Web/API/AbsRestApi.cs (modified) (1 diff)
• MapRendering/Web/Handlers/ApiHandler.cs (modified) (1 diff)
• MapRendering/Web/WebUtils.cs (modified) (2 diffs)

binary-improvements2

@@ +1 @@
+.idea
 bin
-.idea
+server-fixes.sln.DotSettings.user

@@ +1 @@
+.idea
 bin
-.idea
+server-fixes.sln.DotSettings.user

binary-improvements2/MapRendering

@@ +1 @@
+bin
 obj

@@ +1 @@
+bin
 obj

binary-improvements2/MapRendering/Web/API/AbsRestApi.cs

@@ -105 +105 @@
                 }
 
+                protected bool TryGetJsonField (JSONObject _body, string _fieldName, out int _value) {
+                        _value = default;
+                        
+                        if (!_body.TryGetValue (_fieldName, out JSONNode fieldNode)) {
+                                return false;
+                        }
+
+                        if (!(fieldNode is JSONValue valueField)) {
+                                return false;
+                        }
+
+                        try {
+                                _value = valueField.AsInt;
+                                return true;
+                        } catch (Exception) {
+                                return false;
+                        }
+                }
+
                 protected abstract void HandleRestGet (RequestContext _context);
 

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

@@ -22 +22 @@
                         Object[] apiEmptyCtorArgs = { };
                         
-                        foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
-                                if (!t.IsAbstract && t.IsSubclassOf (typeof (AbsWebAPI))) {
-                                        ConstructorInfo ctor = t.GetConstructor (apiWithParentCtorTypes);
-                                        if (ctor != null) {
-                                                AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiWithParentCtorArgs);
-                                                addApi (apiInstance);
-                                                continue;
-                                        }
+                        
+                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsWebAPI), _type => {
+                                ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes);
+                                if (ctor != null) {
+                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiWithParentCtorArgs);
+                                        addApi (apiInstance);
+                                        return;
+                                }
                                         
-                                        ctor = t.GetConstructor (apiEmptyCtorTypes);
-                                        if (ctor != null) {
-                                                AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiEmptyCtorArgs);
-                                                addApi (apiInstance);
-                                        }
+                                ctor = _type.GetConstructor (apiEmptyCtorTypes);
+                                if (ctor != null) {
+                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiEmptyCtorArgs);
+                                        addApi (apiInstance);
                                 }
-                        }
+                        });
 
                         // Permissions that don't map to a real API

binary-improvements2/MapRendering/Web/WebUtils.cs

@@ -25 +25 @@
                         netWriteSampler.Begin ();
 #endif
-                        WriteText (_resp, sb.ToString(), _mimeType: MimeJson);
+                        WriteText (_resp, sb.ToString(), _statusCode, MimeJson);
 #if ENABLE_PROFILER
                         netWriteSampler.End ();
@@ -32 +32 @@
 
                 public static void WriteText (HttpListenerResponse _resp, string _text, HttpStatusCode _statusCode = HttpStatusCode.OK, string _mimeType = null) {
+                        _resp.StatusCode = (int)_statusCode;
+                        _resp.ContentType = _mimeType ?? MimePlain;
+                        _resp.ContentEncoding = Encoding.UTF8;
+
                         byte[] buf = Encoding.UTF8.GetBytes (_text);
                         _resp.ContentLength64 = buf.Length;
                         _resp.OutputStream.Write (buf, 0, buf.Length);
-                        
-                        _resp.ContentType = _mimeType ?? MimePlain;
-                        _resp.ContentEncoding = Encoding.UTF8;
-                        _resp.StatusCode = (int)_statusCode;
                 }
 

@@ +1 @@
+.idea
 bin
-.idea
+server-fixes.sln.DotSettings.user

@@ +1 @@
+bin
 obj