@kawaiininja/fetch 1.0.60 → 1.1.0

package/dist/hooks/useCsrf.js

@@ -7,8 +7,9 @@ const getFromStorage = (debug) => {
     if (typeof window === "undefined")
         return null;
     const stored = localStorage.getItem("csrf_token");
-    if (stored && debug)
-        console.log("[useCsrf] Retrieved from localStorage.");
+    if (stored && debug) {
+        console.log("%c[useCsrf] 💾 SUCCESS: Found token in localStorage", "color: #add8e6");
+    }
     return stored || null;
 };
 const saveToStorage = (token) => {
@@ -18,7 +19,7 @@ const saveToStorage = (token) => {
 };
 const fetchFromNetwork = async (apiUrl, debug) => {
     if (debug)
-        console.log("[useCsrf] Fetching new CSRF token from server...");
+        console.log("%c[useCsrf] 🌍 NETWORK: Requesting fresh token from server...", "color: #ffa500");
     const csrfUrl = apiUrl("auth/csrf-token");
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), 15000);
@@ -29,17 +30,26 @@ const fetchFromNetwork = async (apiUrl, debug) => {
             credentials: "include",
             signal: controller.signal,
         });
-        if (!res.ok)
-            throw new Error(`CSRF HTTP Error: ${res.status}`);
+        if (!res.ok) {
+            const errText = `CSRF HTTP Error: ${res.status}`;
+            if (debug)
+                console.error(`%c[useCsrf] ❌ NETWORK FAIL: ${errText}`, "color: #ff0000");
+            throw new Error(errText);
+        }
         const json = await res.json();
         const token = json?.csrfToken;
-        if (!token)
+        if (!token) {
+            if (debug)
+                console.error("%c[useCsrf] ❌ RESPONSE FAIL: No token in JSON", "color: #ff0000");
             throw new Error("Missing CSRF token in response");
+        }
+        if (debug)
+            console.log("%c[useCsrf] ✅ NETWORK SUCCESS: Received new token", "color: #00ff00");
         return token;
     }
     catch (error) {
         if (debug)
-            console.error("[useCsrf] Network Error:", error);
+            console.error("%c[useCsrf] ❌ FATAL ERROR:", "color: #ff0000", error);
         throw error;
     }
     finally {
@@ -55,8 +65,9 @@ export function useCsrf() {
         if (isNative() || disableCsrf)
             return;
         if (debug)
-            console.log("[useCsrf] Clearing CSRF token...");
+            console.log("%c[useCsrf] 🧹 CLEARING: Token and promises wiped.", "color: #ff69b4");
         csrfRef.current = null;
+        csrfPromiseRef.current = null;
         if (typeof window !== "undefined")
             localStorage.removeItem("csrf_token");
     }, [debug, disableCsrf]);
@@ -64,16 +75,31 @@ export function useCsrf() {
         const { force = false } = options || {};
         if (isNative() || disableCsrf) {
             if (debug)
-                console.log(`[useCsrf] Skipped (Platform/Config)`);
+                console.log("[useCsrf] ⏭️ Skipped (Native or Disabled)");
             return "";
         }
-        // 1. Memory Cache
-        if (!force && csrfRef.current)
-            return csrfRef.current;
-        if (!force && csrfPromiseRef.current)
-            return csrfPromiseRef.current;
+        if (debug) {
+            console.log(`%c[useCsrf] 🔍 FETCH: Force=${force} | HasMemory=${!!csrfRef.current} | HasPromise=${!!csrfPromiseRef.current}`, "font-weight: bold; color: #888");
+        }
+        // 1. Return Memory/Pending (ONLY IF NOT FORCED)
+        if (!force) {
+            if (csrfRef.current) {
+                if (debug)
+                    console.log("%c[useCsrf] 🧠 CACHE: Using Memory Token", "color: #add8e6");
+                return csrfRef.current;
+            }
+            if (csrfPromiseRef.current) {
+                if (debug)
+                    console.log("%c[useCsrf] ⏳ PENDING: Joining existing fetch...", "color: #add8e6");
+                return csrfPromiseRef.current;
+            }
+        }
+        else {
+            if (debug)
+                console.log("%c[useCsrf] 🚀 FORCED: Bypassing ALL caches", "font-weight: bold; color: #ffa500");
+        }
         const task = async () => {
-            // 2. Storage Cache
+            // 2. Check Storage (ONLY IF NOT FORCED)
             if (!force) {
                 const stored = getFromStorage(debug);
                 if (stored) {
@@ -88,7 +114,7 @@ export function useCsrf() {
             return newToken;
         };
         const promise = task();
-        // Cleanup ref on completion
+        // Reset promise ref once done so next call starts fresh or uses memory
         const chained = promise.finally(() => {
             if (csrfPromiseRef.current === chained) {
                 csrfPromiseRef.current = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kawaiininja/fetch",
-    "version": "1.0.60",
+    "version": "1.1.0",
     "description": "Core fetch utility for Onyx Framework",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",