invalidate asset cache on metadata changes and refresh asset details

This commit is contained in:
2026-03-24 13:42:51 +00:00
parent a7710be847
commit d773e8684b
8 changed files with 182 additions and 11 deletions
@@ -39,7 +39,7 @@ final class FileSystemPackerCacheRepositoryTest {
final var state = new PackerWorkspaceCacheState(
PackerWorkspaceCacheState.CURRENT_SCHEMA_VERSION,
List.of(
new PackerAssetCacheEntry(3, List.of(
new PackerAssetCacheEntry(3, "contract-3", List.of(
new PackerFileCacheEntry(
"tiles/ui.png",
"image/png",
@@ -54,7 +54,7 @@ final class FileSystemPackerCacheRepositoryTest {
84L,
"def456",
Map.of()))),
new PackerAssetCacheEntry(1, List.of(
new PackerAssetCacheEntry(1, "contract-1", List.of(
new PackerFileCacheEntry(
"audio/click.wav",
"audio/wav",
@@ -67,6 +67,7 @@ final class FileSystemPackerCacheRepositoryTest {
final var loaded = repository.load(project);
assertEquals(List.of(1, 3), loaded.assets().stream().map(PackerAssetCacheEntry::assetId).toList());
assertEquals("contract-3", loaded.findAsset(3).orElseThrow().contractFingerprint());
assertTrue(loaded.findAsset(3).flatMap(asset -> asset.findFile("tiles/ui.png")).isPresent());
assertEquals(128L, loaded.findAsset(3).orElseThrow().findFile("tiles/ui.png").orElseThrow().size());
}
@@ -105,8 +106,8 @@ final class FileSystemPackerCacheRepositoryTest {
final var state = new PackerWorkspaceCacheState(
PackerWorkspaceCacheState.CURRENT_SCHEMA_VERSION,
List.of(
new PackerAssetCacheEntry(7, List.of()),
new PackerAssetCacheEntry(9, List.of())));
new PackerAssetCacheEntry(7, "contract-7", List.of()),
new PackerAssetCacheEntry(9, "contract-9", List.of())));
assertTrue(state.findAsset(7).isPresent());
assertTrue(state.findAsset(8).isEmpty());
@@ -118,7 +119,7 @@ final class FileSystemPackerCacheRepositoryTest {
final var project = project(tempDir.resolve("project"));
final var state = new PackerWorkspaceCacheState(
PackerWorkspaceCacheState.CURRENT_SCHEMA_VERSION,
List.of(new PackerAssetCacheEntry(1, List.of(
List.of(new PackerAssetCacheEntry(1, "contract-1", List.of(
new PackerFileCacheEntry(
"tiles/ui.png",
"image/png",
@@ -133,6 +134,7 @@ final class FileSystemPackerCacheRepositoryTest {
assertFalse(json.contains("diagnostic"));
assertFalse(json.contains("diagnostics"));
assertTrue(json.contains("\"asset_id\""));
assertTrue(json.contains("\"contract_fingerprint\""));
assertTrue(json.contains("\"metadata\""));
}
@@ -28,7 +28,7 @@ final class PackerAbstractBankWalkerTest {
final var assetRoot = Files.createDirectories(tempDir.resolve("asset"));
final var filePath = writeText(assetRoot.resolve("entry.txt"), "hello world");
final long lastModified = Files.getLastModifiedTime(filePath).toMillis();
final var priorCache = new PackerAssetCacheEntry(1, List.of(
final var priorCache = new PackerAssetCacheEntry(1, "contract", List.of(
new PackerFileCacheEntry("entry.txt", "text/plain", 1L, lastModified, "cached", Map.of("source", "cache"))));
final var result = walker.walk(assetRoot, "requirements", java.util.Optional.of(priorCache));
@@ -44,7 +44,7 @@ final class PackerAbstractBankWalkerTest {
final var assetRoot = Files.createDirectories(tempDir.resolve("asset"));
final var filePath = writeText(assetRoot.resolve("entry.txt"), "hello world");
final long currentLastModified = Files.getLastModifiedTime(filePath).toMillis();
final var priorCache = new PackerAssetCacheEntry(1, List.of(
final var priorCache = new PackerAssetCacheEntry(1, "contract", List.of(
new PackerFileCacheEntry(
"entry.txt",
"text/plain",
@@ -67,7 +67,7 @@ final class PackerAbstractBankWalkerTest {
final var filePath = writeText(assetRoot.resolve("entry.txt"), "hello world");
final long lastModified = Files.getLastModifiedTime(filePath).toMillis();
final String fingerprint = sha256(Files.readAllBytes(filePath));
final var priorCache = new PackerAssetCacheEntry(1, List.of(
final var priorCache = new PackerAssetCacheEntry(1, "contract", List.of(
new PackerFileCacheEntry(
"entry.txt",
"text/plain",
@@ -89,7 +89,7 @@ final class PackerAbstractBankWalkerTest {
final var assetRoot = Files.createDirectories(tempDir.resolve("asset"));
final var filePath = writeText(assetRoot.resolve("entry.txt"), "hello world");
final long lastModified = Files.getLastModifiedTime(filePath).toMillis();
final var priorCache = new PackerAssetCacheEntry(1, List.of(
final var priorCache = new PackerAssetCacheEntry(1, "contract", List.of(
new PackerFileCacheEntry(
"entry.txt",
"text/plain",
@@ -0,0 +1,104 @@
package p.packer.repositories;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.models.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
final class PackerRuntimeAssetMaterializerTest {
private static final ObjectMapper MAPPER = new ObjectMapper();
@TempDir
Path tempDir;
@Test
void reusesPriorAssetCacheOnlyWhenContractFingerprintMatches() throws Exception {
final var walker = new TrackingWalker();
final var materializer = new PackerRuntimeAssetMaterializer(walker);
final Path assetRoot = Files.createDirectories(tempDir.resolve("asset"));
final Path manifestPath = assetRoot.resolve("asset.json");
Files.writeString(manifestPath, "{}");
final PackerAssetDeclaration declaration = declaration(Map.of("tile_size", "32x32"));
final PackerAssetDeclarationParseResult parseResult = new PackerAssetDeclarationParseResult(declaration, List.of());
final String fingerprint = PackerContractFingerprint.metadataFingerprint(declaration.outputMetadata());
final Optional<PackerAssetCacheEntry> priorAssetCache = Optional.of(new PackerAssetCacheEntry(1, fingerprint, List.of()));
materializer.materialize(
assetRoot,
manifestPath,
Optional.of(new PackerRegistryEntry(1, "uuid", "asset", true)),
parseResult,
priorAssetCache);
assertTrue(walker.lastPriorAssetCache().isPresent());
}
@Test
void invalidatesPriorAssetCacheWhenContractFingerprintChanges() throws Exception {
final var walker = new TrackingWalker();
final var materializer = new PackerRuntimeAssetMaterializer(walker);
final Path assetRoot = Files.createDirectories(tempDir.resolve("asset"));
final Path manifestPath = assetRoot.resolve("asset.json");
Files.writeString(manifestPath, "{}");
materializer.materialize(
assetRoot,
manifestPath,
Optional.of(new PackerRegistryEntry(1, "uuid", "asset", true)),
new PackerAssetDeclarationParseResult(declaration(Map.of("tile_size", "32x32")), List.of()),
Optional.of(new PackerAssetCacheEntry(
1,
PackerContractFingerprint.metadataFingerprint(Map.of("tile_size", "16x16")),
List.of())));
assertTrue(walker.lastPriorAssetCache().isEmpty());
}
private static PackerAssetDeclaration declaration(Map<String, String> metadata) {
return new PackerAssetDeclaration(
1,
"uuid",
"asset",
AssetFamilyCatalog.TILE_BANK,
Map.of(),
List.of(),
OutputFormatCatalog.TILES_INDEXED_V1,
OutputCodecCatalog.NONE,
metadata,
true);
}
private static final class TrackingWalker extends PackerAssetWalker {
private Optional<PackerAssetCacheEntry> lastPriorAssetCache = Optional.empty();
private TrackingWalker() {
super(MAPPER);
}
@Override
public PackerWalkResult walk(
Path assetRoot,
PackerAssetDeclaration declaration,
Optional<PackerAssetCacheEntry> priorAssetCache) {
lastPriorAssetCache = Objects.requireNonNull(priorAssetCache, "priorAssetCache");
return PackerWalkResult.EMPTY;
}
private Optional<PackerAssetCacheEntry> lastPriorAssetCache() {
return lastPriorAssetCache;
}
}
}