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

Moved GC to later in map gen

Browse Source 
Store Mongoid correctly
This commit is contained in:
Chomp
2025-08-29 09:48:14 +01:00
parent d3f95de546
commit 307071fa9f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs
+7 -6
View File
@@ -3,6 +3,7 @@ using System.Text;
using Microsoft.AspNetCore.Http;
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Helpers;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Eft.Ws;
using SPTarkov.Server.Core.Models.Utils;
using SPTarkov.Server.Core.Servers.Ws.Message;
@@ -21,7 +22,7 @@ public class SptWebSocketConnectionHandler(
IEnumerable<ISptWebSocketMessageHandler> messageHandlers
) : IWebSocketConnectionHandler
{
protected readonly Dictionary<string, Dictionary<string, WebSocket>> _sockets = new();
protected readonly Dictionary<MongoId, Dictionary<string, WebSocket>> _sockets = new();
protected readonly Lock _socketsLock = new();
public string GetHookUrl()
@@ -37,12 +38,12 @@ public class SptWebSocketConnectionHandler(
public Task OnConnection(WebSocket ws, HttpContext context, string sessionIdContext)
{
var splitUrl = context.Request.Path.Value.Split("/");
var sessionID = splitUrl.Last();
var sessionID = new MongoId(splitUrl.Last());
var playerProfile = profileHelper.GetFullProfile(sessionID);
var playerInfoText = $"{playerProfile.ProfileInfo.Username} ({sessionID})";
if (logger.IsLogEnabled(LogLevel.Debug))
{
logger.Debug($"[WS] Websocket connect for player {playerInfoText} started with context {sessionIdContext}");
logger.Debug($"[WS] Websocket connect for player: {playerInfoText} started with context: {sessionIdContext}");
}
lock (_socketsLock)
@@ -159,7 +160,7 @@ public class SptWebSocketConnectionHandler(
}
}
public void SendMessage(string sessionID, WsNotificationEvent output)
public void SendMessage(MongoId sessionID, WsNotificationEvent output)
{
try
{
@@ -211,7 +212,7 @@ public class SptWebSocketConnectionHandler(
}
}
public bool IsWebSocketConnected(string sessionID)
public bool IsWebSocketConnected(MongoId sessionID)
{
lock (_socketsLock)
{
@@ -219,7 +220,7 @@ public class SptWebSocketConnectionHandler(
}
}
public IEnumerable<WebSocket> GetSessionWebSocket(string sessionID)
public IEnumerable<WebSocket> GetSessionWebSocket(MongoId sessionID)
{
lock (_socketsLock)
{
Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
+3 -3
View File
@@ -141,18 +141,18 @@ public class LocationLifecycleService(
// Clear bot cache ready for bot generation call that occurs after this
botNameService.ClearNameCache();
GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
// Handle Player Inventory Wiping checks for alt-f4 prevention
HandlePreRaidInventoryChecks(request.PlayerSide, playerProfile.CharacterData.PmcData, sessionId);
GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
return result;
}
/// <summary>
/// Handle Pre Raid checks Alt-F4 Prevention and player inventory wiping
/// </summary>
protected void HandlePreRaidInventoryChecks(string playerSide, PmcData pmcData, string sessionId)
protected void HandlePreRaidInventoryChecks(string playerSide, PmcData pmcData, MongoId sessionId)
{
// If config enabled, remove players equipped items to prevent alt-F4 from persisting items
if (!IsSide(playerSide) || !_lostOnDeathConfig.WipeOnRaidStart)