From 7b588e08d26056250a97e3d6d756db31384e7b4e Mon Sep 17 00:00:00 2001 From: Dylan Garvis Date: Wed, 23 Sep 2026 12:50:00 -0400 Subject: [PATCH] feat(admin): inspect saved characters --- .../dmg/fantasystick/FantasyStickPlugin.java | 2 +- .../book/CharacterBookController.java | 133 ++++++++++- .../fantasystick/book/PartyBookControls.java | 10 +- .../dmg/fantasystick/party/PartyRoster.java | 1 + .../persistence/CharacterStorage.java | 17 ++ .../persistence/YamlCharacterRepository.java | 37 ++++ .../session/EquipmentAdminCommand.java | 138 +++++++++++- .../AdminCharacterBookNativeTest.java | 8 +- .../DefeatHealthDeliveryNativeTest.java | 1 + .../SavedCharacterAdminNativeTest.java | 208 ++++++++++++++++++ .../YamlCharacterRepositoryTest.java | 22 ++ 11 files changed, 555 insertions(+), 22 deletions(-) create mode 100644 src/nativeTest/java/games/dmg/fantasystick/SavedCharacterAdminNativeTest.java diff --git a/src/main/java/games/dmg/fantasystick/FantasyStickPlugin.java b/src/main/java/games/dmg/fantasystick/FantasyStickPlugin.java index 7970814..90db3b9 100644 --- a/src/main/java/games/dmg/fantasystick/FantasyStickPlugin.java +++ b/src/main/java/games/dmg/fantasystick/FantasyStickPlugin.java @@ -618,7 +618,7 @@ public final class FantasyStickPlugin extends JavaPlugin { () -> factory.create(rules), nextTick, problem -> getLogger().log(Level.WARNING, "Admin character issue " + problem.operation() + " for player " + problem.player() + "; character " + problem.character(), problem.cause()))); - admin.attachCharacterBooks(books); + admin.attachCharacterBooks(books, characters); var playerRoot = new games.dmg.fantasystick.session.FantasyPlayerCommand( admin, feedbackCommand, particlesCommand); var playerCommand = java.util.Objects.requireNonNull(getCommand("fstick"), diff --git a/src/main/java/games/dmg/fantasystick/book/CharacterBookController.java b/src/main/java/games/dmg/fantasystick/book/CharacterBookController.java index f0ff56b..d4fb924 100644 --- a/src/main/java/games/dmg/fantasystick/book/CharacterBookController.java +++ b/src/main/java/games/dmg/fantasystick/book/CharacterBookController.java @@ -33,10 +33,12 @@ public final class CharacterBookController implements Consumer, Au private final Map pending = new ConcurrentHashMap<>(); private final Map adminPending = new ConcurrentHashMap<>(); private final Map adminViews = new ConcurrentHashMap<>(); + private final Map savedViews = new ConcurrentHashMap<>(); private volatile boolean closed; private static final int VOLUME_SIZE = 30; // Reserve room for linked ability details, navigation and party pages. private static final net.kyori.adventure.key.Key PAGES = net.kyori.adventure.key.Key.key("fantasystick", "character_pages"); private static final net.kyori.adventure.key.Key ADMIN_PAGES = net.kyori.adventure.key.Key.key("fantasystick", "admin_character_pages"); + private static final net.kyori.adventure.key.Key SAVED_PAGES = net.kyori.adventure.key.Key.key("fantasystick", "saved_character_pages"); private static final net.kyori.adventure.key.Key STATS = net.kyori.adventure.key.Key.key("fantasystick", "character_stat"); private static final net.kyori.adventure.key.Key ABILITY_UNLOCK = net.kyori.adventure.key.Key.key("fantasystick", "ability_unlock"); private static final net.kyori.adventure.key.Key ABILITY_UNLEARN = net.kyori.adventure.key.Key.key("fantasystick", "ability_unlearn"); @@ -49,6 +51,7 @@ public final class CharacterBookController implements Consumer, Au private record AdminView(String nonce, UUID administrator, org.bukkit.entity.Player target, games.dmg.fantasystick.session.EquipmentSessions.Active active, int previous, int next) { } + private record SavedView(String nonce, UUID administrator, UUID character, int previous, int next) { } private record StatView(String nonce, ControlInput input, java.math.BigInteger revision) { } private record AbilityView(String nonce, ControlInput input, java.math.BigInteger revision, java.util.Set ids) { } private record PassiveView(String nonce, ControlInput input, java.math.BigInteger revision, java.util.Set ids) { } @@ -123,6 +126,7 @@ public final class CharacterBookController implements Consumer, Au UUID targetId = target.getUniqueId(); Object ticket = new Object(); adminViews.remove(administratorId); + savedViews.remove(administratorId); adminPending.put(administratorId, ticket); characters.find(active.character()).whenComplete((record, failure) -> { if (closed || adminPending.get(administratorId) != ticket) return; @@ -164,6 +168,55 @@ public final class CharacterBookController implements Consumer, Au }); } + public void openSavedReadOnly(org.bukkit.entity.Player administrator, UUID character) { + Objects.requireNonNull(administrator); Objects.requireNonNull(character); + if (closed) return; + if (!administrator.isOnline() || !administrator.hasPermission("fantasystick.admin")) { + if (administrator.isOnline()) administrator.sendMessage("Saved character view refused: administrator permission is required."); + return; + } + loadSavedReadOnly(administrator, character, 0); + } + + private void loadSavedReadOnly(org.bukkit.entity.Player administrator, UUID character, int offset) { + if (closed) return; + UUID administratorId = administrator.getUniqueId(); + Object ticket = new Object(); + adminViews.remove(administratorId); + savedViews.remove(administratorId); + adminPending.put(administratorId, ticket); + characters.inspect(character).whenComplete((record, failure) -> { + if (closed || adminPending.get(administratorId) != ticket) return; + try { + nextTick.accept(() -> { + if (closed || !adminPending.remove(administratorId, ticket)) return; + if (!administrator.isOnline() || !administrator.hasPermission("fantasystick.admin")) { + if (administrator.isOnline()) administrator.sendMessage("Saved character view refused: administrator permission changed."); + return; + } + if (failure != null) { + report(new Failure(administratorId, character, failure)); + administrator.sendMessage("Saved character view could not be loaded; no state was changed."); + return; + } + if (record.isEmpty()) { + administrator.sendMessage("Saved character view refused: character not found."); + return; + } + try { administrator.openBook(renderSavedReadOnly(record.orElseThrow(), administrator, offset)); } + catch (RuntimeException error) { + savedViews.remove(administratorId); + report(new Failure(administratorId, character, error)); + administrator.sendMessage("Saved character view could not be opened; no state was changed."); + } + }); + } catch (RuntimeException rejected) { + adminPending.remove(administratorId, ticket); + report(new Failure(administratorId, character, rejected)); + } + }); + } + private void load(ControlInput input, int offset) { if (closed || input.kind() != ControlInput.Kind.BOOK || input.gesture() != ControlInput.Gesture.USE || !input.stillCurrent()) return; @@ -200,19 +253,24 @@ public final class CharacterBookController implements Consumer, Au } private ItemStack render(CharacterRecord record, ControlInput input, int offset) { - return renderBook(record, input.player(), input, offset, null, null); + return renderBook(record, input.player(), input, offset, null, null, false); } private ItemStack renderReadOnly(CharacterRecord record, org.bukkit.entity.Player administrator, org.bukkit.entity.Player target, games.dmg.fantasystick.session.EquipmentSessions.Active active, int offset) { - return renderBook(record, target, null, offset, administrator, active); + return renderBook(record, target, null, offset, administrator, active, false); + } + + private ItemStack renderSavedReadOnly(CharacterRecord record, org.bukkit.entity.Player administrator, int offset) { + return renderBook(record, administrator, null, offset, administrator, null, true); } private ItemStack renderBook(CharacterRecord record, org.bukkit.entity.Player subject, ControlInput input, int offset, org.bukkit.entity.Player administrator, - games.dmg.fantasystick.session.EquipmentSessions.Active adminActive) { + games.dmg.fantasystick.session.EquipmentSessions.Active adminActive, + boolean savedState) { boolean interactive = input != null; var item = new ItemStack(Material.WRITTEN_BOOK); var meta = (BookMeta) item.getItemMeta(); @@ -220,10 +278,12 @@ public final class CharacterBookController implements Consumer, Au meta.setAuthor("Fantasy Stick"); var statView = interactive ? new StatView(UUID.randomUUID().toString(), input, record.revision()) : null; - var allOverview = overviewPages(record, subject, statView); + var allOverview = overviewPages(record, subject, statView, savedState); int start = Math.min(offset, (allOverview.size() - 1) / VOLUME_SIZE * VOLUME_SIZE); int end = Math.min(start + VOLUME_SIZE, allOverview.size()); - var pages = new java.util.ArrayList(allOverview.subList(start, end)); + var pages = new java.util.ArrayList(); + if (savedState && start == 0) pages.addAll(savedSummaryPages(record)); + pages.addAll(allOverview.subList(start, end)); if(end==allOverview.size())pages.add(gearPage(record)); if (interactive && record.unspentPoints().signum() > 0 && start == 0) statViews.put(input.session().player(), statView); @@ -304,6 +364,14 @@ public final class CharacterBookController implements Consumer, Au .append(pageButton("Previous pages", view, 0)); if (view.next() >= 0) navigation = navigation.append(Component.newline()) .append(pageButton("Next pages", view, 1)); + } else if (savedState) { + var view = new SavedView(UUID.randomUUID().toString(), administrator.getUniqueId(), record.id(), + start > 0 ? start - VOLUME_SIZE : -1, end < allOverview.size() ? end : -1); + savedViews.put(administrator.getUniqueId(), view); + if (view.previous() >= 0) navigation = navigation.append(Component.newline()) + .append(savedPageButton("Previous pages", view, 0)); + if (view.next() >= 0) navigation = navigation.append(Component.newline()) + .append(savedPageButton("Next pages", view, 1)); } else { var view = new AdminView(UUID.randomUUID().toString(), administrator.getUniqueId(), subject, adminActive, start > 0 ? start - VOLUME_SIZE : -1, @@ -317,7 +385,9 @@ public final class CharacterBookController implements Consumer, Au pages.add(navigation); } if (end == allOverview.size()) pages.addAll(interactive - ? partyControls.pages(input) : partyControls.readOnlyPages(subject.getUniqueId())); + ? partyControls.pages(input) : savedState + ? partyControls.readOnlyCharacterPages(record.id()) + : partyControls.readOnlyPages(subject.getUniqueId())); meta.pages(pages); item.setItemMeta(meta); return item; @@ -326,8 +396,22 @@ public final class CharacterBookController implements Consumer, Au private Component gearPage(CharacterRecord record){return Component.text("Gear\n\nHead: Cosmetic\nChestplate: "+tier(record.gear().chestplate())+"\nLeggings: "+tier(record.gear().leggings())+"\nBoots: "+tier(record.gear().boots()));} private static String tier(games.dmg.fantasystick.persistence.GearTier tier){String value=tier.name().toLowerCase(java.util.Locale.ROOT);return Character.toUpperCase(value.charAt(0))+value.substring(1);} + private java.util.List savedSummaryPages(CharacterRecord record) { + var builder = new PageBuilder(); + boolean active = sessions.activeCharacter(record.id()).filter(sessions::current).isPresent(); + builder.text("Saved state"); + builder.blank(); + builder.text("Character UUID:"); + builder.text(record.id().toString()); + builder.text(active ? "Active" : "Inactive"); + builder.text(record.dead() ? "Dead" : "Alive"); + if (record.deathId() != null) builder.text("Death: " + record.deathId()); + if (record.diedAt() != null) builder.text("Died: " + record.diedAt()); + return builder.pages(); + } + private java.util.List overviewPages(CharacterRecord record, org.bukkit.entity.Player subject, - StatView view) { + StatView view, boolean savedState) { var builder = new PageBuilder(); builder.text(record.name()); builder.blank(); @@ -343,8 +427,16 @@ public final class CharacterBookController implements Consumer, Au builder.text("XP: " + xp); builder.text("Unspent points: " + record.unspentPoints()); builder.text("Coins: " + record.coins()); - builder.text("Health: " + java.math.BigDecimal.valueOf(subject.getHealth()).min(maximum).stripTrailingZeros().toPlainString() + var health = savedState ? record.health() : java.math.BigDecimal.valueOf(subject.getHealth()).min(maximum); + builder.text((savedState ? "Saved health: " : "Health: ") + health.stripTrailingZeros().toPlainString() + "/" + maximum.stripTrailingZeros().toPlainString()); + if (savedState) { + builder.blank(); + builder.text("Saved cooldowns"); + if (record.cooldowns().isEmpty()) builder.text("None"); + else record.cooldowns().entrySet().stream().sorted(java.util.Map.Entry.comparingByKey()) + .forEach(entry -> builder.text(entry.getKey() + ": " + entry.getValue())); + } return builder.pages(); } @@ -585,6 +677,28 @@ public final class CharacterBookController implements Consumer, Au net.kyori.adventure.nbt.api.BinaryTagHolder.binaryTagHolder("\"" + view.nonce() + ":" + direction + "\""))); } + private static Component savedPageButton(String label, SavedView view, int direction) { + return Component.text("[" + label + "]", net.kyori.adventure.text.format.NamedTextColor.DARK_BLUE) + .clickEvent(net.kyori.adventure.text.event.ClickEvent.custom(SAVED_PAGES, + net.kyori.adventure.nbt.api.BinaryTagHolder.binaryTagHolder("\"" + view.nonce() + ":" + direction + "\""))); + } + + @org.bukkit.event.EventHandler + public void savedPageAction(io.papermc.paper.event.player.PlayerCustomClickEvent event) { + if (closed || !SAVED_PAGES.equals(event.getIdentifier()) + || !(event.getCommonConnection() instanceof io.papermc.paper.connection.PlayerGameConnection connection)) return; + var administrator = connection.getPlayer(); + var view = savedViews.get(administrator.getUniqueId()); + if (view == null || event.getTag() == null || !view.administrator().equals(administrator.getUniqueId())) return; + String raw = event.getTag().string(); + if (raw.length() > 64) return; + var match = PAGE_PAYLOAD.matcher(raw); + if (!match.matches() || !view.nonce().equals(match.group(1))) return; + int offset = match.group(2).equals("0") ? view.previous() : view.next(); + if (offset < 0 || !savedViews.remove(administrator.getUniqueId(), view)) return; + loadSavedReadOnly(administrator, view.character(), offset); + } + @org.bukkit.event.EventHandler public void adminPageAction(io.papermc.paper.event.player.PlayerCustomClickEvent event) { if (closed || !ADMIN_PAGES.equals(event.getIdentifier()) @@ -784,6 +898,7 @@ public final class CharacterBookController implements Consumer, Au pending.remove(owner); adminPending.remove(owner); adminViews.remove(owner); + savedViews.remove(owner); views.remove(owner); statViews.remove(owner); abilityViews.remove(owner); @@ -792,6 +907,6 @@ public final class CharacterBookController implements Consumer, Au } @Override public void close() { - closed = true; pending.clear(); adminPending.clear(); adminViews.clear(); views.clear(); statViews.clear(); abilityViews.clear(); passiveViews.clear(); partyControls.close(); + closed = true; pending.clear(); adminPending.clear(); adminViews.clear(); savedViews.clear(); views.clear(); statViews.clear(); abilityViews.clear(); passiveViews.clear(); partyControls.close(); } } diff --git a/src/main/java/games/dmg/fantasystick/book/PartyBookControls.java b/src/main/java/games/dmg/fantasystick/book/PartyBookControls.java index 81f20e6..8d55c83 100644 --- a/src/main/java/games/dmg/fantasystick/book/PartyBookControls.java +++ b/src/main/java/games/dmg/fantasystick/book/PartyBookControls.java @@ -60,6 +60,11 @@ public final class PartyBookControls implements AutoCloseable { return rootPages(Objects.requireNonNull(account)); } + public List readOnlyCharacterPages(UUID character) { + if (closed) return List.of(); + return rootPages(parties.partyOfCharacter(Objects.requireNonNull(character))); + } + private List render(ControlInput input, Menu menu, int offset) { if (closed || !input.stillCurrent()) return List.of(); var build = new Pages(input); @@ -104,8 +109,11 @@ public final class PartyBookControls implements AutoCloseable { } private List rootPages(UUID owner) { + return rootPages(parties.partyOf(owner)); + } + + private List rootPages(java.util.Optional party) { var pages = new ArrayList(); - var party = parties.partyOf(owner); Component summary = Component.text("Party\n\n"); if (party.isEmpty()) { pages.add(summary.append(Component.text("No party.\n\nVisit a Party\nRegistrar.\nCreate, join, or\nmanage one."))); diff --git a/src/main/java/games/dmg/fantasystick/party/PartyRoster.java b/src/main/java/games/dmg/fantasystick/party/PartyRoster.java index 5c25707..1572f72 100644 --- a/src/main/java/games/dmg/fantasystick/party/PartyRoster.java +++ b/src/main/java/games/dmg/fantasystick/party/PartyRoster.java @@ -20,6 +20,7 @@ public final class PartyRoster implements AutoCloseable { public int maximumSize(){int value=maximumSize.getAsInt();if(value<1)throw new IllegalStateException("Party maximum must be positive");return value;} public Optional create(UUID player){if(closed)return Optional.empty();if(durable!=null){if(!durable.ready())return Optional.empty();var character=character(player);if(character==null)return Optional.empty();var result=durable.create(character,"Party "+character.toString().substring(0,8)).join();return result.party().flatMap(this::project);}if(closed||!connected(player)||membership.containsKey(player))return Optional.empty();var party=new Party(UUID.randomUUID(),player,List.of(player));membership.put(player,party);return Optional.of(party);} public Optional partyOf(UUID player){if(durable!=null){if(!durable.ready())return Optional.empty();var character=character(player);return character==null?Optional.empty():durable.partyOf(character).flatMap(this::project);}return Optional.ofNullable(membership.get(player));} + public Optional partyOfCharacter(UUID character){if(durable!=null)return durable.ready()?durable.partyOf(character).flatMap(this::project):Optional.empty();return Optional.ofNullable(membership.get(character));} public Optional rewardMembership(UUID player){if(durable!=null){if(!durable.ready())return Optional.empty();var character=character(player);if(character==null)return Optional.empty();return durable.partyOf(character).map(party->new RewardMembership(party.id(),activePlayers(party)));}var party=membership.get(player);return party==null?Optional.empty():Optional.of(new RewardMembership(party.id(),party.members().stream().filter(this::connected).toList()));} public List invitationsFor(UUID player){if(durable!=null){if(!durable.ready())return List.of();var character=character(player);if(character==null)return List.of();return durable.invitationsFor(character).stream().map(value->new Invitation(value.id(),value.party(),new UUID(0,0),player,Instant.MAX)).toList();}expire();return invitations.values().stream().filter(i->i.invitee().equals(player)).sorted(Comparator.comparing(Invitation::expires).thenComparing(Invitation::id)).toList();} public Optional invite(UUID leader,UUID party,UUID invitee){if(closed)return Optional.empty();if(durable!=null){if(!durable.ready())return Optional.empty();var source=character(leader);var target=character(invitee);if(source==null||target==null)return Optional.empty();var result=durable.invite(source,party,target).join();return result.invitation().map(value->new Invitation(value.id(),value.party(),leader,invitee,Instant.MAX));}expire();var group=managedBy(leader,party);if(group==null||group.members().size()>=maximumSize()||!connected(invitee)||membership.containsKey(invitee))return Optional.empty();var existing=invitations.values().stream().filter(i->i.party().equals(party)&&i.invitee().equals(invitee)).findFirst();if(existing.isPresent())return existing;var invitation=new Invitation(UUID.randomUUID(),party,leader,invitee,clock.instant().plusSeconds(60));invitations.put(invitation.id(),invitation);return Optional.of(invitation);} diff --git a/src/main/java/games/dmg/fantasystick/persistence/CharacterStorage.java b/src/main/java/games/dmg/fantasystick/persistence/CharacterStorage.java index 4ea41b8..2ff0e2a 100644 --- a/src/main/java/games/dmg/fantasystick/persistence/CharacterStorage.java +++ b/src/main/java/games/dmg/fantasystick/persistence/CharacterStorage.java @@ -205,6 +205,23 @@ public final class CharacterStorage implements AutoCloseable { return new CraftCleanup(removed, retained); } + public record Catalog(List records, int unreadable) { + public Catalog { records = List.copyOf(records); } + public boolean complete() { return unreadable == 0; } + } + + public CompletableFuture catalog() { + return submit(() -> { + var catalog = repository.catalog(); + return new Catalog(catalog.records(), catalog.unreadable()); + }); + } + + /** Pure authoritative read for administration; unlike gameplay loading, this never performs legacy migration. */ + public CompletableFuture> inspect(UUID id) { + return submit(() -> repository.load(Objects.requireNonNull(id))); + } + public CompletableFuture> find(UUID id) { return submit(() -> load(id)); } diff --git a/src/main/java/games/dmg/fantasystick/persistence/YamlCharacterRepository.java b/src/main/java/games/dmg/fantasystick/persistence/YamlCharacterRepository.java index fcaeae9..fee52ca 100644 --- a/src/main/java/games/dmg/fantasystick/persistence/YamlCharacterRepository.java +++ b/src/main/java/games/dmg/fantasystick/persistence/YamlCharacterRepository.java @@ -12,7 +12,9 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -108,6 +110,41 @@ public final class YamlCharacterRepository { return removed[0]; } + public record Catalog(List records, int unreadable) { + public Catalog { records = List.copyOf(records); } + } + + /** Enumerate only canonical record files without following directory-entry symlinks. */ + public Catalog catalog() throws IOException { + if (Files.notExists(directory, LinkOption.NOFOLLOW_LINKS)) return new Catalog(List.of(), 0); + if (!Files.isDirectory(directory, LinkOption.NOFOLLOW_LINKS)) + throw new IOException("Character directory is unavailable"); + var records = new ArrayList(); + int unreadable = 0; + try (var entries = Files.newDirectoryStream(directory, "*.yml")) { + for (var entry : entries) { + String filename = entry.getFileName().toString(); + if (!filename.endsWith(".yml")) continue; + UUID id; + try { + String stem = filename.substring(0, filename.length() - 4); + id = UUID.fromString(stem); + if (!id.toString().equals(stem)) continue; + } catch (IllegalArgumentException invalid) { continue; } + if (!Files.isRegularFile(entry, LinkOption.NOFOLLOW_LINKS)) { + unreadable++; + continue; + } + try { + var record = load(id); + if (record.isPresent()) records.add(record.orElseThrow()); + else unreadable++; + } catch (IOException failure) { unreadable++; } + } + } + return new Catalog(records, unreadable); + } + public Optional load(UUID id) throws IOException { Path file = file(id); if (Files.notExists(file, LinkOption.NOFOLLOW_LINKS)) return Optional.empty(); diff --git a/src/main/java/games/dmg/fantasystick/session/EquipmentAdminCommand.java b/src/main/java/games/dmg/fantasystick/session/EquipmentAdminCommand.java index eb79f7c..d8f0747 100644 --- a/src/main/java/games/dmg/fantasystick/session/EquipmentAdminCommand.java +++ b/src/main/java/games/dmg/fantasystick/session/EquipmentAdminCommand.java @@ -20,6 +20,10 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { private final Server server; private final Consumer nextTick; private final Consumer diagnostics; + private final java.util.LinkedHashMap savedCharacterCatalog = new java.util.LinkedHashMap<>(); + private final java.util.concurrent.ConcurrentHashMap savedSearches = new java.util.concurrent.ConcurrentHashMap<>(); + private static final int SAVED_CATALOG_COMPLETION_LIMIT = 256; + private static final int SAVED_SEARCH_PAGE_SIZE = 8; private volatile boolean closed; private games.dmg.fantasystick.persistence.AdventureSettings settings; private games.dmg.fantasystick.persistence.FireballSettings fireballSettings; @@ -93,6 +97,7 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { private games.dmg.fantasystick.shop.FantasyArmorerController armorerController; private games.dmg.fantasystick.shop.ArmorMarket armorMarket; private games.dmg.fantasystick.book.CharacterBookController characterBooks; + private games.dmg.fantasystick.persistence.CharacterStorage characters; public EquipmentAdminCommand(EquipmentSessionStore receipts, EquipmentSessions sessions, Server server, Consumer nextTick, Consumer diagnostics) { @@ -380,9 +385,11 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { characterIssuer = Objects.requireNonNull(issuer); } - public void attachCharacterBooks(games.dmg.fantasystick.book.CharacterBookController books) { + public void attachCharacterBooks(games.dmg.fantasystick.book.CharacterBookController books, + games.dmg.fantasystick.persistence.CharacterStorage storage) { if (closed || characterBooks != null) throw new IllegalStateException("Character books already attached or command closed"); characterBooks = Objects.requireNonNull(books); + characters = Objects.requireNonNull(storage); } public void attachPartyRegistrars(games.dmg.fantasystick.party.PartyRegistrarDirectory directory, @@ -428,7 +435,7 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { adventureQuestCommands.giver(sender, args); return true; } if (args.length > 0 && args[0].equals("character")) { - characterView(sender, args); return true; + characterCommand(sender, args); return true; } if(dungeonCommands!=null&&args.length>0&&args[0].equals("dungeon")){dungeonCommands.execute(sender,args);return true;} if(args.length>0&&args[0].equals("shop")){shop(sender,args);return true;} @@ -535,10 +542,23 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { sender.sendMessage("Usage: /fstickadmin ..."); } - private void characterView(CommandSender sender, String[] args) { + private void characterCommand(CommandSender sender, String[] args) { + if (args.length >= 2 && args[1].equals("find")) { + characterFind(sender, args); + return; + } + if (args.length >= 2 && args[1].equals("show")) { + characterShow(sender, args); + return; + } + if (args.length == 3 && args[1].equals("view") + && !(sender instanceof org.bukkit.entity.Player)) { + sender.sendMessage("Character view requires an in-game administrator."); + return; + } if (characterBooks == null || !(sender instanceof org.bukkit.entity.Player administrator) || args.length != 3 || !args[1].equals("view") || args[2].isBlank()) { - sender.sendMessage("Usage: /fstickadmin character view (in-game administrator only)"); + sender.sendMessage("Usage: /fstickadmin character |show |view >"); return; } var matches = server.getOnlinePlayers().stream() @@ -552,6 +572,93 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { characterBooks.openReadOnly(administrator, matches.getFirst()); } + private void characterFind(CommandSender sender, String[] args) { + if (args.length < 3 || String.join(" ", java.util.Arrays.copyOfRange(args, 2, args.length)).isBlank()) { + sender.sendMessage("Usage: /fstickadmin character find "); + return; + } + String query = String.join(" ", java.util.Arrays.copyOfRange(args, 2, args.length)); + String folded = query.toLowerCase(java.util.Locale.ROOT); + Object ticket = new Object(); + Object requestKey = sender instanceof org.bukkit.entity.Player player + ? player.getUniqueId() : EquipmentAdminCommand.class; + savedSearches.put(requestKey, ticket); + characters.catalog().whenComplete((catalog, failure) -> { + if (closed || savedSearches.get(requestKey) != ticket) return; + try { nextTick.accept(() -> { + if (closed || !savedSearches.remove(requestKey, ticket) || !sender.hasPermission(PERMISSION) + || sender instanceof org.bukkit.entity.Player player && !player.isOnline()) return; + if (failure != null) { + sender.sendMessage("Saved character search failed; no records were changed."); + return; + } + rememberSavedCharacters(catalog.records()); + var matches = catalog.records().stream() + .filter(record -> record.name().toLowerCase(java.util.Locale.ROOT).contains(folded)) + .sorted(java.util.Comparator.comparing( + (games.dmg.fantasystick.persistence.CharacterRecord record) -> + record.name().toLowerCase(java.util.Locale.ROOT)) + .thenComparing(record -> record.id().toString())) + .toList(); + if (matches.isEmpty()) { + sender.sendMessage(catalog.complete() + ? "No saved characters match '" + query + "'." + : "No readable saved characters match '" + query + + "'; results are incomplete because " + catalog.unreadable() + " record(s) could not be examined."); + return; + } + int pages = (matches.size() + SAVED_SEARCH_PAGE_SIZE - 1) / SAVED_SEARCH_PAGE_SIZE; + for (int page = 0; page < pages; page++) { + sender.sendMessage("Saved character results " + (page + 1) + "/" + pages + + (catalog.complete() ? "" : " (incomplete: " + catalog.unreadable() + " unreadable)")); + int from = page * SAVED_SEARCH_PAGE_SIZE; + for (var record : matches.subList(from, Math.min(matches.size(), from + SAVED_SEARCH_PAGE_SIZE))) { + boolean active = sessions.activeCharacter(record.id()).filter(sessions::current).isPresent(); + var result = net.kyori.adventure.text.Component.text(record.name() + " — " + record.id() + + " — level " + record.level() + " — " + (record.dead() ? "dead" : "alive") + + " — " + (active ? "active" : "inactive")) + .clickEvent(net.kyori.adventure.text.event.ClickEvent.suggestCommand( + "/fstickadmin character show " + record.id())); + sender.sendMessage(result); + } + } + }); } catch (RuntimeException rejected) { + savedSearches.remove(requestKey, ticket); + report(null, "character-find-response", rejected); + } + }); + } + + private void characterShow(CommandSender sender, String[] args) { + if (characterBooks == null || !(sender instanceof org.bukkit.entity.Player administrator)) { + sender.sendMessage("Saved character books require an in-game administrator."); + return; + } + UUID character; + try { + if (args.length != 3) throw new IllegalArgumentException("Invalid shape"); + character = UUID.fromString(args[2]); + if (!character.toString().equals(args[2])) throw new IllegalArgumentException("Noncanonical UUID"); + } catch (IllegalArgumentException invalid) { + sender.sendMessage("Usage: /fstickadmin character show "); + return; + } + characterBooks.openSavedReadOnly(administrator, character); + } + + private synchronized void rememberSavedCharacters( + java.util.Collection records) { + for (var record : records.stream().sorted(java.util.Comparator.comparing(value -> value.id().toString())).toList()) { + savedCharacterCatalog.put(record.id(), record.name()); + while (savedCharacterCatalog.size() > SAVED_CATALOG_COMPLETION_LIMIT) + savedCharacterCatalog.remove(savedCharacterCatalog.keySet().iterator().next()); + } + } + + private synchronized java.util.Map savedCharacterSuggestions() { + return java.util.Map.copyOf(savedCharacterCatalog); + } + private void experience(CommandSender sender, String[] args) { if (experienceGrant == null || args.length < 4 || !args[1].equals("give")) { sender.sendMessage("Usage: /fstickadmin experience give "); return; @@ -1497,8 +1604,18 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { if (args.length == 1) return matching(sender instanceof org.bukkit.entity.Player ? List.of("adventure", "adventure-site", "character", "config", "dungeon", "experience", "give", "inspect", "party-registrar", "quest-giver", "recover", "revive", "shop", "training-dummy") : List.of("adventure-site", "config", "dungeon", "experience", "give", "inspect", "party-registrar", "quest-giver", "recover", "shop", "training-dummy"), args[0]); - if (args.length == 2 && args[0].equals("character") && sender instanceof org.bukkit.entity.Player) - return matching(List.of("view"), args[1]); + if (args.length == 2 && args[0].equals("character")) { + var routes = new java.util.ArrayList<>(List.of("find")); + if (sender instanceof org.bukkit.entity.Player) routes.addAll(List.of("show", "view")); + return matching(routes, args[1]); + } + if (args.length >= 3 && args[0].equals("character") && args[1].equals("find")) { + String prefix = String.join(" ", java.util.Arrays.copyOfRange(args, 2, args.length)); + return matchingIgnoreCase(savedCharacterSuggestions().values(), prefix); + } + if (args.length == 3 && args[0].equals("character") && args[1].equals("show") + && sender instanceof org.bukkit.entity.Player) + return matching(savedCharacterSuggestions().keySet().stream().map(UUID::toString).toList(), args[2]); if (args.length == 3 && args[0].equals("character") && args[1].equals("view") && sender instanceof org.bukkit.entity.Player) return matching(server.getOnlinePlayers().stream().filter(org.bukkit.entity.Player::isOnline) @@ -1697,5 +1814,12 @@ public final class EquipmentAdminCommand implements TabExecutor, AutoCloseable { private static List matching(java.util.Collection values, String prefix) { return values.stream().filter(value -> value.startsWith(prefix)).distinct().sorted().toList(); } - @Override public void close() { closed = true; if (characterIssuer != null) characterIssuer.close(); if(adminRevival!=null)adminRevival.close(); if(experienceGrant!=null)experienceGrant.close(); } + + private static List matchingIgnoreCase(java.util.Collection values, String prefix) { + String folded = prefix.toLowerCase(java.util.Locale.ROOT); + return values.stream().filter(value -> value.toLowerCase(java.util.Locale.ROOT).startsWith(folded)) + .distinct().sorted(java.util.Comparator.comparing((String value) -> value.toLowerCase(java.util.Locale.ROOT)) + .thenComparing(java.util.Comparator.naturalOrder())).toList(); + } + @Override public void close() { closed = true; savedSearches.clear(); if (characterIssuer != null) characterIssuer.close(); if(adminRevival!=null)adminRevival.close(); if(experienceGrant!=null)experienceGrant.close(); } } diff --git a/src/nativeTest/java/games/dmg/fantasystick/AdminCharacterBookNativeTest.java b/src/nativeTest/java/games/dmg/fantasystick/AdminCharacterBookNativeTest.java index 8b4b2e5..06e69c0 100644 --- a/src/nativeTest/java/games/dmg/fantasystick/AdminCharacterBookNativeTest.java +++ b/src/nativeTest/java/games/dmg/fantasystick/AdminCharacterBookNativeTest.java @@ -275,8 +275,8 @@ class AdminCharacterBookNativeTest { assertEquals(java.util.List.of("character", "config"), fixture.command.tabComplete(admin.player, "fantasystick", new String[]{"c"})); - assertEquals(java.util.List.of("view"), - fixture.command.tabComplete(admin.player, "fantasystick", new String[]{"character", ""})); + assertEquals(java.util.List.of("find", "show", "view"), + fixture.command.tabComplete(admin.player, "fstickadmin", new String[]{"character", ""})); assertEquals(java.util.List.of("ActiveTarget"), fixture.command.tabComplete(admin.player, "fantasystick", new String[]{"character", "view", ""})); assertEquals(java.util.List.of("ActiveTarget"), @@ -293,8 +293,8 @@ class AdminCharacterBookNativeTest { admin.allowed = true; var console = new EquipmentAdminCommandNativeTest.Sender(); - assertTrue(fixture.command.tabComplete(console.port, "fantasystick", - new String[]{"character", ""}).isEmpty()); + assertEquals(java.util.List.of("find"), fixture.command.tabComplete(console.port, "fstickadmin", + new String[]{"character", ""})); fixture.command.execute(console.port, "fantasystick", new String[]{"character", "view", "ActiveTarget"}); assertTrue(console.messages.getLast().contains("in-game administrator")); diff --git a/src/nativeTest/java/games/dmg/fantasystick/DefeatHealthDeliveryNativeTest.java b/src/nativeTest/java/games/dmg/fantasystick/DefeatHealthDeliveryNativeTest.java index 901cfbd..0ef7204 100644 --- a/src/nativeTest/java/games/dmg/fantasystick/DefeatHealthDeliveryNativeTest.java +++ b/src/nativeTest/java/games/dmg/fantasystick/DefeatHealthDeliveryNativeTest.java @@ -34,6 +34,7 @@ class DefeatHealthDeliveryNativeTest { if (a.nativePlayer.queuedHealthUpdatePacket != null) sent.add(a.nativePlayer.queuedHealthUpdatePacket); a.nativePlayer.queueHealthUpdatePacket = false; PartyLifecycleNativeTest.directory(f).defeat(java.util.UUID.randomUUID()).join(); + f.awaitCharacterAndReceipt(a); PartyBookNativeTest.drain(f); assertTrue(death.isCancelled()); assertEquals(a.maximumHealth.getValue(), a.player.getHealth()); diff --git a/src/nativeTest/java/games/dmg/fantasystick/SavedCharacterAdminNativeTest.java b/src/nativeTest/java/games/dmg/fantasystick/SavedCharacterAdminNativeTest.java new file mode 100644 index 0000000..6e66380 --- /dev/null +++ b/src/nativeTest/java/games/dmg/fantasystick/SavedCharacterAdminNativeTest.java @@ -0,0 +1,208 @@ +package games.dmg.fantasystick; + +import static org.junit.jupiter.api.Assertions.*; + +import java.nio.file.Path; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import net.minecraft.network.chat.Component; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** Registered saved-character lookup and exact-UUID read-only inspection. */ +class SavedCharacterAdminNativeTest { + @TempDir Path data; + + @BeforeAll static void bootstrap() throws Exception { NativeRuntime.bootstrap(); } + + @Test void findsInactiveSavedCharactersThenShowsExactSavedStateWithoutMutation() throws Exception { + try (var fixture = new FantasyStickLifecycleNativeTest.Fixture(data)) { + fixture.plugin.setEnabled(true); + var administrator = new FantasyStickLifecycleNativeTest.Actor(data); + administrator.accountName = "Admin"; + fixture.players.put(administrator.core.id, administrator.player); + var first = new FantasyStickLifecycleNativeTest.Actor(data); + var second = new FantasyStickLifecycleNativeTest.Actor(data); + var storage = characters(fixture); + var renamedFirst = storage.renameCharacter(first.core.record.id(), "Écho Scout").get(5, TimeUnit.SECONDS).orElseThrow(); + storage.renameCharacter(second.core.record.id(), "Echo Keeper").get(5, TimeUnit.SECONDS).orElseThrow(); + byte[] before = java.nio.file.Files.readAllBytes(data.resolve("characters").resolve(renamedFirst.id() + ".yml")); + + assertTrue(fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "find", "echo"})); + drain(fixture); + assertTrue(administrator.messages.stream().anyMatch(message -> message.contains("Echo Keeper"))); + assertFalse(administrator.messages.stream().anyMatch(message -> message.contains("Écho Scout")), + "Literal case-insensitive matching does not strip accents"); + assertTrue(administrator.messages.stream().anyMatch(message -> message.contains(second.core.record.id().toString()))); + assertEquals(java.util.List.of("Echo Keeper"), fixture.adminCommand.tabComplete(administrator.player, + "fstickadmin", new String[]{"character", "find", "ech"})); + assertEquals(java.util.List.of(second.core.record.id().toString()), fixture.adminCommand.tabComplete( + administrator.player, "fstickadmin", new String[]{"character", "show", + second.core.record.id().toString().substring(0, 8)})); + + administrator.messages.clear(); + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "find", "Écho"}); + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "find", "Keeper"}); + drain(fixture); + assertFalse(administrator.messages.stream().anyMatch(message -> message.contains("Écho Scout")), + "A superseded asynchronous search must not publish stale results"); + assertTrue(administrator.messages.stream().anyMatch(message -> message.contains("Echo Keeper"))); + + administrator.messages.clear(); + assertTrue(fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", renamedFirst.id().toString()})); + drain(fixture); + assertEquals(1, administrator.books.size()); + String text = pages(administrator).stream().map(Component::getString) + .collect(java.util.stream.Collectors.joining("\n")); + assertTrue(text.contains("Saved state"), text); + assertTrue(text.contains("Inactive"), text); + String unwrapped = text.replace("\n", ""); + assertTrue(unwrapped.contains("Saved health: 10/10"), text); + assertTrue(unwrapped.contains(renamedFirst.id().toString()), text); + assertTrue(text.contains("Écho Scout"), text); + assertArrayEquals(before, java.nio.file.Files.readAllBytes( + data.resolve("characters").resolve(renamedFirst.id() + ".yml"))); + } + } + + @Test void savedViewUsesSavedRatherThanLiveHealthAndRevalidatesPermissionAndLatestRequest() throws Exception { + try (var fixture = new FantasyStickLifecycleNativeTest.Fixture(data)) { + fixture.plugin.setEnabled(true); + var administrator = new FantasyStickLifecycleNativeTest.Actor(data); + var first = new FantasyStickLifecycleNativeTest.Actor(data); + var second = new FantasyStickLifecycleNativeTest.Actor(data); + administrator.accountName = "Admin"; + fixture.players.put(administrator.core.id, administrator.player); + fixture.players.put(first.core.id, first.player); + fixture.players.put(second.core.id, second.player); + fixture.activate(first); + first.core.health = 3; + + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", first.core.record.id().toString()}); + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", second.core.record.id().toString()}); + drain(fixture); + assertEquals(1, administrator.books.size(), "Only the latest saved-state request may open"); + String latest = pages(administrator).stream().map(Component::getString) + .collect(java.util.stream.Collectors.joining("\n")).replace("\n", ""); + assertTrue(latest.contains(second.core.record.id().toString())); + assertTrue(latest.contains("Inactive")); + + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", first.core.record.id().toString()}); + characters(fixture).find(UUID.randomUUID()).get(5, TimeUnit.SECONDS); + var response = fixture.tasks.poll(); + assertNotNull(response); + administrator.allowed = false; + response.run(); + assertEquals(1, administrator.books.size()); + assertTrue(administrator.messages.getLast().contains("permission changed")); + administrator.allowed = true; + + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", first.core.record.id().toString()}); + drain(fixture); + String active = pages(administrator).stream().map(Component::getString) + .collect(java.util.stream.Collectors.joining("\n")).replace("\n", ""); + assertTrue(active.contains("Active")); + assertTrue(active.contains("Saved health: 10/10"), active); + assertFalse(active.contains("Saved health: 3/10"), active); + } + } + + @Test void searchPaginatesDuplicateNamesReportsUnreadableRecordsAndSupportsConsole() throws Exception { + try (var fixture = new FantasyStickLifecycleNativeTest.Fixture(data)) { + fixture.plugin.setEnabled(true); + var administrator = new FantasyStickLifecycleNativeTest.Actor(data); + administrator.accountName = "Admin"; + fixture.players.put(administrator.core.id, administrator.player); + var storage = characters(fixture); + var records = new java.util.ArrayList(); + for (int index = 0; index < 10; index++) { + var actor = new FantasyStickLifecycleNativeTest.Actor(data); + records.add(storage.renameCharacter(actor.core.record.id(), "Shared Name") + .get(5, TimeUnit.SECONDS).orElseThrow()); + if (index == 0) { + actor.core.inventory.setItemInOffHand(new games.dmg.fantasystick.items.CharacterSheets() + .create(records.getLast())); + fixture.players.put(actor.core.id, actor.player); + fixture.activate(actor); + } + } + var dead = storage.recordDeath(records.get(1).id()).get(5, TimeUnit.SECONDS).orElseThrow(); + UUID corrupt = UUID.randomUUID(); + java.nio.file.Files.writeString(data.resolve("characters").resolve(corrupt + ".yml"), + "schema-version: malformed\n"); + + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "find", "shared name"}); + drain(fixture); + assertTrue(administrator.messages.contains("Saved character results 1/2 (incomplete: 1 unreadable)")); + assertTrue(administrator.messages.contains("Saved character results 2/2 (incomplete: 1 unreadable)")); + assertEquals(10, administrator.messages.stream().filter(message -> message.contains("Shared Name — ")).count()); + assertTrue(administrator.messages.stream().anyMatch(message -> message.contains(" — active"))); + assertTrue(administrator.messages.stream().anyMatch(message -> message.contains(dead.id().toString()) + && message.contains(" — dead — inactive"))); + assertEquals(10, administrator.messageComponents.stream() + .filter(component -> component.clickEvent() != null && component.clickEvent().action() + == net.kyori.adventure.text.event.ClickEvent.Action.SUGGEST_COMMAND) + .count()); + + var console = new EquipmentAdminCommandNativeTest.Sender(); + fixture.adminCommand.execute(console.port, "fstickadmin", + new String[]{"character", "find", "Shared"}); + drain(fixture); + assertTrue(console.messages.stream().anyMatch(message -> message.contains("Saved character results 1/2"))); + fixture.adminCommand.execute(console.port, "fstickadmin", + new String[]{"character", "show", records.getFirst().id().toString()}); + assertTrue(console.messages.getLast().contains("in-game administrator")); + + int opened = administrator.books.size(); + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", dead.id().toString()}); + drain(fixture); + assertEquals(opened + 1, administrator.books.size()); + String deadText = pages(administrator).stream().map(Component::getString) + .collect(java.util.stream.Collectors.joining("\n")).replace("\n", ""); + assertTrue(deadText.contains("Dead")); + assertTrue(deadText.contains(dead.deathId().toString())); + assertTrue(deadText.contains(dead.diedAt().toString())); + + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", corrupt.toString()}); + drain(fixture); + assertEquals(opened + 1, administrator.books.size()); + assertTrue(administrator.messages.getLast().contains("could not be loaded")); + fixture.adminCommand.execute(administrator.player, "fstickadmin", + new String[]{"character", "show", UUID.randomUUID().toString()}); + drain(fixture); + assertEquals(opened + 1, administrator.books.size()); + assertTrue(administrator.messages.getLast().contains("not found")); + } + } + + private static games.dmg.fantasystick.persistence.CharacterStorage characters( + FantasyStickLifecycleNativeTest.Fixture fixture) { + return (games.dmg.fantasystick.persistence.CharacterStorage) + FantasyStickLifecycleNativeTest.Fixture.field(fixture.plugin, "characters"); + } + + private static void drain(FantasyStickLifecycleNativeTest.Fixture fixture) throws Exception { + characters(fixture).find(UUID.randomUUID()).get(5, TimeUnit.SECONDS); + Runnable callback; + while ((callback = fixture.tasks.poll()) != null) callback.run(); + } + + private static java.util.List pages(FantasyStickLifecycleNativeTest.Actor actor) { + var content = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(actor.books.getLast()) + .get(net.minecraft.core.component.DataComponents.WRITTEN_BOOK_CONTENT); + assertNotNull(content); + return content.pages().stream().map(page -> page.raw()).toList(); + } +} diff --git a/src/test/java/games/dmg/fantasystick/persistence/YamlCharacterRepositoryTest.java b/src/test/java/games/dmg/fantasystick/persistence/YamlCharacterRepositoryTest.java index 61c84d2..e97dedb 100644 --- a/src/test/java/games/dmg/fantasystick/persistence/YamlCharacterRepositoryTest.java +++ b/src/test/java/games/dmg/fantasystick/persistence/YamlCharacterRepositoryTest.java @@ -98,6 +98,28 @@ class YamlCharacterRepositoryTest { assertEquals(Map.of(), CharacterYaml.decode(legacy).restrictedKills()); } + @Test + void catalogReadsOnlyCanonicalRegularRecordsAndReportsUnreadableEntries() throws Exception { + var repository = new YamlCharacterRepository(data); + var first = sample(UUID.randomUUID()); + var second = sample(UUID.randomUUID()); + repository.create(first); repository.create(second); + var directory = data.resolve("characters"); + Files.writeString(directory.resolve(UUID.randomUUID() + ".yml"), "schema-version: malformed\n"); + Files.writeString(directory.resolve("not-a-uuid.yml"), "ignored"); + var outside = data.resolve("outside-character.yml"); + Files.writeString(outside, CharacterYaml.encode(sample(UUID.randomUUID()))); + var link = directory.resolve(UUID.randomUUID() + ".yml"); + Files.createSymbolicLink(link, outside); + + var catalog = repository.catalog(); + assertEquals(Set.of(first.id(), second.id()), catalog.records().stream() + .map(CharacterRecord::id).collect(java.util.stream.Collectors.toSet())); + assertEquals(2, catalog.unreadable()); + assertTrue(Files.isSymbolicLink(link)); + assertEquals(CharacterYaml.encode(CharacterYaml.decode(Files.readString(outside))), Files.readString(outside)); + } + @Test void repeatedCreationAndAbandonmentDoNotAccumulatePerCharacterCoordinationFiles() throws Exception { var repository = new YamlCharacterRepository(data);