astro-tokenkit 1.0.24 → 1.0.26

package/dist/auth/manager.js

@@ -20,18 +20,39 @@ import { logger } from '../utils/logger';
 class SingleFlight {
     constructor() {
         this.inFlight = new Map();
+        this.recent = new Map();
+        this.GRACE_PERIOD = 5000; // 5 seconds grace period for race conditions
     }
     execute(key, fn) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 1. Check in-flight
             const existing = this.inFlight.get(key);
             if (existing)
                 return existing;
+            // 2. Check recent (grace period)
+            const cached = this.recent.get(key);
+            if (cached && (Date.now() - cached.time < this.GRACE_PERIOD)) {
+                return cached.bundle;
+            }
+            // 3. Execute new flight
             const promise = (() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    return yield fn();
+                    const bundle = yield fn();
+                    // Store in recent on success
+                    if (bundle) {
+                        this.recent.set(key, { bundle, time: Date.now() });
+                    }
+                    return bundle;
                 }
                 finally {
                     this.inFlight.delete(key);
+                    // Cleanup old entries
+                    const now = Date.now();
+                    for (const [k, v] of this.recent.entries()) {
+                        if (now - v.time > this.GRACE_PERIOD) {
+                            this.recent.delete(k);
+                        }
+                    }
                 }
             }))();
             this.inFlight.set(key, promise);
@@ -127,29 +148,32 @@ export class TokenManager {
      */
     refresh(ctx, refreshToken, options, headers) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.debug('[TokenKit] Starting token refresh', !!this.config.debug);
-            try {
-                const bundle = yield this.performRefresh(ctx, refreshToken, options, headers);
-                if (bundle) {
-                    if (this.config.onRefresh) {
-                        yield this.config.onRefresh(bundle, ctx);
+            const flightKey = this.createFlightKey(refreshToken);
+            return this.singleFlight.execute(flightKey, () => __awaiter(this, void 0, void 0, function* () {
+                logger.debug('[TokenKit] Starting token refresh', !!this.config.debug);
+                try {
+                    const bundle = yield this.performRefresh(ctx, refreshToken, options, headers);
+                    if (bundle) {
+                        if (this.config.onRefresh) {
+                            yield this.config.onRefresh(bundle, ctx);
+                        }
                     }
+                    else {
+                        logger.debug('[TokenKit] Token refresh returned no bundle (invalid or expired)', !!this.config.debug);
+                        if (this.config.onRefreshError) {
+                            yield this.config.onRefreshError(new AuthError('Refresh token invalid or expired', 401), ctx);
+                        }
+                    }
+                    return bundle;
                 }
-                else {
-                    logger.debug('[TokenKit] Token refresh returned no bundle (invalid or expired)', !!this.config.debug);
+                catch (error) {
+                    logger.debug(`[TokenKit] Token refresh failed: ${error.message}`, !!this.config.debug);
                     if (this.config.onRefreshError) {
-                        yield this.config.onRefreshError(new AuthError('Refresh token invalid or expired', 401), ctx);
+                        yield this.config.onRefreshError(error, ctx);
                     }
+                    throw error;
                 }
-                return bundle;
-            }
-            catch (error) {
-                logger.debug(`[TokenKit] Token refresh failed: ${error.message}`, !!this.config.debug);
-                if (this.config.onRefreshError) {
-                    yield this.config.onRefreshError(error, ctx);
-                }
-                throw error;
-            }
+            }));
         });
     }
     /**
@@ -189,8 +213,8 @@ export class TokenManager {
                 clearTimeout(timeoutId);
             }
             if (!response.ok) {
-                // 401/403 = invalid refresh token
-                if (response.status === 401 || response.status === 403) {
+                // 400 (Bad Request), 401 (Unauthorized) or 403 (Forbidden) = invalid refresh token
+                if (response.status === 400 || response.status === 401 || response.status === 403) {
                     clearTokens(ctx, this.config.cookies);
                     return null;
                 }
@@ -233,8 +257,7 @@ export class TokenManager {
             const expired = isExpired(tokens.expiresAt, now, this.config.policy);
             if (force || expired) {
                 logger.debug(`[TokenKit] Token ${force ? 'force refresh' : 'expired'}, refreshing...`, !!this.config.debug);
-                const flightKey = this.createFlightKey(tokens.refreshToken);
-                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
+                const bundle = yield this.refresh(ctx, tokens.refreshToken, options, headers);
                 if (!bundle) {
                     logger.debug('[TokenKit] Refresh returned no bundle, session lost', !!this.config.debug);
                     return null;
@@ -251,9 +274,8 @@ export class TokenManager {
             // Proactive refresh
             if (shouldRefresh(tokens.expiresAt, now, tokens.lastRefreshAt, this.config.policy)) {
                 logger.debug('[TokenKit] Token near expiration, performing proactive refresh', !!this.config.debug);
-                const flightKey = this.createFlightKey(tokens.refreshToken);
                 try {
-                    const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
+                    const bundle = yield this.refresh(ctx, tokens.refreshToken, options, headers);
                     if (bundle) {
                         logger.debug('[TokenKit] Proactive refresh successful', !!this.config.debug);
                         // Ensure tokens are stored in the current context (in case of shared flight)

package/dist/client/idle-manager.d.ts

@@ -26,5 +26,6 @@ export declare class IdleManager {
     private updateExpiredTimeLocal;
     private handleTimeout;
     private triggerIdle;
+    private isExcluded;
     cleanup(): void;
 }

package/dist/client/idle-manager.js

@@ -52,6 +52,9 @@ export class IdleManager {
     start() {
         if (typeof window === 'undefined')
             return;
+        if (this.isExcluded()) {
+            return;
+        }
         this.updateExpiredTimeLocal();
         this.setupEventListeners();
         this.loop();
@@ -129,6 +132,10 @@ export class IdleManager {
     triggerIdle() {
         if (this.isIdle)
             return;
+        if (this.isExcluded()) {
+            this.updateExpiredTimeLocal();
+            return;
+        }
         this.isIdle = true;
         if (typeof window !== 'undefined') {
             window.dispatchEvent(new CustomEvent('tk:idle', { detail: this.config }));
@@ -136,6 +143,15 @@ export class IdleManager {
         this.cleanup();
         this.onIdle();
     }
+    isExcluded() {
+        if (this.config.excludePaths && this.config.excludePaths.length > 0) {
+            if (typeof window !== 'undefined') {
+                const currentPath = window.location.pathname;
+                return this.config.excludePaths.some(path => currentPath.startsWith(path));
+            }
+        }
+        return false;
+    }
     cleanup() {
         if (this.rafId) {
             cancelAnimationFrame(this.rafId);

package/dist/index.cjs

@@ -533,18 +533,39 @@ const logger = {
 class SingleFlight {
     constructor() {
         this.inFlight = new Map();
+        this.recent = new Map();
+        this.GRACE_PERIOD = 5000; // 5 seconds grace period for race conditions
     }
     execute(key, fn) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 1. Check in-flight
             const existing = this.inFlight.get(key);
             if (existing)
                 return existing;
+            // 2. Check recent (grace period)
+            const cached = this.recent.get(key);
+            if (cached && (Date.now() - cached.time < this.GRACE_PERIOD)) {
+                return cached.bundle;
+            }
+            // 3. Execute new flight
             const promise = (() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    return yield fn();
+                    const bundle = yield fn();
+                    // Store in recent on success
+                    if (bundle) {
+                        this.recent.set(key, { bundle, time: Date.now() });
+                    }
+                    return bundle;
                 }
                 finally {
                     this.inFlight.delete(key);
+                    // Cleanup old entries
+                    const now = Date.now();
+                    for (const [k, v] of this.recent.entries()) {
+                        if (now - v.time > this.GRACE_PERIOD) {
+                            this.recent.delete(k);
+                        }
+                    }
                 }
             }))();
             this.inFlight.set(key, promise);
@@ -640,29 +661,32 @@ class TokenManager {
      */
     refresh(ctx, refreshToken, options, headers) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.debug('[TokenKit] Starting token refresh', !!this.config.debug);
-            try {
-                const bundle = yield this.performRefresh(ctx, refreshToken, options, headers);
-                if (bundle) {
-                    if (this.config.onRefresh) {
-                        yield this.config.onRefresh(bundle, ctx);
+            const flightKey = this.createFlightKey(refreshToken);
+            return this.singleFlight.execute(flightKey, () => __awaiter(this, void 0, void 0, function* () {
+                logger.debug('[TokenKit] Starting token refresh', !!this.config.debug);
+                try {
+                    const bundle = yield this.performRefresh(ctx, refreshToken, options, headers);
+                    if (bundle) {
+                        if (this.config.onRefresh) {
+                            yield this.config.onRefresh(bundle, ctx);
+                        }
                     }
+                    else {
+                        logger.debug('[TokenKit] Token refresh returned no bundle (invalid or expired)', !!this.config.debug);
+                        if (this.config.onRefreshError) {
+                            yield this.config.onRefreshError(new AuthError('Refresh token invalid or expired', 401), ctx);
+                        }
+                    }
+                    return bundle;
                 }
-                else {
-                    logger.debug('[TokenKit] Token refresh returned no bundle (invalid or expired)', !!this.config.debug);
+                catch (error) {
+                    logger.debug(`[TokenKit] Token refresh failed: ${error.message}`, !!this.config.debug);
                     if (this.config.onRefreshError) {
-                        yield this.config.onRefreshError(new AuthError('Refresh token invalid or expired', 401), ctx);
+                        yield this.config.onRefreshError(error, ctx);
                     }
+                    throw error;
                 }
-                return bundle;
-            }
-            catch (error) {
-                logger.debug(`[TokenKit] Token refresh failed: ${error.message}`, !!this.config.debug);
-                if (this.config.onRefreshError) {
-                    yield this.config.onRefreshError(error, ctx);
-                }
-                throw error;
-            }
+            }));
         });
     }
     /**
@@ -702,8 +726,8 @@ class TokenManager {
                 clearTimeout(timeoutId);
             }
             if (!response.ok) {
-                // 401/403 = invalid refresh token
-                if (response.status === 401 || response.status === 403) {
+                // 400 (Bad Request), 401 (Unauthorized) or 403 (Forbidden) = invalid refresh token
+                if (response.status === 400 || response.status === 401 || response.status === 403) {
                     clearTokens(ctx, this.config.cookies);
                     return null;
                 }
@@ -746,8 +770,7 @@ class TokenManager {
             const expired = isExpired(tokens.expiresAt, now, this.config.policy);
             if (force || expired) {
                 logger.debug(`[TokenKit] Token ${force ? 'force refresh' : 'expired'}, refreshing...`, !!this.config.debug);
-                const flightKey = this.createFlightKey(tokens.refreshToken);
-                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
+                const bundle = yield this.refresh(ctx, tokens.refreshToken, options, headers);
                 if (!bundle) {
                     logger.debug('[TokenKit] Refresh returned no bundle, session lost', !!this.config.debug);
                     return null;
@@ -764,9 +787,8 @@ class TokenManager {
             // Proactive refresh
             if (shouldRefresh(tokens.expiresAt, now, tokens.lastRefreshAt, this.config.policy)) {
                 logger.debug('[TokenKit] Token near expiration, performing proactive refresh', !!this.config.debug);
-                const flightKey = this.createFlightKey(tokens.refreshToken);
                 try {
-                    const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
+                    const bundle = yield this.refresh(ctx, tokens.refreshToken, options, headers);
                     if (bundle) {
                         logger.debug('[TokenKit] Proactive refresh successful', !!this.config.debug);
                         // Ensure tokens are stored in the current context (in case of shared flight)