refactor(resources): move artifact failure translation into resources and declare JavaScript reconstruction's artifact entries (#11558)

refactor(resources): give artifact failure translation to resources and declare JavaScript reconstruction's artifact entries

translateArtifactFailure projects ArtifactReaderFailure, which src/resources owns, and depends only on resources and domain, so it moves to src/resources and is exported from its index. JavaScript reconstruction drives the canonical inventory scan, the format reader and the source read inside one resource scope; those three artifacts files are declared entry files. application -> artifacts past-entry imports go from 7 to 1 (the ZIP reader, moved by #11525).

Refs #11359
This commit is contained in:
morluto authored and GitHub committed 2026-11-16 06:42:44 +08:00
1 parent e77793e09a
commit c965d2346b
25 files changed
+44 -34

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@
"native -> artifacts": 2
},
"entry": {
"application -> artifacts": 7,
"application -> artifacts": 1,
"application -> browser": 2,
"application -> desktop": 41,
"application -> frida": 2,
+5
View File
@@ -245,6 +245,11 @@ export const ENTRY_FILES = Object.freeze(
"ArtifactProviderMetadata.ts",
"DesktopApplicationReader.ts",
"ReleaseExposureReader.ts",
// JavaScript reconstruction owns one resource scope across the
// inventory scan, the format reader and the source read.
"inventory/scanCanonical.ts",
"javascript/JavaScriptArtifactFiles.ts",
"javascript/JavaScriptArtifactReader.ts",
],
browser: [
"CdpBrowserProvider.ts",
@@ -18,7 +18,6 @@
"src/application/desktop/DesktopTaskReaderCleanup.ts": 2,
"src/application/ntfs/NtfsJournalService.ts": 1,
"src/application/process/ProcessCli.ts": 1,
"src/artifacts/ArtifactOperationFailure.ts": 1,
"src/artifacts/ReleaseExposureReader.ts": 1,
"src/browser/BrowserScenarioPartialObservation.ts": 1,
"src/browser/CdpBrowserProvider.ts": 1,
@@ -60,6 +59,7 @@
"src/providers/AnalysisClientFailure.ts": 1,
"src/providers/OwnedCommandCleanup.ts": 2,
"src/providers/runOwned.ts": 1,
"src/resources/ArtifactOperationFailure.ts": 1,
"src/resources/StableArtifactFailure.ts": 2,
"src/rust/RustBinaryProvider.ts": 1
}
@@ -11,8 +11,8 @@ import { z } from "zod";
import {
ArtifactReaderFailure,
type ArtifactResourceScope,
translateArtifactFailure,
} from "../../resources/index.js";
import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js";
import {
analyzeJavaScriptApplicationInputSchema,
type JavaScriptApplicationAnalysisResult,
@@ -46,8 +46,10 @@ import { htmlArtifactReferences } from "../../domain/javascript/htmlArtifactRefe
import type { JavaScriptSourceAnalysisPort } from "../../domain/javascript/javascriptSourceAnalysis.js";
import type { JavaScriptSemanticGraphProjection } from "./JavaScriptSemanticGraphBuilder.js";
import { AnalysisError } from "../../domain/analysisErrorBase.js";
import { ArtifactReaderFailure } from "../../resources/index.js";
import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js";
import {
ArtifactReaderFailure,
translateArtifactFailure,
} from "../../resources/index.js";
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
import {
AnalysisResourceConstraintError,
@@ -6,7 +6,7 @@ import {
AnalysisCancelledError,
AnalysisResourceConstraintError,
} from "../../domain/analysisErrorCore.js";
import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../resources/index.js";
import type { JavaScriptArtifactFileSet } from "../../domain/javascript/javascriptArtifactFiles.js";
import type { JavaScriptSourceAnalysisLimits } from "../../domain/javascript/javascriptSourceAnalysis.js";
import type { ArtifactResourceScope } from "../../resources/index.js";
+1 -1
View File
@@ -12,9 +12,9 @@ import {
ArtifactReaderFailure,
ArtifactResourceScope,
withArtifactTargetIdentity,
translateArtifactFailure,
} from "../resources/index.js";
import type { AnalysisError } from "../domain/analysisErrorBase.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import { snapshotEnvironment } from "../process/snapshotEnvironment.js";
import {
createAnalysisExecution,
+1 -1
View File
@@ -12,9 +12,9 @@ import {
ArtifactResourceScope,
type ArtifactResourceOwner,
abortIfNeeded,
translateArtifactFailure,
} from "../resources/index.js";
import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import {
inspectDesktopFile,
RETAINED_FACT_BYTES,
+1 -1
View File
@@ -6,7 +6,7 @@ import {
NativeDmgArtifactReader,
type NativeDmgHost,
} from "./NativeDmgArtifactReader.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../resources/index.js";
import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
import { mkdir, writeFile } from "node:fs/promises";
import { join } from "node:path";
@@ -9,7 +9,7 @@ import {
NativeDmgArtifactReader,
type NativeDmgHost,
} from "./NativeDmgArtifactReader.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../resources/index.js";
import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
it.each(["same", "other", "missing-path", "no-path", "empty-group"] as const)(
+1 -1
View File
@@ -32,7 +32,7 @@ import { ZipArtifactReader } from "./ZipArtifactReader.js";
import { openRegularFile } from "../filesystem/RegularFile.js";
import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js";
import { hashReadable } from "./ArtifactHash.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../resources/index.js";
import { analysisErrorUserMessage } from "../domain/analysisErrorPresentation.js";
import { waitFor } from "../../tests/support/testWait.js";
@@ -20,9 +20,9 @@ import {
sameArtifactSourceIdentity,
type ArtifactEntry,
type ArtifactReaderTraversal,
translateArtifactFailure,
} from "../../resources/index.js";
import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import { InternalInvariantError } from "../../domain/internalInvariant.js";
import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
import { ARTIFACT_GRAPH_PROVIDER } from "../../domain/investigationProviders.js";
@@ -7,7 +7,7 @@ import { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js";
import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js";
import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../resources/index.js";
const bundle = async () => {
const path = await createTestTempDirectory("rea-ib-finalization-");
@@ -8,7 +8,7 @@ import { expect, it, vi } from "vitest";
import { AnalysisAccessDeniedError } from "../../domain/analysisErrorCore.js";
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../resources/index.js";
import { inspectBundleKeyedArchive } from "./KeyedArchiveReader.js";
import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js";
+1 -1
View File
@@ -10,6 +10,7 @@ import {
assertArtifactReadActive,
bindArtifactFileCleanup,
ArtifactResourceScope,
translateArtifactFailure,
} from "../../resources/index.js";
import { createHash } from "node:crypto";
import {
@@ -55,7 +56,6 @@ import {
DirectoryArtifactEntryAccessDenied,
} from "../DirectoryArtifactReader.js";
import { AnalysisError } from "../../domain/analysisErrorBase.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import { analysisErrorWithCleanupDependencies } from "../../domain/analysisErrorCleanup.js";
import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js";
@@ -15,7 +15,10 @@ import {
} from "./ArtifactGraphConstruction.js";
import { createArtifactClassificationProbe } from "../ArtifactClassificationProbe.js";
import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import {
translateArtifactFailure,
createAsarHeaderSignatureProbe,
} from "../../resources/index.js";
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
import { artifactIdForContent } from "../../domain/artifactIdentity.js";
import { pe } from "../../domain/binaryTarget.fixture.js";
@@ -42,7 +45,6 @@ import {
} from "../../../tests/fixtures/espImage.js";
import { devicetreeFixture } from "../../domain/firmware/devicetree.fixture.js";
import { fitFixture } from "../fit/FitImage.fixture.js";
import { createAsarHeaderSignatureProbe } from "../../resources/index.js";
it("joins only observed PE signature bytes across stream chunks", () => {
const bytes = pe(0x8664, 8190);
@@ -11,7 +11,7 @@ import { expect, it, vi } from "vitest";
import { PyInstallerArtifactReader } from "../PyInstallerArtifactReader.js";
import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js";
import { hashReadable } from "../ArtifactHash.js";
import { translateArtifactFailure } from "../ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../resources/index.js";
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
import { marshalCode } from "../../python/PythonPyc.fixture.js";
import * as artifactPaths from "../../resources/ArtifactPaths.js";
@@ -1,18 +1,18 @@
import { expect, it } from "vitest";
import { ArtifactReaderFailure } from "../resources/ArtifactReader.js";
import { ArtifactReaderFailure } from "./ArtifactReader.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
import { projectAnalysisError } from "../domain/analysisErrorProjection.js";
import { constants as bufferConstants } from "node:buffer";
import {
imageFileSizeRemediation,
readerIntegrityFailure,
} from "../resources/StableArtifactFailure.js";
} from "./StableArtifactFailure.js";
import { artifactIntegrityDetails } from "../domain/artifactIntegrity.js";
import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js";
import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js";
import { ArtifactFileCleanupFailure } from "./ArtifactFileOperation.js";
import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js";
import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js";
import { artifactReaderLimitFailure } from "../resources/index.js";
import { artifactReaderLimitFailure } from "./index.js";
// The provider ceiling test uses a sparse file and is skipped on Windows.
it.skipIf(process.platform !== "win32")(
@@ -2,11 +2,11 @@ import { analysisSettingLimit } from "../domain/analysisSettingDefinitions.js";
import { AnalysisError } from "../domain/analysisErrorBase.js";
import { ArtifactOperationError } from "../domain/artifactOperationError.js";
import { InternalInvariantError } from "../domain/internalInvariant.js";
import { ArtifactReaderFailure } from "./ArtifactReader.js";
import {
ArtifactReaderFailure,
artifactFileCancellationCause,
bindArtifactFileCleanup,
} from "../resources/index.js";
} from "./ArtifactFileOperation.js";
/**
* Translate one artifact boundary failure while retaining cleanup evidence. A
+1 -1
View File
@@ -19,7 +19,7 @@ import {
ArtifactReaderFailure,
type ArtifactReader,
} from "./ArtifactReader.js";
import { translateArtifactFailure } from "../artifacts/ArtifactOperationFailure.js";
import { translateArtifactFailure } from "./ArtifactOperationFailure.js";
it("waits for admitted operations and shares concurrent close", async () => {
const scope = new ArtifactResourceScope();
+1
View File
@@ -25,6 +25,7 @@ export {
ArtifactFileSource,
assertArtifactFileSelectedSource,
} from "./ArtifactFileSource.js";
export { translateArtifactFailure } from "./ArtifactOperationFailure.js";
export {
ArtifactFileCancelled,
ArtifactFileCleanupFailure,
@@ -6,7 +6,7 @@ import { describe, expect, it, onTestFinished, vi } from "vitest";
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
import { translateArtifactFailure } from "../../../src/artifacts/ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../../src/resources/index.js";
import {
ArtifactReaderFailure,
type ArtifactEntry,
@@ -4,7 +4,11 @@ import { join } from "node:path";
import { createPackage } from "@electron/asar";
import { afterEach, expect, it, vi } from "vitest";
import { translateArtifactFailure } from "../../../src/artifacts/ArtifactOperationFailure.js";
import {
translateArtifactFailure,
admitAsarHeader,
asarHeaderAdmissionRecovery,
} from "../../../src/resources/index.js";
import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js";
import { parseEnvironment } from "../../../src/config/environment.js";
import { createDirectAnalysis } from "../../../src/composition/directAnalysis.js";
@@ -22,10 +26,6 @@ import { projectAnalysisError } from "../../../src/domain/analysisErrorProjectio
import { inventoryArtifact } from "../../fixtures/artifactInventory.js";
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
import { analyzeJavaScriptApplication } from "../../support/javascriptApplicationScope.js";
import {
admitAsarHeader,
asarHeaderAdmissionRecovery,
} from "../../../src/resources/index.js";
const createFixture = async () => {
const root = await createTestTempDirectory("rea-asar-header-admission-");
@@ -35,7 +35,7 @@ vi.mock("../../src/process/ExecFileOutput.js", async (importOriginal) => {
import { NativeDmgArtifactReader } from "../../src/artifacts/NativeDmgArtifactReader.js";
import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js";
import { ExecFileOutputCancelledError } from "../../src/process/ExecFileOutput.js";
import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../src/resources/index.js";
it.skipIf(process.platform !== "darwin").each([false, true])(
"preserves exact DMG caller reason and settles the command before return (pre-aborted: %s)",
@@ -89,7 +89,7 @@ import {
withArtifactRegularFile,
} from "../../src/resources/ArtifactFileOperation.js";
import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js";
import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js";
import { translateArtifactFailure } from "../../src/resources/index.js";
import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js";
import {
OwnedRegularFileOperationFailure,