implements packer PR-09 event lane and studio adapter
This commit is contained in:
@@ -6,6 +6,10 @@ import p.packer.api.building.PackerBuildRequest;
|
||||
import p.packer.api.building.PackerBuildResult;
|
||||
import p.packer.api.building.PackerBuildService;
|
||||
import p.packer.api.diagnostics.PackerDiagnostic;
|
||||
import p.packer.api.events.PackerEventKind;
|
||||
import p.packer.api.events.PackerEventSink;
|
||||
import p.packer.api.events.PackerProgress;
|
||||
import p.packer.events.PackerOperationEventEmitter;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
@@ -27,13 +31,19 @@ public final class FileSystemPackerBuildService implements PackerBuildService {
|
||||
private static final int PRELUDE_SIZE = 24;
|
||||
|
||||
private final PackerBuildPlanner buildPlanner;
|
||||
private final PackerEventSink eventSink;
|
||||
|
||||
public FileSystemPackerBuildService() {
|
||||
this(new PackerBuildPlanner());
|
||||
this(new PackerBuildPlanner(), PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerBuildService(PackerBuildPlanner buildPlanner) {
|
||||
this(buildPlanner, PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerBuildService(PackerBuildPlanner buildPlanner, PackerEventSink eventSink) {
|
||||
this.buildPlanner = Objects.requireNonNull(buildPlanner, "buildPlanner");
|
||||
this.eventSink = Objects.requireNonNull(eventSink, "eventSink");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -43,14 +53,17 @@ public final class FileSystemPackerBuildService implements PackerBuildService {
|
||||
|
||||
@Override
|
||||
public PackerBuildResult build(PackerBuildRequest request) {
|
||||
final Path buildDirectory = Objects.requireNonNull(request, "request").project().rootPath().resolve("build");
|
||||
final PackerBuildRequest buildRequest = Objects.requireNonNull(request, "request");
|
||||
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(buildRequest.project(), eventSink);
|
||||
final Path buildDirectory = buildRequest.project().rootPath().resolve("build");
|
||||
final Path assetsArchive = buildDirectory.resolve("assets.pa").toAbsolutePath().normalize();
|
||||
final Path assetTableJson = buildDirectory.resolve("asset_table.json").toAbsolutePath().normalize();
|
||||
final Path preloadJson = buildDirectory.resolve("preload.json").toAbsolutePath().normalize();
|
||||
final Path metadataJson = buildDirectory.resolve("asset_table_metadata.json").toAbsolutePath().normalize();
|
||||
|
||||
final PackerBuildPlanResult planResult = buildPlanner.plan(request.project());
|
||||
events.emit(PackerEventKind.BUILD_STARTED, "Build started.", new PackerProgress(0.0d, false), List.of());
|
||||
final PackerBuildPlanResult planResult = buildPlanner.plan(buildRequest.project());
|
||||
if (planResult.plan() == null) {
|
||||
events.emit(PackerEventKind.BUILD_FINISHED, planResult.summary(), new PackerProgress(1.0d, false), List.of());
|
||||
return new PackerBuildResult(
|
||||
PackerOperationStatus.FAILED,
|
||||
planResult.summary(),
|
||||
@@ -61,11 +74,18 @@ public final class FileSystemPackerBuildService implements PackerBuildService {
|
||||
|
||||
try {
|
||||
Files.createDirectories(buildDirectory);
|
||||
final String previousCacheKey = loadPreviousCacheKey(metadataJson);
|
||||
events.emit(
|
||||
previousCacheKey != null && previousCacheKey.equals(planResult.plan().cacheKey()) ? PackerEventKind.CACHE_HIT : PackerEventKind.CACHE_MISS,
|
||||
previousCacheKey != null && previousCacheKey.equals(planResult.plan().cacheKey()) ? "Build cache hit." : "Build cache miss.",
|
||||
List.of());
|
||||
final EmittedArchive archive = emitArchive(planResult.plan());
|
||||
events.emit(PackerEventKind.PROGRESS_UPDATED, "Build archive prepared.", new PackerProgress(0.5d, false), List.of());
|
||||
Files.write(assetsArchive, archive.bytes());
|
||||
Files.writeString(assetTableJson, archive.assetTableJson(), StandardCharsets.UTF_8);
|
||||
Files.writeString(preloadJson, archive.preloadJson(), StandardCharsets.UTF_8);
|
||||
Files.writeString(metadataJson, archive.metadataJson(), StandardCharsets.UTF_8);
|
||||
events.emit(PackerEventKind.BUILD_FINISHED, "Build finished.", new PackerProgress(1.0d, false), List.of());
|
||||
return new PackerBuildResult(
|
||||
planResult.status(),
|
||||
"Build emitted " + planResult.plan().assets().size() + " assets.",
|
||||
@@ -149,6 +169,20 @@ public final class FileSystemPackerBuildService implements PackerBuildService {
|
||||
return new EmittedArchive(archiveBytes, assetTableJson, preloadJson, metadataJson);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private String loadPreviousCacheKey(Path metadataJson) {
|
||||
if (!Files.isRegularFile(metadataJson)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return ((Map<String, Object>) new com.fasterxml.jackson.databind.ObjectMapper().readValue(Files.readString(metadataJson), Map.class))
|
||||
.getOrDefault("cache_key", "")
|
||||
.toString();
|
||||
} catch (IOException exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private record EmittedArchive(
|
||||
byte[] bytes,
|
||||
String assetTableJson,
|
||||
|
||||
@@ -11,9 +11,13 @@ import p.packer.api.doctor.PackerDoctorMode;
|
||||
import p.packer.api.doctor.PackerDoctorRequest;
|
||||
import p.packer.api.doctor.PackerDoctorResult;
|
||||
import p.packer.api.doctor.PackerDoctorService;
|
||||
import p.packer.api.events.PackerEventKind;
|
||||
import p.packer.api.events.PackerEventSink;
|
||||
import p.packer.api.events.PackerProgress;
|
||||
import p.packer.api.workspace.GetAssetDetailsRequest;
|
||||
import p.packer.api.workspace.ListAssetsRequest;
|
||||
import p.packer.declarations.PackerAssetDetailsService;
|
||||
import p.packer.events.PackerOperationEventEmitter;
|
||||
import p.packer.workspace.FileSystemPackerWorkspaceService;
|
||||
|
||||
import java.nio.file.Files;
|
||||
@@ -27,16 +31,25 @@ import java.util.Set;
|
||||
public final class FileSystemPackerDoctorService implements PackerDoctorService {
|
||||
private final FileSystemPackerWorkspaceService workspaceService;
|
||||
private final PackerAssetDetailsService detailsService;
|
||||
private final PackerEventSink eventSink;
|
||||
|
||||
public FileSystemPackerDoctorService() {
|
||||
this(new FileSystemPackerWorkspaceService(), new PackerAssetDetailsService());
|
||||
this(new FileSystemPackerWorkspaceService(), new PackerAssetDetailsService(), PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerDoctorService(
|
||||
FileSystemPackerWorkspaceService workspaceService,
|
||||
PackerAssetDetailsService detailsService) {
|
||||
this(workspaceService, detailsService, PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerDoctorService(
|
||||
FileSystemPackerWorkspaceService workspaceService,
|
||||
PackerAssetDetailsService detailsService,
|
||||
PackerEventSink eventSink) {
|
||||
this.workspaceService = Objects.requireNonNull(workspaceService, "workspaceService");
|
||||
this.detailsService = Objects.requireNonNull(detailsService, "detailsService");
|
||||
this.eventSink = Objects.requireNonNull(eventSink, "eventSink");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -48,6 +61,7 @@ public final class FileSystemPackerDoctorService implements PackerDoctorService
|
||||
public PackerDoctorResult doctor(PackerDoctorRequest request) {
|
||||
final PackerDoctorRequest doctorRequest = Objects.requireNonNull(request, "request");
|
||||
final PackerProjectContext project = doctorRequest.project();
|
||||
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(project, eventSink);
|
||||
final var snapshot = workspaceService.listAssets(new ListAssetsRequest(project));
|
||||
final List<PackerDiagnostic> diagnostics = new ArrayList<>();
|
||||
final Set<String> safeFixes = new LinkedHashSet<>();
|
||||
@@ -57,10 +71,13 @@ public final class FileSystemPackerDoctorService implements PackerDoctorService
|
||||
addDiagnostic(diagnostics, seenDiagnostics, diagnostic);
|
||||
}
|
||||
|
||||
final int totalAssets = snapshot.assets().size();
|
||||
int inspected = 0;
|
||||
for (var asset : snapshot.assets()) {
|
||||
if (!includeAsset(doctorRequest.mode(), asset.state())) {
|
||||
continue;
|
||||
}
|
||||
inspected += 1;
|
||||
final String assetReference = asset.identity().assetId() == null
|
||||
? relativeAssetRoot(project, asset.identity().assetRoot())
|
||||
: Integer.toString(asset.identity().assetId());
|
||||
@@ -102,6 +119,11 @@ public final class FileSystemPackerDoctorService implements PackerDoctorService
|
||||
input,
|
||||
managed));
|
||||
}));
|
||||
events.emit(
|
||||
PackerEventKind.PROGRESS_UPDATED,
|
||||
"Doctor inspected asset: " + asset.identity().assetName(),
|
||||
new PackerProgress(totalAssets == 0 ? 1.0d : inspected / (double) totalAssets, false),
|
||||
List.of(asset.identity().assetName()));
|
||||
}
|
||||
|
||||
final long blockingCount = diagnostics.stream().filter(PackerDiagnostic::blocking).count();
|
||||
@@ -113,6 +135,7 @@ public final class FileSystemPackerDoctorService implements PackerDoctorService
|
||||
: diagnostics.isEmpty()
|
||||
? "Doctor found no diagnostics."
|
||||
: "Doctor found " + diagnostics.size() + " diagnostics with no blockers.";
|
||||
events.emit(PackerEventKind.DIAGNOSTICS_UPDATED, summary, List.of());
|
||||
return new PackerDoctorResult(status, summary, diagnostics, List.copyOf(safeFixes));
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
package p.packer.events;
|
||||
|
||||
import p.packer.api.PackerProjectContext;
|
||||
import p.packer.api.events.PackerEvent;
|
||||
import p.packer.api.events.PackerEventKind;
|
||||
import p.packer.api.events.PackerEventSink;
|
||||
import p.packer.api.events.PackerProgress;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
|
||||
public final class PackerOperationEventEmitter {
|
||||
private final PackerProjectContext project;
|
||||
private final PackerEventSink sink;
|
||||
private final String operationId;
|
||||
private long sequence;
|
||||
|
||||
public PackerOperationEventEmitter(PackerProjectContext project, PackerEventSink sink) {
|
||||
this(project, sink, UUID.randomUUID().toString());
|
||||
}
|
||||
|
||||
public PackerOperationEventEmitter(PackerProjectContext project, PackerEventSink sink, String operationId) {
|
||||
this.project = Objects.requireNonNull(project, "project");
|
||||
this.sink = Objects.requireNonNull(sink, "sink");
|
||||
this.operationId = Objects.requireNonNull(operationId, "operationId").trim();
|
||||
}
|
||||
|
||||
public String operationId() {
|
||||
return operationId;
|
||||
}
|
||||
|
||||
public void emit(PackerEventKind kind, String summary, List<String> affectedAssets) {
|
||||
emit(kind, summary, null, affectedAssets);
|
||||
}
|
||||
|
||||
public void emit(PackerEventKind kind, String summary, PackerProgress progress, List<String> affectedAssets) {
|
||||
sink.publish(new PackerEvent(
|
||||
project.projectId(),
|
||||
operationId,
|
||||
sequence++,
|
||||
Objects.requireNonNull(kind, "kind"),
|
||||
Instant.now(),
|
||||
Objects.requireNonNull(summary, "summary"),
|
||||
progress,
|
||||
affectedAssets == null ? List.of() : List.copyOf(affectedAssets)));
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -81,10 +81,11 @@ public final class FileSystemPackerMutationService implements PackerMutationServ
|
||||
throw new PackerMutationException("Cannot apply mutation preview with blockers");
|
||||
}
|
||||
final PackerMutationResult result = writeCoordinator.withWriteLock(project, () -> applyLocked(preview));
|
||||
emit(project, result.operationId(), 1L, PackerEventKind.ACTION_APPLIED, result.summary(), affectedAssets(preview));
|
||||
emit(project, result.operationId(), 1L, PackerEventKind.ASSET_CHANGED, "Asset state changed.", affectedAssets(preview));
|
||||
emit(project, result.operationId(), 2L, PackerEventKind.ACTION_APPLIED, result.summary(), affectedAssets(preview));
|
||||
return result;
|
||||
} catch (RuntimeException exception) {
|
||||
emit(project, preview.operationId(), 1L, PackerEventKind.ACTION_FAILED, rootCauseMessage(exception), affectedAssets(preview));
|
||||
emit(project, preview.operationId(), 2L, PackerEventKind.ACTION_FAILED, rootCauseMessage(exception), affectedAssets(preview));
|
||||
throw exception;
|
||||
}
|
||||
}
|
||||
|
||||
+30
-4
@@ -9,6 +9,9 @@ import p.packer.api.assets.PackerAssetSummary;
|
||||
import p.packer.api.diagnostics.PackerDiagnostic;
|
||||
import p.packer.api.diagnostics.PackerDiagnosticCategory;
|
||||
import p.packer.api.diagnostics.PackerDiagnosticSeverity;
|
||||
import p.packer.api.events.PackerEventKind;
|
||||
import p.packer.api.events.PackerEventSink;
|
||||
import p.packer.api.events.PackerProgress;
|
||||
import p.packer.api.workspace.GetAssetDetailsRequest;
|
||||
import p.packer.api.workspace.GetAssetDetailsResult;
|
||||
import p.packer.api.workspace.InitWorkspaceRequest;
|
||||
@@ -23,6 +26,7 @@ import p.packer.foundation.PackerRegistryEntry;
|
||||
import p.packer.foundation.PackerRegistryState;
|
||||
import p.packer.foundation.PackerWorkspaceFoundation;
|
||||
import p.packer.foundation.PackerWorkspacePaths;
|
||||
import p.packer.events.PackerOperationEventEmitter;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
@@ -34,17 +38,26 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
private final PackerWorkspaceFoundation workspaceFoundation;
|
||||
private final PackerAssetDeclarationParser parser;
|
||||
private final PackerAssetDetailsService detailsService;
|
||||
private final PackerEventSink eventSink;
|
||||
|
||||
public FileSystemPackerWorkspaceService() {
|
||||
this(new PackerWorkspaceFoundation(), new PackerAssetDeclarationParser());
|
||||
this(new PackerWorkspaceFoundation(), new PackerAssetDeclarationParser(), PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerWorkspaceService(
|
||||
PackerWorkspaceFoundation workspaceFoundation,
|
||||
PackerAssetDeclarationParser parser) {
|
||||
this(workspaceFoundation, parser, PackerEventSink.noop());
|
||||
}
|
||||
|
||||
public FileSystemPackerWorkspaceService(
|
||||
PackerWorkspaceFoundation workspaceFoundation,
|
||||
PackerAssetDeclarationParser parser,
|
||||
PackerEventSink eventSink) {
|
||||
this.workspaceFoundation = Objects.requireNonNull(workspaceFoundation, "workspaceFoundation");
|
||||
this.parser = Objects.requireNonNull(parser, "parser");
|
||||
this.detailsService = new PackerAssetDetailsService(workspaceFoundation, parser);
|
||||
this.eventSink = Objects.requireNonNull(eventSink, "eventSink");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -60,6 +73,7 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
@Override
|
||||
public ListAssetsResult listAssets(ListAssetsRequest request) {
|
||||
final PackerProjectContext project = Objects.requireNonNull(request, "request").project();
|
||||
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(project, eventSink);
|
||||
final Path assetsRoot = PackerWorkspacePaths.assetsRoot(project);
|
||||
final PackerRegistryState registry = workspaceFoundation.loadRegistry(project);
|
||||
final Map<Path, PackerRegistryEntry> registryByRoot = new HashMap<>();
|
||||
@@ -74,14 +88,23 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
if (Files.isDirectory(assetsRoot)) {
|
||||
try (Stream<Path> paths = Files.find(assetsRoot, Integer.MAX_VALUE, (path, attrs) ->
|
||||
attrs.isRegularFile() && path.getFileName().toString().equals("asset.json"))) {
|
||||
paths.forEach(assetManifestPath -> {
|
||||
final List<Path> manifests = paths.toList();
|
||||
final int total = manifests.size();
|
||||
for (int index = 0; index < manifests.size(); index += 1) {
|
||||
final Path assetManifestPath = manifests.get(index);
|
||||
final Path assetRoot = assetManifestPath.getParent().toAbsolutePath().normalize();
|
||||
discoveredRoots.add(assetRoot);
|
||||
final PackerRegistryEntry registryEntry = registryByRoot.get(assetRoot);
|
||||
final PackerAssetDeclarationParseResult parsed = parser.parse(assetManifestPath);
|
||||
diagnostics.addAll(parsed.diagnostics());
|
||||
assets.add(buildSummary(assetRoot, registryEntry, parsed));
|
||||
});
|
||||
final PackerAssetSummary summary = buildSummary(assetRoot, registryEntry, parsed);
|
||||
assets.add(summary);
|
||||
events.emit(
|
||||
PackerEventKind.ASSET_DISCOVERED,
|
||||
"Discovered asset: " + summary.identity().assetName(),
|
||||
new PackerProgress(total == 0 ? 1.0d : (index + 1) / (double) total, false),
|
||||
List.of(summary.identity().assetName()));
|
||||
}
|
||||
} catch (IOException exception) {
|
||||
diagnostics.add(new PackerDiagnostic(
|
||||
PackerDiagnosticSeverity.ERROR,
|
||||
@@ -110,6 +133,9 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
final PackerOperationStatus status = diagnostics.stream().anyMatch(PackerDiagnostic::blocking)
|
||||
? PackerOperationStatus.PARTIAL
|
||||
: PackerOperationStatus.SUCCESS;
|
||||
if (!diagnostics.isEmpty()) {
|
||||
events.emit(PackerEventKind.DIAGNOSTICS_UPDATED, "Asset scan diagnostics updated.", List.of());
|
||||
}
|
||||
return new ListAssetsResult(
|
||||
status,
|
||||
"Packer asset snapshot ready.",
|
||||
|
||||
Reference in New Issue
Block a user