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

package/dist/config.d.mts

@@ -1,4 +1,4 @@
-import { C as ClientConfig } from './shared/apollo.d410709a.mjs';
+import { C as ClientConfig } from './shared/apollo.c5299a22.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.d410709a.js';
+import { C as ClientConfig } from './shared/apollo.c5299a22.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.d410709a.mjs';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.c5299a22.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.d410709a.js';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.c5299a22.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.20",
+  "version": "6.0.0-alpha.23",
   "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.20";
+const version = "6.0.0-alpha.23";
 
 const serializeConfig = (obj) => {
   if (typeof obj === "function") {
@@ -46,7 +46,8 @@ const module = defineNuxtModule({
       secure: process.env.NODE_ENV === "production",
       sameSite: "lax"
     },
-    clientAwareness: false
+    clientAwareness: false,
+    requestMaxTimeout: 7e3
   },
   async setup(options, nuxt) {
     if (!options.clients || !Object.keys(options.clients).length) {
@@ -85,6 +86,7 @@ const module = defineNuxtModule({
         v.csrfHeader = v?.csrfHeader || options.csrfHeader;
         v.tokenName = v?.tokenName || `apollo:${k}.token`;
         v.tokenStorage = v?.tokenStorage || options.tokenStorage;
+        v.requestMaxTimeout = v?.requestMaxTimeout || options.requestMaxTimeout;
         if (v.cookieAttributes) {
           v.cookieAttributes = defu(v?.cookieAttributes, options.cookieAttributes);
         }

package/dist/runtime/plugin.mjs

@@ -92,17 +92,36 @@ export default defineNuxtPlugin((nuxtApp) => {
     if (clientConfig.persistedQueries) {
       persistedLink = createPersistedQueryLink({ sha256, useGETForHashedQueries: true });
     }
-    const customFetch = async (uri, options, blocked1stCall = false) => {
-      const response = await fetch(uri, options);
-      if (response.status === 419) {
-        const token = await getCsrfToken(true);
-        if (token && !blocked1stCall) {
-          return customFetch(uri, options, !blocked1stCall);
-        } else {
-          nuxtApp.callHook("apollo:error", { networkError: { bodyText: "Session Expired", statusCode: 419 } });
-        }
-      }
-      return response;
+    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 httpEndLink = createUploadLink({
       ...clientConfig?.httpLinkOptions && clientConfig.httpLinkOptions,

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

@@ -120,6 +120,13 @@ type ClientConfig = {
    */
   csrfHeader?: string
 
+  /**
+   * Request maximum timeout.
+   * @type {number}
+   * @default 7000
+   */
+  requestMaxTimeout?: number
+
   /**
    * Enable automatic persisted queries.
    * @type {boolean}
@@ -176,6 +183,13 @@ interface NuxtApolloConfig<T = false> {
    */
   csrfHeader?: string;
 
+  /**
+   * Request maximum timeout.
+   * @type {number}
+   * @default 7000
+   */
+  requestMaxTimeout?: number
+
   /**
    * Specify if the auth token should be stored in `cookie` or `localStorage`.
    * `Cookie` storage is required for SSR.

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

@@ -120,6 +120,13 @@ type ClientConfig = {
    */
   csrfHeader?: string
 
+  /**
+   * Request maximum timeout.
+   * @type {number}
+   * @default 7000
+   */
+  requestMaxTimeout?: number
+
   /**
    * Enable automatic persisted queries.
    * @type {boolean}
@@ -176,6 +183,13 @@ interface NuxtApolloConfig<T = false> {
    */
   csrfHeader?: string;
 
+  /**
+   * Request maximum timeout.
+   * @type {number}
+   * @default 7000
+   */
+  requestMaxTimeout?: number
+
   /**
    * Specify if the auth token should be stored in `cookie` or `localStorage`.
    * `Cookie` storage is required for SSR.

package/package.json

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