wip

Author: jacekradko

packages/clerk-js/src/core/fapiClient.ts

@@ -3,6 +3,8 @@ import { retry } from '@clerk/shared/retry';
 import { camelToSnake } from '@clerk/shared/underscore';
 import type { ClerkAPIErrorJSON, ClientJSON, InstanceType } from '@clerk/types';
 
+import { debugLogger } from '@/utils/debug';
+
 import { buildEmailAddress as buildEmailAddressUtil, buildURL as buildUrlUtil, stringifyQueryParams } from '../utils';
 import { SUPPORTED_FAPI_VERSION } from './constants';
 import { clerkNetworkError } from './errors';
@@ -250,12 +252,16 @@ export function createFapiClient(options: FapiClientOptions): FapiClient {
         response = new Response('{}', requestInit); // Mock an empty json response
       }
     } catch (e) {
+      debugLogger.error('network error', { error: e, url: urlStr, method }, 'fapiClient');
       clerkNetworkError(urlStr, e);
     }
 
     // 204 No Content responses do not have a body so we should not try to parse it
     const json: FapiResponseJSON<T> | null = response.status !== 204 ? await response.json() : null;
     const fapiResponse: FapiResponse<T> = Object.assign(response, { payload: json });
+    if (!response.ok) {
+      debugLogger.error('request failed', { method, path: requestInit.path, status: response.status }, 'fapiClient');
+    }
     await runAfterResponseCallbacks(requestInit, fapiResponse);
     return fapiResponse;
   }

packages/clerk-js/src/utils/debug.ts

@@ -25,6 +25,57 @@ let isEnabled = false;
 let realLogger: DebugLoggerInterface | null = null;
 let lastOptions: Omit<InitOptions, 'enabled'> | null = null;
 
+type BufferedLogEntry = {
+  level: DebugLogLevel;
+  message: string;
+  context?: Record<string, unknown>;
+  source?: string;
+  ts: number;
+};
+
+const MAX_BUFFERED_LOGS = 200;
+const preInitBuffer: BufferedLogEntry[] = [];
+
+function pushBuffered(level: DebugLogLevel, message: string, context?: Record<string, unknown>, source?: string): void {
+  preInitBuffer.push({ level, message, context, source, ts: Date.now() });
+  if (preInitBuffer.length > MAX_BUFFERED_LOGS) {
+    preInitBuffer.shift();
+  }
+}
+
+function flushBuffered(): void {
+  if (!realLogger || preInitBuffer.length === 0) {
+    return;
+  }
+  for (const entry of preInitBuffer) {
+    const mergedContext = {
+      ...(entry.context || {}),
+      __preInit: true,
+      __preInitTs: entry.ts,
+    } as Record<string, unknown>;
+    switch (entry.level) {
+      case 'error':
+        realLogger.error(entry.message, mergedContext, entry.source);
+        break;
+      case 'warn':
+        realLogger.warn(entry.message, mergedContext, entry.source);
+        break;
+      case 'info':
+        realLogger.info(entry.message, mergedContext, entry.source);
+        break;
+      case 'debug':
+        realLogger.debug(entry.message, mergedContext, entry.source);
+        break;
+      case 'trace':
+        realLogger.trace(entry.message, mergedContext, entry.source);
+        break;
+      default:
+        break;
+    }
+  }
+  preInitBuffer.length = 0;
+}
+
 async function ensureInitialized(): Promise<void> {
   try {
     if (!isEnabled || realLogger) {
@@ -40,6 +91,7 @@ async function ensureInitialized(): Promise<void> {
 
     if (logger) {
       realLogger = logger;
+      flushBuffered();
     }
   } catch (error) {
     const message = 'Debug logger initialization failed';
@@ -113,6 +165,7 @@ export function initDebugLogger(options: InitOptions = {}): void {
         });
         if (logger) {
           realLogger = logger;
+          flushBuffered();
         }
       } catch (error) {
         try {
@@ -145,30 +198,35 @@ export function initDebugLogger(options: InitOptions = {}): void {
 const baseDebugLogger: DebugLoggerInterface = {
   debug(message: string, context?: Record<string, unknown>, source?: string): void {
     if (!realLogger) {
+      pushBuffered('debug', message, context, source);
       return;
     }
     realLogger.debug(message, context, source);
   },
   error(message: string, context?: Record<string, unknown>, source?: string): void {
     if (!realLogger) {
+      pushBuffered('error', message, context, source);
       return;
     }
     realLogger.error(message, context, source);
   },
   info(message: string, context?: Record<string, unknown>, source?: string): void {
     if (!realLogger) {
+      pushBuffered('info', message, context, source);
       return;
     }
     realLogger.info(message, context, source);
   },
   trace(message: string, context?: Record<string, unknown>, source?: string): void {
     if (!realLogger) {
+      pushBuffered('trace', message, context, source);
       return;
     }
     realLogger.trace(message, context, source);
   },
   warn(message: string, context?: Record<string, unknown>, source?: string): void {
     if (!realLogger) {
+      pushBuffered('warn', message, context, source);
       return;
     }
     realLogger.warn(message, context, source);