Merge pull request #1820 from CapSoftware/basic-web-editor

Web video trimming and cuts

Author: richiemcilroy

apps/media-server/src/__tests__/lib/ffmpeg-edit.test.ts

@@ -0,0 +1,70 @@
+import { describe, expect, test } from "bun:test";
+import {
+	buildStreamCopySegmentArgs,
+	buildTranscodeSegmentArgs,
+	normalizeEditRanges,
+} from "../../lib/ffmpeg-edit";
+
+describe("ffmpeg edit helpers", () => {
+	test("normalizes edit ranges", () => {
+		expect(
+			normalizeEditRanges(
+				[
+					{ start: 3, end: 5 },
+					{ start: -1, end: 0.01 },
+					{ start: 8, end: 12 },
+				],
+				10,
+			),
+		).toEqual([
+			{ start: 3, end: 5 },
+			{ start: 8, end: 10 },
+		]);
+	});
+
+	test("builds stream-copy segment args", () => {
+		const args = buildStreamCopySegmentArgs(
+			"/input.mp4",
+			{
+				start: 1,
+				end: 3.25,
+			},
+			"/segment.mp4",
+		);
+
+		expect(args).toContain("copy");
+		expect(args).toContain("-avoid_negative_ts");
+		expect(args).toContain("2.250");
+	});
+
+	test("builds no-audio transcode args", () => {
+		const args = buildTranscodeSegmentArgs(
+			"/input.mp4",
+			{ start: 0, end: 1 },
+			"/segment.mp4",
+			false,
+		);
+
+		expect(args).toContain("libx264");
+		expect(args).toContain(
+			"[0:v:0]fps=30,trim=start=0.000:end=1.000,setpts=PTS-STARTPTS[v]",
+		);
+		expect(args).toContain("-an");
+		expect(args).not.toContain("0:a:0?");
+	});
+
+	test("builds audio transcode args", () => {
+		const args = buildTranscodeSegmentArgs(
+			"/input.mp4",
+			{ start: 0, end: 1 },
+			"/segment.mp4",
+			true,
+		);
+
+		expect(args).toContain("aac");
+		expect(args).toContain(
+			"[0:v:0]fps=30,trim=start=0.000:end=1.000,setpts=PTS-STARTPTS[v];[0:a:0]atrim=start=0.000:end=1.000,asetpts=PTS-STARTPTS[a]",
+		);
+		expect(args).toContain("[a]");
+	});
+});

apps/media-server/src/__tests__/routes/video.test.ts

@@ -465,6 +465,113 @@ describe("POST /video/process", () => {
 	});
 });
 
+describe("POST /video/edit", () => {
+	beforeEach(() => {
+		mock.restore();
+	});
+
+	test("returns 401 without media server secret", async () => {
+		const response = await app.fetch(
+			unauthenticatedVideoPostRequest("/video/edit", {
+				videoId: "test-id",
+				userId: "user-id",
+				sourceUrl: "https://example.com/source.mp4",
+				outputPresignedUrl: "https://s3.example.com/output",
+				keepRanges: [{ start: 0, end: 1 }],
+			}),
+		);
+
+		expect(response.status).toBe(401);
+	});
+
+	test("returns 400 for invalid JSON", async () => {
+		const response = await app.fetch(
+			new Request("http://localhost/video/edit", {
+				method: "POST",
+				headers: AUTH_HEADERS,
+				body: "{",
+			}),
+		);
+
+		expect(response.status).toBe(400);
+		const data = await response.json();
+		expect(data.code).toBe("INVALID_REQUEST");
+	});
+
+	test("returns 400 for missing keep ranges", async () => {
+		const response = await app.fetch(
+			videoPostRequest("/video/edit", {
+				videoId: "test-id",
+				userId: "user-id",
+				sourceUrl: "https://example.com/source.mp4",
+				outputPresignedUrl: "https://s3.example.com/output",
+			}),
+		);
+
+		expect(response.status).toBe(400);
+		const data = await response.json();
+		expect(data.code).toBe("INVALID_REQUEST");
+	});
+
+	test("returns 400 for invalid ranges", async () => {
+		const response = await app.fetch(
+			videoPostRequest("/video/edit", {
+				videoId: "test-id",
+				userId: "user-id",
+				sourceUrl: "https://example.com/source.mp4",
+				outputPresignedUrl: "https://s3.example.com/output",
+				keepRanges: [{ start: 3, end: 1 }],
+			}),
+		);
+
+		expect(response.status).toBe(400);
+		const data = await response.json();
+		expect(data.code).toBe("INVALID_REQUEST");
+	});
+
+	test("returns jobId when edit starts successfully", async () => {
+		mock.module("../../lib/job-manager", () => ({
+			canAcceptNewVideoProcess: () => true,
+			getActiveVideoProcessCount: () => 0,
+			getMaxConcurrentVideoProcesses: () => 3,
+			getSystemResources: jobManager.getSystemResources,
+			getAllJobs: () => [],
+			generateJobId: () => "edit-job-id",
+			createJob: () => ({
+				jobId: "edit-job-id",
+				videoId: "test-id",
+				userId: "user-id",
+				phase: "queued",
+				progress: 0,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+			}),
+			getJob: () => null,
+			updateJob: () => null,
+			deleteJob: () => {},
+			sendWebhook: async () => {},
+			getJobProgress: jobManager.getJobProgress,
+		}));
+
+		const { default: appWithMock } = await import("../../app");
+
+		const response = await appWithMock.fetch(
+			videoPostRequest("/video/edit", {
+				videoId: "test-id",
+				userId: "user-id",
+				sourceUrl: "https://example.com/source.mp4",
+				outputPresignedUrl: "https://s3.example.com/output",
+				keepRanges: [{ start: 0, end: 1 }],
+			}),
+		);
+
+		expect(response.status).toBe(200);
+		const data = await response.json();
+		expect(data.jobId).toBe("edit-job-id");
+		expect(data.status).toBe("queued");
+	});
+});
+
 describe("GET /video/process/:jobId/status", () => {
 	beforeEach(() => {
 		mock.restore();

apps/media-server/src/app.ts

@@ -27,6 +27,7 @@ app.get("/", (c) => {
 			"/video/thumbnail",
 			"/video/convert",
 			"/video/process",
+			"/video/edit",
 			"/video/process/:jobId/status",
 			"/video/process/:jobId/cancel",
 			"/video/cleanup",