@flexbe/sdk 0.1.2 → 0.1.3

package/dist/cjs/client/token-manager.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenManager = void 0;
 const TOKEN_STORAGE_KEY = 'flexbe_jwt_token';
 const REFRESH_THRESHOLD = 0.8; // Refresh when 80% of token lifetime has passed
+const REFRESH_CHECK_INTERVAL = 30 * 1000; // Check every 30 seconds
+const MAX_REFRESH_DELAY = 10000; // Maximum random delay of 10 seconds
 class TokenManager {
     constructor() {
         this.token = null;
         this.refreshInterval = null;
+        this.refreshTimeout = null;
+        this.tokenPromise = null;
+        this.debug = false;
         this.initializeFromStorage();
         this.setupStorageListener();
     }
@@ -17,59 +22,61 @@ class TokenManager {
         return TokenManager.instance;
     }
     initializeFromStorage() {
-        if (typeof window !== 'undefined') {
-            const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
-            if (storedToken) {
-                try {
-                    this.token = JSON.parse(storedToken);
-                    if (this.token.expiresAt > Date.now()) {
-                        console.log('Reusing stored token:', {
-                            expiresIn: `${Math.round((this.token.expiresAt - Date.now()) / 1000)} seconds`,
-                            expiresAt: new Date(this.token.expiresAt).toISOString(),
-                        });
-                        this.startRefreshInterval();
-                    }
-                    else {
-                        this.clearToken();
-                    }
-                }
-                catch (error) {
-                    console.error('Failed to parse stored token:', error);
-                    this.clearToken();
-                }
+        if (typeof window === 'undefined')
+            return;
+        const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
+        if (!storedToken)
+            return;
+        try {
+            this.token = JSON.parse(storedToken);
+            if (this.token.expiresAt > Date.now()) {
+                this.logTokenStatus('Token loaded from storage');
+                this.startRefreshInterval();
+            }
+            else {
+                this.clearToken();
             }
         }
+        catch (error) {
+            console.error('Failed to parse stored token:', error);
+            this.clearToken();
+        }
     }
     setupStorageListener() {
-        if (typeof window !== 'undefined') {
-            window.addEventListener('storage', (event) => {
-                if (event.key === TOKEN_STORAGE_KEY) {
-                    if (event.newValue) {
-                        try {
-                            const newToken = JSON.parse(event.newValue);
-                            if (newToken.expiresAt > Date.now()) {
-                                this.token = newToken;
-                                console.log('Token updated from storage:', {
-                                    expiresIn: `${Math.round((newToken.expiresAt - Date.now()) / 1000)} seconds`,
-                                    expiresAt: new Date(newToken.expiresAt).toISOString(),
-                                });
-                                this.startRefreshInterval();
-                            }
-                            else {
-                                this.clearToken();
-                            }
-                        }
-                        catch (error) {
-                            console.error('Failed to parse token from storage event:', error);
-                            this.clearToken();
-                        }
-                    }
-                    else {
-                        this.clearToken();
-                    }
+        if (typeof window === 'undefined')
+            return;
+        window.addEventListener('storage', (event) => {
+            if (event.key !== TOKEN_STORAGE_KEY)
+                return;
+            if (!event.newValue) {
+                this.clearToken();
+                void this.retrieveToken();
+                return;
+            }
+            try {
+                const newToken = JSON.parse(event.newValue);
+                // Skip if the new token is exactly the same as current token
+                if (this.token &&
+                    this.token.accessToken === newToken.accessToken &&
+                    this.token.expiresAt === newToken.expiresAt) {
+                    return;
                 }
-            });
-        }
+                if (newToken.expiresAt > Date.now()) {
+                    this.token = newToken;
+                    this.logTokenStatus('Token updated from storage');
+                    this.startRefreshInterval();
+                }
+                else {
+                    this.clearToken();
+                    void this.retrieveToken();
+                }
+            }
+            catch (error) {
+                console.error('Failed to parse token from storage event:', error);
+                this.clearToken();
+                void this.retrieveToken();
+            }
+        });
     }
     getExpirationFromToken(token) {
         try {
@@ -82,32 +89,125 @@ class TokenManager {
             return Date.now() + (4 * 60 * 1000); // Default to 4 minutes if parsing fails
         }
     }
+    async getToken() {
+        const token = this.token;
+        if (token && token.expiresAt && token.expiresAt > Date.now()) {
+            return token.accessToken;
+        }
+        await this.retrieveToken();
+        return this.token?.accessToken ?? null;
+    }
+    async retrieveToken() {
+        if (this.tokenPromise) {
+            await this.tokenPromise;
+            return;
+        }
+        this.tokenPromise = this.doRetrieveToken();
+        try {
+            await this.tokenPromise;
+        }
+        finally {
+            this.tokenPromise = null;
+        }
+    }
+    async doRetrieveToken() {
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), 30000);
+        try {
+            const response = await fetch('/oauth/token', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ grant_type: 'client_credentials' }),
+                credentials: 'include',
+                signal: controller.signal,
+            });
+            clearTimeout(timeoutId);
+            if (!response.ok) {
+                const errorData = await response.json().catch(() => ({ message: response.statusText }));
+                throw new Error(errorData.message || response.statusText);
+            }
+            const data = await response.json();
+            this.setToken(data);
+        }
+        catch (error) {
+            console.error('Failed to retrieve token:', error);
+            this.clearToken();
+            throw error;
+        }
+    }
     startRefreshInterval() {
+        this.clearRefreshTimers();
+        if (!this.token)
+            return;
+        const tokenLifetime = this.token.expiresAt - Date.now();
+        const refreshThreshold = Math.round(tokenLifetime * REFRESH_THRESHOLD);
+        const timeUntilRefresh = refreshThreshold - (Math.random() * MAX_REFRESH_DELAY);
+        this.logTokenStatus('Starting refresh interval', {
+            tokenLifetime: `${Math.round(tokenLifetime / 1000)} seconds`,
+            refreshThreshold: `${Math.round(refreshThreshold / 1000)} seconds`,
+            timeUntilRefresh: `${Math.round(timeUntilRefresh / 1000)} seconds`,
+        });
+        this.scheduleRefresh(timeUntilRefresh);
+        this.refreshInterval = window.setInterval(() => {
+            if (!this.token)
+                return;
+            const timeUntilExpiry = this.token.expiresAt - Date.now();
+            if (timeUntilExpiry <= 0) {
+                this.logTokenStatus('Token expired');
+                this.clearToken();
+                void this.retrieveToken();
+                return;
+            }
+            const refreshThreshold = Math.round(timeUntilExpiry * REFRESH_THRESHOLD);
+            if (timeUntilExpiry <= refreshThreshold) {
+                this.logTokenStatus('Refreshing token', {
+                    timeUntilExpiry: `${Math.round(timeUntilExpiry / 1000)} seconds`,
+                    refreshThreshold: `${Math.round(refreshThreshold / 1000)} seconds`,
+                });
+                this.scheduleRefresh(refreshThreshold - (Math.random() * MAX_REFRESH_DELAY));
+            }
+        }, REFRESH_CHECK_INTERVAL);
+    }
+    scheduleRefresh(delay) {
+        if (this.refreshTimeout) {
+            window.clearTimeout(this.refreshTimeout);
+        }
+        this.refreshTimeout = window.setTimeout(() => {
+            const token = this.token;
+            if (token && token.expiresAt - Date.now() <= token.expiresAt * REFRESH_THRESHOLD) {
+                void this.retrieveToken();
+            }
+        }, delay);
+    }
+    clearRefreshTimers() {
         if (this.refreshInterval) {
             clearInterval(this.refreshInterval);
+            this.refreshInterval = null;
         }
-        if (this.token) {
-            const tokenLifetime = this.token.expiresAt - (this.token.expiresAt - 4 * 60 * 1000); // 4 minutes in milliseconds
-            const refreshTime = Math.round(tokenLifetime * REFRESH_THRESHOLD);
-            console.log('Setting up token refresh:', {
-                tokenLifetime: `${Math.round(tokenLifetime / 1000)} seconds`,
-                refreshIn: `${Math.round(refreshTime / 1000)} seconds`,
-                refreshAt: new Date(Date.now() + refreshTime).toISOString(),
-            });
-            this.refreshInterval = window.setInterval(() => {
-                this.clearToken();
-            }, refreshTime);
+        if (this.refreshTimeout) {
+            window.clearTimeout(this.refreshTimeout);
+            this.refreshTimeout = null;
         }
     }
+    logTokenStatus(message, additionalInfo = {}) {
+        if (!this.debug)
+            return;
+        const token = this.token;
+        if (!token)
+            return;
+        console.log(message, {
+            expiresIn: `${Math.round((token.expiresAt - Date.now()) / 1000)} seconds`,
+            expiresAt: new Date(token.expiresAt).toISOString(),
+            ...additionalInfo,
+        });
+    }
     setToken(tokenResponse) {
         const expiresAt = this.getExpirationFromToken(tokenResponse.accessToken);
         this.token = {
             accessToken: tokenResponse.accessToken,
             expiresAt,
         };
-        const expiresIn = Math.round((expiresAt - Date.now()) / 1000);
-        console.log('New access token obtained:', {
-            expiresIn: `${expiresIn} seconds`,
+        this.logTokenStatus('Token set', {
             expiresAt: new Date(expiresAt).toISOString(),
         });
         if (typeof window !== 'undefined') {
@@ -115,19 +215,9 @@ class TokenManager {
         }
         this.startRefreshInterval();
     }
-    getToken() {
-        if (this.token && this.token.expiresAt > Date.now()) {
-            return this.token.accessToken;
-        }
-        this.clearToken();
-        return null;
-    }
     clearToken() {
         this.token = null;
-        if (this.refreshInterval) {
-            clearInterval(this.refreshInterval);
-            this.refreshInterval = null;
-        }
+        this.clearRefreshTimers();
         if (typeof window !== 'undefined') {
             localStorage.removeItem(TOKEN_STORAGE_KEY);
         }

package/dist/cjs/types/index.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlexbeAuthType = void 0;
+var FlexbeAuthType;
+(function (FlexbeAuthType) {
+    FlexbeAuthType["API_KEY"] = "apiKey";
+    FlexbeAuthType["BEARER"] = "bearer";
+})(FlexbeAuthType || (exports.FlexbeAuthType = FlexbeAuthType = {}));

package/dist/esm/client/auth.js

@@ -1,103 +1,59 @@
+import { FlexbeAuthType } from '../types';
 import { TokenManager } from './token-manager';
 export class FlexbeAuth {
     constructor(config) {
         this.initialized = false;
-        this.initializing = false;
+        this.initializationPromise = null;
         this.config = config;
         this.tokenManager = TokenManager.getInstance();
-        if (this.config.authType === 'bearer') {
-            // Check if we have a valid token in storage
-            const existingToken = this.tokenManager.getToken();
-            if (existingToken) {
-                this.initialized = true;
-            }
-            // Don't start initialization here, let ensureInitialized handle it
+        if (this.config.authType === FlexbeAuthType.BEARER) {
+            // Start initialization but don't wait for it
+            this.initializationPromise = this.initialize();
         }
         else {
             this.initialized = true;
         }
     }
-    async initializeBearerAuth() {
-        if (this.initializing) {
-            // Wait for the ongoing initialization to complete
-            while (this.initializing) {
-                await new Promise(resolve => setTimeout(resolve, 100));
-            }
-            return;
-        }
+    async initialize() {
         try {
-            this.initializing = true;
-            const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
-            const response = await fetch('/oauth/token', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    grant_type: 'client_credentials',
-                }),
-                credentials: 'include',
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!response.ok) {
-                const defaultError = { message: response.statusText };
-                const errorData = await response.json().catch(() => defaultError);
-                const error = {
-                    message: errorData.message || response.statusText,
-                    code: errorData.code,
-                    status: response.status,
-                    details: errorData.details,
-                };
-                throw error;
-            }
-            const data = await response.json();
-            this.tokenManager.setToken(data);
-            this.initialized = true;
+            const token = await this.tokenManager.getToken();
+            this.initialized = !!token;
         }
         catch (error) {
-            console.error('Failed to initialize bearer authentication:', error);
-            this.initialized = false; // Reset initialized state on error
-            throw error;
+            console.error('Failed to initialize auth:', error);
+            this.initialized = false;
         }
         finally {
-            this.initializing = false;
+            this.initializationPromise = null;
         }
     }
     async ensureInitialized() {
-        if (this.config.authType !== 'bearer' || this.initialized) {
+        if (this.config.authType !== FlexbeAuthType.BEARER || this.initialized) {
+            return;
+        }
+        // If initialization is in progress, wait for it
+        if (this.initializationPromise) {
+            await this.initializationPromise;
             return;
         }
-        await this.initializeBearerAuth();
+        // If not initialized and no initialization in progress, start one
+        await this.initialize();
     }
     async getAuthHeaders() {
         await this.ensureInitialized();
         const headers = {
             'Content-Type': 'application/json',
         };
-        if (this.config.authType === 'apiKey') {
+        if (this.config.authType === FlexbeAuthType.API_KEY) {
             headers['x-api-key'] = this.config.apiKey;
         }
-        else if (this.config.authType === 'bearer') {
-            const token = this.tokenManager.getToken();
+        else if (this.config.authType === FlexbeAuthType.BEARER) {
+            const token = await this.tokenManager.getToken();
             if (!token) {
-                // If no token is available, try to initialize again
-                this.initialized = false;
-                await this.ensureInitialized();
-                const newToken = this.tokenManager.getToken();
-                if (!newToken) {
-                    throw new Error('No valid bearer token available');
-                }
-                headers['Authorization'] = `Bearer ${newToken}`;
-            }
-            else {
-                headers['Authorization'] = `Bearer ${token}`;
+                throw new Error('No valid bearer token available');
             }
+            headers['Authorization'] = `Bearer ${token}`;
         }
         return headers;
     }
-    isInitialized() {
-        return this.initialized;
-    }
 }

package/dist/esm/client/client.js

@@ -1,3 +1,4 @@
+import { FlexbeAuthType } from '../types';
 import { Pages } from './pages';
 import { ApiClient } from './api-client';
 export class FlexbeClient {
@@ -13,7 +14,7 @@ export class FlexbeClient {
             timeout: config?.timeout || 30000,
             apiKey: config?.apiKey || getEnvVar('FLEXBE_API_KEY') || '',
             siteId: config?.siteId || getEnvVar('FLEXBE_SITE_ID'),
-            authType: config?.authType || 'apiKey',
+            authType: config?.authType || FlexbeAuthType.API_KEY,
         };
         if (this.config.authType === 'apiKey' && !this.config.apiKey) {
             throw new Error('API key is required when using apiKey authentication. Please provide it either through config or FLEXBE_API_KEY environment variable.');