Return response when response is ok

hugoalh · Aug 9, 2023 · c6adc3b · c6adc3b
1 parent 2157a78
commit c6adc3b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -18,6 +18,7 @@ body:
       description: "What versions are affected? Versions must be listed as supported in the Security Policy (file: `SECURITY.md`)."
       multiple: true
       options:
+        - "v0.1.2"
         - "v0.1.1"
         - "v0.1.0"
     validations:

diff --git a/deno.json b/deno.json
@@ -14,5 +14,6 @@
 				"recommended"
 			]
 		}
-	}
+	},
+	"lock": false
 }
diff --git a/exfetch.ts b/exfetch.ts
@@ -272,6 +272,12 @@ export class ExFetch {
 		let response: Response;
 		do {
 			response = await fetch(input, { ...init, signal });
+			if (
+				response.ok ||
+				attempt >= this.#retry.attempts
+			) {
+				break;
+			}
 			let retryable: boolean = statusCodeRetryable.has(response.status);
 			if (typeof this.#retry.condition === "function") {
 				if (!this.#retry.condition(response.status, retryable)) {
@@ -282,9 +288,6 @@ export class ExFetch {
 					break;
 				}
 			}
-			if (attempt >= this.#retry.attempts) {
-				break;
-			}
 			let delayTime: number;
 			let headerRetryAfterValue: string | null = response.headers.get("Retry-After");
 			if (typeof headerRetryAfterValue === "string") {