Skip to content

fix(differentialDownloader): improve error handling and timeout management in multipleRangeDownloader #9071

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+20 −3
Open

fix(differentialDownloader): improve error handling and timeout management in multipleRangeDownloader #9071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d655101
fix(differentialDownloader): improve error handling and timeout manag…
beyondkmp Apr 30, 2025
93b59c7
add changeset
beyondkmp Apr 30, 2025
d47e037
delete wrapperReject
beyondkmp May 1, 2025
b2f6af2
Merge branch 'master' into differentially
beyondkmp May 4, 2025
0a16de6
Merge branch 'master' into differentially
mmaietta Jul 11, 2025
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
5 changes: 5 additions & 0 deletions .changeset/bright-laws-dance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"electron-updater": patch
---

fix(differentialDownloader): improve error handling and timeout management in multipleRangeDownloader
18 changes: 15 additions & 3 deletions packages/electron-updater/src/differentialDownloader/multipleRangeDownloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@ function doExecuteTasks(differentialDownloader: DifferentialDownloader, options:

const requestOptions = differentialDownloader.createRequestOptions()
requestOptions.headers!.Range = ranges.substring(0, ranges.length - 2)

let timeoutId: NodeJS.Timeout | null = null

const wrappedResolve = () => {
if (timeoutId !== null) {
clearTimeout(timeoutId)
timeoutId = null
}
resolve()
}

const request = differentialDownloader.httpExecutor.createRequest(requestOptions, response => {
if (!checkIsRangesSupported(response, reject)) {
return
Expand All @@ -101,15 +112,16 @@ function doExecuteTasks(differentialDownloader: DifferentialDownloader, options:
return
}

const dicer = new DataSplitter(out, options, partIndexToTaskIndex, m[1] || m[2], partIndexToLength, resolve)
const dicer = new DataSplitter(out, options, partIndexToTaskIndex, m[1] || m[2], partIndexToLength, wrappedResolve)
dicer.on("error", reject)
response.pipe(dicer)

response.on("end", () => {
setTimeout(() => {
timeoutId = setTimeout(() => {
Copy link
Collaborator

@mmaietta mmaietta Apr 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to store timeoutId for anything? Curious as to why we need to have wrappedReject. I was under the impression setTimeout without storing its ID would auto-release when GC'd

Copy link
Contributor Author

@beyondkmp beyondkmp May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reject does seem unnecessary now, as it has already failed. At the time of writing, it was done for consistency, so both resolve and reject were included.

Copy link
Contributor Author

@beyondkmp beyondkmp May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted.

Copy link
Collaborator

@mmaietta mmaietta May 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still see timeoutId but only being cleared on resolve now. Why can't we reuse previous logic and only change the timeout?

Are we simply detecting whether the timeout is working properly? e.g. are we attempting to resolve and reject the promise in the same flow so we're hitting a race condition?

Copy link
Collaborator

@mmaietta mmaietta Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@beyondkmp can you please follow up here when you have a chance? Then we can proceed with the PR

timeoutId = null
request.abort()
reject(new Error("Response ends without calling any handlers"))
}, 10000)
}, 30000)
})
})
differentialDownloader.httpExecutor.addErrorAndTimeoutHandlers(request, reject)
Expand Down