Eclypsed/Lazuli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Began working on ytmusic search parsers

Browse Source
This commit is contained in:
Eclypsed
2024-03-31 01:44:48 -04:00
parent a624f375e4
commit dc18005a60
3 changed files with 191 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app.d.ts vendored
View File

@@ -44,7 +44,7 @@ declare global {
public id: string
getRecommendations: () => Promise<(Song | Album | Playlist)[]>
getConnectionInfo: () => Promise<ConnectionInfo>
search: (searchTerm: string) => Promise<(Song | Album | Artist | Playlist)[]>
search: (searchTerm: string, filter?: 'song' | 'album' | 'artist' | 'playlist') => Promise<(Song | Album | Artist | Playlist)[]>
}
// These Schemas should only contain general info data that is necessary for data fetching purposes.
// They are NOT meant to be stores for large amounts of data, i.e. Don't include the data for every single song the Playlist type.
@@ -53,7 +53,7 @@ declare global {
type Song = {
connection: {
id: string
type: serviceType
type: 'jellyfin' | 'youtube-music'
}
id: string
name: string
@@ -76,7 +76,7 @@ declare global {
type Album = {
connection: {
id: string
type: serviceType
type: 'jellyfin' | 'youtube-music'
}
id: string
name: string
@@ -91,7 +91,23 @@ declare global {
releaseDate?: string
}
// Need to figure out how to do Artists, maybe just query MusicBrainz?
type Artist = {
connection: {
id: string
type: 'jellyfin' | 'youtube-music'
}
id: string
name: string
type: 'artist'
thumbnail?: string
}
type Playlist = {
connection: {
id: string
type: 'jellyfin' | 'youtube-music'
}
id: string
name: string
type: 'playlist'
@@ -99,13 +115,6 @@ declare global {
description?: string
}
type Artist = {
id: string
name: string
type: 'artist'
thumbnail?: string
}
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.

6
src/lib/server/jellyfin.ts
View File

@@ -69,7 +69,7 @@ export class Jellyfin implements Connection {
return Array.from(mostPlayedData.Items as JellyfinAPI.Song[], (song) => this.parseSong(song))
}
public search = async (searchTerm: string): Promise<(Song | Album | Playlist)[]> => {
public search = async (searchTerm: string, filter?: 'song' | 'album' | 'artist' | 'playlist'): Promise<(Song | Album | Playlist)[]> => {
const searchParams = new URLSearchParams({
searchTerm,
includeItemTypes: 'Audio,MusicAlbum,Playlist', // Potentially add MusicArtist
@@ -153,6 +153,10 @@ export class Jellyfin implements Connection {
const thumbnail = playlist.ImageTags?.Primary ? new URL(`Items/${playlist.Id}/Images/Primary`, this.serverUrl).toString() : undefined
return {
connection: {
id: this.id,
type: 'jellyfin',
},
id: playlist.Id,
name: playlist.Name,
type: 'playlist',

195
src/lib/server/youtube-music.ts
View File

@@ -74,26 +74,39 @@ export class YouTubeMusic implements Connection {
return listenAgain.concat(quickPicks)
}
public search = async (searchTerm: string): Promise<(Song | Album | Playlist)[]> => {
public search = async (searchTerm: string, filter?: 'song' | 'album' | 'artist' | 'playlist'): Promise<(Song | Album | Artist | Playlist)[]> => {
const headers = Object.assign(this.BASEHEADERS, { authorization: `Bearer ${(await this.getTokens()).accessToken}`, 'X-Goog-Request-Time': `${Date.now()}` })
// const response = await fetch(`https://music.youtube.com/youtubei/v1/search`, {
// headers,
// method: 'POST',
// body: JSON.stringify({
// query: searchTerm,
// context: {
// client: {
// clientName: 'WEB_REMIX',
// clientVersion: `1.${formatDate()}.01.00`,
// hl: 'en',
// },
// },
// }),
// })
// Figure out how to handle Library and Uploads
// Depending on how I want to handle the playlist & library sync feature
// const data = await response.json()
// console.log(JSON.stringify(data))
const searchParams = {
song: 'EgWKAQIIAWoMEA4QChADEAQQCRAF',
album: 'EgWKAQIYAWoMEA4QChADEAQQCRAF',
artist: 'EgWKAQIgAWoMEA4QChADEAQQCRAF',
playlist: 'Eg-KAQwIABAAGAAgACgBMABqChAEEAMQCRAFEAo%3D',
}
const searchResulsts: InnerTube.SearchResponse = await fetch(`https://music.youtube.com/youtubei/v1/search`, {
headers,
method: 'POST',
body: JSON.stringify({
query: searchTerm,
params: filter ? searchParams[filter] : undefined,
context: {
client: {
clientName: 'WEB_REMIX',
clientVersion: `1.${formatDate()}.01.00`,
hl: 'en',
},
},
}),
}).then((response) => response.json())
console.log(JSON.stringify(searchResulsts))
const contents = searchResulsts.contents.tabbedSearchResultsRenderer.tabs[0].tabRenderer.content.sectionListRenderer.contents
const parsedSearchResults: (Song | Album | Artist | Playlist)[] = []
return []
}
@@ -230,6 +243,76 @@ export class YouTubeMusic implements Connection {
return parsedContent
}
private parseMusicCardShelfRenderer = (cardContent: InnerTube.musicCardShelfRenderer): Song | Album | Artist | Playlist => {
const navigationEndpoint = cardContent.title.runs[0].navigationEndpoint
const artists: Song['artists'] | Album['artists'] = []
cardContent.subtitle.runs.forEach((run) => {
if (run.navigationEndpoint?.browseEndpoint.browseEndpointContextSupportedConfigs.browseEndpointContextMusicConfig.pageType === 'MUSIC_PAGE_TYPE_ARTIST') {
artists.push({ id: run.navigationEndpoint.browseEndpoint.browseId, name: run.text })
}
})
const thumbnail = refineThumbnailUrl(cardContent.thumbnail.musicThumbnailRenderer.thumbnail.thumbnails[0].url)
if ('watchEndpoint' in navigationEndpoint) {
const albumSubtitleRun = cardContent.subtitle.runs.find(
(run) => run.navigationEndpoint?.browseEndpoint.browseEndpointContextSupportedConfigs.browseEndpointContextMusicConfig.pageType === 'MUSIC_PAGE_TYPE_ALBUM',
)
const song: Song = {
connection: {
id: this.id,
type: 'youtube-music',
},
id: navigationEndpoint.watchEndpoint.videoId,
name: cardContent.title.runs[0].text,
type: 'song',
thumbnail,
}
if (artists.length > 0) song.artists = artists
if (albumSubtitleRun) song.album = { id: albumSubtitleRun.navigationEndpoint!.browseEndpoint.browseId, name: albumSubtitleRun.text }
return song
} else {
const pageType = navigationEndpoint.browseEndpoint.browseEndpointContextSupportedConfigs.browseEndpointContextMusicConfig.pageType
if (pageType === 'MUSIC_PAGE_TYPE_ALBUM') {
const album: Album = {
connection: {
id: this.id,
type: 'youtube-music',
},
id: navigationEndpoint.browseEndpoint.browseId,
name: cardContent.title.runs[0].text,
type: 'album',
thumbnail,
}
if (artists.length > 0) album.artists = artists
return album
} else if (pageType === 'MUSIC_PAGE_TYPE_ARTIST') {
const artist: Artist = {
connection: {
id: this.id,
type: 'youtube-music',
},
id: navigationEndpoint.browseEndpoint.browseId,
name: cardContent.title.runs[0].text,
type: 'artist',
thumbnail,
}
return artist
} else {
// NEED TO GET A SAMPLE FOR THIS
const playlist: Playlist = {
connection: {
id: this.id,
type: 'youtube-music',
},
id: navigationEndpoint.browseEndpoint.browseId,
name: cardContent.title.runs[0].text,
type: 'playlist',
}
return playlist
}
}
}
}
const refineThumbnailUrl = (urlString: string): string => {
@@ -254,10 +337,72 @@ const formatDate = (): string => {
}
declare namespace InnerTube {
type Response = BrowseResponse | OtherResponse
interface SearchResponse {
contents: {
tabbedSearchResultsRenderer: {
tabs: [
{
tabRenderer: {
title: string
content: {
sectionListRenderer: {
contents: Array<
| {
musicCardShelfRenderer: musicCardShelfRenderer
}
| {
musicShelfRenderer: musicShelfRenderer
}
>
}
}
}
},
]
}
}
}
interface OtherResponse {
contents: object
type musicCardShelfRenderer = {
title: {
runs: [
{
text: string // Unlike musicShelfRenderer, this is the name of the top search result, be that the name of a song, album, artist, or etc.
navigationEndpoint:
| {
watchEndpoint: watchEndpoint
}
| {
browseEndpoint: browseEndpoint
}
},
]
}
subtitle: {
runs: Array<{
text: string
navigationEndpoint?: {
browseEndpoint: browseEndpoint
}
}>
}
contents?: Array<{
musicResponsiveListItemRenderer: musicResponsiveListItemRenderer
}>
thumbnail: {
musicThumbnailRenderer: musicThumbnailRenderer
}
}
type musicShelfRenderer = {
title: {
runs: Array<{
text: 'Artists' | 'Songs' | 'Videos' | 'Albums' | 'Community playlists' | 'Podcasts' | 'Episodes' | 'Profiles'
}>
}
contents: Array<{
musicResponsiveListItemRenderer: musicResponsiveListItemRenderer
}>
}
interface BrowseResponse {
@@ -371,13 +516,11 @@ declare namespace InnerTube {
thumbnail: {
musicThumbnailRenderer: musicThumbnailRenderer
}
overlay: unknown
flexColumns: {
musicResponsiveListItemFlexColumnRenderer: {
text: { runs: [runs] }
}
}[]
menu: unknown
playlistItemData: {
videoId: string
}
@@ -385,11 +528,11 @@ declare namespace InnerTube {
type musicThumbnailRenderer = {
thumbnail: {
thumbnails: {
thumbnails: Array<{
url: string
width: number
height: number
}[]
}>
}
thumbnailCrop: string
thumbnailScale: string
@@ -430,11 +573,7 @@ declare namespace InnerTube {
type watchEndpoint = {
videoId: string
playlistId: string
params?: string
loggingContext: {
vssLoggingContext: object
}
watchEndpointMusicSupportedConfigs: {
watchEndpointMusicConfig: object
}