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

fix(battle-node): emit envelope keys before body keys in MsgEnvelope.ToJson

Browse Source 
Client RealTimeNetworkAgent.SetNetworkInfo iterates the synchronize-data
dict in insertion order. The "uri" key, when recognized as Matched, calls
GameMgr.InitializeSelfInfo which sets _selfDeck = null. Any "selfDeck"
processed before "uri" gets wiped; Matching.StartBattleLoad then crashes
on null.Select(...). Pre-refactor ToJson built a Dictionary envelope-first
then appended body keys, so the bug never surfaced. The typed-body rewrite
inverted the order — restoring envelope-first matches the prod wire.

Regression test BuildMatched_KeyOrder_PutsUriBeforeSelfDeckAndSelfInfo
locks the contract.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-01 10:53:51 -04:00
parent 19cc7980d1
commit e4691d616b
2 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
SVSim.BattleNode/Protocol/MsgEnvelope.cs
View File

@@ -42,12 +42,24 @@ public sealed record MsgEnvelope(
public static string ToJson(MsgEnvelope env)
{
JsonObject result;
// Envelope fields MUST come before body fields on the wire. The client's
// RealTimeNetworkAgent.SetNetworkInfo iterates the dict in insertion order and
// clears _selfDeck on the "uri" key (via GameMgr.InitializeSelfInfo). Any body
// field processed before "uri" is wiped before Matching.StartBattleLoad reads
// it back. The prod wire emits envelope keys first; we must too.
var result = new JsonObject();
result["uri"] = env.Uri.ToString();
result["viewerId"] = env.ViewerId;
result["uuid"] = env.Uuid;
result["try"] = env.Try;
result["cat"] = (int)env.Cat;
if (env.Bid is not null) result["bid"] = env.Bid;
if (env.PubSeq.HasValue) result["pubSeq"] = env.PubSeq.Value;
if (env.PlaySeq.HasValue) result["playSeq"] = env.PlaySeq.Value;
if (env.Body is RawBody raw)
{
// Inbound-echo path: flatten Entries to top-level keys, same as before
// the typed-body refactor.
result = new JsonObject();
// Inbound-echo path: flatten Entries to top-level keys.
foreach (var (k, v) in raw.Entries)
{
if (ReservedEnvelopeKeys.Contains(k))
@@ -60,19 +72,17 @@ public sealed record MsgEnvelope(
}
else
{
// Typed body: serialize via [JsonPropertyName] attributes on the record.
result = (JsonObject)JsonSerializer.SerializeToNode(env.Body, env.Body.GetType(), Options)!;
// Typed body: serialize via [JsonPropertyName] attributes on the record,
// then layer each field onto `result` after the envelope keys. DeepClone
// because S.T.Json JsonNodes can only have one parent; reassigning a node
// owned by `bodyNode` to `result` would throw without the clone.
var bodyNode = (JsonObject)JsonSerializer.SerializeToNode(env.Body, env.Body.GetType(), Options)!;
foreach (var prop in bodyNode)
{
result[prop.Key] = prop.Value?.DeepClone();
}
}
result["uri"] = env.Uri.ToString();
result["viewerId"] = env.ViewerId;
result["uuid"] = env.Uuid;
result["try"] = env.Try;
result["cat"] = (int)env.Cat;
if (env.Bid is not null) result["bid"] = env.Bid;
if (env.PubSeq.HasValue) result["pubSeq"] = env.PubSeq.Value;
if (env.PlaySeq.HasValue) result["playSeq"] = env.PlaySeq.Value;
return result.ToJsonString(Options);
}