Review

src/download/checksum/checksum.ts

@@ -13,37 +13,34 @@ export async function validateChecksum(
   version: string,
   ndjsonChecksum?: string,
 ): Promise<void> {
-  let isValid: boolean | undefined;
-  let checksumUsed: string | undefined;
-
   // Priority: user-provided checksum > KNOWN_CHECKSUMS > NDJSON fallback
+  const key = `${arch}-${platform}-${version}`;
+  let checksumToUse: string | undefined;
+  let source: string;
+
   if (checkSum !== undefined && checkSum !== "") {
-    checksumUsed = checkSum;
-    core.debug("Using user-provided checksum.");
-    isValid = await validateFileCheckSum(downloadPath, checkSum);
+    checksumToUse = checkSum;
+    source = "user-provided";
+  } else if (key in KNOWN_CHECKSUMS) {
+    checksumToUse = KNOWN_CHECKSUMS[key];
+    source = `known checksum for ${key}`;
+  } else if (ndjsonChecksum !== undefined && ndjsonChecksum !== "") {
+    checksumToUse = ndjsonChecksum;
+    source = "NDJSON version data";
   } else {
-    const key = `${arch}-${platform}-${version}`;
-    if (key in KNOWN_CHECKSUMS) {
-      checksumUsed = KNOWN_CHECKSUMS[key];
-      core.debug(`Using known checksum for ${key}.`);
-      isValid = await validateFileCheckSum(downloadPath, checksumUsed);
-    } else if (ndjsonChecksum !== undefined && ndjsonChecksum !== "") {
-      checksumUsed = ndjsonChecksum;
-      core.debug("Using checksum from NDJSON version data.");
-      isValid = await validateFileCheckSum(downloadPath, ndjsonChecksum);
-    } else {
-      core.debug(`No checksum found for ${key}.`);
-    }
+    core.debug(`No checksum found for ${key}.`);
+    return;
   }
 
-  if (isValid === false) {
+  core.debug(`Using ${source}.`);
+  const isValid = await validateFileCheckSum(downloadPath, checksumToUse);
+
+  if (!isValid) {
     throw new Error(
-      `Checksum for ${downloadPath} did not match ${checksumUsed}.`,
+      `Checksum for ${downloadPath} did not match ${checksumToUse}.`,
     );
   }
-  if (isValid === true) {
-    core.debug(`Checksum for ${downloadPath} is valid.`);
-  }
+  core.debug(`Checksum for ${downloadPath} is valid.`);
 }
 
 async function validateFileCheckSum(

src/download/download-version.ts

@@ -8,11 +8,10 @@ import { OWNER, REPO, TOOL_CACHE_NAME } from "../utils/constants";
 import type { Architecture, Platform } from "../utils/platforms";
 import { validateChecksum } from "./checksum/checksum";
 import {
-  getDownloadUrl,
   getLatestKnownVersion as getLatestVersionInManifest,
+  getDownloadUrl as getManifestDownloadUrl,
 } from "./version-manifest";
 import {
-  type ArtifactResult,
   getAllVersions,
   getArtifact,
   getLatestVersion as getLatestVersionFromNdjson,
@@ -33,7 +32,7 @@ export function tryGetFromToolCache(
   return { installedPath, version: resolvedVersion };
 }
 
-export async function downloadVersionFromGithub(
+export async function downloadVersionFromNdjson(
   platform: Platform,
   arch: Architecture,
   version: string,
@@ -43,13 +42,8 @@ export async function downloadVersionFromGithub(
   const artifact = `uv-${arch}-${platform}`;
   const extension = getExtension(platform);
 
-  // Try to get artifact info from NDJSON (includes checksum)
-  let artifactInfo: ArtifactResult | undefined;
-  try {
-    artifactInfo = await getArtifact(version, arch, platform);
-  } catch (err) {
-    core.debug(`Failed to get artifact from NDJSON: ${(err as Error).message}`);
-  }
+  // Get artifact info from NDJSON (includes URL and checksum)
+  const artifactInfo = await getArtifact(version, arch, platform);
 
   const downloadUrl =
     artifactInfo?.url ??
@@ -68,39 +62,23 @@ export async function downloadVersionFromGithub(
 }
 
 export async function downloadVersionFromManifest(
-  manifestUrl: string | undefined,
+  manifestUrl: string,
   platform: Platform,
   arch: Architecture,
   version: string,
   checkSum: string | undefined,
   githubToken: string,
 ): Promise<{ version: string; cachedToolDir: string }> {
-  const downloadUrl = await getDownloadUrl(
+  const downloadUrl = await getManifestDownloadUrl(
     manifestUrl,
     version,
     arch,
     platform,
   );
   if (!downloadUrl) {
-    core.info(
-      `manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}. Falling back to GitHub releases.`,
+    throw new Error(
+      `manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}.`,
     );
-    return await downloadVersionFromGithub(
-      platform,
-      arch,
-      version,
-      checkSum,
-      githubToken,
-    );
-  }
-
-  // Try to get checksum from NDJSON for manifest downloads too
-  let ndjsonChecksum: string | undefined;
-  try {
-    const artifactInfo = await getArtifact(version, arch, platform);
-    ndjsonChecksum = artifactInfo?.sha256;
-  } catch (err) {
-    core.debug(`Failed to get artifact from NDJSON: ${(err as Error).message}`);
   }
 
   return await downloadVersion(
@@ -111,7 +89,7 @@ export async function downloadVersionFromManifest(
     version,
     checkSum,
     githubToken,
-    ndjsonChecksum,
+    undefined, // No NDJSON checksum for manifest downloads
   );
 }
 

src/download/versions-client.ts

@@ -31,46 +31,19 @@ export async function fetchVersionData(): Promise<NdjsonVersion[]> {
     );
   }
 
+  const body = await response.text();
   const versions: NdjsonVersion[] = [];
 
-  if (!response.body) {
-    throw new Error("Response body is null");
-  }
-
-  // Stream and parse NDJSON line by line
-  const decoder = new TextDecoder();
-  let buffer = "";
-
-  for await (const chunk of response.body) {
-    buffer += decoder.decode(chunk, { stream: true });
-
-    // Process complete lines
-    const lines = buffer.split("\n");
-    // Keep the last potentially incomplete line in buffer
-    buffer = lines.pop() ?? "";
-
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (trimmed === "") {
-        continue;
-      }
-      try {
-        const version = JSON.parse(trimmed) as NdjsonVersion;
-        versions.push(version);
-      } catch {
-        core.debug(`Failed to parse NDJSON line: ${trimmed}`);
-      }
+  for (const line of body.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") {
+      continue;
     }
-  }
-
-  // Process any remaining content in buffer
-  const remaining = buffer.trim();
-  if (remaining !== "") {
     try {
-      const version = JSON.parse(remaining) as NdjsonVersion;
+      const version = JSON.parse(trimmed) as NdjsonVersion;
       versions.push(version);
     } catch {
-      core.debug(`Failed to parse NDJSON line: ${remaining}`);
+      core.debug(`Failed to parse NDJSON line: ${trimmed}`);
     }
   }