🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance Stripe integration with caching and retry logic
Bill Yang9a63c5edca64
diff --git a/server/src/lib/stripe.ts b/server/src/lib/stripe.tsindex dcadd36f4..0e546bfd3 100644--- a/server/src/lib/stripe.ts+++ b/server/src/lib/stripe.ts@@ -8,5 +8,8 @@ const secretKey = process.env.STRIPE_SECRET_KEY;export const stripe = secretKey? new Stripe(secretKey, {typescript: true, // Enable TypeScript support+ // Automatically retry requests that fail with a 429 (rate limit) or transient+ // network/5xx error using Stripe's built-in exponential backoff with jitter.+ maxNetworkRetries: 3,}): null;diff --git a/server/src/lib/subscriptionUtils.ts b/server/src/lib/subscriptionUtils.tsindex bd09aa182..d94bd881d 100644--- a/server/src/lib/subscriptionUtils.ts+++ b/server/src/lib/subscriptionUtils.ts@@ -171,6 +171,28 @@ export async function getOverrideSubscription(organizationId: string): Promise<O}}+/**+ * Short-lived in-process cache for Stripe subscription lookups, keyed by customer ID.+ *+ * Subscription data is read on hot paths (e.g. listing sites on every dashboard load)+ * but changes rarely, so caching it for a short window collapses repeated reads into a+ * single Stripe API call and keeps us well under Stripe's request rate limits. Each+ * worker process keeps its own cache; staleness is bounded by the TTL, and mutations+ * (plan changes, new checkouts) call invalidateStripeSubscriptionCache to refresh early.+ */+const STRIPE_SUBSCRIPTION_CACHE_TTL_MS = 60_000;+const stripeSubscriptionCache = new Map<string, { value: StripeSubscriptionInfo | null; expiresAt: number }>();++/**+ * Drops the cached subscription for a customer so the next read fetches fresh data.+ * Call this after any mutation that changes a customer's subscription.+ */+export function invalidateStripeSubscriptionCache(stripeCustomerId: string | null): void {+ if (stripeCustomerId) {+ stripeSubscriptionCache.delete(stripeCustomerId);+ }+}+/*** Gets Stripe subscription info for an organization* @returns Stripe subscription info or null if no active subscription found@@ -180,29 +202,48 @@ export async function getStripeSubscription(stripeCustomerId: string | null): Prreturn null;}+ const cached = stripeSubscriptionCache.get(stripeCustomerId);+ if (cached && cached.expiresAt > Date.now()) {+ return cached.value;+ }+try {- // Fetch both active and trialing subscriptions in parallel- const [activeSubs, trialSubs] = await Promise.all([- (stripe as Stripe).subscriptions.list({- customer: stripeCustomerId,- status: "active",- expand: ["data.plan.product"],- }),- (stripe as Stripe).subscriptions.list({- customer: stripeCustomerId,- status: "trialing",- expand: ["data.plan.product"],- }),- ]);-- const allSubs = [...activeSubs.data, ...trialSubs.data];-- if (allSubs.length === 0) {- return null;- }+ const value = await fetchStripeSubscription(stripeCustomerId);+ stripeSubscriptionCache.set(stripeCustomerId, {+ value,+ expiresAt: Date.now() + STRIPE_SUBSCRIPTION_CACHE_TTL_MS,+ });+ return value;+ } catch (error) {+ console.error("Error fetching Stripe subscription:", error);+ // On error, fall back to the last cached value (even if expired) rather than+ // treating the org as having no subscription.+ return cached?.value ?? null;+ }+}- // Pick the most recently created subscription across both active and trialing- const subscription = allSubs.sort((a, b) => b.created - a.created)[0];+/**+ * Performs the actual Stripe API lookup for a customer's best subscription.+ * Uses a single list call (status "all") to halve request volume versus separate+ * active/trialing queries.+ */+async function fetchStripeSubscription(stripeCustomerId: string): Promise<StripeSubscriptionInfo | null> {+ // Fetch active + trialing in a single request and filter locally.+ const subs = await (stripe as Stripe).subscriptions.list({+ customer: stripeCustomerId,+ status: "all",+ limit: 100,+ expand: ["data.plan.product"],+ });++ const allSubs = subs.data.filter(sub => sub.status === "active" || sub.status === "trialing");++ if (allSubs.length === 0) {+ return null;+ }++ // Pick the most recently created subscription across both active and trialing+ const subscription = allSubs.sort((a, b) => b.created - a.created)[0];const isTrial = subscription.status === "trialing";const subscriptionItem = subscription.items.data[0];@@ -257,10 +298,6 @@ export async function getStripeSubscription(stripeCustomerId: string | null): PrcreatedAt: new Date(subscription.created * 1000),...(isTrial && subscription.trial_end ? { trialEnd: new Date(subscription.trial_end * 1000) } : {}),};- } catch (error) {- console.error("Error fetching Stripe subscription:", error);- return null;- }}/**