mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 11:43:20 +00:00
refactor(resources): move the ZIP artifact reader into src/resources (#11525)
This commit is contained in:
1 parent
55c317d2b6
commit
072b5787b6
24 files changed
+39
-35
No files matched your search
@@ -8,17 +8,13 @@
|
||||
"main <-> server"
|
||||
],
|
||||
"crossProvider": {
|
||||
"android -> artifacts": 2,
|
||||
"apktool -> artifacts": 2,
|
||||
"browser -> artifacts": 2,
|
||||
"captures -> pcap": 2,
|
||||
"desktop -> electron": 1,
|
||||
"flutter -> artifacts": 1,
|
||||
"gpu -> artifacts": 2,
|
||||
"model -> artifacts": 1
|
||||
},
|
||||
"entry": {
|
||||
"application -> artifacts": 1,
|
||||
"application -> browser": 2,
|
||||
"application -> desktop": 41,
|
||||
"application -> frida": 2,
|
||||
|
||||
@@ -3,8 +3,8 @@ import {
|
||||
ArtifactReaderFailure,
|
||||
type ArtifactResourceScope,
|
||||
streamChunkToBuffer,
|
||||
ZipArtifactReader,
|
||||
} from "../resources/index.js";
|
||||
import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js";
|
||||
import type {
|
||||
AndroidJniLibraryObservation,
|
||||
AndroidJniReport,
|
||||
|
||||
@@ -47,9 +47,9 @@ import {
|
||||
ArtifactFileCleanupFailure,
|
||||
bindArtifactFileCleanup,
|
||||
withArtifactRegularFile,
|
||||
ZipArtifactReader,
|
||||
} from "../resources/index.js";
|
||||
import { analysisClientFailureForOperation } from "../providers/AnalysisClientFailure.js";
|
||||
import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js";
|
||||
import type { DoctorProviderCheck } from "../ports/DoctorProviderInspection.js";
|
||||
import {
|
||||
JADX_JAR_CONFIGURATION_REMEDIATION,
|
||||
|
||||
@@ -9,12 +9,12 @@ import {
|
||||
type FileEntry,
|
||||
} from "@zip.js/zip.js";
|
||||
|
||||
import { assertArtifactReadActive } from "../../resources/index.js";
|
||||
import {
|
||||
assertArtifactReadActive,
|
||||
decodeZipEntryText,
|
||||
ZIP_READER_OPTIONS,
|
||||
zipEntryPath,
|
||||
} from "../../artifacts/ZipArtifactReader.js";
|
||||
} from "../../resources/index.js";
|
||||
import {
|
||||
DAMAGED_ZIP_ENTRY,
|
||||
UNREADABLE_ZIP,
|
||||
|
||||
@@ -28,11 +28,13 @@ import { describe, expect, it, onTestFinished, vi } from "vitest";
|
||||
|
||||
import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js";
|
||||
|
||||
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 "../resources/index.js";
|
||||
import {
|
||||
translateArtifactFailure,
|
||||
ZipArtifactReader,
|
||||
} from "../resources/index.js";
|
||||
|
||||
import { analysisErrorUserMessage } from "../domain/analysisErrorPresentation.js";
|
||||
import { waitFor } from "../../tests/support/testWait.js";
|
||||
|
||||
@@ -8,8 +8,8 @@ import { describe, expect, it } from "vitest";
|
||||
import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js";
|
||||
import type { ArtifactReaderTraversal } from "../resources/ArtifactReader.js";
|
||||
import { scanReader } from "./inventory/scanReader.js";
|
||||
import { ZipArtifactReader } from "./ZipArtifactReader.js";
|
||||
import { accountZipMemberRegion } from "../domain/zip/zipMemberRegion.js";
|
||||
import { ZipArtifactReader } from "../resources/index.js";
|
||||
|
||||
interface Member {
|
||||
readonly name: string;
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
import {
|
||||
ArtifactReaderFailure,
|
||||
type ArtifactReader,
|
||||
ZipArtifactReader,
|
||||
} from "../resources/index.js";
|
||||
import type { ArtifactReaderAdmission } from "./ArtifactReaderAdmission.js";
|
||||
import { AsarArtifactReader } from "./AsarArtifactReader.js";
|
||||
@@ -45,7 +46,6 @@ import { NtfsMftArtifactReader } from "./NtfsMftArtifactReader.js";
|
||||
import { UImageArtifactReader } from "./UImageArtifactReader.js";
|
||||
import { UnityFsArtifactReader } from "./UnityFsArtifactReader.js";
|
||||
import { WxapkgArtifactReader } from "./WxapkgArtifactReader.js";
|
||||
import { ZipArtifactReader } from "./ZipArtifactReader.js";
|
||||
|
||||
/** How inventory describes a format when no reader was constructed. */
|
||||
export type AbsentInventory = "platform" | "universal" | "unavailable" | "root";
|
||||
|
||||
@@ -9,11 +9,11 @@ import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js";
|
||||
import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js";
|
||||
import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js";
|
||||
import { openRegularFile } from "../../filesystem/RegularFile.js";
|
||||
import { ZipArtifactReader } from "../ZipArtifactReader.js";
|
||||
import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
|
||||
import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js";
|
||||
import { asarHeaderBytes } from "../../../tests/fixtures/asarHeader.js";
|
||||
import { extractArtifact } from "./ArtifactExtraction.js";
|
||||
import { ZipArtifactReader } from "../../resources/index.js";
|
||||
|
||||
const zipBytes = async (content?: string): Promise<Buffer> => {
|
||||
const writer = new ZipWriter(new Uint8ArrayWriter());
|
||||
|
||||
@@ -7,7 +7,6 @@ import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirect
|
||||
import { ArtifactProvider } from "../ArtifactProvider.js";
|
||||
import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js";
|
||||
import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js";
|
||||
import { ZipArtifactReader } from "../ZipArtifactReader.js";
|
||||
import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js";
|
||||
import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js";
|
||||
import { projectAnalysisError } from "../../domain/analysisErrorProjection.js";
|
||||
@@ -15,6 +14,7 @@ import {
|
||||
scanCanonicalArtifactInventoryForExtractionInScope,
|
||||
scanCanonicalArtifactInventoryInScope,
|
||||
} from "./scanCanonical.js";
|
||||
import { ZipArtifactReader } from "../../resources/index.js";
|
||||
|
||||
afterEach(() => vi.restoreAllMocks());
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { captureBudgets } from "./CaptureBudgets.js";
|
||||
import { ZipArtifactReader } from "../../artifacts/ZipArtifactReader.js";
|
||||
import {
|
||||
ArtifactReaderFailure,
|
||||
type ArtifactEntry,
|
||||
ZipArtifactReader,
|
||||
} from "../../resources/index.js";
|
||||
import type { WebNetworkCaptureRecord } from "../../domain/webNetworkCapture.js";
|
||||
import { SAZ_CAPTURE_PROVIDER_IDENTITY } from "./CaptureProviderIdentities.js";
|
||||
|
||||
@@ -9,8 +9,8 @@ import {
|
||||
projectStableArtifactFailure,
|
||||
hashStableRootArtifactHandle,
|
||||
assertArtifactFileSelectedSource,
|
||||
ZipArtifactReader,
|
||||
} from "../../../resources/index.js";
|
||||
import { ZipArtifactReader } from "../../../artifacts/ZipArtifactReader.js";
|
||||
import {
|
||||
AnalysisResourceConstraintError,
|
||||
AnalysisUnsupportedTargetError,
|
||||
|
||||
@@ -3,13 +3,13 @@ import { awaitAcknowledgement } from "../../../../tests/fixtures/lifecycleAcknow
|
||||
import { readFile, rename, copyFile } from "node:fs/promises";
|
||||
import { expect, it, vi } from "vitest";
|
||||
import { ArtifactResourceScope } from "../../../resources/ArtifactResourceScope.js";
|
||||
import { ZipArtifactReader } from "../../../artifacts/ZipArtifactReader.js";
|
||||
import { PlaywrightTraceDecoder } from "./PlaywrightTraceDecoder.js";
|
||||
import { PlaywrightTraceService } from "../../../application/playwrightTrace/PlaywrightTraceService.js";
|
||||
import { parseEvidence } from "../../../domain/evidence.js";
|
||||
import { playwrightTraceSchema } from "../../../domain/playwrightTrace/playwrightTrace.js";
|
||||
import { playwrightTraceFixture } from "../../../../tests/fixtures/playwrightTrace.js";
|
||||
import { OwnedFileHandle } from "../../../filesystem/OwnedFileHandle.js";
|
||||
import { ZipArtifactReader } from "../../../resources/index.js";
|
||||
|
||||
it("preserves only fully verified streams when cancellation arrives before the network member", async () => {
|
||||
const fixture = await playwrightTraceFixture();
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
AnalysisCleanupLeaseGroup,
|
||||
ArtifactReaderFailure,
|
||||
type ArtifactEntry,
|
||||
ZipArtifactReader,
|
||||
} from "../resources/index.js";
|
||||
import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js";
|
||||
import { analysisErrorWithCancellation } from "../domain/analysisErrorCancellation.js";
|
||||
@@ -50,7 +51,6 @@ import {
|
||||
} from "../domain/analysisErrorBase.js";
|
||||
import { ProviderCleanupError } from "../domain/providerCleanupError.js";
|
||||
import { err, ok, type Result } from "../domain/result.js";
|
||||
import { ZipArtifactReader } from "../artifacts/ZipArtifactReader.js";
|
||||
import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js";
|
||||
import {
|
||||
NonRegularFileReadError,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { OwnerCancellation } from "../domain/analysisErrorCore.js";
|
||||
import { assertArtifactReadActive } from "./ArtifactFileOperation.js";
|
||||
import {
|
||||
assertArtifactReadActive,
|
||||
ArtifactReaderFailure,
|
||||
copyArtifactEntry,
|
||||
sameArtifactEntry,
|
||||
@@ -8,9 +8,9 @@ import {
|
||||
type ArtifactReader,
|
||||
type ArtifactReaderTraversal,
|
||||
type ArtifactTraversalOptions,
|
||||
ArtifactFileSource,
|
||||
artifactReaderLimitFailure,
|
||||
} from "../resources/index.js";
|
||||
} from "./ArtifactReader.js";
|
||||
import { ArtifactFileSource } from "./ArtifactFileSource.js";
|
||||
import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js";
|
||||
import type { FileHandle } from "node:fs/promises";
|
||||
import { Duplex, PassThrough, type Readable } from "node:stream";
|
||||
import { once } from "node:events";
|
||||
@@ -127,3 +127,9 @@ export {
|
||||
targetDigestChangedFailure,
|
||||
withArtifactTargetIdentity,
|
||||
} from "./withArtifactTargetIdentity.js";
|
||||
export {
|
||||
ZIP_READER_OPTIONS,
|
||||
ZipArtifactReader,
|
||||
decodeZipEntryText,
|
||||
zipEntryPath,
|
||||
} from "./ZipArtifactReader.js";
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
} from "../../../src/android/AndroidJniLibraries.js";
|
||||
import { JadxInterruption } from "../../../src/android/JadxInterruption.js";
|
||||
import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js";
|
||||
import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import {
|
||||
AnalysisCancelledError,
|
||||
AnalysisTimeoutError,
|
||||
@@ -25,6 +24,7 @@ import {
|
||||
import { androidPartialObservationSchema } from "../../../src/domain/android/androidPartialObservation.js";
|
||||
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
|
||||
import { jniElfFixture } from "../../fixtures/android/jniElf.js";
|
||||
import { ZipArtifactReader } from "../../../src/resources/index.js";
|
||||
|
||||
const OPERATION = "inspect_android_jni_bindings";
|
||||
const LIBRARY = "lib/arm64-v8a/libfixture.so";
|
||||
|
||||
@@ -16,7 +16,6 @@ import {
|
||||
import { cliTest } from "../../support/cli/cliFixture.js";
|
||||
|
||||
import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js";
|
||||
import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import { withArtifactClient } from "../../support/artifactClientScope.js";
|
||||
import {
|
||||
artifactExtractionResultSchema,
|
||||
@@ -24,6 +23,7 @@ import {
|
||||
} from "../../../src/domain/artifactGraph.js";
|
||||
import { artifactInspectionResultSchema } from "../../../src/domain/artifactInspection.js";
|
||||
import { parseEvidence } from "../../../src/domain/evidence.js";
|
||||
import { ZipArtifactReader } from "../../../src/resources/index.js";
|
||||
|
||||
cliTest(
|
||||
"inventories and extracts method-93 Zstandard ZIP bytes through the public CLI",
|
||||
|
||||
@@ -8,7 +8,7 @@ import { writeOrderedZip } from "../../fixtures/artifactEntryOrder.js";
|
||||
import { inventoryArtifact } from "../../fixtures/artifactInventory.js";
|
||||
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
|
||||
import type { ArtifactEntry } from "../../../src/resources/ArtifactReader.js";
|
||||
import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import { ZipArtifactReader } from "../../../src/resources/index.js";
|
||||
|
||||
it("retains distinct occurrences when ZIP paths normalize to the same child", async () => {
|
||||
const root = await createTestTempDirectory("rea-zip-relative-duplicates-");
|
||||
|
||||
@@ -34,7 +34,6 @@ import {
|
||||
flutterResultSchemas,
|
||||
type FlutterOperation,
|
||||
} from "../../../src/domain/flutter/flutterBuildAnalysis.js";
|
||||
import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js";
|
||||
import {
|
||||
createFlutterApk as buildApk,
|
||||
@@ -48,6 +47,7 @@ import {
|
||||
realRm,
|
||||
} from "../../fixtures/flutterCleanup.js";
|
||||
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
|
||||
import { ZipArtifactReader } from "../../../src/resources/index.js";
|
||||
|
||||
vi.mock("node:fs", async (importOriginal) => {
|
||||
const original = await importOriginal<typeof import("node:fs")>();
|
||||
|
||||
@@ -10,10 +10,10 @@ import { BunStandaloneArtifactReader } from "../../../src/artifacts/BunStandalon
|
||||
import { DenoStandaloneArtifactReader } from "../../../src/artifacts/DenoStandaloneArtifactReader.js";
|
||||
import { DotnetBundleArtifactReader } from "../../../src/artifacts/DotnetBundleArtifactReader.js";
|
||||
import { MachOSliceArtifactReader } from "../../../src/artifacts/MachOSliceArtifactReader.js";
|
||||
import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import { ok } from "../../../src/domain/result.js";
|
||||
import type { NativeCommandRunner } from "../../../src/providers/NativeCommandRunner.js";
|
||||
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
|
||||
import { ZipArtifactReader } from "../../../src/resources/index.js";
|
||||
|
||||
const injected = vi.hoisted(() => ({
|
||||
opened: undefined as
|
||||
|
||||
@@ -6,11 +6,6 @@ import { Uint8ArrayReader, ZipReader } from "@zip.js/zip.js";
|
||||
import { describe, expect, it } from "vitest";
|
||||
|
||||
import { readZipView } from "../../../src/application/desktop/DesktopZipView.js";
|
||||
import {
|
||||
decodeZipEntryText,
|
||||
ZIP_READER_OPTIONS,
|
||||
zipEntryPath,
|
||||
} from "../../../src/artifacts/ZipArtifactReader.js";
|
||||
import type { DesktopTaskCheck } from "../../../src/domain/desktop/appTask.js";
|
||||
import type { JsonValue } from "../../../src/domain/jsonValue.js";
|
||||
import { detectStateFormat } from "../../../src/domain/desktop/stateFormats.js";
|
||||
@@ -30,6 +25,11 @@ import {
|
||||
pythonFileViews,
|
||||
writeFiles,
|
||||
} from "../../support/desktopExportPython.js";
|
||||
import {
|
||||
decodeZipEntryText,
|
||||
ZIP_READER_OPTIONS,
|
||||
zipEntryPath,
|
||||
} from "../../../src/resources/index.js";
|
||||
|
||||
const MIB = 1024 * 1024;
|
||||
const FIXTURES = join(import.meta.dirname, "../../fixtures/freecad");
|
||||
|
||||
@@ -30,7 +30,6 @@ import {
|
||||
} from "../../../../src/domain/artifactGraph.js";
|
||||
import type { BinaryTarget } from "../../../../src/domain/binaryTargetTypes.js";
|
||||
import type { ArtifactEntry } from "../../../../src/resources/ArtifactReader.js";
|
||||
import { ZipArtifactReader } from "../../../../src/artifacts/ZipArtifactReader.js";
|
||||
import {
|
||||
cArchiveExecutable,
|
||||
pyzArchive,
|
||||
@@ -44,6 +43,7 @@ import {
|
||||
scanArtifactInventory,
|
||||
} from "../../../fixtures/artifactInventory.js";
|
||||
import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js";
|
||||
import { ZipArtifactReader } from "../../../../src/resources/index.js";
|
||||
|
||||
afterEach(() => vi.restoreAllMocks());
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ import { writeFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { TextReader, Uint8ArrayWriter, ZipWriter } from "@zip.js/zip.js";
|
||||
import { expect, it } from "vitest";
|
||||
import { ZipArtifactReader } from "../../../../src/artifacts/ZipArtifactReader.js";
|
||||
import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js";
|
||||
import { ZipArtifactReader } from "../../../../src/resources/index.js";
|
||||
|
||||
it("cancels a ZIP read while its consumer is applying backpressure", async () => {
|
||||
const root = await createTestTempDirectory("rea-zip-backpressure-");
|
||||
|
||||
@@ -12,9 +12,9 @@ vi.mock("node:fs", async (importOriginal) => {
|
||||
});
|
||||
|
||||
import { openRegularFile } from "../../src/filesystem/RegularFile.js";
|
||||
import { ZipArtifactReader } from "../../src/artifacts/ZipArtifactReader.js";
|
||||
import { writeOrderedZip } from "../fixtures/artifactEntryOrder.js";
|
||||
import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js";
|
||||
import { ZipArtifactReader } from "../../src/resources/index.js";
|
||||
|
||||
it("rejects a symlink when O_NOFOLLOW is unavailable and still follows when requested", async () => {
|
||||
const root = await createTestTempDirectory("rea-no-nofollow-");
|
||||
|
||||
Reference in new issue
Block a user