From 2196fe39c1555a809a1668e9ca15813821f18528 Mon Sep 17 00:00:00 2001
From: Jakub Nowakowski <jakub.nowakowski@thesis.co>
Date: Fri, 6 Dec 2024 10:49:38 +0100
Subject: [PATCH] Enable retries for all HTTP requests in SDK

Previously we were only retrying HTTP requests in the SDK for tBTC API
calls. We can generalize this solution and apply it to all HTTP requests.
---
 sdk/src/lib/api/HttpApi.ts | 28 ++++++++++++++++------------
 sdk/src/lib/api/TbtcApi.ts | 24 ++++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/sdk/src/lib/api/HttpApi.ts b/sdk/src/lib/api/HttpApi.ts
index 696156715..eb9be45ca 100644
--- a/sdk/src/lib/api/HttpApi.ts
+++ b/sdk/src/lib/api/HttpApi.ts
@@ -28,7 +28,7 @@ export default abstract class HttpApi {
    * @returns The HTTP response.
    * @throws Error if the request fails after all retries.
    */
-  async requestWithRetry(
+  async #requestWithRetry(
     requestFn: () => Promise<Response>,
   ): Promise<Response> {
     return backoffRetrier<Response>(
@@ -55,10 +55,12 @@ export default abstract class HttpApi {
     endpoint: string,
     requestInit?: RequestInit,
   ): Promise<Response> {
-    return fetch(new URL(endpoint, this.#apiUrl), {
-      credentials: "include",
-      ...requestInit,
-    })
+    return this.#requestWithRetry(async () =>
+      fetch(new URL(endpoint, this.#apiUrl), {
+        credentials: "include",
+        ...requestInit,
+      }),
+    )
   }
 
   /**
@@ -73,12 +75,14 @@ export default abstract class HttpApi {
     body: unknown,
     requestInit?: RequestInit,
   ): Promise<Response> {
-    return fetch(new URL(endpoint, this.#apiUrl), {
-      method: "POST",
-      body: JSON.stringify(body),
-      credentials: "include",
-      headers: { "Content-Type": "application/json" },
-      ...requestInit,
-    })
+    return this.#requestWithRetry(async () =>
+      fetch(new URL(endpoint, this.#apiUrl), {
+        method: "POST",
+        body: JSON.stringify(body),
+        credentials: "include",
+        headers: { "Content-Type": "application/json" },
+        ...requestInit,
+      }),
+    )
   }
 }
diff --git a/sdk/src/lib/api/TbtcApi.ts b/sdk/src/lib/api/TbtcApi.ts
index a1baf46c4..c4ce503c4 100644
--- a/sdk/src/lib/api/TbtcApi.ts
+++ b/sdk/src/lib/api/TbtcApi.ts
@@ -38,11 +38,11 @@ export default class TbtcApi extends HttpApi {
    * otherwise.
    */
   async saveReveal(revealData: SaveRevealRequest): Promise<boolean> {
-    const response = await this.requestWithRetry(async () =>
-      this.postRequest("reveals", revealData),
-    ).catch((error) => {
-      throw new Error(`Failed to save reveal: ${error}`)
-    })
+    const response = await this.postRequest("reveals", revealData).catch(
+      (error) => {
+        throw new Error(`Failed to save reveal: ${error}`)
+      },
+    )
 
     const { success } = (await response.json()) as { success: boolean }
 
@@ -59,11 +59,11 @@ export default class TbtcApi extends HttpApi {
     depositStatus: DepositStatus
     fundingOutpoint: BitcoinTxOutpoint
   }> {
-    const response = await this.requestWithRetry(async () =>
-      this.postRequest("deposits", depositData),
-    ).catch((error) => {
-      throw new Error(`Failed to create deposit: ${error}`)
-    })
+    const response = await this.postRequest("deposits", depositData).catch(
+      (error) => {
+        throw new Error(`Failed to create deposit: ${error}`)
+      },
+    )
 
     const responseData = (await response.json()) as CreateDepositResponse
 
@@ -82,8 +82,8 @@ export default class TbtcApi extends HttpApi {
    * @returns All owner deposits, including queued deposits.
    */
   async getDepositsByOwner(depositOwner: ChainIdentifier): Promise<Deposit[]> {
-    const response = await this.requestWithRetry(async () =>
-      this.getRequest(`deposits/${depositOwner.identifierHex}`),
+    const response = await this.getRequest(
+      `deposits/${depositOwner.identifierHex}`,
     ).catch((error) => {
       throw new Error(`Failed to fetch deposits: ${error}`)
     })