Skip to content

fix: await progress-log writes before finishing CLI download #1082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EhabY wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: await progress-log writes before finishing CLI download #1082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/core/cliManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,8 @@ export class CliManager {
? "unknown"
: prettyBytes(contentLength);

let progressWrite: Promise<void> = Promise.resolve();

// Pipe data received from the request to the stream.
readStream.on("data", (buffer: Buffer) => {
writeStream.write(buffer, () => {
Expand All @@ -810,7 +812,7 @@ export class CliManager {
: (buffer.byteLength / contentLength) * 100,
});
if (onProgress) {
onProgress(
progressWrite = onProgress(
written,
Number.isNaN(contentLength) ? null : contentLength,
).catch((error) => {
Expand All @@ -827,27 +829,33 @@ export class CliManager {
return new Promise<boolean>((resolve, reject) => {
writeStream.on("error", (error) => {
readStream.destroy();
reject(
new Error(
`Unable to download binary: ${errToStr(error, "no reason given")}`,
void progressWrite.then(() =>
reject(
new Error(
`Unable to download binary: ${errToStr(error, "no reason given")}`,
),
),
);
});
readStream.on("error", (error) => {
writeStream.close();
reject(
new Error(
`Unable to download binary: ${errToStr(error, "no reason given")}`,
void progressWrite.then(() =>
reject(
new Error(
`Unable to download binary: ${errToStr(error, "no reason given")}`,
),
),
);
});
readStream.on("close", () => {
writeStream.close();
if (cancelled) {
resolve(false);
} else {
resolve(true);
}
void progressWrite.then(() => {
if (cancelled) {
resolve(false);
} else {
resolve(true);
}
});
});
});
},
Expand Down