f21ab7a38c
Deletes the scripted opponent and every entry point that created a BattleType.Scripted session (the ?scripted=1 query opt-in, the SoloDefaultsToScripted toggle, the resolver short-circuit, the WS handler case, the bridge validation arm). Real two-client PvP and the Bot matchmaking-timeout fallback are untouched. ResolveAsync drops its scriptedOptIn parameter. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
55 lines
2.1 KiB
C#
55 lines
2.1 KiB
C#
using System.Security.Cryptography;
|
|
using SVSim.BattleNode.Sessions;
|
|
|
|
namespace SVSim.BattleNode.Bridge;
|
|
|
|
/// <summary>
|
|
/// In-process implementation of <see cref="IMatchingBridge"/>. The HTTP-side
|
|
/// matching queue calls <see cref="RegisterBattle"/> once it has decided "these two
|
|
/// play each other" or "this viewer is solo (bot/scripted)."
|
|
/// </summary>
|
|
public sealed class MatchingBridge : IMatchingBridge
|
|
{
|
|
private readonly IBattleSessionStore _store;
|
|
private readonly BattleNodeOptions _options;
|
|
|
|
public MatchingBridge(IBattleSessionStore store, BattleNodeOptions options)
|
|
{
|
|
_store = store;
|
|
_options = options;
|
|
}
|
|
|
|
public PendingMatch RegisterBattle(BattlePlayer p1, BattlePlayer? p2, BattleType type)
|
|
{
|
|
ValidateContract(p1, p2, type);
|
|
|
|
// 12-digit decimal battle id mirrors the captures (e.g. "975695075012").
|
|
// Two unbiased 6-digit draws concatenated — RandomNumberGenerator.GetInt32 uses
|
|
// rejection sampling so the result is uniform on [0, 10^6).
|
|
var hi = RandomNumberGenerator.GetInt32(0, 1_000_000);
|
|
var lo = RandomNumberGenerator.GetInt32(0, 1_000_000);
|
|
var battleId = $"{hi:D6}{lo:D6}";
|
|
|
|
_store.RegisterPending(new PendingBattle(battleId, type, p1, p2));
|
|
return new PendingMatch(battleId, _options.NodeServerUrl);
|
|
}
|
|
|
|
private static void ValidateContract(BattlePlayer p1, BattlePlayer? p2, BattleType type)
|
|
{
|
|
if (p1 is null) throw new ArgumentNullException(nameof(p1));
|
|
switch (type)
|
|
{
|
|
case BattleType.Pvp:
|
|
if (p2 is null) throw new ArgumentException("Pvp requires both p1 and p2.", nameof(p2));
|
|
if (p1.ViewerId == p2.ViewerId)
|
|
throw new ArgumentException("Pvp requires distinct viewer ids.", nameof(p2));
|
|
break;
|
|
case BattleType.Bot:
|
|
if (p2 is not null) throw new ArgumentException("Bot must have p2==null.", nameof(p2));
|
|
break;
|
|
default:
|
|
throw new ArgumentOutOfRangeException(nameof(type), type, "Unknown BattleType.");
|
|
}
|
|
}
|
|
}
|