- {#each recommendations.filter((item) => item.type === 'album') as album}
-
+
+ {#each recommendations as mediaItem}
+ {#if mediaItem.type === 'album'}
+
+ {:else if mediaItem.type === 'playlist'}
+
+ {/if}
{/each}
{/await}
diff --git a/src/routes/(app)/mixes/+page.svelte b/src/routes/(app)/mixes/+page.svelte
new file mode 100644
index 0000000..55539c0
--- /dev/null
+++ b/src/routes/(app)/mixes/+page.svelte
@@ -0,0 +1,14 @@
+
+
+
+
+
diff --git a/src/routes/(app)/user/+page.svelte b/src/routes/(app)/user/+page.svelte
index 0d0e462..bf42875 100644
--- a/src/routes/(app)/user/+page.svelte
+++ b/src/routes/(app)/user/+page.svelte
@@ -7,7 +7,6 @@
import { newestAlert } from '$lib/stores.js'
import type { PageServerData } from './$types.js'
import type { SubmitFunction } from '@sveltejs/kit'
- import { getDeviceUUID } from '$lib/utils'
import { SvelteComponent, type ComponentType } from 'svelte'
import ConnectionProfile from './connectionProfile.svelte'
import { enhance } from '$app/forms'
@@ -21,6 +20,15 @@
data.connections.then((userConnections) => ('error' in userConnections ? (errorMessage = userConnections.error) : (connections = userConnections)))
+ function getDeviceUUID(): string {
+ const existingUUID = localStorage.getItem('deviceUUID')
+ if (existingUUID) return existingUUID
+
+ const newUUID = '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c: any) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16))
+ localStorage.setItem('deviceUUID', newUUID)
+ return newUUID
+ }
+
const authenticateJellyfin: SubmitFunction = ({ formData, cancel }) => {
const { serverUrl, username, password } = Object.fromEntries(formData)
diff --git a/src/routes/api/remoteImage/+server.ts b/src/routes/api/remoteImage/+server.ts
index 7dc9193..2f89b02 100644
--- a/src/routes/api/remoteImage/+server.ts
+++ b/src/routes/api/remoteImage/+server.ts
@@ -64,12 +64,12 @@ function modifyImageURL(imageURL: URL, options?: { maxWidth?: number; maxHeight?
switch (imageURL.origin) {
case 'https://i.ytimg.com':
case 'https://www.gstatic.com':
- // These two origins correspond to images that can't have their size modified with search params, so we just return them at the default res
+ case 'https://music.youtube.com':
+ // These origins correspond to images that can't have their size modified with search params, so we just return them at the default res
return baseURL
case 'https://lh3.googleusercontent.com':
case 'https://yt3.googleusercontent.com':
case 'https://yt3.ggpht.com':
- case 'https://music.youtube.com':
const fakeQueryParams = []
if (maxWidth) fakeQueryParams.push(`w${Math.min(maxWidth, MAX_YOUTUBE_THUMBNAIL_SCALAR_SIZE)}`)
if (maxHeight) fakeQueryParams.push(`h${Math.min(maxHeight, MAX_YOUTUBE_THUMBNAIL_SCALAR_SIZE)}`)
diff --git a/src/routes/api/v1/connections/+server.ts b/src/routes/api/v1/connections/+server.ts
new file mode 100644
index 0000000..3d4beb9
--- /dev/null
+++ b/src/routes/api/v1/connections/+server.ts
@@ -0,0 +1,19 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { ConnectionFactory } from '$lib/server/api-helper'
+
+export const GET: RequestHandler = async ({ url }) => {
+ const ids = url.searchParams.get('id')?.replace(/\s/g, '').split(',')
+ if (!ids) return new Response('Missing id query parameter', { status: 400 })
+
+ const connections = (await Promise.all(ids.map((id) => ConnectionFactory.getConnection(id).catch(() => null)))).filter((result): result is Connection => result !== null)
+
+ const getConnectionInfo = (connection: Connection) =>
+ connection.getConnectionInfo().catch((reason) => {
+ console.error(`Failed to fetch connection info: ${reason}`)
+ return null
+ })
+
+ const connectionInfo = (await Promise.all(connections.map(getConnectionInfo))).filter((connectionInfo): connectionInfo is ConnectionInfo => connectionInfo !== null)
+
+ return Response.json({ connections: connectionInfo })
+}
diff --git a/src/routes/api/v1/connections/[connectionId]/album/+server.ts b/src/routes/api/v1/connections/[connectionId]/album/+server.ts
new file mode 100644
index 0000000..cc3d077
--- /dev/null
+++ b/src/routes/api/v1/connections/[connectionId]/album/+server.ts
@@ -0,0 +1,14 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { ConnectionFactory } from '$lib/server/api-helper'
+
+export const GET: RequestHandler = async ({ params, url }) => {
+ const connection = await ConnectionFactory.getConnection(params.connectionId!)
+
+ const albumId = url.searchParams.get('id')
+ if (!albumId) return new Response(`Missing id search parameter`, { status: 400 })
+
+ const album = await connection.getAlbum(albumId).catch(() => undefined)
+ if (!album) return new Response(`Failed to fetch album with id: ${albumId}`, { status: 400 })
+
+ return Response.json({ album })
+}
diff --git a/src/routes/api/v1/connections/[connectionId]/album/[albumId]/items/+server.ts b/src/routes/api/v1/connections/[connectionId]/album/[albumId]/items/+server.ts
new file mode 100644
index 0000000..b4e9c13
--- /dev/null
+++ b/src/routes/api/v1/connections/[connectionId]/album/[albumId]/items/+server.ts
@@ -0,0 +1,11 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { ConnectionFactory } from '$lib/server/api-helper'
+
+export const GET: RequestHandler = async ({ params }) => {
+ const connection = await ConnectionFactory.getConnection(params.connectionId!)
+
+ const items = await connection.getAlbumItems(params.albumId!).catch(() => null)
+ if (!items) return new Response(`Failed to fetch album with id: ${params.albumId!}`, { status: 400 })
+
+ return Response.json({ items })
+}
diff --git a/src/routes/api/v1/connections/[connectionId]/artist/+server.ts b/src/routes/api/v1/connections/[connectionId]/artist/+server.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/routes/api/v1/connections/[connectionId]/playlist/+server.ts b/src/routes/api/v1/connections/[connectionId]/playlist/+server.ts
new file mode 100644
index 0000000..521a608
--- /dev/null
+++ b/src/routes/api/v1/connections/[connectionId]/playlist/+server.ts
@@ -0,0 +1,19 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { ConnectionFactory } from '$lib/server/api-helper'
+
+export const GET: RequestHandler = async ({ params, url }) => {
+ const connection = await ConnectionFactory.getConnection(params.connectionId!)
+
+ const playlistId = url.searchParams.get('id')
+ if (!playlistId) return new Response(`Missing id search parameter`, { status: 400 })
+
+ const response = await connection
+ .getPlaylistItems(playlistId)
+ .then((playlist) => Response.json({ playlist }))
+ .catch((error: TypeError | Error) => {
+ if (error instanceof TypeError) return new Response('Bad Request', { status: 400 })
+ return new Response('Failed to fetch playlist items', { status: 502 })
+ })
+
+ return response
+}
diff --git a/src/routes/api/v1/connections/[connectionId]/playlist/[playlistId]/items/+server.ts b/src/routes/api/v1/connections/[connectionId]/playlist/[playlistId]/items/+server.ts
new file mode 100644
index 0000000..129a16a
--- /dev/null
+++ b/src/routes/api/v1/connections/[connectionId]/playlist/[playlistId]/items/+server.ts
@@ -0,0 +1,25 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { ConnectionFactory } from '$lib/server/api-helper'
+
+export const GET: RequestHandler = async ({ params, url }) => {
+ const connection = await ConnectionFactory.getConnection(params.connectionId!)
+
+ const startIndexString = url.searchParams.get('startIndex')
+ const limitString = url.searchParams.get('limit')
+
+ const numberStartIndex = Number(startIndexString)
+ const numberLimit = Number(limitString)
+
+ const startIndex = Number.isInteger(numberStartIndex) && numberStartIndex > 0 ? numberStartIndex : undefined
+ const limit = Number.isInteger(numberLimit) && numberLimit > 0 ? numberLimit : undefined
+
+ const response = await connection
+ .getPlaylistItems(params.playlistId!, { startIndex, limit })
+ .then((items) => Response.json({ items }))
+ .catch((error: TypeError | Error) => {
+ if (error instanceof TypeError) return new Response('Bad Request', { status: 400 })
+ return new Response('Failed to fetch playlist items', { status: 502 })
+ })
+
+ return response
+}
diff --git a/vite.config.ts b/vite.config.ts
index 53c1903..cd37977 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,13 @@
import { sveltekit } from '@sveltejs/kit/vite'
import { defineConfig } from 'vite'
+import Icons from 'unplugin-icons/vite'
export default defineConfig({
- plugins: [sveltekit()],
+ plugins: [
+ sveltekit(),
+ Icons({
+ compiler: 'svelte',
+ autoInstall: true,
+ }),
+ ],
})