Merge branch 'main' into ss/add-query-method-support

Author: sindresorhus

readme.md

@@ -294,7 +294,7 @@ If `retry` is a number, it will be used as `limit` and other defaults will remai
 
 Network errors (e.g., DNS failures, connection refused, offline) are automatically retried for retriable methods. Only errors recognized as network errors are retried; other errors (e.g., programming bugs) are thrown immediately. Use `shouldRetry` to customize this behavior.
 
-If the response provides an HTTP status contained in `afterStatusCodes`, Ky will wait until the date, timeout, or timestamp given in the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header has passed to retry the request. If `Retry-After` is missing, the non-standard [`RateLimit-Reset`](https://www.ietf.org/archive/id/draft-polli-ratelimit-headers-05.html#section-3.3) header is used in its place as a fallback. If the provided status code is not in the list, the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header will be ignored.
+If the response provides an HTTP status contained in `afterStatusCodes`, Ky will wait until the date, delay, or timestamp given in the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header has passed to retry the request. If `Retry-After` is missing, the non-standard [`RateLimit-Reset`](https://www.ietf.org/archive/id/draft-polli-ratelimit-headers-05.html#section-3.3) header is used in its place as a fallback. If the provided status code is not in the list, the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header will be ignored.
 
 If [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header is greater than `maxRetryAfter`, it will use `maxRetryAfter`.
 

source/types/options.ts

@@ -174,7 +174,7 @@ export type KyOptions = {
 
 	Network errors (e.g., DNS failures, connection refused, offline) are automatically retried for retriable methods. Only errors recognized as network errors are retried; other errors (e.g., programming bugs) are thrown immediately. Use `shouldRetry` to customize this behavior.
 
-	If the response provides an HTTP status contained in `afterStatusCodes`, Ky will wait until the date, timeout, or timestamp given in the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header has passed to retry the request. If `Retry-After` is missing, the non-standard [`RateLimit-Reset`](https://www.ietf.org/archive/id/draft-polli-ratelimit-headers-05.html#section-3.3) header is used in its place as a fallback. If the provided status code is not in the list, the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header will be ignored.
+	If the response provides an HTTP status contained in `afterStatusCodes`, Ky will wait until the date, delay, or timestamp given in the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header has passed to retry the request. If `Retry-After` is missing, the non-standard [`RateLimit-Reset`](https://www.ietf.org/archive/id/draft-polli-ratelimit-headers-05.html#section-3.3) header is used in its place as a fallback. If the provided status code is not in the list, the [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header will be ignored.
 
 	If [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After) header is greater than `maxRetryAfter`, it will use `maxRetryAfter`.
 

test/retry.ts

@@ -2029,18 +2029,18 @@ test('totalTimeout with retryOnTimeout: true caps total time across retries', as
 
 	const customFetch: typeof fetch = async () => {
 		requestCount++;
-		// Each attempt takes 600ms, exceeding the 400ms per-attempt timeout
-		await delay(600);
+		// Each attempt takes longer than the per-attempt timeout, so every attempt times out.
+		await delay(300);
 		return new Response('ok');
 	};
 
 	await t.throwsAsync(
 		ky('https://example.com', {
 			fetch: customFetch,
-			timeout: 400,
-			totalTimeout: 1500,
+			timeout: 100,
+			totalTimeout: 1000,
 			retry: {
-				limit: 10,
+				limit: 30,
 				retryOnTimeout: true,
 				delay: () => 0,
 			},
@@ -2050,8 +2050,11 @@ test('totalTimeout with retryOnTimeout: true caps total time across retries', as
 		},
 	);
 
-	// Each attempt times out at ~400ms. Within 1500ms totalTimeout, 2-4 attempts fit.
-	t.true(requestCount >= 2 && requestCount <= 4);
+	// Each attempt times out at ~100ms, so many attempts fit within the 1000ms totalTimeout.
+	// The exact count is timing-dependent (slow CI runs fewer), so we only assert the invariant:
+	// it retried at least once, and totalTimeout stopped it well before the retry limit.
+	t.true(requestCount >= 2, `Expected at least 2 attempts, got ${requestCount}`);
+	t.true(requestCount < 30, `Expected totalTimeout to cap below the retry limit, got ${requestCount}`);
 });
 
 test('NetworkError wraps fetch network errors', async t => {