672a89ed46
SoloDefaultsToScripted was only consulted by ArenaTwoPickBattleController; RankBattleController did its own inline pair-up + state-code mapping and ignored the flag entirely. Result: turning on the flag globally only short-circuited TK2 polls, while rank-battle polls still parked for the PvpFirstThenAiFallback threshold (15s) before resolving — surfaced today when the user set the flag and saw rank-battle still queue, then bot- battle via the client-side AI (not the server-side Scripted lifecycle we need to test WS traffic against). New IMatchingResolver owns the cross-cutting decisions: - honor scriptedOptIn (per-request) OR options.SoloDefaultsToScripted (process-wide) — bypass pair-up, register Scripted, return 3004 - otherwise call IMatchingPairUpService.TryPairAsync and translate the PairUpResult to the 3002/3004/3007/3011 vocabulary Family controllers shed the duplicated logic: - ArenaTwoPickBattleController: ~50 LOC → ~25; preserves ?scripted=1 query opt-in (parsed permissively for "1"/"true") and the ArenaTwoPickException catch - RankBattleController: ~30 LOC → ~12; preserves the 3001 mapping for InvalidOperationException (no deck for format) and card_master_id emission DoMatchingContractTests is the durable enforcement: parametrized over TK2 + rotation + unlimited rank, asserts SoloDefaultsToScripted=true makes every family's first poll skip 3002 and return SUCCEEDED with a battle_id + node_server_url. Adding a fourth family that forgets to route through IMatchingResolver fails this test — that's the point. MatchingResolverTests covers the six resolver paths in isolation with mocks; per-test Harness locals (not fixture-level fields) because the assembly is [Parallelizable(ParallelScope.All)] and shared mocks race. 957 tests passing (was 948; +9: 6 resolver + 3 contract parametrizations). No regressions in the existing TK2 / rank-battle controller suites. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
64 lines
2.4 KiB
C#
64 lines
2.4 KiB
C#
using SVSim.BattleNode.Bridge;
|
|
using SVSim.BattleNode.Sessions;
|
|
|
|
namespace SVSim.EmulatedEntrypoint.Matching;
|
|
|
|
/// <inheritdoc cref="IMatchingResolver"/>
|
|
public sealed class MatchingResolver : IMatchingResolver
|
|
{
|
|
private readonly IMatchingBridge _bridge;
|
|
private readonly IMatchingPairUpService _pairUp;
|
|
private readonly BattleNodeOptions _options;
|
|
|
|
public MatchingResolver(
|
|
IMatchingBridge bridge,
|
|
IMatchingPairUpService pairUp,
|
|
BattleNodeOptions options)
|
|
{
|
|
_bridge = bridge;
|
|
_pairUp = pairUp;
|
|
_options = options;
|
|
}
|
|
|
|
public Task<MatchingResolution> ResolveAsync(
|
|
string mode,
|
|
BattlePlayer player,
|
|
bool scriptedOptIn,
|
|
CancellationToken ct)
|
|
{
|
|
// Dev-affordance short-circuit. Either a per-request flag (e.g. ?scripted=1) or the
|
|
// process-wide BattleNodeOptions.SoloDefaultsToScripted toggle puts us here.
|
|
// Registers a Scripted match (server-side scripted opponent in BattleSession) and
|
|
// returns matching_state=3004 SUCCEEDED so the client opens the WS and proceeds.
|
|
if (scriptedOptIn || _options.SoloDefaultsToScripted)
|
|
{
|
|
var m = _bridge.RegisterBattle(player, p2: null, BattleType.Scripted);
|
|
return Task.FromResult(new MatchingResolution(3004, m.BattleId, m.NodeServerUrl));
|
|
}
|
|
|
|
return ResolveViaPairUpAsync(mode, player, ct);
|
|
}
|
|
|
|
private async Task<MatchingResolution> ResolveViaPairUpAsync(string mode, BattlePlayer player, CancellationToken ct)
|
|
{
|
|
var paired = await _pairUp.TryPairAsync(mode, player, ct);
|
|
if (paired is null)
|
|
{
|
|
// Parked. matching_state 3002 RETRY. node_server_url MUST be present as empty
|
|
// string (the client unguarded-.ToString()s it before consulting matching_state).
|
|
return new MatchingResolution(3002, BattleId: null, "");
|
|
}
|
|
|
|
// 3011 = AI_BATTLE_MATCHING_SUCCEEDED (PvpFirstThenAiFallback policy's threshold fired)
|
|
// 3007 = RC_BATTLE_MATCHING_SUCCEEDED_OWNER (first arriver, cache pickup)
|
|
// 3004 = RC_BATTLE_MATCHING_SUCCEEDED (joiner — triggered the pair)
|
|
var state = paired switch
|
|
{
|
|
{ IsAiFallback: true } => 3011,
|
|
{ IsOwner: true } => 3007,
|
|
_ => 3004,
|
|
};
|
|
return new MatchingResolution(state, paired.Match.BattleId, paired.Match.NodeServerUrl);
|
|
}
|
|
}
|