@gambalabs/apollo 6.0.0-alpha.19 → 6.0.0-alpha.21

package/dist/config.d.mts

@@ -1,4 +1,4 @@
-import { C as ClientConfig } from './shared/apollo.32d05cc9.mjs';
+import { C as ClientConfig } from './shared/apollo.d410709a.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.32d05cc9.js';
+import { C as ClientConfig } from './shared/apollo.d410709a.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.32d05cc9.mjs';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.d410709a.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.32d05cc9.js';
+import { N as NuxtApolloConfig, C as ClientConfig } from './shared/apollo.d410709a.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.19",
+  "version": "6.0.0-alpha.21",
   "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.19";
+const version = "6.0.0-alpha.21";
 
 const serializeConfig = (obj) => {
   if (typeof obj === "function") {

package/dist/runtime/plugin.mjs

@@ -61,9 +61,9 @@ export default defineNuxtPlugin((nuxtApp) => {
         }
       };
     });
-    const getCsrfToken = async () => {
+    const getCsrfToken = async (forceUpdate = false) => {
       const token = ref();
-      await nuxtApp.callHook("apollo:csrf", { token, client: key });
+      await nuxtApp.callHook("apollo:csrf", { token, client: key, forceUpdate });
       return token.value;
     };
     const csrfLink = setContext(async (_, { headers }) => {
@@ -92,10 +92,27 @@ 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 } });
+        }
+      } else if (response.status > 300) {
+        const errorText = await response.text();
+        nuxtApp.callHook("apollo:error", { networkError: { bodyText: errorText, statusCode: response.status } });
+      }
+      return response;
+    };
     const httpEndLink = createUploadLink({
       ...clientConfig?.httpLinkOptions && clientConfig.httpLinkOptions,
       uri: process.client && clientConfig.browserHttpEndpoint || clientConfig.httpEndpoint,
-      headers: { ...clientConfig?.httpLinkOptions?.headers || {} }
+      headers: { ...clientConfig?.httpLinkOptions?.headers || {} },
+      fetch: customFetch
+      // use custom fetch instead of default fetch to handle status code
     });
     const httpLink = baseLink.concat(httpEndLink);
     let wsLink = null;
@@ -121,23 +138,34 @@ export default defineNuxtPlugin((nuxtApp) => {
     }
     let pusherLink = null;
     if (process.client && clientConfig.pusher) {
-      pusherLink = new PusherLink({
-        pusher: new Pusher(clientConfig.pusher.pusherAppKey, {
-          wsHost: clientConfig.pusher.wsHost,
-          wsPort: clientConfig.pusher.wsPort,
-          forceTLS: clientConfig.pusher.forceTLS,
-          disableStats: true,
-          enabledTransports: ["ws", "wss"],
-          cluster: clientConfig.pusher.cluster,
-          channelAuthorization: {
-            endpoint: clientConfig.pusher.channelEndpoint,
-            headersProvider() {
-              const { token: csrfToken } = nuxtApp.$csrfToken();
-              const { token: authToken } = nuxtApp.$authToken();
-              return { "X-CSRF-Token": csrfToken.value, authorization: `Bearer ${authToken.value}` };
-            }
+      const pusherObj = new Pusher(clientConfig.pusher.pusherAppKey, {
+        wsHost: clientConfig.pusher.wsHost,
+        wsPort: clientConfig.pusher.wsPort,
+        forceTLS: clientConfig.pusher.forceTLS,
+        disableStats: true,
+        enabledTransports: ["ws", "wss"],
+        cluster: clientConfig.pusher.cluster,
+        activityTimeout: clientConfig.pusher.activityTimeout,
+        reconnect: {
+          auto: true
+        },
+        channelAuthorization: {
+          endpoint: clientConfig.pusher.channelEndpoint,
+          headersProvider() {
+            const { token: csrfToken } = nuxtApp.$csrfToken();
+            const { token: authToken } = nuxtApp.$authToken();
+            return { "X-CSRF-Token": csrfToken.value, authorization: `Bearer ${authToken.value}` };
           }
-        })
+        }
+      });
+      const handleVisibilityChange = () => {
+        if (document.visibilityState === "visible" && pusherObj.connection.state !== "connected") {
+          pusherObj.connect();
+        }
+      };
+      document.addEventListener("visibilitychange", handleVisibilityChange);
+      pusherLink = new PusherLink({
+        pusher: pusherObj
       });
     }
     const errorLink = onError((err) => {

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

@@ -11,6 +11,7 @@ type Pusher = {
   forceTLS: boolean;
   channelEndpoint: string;
   pusherAppKey: string;
+  activityTimeout: number;
 }
 
 type ClientConfig = {

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

@@ -11,6 +11,7 @@ type Pusher = {
   forceTLS: boolean;
   channelEndpoint: string;
   pusherAppKey: string;
+  activityTimeout: number;
 }
 
 type ClientConfig = {

package/package.json

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