mirror of
https://github.com/morluto/rea.git
synced 2026-11-22 06:25:44 +00:00
fix(android): retain mapping read failures through late cancellation (#12329)
This commit is contained in:
1 parent
ddcd62009b
commit
45046356c5
3 files changed
+107
-24
No files matched your search
@@ -1,8 +1,8 @@
|
||||
import {
|
||||
artifactFileCancellationCause,
|
||||
artifactFilePrimaryFacts,
|
||||
bindArtifactFileCleanup,
|
||||
ArtifactReaderFailure,
|
||||
projectStableArtifactFailure,
|
||||
stableArtifactInputRecovery,
|
||||
readerIntegrityFailure,
|
||||
type ArtifactResourceScope,
|
||||
@@ -14,9 +14,9 @@ import {
|
||||
} from "../domain/android/androidMapping.js";
|
||||
import { parseProguardMapping } from "../domain/android/proguardMapping.js";
|
||||
import type { AnalysisError } from "../domain/analysisErrorBase.js";
|
||||
import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
|
||||
import {
|
||||
AnalysisAccessDeniedError,
|
||||
AnalysisCancelledError,
|
||||
AnalysisInputError,
|
||||
AnalysisResourceConstraintError,
|
||||
AnalysisTimeoutError,
|
||||
@@ -24,7 +24,6 @@ import {
|
||||
carriedReason,
|
||||
} from "../domain/analysisErrorCore.js";
|
||||
import { ProviderAdapterError } from "../domain/providerAdapterError.js";
|
||||
import { ProviderCleanupError } from "../domain/providerCleanupError.js";
|
||||
import { err, ok, type Result } from "../domain/result.js";
|
||||
import { isSelectedRegularFileError } from "../filesystem/RegularFile.js";
|
||||
import { jadxOperationTimeoutGuidance } from "./JadxOperationTimeout.js";
|
||||
@@ -116,8 +115,13 @@ const readFailurePrimary = (
|
||||
{ cause: primary },
|
||||
);
|
||||
}
|
||||
// A closed resource scope during shutdown is cancellation, not a file fault.
|
||||
if (read.signal.aborted) return mappingInterruption(read, read.signal.reason);
|
||||
// The scope can refuse admission during shutdown before any physical read.
|
||||
if (
|
||||
owned?.reason === "unavailable" &&
|
||||
owned.cleanup === undefined &&
|
||||
read.signal.aborted
|
||||
)
|
||||
return mappingInterruption(read, read.signal.reason);
|
||||
return new ProviderAdapterError("jadx", read.operation, {
|
||||
cause: primary,
|
||||
diagnostics: {
|
||||
@@ -127,24 +131,24 @@ const readFailurePrimary = (
|
||||
});
|
||||
};
|
||||
|
||||
/** Compose the read failure with any descriptor cleanup the scope retained. */
|
||||
/** Preserve the read's outcome, any later interruption, and its descriptor lease. */
|
||||
const readFailure = (cause: unknown, read: MappingRead): AnalysisError => {
|
||||
const primary = readFailurePrimary(cause, read);
|
||||
const error =
|
||||
cause instanceof ArtifactReaderFailure && cause.cleanup !== undefined
|
||||
? analysisErrorWithCleanupFailure(
|
||||
primary,
|
||||
new ProviderCleanupError(
|
||||
"jadx",
|
||||
cause.cleanup.resources,
|
||||
{ reason: cause.cleanup.reason },
|
||||
{ operation: read.operation, cause },
|
||||
),
|
||||
read.operation,
|
||||
)
|
||||
: primary;
|
||||
bindArtifactFileCleanup(cause, error);
|
||||
return error;
|
||||
if (
|
||||
read.signal.aborted &&
|
||||
!(primary instanceof AnalysisCancelledError) &&
|
||||
!(primary instanceof AnalysisTimeoutError)
|
||||
)
|
||||
primary.retainSecondaryFailure(
|
||||
mappingInterruption(read, read.signal.reason),
|
||||
);
|
||||
return projectStableArtifactFailure(
|
||||
cause,
|
||||
primary,
|
||||
read.path,
|
||||
"jadx",
|
||||
read.operation,
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user