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>
This commit is contained in:
gamer147
@@ -61,37 +61,6 @@ public class CryptAES
|
||||
return array4;
|
||||
}
|
||||
|
||||
public static string EncryptRJ256(string prm_text_to_encrypt)
|
||||
{
|
||||
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
||||
rijndaelManaged.Padding = PaddingMode.Zeros;
|
||||
rijndaelManaged.Mode = CipherMode.CBC;
|
||||
rijndaelManaged.KeySize = 256;
|
||||
rijndaelManaged.BlockSize = 256;
|
||||
byte[] array = new byte[0];
|
||||
byte[] array2 = new byte[0];
|
||||
string s = Cryptographer.generateKeyString();
|
||||
string s2 = Certification.Udid.Replace("-", "");
|
||||
array = Encoding.UTF8.GetBytes(s);
|
||||
array2 = Encoding.UTF8.GetBytes(s2);
|
||||
ICryptoTransform transform = rijndaelManaged.CreateEncryptor(array, array2);
|
||||
using MemoryStream memoryStream = new MemoryStream();
|
||||
using CryptoStream cryptoStream = new CryptoStream(memoryStream, transform, CryptoStreamMode.Write);
|
||||
byte[] bytes = Encoding.UTF8.GetBytes(prm_text_to_encrypt);
|
||||
cryptoStream.Write(bytes, 0, bytes.Length);
|
||||
cryptoStream.FlushFinalBlock();
|
||||
byte[] array3 = memoryStream.ToArray();
|
||||
byte[] array4 = new byte[array3.Length + array.Length];
|
||||
Array.Copy(array3, 0, array4, 0, array3.Length);
|
||||
Array.Copy(array, 0, array4, array3.Length, array.Length);
|
||||
rijndaelManaged.Clear();
|
||||
memoryStream.Flush();
|
||||
memoryStream.Close();
|
||||
cryptoStream.Flush();
|
||||
cryptoStream.Close();
|
||||
return Convert.ToBase64String(array4);
|
||||
}
|
||||
|
||||
public static string EncryptRJ256ForNode(string prm_text_to_encrypt)
|
||||
{
|
||||
using AesManaged aesManaged = new AesManaged();
|
||||
@@ -135,33 +104,6 @@ public class CryptAES
|
||||
return array4;
|
||||
}
|
||||
|
||||
public static string DecryptRJ256(string prm_text_to_decrypt)
|
||||
{
|
||||
byte[] array = Convert.FromBase64String(prm_text_to_decrypt);
|
||||
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
||||
rijndaelManaged.Padding = PaddingMode.Zeros;
|
||||
rijndaelManaged.Mode = CipherMode.CBC;
|
||||
rijndaelManaged.KeySize = 256;
|
||||
rijndaelManaged.BlockSize = 256;
|
||||
byte[] array2 = new byte[32];
|
||||
byte[] array3 = new byte[32];
|
||||
byte[] array4 = new byte[array.Length - array2.Length];
|
||||
Array.Copy(array, 0, array4, 0, array4.Length);
|
||||
Array.Copy(array, array.Length - array2.Length, array2, 0, array2.Length);
|
||||
array3 = Encoding.UTF8.GetBytes(Certification.Udid.Replace("-", ""));
|
||||
ICryptoTransform transform = rijndaelManaged.CreateDecryptor(array2, array3);
|
||||
byte[] array5 = new byte[array4.Length];
|
||||
using MemoryStream memoryStream = new MemoryStream(array4);
|
||||
using CryptoStream cryptoStream = new CryptoStream(memoryStream, transform, CryptoStreamMode.Read);
|
||||
cryptoStream.Read(array5, 0, array5.Length);
|
||||
rijndaelManaged.Clear();
|
||||
cryptoStream.Flush();
|
||||
cryptoStream.Close();
|
||||
memoryStream.Flush();
|
||||
memoryStream.Close();
|
||||
return Encoding.UTF8.GetString(array5).TrimEnd(default(char));
|
||||
}
|
||||
|
||||
public static string DecryptRJ256ForNode(string prm_text_to_decrypt)
|
||||
{
|
||||
using AesManaged aesManaged = new AesManaged();
|
||||
@@ -181,68 +123,4 @@ public class CryptAES
|
||||
aesManaged.Clear();
|
||||
return result;
|
||||
}
|
||||
|
||||
public static byte[] EncryptRJ256(byte[] binData)
|
||||
{
|
||||
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
||||
rijndaelManaged.Padding = PaddingMode.PKCS7;
|
||||
rijndaelManaged.Mode = CipherMode.CBC;
|
||||
rijndaelManaged.KeySize = 256;
|
||||
rijndaelManaged.BlockSize = 256;
|
||||
byte[] array = new byte[0];
|
||||
byte[] array2 = new byte[0];
|
||||
string s = Cryptographer.generateKeyString();
|
||||
string s2 = Certification.Udid.Replace("-", "");
|
||||
array = Encoding.UTF8.GetBytes(s);
|
||||
array2 = Encoding.UTF8.GetBytes(s2);
|
||||
ICryptoTransform transform = rijndaelManaged.CreateEncryptor(array, array2);
|
||||
using MemoryStream memoryStream = new MemoryStream();
|
||||
using CryptoStream cryptoStream = new CryptoStream(memoryStream, transform, CryptoStreamMode.Write);
|
||||
byte[] bytes = BitConverter.GetBytes(binData.Length);
|
||||
byte[] array3 = new byte[4 + binData.Length];
|
||||
Array.Copy(bytes, 0, array3, 0, 4);
|
||||
Array.Copy(binData, 0, array3, 4, binData.Length);
|
||||
cryptoStream.Write(array3, 0, array3.Length);
|
||||
cryptoStream.FlushFinalBlock();
|
||||
byte[] array4 = memoryStream.ToArray();
|
||||
byte[] array5 = new byte[array.Length + array4.Length];
|
||||
Array.Copy(array4, 0, array5, 0, array4.Length);
|
||||
Array.Copy(array, 0, array5, array4.Length, array.Length);
|
||||
rijndaelManaged.Clear();
|
||||
memoryStream.Flush();
|
||||
memoryStream.Close();
|
||||
cryptoStream.Flush();
|
||||
cryptoStream.Close();
|
||||
return array5;
|
||||
}
|
||||
|
||||
public static byte[] DecryptRJ256(byte[] binData)
|
||||
{
|
||||
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
||||
rijndaelManaged.Padding = PaddingMode.PKCS7;
|
||||
rijndaelManaged.Mode = CipherMode.CBC;
|
||||
rijndaelManaged.KeySize = 256;
|
||||
rijndaelManaged.BlockSize = 256;
|
||||
byte[] array = new byte[32];
|
||||
byte[] array2 = new byte[32];
|
||||
byte[] array3 = new byte[binData.Length - array.Length];
|
||||
Array.Copy(binData, 0, array3, 0, array3.Length);
|
||||
Array.Copy(binData, binData.Length - array.Length, array, 0, array.Length);
|
||||
array2 = Encoding.UTF8.GetBytes(Certification.Udid.Replace("-", ""));
|
||||
ICryptoTransform transform = rijndaelManaged.CreateDecryptor(array, array2);
|
||||
byte[] array4 = new byte[array3.Length];
|
||||
using MemoryStream memoryStream = new MemoryStream(array3);
|
||||
using CryptoStream cryptoStream = new CryptoStream(memoryStream, transform, CryptoStreamMode.Read);
|
||||
cryptoStream.Read(array4, 0, array4.Length);
|
||||
byte[] array5 = new byte[4];
|
||||
Array.Copy(array4, 0, array5, 0, 4);
|
||||
byte[] array6 = new byte[BitConverter.ToInt32(array5, 0)];
|
||||
Array.Copy(array4, 4, array6, 0, array6.Length);
|
||||
rijndaelManaged.Clear();
|
||||
memoryStream.Flush();
|
||||
memoryStream.Close();
|
||||
cryptoStream.Flush();
|
||||
cryptoStream.Close();
|
||||
return array6;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user