Changeset 505

Timestamp:

Apr 10, 2025, 3:30:00 PM (3 days ago)

Author:

alloc

Message:

Changed: Load item icons in a coroutine to reduce time needed to get server in a connectable state
Fixed: WebAPI "Player" returns player levels again

Location:

TFP-WebServer

Files:

• WebServer/ModInfo.xml (modified) (1 diff)
• WebServer/src/ModApi.cs (modified) (1 diff)
• WebServer/src/UrlHandlers/ItemIconHandler.cs (modified) (5 diffs)
• WebServer/src/WebAPI/APIs/WorldState/Player.cs (modified) (1 diff)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.pdb (modified) ( previous)
• bin/Mods/TFP_WebServer/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.dll (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.pdb (modified) ( previous)

TFP-WebServer/WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="2.0.0.1" />
+        <Version value="2.0.0.3" />
         <Website value="" />
 </xml>

TFP-WebServer/WebServer/src/ModApi.cs

@@ -27 +27 @@
 
                         if (ItemIconHandler.Instance != null) {
-                                ItemIconHandler.Instance.LoadIcons ();
+                                ThreadManager.StartCoroutine (ItemIconHandler.Instance.LoadIcons ());
                         }
                 }

TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -68 +69 @@
                 }
 
-                public bool LoadIcons () {
+                private const int LoadingMaxMsPerFrame = 100;
+                private bool loading;
+                public IEnumerator LoadIcons () {
                         
                         lock (icons) {
-                                if (loaded) {
-                                        return true;
-                                }
+                                if (loading || loaded) {
+                                        yield break;
+                                }
+
+                                loading = true;
+
+                                MicroStopwatch mswPerFrame = new MicroStopwatch (true);
 
                                 LoadingStats stats = new LoadingStats ();
@@ -99 +106 @@
                                 }
 
-                                try {
-                                        loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons, stats);
-                                } catch (Exception e) {
-                                        Log.Error ("[Web] Failed loading icons from base game");
-                                        Log.Exception (e);
-                                }
+                                yield return loadIconsFromFolder (GameIO.GetGameDir ("Data/ItemIcons"), tintedIcons, stats, mswPerFrame);
 
                                 // Load icons from mods
                                 foreach (Mod mod in ModManager.GetLoadedMods ()) {
-                                        try {
-                                                string modIconsPath = $"{mod.Path}/ItemIcons";
-                                                loadIconsFromFolder (modIconsPath, tintedIcons, stats);
-                                        } catch (Exception e) {
-                                                Log.Error ($"[Web] Failed loading icons from mod {mod.Name}");
-                                                Log.Exception (e);
-                                        }
+                                        string modIconsPath = $"{mod.Path}/ItemIcons";
+                                        yield return loadIconsFromFolder (modIconsPath, tintedIcons, stats, mswPerFrame);
                                 }
                                 
@@ -133 +130 @@
                                         Log.Out ($"[Web] IconHandler: Cached {totalSize / 1024} KiB");
                                 }
-
-                                return true;
-                        }
-                }
-
-                private void loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats) {
+                        }
+                }
+
+                private IEnumerator loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons, LoadingStats _stats,
+                        MicroStopwatch _mswPerFrame) {
                         if (!Directory.Exists (_path)) {
-                                return;
-                        }
+                                yield break;
+                        }
+
+                        _mswPerFrame.ResetAndRestart ();
 
                         foreach (string file in Directory.GetFiles (_path)) {
@@ -164 +162 @@
                                         Object.Destroy (tex);
                                 } catch (Exception e) {
+                                        Log.Error ($"[Web] Failed loading icon from {_path}");
                                         Log.Exception (e);
+                                }
+
+                                if (_mswPerFrame.ElapsedMilliseconds >= LoadingMaxMsPerFrame) {
+                                        yield return null;
+                                        _mswPerFrame.ResetAndRestart ();
                                 }
                         }

TFP-WebServer/WebServer/src/WebAPI/APIs/WorldState/Player.cs

@@ -158 +158 @@
 
                         _writer.WriteRaw (jsonLevelKey);
-                        _writer.WriteNull (); // TODO
+                        _writer.WriteInt32 (entity.Progression.Level);
 
                         _writer.WriteRaw (jsonHealthKey);

TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="2.0.0.1" />
+        <Version value="2.0.0.3" />
         <Website value="" />
 </xml>