Bundle install: Only use stdin for streaming

github · Oct 22, 2024 · 8c3a732 · 8c3a732
1 parent b35b023
commit 8c3a732
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/lib/tar.js b/lib/tar.js
diff --git a/lib/tar.js.map b/lib/tar.js.map
diff --git a/src/tar.ts b/src/tar.ts
@@ -125,23 +125,19 @@ export async function extract(
           "Could not determine tar version, which is required to extract a Zstandard archive.",
         );
       }
-      return await extractTarZst(
-        fs.createReadStream(tarPath),
-        tarVersion,
-        logger,
-      );
+      return await extractTarZst(tarPath, tarVersion, logger);
   }
 }
 
 /**
  * Extract a compressed tar archive
  *
- * @param file     path to the tar
+ * @param tar   tar stream, or path to the tar
  * @param dest     destination directory. Optional.
  * @returns        path to the destination directory
  */
 export async function extractTarZst(
-  tarStream: stream.Readable,
+  tar: stream.Readable | string,
   tarVersion: TarVersion,
   logger: Logger,
 ): Promise<string> {
@@ -157,7 +153,7 @@ export async function extractTarZst(
       args.push("--overwrite");
     }
 
-    args.push("-f", "-", "-C", dest);
+    args.push("-f", tar instanceof stream.Readable ? "-" : tar, "-C", dest);
 
     process.stdout.write(`[command]tar ${args.join(" ")}\n`);
 
@@ -175,7 +171,9 @@ export async function extractTarZst(
       process.stdout.write(data);
     });
 
-    tarStream.pipe(tarProcess.stdin);
+    if (tar instanceof stream.Readable) {
+      tar.pipe(tarProcess.stdin);
+    }
 
     await new Promise<void>((resolve, reject) => {
       tarProcess.on("exit", (code) => {