SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(arena-tk2): split do_matching success into 3007 owner / 3004 joiner

Browse Source 
Mirrors prod's TK2 wire flow: the first arriver (parked, picks up cached
pair on a later poll) gets matching_state 3007 (SUCCEEDED_OWNER); the
second arriver (whose poll triggered the pair) gets 3004 (SUCCEEDED).

Observationally inert in the public matching code path today — the
client's Matching class writes isOwner from the response into a field
that nothing in TK2/ranked reads. Matching_Room (private rooms) DOES
read it but from a separate code path that doesn't consult our response.
We send the split anyway for prod fidelity and to leave room for future
flows (rematch UI, etc.) that might start consuming it.

TryPairAsync now returns PairUpResult(Match, IsOwner) instead of bare
PendingMatch?, so the controller can decide owner vs joiner without
re-deriving it.

Also documents on DoMatchingResponseDto why we omit prod's `room_id`
field (not in the client's DoMatchingDetail model; private-room flows
get their room id from a different API and don't consult this response).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-01 23:24:13 -04:00
parent 0ecd565774
commit 8112b3f81f
6 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SVSim.EmulatedEntrypoint/Matching/InProcessPairUp.cs
View File

@@ -18,25 +18,27 @@ public sealed class InProcessPairUp : IMatchingPairUpService
_bridge = bridge;
}
public Task<PendingMatch?> TryPairAsync(string mode, BattlePlayer player, CancellationToken ct)
public Task<PairUpResult?> TryPairAsync(string mode, BattlePlayer player, CancellationToken ct)
{
var slot = _slots.GetOrAdd(mode, _ => new ModeSlot());
lock (slot.Lock)
{
// 1. Already-resolved match cached for this viewer? Consume + return.
// This caller is the FIRST arriver picking up their cached pair — owner role.
if (slot.Resolved.TryGetValue(player.ViewerId, out var cached))
{
slot.Resolved.Remove(player.ViewerId);
return Task.FromResult<PendingMatch?>(cached);
return Task.FromResult<PairUpResult?>(new PairUpResult(cached, IsOwner: true));
}
// 2. Someone already waiting in this slot? Pair with them.
// This caller is the SECOND arriver who triggered the pair — joiner role.
if (slot.Waiting is not null)
{
if (slot.Waiting.ViewerId == player.ViewerId)
{
// Same viewer polled twice while parked — keep them parked.
return Task.FromResult<PendingMatch?>(null);
return Task.FromResult<PairUpResult?>(null);
}
var p1 = slot.Waiting;
var p2 = player;
@@ -44,12 +46,12 @@ public sealed class InProcessPairUp : IMatchingPairUpService
var match = _bridge.RegisterBattle(p1, p2, BattleType.Pvp);
// Cache the result for the FIRST arriver's next poll (consume-on-read).
slot.Resolved[p1.ViewerId] = match;
return Task.FromResult<PendingMatch?>(match);
return Task.FromResult<PairUpResult?>(new PairUpResult(match, IsOwner: false));
}
// 3. Empty slot — park this caller.
slot.Waiting = player;
return Task.FromResult<PendingMatch?>(null);
return Task.FromResult<PairUpResult?>(null);
}
}