Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clever-singers-start.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@aws-amplify/core": patch
---

fix: wrap plain Error from fetch as NetworkError in React Native
42 changes: 42 additions & 0 deletions packages/core/__tests__/clients/fetch.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { AmplifyErrorCode } from '../../src/types';
import { fetchTransferHandler } from '../../src/clients/handlers/fetch';

describe(fetchTransferHandler.name, () => {
Expand Down Expand Up @@ -131,4 +132,45 @@ describe(fetchTransferHandler.name, () => {
expect(mockFetch.mock.calls[0][1].body).toBe('Mock Body');
},
);

it('should throw NetworkError when fetch rejects with TypeError (browser)', async () => {
mockFetch.mockRejectedValue(new TypeError('Failed to fetch'));

await expect(fetchTransferHandler(mockRequest, {})).rejects.toMatchObject({
name: AmplifyErrorCode.NetworkError,
message: 'A network error has occurred.',
underlyingError: expect.any(TypeError),
});
});

it('should throw NetworkError when fetch rejects with plain Error (React Native native network failure)', async () => {
mockFetch.mockRejectedValue(new Error('Network request failed'));

await expect(fetchTransferHandler(mockRequest, {})).rejects.toMatchObject({
name: AmplifyErrorCode.NetworkError,
message: 'A network error has occurred.',
underlyingError: expect.any(Error),
});
});

it('should rethrow AbortError without wrapping', async () => {
const abortError = Object.assign(new Error('The user aborted a request.'), {
name: 'AbortError',
});
mockFetch.mockRejectedValue(abortError);

await expect(fetchTransferHandler(mockRequest, {})).rejects.toBe(
abortError,
);
});

it('should include the original error as underlyingError', async () => {
const cause = new Error('Network request failed');
mockFetch.mockRejectedValue(cause);

await expect(fetchTransferHandler(mockRequest, {})).rejects.toMatchObject({
name: AmplifyErrorCode.NetworkError,
underlyingError: cause,
});
});
});
17 changes: 10 additions & 7 deletions packages/core/src/clients/handlers/fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,17 @@ export const fetchTransferHandler: TransferHandler<
credentials: withCrossDomainCredentials ? 'include' : 'same-origin',
});
} catch (e) {
if (e instanceof TypeError) {
throw new AmplifyError({
name: AmplifyErrorCode.NetworkError,
message: 'A network error has occurred.',
underlyingError: e,
});
if (e instanceof Error && e.name === 'AbortError') {
throw e;
}
throw e;
// Fetch only rejects for aborts and network failures. HTTP error responses resolve
// normally. Browsers typically throw TypeError, while React Native throws Error
// objects for network failures.
throw new AmplifyError({
name: AmplifyErrorCode.NetworkError,
message: 'A network error has occurred.',
underlyingError: e,
});
}

const responseHeaders: Record<string, string> = {};
Expand Down