Changeset 499

Timestamp:

Jul 23, 2024, 6:49:56 PM (4 months ago)

Author:

alloc

Message:

*Fixed: Chat code
*Fixed: SSE connection counting, added connection set up logging

Location:

TFP-WebServer

Files:

• CommandExtensions/ModInfo.xml (modified) (1 diff)
• CommandExtensions/src/ChatHelpers.cs (modified) (1 diff)
• CommandExtensions/src/Commands/Give.cs (modified) (1 diff)
• WebServer/ModInfo.xml (modified) (1 diff)
• WebServer/src/SSE/AbsEvent.cs (modified) (3 diffs)
• WebServer/src/SSE/SseClient.cs (modified) (2 diffs)
• WebServer/src/UrlHandlers/SseHandler.cs (modified) (1 diff)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.pdb (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/ModInfo.xml (modified) (1 diff)
• 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/CommandExtensions/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.0" />
+        <Version value="1.1.0.1" />
         <Website value="" />
 </xml>

TFP-WebServer/CommandExtensions/src/ChatHelpers.cs

@@ -10 +10 @@
                         }
 
-                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, _message,
-                                $"{senderName} (PM)", null));
+                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1,
+                                $"{senderName} (PM): {_message}", null,
+                                EMessageSender.None));
                         string receiverName = _receiver.playerName;
                         receiverName = receiverName != null ? $"\"{receiverName}\"" : "unknownName";

TFP-WebServer/CommandExtensions/src/Commands/Give.cs

@@ -51 +51 @@
                         }
 
-                        int quality = Constants.cItemMaxQuality;
+                        ushort quality = Constants.cItemMaxQuality;
 
                         if (_params.Count == 4) {
-                                if (!int.TryParse (_params [3], out quality) || quality <= 0) {
+                                if (!ushort.TryParse (_params [3], out quality) || quality > Constants.cItemMaxQuality) {
                                         SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero.");
                                         return;

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="1.1.0.2" />
+        <Version value="1.1.0.3" />
         <Website value="" />
 </xml>

TFP-WebServer/WebServer/src/SSE/AbsEvent.cs

@@ -36 +36 @@
 
                         openClients.Add (_client);
+                        
+                        logConnectionState ("Connection opened", _client);
                 }
 
@@ -64 +66 @@
                                                 bytesToSend = Encoding.UTF8.GetBytes (output, 0, output.Length, buf, 0);
                                         } catch (ArgumentException e) {
-                                                logError ("Exception while encoding data for output, most likely exceeding buffer size:", false);
+                                                Log.Error ($"[Web] [SSE] '{Name}': Exception while encoding data for output, most likely exceeding buffer size:");
                                                 Log.Exception (e);
                                                 return;
@@ -79 +81 @@
                 private void sendBufToListeners (byte[] _bytes, int _bytesToSend) {
                         for (int i = openClients.Count - 1; i >= 0; i--) {
-                                ESseClientWriteResult writeResult = openClients [i].Write (_bytes, _bytesToSend);
-                                if (writeResult == ESseClientWriteResult.Ok) {
-                                        continue;
-                                }
-
-                                currentlyOpen--;
-                                totalClosed++;
-
-                                if (writeResult == ESseClientWriteResult.Error) {
-                                        logError ("Can not write to endpoint, closing", true);
-                                }
+                                openClients [i].Write (_bytes, _bytesToSend);
                         }
-                }
-
-                protected void logError (string _message, bool _printConnections) {
-                        Log.Error (_printConnections
-                                ? $"[Web] [SSE] '{Name}': {_message} (Left open: {currentlyOpen}, total opened: {totalOpened}, closed: {totalClosed})"
-                                : $"[Web] [SSE] '{Name}': {_message}");
                 }
 
                 public virtual int DefaultPermissionLevel () => 0;
 
+                private void logConnectionState (string _message, SseClient _client) {
+                        Log.Out ($"[Web] [SSE] '{Name}': {_message} from {_client.RemoteEndpoint} (Left open: {currentlyOpen}, total opened: {totalOpened}, closed: {totalClosed})");
+                }
+
                 public void ClientClosed (SseClient _client) {
-                        openClients.Remove (_client);
+                        if (openClients.Remove (_client)) {
+                                currentlyOpen--;
+                                totalClosed++;
+
+                                logConnectionState ("Closed connection", _client);
+                        }
                 }
         }

TFP-WebServer/WebServer/src/SSE/SseClient.cs

@@ -1 +1 @@
 using System;
 using System.IO;
+using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using SpaceWizards.HttpListener;
 using Webserver.UrlHandlers;
+using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
 
 namespace Webserver.SSE {
@@ -17 +18 @@
         private static readonly byte[] keepAliveData = Encoding.UTF8.GetBytes (": KeepAlive\n\n");
 
+        public readonly IPEndPoint RemoteEndpoint;
         private readonly SseHandler parent;
         private readonly HttpListenerResponse response;
         private DateTime lastMessageSent = DateTime.Now;
 
-        public SseClient (SseHandler _parent, HttpListenerResponse _response) {
+        public SseClient (SseHandler _parent, RequestContext _context) {
             parent = _parent;
-            response = _response;
+            response = _context.Response;
+            RemoteEndpoint = _context.Request.RemoteEndPoint;
             
             // Keep the request open
-            _response.SendChunked = true;
+            response.SendChunked = true;
 
-            _response.AddHeader ("Content-Type", "text/event-stream");
-            _response.OutputStream.Flush ();
+            response.AddHeader ("Content-Type", "text/event-stream");
+            response.OutputStream.Flush ();
         }
 

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

@@ -68 +68 @@
                         SseClient client;
                         try {
-                                client = new SseClient(this, _context.Response);
+                                client = new SseClient(this, _context);
                         } catch (Exception e) {
                                 Log.Error ($"[Web] [SSE] In {nameof (SseHandler)}.HandleRequest(): Could not create client:");

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

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="1.1.0.0" />
+        <Version value="1.1.0.1" />
         <Website value="" />
 </xml>

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="1.1.0.2" />
+        <Version value="1.1.0.3" />
         <Website value="" />
 </xml>