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

Actually do what coconut was asking me to

Browse Source
This commit is contained in:
Regalijan 2024-03-26 03:55:49 -04:00
parent 65b33e4c94
commit 6b85d517ca
Signed by: regalijan
GPG Key ID: 5D4196DA269EF520
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
functions/api/coconut.ts
View File

@ -1,12 +1,15 @@
import { AwsClient } from "aws4fetch";
import { jsonError } from "../common.js";
export async function onRequestPost(context: RequestContext) {
const { searchParams } = new URL(context.request.url);
const id = searchParams.get("attachment");
const attachment = searchParams.get("attachment");
const token = searchParams.get("token");
if (!id || !token) return jsonError("Invalid report id or token", 400);
if (!attachment || !token)
return jsonError("Invalid report id or token", 400);
const id = attachment.replace(/\.mp4$/, "");
const coconutData: { token: string } | null = await context.env.DATA.get(
`coconutjob_${id}`,
{ type: "json" },
@ -19,6 +22,11 @@ export async function onRequestPost(context: RequestContext) {
await context.env.DATA.delete(`coconutjob_${id}`);
const aws = new AwsClient({
accessKeyId: context.env.R2_ACCESS_KEY,
secretAccessKey: context.env.R2_SECRET_KEY,
});
const { event } = await context.request.json();
if (event === "job.failed") {
@ -37,6 +45,17 @@ export async function onRequestPost(context: RequestContext) {
},
method: "POST",
});
} else {
const R2_URL = `https://car-crushers.${context.env.R2_ZONE}.r2.cloudflarestorage.com`;
await aws.fetch(`${R2_URL}/${id}`, {
headers: {
"x-amz-copy-source": `car-crushers/${attachment}`,
},
method: "PUT",
});
await aws.fetch(`${R2_URL}/${attachment}`, {
method: "DELETE",
});
}
return new Response(null, {

13
functions/api/reports/complete.ts
View File

@ -29,15 +29,6 @@ export async function onRequestPost(context: RequestContext) {
if (coconutData) {
const responsePromises = [];
const contentTypes: { [k: string]: string } = {
gif: "image/gif",
m4v: "video/x-m4v",
mkv: "video/x-matroska",
mov: "video/mp4",
mp4: "video/mp4",
webm: "video/webm",
wmv: "video/x-ms-wmv",
};
for (const attachment of coconutData.attachments) {
const token = crypto.randomUUID();
@ -57,7 +48,7 @@ export async function onRequestPost(context: RequestContext) {
secret_access_key: context.env.R2_SECRET_KEY,
},
endpoint: `https://${context.env.R2_ZONE}.r2.cloudflarestorage.com`,
key: `/t/${attachment}.${contentTypes[objectMeta.httpMetadata?.contentType as string]}`,
key: `/t/${attachment}`,
region: "us-east-1",
service: "s3other",
},
@ -71,7 +62,7 @@ export async function onRequestPost(context: RequestContext) {
},
outputs: {
mp4: {
path: `/${attachment}`,
path: `/${attachment}.mp4`,
},
},
storage: {