Files
SVSimServer/SVSim.BattleEngine/Engine/LitJson/JsonWriter.cs
gamer147 2d9a6eea4b engine cleanup passes 4-7 + multi-instancing ambient rip
Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed,
+11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer
stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that
turns concurrent battles into a type-system property rather than a scope
contract.

## What landed

**Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a
cascading cull across the skill graph, view layer, and receive-path periphery.
Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/
IsAINetwork) became `const false`, every guarded block deleted. Field*.cs
subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan
family reworked to take a mgr param through IMulliganMgr.InitMulligan.
Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/
skill filters converted from static ambient reads to per-mgr reads via
SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr.

**Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient-
Context / TestBattleScope in full. Every per-battle mutable slot now lives on
the mgr instance itself:
  mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo /
  InstanceViewerId / InstanceNetworkAgent / GameMgr
BattleManagerBase.GetIns() returns null unconditionally; the residual static
flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo,
ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the
handful of engine-internal readers that still reference their types. Zero
BattleAmbient references anywhere in engine + node + tests.

Added pre-seeded GameMgr ctor overload threaded through the mgr chain
(BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard-
BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a
GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it
to the mgr's ctor — no ambient reach.

Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain
GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps
ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr
takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal
BEFORE mgr construction.

Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to
`HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten
around per-mgr construction (GetIns() → null is the pinned invariant).

## Regression fixes

- **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke
  the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream
  of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups
  via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied
  by the WireMulliganPhase seam; unit tests exposed the live-path gap.

## Ship state

- SVSim.BattleEngine.Tests: 56/56 pass, 2 skip
- SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48)
- Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs
  in SVSim.EmulatedEntrypoint, unrelated)
- Sequential PVP smoke: verified live (two back-to-back battles, no regression
  on cleanup/spinup)
- Concurrent PVP smoke: verified live

Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure
analyzer needed to make future cascade cleanup safe (per feedback memory
"Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-07-03 19:18:54 -04:00

411 lines
7.5 KiB
C#

using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Text;
namespace LitJson;
public class JsonWriter
{
private static NumberFormatInfo number_format;
private WriterContext context;
private Stack<WriterContext> ctx_stack;
private bool has_reached_end;
private char[] hex_seq;
private int indentation;
private int indent_value;
private StringBuilder inst_string_builder;
private bool pretty_print;
private bool validate;
private TextWriter writer;
public TextWriter TextWriter => writer;
public bool Validate
{
get
{
return validate;
}
set
{
validate = value;
}
}
static JsonWriter()
{
number_format = NumberFormatInfo.InvariantInfo;
}
public JsonWriter()
{
inst_string_builder = new StringBuilder();
writer = new StringWriter(inst_string_builder);
Init();
}
public JsonWriter(StringBuilder sb)
: this(new StringWriter(sb))
{
}
public JsonWriter(TextWriter writer)
{
if (writer == null)
{
throw new ArgumentNullException("writer");
}
this.writer = writer;
Init();
}
private void DoValidation(Condition cond)
{
if (!context.ExpectingValue)
{
context.Count++;
}
if (!validate)
{
return;
}
if (has_reached_end)
{
throw new JsonException("A complete JSON symbol has already been written");
}
switch (cond)
{
case Condition.InArray:
if (!context.InArray)
{
throw new JsonException("Can't close an array here");
}
break;
case Condition.InObject:
if (!context.InObject || context.ExpectingValue)
{
throw new JsonException("Can't close an object here");
}
break;
case Condition.NotAProperty:
if (context.InObject && !context.ExpectingValue)
{
throw new JsonException("Expected a property");
}
break;
case Condition.Property:
if (!context.InObject || context.ExpectingValue)
{
throw new JsonException("Can't add a property here");
}
break;
case Condition.Value:
if (!context.InArray && (!context.InObject || !context.ExpectingValue))
{
throw new JsonException("Can't add a value here");
}
break;
}
}
private void Init()
{
has_reached_end = false;
hex_seq = new char[4];
indentation = 0;
indent_value = 4;
pretty_print = false;
validate = true;
ctx_stack = new Stack<WriterContext>();
context = new WriterContext();
ctx_stack.Push(context);
}
private static void IntToHex(int n, char[] hex)
{
for (int i = 0; i < 4; i++)
{
int num = n % 16;
if (num < 10)
{
hex[3 - i] = (char)(48 + num);
}
else
{
hex[3 - i] = (char)(65 + (num - 10));
}
n >>= 4;
}
}
private void Indent()
{
if (pretty_print)
{
indentation += indent_value;
}
}
private void Put(string str)
{
if (pretty_print && !context.ExpectingValue)
{
for (int i = 0; i < indentation; i++)
{
writer.Write(' ');
}
}
writer.Write(str);
}
private void PutNewline()
{
PutNewline(add_comma: true);
}
private void PutNewline(bool add_comma)
{
if (add_comma && !context.ExpectingValue && context.Count > 1)
{
writer.Write(',');
}
if (pretty_print && !context.ExpectingValue)
{
writer.Write('\n');
}
}
private void PutString(string str)
{
Put(string.Empty);
writer.Write('"');
int length = str.Length;
for (int i = 0; i < length; i++)
{
switch (str[i])
{
case '\n':
writer.Write("\\n");
continue;
case '\r':
writer.Write("\\r");
continue;
case '\t':
writer.Write("\\t");
continue;
case '"':
case '\\':
writer.Write('\\');
writer.Write(str[i]);
continue;
case '\f':
writer.Write("\\f");
continue;
case '\b':
writer.Write("\\b");
continue;
}
if (str[i] >= ' ' && str[i] <= '~')
{
writer.Write(str[i]);
continue;
}
IntToHex(str[i], hex_seq);
writer.Write("\\u");
writer.Write(hex_seq);
}
writer.Write('"');
}
private void Unindent()
{
if (pretty_print)
{
indentation -= indent_value;
}
}
public override string ToString()
{
if (inst_string_builder == null)
{
return string.Empty;
}
return inst_string_builder.ToString();
}
public void Reset()
{
has_reached_end = false;
ctx_stack.Clear();
context = new WriterContext();
ctx_stack.Push(context);
if (inst_string_builder != null)
{
inst_string_builder.Remove(0, inst_string_builder.Length);
}
}
public void Write(bool boolean)
{
DoValidation(Condition.Value);
PutNewline();
Put(boolean ? "true" : "false");
context.ExpectingValue = false;
}
public void Write(decimal number)
{
DoValidation(Condition.Value);
PutNewline();
Put(Convert.ToString(number, number_format));
context.ExpectingValue = false;
}
public void Write(double number)
{
DoValidation(Condition.Value);
PutNewline();
string text = Convert.ToString(number, number_format);
Put(text);
if (text.IndexOf('.') == -1 && text.IndexOf('E') == -1)
{
writer.Write(".0");
}
context.ExpectingValue = false;
}
public void Write(int number)
{
DoValidation(Condition.Value);
PutNewline();
Put(Convert.ToString(number, number_format));
context.ExpectingValue = false;
}
public void Write(long number)
{
DoValidation(Condition.Value);
PutNewline();
Put(Convert.ToString(number, number_format));
context.ExpectingValue = false;
}
public void Write(string str)
{
DoValidation(Condition.Value);
PutNewline();
if (str == null)
{
Put("null");
}
else
{
PutString(str);
}
context.ExpectingValue = false;
}
public void Write(ulong number)
{
DoValidation(Condition.Value);
PutNewline();
Put(Convert.ToString(number, number_format));
context.ExpectingValue = false;
}
public void WriteArrayEnd()
{
DoValidation(Condition.InArray);
PutNewline(add_comma: false);
ctx_stack.Pop();
if (ctx_stack.Count == 1)
{
has_reached_end = true;
}
else
{
context = ctx_stack.Peek();
context.ExpectingValue = false;
}
Unindent();
Put("]");
}
public void WriteArrayStart()
{
DoValidation(Condition.NotAProperty);
PutNewline();
Put("[");
context = new WriterContext();
context.InArray = true;
ctx_stack.Push(context);
Indent();
}
public void WriteObjectEnd()
{
DoValidation(Condition.InObject);
PutNewline(add_comma: false);
ctx_stack.Pop();
if (ctx_stack.Count == 1)
{
has_reached_end = true;
}
else
{
context = ctx_stack.Peek();
context.ExpectingValue = false;
}
Unindent();
Put("}");
}
public void WriteObjectStart()
{
DoValidation(Condition.NotAProperty);
PutNewline();
Put("{");
context = new WriterContext();
context.InObject = true;
ctx_stack.Push(context);
Indent();
}
public void WritePropertyName(string property_name)
{
DoValidation(Condition.Property);
PutNewline();
PutString(property_name);
if (pretty_print)
{
if (property_name.Length > context.Padding)
{
context.Padding = property_name.Length;
}
for (int num = context.Padding - property_name.Length; num >= 0; num--)
{
writer.Write(' ');
}
writer.Write(": ");
}
else
{
writer.Write(':');
}
context.ExpectingValue = true;
}
}