feat: refactoring api logic

This commit is contained in:
Mat12143 2025-08-02 03:54:26 +02:00
parent 1383c0fbed
commit 44e0d9f44c
7 changed files with 150 additions and 74 deletions

View file

@ -1,8 +1,10 @@
<script lang="ts">
let { code, message } = $props()
import type { FetchError } from "$lib/types"
let { returnError }: { returnError: FetchError } = $props()
</script>
<div class="flex h-screen w-full flex-col items-center justify-center">
<h1 class="p-2 text-xl">Error {code}</h1>
<p>{message}</p>
<h1 class="p-2 text-xl">Error {returnError.code}</h1>
<p>{returnError.message}</p>
</div>

View file

@ -1,12 +1,12 @@
<script lang="ts">
import { type Song, createEmptySong } from "$lib/types"
let { songs, playing } = $props()
let { queueSongs, playingIndex } = $props()
let displaySongs = $derived<Song[]>([
playing > 0 && playing < songs.length ? songs[playing - 1] : createEmptySong(),
songs[playing],
playing == songs.length - 1 ? createEmptySong() : songs[playing + 1],
playingIndex > 0 ? queueSongs[playingIndex - 1] : createEmptySong(),
queueSongs[playingIndex],
playingIndex == queueSongs.length - 1 ? createEmptySong() : queueSongs[playingIndex + 1],
])
</script>

View file

@ -35,3 +35,8 @@ export const parseSuggestion = async function (sugg: any): Promise<Suggestion> {
let resp = await SuggestionSchema.parseAsync(sugg)
return resp
}
export type FetchError = {
code: number
message: string
}

69
frontend/src/lib/utils.ts Normal file
View file

@ -0,0 +1,69 @@
import { parseSong, parseSuggestion, type FetchError, type Song, type Suggestion } from "./types"
export const joinRoom = async function (roomId: string): Promise<[FetchError | null, string]> {
let resp = await fetch("/api/join?room=" + roomId)
if (resp.status != 200) {
return [{ code: 400, message: "Cannot join the room" }, ""]
}
return [null, "test"]
}
export const getSuggestions = async function (roomId: string): Promise<[FetchError | null, Suggestion[]]> {
let resp = await fetch("/api/room/suggestions?room=" + roomId)
if (resp.status != 200) {
return [{ code: 400, message: "Failed to retrieve suggestions" }, []]
}
let json = await resp.json()
let suggestions: Suggestion[] = []
json["songs"].forEach(async (i: any) => {
suggestions.push(await parseSuggestion(i))
})
suggestions = suggestions.sort((a, b) => {
return a.upvote - b.upvote
})
return [null, suggestions]
}
export const getQueueSongs = async function (roomId: string): Promise<[FetchError | null, Song[], number]> {
let resp = await fetch("/api/queue?room=" + roomId)
if (resp.status != 200) {
return [{ code: 400, message: "Failed to load queue songs" }, [], 0]
}
let json = await resp.json()
let songs: Song[] = []
json["queue"].forEach(async (i: any) => {
songs.push(await parseSong(i))
})
let playingId = json["index"]
return [null, songs, playingId]
}
export const triggerPlayNext = async function (roomId: string): Promise<[FetchError | null, Song[], number]> {
let resp = await fetch("/api/queue/next?room=" + roomId, { method: "POST" })
if (resp.status != 200) {
return [{ code: 400, message: "Failed to trigger next song playback" }, [], 0]
}
let json = await resp.json()
let songs: Song[] = []
if (json["ended"]) {
json["queue"].forEach(async (i: any) => {
songs.push(await parseSong(i))
})
}
return [null, songs, json["index"]]
}