diff --git a/docs/api/modules/_aws_amplify_adapter_nextjs.html b/docs/api/modules/_aws_amplify_adapter_nextjs.html index bf0ece5c0aa..070fc9d10c7 100644 --- a/docs/api/modules/_aws_amplify_adapter_nextjs.html +++ b/docs/api/modules/_aws_amplify_adapter_nextjs.html @@ -1,5 +1,5 @@ -@aws-amplify/adapter-nextjs - v1.2.23 | Amplify JS API Documentation -

Module @aws-amplify/adapter-nextjs - v1.2.23

This package contains the AWS Amplify Next.js Adapter. For more information on using Next.js in your application please reference the Amplify Dev Center.

+@aws-amplify/adapter-nextjs - v1.2.24 | Amplify JS API Documentation +

Module @aws-amplify/adapter-nextjs - v1.2.24

This package contains the AWS Amplify Next.js Adapter. For more information on using Next.js in your application please reference the Amplify Dev Center.

Index

Modules

api index utils diff --git a/docs/api/modules/_aws_amplify_datastore_storage_adapter.html b/docs/api/modules/_aws_amplify_datastore_storage_adapter.html index 6c55fd401c5..0d00477cd4b 100644 --- a/docs/api/modules/_aws_amplify_datastore_storage_adapter.html +++ b/docs/api/modules/_aws_amplify_datastore_storage_adapter.html @@ -1,5 +1,5 @@ -@aws-amplify/datastore-storage-adapter - v2.1.55 | Amplify JS API Documentation -

Module @aws-amplify/datastore-storage-adapter - v2.1.55

This package contains the AWS Amplify DataStore storage adapter. For more information on using the DataStore storage adapter in your application please reference the Amplify Dev Center.

+@aws-amplify/datastore-storage-adapter - v2.1.56 | Amplify JS API Documentation +

Module @aws-amplify/datastore-storage-adapter - v2.1.56

This package contains the AWS Amplify DataStore storage adapter. For more information on using the DataStore storage adapter in your application please reference the Amplify Dev Center.

Index

Modules

ExpoSQLiteAdapter/ExpoSQLiteAdapter SQLiteAdapter/SQLiteAdapter index diff --git a/docs/api/modules/_aws_amplify_geo.html b/docs/api/modules/_aws_amplify_geo.html index db78b367f0a..88df4e878e2 100644 --- a/docs/api/modules/_aws_amplify_geo.html +++ b/docs/api/modules/_aws_amplify_geo.html @@ -1,5 +1,5 @@ -@aws-amplify/geo - v3.0.53 | Amplify JS API Documentation -

Module @aws-amplify/geo - v3.0.53

This package contains the AWS Amplify Geo category. For more information on using Geo in your application please reference the Amplify Dev Center.

+@aws-amplify/geo - v3.0.54 | Amplify JS API Documentation +

Module @aws-amplify/geo - v3.0.54

This package contains the AWS Amplify Geo category. For more information on using Geo in your application please reference the Amplify Dev Center.

Index

Modules

\ No newline at end of file diff --git a/docs/api/modules/_aws_amplify_interactions.html b/docs/api/modules/_aws_amplify_interactions.html index a9b398bafb6..adbe283803d 100644 --- a/docs/api/modules/_aws_amplify_interactions.html +++ b/docs/api/modules/_aws_amplify_interactions.html @@ -1,5 +1,5 @@ -@aws-amplify/interactions - v6.0.52 | Amplify JS API Documentation -

Module @aws-amplify/interactions - v6.0.52

This package contains the AWS Amplify Interactions category. For more information on using Interactions in your application please reference the Amplify Dev Center.

+@aws-amplify/interactions - v6.0.53 | Amplify JS API Documentation +

Module @aws-amplify/interactions - v6.0.53

This package contains the AWS Amplify Interactions category. For more information on using Interactions in your application please reference the Amplify Dev Center.

Index

Modules

index lex-v1 lex-v2 diff --git a/docs/api/modules/_aws_amplify_predictions.html b/docs/api/modules/_aws_amplify_predictions.html index df96580cede..013601b6ed8 100644 --- a/docs/api/modules/_aws_amplify_predictions.html +++ b/docs/api/modules/_aws_amplify_predictions.html @@ -1,5 +1,5 @@ -@aws-amplify/predictions - v6.1.28 | Amplify JS API Documentation -

Module @aws-amplify/predictions - v6.1.28

This package contains the AWS Amplify Predictions category. For more information on using Predictions in your application please reference the Amplify Dev Center.

+@aws-amplify/predictions - v6.1.29 | Amplify JS API Documentation +

Module @aws-amplify/predictions - v6.1.29

This package contains the AWS Amplify Predictions category. For more information on using Predictions in your application please reference the Amplify Dev Center.

Index

Modules

Interfaces

IdentifyEntitiesInput IdentifyEntitiesOutput diff --git a/docs/api/modules/_aws_amplify_pubsub.html b/docs/api/modules/_aws_amplify_pubsub.html index 039ce4ab6fc..f9f1bd83933 100644 --- a/docs/api/modules/_aws_amplify_pubsub.html +++ b/docs/api/modules/_aws_amplify_pubsub.html @@ -1,5 +1,5 @@ -@aws-amplify/pubsub - v6.1.28 | Amplify JS API Documentation -

Module @aws-amplify/pubsub - v6.1.28

This package contains the AWS Amplify PubSub category. For more information on using PubSub in your application please reference the Amplify Dev Center.

+@aws-amplify/pubsub - v6.1.29 | Amplify JS API Documentation +

Module @aws-amplify/pubsub - v6.1.29

This package contains the AWS Amplify PubSub category. For more information on using PubSub in your application please reference the Amplify Dev Center.

Index

Modules

clients/iot clients/mqtt index diff --git a/docs/api/modules/aws_amplify.html b/docs/api/modules/aws_amplify.html index 78d818c084a..ffca7623c6f 100644 --- a/docs/api/modules/aws_amplify.html +++ b/docs/api/modules/aws_amplify.html @@ -1,5 +1,5 @@ -aws-amplify - v6.6.6 | Amplify JS API Documentation -

Module aws-amplify - v6.6.6

AWS Amplify Package - aws-amplify

AWS Amplify is a JavaScript library for frontend and mobile developers building cloud-enabled applications. The library is a declarative interface across different categories of operations in order to make common tasks easier to add into your application. The default implementation works with Amazon Web Services (AWS) resources but is designed to be open and pluggable for usage with other cloud services that wish to provide an implementation or custom backends.

+aws-amplify - v6.6.7 | Amplify JS API Documentation +

Module aws-amplify - v6.6.7

AWS Amplify Package - aws-amplify

AWS Amplify is a JavaScript library for frontend and mobile developers building cloud-enabled applications. The library is a declarative interface across different categories of operations in order to make common tasks easier to add into your application. The default implementation works with Amazon Web Services (AWS) resources but is designed to be open and pluggable for usage with other cloud services that wish to provide an implementation or custom backends.

Documentation is available here.

Index

Modules

adapter-core analytics diff --git a/packages/adapter-nextjs/CHANGELOG.md b/packages/adapter-nextjs/CHANGELOG.md index 651e1bda5aa..a328e22f237 100644 --- a/packages/adapter-nextjs/CHANGELOG.md +++ b/packages/adapter-nextjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.2.24](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/adapter-nextjs@1.2.23...@aws-amplify/adapter-nextjs@1.2.24) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/adapter-nextjs + ## [1.2.23](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/adapter-nextjs@1.2.22...@aws-amplify/adapter-nextjs@1.2.23) (2024-10-21) **Note:** Version bump only for package @aws-amplify/adapter-nextjs diff --git a/packages/adapter-nextjs/package.json b/packages/adapter-nextjs/package.json index c9541b75366..35562ad1c68 100644 --- a/packages/adapter-nextjs/package.json +++ b/packages/adapter-nextjs/package.json @@ -1,7 +1,7 @@ { "author": "Amazon Web Services", "name": "@aws-amplify/adapter-nextjs", - "version": "1.2.23", + "version": "1.2.24", "description": "The adapter for the supporting of using Amplify APIs in Next.js.", "peerDependencies": { "aws-amplify": "^6.0.7", @@ -16,7 +16,7 @@ "@types/node": "^20.3.1", "@types/react": "^18.2.13", "@types/react-dom": "^18.2.6", - "aws-amplify": "6.6.6", + "aws-amplify": "6.6.7", "jest-fetch-mock": "3.0.3", "next": ">= 13.5.0 < 15.0.0", "typescript": "5.0.2" diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md index 522fd7fbb2c..c0d5555db59 100644 --- a/packages/analytics/CHANGELOG.md +++ b/packages/analytics/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.0.54](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@7.0.53...@aws-amplify/analytics@7.0.54) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/analytics + ## [7.0.53](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/analytics@7.0.52...@aws-amplify/analytics@7.0.53) (2024-10-21) **Note:** Version bump only for package @aws-amplify/analytics diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 84f5fd42e32..b86a33196d7 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/analytics", - "version": "7.0.53", + "version": "7.0.54", "description": "Analytics category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -103,7 +103,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "@aws-sdk/types": "3.398.0", "typescript": "5.0.2" diff --git a/packages/api-graphql/CHANGELOG.md b/packages/api-graphql/CHANGELOG.md index 2205b9788a8..aeca59eee04 100644 --- a/packages/api-graphql/CHANGELOG.md +++ b/packages/api-graphql/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.4.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@4.4.2...@aws-amplify/api-graphql@4.4.3) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/api-graphql + ## [4.4.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-graphql@4.4.1...@aws-amplify/api-graphql@4.4.2) (2024-10-21) **Note:** Version bump only for package @aws-amplify/api-graphql diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index a90c407a1c5..38ace479d26 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/api-graphql", - "version": "4.4.2", + "version": "4.4.3", "description": "Api-graphql category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -84,8 +84,8 @@ "server" ], "dependencies": { - "@aws-amplify/api-rest": "4.0.53", - "@aws-amplify/core": "6.4.6", + "@aws-amplify/api-rest": "4.0.54", + "@aws-amplify/core": "6.4.7", "@aws-amplify/data-schema": "^1.7.0", "@aws-sdk/types": "3.387.0", "graphql": "15.8.0", diff --git a/packages/api-rest/CHANGELOG.md b/packages/api-rest/CHANGELOG.md index 0a08321154c..b8148cdf68f 100644 --- a/packages/api-rest/CHANGELOG.md +++ b/packages/api-rest/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [4.0.54](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@4.0.53...@aws-amplify/api-rest@4.0.54) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/api-rest + ## [4.0.53](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api-rest@4.0.52...@aws-amplify/api-rest@4.0.53) (2024-10-21) **Note:** Version bump only for package @aws-amplify/api-rest diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json index a40469786ce..e0f0c00c0e6 100644 --- a/packages/api-rest/package.json +++ b/packages/api-rest/package.json @@ -1,7 +1,7 @@ { "name": "@aws-amplify/api-rest", "private": false, - "version": "4.0.53", + "version": "4.0.54", "description": "Api-rest category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -87,7 +87,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "typescript": "5.0.2" }, diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index ed3e1a31eaf..f65b6be63a5 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.56](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@6.0.55...@aws-amplify/api@6.0.56) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/api + ## [6.0.55](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@6.0.54...@aws-amplify/api@6.0.55) (2024-10-21) **Note:** Version bump only for package @aws-amplify/api diff --git a/packages/api/package.json b/packages/api/package.json index 03f8e320ed8..031a8dbaf99 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/api", - "version": "6.0.55", + "version": "6.0.56", "description": "Api category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -79,8 +79,8 @@ "server" ], "dependencies": { - "@aws-amplify/api-graphql": "4.4.2", - "@aws-amplify/api-rest": "4.0.53", + "@aws-amplify/api-graphql": "4.4.3", + "@aws-amplify/api-rest": "4.0.54", "tslib": "^2.5.0" } } diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md index eb007e2e99b..7e2c49e2c9a 100644 --- a/packages/auth/CHANGELOG.md +++ b/packages/auth/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.5.4](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@6.5.3...@aws-amplify/auth@6.5.4) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/auth + ## [6.5.3](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/auth@6.5.2...@aws-amplify/auth@6.5.3) (2024-10-21) **Note:** Version bump only for package @aws-amplify/auth diff --git a/packages/auth/__tests__/providers/cognito/tokenProvider/tokenOrchestrator.test.ts b/packages/auth/__tests__/providers/cognito/tokenProvider/tokenOrchestrator.test.ts index c0853b51f23..d514772695a 100644 --- a/packages/auth/__tests__/providers/cognito/tokenProvider/tokenOrchestrator.test.ts +++ b/packages/auth/__tests__/providers/cognito/tokenProvider/tokenOrchestrator.test.ts @@ -1,11 +1,15 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +import { + AmplifyError, + AmplifyErrorCode, +} from '@aws-amplify/core/internals/utils'; + import { tokenOrchestrator } from '../../../../src/providers/cognito/tokenProvider'; import { CognitoAuthTokens } from '../../../../src/providers/cognito/tokenProvider/types'; import { oAuthStore } from '../../../../src/providers/cognito/utils/oauth/oAuthStore'; -jest.mock('@aws-amplify/core/internals/utils'); jest.mock('@aws-amplify/core', () => ({ ...jest.requireActual('@aws-amplify/core'), Hub: { @@ -90,4 +94,20 @@ describe('tokenOrchestrator', () => { expect(newTokens?.signInDetails).toEqual(testSignInDetails); }); }); + + describe('handleErrors method', () => { + it('does not call clearTokens() if the error is a network error thrown from fetch handler', () => { + const clearTokensSpy = jest.spyOn(tokenOrchestrator, 'clearTokens'); + const error = new AmplifyError({ + name: AmplifyErrorCode.NetworkError, + message: 'Network Error', + }); + + expect(() => { + (tokenOrchestrator as any).handleErrors(error); + }).toThrow(error); + + expect(clearTokensSpy).not.toHaveBeenCalled(); + }); + }); }); diff --git a/packages/auth/package.json b/packages/auth/package.json index 1c35df399f1..d4c6309f25e 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/auth", - "version": "6.5.3", + "version": "6.5.4", "description": "Auth category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -97,7 +97,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "@jest/test-sequencer": "^29.7.0", "typescript": "5.0.2" diff --git a/packages/auth/src/providers/cognito/tokenProvider/TokenOrchestrator.ts b/packages/auth/src/providers/cognito/tokenProvider/TokenOrchestrator.ts index 121875013e2..3f8027d2596 100644 --- a/packages/auth/src/providers/cognito/tokenProvider/TokenOrchestrator.ts +++ b/packages/auth/src/providers/cognito/tokenProvider/TokenOrchestrator.ts @@ -9,6 +9,7 @@ import { } from '@aws-amplify/core'; import { AMPLIFY_SYMBOL, + AmplifyErrorCode, assertTokenProviderConfig, isBrowser, isTokenExpired, @@ -169,7 +170,7 @@ export class TokenOrchestrator implements AuthTokenOrchestrator { private handleErrors(err: unknown) { assertServiceError(err); - if (err.message !== 'Network error') { + if (err.name !== AmplifyErrorCode.NetworkError) { // TODO(v6): Check errors on client this.clearTokens(); } diff --git a/packages/aws-amplify/CHANGELOG.md b/packages/aws-amplify/CHANGELOG.md index 00c9033eb9d..362379603db 100644 --- a/packages/aws-amplify/CHANGELOG.md +++ b/packages/aws-amplify/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.6.7](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@6.6.6...aws-amplify@6.6.7) (2024-10-25) + +**Note:** Version bump only for package aws-amplify + ## [6.6.6](https://github.com/aws-amplify/amplify-js/compare/aws-amplify@6.6.5...aws-amplify@6.6.6) (2024-10-21) **Note:** Version bump only for package aws-amplify diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json index 68f9d88cf9a..68a21ce9e5a 100644 --- a/packages/aws-amplify/package.json +++ b/packages/aws-amplify/package.json @@ -1,6 +1,6 @@ { "name": "aws-amplify", - "version": "6.6.6", + "version": "6.6.7", "description": "AWS Amplify is a JavaScript library for Frontend and mobile developers building cloud-enabled applications.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -276,13 +276,13 @@ "utils" ], "dependencies": { - "@aws-amplify/analytics": "7.0.53", - "@aws-amplify/api": "6.0.55", - "@aws-amplify/auth": "6.5.3", - "@aws-amplify/core": "6.4.6", - "@aws-amplify/datastore": "5.0.55", - "@aws-amplify/notifications": "2.0.53", - "@aws-amplify/storage": "6.6.11", + "@aws-amplify/analytics": "7.0.54", + "@aws-amplify/api": "6.0.56", + "@aws-amplify/auth": "6.5.4", + "@aws-amplify/core": "6.4.7", + "@aws-amplify/datastore": "5.0.56", + "@aws-amplify/notifications": "2.0.54", + "@aws-amplify/storage": "6.6.12", "tslib": "^2.5.0" }, "devDependencies": { @@ -317,7 +317,7 @@ "name": "[Analytics] identifyUser (Pinpoint)", "path": "./dist/esm/analytics/index.mjs", "import": "{ identifyUser }", - "limit": "15.89 kB" + "limit": "15.91 kB" }, { "name": "[Analytics] enable", @@ -485,7 +485,7 @@ "name": "[Storage] list (S3)", "path": "./dist/esm/storage/index.mjs", "import": "{ list }", - "limit": "15.49 kB" + "limit": "15.55 kB" }, { "name": "[Storage] remove (S3)", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index db268c8bf30..9790c48f364 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.4.7](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/core@6.4.6...@aws-amplify/core@6.4.7) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/core + ## [6.4.6](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/core@6.4.5...@aws-amplify/core@6.4.6) (2024-10-21) ### Bug Fixes diff --git a/packages/core/__tests__/clients/middleware/retry/defaultRetryDecider.test.ts b/packages/core/__tests__/clients/middleware/retry/defaultRetryDecider.test.ts new file mode 100644 index 00000000000..160c4fdbe74 --- /dev/null +++ b/packages/core/__tests__/clients/middleware/retry/defaultRetryDecider.test.ts @@ -0,0 +1,40 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +import { HttpResponse } from '../../../../src/clients'; +import { getRetryDecider } from '../../../../src/clients/middleware/retry/defaultRetryDecider'; +import { AmplifyError } from '../../../../src/errors'; +import { AmplifyErrorCode } from '../../../../src/types'; + +describe('getRetryDecider', () => { + const mockErrorParser = jest.fn(); + + describe('created retryDecider', () => { + const mockNetworkErrorThrownFromFetch = new AmplifyError({ + name: AmplifyErrorCode.NetworkError, + message: 'Network Error', + }); + const mockNetworkErrorThrownFromXHRInStorage = new Error('Network Error'); + mockNetworkErrorThrownFromXHRInStorage.name = 'ERR_NETWORK'; + mockNetworkErrorThrownFromXHRInStorage.message = 'Network Error'; + + test.each([ + [ + 'a network error from the fetch handler', + true, + mockNetworkErrorThrownFromFetch, + ], + [ + 'a network error from the XHR handler defined in Storage', + true, + mockNetworkErrorThrownFromXHRInStorage, + ], + ])('when receives %p returns %p', (_, expected, error) => { + const mockResponse = {} as unknown as HttpResponse; + mockErrorParser.mockReturnValueOnce(error); + const retryDecider = getRetryDecider(mockErrorParser); + + expect(retryDecider(mockResponse, error)).resolves.toBe(expected); + }); + }); +}); diff --git a/packages/core/metadata b/packages/core/metadata index 1ee6ec03c5c..526a350b908 100644 --- a/packages/core/metadata +++ b/packages/core/metadata @@ -1 +1 @@ -d0e6e694a +da62f578b diff --git a/packages/core/package.json b/packages/core/package.json index 14f21beb556..a8f23305360 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/core", - "version": "6.4.6", + "version": "6.4.7", "description": "Core category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", diff --git a/packages/core/src/clients/middleware/retry/defaultRetryDecider.ts b/packages/core/src/clients/middleware/retry/defaultRetryDecider.ts index 874cc74314e..a990fbbdc3c 100644 --- a/packages/core/src/clients/middleware/retry/defaultRetryDecider.ts +++ b/packages/core/src/clients/middleware/retry/defaultRetryDecider.ts @@ -1,6 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 +import { AmplifyErrorCode } from '../../../types'; import { ErrorParser, HttpResponse } from '../../types'; import { isClockSkewError } from './isClockSkewError'; @@ -55,7 +56,11 @@ const isThrottlingError = (statusCode?: number, errorCode?: string) => (!!errorCode && THROTTLING_ERROR_CODES.includes(errorCode)); const isConnectionError = (error?: unknown) => - (error as Error)?.name === 'Network error'; + [ + AmplifyErrorCode.NetworkError, + // TODO(vNext): unify the error code `ERR_NETWORK` used by the Storage XHR handler + 'ERR_NETWORK', + ].includes((error as Error)?.name); const isServerSideError = (statusCode?: number, errorCode?: string) => (!!statusCode && [500, 502, 503, 504].includes(statusCode)) || diff --git a/packages/datastore-storage-adapter/CHANGELOG.md b/packages/datastore-storage-adapter/CHANGELOG.md index 9d0a350b009..f7082a438fe 100644 --- a/packages/datastore-storage-adapter/CHANGELOG.md +++ b/packages/datastore-storage-adapter/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.1.56](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.1.55...@aws-amplify/datastore-storage-adapter@2.1.56) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/datastore-storage-adapter + ## [2.1.55](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore-storage-adapter@2.1.54...@aws-amplify/datastore-storage-adapter@2.1.55) (2024-10-21) **Note:** Version bump only for package @aws-amplify/datastore-storage-adapter diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json index 88825b77b29..9eb99088ce6 100644 --- a/packages/datastore-storage-adapter/package.json +++ b/packages/datastore-storage-adapter/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/datastore-storage-adapter", - "version": "2.1.55", + "version": "2.1.56", "description": "SQLite storage adapter for Amplify DataStore ", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -36,8 +36,8 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", - "@aws-amplify/datastore": "5.0.55", + "@aws-amplify/core": "6.4.7", + "@aws-amplify/datastore": "5.0.56", "@types/react-native-sqlite-storage": "5.0.1", "expo-file-system": "13.1.4", "expo-sqlite": "10.1.0", diff --git a/packages/datastore/CHANGELOG.md b/packages/datastore/CHANGELOG.md index 0af23a9f6a6..f131984e603 100644 --- a/packages/datastore/CHANGELOG.md +++ b/packages/datastore/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.0.56](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@5.0.55...@aws-amplify/datastore@5.0.56) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/datastore + ## [5.0.55](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@5.0.54...@aws-amplify/datastore@5.0.55) (2024-10-21) **Note:** Version bump only for package @aws-amplify/datastore diff --git a/packages/datastore/package.json b/packages/datastore/package.json index 67ce0cd8c85..54823feb8c0 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/datastore", - "version": "5.0.55", + "version": "5.0.56", "description": "AppSyncLocal support for aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -44,7 +44,7 @@ "src" ], "dependencies": { - "@aws-amplify/api": "6.0.55", + "@aws-amplify/api": "6.0.56", "buffer": "4.9.2", "idb": "5.0.6", "immer": "9.0.6", @@ -55,7 +55,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "@types/uuid-validate": "^0.0.1", "dexie": "3.2.2", diff --git a/packages/geo/CHANGELOG.md b/packages/geo/CHANGELOG.md index 826cea19474..9e3a8d796c4 100644 --- a/packages/geo/CHANGELOG.md +++ b/packages/geo/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.54](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/geo@3.0.53...@aws-amplify/geo@3.0.54) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/geo + ## [3.0.53](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/geo@3.0.52...@aws-amplify/geo@3.0.53) (2024-10-21) **Note:** Version bump only for package @aws-amplify/geo diff --git a/packages/geo/package.json b/packages/geo/package.json index 10237888740..1a50f2cf0f2 100644 --- a/packages/geo/package.json +++ b/packages/geo/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/geo", - "version": "3.0.53", + "version": "3.0.54", "description": "Geo category for aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -76,7 +76,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "typescript": "5.0.2" }, "size-limit": [ diff --git a/packages/interactions/CHANGELOG.md b/packages/interactions/CHANGELOG.md index 33129f78c50..3ce5ca0635e 100644 --- a/packages/interactions/CHANGELOG.md +++ b/packages/interactions/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.53](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/interactions@6.0.52...@aws-amplify/interactions@6.0.53) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/interactions + ## [6.0.52](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/interactions@6.0.51...@aws-amplify/interactions@6.0.52) (2024-10-21) **Note:** Version bump only for package @aws-amplify/interactions diff --git a/packages/interactions/package.json b/packages/interactions/package.json index 4b58cacdb33..55a1a5465da 100644 --- a/packages/interactions/package.json +++ b/packages/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/interactions", - "version": "6.0.52", + "version": "6.0.53", "description": "Interactions category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -81,7 +81,7 @@ "uuid": "^9.0.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "typescript": "^5.0.2" }, "size-limit": [ diff --git a/packages/notifications/CHANGELOG.md b/packages/notifications/CHANGELOG.md index 2b0ffdcb5e8..b0756e107a5 100644 --- a/packages/notifications/CHANGELOG.md +++ b/packages/notifications/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.54](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/notifications@2.0.53...@aws-amplify/notifications@2.0.54) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/notifications + ## [2.0.53](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/notifications@2.0.52...@aws-amplify/notifications@2.0.53) (2024-10-21) **Note:** Version bump only for package @aws-amplify/notifications diff --git a/packages/notifications/package.json b/packages/notifications/package.json index 75085a8021f..3181627ea04 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/notifications", - "version": "2.0.53", + "version": "2.0.54", "description": "Notifications category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -98,7 +98,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "typescript": "5.0.2" } diff --git a/packages/predictions/CHANGELOG.md b/packages/predictions/CHANGELOG.md index a8495adfa5a..dd82894eb13 100644 --- a/packages/predictions/CHANGELOG.md +++ b/packages/predictions/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.1.29](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/predictions@6.1.28...@aws-amplify/predictions@6.1.29) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/predictions + ## [6.1.28](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/predictions@6.1.27...@aws-amplify/predictions@6.1.28) (2024-10-21) **Note:** Version bump only for package @aws-amplify/predictions diff --git a/packages/predictions/package.json b/packages/predictions/package.json index 8b8ffe22ec7..58454d07659 100644 --- a/packages/predictions/package.json +++ b/packages/predictions/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/predictions", - "version": "6.1.28", + "version": "6.1.29", "description": "Machine learning category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -43,7 +43,7 @@ "src" ], "dependencies": { - "@aws-amplify/storage": "6.6.11", + "@aws-amplify/storage": "6.6.12", "@aws-sdk/client-comprehend": "3.621.0", "@aws-sdk/client-polly": "3.621.0", "@aws-sdk/client-rekognition": "3.621.0", @@ -59,7 +59,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "typescript": "5.0.2" }, "size-limit": [ diff --git a/packages/pubsub/CHANGELOG.md b/packages/pubsub/CHANGELOG.md index e5cde41ad5f..dea3c993c89 100644 --- a/packages/pubsub/CHANGELOG.md +++ b/packages/pubsub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.1.29](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/pubsub@6.1.28...@aws-amplify/pubsub@6.1.29) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/pubsub + ## [6.1.28](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/pubsub@6.1.27...@aws-amplify/pubsub@6.1.28) (2024-10-21) **Note:** Version bump only for package @aws-amplify/pubsub diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index 89d36108296..38e5ed4df42 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/pubsub", - "version": "6.1.28", + "version": "6.1.29", "description": "Pubsub category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -73,7 +73,7 @@ "mqtt" ], "dependencies": { - "@aws-amplify/auth": "6.5.3", + "@aws-amplify/auth": "6.5.4", "buffer": "4.9.2", "graphql": "15.8.0", "rxjs": "^7.8.1", @@ -84,7 +84,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "typescript": "5.0.2" }, "size-limit": [ diff --git a/packages/storage/CHANGELOG.md b/packages/storage/CHANGELOG.md index 266fbf372af..53b592fd4e4 100644 --- a/packages/storage/CHANGELOG.md +++ b/packages/storage/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.6.12](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/storage@6.6.11...@aws-amplify/storage@6.6.12) (2024-10-25) + +**Note:** Version bump only for package @aws-amplify/storage + ## [6.6.11](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/storage@6.6.10...@aws-amplify/storage@6.6.11) (2024-10-21) ### Bug Fixes diff --git a/packages/storage/package.json b/packages/storage/package.json index bebd35ce629..13234515991 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -1,6 +1,6 @@ { "name": "@aws-amplify/storage", - "version": "6.6.11", + "version": "6.6.12", "description": "Storage category of aws-amplify", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.mjs", @@ -101,7 +101,7 @@ "@aws-amplify/core": "^6.1.0" }, "devDependencies": { - "@aws-amplify/core": "6.4.6", + "@aws-amplify/core": "6.4.7", "@aws-amplify/react-native": "1.1.6", "typescript": "5.0.2" } diff --git a/scripts/tsc-compliance-test/CHANGELOG.md b/scripts/tsc-compliance-test/CHANGELOG.md index 35098b6de7d..14414b26d3a 100644 --- a/scripts/tsc-compliance-test/CHANGELOG.md +++ b/scripts/tsc-compliance-test/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.1.59](https://github.com/aws-amplify/amplify-js/compare/tsc-compliance-test@0.1.58...tsc-compliance-test@0.1.59) (2024-10-25) + +**Note:** Version bump only for package tsc-compliance-test + ## [0.1.58](https://github.com/aws-amplify/amplify-js/compare/tsc-compliance-test@0.1.57...tsc-compliance-test@0.1.58) (2024-10-21) **Note:** Version bump only for package tsc-compliance-test diff --git a/scripts/tsc-compliance-test/package.json b/scripts/tsc-compliance-test/package.json index 246b307a01d..c83b90c2de5 100644 --- a/scripts/tsc-compliance-test/package.json +++ b/scripts/tsc-compliance-test/package.json @@ -1,11 +1,11 @@ { "name": "tsc-compliance-test", - "version": "0.1.58", + "version": "0.1.59", "license": "MIT", "private": true, "devDependencies": { "@types/node": "16.18.82", - "aws-amplify": "6.6.6", + "aws-amplify": "6.6.7", "typescript": "4.2.x" }, "scripts": {