Sessie: een start-refresh zonder oordeel (429/5xx/netwerk) zet de gebruiker niet meer op gast maar toont een retry-scherm; Retry-After wordt gestuurd en gerespecteerd
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -22,12 +22,15 @@ export type ApiResult<T> = { ok: true; data: T } | { ok: false; error: ProblemDe
|
||||
export class ProblemDetailsError extends Error {
|
||||
readonly status: number;
|
||||
readonly problem: ProblemDetails;
|
||||
/** From the Retry-After header (seconds), in milliseconds; undefined when the server did not say. */
|
||||
readonly retryAfterMs?: number;
|
||||
|
||||
constructor(status: number, problem: ProblemDetails) {
|
||||
constructor(status: number, problem: ProblemDetails, retryAfterMs?: number) {
|
||||
super(problem.title ?? problem.detail ?? `Request failed with status ${status}`);
|
||||
this.name = 'ProblemDetailsError';
|
||||
this.status = status;
|
||||
this.problem = problem;
|
||||
this.retryAfterMs = retryAfterMs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,13 +158,20 @@ export class ApiClient {
|
||||
const problem: ProblemDetails = isProblemDetails(data)
|
||||
? data
|
||||
: { status: response.status, title: response.statusText };
|
||||
throw new ProblemDetailsError(response.status, problem);
|
||||
throw new ProblemDetailsError(response.status, problem, parseRetryAfter(response.headers.get('Retry-After')));
|
||||
}
|
||||
|
||||
return data as T;
|
||||
}
|
||||
}
|
||||
|
||||
/** Retry-After as delay-seconds (the only form a rate limiter sends); anything else is ignored. */
|
||||
function parseRetryAfter(value: string | null): number | undefined {
|
||||
if (value === null) return undefined;
|
||||
const seconds = Number(value);
|
||||
return Number.isFinite(seconds) && seconds >= 0 ? Math.round(seconds * 1000) : undefined;
|
||||
}
|
||||
|
||||
function safeJsonParse(text: string): unknown {
|
||||
try {
|
||||
return JSON.parse(text);
|
||||
|
||||
@@ -11,3 +11,12 @@ export const refreshBackoff = { delays: [400, 1200, 2500] as number[] };
|
||||
export function isAuthRejection(error: unknown): boolean {
|
||||
return error instanceof ProblemDetailsError && (error.status === 400 || error.status === 401 || error.status === 403);
|
||||
}
|
||||
|
||||
/** Longest a server's Retry-After is honoured at start-up; a longer wait is left to the visitor's retry button. */
|
||||
export const maxRetryAfterMs = 15000;
|
||||
|
||||
/** How long to wait before the next quiet start-up retry: the planned backoff, or the server's Retry-After if longer. */
|
||||
export function nextRetryDelay(error: unknown, planned: number): number {
|
||||
const asked = error instanceof ProblemDetailsError ? error.retryAfterMs : undefined;
|
||||
return asked === undefined ? planned : Math.max(planned, Math.min(asked, maxRetryAfterMs));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user