From cbe9b609738b8137be90b6757d8196cf26a49ff4 Mon Sep 17 00:00:00 2001
From: Eclypsed <nicholas.tamassia@gmail.com>
Date: Sat, 3 Feb 2024 02:47:23 -0500
Subject: [PATCH] How did I ever live without interfaces

---
 src/app.d.ts                                  | 128 +++++++++++-------
 src/lib/components/media/mediaCard.svelte     |   0
 src/lib/components/navbar/navTab.svelte       |   3 -
 src/lib/components/navbar/playlistTab.svelte  |   2 +-
 src/lib/server/users.db                       | Bin 24576 -> 24576 bytes
 src/lib/service-managers/jellyfin.ts          |  42 ++++++
 .../api/users/[userId]/connections/+server.ts |   4 +-
 .../users/[userId]/recommendations/+server.ts |  34 +++++
 src/routes/settings/connections/+page.svelte  |  38 +++---
 .../connections/jellyfinAuthBox.svelte        |   3 +-
 10 files changed, 178 insertions(+), 76 deletions(-)
 create mode 100644 src/lib/components/media/mediaCard.svelte
 create mode 100644 src/lib/service-managers/jellyfin.ts
 create mode 100644 src/routes/api/users/[userId]/recommendations/+server.ts

diff --git a/src/app.d.ts b/src/app.d.ts
index b2bddab..d0bc5e8 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -17,10 +17,8 @@ declare global {
         password?: string
     }
 
-    type ServiceType = 'jellyfin' | 'youtube-music'
-
     interface Service {
-        type: ServiceType
+        type: 'jellyfin' | 'youtube-music'
         userId: string
         urlOrigin: string
     }
@@ -32,6 +30,39 @@ declare global {
         accessToken: string
     }
 
+    interface MediaItem {
+        connection: Connection
+        id: string
+        name: string
+        duration: number
+        thumbnail?: string
+    }
+
+    interface Song extends MediaItem {
+        artists?: Artist[]
+        albumId?: string
+        audio: string
+        video?: string
+        releaseDate: string
+    }
+
+    interface Album extends MediaItem {
+        artists: Artist[]
+        songs: Song[]
+        releaseDate: string
+    }
+
+    interface Playlist extends MediaItem {
+        songs: Song[]
+        description?: string
+    }
+
+    interface Artist {
+        id: string
+        name: string
+        // Add more here in the future
+    }
+
     namespace Jellyfin {
         // The jellyfin API will not always return the data it says it will, for example /Users/AuthenticateByName says it will
         // retrun the ServerName, it wont. This must be fetched from /System/Info.
@@ -61,6 +92,50 @@ declare global {
         interface System {
             ServerName: string
         }
+
+        interface MediaItem {
+            Name: string
+            Id: string
+            RunTimeTicks: number
+            Type: 'Audio' | 'MusicAlbum' | 'Playlist'
+            ImageTags?: {
+                Primary?: string
+            }
+        }
+
+        interface Song extends Jellyfin.MediaItem {
+            ProductionYear: number
+            Type: 'Audio'
+            ArtistItems?: {
+                Name: string
+                Id: string
+            }[]
+            Album?: string
+            AlbumId?: string
+            AlbumPrimaryImageTag?: string
+            AlbumArtists?: {
+                Name: string
+                Id: string
+            }[]
+        }
+
+        interface Album extends Jellyfin.MediaItem {
+            ProductionYear: number
+            Type: 'MusicAlbum'
+            ArtistItems?: {
+                Name: string
+                Id: string
+            }[]
+            AlbumArtists?: {
+                Name: string
+                Id: string
+            }[]
+        }
+
+        interface Playlist extends Jellyfin.MediaItem {
+            Type: 'Playlist'
+            ChildCount: number
+        }
     }
 
     namespace YouTubeMusic {
@@ -73,53 +148,6 @@ declare global {
             service: YTService
         }
     }
-
-    interface MediaItem {
-        connectionId: string
-        serviceType: string
-        id: string
-        name: string
-        duration: number
-        thumbnail: string
-    }
-
-    interface Song extends MediaItem {
-        artists: {
-            id: string
-            name: string
-        }[]
-        album?: {
-            id: string
-            name: string
-            artists: {
-                id: string
-                name: string
-            }[]
-        }
-        audio: string
-        video?: string
-        releaseDate: string
-    }
-
-    interface Album extends MediaItem {
-        artists: {
-            id: string
-            name: string
-        }[]
-        songs: Song[]
-        releaseDate: string
-    }
-
-    interface Playlist extends MediaItem {
-        songs: Song[]
-        description?: string
-    }
-
-    interface Artist {
-        id: string
-        name: string
-        // Add more here in the future
-    }
 }
 
 export {}
diff --git a/src/lib/components/media/mediaCard.svelte b/src/lib/components/media/mediaCard.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/src/lib/components/navbar/navTab.svelte b/src/lib/components/navbar/navTab.svelte
index 6b167ed..10566af 100644
--- a/src/lib/components/navbar/navTab.svelte
+++ b/src/lib/components/navbar/navTab.svelte
@@ -10,11 +10,8 @@
     export let disabled = false
     export let nav: NavTab
 
-    import { createEventDispatcher } from 'svelte'
     import { goto } from '$app/navigation'
 
-    const dispatch = createEventDispatcher()
-
     let button: HTMLButtonElement
 </script>
 
diff --git a/src/lib/components/navbar/playlistTab.svelte b/src/lib/components/navbar/playlistTab.svelte
index fff30d2..dc193ee 100644
--- a/src/lib/components/navbar/playlistTab.svelte
+++ b/src/lib/components/navbar/playlistTab.svelte
@@ -33,7 +33,7 @@
 <button
     {disabled}
     bind:this={button}
-    class="relative aspect-square w-full rounded-lg bg-cover bg-center transition-all"
+    class="relative aspect-square w-full flex-shrink-0 rounded-lg bg-cover bg-center transition-all"
     style="background-image: url({playlist.thumbnail});"
     on:mouseenter={() => dispatch('mouseenter', { ...calculateCenter(button), content: playlist.name })}
     on:mouseleave={() => dispatch('mouseleave')}
diff --git a/src/lib/server/users.db b/src/lib/server/users.db
index b173cb2726b5f0970a614e77aa4bb64c524f182c..391c615ab59212095235c275f2f8d734ead00c6d 100644
GIT binary patch
delta 102
zcmZoTz}Rqrae_3X$V3@uMv;vP3;a~lj7$v8ERs`ojV+BWbxll6jC7NX4N`QI(~Q#$
XQ_|ARl2TG9-_cju?BPE}fGE`f4d5N~

delta 102
zcmZoTz}Rqrae_3X&_o$$Mxl)f3;a}!%nb|;EDbDmlTFM_bxkZSjdhcfOp|qu(o9WL
X%nd9|k_;>--_cju?BPE}fGE`fuMHbf

diff --git a/src/lib/service-managers/jellyfin.ts b/src/lib/service-managers/jellyfin.ts
new file mode 100644
index 0000000..9af8375
--- /dev/null
+++ b/src/lib/service-managers/jellyfin.ts
@@ -0,0 +1,42 @@
+export class Jellyfin {
+    static audioPresets = (userId: string) => {
+        return {
+            MaxStreamingBitrate: '999999999',
+            Container: 'opus,webm|opus,mp3,aac,m4a|aac,m4b|aac,flac,webma,webm|webma,wav,ogg',
+            TranscodingContainer: 'ts',
+            TranscodingProtocol: 'hls',
+            AudioCodec: 'aac',
+            userId,
+        }
+    }
+
+    static mediaItemFactory = (item: Jellyfin.MediaItem, connection: Connection): MediaItem => {}
+
+    static songFactory = (song: Jellyfin.Song, connection: Connection): Song => {
+        const { id, service } = connection
+
+        const artists: Artist[] | undefined = song.ArtistItems
+            ? Array.from(song.ArtistItems, (artist) => {
+                  return { name: artist.Name, id: artist.Id }
+              })
+            : undefined
+
+        const thumbnail = song.ImageTags?.Primary ? new URL(`Items/${song.Id}/Images/Primary`, service.urlOrigin).href : song.AlbumPrimaryImageTag ? new URL(`Items/${song.AlbumId}/Images/Primary`).href : undefined
+
+        const audoSearchParams = new URLSearchParams(this.audioPresets(service.userId))
+        const audioSource = new URL(`Audio/${song.Id}/universal?${audoSearchParams.toString()}`, service.urlOrigin).href
+
+        const factorySong: Song = {
+            connection,
+            id: song.Id,
+            name: song.Name,
+            duration: Math.floor(song.RunTimeTicks / 10000),
+            thumbnail,
+            artists,
+            albumId: song.AlbumId,
+            audio: audioSource,
+            releaseDate: String(song.ProductionYear),
+        }
+        return factorySong
+    }
+}
diff --git a/src/routes/api/users/[userId]/connections/+server.ts b/src/routes/api/users/[userId]/connections/+server.ts
index f9d8f81..d6b9ac8 100644
--- a/src/routes/api/users/[userId]/connections/+server.ts
+++ b/src/routes/api/users/[userId]/connections/+server.ts
@@ -7,7 +7,7 @@ export const GET: RequestHandler = async ({ params }) => {
     const userId = params.userId as string
 
     const connections = Connections.getUserConnections(userId)
-    return new Response(JSON.stringify(connections))
+    return Response.json(connections)
 }
 
 // This schema should be identical to the Connection Data Type but without the id and userId
@@ -30,7 +30,7 @@ export const POST: RequestHandler = async ({ params, request }) => {
 
     const { service, accessToken } = connection
     const newConnection = Connections.addConnection(userId, service, accessToken)
-    return new Response(JSON.stringify(newConnection))
+    return Response.json(newConnection)
 }
 
 export const DELETE: RequestHandler = async ({ request }) => {
diff --git a/src/routes/api/users/[userId]/recommendations/+server.ts b/src/routes/api/users/[userId]/recommendations/+server.ts
new file mode 100644
index 0000000..1659af4
--- /dev/null
+++ b/src/routes/api/users/[userId]/recommendations/+server.ts
@@ -0,0 +1,34 @@
+import type { RequestHandler } from '@sveltejs/kit'
+import { SECRET_INTERNAL_API_KEY } from '$env/static/private'
+
+// This is temporary functionally for the sake of developing the app.
+// In the future will implement more robust algorith for offering recommendations
+export const GET: RequestHandler = async ({ params, fetch }) => {
+    const userId = params.userId as string
+
+    const connectionsResponse = await fetch(`/api/users/${userId}/connections`, { headers: { apikey: SECRET_INTERNAL_API_KEY } })
+    const userConnections: Connection[] = await connectionsResponse.json()
+
+    const recommendations = []
+
+    for (const connection of userConnections) {
+        const { service, accessToken } = connection
+
+        switch (service.type) {
+            case 'jellyfin':
+                const mostPlayedSongsSearchParams = new URLSearchParams({
+                    SortBy: 'PlayCount',
+                    SortOrder: 'Descending',
+                    IncludeItemTypes: 'Audio',
+                    Recursive: 'true',
+                    limit: '10',
+                })
+
+                const mostPlayedSongsURL = new URL(`/Users/${service.userId}/Items?${mostPlayedSongsSearchParams.toString()}`, service.urlOrigin).href
+                const requestHeaders = new Headers({ Authorization: `MediaBrowser Token="${accessToken}"` })
+
+                const mostPlayedResponse = await fetch(mostPlayedSongsURL, { headers: requestHeaders })
+                const mostPlayedData = await mostPlayedResponse.json()
+        }
+    }
+}
diff --git a/src/routes/settings/connections/+page.svelte b/src/routes/settings/connections/+page.svelte
index b5c422e..a30dd7f 100644
--- a/src/routes/settings/connections/+page.svelte
+++ b/src/routes/settings/connections/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { fly } from 'svelte/transition'
     import Services from '$lib/services.json'
     import JellyfinAuthBox from './jellyfinAuthBox.svelte'
     import { newestAlert } from '$lib/stores.js'
@@ -38,26 +37,25 @@
         }
 
         return async ({ result }) => {
-            switch (result.type) {
-                case 'failure':
-                    return ($newestAlert = ['warning', result.data?.message])
-                case 'success':
-                    if (result.data?.newConnection) {
-                        const newConnection: Connection = result.data.newConnection
-                        connections = [newConnection, ...connections]
+            if (result.type === 'failure') {
+                return ($newestAlert = ['warning', result.data?.message])
+            } else if (result.type === 'success') {
+                if (result.data?.newConnection) {
+                    const newConnection: Connection = result.data.newConnection
+                    connections = [newConnection, ...connections]
 
-                        newConnectionModal = null
-                        return ($newestAlert = ['success', `Added ${Services[newConnection.service.type].displayName}`])
-                    } else if (result.data?.deletedConnectionId) {
-                        const id = result.data.deletedConnectionId
-                        const indexToDelete = connections.findIndex((connection) => connection.id === id)
-                        const serviceType = connections[indexToDelete].service.type
+                    newConnectionModal = null
+                    return ($newestAlert = ['success', `Added ${Services[newConnection.service.type].displayName}`])
+                } else if (result.data?.deletedConnectionId) {
+                    const id = result.data.deletedConnectionId
+                    const indexToDelete = connections.findIndex((connection) => connection.id === id)
+                    const serviceType = connections[indexToDelete].service.type
 
-                        connections.splice(indexToDelete, 1)
-                        connections = connections
+                    connections.splice(indexToDelete, 1)
+                    connections = connections
 
-                        return ($newestAlert = ['success', `Deleted ${Services[serviceType].displayName}`])
-                    }
+                    return ($newestAlert = ['success', `Deleted ${Services[serviceType].displayName}`])
+                }
             }
         }
     }
@@ -82,7 +80,9 @@
             <ConnectionProfile {connection} submitFunction={submitCredentials} />
         {/each}
     </div>
-    <svelte:component this={newConnectionModal} submitFunction={submitCredentials} on:close={() => (newConnectionModal = null)} />
+    {#if newConnectionModal !== null}
+        <svelte:component this={newConnectionModal} submitFunction={submitCredentials} on:close={() => (newConnectionModal = null)} />
+    {/if}
 </main>
 
 <style>
diff --git a/src/routes/settings/connections/jellyfinAuthBox.svelte b/src/routes/settings/connections/jellyfinAuthBox.svelte
index ca42fc2..e0bae42 100644
--- a/src/routes/settings/connections/jellyfinAuthBox.svelte
+++ b/src/routes/settings/connections/jellyfinAuthBox.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import type { SubmitFunction } from '@sveltejs/kit'
+    import { scale } from 'svelte/transition'
     import { createEventDispatcher } from 'svelte'
     import { enhance } from '$app/forms'
 
@@ -8,7 +9,7 @@
     const dispatch = createEventDispatcher()
 </script>
 
-<form method="post" use:enhance={submitFunction} class="fixed left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">
+<form method="post" use:enhance={submitFunction} class="fixed left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" transition:scale>
     <div id="main-box" class="relative flex aspect-video w-screen max-w-2xl flex-col justify-center gap-9 rounded-xl bg-neutral-925 px-8">
         <h1 class="text-center text-4xl">Jellyfin Sign In</h1>
         <div class="flex w-full flex-col gap-5">