Skip to content

armgit / rea

Public Imported from GitHub
0

Reverse engineer anything with agents, from app behavior down to native binaries.

refactor(kuna): centralize installation cancellation projection

morluto55f5c8db690a
diff --git a/src/kuna/KunaDoctor.ts b/src/kuna/KunaDoctor.ts
index d4a533ab7..da8f95e75 100644
--- a/src/kuna/KunaDoctor.ts
+++ b/src/kuna/KunaDoctor.ts
@@ -9,12 +9,10 @@ import type {
import { readKunaConfiguration } from "./KunaConfiguration.js";
import type { RetainedResourceScope } from "../application/AnalysisProvider.js";
import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
-import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
import { kunaRetainedResourceCleanupError } from "./KunaCommand.js";
import {
createKunaResourceScope,
inspectKunaInstallation,
- kunaInstallationCancellation,
kunaInstallationFailureDiagnostics,
type KunaReadinessFailure,
} from "./KunaInstallation.js";
@@ -78,23 +76,11 @@ export const inspectKunaProvider = async (
],
};
if (!(cause instanceof RegularFileCleanupFailure)) {
- const cancellation = kunaInstallationCancellation(cause);
- if (cancellation !== undefined) {
- const error = new AnalysisCancelledError("doctor", {
- cause: cancellation.reason,
- diagnostics: cancellation.diagnostics,
- ...(!kunaResources.hasPending
- ? {}
- : {
- cleanup: {
- reason: "Kuna version-probe process cleanup is unconfirmed.",
- resources: kunaResources.cleanupResources ?? [],
- },
- }),
- });
- kunaResources.bindRetainedFailure(error);
- throw error;
- }
+ const cancellation = kunaResources.installationCancellationError(
+ cause,
+ "doctor",
+ );
+ if (cancellation !== undefined) throw cancellation;
throw cause;
}
return {
diff --git a/src/kuna/KunaInstallation.ts b/src/kuna/KunaInstallation.ts
index 1538ffa17..087dbe5e8 100644
--- a/src/kuna/KunaInstallation.ts
+++ b/src/kuna/KunaInstallation.ts
@@ -9,6 +9,7 @@ import { join } from "node:path";
import { jsonValueSchema, type JsonValue } from "../domain/jsonValue.js";
import type { AnalysisError } from "../domain/analysisErrorBase.js";
+import { AnalysisCancelledError } from "../domain/analysisErrorCore.js";
import { err, ok, type Result } from "../domain/result.js";
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
import {
@@ -171,6 +172,10 @@ export interface KunaResourceScope {
readonly owner: RetainedResourceScope;
readonly cleanupResources: readonly string[] | undefined;
readonly hasPending: boolean;
+ installationCancellationError(
+ cause: unknown,
+ operation: string,
+ ): AnalysisCancelledError | undefined;
bindFailure(failure: RegularFileCleanupFailure, error: AnalysisError): void;
bindRetainedFailure(error: AnalysisError): void;
}
@@ -183,25 +188,48 @@ export const createKunaResourceScope = (
Parameters<RetainedResourceScope["retain"]>[0],
{ readonly lease: AnalysisCleanupLease }
>();
- const bindPendingFailure = (error: AnalysisError) => {
- const retained = [...leases.values()]
+ const pendingLeases = () =>
+ [...leases.values()]
.map(({ lease }) => lease)
.filter((lease) => !lease.released);
+ const bindPendingFailure = (error: AnalysisError) => {
+ const retained = pendingLeases();
if (retained.length > 0) new AnalysisCleanupLeaseGroup(error, retained);
};
+ const cleanupResources = (
+ pending = pendingLeases(),
+ ): readonly string[] | undefined => {
+ if (pending.some((lease) => lease.cleanupResources === undefined))
+ return undefined;
+ return [
+ ...new Set(pending.flatMap((lease) => lease.cleanupResources ?? [])),
+ ];
+ };
return {
get hasPending() {
- return [...leases.values()].some(({ lease }) => !lease.released);
+ return pendingLeases().length > 0;
},
get cleanupResources() {
- const pending = [...leases.values()]
- .map(({ lease }) => lease)
- .filter((lease) => !lease.released);
- if (pending.some((lease) => lease.cleanupResources === undefined))
- return undefined;
- return [
- ...new Set(pending.flatMap((lease) => lease.cleanupResources ?? [])),
- ];
+ return cleanupResources();
+ },
+ installationCancellationError: (cause, operation) => {
+ const cancellation = kunaInstallationCancellation(cause);
+ if (cancellation === undefined) return undefined;
+ const pending = pendingLeases();
+ const error = new AnalysisCancelledError(operation, {
+ cause: cancellation.reason,
+ diagnostics: cancellation.diagnostics,
+ ...(pending.length === 0
+ ? {}
+ : {
+ cleanup: {
+ reason: "Kuna version-probe process cleanup is unconfirmed.",
+ resources: cleanupResources(pending) ?? [],
+ },
+ }),
+ });
+ bindPendingFailure(error);
+ return error;
},
owner: {
retain: (owner, resource) => {
diff --git a/src/kuna/KunaProvider.ts b/src/kuna/KunaProvider.ts
index 937b91a63..2b7bc7f52 100644
--- a/src/kuna/KunaProvider.ts
+++ b/src/kuna/KunaProvider.ts
@@ -29,7 +29,6 @@ import {
import {
createKunaResourceScope,
inspectKunaInstallation,
- kunaInstallationCancellation,
} from "./KunaInstallation.js";
import { KunaProjectCache } from "./KunaProjectCache.js";
import {
@@ -207,25 +206,12 @@ export class KunaProvider implements AnalysisProviderCandidate {
"kuna:profile",
);
if (retainedCleanup !== undefined) return err(retainedCleanup);
- const cancellation = kunaInstallationCancellation(cause);
- if (
- !(cause instanceof RegularFileCleanupFailure) &&
- cancellation !== undefined
- ) {
- const error = new AnalysisCancelledError("kuna:profile", {
- cause: cancellation.reason,
- diagnostics: cancellation.diagnostics,
- ...(!kunaResources.hasPending
- ? {}
- : {
- cleanup: {
- reason: "Kuna version-probe process cleanup is unconfirmed.",
- resources: kunaResources.cleanupResources ?? [],
- },
- }),
- });
- kunaResources.bindRetainedFailure(error);
- return err(error);
+ if (!(cause instanceof RegularFileCleanupFailure)) {
+ const cancellation = kunaResources.installationCancellationError(
+ cause,
+ "kuna:profile",
+ );
+ if (cancellation !== undefined) return err(cancellation);
}
if (!(cause instanceof RegularFileCleanupFailure)) throw cause;
const error = kunaFileCleanupError(cause, "kuna:profile");
diff --git a/src/kuna/KunaSessionClient.ts b/src/kuna/KunaSessionClient.ts
index 207f7b77c..f17bd4944 100644
--- a/src/kuna/KunaSessionClient.ts
+++ b/src/kuna/KunaSessionClient.ts
@@ -45,7 +45,6 @@ import { kunaFunctionDeadline } from "./KunaConfiguration.js";
import {
createKunaResourceScope,
inspectKunaInstallation,
- kunaInstallationCancellation,
type KunaInstallation,
} from "./KunaInstallation.js";
import {
@@ -1429,25 +1428,12 @@ export class KunaSessionClient implements AnalysisClient {
} catch (cause: unknown) {
const retainedCleanup = kunaRetainedResourceCleanupError(cause, "health");
if (retainedCleanup !== undefined) return err(retainedCleanup);
- const cancellation = kunaInstallationCancellation(cause);
- if (
- !(cause instanceof RegularFileCleanupFailure) &&
- cancellation !== undefined
- ) {
- const error = new AnalysisCancelledError("health", {
- cause: cancellation.reason,
- diagnostics: cancellation.diagnostics,
- ...(!kunaResources.hasPending
- ? {}
- : {
- cleanup: {
- reason: "Kuna version-probe process cleanup is unconfirmed.",
- resources: kunaResources.cleanupResources ?? [],
- },
- }),
- });
- kunaResources.bindRetainedFailure(error);
- return err(error);
+ if (!(cause instanceof RegularFileCleanupFailure)) {
+ const cancellation = kunaResources.installationCancellationError(
+ cause,
+ "health",
+ );
+ if (cancellation !== undefined) return err(cancellation);
}
if (!(cause instanceof RegularFileCleanupFailure))
return err(failure("health", cause));