@dream-api/sdk 0.1.31 → 0.1.33

package/dist/index.js

@@ -194,6 +194,7 @@ var JWT_TEMPLATE = "end-user-api";
 function getClerk() {
   return window.Clerk;
 }
+var STORAGE_KEY = "dream_api_jwt";
 var ClerkManager = class {
   constructor(mode, onTokenChange) {
     this.loaded = false;
@@ -202,25 +203,57 @@ var ClerkManager = class {
     this.onTokenChange = onTokenChange;
   }
   /**
-   * Load Clerk SDK (call once on page load)
+   * Load auth (call once on page load)
+   * Uses JWT from URL or localStorage - no Clerk needed on dev's domain
    */
   async load() {
     if (this.loaded || typeof window === "undefined") return;
     const urlParams = new URLSearchParams(window.location.search);
     const jwt = urlParams.get("__clerk_jwt");
     if (jwt) {
-      console.log("[DreamAPI] JWT received from sign-up worker");
-      this.token = jwt;
-      this.onTokenChange?.(jwt);
+      console.log("[DreamAPI] JWT received from auth worker");
+      this.setToken(jwt);
       urlParams.delete("__clerk_jwt");
       const newUrl = urlParams.toString() ? `${window.location.pathname}?${urlParams}` : window.location.pathname;
       window.history.replaceState({}, "", newUrl);
       this.loaded = true;
       return;
     }
+    const storedJwt = localStorage.getItem(STORAGE_KEY);
+    if (storedJwt) {
+      try {
+        const payload = JSON.parse(atob(storedJwt.split(".")[1].replace(/-/g, "+").replace(/_/g, "/")));
+        const now = Math.floor(Date.now() / 1e3);
+        if (payload.exp && payload.exp > now) {
+          console.log("[DreamAPI] Valid JWT from localStorage");
+          this.token = storedJwt;
+          this.onTokenChange?.(storedJwt);
+          this.loaded = true;
+          return;
+        } else {
+          console.log("[DreamAPI] Stored JWT expired, clearing");
+          localStorage.removeItem(STORAGE_KEY);
+        }
+      } catch (e) {
+        console.log("[DreamAPI] Invalid stored JWT, clearing");
+        localStorage.removeItem(STORAGE_KEY);
+      }
+    }
+    if (this.mode === "test") {
+      try {
+        await this.loadClerkSDK();
+      } catch (e) {
+        console.log("[DreamAPI] Clerk load failed (expected in some environments)");
+      }
+    }
+    this.loaded = true;
+  }
+  /**
+   * Load Clerk SDK (test mode only, for better DX on localhost)
+   */
+  async loadClerkSDK() {
     const existingClerk = getClerk();
     if (existingClerk) {
-      this.loaded = true;
       await this.checkSession();
       return;
     }
@@ -242,55 +275,16 @@ var ClerkManager = class {
     }
     if (clerk) {
       await clerk.load();
-      const urlParams2 = new URLSearchParams(window.location.search);
-      const ticket = urlParams2.get("__clerk_ticket");
-      console.log("[DreamAPI] URL:", window.location.href);
-      console.log("[DreamAPI] Ticket present:", ticket ? "YES" : "NO");
-      const sdkDebug = {
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        url: window.location.href,
-        hasTicket: !!ticket,
-        ticketLength: ticket ? ticket.length : 0,
-        signupDebug: localStorage.getItem("dream_signup_debug"),
-        signupRedirect: localStorage.getItem("dream_signup_redirect")
-      };
-      localStorage.setItem("dream_sdk_debug", JSON.stringify(sdkDebug));
-      if (ticket) {
-        for (let i = 0; i < 50; i++) {
-          const hasSignIn = clerk.signIn || clerk.client?.signIn;
-          if (hasSignIn && clerk.setActive) break;
-          await new Promise((r) => setTimeout(r, 100));
-        }
-        console.log("[DreamAPI] signIn available:", !!clerk.signIn, "client.signIn:", !!clerk.client?.signIn, "setActive:", !!clerk.setActive);
-      }
-      const signInObj = clerk.signIn || clerk.client?.signIn;
-      if (ticket && signInObj && clerk.setActive) {
-        console.log("[DreamAPI] Consuming ticket...");
-        try {
-          const result = await signInObj.create({ strategy: "ticket", ticket });
-          console.log("[DreamAPI] Ticket result:", result.status, result.createdSessionId);
-          if (result.status === "complete" && result.createdSessionId) {
-            await clerk.setActive({ session: result.createdSessionId });
-            console.log("[DreamAPI] Session activated!");
-            for (let i = 0; i < 20; i++) {
-              await new Promise((r) => setTimeout(r, 100));
-              if (clerk.user && clerk.session) break;
-            }
-            console.log("[DreamAPI] User hydrated:", !!clerk.user);
-            urlParams2.delete("__clerk_ticket");
-            const newUrl = urlParams2.toString() ? `${window.location.pathname}?${urlParams2}` : window.location.pathname;
-            window.history.replaceState({}, "", newUrl);
-          }
-        } catch (err) {
-          console.error("[DreamAPI] Ticket error:", err?.message, err);
-        }
-      } else if (ticket) {
-        console.error("[DreamAPI] FAILED to get signIn object! Ticket NOT consumed.");
-        console.log("[DreamAPI] clerk keys:", Object.keys(clerk));
-      }
+      await this.checkSession();
     }
-    this.loaded = true;
-    await this.checkSession();
+  }
+  /**
+   * Store JWT in memory and localStorage
+   */
+  setToken(jwt) {
+    this.token = jwt;
+    localStorage.setItem(STORAGE_KEY, jwt);
+    this.onTokenChange?.(jwt);
   }
   /**
    * Check if returning from auth and grab token
@@ -319,6 +313,17 @@ var ClerkManager = class {
    * Get current user info
    */
   getUser() {
+    const clerk = getClerk();
+    if (clerk?.user) {
+      const user = clerk.user;
+      const metadata = user.publicMetadata || {};
+      return {
+        id: user.id,
+        email: user.primaryEmailAddress?.emailAddress || "",
+        plan: metadata.plan || "free",
+        publishableKey: metadata.publishableKey || ""
+      };
+    }
     if (this.token) {
       try {
         const parts = this.token.split(".");
@@ -335,16 +340,7 @@ var ClerkManager = class {
         console.error("[DreamAPI] Failed to decode JWT:", e);
       }
     }
-    const clerk = getClerk();
-    if (!clerk?.user) return null;
-    const user = clerk.user;
-    const metadata = user.publicMetadata || {};
-    return {
-      id: user.id,
-      email: user.primaryEmailAddress?.emailAddress || "",
-      plan: metadata.plan || "free",
-      publishableKey: metadata.publishableKey || ""
-    };
+    return null;
   }
   /**
    * Get current token
@@ -353,33 +349,40 @@ var ClerkManager = class {
     return this.token;
   }
   /**
-   * Refresh token and user data from Clerk server
-   * Call after plan changes (checkout success) to get updated metadata
+   * Refresh token and user data
+   * In test mode: refreshes from Clerk session
+   * In live mode: returns current token (re-auth needed for fresh data)
    */
   async refreshToken() {
     const clerk = getClerk();
-    if (!clerk?.session) return null;
-    try {
-      if (clerk.user?.reload) {
-        await clerk.user.reload();
+    if (clerk?.session) {
+      try {
+        if (clerk.user?.reload) {
+          await clerk.user.reload();
+        }
+        this.token = await clerk.session.getToken({ template: JWT_TEMPLATE });
+        this.setToken(this.token);
+        return this.token;
+      } catch (err) {
+        console.error("Failed to refresh token from Clerk:", err);
       }
-      this.token = await clerk.session.getToken({ template: JWT_TEMPLATE });
-      this.onTokenChange?.(this.token);
-      return this.token;
-    } catch (err) {
-      console.error("Failed to refresh token:", err);
-      return null;
     }
+    return this.token;
   }
   /**
    * Sign out
    */
   async signOut() {
-    const clerk = getClerk();
-    if (!clerk) return;
-    await clerk.signOut();
+    localStorage.removeItem(STORAGE_KEY);
     this.token = null;
     this.onTokenChange?.(null);
+    const clerk = getClerk();
+    if (clerk) {
+      try {
+        await clerk.signOut();
+      } catch (e) {
+      }
+    }
   }
   /**
    * Check if we're returning from auth (has clerk params/cookies)

package/dist/index.mjs

@@ -166,6 +166,7 @@ var JWT_TEMPLATE = "end-user-api";
 function getClerk() {
   return window.Clerk;
 }
+var STORAGE_KEY = "dream_api_jwt";
 var ClerkManager = class {
   constructor(mode, onTokenChange) {
     this.loaded = false;
@@ -174,25 +175,57 @@ var ClerkManager = class {
     this.onTokenChange = onTokenChange;
   }
   /**
-   * Load Clerk SDK (call once on page load)
+   * Load auth (call once on page load)
+   * Uses JWT from URL or localStorage - no Clerk needed on dev's domain
    */
   async load() {
     if (this.loaded || typeof window === "undefined") return;
     const urlParams = new URLSearchParams(window.location.search);
     const jwt = urlParams.get("__clerk_jwt");
     if (jwt) {
-      console.log("[DreamAPI] JWT received from sign-up worker");
-      this.token = jwt;
-      this.onTokenChange?.(jwt);
+      console.log("[DreamAPI] JWT received from auth worker");
+      this.setToken(jwt);
       urlParams.delete("__clerk_jwt");
       const newUrl = urlParams.toString() ? `${window.location.pathname}?${urlParams}` : window.location.pathname;
       window.history.replaceState({}, "", newUrl);
       this.loaded = true;
       return;
     }
+    const storedJwt = localStorage.getItem(STORAGE_KEY);
+    if (storedJwt) {
+      try {
+        const payload = JSON.parse(atob(storedJwt.split(".")[1].replace(/-/g, "+").replace(/_/g, "/")));
+        const now = Math.floor(Date.now() / 1e3);
+        if (payload.exp && payload.exp > now) {
+          console.log("[DreamAPI] Valid JWT from localStorage");
+          this.token = storedJwt;
+          this.onTokenChange?.(storedJwt);
+          this.loaded = true;
+          return;
+        } else {
+          console.log("[DreamAPI] Stored JWT expired, clearing");
+          localStorage.removeItem(STORAGE_KEY);
+        }
+      } catch (e) {
+        console.log("[DreamAPI] Invalid stored JWT, clearing");
+        localStorage.removeItem(STORAGE_KEY);
+      }
+    }
+    if (this.mode === "test") {
+      try {
+        await this.loadClerkSDK();
+      } catch (e) {
+        console.log("[DreamAPI] Clerk load failed (expected in some environments)");
+      }
+    }
+    this.loaded = true;
+  }
+  /**
+   * Load Clerk SDK (test mode only, for better DX on localhost)
+   */
+  async loadClerkSDK() {
     const existingClerk = getClerk();
     if (existingClerk) {
-      this.loaded = true;
       await this.checkSession();
       return;
     }
@@ -214,55 +247,16 @@ var ClerkManager = class {
     }
     if (clerk) {
       await clerk.load();
-      const urlParams2 = new URLSearchParams(window.location.search);
-      const ticket = urlParams2.get("__clerk_ticket");
-      console.log("[DreamAPI] URL:", window.location.href);
-      console.log("[DreamAPI] Ticket present:", ticket ? "YES" : "NO");
-      const sdkDebug = {
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        url: window.location.href,
-        hasTicket: !!ticket,
-        ticketLength: ticket ? ticket.length : 0,
-        signupDebug: localStorage.getItem("dream_signup_debug"),
-        signupRedirect: localStorage.getItem("dream_signup_redirect")
-      };
-      localStorage.setItem("dream_sdk_debug", JSON.stringify(sdkDebug));
-      if (ticket) {
-        for (let i = 0; i < 50; i++) {
-          const hasSignIn = clerk.signIn || clerk.client?.signIn;
-          if (hasSignIn && clerk.setActive) break;
-          await new Promise((r) => setTimeout(r, 100));
-        }
-        console.log("[DreamAPI] signIn available:", !!clerk.signIn, "client.signIn:", !!clerk.client?.signIn, "setActive:", !!clerk.setActive);
-      }
-      const signInObj = clerk.signIn || clerk.client?.signIn;
-      if (ticket && signInObj && clerk.setActive) {
-        console.log("[DreamAPI] Consuming ticket...");
-        try {
-          const result = await signInObj.create({ strategy: "ticket", ticket });
-          console.log("[DreamAPI] Ticket result:", result.status, result.createdSessionId);
-          if (result.status === "complete" && result.createdSessionId) {
-            await clerk.setActive({ session: result.createdSessionId });
-            console.log("[DreamAPI] Session activated!");
-            for (let i = 0; i < 20; i++) {
-              await new Promise((r) => setTimeout(r, 100));
-              if (clerk.user && clerk.session) break;
-            }
-            console.log("[DreamAPI] User hydrated:", !!clerk.user);
-            urlParams2.delete("__clerk_ticket");
-            const newUrl = urlParams2.toString() ? `${window.location.pathname}?${urlParams2}` : window.location.pathname;
-            window.history.replaceState({}, "", newUrl);
-          }
-        } catch (err) {
-          console.error("[DreamAPI] Ticket error:", err?.message, err);
-        }
-      } else if (ticket) {
-        console.error("[DreamAPI] FAILED to get signIn object! Ticket NOT consumed.");
-        console.log("[DreamAPI] clerk keys:", Object.keys(clerk));
-      }
+      await this.checkSession();
     }
-    this.loaded = true;
-    await this.checkSession();
+  }
+  /**
+   * Store JWT in memory and localStorage
+   */
+  setToken(jwt) {
+    this.token = jwt;
+    localStorage.setItem(STORAGE_KEY, jwt);
+    this.onTokenChange?.(jwt);
   }
   /**
    * Check if returning from auth and grab token
@@ -291,6 +285,17 @@ var ClerkManager = class {
    * Get current user info
    */
   getUser() {
+    const clerk = getClerk();
+    if (clerk?.user) {
+      const user = clerk.user;
+      const metadata = user.publicMetadata || {};
+      return {
+        id: user.id,
+        email: user.primaryEmailAddress?.emailAddress || "",
+        plan: metadata.plan || "free",
+        publishableKey: metadata.publishableKey || ""
+      };
+    }
     if (this.token) {
       try {
         const parts = this.token.split(".");
@@ -307,16 +312,7 @@ var ClerkManager = class {
         console.error("[DreamAPI] Failed to decode JWT:", e);
       }
     }
-    const clerk = getClerk();
-    if (!clerk?.user) return null;
-    const user = clerk.user;
-    const metadata = user.publicMetadata || {};
-    return {
-      id: user.id,
-      email: user.primaryEmailAddress?.emailAddress || "",
-      plan: metadata.plan || "free",
-      publishableKey: metadata.publishableKey || ""
-    };
+    return null;
   }
   /**
    * Get current token
@@ -325,33 +321,40 @@ var ClerkManager = class {
     return this.token;
   }
   /**
-   * Refresh token and user data from Clerk server
-   * Call after plan changes (checkout success) to get updated metadata
+   * Refresh token and user data
+   * In test mode: refreshes from Clerk session
+   * In live mode: returns current token (re-auth needed for fresh data)
    */
   async refreshToken() {
     const clerk = getClerk();
-    if (!clerk?.session) return null;
-    try {
-      if (clerk.user?.reload) {
-        await clerk.user.reload();
+    if (clerk?.session) {
+      try {
+        if (clerk.user?.reload) {
+          await clerk.user.reload();
+        }
+        this.token = await clerk.session.getToken({ template: JWT_TEMPLATE });
+        this.setToken(this.token);
+        return this.token;
+      } catch (err) {
+        console.error("Failed to refresh token from Clerk:", err);
       }
-      this.token = await clerk.session.getToken({ template: JWT_TEMPLATE });
-      this.onTokenChange?.(this.token);
-      return this.token;
-    } catch (err) {
-      console.error("Failed to refresh token:", err);
-      return null;
     }
+    return this.token;
   }
   /**
    * Sign out
    */
   async signOut() {
-    const clerk = getClerk();
-    if (!clerk) return;
-    await clerk.signOut();
+    localStorage.removeItem(STORAGE_KEY);
     this.token = null;
     this.onTokenChange?.(null);
+    const clerk = getClerk();
+    if (clerk) {
+      try {
+        await clerk.signOut();
+      } catch (e) {
+      }
+    }
   }
   /**
    * Check if we're returning from auth (has clerk params/cookies)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dream-api/sdk",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Official SDK for Dream API - Auth, billing, and usage tracking in one API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",