Properly handle multiple jobs per report

This commit is contained in:
Regalijan 2024-03-24 03:05:53 -04:00
parent 55469939d5
commit d3f5a1ab8d
Signed by: regalijan
GPG Key ID: 5D4196DA269EF520
3 changed files with 60 additions and 10 deletions

45
functions/api/coconut.ts Normal file
View File

@ -0,0 +1,45 @@
import { jsonError } from "../common.js";
export async function onRequestPost(context: RequestContext) {
const { searchParams } = new URL(context.request.url);
const id = searchParams.get("attachment");
const token = searchParams.get("token");
if (!id || !token) return jsonError("Invalid report id or token", 400);
const coconutData: { token: string } | null = await context.env.DATA.get(
`coconutjob_${id}`,
{ type: "json" },
);
if (!coconutData)
return jsonError("Request is stale or otherwise invalid", 400);
if (coconutData.token !== token) return jsonError("Forbidden", 403);
await context.env.DATA.delete(`coconutjob_${id}`);
const { event } = await context.request.json();
if (event === "job.failed") {
await fetch(context.env.REPORTS_WEBHOOK, {
body: JSON.stringify({
embeds: [
{
title: "Transcoding Failed",
color: 16711680,
description: `Attachment ${id} could not be transcoded, please log in to Coconut to see what went wrong.`,
},
],
}),
headers: {
"content-type": "application/json",
},
method: "POST",
});
}
return new Response(null, {
status: 204,
});
}

View File

@ -21,18 +21,19 @@ export async function onRequestPost(context: RequestContext) {
if (!value) return jsonError("Report is missing", 500); if (!value) return jsonError("Report is missing", 500);
const coconutData = (await context.env.DATA.get(`coconutjob_${id}`, { const coconutData = (await context.env.DATA.get(`coconutdata_${id}`, {
type: "json", type: "json",
})) as { })) as {
attachments: string[]; attachments: string[];
token: string;
} | null; } | null;
if (coconutData) { if (coconutData) {
const coconutResponsePromises = []; const responsePromises = [];
for (const attachment of coconutData.attachments) for (const attachment of coconutData.attachments) {
coconutResponsePromises.push( const token = crypto.randomUUID();
responsePromises.push(
fetch("https://api.coconut.co/v2/jobs", { fetch("https://api.coconut.co/v2/jobs", {
body: JSON.stringify({ body: JSON.stringify({
input: { input: {
@ -48,8 +49,8 @@ export async function onRequestPost(context: RequestContext) {
}, },
notification: { notification: {
params: { params: {
report_id: id, attachment: attachment,
token: coconutData.token, token,
}, },
type: "http", type: "http",
url: `https://${context.request.headers.get("host")}/api/coconut`, url: `https://${context.request.headers.get("host")}/api/coconut`,
@ -76,9 +77,14 @@ export async function onRequestPost(context: RequestContext) {
}, },
method: "POST", method: "POST",
}), }),
context.env.DATA.put(`coconutjob_${attachment}`, token, {
expirationTtl: 600,
}),
); );
}
await Promise.allSettled(coconutResponsePromises); await Promise.allSettled(responsePromises);
await context.env.DATA.delete(`coconutdata_${id}`);
} }
if (context.env.REPORTS_WEBHOOK) { if (context.env.REPORTS_WEBHOOK) {

View File

@ -180,10 +180,9 @@ export async function onRequestPost(context: RequestContext) {
const { current_user: currentUser } = context.data; const { current_user: currentUser } = context.data;
if (filesToProcess.length) if (filesToProcess.length)
await context.env.DATA.put( await context.env.DATA.put(
`coconutjob_${reportId}`, `coconutdata_${reportId}`,
JSON.stringify({ JSON.stringify({
attachments: filesToProcess, attachments: filesToProcess,
token: crypto.randomUUID(),
}), }),
{ {
expirationTtl: 1800, expirationTtl: 1800,