mcp-scraper 0.3.20 → 0.3.21

package/dist/bin/api-server.cjs

@@ -7400,6 +7400,7 @@ __export(db_exports, {
   setExtraConcurrencySlots: () => setExtraConcurrencySlots,
   setPassword: () => setPassword,
   setStripeCustomerId: () => setStripeCustomerId,
+  setSubscriptionTier: () => setSubscriptionTier,
   startHarvestAttempt: () => startHarvestAttempt,
   stripeEventAlreadyProcessed: () => stripeEventAlreadyProcessed,
   updateKpoJobState: () => updateKpoJobState,
@@ -7527,6 +7528,18 @@ async function migrate() {
     await db.execute(`ALTER TABLE users ADD COLUMN concurrency_stripe_sub_id TEXT`);
   } catch {
   }
+  try {
+    await db.execute(`ALTER TABLE users ADD COLUMN subscription_concurrency INTEGER NOT NULL DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE users ADD COLUMN subscription_tier TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE users ADD COLUMN subscription_id TEXT`);
+  } catch {
+  }
   await db.execute(`
     CREATE TABLE IF NOT EXISTS concurrency_locks (
       id          TEXT PRIMARY KEY,
@@ -7809,7 +7822,10 @@ function rowToUser(row) {
     stripe_customer_id: row.stripe_customer_id != null ? String(row.stripe_customer_id) : null,
     balance_mc: Number(row.balance_mc ?? 0),
     extra_concurrency_slots: Number(row.extra_concurrency_slots ?? 0),
-    concurrency_stripe_sub_id: row.concurrency_stripe_sub_id != null ? String(row.concurrency_stripe_sub_id) : null
+    concurrency_stripe_sub_id: row.concurrency_stripe_sub_id != null ? String(row.concurrency_stripe_sub_id) : null,
+    subscription_concurrency: Number(row.subscription_concurrency ?? 0),
+    subscription_tier: row.subscription_tier != null ? String(row.subscription_tier) : null,
+    subscription_id: row.subscription_id != null ? String(row.subscription_id) : null
   };
 }
 async function getUserByEmail(email) {
@@ -8594,6 +8610,12 @@ async function setConcurrencySubId(userId, subId) {
     args: [subId, userId]
   });
 }
+async function setSubscriptionTier(userId, tier, concurrency, subId) {
+  await getDb().execute({
+    sql: "UPDATE users SET subscription_tier = ?, subscription_concurrency = ?, subscription_id = ? WHERE id = ?",
+    args: [tier, Math.max(0, Math.round(concurrency)), subId, userId]
+  });
+}
 async function ensureMigrated(userId) {
   const db = getDb();
   const hasLots = await db.execute({ sql: "SELECT 1 FROM credit_lots WHERE user_id = ? LIMIT 1", args: [userId] });
@@ -9613,7 +9635,7 @@ function insufficientBalanceResponse(balanceMc, requiredMc) {
     topup_url: topupUrl
   };
 }
-var MC_COSTS, MC_PER_BROWSER_MS, BROWSER_OPEN_MIN_BALANCE_MC, MC_PER_CREDIT, CREDIT_COST_CATALOG, CONCURRENCY_PRICE_ID, CONCURRENCY_SLOT_PRICE_USD, CONCURRENCY_SLOT_PRICE_CURRENCY, CONCURRENCY_SLOT_PRICE_INTERVAL, CONCURRENCY_SLOT_PRICE_LABEL, CONCURRENCY_SLOT_TERMINAL_COMMAND, FREE_SIGNUP_MC, FREE_MONTHLY_REFRESH_MC, BALANCE_PRICE_IDS, BALANCE_PACK_LABELS, LedgerOperation;
+var MC_COSTS, MC_PER_BROWSER_MS, BROWSER_OPEN_MIN_BALANCE_MC, MC_PER_CREDIT, CREDIT_COST_CATALOG, CONCURRENCY_PRICE_ID, SUBSCRIPTION_TIERS, SUBSCRIPTION_TIER_BY_KEY, CONCURRENCY_SLOT_PRICE_USD, CONCURRENCY_SLOT_PRICE_CURRENCY, CONCURRENCY_SLOT_PRICE_INTERVAL, CONCURRENCY_SLOT_PRICE_LABEL, CONCURRENCY_SLOT_TERMINAL_COMMAND, LedgerOperation;
 var init_rates = __esm({
   "src/api/rates.ts"() {
     "use strict";
@@ -9767,27 +9789,22 @@ var init_rates = __esm({
       }
     ];
     CONCURRENCY_PRICE_ID = "price_1Ta1NRS8aAcsk3TGwsRnYbix";
+    SUBSCRIPTION_TIERS = {
+      "price_1TmiHRS8aAcsk3TGwmSNfNIa": { tier: "starter", label: "Starter", price_id: "price_1TmiHRS8aAcsk3TGwmSNfNIa", monthly_usd: 12, credits_mc: 10312500, concurrency: 3, intro_coupon: "mcp-starter-1dollar-intro-12" },
+      "price_1Tmg1nS8aAcsk3TGe8zcnGTM": { tier: "growth", label: "Growth", price_id: "price_1Tmg1nS8aAcsk3TGe8zcnGTM", monthly_usd: 100, credits_mc: 9075e4, concurrency: 10, intro_coupon: null },
+      "price_1Tmg1nS8aAcsk3TGsZw34iXS": { tier: "scale", label: "Scale", price_id: "price_1Tmg1nS8aAcsk3TGsZw34iXS", monthly_usd: 250, credits_mc: 226875e3, concurrency: 20, intro_coupon: null }
+    };
+    SUBSCRIPTION_TIER_BY_KEY = Object.fromEntries(
+      Object.values(SUBSCRIPTION_TIERS).map((t) => [t.tier, t])
+    );
     CONCURRENCY_SLOT_PRICE_USD = 5;
     CONCURRENCY_SLOT_PRICE_CURRENCY = "usd";
     CONCURRENCY_SLOT_PRICE_INTERVAL = "month";
     CONCURRENCY_SLOT_PRICE_LABEL = "$5/month";
     CONCURRENCY_SLOT_TERMINAL_COMMAND = "npx -y -p mcp-scraper@latest mcp-scraper-cli billing concurrency checkout";
-    FREE_SIGNUP_MC = 5e5;
-    FREE_MONTHLY_REFRESH_MC = 25e4;
-    BALANCE_PRICE_IDS = {
-      "price_1TZx6rS8aAcsk3TGNMc1Vgpo": 11e6,
-      "price_1TZx6sS8aAcsk3TGxgqB7khO": 275e5,
-      "price_1TZx6tS8aAcsk3TG8PnJqHlG": 605e5,
-      "price_1TZx6tS8aAcsk3TGNgRMpy0e": 121e6
-    };
-    BALANCE_PACK_LABELS = {
-      "price_1TZx6rS8aAcsk3TGNMc1Vgpo": "$10",
-      "price_1TZx6sS8aAcsk3TGxgqB7khO": "$25",
-      "price_1TZx6tS8aAcsk3TG8PnJqHlG": "$50",
-      "price_1TZx6tS8aAcsk3TGNgRMpy0e": "$100"
-    };
     LedgerOperation = {
       TOPUP: "topup",
+      SUBSCRIPTION: "subscription",
       SIGNUP_GRANT: "signup_grant",
       MONTHLY_REFRESH: "monthly_free_refresh",
       PAA: "paa",
@@ -12212,7 +12229,8 @@ var init_server_schemas = __esm({
 
 // src/api/concurrency-gates.ts
 function concurrencyLimitForUser(user) {
-  return 1 + Math.max(0, Number(user.extra_concurrency_slots ?? 0));
+  const tier = Math.max(0, Number(user.subscription_concurrency ?? 0));
+  return Math.max(1, tier) + Math.max(0, Number(user.extra_concurrency_slots ?? 0));
 }
 function concurrencyLimitExceededResponse(gate) {
   const upgrade = concurrencySlotBillingInfo();
@@ -23863,7 +23881,7 @@ var PACKAGE_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    PACKAGE_VERSION = "0.3.20";
+    PACKAGE_VERSION = "0.3.21";
   }
 });
 
@@ -27997,6 +28015,18 @@ var init_browser_agent_console = __esm({
 });
 
 // src/api/stripe-routes.ts
+function linePriceId(line) {
+  const l = line;
+  return l?.price?.id ?? l?.pricing?.price_details?.price ?? l?.plan?.id;
+}
+async function resolveUser(customerId, emailFallback) {
+  let user = await getUserByStripeCustomerId(customerId);
+  if (user) return user;
+  if (!emailFallback) return void 0;
+  user = await getUserByEmail(emailFallback);
+  if (user) await setStripeCustomerId(user.id, customerId);
+  return user;
+}
 var import_stripe, import_hono12, stripe, stripeApp;
 var init_stripe_routes = __esm({
   "src/api/stripe-routes.ts"() {
@@ -28018,46 +28048,43 @@ var init_stripe_routes = __esm({
       }
       const isNew = await recordStripeEvent(event.id);
       if (!isNew) return c.json({ received: true });
-      if (event.type === "checkout.session.completed") {
-        const session = event.data.object;
-        if (session.payment_status !== "paid") return c.json({ received: true });
-        const customerId = session.customer;
-        const lineItems = await stripe.checkout.sessions.listLineItems(session.id);
-        const priceId = lineItems.data[0]?.price?.id;
-        if (!priceId) return c.json({ received: true });
-        if (priceId in BALANCE_PRICE_IDS) {
-          const mc = BALANCE_PRICE_IDS[priceId];
-          const label = BALANCE_PACK_LABELS[priceId] ?? "unknown";
-          let user = await getUserByStripeCustomerId(customerId);
-          if (!user) {
-            const email = session.customer_details?.email;
-            if (!email) return c.json({ received: true });
-            user = await getUserByEmail(email);
-            if (!user) return c.json({ received: true });
-            await setStripeCustomerId(user.id, customerId);
+      if (event.type === "invoice.paid" || event.type === "invoice.payment_succeeded") {
+        const invoice = event.data.object;
+        const lineTierId = invoice.lines.data.map(linePriceId).find((id) => id && id in SUBSCRIPTION_TIERS);
+        if (lineTierId) {
+          const tier = SUBSCRIPTION_TIERS[lineTierId];
+          const user = await resolveUser(invoice.customer, invoice.customer_email ?? void 0);
+          if (user && invoice.id && !await ledgerExistsForStripePI(invoice.id)) {
+            await creditMc(user.id, tier.credits_mc, LedgerOperation.SUBSCRIPTION, `${tier.label} subscription credits`, invoice.id);
+            await setSubscriptionTier(user.id, tier.tier, tier.concurrency, invoice.subscription ?? user.subscription_id);
           }
-          const pi = session.payment_intent;
-          if (await ledgerExistsForStripePI(pi)) return c.json({ received: true });
-          await creditMc(user.id, mc, LedgerOperation.TOPUP, `${label} balance top-up`, pi);
         }
       }
-      if (event.type === "customer.subscription.created") {
+      if (event.type === "customer.subscription.created" || event.type === "customer.subscription.updated") {
         const sub = event.data.object;
         const priceId = sub.items.data[0]?.price?.id;
-        if (priceId !== CONCURRENCY_PRICE_ID) return c.json({ received: true });
         const user = await getUserByStripeCustomerId(sub.customer);
         if (!user) return c.json({ received: true });
-        await setExtraConcurrencySlots(user.id, user.extra_concurrency_slots + 1);
-        await setConcurrencySubId(user.id, sub.id);
+        if (priceId && priceId in SUBSCRIPTION_TIERS) {
+          const tier = SUBSCRIPTION_TIERS[priceId];
+          const live = sub.status === "active" || sub.status === "trialing";
+          await setSubscriptionTier(user.id, live ? tier.tier : null, live ? tier.concurrency : 0, live ? sub.id : null);
+        } else if (priceId === CONCURRENCY_PRICE_ID && event.type === "customer.subscription.created") {
+          await setExtraConcurrencySlots(user.id, user.extra_concurrency_slots + 1);
+          await setConcurrencySubId(user.id, sub.id);
+        }
       }
       if (event.type === "customer.subscription.deleted") {
         const sub = event.data.object;
         const priceId = sub.items.data[0]?.price?.id;
-        if (priceId !== CONCURRENCY_PRICE_ID) return c.json({ received: true });
         const user = await getUserByStripeCustomerId(sub.customer);
         if (!user) return c.json({ received: true });
-        await setExtraConcurrencySlots(user.id, Math.max(0, user.extra_concurrency_slots - 1));
-        await setConcurrencySubId(user.id, null);
+        if (priceId && priceId in SUBSCRIPTION_TIERS) {
+          await setSubscriptionTier(user.id, null, 0, null);
+        } else if (priceId === CONCURRENCY_PRICE_ID) {
+          await setExtraConcurrencySlots(user.id, Math.max(0, user.extra_concurrency_slots - 1));
+          await setConcurrencySubId(user.id, null);
+        }
       }
       return c.json({ received: true });
     });
@@ -28106,102 +28133,15 @@ var init_site_audit_worker = __esm({
   }
 });
 
-// src/api/billing-schemas.ts
-var import_zod28, BillingCheckoutBodySchema, FreeCreditBreakdownSchema, BillingBalanceResponseSchema, MonthlyRefreshSweepResultSchema;
-var init_billing_schemas = __esm({
-  "src/api/billing-schemas.ts"() {
-    "use strict";
-    import_zod28 = require("zod");
-    BillingCheckoutBodySchema = import_zod28.z.object({
-      priceId: import_zod28.z.string().min(1)
-    });
-    FreeCreditBreakdownSchema = import_zod28.z.object({
-      signup_grant_mc: import_zod28.z.number().int().nonnegative(),
-      monthly_refresh_mc: import_zod28.z.number().int().nonnegative(),
-      total_free_mc: import_zod28.z.number().int().nonnegative(),
-      signup_grant_credits: import_zod28.z.number().nonnegative(),
-      monthly_refresh_credits: import_zod28.z.number().nonnegative(),
-      total_free_credits: import_zod28.z.number().nonnegative()
-    });
-    BillingBalanceResponseSchema = import_zod28.z.object({
-      balance_mc: import_zod28.z.number().int().nonnegative(),
-      balance_credits: import_zod28.z.number().nonnegative(),
-      free_credits: FreeCreditBreakdownSchema,
-      ledger: import_zod28.z.array(import_zod28.z.any())
-    });
-    MonthlyRefreshSweepResultSchema = import_zod28.z.object({
-      usersRefreshed: import_zod28.z.number().int().nonnegative(),
-      totalMcGranted: import_zod28.z.number().int().nonnegative()
-    });
-  }
-});
-
 // src/api/credit-operations.ts
-function monthKey(value = /* @__PURE__ */ new Date()) {
-  return value.toISOString().slice(0, 7);
-}
-function userCreatedBeforeThisMonth(user) {
-  return user.created_at.slice(0, 7) < monthKey();
-}
-async function grantSignupCredit(userId) {
-  if (await ledgerExistsForOperation(userId, LedgerOperation.SIGNUP_GRANT)) return;
-  await creditMc(userId, FREE_SIGNUP_MC, LedgerOperation.SIGNUP_GRANT, "Welcome to MCP Scraper");
+async function grantSignupCredit(_userId) {
+  return;
 }
 async function applyMonthlyFreeRefresh(user) {
-  if (!userCreatedBeforeThisMonth(user)) return user;
-  const claimed = await claimMonthlyFreeRefresh(user.id, monthKey());
-  if (!claimed) return user;
-  const balance = await creditMc(
-    user.id,
-    FREE_MONTHLY_REFRESH_MC,
-    LedgerOperation.MONTHLY_REFRESH,
-    "Monthly free credits"
-  );
-  return { ...user, balance_mc: balance };
+  return user;
 }
 async function runMonthlyRefreshSweep() {
-  const db = getDb();
-  const monthStart = /* @__PURE__ */ new Date();
-  monthStart.setUTCDate(1);
-  monthStart.setUTCHours(0, 0, 0, 0);
-  const monthStartIso = monthStart.toISOString();
-  const currentMonth = monthKey();
-  const res = await db.execute({
-    sql: `
-      SELECT * FROM users
-      WHERE created_at < ?
-        AND active = 1
-        AND id NOT IN (
-          SELECT user_id FROM free_credit_refreshes WHERE month = ?
-        )
-    `,
-    args: [monthStartIso, currentMonth]
-  });
-  const users = res.rows.map((r) => ({
-    id: Number(r.id),
-    email: String(r.email),
-    name: r.name != null ? String(r.name) : null,
-    api_key: String(r.api_key ?? ""),
-    key_active: Number(r.key_active ?? 1),
-    password_hash: r.password_hash != null ? String(r.password_hash) : null,
-    created_at: String(r.created_at),
-    active: Number(r.active),
-    stripe_customer_id: r.stripe_customer_id != null ? String(r.stripe_customer_id) : null,
-    balance_mc: Number(r.balance_mc ?? 0),
-    extra_concurrency_slots: Number(r.extra_concurrency_slots ?? 0),
-    concurrency_stripe_sub_id: r.concurrency_stripe_sub_id != null ? String(r.concurrency_stripe_sub_id) : null
-  }));
-  let usersRefreshed = 0;
-  let totalMcGranted = 0;
-  for (const user of users) {
-    const before = user.balance_mc;
-    const after = await applyMonthlyFreeRefresh(user);
-    if (after.balance_mc !== before) {
-      usersRefreshed++;
-      totalMcGranted += FREE_MONTHLY_REFRESH_MC;
-    }
-  }
-  return { usersRefreshed, totalMcGranted };
+  return { usersRefreshed: 0, totalMcGranted: 0 };
 }
 async function getFreeCreditBreakdown(userId) {
   const res = await getDb().execute({
@@ -28237,7 +28177,6 @@ var init_credit_operations = __esm({
     "use strict";
     init_db();
     init_rates();
-    init_db();
   }
 });
 
@@ -28587,7 +28526,6 @@ var init_server = __esm({
     init_db();
     import_stripe2 = __toESM(require("stripe"), 1);
     init_rates();
-    init_billing_schemas();
     init_server_schemas();
     init_schemas3();
     init_credit_operations();
@@ -28781,8 +28719,10 @@ var init_server = __esm({
         balance_mc: user.balance_mc,
         balance_credits: user.balance_mc / 1e3,
         extra_concurrency_slots: user.extra_concurrency_slots,
-        concurrency_limit: 1 + user.extra_concurrency_slots,
+        concurrency_limit: concurrencyLimitForUser(user),
         has_concurrency_sub: !!user.concurrency_stripe_sub_id,
+        subscription_tier: user.subscription_tier,
+        subscription_concurrency: user.subscription_concurrency,
         ...stats
       });
     });
@@ -29208,13 +29148,12 @@ var init_server = __esm({
       });
     });
     app.post("/billing/checkout", requireAllowedOrigin, sessionAuth, async (c) => {
+      return c.json({ error: "One-time credit packs are no longer available. Subscribe to a plan instead \u2014 use /billing/subscribe.", error_code: "packs_removed" }, 410);
+    });
+    app.post("/billing/concurrency/checkout", requireAllowedOrigin, sessionAuth, async (c) => {
       try {
         const user = c.get("sessionUser");
-        const raw = await c.req.json();
-        const parsed = BillingCheckoutBodySchema.safeParse(raw);
-        if (!parsed.success) return c.json({ error: "Invalid request" }, 400);
-        const { priceId } = parsed.data;
-        if (!(priceId in BALANCE_PRICE_IDS)) return c.json({ error: "Invalid price" }, 400);
+        if (user.concurrency_stripe_sub_id) return c.json({ error: "Already subscribed \u2014 cancel existing slot first to change." }, 409);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
         const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
@@ -29226,26 +29165,28 @@ var init_server = __esm({
         }
         const session = await stripeClient.checkout.sessions.create({
           customer: customerId,
-          mode: "payment",
-          line_items: [{ price: priceId, quantity: 1 }],
+          mode: "subscription",
+          line_items: [{ price: CONCURRENCY_PRICE_ID, quantity: 1 }],
           ui_mode: "embedded",
           automatic_tax: { enabled: true },
           billing_address_collection: "required",
           customer_update: { address: "auto", name: "auto" },
           tax_id_collection: { enabled: true },
-          return_url: `${appOrigin()}/billing?session_id={CHECKOUT_SESSION_ID}`
+          return_url: `${appOrigin()}/billing?slot_added=1`
         });
         return c.json({ clientSecret: session.client_secret });
       } catch (err) {
         const message = err instanceof Error ? err.message : "Unable to start checkout.";
-        console.error("[billing/checkout]", message);
+        console.error("[billing/concurrency/checkout]", message);
         return c.json({ error: message }, 500);
       }
     });
-    app.post("/billing/concurrency/checkout", requireAllowedOrigin, sessionAuth, async (c) => {
+    app.post("/billing/subscribe", requireAllowedOrigin, sessionAuth, async (c) => {
       try {
         const user = c.get("sessionUser");
-        if (user.concurrency_stripe_sub_id) return c.json({ error: "Already subscribed \u2014 cancel existing slot first to change." }, 409);
+        const raw = await c.req.json().catch(() => ({}));
+        const tier = SUBSCRIPTION_TIER_BY_KEY[String(raw.tier ?? "")];
+        if (!tier) return c.json({ error: "Invalid tier. Choose starter, growth, or scale." }, 400);
         const secret2 = process.env.STRIPE_SECRET_KEY?.trim();
         if (!secret2) return c.json({ error: "Stripe is not configured." }, 503);
         const stripeClient = new import_stripe2.default(secret2, { apiVersion: STRIPE_API_VERSION });
@@ -29255,21 +29196,33 @@ var init_server = __esm({
           customerId = customer.id;
           await setStripeCustomerId(user.id, customerId);
         }
+        if (user.subscription_id) {
+          const sub = await stripeClient.subscriptions.retrieve(user.subscription_id);
+          const itemId = sub.items.data[0]?.id;
+          if (itemId) {
+            await stripeClient.subscriptions.update(user.subscription_id, {
+              items: [{ id: itemId, price: tier.price_id }],
+              proration_behavior: "create_prorations"
+            });
+            return c.json({ updated: true, tier: tier.tier });
+          }
+        }
         const session = await stripeClient.checkout.sessions.create({
           customer: customerId,
           mode: "subscription",
-          line_items: [{ price: CONCURRENCY_PRICE_ID, quantity: 1 }],
+          line_items: [{ price: tier.price_id, quantity: 1 }],
+          ...tier.intro_coupon ? { discounts: [{ coupon: tier.intro_coupon }] } : {},
           ui_mode: "embedded",
           automatic_tax: { enabled: true },
           billing_address_collection: "required",
           customer_update: { address: "auto", name: "auto" },
           tax_id_collection: { enabled: true },
-          return_url: `${appOrigin()}/billing?slot_added=1`
+          return_url: `${appOrigin()}/billing?subscribed=${tier.tier}`
         });
         return c.json({ clientSecret: session.client_secret });
       } catch (err) {
-        const message = err instanceof Error ? err.message : "Unable to start checkout.";
-        console.error("[billing/concurrency/checkout]", message);
+        const message = err instanceof Error ? err.message : "Unable to start subscription.";
+        console.error("[billing/subscribe]", message);
         return c.json({ error: message }, 500);
       }
     });
@@ -29317,7 +29270,7 @@ var init_server = __esm({
             current_extra_slots: user.extra_concurrency_slots,
             current_limit: concurrencyLimitForUser(user),
             after_checkout_extra_slots: user.extra_concurrency_slots + 1,
-            after_checkout_limit: concurrencyLimitForUser({ extra_concurrency_slots: user.extra_concurrency_slots + 1 })
+            after_checkout_limit: concurrencyLimitForUser({ extra_concurrency_slots: user.extra_concurrency_slots + 1, subscription_concurrency: user.subscription_concurrency })
           },
           next_step: "Open checkout_url in a browser, complete checkout, then restart or retry the MCP request."
         });