astro-tokenkit 1.0.20 → 1.0.21

package/dist/integration.js

@@ -64,7 +64,7 @@ export function tokenKit(config) {
                 }
                 // Always inject the client-side script for idle monitoring
                 injectScript('page', `import 'astro-tokenkit/client-init';`);
-                logger.debug('[TokenKit] Integration initialized');
+                logger.debug('[TokenKit] Integration initialized', !!config.debug);
             },
         },
     };

package/dist/middleware.cjs

@@ -412,13 +412,13 @@ function safeFetch(url, init, config) {
  * Logger utility that respects the debug flag in the configuration
  */
 const logger = {
-    debug: (message, ...args) => {
-        if (getConfig().debug) {
+    debug: (message, force, ...args) => {
+        if (force || getConfig().debug) {
             console.debug(message, ...args);
         }
     },
-    info: (message, ...args) => {
-        if (getConfig().debug) {
+    info: (message, force, ...args) => {
+        if (force || getConfig().debug) {
             console.log(message, ...args);
         }
     },
@@ -544,11 +544,27 @@ 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 {
-                return yield this.performRefresh(ctx, refreshToken, options, headers);
+                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;
             }
             catch (error) {
-                clearTokens(ctx, this.config.cookies);
+                logger.debug(`[TokenKit] Token refresh failed: ${error.message}`, !!this.config.debug);
+                if (this.config.onRefreshError) {
+                    yield this.config.onRefreshError(error, ctx);
+                }
                 throw error;
             }
         });
@@ -627,14 +643,19 @@ class TokenManager {
             const tokens = retrieveTokens(ctx, this.config.cookies);
             // No tokens
             if (!tokens.accessToken || !tokens.refreshToken || !tokens.expiresAt) {
+                logger.debug('[TokenKit] No valid session found, refresh impossible', !!this.config.debug);
                 return null;
             }
             // Token expired or force refresh
-            if (force || isExpired(tokens.expiresAt, now, this.config.policy)) {
+            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));
-                if (!bundle)
+                if (!bundle) {
+                    logger.debug('[TokenKit] Refresh returned no bundle, session lost', !!this.config.debug);
                     return null;
+                }
                 // Ensure tokens are stored in the current context (in case of shared flight)
                 storeTokens(ctx, bundle, this.config.cookies);
                 return {
@@ -646,19 +667,26 @@ 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);
-                const bundle = yield this.singleFlight.execute(flightKey, () => this.refresh(ctx, tokens.refreshToken, options, headers));
-                if (bundle) {
-                    // Ensure tokens are stored in the current context (in case of shared flight)
-                    storeTokens(ctx, bundle, this.config.cookies);
-                    return {
-                        accessToken: bundle.accessToken,
-                        expiresAt: bundle.accessExpiresAt,
-                        tokenType: bundle.tokenType,
-                        payload: (_d = (_c = bundle.sessionPayload) !== null && _c !== void 0 ? _c : parseJWTPayload(bundle.accessToken)) !== null && _d !== void 0 ? _d : undefined,
-                    };
+                try {
+                    const bundle = yield this.singleFlight.execute(flightKey, () => 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)
+                        storeTokens(ctx, bundle, this.config.cookies);
+                        return {
+                            accessToken: bundle.accessToken,
+                            expiresAt: bundle.accessExpiresAt,
+                            tokenType: bundle.tokenType,
+                            payload: (_d = (_c = bundle.sessionPayload) !== null && _c !== void 0 ? _c : parseJWTPayload(bundle.accessToken)) !== null && _d !== void 0 ? _d : undefined,
+                        };
+                    }
+                }
+                catch (error) {
+                    logger.debug(`[TokenKit] Proactive refresh failed: ${error.message}. Continuing with current token.`, !!this.config.debug);
                 }
-                // Refresh failed, check if tokens still exist
+                // Refresh failed or returned no bundle, check if tokens still exist
                 const currentTokens = retrieveTokens(ctx, this.config.cookies);
                 if (!currentTokens.accessToken) {
                     return null;
@@ -700,7 +728,7 @@ class TokenManager {
                 }
                 catch (error) {
                     // Ignore logout endpoint errors
-                    logger.debug('[TokenKit] Logout endpoint failed:', error);
+                    logger.debug('[TokenKit] Logout endpoint failed:', !!this.config.debug, error);
                 }
                 finally {
                     clearTimeout(timeoutId);
@@ -848,7 +876,7 @@ function createMiddleware() {
             else if (config.context) {
                 contextStrategy = 'custom (external AsyncLocalStorage)';
             }
-            logger.debug(`[TokenKit] Middleware initialized (auth: ${authStatus}, context: ${contextStrategy})`);
+            logger.debug(`[TokenKit] Middleware initialized (auth: ${authStatus}, context: ${contextStrategy})`, !!config.debug);
             globalStorage[LOGGED_KEY] = true;
         }
         const runLogic = () => __awaiter(this, void 0, void 0, function* () {
@@ -860,7 +888,7 @@ function createMiddleware() {
                 }
                 catch (error) {
                     // Log only the message to avoid leaking sensitive data in the error object
-                    logger.debug('[TokenKit] Automatic token rotation failed:', error.message || error);
+                    logger.debug('[TokenKit] Automatic token rotation failed:', !!config.debug, error.message || error);
                 }
             }
             return next();