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>
223 lines
4.2 KiB
C#
223 lines
4.2 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Text.RegularExpressions;
|
|
using Sqlite3Plugin;
|
|
|
|
namespace Cute;
|
|
|
|
public class LocalSqliteKVS : ILocalKVS, IDisposable
|
|
{
|
|
protected DBProxy _db;
|
|
|
|
protected PreparedQuery _keyQuery;
|
|
|
|
protected PreparedQuery _upsertQuery;
|
|
|
|
protected PreparedQuery _deleteQuery;
|
|
|
|
protected PreparedQuery _likeQuery;
|
|
|
|
protected PreparedQuery _selectAllQuery;
|
|
|
|
protected bool _enableCache;
|
|
|
|
protected Dictionary<string, string> _tableCache;
|
|
|
|
public string savePath => _db.dbPath;
|
|
|
|
protected LocalSqliteKVS(string path, bool enableCache)
|
|
{
|
|
try
|
|
{
|
|
string directoryName = Path.GetDirectoryName(path);
|
|
if (!Directory.Exists(directoryName))
|
|
{
|
|
Directory.CreateDirectory(directoryName);
|
|
}
|
|
_db = new DBProxy();
|
|
if (!_db.OpenWritable(path))
|
|
{
|
|
throw new ApplicationException($"Failed to open LocalKVS at {path}");
|
|
}
|
|
if (!_db.Exec("CREATE TABLE IF NOT EXISTS t (k TEXT NOT NULL, v TEXT NOT NULL, PRIMARY KEY(k));"))
|
|
{
|
|
throw new ApplicationException($"Failed to initialize LocalKVS at {path}");
|
|
}
|
|
_db.Exec("pragma cache_size=0");
|
|
_keyQuery = _db.PreparedQuery("SELECT v FROM t WHERE k=?;");
|
|
_upsertQuery = _db.PreparedQuery("REPLACE INTO t(k,v)VALUES(?,?);");
|
|
_deleteQuery = _db.PreparedQuery("DELETE FROM t WHERE k=?;");
|
|
_likeQuery = _db.PreparedQuery("SELECT k FROM t WHERE k LIKE ? ESCAPE '!';");
|
|
_selectAllQuery = _db.PreparedQuery("SELECT k FROM t;");
|
|
_enableCache = enableCache;
|
|
if (!_enableCache)
|
|
{
|
|
return;
|
|
}
|
|
using (Query query = _db.Query("SELECT COUNT(*) FROM t;"))
|
|
{
|
|
query.Step();
|
|
int capacity = query.GetInt(0);
|
|
_tableCache = new Dictionary<string, string>(capacity);
|
|
}
|
|
using Query query2 = _db.Query("SELECT k,v FROM t;");
|
|
while (query2.Step())
|
|
{
|
|
string text = query2.GetText(0);
|
|
string text2 = query2.GetText(1);
|
|
_tableCache[text] = text2;
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Dispose();
|
|
throw ex;
|
|
}
|
|
}
|
|
|
|
public static LocalSqliteKVS Open(string path, bool enableCache)
|
|
{
|
|
return new LocalSqliteKVS(path, enableCache);
|
|
}
|
|
|
|
public virtual void Dispose()
|
|
{
|
|
if (_db != null)
|
|
{
|
|
if (_keyQuery != null)
|
|
{
|
|
_keyQuery.Dispose();
|
|
_keyQuery = null;
|
|
}
|
|
if (_upsertQuery != null)
|
|
{
|
|
_upsertQuery.Dispose();
|
|
_upsertQuery = null;
|
|
}
|
|
if (_deleteQuery != null)
|
|
{
|
|
_deleteQuery.Dispose();
|
|
_deleteQuery = null;
|
|
}
|
|
if (_likeQuery != null)
|
|
{
|
|
_likeQuery.Dispose();
|
|
_likeQuery = null;
|
|
}
|
|
if (_selectAllQuery != null)
|
|
{
|
|
_selectAllQuery.Dispose();
|
|
_selectAllQuery = null;
|
|
}
|
|
_db.Dispose();
|
|
_db = null;
|
|
_tableCache = null;
|
|
}
|
|
}
|
|
|
|
public string Get(string key)
|
|
{
|
|
if (_enableCache)
|
|
{
|
|
if (!_tableCache.TryGetValue(key, out var value))
|
|
{
|
|
return null;
|
|
}
|
|
return value;
|
|
}
|
|
try
|
|
{
|
|
_keyQuery.BindText(1, key);
|
|
if (_keyQuery.Step())
|
|
{
|
|
return _keyQuery.GetText(0);
|
|
}
|
|
return null;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
throw ex;
|
|
}
|
|
finally
|
|
{
|
|
_keyQuery.Reset();
|
|
}
|
|
}
|
|
|
|
public void Set(string key, string value)
|
|
{
|
|
if (_enableCache)
|
|
{
|
|
_tableCache[key] = value;
|
|
}
|
|
try
|
|
{
|
|
_upsertQuery.BindText(1, key);
|
|
_upsertQuery.BindText(2, value);
|
|
_upsertQuery.Step();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
throw ex;
|
|
}
|
|
finally
|
|
{
|
|
_upsertQuery.Reset();
|
|
}
|
|
}
|
|
|
|
public void Delete(string key)
|
|
{
|
|
if (_enableCache && !_tableCache.Remove(key))
|
|
{
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
_deleteQuery.BindText(1, key);
|
|
_deleteQuery.Step();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
throw ex;
|
|
}
|
|
finally
|
|
{
|
|
_deleteQuery.Reset();
|
|
}
|
|
}
|
|
|
|
public void Transaction(Action block)
|
|
{
|
|
if (!_db.Begin())
|
|
{
|
|
throw new ApplicationException("Failed to begin LocalKVS transaction");
|
|
}
|
|
try
|
|
{
|
|
block();
|
|
_db.Commit();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_db.Rollback();
|
|
throw ex;
|
|
}
|
|
}
|
|
|
|
public void DeleteAll()
|
|
{
|
|
_db.Exec("DELETE FROM t;");
|
|
if (_enableCache)
|
|
{
|
|
_tableCache.Clear();
|
|
}
|
|
}
|
|
|
|
public void Optimize()
|
|
{
|
|
_db.Vacuum();
|
|
}
|
|
}
|