## Summary Removes the dated `DynamicJson` JSON helper and migrates spawner JSON (de)serialization to a polymorphic `record SpawnerDto` hierarchy. `DynamicJson` was the last remaining consumer (regions moved off it in #1400). The key correctness improvement: **System.Text.Json deserializes plain DTO records, never a live `Item`.** Previously, deserializing directly into an `Item` meant STJ constructed world-registered objects *before* the data was validated — a malformed/hand-edited spawn file could leave orphaned spawner Items in the world save. Now a parse failure is GC-only; `dto.ToSpawner()` constructs the spawner only from a fully-validated DTO and self-cleans on failure. ## What changed - **New:** `SpawnerDto` (abstract) + `SpawnerDataDto` / `RegionSpawnerDto` / `ProximitySpawnerDto`, each marked with a reusable `[JsonDiscoverableType]` opt-in attribute. Auto-discovered at the `Configure` phase — no manual registration list (avoids the regions `Register<T>()` footgun), open to custom spawner subtypes. - **Symmetric mapping:** `BaseSpawner.ToDto()` (export) ⇄ `SpawnerDto.ToSpawner()` (import). `ToSpawner()` deletes-and-rethrows on any failure, so the importer can never orphan an Item. - **`SpawnerJsonSerializer`** wires `$type` polymorphism on the `SpawnerDto` root with loud collision/constructibility validation. - **Import/export commands** rewired to the typed DTO path (reflection `FindTypeByName`/`CreateInstance` removed). - **Data migration:** the 109 `Distribution/Data/Spawns/**` files moved from `"type"`→`"$type"` and legacy `homeRange`→`spawnBounds`. The runtime still *reads* legacy `homeRange` for external files. The `homeRange→spawnBounds` formula is proven equivalent to the runtime conversion (`BoundsEquivalenceTests`, hr=0/1/3/7). - **Deleted:** `Projects/Server/Json/DynamicJson.cs`. Sparse export output matches the legacy `ToJson` (nullable DTO properties + `WhenWritingNull`). Binary world-save serialization is untouched. ## Tests - DTO round-trip per spawner type; sparse-default omission; legacy `homeRange` read; export/import file round-trip. - `Import_MalformedFile_LeaksNoWorldItems` — proves a mid-array parse failure constructs zero world Items. - `AllSpawnFilesLoadTests` — every migrated spawn file deserializes and builds. - Duplicate-discriminator validation. - UOContent.Tests 485/485, Server.Tests 710/710, build clean. ## Follow-up (not in this PR) `Rectangle3DConverter.Write` (in `Projects/Server/`) omits `z1/z2` when `Start.Z == -128`, so a future server-side export of a `homeRange`-style spawner round-trips depth 256→255. Pre-existing and out of scope here (Server change); the migrated data reads correctly. Worth a separate small converter PR.
200 lines
6.7 KiB
C#
200 lines
6.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using Server;
|
|
using Server.Engines.Spawners;
|
|
using Xunit;
|
|
|
|
namespace UOContent.Tests.Engines.Spawners.Json;
|
|
|
|
[Collection("Sequential UOContent Tests")]
|
|
public class ImportCleanupTests
|
|
{
|
|
private const string SpawnerGuid = "11111111-1111-1111-1111-111111111111";
|
|
|
|
[Fact]
|
|
public void Import_ValidFile_PlacesSpawner()
|
|
{
|
|
var dir = Path.Combine(Path.GetTempPath(), "muo-spawner-import-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(dir);
|
|
var path = Path.Combine(dir, "test.json");
|
|
File.WriteAllText(path, """
|
|
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "11111111-1111-1111-1111-111111111111",
|
|
"location": [305, 305, 0],
|
|
"map": "Felucca",
|
|
"count": 1,
|
|
"spawnBounds": { "x1": 300, "y1": 300, "x2": 310, "y2": 310 },
|
|
"entries": []
|
|
}
|
|
]
|
|
""");
|
|
|
|
BaseSpawner placedSpawner = null;
|
|
try
|
|
{
|
|
var all = new Dictionary<Guid, ISpawner>();
|
|
ImportSpawnersCommand.ImportFile(new FileInfo(path), all);
|
|
|
|
foreach (var s in Map.Felucca.GetItemsAt<BaseSpawner>(new Point3D(305, 305, 0)))
|
|
{
|
|
if (s.Guid == new Guid(SpawnerGuid))
|
|
{
|
|
placedSpawner = s;
|
|
break;
|
|
}
|
|
}
|
|
|
|
Assert.NotNull(placedSpawner);
|
|
Assert.True(all.ContainsKey(new Guid(SpawnerGuid)));
|
|
}
|
|
finally
|
|
{
|
|
placedSpawner?.Delete();
|
|
if (Directory.Exists(dir))
|
|
{
|
|
Directory.Delete(dir, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Import_NoMap_DeletesOrphanedSpawner()
|
|
{
|
|
// A spawner with no map entry deserialized by STJ will have map == null (or Map.Internal).
|
|
// Verify it does NOT end up on any live map.
|
|
var dir = Path.Combine(Path.GetTempPath(), "muo-spawner-import-nomap-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(dir);
|
|
var path = Path.Combine(dir, "test-nomap.json");
|
|
File.WriteAllText(path, """
|
|
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "22222222-2222-2222-2222-222222222222",
|
|
"location": [400, 400, 0],
|
|
"count": 1,
|
|
"spawnBounds": { "x1": 395, "y1": 395, "x2": 405, "y2": 405 },
|
|
"entries": []
|
|
}
|
|
]
|
|
""");
|
|
|
|
try
|
|
{
|
|
var all = new Dictionary<Guid, ISpawner>();
|
|
ImportSpawnersCommand.ImportFile(new FileInfo(path), all);
|
|
|
|
// The spawner must NOT be in allSpawners (rejected due to missing map).
|
|
Assert.DoesNotContain(new Guid("22222222-2222-2222-2222-222222222222"), all.Keys);
|
|
}
|
|
finally
|
|
{
|
|
if (Directory.Exists(dir))
|
|
{
|
|
Directory.Delete(dir, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Import_MalformedFile_LeaksNoWorldItems()
|
|
{
|
|
// First entry is syntactically valid JSON for a Spawner, second entry is truncated/garbage.
|
|
// STJ throws a JsonException during array deserialization before any Items are created
|
|
// (the DTO path is GC-only), so zero new spawners should appear at the valid entry's location.
|
|
var dir = Path.Combine(Path.GetTempPath(), "muo-import-malformed-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(dir);
|
|
File.WriteAllText(Path.Combine(dir, "bad.json"), """
|
|
[ { "$type": "Spawner", "location": [320, 320, 0], "map": "Felucca", "count": 1,
|
|
"entries": [ { "name": "Fisherman", "maxCount": 1, "probability": 100 } ] },
|
|
{ "$type": "Spawner", "location": [ THIS IS NOT JSON
|
|
""");
|
|
try
|
|
{
|
|
var before = CountSpawnersNear(new Point3D(320, 320, 0));
|
|
ImportSpawnersCommand.ImportFile(new FileInfo(Path.Combine(dir, "bad.json")), new Dictionary<Guid, ISpawner>());
|
|
// Malformed parse must construct zero Items (DTO is GC-only); nothing placed or orphaned.
|
|
Assert.Equal(before, CountSpawnersNear(new Point3D(320, 320, 0)));
|
|
}
|
|
finally
|
|
{
|
|
Directory.Delete(dir, true);
|
|
}
|
|
}
|
|
|
|
private static int CountSpawnersNear(Point3D p)
|
|
{
|
|
var n = 0;
|
|
foreach (var _ in Map.Felucca.GetItemsAt<BaseSpawner>(p))
|
|
{
|
|
n++;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
[Fact]
|
|
public void Import_DuplicateLocation_ReplacesExistingSpawner()
|
|
{
|
|
// Verifies that an existing spawner at the same location and type is removed and replaced.
|
|
var dir = Path.Combine(Path.GetTempPath(), "muo-spawner-import-dup-" + Guid.NewGuid().ToString("N"));
|
|
Directory.CreateDirectory(dir);
|
|
var path = Path.Combine(dir, "test-dup.json");
|
|
|
|
var newGuid = new Guid("33333333-3333-3333-3333-333333333333");
|
|
// Use a non-interpolated raw string literal; the guid is a known constant so hardcode it.
|
|
File.WriteAllText(path, """
|
|
[
|
|
{
|
|
"$type": "Spawner",
|
|
"guid": "33333333-3333-3333-3333-333333333333",
|
|
"location": [310, 310, 0],
|
|
"map": "Felucca",
|
|
"count": 1,
|
|
"spawnBounds": { "x1": 305, "y1": 305, "x2": 315, "y2": 315 },
|
|
"entries": []
|
|
}
|
|
]
|
|
""");
|
|
|
|
// Place a pre-existing spawner at the same location.
|
|
var existing = new Spawner(1, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(10));
|
|
existing.MoveToWorld(new Point3D(310, 310, 0), Map.Felucca);
|
|
|
|
BaseSpawner placedSpawner = null;
|
|
try
|
|
{
|
|
var all = new Dictionary<Guid, ISpawner> { [existing.Guid] = existing };
|
|
ImportSpawnersCommand.ImportFile(new FileInfo(path), all);
|
|
|
|
// existing should have been deleted and replaced.
|
|
Assert.True(existing.Deleted);
|
|
Assert.DoesNotContain(existing.Guid, all.Keys);
|
|
|
|
foreach (var s in Map.Felucca.GetItemsAt<BaseSpawner>(new Point3D(310, 310, 0)))
|
|
{
|
|
if (s.Guid == newGuid)
|
|
{
|
|
placedSpawner = s;
|
|
break;
|
|
}
|
|
}
|
|
|
|
Assert.NotNull(placedSpawner);
|
|
}
|
|
finally
|
|
{
|
|
if (!existing.Deleted)
|
|
{
|
|
existing.Delete();
|
|
}
|
|
placedSpawner?.Delete();
|
|
if (Directory.Exists(dir))
|
|
{
|
|
Directory.Delete(dir, true);
|
|
}
|
|
}
|
|
}
|
|
}
|