Upload processed audio tracks to S3

server/api/admin/track.delete.ts

@@ -2,7 +2,7 @@ import { getQuery, setResponseStatus } from "h3"
 import { Track } from "../../models/track"
 import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
-import { tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
+import { tryDeleteObjectPrefix } from "../../utils/object-storage"
 
 export default defineAuthenticatedEventHandler(async (event) => {
 	await requireAuthenticatedUser(event, true)
@@ -14,6 +14,6 @@ export default defineAuthenticatedEventHandler(async (event) => {
 		setResponseStatus(event, 404)
 		return {}
 	}
-	void tryCleanUploadFileOrDirectory(event, track.fileDir)
+	await tryDeleteObjectPrefix(event, `${track.fileDir}/`)
 	return {}
 })

server/api/admin/track.patch.ts

@@ -1,9 +1,8 @@
-import path from "node:path"
 import mongoose from "mongoose"
 import { getQuery } from "h3"
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, safeFileExtension, parseOptionalJson, splitIds } from "../../utils/admin-form"
-import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
-import { getAudioDuration, processAudioFile } from "../../utils/audio-files"
+import { prepareAudioUpload } from "../../utils/audio-files"
+import { putObjects, tryDeleteObjectPrefix } from "../../utils/object-storage"
 import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { parseMongoId, validationResponse } from "../../utils/api-validation"
 import { Track } from "../../models/track"
@@ -28,29 +27,42 @@ export default defineAuthenticatedEventHandler(async (event) => {
 		setResponseStatus(event, 400)
 		return { message: "One or more ID(s) are invalid" }
 	}
+	const parsedLyrics = lyrics ? parseOptionalJson(lyrics) : undefined
+	if (parsedLyrics && !parsedLyrics.ok) throw new Error("Invalid lyrics JSON")
 
 	const track = await Track.findById(parsedId.value)
 	if (!track) {
 		setResponseStatus(event, 404)
 		return {}
 	}
+	let replacementDirectory: string | undefined
+	let previousDirectory: string | undefined
 	if (file) {
-		void tryCleanUploadFileOrDirectory(event, track.fileDir)
-		const relativeFilePath = `tracks/${crypto.randomUUID()}/original.${safeFileExtension(file.name)}`
-		await saveUploadFile(event, relativeFilePath, file.data)
-		const duration = await getAudioDuration(event, relativeFilePath)
-		void processAudioFile(event, relativeFilePath).catch((error) => console.error(error))
-		track.fileDir = path.dirname(relativeFilePath)
-		track.durationInSeconds = Math.round(duration)
+		replacementDirectory = `tracks/${crypto.randomUUID()}`
+		const extension = safeFileExtension(file.name)
+		const processed = await prepareAudioUpload(file.data, extension)
+		await putObjects(event, [
+			{ key: `${replacementDirectory}/original${extension ? `.${extension}` : ""}`, body: processed.original, contentType: file.type },
+			...processed.renditions.map((rendition) => ({
+				key: `${replacementDirectory}/${rendition.name}`,
+				body: rendition.body,
+				contentType: rendition.contentType,
+			})),
+		])
+		previousDirectory = track.fileDir
+		track.fileDir = replacementDirectory
+		track.durationInSeconds = Math.round(processed.duration)
 	}
 	if (name) track.name = name
 	if (album) track.album = new mongoose.Types.ObjectId(album)
 	if (artists) track.artists = artists.map((id) => new mongoose.Types.ObjectId(id))
-	if (lyrics) {
-		const parsedLyrics = parseOptionalJson(lyrics)
-		if (!parsedLyrics.ok) throw new Error("Invalid lyrics JSON")
-		track.lyrics = parsedLyrics.value as any
+	if (parsedLyrics?.ok && parsedLyrics.value !== undefined) track.lyrics = parsedLyrics.value as any
+	try {
+		await track.save()
+	} catch (error) {
+		if (replacementDirectory) await tryDeleteObjectPrefix(event, `${replacementDirectory}/`)
+		throw error
 	}
-	await track.save()
+	if (previousDirectory) await tryDeleteObjectPrefix(event, `${previousDirectory}/`)
 	return track
 })

server/api/admin/track.post.ts

@@ -1,8 +1,7 @@
-import path from "node:path"
 import mongoose from "mongoose"
 import { readAdminForm, adminFormText, adminFormTexts, adminFormFile, parseOptionalJson, splitIds } from "../../utils/admin-form"
-import { saveUploadFile, tryCleanUploadFileOrDirectory } from "../../utils/upload-files"
-import { getAudioDuration, processAudioFile } from "../../utils/audio-files"
+import { prepareAudioUpload } from "../../utils/audio-files"
+import { putObjects, tryDeleteObjectPrefix } from "../../utils/object-storage"
 import { defineAuthenticatedEventHandler, requireAuthenticatedUser } from "../../utils/auth"
 import { Track } from "../../models/track"
 
@@ -37,27 +36,36 @@ export default defineAuthenticatedEventHandler(async (event) => {
 		return { message: "Only audio files are accepted" }
 	}
 
-	const relativeFilePath = `tracks/${crypto.randomUUID()}/original`
-	const fileDirectory = path.dirname(relativeFilePath)
+	const fileDirectory = `tracks/${crypto.randomUUID()}`
 	try {
-		console.log("Processing audio")
-		await saveUploadFile(event, relativeFilePath, file.data)
-		const duration = await getAudioDuration(event, relativeFilePath)
-		void processAudioFile(event, relativeFilePath).catch((error) => console.error(error))
+		const extension = safeFileExtension(file.name)
+		const processed = await prepareAudioUpload(file.data, extension)
+		await putObjects(event, [
+			{ key: `${fileDirectory}/original${extension ? `.${extension}` : ""}`, body: processed.original, contentType: file.type },
+			...processed.renditions.map((rendition) => ({
+				key: `${fileDirectory}/${rendition.name}`,
+				body: rendition.body,
+				contentType: rendition.contentType,
+			})),
+		])
 		const track = new Track({
 			name,
 			album: new mongoose.Types.ObjectId(album),
 			artists: artists.map((id) => new mongoose.Types.ObjectId(id)),
 			fileDir: fileDirectory,
-			durationInSeconds: Math.round(duration),
+			durationInSeconds: Math.round(processed.duration),
 			lyrics: parsedLyrics.value || undefined,
 		})
-		await track.save()
+		try {
+			await track.save()
+		} catch (error) {
+			await tryDeleteObjectPrefix(event, `${fileDirectory}/`)
+			throw error
+		}
 		setResponseStatus(event, 201)
 		return track
 	} catch (error) {
-		void tryCleanUploadFileOrDirectory(event, fileDirectory)
-		console.log(error)
+		console.error(error)
 		setResponseStatus(event, 500)
 		return undefined
 	}