hanzoai/deploy
2
0
Fork 0
mirror of https://github.com/hanzoai/deploy.git synced 2026-10-07 08:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): don't prefetch errors (#27877) (cherry-pick #27925 for 3.3) (#28023)

Browse Source 
Signed-off-by: Blake Pettersson <[email protected]>
Co-authored-by: Blake Pettersson <[email protected]>
This commit is contained in:
argo-cd-cherry-pick-bot[bot]
2026-05-27 00:10:36 -10:00
committed by GitHub
co-authored by Blake Pettersson
parent 4e8f4ed2e9
commit d56d44a00a
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/app/shared/services/requests.ts
+31 -20
View File
@@ -71,37 +71,48 @@ export default {
const fullUrl = `${apiRoot()}${url}`;
const abortController = new AbortController();
let errored = false;
// If there is an error, show it beforehand
fetch(fullUrl, {signal: abortController.signal})
.then(response => {
if (!response.ok) {
return response.text().then(text => {
// EventSource's error event is opaque (no status, no body). On failure,
// issue a one-shot fetch so we can surface the server's HTTP status and
// body. This replaces the always-on prefetch, which doubled the open
// watch streams per subscription and held an HTTP/1.1 connection slot
// for the lifetime of every watch — see issue #27877.
const probeAndError = (eventSourceError: any) => {
if (errored) {
return;
}
errored = true;
fetch(fullUrl, {signal: abortController.signal})
.then(async response => {
if (!response.ok) {
const text = await response.text();
observer.error({status: response.status, statusText: response.statusText, body: text});
onError.next({status: response.status, name: response.statusText, message: text} as agent.ResponseError);
});
}
})
.catch(err => {
if (err.name === 'AbortError') {
return;
}
observer.error(err);
onError.next(err);
});
} else {
await response.body?.cancel();
observer.error(eventSourceError);
onError.next(eventSourceError);
}
})
.catch(fetchErr => {
if (fetchErr.name === 'AbortError') {
return;
}
observer.error(fetchErr);
onError.next(fetchErr);
});
};
let eventSource = new EventSource(fullUrl);
eventSource.onmessage = msg => observer.next(msg.data);
eventSource.onerror = e => {
observer.error(e);
onError.next(e);
};
eventSource.onerror = e => probeAndError(e);
// EventSource does not provide easy way to get notification when connection closed.
// check readyState periodically instead.
const interval = setInterval(() => {
if (eventSource && eventSource.readyState === ReadyState.CLOSED) {
observer.error('connection got closed unexpectedly');
probeAndError('connection got closed unexpectedly');
}
}, 500);
return () => {