Skip to content

fix: release upstream response body before sending error on status/header failure #27

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

Merged
DominicBM merged 4 commits into from
Apr 16, 2026
Merged

fix: release upstream response body before sending error on status/header failure #27

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37a2b75
fix: release upstream response body before sending error on status/he…
DominicBM Apr 15, 2026
535ebc8
refactor: extract releaseUpstreamBody helper to remove duplication
DominicBM Apr 16, 2026
8db4551
Use optional chaining on .catch() in releaseUpstreamBody to prevent T…
DominicBM Apr 16, 2026
f31d6e9
fix: release upstream body in serveItemFromS3 on non-OK status
DominicBM Apr 16, 2026
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
7 changes: 7 additions & 0 deletions src/ThumbnailApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export class ThumbnailApi {

if (!this.responseHelper.okStatus(status)) {
const error = new Error(`Status ${String(status)} from upstream.`);
this.releaseUpstreamBody(remoteImageResponse);
this.sendError(expressResponse, itemId, 404, error);
return;
}
Expand All @@ -106,6 +107,7 @@ export class ThumbnailApi {

if (!this.responseHelper.okHeaders(remoteImageResponse.headers)) {
const error = new Error(`Got bad headers from upstream.`);
this.releaseUpstreamBody(remoteImageResponse);
this.sendError(expressResponse, itemId, 404, error);
return;
}
Expand Down Expand Up @@ -139,6 +141,7 @@ export class ThumbnailApi {

if (!this.responseHelper.okStatus(status)) {
const error = new Error(`Status ${String(status)} from upstream.`);
this.releaseUpstreamBody(response);
this.sendError(expressResponse, itemId, 404, error);
return;
}
Expand Down Expand Up @@ -169,6 +172,10 @@ export class ThumbnailApi {
}
}

private releaseUpstreamBody(response: Response): void {
void response.body?.cancel?.()?.catch(() => {});
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

sendError(
res: express.Response,
itemId: string,
Expand Down
Loading