@appfunnel-dev/sdk 0.13.0 → 0.14.0

package/dist/{chunk-KEFKKBBP.cjs → chunk-OTBIW5DN.cjs}

@@ -378,7 +378,8 @@ var Router = class {
         this.initialKey = config.pages?.[initialPage] ? initialPage : defaultInitial;
       } else {
         const hasSession = this.hasSessionCookie(campaignSlug);
-        this.initialKey = hasSession && config.pages?.[initialPage] ? initialPage : defaultInitial;
+        const hasPendingSession = typeof window !== "undefined" && (window.location.search.includes("customer=") || window.location.search.includes("sid="));
+        this.initialKey = (hasSession || hasPendingSession) && config.pages?.[initialPage] ? initialPage : defaultInitial;
       }
     } else {
       this.initialKey = initialPage || defaultInitial;
@@ -1178,6 +1179,121 @@ var I18n = class {
     this.listeners.forEach((l) => l());
   }
 };
+
+// src/runtime/session.ts
+var API_BASE_URL2 = "https://api.appfunnel.net";
+var API_HEADERS = { "ngrok-skip-browser-warning": "1" };
+async function apiFetch(path) {
+  try {
+    const res = await fetch(`${API_BASE_URL2}${path}`, { headers: API_HEADERS });
+    return res.ok ? res.json() : null;
+  } catch {
+    return null;
+  }
+}
+function mergeVariables(store, data) {
+  if (Object.keys(data).length === 0) return;
+  store.setState((prev) => {
+    const merged = { ...prev };
+    for (const [key, value] of Object.entries(data)) {
+      if (value !== void 0) merged[key] = value;
+    }
+    return merged;
+  });
+}
+function cleanUrlParams(...keys) {
+  const url = new URL(window.location.href);
+  for (const key of keys) url.searchParams.delete(key);
+  window.history.replaceState({}, "", url.toString());
+}
+async function fetchAndRestoreSession(store, sessionId, funnelId) {
+  const result = await apiFetch(`/session/${sessionId}/data`);
+  if (!result?.success) return;
+  if (result.data?.funnelId && result.data.funnelId !== funnelId) return;
+  const savedData = result.data?.data || {};
+  mergeVariables(store, savedData);
+}
+async function resolveCheckoutSuccess(ctx, params) {
+  const stripeSessionId = params.get("session_id");
+  cleanUrlParams("checkout", "session_id");
+  const sessionId = ctx.tracker.getSessionId();
+  if (!sessionId) return { ok: false };
+  ctx.store.setMany({
+    "purchase.status": "success",
+    "purchase.success": true,
+    "purchase.cancelled": false
+  });
+  await Promise.all([
+    apiFetch(
+      `/campaign/${ctx.campaignId}/stripe/checkout-status?sessionId=${encodeURIComponent(sessionId)}&checkoutSessionId=${encodeURIComponent(stripeSessionId)}`
+    ).then((result) => {
+      if (!result?.success) return;
+      const updates = {
+        "payment.status": result.paymentStatus || "paid"
+      };
+      if (result.stripeCustomerId) {
+        updates["user.stripeCustomerId"] = result.stripeCustomerId;
+      }
+      if (result.subscriptionId) {
+        updates["stripe.subscriptionId"] = result.subscriptionId;
+        updates["subscription.status"] = result.subscriptionStatus || "active";
+      }
+      if (result.paymentIntentId) {
+        updates["stripe.paymentIntentId"] = result.paymentIntentId;
+      }
+      ctx.store.setMany(updates);
+      ctx.tracker.track("purchase.complete", {
+        eventId: stripeSessionId,
+        amount: result.amountTotal ? result.amountTotal / 100 : 0,
+        currency: result.currency || "usd",
+        email: result.customerEmail
+      });
+    }),
+    fetchAndRestoreSession(ctx.store, sessionId, ctx.funnelId)
+  ]);
+  return { ok: true };
+}
+function resolveCheckoutCanceled(ctx) {
+  cleanUrlParams("checkout", "session_id");
+  ctx.store.setMany({
+    "purchase.status": "cancelled",
+    "purchase.success": false,
+    "purchase.cancelled": true
+  });
+  return { ok: true };
+}
+async function resolveCustomer(ctx, customerId) {
+  cleanUrlParams("customer");
+  const result = await apiFetch(
+    `/session/by-customer?customerId=${encodeURIComponent(customerId)}&campaignId=${encodeURIComponent(ctx.campaignId)}&funnelId=${encodeURIComponent(ctx.funnelId)}`
+  );
+  if (!result?.success || !result.sessionId) return { ok: false };
+  ctx.tracker.setSessionId(result.sessionId);
+  if (result.data) {
+    mergeVariables(ctx.store, result.data);
+  }
+  return { ok: true };
+}
+async function resolveExistingSession(ctx) {
+  const sessionId = ctx.tracker.getSessionId();
+  if (!sessionId) return { ok: true };
+  await fetchAndRestoreSession(ctx.store, sessionId, ctx.funnelId);
+  return { ok: true };
+}
+async function resolveSession(ctx, params) {
+  const checkoutStatus = params.get("checkout");
+  const customerId = params.get("customer");
+  if (checkoutStatus === "success" && params.get("session_id")) {
+    return resolveCheckoutSuccess(ctx, params);
+  }
+  if (checkoutStatus === "canceled") {
+    return resolveCheckoutCanceled(ctx);
+  }
+  if (customerId) {
+    return resolveCustomer(ctx, customerId);
+  }
+  return resolveExistingSession(ctx);
+}
 var FunnelContext = react.createContext(null);
 function useFunnelContext() {
   const ctx = react.useContext(FunnelContext);
@@ -1199,12 +1315,16 @@ function FunnelProvider({
   const campaignId = sessionData?.campaignId || config.projectId || "";
   const funnelId = sessionData?.funnelId || config.projectId || "";
   const disableLoadingScreen = config.settings?.disableLoadingScreen === true;
+  const initialUrlParams = react.useRef(null);
+  if (!initialUrlParams.current && typeof window !== "undefined") {
+    initialUrlParams.current = new URLSearchParams(window.location.search);
+  }
   const [isReady, setIsReady] = react.useState(() => {
     if (disableLoadingScreen) return true;
     if (sessionData?.variables) return true;
     if (globalThis.__APPFUNNEL_DEV__) return true;
     if (typeof window === "undefined") return false;
-    const params = new URLSearchParams(window.location.search);
+    const params = initialUrlParams.current;
     if (!params.has("checkout") && !params.has("customer") && !params.has("sid")) {
       const hasCookie = document.cookie.includes("fs_");
       if (!hasCookie) return true;
@@ -1223,12 +1343,7 @@ function FunnelProvider({
     );
   }
   if (!routerRef.current) {
-    routerRef.current = new Router({
-      config,
-      initialPage,
-      basePath,
-      campaignSlug
-    });
+    routerRef.current = new Router({ config, initialPage, basePath, campaignSlug });
   }
   if (!trackerRef.current) {
     trackerRef.current = new FunnelTracker();
@@ -1251,163 +1366,18 @@ function FunnelProvider({
   react.useEffect(() => {
     if (sessionData?.variables) return;
     if (globalThis.__APPFUNNEL_DEV__) return;
-    const API_BASE_URL2 = "https://api.appfunnel.net";
-    const markReady = () => setIsReady(true);
-    tracker.init(campaignId, funnelId, campaignSlug, sessionData?.experimentId);
     if (typeof window === "undefined") return;
-    const urlParams = new URLSearchParams(window.location.search);
-    const checkoutStatus = urlParams.get("checkout");
-    const stripeSessionId = urlParams.get("session_id");
-    if (checkoutStatus === "success" && stripeSessionId) {
-      const url = new URL(window.location.href);
-      url.searchParams.delete("checkout");
-      url.searchParams.delete("session_id");
-      window.history.replaceState({}, "", url.toString());
-      const sessionId2 = tracker.getSessionId();
-      if (!sessionId2) {
-        markReady();
-        return;
+    tracker.init(campaignId, funnelId, campaignSlug, sessionData?.experimentId);
+    const params = initialUrlParams.current || new URLSearchParams(window.location.search);
+    resolveSession({ store, tracker, campaignId, funnelId }, params).then((result) => {
+      if (!result.ok) {
+        const initialKey = config.initialPageKey || Object.keys(config.pages ?? {})[0];
+        if (initialKey) router.goToPage(initialKey);
       }
-      store.setMany({
-        "purchase.status": "success",
-        "purchase.success": true,
-        "purchase.cancelled": false
-      });
-      Promise.all([
-        // Checkout details (stripeCustomerId, subscription info, etc.)
-        fetch(
-          `${API_BASE_URL2}/campaign/${campaignId}/stripe/checkout-status?sessionId=${encodeURIComponent(sessionId2)}&checkoutSessionId=${encodeURIComponent(stripeSessionId)}`,
-          { headers: { "ngrok-skip-browser-warning": "1" } }
-        ).then((res) => res.ok ? res.json() : null).then((result) => {
-          if (!result?.success) return;
-          const updates = {};
-          if (result.stripeCustomerId) {
-            updates["user.stripeCustomerId"] = result.stripeCustomerId;
-          }
-          if (result.subscriptionId) {
-            updates["stripe.subscriptionId"] = result.subscriptionId;
-            updates["subscription.status"] = result.subscriptionStatus || "active";
-          }
-          if (result.paymentIntentId) {
-            updates["stripe.paymentIntentId"] = result.paymentIntentId;
-          }
-          updates["payment.status"] = result.paymentStatus || "paid";
-          if (Object.keys(updates).length > 0) {
-            store.setMany(updates);
-          }
-          tracker.track("purchase.complete", {
-            eventId: stripeSessionId,
-            amount: result.amountTotal ? result.amountTotal / 100 : 0,
-            currency: result.currency || "usd",
-            email: result.customerEmail
-          });
-        }).catch(() => {
-        }),
-        // Session variable restoration
-        fetch(`${API_BASE_URL2}/session/${sessionId2}/data`, {
-          headers: { "ngrok-skip-browser-warning": "1" }
-        }).then((res) => res.ok ? res.json() : null).then((result) => {
-          if (!result?.success) return;
-          if (result.data?.funnelId && result.data.funnelId !== funnelId) return;
-          const savedData = result.data?.data || {};
-          if (Object.keys(savedData).length === 0) return;
-          store.setState((prev) => {
-            const merged = { ...prev };
-            for (const [key, value] of Object.entries(savedData)) {
-              if (value !== void 0) merged[key] = value;
-            }
-            return merged;
-          });
-        }).catch(() => {
-        })
-      ]).finally(markReady);
-      return;
-    }
-    if (checkoutStatus === "canceled") {
-      const url = new URL(window.location.href);
-      url.searchParams.delete("checkout");
-      url.searchParams.delete("session_id");
-      window.history.replaceState({}, "", url.toString());
-      store.setMany({
-        "purchase.status": "cancelled",
-        "purchase.success": false,
-        "purchase.cancelled": true
-      });
-      markReady();
-      return;
-    }
-    const customerParam = urlParams.get("customer");
-    if (customerParam) {
-      const url = new URL(window.location.href);
-      url.searchParams.delete("customer");
-      window.history.replaceState({}, "", url.toString());
-      fetch(
-        `${API_BASE_URL2}/session/by-customer?customerId=${encodeURIComponent(customerParam)}&campaignId=${encodeURIComponent(campaignId)}&funnelId=${encodeURIComponent(funnelId)}`,
-        { headers: { "ngrok-skip-browser-warning": "1" } }
-      ).then((res) => res.ok ? res.json() : null).then((result) => {
-        if (!result?.success || !result.sessionId) return;
-        tracker.setSessionId(result.sessionId);
-        if (!result.isNew && result.data) {
-          const savedData = result.data;
-          if (Object.keys(savedData).length > 0) {
-            store.setState((prev) => {
-              const merged = { ...prev };
-              for (const [key, value] of Object.entries(savedData)) {
-                if (value !== void 0) merged[key] = value;
-              }
-              return merged;
-            });
-          }
-        }
-      }).catch(() => {
-      }).finally(markReady);
-      return;
-    }
-    const sessionId = tracker.getSessionId();
-    if (!sessionId) {
-      markReady();
-      return;
-    }
-    fetch(`${API_BASE_URL2}/session/${sessionId}/data`, {
-      headers: { "ngrok-skip-browser-warning": "1" }
-    }).then((res) => res.ok ? res.json() : null).then((result) => {
-      if (!result?.success) return;
-      if (result.data?.funnelId && result.data.funnelId !== funnelId) return;
-      const savedData = result.data?.data || {};
-      if (Object.keys(savedData).length === 0) return;
-      store.setState((prev) => {
-        const merged = { ...prev };
-        for (const [key, value] of Object.entries(savedData)) {
-          if (value !== void 0) merged[key] = value;
-        }
-        return merged;
-      });
-    }).catch(() => {
-    }).finally(markReady);
-  }, []);
-  const products = react.useMemo(() => {
-    if (!config.products?.items || !priceData) return [];
-    return buildRuntimeProducts(config.products.items, priceData);
-  }, [config.products, priceData]);
-  const defaultProductId = config.products?.defaultId || products[0]?.id || null;
-  const selectedProductIdRef = react.useRef(defaultProductId);
-  const selectProduct = react.useCallback((productId) => {
-    selectedProductIdRef.current = productId;
-    store.set("products.selectedProductId", productId);
-  }, [store]);
-  react.useEffect(() => {
-    const eventBus = new AppFunnelEventBus(store, router, selectProduct);
-    eventBus.attach();
-    eventBusRef.current = eventBus;
-    if (config.integrations && Object.keys(config.integrations).length > 0) {
-      initializeIntegrations(config.integrations);
-    }
-    return () => {
-      eventBus.destroy();
-      eventBusRef.current = null;
-    };
+    }).finally(() => setIsReady(true));
   }, []);
   react.useEffect(() => {
+    if (!isReady) return;
     tracker.init(campaignId, funnelId, campaignSlug, sessionData?.experimentId);
     if (sessionData?.sessionId) {
       tracker.setSessionId(sessionData.sessionId);
@@ -1430,11 +1400,33 @@ function FunnelProvider({
       tracker.stopPageTracking();
       tracker.flushVariables();
     };
+  }, [isReady]);
+  const products = react.useMemo(() => {
+    if (!config.products?.items || !priceData) return [];
+    return buildRuntimeProducts(config.products.items, priceData);
+  }, [config.products, priceData]);
+  const defaultProductId = config.products?.defaultId || products[0]?.id || null;
+  const selectedProductIdRef = react.useRef(defaultProductId);
+  const selectProduct = react.useCallback((productId) => {
+    selectedProductIdRef.current = productId;
+    store.set("products.selectedProductId", productId);
+  }, [store]);
+  react.useEffect(() => {
+    const eventBus = new AppFunnelEventBus(store, router, selectProduct);
+    eventBus.attach();
+    eventBusRef.current = eventBus;
+    if (config.integrations && Object.keys(config.integrations).length > 0) {
+      initializeIntegrations(config.integrations);
+    }
+    return () => {
+      eventBus.destroy();
+      eventBusRef.current = null;
+    };
   }, []);
   const sessionStartTime = react.useRef(Date.now());
   const pageStartTime = react.useRef(Date.now());
   react.useEffect(() => {
-    const sysVars = computeSystemVariables({
+    store.setMany(computeSystemVariables({
       currentPageKey: router.getCurrentPage()?.key || "",
       pageHistory: router.getPageHistory(),
       pageStartTime: pageStartTime.current,
@@ -1442,8 +1434,7 @@ function FunnelProvider({
       totalPages: Object.keys(config.pages ?? {}).length,
       funnelId,
       campaignId
-    });
-    store.setMany(sysVars);
+    }));
     if (defaultProductId) {
       store.set("products.selectedProductId", defaultProductId);
     }
@@ -1485,5 +1476,5 @@ exports.FunnelProvider = FunnelProvider;
 exports.__require = __require;
 exports.registerIntegration = registerIntegration;
 exports.useFunnelContext = useFunnelContext;
-//# sourceMappingURL=chunk-KEFKKBBP.cjs.map
-//# sourceMappingURL=chunk-KEFKKBBP.cjs.map
+//# sourceMappingURL=chunk-OTBIW5DN.cjs.map
+//# sourceMappingURL=chunk-OTBIW5DN.cjs.map