make stuff nonstatic

SimpleHttpServer/HttpServer.cs

@@ -86,18 +86,24 @@ public sealed class HttpServer {
 
     private readonly Dictionary<(string path, string rType), EndpointInvocationInfo> simpleEndpointMethodInfos = new();
     private static readonly Type[] expectedEndpointParameterTypes = new[] { typeof(RequestContext) };
-    public void RegisterEndpointsFromType<T>() {
+
+    public void RegisterEndpointsFromType<T>(Func<T>? instanceFactory = null) where T : class { // T cannot be static, as generic args must be nonstatic
         if (stringToTypeParameterConverters.Count == 0)
             RegisterDefaultConverters();
 
         var t = typeof(T);
-        foreach (var (mi, attrib) in t.GetMethods()
+        var mis = t.GetMethods()
             .ToDictionary(x => x, x => x.GetCustomAttributes<HttpEndpointAttribute>())
-            .Where(x => x.Value.Any()).ToDictionary(x => x.Key, x => x.Value.Single())) {
+            .Where(x => x.Value.Any()).ToDictionary(x => x.Key, x => x.Value.Single());
+
+        var isStatic = mis.All(x => x.Key.IsStatic); // if all are static then there is no point in having a constructor as no instance data is accessible, but we allow passing a factory anyway
+        Assert(isStatic || (instanceFactory != null), $"You must provide an instance factory if any methods of the given type ({typeof(T).FullName}) are non-static");
+        T? classInstance = instanceFactory?.Invoke();
+        foreach (var (mi, attrib) in mis) {
 
             string GetFancyMethodName() => mi.DeclaringType!.FullName + "#" + mi.Name;
 
-            Assert(mi.IsStatic, $"Method tagged with HttpEndpointAttribute must be static! ({GetFancyMethodName()})");
+            //Assert(mi.IsStatic, $"Method tagged with HttpEndpointAttribute must be static! ({GetFancyMethodName()})");
             Assert(mi.IsPublic, $"Method tagged with HttpEndpointAttribute must be public! ({GetFancyMethodName()})");
 
             var methodParams = mi.GetParameters();
@@ -126,8 +132,11 @@ public sealed class HttpServer {
             }
 
             // stores the check attributes that are defined on the method and on the containing class
-            var requiredChecks = mi.GetCustomAttributes<BaseEndpointCheckAttribute>(true).Concat(mi.DeclaringType?.GetCustomAttributes<BaseEndpointCheckAttribute>(true) ?? Enumerable.Empty<Attribute>())
-                  .Where(a => a.GetType().IsAssignableTo(typeof(BaseEndpointCheckAttribute))).Cast<BaseEndpointCheckAttribute>().ToArray();
+            var requiredChecks = mi.GetCustomAttributes<InternalEndpointCheckAttribute>(true).Concat(mi.DeclaringType?.GetCustomAttributes<InternalEndpointCheckAttribute>(true) ?? Enumerable.Empty<Attribute>())
+                  .Where(a => a.GetType().IsAssignableTo(typeof(InternalEndpointCheckAttribute))).Cast<InternalEndpointCheckAttribute>().ToArray();
+
+            foreach (var requiredCheck in requiredChecks)
+                requiredCheck.SetInstance(classInstance);
 
             foreach (var location in attrib.Locations) {
                 var normLocation = NormalizeUrlPath(location);
@@ -139,7 +148,7 @@ public sealed class HttpServer {
 
                 var reqMethod = Enum.GetName(attrib.RequestMethod) ?? throw new ArgumentException("Request method was undefined");
                 mainLogger.Information($"Registered endpoint: '{reqMethod} {normLocation}'");
-                simpleEndpointMethodInfos.Add((normLocation, reqMethod), new EndpointInvocationInfo(mi, qparams, requiredChecks));
+                simpleEndpointMethodInfos.Add((normLocation, reqMethod), new EndpointInvocationInfo(mi, qparams, requiredChecks, classInstance));
             }
         }
     }
@@ -265,7 +274,7 @@ public sealed class HttpServer {
                 convertedQParamValues[0] = rc;
                 rc.ParsedParameters = parsedQParams.AsReadOnly();
 
-                await (Task) (mi.Invoke(null, convertedQParamValues) ?? throw new NullReferenceException("Website func returned null unexpectedly"));
+                await (Task) (mi.Invoke(endpointInvocationInfo.typeInstanceReference, convertedQParamValues) ?? throw new NullReferenceException("Website func returned null unexpectedly"));
             } else {
                 if (requestMethod == "GET")
                     foreach (var (k, v) in staticServePaths) {