Further netcode cleanup

Author: valkyrienyanko

Template/Framework/Autoloads/AutoloadsFramework.cs

@@ -38,6 +38,7 @@ public abstract partial class AutoloadsFramework : Node
     public FocusOutlineManager FocusOutline { get; private set; } = null!;
     public Logger Logger { get; private set; } = null!;
     public IApplicationLifetime ApplicationLifetime { get; private set; } = null!;
+    public IBackgroundTaskTracker BackgroundTasks { get; private set; } = null!;
     public GameServices RuntimeServices { get; private set; } = null!;
 
 #if DEBUG
@@ -64,6 +65,7 @@ public sealed override void _EnterTree()
         GameConsole = GetNode<GameConsole>("%Console");
         FocusOutline = new FocusOutlineManager(this);
         Logger = new Logger(GameConsole);
+        BackgroundTasks = new BackgroundTaskTracker(Logger);
 
         OptionsManager = new OptionsManager(this);
         AudioManager = new AudioManager(this, OptionsManager);
@@ -83,7 +85,8 @@ public sealed override void _EnterTree()
             Services,
             FocusOutline,
             Logger,
-            ApplicationLifetime);
+            ApplicationLifetime,
+            BackgroundTasks);
         Game.Initialize(RuntimeServices);
 
         SceneComposition.ConfigureNodeTree(this, RuntimeServices);
@@ -126,7 +129,7 @@ public sealed override void _Notification(int what)
     {
         if (what == NotificationWMCloseRequest)
         {
-            TaskUtils.FireAndForget(ExitGame);
+            BackgroundTasks.Run(_ => ExitGame(), "Autoloads.ExitGame");
         }
 
         Notification(what);
@@ -143,6 +146,7 @@ public sealed override void _ExitTree()
 #endif
 
         Logger.Dispose();
+        BackgroundTasks.Dispose();
         Profiler.Dispose();
 
         Game.Reset();
@@ -172,6 +176,10 @@ public async Task ExitGame()
                 {
                     await subscriber();
                 }
+                catch (OperationCanceledException ex)
+                {
+                    GD.Print($"PreQuit subscriber canceled: {ex.Message}");
+                }
                 catch (Exception ex)
                 {
                     GD.PrintErr($"PreQuit subscriber failed: {ex}");

Template/Framework/Debugging/GameFramework.cs

@@ -21,6 +21,7 @@ public partial class Game
     public static FocusOutlineManager FocusOutline => RuntimeServices.FocusOutline;
 
     public static ILoggerService Logger => RuntimeServices.Logger;
+    public static IBackgroundTaskTracker BackgroundTasks => RuntimeServices.BackgroundTasks;
 
     public static IApplicationLifetime Application => RuntimeServices.ApplicationLifetime;
 

Template/Framework/ModLoader/ModLoaderUi.cs

@@ -60,73 +60,86 @@ public void LoadMods(Node node)
         {
             if (!dir.CurrentIsDir())
             {
-                goto Next;
+                filename = dir.GetNext();
+                continue;
             }
 
-            string modRoot = $@"{modsPath}/{filename}";
-            string modJson = $@"{modRoot}/mod.json";
+            TryLoadModDirectory(node, modsPath, filename, options);
+            filename = dir.GetNext();
+        }
 
-            if (!File.Exists(modJson))
-            {
-                _logger.LogWarning($"The mod folder '{filename}' does not have a mod.json so it will not be loaded");
-                goto Next;
-            }
+        dir.ListDirEnd();
+        dir.Dispose();
+    }
 
-            string jsonFileContents = File.ReadAllText(modJson);
+    private void TryLoadModDirectory(Node hostNode, string modsPath, string folderName, JsonSerializerOptions options)
+    {
+        string modRoot = $@"{modsPath}/{folderName}";
+        string modJson = $@"{modRoot}/mod.json";
 
-            jsonFileContents = jsonFileContents.Replace("*", "Any");
+        if (!File.Exists(modJson))
+        {
+            _logger.LogWarning($"The mod folder '{folderName}' does not have a mod.json so it will not be loaded");
+            return;
+        }
 
-            if (!TryDeserializeModInfo(modJson, jsonFileContents, options, out ModInfo? modInfo))
-            {
-                goto Next;
-            }
+        string jsonFileContents;
+        try
+        {
+            jsonFileContents = File.ReadAllText(modJson);
+        }
+        catch (IOException exception)
+        {
+            _logger.LogWarning($"Failed to read '{modJson}': {exception.Message}");
+            return;
+        }
+        catch (UnauthorizedAccessException exception)
+        {
+            _logger.LogWarning($"Access denied while reading '{modJson}': {exception.Message}");
+            return;
+        }
 
-            modInfo!.Normalize();
+        jsonFileContents = jsonFileContents.Replace("*", "Any");
 
-            if (string.IsNullOrWhiteSpace(modInfo.Id))
-            {
-                _logger.LogWarning($"The mod folder '{filename}' has an invalid or empty id and will be skipped");
-                goto Next;
-            }
+        if (!TryDeserializeModInfo(modJson, jsonFileContents, options, out ModInfo? modInfo))
+            return;
 
-            if (_mods.ContainsKey(modInfo.Id))
-            {
-                _logger.LogWarning($"Duplicate mod id '{modInfo.Id}' was skipped");
-                goto Next;
-            }
+        modInfo!.Normalize();
+
+        if (string.IsNullOrWhiteSpace(modInfo.Id))
+        {
+            _logger.LogWarning($"The mod folder '{folderName}' has an invalid or empty id and will be skipped");
+            return;
+        }
 
-            _mods.Add(modInfo.Id, modInfo);
+        if (_mods.ContainsKey(modInfo.Id))
+        {
+            _logger.LogWarning($"Duplicate mod id '{modInfo.Id}' was skipped");
+            return;
+        }
 
-            // Load pck
-            string pckPath = $@"{modRoot}/mod.pck";
+        _mods.Add(modInfo.Id, modInfo);
 
-            if (File.Exists(pckPath))
-            {
-                bool success = ProjectSettings.LoadResourcePack(pckPath, replaceFiles: false);
+        string pckPath = $@"{modRoot}/mod.pck";
+        if (File.Exists(pckPath))
+        {
+            bool success = ProjectSettings.LoadResourcePack(pckPath, replaceFiles: false);
 
-                if (!success)
-                {
-                    _logger.LogWarning($"Failed to load pck file for mod '{modInfo.Name}'");
-                }
-                else
-                {
-                    TryInstantiateModScene(node, modInfo);
-                }
+            if (!success)
+            {
+                _logger.LogWarning($"Failed to load pck file for mod '{modInfo.Name}'");
             }
-
-            // Load dll
-            string dllPath = $@"{modRoot}/Mod.dll";
-            if (File.Exists(dllPath))
+            else
             {
-                TryLoadManagedMod(node, modInfo, dllPath);
+                TryInstantiateModScene(hostNode, modInfo);
             }
-
-        Next:
-            filename = dir.GetNext();
         }
 
-        dir.ListDirEnd();
-        dir.Dispose();
+        string dllPath = $@"{modRoot}/Mod.dll";
+        if (File.Exists(dllPath))
+        {
+            TryLoadManagedMod(hostNode, modInfo, dllPath);
+        }
     }
 
     private bool TryDeserializeModInfo(
@@ -188,6 +201,18 @@ private void TryLoadManagedMod(Node hostNode, ModInfo modInfo, string dllPath)
             ManagedModRuntime runtime = new(loadContext, assembly, entrypoints);
             _managedMods.Add(modInfo.Id, runtime);
         }
+        catch (FileNotFoundException exception)
+        {
+            _logger.LogErr(exception, $"Managed mod '{modInfo.Id}' assembly was not found");
+        }
+        catch (FileLoadException exception)
+        {
+            _logger.LogErr(exception, $"Managed mod '{modInfo.Id}' assembly could not be loaded");
+        }
+        catch (BadImageFormatException exception)
+        {
+            _logger.LogErr(exception, $"Managed mod '{modInfo.Id}' assembly is not a valid .NET assembly");
+        }
         catch (Exception exception)
         {
             _logger.LogErr(exception, $"Failed to load managed mod '{modInfo.Id}'");
@@ -213,6 +238,18 @@ private List<IModEntrypoint> ActivateEntrypoints(Node hostNode, ModInfo modInfo,
                     entrypoints.Add(entrypoint);
                 }
             }
+            catch (MissingMethodException exception)
+            {
+                _logger.LogErr(exception, $"Entrypoint '{type.FullName}' for mod '{modInfo.Id}' requires a public parameterless constructor");
+            }
+            catch (MemberAccessException exception)
+            {
+                _logger.LogErr(exception, $"Entrypoint '{type.FullName}' for mod '{modInfo.Id}' is not accessible");
+            }
+            catch (TargetInvocationException exception)
+            {
+                _logger.LogErr(exception, $"Entrypoint '{type.FullName}' for mod '{modInfo.Id}' threw during activation");
+            }
             catch (Exception exception)
             {
                 _logger.LogErr(exception, $"Failed to initialize entrypoint '{type.FullName}' for mod '{modInfo.Id}'");

Template/Framework/Netcode/Attributes/NetOrderAttribute.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace __TEMPLATE__.Netcode;
+
+/// <summary>
+/// Optional explicit order used by legacy reflection-based serialization fallback.
+/// Members without this attribute retain metadata-token ordering.
+/// </summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+public sealed class NetOrderAttribute(int order) : Attribute
+{
+    public int Order { get; } = order;
+}

Template/Framework/Netcode/Attributes/NetOrderAttribute.cs.uid

@@ -0,0 +1 @@
+uid://ctojg4qlwxp8j