@opexa/portal-components 0.1.66 → 0.1.69

package/dist/client/services/signIn.js

@@ -1,5 +1,5 @@
 import { Capacitor } from '@capacitor/core';
-import { API_VERSION_HEADER_KEY, AUTH_API_BASE_URL_HEADER_KEY, SESSION_VERSION_HEADER_KEY, } from '../../constants/index.js';
+import { API_VERSION_HEADER_KEY, AUTH_API_BASE_URL_HEADER_KEY, PLATFORM_WEB_HEADER_KEY, SESSION_VERSION_HEADER_KEY, } from '../../constants/index.js';
 import { httpRequest, } from '../../services/httpRequest.js';
 const platform = Capacitor.getPlatform();
 export async function signIn(input, options, versionSession = 'default', version = 1, authApiBaseUrl, isInplayMobileEnabled = false) {
@@ -9,9 +9,9 @@ export async function signIn(input, options, versionSession = 'default', version
         : versionSession;
     headers.set(SESSION_VERSION_HEADER_KEY, effectiveVersionSession);
     headers.set(API_VERSION_HEADER_KEY, String(version));
-    // if (version === 4 && platform === 'web') {
-    // 	headers.set(PLATFORM_WEB_HEADER_KEY, 'true');
-    // }
+    if (version === 4 && platform === 'web') {
+        headers.set(PLATFORM_WEB_HEADER_KEY, 'true');
+    }
     if (authApiBaseUrl) {
         headers.set(AUTH_API_BASE_URL_HEADER_KEY, authApiBaseUrl);
     }

package/dist/components/PortalProvider/SessionWatcher.js

@@ -1,5 +1,7 @@
 'use client';
+import { App } from '@capacitor/app';
 import { useRouter } from 'next/navigation';
+import { useEffect, useRef } from 'react';
 import { useTimeout } from 'usehooks-ts';
 import { useShallow } from 'zustand/shallow';
 import { useGlobalStore } from '../../client/hooks/useGlobalStore.js';
@@ -7,13 +9,54 @@ import { useSessionHealthQuery } from '../../client/hooks/useSessionHealthQuery.
 import { useSessionQuery } from '../../client/hooks/useSessionQuery.js';
 import { useSignOutMutation } from '../../client/hooks/useSignOutMutation.js';
 import { toaster } from '../../client/utils/toaster.js';
+const SESSION_WATCH_INTERVAL = 30_000;
 export function SessionWatcher() {
     const router = useRouter();
     const sessionQuery = useSessionQuery();
+    const isAuthenticated = sessionQuery.data?.status === 'authenticated';
+    const isAuthenticatedRef = useRef(isAuthenticated);
+    isAuthenticatedRef.current = isAuthenticated;
     const sessionHealthQuery = useSessionHealthQuery({
-        enabled: sessionQuery.data?.status === 'authenticated',
-        refetchInterval: 1000 * 5,
+        enabled: false,
     });
+    const refetchSessionHealthRef = useRef(sessionHealthQuery.refetch);
+    refetchSessionHealthRef.current = sessionHealthQuery.refetch;
+    useEffect(() => {
+        let counter = 0;
+        let timeout = null;
+        let isForeground = true;
+        let stopped = false;
+        const listener = App.addListener('appStateChange', ({ isActive }) => {
+            isForeground = isActive;
+        });
+        const assignTimeout = () => {
+            const duration = counter <= 0 ? SESSION_WATCH_INTERVAL * 1.5 : SESSION_WATCH_INTERVAL;
+            return setTimeout(async () => {
+                if (isForeground && isAuthenticatedRef.current) {
+                    try {
+                        await refetchSessionHealthRef.current();
+                    }
+                    catch {
+                        // A failed check must not stop future session checks.
+                    }
+                    if (stopped) {
+                        return;
+                    }
+                }
+                counter += 1;
+                timeout = assignTimeout();
+            }, duration);
+        };
+        timeout = assignTimeout();
+        return () => {
+            stopped = true;
+            if (timeout) {
+                clearTimeout(timeout);
+                timeout = null;
+            }
+            void listener.then((handle) => handle.remove()).catch(() => undefined);
+        };
+    }, []);
     const { gameLaunch, reset } = useGlobalStore(useShallow((ctx) => ({
         gameLaunch: ctx.gameLaunch,
         reset: ctx.reset,

package/dist/services/auth.js

@@ -143,16 +143,24 @@ export async function authenticate(input, options) {
     throw new Error("Invalid input 'type'");
 }
 export async function refreshSession(options, version = 1, authApiBaseUrl) {
-    const url = authApiBaseUrl || AUTH_ENDPOINT;
-    try {
-        return await httpRequest.json(version !== 1
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url =
+        version !== 1
             ? `${url}/v${version}/session/refresh`
-            : `${url}/session:refresh`, {
+            : `${url}/session:refresh`;
+    console.log('[REFRESH SESSION]');
+    console.log({ url });
+    try {
+        return await httpRequest.json(url, {
             ...options,
             method: 'POST',
         });
     }
     catch (e) {
+        console.log('[REFRESH SESSION]');
+        console.log('Failed to refresh session');
+        console.log(e);
         if (e instanceof Error) {
             throw e;
         }
@@ -166,9 +174,13 @@ export async function refreshSession(options, version = 1, authApiBaseUrl) {
     }
 }
 export async function destroySession(options, authApiBaseUrl) {
-    const url = authApiBaseUrl || AUTH_ENDPOINT;
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url = `${url}/session`;
+    console.log('[DESTROY SESSION]');
+    console.log({ url });
     try {
-        await httpRequest(`${url}/session`, {
+        await httpRequest(url, {
             ...options,
             method: 'DELETE',
         });
@@ -180,9 +192,14 @@ export async function destroySession(options, authApiBaseUrl) {
 export async function getSessionHealth(options) {
     try {
         const res = await fetch(`${AUTH_ENDPOINT}/session`, options);
+        if (!res.ok) {
+            console.log('[SESSION]');
+            console.log("'/session' failed");
+        }
         return res.ok;
     }
     catch {
+        console.log("unknown error in '/session'");
         /* Network errors should not be logged out */
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opexa/portal-components",
-  "version": "0.1.66",
+  "version": "0.1.69",
   "exports": {
     "./ui/*": {
       "types": "./dist/ui/*/index.d.ts",