ref: more robust auth

Author: ex3ndr

sources/client/clientMe.ts

@@ -1,21 +1,23 @@
 import type { CommandContext } from "@/commands/types";
+import {
+  NetworkError,
+  ServerError,
+} from "@/commands/auth/appPairingRequest";
 
 type ClientUser = {
   id: number;
   first_name: string;
   last_name: string | null;
 };
 
+const MAX_RETRIES = 10;
+const MAX_BACKOFF_MS = 30000;
+
 export async function fetchClientMe(
   context: CommandContext,
   token: string
 ): Promise<ClientUser> {
-  const response = await context.client.fetch("/v1/me", {
-    method: "GET",
-    headers: {
-      Authorization: `Bearer ${token}`,
-    },
-  });
+  const response = await fetchWithRetry(context, token);
 
   if (!response.ok) {
     const errorPayload = await safeJson(response);
@@ -40,6 +42,75 @@ export async function fetchClientMe(
   };
 }
 
+async function fetchWithRetry(
+  context: CommandContext,
+  token: string
+): Promise<Response> {
+  let lastError: Error | null = null;
+  let lastErrorType: "network" | "server" | null = null;
+
+  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      const response = await context.client.fetch("/v1/me", {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+      });
+
+      if (response.status >= 500 && response.status < 600) {
+        lastErrorType = "server";
+        lastError = new ServerError(`Server error: ${response.status}`);
+        if (attempt < MAX_RETRIES) {
+          console.log(
+            `Server is temporarily unavailable, retrying... (attempt ${attempt} of ${MAX_RETRIES})`
+          );
+          await sleep(getBackoffDelay(attempt));
+          continue;
+        }
+      }
+
+      return response;
+    } catch (error) {
+      lastErrorType = "network";
+      lastError =
+        error instanceof Error
+          ? new NetworkError(error.message)
+          : new NetworkError("Unknown network error");
+
+      if (attempt < MAX_RETRIES) {
+        console.log(
+          `Network connection issue, retrying... (attempt ${attempt} of ${MAX_RETRIES})`
+        );
+        await sleep(getBackoffDelay(attempt));
+        continue;
+      }
+    }
+  }
+
+  if (lastErrorType === "network") {
+    throw new NetworkError(
+      "Unable to connect to Bee services. Please check your internet connection and try again."
+    );
+  }
+
+  if (lastErrorType === "server") {
+    throw new ServerError(
+      "Bee servers are currently experiencing issues. Please try again later."
+    );
+  }
+
+  throw lastError ?? new Error("Request failed after multiple retries.");
+}
+
+function getBackoffDelay(attempt: number): number {
+  return Math.min(1000 * Math.pow(2, attempt - 1), MAX_BACKOFF_MS);
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 async function safeJson(
   response: Response
 ): Promise<Record<string, unknown> | null> {

sources/commands/auth/appPairingRequest.ts

@@ -5,12 +5,28 @@ export type AppPairingRequest =
   | { status: "completed"; requestId: string; encryptedToken: string }
   | { status: "expired"; requestId: string };
 
+export class NetworkError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "NetworkError";
+  }
+}
+
+export class ServerError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ServerError";
+  }
+}
+
 const PAIRING_API_URLS: Record<Environment, string> = {
   prod: "https://auth.beeai-services.com",
   staging: "https://public-api.korshaks.people.amazon.dev",
 };
 
 const PAIRING_PATH = "/apps/pairing/request";
+const MAX_RETRIES = 10;
+const MAX_BACKOFF_MS = 30000;
 
 export async function requestAppPairing(
   env: Environment,
@@ -86,7 +102,74 @@ async function fetchPairing(
   init: RequestInit
 ): Promise<Response> {
   const url = new URL(PAIRING_PATH, PAIRING_API_URLS[env]);
-  return fetch(url, init);
+  return await fetchWithRetry(url, init);
+}
+
+async function fetchWithRetry(
+  url: URL,
+  init: RequestInit
+): Promise<Response> {
+  let lastError: Error | null = null;
+  let lastErrorType: "network" | "server" | null = null;
+
+  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+    try {
+      const response = await fetch(url, init);
+
+      if (response.status >= 500 && response.status < 600) {
+        lastErrorType = "server";
+        lastError = new ServerError(
+          `Server error: ${response.status}`
+        );
+        if (attempt < MAX_RETRIES) {
+          console.log(
+            `Server is temporarily unavailable, retrying... (attempt ${attempt} of ${MAX_RETRIES})`
+          );
+          await sleep(getBackoffDelay(attempt));
+          continue;
+        }
+      }
+
+      return response;
+    } catch (error) {
+      lastErrorType = "network";
+      lastError =
+        error instanceof Error
+          ? new NetworkError(error.message)
+          : new NetworkError("Unknown network error");
+
+      if (attempt < MAX_RETRIES) {
+        console.log(
+          `Network connection issue, retrying... (attempt ${attempt} of ${MAX_RETRIES})`
+        );
+        await sleep(getBackoffDelay(attempt));
+        continue;
+      }
+    }
+  }
+
+  if (lastErrorType === "network") {
+    throw new NetworkError(
+      "Unable to connect to Bee services. Please check your internet connection and try again."
+    );
+  }
+
+  if (lastErrorType === "server") {
+    throw new ServerError(
+      "Bee servers are currently experiencing issues. Please try again later."
+    );
+  }
+
+  throw lastError ?? new Error("Request failed after multiple retries.");
+}
+
+function getBackoffDelay(attempt: number): number {
+  const delay = Math.min(1000 * Math.pow(2, attempt - 1), MAX_BACKOFF_MS);
+  return delay;
+}
+
+async function sleep(ms: number): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 async function safeJson(