mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 03:33:25 +00:00
refactor(application): build application cancellations with a required reason (#10574)
* refactor(application): build application cancellations with a required reason Migrate every AnalysisCancelledError construction under src/application to cancelledBy and lower the guard baseline from 671 to 442. Shutdown refusals in BinarySession report OwnerCancellation.ownerClosed when the caller did not abort, instead of an undefined reason. ReverseEngineeringService and DesktopBuildOwnedWork close their work with the typed owner reason. SharedStartupAttempt returns the departing caller's reason with a cancelled wait. One shared isAborted predicate replaces eleven local copies and narrows a checked signal for cancelledBy. * refactor(desktop): drop an unused cancellation import from desktop capture state
This commit is contained in:
1 parent
0ddc732c69
commit
2826592759
86 files changed
+554
-1012
No files matched your search
@@ -9,11 +9,11 @@ import type {
|
||||
} from "./ElectronActiveObservationPort.js";
|
||||
import {
|
||||
AnalysisAccessDeniedError,
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisInputError,
|
||||
AnalysisOutputError,
|
||||
type AnalysisInputIssue,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import type { Evidence } from "../../domain/evidence.js";
|
||||
@@ -194,15 +194,11 @@ export const captureElectronScenario = async (
|
||||
options: ExecutionOptions = {},
|
||||
): Promise<Result<Evidence, AnalysisError>> => {
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, { cause: options.signal.reason }),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
const canonical = await canonicalizeInput(input);
|
||||
if (!canonical.ok) return canonical;
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, { cause: options.signal.reason }),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
if (provider === undefined)
|
||||
return err(
|
||||
new AnalysisCapabilityUnavailableError(
|
||||
|
||||
@@ -7,9 +7,9 @@ import type {
|
||||
ListElectronTargetsInput,
|
||||
} from "../../domain/javascript/electronObservation.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisOutputError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import { err, ok, type Result } from "../../domain/result.js";
|
||||
@@ -33,11 +33,7 @@ export const listElectronTargets = async (
|
||||
const ready = requireProvider(provider, "list_electron_targets");
|
||||
if (!ready.ok) return ready;
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError("list_electron_targets", {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
);
|
||||
return err(cancelledBy("list_electron_targets", options.signal));
|
||||
const result = await ready.value.listTargets(input, options);
|
||||
if (!result.ok) return result;
|
||||
const json = jsonValueSchema.safeParse(result.value);
|
||||
@@ -78,11 +74,7 @@ export const inspectElectronPage = async (
|
||||
const ready = requireProvider(provider, "inspect_electron_page");
|
||||
if (!ready.ok) return ready;
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError("inspect_electron_page", {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
);
|
||||
return err(cancelledBy("inspect_electron_page", options.signal));
|
||||
const result = await ready.value.inspectPage(input, options);
|
||||
if (!result.ok) {
|
||||
const partial = jsonObjectSchema.safeParse(result.error.partialObservation);
|
||||
|
||||
@@ -49,9 +49,10 @@ import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js";
|
||||
import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js";
|
||||
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisResourceConstraintError,
|
||||
AnalysisTimeoutError,
|
||||
cancelledBy,
|
||||
carriedReason,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
|
||||
interface MutableArtifactAnalysis {
|
||||
@@ -105,18 +106,13 @@ export const analyzeAndAdoptJavaScriptArtifactFiles = async (
|
||||
await setImmediate();
|
||||
if (classifyUnavailableSource(file, state, projection)) {
|
||||
if (signal?.aborted === true) {
|
||||
interruption = new AnalysisCancelledError(
|
||||
"analyze_javascript_application",
|
||||
{ cause: signal.reason },
|
||||
);
|
||||
interruption = cancelledBy("analyze_javascript_application", signal);
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (signal?.aborted === true)
|
||||
throw new AnalysisCancelledError("analyze_javascript_application", {
|
||||
cause: signal.reason,
|
||||
});
|
||||
throw cancelledBy("analyze_javascript_application", signal);
|
||||
await beforeFile(file, selectedFileIndex++, selectedFileCount);
|
||||
analysisStarted = true;
|
||||
if (file.kind !== "javascript" || !file.text.included) {
|
||||
@@ -235,9 +231,9 @@ export const analyzeAndAdoptJavaScriptArtifactFiles = async (
|
||||
cause,
|
||||
);
|
||||
else if (signal?.aborted === true && cause === signal.reason)
|
||||
interruption = new AnalysisCancelledError(
|
||||
interruption = cancelledBy(
|
||||
"analyze_javascript_application",
|
||||
{ cause },
|
||||
carriedReason(cause),
|
||||
);
|
||||
else throw cause;
|
||||
const scope = javascriptArtifactAnalysisScopes[file.kind];
|
||||
|
||||
@@ -3,9 +3,9 @@ import type { JavaScriptRuntimeObservationPort } from "./JavaScriptRuntimeObserv
|
||||
import { createJavaScriptRuntimeObservationEvidence } from "./JavaScriptRuntimeObservationEvidence.js";
|
||||
import type { Evidence } from "../../domain/evidence.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisCapabilityUnavailableError,
|
||||
AnalysisOutputError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import type {
|
||||
@@ -32,11 +32,7 @@ export const listJavaScriptRuntimeTargets = async (
|
||||
const ready = requireProvider(provider, "list_javascript_runtime_targets");
|
||||
if (!ready.ok) return ready;
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError("list_javascript_runtime_targets", {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
);
|
||||
return err(cancelledBy("list_javascript_runtime_targets", options.signal));
|
||||
const result = await ready.value.listTargets(input, options);
|
||||
if (!result.ok) return result;
|
||||
const report = javascriptRuntimeTargetListSchema.safeParse(result.value);
|
||||
@@ -66,11 +62,7 @@ export const observeJavaScriptRuntime = async (
|
||||
const ready = requireProvider(provider, "observe_javascript_runtime");
|
||||
if (!ready.ok) return ready;
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError("observe_javascript_runtime", {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
);
|
||||
return err(cancelledBy("observe_javascript_runtime", options.signal));
|
||||
const result = await ready.value.observe(input, options);
|
||||
if (!result.ok) {
|
||||
const partial = result.error.partialObservation;
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
type HistoricalSourceGraph,
|
||||
} from "../../domain/referenceSourceGraph.js";
|
||||
import type { ArtifactResourceScope } from "../../artifacts/ArtifactResourceScope.js";
|
||||
import { AnalysisCancelledError } from "../../domain/analysisErrorCore.js";
|
||||
import { cancelledBy, isAborted } from "../../domain/analysisErrorCore.js";
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js";
|
||||
import { err, ok, type Result } from "../../domain/result.js";
|
||||
@@ -29,13 +29,8 @@ export const resolveSourceToBundleReference = async (
|
||||
signal?: AbortSignal,
|
||||
resources?: ArtifactResourceScope,
|
||||
): Promise<Result<ResolvedSourceToBundleReference, AnalysisError>> => {
|
||||
const cancelled = () => signal?.aborted === true;
|
||||
if (cancelled())
|
||||
return err(
|
||||
new AnalysisCancelledError("compare_source_to_bundle", {
|
||||
cause: signal?.reason,
|
||||
}),
|
||||
);
|
||||
if (isAborted(signal))
|
||||
return err(cancelledBy("compare_source_to_bundle", signal));
|
||||
if (!("kind" in reference)) return ok({ reference });
|
||||
const read = await readJsonFileWithSource(
|
||||
reference.path,
|
||||
@@ -45,12 +40,8 @@ export const resolveSourceToBundleReference = async (
|
||||
);
|
||||
if (!read.ok) return read;
|
||||
await setImmediate();
|
||||
if (cancelled())
|
||||
return err(
|
||||
new AnalysisCancelledError("compare_source_to_bundle", {
|
||||
cause: signal?.reason,
|
||||
}),
|
||||
);
|
||||
if (isAborted(signal))
|
||||
return err(cancelledBy("compare_source_to_bundle", signal));
|
||||
const headroom = requireAuthenticationHeadroom(read.value.data, {
|
||||
operation: "compare_source_to_bundle",
|
||||
path: read.value.path,
|
||||
@@ -61,12 +52,8 @@ export const resolveSourceToBundleReference = async (
|
||||
const parsed = historicalSourceGraphSchema.safeParse(read.value.data);
|
||||
// Dispatch aborts queued while synchronous validation and commitment hashing ran.
|
||||
await setImmediate();
|
||||
if (cancelled())
|
||||
return err(
|
||||
new AnalysisCancelledError("compare_source_to_bundle", {
|
||||
cause: signal?.reason,
|
||||
}),
|
||||
);
|
||||
if (isAborted(signal))
|
||||
return err(cancelledBy("compare_source_to_bundle", signal));
|
||||
if (!parsed.success)
|
||||
return err(
|
||||
analysisInputErrorFromIssues(
|
||||
|
||||
@@ -6,8 +6,8 @@ import { readImmutableEvidence } from "../../domain/evidenceValidation.js";
|
||||
import type { AnalysisError } from "../../domain/analysisErrorBase.js";
|
||||
import type { EvidenceWorkflowExecution } from "../investigation/EvidenceWorkflowExecution.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisInputError,
|
||||
cancelledBy,
|
||||
} from "../../domain/analysisErrorCore.js";
|
||||
import { digestCanonicalValue } from "../../domain/canonicalDigest.js";
|
||||
import { err, ok, type Result } from "../../domain/result.js";
|
||||
@@ -217,11 +217,7 @@ export const compareStaticAndObservedEndpointsEvidence = async (
|
||||
if (index % 256 === 0) {
|
||||
await setImmediate();
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, {
|
||||
cause: options.signal.reason,
|
||||
}),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
}
|
||||
const added = accumulator.add(record);
|
||||
if (!added.ok) return added;
|
||||
@@ -237,8 +233,6 @@ export const compareStaticAndObservedEndpointsEvidence = async (
|
||||
if (!compared.ok) return compared;
|
||||
await setImmediate();
|
||||
if (options.signal?.aborted)
|
||||
return err(
|
||||
new AnalysisCancelledError(OPERATION, { cause: options.signal.reason }),
|
||||
);
|
||||
return err(cancelledBy(OPERATION, options.signal));
|
||||
return createComparison(sources, compared.value, accumulator);
|
||||
};
|
||||
Reference in new issue
Block a user