From 264dcd5feece5971d73c21d4a641ea81cf90f654 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 03:44:53 +0800 Subject: [PATCH] refactor(artifacts): break the artifacts-firmware and artifacts-gpu import cycles (#11331) * refactor(domain): move BinaryContainer into src/domain BinaryContainer imports only domain modules and is shared by artifacts, firmware, gpu, go, il2cpp, python, rust and native. Living under src/native made artifacts and firmware import native for its failure types and BinaryReader. Pure move: git mv plus import specifier updates. * refactor(firmware): move the devicetree parser into src/domain/firmware The FIT artifact reader in src/artifacts parses embedded devicetree blobs with the parser that lived under src/firmware, while firmware's providers import src/artifacts: the two units imported each other. The parser and its fixture are pure and now sit beside domain/firmware/devicetree.ts. Pure move: git mv plus import specifier and baseline key updates. * refactor(artifacts): break the artifacts-gpu import cycle (#11335) * refactor(artifacts): move the LZ4 block decoder into src/artifacts Pure move: git mv plus import specifier updates. The next commit removes its GPU-specific budget. * refactor(artifacts): take the LZ4 output budget from the caller decodeLz4Block bounded every decode by the GPU object budget and threw through rejectGpu, so UnityFS decoding in src/artifacts imported src/gpu while gpu imports artifacts. Callers now pass their budget: GPU payloads keep GPU_OBJECT_BYTES; UnityFS passes its 64 MiB block bound, which its size checks already enforce before decoding. Malformed blocks still throw BinaryFormatFailure with the same messages. * test(architecture): drop the artifacts-firmware and artifacts-gpu cycles from the layer baseline * refactor(artifacts): move the PE resource reader into src/artifacts/pe (#11347) refactor(artifacts): move the PE resource layout and parser into src/artifacts/pe The Node SEA and Deno standalone readers in src/artifacts locate PE resources with the layout and parser that lived under src/native/pe, while those modules already read through src/artifacts (ArtifactReaderFailure, assertArtifactReadActive). Pure move: git mv plus import specifier, baseline key and spec path updates. --- docs/development/tool-design.md | 2 +- docs/specs/artifacts/deno-standalone/plan.md | 2 +- scripts/lib/module-layers.baseline.json | 2 - scripts/verify/architecture-guards.mjs | 6 +-- .../baselines/local-limit-error-class.json | 2 +- scripts/verify/baselines/raw-buffer-read.json | 8 ++-- .../PeResourcesService.test.ts | 4 +- src/artifacts/FitArtifactReader.test.ts | 2 +- src/{gpu => artifacts}/Lz4Block.test.ts | 14 +++++-- src/{gpu => artifacts}/Lz4Block.ts | 33 +++++++++++------ src/artifacts/NodeSeaArtifactReader.test.ts | 2 +- src/artifacts/UnityFsStructures.ts | 11 ++++-- src/artifacts/ZipMemberRegion.ts | 2 +- src/artifacts/deno/DenoStandalone.fixture.ts | 2 +- .../deno/DenoStandaloneArtifactReader.test.ts | 2 +- src/artifacts/deno/DenoStandaloneLocation.ts | 2 +- src/artifacts/fit/FitImage.fixture.ts | 2 +- src/artifacts/fit/FitStructure.test.ts | 2 +- src/artifacts/fit/FitStructure.ts | 4 +- .../ArtifactGraphConstruction.test.ts | 2 +- src/artifacts/nodeSea/NodeSea.fixture.ts | 2 +- src/artifacts/nodeSea/NodeSeaLocation.ts | 4 +- .../pe/PeResourceLayout.ts | 4 +- .../pe/PeResourceParser.test.ts | 2 +- .../pe/PeResourceParser.ts | 4 +- .../pe/PeResourceTreeFacts.ts | 0 .../pe/PeResources.fixture.ts | 0 .../binaryContainer.ts} | 6 +-- .../firmware/devicetree.fixture.ts} | 0 .../firmware/devicetreeParser.test.ts} | 6 +-- .../firmware/devicetreeParser.ts} | 7 +--- src/firmware/devicetree/DevicetreeProvider.ts | 5 ++- src/go/GoBinaryImage.ts | 2 +- src/go/GoBinaryProvider.ts | 2 +- src/go/GoBuildInfoSearch.ts | 2 +- src/go/GoStringLiterals.test.ts | 2 +- src/go/GoStringLiterals.ts | 2 +- src/gpu/AmdGpuMetadata.ts | 2 +- src/gpu/ClangOffloadBundle.ts | 2 +- src/gpu/CudaInfo.ts | 2 +- src/gpu/GpuCodeObjectsProvider.ts | 2 +- src/gpu/GpuElfKernels.ts | 2 +- src/gpu/GpuInventory.ts | 2 +- src/gpu/GpuPayloadCodec.ts | 7 ++-- src/gpu/GpuSource.ts | 2 +- src/gpu/PtxKernels.ts | 2 +- src/il2cpp/Il2cppBinaryImage.ts | 2 +- src/il2cpp/Il2cppBinaryRegistration.ts | 2 +- .../AppleDispatchMetadata.failure.test.ts | 2 +- src/native/AppleDispatchMetadata.ts | 2 +- src/native/AppleMachoSelection.test.ts | 2 +- src/native/AppleMachoSelection.ts | 2 +- src/native/AppleObjcCategories.ts | 2 +- src/native/AppleObjcDispatchFacets.ts | 2 +- src/native/AppleSwiftDispatchFacets.ts | 2 +- src/native/android/AndroidJniLibrary.ts | 2 +- src/native/elf/ElfNoteParser.ts | 2 +- src/native/elf/ElfUnwindRangesProvider.ts | 2 +- src/native/elf/KernelModuleParser.test.ts | 2 +- src/native/elf/KernelModuleParser.ts | 2 +- src/native/elf/KernelModuleProvider.ts | 2 +- src/native/exports/NativeExportParser.test.ts | 2 +- src/native/exports/NativeExportParser.ts | 2 +- src/native/exports/NativeExportsProvider.ts | 2 +- .../hardening/BinaryHardeningParsers.test.ts | 2 +- .../hardening/BinaryHardeningProvider.ts | 2 +- src/native/hardening/ElfHardening.ts | 2 +- src/native/hardening/MachoHardening.ts | 2 +- src/native/hardening/PeHardening.ts | 2 +- src/native/initializers/ElfInitializers.ts | 2 +- src/native/initializers/MachoInitializers.ts | 2 +- .../NativeInitializersParsers.test.ts | 6 +-- .../NativeInitializersProvider.ts | 2 +- src/native/metadata/BinaryContainer.test.ts | 2 +- src/native/metadata/ElfImage.ts | 2 +- src/native/metadata/ElfPointerRelocations.ts | 2 +- src/native/metadata/ElfStringTable.test.ts | 2 +- src/native/metadata/ElfStringTable.ts | 2 +- src/native/metadata/MachoImage.ts | 2 +- src/native/metadata/NativeSectionDirectory.ts | 2 +- src/native/metadata/PeImage.test.ts | 2 +- src/native/metadata/PeImage.ts | 2 +- src/native/metadata/readBinaryContainer.ts | 2 +- src/native/pe/PeBinaryFailure.ts | 2 +- src/native/pe/PeCertificateParser.ts | 2 +- src/native/pe/PeCertificatesProvider.ts | 2 +- src/native/pe/PeImportParser.ts | 2 +- src/native/pe/PeLoadConfigParser.ts | 2 +- src/native/pe/PeResourcesProvider.test.ts | 2 +- src/native/pe/PeResourcesProvider.ts | 4 +- src/python/PythonPycParser.ts | 2 +- src/rust/RustBinaryImage.ts | 2 +- .../applications/firmwareComparison.test.ts | 2 +- .../applications/peResources.test.ts | 2 +- .../acceptance/artifactComparisonFit.test.ts | 2 +- tests/acceptance/devicetreeCli.test.ts | 2 +- tests/acceptance/fitImageCli.test.ts | 2 +- .../cli/callerPathSymlinkParentCli.test.ts | 2 +- .../boundary/filesystem/binaryTarget.test.ts | 2 +- .../filesystem/machoCommandAdmission.test.ts | 2 +- tests/boundary/filesystem/peResources.test.ts | 2 +- .../filesystem/pythonBeamCleanup.test.ts | 2 +- .../firmware/devicetreeFinalization.test.ts | 2 +- tests/boundary/go/goBinaryImage.test.ts | 2 +- tests/boundary/go/goBinaryMappings.test.ts | 2 +- tests/boundary/mcp/devicetreeMcp.test.ts | 2 +- .../artifactReadCleanupRetry.test.ts | 2 +- .../native/objcClassMetadataFallback.test.ts | 2 +- .../nativeArtifactFinalization.test.ts | 2 +- .../conformance/formats/mzPeAdmission.test.ts | 4 +- tests/conformance/providerCompletion.test.ts | 4 +- .../peResourcesLifetime.test.ts | 37 ++++++++++--------- .../stableArtifactConsumers.test.ts | 2 +- 113 files changed, 191 insertions(+), 167 deletions(-) rename src/{gpu => artifacts}/Lz4Block.test.ts (54%) rename src/{gpu => artifacts}/Lz4Block.ts (69%) rename src/{native => artifacts}/pe/PeResourceLayout.ts (99%) rename src/{native => artifacts}/pe/PeResourceParser.test.ts (99%) rename src/{native => artifacts}/pe/PeResourceParser.ts (98%) rename src/{native => artifacts}/pe/PeResourceTreeFacts.ts (100%) rename src/{native => artifacts}/pe/PeResources.fixture.ts (100%) rename src/{native/metadata/BinaryContainer.ts => domain/binaryContainer.ts} (99%) rename src/{firmware/devicetree/Devicetree.fixture.ts => domain/firmware/devicetree.fixture.ts} (100%) rename src/{firmware/devicetree/DevicetreeParser.test.ts => domain/firmware/devicetreeParser.test.ts} (98%) rename src/{firmware/devicetree/DevicetreeParser.ts => domain/firmware/devicetreeParser.ts} (98%) diff --git a/docs/development/tool-design.md b/docs/development/tool-design.md index 9c18810faa..121e671104 100644 --- a/docs/development/tool-design.md +++ b/docs/development/tool-design.md @@ -312,7 +312,7 @@ omissions alone explain it; independently proven differences still survive. A byte-format parser reports failure with `ParseFailureError` from `src/domain/parseFailure.ts`: `malformed`, `truncated`, `unsupported`, or `limit`, with the format and, when known, the offset and field. Read bounded -fields through `BinaryReader` (`src/native/metadata/BinaryContainer.ts`), which +fields through `BinaryReader` (`src/domain/binaryContainer.ts`), which raises that failure instead of a bare `RangeError`. Providers project the failure with `parseFailureAnalysisError` rather than their own `instanceof` ladder; a `limit` stays with its producer, which knows the budget to name. diff --git a/docs/specs/artifacts/deno-standalone/plan.md b/docs/specs/artifacts/deno-standalone/plan.md index 3fa5a1d217..b0ea3b54cf 100644 --- a/docs/specs/artifacts/deno-standalone/plan.md +++ b/docs/specs/artifacts/deno-standalone/plan.md @@ -17,7 +17,7 @@ section placement: - `DenoStandaloneLocation.ts` confirms the carrier name before claiming a file. It reads ELF and note headers, walks PE resource directories to the named - payload through `src/native/pe/PeResourceLayout.ts`, and scans Intel trailers + payload through `src/artifacts/pe/PeResourceLayout.ts`, and scans Intel trailers to the slice start so an enclosing app wins over a stored executable. - `DenoSectionLayout.ts` parses metadata JSON, the virtual-filesystem header, specifier, redirect and remote tables, and the npm snapshot length. diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 5215ca4a82..c7c0c50187 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -55,8 +55,6 @@ "application <-> frida", "application <-> providers", "artifacts <-> dotnet", - "artifacts <-> firmware", - "artifacts <-> gpu", "artifacts <-> javascript", "artifacts <-> native", "artifacts <-> process", diff --git a/scripts/verify/architecture-guards.mjs b/scripts/verify/architecture-guards.mjs index 3eea22d2b7..381e86374b 100644 --- a/scripts/verify/architecture-guards.mjs +++ b/scripts/verify/architecture-guards.mjs @@ -514,7 +514,7 @@ checkCounted( ); // Byte-format parsers read untrusted input. Bounds, truncation and failure -// kind belong to BinaryReader (src/native/metadata/BinaryContainer.ts) and +// kind belong to BinaryReader (src/domain/binaryContainer.ts) and // the ParseFailure algebra (src/domain/parseFailure.ts), not to each parser. const PARSER_FOLDERS = [ "src/android/", @@ -564,11 +564,11 @@ const parserFiles = files.filter((file) => // An unchecked Buffer or DataView read throws a bare RangeError past the end, // which a catch site cannot tell from a host stack or string limit. checkCounted( - "raw Buffer or DataView numeric read (use BinaryReader from src/native/metadata/BinaryContainer)", + "raw Buffer or DataView numeric read (use BinaryReader from src/domain/binaryContainer)", "raw-buffer-read", files, /\.(?:read(?:Big)?U?Int(?:8|16|32|64)?(?:LE|BE)?|readBigUint64(?:LE|BE)|readUint(?:8|16|32)(?:LE|BE)?|read(?:Float|Double)(?:LE|BE)|get(?:Big)?(?:Uint|Int)(?:8|16|32|64)|getFloat(?:32|64))\(/gu, - ["src/native/metadata/BinaryContainer.ts"], + ["src/domain/binaryContainer.ts"], ); // An input fault is a ParseFailureError; a broken internal assumption is a diff --git a/scripts/verify/baselines/local-limit-error-class.json b/scripts/verify/baselines/local-limit-error-class.json index 2ce8f6defb..64af8e8c99 100644 --- a/scripts/verify/baselines/local-limit-error-class.json +++ b/scripts/verify/baselines/local-limit-error-class.json @@ -1,7 +1,7 @@ { "src/browser/WebSourceMapFetcher.ts": 1, "src/captures/parseFieldDiscovery.ts": 1, - "src/firmware/devicetree/DevicetreeParser.ts": 1, + "src/domain/firmware/devicetreeParser.ts": 1, "src/signals/SigrokRecordingProvider.ts": 1, "src/signals/parseDecoderDiscovery.ts": 1, "src/v8/V8CodeCache.errors.ts": 1 diff --git a/scripts/verify/baselines/raw-buffer-read.json b/scripts/verify/baselines/raw-buffer-read.json index d9ca11d2de..8000f2b6da 100644 --- a/scripts/verify/baselines/raw-buffer-read.json +++ b/scripts/verify/baselines/raw-buffer-read.json @@ -20,6 +20,9 @@ "src/artifacts/fit/FitStructure.ts": 3, "src/artifacts/nodeSea/NodeSeaBlob.ts": 4, "src/artifacts/nodeSea/NodeSeaLocation.ts": 2, + "src/artifacts/pe/PeResourceLayout.ts": 3, + "src/artifacts/pe/PeResourceParser.ts": 11, + "src/artifacts/pe/PeResourceTreeFacts.ts": 9, "src/artifacts/pyinstaller/CArchiveLayout.ts": 8, "src/artifacts/pyinstaller/PyzArchive.ts": 1, "src/browser/PngVisualDiff.ts": 7, @@ -45,6 +48,7 @@ "src/domain/elfRelocation.ts": 6, "src/domain/elfSectionHeader.ts": 6, "src/domain/elfSymbol.ts": 8, + "src/domain/firmware/devicetreeParser.ts": 4, "src/domain/firmware/fitImage.ts": 1, "src/domain/gamecubeDol.ts": 6, "src/domain/godotPckFormat.ts": 5, @@ -83,7 +87,6 @@ "src/dotnet/ManagedPeReader.ts": 5, "src/dotnet/ManagedTypeDefinitionRows.ts": 1, "src/erlang/BeamParser.ts": 3, - "src/firmware/devicetree/DevicetreeParser.ts": 4, "src/flutter/DartElf.ts": 2, "src/ghidra/GhidraLoadImageValues.ts": 1, "src/ghidra/extensions/GhidraExtensions.ts": 1, @@ -123,9 +126,6 @@ "src/native/pe/PeCertificateAsn1.ts": 2, "src/native/pe/PeCertificateParser.ts": 3, "src/native/pe/PeLoadConfigParser.ts": 7, - "src/native/pe/PeResourceLayout.ts": 3, - "src/native/pe/PeResourceParser.ts": 11, - "src/native/pe/PeResourceTreeFacts.ts": 9, "src/native/pwndbg/CoreFileMappingAuthority.ts": 1, "src/native/pwntools/PwntoolsRecordedCrashProvider.ts": 1, "src/native/pwntools/RecordedCrashSourceBindings.ts": 6, diff --git a/src/application/binaryDiagnostics/PeResourcesService.test.ts b/src/application/binaryDiagnostics/PeResourcesService.test.ts index 7457c8bb91..355110a195 100644 --- a/src/application/binaryDiagnostics/PeResourcesService.test.ts +++ b/src/application/binaryDiagnostics/PeResourcesService.test.ts @@ -3,8 +3,8 @@ import { expect, it } from "vitest"; import { PeResourcesService } from "./PeResourcesService.js"; import { PE_RESOURCES_PROVIDER } from "../../domain/investigationProviders.js"; import { inspectPeResourcesInputSchema } from "../../domain/native/peResources.js"; -import { parsePeResources } from "../../native/pe/PeResourceParser.js"; -import { peResourceFixture } from "../../native/pe/PeResources.fixture.js"; +import { parsePeResources } from "../../artifacts/pe/PeResourceParser.js"; +import { peResourceFixture } from "../../artifacts/pe/PeResources.fixture.js"; import { ok } from "../../domain/result.js"; import { parseEvidence } from "../../domain/evidence.js"; import { diff --git a/src/artifacts/FitArtifactReader.test.ts b/src/artifacts/FitArtifactReader.test.ts index af994fc215..a40ffbd58b 100644 --- a/src/artifacts/FitArtifactReader.test.ts +++ b/src/artifacts/FitArtifactReader.test.ts @@ -22,7 +22,7 @@ import { import { cells, devicetreeFixture, -} from "../firmware/devicetree/Devicetree.fixture.js"; +} from "../domain/firmware/devicetree.fixture.js"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; import { scanCanonicalArtifactInventory } from "../../tests/fixtures/artifactInventory.js"; diff --git a/src/gpu/Lz4Block.test.ts b/src/artifacts/Lz4Block.test.ts similarity index 54% rename from src/gpu/Lz4Block.test.ts rename to src/artifacts/Lz4Block.test.ts index 82af83fdb6..783983a0c5 100644 --- a/src/gpu/Lz4Block.test.ts +++ b/src/artifacts/Lz4Block.test.ts @@ -1,21 +1,29 @@ import { expect, it } from "vitest"; +import { BinaryResourceFailure } from "../domain/binaryContainer.js"; import { decodeLz4Block } from "./Lz4Block.js"; it("decodes overlapping matches by repeating the newly produced pattern", async () => { // The initial match is the same overlap shape observed in nvcc 12.9 speed-mode PTX. const input = Buffer.from("3c0a2f2f0300504142434445", "hex"); - expect((await decodeLz4Block(input, 24)).toString()).toBe( + expect((await decodeLz4Block(input, 24, 24)).toString()).toBe( "\n//".repeat(6) + "\nABCDE", ); }); it.each(["10000000", "10000100", "f0ff", "f001", "00"])( "rejects malformed or mismatched block %s", async (hex) => { - await expect(decodeLz4Block(Buffer.from(hex, "hex"), 8)).rejects.toThrow(); + await expect( + decodeLz4Block(Buffer.from(hex, "hex"), 8, 8), + ).rejects.toThrow(); }, ); it("preserves an already-aborted caller's cancellation", async () => { const signal = AbortSignal.abort("caller stopped"); await expect( - decodeLz4Block(Buffer.from("10aa", "hex"), 1, signal), + decodeLz4Block(Buffer.from("10aa", "hex"), 1, 1, signal), ).rejects.toMatchObject({ reason: "cancelled" }); }); +it("refuses a declared length above the caller's output budget", async () => { + const refusal = decodeLz4Block(Buffer.from("10aa", "hex"), 9, 8); + await expect(refusal).rejects.toBeInstanceOf(BinaryResourceFailure); + await expect(refusal).rejects.toMatchObject({ maximum_bytes: 8 }); +}); diff --git a/src/gpu/Lz4Block.ts b/src/artifacts/Lz4Block.ts similarity index 69% rename from src/gpu/Lz4Block.ts rename to src/artifacts/Lz4Block.ts index 2cfab3e948..de63e75906 100644 --- a/src/gpu/Lz4Block.ts +++ b/src/artifacts/Lz4Block.ts @@ -1,21 +1,30 @@ import { scheduler } from "node:timers/promises"; -import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { GPU_OBJECT_BYTES, rejectGpu } from "./GpuSource.js"; -import { BinaryResourceFailure } from "../native/metadata/BinaryContainer.js"; -/** Raw LZ4 blocks used by CUDA's 0x2000 mode; not an LZ4 frame decoder. */ +import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; +import { + BinaryFormatFailure, + BinaryResourceFailure, +} from "../domain/binaryContainer.js"; +const rejectLz4 = (message: string): never => { + throw new BinaryFormatFailure("malformed", message); +}; +/** + * Raw LZ4 blocks (CUDA's 0x2000 mode, UnityFS blocks); not an LZ4 frame + * decoder. `maximumBytes` is the caller's decoded-output budget. + */ export const decodeLz4Block = async ( input: Buffer, expected: number, + maximumBytes: number, signal?: AbortSignal, ): Promise => { if ( !Number.isSafeInteger(expected) || expected < 0 || - expected > GPU_OBJECT_BYTES + expected > maximumBytes ) throw new BinaryResourceFailure( "structure", - GPU_OBJECT_BYTES, + maximumBytes, "LZ4 decoded length exceeds the object budget", ); const output = Buffer.alloc(expected); @@ -23,7 +32,7 @@ export const decodeLz4Block = async ( write = 0, checkpoint = 0; const byte = (): number => { - if (read >= input.length) return rejectGpu("Truncated LZ4 block"); + if (read >= input.length) return rejectLz4("Truncated LZ4 block"); return input[read++]!; }; const length = (nibble: number, remaining: number): number => { @@ -33,11 +42,11 @@ export const decodeLz4Block = async ( do { extra = byte(); if (extra > remaining - total) - rejectGpu("LZ4 length exceeds its declared output"); + rejectLz4("LZ4 length exceeds its declared output"); total += extra; } while (extra === 255); } - if (total > remaining) rejectGpu("LZ4 length exceeds its declared output"); + if (total > remaining) rejectLz4("LZ4 length exceeds its declared output"); return total; }; while (read < input.length) { @@ -49,14 +58,14 @@ export const decodeLz4Block = async ( const token = byte(); const literals = length(token >>> 4, expected - write); if (literals > input.length - read) - rejectGpu("LZ4 literals exceed their encoded input"); + rejectLz4("LZ4 literals exceed their encoded input"); input.copy(output, write, read, read + literals); read += literals; write += literals; if (read === input.length) break; const distance = byte() | (byte() << 8); if (distance === 0 || distance > write) - rejectGpu("LZ4 match has an invalid backward distance"); + rejectLz4("LZ4 match has an invalid backward distance"); const match = length(token & 15, expected - write - 4) + 4; let copied = Math.min(distance, match); output.copy(output, write, write - distance, write - distance + copied); @@ -69,7 +78,7 @@ export const decodeLz4Block = async ( write += match; } if (write !== expected) - rejectGpu("LZ4 decoded length disagrees with its declaration"); + rejectLz4("LZ4 decoded length disagrees with its declaration"); assertArtifactReadActive(signal); return output; }; diff --git a/src/artifacts/NodeSeaArtifactReader.test.ts b/src/artifacts/NodeSeaArtifactReader.test.ts index ddea5b017f..813e6f4e25 100644 --- a/src/artifacts/NodeSeaArtifactReader.test.ts +++ b/src/artifacts/NodeSeaArtifactReader.test.ts @@ -32,7 +32,7 @@ import { nodeSeaUniversal, } from "./nodeSea/NodeSea.fixture.js"; import { elfNote, elfNoteFixture } from "../native/elf/ElfNotes.fixture.js"; -import { peResourceFixture } from "../native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "./pe/PeResources.fixture.js"; import { locateNodeSea } from "./nodeSea/NodeSeaLocation.js"; import { MAX_INSPECT_PE_FILE_BYTES } from "../domain/native/peResources.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; diff --git a/src/artifacts/UnityFsStructures.ts b/src/artifacts/UnityFsStructures.ts index 8f92c8a2e6..54604ee277 100644 --- a/src/artifacts/UnityFsStructures.ts +++ b/src/artifacts/UnityFsStructures.ts @@ -2,11 +2,11 @@ import { Budget } from "../domain/budget.js"; import type { FileHandle } from "node:fs/promises"; import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { readArtifactFileBytes } from "./ArtifactFileRange.js"; -import { decodeLz4Block } from "../gpu/Lz4Block.js"; +import { decodeLz4Block } from "./Lz4Block.js"; import { BinaryFormatFailure, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { assertArtifactReadActive } from "./ArtifactFileOperation.js"; import { setImmediate } from "node:timers/promises"; import { @@ -229,7 +229,12 @@ export const decodeUnityFsLz4 = async ( signal?: AbortSignal, ): Promise => { try { - return await decodeLz4Block(encoded, expected, signal); + return await decodeLz4Block( + encoded, + expected, + MAX_BLOCK_UNCOMPRESSED_BYTES, + signal, + ); } catch (cause: unknown) { if (cause instanceof ArtifactReaderFailure) throw cause; if (cause instanceof BinaryResourceFailure) diff --git a/src/artifacts/ZipMemberRegion.ts b/src/artifacts/ZipMemberRegion.ts index e39ad0e5e7..7dd1e5e366 100644 --- a/src/artifacts/ZipMemberRegion.ts +++ b/src/artifacts/ZipMemberRegion.ts @@ -1,4 +1,4 @@ -import { BinaryReader } from "../native/metadata/BinaryContainer.js"; +import { BinaryReader } from "../domain/binaryContainer.js"; import { apkSigningPairEnd, APK_SIGNING_BLOCK_MAX_PAIRS, diff --git a/src/artifacts/deno/DenoStandalone.fixture.ts b/src/artifacts/deno/DenoStandalone.fixture.ts index d8717903cc..a5b14ca1bb 100644 --- a/src/artifacts/deno/DenoStandalone.fixture.ts +++ b/src/artifacts/deno/DenoStandalone.fixture.ts @@ -1,5 +1,5 @@ import { elfNote, elfNoteFixture } from "../../native/elf/ElfNotes.fixture.js"; -import { peResourceFixture } from "../../native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../pe/PeResources.fixture.js"; // https://github.com/denoland/deno/blob/v2.9.8/cli/lib/standalone/binary.rs // declares this section marker. diff --git a/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts b/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts index ba621f23e8..19b93b4233 100644 --- a/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts +++ b/src/artifacts/deno/DenoStandaloneArtifactReader.test.ts @@ -13,7 +13,7 @@ import { MAX_INSPECT_ELF_NOTE_FILE_BYTES, } from "../../domain/native/elfNotes.js"; import { MAX_INSPECT_PE_FILE_BYTES } from "../../domain/native/peResources.js"; -import { peResourceFixture } from "../../native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../pe/PeResources.fixture.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { scanCanonicalArtifactInventory } from "../../../tests/fixtures/artifactInventory.js"; import { artifactFormatDescriptor } from "../artifactFormats.js"; diff --git a/src/artifacts/deno/DenoStandaloneLocation.ts b/src/artifacts/deno/DenoStandaloneLocation.ts index 753e8b92c1..b3c2f50d27 100644 --- a/src/artifacts/deno/DenoStandaloneLocation.ts +++ b/src/artifacts/deno/DenoStandaloneLocation.ts @@ -41,7 +41,7 @@ import { } from "../apple/MachoLoadCommandReader.js"; import { abortIfNeeded } from "../ArtifactHash.js"; import { ArtifactReaderFailure } from "../ArtifactReader.js"; -import { locatePeResourcePayloads } from "../../native/pe/PeResourceLayout.js"; +import { locatePeResourcePayloads } from "../pe/PeResourceLayout.js"; import { DENO_SECTION_MAGIC } from "./DenoSectionLayout.js"; const CPU_TYPE_ARM64 = 0x0100000c; diff --git a/src/artifacts/fit/FitImage.fixture.ts b/src/artifacts/fit/FitImage.fixture.ts index c7c07eaebd..f5bf513f0a 100644 --- a/src/artifacts/fit/FitImage.fixture.ts +++ b/src/artifacts/fit/FitImage.fixture.ts @@ -6,7 +6,7 @@ import { devicetreeFixture, dtString, type FixtureNode, -} from "../../firmware/devicetree/Devicetree.fixture.js"; +} from "../../domain/firmware/devicetree.fixture.js"; /** One /images node; `hashes` names algorithms whose values the fixture computes. */ export interface FitFixtureImage { diff --git a/src/artifacts/fit/FitStructure.test.ts b/src/artifacts/fit/FitStructure.test.ts index 55d0aaa021..13a8592f86 100644 --- a/src/artifacts/fit/FitStructure.test.ts +++ b/src/artifacts/fit/FitStructure.test.ts @@ -5,7 +5,7 @@ import { devicetreeFixture, dtString, type FixtureNode, -} from "../../firmware/devicetree/Devicetree.fixture.js"; +} from "../../domain/firmware/devicetree.fixture.js"; import { FIT_EMBEDDED, FIT_KERNEL, diff --git a/src/artifacts/fit/FitStructure.ts b/src/artifacts/fit/FitStructure.ts index 23d05294ad..539502de45 100644 --- a/src/artifacts/fit/FitStructure.ts +++ b/src/artifacts/fit/FitStructure.ts @@ -18,8 +18,8 @@ import { import { DevicetreeLimitFailure, parseDevicetree, -} from "../../firmware/devicetree/DevicetreeParser.js"; -import { BinaryFormatFailure } from "../../native/metadata/BinaryContainer.js"; +} from "../../domain/firmware/devicetreeParser.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { ArtifactReaderFailure } from "../ArtifactReader.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; diff --git a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts index 5f45b3cb5e..a70fe8f666 100644 --- a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts +++ b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts @@ -41,7 +41,7 @@ import { esp8266Image, espImage, } from "../../../tests/fixtures/espImage.js"; -import { devicetreeFixture } from "../../firmware/devicetree/Devicetree.fixture.js"; +import { devicetreeFixture } from "../../domain/firmware/devicetree.fixture.js"; import { fitFixture } from "../fit/FitImage.fixture.js"; it("joins only observed PE signature bytes across stream chunks", () => { diff --git a/src/artifacts/nodeSea/NodeSea.fixture.ts b/src/artifacts/nodeSea/NodeSea.fixture.ts index 79300bb06f..5b4ea72e3e 100644 --- a/src/artifacts/nodeSea/NodeSea.fixture.ts +++ b/src/artifacts/nodeSea/NodeSea.fixture.ts @@ -1,5 +1,5 @@ import { elfNote, elfNoteFixture } from "../../native/elf/ElfNotes.fixture.js"; -import { peResourceFixture } from "../../native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../pe/PeResources.fixture.js"; /** Node 24 SEA blob magic: https://github.com/nodejs/node/blob/v24.12.0/src/node_sea.h */ export const NODE_SEA_FIXTURE_MAGIC = 0x143da20; diff --git a/src/artifacts/nodeSea/NodeSeaLocation.ts b/src/artifacts/nodeSea/NodeSeaLocation.ts index 572b9ad5b2..535d64fab3 100644 --- a/src/artifacts/nodeSea/NodeSeaLocation.ts +++ b/src/artifacts/nodeSea/NodeSeaLocation.ts @@ -10,11 +10,11 @@ import { readElfProgramHeader } from "../../domain/elfProgramHeader.js"; import { readElfRawTableDeclarations } from "../../domain/elfRawTableDeclarations.js"; import { createHash } from "node:crypto"; import { constants as bufferConstants } from "node:buffer"; -import { parsePeResources } from "../../native/pe/PeResourceParser.js"; +import { parsePeResources } from "../pe/PeResourceParser.js"; import { hasPeResourceName, readPeResourceLayout, -} from "../../native/pe/PeResourceLayout.js"; +} from "../pe/PeResourceLayout.js"; import { MAX_INSPECT_PE_FILE_BYTES, MAX_INSPECT_PE_DIRECTORY_ENTRIES, diff --git a/src/native/pe/PeResourceLayout.ts b/src/artifacts/pe/PeResourceLayout.ts similarity index 99% rename from src/native/pe/PeResourceLayout.ts rename to src/artifacts/pe/PeResourceLayout.ts index 0364f5916f..abe83a485d 100644 --- a/src/native/pe/PeResourceLayout.ts +++ b/src/artifacts/pe/PeResourceLayout.ts @@ -7,10 +7,10 @@ import { readPeResourceNameFacts, } from "./PeResourceTreeFacts.js"; import { parseMzHeaderEvidence } from "../../domain/dosMz.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readPeCoffHeader } from "../../domain/peCoffHeader.js"; import { readPeSectionHeader } from "../../domain/peSectionHeader.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../ArtifactReader.js"; import { readPeOptionalHeaderStructure, type PeOptionalHeaderFailure, diff --git a/src/native/pe/PeResourceParser.test.ts b/src/artifacts/pe/PeResourceParser.test.ts similarity index 99% rename from src/native/pe/PeResourceParser.test.ts rename to src/artifacts/pe/PeResourceParser.test.ts index 3107908ba2..7a25f746d2 100644 --- a/src/native/pe/PeResourceParser.test.ts +++ b/src/artifacts/pe/PeResourceParser.test.ts @@ -1,5 +1,5 @@ import { dosMz, nonPeWindowsMz } from "../../domain/binaryTarget.fixture.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { ArtifactReaderFailure } from "../ArtifactReader.js"; import { createHash } from "node:crypto"; import { describe, expect, it } from "vitest"; import { diff --git a/src/native/pe/PeResourceParser.ts b/src/artifacts/pe/PeResourceParser.ts similarity index 98% rename from src/native/pe/PeResourceParser.ts rename to src/artifacts/pe/PeResourceParser.ts index e25df7ec6f..7f2aa002c3 100644 --- a/src/native/pe/PeResourceParser.ts +++ b/src/artifacts/pe/PeResourceParser.ts @@ -9,8 +9,8 @@ import { } from "./PeResourceTreeFacts.js"; import { createHash } from "node:crypto"; import { setImmediate } from "node:timers/promises"; -import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; +import { assertArtifactReadActive } from "../ArtifactFileOperation.js"; +import { ArtifactReaderFailure } from "../ArtifactReader.js"; import type { ArtifactLimitBoundary } from "../../domain/artifactOperationError.js"; import { jsonParts } from "../../domain/jsonSerialization.js"; import type { diff --git a/src/native/pe/PeResourceTreeFacts.ts b/src/artifacts/pe/PeResourceTreeFacts.ts similarity index 100% rename from src/native/pe/PeResourceTreeFacts.ts rename to src/artifacts/pe/PeResourceTreeFacts.ts diff --git a/src/native/pe/PeResources.fixture.ts b/src/artifacts/pe/PeResources.fixture.ts similarity index 100% rename from src/native/pe/PeResources.fixture.ts rename to src/artifacts/pe/PeResources.fixture.ts diff --git a/src/native/metadata/BinaryContainer.ts b/src/domain/binaryContainer.ts similarity index 99% rename from src/native/metadata/BinaryContainer.ts rename to src/domain/binaryContainer.ts index a529605458..fd2d78ccf1 100644 --- a/src/native/metadata/BinaryContainer.ts +++ b/src/domain/binaryContainer.ts @@ -2,9 +2,9 @@ import { resolveMappedFileOffset, type FileMapping, type ZeroFillMapping, -} from "../../domain/virtualFileMapping.js"; -import type { PeDataDirectory } from "../../domain/peOptionalHeader.js"; -import { decodeLimit, ParseFailureError } from "../../domain/parseFailure.js"; +} from "./virtualFileMapping.js"; +import type { PeDataDirectory } from "./peOptionalHeader.js"; +import { decodeLimit, ParseFailureError } from "./parseFailure.js"; /** Native container facts a format failure can name. */ interface BinaryFormatFailureFacts { diff --git a/src/firmware/devicetree/Devicetree.fixture.ts b/src/domain/firmware/devicetree.fixture.ts similarity index 100% rename from src/firmware/devicetree/Devicetree.fixture.ts rename to src/domain/firmware/devicetree.fixture.ts diff --git a/src/firmware/devicetree/DevicetreeParser.test.ts b/src/domain/firmware/devicetreeParser.test.ts similarity index 98% rename from src/firmware/devicetree/DevicetreeParser.test.ts rename to src/domain/firmware/devicetreeParser.test.ts index 8be6519d66..3b1f205dee 100644 --- a/src/firmware/devicetree/DevicetreeParser.test.ts +++ b/src/domain/firmware/devicetreeParser.test.ts @@ -3,14 +3,14 @@ import { createHash } from "node:crypto"; import { devicetreeSchema, inspectDevicetreeInputSchema, -} from "../../domain/firmware/devicetree.js"; -import { DevicetreeLimitFailure, parseDevicetree } from "./DevicetreeParser.js"; +} from "./devicetree.js"; +import { DevicetreeLimitFailure, parseDevicetree } from "./devicetreeParser.js"; import { cells, devicetreeFixture, emptyStringsAtReservationBoundaryFixture, type FixtureNode, -} from "./Devicetree.fixture.js"; +} from "./devicetree.fixture.js"; const parse = (b: Buffer, limits = {}) => parseDevicetree( b, diff --git a/src/firmware/devicetree/DevicetreeParser.ts b/src/domain/firmware/devicetreeParser.ts similarity index 98% rename from src/firmware/devicetree/DevicetreeParser.ts rename to src/domain/firmware/devicetreeParser.ts index 6120bab4aa..b759172b01 100644 --- a/src/firmware/devicetree/DevicetreeParser.ts +++ b/src/domain/firmware/devicetreeParser.ts @@ -1,8 +1,5 @@ -import type { - Devicetree, - InspectDevicetreeInput, -} from "../../domain/firmware/devicetree.js"; -import { BinaryFormatFailure } from "../../native/metadata/BinaryContainer.js"; +import type { Devicetree, InspectDevicetreeInput } from "./devicetree.js"; +import { BinaryFormatFailure } from "../binaryContainer.js"; export class DevicetreeLimitFailure extends Error { constructor( diff --git a/src/firmware/devicetree/DevicetreeProvider.ts b/src/firmware/devicetree/DevicetreeProvider.ts index be4d5e3499..4e25d12d8e 100644 --- a/src/firmware/devicetree/DevicetreeProvider.ts +++ b/src/firmware/devicetree/DevicetreeProvider.ts @@ -26,7 +26,10 @@ import { } from "../../domain/firmware/devicetree.js"; import { err, ok } from "../../domain/result.js"; import { DEVICETREE_PROVIDER } from "../../domain/investigationProviders.js"; -import { DevicetreeLimitFailure, parseDevicetree } from "./DevicetreeParser.js"; +import { + DevicetreeLimitFailure, + parseDevicetree, +} from "../../domain/firmware/devicetreeParser.js"; const OPERATION = "inspect_devicetree"; diff --git a/src/go/GoBinaryImage.ts b/src/go/GoBinaryImage.ts index f69da8d172..436df999c2 100644 --- a/src/go/GoBinaryImage.ts +++ b/src/go/GoBinaryImage.ts @@ -12,7 +12,7 @@ import { imageFileMappings, isZeroFilledSpan, type BinaryContainer, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { readBinaryContainer } from "../native/metadata/readBinaryContainer.js"; import { goAnalysisBudgets, diff --git a/src/go/GoBinaryProvider.ts b/src/go/GoBinaryProvider.ts index 911aa42273..88a3d9f987 100644 --- a/src/go/GoBinaryProvider.ts +++ b/src/go/GoBinaryProvider.ts @@ -40,7 +40,7 @@ import { fixedAllowanceOptions } from "../domain/fixedAllowanceRemediation.js"; import { err, ok, type Result } from "../domain/result.js"; import { readGoBinaryImage, type GoBinaryImage } from "./GoBinaryImage.js"; import { requireSelectedNativeImage } from "../native/metadata/MachoSliceSelection.js"; -import { BinaryResourceFailure } from "../native/metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../domain/binaryContainer.js"; const OPERATION = "inspect_go_binary"; diff --git a/src/go/GoBuildInfoSearch.ts b/src/go/GoBuildInfoSearch.ts index a5bf908ec7..4ca11a471f 100644 --- a/src/go/GoBuildInfoSearch.ts +++ b/src/go/GoBuildInfoSearch.ts @@ -4,7 +4,7 @@ import { BinaryReader, mappedFileOffset, type BinaryContainer, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { firstKeyed, keyedBy, uniqueKeyed } from "../domain/keyedCollection.js"; export interface GoBuildInfoSearchRange extends FileMapping { diff --git a/src/go/GoStringLiterals.test.ts b/src/go/GoStringLiterals.test.ts index f59895536c..02f93f01eb 100644 --- a/src/go/GoStringLiterals.test.ts +++ b/src/go/GoStringLiterals.test.ts @@ -5,7 +5,7 @@ import type { BinaryContainer, ImageSection, LoadRegion, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { createGoRodataStringFixture } from "../../tests/fixtures/go/rodataStringImage.js"; import { readGoBinaryImage } from "./GoBinaryImage.js"; import { recoverGoStringLiterals } from "./GoStringLiterals.js"; diff --git a/src/go/GoStringLiterals.ts b/src/go/GoStringLiterals.ts index 0130355185..1304d46271 100644 --- a/src/go/GoStringLiterals.ts +++ b/src/go/GoStringLiterals.ts @@ -14,7 +14,7 @@ import { type BinaryContainer, type FileMappingIndex, type LoadRegion, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; const MAX_REJECTED_SLICE_CACHE = 4096; const PE_MEM_READ = 0x40000000; diff --git a/src/gpu/AmdGpuMetadata.ts b/src/gpu/AmdGpuMetadata.ts index a506ecbbf1..8eaf4b2e97 100644 --- a/src/gpu/AmdGpuMetadata.ts +++ b/src/gpu/AmdGpuMetadata.ts @@ -3,7 +3,7 @@ import { decode } from "@msgpack/msgpack"; import { BinaryResourceFailure, BinaryFormatFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { rejectGpu } from "./GpuSource.js"; export const AMD_METADATA_BYTES = 8 * 1024 * 1024; diff --git a/src/gpu/ClangOffloadBundle.ts b/src/gpu/ClangOffloadBundle.ts index 8ad96a071e..9a9e568c07 100644 --- a/src/gpu/ClangOffloadBundle.ts +++ b/src/gpu/ClangOffloadBundle.ts @@ -4,7 +4,7 @@ import type { GpuObject } from "../domain/gpu/gpuCodeObjects.js"; import { BinaryFormatFailure, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; import { gpuCount, diff --git a/src/gpu/CudaInfo.ts b/src/gpu/CudaInfo.ts index 128844d9a4..33f8c52d55 100644 --- a/src/gpu/CudaInfo.ts +++ b/src/gpu/CudaInfo.ts @@ -1,7 +1,7 @@ import { BinaryReader, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { GPU_OBJECT_BYTES, GPU_REPORT_BYTES, rejectGpu } from "./GpuSource.js"; import { Budget } from "../domain/budget.js"; import { jsonValueByteLength } from "../domain/jsonValueByteLength.js"; diff --git a/src/gpu/GpuCodeObjectsProvider.ts b/src/gpu/GpuCodeObjectsProvider.ts index 0635134ae8..40c771a207 100644 --- a/src/gpu/GpuCodeObjectsProvider.ts +++ b/src/gpu/GpuCodeObjectsProvider.ts @@ -36,7 +36,7 @@ import { artifactFileCompletion, } from "../artifacts/ArtifactFileOperation.js"; import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js"; -import { BinaryResourceFailure } from "../native/metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../domain/binaryContainer.js"; import { GpuFileSource, gpuCount, diff --git a/src/gpu/GpuElfKernels.ts b/src/gpu/GpuElfKernels.ts index ffb5e44b98..ac6260f1d9 100644 --- a/src/gpu/GpuElfKernels.ts +++ b/src/gpu/GpuElfKernels.ts @@ -17,7 +17,7 @@ import { BinaryReader, BinaryFormatFailure, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { readElfSectionDirectory, type NativeSection, diff --git a/src/gpu/GpuInventory.ts b/src/gpu/GpuInventory.ts index 8272753347..ab4e72a1e5 100644 --- a/src/gpu/GpuInventory.ts +++ b/src/gpu/GpuInventory.ts @@ -23,7 +23,7 @@ import { BinaryFormatFailure, BinaryResourceFailure, isBinaryStringReadLimit, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { readElfSectionDirectory, readPeSectionDirectory, diff --git a/src/gpu/GpuPayloadCodec.ts b/src/gpu/GpuPayloadCodec.ts index 29248d5ecc..c58af14b87 100644 --- a/src/gpu/GpuPayloadCodec.ts +++ b/src/gpu/GpuPayloadCodec.ts @@ -2,8 +2,8 @@ import { nodeCodecResult } from "../compression/NodeCodecResult.js"; import { constants, inflate, zstdDecompress } from "node:zlib"; import { promisify } from "node:util"; import { assertArtifactReadActive } from "../artifacts/ArtifactFileOperation.js"; -import { decodeLz4Block } from "./Lz4Block.js"; -import { rejectGpu } from "./GpuSource.js"; +import { decodeLz4Block } from "../artifacts/Lz4Block.js"; +import { GPU_OBJECT_BYTES, rejectGpu } from "./GpuSource.js"; const unzip = promisify(inflate); const unzstd = promisify(zstdDecompress); /** Completed codec bytes and their encoded extent share one completion owner. */ @@ -47,7 +47,8 @@ export const decodeGpuPayload = async ( signal?: AbortSignal, ): Promise => { assertArtifactReadActive(signal); - if (compression === "lz4") return decodeLz4Block(bytes, expected, signal); + if (compression === "lz4") + return decodeLz4Block(bytes, expected, GPU_OBJECT_BYTES, signal); const decoded = await decodeGpuPayloadStream( bytes, compression, diff --git a/src/gpu/GpuSource.ts b/src/gpu/GpuSource.ts index 2745b267f7..0d5153c79c 100644 --- a/src/gpu/GpuSource.ts +++ b/src/gpu/GpuSource.ts @@ -5,7 +5,7 @@ import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { BinaryFormatFailure, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import type { NativeReadRequest, NativeSectionDirectory, diff --git a/src/gpu/PtxKernels.ts b/src/gpu/PtxKernels.ts index 9de263787c..a0aab66d90 100644 --- a/src/gpu/PtxKernels.ts +++ b/src/gpu/PtxKernels.ts @@ -1,7 +1,7 @@ import { BinaryFormatFailure, BinaryResourceFailure, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import type { GpuKernel } from "../domain/gpu/gpuCodeObjects.js"; import { GPU_REPORT_BYTES, rejectGpu } from "./GpuSource.js"; interface Token { diff --git a/src/il2cpp/Il2cppBinaryImage.ts b/src/il2cpp/Il2cppBinaryImage.ts index 78e60f46e4..fef7278319 100644 --- a/src/il2cpp/Il2cppBinaryImage.ts +++ b/src/il2cpp/Il2cppBinaryImage.ts @@ -13,7 +13,7 @@ import { isZeroFilledSpan, type BinaryContainer, type FileMappingIndex, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { readBinaryContainer } from "../native/metadata/readBinaryContainer.js"; import { requireSelectedNativeImage, diff --git a/src/il2cpp/Il2cppBinaryRegistration.ts b/src/il2cpp/Il2cppBinaryRegistration.ts index 15974b4229..0ecb015425 100644 --- a/src/il2cpp/Il2cppBinaryRegistration.ts +++ b/src/il2cpp/Il2cppBinaryRegistration.ts @@ -1,7 +1,7 @@ import { BinaryFormatFailure, mappedFileOffset, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { Il2cppBinaryFormatFailure } from "./Il2cppBinaryFormat.js"; import { isMapped, diff --git a/src/native/AppleDispatchMetadata.failure.test.ts b/src/native/AppleDispatchMetadata.failure.test.ts index f60cdd100a..342414fb30 100644 --- a/src/native/AppleDispatchMetadata.failure.test.ts +++ b/src/native/AppleDispatchMetadata.failure.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js"; import { appleDispatchMetadataFailure } from "./AppleDispatchMetadata.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; it.each(["malformed", "unsupported"] as const)( "keeps an explicit %s metadata refusal target-specific", diff --git a/src/native/AppleDispatchMetadata.ts b/src/native/AppleDispatchMetadata.ts index 7c7295d823..c65a515b6b 100644 --- a/src/native/AppleDispatchMetadata.ts +++ b/src/native/AppleDispatchMetadata.ts @@ -48,7 +48,7 @@ import { readBoundedFileBytes } from "../process/BoundedFileBytes.js"; import { EvidenceIntegrityError } from "../domain/evidenceErrors.js"; import { pushDispatchCoverage } from "./AppleDispatchCoverage.js"; import { parsePointerFixupsSteps } from "./AppleMachoFixups.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import { parseMachoLayout } from "./AppleMachoSelection.js"; import { selectMachoSlice, diff --git a/src/native/AppleMachoSelection.test.ts b/src/native/AppleMachoSelection.test.ts index a4169f9729..ab50e51a47 100644 --- a/src/native/AppleMachoSelection.test.ts +++ b/src/native/AppleMachoSelection.test.ts @@ -18,7 +18,7 @@ import { } from "../artifacts/apple/MachoImage.fixture.js"; import { readMachoImage } from "../artifacts/apple/MachoLoadCommandReader.js"; import { readMachoImage as readMachoMetadataImage } from "./metadata/MachoImage.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import { layoutFor, MachoSliceRefused } from "./AppleMachoSelection.fixture.js"; import { selectMachoSlice, diff --git a/src/native/AppleMachoSelection.ts b/src/native/AppleMachoSelection.ts index 1806e962d5..d0e27c8b90 100644 --- a/src/native/AppleMachoSelection.ts +++ b/src/native/AppleMachoSelection.ts @@ -24,7 +24,7 @@ import { import { BinaryFormatFailure, createFileMappingIndex, -} from "./metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import type { FixupCommands } from "./AppleMachoFixups.js"; import { decodeMachoFixedName, decodeMachoName } from "./AppleMachoNames.js"; diff --git a/src/native/AppleObjcCategories.ts b/src/native/AppleObjcCategories.ts index 4b184edd97..11400d024d 100644 --- a/src/native/AppleObjcCategories.ts +++ b/src/native/AppleObjcCategories.ts @@ -5,7 +5,7 @@ import type { Section } from "./AppleMachoSelection.js"; import type { ObjcDispatchReaders } from "./AppleObjcDispatchFacets.js"; import { readObjcPropertiesOf } from "./AppleObjcProperties.js"; import { issue, type DecodeIssue } from "./AppleDispatchDecodeFacts.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import type { ObjcProtocolListResult } from "./AppleObjcProtocols.js"; const CLASS_SYMBOL = /^_OBJC_(?:META)?CLASS_\$_(.+)$/u; diff --git a/src/native/AppleObjcDispatchFacets.ts b/src/native/AppleObjcDispatchFacets.ts index 1fa0c5234c..cb7ff8bb54 100644 --- a/src/native/AppleObjcDispatchFacets.ts +++ b/src/native/AppleObjcDispatchFacets.ts @@ -8,7 +8,7 @@ import { import type { Segment, Section } from "./AppleMachoSelection.js"; import { boundClassName, decodeObjcCategories } from "./AppleObjcCategories.js"; import { readObjcPropertiesOf } from "./AppleObjcProperties.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import type { DecodeIssue } from "./AppleDispatchDecodeFacts.js"; import { createObjcProtocolReader } from "./AppleObjcProtocols.js"; import type { diff --git a/src/native/AppleSwiftDispatchFacets.ts b/src/native/AppleSwiftDispatchFacets.ts index 9118220169..70d5586172 100644 --- a/src/native/AppleSwiftDispatchFacets.ts +++ b/src/native/AppleSwiftDispatchFacets.ts @@ -6,7 +6,7 @@ import { import type { ObjcSwiftMetadata } from "../domain/native/objcSwiftMetadata.js"; import type { PointerResolution } from "./AppleMachoFixups.js"; import type { Segment, Section } from "./AppleMachoSelection.js"; -import { BinaryFormatFailure } from "./metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../domain/binaryContainer.js"; import { issue, type FacetDecodeFacts } from "./AppleDispatchDecodeFacts.js"; import { decodeSwiftConformanceTypeReference, diff --git a/src/native/android/AndroidJniLibrary.ts b/src/native/android/AndroidJniLibrary.ts index b1359ed531..acfac68daa 100644 --- a/src/native/android/AndroidJniLibrary.ts +++ b/src/native/android/AndroidJniLibrary.ts @@ -17,7 +17,7 @@ import { BinaryResourceFailure, isBinaryStringReadLimit, createFileMappingIndex, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readElfPointerRelocationsSteps, ElfPointerRelocationFailure, diff --git a/src/native/elf/ElfNoteParser.ts b/src/native/elf/ElfNoteParser.ts index 2ebdb61c5c..afbd07f063 100644 --- a/src/native/elf/ElfNoteParser.ts +++ b/src/native/elf/ElfNoteParser.ts @@ -28,7 +28,7 @@ import { elfObjectTypeName, gnuNoteTypeName, } from "../../domain/native/elfNotes.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { decodeLimit, ParseFailureError } from "../../domain/parseFailure.js"; import { decodeElfSectionNameTable } from "../metadata/ElfSectionNameTable.js"; diff --git a/src/native/elf/ElfUnwindRangesProvider.ts b/src/native/elf/ElfUnwindRangesProvider.ts index d4f80f286c..10f2747ebd 100644 --- a/src/native/elf/ElfUnwindRangesProvider.ts +++ b/src/native/elf/ElfUnwindRangesProvider.ts @@ -25,7 +25,7 @@ import { } from "../../domain/native/elfUnwindRanges.js"; import { err, ok } from "../../domain/result.js"; import { ELF_UNWIND_RANGES_PROVIDER } from "../../domain/investigationProviders.js"; -import { BinaryResourceFailure } from "../metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../../domain/binaryContainer.js"; import { ElfUnwindSymbolTextFailure, parseElfUnwindRanges, diff --git a/src/native/elf/KernelModuleParser.test.ts b/src/native/elf/KernelModuleParser.test.ts index d5013bed3f..d469dd0ac7 100644 --- a/src/native/elf/KernelModuleParser.test.ts +++ b/src/native/elf/KernelModuleParser.test.ts @@ -6,7 +6,7 @@ import { kernelModuleSchema, MODULE_SIGNATURE_MAGIC, } from "../../domain/native/kernelModule.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { compressedKernelModuleContainer, kernelModuleFixture, diff --git a/src/native/elf/KernelModuleParser.ts b/src/native/elf/KernelModuleParser.ts index 4370057c2a..5accde3887 100644 --- a/src/native/elf/KernelModuleParser.ts +++ b/src/native/elf/KernelModuleParser.ts @@ -19,7 +19,7 @@ import { import type { ImageSection, BinaryContainer, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readElfImage } from "../metadata/ElfImage.js"; import { kernelCompressionCodecAt } from "./KernelCompressionCodec.js"; diff --git a/src/native/elf/KernelModuleProvider.ts b/src/native/elf/KernelModuleProvider.ts index 32d05c978e..6f22b98dca 100644 --- a/src/native/elf/KernelModuleProvider.ts +++ b/src/native/elf/KernelModuleProvider.ts @@ -28,7 +28,7 @@ import { } from "../../domain/native/kernelModule.js"; import { err, ok } from "../../domain/result.js"; import { KERNEL_MODULE_PROVIDER } from "../../domain/investigationProviders.js"; -import { BinaryResourceFailure } from "../metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../../domain/binaryContainer.js"; import { parseKernelModule } from "./KernelModuleParser.js"; const OPERATION = "inspect_kernel_module"; diff --git a/src/native/exports/NativeExportParser.test.ts b/src/native/exports/NativeExportParser.test.ts index 4085302722..d869d19586 100644 --- a/src/native/exports/NativeExportParser.test.ts +++ b/src/native/exports/NativeExportParser.test.ts @@ -7,7 +7,7 @@ import { peExportImage, } from "../../../tests/fixtures/binaryDiagnostics/nativeExports.js"; import * as nativeExportContracts from "../../domain/native/nativeExports.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { parseNativeExports, parseNativeExportsSteps, diff --git a/src/native/exports/NativeExportParser.ts b/src/native/exports/NativeExportParser.ts index 4d302dce98..f53d36203b 100644 --- a/src/native/exports/NativeExportParser.ts +++ b/src/native/exports/NativeExportParser.ts @@ -7,7 +7,7 @@ import { mappedFileOffset, imageFileMappings, readMappedCString, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { architectureForElfMachine } from "../metadata/ElfImage.js"; import { readElfStringBytes } from "../metadata/ElfStringTable.js"; import { readElfSymbol } from "../../domain/elfSymbol.js"; diff --git a/src/native/exports/NativeExportsProvider.ts b/src/native/exports/NativeExportsProvider.ts index 8870a1d4d2..8053f01c61 100644 --- a/src/native/exports/NativeExportsProvider.ts +++ b/src/native/exports/NativeExportsProvider.ts @@ -34,7 +34,7 @@ import { NATIVE_EXPORTS_PROVIDER } from "../../domain/investigationProviders.js" import { BinaryResourceFailure, binaryResourceAllowance, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { NATIVE_EXPORT_LIMITS, type NativeExportLimit, diff --git a/src/native/hardening/BinaryHardeningParsers.test.ts b/src/native/hardening/BinaryHardeningParsers.test.ts index 0f0694f27c..9a11e29dab 100644 --- a/src/native/hardening/BinaryHardeningParsers.test.ts +++ b/src/native/hardening/BinaryHardeningParsers.test.ts @@ -6,7 +6,7 @@ import { PE_HARDENING_PROPERTIES, type BinaryHardeningRow, } from "../../domain/native/binaryHardening.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readElfImage } from "../metadata/ElfImage.js"; import { readMachoImage } from "../metadata/MachoImage.js"; import { diff --git a/src/native/hardening/BinaryHardeningProvider.ts b/src/native/hardening/BinaryHardeningProvider.ts index fbec8ba874..4c5c463f73 100644 --- a/src/native/hardening/BinaryHardeningProvider.ts +++ b/src/native/hardening/BinaryHardeningProvider.ts @@ -32,7 +32,7 @@ import { import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { err, ok } from "../../domain/result.js"; import { BINARY_HARDENING_PROVIDER } from "../../domain/investigationProviders.js"; -import { BinaryResourceFailure } from "../metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../../domain/binaryContainer.js"; import { readElfHardening } from "./ElfHardening.js"; import { readMachoHardening } from "./MachoHardening.js"; import { readPeHardening } from "./PeHardening.js"; diff --git a/src/native/hardening/ElfHardening.ts b/src/native/hardening/ElfHardening.ts index fa16651df5..7b8471c680 100644 --- a/src/native/hardening/ElfHardening.ts +++ b/src/native/hardening/ElfHardening.ts @@ -40,7 +40,7 @@ import { import { BinaryFormatFailure, BinaryResourceFailure, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { ELF_PT_GNU_PROPERTY, ELF_PT_GNU_RELRO, diff --git a/src/native/hardening/MachoHardening.ts b/src/native/hardening/MachoHardening.ts index 9398b60308..730e307825 100644 --- a/src/native/hardening/MachoHardening.ts +++ b/src/native/hardening/MachoHardening.ts @@ -34,7 +34,7 @@ import { MAX_BINARY_HARDENING_TABLE_ENTRIES, } from "../../domain/native/binaryHardening.js"; import { assertArtifactReadActive } from "../../artifacts/ArtifactFileOperation.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readMachoEncryption } from "../../artifacts/apple/MachoEncryptionReader.js"; import { frameLoadCommands, diff --git a/src/native/hardening/PeHardening.ts b/src/native/hardening/PeHardening.ts index 3d78fb7670..ff483338fc 100644 --- a/src/native/hardening/PeHardening.ts +++ b/src/native/hardening/PeHardening.ts @@ -13,7 +13,7 @@ import { import { BinaryFormatFailure, BinaryResourceFailure, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { peSubjectArchitecture } from "../../domain/peMachine.js"; import type { PeDataDirectory } from "../../domain/peOptionalHeader.js"; import { readPeImage } from "../metadata/PeImage.js"; diff --git a/src/native/initializers/ElfInitializers.ts b/src/native/initializers/ElfInitializers.ts index 13d1cb4f71..b11e7f1245 100644 --- a/src/native/initializers/ElfInitializers.ts +++ b/src/native/initializers/ElfInitializers.ts @@ -22,7 +22,7 @@ import { createFileMappingIndex, mappedFileOffset, type FileMappingIndex, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readElfDirectoryFromBuffer } from "../metadata/NativeSectionDirectory.js"; import type { NativeSection } from "../metadata/NativeSectionDirectory.js"; import { diff --git a/src/native/initializers/MachoInitializers.ts b/src/native/initializers/MachoInitializers.ts index 4523c99e4d..6497f87649 100644 --- a/src/native/initializers/MachoInitializers.ts +++ b/src/native/initializers/MachoInitializers.ts @@ -26,7 +26,7 @@ import { BinaryMappingFailure, createFileMappingIndex, type ImageSection, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readMachoImage } from "../metadata/MachoImage.js"; import { finishInitializerReport, diff --git a/src/native/initializers/NativeInitializersParsers.test.ts b/src/native/initializers/NativeInitializersParsers.test.ts index 2ed1730533..003a91c740 100644 --- a/src/native/initializers/NativeInitializersParsers.test.ts +++ b/src/native/initializers/NativeInitializersParsers.test.ts @@ -7,9 +7,9 @@ const mapping = vi.hoisted(() => ({ scans: vi.fn(), indexes: vi.fn(), })); -vi.mock("../metadata/BinaryContainer.js", async (importOriginal) => { +vi.mock("../../domain/binaryContainer.js", async (importOriginal) => { const actual = - await importOriginal(); + await importOriginal(); return { ...actual, mappedFileOffset: ( @@ -48,7 +48,7 @@ import { } from "../../domain/native/nativeInitializers.js"; import { buildAddressRangeIndex } from "./addressRangeIndex.js"; import { InitializerNotes } from "./initializerNotes.js"; -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { ArtifactReaderFailure } from "../../artifacts/ArtifactReader.js"; const artifact = (bytes: Buffer) => ({ diff --git a/src/native/initializers/NativeInitializersProvider.ts b/src/native/initializers/NativeInitializersProvider.ts index bd0921eda9..cdfdbf9645 100644 --- a/src/native/initializers/NativeInitializersProvider.ts +++ b/src/native/initializers/NativeInitializersProvider.ts @@ -33,7 +33,7 @@ import { NATIVE_INITIALIZERS_PROVIDER } from "../../domain/investigationProvider import { BinaryFormatFailure, BinaryResourceFailure, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { ElfPointerRelocationFailure } from "../metadata/ElfPointerRelocations.js"; import { requireSelectedNativeImage } from "../metadata/MachoSliceSelection.js"; import { readElfInitializers } from "./ElfInitializers.js"; diff --git a/src/native/metadata/BinaryContainer.test.ts b/src/native/metadata/BinaryContainer.test.ts index d9c161f6a1..55b735cb1d 100644 --- a/src/native/metadata/BinaryContainer.test.ts +++ b/src/native/metadata/BinaryContainer.test.ts @@ -13,7 +13,7 @@ import { mappedFileOffset, readMappedCString, type BinaryContainer, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; it("preserves representable offsets for invalid file ranges", () => { const reader = new BinaryReader(Buffer.alloc(120), true, "elf"); diff --git a/src/native/metadata/ElfImage.ts b/src/native/metadata/ElfImage.ts index 25d0ec27c1..0bb72fbb5b 100644 --- a/src/native/metadata/ElfImage.ts +++ b/src/native/metadata/ElfImage.ts @@ -11,7 +11,7 @@ import { type ElfDynamicSegment, type ImageSection, type LoadRegion, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { elfArchitecture } from "../../domain/elfFixedHeader.js"; import { readElfDirectoryFromBuffer } from "./NativeSectionDirectory.js"; diff --git a/src/native/metadata/ElfPointerRelocations.ts b/src/native/metadata/ElfPointerRelocations.ts index 8940f942b7..9aa830629a 100644 --- a/src/native/metadata/ElfPointerRelocations.ts +++ b/src/native/metadata/ElfPointerRelocations.ts @@ -17,7 +17,7 @@ import { createFileMappingIndex, isZeroFilledSpan, type ElfDynamicSegment, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { ParseFailureError } from "../../domain/parseFailure.js"; /** The ParseFailure format of ELF loader pointer interpretation. */ diff --git a/src/native/metadata/ElfStringTable.test.ts b/src/native/metadata/ElfStringTable.test.ts index 250f877955..54dd9fccfc 100644 --- a/src/native/metadata/ElfStringTable.test.ts +++ b/src/native/metadata/ElfStringTable.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { BinaryFormatFailure, isBinaryStringReadLimit, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readElfStringBytes } from "./ElfStringTable.js"; it("preserves empty and non-UTF8 string-table bytes", () => { diff --git a/src/native/metadata/ElfStringTable.ts b/src/native/metadata/ElfStringTable.ts index 44d434cadf..47f6b2c5ec 100644 --- a/src/native/metadata/ElfStringTable.ts +++ b/src/native/metadata/ElfStringTable.ts @@ -2,7 +2,7 @@ import { observeElfStringTableEntry } from "../../domain/elfStringTable.js"; import { BinaryFormatFailure, binaryStringReadLimit, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; /** Read exact string-table bytes; ELF does not prescribe a character encoding. */ export const readElfStringBytes = (bytes: Buffer, offset: number): Buffer => { diff --git a/src/native/metadata/MachoImage.ts b/src/native/metadata/MachoImage.ts index 23c5690f19..358310ed07 100644 --- a/src/native/metadata/MachoImage.ts +++ b/src/native/metadata/MachoImage.ts @@ -20,7 +20,7 @@ import { type BinaryContainer, type ImageSection, type LoadRegion, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { MachoLoadCommandCursor, readMachoLoadCommandDeclarations, diff --git a/src/native/metadata/NativeSectionDirectory.ts b/src/native/metadata/NativeSectionDirectory.ts index ebad21239e..311e9eb374 100644 --- a/src/native/metadata/NativeSectionDirectory.ts +++ b/src/native/metadata/NativeSectionDirectory.ts @@ -22,7 +22,7 @@ import { BinaryResourceFailure, declaredFileRange, type ElfDynamicSegment, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { decodeElfSectionNameTable } from "./ElfSectionNameTable.js"; /** A borrowed positional source. Drivers own admission, cancellation and file identity. */ diff --git a/src/native/metadata/PeImage.test.ts b/src/native/metadata/PeImage.test.ts index df3f1b6932..086a228127 100644 --- a/src/native/metadata/PeImage.test.ts +++ b/src/native/metadata/PeImage.test.ts @@ -3,7 +3,7 @@ import { readGoBinaryImage } from "../../go/GoBinaryImage.js"; import { readPeImage } from "./PeImage.js"; import { pe } from "../../domain/binaryTarget.fixture.js"; import { parseMzHeaderEvidence } from "../../domain/dosMz.js"; -import { BinaryFormatFailure } from "./BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { readBinaryContainer } from "./readBinaryContainer.js"; import { createGoBinaryFixture, diff --git a/src/native/metadata/PeImage.ts b/src/native/metadata/PeImage.ts index 9b311408b5..23e12712a1 100644 --- a/src/native/metadata/PeImage.ts +++ b/src/native/metadata/PeImage.ts @@ -15,7 +15,7 @@ import { BinaryReader, type BinaryContainer, type ImageSection, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; const peHeaderOffset = (reader: BinaryReader): number => { const evidence = parseMzHeaderEvidence(reader.bytes); diff --git a/src/native/metadata/readBinaryContainer.ts b/src/native/metadata/readBinaryContainer.ts index 860c0812c4..180ca0376a 100644 --- a/src/native/metadata/readBinaryContainer.ts +++ b/src/native/metadata/readBinaryContainer.ts @@ -1,7 +1,7 @@ import { BinaryFormatFailure, type BinaryContainer, -} from "./BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { classifyFatContainerIdentity, readFatContainerHeader, diff --git a/src/native/pe/PeBinaryFailure.ts b/src/native/pe/PeBinaryFailure.ts index f81b055bac..b8f776c4d0 100644 --- a/src/native/pe/PeBinaryFailure.ts +++ b/src/native/pe/PeBinaryFailure.ts @@ -23,7 +23,7 @@ import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { BinaryResourceFailure, binaryResourceAllowance, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; interface PeBinaryInput { readonly path: string; diff --git a/src/native/pe/PeCertificateParser.ts b/src/native/pe/PeCertificateParser.ts index 403f467239..1c9ef18504 100644 --- a/src/native/pe/PeCertificateParser.ts +++ b/src/native/pe/PeCertificateParser.ts @@ -11,7 +11,7 @@ import { PeCertificateAsn1Failure, readAsn1, } from "./PeCertificateAsn1.js"; -import { readPeHeaders } from "./PeResourceLayout.js"; +import { readPeHeaders } from "../../artifacts/pe/PeResourceLayout.js"; const fail = (message: string): never => { throw new ArtifactReaderFailure("format", message); diff --git a/src/native/pe/PeCertificatesProvider.ts b/src/native/pe/PeCertificatesProvider.ts index d0eac0fcfe..e5e319d0f8 100644 --- a/src/native/pe/PeCertificatesProvider.ts +++ b/src/native/pe/PeCertificatesProvider.ts @@ -1,4 +1,4 @@ -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { projectSelectedArtifactFileFailure, projectOwnedArtifactIdentityFailure, diff --git a/src/native/pe/PeImportParser.ts b/src/native/pe/PeImportParser.ts index 6508d03a44..1c012c1a1b 100644 --- a/src/native/pe/PeImportParser.ts +++ b/src/native/pe/PeImportParser.ts @@ -14,7 +14,7 @@ import { isBinaryFormatOrStringLimitFailure, createFileMappingIndex, imageFileMappings, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readPeImage } from "../metadata/PeImage.js"; import { MAX_INSPECT_PE_IMPORT_RETAINED_TEXT_BYTES, diff --git a/src/native/pe/PeLoadConfigParser.ts b/src/native/pe/PeLoadConfigParser.ts index b481bdfbb8..314b357724 100644 --- a/src/native/pe/PeLoadConfigParser.ts +++ b/src/native/pe/PeLoadConfigParser.ts @@ -10,7 +10,7 @@ import { BinaryResourceFailure, createFileMappingIndex, imageFileMappings, -} from "../metadata/BinaryContainer.js"; +} from "../../domain/binaryContainer.js"; import { readPeImage, type PeImage } from "../metadata/PeImage.js"; import { guardFlagRecord, diff --git a/src/native/pe/PeResourcesProvider.test.ts b/src/native/pe/PeResourcesProvider.test.ts index f71fa7d131..d94f35e5fc 100644 --- a/src/native/pe/PeResourcesProvider.test.ts +++ b/src/native/pe/PeResourcesProvider.test.ts @@ -10,7 +10,7 @@ import { } from "../../domain/native/peResources.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { PeResourcesProvider } from "./PeResourcesProvider.js"; -import { peResourceFixture } from "./PeResources.fixture.js"; +import { peResourceFixture } from "../../artifacts/pe/PeResources.fixture.js"; import { imageFileSizeRemediation } from "../../artifacts/StableArtifactFailure.js"; const inspect = async ( diff --git a/src/native/pe/PeResourcesProvider.ts b/src/native/pe/PeResourcesProvider.ts index 784bab490c..a623210911 100644 --- a/src/native/pe/PeResourcesProvider.ts +++ b/src/native/pe/PeResourcesProvider.ts @@ -1,4 +1,4 @@ -import { BinaryFormatFailure } from "../metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../domain/binaryContainer.js"; import { imageFileSizeRemediation, projectSelectedArtifactFileFailure, @@ -36,7 +36,7 @@ import { PE_RESOURCES_PROVIDER } from "../../domain/investigationProviders.js"; import { parsePeResources, PE_RESOURCE_METADATA_BYTES, -} from "./PeResourceParser.js"; +} from "../../artifacts/pe/PeResourceParser.js"; /** Portable parser over one bounded, identity-checked regular file. */ export class PeResourcesProvider implements PeResourcesPort { diff --git a/src/python/PythonPycParser.ts b/src/python/PythonPycParser.ts index 80eb5e1cca..a7c5f75d7f 100644 --- a/src/python/PythonPycParser.ts +++ b/src/python/PythonPycParser.ts @@ -27,7 +27,7 @@ import { } from "../domain/python/pythonPyc.js"; import { Budget } from "../domain/budget.js"; import { malformedInput, unsupportedInput } from "../domain/parseFailure.js"; -import { BinaryReader } from "../native/metadata/BinaryContainer.js"; +import { BinaryReader } from "../domain/binaryContainer.js"; import { PYTHON_PYC_FORMAT, PythonPycResourceFailure, diff --git a/src/rust/RustBinaryImage.ts b/src/rust/RustBinaryImage.ts index bfeaff1ad6..a437ea36ad 100644 --- a/src/rust/RustBinaryImage.ts +++ b/src/rust/RustBinaryImage.ts @@ -2,7 +2,7 @@ import { BinaryResourceFailure, type BinaryContainer, type ImageSection, -} from "../native/metadata/BinaryContainer.js"; +} from "../domain/binaryContainer.js"; import { malformedInput, unsupportedInput } from "../domain/parseFailure.js"; import { keyedBy, uniqueKeyed } from "../domain/keyedCollection.js"; import { readBinaryContainer } from "../native/metadata/readBinaryContainer.js"; diff --git a/tests/acceptance/applications/firmwareComparison.test.ts b/tests/acceptance/applications/firmwareComparison.test.ts index cd2a8e7119..a0226d5365 100644 --- a/tests/acceptance/applications/firmwareComparison.test.ts +++ b/tests/acceptance/applications/firmwareComparison.test.ts @@ -15,7 +15,7 @@ import { fitFixture, type FitFixtureImage, } from "../../../src/artifacts/fit/FitImage.fixture.js"; -import { dtString } from "../../../src/firmware/devicetree/Devicetree.fixture.js"; +import { dtString } from "../../../src/domain/firmware/devicetree.fixture.js"; type McpCall = Awaited>["call"]; const image = (name: string, content: string): FitFixtureImage => ({ diff --git a/tests/acceptance/applications/peResources.test.ts b/tests/acceptance/applications/peResources.test.ts index af76a8676f..5d0b920352 100644 --- a/tests/acceptance/applications/peResources.test.ts +++ b/tests/acceptance/applications/peResources.test.ts @@ -6,7 +6,7 @@ import { join } from "node:path"; import { expect } from "vitest"; import { toolContract } from "../../../src/contracts/toolContracts.js"; import { peResourcesSchema } from "../../../src/domain/native/peResources.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; import { connectLocalToolsMcp } from "../../fixtures/localToolsMcp.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { parseMcpToolError } from "../../fixtures/mcpToolError.js"; diff --git a/tests/acceptance/artifactComparisonFit.test.ts b/tests/acceptance/artifactComparisonFit.test.ts index c0c17fde76..74bc42c3d0 100644 --- a/tests/acceptance/artifactComparisonFit.test.ts +++ b/tests/acceptance/artifactComparisonFit.test.ts @@ -5,7 +5,7 @@ import { fitFixture } from "../../src/artifacts/fit/FitImage.fixture.js"; import { cells, dtString, -} from "../../src/firmware/devicetree/Devicetree.fixture.js"; +} from "../../src/domain/firmware/devicetree.fixture.js"; import { artifactComparisonResultSchema } from "../../src/domain/artifactComparison.js"; import { artifactInspectionResultSchema } from "../../src/domain/artifactInspection.js"; import { artifactInventoryResultSchema } from "../../src/domain/artifactGraph.js"; diff --git a/tests/acceptance/devicetreeCli.test.ts b/tests/acceptance/devicetreeCli.test.ts index b3ed7d7aef..e5e71184bf 100644 --- a/tests/acceptance/devicetreeCli.test.ts +++ b/tests/acceptance/devicetreeCli.test.ts @@ -8,7 +8,7 @@ import { cells, devicetreeFixture, emptyStringsAtReservationBoundaryFixture, -} from "../../src/firmware/devicetree/Devicetree.fixture.js"; +} from "../../src/domain/firmware/devicetree.fixture.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { connectLocalToolsMcp } from "../fixtures/localToolsMcp.js"; import { cliTest } from "../support/cli/cliFixture.js"; diff --git a/tests/acceptance/fitImageCli.test.ts b/tests/acceptance/fitImageCli.test.ts index 9bb4f8bb5a..e6bf6fe4f9 100644 --- a/tests/acceptance/fitImageCli.test.ts +++ b/tests/acceptance/fitImageCli.test.ts @@ -14,7 +14,7 @@ import { import { cells, dtString, -} from "../../src/firmware/devicetree/Devicetree.fixture.js"; +} from "../../src/domain/firmware/devicetree.fixture.js"; import { parseEvidence } from "../../src/domain/evidence.js"; import { artifactInspectionResultSchema } from "../../src/domain/artifactInspection.js"; import { diff --git a/tests/boundary/cli/callerPathSymlinkParentCli.test.ts b/tests/boundary/cli/callerPathSymlinkParentCli.test.ts index 0e4a7ba36f..f1ad000572 100644 --- a/tests/boundary/cli/callerPathSymlinkParentCli.test.ts +++ b/tests/boundary/cli/callerPathSymlinkParentCli.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { describe, expect } from "vitest"; import { toolContract } from "../../../src/contracts/toolContracts.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; import { createGoBinaryFixture } from "../../fixtures/go/image.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { cliTest } from "../../support/cli/cliFixture.js"; diff --git a/tests/boundary/filesystem/binaryTarget.test.ts b/tests/boundary/filesystem/binaryTarget.test.ts index ebf2df30b3..0f1accbed6 100644 --- a/tests/boundary/filesystem/binaryTarget.test.ts +++ b/tests/boundary/filesystem/binaryTarget.test.ts @@ -61,7 +61,7 @@ import { FIT_EMBEDDED, FIT_EXTERNAL, } from "../../../src/artifacts/fit/FitImage.fixture.js"; -import { devicetreeFixture } from "../../../src/firmware/devicetree/Devicetree.fixture.js"; +import { devicetreeFixture } from "../../../src/domain/firmware/devicetree.fixture.js"; it.each([ [4000, false], diff --git a/tests/boundary/filesystem/machoCommandAdmission.test.ts b/tests/boundary/filesystem/machoCommandAdmission.test.ts index 64d0abe735..7d821214a7 100644 --- a/tests/boundary/filesystem/machoCommandAdmission.test.ts +++ b/tests/boundary/filesystem/machoCommandAdmission.test.ts @@ -2,7 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { BinaryResourceFailure } from "../../../src/native/metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../../../src/domain/binaryContainer.js"; import { readMachoLoadCommandTableHeader } from "../../../src/domain/apple/machoLoadCommands.js"; import { readBinaryContainer } from "../../../src/native/metadata/readBinaryContainer.js"; import { parseBinaryTarget } from "../../../src/application/BinaryTargetResolver.js"; diff --git a/tests/boundary/filesystem/peResources.test.ts b/tests/boundary/filesystem/peResources.test.ts index 7945cb4fc0..1e74f0cf5e 100644 --- a/tests/boundary/filesystem/peResources.test.ts +++ b/tests/boundary/filesystem/peResources.test.ts @@ -2,7 +2,7 @@ import { symlink, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { createPeResourcesService } from "../../../src/composition/binaryDiagnostics.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; describe("PE resource stable filesystem boundary", () => { diff --git a/tests/boundary/filesystem/pythonBeamCleanup.test.ts b/tests/boundary/filesystem/pythonBeamCleanup.test.ts index 808abadada..cdb893bae7 100644 --- a/tests/boundary/filesystem/pythonBeamCleanup.test.ts +++ b/tests/boundary/filesystem/pythonBeamCleanup.test.ts @@ -14,7 +14,7 @@ import { BeamProvider } from "../../../src/erlang/BeamProvider.js"; import { erlangBeamFixture } from "../../../src/erlang/Beam.fixture.js"; import { DevicetreeService } from "../../../src/application/binaryDiagnostics/DevicetreeService.js"; import { DevicetreeProvider } from "../../../src/firmware/devicetree/DevicetreeProvider.js"; -import { devicetreeFixture } from "../../../src/firmware/devicetree/Devicetree.fixture.js"; +import { devicetreeFixture } from "../../../src/domain/firmware/devicetree.fixture.js"; const injected = vi.hoisted(() => ({ opened: undefined as diff --git a/tests/boundary/firmware/devicetreeFinalization.test.ts b/tests/boundary/firmware/devicetreeFinalization.test.ts index 02656561cd..4a27cd62be 100644 --- a/tests/boundary/firmware/devicetreeFinalization.test.ts +++ b/tests/boundary/firmware/devicetreeFinalization.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { DevicetreeProvider } from "../../../src/firmware/devicetree/DevicetreeProvider.js"; import { DevicetreeService } from "../../../src/application/binaryDiagnostics/DevicetreeService.js"; -import { devicetreeFixture } from "../../../src/firmware/devicetree/Devicetree.fixture.js"; +import { devicetreeFixture } from "../../../src/domain/firmware/devicetree.fixture.js"; import { OwnedFileHandle } from "../../../src/filesystem/OwnedFileHandle.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/go/goBinaryImage.test.ts b/tests/boundary/go/goBinaryImage.test.ts index c76df6875a..3e4ecf6598 100644 --- a/tests/boundary/go/goBinaryImage.test.ts +++ b/tests/boundary/go/goBinaryImage.test.ts @@ -7,7 +7,7 @@ import { } from "../../../src/artifacts/apple/MachoImage.fixture.js"; import { readGoBinaryImage } from "../../../src/go/GoBinaryImage.js"; import { goBuildInfoSearch } from "../../../src/go/GoBuildInfoSearch.js"; -import { BinaryResourceFailure } from "../../../src/native/metadata/BinaryContainer.js"; +import { BinaryResourceFailure } from "../../../src/domain/binaryContainer.js"; import { readMachoImage } from "../../../src/native/metadata/MachoImage.js"; import { readBinaryContainer } from "../../../src/native/metadata/readBinaryContainer.js"; import { diff --git a/tests/boundary/go/goBinaryMappings.test.ts b/tests/boundary/go/goBinaryMappings.test.ts index d84ab6d6d7..46ec512b58 100644 --- a/tests/boundary/go/goBinaryMappings.test.ts +++ b/tests/boundary/go/goBinaryMappings.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { mappedFileOffset } from "../../../src/native/metadata/BinaryContainer.js"; +import { mappedFileOffset } from "../../../src/domain/binaryContainer.js"; const selected = { address: 100n, offset: 16, size: 64 }; diff --git a/tests/boundary/mcp/devicetreeMcp.test.ts b/tests/boundary/mcp/devicetreeMcp.test.ts index 358fd50a22..3a4ab3161d 100644 --- a/tests/boundary/mcp/devicetreeMcp.test.ts +++ b/tests/boundary/mcp/devicetreeMcp.test.ts @@ -18,7 +18,7 @@ import { cells, devicetreeFixture, dtString, -} from "../../../src/firmware/devicetree/Devicetree.fixture.js"; +} from "../../../src/domain/firmware/devicetree.fixture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { mcpTest } from "../../support/mcp/mcpFixture.js"; diff --git a/tests/boundary/providers/artifactReadCleanupRetry.test.ts b/tests/boundary/providers/artifactReadCleanupRetry.test.ts index 5fac7c3edd..5a49e19376 100644 --- a/tests/boundary/providers/artifactReadCleanupRetry.test.ts +++ b/tests/boundary/providers/artifactReadCleanupRetry.test.ts @@ -53,7 +53,7 @@ import { projectAnalysisError } from "../../../src/domain/analysisErrorProjectio import { GoBinaryProvider } from "../../../src/go/GoBinaryProvider.js"; import { PeResourcesProvider } from "../../../src/native/pe/PeResourcesProvider.js"; import { createGoBinaryFixture } from "../../fixtures/go/image.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; it.each(["go", "pe"] as const)( "%s provider retains a failed descriptor close and retries that owner before the next read", diff --git a/tests/boundary/providers/native/objcClassMetadataFallback.test.ts b/tests/boundary/providers/native/objcClassMetadataFallback.test.ts index c14545787e..68bfaa02b9 100644 --- a/tests/boundary/providers/native/objcClassMetadataFallback.test.ts +++ b/tests/boundary/providers/native/objcClassMetadataFallback.test.ts @@ -12,7 +12,7 @@ import { createAnalysisExecution } from "../../../../src/application/AnalysisPro import { EnhancedTools } from "../../../../src/application/EnhancedTools.js"; import { layoutFor } from "../../../../src/native/AppleMachoSelection.fixture.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; -import { BinaryFormatFailure } from "../../../../src/native/metadata/BinaryContainer.js"; +import { BinaryFormatFailure } from "../../../../src/domain/binaryContainer.js"; import { NativeFixtureRunner } from "../../../fixtures/nativeCommands.js"; import { ok } from "../../../../src/domain/result.js"; diff --git a/tests/boundary/providers/nativeArtifactFinalization.test.ts b/tests/boundary/providers/nativeArtifactFinalization.test.ts index c9e11768c8..6be70a4caa 100644 --- a/tests/boundary/providers/nativeArtifactFinalization.test.ts +++ b/tests/boundary/providers/nativeArtifactFinalization.test.ts @@ -22,7 +22,7 @@ import { NativeExportsProvider } from "../../../src/native/exports/NativeExports import { AppleIpsProvider } from "../../../src/native/apple/AppleIpsProvider.js"; import { WindowsShortcutProvider } from "../../../src/native/windows/WindowsShortcutProvider.js"; import { ApkSignatureProvider } from "../../../src/apkSignature/ApkSignatureProvider.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; const cases = [ diff --git a/tests/conformance/formats/mzPeAdmission.test.ts b/tests/conformance/formats/mzPeAdmission.test.ts index 110ea9616c..c81a68dbf8 100644 --- a/tests/conformance/formats/mzPeAdmission.test.ts +++ b/tests/conformance/formats/mzPeAdmission.test.ts @@ -13,8 +13,8 @@ import { inspectDesktopFile } from "../../../src/artifacts/DesktopFileInspection import type { DesktopFile } from "../../../src/domain/desktopApplication.js"; import { readManagedPeLayout } from "../../../src/dotnet/ManagedPeReader.js"; import { buildManagedPeFixture } from "../../../src/dotnet/ManagedPe.fixture.js"; -import { readPeHeaders } from "../../../src/native/pe/PeResourceLayout.js"; -import { peResourceFixture } from "../../../src/native/pe/PeResources.fixture.js"; +import { readPeHeaders } from "../../../src/artifacts/pe/PeResourceLayout.js"; +import { peResourceFixture } from "../../../src/artifacts/pe/PeResources.fixture.js"; import { ElectronFuseService } from "../../../src/application/electron/ElectronFuseService.js"; import { ElectronFuseProvider } from "../../../src/electron/ElectronFuseProvider.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; diff --git a/tests/conformance/providerCompletion.test.ts b/tests/conformance/providerCompletion.test.ts index 3f723c1653..9a702c5ae7 100644 --- a/tests/conformance/providerCompletion.test.ts +++ b/tests/conformance/providerCompletion.test.ts @@ -16,8 +16,8 @@ import { import { PeResourcesService } from "../../src/application/binaryDiagnostics/PeResourcesService.js"; import { PE_RESOURCES_PROVIDER } from "../../src/domain/investigationProviders.js"; import { inspectPeResourcesInputSchema } from "../../src/domain/native/peResources.js"; -import { parsePeResources } from "../../src/native/pe/PeResourceParser.js"; -import { peResourceFixture } from "../../src/native/pe/PeResources.fixture.js"; +import { parsePeResources } from "../../src/artifacts/pe/PeResourceParser.js"; +import { peResourceFixture } from "../../src/artifacts/pe/PeResources.fixture.js"; import { createHash } from "node:crypto"; import { RecordedCrashService } from "../../src/application/binaryDiagnostics/RecordedCrashService.js"; import { diff --git a/tests/process-global/peResourcesLifetime.test.ts b/tests/process-global/peResourcesLifetime.test.ts index 258d1bcc84..fbd777d1a4 100644 --- a/tests/process-global/peResourcesLifetime.test.ts +++ b/tests/process-global/peResourcesLifetime.test.ts @@ -14,26 +14,29 @@ const parsing = vi.hoisted(() => { return { gate, entered: gate(), release: gate() }; }); -vi.mock("../../src/native/pe/PeResourceParser.js", async (importOriginal) => { - const original = - await importOriginal< - typeof import("../../src/native/pe/PeResourceParser.js") - >(); - return { - ...original, - parsePeResources: async ( - ...arguments_: Parameters - ) => { - parsing.entered.resolve(); - await parsing.release.promise; - return original.parsePeResources(...arguments_); - }, - }; -}); +vi.mock( + "../../src/artifacts/pe/PeResourceParser.js", + async (importOriginal) => { + const original = + await importOriginal< + typeof import("../../src/artifacts/pe/PeResourceParser.js") + >(); + return { + ...original, + parsePeResources: async ( + ...arguments_: Parameters + ) => { + parsing.entered.resolve(); + await parsing.release.promise; + return original.parsePeResources(...arguments_); + }, + }; + }, +); import { inspectPeResourcesInputSchema } from "../../src/domain/native/peResources.js"; import { PeResourcesProvider } from "../../src/native/pe/PeResourcesProvider.js"; -import { peResourceFixture } from "../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../src/artifacts/pe/PeResources.fixture.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; beforeEach(() => { diff --git a/tests/process-global/stableArtifactConsumers.test.ts b/tests/process-global/stableArtifactConsumers.test.ts index ddd9e0a1a2..e3353ba4e8 100644 --- a/tests/process-global/stableArtifactConsumers.test.ts +++ b/tests/process-global/stableArtifactConsumers.test.ts @@ -137,7 +137,7 @@ import { inspectErlangBeamInputSchema } from "../../src/domain/erlang/beam.js"; import { ModelArtifactProvider } from "../../src/model/ModelArtifactProvider.js"; import { ggufFixture } from "../fixtures/model/model.js"; import { inspectPeResourcesInputSchema } from "../../src/domain/native/peResources.js"; -import { peResourceFixture } from "../../src/native/pe/PeResources.fixture.js"; +import { peResourceFixture } from "../../src/artifacts/pe/PeResources.fixture.js"; import { createServer } from "../../src/server/createServer.js"; import { createTestBinarySession } from "../fixtures/binarySession.js"; import { createRustImage } from "../fixtures/rust/image.js";