From 6266a698433490f2547924e8047377447fbddbda Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 20 Feb 2024 13:49:11 +0100
Subject: [PATCH] fix: do not show download prompt when downloading JSON

---
 sources/httpUtils.ts | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/sources/httpUtils.ts b/sources/httpUtils.ts
index f88f752a2..8f48f9d6a 100644
--- a/sources/httpUtils.ts
+++ b/sources/httpUtils.ts
@@ -4,28 +4,12 @@ import {once}          from 'events';
 import {stderr, stdin} from 'process';
 import {Readable}      from 'stream';
 
-export async function fetch(input: string | URL, init?: RequestInit) {
+async function fetch(input: string | URL, init?: RequestInit) {
   if (process.env.COREPACK_ENABLE_NETWORK === `0`)
     throw new UsageError(`Network access disabled by the environment; can't reach ${input}`);
 
   const agent = await getProxyAgent(input);
 
-  if (process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT === `1`) {
-    console.error(`Corepack is about to download ${input}.`);
-    if (stdin.isTTY && !process.env.CI) {
-      stderr.write(`\nDo you want to continue? [Y/n] `);
-      stdin.resume();
-      const chars = await once(stdin, `data`);
-      stdin.pause();
-      if (
-        chars[0][0] === 0x6e || // n
-        chars[0][0] === 0x4e // N
-      ) {
-        throw new UsageError(`Aborted by the user`);
-      }
-    }
-  }
-
   let response;
   try {
     response = await globalThis.fetch(input, {
@@ -55,6 +39,22 @@ export async function fetchAsJson(input: string | URL, init?: RequestInit) {
 }
 
 export async function fetchUrlStream(input: string | URL, init?: RequestInit) {
+  if (process.env.COREPACK_ENABLE_DOWNLOAD_PROMPT === `1`) {
+    console.error(`Corepack is about to download ${input}.`);
+    if (stdin.isTTY && !process.env.CI) {
+      stderr.write(`\nDo you want to continue? [Y/n] `);
+      stdin.resume();
+      const chars = await once(stdin, `data`);
+      stdin.pause();
+      if (
+        chars[0][0] === 0x6e || // n
+        chars[0][0] === 0x4e // N
+      ) {
+        throw new UsageError(`Aborted by the user`);
+      }
+    }
+  }
+
   const response = await fetch(input, init);
   const webStream = response.body;
   assert(webStream, `Expected stream to be set`);