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>
55 lines
2.6 KiB
C#
55 lines
2.6 KiB
C#
using SVSim.BattleNode.Bridge;
|
|
|
|
namespace SVSim.EmulatedEntrypoint.Matching;
|
|
|
|
/// <summary>
|
|
/// Single source of truth for how a <c>/do_matching</c> request is resolved into a wire
|
|
/// matching_state + battle_id + node_server_url across every battle family.
|
|
/// <para>
|
|
/// Lives here (and not on each controller) because the resolution rules are the same
|
|
/// regardless of which URL family carried the request:
|
|
/// </para>
|
|
/// <list type="number">
|
|
/// <item>Honor the dev-affordance scripted opt-in (route flag and/or
|
|
/// <see cref="BattleNodeOptions.SoloDefaultsToScripted"/>) — bypass pair-up,
|
|
/// register a Scripted match, return immediately.</item>
|
|
/// <item>Otherwise consult <see cref="IMatchingPairUpService"/> and translate the
|
|
/// resulting <see cref="PairUpResult"/> into a wire matching_state per the
|
|
/// 3002 / 3004 / 3007 / 3011 vocabulary.</item>
|
|
/// </list>
|
|
/// <para>
|
|
/// Family-specific details (DTO shapes, family-specific request fields like
|
|
/// <c>card_master_id</c>, error-mapping like rank-battle's 3001 on a missing deck) stay
|
|
/// on the controllers. The resolver only owns the cross-cutting "did the flag win, did
|
|
/// pair-up resolve, what's the state code" decision.
|
|
/// </para>
|
|
/// </summary>
|
|
public interface IMatchingResolver
|
|
{
|
|
/// <param name="mode">
|
|
/// The matching-mode key the resolver passes through to
|
|
/// <see cref="IMatchingPairUpService.TryPairAsync"/> — one of the
|
|
/// <see cref="ModePolicy"/> registry's mode names (e.g. <c>"arena_two_pick_battle"</c>,
|
|
/// <c>"rotation_rank_battle"</c>, <c>"unlimited_rank_battle"</c>).
|
|
/// </param>
|
|
/// <param name="player">Caller's <see cref="BattlePlayer"/> (viewer-id + built MatchContext).</param>
|
|
/// <param name="scriptedOptIn">
|
|
/// Per-request opt-in from a controller-specific signal (e.g. TK2's <c>?scripted=1</c>
|
|
/// query param). OR'd with <see cref="BattleNodeOptions.SoloDefaultsToScripted"/>;
|
|
/// either being true short-circuits to a Scripted match.
|
|
/// </param>
|
|
Task<MatchingResolution> ResolveAsync(
|
|
string mode,
|
|
BattlePlayer player,
|
|
bool scriptedOptIn,
|
|
CancellationToken ct);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Wire-level outcome of a <c>/do_matching</c> resolution. Always carries a non-null
|
|
/// <see cref="NodeServerUrl"/> — empty string while parked (3002), real URL on resolution —
|
|
/// because the client's <c>DoMatchingBase.SettingDoMatchingData()</c> calls
|
|
/// <c>.ToString()</c> on the wire field without a <c>Keys.Contains</c> guard.
|
|
/// </summary>
|
|
public sealed record MatchingResolution(int MatchingState, string? BattleId, string NodeServerUrl);
|