Wire arena revocation enforcement into runtime

Author: LegendaryForge

src/main/java/io/github/legendaryforge/legendary/core/internal/runtime/DefaultCoreRuntime.java

@@ -14,8 +14,11 @@
 import io.github.legendaryforge.legendary.core.internal.event.SimpleEventBus;
 import io.github.legendaryforge.legendary.core.internal.legendary.arena.ArenaInvariantBridge;
 import io.github.legendaryforge.legendary.core.internal.legendary.arena.ArenaInvariantRegistry;
-import io.github.legendaryforge.legendary.core.internal.legendary.arena.PhaseGateInvariant;
+import io.github.legendaryforge.legendary.core.internal.legendary.arena.ArenaRevocationTracker;
 import io.github.legendaryforge.legendary.core.internal.legendary.arena.BoundsInvariant;
+import io.github.legendaryforge.legendary.core.internal.legendary.arena.LegendaryInstanceTrackingEncounterManager;
+import io.github.legendaryforge.legendary.core.internal.legendary.arena.LegendaryRevokedRejoinEnforcingEncounterManager;
+import io.github.legendaryforge.legendary.core.internal.legendary.arena.PhaseGateInvariant;
 import io.github.legendaryforge.legendary.core.internal.legendary.manager.LegendaryAccessEnforcingEncounterManager;
 import io.github.legendaryforge.legendary.core.internal.legendary.penalty.NoopLegendaryPenaltyStatus;
 import io.github.legendaryforge.legendary.core.internal.legendary.start.DefaultLegendaryStartPolicy;
@@ -24,12 +27,10 @@
 import io.github.legendaryforge.legendary.core.internal.lifecycle.DefaultServiceRegistry;
 import io.github.legendaryforge.legendary.core.internal.registry.DefaultRegistryAccess;
 import java.time.Clock;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Set;
-import io.github.legendaryforge.legendary.core.internal.legendary.arena.LegendaryInstanceTrackingEncounterManager;
-import io.github.legendaryforge.legendary.core.api.id.ResourceId;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Default internal wiring of LegendaryCore runtime components.
@@ -86,7 +87,7 @@ public DefaultCoreRuntime(Optional<PlayerDirectory> players, Optional<PartyDirec
                 io.github.legendaryforge.legendary.core.api.encounter.event.EncounterEndedEvent.class,
                 durationTelemetry::onEnded);
 
-Set<java.util.UUID> legendaryInstanceIds = ConcurrentHashMap.newKeySet();
+        Set<java.util.UUID> legendaryInstanceIds = ConcurrentHashMap.newKeySet();
         PhaseGateInvariant phaseGate = new PhaseGateInvariant();
         BoundsInvariant bounds = new BoundsInvariant(bus);
 
@@ -97,11 +98,20 @@ public DefaultCoreRuntime(Optional<PlayerDirectory> players, Optional<PartyDirec
 
         ArenaInvariantBridge.bind(bus, arenaRegistry, legendaryInstanceIds::contains, legendaryInstanceIds::remove);
 
+        ArenaRevocationTracker revocations = new ArenaRevocationTracker();
+
+        bus.subscribe(
+                io.github.legendaryforge.legendary.core.api.encounter.event.EncounterEndedEvent.class,
+                e -> revocations.clearInstance(e.instanceId()));
+
         EncounterManager base = new DefaultEncounterManager(players, parties, Optional.of(bus));
         EncounterManager startGated = new LegendaryStartGatingEncounterManager(
                 base, new DefaultLegendaryStartPolicy(), new NoopLegendaryPenaltyStatus());
-        EncounterManager enforced = new LegendaryAccessEnforcingEncounterManager(startGated, new DefaultLegendaryAccessPolicy());
-this.encounters = new LegendaryInstanceTrackingEncounterManager(enforced, legendaryInstanceIds);
+        EncounterManager enforced =
+                new LegendaryAccessEnforcingEncounterManager(startGated, new DefaultLegendaryAccessPolicy());
+        EncounterManager revokedRejoinEnforced = new LegendaryRevokedRejoinEnforcingEncounterManager(
+                enforced, legendaryInstanceIds::contains, phaseGate, revocations);
+        this.encounters = new LegendaryInstanceTrackingEncounterManager(revokedRejoinEnforced, legendaryInstanceIds);
 
         this.players = Objects.requireNonNull(players, "players");
         this.parties = Objects.requireNonNull(parties, "parties");

src/test/java/io/github/legendaryforge/legendary/core/internal/runtime/DefaultCoreRuntimeWiringTest.java

@@ -7,6 +7,7 @@
 import io.github.legendaryforge.legendary.core.api.platform.CoreRuntime;
 import io.github.legendaryforge.legendary.core.internal.encounter.DefaultEncounterManager;
 import io.github.legendaryforge.legendary.core.internal.legendary.arena.LegendaryInstanceTrackingEncounterManager;
+import io.github.legendaryforge.legendary.core.internal.legendary.arena.LegendaryRevokedRejoinEnforcingEncounterManager;
 import io.github.legendaryforge.legendary.core.internal.legendary.manager.LegendaryAccessEnforcingEncounterManager;
 import io.github.legendaryforge.legendary.core.internal.legendary.start.LegendaryStartGatingEncounterManager;
 import java.lang.reflect.Field;
@@ -30,15 +31,22 @@ void defaultConstructorWiresLegendaryEncounterManagersInCorrectOrder() {
         CoreRuntime runtime = new DefaultCoreRuntime();
 
         EncounterManager encounters = runtime.encounters();
-          assertTrue(encounters instanceof LegendaryInstanceTrackingEncounterManager, "top-level should track legendary instances");
+        assertTrue(
+                encounters instanceof LegendaryInstanceTrackingEncounterManager,
+                "top-level should track legendary instances");
 
-          EncounterManager enforcing = readDelegate(encounters);
-          assertTrue(enforcing instanceof LegendaryAccessEnforcingEncounterManager, "second-level should enforce access");
+        EncounterManager revokedRejoinEnforced = readDelegate(encounters);
+        assertTrue(
+                revokedRejoinEnforced instanceof LegendaryRevokedRejoinEnforcingEncounterManager,
+                "second-level should enforce revocation");
 
-          EncounterManager startGated = readDelegate(enforcing);
-          assertTrue(startGated instanceof LegendaryStartGatingEncounterManager, "third-level should gate start");
+        EncounterManager enforcing = readDelegate(revokedRejoinEnforced);
+        assertTrue(enforcing instanceof LegendaryAccessEnforcingEncounterManager, "third-level should enforce access");
 
-          EncounterManager base = readDelegate(startGated);
+        EncounterManager startGated = readDelegate(enforcing);
+        assertTrue(startGated instanceof LegendaryStartGatingEncounterManager, "fourth-level should gate start");
+
+        EncounterManager base = readDelegate(startGated);
         assertTrue(base instanceof DefaultEncounterManager, "base should be DefaultEncounterManager");
     }