regalijan/car-crushers-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file copy not working

Browse Source
This commit is contained in:
Regalijan 2024-03-26 23:32:20 -04:00
parent cbfa13e426
commit 8d6e631abd
Signed by: regalijan
GPG Key ID: 5D4196DA269EF520
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
functions/api/coconut.ts
View File

@ -9,9 +9,8 @@ export async function onRequestPost(context: RequestContext) {
if (!attachment || !token) if (!attachment || !token)
return jsonError("Invalid report id or token", 400); return jsonError("Invalid report id or token", 400);
const id = attachment.replace(/\.mp4$/, "");
const coconutToken: string | null = await context.env.DATA.get( const coconutToken: string | null = await context.env.DATA.get(
`coconutjob_${id}`, `coconutjob_${attachment}`,
); );
if (!coconutToken) if (!coconutToken)
@ -19,14 +18,14 @@ export async function onRequestPost(context: RequestContext) {
if (coconutToken !== token) return jsonError("Forbidden", 403); if (coconutToken !== token) return jsonError("Forbidden", 403);
await context.env.DATA.delete(`coconutjob_${id}`); await context.env.DATA.delete(`coconutjob_${attachment}`);
const aws = new AwsClient({ const aws = new AwsClient({
accessKeyId: context.env.R2_ACCESS_KEY, accessKeyId: context.env.R2_ACCESS_KEY,
secretAccessKey: context.env.R2_SECRET_KEY, secretAccessKey: context.env.R2_SECRET_KEY,
}); });
const { event } = await context.request.json(); const { data, event } = await context.request.json();
if (event === "job.failed") { if (event === "job.failed") {
await fetch(context.env.REPORTS_WEBHOOK, { await fetch(context.env.REPORTS_WEBHOOK, {
@ -35,7 +34,7 @@ export async function onRequestPost(context: RequestContext) {
{ {
title: "Transcoding Failed", title: "Transcoding Failed",
color: 16711680, color: 16711680,
description: `Attachment ${id} could not be transcoded, please log in to Coconut to see what went wrong.`, description: `Attachment ${attachment} could not be transcoded, please log in to Coconut to see what went wrong.`,
}, },
], ],
}), }),
@ -46,16 +45,20 @@ export async function onRequestPost(context: RequestContext) {
}); });
} else { } else {
const R2_URL = `https://car-crushers.${context.env.R2_ZONE}.r2.cloudflarestorage.com`; const R2_URL = `https://car-crushers.${context.env.R2_ZONE}.r2.cloudflarestorage.com`;
await aws.fetch(`${R2_URL}/${id}`, { const copyResp = await aws.fetch(`${R2_URL}/${attachment}`, {
headers: { headers: {
"x-amz-copy-source": `/car-crushers/${attachment}`, "x-amz-copy-source": `/car-crushers/${attachment}.mp4`,
"x-amz-metadata-directive": "COPY", "x-amz-metadata-directive": "COPY",
}, },
method: "PUT", method: "PUT",
}); });
await aws.fetch(`${R2_URL}/${attachment}`, {
method: "DELETE", await context.env.R2.delete(attachment);
});
if (!copyResp.ok)
console.log(
`Copy status: ${copyResp.status}\n\nCopy response body: ${await copyResp.text()}`,
);
} }
return new Response(null, { return new Response(null, {