Changeset 402 for binary-improvements2/WebServer/src/Web.cs

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

File:

• binary-improvements2/WebServer/src/Web.cs (modified) (13 diffs)

binary-improvements2/WebServer/src/Web.cs

@@ -3 +3 @@
 using System.IO;
 using System.Net.Sockets;
-using AllocsFixes.FileCache;
-using MapRendering;
 using SpaceWizards.HttpListener;
 using UnityEngine;
+using Webserver.FileCache;
 using Webserver.UrlHandlers;
 using Cookie = System.Net.Cookie;
@@ -14 +13 @@
 namespace Webserver {
         public class Web : IConsoleServer {
+                public static event Action<Web> ServerInitialized;
+                
                 private const int guestPermissionLevel = 2000;
                 private const string indexPageUrl = "/app";
@@ -26 +27 @@
                 public Web (string _modInstancePath) {
                         try {
-                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("ControlPanelPort"));
+                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof (EnumGamePrefs.ControlPanelPort)));
                                 if (webPort < 1 || webPort > 65533) {
                                         Log.Out ("[Web] Webserver not started (ControlPanelPort not within 1-65533)");
@@ -44 +45 @@
 
                                 string webfilesFolder = DetectWebserverFolder (_modInstancePath);
-                                string webfilesFolderLegacy = _modInstancePath + "/weblegacy";
+                                string webfilesFolderLegacy = $"{_modInstancePath}/weblegacy";
 
                                 connectionHandler = new ConnectionHandler ();
@@ -56 +57 @@
                                 RegisterPathHandler ("/weblegacy", new StaticHandler (
                                         webfilesFolderLegacy,
-                                        useStaticCache ? (AbstractCache)new SimpleCache () : new DirectAccess (),
+                                        useStaticCache ? new SimpleCache () : new DirectAccess (),
                                         false)
                                 );
@@ -68 +69 @@
                                 RegisterPathHandler ("/files/", new StaticHandler (
                                         webfilesFolder,
-                                        useStaticCache ? (AbstractCache) new SimpleCache () : new DirectAccess (),
+                                        useStaticCache ? new SimpleCache () : new DirectAccess (),
                                         false)
                                 );
                                 RegisterPathHandler ("/itemicons/", new ItemIconHandler (true));
-                                RegisterPathHandler ("/map/", new StaticHandler (
-                                        GameIO.GetSaveGameDir () + "/map",
-                                        MapRenderer.GetTileCache (),
-                                        false,
-                                        "web.map")
-                                );
                                 RegisterPathHandler ("/api/", new ApiHandler ());
+                                
+                                // Allow other code to add their stuff
+                                ServerInitialized?.Invoke (this);
 
                                 listener.Prefixes.Add ($"http://+:{webPort}/");
@@ -87 +85 @@
                                 SdtdConsole.Instance.RegisterServer (this);
 
-                                Log.Out ("[Web] Started Webserver on port " + webPort);
+                                Log.Out ($"[Web] Started Webserver on port {webPort}");
                         } catch (Exception e) {
                                 Log.Error ("[Web] Error in Web.ctor: ");
@@ -95 +93 @@
 
                 private static string DetectWebserverFolder (string _modInstancePath) {
-                        string webserverFolder = _modInstancePath + "/webserver";
+                        string webserverFolder = $"{_modInstancePath}/webserver";
 
                         foreach (Mod mod in ModManager.GetLoadedMods ()) {
-                                string modServerFolder = mod.Path + "/webserver";
+                                string modServerFolder = $"{mod.Path}/webserver";
                                 
                                 if (Directory.Exists (modServerFolder)) {
@@ -127 +125 @@
                         foreach (Mod mod in ModManager.GetLoadedMods ()) {
                                 try {
-                                        string webModPath = mod.Path + "/WebMod";
+                                        string webModPath = $"{mod.Path}/WebMod";
                                         if (!Directory.Exists (webModPath)) {
                                                 continue;
@@ -136 +134 @@
                                                 webMods.Add (webMod);
                                         } catch (InvalidDataException e) {
-                                                Log.Error ($"[Web] Could not load webmod from mod {mod.ModInfo.Name.Value}: {e.Message}");
+                                                Log.Error ($"[Web] Could not load webmod from mod {mod.Name}: {e.Message}");
                                         }
                                 } catch (Exception e) {
-                                        Log.Error ("[Web] Failed loading web mods from mod " + mod.ModInfo.Name.Value);
+                                        Log.Error ($"[Web] Failed loading web mods from mod {mod.Name}");
                                         Log.Exception (e);
                                 }
@@ -150 +148 @@
                                 listener.Close ();
                         } catch (Exception e) {
-                                Log.Out ("[Web] Error in Web.Disconnect: " + e);
+                                Log.Out ($"[Web] Error in Web.Disconnect: {e}");
                         }
                 }
@@ -238 +236 @@
                         } catch (IOException e) {
                                 if (e.InnerException is SocketException) {
-                                        Log.Out ("[Web] Error in Web.HandleRequest(): Remote host closed connection: " + e.InnerException.Message);
+                                        Log.Out ($"[Web] Error in Web.HandleRequest(): Remote host closed connection: {e.InnerException.Message}");
                                 } else {
-                                        Log.Out ("[Web] Error (IO) in Web.HandleRequest(): " + e);
+                                        Log.Out ($"[Web] Error (IO) in Web.HandleRequest(): {e}");
                                 }
                         } catch (Exception e) {
@@ -313 +311 @@
                         }
 
-                        Log.Warning ("[Web] Invalid Admintoken used from " + reqRemoteEndPoint);
+                        Log.Warning ($"[Web] Invalid Admintoken used from {reqRemoteEndPoint}");
 
                         return guestPermissionLevel;