Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"check:no-linked-sdk": "node scripts/check-no-linked-sdk.mjs"
},
"dependencies": {
"@rendobar/sdk": "^2.0.0",
"@rendobar/sdk": "^3.0.0",
"citty": "^0.2.0",
"picocolors": "^1.1.1",
"@clack/prompts": "^1.2.0"
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/__tests__/ffmpeg-command.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe("ffmpeg command flow", () => {
const rawArgs = ["-i", localPath, "-vf", "scale=640:480", "output.mp4"];
const parsed = parseFfmpegArgs(rawArgs);
const mockClient = {
uploads: { upload: mock(() => Promise.resolve({ downloadUrl: "https://cdn.rendobar.com/uploads/abc.mp4" })) },
uploads: { create: mock(() => Promise.resolve({ url: "https://cdn.rendobar.com/uploads/abc.mp4" })) },
} as unknown as Parameters<typeof uploadLocalFiles>[2];
const rewritten = await uploadLocalFiles(rawArgs, parsed.inputs, mockClient);
const commandString = "ffmpeg " + rewritten.join(" ");
Expand All @@ -52,7 +52,7 @@ describe("ffmpeg command flow", () => {
const rawArgs = ["-i", localPath, "-c:v", "libx264", "-crf", "23", "output.mp4"];
const parsed = parseFfmpegArgs(rawArgs);
const mockClient = {
uploads: { upload: mock(() => Promise.resolve({ downloadUrl: "https://cdn.rendobar.com/uploads/xyz.mp4" })) },
uploads: { create: mock(() => Promise.resolve({ url: "https://cdn.rendobar.com/uploads/xyz.mp4" })) },
} as unknown as Parameters<typeof uploadLocalFiles>[2];
const rewritten = await uploadLocalFiles(rawArgs, parsed.inputs, mockClient);

Expand All @@ -78,16 +78,16 @@ describe("ffmpeg command flow", () => {
let callIdx = 0;
const mockClient = {
uploads: {
upload: mock(async () => {
create: mock(async () => {
callIdx++;
return { downloadUrl: `https://cdn.rendobar.com/uploads/file${callIdx}.mp4` };
return { url: `https://cdn.rendobar.com/uploads/file${callIdx}.mp4` };
}),
},
} as unknown as Parameters<typeof uploadLocalFiles>[2];

const rewritten = await uploadLocalFiles(rawArgs, parsed.inputs, mockClient);

expect(mockClient.uploads.upload).toHaveBeenCalledTimes(2);
expect(mockClient.uploads.create).toHaveBeenCalledTimes(2);
expect(rewritten[1]).toContain("cdn.rendobar.com");
expect(rewritten[3]).toContain("cdn.rendobar.com");
// Filter complex preserved
Expand All @@ -103,13 +103,13 @@ describe("ffmpeg command flow", () => {
expect(parsed.inputs[1]!.isLocal).toBe(true);

const mockClient = {
uploads: { upload: mock(() => Promise.resolve({ downloadUrl: "https://cdn.rendobar.com/uploads/local.png" })) },
uploads: { create: mock(() => Promise.resolve({ url: "https://cdn.rendobar.com/uploads/local.png" })) },
} as unknown as Parameters<typeof uploadLocalFiles>[2];

const rewritten = await uploadLocalFiles(rawArgs, parsed.inputs, mockClient);

// Only one upload call (the local file)
expect(mockClient.uploads.upload).toHaveBeenCalledTimes(1);
expect(mockClient.uploads.create).toHaveBeenCalledTimes(1);
// Remote URL preserved
expect(rewritten[1]).toBe("https://example.com/bg.mp4");
// Local file replaced
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/upload.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ describe("uploadLocalFiles", () => {

it("uploads local files and replaces paths in args", async () => {
const localPath = createTempFile("video.mp4");
const mockUpload = mock(() => Promise.resolve({ downloadUrl: "https://cdn.rendobar.com/uploads/abc123.mp4" }));
const mockClient = { uploads: { upload: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];
const mockUpload = mock(() => Promise.resolve({ url: "https://cdn.rendobar.com/uploads/abc123.mp4" }));
const mockClient = { uploads: { create: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];

const args = ["-i", localPath, "-vf", "scale=1280:720", "output.mp4"];
const inputs = [{ index: 1, value: localPath, isLocal: true }];
Expand All @@ -43,9 +43,9 @@ describe("uploadLocalFiles", () => {
let callCount = 0;
const mockUpload = mock(async () => {
callCount++;
return { downloadUrl: `https://cdn.rendobar.com/uploads/file${callCount}.mp4` };
return { url: `https://cdn.rendobar.com/uploads/file${callCount}.mp4` };
});
const mockClient = { uploads: { upload: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];
const mockClient = { uploads: { create: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];

const args = ["-i", pathA, "-i", pathB, "output.mp4"];
const inputs = [
Expand All @@ -61,8 +61,8 @@ describe("uploadLocalFiles", () => {
});

it("skips URL inputs (no upload needed)", async () => {
const mockUpload = mock(() => Promise.resolve({ downloadUrl: "" }));
const mockClient = { uploads: { upload: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];
const mockUpload = mock(() => Promise.resolve({ url: "" }));
const mockClient = { uploads: { create: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];

const args = ["-i", "https://example.com/video.mp4", "output.mp4"];
const inputs = [{ index: 1, value: "https://example.com/video.mp4", isLocal: false }];
Expand All @@ -74,8 +74,8 @@ describe("uploadLocalFiles", () => {
});

it("throws when local file does not exist", async () => {
const mockUpload = mock(() => Promise.resolve({ downloadUrl: "" }));
const mockClient = { uploads: { upload: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];
const mockUpload = mock(() => Promise.resolve({ url: "" }));
const mockClient = { uploads: { create: mockUpload } } as unknown as Parameters<typeof uploadLocalFiles>[2];

const args = ["-i", "/nonexistent/file.mp4", "output.mp4"];
const inputs = [{ index: 1, value: "/nonexistent/file.mp4", isLocal: true }];
Expand Down
4 changes: 2 additions & 2 deletions src/lib/upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ export async function uploadLocalFiles(
const filename = path.basename(input.value);

callbacks?.onFileStart?.(filename, file.size, i, total);
const { downloadUrl } = await client.uploads.upload(new Uint8Array(buffer), { filename });
const asset = await client.uploads.create(new Uint8Array(buffer), { filename });
callbacks?.onFileDone?.(filename, i, total);

result[input.index] = downloadUrl;
result[input.index] = asset.url;
}

return result;
Expand Down