Changeset 500 for TFP-WebServer/WebServer/src

Timestamp:

Jul 29, 2024, 4:48:56 PM (5 months ago)

Author:

alloc

Message:

Fixed NRE when using APIs while server is shutting down

Location:

TFP-WebServer/WebServer/src

Files:

• ModApi.cs (modified) (2 diffs)
• Web.cs (modified) (2 diffs)

TFP-WebServer/WebServer/src/ModApi.cs

@@ -12 +12 @@
                 public void InitMod (Mod _modInstance) {
                         ModEvents.GameStartDone.RegisterHandler (GameStartDone);
-                        ModEvents.GameShutdown.RegisterHandler (GameShutdown);
+                        ModEvents.WorldShuttingDown.RegisterHandler (WorldShuttingDown);
                         modInstance = _modInstance;
 
@@ -31 +31 @@
                 }
 
-                private void GameShutdown () {
-                        webInstance?.Shutdown ();
+                private void WorldShuttingDown () {
+                        webInstance?.Disconnect ();
                 }
         }

TFP-WebServer/WebServer/src/Web.cs

@@ -30 +30 @@
                 private readonly AsyncCallback handleRequestDelegate;
 
+                private bool shutdown;
+
                 public Web (string _modInstancePath) {
                         try {
@@ -150 +152 @@
 
                 public void Disconnect () {
+                        if (shutdown) {
+                                return;
+                        }
+
+                        shutdown = true;
+                        
                         try {
+                                foreach (AbsHandler handler in handlers) {
+                                        handler.Shutdown ();
+                                }
+
                                 listener.Stop ();
                                 listener.Close ();
                         } catch (Exception e) {
                                 Log.Out ($"[Web] Error in Web.Disconnect: {e}");
-                        }
-                }
-
-                public void Shutdown () {
-                        foreach (AbsHandler handler in handlers) {
-                                handler.Shutdown ();
                         }
                 }