Changeset 384

Timestamp:

Aug 3, 2022, 9:10:12 PM (2 years ago)

Author:

alloc

Message:

Added support for webmods to the backend

Location:

binary-improvements2/MapRendering

Files:

• Web/API/GetWebMods.cs (added)
• Web/Handlers/ApiHandler.cs (modified) (1 diff)
• Web/Web.cs (modified) (5 diffs)
• Web/WebMod.cs (added)
• WebAndMapRendering.csproj (modified) (2 diffs)

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

@@ -11 +11 @@
                 private readonly Dictionary<string, WebAPI> apis = new CaseInsensitiveStringDictionary<WebAPI> ();
 
-                public ApiHandler (string _moduleName = null) : base (_moduleName) {
+                public ApiHandler () : base (null) {
 
+                }
+
+                public override void SetBasePathAndParent (Web _parent, string _relativePath) {
+                        base.SetBasePathAndParent (_parent, _relativePath);
+
+                        Type[] apiWithParentCtorTypes = { typeof (Web) };
+                        Object[] apiWithParentCtorArgs = { _parent };
+
+                        Type[] apiEmptyCtorTypes = { };
+                        Object[] apiEmptyCtorArgs = { };
+                        
                         foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
                                 if (!t.IsAbstract && t.IsSubclassOf (typeof (WebAPI))) {
-                                        ConstructorInfo ctor = t.GetConstructor (new Type [0]);
+                                        ConstructorInfo ctor = t.GetConstructor (apiWithParentCtorTypes);
                                         if (ctor != null) {
-                                                WebAPI apiInstance = (WebAPI) ctor.Invoke (new object [0]);
+                                                WebAPI apiInstance = (WebAPI) ctor.Invoke (apiWithParentCtorArgs);
+                                                addApi (apiInstance);
+                                                continue;
+                                        }
+                                        
+                                        ctor = t.GetConstructor (apiEmptyCtorTypes);
+                                        if (ctor != null) {
+                                                WebAPI apiInstance = (WebAPI) ctor.Invoke (apiEmptyCtorArgs);
                                                 addApi (apiInstance);
                                         }

binary-improvements2/MapRendering/Web/Web.cs

@@ -17 +17 @@
         public class Web : IConsoleServer {
                 private const int guestPermissionLevel = 2000;
-                private const string indexPagePath = "/app";
+                private const string indexPageUrl = "/app";
                 
                 public static int handlingCount;
@@ -23 +23 @@
                 public static long totalHandlingTime = 0;
                 private readonly List<AbsHandler> handlers = new List<AbsHandler> ();
+                public readonly List<WebMod> webMods = new List<WebMod> ();
                 private readonly ConnectionHandler connectionHandler;
 
@@ -64 +65 @@
                                 );
                                 
+                                // Do mods relatively early as they should not be requested a lot, unlike the later registrations, especially for API and map tiles
+                                RegisterWebMods (useStaticCache);
+
                                 RegisterPathHandler ("/session/", new SessionHandler (webfilesFolder, connectionHandler));
                                 RegisterPathHandler ("/userstatus", new UserStatusHandler ());
+                                RegisterPathHandler ("/sse/", new SseHandler ());
                                 RegisterPathHandler ("/files/", new StaticHandler (
-                                                webfilesFolder,
-                                                useStaticCache ? (AbstractCache) new SimpleCache () : new DirectAccess (),
-                                                false)
+                                        webfilesFolder,
+                                        useStaticCache ? (AbstractCache) new SimpleCache () : new DirectAccess (),
+                                        false)
                                 );
                                 RegisterPathHandler ("/itemicons/", new ItemIconHandler (true));
                                 RegisterPathHandler ("/map/", new StaticHandler (
-                                                GameIO.GetSaveGameDir () + "/map",
-                                                MapRendering.MapRendering.GetTileCache (),
-                                                false,
-                                                "web.map")
+                                        GameIO.GetSaveGameDir () + "/map",
+                                        MapRendering.MapRendering.GetTileCache (),
+                                        false,
+                                        "web.map")
                                 );
                                 RegisterPathHandler ("/api/", new ApiHandler ());
-                                RegisterPathHandler ("/sse/", new SseHandler ());
 
                                 listener.Prefixes.Add ($"http://+:{webPort}/");
@@ -105 +109 @@
                         handlers.Add (_handler);
                         _handler.SetBasePathAndParent (this, _urlBasePath);
+                }
+
+                private void RegisterWebMods (bool _useStaticCache) {
+                        foreach (Mod mod in ModManager.GetLoadedMods ()) {
+                                try {
+                                        string webModPath = mod.Path + "/WebMod";
+                                        if (!Directory.Exists (webModPath)) {
+                                                continue;
+                                        }
+
+                                        try {
+                                                WebMod webMod = new WebMod (this, mod, _useStaticCache);
+                                                webMods.Add (webMod);
+                                        } catch (InvalidDataException e) {
+                                                Log.Error ($"Could not load webmod from mod {mod.ModInfo.Name.Value}: {e.Message}");
+                                        }
+                                } catch (Exception e) {
+                                        Log.Error ("Failed loading web mods from mod " + mod.ModInfo.Name.Value);
+                                        Log.Exception (e);
+                                }
+                        }
                 }
 
@@ -198 +223 @@
 
                                 if (requestPath.Length < 2) {
-                                        response.Redirect (indexPagePath);
+                                        response.Redirect (indexPageUrl);
                                         return;
                                 }

binary-improvements2/MapRendering/WebAndMapRendering.csproj

@@ -87 +87 @@
     <Compile Include="Web\API\GetAnimalsLocation.cs" />
     <Compile Include="Web\API\GetHostileLocation.cs" />
+    <Compile Include="Web\API\GetWebMods.cs" />
     <Compile Include="Web\API\Null.cs" />
     <Compile Include="Web\Handlers\RewriteHandler.cs" />
@@ -104 +105 @@
     <Compile Include="Web\OpenID.cs" />
     <Compile Include="Web\ConnectionHandler.cs" />
+    <Compile Include="Web\WebMod.cs" />
     <Compile Include="Web\WebPermissions.cs" />
     <Compile Include="Web\Handlers\ApiHandler.cs" />