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

Convert routers and callback sessionIds to MongoIds (#453)

Browse Source 
Co-authored-by: Chomp <27521899+chompDev@users.noreply.github.com>
This commit is contained in:
Cj
2025-07-06 05:19:56 -04:00
committed by GitHub
parent 96f973e9e3
commit 0b18b7e4ba
60 changed files with 906 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs
+18 -13
View File
@@ -1,5 +1,6 @@
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Controllers;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Eft.Bot;
using SPTarkov.Server.Core.Models.Eft.Common;
using SPTarkov.Server.Core.Utils;
@@ -7,19 +8,19 @@ using SPTarkov.Server.Core.Utils;
namespace SPTarkov.Server.Core.Callbacks;
[Injectable]
public class BotCallbacks(BotController _botController, HttpResponseUtil _httpResponseUtil)
public class BotCallbacks(BotController botController, HttpResponseUtil httpResponseUtil)
{
/// <summary>
/// Handle singleplayer/settings/bot/limit
/// Is called by client to define each bot roles wave limit
/// </summary>
/// <returns></returns>
public ValueTask<string> GetBotLimit(string url, EmptyRequestData _, string sessionID)
public ValueTask<string> GetBotLimit(string url, EmptyRequestData _, MongoId sessionID)
{
var splitUrl = url.Split('/');
var type = splitUrl[^1];
return new ValueTask<string>(
_httpResponseUtil.NoBody(_botController.GetBotPresetGenerationLimit(type))
httpResponseUtil.NoBody(botController.GetBotPresetGenerationLimit(type))
);
}
@@ -27,7 +28,7 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
/// Handle singleplayer/settings/bot/difficulty
/// </summary>
/// <returns></returns>
public ValueTask<string> GetBotDifficulty(string url, EmptyRequestData _, string sessionID)
public ValueTask<string> GetBotDifficulty(string url, EmptyRequestData _, MongoId sessionID)
{
var splitUrl = url.Split('/');
var type = splitUrl[^2].ToLowerInvariant();
@@ -35,12 +36,12 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
if (difficulty == "core")
{
return new ValueTask<string>(
_httpResponseUtil.NoBody(_botController.GetBotCoreDifficulty())
httpResponseUtil.NoBody(botController.GetBotCoreDifficulty())
);
}
return new ValueTask<string>(
_httpResponseUtil.NoBody(_botController.GetBotDifficulty(sessionID, type, difficulty))
httpResponseUtil.NoBody(botController.GetBotDifficulty(sessionID, type, difficulty))
);
}
@@ -48,10 +49,14 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
/// Handle singleplayer/settings/bot/difficulties
/// </summary>
/// <returns></returns>
public ValueTask<string> GetAllBotDifficulties(string url, EmptyRequestData _, string sessionID)
public ValueTask<string> GetAllBotDifficulties(
string url,
EmptyRequestData _,
MongoId sessionID
)
{
return new ValueTask<string>(
_httpResponseUtil.NoBody(_botController.GetAllBotDifficulties())
httpResponseUtil.NoBody(botController.GetAllBotDifficulties())
);
}
@@ -62,11 +67,11 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
public ValueTask<string> GenerateBots(
string url,
GenerateBotsRequestData info,
string sessionID
MongoId sessionID
)
{
return new ValueTask<string>(
_httpResponseUtil.GetBody(_botController.Generate(sessionID, info))
httpResponseUtil.GetBody(botController.Generate(sessionID, info))
);
}
@@ -74,11 +79,11 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
/// Handle singleplayer/settings/bot/maxCap
/// </summary>
/// <returns></returns>
public ValueTask<string> GetBotCap(string url, EmptyRequestData _, string sessionID)
public ValueTask<string> GetBotCap(string url, EmptyRequestData _, MongoId sessionID)
{
var splitUrl = url.Split('/');
var location = splitUrl[^1];
return new ValueTask<string>(_httpResponseUtil.NoBody(_botController.GetBotCap(location)));
return new ValueTask<string>(httpResponseUtil.NoBody(botController.GetBotCap(location)));
}
/// <summary>
@@ -87,6 +92,6 @@ public class BotCallbacks(BotController _botController, HttpResponseUtil _httpRe
/// <returns></returns>
public ValueTask<string> GetBotBehaviours()
{
return new ValueTask<string>(_httpResponseUtil.NoBody(_botController.GetAiBotBrainTypes()));
return new ValueTask<string>(httpResponseUtil.NoBody(botController.GetAiBotBrainTypes()));
}
}