🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor Stripe pricing retrieval and update pricing constants
Bill Yang0f43f62103a6
diff --git a/client/src/app/settings/subscription/components/ProPlan.tsx b/client/src/app/settings/subscription/components/ProPlan.tsxindex 4e97672f3..0404c7c66 100644--- a/client/src/app/settings/subscription/components/ProPlan.tsx+++ b/client/src/app/settings/subscription/components/ProPlan.tsx@@ -6,7 +6,7 @@ import { Button } from "../../../../components/ui/button";import { Card, CardContent } from "../../../../components/ui/card";import { Progress } from "../../../../components/ui/progress";import { BACKEND_URL } from "../../../../lib/const";-import { STRIPE_PRICES } from "../../../../lib/stripe";+import { getStripePrices } from "../../../../lib/stripe";import { formatDate } from "../utils/planUtils";import { useStripeSubscription } from "../utils/useStripeSubscription";@@ -27,7 +27,7 @@ export function ProPlan() {eventLimit > 0 ? Math.min((currentUsage / eventLimit) * 100, 100) : 0;const isAnnualPlan = activeSubscription?.interval === "year";- const stripePlan = STRIPE_PRICES.find(+ const stripePlan = getStripePrices().find((p) => p.name === activeSubscription?.planName);diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsxindex d714695c5..fc2961948 100644--- a/client/src/app/subscribe/page.tsx+++ b/client/src/app/subscribe/page.tsx@@ -2,14 +2,14 @@import { Slider } from "@/components/ui/slider";import { authClient } from "@/lib/auth";-import { STRIPE_PRICES } from "@/lib/stripe";+import { getStripePrices } from "@/lib/stripe";import { Check } from "lucide-react";+import { useRouter } from "next/navigation";import { useState } from "react";import { toast } from "sonner";import { StandardPage } from "../../components/StandardPage";import { BACKEND_URL } from "../../lib/const";import { useStripeSubscription } from "../settings/subscription/utils/useStripeSubscription";-import { useRouter } from "next/navigation";// Available event tiers for the sliderconst EVENT_TIERS = [@@ -43,10 +43,9 @@ function findPriceForTier(): StripePrice | null {// Determine if we need to look for annual plansconst isAnnual = interval === "year";- const namePattern = isAnnual ? "pro-annual" : "pro";// Filter plans by name pattern (with or without -annual suffix) and interval- const plans = STRIPE_PRICES.filter(+ const plans = getStripePrices().filter((plan) =>(isAnnual? plan.name.startsWith("pro") && plan.name.includes("-annual")diff --git a/client/src/lib/stripe.ts b/client/src/lib/stripe.tsindex 1b925aaeb..f064912fe 100644--- a/client/src/lib/stripe.ts+++ b/client/src/lib/stripe.ts@@ -1,7 +1,7 @@-export const STRIPE_PRICES = [+const STRIPE_PRICES = [{- priceId: "price_1R1fIVDFVprnAny2yJtRRPBm",price: 19,+ priceId: "price_1RKuxUDFVprnAny2xyyWvXNr",name: "pro100k",interval: "month",limits: {@@ -9,8 +9,8 @@ export const STRIPE_PRICES = [},},{- priceId: "price_1R2l2KDFVprnAny2iZr5gFLe",price: 190,+ priceId: "price_1RKuxUDFVprnAny2RkoZyxev",name: "pro100k-annual",interval: "year",limits: {@@ -18,8 +18,8 @@ export const STRIPE_PRICES = [},},{- priceId: "price_1R1fKJDFVprnAny2mfiBjkAQ",price: 29,+ priceId: "price_1RKuxTDFVprnAny2TS4Qz0Hi",name: "pro250k",interval: "month",limits: {@@ -27,8 +27,8 @@ export const STRIPE_PRICES = [},},{- priceId: "price_1R2lJIDFVprnAny22zUvjg5o",price: 290,+ priceId: "price_1RKuxTDFVprnAny2rDcJOwHn",name: "pro250k-annual",interval: "year",limits: {@@ -37,7 +37,7 @@ export const STRIPE_PRICES = [},{name: "pro500k",- priceId: "price_1R1fQlDFVprnAny2WwNdiRgT",+ priceId: "price_1RKuxSDFVprnAny2L7hbJSmO",price: 49,interval: "month",limits: {@@ -46,7 +46,7 @@ export const STRIPE_PRICES = [},{name: "pro500k-annual",- priceId: "price_1R2lKIDFVprnAny27wXUAy2D",+ priceId: "price_1RKuxSDFVprnAny2APD1EsL4",price: 490,interval: "year",limits: {@@ -55,7 +55,7 @@ export const STRIPE_PRICES = [},{name: "pro1m",- priceId: "price_1R1fR2DFVprnAny28tPEQAwh",+ priceId: "price_1RKuxRDFVprnAny2UnTeUnYl",price: 69,interval: "month",limits: {@@ -64,7 +64,7 @@ export const STRIPE_PRICES = [},{name: "pro1m-annual",- priceId: "price_1R2lKtDFVprnAny2Xl98rgu4",+ priceId: "price_1RKuxRDFVprnAny2f67uFcwC",price: 690,interval: "year",limits: {@@ -73,7 +73,7 @@ export const STRIPE_PRICES = [},{name: "pro2m",- priceId: "price_1R1fRMDFVprnAny24AMo0Vuu",+ priceId: "price_1RKuxPDFVprnAny2pvdhKxSL",price: 99,interval: "month",limits: {@@ -82,7 +82,7 @@ export const STRIPE_PRICES = [},{name: "pro2m-annual",- priceId: "price_1RE1bQDFVprnAny2ELKQS79d",+ priceId: "price_1RKuxPDFVprnAny2NCYgKQf5",price: 990,interval: "year",limits: {@@ -91,7 +91,7 @@ export const STRIPE_PRICES = [},{name: "pro5m",- priceId: "price_1RKuYJDFVprnAny2apEXvkde",+ priceId: "price_1RKuxKDFVprnAny2pytTqnzP",price: 149,interval: "month",limits: {@@ -100,7 +100,7 @@ export const STRIPE_PRICES = [},{name: "pro5m-annual",- priceId: "price_1RKuYaDFVprnAny2xEoejLRR",+ priceId: "price_1RKuxKDFVprnAny2UjJFcvHQ",price: 1490,interval: "year",limits: {@@ -109,7 +109,7 @@ export const STRIPE_PRICES = [},{name: "pro10m",- priceId: "price_1RKuX5DFVprnAny20UMfh10N",+ priceId: "price_1RKuxNDFVprnAny2HkZXUcZN",price: 249,interval: "month",limits: {@@ -118,7 +118,7 @@ export const STRIPE_PRICES = [},{name: "pro10m-annual",- priceId: "price_1RKuXODFVprnAny2JUjrCSyY",+ priceId: "price_1RKuxNDFVprnAny2mjFH5swO",price: 2490,interval: "year",limits: {@@ -126,3 +126,30 @@ export const STRIPE_PRICES = [},},];++const TEST_TO_PRICE_ID = {+ pro100k: "price_1R1fIVDFVprnAny2yJtRRPBm",+ "pro100k-annual": "price_1R2l2KDFVprnAny2iZr5gFLe",+ pro250k: "price_1R1fKJDFVprnAny2mfiBjkAQ",+ "pro250k-annual": "price_1R2lJIDFVprnAny22zUvjg5o",+ pro500k: "price_1R1fQlDFVprnAny2WwNdiRgT",+ "pro500k-annual": "price_1R2lKIDFVprnAny27wXUAy2D",+ pro1m: "price_1R1fR2DFVprnAny28tPEQAwh",+ "pro1m-annual": "price_1R2lKtDFVprnAny2Xl98rgu4",+ pro2m: "price_1R1fRMDFVprnAny24AMo0Vuu",+ "pro2m-annual": "price_1RE1bQDFVprnAny2ELKQS79d",+ pro5m: "price_1RKuYJDFVprnAny2apEXvkde",+ "pro5m-annual": "price_1RKuYaDFVprnAny2xEoejLRR",+ pro10m: "price_1RKuX5DFVprnAny20UMfh10N",+ "pro10m-annual": "price_1RKuXODFVprnAny2JUjrCSyY",+};++export const getStripePrices = () => {+ if (process.env.NEXT_PUBLIC_BACKEND_URL?.includes("app.rybbit.io")) {+ return STRIPE_PRICES;+ }+ return STRIPE_PRICES.map((price) => ({+ ...price,+ priceId: TEST_TO_PRICE_ID[price.name as keyof typeof TEST_TO_PRICE_ID],+ }));+};diff --git a/docs/src/app/page.jsx b/docs/src/app/page.jsxindex c799119d7..7f5e3ad73 100644--- a/docs/src/app/page.jsx+++ b/docs/src/app/page.jsx@@ -37,7 +37,7 @@ export default function IndexPage() {Track your Site</button></Link>- <Link href="https://app.rybbit.io/1" className="w-full sm:w-auto">+ <Link href="https://demo.rybbit.io/1" className="w-full sm:w-auto"><button className="w-full sm:w-auto bg-neutral-800 hover:bg-neutral-700 text-white font-medium px-5 py-3 rounded-lg border border-neutral-600 transform hover:-translate-y-0.5 transition-all duration-200 hover:border-neutral-400 focus:outline-none focus:ring-2 focus:ring-neutral-400 focus:ring-opacity-50">View Live Demo</button>diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.tsindex c80ebebf3..e73605ec7 100644--- a/server/src/api/stripe/getSubscription.ts+++ b/server/src/api/stripe/getSubscription.ts@@ -1,19 +1,19 @@+import { eq } from "drizzle-orm";import { FastifyReply, FastifyRequest } from "fastify";-import { stripe } from "../../lib/stripe.js";+import Stripe from "stripe";import { db } from "../../db/postgres/postgres.js";import { user as userSchema } from "../../db/postgres/schema.js";-import { eq } from "drizzle-orm";import {- STRIPE_PRICES,+ getStripePrices,StripePlan,TRIAL_DURATION_DAYS,TRIAL_EVENT_LIMIT,} from "../../lib/const.js";-import Stripe from "stripe";+import { stripe } from "../../lib/stripe.js";// Function to find plan details by price IDfunction findPlanDetails(priceId: string): StripePlan | undefined {- return STRIPE_PRICES.find(+ return getStripePrices().find((plan: StripePlan) =>plan.priceId === priceId ||(plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)diff --git a/server/src/cron/monthly-usage-checker.ts b/server/src/cron/monthly-usage-checker.tsindex b4b505a64..3643a6d49 100644--- a/server/src/cron/monthly-usage-checker.ts+++ b/server/src/cron/monthly-usage-checker.ts@@ -1,12 +1,12 @@-import { user, member, sites } from "../db/postgres/schema.js";+import { and, eq, inArray } from "drizzle-orm";+import { DateTime } from "luxon";+import Stripe from "stripe";+import { processResults } from "../api/analytics/utils.js";import { clickhouse } from "../db/clickhouse/clickhouse.js";-import { STRIPE_PRICES, StripePlan } from "../lib/const.js";-import { eq, inArray, and } from "drizzle-orm";import { db } from "../db/postgres/postgres.js";-import { processResults } from "../api/analytics/utils.js";+import { member, sites, user } from "../db/postgres/schema.js";+import { getStripePrices, StripePlan } from "../lib/const.js";import { stripe } from "../lib/stripe.js";-import Stripe from "stripe";-import { DateTime } from "luxon";// Default event limit for users without an active subscriptionconst DEFAULT_EVENT_LIMIT = 0;@@ -102,7 +102,7 @@ async function getUserSubscriptionInfo(userData: {}// Find corresponding plan details from constants- const planDetails = STRIPE_PRICES.find(+ const planDetails = getStripePrices().find((plan: StripePlan) =>plan.priceId === priceId ||(plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)diff --git a/server/src/lib/const.ts b/server/src/lib/const.tsindex 7f43ee0a7..79c7b9e73 100644--- a/server/src/lib/const.ts+++ b/server/src/lib/const.ts@@ -20,9 +20,9 @@ export interface StripePlan {annualDiscountPriceId?: string; // Make this optional}-export const STRIPE_PRICES: StripePlan[] = [+const STRIPE_PRICES: StripePlan[] = [{- priceId: "price_1R1fIVDFVprnAny2yJtRRPBm",+ priceId: "price_1RKuxUDFVprnAny2xyyWvXNr",name: "pro100k",interval: "month",limits: {@@ -30,7 +30,7 @@ export const STRIPE_PRICES: StripePlan[] = [},},{- priceId: "price_1R2l2KDFVprnAny2iZr5gFLe",+ priceId: "price_1RKuxUDFVprnAny2RkoZyxev",name: "pro100k-annual",interval: "year",limits: {@@ -38,7 +38,7 @@ export const STRIPE_PRICES: StripePlan[] = [},},{- priceId: "price_1R1fKJDFVprnAny2mfiBjkAQ",+ priceId: "price_1RKuxTDFVprnAny2TS4Qz0Hi",name: "pro250k",interval: "month",limits: {@@ -46,7 +46,7 @@ export const STRIPE_PRICES: StripePlan[] = [},},{- priceId: "price_1R2lJIDFVprnAny22zUvjg5o",+ priceId: "price_1RKuxTDFVprnAny2rDcJOwHn",name: "pro250k-annual",interval: "year",limits: {@@ -55,7 +55,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro500k",- priceId: "price_1R1fQlDFVprnAny2WwNdiRgT",+ priceId: "price_1RKuxSDFVprnAny2L7hbJSmO",interval: "month",limits: {events: 500_000,@@ -63,7 +63,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro500k-annual",- priceId: "price_1R2lKIDFVprnAny27wXUAy2D",+ priceId: "price_1RKuxSDFVprnAny2APD1EsL4",interval: "year",limits: {events: 500_000,@@ -71,7 +71,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro1m",- priceId: "price_1R1fR2DFVprnAny28tPEQAwh",+ priceId: "price_1RKuxRDFVprnAny2UnTeUnYl",interval: "month",limits: {events: 1_000_000,@@ -79,7 +79,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro1m-annual",- priceId: "price_1R2lKtDFVprnAny2Xl98rgu4",+ priceId: "price_1RKuxRDFVprnAny2f67uFcwC",interval: "year",limits: {events: 1_000_000,@@ -87,7 +87,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro2m",- priceId: "price_1R1fRMDFVprnAny24AMo0Vuu",+ priceId: "price_1RKuxPDFVprnAny2pvdhKxSL",interval: "month",limits: {events: 2_000_000,@@ -95,7 +95,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro2m-annual",- priceId: "price_1RE1bQDFVprnAny2ELKQS79d",+ priceId: "price_1RKuxPDFVprnAny2NCYgKQf5",interval: "year",limits: {events: 2_000_000,@@ -103,7 +103,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro5m",- priceId: "price_1RKuYJDFVprnAny2apEXvkde",+ priceId: "price_1RKuxKDFVprnAny2pytTqnzP",interval: "month",limits: {events: 5_000_000,@@ -111,7 +111,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro5m-annual",- priceId: "price_1RKuYaDFVprnAny2xEoejLRR",+ priceId: "price_1RKuxKDFVprnAny2UjJFcvHQ",interval: "year",limits: {events: 5_000_000,@@ -119,7 +119,7 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro10m",- priceId: "price_1RKuX5DFVprnAny20UMfh10N",+ priceId: "price_1RKuxNDFVprnAny2HkZXUcZN",interval: "month",limits: {events: 10_000_000,@@ -127,10 +127,37 @@ export const STRIPE_PRICES: StripePlan[] = [},{name: "pro10m-annual",- priceId: "price_1RKuXODFVprnAny2JUjrCSyY",+ priceId: "price_1RKuxNDFVprnAny2mjFH5swO",interval: "year",limits: {events: 10_000_000,},},];++const TEST_TO_PRICE_ID = {+ pro100k: "price_1R1fIVDFVprnAny2yJtRRPBm",+ "pro100k-annual": "price_1R2l2KDFVprnAny2iZr5gFLe",+ pro250k: "price_1R1fKJDFVprnAny2mfiBjkAQ",+ "pro250k-annual": "price_1R2lJIDFVprnAny22zUvjg5o",+ pro500k: "price_1R1fQlDFVprnAny2WwNdiRgT",+ "pro500k-annual": "price_1R2lKIDFVprnAny27wXUAy2D",+ pro1m: "price_1R1fR2DFVprnAny28tPEQAwh",+ "pro1m-annual": "price_1R2lKtDFVprnAny2Xl98rgu4",+ pro2m: "price_1R1fRMDFVprnAny24AMo0Vuu",+ "pro2m-annual": "price_1RE1bQDFVprnAny2ELKQS79d",+ pro5m: "price_1RKuYJDFVprnAny2apEXvkde",+ "pro5m-annual": "price_1RKuYaDFVprnAny2xEoejLRR",+ pro10m: "price_1RKuX5DFVprnAny20UMfh10N",+ "pro10m-annual": "price_1RKuXODFVprnAny2JUjrCSyY",+};++export const getStripePrices = () => {+ if (process.env.STRIPE_SECRET_KEY?.startsWith("sk_live")) {+ return STRIPE_PRICES;+ }+ return STRIPE_PRICES.map((price) => ({+ ...price,+ priceId: TEST_TO_PRICE_ID[price.name as keyof typeof TEST_TO_PRICE_ID],+ }));+};