TheSunIsLeaking/DorkNet
3
0
Fork 0
mirror of https://github.com/DorkSquadRR/DorkNet.git synced 2026-10-26 07:28:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor PlayerPresenceController and NotifyHub: enhance online presence tracking and improve connection handling logic

Browse Source
This commit is contained in:
Alexa
2026-06-05 22:54:08 +03:00
parent 3c0dd64293
commit 4d58130acd
3 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DorkNet.Server/Controllers/Match/PlayerPresenceController.cs
+15 -11
View File
@@ -35,7 +35,9 @@ namespace DorkNet.Server.Controllers.Match;
/// null. Players who haven't /goto'd anywhere still report offline.
/// </summary>
[ApiController]
public class PlayerPresenceController(PlayerPresenceService presence) : ControllerBase
public class PlayerPresenceController(
PlayerPresenceService presence,
OnlinePresenceService onlinePresence) : ControllerBase
{
[HttpGet("/player")]
public ActionResult<List<PlayerPresenceDto>> GetPresences()
@@ -81,17 +83,19 @@ public class PlayerPresenceController(PlayerPresenceService presence) : Controll
// privacy concern actually applies.
var callerId = this.CurrentPlayerId();
var callerRoom = callerId is long cid ? presence.GetRoom(cid) : null;
var onlineIds = onlinePresence.OnlinePlayerIds().ToHashSet();
var result = ids.Select(id =>
{
var room = presence.GetRoom(id);
// IsOnline is derived from current room presence: a player
// who has heartbeated recently has a non-null RoomInstance
// in PlayerPresenceService; one who hasn't shows up as
// null. Without this, IsOnline defaulted to `true` and the
// watch's friends list showed every queried account as
// Online regardless of actual session state — verified live
// (six accounts shown Online despite none being connected).
var isOnline = room is not null;
// Other players need both a room presence and an active
// notify connection. Presence keys intentionally live for
// minutes to survive long room loads, so using them alone
// leaves friends stuck online after a graceful disconnect.
// For self, keep using room presence: boot-time bulk probes
// can race the SignalR connection, and returning self as
// offline there can desync the heartbeat cache.
var isSelf = callerId == id;
var isOnline = room is not null && (isSelf || onlineIds.Contains(id));
return new PlayerPresenceDto
{
PlayerId = (int)id,
@@ -109,9 +113,9 @@ public class PlayerPresenceController(PlayerPresenceService presence) : Controll
// joins; returning a redacted same-room instance there
// leaves the 2020 client with an incomplete roomInstance
// and can null-ref while reconciling player presence.
RoomInstance = ShouldExposeFullRoom(callerId, callerRoom, id, room)
RoomInstance = isOnline && ShouldExposeFullRoom(callerId, callerRoom, id, room)
? room
: RoomInstanceDto.Redact(room),
: RoomInstanceDto.Redact(isOnline ? room : null),
IsOnline = isOnline,
};
}).ToList();