@quiltt/core 3.5.5 → 3.5.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @quiltt/core
 
+## 3.5.6
+
+### Patch Changes
+
+- [#223](https://github.com/quiltt/quiltt-js/pull/223) [`8c5041c`](https://github.com/quiltt/quiltt-js/commit/8c5041c1670fd7dbfed06355c06888256ce84b08) Thanks [@zubairaziz](https://github.com/zubairaziz)! - Remove axios and replace with native fetch
+
 ## 3.5.5
 
 ### Patch Changes
@@ -24,57 +30,57 @@
 
 ### Patch Changes
 
-- [#204](https://github.com/quiltt/quiltt-public/pull/204) [`ee42bf1`](https://github.com/quiltt/quiltt-public/commit/ee42bf137db1029807df49f66ff7e57117e8ace9) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Add missing type to QuilttButton
+- [#204](https://github.com/quiltt/quiltt-js/pull/204) [`ee42bf1`](https://github.com/quiltt/quiltt-js/commit/ee42bf137db1029807df49f66ff7e57117e8ace9) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Add missing type to QuilttButton
 
-- [#197](https://github.com/quiltt/quiltt-public/pull/197) [`8d9f24c`](https://github.com/quiltt/quiltt-public/commit/8d9f24c59102db5dc665195a6145cfac2c80e2c0) Thanks [@rubendinho](https://github.com/rubendinho)! - Update docs, and fix typo in types
+- [#197](https://github.com/quiltt/quiltt-js/pull/197) [`8d9f24c`](https://github.com/quiltt/quiltt-js/commit/8d9f24c59102db5dc665195a6145cfac2c80e2c0) Thanks [@rubendinho](https://github.com/rubendinho)! - Update docs, and fix typo in types
 
 ## 3.5.2
 
 ### Patch Changes
 
-- [#202](https://github.com/quiltt/quiltt-public/pull/202) [`42705f0`](https://github.com/quiltt/quiltt-public/commit/42705f0e01b0adb35ab627697169433e1065a8f0) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Expose Institutions to React API
+- [#202](https://github.com/quiltt/quiltt-js/pull/202) [`42705f0`](https://github.com/quiltt/quiltt-js/commit/42705f0e01b0adb35ab627697169433e1065a8f0) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Expose Institutions to React API
 
 ## 3.5.1
 
 ### Patch Changes
 
-- [#200](https://github.com/quiltt/quiltt-public/pull/200) [`0a07431`](https://github.com/quiltt/quiltt-public/commit/0a07431ff936e6cd4fd3aeee66bba1fec21f6624) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Fix release
+- [#200](https://github.com/quiltt/quiltt-js/pull/200) [`0a07431`](https://github.com/quiltt/quiltt-js/commit/0a07431ff936e6cd4fd3aeee66bba1fec21f6624) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Fix release
 
 ## 3.5.0
 
 ### Minor Changes
 
-- [#198](https://github.com/quiltt/quiltt-public/pull/198) [`c65d87a`](https://github.com/quiltt/quiltt-public/commit/c65d87a8316dbec82635a0c4108714de7bbd082b) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Add Institutions to the Connect API
+- [#198](https://github.com/quiltt/quiltt-js/pull/198) [`c65d87a`](https://github.com/quiltt/quiltt-js/commit/c65d87a8316dbec82635a0c4108714de7bbd082b) Thanks [@sirwolfgang](https://github.com/sirwolfgang)! - Add Institutions to the Connect API
 
 ## 3.4.1
 
 ### Patch Changes
 
-- [#195](https://github.com/quiltt/quiltt-public/pull/195) [`6c36908`](https://github.com/quiltt/quiltt-public/commit/6c36908678cb46d5f6a0c7438e0ed48889cabf79) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Report preflight error before sending connectorUrl to webview
+- [#195](https://github.com/quiltt/quiltt-js/pull/195) [`6c36908`](https://github.com/quiltt/quiltt-js/commit/6c36908678cb46d5f6a0c7438e0ed48889cabf79) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Report preflight error before sending connectorUrl to webview
 
 ## 3.4.0
 
 ### Minor Changes
 
-- [#191](https://github.com/quiltt/quiltt-public/pull/191) [`58c8f0c`](https://github.com/quiltt/quiltt-public/commit/58c8f0c5265dfa379263225baafb4552067514c6) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Add agent QSP for analytic
+- [#191](https://github.com/quiltt/quiltt-js/pull/191) [`58c8f0c`](https://github.com/quiltt/quiltt-js/commit/58c8f0c5265dfa379263225baafb4552067514c6) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Add agent QSP for analytic
 
 ## 3.3.10
 
 ### Patch Changes
 
-- [#190](https://github.com/quiltt/quiltt-public/pull/190) [`21ead66`](https://github.com/quiltt/quiltt-public/commit/21ead662e7626f906562f952c9d1c0bc2c859985) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Fix Android App with Chase app installed not able to launch Chase app
+- [#190](https://github.com/quiltt/quiltt-js/pull/190) [`21ead66`](https://github.com/quiltt/quiltt-js/commit/21ead662e7626f906562f952c9d1c0bc2c859985) Thanks [@tom-quiltt](https://github.com/tom-quiltt)! - Fix Android App with Chase app installed not able to launch Chase app
 
 ## 3.3.9
 
 ### Patch Changes
 
-- [#187](https://github.com/quiltt/quiltt-public/pull/187) [`02f37cd`](https://github.com/quiltt/quiltt-public/commit/02f37cda97f501f2d77601d0fd6b7fbbd1c71431) Thanks [@rubendinho](https://github.com/rubendinho)! - Export Quiltt config
+- [#187](https://github.com/quiltt/quiltt-js/pull/187) [`02f37cd`](https://github.com/quiltt/quiltt-js/commit/02f37cda97f501f2d77601d0fd6b7fbbd1c71431) Thanks [@rubendinho](https://github.com/rubendinho)! - Export Quiltt config
 
 ## 3.3.8
 
 ### Patch Changes
 
-- [#185](https://github.com/quiltt/quiltt-public/pull/185) [`a3452da`](https://github.com/quiltt/quiltt-public/commit/a3452da3c7604902b5917e1f838e2dced42b708c) Thanks [@rubendinho](https://github.com/rubendinho)! - Fix Vite build error
+- [#185](https://github.com/quiltt/quiltt-js/pull/185) [`a3452da`](https://github.com/quiltt/quiltt-js/commit/a3452da3c7604902b5917e1f838e2dced42b708c) Thanks [@rubendinho](https://github.com/rubendinho)! - Fix Vite build error
 
 ## 3.3.7
 

package/README.md

@@ -1,7 +1,7 @@
 # @quiltt/core
 
 [![npm version](https://badge.fury.io/js/@quiltt%2Fcore.svg)](https://badge.fury.io/js/@quiltt%2Fcore)
-[![CI](https://github.com/quiltt/quiltt-public/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/quiltt/quiltt-public/actions/workflows/ci.yml)
+[![CI](https://github.com/quiltt/quiltt-js/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/quiltt/quiltt-js/actions/workflows/ci.yml)
 
 `@quiltt/core` provides essential functionality for building Javascript-based applications with Quiltt. It provides an Auth API client and modules for handling JSON Web Tokens (JWT), observables, storage management, timeouts, API handling, and Typescript types.
 

package/dist/{SubscriptionLink-client-B5Tmyqw7.js → SubscriptionLink-client-VkkcO2Yz.js}

@@ -1,10 +1,10 @@
 'use client';
 import { ApolloLink, Observable as Observable$1 } from '@apollo/client/core/index.js';
 import { print } from 'graphql';
-import { c as createConsumer } from './index-client-BY-d8Msy.js';
+import { c as createConsumer } from './index-client-D55-rzVl.js';
 
 var name = "@quiltt/core";
-var version$1 = "3.5.5";
+var version$1 = "3.5.6";
 
 const QUILTT_API_INSECURE = (()=>{
     try {

package/dist/{index-client-BY-d8Msy.js → index-client-D55-rzVl.js}

@@ -1,5 +1,5 @@
 'use client';
-import { d as debugging } from './SubscriptionLink-client-B5Tmyqw7.js';
+import { d as debugging } from './SubscriptionLink-client-VkkcO2Yz.js';
 
 var adapters = {
     logger: typeof globalThis !== 'undefined' ? globalThis.console : undefined,

package/dist/index.d.ts

@@ -6,7 +6,6 @@ import * as _apollo_client from '@apollo/client';
 import { HttpLink as HttpLink$1 } from '@apollo/client/link/http/index.js';
 import { RetryLink as RetryLink$1 } from '@apollo/client/link/retry/index.js';
 import { ApolloLink as ApolloLink$1, Operation as Operation$1, NextLink as NextLink$1, Observable as Observable$2, FetchResult as FetchResult$1 } from '@apollo/client/core/index.js';
-import { AxiosResponse } from 'axios';
 
 declare const debugging: boolean;
 declare const version: string;
@@ -370,6 +369,14 @@ declare class QuilttClient<T> extends ApolloClient<T> {
     constructor(options: QuilttClientOptions<T>);
 }
 
+type FetchResponse<T> = {
+    data: T;
+    status: number;
+    statusText: string;
+    headers: Headers;
+    ok: boolean;
+};
+
 declare enum AuthStrategies {
     Email = "email",
     Phone = "phone"
@@ -389,7 +396,7 @@ type PasscodePayload = UsernamePayload & {
 type SessionData = {
     token: string;
 };
-type NoContentData = void;
+type NoContentData = null;
 type UnauthorizedData = {
     message: string;
     instruction: string;
@@ -401,8 +408,8 @@ type Ping = SessionData | UnauthorizedData;
 type Identify = SessionData | NoContentData | UnprocessableData;
 type Authenticate = SessionData | UnauthorizedData | UnprocessableData;
 type Revoke = NoContentData | UnauthorizedData;
-type SessionResponse = AxiosResponse<SessionData>;
-type UnprocessableResponse = AxiosResponse<UnprocessableData>;
+type SessionResponse = FetchResponse<SessionData>;
+type UnprocessableResponse = FetchResponse<UnprocessableData>;
 declare class AuthAPI {
     clientId: string | undefined;
     constructor(clientId?: string | undefined);
@@ -411,27 +418,27 @@ declare class AuthAPI {
      *  - 200: OK           -> Session is Valid
      *  - 401: Unauthorized -> Session is Invalid
      */
-    ping: (token: string) => Promise<AxiosResponse<Ping, any>>;
+    ping: (token: string) => Promise<FetchResponse<Ping>>;
     /**
      * Response Statuses:
      *  - 201: Created              -> Profile Created, New Session Returned
      *  - 202: Accepted             -> Profile Found, MFA Code Sent for `authenticate`
      *  - 422: Unprocessable Entity -> Invalid Payload
      */
-    identify: (payload: UsernamePayload) => Promise<AxiosResponse<Identify, any>>;
+    identify: (payload: UsernamePayload) => Promise<FetchResponse<Identify>>;
     /**
      * Response Statuses:
      *  - 201: Created              -> MFA Validated, New Session Returned
      *  - 401: Unauthorized         -> MFA Invalid
      *  - 422: Unprocessable Entity -> Invalid Payload
      */
-    authenticate: (payload: PasscodePayload) => Promise<AxiosResponse<Authenticate, any>>;
+    authenticate: (payload: PasscodePayload) => Promise<FetchResponse<Authenticate>>;
     /**
      * Response Statuses:
      *  - 204: No Content   -> Session Revoked
      *  - 401: Unauthorized -> Session Not Found
      */
-    revoke: (token: string) => Promise<AxiosResponse<Revoke, any>>;
+    revoke: (token: string) => Promise<FetchResponse<Revoke>>;
     private config;
     private validateStatus;
     private body;

package/dist/index.js

@@ -1,13 +1,12 @@
-import { G as GlobalStorage, e as endpointGraphQL, v as version, d as debugging, S as SubscriptionLink, a as endpointAuth } from './SubscriptionLink-client-B5Tmyqw7.js';
-export { L as LocalStorage, M as MemoryStorage, O as Observable, f as Storage, c as cdnBase, b as endpointWebsockets } from './SubscriptionLink-client-B5Tmyqw7.js';
+import { G as GlobalStorage, e as endpointGraphQL, v as version, d as debugging, S as SubscriptionLink, a as endpointAuth } from './SubscriptionLink-client-VkkcO2Yz.js';
+export { L as LocalStorage, M as MemoryStorage, O as Observable, f as Storage, c as cdnBase, b as endpointWebsockets } from './SubscriptionLink-client-VkkcO2Yz.js';
 import { ApolloLink, ApolloClient } from '@apollo/client/index.js';
 export { InMemoryCache, gql, useMutation, useQuery, useSubscription } from '@apollo/client/index.js';
 import { BatchHttpLink as BatchHttpLink$1 } from '@apollo/client/link/batch-http/index.js';
-import fetch from 'cross-fetch';
+import crossfetch from 'cross-fetch';
 import { onError } from '@apollo/client/link/error/index.js';
 import { HttpLink as HttpLink$1 } from '@apollo/client/link/http/index.js';
 import { RetryLink as RetryLink$1 } from '@apollo/client/link/retry/index.js';
-import Axios from 'axios';
 
 const MATCHER = /^(?:[\w-]+\.){2}[\w-]+$/;
 const JsonWebTokenParse = (token)=>{
@@ -81,9 +80,11 @@ var ConnectorSDKEventType;
     }
 }
 
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch$2 = typeof fetch === 'undefined' ? crossfetch : fetch;
 const BatchHttpLink = new BatchHttpLink$1({
     uri: endpointGraphQL,
-    fetch
+    fetch: effectiveFetch$2
 });
 
 const ErrorLink = onError(({ graphQLErrors, networkError })=>{
@@ -104,9 +105,11 @@ const ErrorLink = onError(({ graphQLErrors, networkError })=>{
 
 const ForwardableLink = new ApolloLink((operation, forward)=>forward(operation));
 
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch$1 = typeof fetch === 'undefined' ? crossfetch : fetch;
 const HttpLink = new HttpLink$1({
     uri: endpointGraphQL,
-    fetch
+    fetch: effectiveFetch$1
 });
 
 const RetryLink = new RetryLink$1({
@@ -152,35 +155,51 @@ class QuilttClient extends ApolloClient {
     }
 }
 
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch = typeof fetch === 'undefined' ? crossfetch : fetch;
 const RETRY_DELAY = 150 // ms
 ;
 const RETRIES = 10 // 150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500 = 8.250s
 ;
-// Create an axios singleton for Quiltt, to prevent mutating other instances
-const axios = Axios.create();
-// Example: axios.get(url, { retry: true })
-axios.interceptors.response.use(undefined, (error)=>{
-    const { config, message, response } = error;
-    const messageLower = message.toLowerCase();
-    if (!config || !config.retry) {
-        return Promise.reject(error);
-    }
-    // Retry Network timeout, Network errors, and Too Many Requests
-    if (!(messageLower.includes('timeout') || messageLower.includes('network error') || response?.status === 429)) {
-        return Promise.reject(error);
-    }
-    if (config.retriesRemaining === undefined) {
-        config.retriesRemaining = RETRIES - 1;
-    } else if (config.retriesRemaining === 1) {
+/**
+ * A wrapper around the native `fetch` function that adds automatic retries on failure, including network errors and HTTP 429 responses.
+ * Now treats any response with status < 500 as valid.
+ */ const fetchWithRetry = async (url, options = {
+    retry: false
+})=>{
+    const { retry, retriesRemaining, validateStatus = (status)=>status >= 200 && status < 300, ...fetchOptions } = options;
+    try {
+        const response = await effectiveFetch(url, fetchOptions);
+        const isResponseOk = validateStatus(response.status);
+        if (isResponseOk) {
+            return {
+                data: await response.json().catch(()=>null),
+                status: response.status,
+                statusText: response.statusText,
+                headers: response.headers,
+                ok: isResponseOk
+            };
+        }
+        // If validateStatus fails, and retry is enabled, prepare to retry for eligible status codes
+        if (retry && (response.status >= 500 || response.status === 429)) {
+            throw new Error('Retryable failure');
+        }
+        throw new Error('HTTP error with status ' + response.status);
+    } catch (error) {
+        if (retry) {
+            const currentRetriesRemaining = retriesRemaining !== undefined ? retriesRemaining : RETRIES;
+            if (currentRetriesRemaining > 0) {
+                const delayTime = RETRY_DELAY * (RETRIES - currentRetriesRemaining);
+                await new Promise((resolve)=>setTimeout(resolve, delayTime));
+                return fetchWithRetry(url, {
+                    ...options,
+                    retriesRemaining: currentRetriesRemaining - 1
+                });
+            }
+        }
         return Promise.reject(error);
-    } else {
-        config.retriesRemaining -= 1;
     }
-    const delay = new Promise((resolve)=>{
-        setTimeout(()=>resolve(), RETRY_DELAY * (RETRIES - config.retriesRemaining));
-    });
-    return delay.then(()=>axios(config));
-});
+};
 
 var AuthStrategies;
 (function(AuthStrategies) {
@@ -194,47 +213,64 @@ class AuthAPI {
    * Response Statuses:
    *  - 200: OK           -> Session is Valid
    *  - 401: Unauthorized -> Session is Invalid
-   */ this.ping = (token)=>{
-            return axios.get(endpointAuth, this.config(token));
+   */ this.ping = async (token)=>{
+            const response = await fetchWithRetry(endpointAuth, {
+                method: 'GET',
+                ...this.config(token)
+            });
+            return response;
         };
         /**
    * Response Statuses:
    *  - 201: Created              -> Profile Created, New Session Returned
    *  - 202: Accepted             -> Profile Found, MFA Code Sent for `authenticate`
    *  - 422: Unprocessable Entity -> Invalid Payload
-   */ this.identify = (payload)=>{
-            return axios.post(endpointAuth, this.body(payload), this.config());
+   */ this.identify = async (payload)=>{
+            const response = await fetchWithRetry(endpointAuth, {
+                method: 'POST',
+                body: JSON.stringify(this.body(payload)),
+                ...this.config()
+            });
+            return response;
         };
         /**
    * Response Statuses:
    *  - 201: Created              -> MFA Validated, New Session Returned
    *  - 401: Unauthorized         -> MFA Invalid
    *  - 422: Unprocessable Entity -> Invalid Payload
-   */ this.authenticate = (payload)=>{
-            return axios.put(endpointAuth, this.body(payload), this.config());
+   */ this.authenticate = async (payload)=>{
+            const response = await fetchWithRetry(endpointAuth, {
+                method: 'PUT',
+                body: JSON.stringify(this.body(payload)),
+                ...this.config()
+            });
+            return response;
         };
         /**
    * Response Statuses:
    *  - 204: No Content   -> Session Revoked
    *  - 401: Unauthorized -> Session Not Found
-   */ this.revoke = (token)=>{
-            return axios.delete(endpointAuth, this.config(token));
+   */ this.revoke = async (token)=>{
+            const response = await fetchWithRetry(endpointAuth, {
+                method: 'DELETE',
+                ...this.config(token)
+            });
+            return response;
         };
         this.config = (token)=>{
-            const headers = {
-                'Content-Type': 'application/json',
-                Accept: 'application/json'
-            };
+            const headers = new Headers();
+            headers.set('Content-Type', 'application/json');
+            headers.set('Accept', 'application/json');
             if (token) {
-                headers.Authorization = `Bearer ${token}`;
+                headers.set('Authorization', `Bearer ${token}`);
             }
             return {
-                headers: headers,
+                headers,
                 validateStatus: this.validateStatus,
                 retry: true
             };
         };
-        this.validateStatus = (status)=>status < 500;
+        this.validateStatus = (status)=>status < 500 && status !== 429;
         this.body = (payload)=>{
             if (!this.clientId) {
                 console.error('Quiltt Client ID is not set. Unable to identify & authenticate');

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@quiltt/core",
-  "version": "3.5.5",
+  "version": "3.5.6",
   "description": "Javascript API client and utilities for Quiltt",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/quiltt/quiltt-public.git",
-    "directory": "packages/core"
-  },
-  "homepage": "https://github.com/quiltt/quiltt-public/tree/main/packages/core#readme",
   "keywords": [
     "quiltt",
     "typescript"
   ],
+  "homepage": "https://github.com/quiltt/quiltt-js/tree/main/packages/core#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/quiltt/quiltt-js.git",
+    "directory": "packages/core"
+  },
   "license": "MIT",
   "sideEffects": [
     "./src/Storage/Local.ts",
@@ -33,16 +33,15 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@apollo/client": "^3.7.16",
-    "axios": "^1.6.0",
-    "cross-fetch": "^3.1.8",
+    "@apollo/client": "^3.9.9",
+    "cross-fetch": "^4.0.0",
     "graphql": "^16.8.1",
-    "graphql-ruby-client": "^1.11.8"
+    "graphql-ruby-client": "^1.13.3"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "4.1.1",
-    "@types/node": "20.11.25",
-    "@types/react": "18.2.64",
+    "@types/node": "20.12.2",
+    "@types/react": "18.2.73",
     "@typescript-eslint/eslint-plugin": "5.60.1",
     "@typescript-eslint/parser": "5.60.1",
     "bunchee": "4.4.8",
@@ -51,7 +50,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "prettier": "2.8.8",
     "rimraf": "5.0.5",
-    "typescript": "5.4.2"
+    "typescript": "5.4.3"
   },
   "publishConfig": {
     "access": "public"

package/src/api/graphql/links/BatchHttpLink.ts

@@ -1,12 +1,14 @@
 import { BatchHttpLink as ApolloHttpLink } from '@apollo/client/link/batch-http/index.js'
+import crossfetch from 'cross-fetch'
 
-import fetch from 'cross-fetch'
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch = typeof fetch === 'undefined' ? crossfetch : fetch
 
 import { endpointGraphQL } from '../../../configuration'
 
 export const BatchHttpLink = new ApolloHttpLink({
   uri: endpointGraphQL,
-  fetch,
+  fetch: effectiveFetch,
 })
 
 export default BatchHttpLink

package/src/api/graphql/links/HttpLink.ts

@@ -1,12 +1,14 @@
 import { HttpLink as ApolloHttpLink } from '@apollo/client/link/http/index.js'
+import crossfetch from 'cross-fetch'
 
-import fetch from 'cross-fetch'
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch = typeof fetch === 'undefined' ? crossfetch : fetch
 
 import { endpointGraphQL } from '../../../configuration'
 
 export const HttpLink = new ApolloHttpLink({
   uri: endpointGraphQL,
-  fetch,
+  fetch: effectiveFetch,
 })
 
 export default HttpLink

package/src/api/rest/{AuthAPI.ts → auth.ts}

@@ -1,7 +1,6 @@
-import type { AxiosRequestConfig, AxiosResponse } from './axios'
-import { axios } from './axios'
-
-import { endpointAuth } from '../../configuration'
+import { endpointAuth } from '@/configuration'
+import type { FetchResponse } from './fetchWithRetry'
+import { fetchWithRetry } from './fetchWithRetry'
 
 export enum AuthStrategies {
   Email = 'email',
@@ -22,7 +21,7 @@ export type UsernamePayload = EmailInput | PhoneInput
 export type PasscodePayload = UsernamePayload & { passcode: string }
 
 type SessionData = { token: string }
-type NoContentData = void
+type NoContentData = null
 type UnauthorizedData = { message: string; instruction: string }
 export type UnprocessableData = { [attribute: string]: Array<string> }
 
@@ -31,8 +30,8 @@ type Identify = SessionData | NoContentData | UnprocessableData
 type Authenticate = SessionData | UnauthorizedData | UnprocessableData
 type Revoke = NoContentData | UnauthorizedData
 
-export type SessionResponse = AxiosResponse<SessionData>
-export type UnprocessableResponse = AxiosResponse<UnprocessableData>
+export type SessionResponse = FetchResponse<SessionData>
+export type UnprocessableResponse = FetchResponse<UnprocessableData>
 
 // https://www.quiltt.dev/api-reference/rest/auth#
 export class AuthAPI {
@@ -47,8 +46,12 @@ export class AuthAPI {
    *  - 200: OK           -> Session is Valid
    *  - 401: Unauthorized -> Session is Invalid
    */
-  ping = (token: string) => {
-    return axios.get<Ping>(endpointAuth, this.config(token))
+  ping = async (token: string) => {
+    const response = await fetchWithRetry<Ping>(endpointAuth, {
+      method: 'GET',
+      ...this.config(token),
+    })
+    return response
   }
 
   /**
@@ -57,8 +60,13 @@ export class AuthAPI {
    *  - 202: Accepted             -> Profile Found, MFA Code Sent for `authenticate`
    *  - 422: Unprocessable Entity -> Invalid Payload
    */
-  identify = (payload: UsernamePayload) => {
-    return axios.post<Identify>(endpointAuth, this.body(payload), this.config())
+  identify = async (payload: UsernamePayload) => {
+    const response = await fetchWithRetry<Identify>(endpointAuth, {
+      method: 'POST',
+      body: JSON.stringify(this.body(payload)),
+      ...this.config(),
+    })
+    return response
   }
 
   /**
@@ -67,8 +75,13 @@ export class AuthAPI {
    *  - 401: Unauthorized         -> MFA Invalid
    *  - 422: Unprocessable Entity -> Invalid Payload
    */
-  authenticate = (payload: PasscodePayload) => {
-    return axios.put<Authenticate>(endpointAuth, this.body(payload), this.config())
+  authenticate = async (payload: PasscodePayload): Promise<FetchResponse<Authenticate>> => {
+    const response = await fetchWithRetry<Authenticate>(endpointAuth, {
+      method: 'PUT',
+      body: JSON.stringify(this.body(payload)),
+      ...this.config(),
+    })
+    return response
   }
 
   /**
@@ -76,28 +89,30 @@ export class AuthAPI {
    *  - 204: No Content   -> Session Revoked
    *  - 401: Unauthorized -> Session Not Found
    */
-  revoke = (token: string) => {
-    return axios.delete<Revoke>(endpointAuth, this.config(token))
+  revoke = async (token: string): Promise<FetchResponse<Revoke>> => {
+    const response = await fetchWithRetry<Revoke>(endpointAuth, {
+      method: 'DELETE',
+      ...this.config(token),
+    })
+    return response
   }
 
-  private config = (token?: string): AxiosRequestConfig => {
-    const headers: { [id: string]: string } = {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-    }
+  private config = (token?: string) => {
+    const headers = new Headers()
+    headers.set('Content-Type', 'application/json')
+    headers.set('Accept', 'application/json')
 
     if (token) {
-      headers.Authorization = `Bearer ${token}`
+      headers.set('Authorization', `Bearer ${token}`)
     }
 
     return {
-      headers: headers,
+      headers,
       validateStatus: this.validateStatus,
       retry: true,
     }
   }
-
-  private validateStatus = (status: number) => status < 500
+  private validateStatus = (status: number) => status < 500 && status !== 429
 
   private body = (payload: any) => {
     if (!this.clientId) {
@@ -112,5 +127,3 @@ export class AuthAPI {
     }
   }
 }
-
-export default AuthAPI

package/src/api/rest/fetchWithRetry.ts

@@ -0,0 +1,73 @@
+import crossfetch from 'cross-fetch'
+
+// Use `cross-fetch` only if `fetch` is not available on the `globalThis` object
+const effectiveFetch = typeof fetch === 'undefined' ? crossfetch : fetch
+
+type FetchWithRetryOptions = RequestInit & {
+  retry?: boolean
+  retriesRemaining?: number
+  validateStatus?: (status: number) => boolean
+}
+
+export type FetchResponse<T> = {
+  data: T
+  status: number
+  statusText: string
+  headers: Headers
+  ok: boolean
+}
+
+const RETRY_DELAY = 150 // ms
+const RETRIES = 10 // 150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500 = 8.250s
+
+/**
+ * A wrapper around the native `fetch` function that adds automatic retries on failure, including network errors and HTTP 429 responses.
+ * Now treats any response with status < 500 as valid.
+ */
+export const fetchWithRetry = async <T>(
+  url: RequestInfo,
+  options: FetchWithRetryOptions = { retry: false }
+): Promise<FetchResponse<T>> => {
+  const {
+    retry,
+    retriesRemaining,
+    validateStatus = (status) => status >= 200 && status < 300, // Default to success for 2xx responses
+    ...fetchOptions
+  } = options
+
+  try {
+    const response = await effectiveFetch(url, fetchOptions)
+
+    const isResponseOk = validateStatus(response.status)
+
+    if (isResponseOk) {
+      return {
+        data: await response.json().catch(() => null),
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+        ok: isResponseOk,
+      }
+    }
+
+    // If validateStatus fails, and retry is enabled, prepare to retry for eligible status codes
+    if (retry && (response.status >= 500 || response.status === 429)) {
+      throw new Error('Retryable failure')
+    }
+
+    throw new Error('HTTP error with status ' + response.status)
+  } catch (error) {
+    if (retry) {
+      const currentRetriesRemaining = retriesRemaining !== undefined ? retriesRemaining : RETRIES
+      if (currentRetriesRemaining > 0) {
+        const delayTime = RETRY_DELAY * (RETRIES - currentRetriesRemaining)
+        await new Promise((resolve) => setTimeout(resolve, delayTime))
+        return fetchWithRetry(url, {
+          ...options,
+          retriesRemaining: currentRetriesRemaining - 1,
+        })
+      }
+    }
+    return Promise.reject(error)
+  }
+}

package/src/api/rest/index.ts

@@ -1 +1 @@
-export * from './AuthAPI'
+export * from './auth'

package/src/api/rest/axios.ts

@@ -1,52 +0,0 @@
-import type { AxiosRequestConfig as RequestConfig } from 'axios'
-import Axios from 'axios'
-
-export type { AxiosResponse } from 'axios'
-export type AxiosRequestConfig<D = any> = RequestConfig<D> & {
-  retry: boolean
-}
-
-const RETRY_DELAY = 150 // ms
-const RETRIES = 10 // 150, 300, 450, 600, 750, 900, 1050, 1200, 1350, 1500 = 8.250s
-
-// Create an axios singleton for Quiltt, to prevent mutating other instances
-const axios = Axios.create()
-
-// Example: axios.get(url, { retry: true })
-axios.interceptors.response.use(undefined, (error) => {
-  const { config, message, response } = error
-  const messageLower = message.toLowerCase()
-
-  if (!config || !config.retry) {
-    return Promise.reject(error)
-  }
-
-  // Retry Network timeout, Network errors, and Too Many Requests
-  if (
-    !(
-      messageLower.includes('timeout') ||
-      messageLower.includes('network error') ||
-      response?.status === 429
-    )
-  ) {
-    return Promise.reject(error)
-  }
-
-  if (config.retriesRemaining === undefined) {
-    config.retriesRemaining = RETRIES - 1
-  } else if (config.retriesRemaining === 1) {
-    return Promise.reject(error)
-  } else {
-    config.retriesRemaining -= 1
-  }
-
-  const delay = new Promise<void>((resolve) => {
-    setTimeout(() => resolve(), RETRY_DELAY * (RETRIES - config.retriesRemaining))
-  })
-
-  return delay.then(() => axios(config))
-})
-
-export { axios }
-
-export default axios