Changeset 459 for TFP-WebServer/WebServer/src

Timestamp:

Aug 9, 2023, 9:41:32 PM (15 months ago)

Author:

alloc

Message:

Updated to dashboard/marker files 0.8.0
Added initial OpenAPI support

Location:

TFP-WebServer/WebServer/src

Files:

• ResourceHelpers.cs (added)
• UrlHandlers/ApiHandler.cs (modified) (1 diff)
• Web.cs (modified) (3 diffs)
• WebAPI/APIs/LogApi.cs (moved) (moved from TFP-WebServer/WebServer/src/WebAPI/APIs/Log.cs ) (2 diffs)
• WebAPI/APIs/OpenAPI.cs (added)
• WebAPI/APIs/OpenAPI.openapi.yaml (added)
• WebAPI/APIs/Permissions/RegisterUser.cs (modified) (1 diff)
• WebAPI/APIs/WorldState/Animal.openapi.yaml (added)
• WebAPI/APIs/WorldState/Player.cs (modified) (2 diffs)
• WebAPI/OpenAPI.master.yaml (added)
• WebAPI/OpenApiHelpers.cs (added)

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

@@ -48 +48 @@
                 private void addApi (AbsWebAPI _api) {
                         apis.Add (_api.Name, _api);
+                        parent.OpenApiHelpers.LoadOpenApiSpec (_api);
                 }
 

TFP-WebServer/WebServer/src/Web.cs

@@ -8 +8 @@
 using Webserver.Permissions;
 using Webserver.UrlHandlers;
+using Webserver.WebAPI;
 using Cookie = System.Net.Cookie;
 using HttpStatusCode = System.Net.HttpStatusCode;
@@ -21 +22 @@
                 public readonly List<WebMod> WebMods = new List<WebMod> ();
                 public readonly ConnectionHandler ConnectionHandler;
+                public readonly OpenApiHelpers OpenApiHelpers;
 
                 private readonly HttpListener listener = new HttpListener ();
@@ -51 +53 @@
 
                                 ConnectionHandler = new ConnectionHandler ();
+                                OpenApiHelpers = new OpenApiHelpers ();
                                 
                                 RegisterDefaultHandlers (_modInstancePath);

TFP-WebServer/WebServer/src/WebAPI/APIs/LogApi.cs

@@ -5 +5 @@
 namespace Webserver.WebAPI.APIs {
         [UsedImplicitly]
-        public class Log : AbsRestApi {
+        public class LogApi : AbsRestApi {
                 private const int maxCount = 1000;
 
@@ -17 +17 @@
                 private static readonly byte[] jsonIsotimeKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("isotime");
                 private static readonly byte[] jsonUptimeKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("uptime");
-                
+
+                public LogApi () : base ("Log") {
+                }
+
                 protected override void HandleRestGet (RequestContext _context) {
                         if (_context.Request.QueryString ["count"] == null || !int.TryParse (_context.Request.QueryString ["count"], out int count)) {

TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/RegisterUser.cs

@@ -95 +95 @@
                         // Log info
                         string crossplatformidString = regData.CrossPlatformUserId == null ? "" : $", crossplatform ID {regData.CrossPlatformUserId.CombinedString}";
-                        global::Log.Out ($"[Web] User registered: Username '{username}' for platform ID {regData.PlatformUserId.CombinedString}{crossplatformidString}");
+                        Log.Out ($"[Web] User registered: Username '{username}' for platform ID {regData.PlatformUserId.CombinedString}{crossplatformidString}");
 
                         if (AdminWebUsers.Instance.HasUser (regData.PlatformUserId, regData.CrossPlatformUserId, out AdminWebUsers.WebUser existingUser)) {
                                 // Remove existing username of player, only allowing one user per player
 
-                                global::Log.Out ($"[Web] Re-registration, replacing existing username '{existingUser.Name}'");
+                                Log.Out ($"[Web] Re-registration, replacing existing username '{existingUser.Name}'");
                                 AdminWebUsers.Instance.RemoveUser (existingUser.Name);
                         }

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

@@ -93 +93 @@
                         ClientInfo ci = ConnectionManager.Instance.Clients.ForUserId (_nativeUserId);
                         if (ci == null) {
-                                global::Log.Warning ($"[Web] Player.GET: ClientInfo null");
+                                Log.Warning ($"[Web] Player.GET: ClientInfo null");
                                 return;
                         }
@@ -101 +101 @@
 
                         if (entity == null) {
-                                global::Log.Warning ($"[Web] Player.GET: EntityPlayer null");
+                                Log.Warning ($"[Web] Player.GET: EntityPlayer null");
                                 return;
                         }