Merge branch 'feat/retry-logic' of github.com:MetaMask/snap-7715-permissions into feat/account-api-v2

Author: MoMannn

packages/gator-permissions-snap/src/clients/accountApiClient.ts

@@ -290,7 +290,10 @@ export class AccountApiClient {
   ): Promise<TokenBalanceResponse> {
     const url = `${this.#accountBaseUrl}/v2/accounts/${account}/balances?networks=${chainId}&filterSupportedTokens=false&includeTokenAddresses=${tokenAddress}&includeStakedAssets=false`;
 
-    return (await makeValidatedRequestWithRetry(
+    return await makeValidatedRequestWithRetry<
+      TokenBalanceResponse,
+      typeof TokenBalanceResponseSchema
+    >(
       url,
       {
         timeoutMs: this.#timeoutMs,
@@ -299,7 +302,7 @@ export class AccountApiClient {
       },
       TokenBalanceResponseSchema,
       retryOptions,
-    )) as TokenBalanceResponse;
+    );
   }
 
   /**
@@ -316,7 +319,10 @@ export class AccountApiClient {
   ): Promise<TokenMetadataResponse> {
     const url = `${this.#tokensBaseUrl}/token/${chainId}?address=${tokenAddress}&includeEnrichedData=false&includeCoingeckoId=false&includeAggregators=false&includeOccurrences=false&includeIconUrl=true&includeAssetType=false&includeTokenFees=false&includeHoneypotStatus=false&includeContractVerificationStatus=false&includeStorage=false&includeERC20Permit=false&includeDescription=false`;
 
-    return (await makeValidatedRequestWithRetry(
+    return await makeValidatedRequestWithRetry<
+      TokenMetadataResponse,
+      typeof TokenMetadataResponseSchema
+    >(
       url,
       {
         timeoutMs: this.#timeoutMs,
@@ -325,6 +331,6 @@ export class AccountApiClient {
       },
       TokenMetadataResponseSchema,
       retryOptions,
-    )) as TokenMetadataResponse;
+    );
   }
 }

packages/gator-permissions-snap/src/utils/httpClient.ts

@@ -31,10 +31,13 @@ export type HttpClientConfig = {
  * @throws {ParseError} If the response cannot be parsed as JSON.
  * @throws {ResourceUnavailableError} If the response structure is invalid according to the schema.
  */
-export async function makeValidatedRequestWithRetry<TResponse>(
+export async function makeValidatedRequestWithRetry<
+  TResponse,
+  TSchema extends z.ZodType<TResponse, any, any>,
+>(
   url: string,
   config: HttpClientConfig,
-  responseSchema: z.ZodSchema<TResponse>,
+  responseSchema: TSchema,
   retryOptions?: RetryOptions,
 ): Promise<TResponse> {
   const { retries = 1, delayMs = 1000 } = retryOptions ?? {};
@@ -68,10 +71,13 @@ export async function makeValidatedRequestWithRetry<TResponse>(
  * @throws {ParseError} If the response cannot be parsed as JSON.
  * @throws {ResourceUnavailableError} If the response structure is invalid according to the schema.
  */
-export async function makeValidatedRequest<TResponse>(
+async function makeValidatedRequest<
+  TResponse,
+  TSchema extends z.ZodType<TResponse, any, any>,
+>(
   url: string,
   config: HttpClientConfig,
-  responseSchema: z.ZodSchema<TResponse>,
+  responseSchema: TSchema,
 ): Promise<TResponse> {
   const { timeoutMs, maxResponseSizeBytes, fetch = globalThis.fetch } = config;
 
@@ -89,8 +95,6 @@ export async function makeValidatedRequest<TResponse>(
       },
     });
   } catch (error) {
-    clearTimeout(timeoutId);
-
     if (error instanceof Error && error.name === 'AbortError') {
       throw new ResourceUnavailableError(
         `Request timed out after ${timeoutMs}ms`,
@@ -100,10 +104,10 @@ export async function makeValidatedRequest<TResponse>(
     throw new InternalError(
       `Failed to fetch resource: ${error instanceof Error ? error.message : 'Unknown error'}`,
     );
+  } finally {
+    clearTimeout(timeoutId);
   }
 
-  clearTimeout(timeoutId);
-
   // Check HTTP status code
   if (!response.ok) {
     if (response.status === 404) {