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>
127 lines
4.4 KiB
C#
127 lines
4.4 KiB
C#
using System;
|
|
using System.IO;
|
|
using System.Security.Cryptography;
|
|
using System.Text;
|
|
|
|
namespace Cute;
|
|
|
|
public class CryptAES
|
|
{
|
|
public static byte[] encrypt(byte[] byteSrc)
|
|
{
|
|
return EncryptRJ256Api(byteSrc);
|
|
}
|
|
|
|
public static string encrypt(string byteSrc)
|
|
{
|
|
return Convert.ToBase64String(EncryptRJ256Api(Encoding.UTF8.GetBytes(byteSrc)));
|
|
}
|
|
|
|
public static string encryptForNode(string src)
|
|
{
|
|
return EncryptRJ256ForNode(src);
|
|
}
|
|
|
|
public static byte[] decrypt(string src)
|
|
{
|
|
return DecryptRJ256Api(Convert.FromBase64String(src));
|
|
}
|
|
|
|
public static string decryptForNode(string src)
|
|
{
|
|
return DecryptRJ256ForNode(src);
|
|
}
|
|
|
|
private static byte[] EncryptRJ256Api(byte[] toEncryptData)
|
|
{
|
|
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
|
rijndaelManaged.Mode = CipherMode.CBC;
|
|
rijndaelManaged.KeySize = 256;
|
|
rijndaelManaged.BlockSize = 128;
|
|
byte[] array = new byte[0];
|
|
byte[] array2 = new byte[0];
|
|
string s = Cryptographer.generateKeyString();
|
|
string s2 = Certification.Udid.Replace("-", "").Substring(0, 16);
|
|
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);
|
|
cryptoStream.Write(toEncryptData, 0, toEncryptData.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 array4;
|
|
}
|
|
|
|
public static string EncryptRJ256ForNode(string prm_text_to_encrypt)
|
|
{
|
|
using AesManaged aesManaged = new AesManaged();
|
|
string text = Cryptographer.generateKeyString();
|
|
string s = text.Substring(0, 16);
|
|
aesManaged.BlockSize = 128;
|
|
aesManaged.KeySize = 256;
|
|
aesManaged.IV = Encoding.UTF8.GetBytes(s);
|
|
aesManaged.Key = Encoding.UTF8.GetBytes(text);
|
|
aesManaged.Mode = CipherMode.CBC;
|
|
aesManaged.Padding = PaddingMode.PKCS7;
|
|
byte[] bytes = Encoding.UTF8.GetBytes(prm_text_to_encrypt);
|
|
using ICryptoTransform cryptoTransform = aesManaged.CreateEncryptor();
|
|
byte[] inArray = cryptoTransform.TransformFinalBlock(bytes, 0, bytes.Length);
|
|
aesManaged.Clear();
|
|
return text + Convert.ToBase64String(inArray);
|
|
}
|
|
|
|
private static byte[] DecryptRJ256Api(byte[] sEncryptedString)
|
|
{
|
|
using RijndaelManaged rijndaelManaged = new RijndaelManaged();
|
|
rijndaelManaged.Mode = CipherMode.CBC;
|
|
rijndaelManaged.KeySize = 256;
|
|
rijndaelManaged.BlockSize = 128;
|
|
byte[] array = new byte[32];
|
|
byte[] array2 = new byte[16];
|
|
byte[] array3 = new byte[sEncryptedString.Length - array.Length];
|
|
Array.Copy(sEncryptedString, 0, array3, 0, array3.Length);
|
|
Array.Copy(sEncryptedString, sEncryptedString.Length - array.Length, array, 0, array.Length);
|
|
array2 = Encoding.UTF8.GetBytes(Certification.Udid.Replace("-", "").Substring(0, 16));
|
|
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);
|
|
rijndaelManaged.Clear();
|
|
cryptoStream.Flush();
|
|
cryptoStream.Close();
|
|
memoryStream.Flush();
|
|
memoryStream.Close();
|
|
return array4;
|
|
}
|
|
|
|
public static string DecryptRJ256ForNode(string prm_text_to_decrypt)
|
|
{
|
|
using AesManaged aesManaged = new AesManaged();
|
|
string text = prm_text_to_decrypt.Substring(0, 32);
|
|
string s = text.Substring(0, 16);
|
|
string s2 = prm_text_to_decrypt.Substring(32);
|
|
aesManaged.BlockSize = 128;
|
|
aesManaged.KeySize = 256;
|
|
aesManaged.Key = Encoding.UTF8.GetBytes(text);
|
|
aesManaged.IV = Encoding.UTF8.GetBytes(s);
|
|
aesManaged.Mode = CipherMode.CBC;
|
|
aesManaged.Padding = PaddingMode.PKCS7;
|
|
byte[] array = Convert.FromBase64String(s2);
|
|
using ICryptoTransform cryptoTransform = aesManaged.CreateDecryptor();
|
|
byte[] bytes = cryptoTransform.TransformFinalBlock(array, 0, array.Length);
|
|
string result = Encoding.UTF8.GetString(bytes);
|
|
aesManaged.Clear();
|
|
return result;
|
|
}
|
|
}
|