Changeset 425 for binary-improvements2/WebServer

Timestamp:

Apr 10, 2023, 8:23:15 PM (19 months ago)

Author:

alloc

Message:

• API "map" added, currently only supports GET with the ID "config"
• API "player" added, currently only supports getting online players with some of the info not supported yet (playtime, last online, level)
• Only logged in player's data is shown unless the user has the permission for "webapi.viewallplayers"
• Internal refactoring
• (Updated version to 21.0.258)

Location:

binary-improvements2/WebServer

Files:

• ModInfo.xml (modified) (1 diff)
• WebServer.csproj (modified) (2 diffs)
• src/Permissions/PermissionUtils.cs (added)
• src/SSE/EventLog.cs (modified) (3 diffs)
• src/WebAPI/APIs/Player.cs (added)
• src/WebAPI/JsonCommons.cs (modified) (2 diffs)
• src/WebConnection.cs (modified) (1 diff)
• src/WebUtils.cs (modified) (2 diffs)

binary-improvements2/WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.250.0" />
+        <Version value="21.0.258.0" />
         <Website value="" />
 </xml>

binary-improvements2/WebServer/WebServer.csproj

@@ -112 +112 @@
     <Compile Include="src\Permissions\AdminApiTokens.cs" />
     <Compile Include="src\Permissions\AdminWebUsers.cs" />
+    <Compile Include="src\Permissions\PermissionUtils.cs" />
     <Compile Include="src\Permissions\RegisterModules.cs" />
     <Compile Include="src\UserRegistrationTokens.cs" />
@@ -128 +129 @@
     <Compile Include="src\WebAPI\APIs\Hostile.cs" />
     <Compile Include="src\WebAPI\APIs\Log.cs" />
+    <Compile Include="src\WebAPI\APIs\Player.cs" />
     <Compile Include="src\WebAPI\APIs\RegisterUser.cs" />
     <Compile Include="src\WebAPI\APIs\ServerInfo.cs" />

binary-improvements2/WebServer/src/SSE/EventLog.cs

@@ -4 +4 @@
 using Utf8Json;
 using Webserver.UrlHandlers;
+using Webserver.WebAPI;
 
 namespace Webserver.SSE {
@@ -19 +20 @@
 
                 private void LogCallback (string _formattedMsg, string _plainMsg, string _trace, LogType _type, DateTime _timestamp, long _uptime) {
-                        string isotime = _timestamp.ToString ("o");
                         string uptime = _uptime.ToString ();
 
@@ -34 +34 @@
                         
                         writer.WriteRaw (jsonIsotimeKey);
-                        writer.WriteString (isotime);
+                        JsonCommons.WriteDateTime (ref writer, _timestamp);
                         
                         writer.WriteRaw (jsonUptimeKey);

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

@@ +1 @@
+using System;
+using UnityEngine;
 using Utf8Json;
 
@@ -19 +21 @@
                         _writer.WriteEndObject ();
                 }
-                
+
+                public static void WritePositionObject (ref JsonWriter _writer, Vector3 _position) {
+                        _writer.WriteRaw (jsonKeyPositionX);
+                        _writer.WriteSingle (_position.x);
+                        
+                        _writer.WriteRaw (jsonKeyPositionY);
+                        _writer.WriteSingle (_position.y);
+                        
+                        _writer.WriteRaw (jsonKeyPositionZ);
+                        _writer.WriteSingle (_position.z);
+                        
+                        _writer.WriteEndObject ();
+                }
+
+                private static readonly byte[] jsonKeyCombinedString = JsonWriter.GetEncodedPropertyNameWithBeginObject ("combinedString");
+                private static readonly byte[] jsonKeyPlatformId = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("platformId");
+                private static readonly byte[] jsonKeyUserId = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("userId");
+
+                public static void WritePlatformUserIdentifier (ref JsonWriter _writer, PlatformUserIdentifierAbs _userIdentifier) {
+                        if (_userIdentifier == null) {
+                                _writer.WriteNull ();
+                                return;
+                        }
+                        
+                        _writer.WriteRaw (jsonKeyCombinedString);
+                        _writer.WriteString (_userIdentifier.CombinedString);
+                        
+                        _writer.WriteRaw (jsonKeyPlatformId);
+                        _writer.WriteString (_userIdentifier.PlatformIdentifierString);
+                        
+                        _writer.WriteRaw (jsonKeyUserId);
+                        _writer.WriteString (_userIdentifier.ReadablePlatformUserIdentifier);
+                        
+                        _writer.WriteEndObject ();
+                }
+
+                public static void WriteDateTime (ref JsonWriter _writer, DateTime _dateTime) {
+                        _writer.WriteString (_dateTime.ToString ("o"));
+                }
         }
 }

binary-improvements2/WebServer/src/WebConnection.cs

@@ -33 +33 @@
                 }
 
-                public static bool CanViewAllPlayers (int _permissionLevel) {
-                        return AdminWebModules.Instance.ModuleAllowedWithLevel ("webapi.viewallplayers", _permissionLevel);
-                }
-
-                public static bool CanViewAllClaims (int _permissionLevel) {
-                        return AdminWebModules.Instance.ModuleAllowedWithLevel ("webapi.viewallclaims", _permissionLevel);
-                }
-
                 public void UpdateUsage () {
                         lastAction = DateTime.Now;

binary-improvements2/WebServer/src/WebUtils.cs

@@ -5 +5 @@
 using System.Text;
 using Utf8Json;
+using Webserver.WebAPI;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
 using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;
@@ -80 +81 @@
 
                         _writer.WriteRaw (jsonRawMetaServertimeKey);
-                        _writer.WriteString (DateTime.Now.ToString ("o"));
+                        JsonCommons.WriteDateTime (ref _writer, DateTime.Now);
 
                         if (!string.IsNullOrEmpty (_errorCode)) {