Visit kit.svelte.dev to read the documentation
\ No newline at end of file + diff --git a/src/routes/album/[id]/+page.server.js b/src/routes/album/[id]/+page.server.js new file mode 100644 index 0000000..6e24008 --- /dev/null +++ b/src/routes/album/[id]/+page.server.js @@ -0,0 +1,11 @@ +export async function load({ fetch, params }) { + const albumId = params.id + const response = await fetch(`/api/jellyfin/album?albumId=${albumId}`) + const responseData = await response.json() + + return { + id: albumId, + albumItemsData: responseData.albumItems, + albumData: responseData.albumData, + } +} diff --git a/src/routes/album/[id]/+page.svelte b/src/routes/album/[id]/+page.svelte index bc2a5e6..477485b 100644 --- a/src/routes/album/[id]/+page.svelte +++ b/src/routes/album/[id]/+page.svelte @@ -2,7 +2,7 @@ import { fly, slide } from 'svelte/transition' import { cubicIn, cubicOut } from 'svelte/easing' - import { generateURL } from '$lib/Jellyfin-api.js' + import { JellyfinUtils } from '$lib/utils' import AlbumBg from '$lib/albumBG.svelte' import Navbar from '$lib/navbar.svelte' import ListItem from '$lib/listItem.svelte' @@ -10,8 +10,7 @@ import MediaPlayer from '$lib/mediaPlayer.svelte' export let data - let albumImg = generateURL({ type: 'Image', pathParams: { id: data.id } }) - // console.log(generateURL({type: 'Items', queryParams: {'albumIds': data.albumData.Id, 'recursive': true}})) + let albumImg = JellyfinUtils.getImageEnpt(data.id) let discArray = Array.from({ length: data.albumData?.discCount ? data.albumData.discCount : 1 }, (_, i) => { return data.albumItemsData.filter((item) => item?.ParentIndexNumber === i + 1 || !item?.ParentIndexNumber) }) diff --git a/src/routes/album/[id]/+page.js b/src/routes/api/jellyfin/album/+server.js similarity index 58% rename from src/routes/album/[id]/+page.js rename to src/routes/api/jellyfin/album/+server.js index 1b4bab4..a12ce12 100644 --- a/src/routes/album/[id]/+page.js +++ b/src/routes/api/jellyfin/album/+server.js @@ -1,40 +1,46 @@ -import { generateURL } from '$lib/Jellyfin-api.js' - -export async function load({ fetch, params }) { - const response = await fetch( - generateURL({ - type: 'Items', - queryParams: { albumIds: params.id, recursive: true }, - }) - ) - const albumItemsData = await response.json() - - // This handles rare circumstances where a song is part of an album but is not meant to be included in the track list - // Example: Xronial Xero (Laur Remix) - Is tagged with the album Xronial Xero, but was a bonus track and not included as part of the album's track list. - const items = albumItemsData.Items.filter((item) => 'IndexNumber' in item) - - // Idk if it's efficient, but this is a beautiful one liner that accomplishes 1. Checking whether or not there are multiple discs, 2. Sorting the Items - // primarily by disc number, and secondarily by track number, and 3. Defaulting to just sorting by track number if the album is only one disc. - items.sort((a, b) => - a?.ParentIndexNumber !== b?.ParentIndexNumber - ? a.ParentIndexNumber - b.ParentIndexNumber - : a.IndexNumber - b.IndexNumber - ) - - const albumData = { - name: items[0].Album, - id: items[0].AlbumId, - artists: items[0].AlbumArtists, - year: items[0].ProductionYear, - discCount: Math.max(...items.map((x) => x?.ParentIndexNumber)), - length: items - .map((x) => x.RunTimeTicks) - .reduce((accumulator, currentValue) => accumulator + currentValue), - } - - return { - id: params.id, - albumItemsData: items, - albumData: albumData, - } -} +import { JellyfinUtils } from '$lib/utils' + +/** @type {import('./$types').RequestHandler} */ +export async function GET({ url, fetch }) { + const albumId = url.searchParams.get('albumId') + if (!albumId) { + return new Response('Requires albumId Query Parameter', { status: 400 }) + } + + const endpoint = JellyfinUtils.getItemsEnpt({ albumIds: albumId, recursive: true }) + const response = await fetch(endpoint) + const data = await response.json() + + // This handles rare circumstances where a song is part of an album but is not meant to be included in the track list + // Example: Xronial Xero (Laur Remix) - Is tagged with the album Xronial Xero, but was a bonus track and not included as part of the album's track list. + const items = data.Items.filter((item) => 'IndexNumber' in item) + + // Idk if it's efficient, but this is a beautiful one liner that accomplishes 1. Checking whether or not there are multiple discs, 2. Sorting the Items + // primarily by disc number, and secondarily by track number, and 3. Defaulting to just sorting by track number if the album is only one disc. + items.sort((a, b) => + a?.ParentIndexNumber !== b?.ParentIndexNumber + ? a.ParentIndexNumber - b.ParentIndexNumber + : a.IndexNumber - b.IndexNumber + ) + + const albumData = { + name: items[0].Album, + id: albumId, + artists: items[0].AlbumArtists, + year: items[0].ProductionYear, + discCount: Math.max(...items.map((x) => x?.ParentIndexNumber)), + length: items + .map((x) => x.RunTimeTicks) + .reduce((accumulator, currentValue) => accumulator + currentValue), + } + + const responseData = JSON.stringify({ + albumItems: items, + albumData: albumData, + }) + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + return new Response(responseData, {headers: responseHeaders}) +} diff --git a/src/routes/api/jellyfin/artist/+server.js b/src/routes/api/jellyfin/artist/+server.js new file mode 100644 index 0000000..e9f876a --- /dev/null +++ b/src/routes/api/jellyfin/artist/+server.js @@ -0,0 +1,39 @@ +import { JellyfinUtils } from '$lib/utils' + +/** @type {import('./$types').RequestHandler} */ +export async function GET({ url, fetch }) { + const artistId = url.searchParams.get('artistId') + if (!artistId) { + return new Response('Requires artistId Query Parameter', { status: 400 }) + } + + const endpoint = JellyfinUtils.getItemsEnpt({ artistIds: artistId, recursive: true }) + const response = await fetch(endpoint) + const data = await response.json() + + const artistItems = { + albums: [], + singles: [], + appearances: [], + } + + // Filters the raw list of items to only the albums that were produced fully or in part by the specified artist + artistItems.albums = data.Items.filter((item) => item.Type === 'MusicAlbum' && item.AlbumArtists.some((artist) => artist.Id === artistId)) + + data.Items.forEach((item) => { + if (item.Type === 'Audio') { + if (!('AlbumId' in item)) { + artistItems.singles.push(item) + } else if (!artistItems.albums.some((album) => album.Id === item.AlbumId)) { + artistItems.appearances.push(item) + } + } + }) + + const responseData = JSON.stringify(artistItems) + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + return new Response(responseData, { headers: responseHeaders }) +} diff --git a/src/routes/api/jellyfin/auth/+server.js b/src/routes/api/jellyfin/auth/+server.js new file mode 100644 index 0000000..99297e9 --- /dev/null +++ b/src/routes/api/jellyfin/auth/+server.js @@ -0,0 +1,42 @@ +/** @type {import('./$types').RequestHandler} */ +export async function GET({ url, fetch }) { + const { serverUrl, username, password, deviceId } = Object.fromEntries(url.searchParams) + if (!(serverUrl && username && password && deviceId)) return new Response('Missing authentication parameter', { status: 400 }) + + let authResponse + try { + const authUrl = new URL('/Users/AuthenticateByName', serverUrl).href + authResponse = await fetch(authUrl, { + method: 'POST', + body: JSON.stringify({ + Username: username, + Pw: password, + }), + headers: { + 'Content-Type': 'application/json; charset=utf-8', + 'X-Emby-Authorization': `MediaBrowser Client="Lazuli", Device="Chrome", DeviceId="${deviceId}", Version="1.0.0.0"`, + }, + }) + } catch { + authResponse = new Response('Invalid server URL', { status: 400 }) + } + + if (!authResponse.ok) { + authResponse = (await authResponse.text()) === 'Error processing request.' ? new Response('Invalid credentials', { status: 400 }) : authResponse + return authResponse + } + + if (!authResponse.headers.get('content-type').includes('application/json')) return new Response('Jellyfin server returned invalid data', { status: 500 }) + + const data = await authResponse.json() + const requiredData = ['User', 'SessionInfo', 'AccessToken', 'ServerId'] + + if (!requiredData.every((key) => Object.keys(data).includes(key))) return new Response('Data missing from Jellyfin server response', { status: 500 }) + + const responseData = JSON.stringify(data) + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + return new Response(responseData, { headers: responseHeaders }) +} diff --git a/src/routes/api/jellyfin/song/+server.js b/src/routes/api/jellyfin/song/+server.js new file mode 100644 index 0000000..03101dd --- /dev/null +++ b/src/routes/api/jellyfin/song/+server.js @@ -0,0 +1,20 @@ +import { JellyfinUtils } from '$lib/utils' + +/** @type {import('./$types').RequestHandler} */ +export async function GET({ url, fetch }) { + const songId = url.searchParams.get('songId') + if (!artistId) { + return new Response('Requires songId Query Parameter', { status: 400 }) + } + + const endpoint = JellyfinUtils.getItemsEnpt({ ids: songId, recursive: true }) + const response = await fetch(endpoint) + const data = await response.json() + + const responseData = JSON.stringify(data.Items[0]) + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + return new Response(responseData, {headers: responseHeaders}) +} diff --git a/src/routes/api/user/connections/+server.js b/src/routes/api/user/connections/+server.js new file mode 100644 index 0000000..3ad059c --- /dev/null +++ b/src/routes/api/user/connections/+server.js @@ -0,0 +1,67 @@ +import { UserConnections } from '$lib/server/db/users' +import Joi from 'joi' + +/** @type {import('./$types').RequestHandler} */ +export async function GET({ request, url }) { + const schema = Joi.number().required() + const userId = request.headers.get('userId') + + const validation = schema.validate(userId) + if (validation.error) return new Response(validation.error.message, { status: 400 }) + + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + const filter = url.searchParams.get('filter') + if (filter) { + const requestedConnections = filter.split(',').map((item) => item.toLowerCase()) + const userConnections = UserConnections.getConnections(userId, requestedConnections) + return new Response(JSON.stringify(userConnections), { headers: responseHeaders }) + } + + const userConnections = UserConnections.getConnections(userId) + return new Response(JSON.stringify(userConnections), { headers: responseHeaders }) +} + +// May need to add support for refresh token and expiry in the future +/** @type {import('./$types').RequestHandler} */ +export async function PATCH({ request }) { + const schema = Joi.object({ + userId: Joi.number().required(), + connection: Joi.object({ + serviceName: Joi.string().required(), + accessToken: Joi.string().required(), + }).required(), + }) + + const userId = request.headers.get('userId') + const connection = await request.json() + + const validation = schema.validate({ userId, connection }) + if (validation.error) return new Response(validation.error.message, { status: 400 }) + + UserConnections.setConnection(userId, connection.serviceName, connection.accessToken) + + return new Response('Updated Connection') +} + +/** @type {import('./$types').RequestHandler} */ +export async function DELETE({ request }) { + const schema = Joi.object({ + userId: Joi.number().required(), + connection: Joi.object({ + serviceName: Joi.string().required(), + }).required(), + }) + + const userId = request.headers.get('userId') + const connection = await request.json() + + const validation = schema.validate({ userId, connection }) + if (validation.error) return new Response(validation.error.message, { status: 400 }) + + UserConnections.deleteConnection(userId, connection.serviceName) + + return new Response('Deleted Connection') +} diff --git a/src/routes/api/youtube-music/media/+server.js b/src/routes/api/youtube-music/media/+server.js new file mode 100644 index 0000000..678f8c1 --- /dev/null +++ b/src/routes/api/youtube-music/media/+server.js @@ -0,0 +1,27 @@ +import ytdl from 'ytdl-core' + +/** @type {import('./$types').RequestHandler} */ +export async function GET({ url }) { + const videoId = url.searchParams.get('videoId') + if (!videoId) { + return new Response('Requires videoId Query Parameter', { status: 400 }) + } + + const videoUrl = `https://www.youtube.com/watch?v=${videoId}` + const info = await ytdl.getInfo(videoUrl) + const videoFormat = ytdl.chooseFormat(info.formats, { + filter: (format) => format.hasVideo && !format.isDashMPD && 'contentLength' in format, + quality: 'highestvideo', + }) + const audioFormat = ytdl.chooseFormat(info.formats, { + filter: 'audioonly', + quality: 'highestaudio', + }) + + const responseData = JSON.stringify({ video: videoFormat.url, audio: audioFormat.url }) + const responseHeaders = new Headers({ + 'Content-Type': 'application/json', + }) + + return new Response(responseData, { headers: responseHeaders }) +} diff --git a/src/routes/artist/[id]/+page.js b/src/routes/artist/[id]/+page.js deleted file mode 100644 index 633de90..0000000 --- a/src/routes/artist/[id]/+page.js +++ /dev/null @@ -1,5 +0,0 @@ -export const load = ({ params }) => { - return { - id: params.id, - } -} diff --git a/src/routes/artist/[id]/+page.server.js b/src/routes/artist/[id]/+page.server.js new file mode 100644 index 0000000..2e3982a --- /dev/null +++ b/src/routes/artist/[id]/+page.server.js @@ -0,0 +1,10 @@ +export async function load({ params, fetch }) { + const artistId = params.id + const response = await fetch(`/api/jellyfin/artist?artistId=${artistId}`) + const responseData = await response.json() + + return { + id: artistId, + artistItems: responseData, + } +} diff --git a/src/routes/artist/[id]/+page.svelte b/src/routes/artist/[id]/+page.svelte index 9174201..cce6667 100644 --- a/src/routes/artist/[id]/+page.svelte +++ b/src/routes/artist/[id]/+page.svelte @@ -1,18 +1,8 @@Loading
- {:then songData} -{songData.Name}
- {/await} -{songData.Name}
+ \ No newline at end of file diff --git a/src/routes/youtube-music/+page.server.js b/src/routes/youtube-music/+page.server.js new file mode 100644 index 0000000..366f011 --- /dev/null +++ b/src/routes/youtube-music/+page.server.js @@ -0,0 +1,11 @@ +/** @type {import('./$types').PageServerLoad} */ +export async function load({ url, fetch }) { + const videoId = url.searchParams.get('videoId') + const response = await fetch(`/api/yt/media?videoId=${videoId}`) + const responseData = await response.json() + return { + videoId: videoId, + videoUrl: responseData.video, + audioUrl: responseData.audio, + } +} diff --git a/src/routes/youtube-music/+page.svelte b/src/routes/youtube-music/+page.svelte new file mode 100644 index 0000000..3e087b2 --- /dev/null +++ b/src/routes/youtube-music/+page.svelte @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 8e5022c..897b0aa 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -6,10 +6,13 @@ export default { theme: { extend: { fontFamily: { - notoSans: [ - "'Noto Sans', 'Noto Sans HK', 'Noto Sans JP', 'Noto Sans KR', 'Noto Sans SC', 'Noto Sans TC'", - ...defaultTheme.fontFamily.sans, - ], + notoSans: ["'Noto Sans', 'Noto Sans HK', 'Noto Sans JP', 'Noto Sans KR', 'Noto Sans SC', 'Noto Sans TC'", ...defaultTheme.fontFamily.sans], + }, + colors: { + 'lazuli-primary': '#ed6713', + 'neutral-925': 'rgb(16, 16, 16)', + 'jellyfin-purple': '#aa5cc3', + 'jellyfin-blue': '#00a4dc', }, }, },