Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Merge main into fix/retry-blocked-desktop-recordings and use a kebab-case panel file

Richie McIlroy8ee63ea301ac
diff --cc apps/web/app/admin/retry-recordings/page.tsx
index 03aead2da,000000000..c0728c551
mode 100644,000000..100644
--- a/apps/web/app/admin/retry-recordings/page.tsx
+++ b/apps/web/app/admin/retry-recordings/page.tsx
@@@ -1,13 -1,0 +1,13 @@@
+import { buildEnv } from "@cap/env";
+import { notFound } from "next/navigation";
+import { getViewerContext } from "@/lib/messenger/data";
- import { RetryRecordingsPanel } from "./RetryRecordingsPanel";
++import { RetryRecordingsPanel } from "./retry-recordings-panel";
+
+export default async function RetryRecordingsPage() {
+ if (buildEnv.NEXT_PUBLIC_IS_CAP !== "true") notFound();
+
+ const viewer = await getViewerContext();
+ if (!viewer.user || !viewer.isAdmin) notFound();
+
+ return <RetryRecordingsPanel />;
+}
diff --cc apps/web/app/admin/retry-recordings/retry-recordings-panel.tsx
index c9eff7623,000000000..c9eff7623
mode 100644,000000..100644
--- a/apps/web/app/admin/retry-recordings/retry-recordings-panel.tsx
+++ b/apps/web/app/admin/retry-recordings/retry-recordings-panel.tsx
diff --cc apps/web/lib/desktop-recording-jobs.ts
index 434a6d175,a46f632b1..c6c6c876a
--- a/apps/web/lib/desktop-recording-jobs.ts
+++ b/apps/web/lib/desktop-recording-jobs.ts
@@@ -29,7 -28,7 +29,10 @@@ import
type RecordingVerification,
recordingVerificationSchema,
} from "@/lib/desktop-recording-verification";
- import { recordingBudgetKey } from "@/lib/media-processing-budget";
-import { RECORDING_PROCESSING_ATTEMPTS } from "@/lib/media-processing-budget";
++import {
++ RECORDING_PROCESSING_ATTEMPTS,
++ recordingBudgetKey,
++} from "@/lib/media-processing-budget";
export const DESKTOP_RECORDING_LEASE_MS = 5 * 60 * 1_000;
export const DESKTOP_RECORDING_SOURCE_RETRY_MS = 60 * 60 * 1_000;
diff --cc apps/web/lib/media-processing-budget.ts
index 4bbe732d1,06fb214b1..b8db3488e
--- a/apps/web/lib/media-processing-budget.ts
+++ b/apps/web/lib/media-processing-budget.ts
@@@ -13,9 -13,10 +13,13 @@@ export class MediaProcessingBudgetErro
const key = (parts: string[]) =>
createHash("sha256").update(JSON.stringify(parts)).digest("hex");
+export const recordingBudgetKey = (videoId: string, generation: string) =>
+ key(["recording", videoId, generation]);
+
+ // A recording's transfer budget covers every automatic attempt, so the attempt limit (not the
+ // budget) decides when processing stops. Media workers read sources in-region, so retries cost time, not egress.
+ export const RECORDING_PROCESSING_ATTEMPTS = 5;
+
export function getMediaProcessingReservation(sourceBytes: number) {
if (
!Number.isSafeInteger(sourceBytes) ||