@gambalabs/apollo 6.0.0-alpha.23 → 6.0.0-alpha.25

package/dist/config.d.mts

@@ -1,4 +1,4 @@
-import { C as ClientConfig } from './shared/apollo.c5299a22.mjs';
+import { C as ClientConfig } from './shared/apollo.eb74b1b6.mjs';
 import 'graphql-ws';
 import '@apollo/client';
 import 'nuxt/app';

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { C as ClientConfig } from './shared/apollo.c5299a22.js';
+import { C as ClientConfig } from './shared/apollo.eb74b1b6.js';
 import 'graphql-ws';
 import '@apollo/client';
 import 'nuxt/app';

package/dist/module.d.mts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.c5299a22.mjs';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.eb74b1b6.mjs';
 export { ErrorResponse } from '@apollo/client/link/error';
 import 'graphql-ws';
 import '@apollo/client';

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.c5299a22.js';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.eb74b1b6.js';
 export { ErrorResponse } from '@apollo/client/link/error';
 import 'graphql-ws';
 import '@apollo/client';

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@gambalabs/apollo",
-  "version": "6.0.0-alpha.23",
+  "version": "6.0.0-alpha.25",
   "configKey": "apollo",
   "compatibility": {
     "nuxt": "^3.0.0-rc.9"

package/dist/module.mjs

@@ -5,7 +5,7 @@ import { useLogger, defineNuxtModule, createResolver, addTemplate, addPlugin, ad
 import GraphQLPlugin from '@rollup/plugin-graphql';
 
 const name = "@gambalabs/apollo";
-const version = "6.0.0-alpha.23";
+const version = "6.0.0-alpha.25";
 
 const serializeConfig = (obj) => {
   if (typeof obj === "function") {
@@ -47,7 +47,20 @@ const module = defineNuxtModule({
       sameSite: "lax"
     },
     clientAwareness: false,
-    requestMaxTimeout: 7e3
+    requestMaxTimeout: 7e3,
+    retryOptions: {
+      delay: {
+        initial: 300,
+        max: Infinity,
+        jitter: true
+      },
+      attempts: {
+        max: 5,
+        retryIf(error, operation) {
+          return !error;
+        }
+      }
+    }
   },
   async setup(options, nuxt) {
     if (!options.clients || !Object.keys(options.clients).length) {
@@ -87,6 +100,7 @@ const module = defineNuxtModule({
         v.tokenName = v?.tokenName || `apollo:${k}.token`;
         v.tokenStorage = v?.tokenStorage || options.tokenStorage;
         v.requestMaxTimeout = v?.requestMaxTimeout || options.requestMaxTimeout;
+        v.retryOptions = v?.retryOptions || options.retryOptions;
         if (v.cookieAttributes) {
           v.cookieAttributes = defu(v?.cookieAttributes, options.cookieAttributes);
         }

package/dist/runtime/plugin.mjs

@@ -8,6 +8,7 @@ import createUploadLink from "apollo-upload-client/createUploadLink.mjs";
 import { createPersistedQueryLink } from "@apollo/client/link/persisted-queries";
 import { sha256 } from "crypto-hash";
 import { GraphQLWsLink } from "@apollo/client/link/subscriptions";
+import { RetryLink } from "@apollo/client/link/retry";
 import { setContext } from "@apollo/client/link/context";
 import Pusher from "pusher-js";
 import createRestartableClient from "./ws.mjs";
@@ -92,43 +93,25 @@ export default defineNuxtPlugin((nuxtApp) => {
     if (clientConfig.persistedQueries) {
       persistedLink = createPersistedQueryLink({ sha256, useGETForHashedQueries: true });
     }
-    const customFetch = async (uri, options) => {
-      return new Promise((resolve, reject) => {
-        let handledByTimeout = false;
-        const timer = setTimeout(() => {
-          handledByTimeout = true;
-          nuxtApp.callHook("apollo:error", {
-            networkError: {
-              bodyText: `Request Exceeded timeout ${clientConfig.requestMaxTimeout}ms`,
-              statusCode: "(failed)net::ERR_NAME_NOT_RESOLVED",
-              options
-            }
-          });
-          reject(new Error(`Request Exceeded timeout ${clientConfig.requestMaxTimeout}ms`));
-        }, clientConfig.requestMaxTimeout);
-        fetch(uri, options).then(async (response) => {
-          clearTimeout(timer);
-          if (response.status >= 300) {
-            const errorText = await response.clone().text();
-            nuxtApp.callHook("apollo:error", { networkError: { bodyText: errorText, statusCode: response.status, options } });
-          }
-          resolve(response);
-        }).catch((e) => {
-          if (handledByTimeout) {
-            return;
-          }
-          clearTimeout(timer);
-          nuxtApp.callHook("apollo:error", { networkError: { bodyText: "Failed to fetch", statusCode: "(failed)net::ERR_NAME_NOT_RESOLVED", options } });
-          reject(e);
-        });
+    const gambaFetch = async (uri, options) => {
+      let handledByTimeout = false;
+      const abortController = new AbortController();
+      const timer = setTimeout(() => {
+        handledByTimeout = true;
+        abortController.abort(`Request exceeded timeout ${clientConfig.requestMaxTimeout / 1e3} seconds`);
+      }, clientConfig.requestMaxTimeout);
+      return fetch(uri, {
+        ...options,
+        signal: abortController.signal
+      }).finally(() => {
+        clearTimeout(timer);
       });
     };
     const httpEndLink = createUploadLink({
       ...clientConfig?.httpLinkOptions && clientConfig.httpLinkOptions,
       uri: process.client && clientConfig.browserHttpEndpoint || clientConfig.httpEndpoint,
       headers: { ...clientConfig?.httpLinkOptions?.headers || {} },
-      fetch: customFetch
-      // use custom fetch instead of default fetch to handle status code
+      fetch: gambaFetch
     });
     const httpLink = baseLink.concat(httpEndLink);
     let wsLink = null;
@@ -187,6 +170,9 @@ export default defineNuxtPlugin((nuxtApp) => {
     const errorLink = onError((err) => {
       nuxtApp.callHook("apollo:error", err);
     });
+    const retryLink = new RetryLink({
+      ...clientConfig.retryOptions
+    });
     const link = pusherLink ? ApolloLink.from([
       errorLink,
       baseLink,
@@ -197,13 +183,13 @@ export default defineNuxtPlugin((nuxtApp) => {
             const definition = getMainDefinition(query);
             return definition.kind === "OperationDefinition" && definition.operation === "query";
           },
-          ApolloLink.from([persistedLink, httpEndLink]),
-          httpEndLink
+          ApolloLink.from([persistedLink, retryLink, httpEndLink]),
+          ApolloLink.from([retryLink, httpEndLink])
         )
-      ] : [httpEndLink]
+      ] : [retryLink, httpEndLink]
     ]) : ApolloLink.from([
       errorLink,
-      ...!wsLink ? [httpLink] : [
+      ...!wsLink ? [retryLink, httpLink] : [
         ...clientConfig?.websocketsOnly ? [wsLink] : [
           split(
             ({ query }) => {
@@ -211,7 +197,7 @@ export default defineNuxtPlugin((nuxtApp) => {
               return definition.kind === "OperationDefinition" && definition.operation === "subscription";
             },
             wsLink,
-            httpLink
+            ApolloLink.from([retryLink, httpLink])
           )
         ]
       ]

package/dist/runtime/pusher.mjs

@@ -40,6 +40,9 @@ class PusherLink extends ApolloLink {
           }
           const event = data?.extensions?.lighthouse_subscriptions.event ?? 'lighthouse-subscription'
           this.subscribeToChannel(subscriptionChannel, event, observer)
+        },
+        error: (networkError) => {
+          observer.error(networkError)
         }
       })
 

package/dist/shared/{apollo.c5299a22.d.mts → apollo.eb74b1b6.d.mts}

@@ -14,6 +14,18 @@ type Pusher = {
   activityTimeout: number;
 }
 
+type RetryOptions = {
+  delay: {
+    initial: number
+    max: number
+    jitter: boolean
+  }
+  attempts: {
+    max: number
+    retryIf: (error: any, operation: any) => boolean
+  }
+}
+
 type ClientConfig = {
   /**
    * The GraphQL endpoint.
@@ -133,6 +145,12 @@ type ClientConfig = {
    * @default false
    */
   persistedQueries?: boolean
+
+  /**
+   * options for Retry link
+   */
+
+  retryOptions?: Partial<RetryOptions>
 };
 
 interface NuxtApolloConfig<T = false> {
@@ -211,6 +229,11 @@ interface NuxtApolloConfig<T = false> {
    * @default false
    */
   clientAwareness?: boolean
+
+  /**
+   * options for Retry link
+   */
+  retryOptions?: Partial<RetryOptions>
 }
 
 export type { ClientConfig as C, NuxtApolloConfig as N };

package/dist/shared/{apollo.c5299a22.d.ts → apollo.eb74b1b6.d.ts}

@@ -14,6 +14,18 @@ type Pusher = {
   activityTimeout: number;
 }
 
+type RetryOptions = {
+  delay: {
+    initial: number
+    max: number
+    jitter: boolean
+  }
+  attempts: {
+    max: number
+    retryIf: (error: any, operation: any) => boolean
+  }
+}
+
 type ClientConfig = {
   /**
    * The GraphQL endpoint.
@@ -133,6 +145,12 @@ type ClientConfig = {
    * @default false
    */
   persistedQueries?: boolean
+
+  /**
+   * options for Retry link
+   */
+
+  retryOptions?: Partial<RetryOptions>
 };
 
 interface NuxtApolloConfig<T = false> {
@@ -211,6 +229,11 @@ interface NuxtApolloConfig<T = false> {
    * @default false
    */
   clientAwareness?: boolean
+
+  /**
+   * options for Retry link
+   */
+  retryOptions?: Partial<RetryOptions>
 }
 
 export type { ClientConfig as C, NuxtApolloConfig as N };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gambalabs/apollo",
-  "version": "6.0.0-alpha.23",
+  "version": "6.0.0-alpha.25",
   "license": "MIT",
   "repository": "https://github.com/GambaLabs/apollo",
   "homepage": "https://apollo.nuxtjs.org",