Move retry classification upstream

Author: gildesmarais

frontend/src/__tests__/App.test.tsx

@@ -478,7 +478,13 @@ describe('App', () => {
       isLoading: false,
       error: undefined,
     });
-    mockConvertFeed.mockRejectedValueOnce(new Error('Unauthorized'));
+    mockConvertFeed.mockRejectedValueOnce(
+      Object.assign(new Error('Unauthorized'), {
+        code: 'UNAUTHORIZED',
+        status: 401,
+        kind: 'auth',
+      })
+    );
 
     render(<App />);
 
@@ -506,7 +512,13 @@ describe('App', () => {
       isLoading: false,
       error: undefined,
     });
-    mockConvertFeed.mockRejectedValueOnce(new Error('Unauthorized'));
+    mockConvertFeed.mockRejectedValueOnce(
+      Object.assign(new Error('Unauthorized'), {
+        code: 'UNAUTHORIZED',
+        status: 401,
+        kind: 'auth',
+      })
+    );
 
     render(<App />);
 
@@ -574,6 +586,9 @@ describe('App', () => {
     mockConvertFeed
       .mockRejectedValueOnce(
         Object.assign(new Error('Tried faraday first, then browserless. Browserless failed.'), {
+          code: 'INTERNAL_SERVER_ERROR',
+          status: 502,
+          kind: 'server',
           retryAction: 'alternate',
           manualRetryStrategy: 'browserless',
         })
@@ -611,6 +626,9 @@ describe('App', () => {
     mockConvertFeed
       .mockRejectedValueOnce(
         Object.assign(new Error('Tried faraday first, then browserless. Browserless failed.'), {
+          code: 'INTERNAL_SERVER_ERROR',
+          status: 502,
+          kind: 'server',
           retryAction: 'primary',
         })
       )
@@ -647,6 +665,9 @@ describe('App', () => {
     });
     mockConvertFeed.mockRejectedValueOnce(
       Object.assign(new Error('URL not allowed for this account'), {
+        code: 'FORBIDDEN',
+        status: 403,
+        kind: 'server',
         retryAction: undefined,
       })
     );

frontend/src/__tests__/useFeedConversion.test.ts

@@ -171,13 +171,21 @@ describe('useFeedConversion', () => {
     fetchMock.mockRejectedValueOnce(new Error('Network error'));
 
     const { result } = renderHook(() => useFeedConversion());
-    let thrownError: (Error & { manualRetryStrategy?: string; retryAction?: string }) | undefined;
+    let thrownError:
+      | (Error & { manualRetryStrategy?: string; retryAction?: string; kind?: string; code?: string; status?: number })
+      | undefined;
 
     await act(async () => {
       try {
         await result.current.convertFeed('https://example.com', 'faraday', 'testtoken');
       } catch (error) {
-        thrownError = error as Error & { manualRetryStrategy?: string; retryAction?: string };
+        thrownError = error as Error & {
+          manualRetryStrategy?: string;
+          retryAction?: string;
+          kind?: string;
+          code?: string;
+          status?: number;
+        };
       }
     });
 
@@ -187,6 +195,7 @@ describe('useFeedConversion', () => {
     expect(thrownError?.message).toBe('Network error');
     expect(thrownError?.manualRetryStrategy).toBe('browserless');
     expect(thrownError?.retryAction).toBe('alternate');
+    expect(thrownError?.kind).toBe('network');
   });
 
   it('preserves the created feed when preview loading fails after feed creation', async () => {
@@ -623,7 +632,7 @@ describe('useFeedConversion', () => {
       new Response(
         JSON.stringify({
           success: false,
-          error: { message: 'Unauthorized' },
+          error: { code: 'UNAUTHORIZED', message: 'Unauthorized' },
         }),
         {
           status: 401,
@@ -633,13 +642,21 @@ describe('useFeedConversion', () => {
     );
 
     const { result } = renderHook(() => useFeedConversion());
-    let thrownError: (Error & { manualRetryStrategy?: string; retryAction?: string }) | undefined;
+    let thrownError:
+      | (Error & { manualRetryStrategy?: string; retryAction?: string; kind?: string; code?: string; status?: number })
+      | undefined;
 
     await act(async () => {
       try {
         await result.current.convertFeed('https://example.com/articles', 'faraday', 'testtoken');
       } catch (error) {
-        thrownError = error as Error & { manualRetryStrategy?: string; retryAction?: string };
+        thrownError = error as Error & {
+          manualRetryStrategy?: string;
+          retryAction?: string;
+          kind?: string;
+          code?: string;
+          status?: number;
+        };
       }
     });
 
@@ -649,6 +666,9 @@ describe('useFeedConversion', () => {
     expect(thrownError?.message).toBe('Unauthorized');
     expect(thrownError?.manualRetryStrategy).toBeUndefined();
     expect(thrownError?.retryAction).toBeUndefined();
+    expect(thrownError?.kind).toBe('auth');
+    expect(thrownError?.code).toBe('UNAUTHORIZED');
+    expect(thrownError?.status).toBeUndefined();
   });
 
   it('does not auto-retry when API returns a non-retryable BAD_REQUEST code', async () => {
@@ -666,13 +686,21 @@ describe('useFeedConversion', () => {
     );
 
     const { result } = renderHook(() => useFeedConversion());
-    let thrownError: (Error & { manualRetryStrategy?: string; retryAction?: string }) | undefined;
+    let thrownError:
+      | (Error & { manualRetryStrategy?: string; retryAction?: string; kind?: string; code?: string; status?: number })
+      | undefined;
 
     await act(async () => {
       try {
         await result.current.convertFeed('https://example.com/articles', 'faraday', 'testtoken');
       } catch (error) {
-        thrownError = error as Error & { manualRetryStrategy?: string; retryAction?: string };
+        thrownError = error as Error & {
+          manualRetryStrategy?: string;
+          retryAction?: string;
+          kind?: string;
+          code?: string;
+          status?: number;
+        };
       }
     });
 
@@ -682,6 +710,9 @@ describe('useFeedConversion', () => {
     expect(thrownError?.message).toBe('Input rejected');
     expect(thrownError?.manualRetryStrategy).toBeUndefined();
     expect(thrownError?.retryAction).toBeUndefined();
+    expect(thrownError?.kind).toBe('input');
+    expect(thrownError?.code).toBe('BAD_REQUEST');
+    expect(thrownError?.status).toBeUndefined();
   });
 
   it('still auto-retries when API returns INTERNAL_SERVER_ERROR even if message contains a url', async () => {
@@ -781,12 +812,20 @@ describe('useFeedConversion', () => {
 
     const { result } = renderHook(() => useFeedConversion());
 
-    let thrownError: (Error & { manualRetryStrategy?: string; retryAction?: string }) | undefined;
+    let thrownError:
+      | (Error & { manualRetryStrategy?: string; retryAction?: string; kind?: string; code?: string; status?: number })
+      | undefined;
     await act(async () => {
       try {
         await result.current.convertFeed('https://example.com/articles', 'faraday', 'testtoken');
       } catch (error) {
-        thrownError = error as Error & { manualRetryStrategy?: string; retryAction?: string };
+        thrownError = error as Error & {
+          manualRetryStrategy?: string;
+          retryAction?: string;
+          kind?: string;
+          code?: string;
+          status?: number;
+        };
       }
     });
 
@@ -795,6 +834,7 @@ describe('useFeedConversion', () => {
     );
     expect(thrownError?.manualRetryStrategy).toBeUndefined();
     expect(thrownError?.retryAction).toBe('primary');
+    expect(thrownError?.kind).toBe('server');
     expect(result.current.result).toBeUndefined();
     expect(result.current.error).toBe(
       'Tried faraday first, then browserless. First attempt failed with: Upstream timeout. Second attempt failed with: Browserless also failed'