fix(battle-node): node_server_url matches prod wire format (no scheme, with path)
Prod do_matching captures (data_dumps/captures/traffic_prod_tk2_*) send the node URL as host:port/socket.io/ with no scheme prefix — e.g. "node06.shadowverse.jp:13560/socket.io/". BestHTTP's SocketManager expects this exact shape; the leading ws:// we were sending plus the missing /socket.io/ path was preventing the client from completing the post-do_matching connect (eventually times out with "connection timed out"). Update BattleNodeOptions default, Program.cs override, and both controller and bridge tests to use "localhost:5148/socket.io/". Discovered during v1 smoke walkthrough. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -1,10 +1,11 @@
|
|||||||
namespace SVSim.BattleNode.Bridge;
|
namespace SVSim.BattleNode.Bridge;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DI-injected options for the battle node. The web host populates these — typically
|
/// DI-injected options for the battle node. NodeServerUrl matches the prod
|
||||||
/// nodeServerUrl is "ws://localhost:5148" matching ASPNETCORE_URLS.
|
/// do_matching wire format: <c>host:port/socket.io/</c>, no scheme prefix.
|
||||||
|
/// BestHTTP's SocketManager parses it as the Socket.IO v2 endpoint URL.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class BattleNodeOptions
|
public sealed class BattleNodeOptions
|
||||||
{
|
{
|
||||||
public string NodeServerUrl { get; set; } = "ws://localhost:5148";
|
public string NodeServerUrl { get; set; } = "localhost:5148/socket.io/";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,8 +119,9 @@ public class Program
|
|||||||
|
|
||||||
builder.Services.AddBattleNode(opt =>
|
builder.Services.AddBattleNode(opt =>
|
||||||
{
|
{
|
||||||
// ASPNETCORE_URLS defaults to http://localhost:5148; we map ws:// onto the same host:port.
|
// Matches the prod do_matching wire format: host:port/socket.io/, no scheme prefix.
|
||||||
opt.NodeServerUrl = "ws://localhost:5148";
|
// BestHTTP's SocketManager parses this as the Socket.IO v2 endpoint URL.
|
||||||
|
opt.NodeServerUrl = "localhost:5148/socket.io/";
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.Services.AddTransient<ShadowverseTranslationMiddleware>();
|
builder.Services.AddTransient<ShadowverseTranslationMiddleware>();
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ public class MatchingBridgeTests
|
|||||||
public void RegisterPendingBattle_RegistersInStoreAndReturnsNodeUrl()
|
public void RegisterPendingBattle_RegistersInStoreAndReturnsNodeUrl()
|
||||||
{
|
{
|
||||||
var store = new InMemoryBattleSessionStore();
|
var store = new InMemoryBattleSessionStore();
|
||||||
var bridge = new MatchingBridge(store, new BattleNodeOptions { NodeServerUrl = "ws://localhost:5148" });
|
var bridge = new MatchingBridge(store, new BattleNodeOptions { NodeServerUrl = "localhost:5148/socket.io/" });
|
||||||
|
|
||||||
var match = bridge.RegisterPendingBattle(viewerId: 906243102);
|
var match = bridge.RegisterPendingBattle(viewerId: 906243102);
|
||||||
|
|
||||||
Assert.That(match.NodeServerUrl, Is.EqualTo("ws://localhost:5148"));
|
Assert.That(match.NodeServerUrl, Is.EqualTo("localhost:5148/socket.io/"));
|
||||||
Assert.That(match.BattleId, Is.Not.Empty);
|
Assert.That(match.BattleId, Is.Not.Empty);
|
||||||
var pending = store.TryGetPending(match.BattleId);
|
var pending = store.TryGetPending(match.BattleId);
|
||||||
Assert.That(pending, Is.Not.Null);
|
Assert.That(pending, Is.Not.Null);
|
||||||
|
|||||||
@@ -28,7 +28,10 @@ public class ArenaTwoPickBattleControllerTests
|
|||||||
var battleId = root.GetProperty("battle_id").GetString();
|
var battleId = root.GetProperty("battle_id").GetString();
|
||||||
Assert.That(battleId, Is.Not.Null.And.Not.Empty);
|
Assert.That(battleId, Is.Not.Null.And.Not.Empty);
|
||||||
var nodeUrl = root.GetProperty("node_server_url").GetString();
|
var nodeUrl = root.GetProperty("node_server_url").GetString();
|
||||||
Assert.That(nodeUrl, Does.StartWith("ws://"));
|
// Matches prod wire format: host:port/socket.io/, no scheme prefix.
|
||||||
|
Assert.That(nodeUrl, Does.Contain("/socket.io/"));
|
||||||
|
Assert.That(nodeUrl, Does.Not.StartWith("ws://"));
|
||||||
|
Assert.That(nodeUrl, Does.Not.StartWith("http://"));
|
||||||
// Required when matching_state ∈ {3004,3007,3011} per
|
// Required when matching_state ∈ {3004,3007,3011} per
|
||||||
// DoMatchingBase.SettingCardMasterId; client throws KeyNotFoundException without it.
|
// DoMatchingBase.SettingCardMasterId; client throws KeyNotFoundException without it.
|
||||||
Assert.That(root.GetProperty("card_master_id").GetInt32(), Is.EqualTo(1));
|
Assert.That(root.GetProperty("card_master_id").GetInt32(), Is.EqualTo(1));
|
||||||
|
|||||||
Reference in New Issue
Block a user