Changeset 404 for binary-improvements2/WebServer/src/WebAPI

Timestamp:

Feb 16, 2023, 3:50:53 PM (21 months ago)

Author:

alloc

Message:

Latest state including reworking to the permissions system

Location:

binary-improvements2/WebServer/src/WebAPI

Files:

• APIs/Command.cs (modified) (3 diffs)
• APIs/ServerInfo.cs (modified) (2 diffs)
• AbsRestApi.cs (modified) (6 diffs)
• Null.cs (modified) (2 diffs)

binary-improvements2/WebServer/src/WebAPI/APIs/Command.cs

@@ -25 +25 @@
 
                         if (string.IsNullOrEmpty (id)) {
-                                bool first = true;
-                                foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
-                                        if (!first) {
+                                IList<IConsoleCommand> ccs = SdtdConsole.Instance.GetCommands ();
+                                for (int i = 0; i < ccs.Count; i++) {
+                                        IConsoleCommand cc = ccs [i];
+                                        
+                                        if (i > 0) {
                                                 writer.WriteValueSeparator ();
                                         }
-
-                                        first = false;
 
                                         writeCommandJson (ref writer, cc, permissionLevel);
@@ -81 +81 @@
                         _writer.WriteString (_command.GetHelp ());
                                 
-                        int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (_command.GetCommands ());
+                        int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (_command.GetCommands ());
                         _writer.WriteRaw (jsonAllowedKey);
                         _writer.WriteBoolean (_userPermissionLevel <= commandPermissionLevel);
@@ -117 +117 @@
                         }
 
-                        int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (command.GetCommands ());
+                        int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (command.GetCommands ());
 
                         if (_context.PermissionLevel > commandPermissionLevel) {

binary-improvements2/WebServer/src/WebAPI/APIs/ServerInfo.cs

@@ +1 @@
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using Utf8Json;
@@ -22 +23 @@
                         GameServerInfo gsi = ConnectionManager.Instance.LocalServerInfo;
 
-                        bool first = true;
-                        
-                        
+                        IList<GameInfoString> list = EnumUtils.Values<GameInfoString> ();
+                        for (int i = 0; i < list.Count; i++) {
+                                GameInfoString stringGamePref = list [i];
 
-                        foreach (GameInfoString stringGamePref in EnumUtils.Values<GameInfoString> ()) {
-                                string value = gsi.GetValue (stringGamePref);
-
-                                if (!first) {
+                                if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                first = false;
-                                
                                 writer.WriteString (stringGamePref.ToStringCached ());
                                 writer.WriteNameSeparator ();
-                                
+
                                 writer.WriteRaw (keyType);
                                 writer.WriteString ("string");
-                                
+
                                 writer.WriteRaw (keyValue);
-                                writer.WriteString (value);
-                                
+                                writer.WriteString (gsi.GetValue (stringGamePref));
+
                                 writer.WriteEndObject ();
                         }
 
-                        foreach (GameInfoInt intGamePref in EnumUtils.Values<GameInfoInt> ()) {
-                                int value = gsi.GetValue (intGamePref);
+                        IList<GameInfoInt> ints = EnumUtils.Values<GameInfoInt> ();
+                        for (int i = 0; i < ints.Count; i++) {
+                                GameInfoInt intGamePref = ints [i];
 
-                                if (!first) {
+                                if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                first = false;
-                                
                                 writer.WriteString (intGamePref.ToStringCached ());
                                 writer.WriteNameSeparator ();
-                                
+
                                 writer.WriteRaw (keyType);
                                 writer.WriteString ("int");
-                                
+
                                 writer.WriteRaw (keyValue);
-                                writer.WriteInt32 (value);
-                                
+                                writer.WriteInt32 (gsi.GetValue (intGamePref));
+
                                 writer.WriteEndObject ();
                         }
 
-                        foreach (GameInfoBool boolGamePref in EnumUtils.Values<GameInfoBool> ()) {
-                                bool value = gsi.GetValue (boolGamePref);
+                        IList<GameInfoBool> prefs = EnumUtils.Values<GameInfoBool> ();
+                        for (int i = 0; i < prefs.Count; i++) {
+                                GameInfoBool boolGamePref = prefs [i];
 
-                                if (!first) {
+                                if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                first = false;
-                                
                                 writer.WriteString (boolGamePref.ToStringCached ());
                                 writer.WriteNameSeparator ();
-                                
+
                                 writer.WriteRaw (keyType);
                                 writer.WriteString ("bool");
-                                
+
                                 writer.WriteRaw (keyValue);
-                                writer.WriteBoolean (value);
-                                
+                                writer.WriteBoolean (gsi.GetValue (boolGamePref));
+
                                 writer.WriteEndObject ();
                         }
-                        
+
                         writer.WriteEndObject ();
                         

binary-improvements2/WebServer/src/WebAPI/AbsRestApi.cs

@@ -95 +95 @@
                 }
 
-                protected void SendErrorResult (RequestContext _context, HttpStatusCode _statusCode, byte[] _jsonInputData = null, string _errorCode = null, Exception _exception = null) {
-                        PrepareEnvelopedResult (out JsonWriter writer);
-                        writer.WriteRaw (JsonEmptyData);
-                        SendEnvelopedResult (_context, ref writer, _statusCode, _jsonInputData, _errorCode, _exception);
-                }
-
                 static AbsRestApi () {
                         JsonWriter writer = new JsonWriter ();
@@ -108 +102 @@
                 }
 
+                protected virtual void HandleRestGet (RequestContext _context) {
+                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, null, "Unsupported");
+                }
+
+                protected virtual void HandleRestPost (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
+                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, _jsonInputData, "Unsupported");
+                }
+
+                protected virtual void HandleRestPut (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
+                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, _jsonInputData, "Unsupported");
+                }
+
+                protected virtual void HandleRestDelete (RequestContext _context) {
+                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, null, "Unsupported");
+                }
+
+
+#region Helpers
+
                 protected static readonly byte[] JsonEmptyData;
                 
-                protected void PrepareEnvelopedResult (out JsonWriter _writer) {
+                protected static void PrepareEnvelopedResult (out JsonWriter _writer) {
                         WebUtils.PrepareEnvelopedResult (out _writer);
                 }
 
-                protected void SendEnvelopedResult (RequestContext _context, ref JsonWriter _writer, HttpStatusCode _statusCode = HttpStatusCode.OK,
+                protected static void SendEnvelopedResult (RequestContext _context, ref JsonWriter _writer, HttpStatusCode _statusCode = HttpStatusCode.OK,
                         byte[] _jsonInputData = null, string _errorCode = null, Exception _exception = null) {
                         
@@ -120 +133 @@
                 }
 
-                protected bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out int _value) {
+                protected static void SendErrorResult (RequestContext _context, HttpStatusCode _statusCode, byte[] _jsonInputData = null, string _errorCode = null, Exception _exception = null) {
+                        PrepareEnvelopedResult (out JsonWriter writer);
+                        writer.WriteRaw (JsonEmptyData);
+                        SendEnvelopedResult (_context, ref writer, _statusCode, _jsonInputData, _errorCode, _exception);
+                }
+
+                protected static bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out int _value) {
                         _value = default;
                         
@@ -139 +158 @@
                 }
 
-                protected bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out double _value) {
+                protected static bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out double _value) {
                         _value = default;
                         
@@ -158 +177 @@
                 }
 
-                protected bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out string _value) {
+                protected static bool TryGetJsonField (IDictionary<string, object> _jsonObject, string _fieldName, out string _value) {
                         _value = default;
                         
@@ -176 +195 @@
                         }
                 }
-
-                protected virtual void HandleRestGet (RequestContext _context) {
-                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, null, "Unsupported");
-                }
-
-                protected virtual void HandleRestPost (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, _jsonInputData, "Unsupported");
-                }
-
-                protected virtual void HandleRestPut (RequestContext _context, IDictionary<string, object> _jsonInput, byte[] _jsonInputData) {
-                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, _jsonInputData, "Unsupported");
-                }
-
-                protected virtual void HandleRestDelete (RequestContext _context) {
-                        SendErrorResult (_context, HttpStatusCode.MethodNotAllowed, null, "Unsupported");
-                }
+                
+
+#endregion
         }
 }

binary-improvements2/WebServer/src/WebAPI/Null.cs

@@ -1 @@
-using System.Text;
+using System;
+using System.Text;
 
 namespace Webserver.WebAPI {
@@ -10 +11 @@
                         _context.Response.ContentType = "text/plain";
                         _context.Response.ContentEncoding = Encoding.ASCII;
-                        _context.Response.OutputStream.Write (new byte[] { }, 0, 0);
+                        _context.Response.OutputStream.Write (Array.Empty<byte> (), 0, 0);
                 }
         }