chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved how ConvertToCorrectType handles /moving actions

Browse Source 
Reduced number of times JSON is parsed into an object
This commit is contained in:
Chomp
2025-05-04 23:09:13 +01:00
parent 74781cb1b2
commit 2ea6128815
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
+19 -10
View File
@@ -21,15 +21,26 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
public override BaseInteractionRequestData? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
using var jsonDocument = JsonDocument.ParseValue(ref reader);
// Need to read the actual JSON text here so we can convert to the correct type
// Get request as raw JSON
var jsonText = jsonDocument.RootElement.GetRawText();
var value = JsonSerializer.Deserialize<BaseInteractionRequestData>(jsonText);
return ConvertToCorrectType(value, jsonText);
// Get the underlying 'type' of action the client is requesting we do
var action = jsonDocument.RootElement.GetProperty("Action").GetString();
return ConvertToCorrectType(action, jsonDocument.RootElement, jsonText);
}
private BaseInteractionRequestData? ConvertToCorrectType(BaseInteractionRequestData? value, string jsonText)
/// <summary>
/// Handle the players action from received from client
/// </summary>
/// <param name="action">e.g. "Eat"</param>
/// <param name="jsonDocumentRoot">Root json element of client request</param>
/// <param name="jsonText">Raw JSON request text</param>
/// <returns>BaseInteractionRequestData</returns>
private static BaseInteractionRequestData? ConvertToCorrectType(string action, JsonElement jsonDocumentRoot, string jsonText)
{
switch (value.Action)
switch (action)
{
case ItemEventActions.CUSTOMIZATION_BUY:
return JsonSerializer.Deserialize<BuyClothingRequestData>(jsonText);
@@ -82,9 +93,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
return JsonSerializer.Deserialize<ChangeWishlistItemCategoryRequest>(jsonText);
case ItemEventActions.TRADING_CONFIRM:
{
var json = JsonSerializer.Deserialize<ProcessBaseTradeRequestData>(jsonText);
switch (json.Type)
switch (jsonDocumentRoot.GetProperty("type").GetString())
{
case ItemEventActions.BUY_FROM_TRADER:
return JsonSerializer.Deserialize<ProcessBuyTradeRequestData>(jsonText);
@@ -92,7 +101,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
return JsonSerializer.Deserialize<ProcessSellTradeRequestData>(jsonText);
default:
throw new Exception(
$"Unhandled action type {value.Action}, make sure the BaseInteractionRequestDataConverter has the deserialization for this action handled."
$"Unhandled action type: {action}, make sure BaseInteractionRequestDataConverter has deserialization for this action."
);
}
}
@@ -169,7 +178,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
return JsonSerializer.Deserialize<PinOrLockItemRequest>(jsonText);
default:
throw new Exception(
$"Unhandled action type {value.Action}, make sure the BaseInteractionRequestDataConverter has the deserialization for this action handled."
$"Unhandled action type {action}, make sure the BaseInteractionRequestDataConverter has the deserialization for this action handled."
);
}
}