Skip to content

Open source CapCut alternative.

TypeScript

feat(site): analytics rollup carries each user's cloud storage and quota

David Le14b03d68e1a7
diff --git a/site/src/app/su/analytics/page.tsx b/site/src/app/su/analytics/page.tsx
index 0d24b8a7..d688eb8b 100644
--- a/site/src/app/su/analytics/page.tsx
+++ b/site/src/app/su/analytics/page.tsx
@@ -42,6 +42,20 @@ function formatMicros(micros: bigint): string {
return `$${(Number(micros) / 1e6).toLocaleString("en-US", { maximumFractionDigits: 2 })}`;
}
+function formatGb(bytes: number): string {
+ return `${(bytes / 1024 ** 3).toFixed(2)} GB`;
+}
+
+// Storage colored by how close the account sits to its quota: orange from
+// 80% up, red at or past the ceiling. Unlimited accounts stay neutral.
+function storageTone(bytes: number, quotaBytes: number | null | undefined): string {
+ if (quotaBytes === null || quotaBytes === undefined || quotaBytes <= 0) return "";
+ const ratio = bytes / quotaBytes;
+ if (ratio >= 1) return "text-red-600 dark:text-red-500";
+ if (ratio >= 0.8) return "text-orange-600 dark:text-orange-400";
+ return "";
+}
+
// Activity is null for a day the pipeline never extracted: the masks are
// empty because there was nothing to read, which is not the same as a day
// nobody worked. Those days leave a gap in the charts and an unknown dot in
@@ -533,6 +547,19 @@ function ActivityGrid({
· paid {formatMicros(BigInt(user.fundedMicros))}
</span>
)}
+ {user.storageBytes !== undefined && (
+ <span
+ className={storageTone(Number(user.storageBytes), user.storageQuotaBytes)}
+ title={
+ user.storageQuotaBytes == null
+ ? "unlimited storage"
+ : `of ${formatGb(user.storageQuotaBytes)}`
+ }
+ >
+ {" "}
+ · {formatGb(Number(user.storageBytes))}
+ </span>
+ )}
</span>
</td>
{columns.map(({ day, i }) => (
diff --git a/site/src/lib/analytics/pipeline.ts b/site/src/lib/analytics/pipeline.ts
index f71cd34b..7fa69df5 100644
--- a/site/src/lib/analytics/pipeline.ts
+++ b/site/src/lib/analytics/pipeline.ts
@@ -23,6 +23,7 @@ import {
type AnalyticsSnapshotFile,
utcDayOf,
} from "@/lib/analytics/schema";
+import { cutLimitsForTier } from "@/cut/server/cloud/limits";
import { isActiveProStatus } from "@/lib/billing/pro-subscription";
import { REFERRAL_SOURCES } from "@/lib/onboarding/sequence";
import { prisma } from "@/lib/prisma";
@@ -233,6 +234,20 @@ async function writeSnapshot(): Promise<AnalyticsSnapshotFile> {
userId: account.userId,
}));
+ // CutStorageUsage keys on userId, so it pages on that column.
+ const storage: { bytes: string; userId: string }[] = [];
+ for (let cursor: string | undefined; ; ) {
+ const page = await prisma.cutStorageUsage.findMany({
+ orderBy: { userId: "asc" },
+ select: { bytes: true, userId: true },
+ take: SNAPSHOT_PAGE_SIZE,
+ ...(cursor === undefined ? {} : { cursor: { userId: cursor }, skip: 1 }),
+ });
+ storage.push(...page.map((row) => ({ bytes: row.bytes.toString(), userId: row.userId })));
+ if (page.length < SNAPSHOT_PAGE_SIZE) break;
+ cursor = page[page.length - 1].userId;
+ }
+
const subscriptions = (
await fetchAllPages((cursorArgs) =>
prisma.proSubscription.findMany({
@@ -269,6 +284,7 @@ async function writeSnapshot(): Promise<AnalyticsSnapshotFile> {
balances,
generatedAt: new Date().toISOString(),
payments,
+ storage,
subscriptions,
users,
version: 1,
@@ -334,9 +350,14 @@ async function consolidate(
(fundedByUser.get(payment.userId) ?? BigInt(0)) + BigInt(payment.amountMicros),
);
}
+ const storageByUser = new Map((snapshot.storage ?? []).map((s) => [s.userId, s.bytes]));
+ const proUsers = new Set(
+ snapshot.subscriptions.filter((sub) => isActiveProStatus(sub.status)).map((sub) => sub.userId),
+ );
const users = snapshot.users
.map((u) => {
const funded = fundedByUser.get(u.id);
+ const limits = cutLimitsForTier({ superUser: u.superUser === true, pro: proUsers.has(u.id) });
return {
activity: masks.get(u.id) ?? days.map(() => 0),
balanceMicros: balanceByUser.get(u.id) ?? "0",
@@ -345,6 +366,8 @@ async function consolidate(
id: u.id,
name: u.name,
registeredAt: u.createdAt,
+ storageBytes: storageByUser.get(u.id) ?? "0",
+ storageQuotaBytes: limits.storageBytes,
...(u.superUser ? { superUser: true } : {}),
};
})
diff --git a/site/src/lib/analytics/schema.ts b/site/src/lib/analytics/schema.ts
index c3606494..477c5c25 100644
--- a/site/src/lib/analytics/schema.ts
+++ b/site/src/lib/analytics/schema.ts
@@ -80,6 +80,9 @@ export const analyticsSnapshotFileSchema = z.object({
}),
),
balances: z.array(z.object({ userId: z.string(), balanceMicros: z.string() })),
+ // Cloud storage counters: bytes held in R2 per user, as decimal strings.
+ // Absent from snapshots written before this shipped.
+ storage: z.array(z.object({ userId: z.string(), bytes: z.string() })).optional(),
// Every Donkey Pro subscription row, whatever its Stripe status.
subscriptions: z.array(
z.object({
@@ -164,6 +167,10 @@ export const analyticsRollupSchema = z.object({
// All-time paid Stripe grants, BigInt micros as a decimal string. Absent
// for users who never paid and in rollups written before this shipped.
fundedMicros: z.string().optional(),
+ // Cloud storage held in R2, and the account's quota at consolidation
+ // (null = unlimited). Absent from rollups written before this shipped.
+ storageBytes: z.string().optional(),
+ storageQuotaBytes: z.number().nullable().optional(),
// True for accounts with the super-user role.
superUser: z.boolean().optional(),
// One mask per entry of days; a dot is mask !== 0.