@bikefinder/api-client 0.3.0 → 0.4.0

package/src/realtime/api-stream-error.ts

@@ -4,8 +4,13 @@ export type ApiStreamErrorCode = "http" | "protocol" | "network";
 export class ApiStreamError extends Error {
   readonly code: ApiStreamErrorCode;
   readonly status: number | undefined;
+  readonly retryAfterMs: number | undefined;
 
-  constructor(code: ApiStreamErrorCode, status?: number) {
+  constructor(
+    code: ApiStreamErrorCode,
+    status?: number,
+    retryAfterMs?: number,
+  ) {
     super(
       code === "http"
         ? `The tracker stream returned HTTP ${status}.`
@@ -16,5 +21,11 @@ export class ApiStreamError extends Error {
     this.name = "ApiStreamError";
     this.code = code;
     this.status = status;
+    this.retryAfterMs =
+      retryAfterMs !== undefined &&
+      Number.isFinite(retryAfterMs) &&
+      retryAfterMs >= 0
+        ? Math.min(retryAfterMs, 300_000)
+        : undefined;
   }
 }

package/src/realtime/watch.ts

@@ -136,7 +136,12 @@ export function watch<TSdk, TOperation extends StreamOperation<TSdk>>(
                     (error.status ?? 0) >= 500)));
             if (!retryable) throw error;
             const maximum = Math.min(30_000, 1_000 * 2 ** (attempt - 1));
-            return timer(maximum * (0.5 + Math.random() * 0.5));
+            return timer(
+              Math.max(
+                maximum * (0.5 + Math.random() * 0.5),
+                error.retryAfterMs ?? 0,
+              ),
+            );
           },
         }),
       ),

package/src/transport.ts

@@ -60,7 +60,7 @@ export function createAuthenticatedFetch(
       if (response.status !== 200) {
         await response.body?.cancel().catch(() => {});
         if (response.status === 401) throw new AuthenticationError();
-        throw new ApiStreamError("http", response.status);
+        throw new ApiStreamError("http", response.status, retryAfter(response));
       }
       const contentType = response.headers
         .get("Content-Type")
@@ -86,6 +86,15 @@ export function createAuthenticatedFetch(
   };
 }
 
+function retryAfter(response: Response): number | undefined {
+  const value = response.headers.get("Retry-After")?.trim();
+  if (!value) return undefined;
+  const delay = /^\d+$/.test(value)
+    ? Number(value) * 1_000
+    : Date.parse(value) - Date.now();
+  return Number.isFinite(delay) ? Math.max(0, delay) : undefined;
+}
+
 function throwIfAborted(signal?: AbortSignal): void {
   // Expo's React Native AbortSignal supports aborted, but not throwIfAborted().
   if (signal?.aborted) {