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

@ -2,71 +2,54 @@
import QueueSlider from "$lib/components/QueueSlider.svelte"
import SuggestionInput from "$lib/components/SuggestionInput.svelte"
import Error from "$lib/components/Error.svelte"
import { parseSong, parseSuggestion, type Suggestion, type Song } from "$lib/types.js"
import { type Suggestion, type Song } from "$lib/types.js"
import { onMount } from "svelte"
import SuggestionList from "$lib/components/SuggestionList.svelte"
import { getQueueSongs, getSuggestions, joinRoom } from "$lib/utils.js"
import type { FetchError } from "$lib/types.js"
let { data } = $props()
let songs = $state<Song[]>([])
let playing = $state(0)
let queueSongs = $state<Song[]>([])
let playingIndex = $state(0)
let suggestions = $state<Suggestion[]>([])
let error = $state({ code: 0, message: "" })
let returnError = $state<FetchError | null>()
let wsUrl = ""
onMount(async () => {
// Join the room
let resp = await fetch("/api/join?room=" + data.roomId)
if (resp.status != 200) {
error = { code: 400, message: "Failed to join the room. Maybe wrong code or location?" }
let sugg, queue, index
;[returnError, wsUrl] = await joinRoom(data.roomId)
if (returnError) {
return
}
// Setup websocket connection
// Get room suggestions
resp = await fetch("/api/room/suggestions?room=" + data.roomId)
if (resp.status != 200) {
error = { code: 500, message: "Failed to retrive suggestions" }
;[returnError, sugg] = await getSuggestions(data.roomId)
if (returnError) {
return
}
let json = await resp.json()
json["songs"].forEach(async (i: any) => {
suggestions.push(await parseSuggestion(i))
})
suggestions = suggestions.sort((a, b) => {
return a.upvote - b.upvote
})
// Get the room queue
resp = await fetch("/api/queue?room=" + data.roomId)
if (resp.status != 200) {
error = { code: 404, message: "Room not found" }
;[returnError, queue, index] = await getQueueSongs(data.roomId)
if (returnError) {
return
}
json = await resp.json()
json["queue"].forEach(async (i: any) => {
songs.push(await parseSong(i))
})
console.log(songs)
queueSongs = queue
suggestions = sugg
playingIndex = index
})
</script>
<!-- Check if the room exists -->
{#if error.code != 0}
<Error code={error.code} message={error.message} />
{#if returnError}
<Error {returnError} />
{:else}
<div class="flex w-full flex-col items-center justify-center p-4 lg:p-10">
<QueueSlider {songs} {playing} />
<QueueSlider {queueSongs} {playingIndex} />
<div class="w-full py-6 lg:w-[30vw]">
<SuggestionInput roomId={data.roomId} />
</div>