From ea668fc953e9a642f05b325df67ce0407b602f1b Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 05:09:58 +0800 Subject: [PATCH] refactor(resources): move the artifact reader limit failure into src/resources (#11474) --- scripts/verify/rea-numeric-limits.mjs | 2 +- src/artifacts/ArtifactOperationFailure.test.ts | 2 +- src/artifacts/BunStandaloneArtifactReader.ts | 4 +--- src/artifacts/GodotPckArtifactReader.ts | 2 +- src/artifacts/NodeSeaArtifactReader.ts | 4 ++-- src/artifacts/ZipArtifactReader.ts | 2 +- src/artifacts/bun/BunModuleGraphLayout.ts | 6 ++++-- src/artifacts/dotnet/DotnetBundle.ts | 6 ++---- src/artifacts/nodeSea/NodeSeaBlob.ts | 2 +- src/artifacts/nodeSea/NodeSeaLocation.ts | 6 ++++-- src/{artifacts => resources}/ArtifactReaderLimits.ts | 2 +- src/resources/index.ts | 1 + 12 files changed, 20 insertions(+), 19 deletions(-) rename src/{artifacts => resources}/ArtifactReaderLimits.ts (97%) diff --git a/scripts/verify/rea-numeric-limits.mjs b/scripts/verify/rea-numeric-limits.mjs index 5b12505f21..3e3edc8a88 100644 --- a/scripts/verify/rea-numeric-limits.mjs +++ b/scripts/verify/rea-numeric-limits.mjs @@ -1042,7 +1042,7 @@ if (direct) { } const parameterOwners = [ - "src/artifacts/ArtifactReaderLimits.ts", + "src/resources/ArtifactReaderLimits.ts", "src/domain/artifactReaderLimits.ts", "src/domain/webNetworkCapture.ts", ]; diff --git a/src/artifacts/ArtifactOperationFailure.test.ts b/src/artifacts/ArtifactOperationFailure.test.ts index f8370a9d00..37ea0b6963 100644 --- a/src/artifacts/ArtifactOperationFailure.test.ts +++ b/src/artifacts/ArtifactOperationFailure.test.ts @@ -3,7 +3,6 @@ import { expect, it } from "vitest"; import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; -import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import { constants as bufferConstants } from "node:buffer"; import { imageFileSizeRemediation, @@ -13,6 +12,7 @@ import { artifactIntegrityDetails } from "../domain/artifactIntegrity.js"; import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; +import { artifactReaderLimitFailure } from "../resources/index.js"; // The provider ceiling test uses a sparse file and is skipped on Windows. it.skipIf(process.platform !== "win32")( diff --git a/src/artifacts/BunStandaloneArtifactReader.ts b/src/artifacts/BunStandaloneArtifactReader.ts index 944035cc46..8e14a5bf1b 100644 --- a/src/artifacts/BunStandaloneArtifactReader.ts +++ b/src/artifacts/BunStandaloneArtifactReader.ts @@ -3,7 +3,6 @@ import { DEFAULT_BUN_READER_LIMITS, type BunReaderLimits, } from "../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import type { BunStandaloneAdmission } from "./bun/BunStandaloneAdmission.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; import { setImmediate } from "node:timers/promises"; @@ -25,10 +24,9 @@ import { type ArtifactReader, type ArtifactTraversalOptions, ArtifactResourceScope, -} from "../resources/index.js"; -import { normalizeArtifactPath, ArtifactPathRegistry, + artifactReaderLimitFailure, } from "../resources/index.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { ownArtifactStream } from "./OwnedArtifactStream.js"; diff --git a/src/artifacts/GodotPckArtifactReader.ts b/src/artifacts/GodotPckArtifactReader.ts index 2d0c97dae9..b7f0939196 100644 --- a/src/artifacts/GodotPckArtifactReader.ts +++ b/src/artifacts/GodotPckArtifactReader.ts @@ -3,7 +3,6 @@ import { DEFAULT_GODOT_READER_LIMITS, type GodotReaderLimits, } from "../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import { readGodotPckHeaderFacts } from "../domain/godotPckFormat.js"; import { artifactExpansionBudgetBytes } from "../domain/artifactExpansionBudget.js"; import type { FileHandle } from "node:fs/promises"; @@ -11,6 +10,7 @@ import { setImmediate } from "node:timers/promises"; import { ArtifactReaderFailure, assertArtifactReadActive, + artifactReaderLimitFailure, } from "../resources/index.js"; import { locateGodotPck, diff --git a/src/artifacts/NodeSeaArtifactReader.ts b/src/artifacts/NodeSeaArtifactReader.ts index e30de6ff6b..7278d5aeb3 100644 --- a/src/artifacts/NodeSeaArtifactReader.ts +++ b/src/artifacts/NodeSeaArtifactReader.ts @@ -10,9 +10,9 @@ import type { NodeSeaMetadata } from "../domain/artifactFormatMetadata.js"; import { ArtifactPathRegistry, normalizeArtifactPath, + ArtifactReaderFailure, + artifactReaderLimitFailure, } from "../resources/index.js"; -import { ArtifactReaderFailure } from "../resources/index.js"; -import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import { decodeNodeSeaBlob, type DecodedNodeSeaBlob, diff --git a/src/artifacts/ZipArtifactReader.ts b/src/artifacts/ZipArtifactReader.ts index 6b5e53e950..e0c6880268 100644 --- a/src/artifacts/ZipArtifactReader.ts +++ b/src/artifacts/ZipArtifactReader.ts @@ -8,6 +8,7 @@ import { type ArtifactReader, type ArtifactReaderTraversal, type ArtifactTraversalOptions, + artifactReaderLimitFailure, } from "../resources/index.js"; import type { FileHandle } from "node:fs/promises"; import { Duplex, PassThrough, type Readable } from "node:stream"; @@ -48,7 +49,6 @@ import { } from "../domain/zip/zipMemberRegion.js"; import type { ZipPackageFormat } from "../domain/zipPackageFormat.js"; import { artifactExpansionBudgetBytes } from "../domain/artifactExpansionBudget.js"; -import { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; import type { StableRegularFileDescriptor } from "../filesystem/RegularFile.js"; import { ArtifactFileSource } from "./ArtifactFileSource.js"; import { readFileHandleRange } from "../filesystem/readFileHandleRange.js"; diff --git a/src/artifacts/bun/BunModuleGraphLayout.ts b/src/artifacts/bun/BunModuleGraphLayout.ts index d493ddbd15..16e104e6db 100644 --- a/src/artifacts/bun/BunModuleGraphLayout.ts +++ b/src/artifacts/bun/BunModuleGraphLayout.ts @@ -14,9 +14,11 @@ import { DEFAULT_BUN_READER_LIMITS, type BunReaderLimits, } from "../../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../../resources/index.js"; +import { + ArtifactReaderFailure, + artifactReaderLimitFailure, +} from "../../resources/index.js"; /** Exact trailer written by Bun's standalone module graph serializer. */ const BUN_TRAILER = Buffer.from("\n---- Bun! ----\n"); diff --git a/src/artifacts/dotnet/DotnetBundle.ts b/src/artifacts/dotnet/DotnetBundle.ts index 6e9f0856e9..20d86c8298 100644 --- a/src/artifacts/dotnet/DotnetBundle.ts +++ b/src/artifacts/dotnet/DotnetBundle.ts @@ -3,18 +3,16 @@ import { DEFAULT_DOTNET_BUNDLE_READER_LIMITS, type DotnetBundleReaderLimits, } from "../../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; import { readArtifactFileChunks, ArtifactPathRegistry, normalizeArtifactPath, -} from "../../resources/index.js"; -import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure, artifactFixedLimitFailure, + artifactReaderLimitFailure, } from "../../resources/index.js"; +import { abortIfNeeded } from "../ArtifactHash.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; /** SHA-256 marker embedded by Microsoft's apphost; the preceding UInt64 is the header offset. */ diff --git a/src/artifacts/nodeSea/NodeSeaBlob.ts b/src/artifacts/nodeSea/NodeSeaBlob.ts index 51b96e832e..4eef979b8b 100644 --- a/src/artifacts/nodeSea/NodeSeaBlob.ts +++ b/src/artifacts/nodeSea/NodeSeaBlob.ts @@ -3,12 +3,12 @@ import { setImmediate } from "node:timers/promises"; import { assertArtifactReadActive, ArtifactReaderFailure, + artifactReaderLimitFailure, } from "../../resources/index.js"; import { DEFAULT_NODE_SEA_READER_LIMITS, type NodeSeaReaderLimits, } from "../../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; import { strictUtf8Decoder } from "../../domain/strictUtf8.js"; /** Node `SeaBlob::kMagic` from `src/node_sea.h` (v24). */ diff --git a/src/artifacts/nodeSea/NodeSeaLocation.ts b/src/artifacts/nodeSea/NodeSeaLocation.ts index 4a561b138b..e19bd4b4d9 100644 --- a/src/artifacts/nodeSea/NodeSeaLocation.ts +++ b/src/artifacts/nodeSea/NodeSeaLocation.ts @@ -23,12 +23,14 @@ import type { FileHandle } from "node:fs/promises"; import type { StableRegularFileDescriptor } from "../../filesystem/RegularFile.js"; import { abortIfNeeded } from "../ArtifactHash.js"; -import { ArtifactReaderFailure } from "../../resources/index.js"; +import { + ArtifactReaderFailure, + artifactReaderLimitFailure, +} from "../../resources/index.js"; import { DEFAULT_NODE_SEA_READER_LIMITS, type NodeSeaReaderLimits, } from "../../domain/artifactReaderLimits.js"; -import { artifactReaderLimitFailure } from "../ArtifactReaderLimits.js"; import { readFatContainerHeader, readFatHeaderPrefix, diff --git a/src/artifacts/ArtifactReaderLimits.ts b/src/resources/ArtifactReaderLimits.ts similarity index 97% rename from src/artifacts/ArtifactReaderLimits.ts rename to src/resources/ArtifactReaderLimits.ts index 454dce9c9a..4feaa41641 100644 --- a/src/artifacts/ArtifactReaderLimits.ts +++ b/src/resources/ArtifactReaderLimits.ts @@ -1,5 +1,5 @@ import type { ArtifactLimitBoundary } from "../domain/artifactOperationError.js"; -import { ArtifactReaderFailure } from "../resources/index.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { artifactReaderLimitMaximum } from "../domain/artifactReaderLimits.js"; /** Construct exact next-call recovery at the enforcing resource owner. */ diff --git a/src/resources/index.ts b/src/resources/index.ts index a528872cd4..c518cad06b 100644 --- a/src/resources/index.ts +++ b/src/resources/index.ts @@ -34,6 +34,7 @@ export { sameArtifactEntry, sameArtifactSourceIdentity, } from "./ArtifactReader.js"; +export { artifactReaderLimitFailure } from "./ArtifactReaderLimits.js"; export type { ArtifactEntry, ArtifactReader,