Small bug fixes and new logging

ProjectEarthServerAPI/Controllers/PlayerController.cs

@@ -183,6 +183,32 @@ public async Task<IActionResult> PutItemInHotbar()
 
 			return Content(JsonConvert.SerializeObject(returnHotbar.Item2));
 		}
+
+		[ApiVersion("1.1")]
+		[HttpPost]
+		[Route("1/api/v{version:apiVersion}/inventory/survival/{ItemID}/consume")]
+		public async Task<IActionResult> ConsumeItem(Guid ItemID) //TODO: actual healing logic ._.
+		{
+			var stream = new StreamReader(Request.Body);
+			var body = await stream.ReadToEndAsync();
+
+			string authtoken = User.FindFirstValue(ClaimTypes.NameIdentifier);
+			Log.Information($"{authtoken} is trying to consume item {ItemID}");
+			InventoryUtils.RemoveItemFromInv(authtoken, ItemID);
+			InventoryUtils.AddItemToInv(authtoken, ItemID, 2);
+			ProfileUtils.AddHealthToPlayer(authtoken, 20);
+			var streamVersion = GenericUtils.GetNextStreamVersion();
+			var resp = new UpdateResponse
+			{
+				updates = new Updates
+				{
+					characterProfile = streamVersion,
+					inventory = streamVersion
+				}
+			};
+
+			return Content(JsonConvert.SerializeObject(resp), "application/json");
+		}
 	}
 
 	[Authorize]

ProjectEarthServerAPI/Models/Features/Item.cs

@@ -46,7 +46,7 @@ public class ItemInfo
 			public float? blockDamage { get; set; }
 			public float? health { get; set; }
 			public BlockMetadata blockMetadata { get; set; }
-			public ItemMetadata ItemMetadata { get; set; }
+			public ItemMetadata itemMetadata { get; set; }
 			public BoostMetadata? boostMetadata { get; set; }
 			public JournalMetadata journalMetadata { get; set; }
 			public AudioMetadata? audioMetadata { get; set; }

ProjectEarthServerAPI/Program.cs

@@ -7,6 +7,7 @@
 using ProjectEarthServerAPI.Models.Player;
 using Serilog;
 using Uma.Uuid;
+using Serilog.Events;
 
 namespace ProjectEarthServerAPI
 {
@@ -23,7 +24,9 @@ public static void Main(string[] args)
                 .WriteTo.Console()
                 .WriteTo.File("logs/debug.txt", rollingInterval: RollingInterval.Day, rollOnFileSizeLimit: true, fileSizeLimitBytes: 8338607, outputTemplate: "{Timestamp:HH:mm:ss.fff} [{Level:u3}] {Message:lj}{NewLine}{Exception}")
                 .MinimumLevel.Debug()
-                .CreateLogger();
+				.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+				.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
+				.CreateLogger();
 
             Log.Logger = log;
 
@@ -46,7 +49,7 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                //.UseSerilog()
+                .UseSerilog()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();

ProjectEarthServerAPI/Startup.cs

@@ -19,6 +19,7 @@
 using Microsoft.AspNetCore.Authentication;
 using ProjectEarthServerAPI.Authentication;
 using Serilog;
+using Serilog.Events;
 
 namespace ProjectEarthServerAPI
 {
@@ -62,7 +63,23 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 				//app.UseDeveloperExceptionPage();
 			}
 
-			//app.UseSerilogRequestLogging();
+			app.UseSerilogRequestLogging(options =>
+			{
+				// Customize the message template
+				options.MessageTemplate = "{RemoteIpAddress} {RequestMethod} {RequestScheme}://{RequestHost}{RequestPath}{RequestQuery} responded {StatusCode} in {Elapsed:0.0000} ms";
+
+				// Emit debug-level events instead of the defaults
+				options.GetLevel = (httpContext, elapsed, ex) => LogEventLevel.Debug;
+
+				// Attach additional properties to the request completion event
+				options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
+				{
+					diagnosticContext.Set("RequestHost", httpContext.Request.Host.Value);
+					diagnosticContext.Set("RequestScheme", httpContext.Request.Scheme);
+					diagnosticContext.Set("RemoteIpAddress", httpContext.Connection.RemoteIpAddress);
+					diagnosticContext.Set("RequestQuery", httpContext.Request.QueryString);
+				};
+			});
 
 			app.UseETagger();
 			//app.UseHttpsRedirection();

ProjectEarthServerAPI/Util/BuildplateUtils.cs

@@ -75,7 +75,7 @@ public static BuildplateShareResponse GetBuildplateById(BuildplateRequest buildp
 		{
 			BuildplateData buildplate = ReadBuildplate(buildplateReq.buildplateId);
 
-			return new BuildplateShareResponse {result = new BuildplateShareResponse.BuildplateShareInfo {buildplateData = buildplate, playerId = null}};
+			return new BuildplateShareResponse {result = new BuildplateShareResponse.BuildplateShareInfo {buildplateData = buildplate, playerId = buildplateReq.playerId}};
 		}
 
 		public static void UpdateBuildplateAndList(BuildplateShareResponse data, string playerId)

ProjectEarthServerAPI/Util/MultiplayerUtils.cs

@@ -660,7 +660,7 @@ public static async Task AuthenticateServer(WebSocket webSocketRequest)
 			ServerInformation info = null;
 			string challenge = null;
 
-			while (!result.CloseStatus.HasValue)
+			while (!result.CloseStatus.HasValue && webSocketRequest.State == WebSocketState.Open)
 			{
 				info ??= JsonConvert.DeserializeObject<ServerInformation>(Encoding.UTF8.GetString(messageBuffer));
 
@@ -728,11 +728,27 @@ await webSocketRequest.SendAsync(
 						break;
 
 					case ServerAuthInformation.Authed:
-						while (true) { }
-
+						try
+						{
+							result = await webSocketRequest.ReceiveAsync(new ArraySegment<byte>(messageBuffer), CancellationToken.None);
+						}
+						catch
+						{
+							continue;
+						}
 						break;
 				}
 			}
+
+			if (info != null)
+				Log.Information($"Server {info.serverId} has disconnected from the api");
+
+			if (info != null && ApiKeyList.ContainsKey(info.serverId))
+				ApiKeyList.Remove(info.serverId);
+			if (info != null && ServerInfoList.ContainsKey(info.serverId))
+				ServerInfoList.Remove(info.serverId);
+			if (info != null && ServerSocketList.ContainsKey(info.serverId))
+				ServerSocketList.Remove(info.serverId);
 		}
 
 		private static bool VerifyChallenge(string challenge, string challengeResponse, ServerInformation info)

ProjectEarthServerAPI/Util/ProfileUtils.cs

@@ -29,6 +29,14 @@ public static void AddExperienceToPlayer(string playerId, int experiencePoints)
 			WriteProfile(playerId, playerProfile);
 		}
 
+		public static void AddHealthToPlayer(string playerId, int healthPoints)
+		{
+			var playerProfile = ReadProfile(playerId);
+			playerProfile.healthPercentage += healthPoints;
+
+			WriteProfile(playerId, playerProfile);
+		}
+
 		private static void RewardLevelupRewards(string playerId, int level)
 		{
 			var rewards = ProfileResponse.levels[level.ToString()].rewards;

ProjectEarthServerAPI/Util/RewardUtils.cs

@@ -8,6 +8,7 @@ public class RewardUtils
 		public static Updates RedeemRewards(string playerId, Rewards rewards, EventLocation location)
 		{
 			Updates updates = new Updates();
+			if (rewards == null) return updates;
 			uint nextStreamId = GenericUtils.GetNextStreamVersion();
 			foreach (var buildplate in rewards.Buildplates)
 			{