Refactor subscription backend logic #2426

http-teapot · 2025-07-11T20:24:58Z

Description

Updated the subscription lifecycle to use Stripe webhooks only.
Added rate limiting logic tied to subscription lifecycle
Updated frontend to use rate limiting when user has active subscription

Related Issues

Type of Change

Testing

Make sure you start with a clean DB.
Log in.
Click the profile dropdown, make sure it reflects the free rates.
Create a new project or update an existing project (interact with the AI).
Verify that the usage counted towards the free rate limit.
Purchase a new subscription.
Verify that the limit reflects the purchased subscription and that the previous message does not count towards the limit.
Post a message (similar as step 4).
Verify that the usage counted towards the subscription monthly limit.
Upgrade the subscription to the next tier.
Verify in the dropdown that the rate limit as increased accordingly to the delta between the previous pricing and the new pricing.
Post a message
Verify that the usage has increased accordingly.
Simulate a renewal
1. Go to Stripe Sandbox
2. Find and click on the subscription
3. In the Actions dropdown, click "Update subscription"
4. Add a new tier (add product) and remove the existing tier (Stripe handles that as an upgrade)
5. Check "Reset billing cycle" (this will invoice the user, just like it'd if it renewed)
6. Click "Update subscription"
The new rate limit should include the previous rate limit minus the used credits
Repeat step (14)
The new rate limit should include the previous rate limit but the one before that (ie. credits are carried over only once)

Screenshots (if applicable)

Additional Notes

Important

Refactor subscription backend to use Stripe webhooks and implement rate limiting based on subscription status, updating database schema and frontend accordingly.

Behavior:
- Refactor subscription lifecycle to use Stripe webhooks exclusively in route.ts and stripe.ts.
- Implement rate limiting logic tied to subscription lifecycle in route.ts and usage/index.ts.
- Update frontend to reflect rate limiting based on subscription status in route.ts.
Database:
- Add rateLimits table in rate-limits.ts to track usage limits per subscription.
- Update subscriptions table in subscription.ts to include period start and end timestamps.
- Modify usageRecords table in usage.ts to include indexing for efficient querying.
Stripe Integration:
- Add createCustomer function in functions.ts to handle new customer creation.
- Modify createCheckoutSession to include stripeCustomerId in functions.ts.
- Update subscription handling functions to manage subscription updates and cancellations in functions.ts.

^{This description was created by}^{for bf4cdb4. You can customize this summary. It will automatically update as commits are pushed.}

…imits

vercel · 2025-07-11T20:25:02Z

Someone is attempting to deploy a commit to the Onlook Team on Vercel.

A member of the Team first needs to authorize it.

apps/web/client/src/app/webhook/stripe/stripe.ts

packages/db/src/schema/subscription/rate-limits.ts

http-teapot · 2025-07-11T20:37:26Z

apps/web/client/src/app/webhook/stripe/stripe.ts

+                // Here you can decide the logic for the carry-over.
+                // Example, you may want to carry over 100% of the credits on the first carry-over,
+                // and 50% of the credits on the next carry-overs.
+                // const max = rate.carryOverTotal === 0 ? rate.left : rate.left * 0.50;
+                const max = rate.left;
+
+                // For now, we only carry over the credits on the first carry-over.
+                // In the future, we may want to carry over the credits on the next carry-overs.
+                if (rate.carryOverTotal === 0) {


This is where you can adjust the carry-over rules. Right now it is set up as:

It only carries over once.

100% of the remaining credits carry over.

apps/web/client/src/app/api/chat/route.ts

apps/web/client/src/server/api/routers/usage/index.ts

apps/web/client/src/app/api/chat/route.ts

apps/web/client/src/app/webhook/stripe/stripe.ts

apps/web/client/src/server/api/routers/subscription/subscription.ts

Kitenite · 2025-07-17T23:51:59Z

apps/web/client/src/server/api/routers/usage/index.ts

-            timestamp: new Date(),
+        // running a transaction helps with concurrency issues and ensures that
+        // the usage is incremented atomically
+        return db.transaction(async (tx) => {


What happens when increment is called on a free plan with no rateLimits? Seems like in this case there should be an upsert or some logic here to handle that? Seeing a 500 error when running with an existing user with no subscription

@onlook/web-client dev: [TRPC] usage.increment took 327ms to execute │ @onlook/web-client dev: ⨯ Error [TRPCError]: Rollback │ @onlook/web-client dev: at <unknown> (src/server/api/routers/usage/index.ts:122:19) │ @onlook/web-client dev: at async (src/server/api/trpc.ts:105:19) │ @onlook/web-client dev: at async streamResponse (src/app/api/chat/route.ts:102:29) │ @onlook/web-client dev: 120 | // if there are no credits left then rollback │ @onlook/web-client dev: 121 | if (!limit?.left) { │ @onlook/web-client dev: > 122 | tx.rollback(); │ @onlook/web-client dev: | ^ │ @onlook/web-client dev: 123 | return; │ @onlook/web-client dev: 124 | } │ @onlook/web-client dev: 125 | { │ @onlook/web-client dev: code: 'INTERNAL_SERVER_ERROR', │ @onlook/web-client dev: [cause]: Error [DrizzleError]: Rollback │ @onlook/web-client dev: at <unknown> (src/server/api/routers/usage/index.ts:122:19) │ @onlook/web-client dev: at async (src/server/api/trpc.ts:105:19) │ @onlook/web-client dev: at async streamResponse (src/app/api/chat/route.ts:102:29) │ @onlook/web-client dev: 120 | // if there are no credits left then rollback │ @onlook/web-client dev: 121 | if (!limit?.left) { │ @onlook/web-client dev: > 122 | tx.rollback(); │ @onlook/web-client dev: | ^ │ @onlook/web-client dev: 123 | return; │ @onlook/web-client dev: 124 | } │ @onlook/web-client dev: 125 | { │ @onlook/web-client dev: cause: undefined │ @onlook/web-client dev: } │ @onlook/web-client dev: } │ @onlook/web-client dev: ⨯ Error [TRPCError]: Rollback │ @onlook/web-client dev: at <unknown> (src/server/api/routers/usage/index.ts:122:19) │ @onlook/web-client dev: at async (src/server/api/trpc.ts:105:19) │ @onlook/web-client dev: at async streamResponse (src/app/api/chat/route.ts:102:29) │ @onlook/web-client dev: 120 | // if there are no credits left then rollback │ @onlook/web-client dev: 121 | if (!limit?.left) { │ @onlook/web-client dev: > 122 | tx.rollback(); │ @onlook/web-client dev: | ^ │ @onlook/web-client dev: 123 | return; │ @onlook/web-client dev: 124 | } │ @onlook/web-client dev: 125 | { │ @onlook/web-client dev: code: 'INTERNAL_SERVER_ERROR', │ @onlook/web-client dev: [cause]: Error [DrizzleError]: Rollback │ @onlook/web-client dev: at <unknown> (src/server/api/routers/usage/index.ts:122:19) │ @onlook/web-client dev: at async (src/server/api/trpc.ts:105:19) │ @onlook/web-client dev: at async streamResponse (src/app/api/chat/route.ts:102:29) │ @onlook/web-client dev: 120 | // if there are no credits left then rollback │ @onlook/web-client dev: 121 | if (!limit?.left) { │ @onlook/web-client dev: > 122 | tx.rollback(); │ @onlook/web-client dev: | ^ │ @onlook/web-client dev: 123 | return; │ @onlook/web-client dev: 124 | } │ @onlook/web-client dev: 125 | { │ @onlook/web-client dev: cause: undefined │ @onlook/web-client dev: } │ @onlook/web-client dev: }

* Fixes both auth login buttons from showing loading animation when either one is actually loading

* Fix decimal input support, add VH units. * fix: preserve arrow key behavior

Kitenite · 2025-07-18T19:47:49Z

apps/web/client/src/server/api/routers/usage/index.ts

+                where: and(eq(subscriptions.userId, user.id), eq(subscriptions.status, SubscriptionStatus.ACTIVE)),
+            });
+            if (!subscription) {
+                return { rateLimitId: undefined, usageRecordId: undefined };


I think in this case we need to check the records for the free user to make sure they don't go over their free tier limit. Would it make sense to create a rate-limit row? Or just use our custom logic and count the usage record?

This would also not count towards free usage limit because it's a no-op. Ideally we still want to make sure this works. You can simulate free user by editing the subscription table row and marking the subscription as cancelled.

Ah yeah, great catch

I didn't want to have rows for free users since they have daily rates, if you have a million users then each month would add 30 million rows in the table. On the other hand, your comment does highlight an issue with separating systems and for free users, it involves counting rows on a large table (though, now indexed) which is not optimal.

I was trying to keep it simple so the credits stored in the database were tied to the subscription's lifecycle. The alternative would be to inject two rate limits (one daily and one monthly) when a free user sends a message and then when a free user converts to paid, have the daily/monthly rate limits endedAt in the past.

IMO, it's the sort of thing you want to stabilize so it doesn't have to be revisited until months/years from now. By that time, you may revisit how you monetize things and start from scratch.

Yeah I see the problem with the usage calculation now. Especially when scaled up. Perhaps having a daily usage count system could make sense.

One last wrinkle here is that the daily usage counting is now only monthly limit counting when user doesn't have a subscription. Seems like this would not reset daily so free users will only have 5 free messages per month. Please let me know if this is accurate.

onlook/apps/web/client/src/server/api/routers/usage/index.ts

Line 82 in b5305af

daily: {

packages/stripe/src/functions.ts

packages/db/src/seed/stripe/backfill-subscriptions.ts

Kitenite · 2025-07-31T23:04:32Z

packages/db/src/seed/stripe/backfill-subscriptions.ts

+
+const insertRateLimit = async (tx: PgTransaction<any, any, any>, item: StripeItem) => {
+    console.log(`Inserting rate limit for subscription ${item.subscription.id}`);
+    // One month from the start date. NOT SURE IF THIS IS CORRECT.


@http-teapot should we use a better end date here?

If stripeCurrentPeriodEnd is available then I'd use that so you don't have to calculate 31/30 days based on month

packages/db/src/seed/stripe/backfill-subscriptions.ts

vercel · 2025-08-01T06:45:31Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
web	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 1, 2025 6:47am

Thomas Potaire added 4 commits July 11, 2025 09:35

cleaning up the webhook lifecyle side

19c771c

Add indexes to optimize count/sum queries and wire frontend to rate l…

c06d665

…imits

Adding rate limit decrement logic

11134b0

remove console.log

bf4cdb4

ellipsis-dev bot reviewed Jul 11, 2025

View reviewed changes

apps/web/client/src/app/webhook/stripe/stripe.ts Outdated Show resolved Hide resolved

packages/db/src/schema/subscription/rate-limits.ts Outdated Show resolved Hide resolved

adjusting logic from self-review

7165979

http-teapot commented Jul 11, 2025

View reviewed changes

fixing suggested comments

05acb14

graphite-app bot reviewed Jul 11, 2025

View reviewed changes

apps/web/client/src/app/api/chat/route.ts Show resolved Hide resolved

apps/web/client/src/server/api/routers/usage/index.ts Outdated Show resolved Hide resolved

great catch from auto-review

f39bf2e

graphite-app bot reviewed Jul 11, 2025

View reviewed changes

apps/web/client/src/server/api/routers/usage/index.ts Outdated Show resolved Hide resolved

Thomas Potaire and others added 2 commits July 15, 2025 09:46

adjusting base on comment

4eeee0b

Merge branch 'main' into refactor-subscription

2a78202

Kitenite reviewed Jul 15, 2025

View reviewed changes

Kitenite added 4 commits July 15, 2025 12:56

small formatting

6d45636

merge from main

cc52397

refactor

9c46135

Merge branch 'main' into refactor-subscription

7eb00a9

Kitenite reviewed Jul 17, 2025

View reviewed changes

Kitenite and others added 5 commits July 17, 2025 17:33

update seed and use db from context

b6b4c4f

decrement of rate limit should only if user has active subscription

b5dd141

Fix for login button loading states (onlook-dev#2481)

f94a117

* Fixes both auth login buttons from showing loading animation when either one is actually loading

Fix decimal input support, add VH units. (onlook-dev#2469)

c906969

* Fix decimal input support, add VH units. * fix: preserve arrow key behavior

Merge branch 'main' into refactor-subscription

35f000b

Kitenite reviewed Jul 18, 2025

View reviewed changes

Thomas Potaire and others added 4 commits July 18, 2025 14:55

attempt at fixing free/paid increment

b5305af

merge from main

0350d6d

merge main

cafa712

merge main

d2c0e50

Populate schedule data when a subscription is scheduled to be downgraded

3cbc2af

http-teapot commented Jul 24, 2025

View reviewed changes

packages/stripe/src/functions.ts Show resolved Hide resolved

Handle downgrade -> upgrade gracefully

4a1b40b

Kitenite mentioned this pull request Jul 31, 2025

[bug] Error: Unknown termination reason #2570

Open

Kitenite added 6 commits July 31, 2025 13:40

update fetching

b874efc

merge main

277106b

fix ui bugs

35dd07f

add backfill script

9d1ef76

add backfill script

fd646eb

clean up

7fce486

Kitenite reviewed Jul 31, 2025

View reviewed changes

packages/db/src/seed/stripe/backfill-subscriptions.ts Show resolved Hide resolved

Kitenite added 3 commits July 31, 2025 15:31

clean up

96f89d3

update translation

cb09566

clear schedule

fc756ad

Kitenite reviewed Jul 31, 2025

View reviewed changes

Kitenite added 3 commits July 31, 2025 16:10

count previous day and month for free plan

69bee9e

update script

277e4e5

update script

ed43563

http-teapot commented Aug 1, 2025

View reviewed changes

packages/db/src/seed/stripe/backfill-subscriptions.ts Outdated Show resolved Hide resolved

Kitenite added 7 commits July 31, 2025 17:12

add rate-limit

09413b4

update rate-limit script

1f53c32

Merge branch 'main' into refactor-subscription

3022ef4

Merge branch 'main' into refactor-subscription

74f185c

update free usage fetching

c1a59bc

update script

9c658f5

update script

ec86116

vercel bot deployed to Preview – web August 1, 2025 06:47 View deployment

Kitenite merged commit 51f4826 into onlook-dev:main Aug 1, 2025
3 of 4 checks passed

Kitenite mentioned this pull request Aug 1, 2025

Bad count of free chat use #2546

Closed

Refactor subscription backend logic #2426

Refactor subscription backend logic #2426

Uh oh!

Conversation

http-teapot commented Jul 11, 2025 • edited by ellipsis-dev bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

Type of Change

Testing

Screenshots (if applicable)

Additional Notes

Uh oh!

vercel bot commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

http-teapot Jul 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kitenite Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Kitenite Jul 17, 2025

Choose a reason for hiding this comment

Uh oh!

Kitenite Jul 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

http-teapot Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

Kitenite Jul 19, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Kitenite Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

http-teapot Aug 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vercel bot commented Aug 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

http-teapot commented Jul 11, 2025 •

edited by ellipsis-dev bot

Loading

Kitenite Jul 18, 2025 •

edited

Loading

http-teapot Aug 1, 2025 •

edited

Loading

vercel bot commented Aug 1, 2025 •

edited

Loading