diff --git a/lib/services.js b/lib/services.js
index 8e2a885..21f6c1a 100644
--- a/lib/services.js
+++ b/lib/services.js
@@ -3,6 +3,7 @@ import * as google from './services/google/index.js';
import * as itunes from './services/itunes/index.js';
import * as spotify from './services/spotify/index.js';
import * as youtube from './services/youtube/index.js';
+import * as ytmusic from './services/ytmusic/index.js';
const services = [
deezer,
@@ -10,6 +11,7 @@ const services = [
itunes,
spotify,
youtube,
+ ytmusic
]
export default services;
diff --git a/lib/services/youtube/url.js b/lib/services/youtube/url.js
index 116eb3a..48e60f8 100644
--- a/lib/services/youtube/url.js
+++ b/lib/services/youtube/url.js
@@ -3,6 +3,9 @@ import querystring from 'querystring';
export default function match(url) {
const parsed = parse(url);
+ if (parsed.host.match(/music\.youtube\.com$/)) {
+ return false;
+ }
if (parsed.host.match(/youtu\.be$/)) {
return true;
} else if (parsed.host.match(/youtube\.com$/)) {
diff --git a/lib/services/ytmusic/index.js b/lib/services/ytmusic/index.js
new file mode 100644
index 0000000..9e16713
--- /dev/null
+++ b/lib/services/ytmusic/index.js
@@ -0,0 +1,269 @@
+import urlMatch from './url.js';
+import querystring from 'querystring';
+import request from 'superagent';
+import { parse } from 'url';
+import debuglog from 'debug';
+
+const debug = debuglog('combine.fm:ytmusic');
+
+const standard_body = {'context': {'capabilities': {}, 'client': {'clientName': 'WEB_REMIX', 'clientVersion': '0.1', 'experimentIds': [], 'experimentsToken': '', 'gl': 'DE', 'hl': 'en', 'locationInfo': {'locationPermissionAuthorizationStatus': 'LOCATION_PERMISSION_AUTHORIZATION_STATUS_UNSUPPORTED'}, 'musicAppInfo': {'musicActivityMasterSwitch': 'MUSIC_ACTIVITY_MASTER_SWITCH_INDETERMINATE', 'musicLocationMasterSwitch': 'MUSIC_LOCATION_MASTER_SWITCH_INDETERMINATE', 'pwaInstallabilityStatus': 'PWA_INSTALLABILITY_STATUS_UNKNOWN'}, 'utcOffsetMinutes': 60}, 'request': {'internalExperimentFlags': [{'key': 'force_music_enable_outertube_tastebuilder_browse', 'value': 'true'}, {'key': 'force_music_enable_outertube_playlist_detail_browse', 'value': 'true'}, {'key': 'force_music_enable_outertube_search_suggestions', 'value': 'true'}], 'sessionIndex': {}}, 'user': {'enableSafetyMode': false}}}
+const standard_headers = {
+ "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:72.0) Gecko/20100101 Firefox/72.0",
+ "Accept": "*/*",
+ "Accept-Language": "en-US,en;q=0.5",
+ "Content-Type": "application/json",
+ "X-Goog-AuthUser": "0",
+ "origin": "https://music.youtube.com",
+ "X-Goog-Visitor-Id": "CgtWaTB2WWRDeEFUYyjhv-X8BQ%3D%3D"
+}
+const standard_params = { alt: "json", key: "AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30"} // INNERTUBE_API_KEY from music.youtube.com
+
+const base_filter = "Eg-KAQwIA"
+const albums_filter = "BAAGAEgACgA"
+const tracks_filter = "RAAGAAgACgA"
+// If you make a typo, ytmusic searches for a correction. With this filter it will look for the exact match
+// since we don't let users type, no sense in letting it autocorrect
+const exact_search_filter = "MABqChAEEAMQCRAFEAo%3D"
+
+// The logic here comes from https://github.com/sigma67/ytmusicapi
+// If something doesn't work, looking up back there might be a good idea.
+export async function search(data, original = {}) {
+ let query;
+ const various = data.artist.name === 'Various Artists' || data.artist.name === 'Various';
+ if (various) {
+ data.artist.name = "";
+ }
+ if (data.type == "track") {
+ query = [data.name, data.artist.name, data.albumName]
+ } else if (data.type == "album") {
+ query = [data.name, data.artist.name]
+ } else {
+ throw new Error();
+ }
+ // Add "" to try and make the search better, works for stuff like "The beatles" to reduce noise
+ query = query.filter(String).map((entry) => '"' + entry + '"').join(" ")
+
+ let params = base_filter + (data.type == "track" ? tracks_filter : albums_filter) + exact_search_filter
+ let request_body = {query, params, ...standard_body }
+
+ const { body } = await request.post("https://music.youtube.com/youtubei/v1/search")
+ .set(standard_headers)
+ .query(standard_params)
+ .send(request_body)
+
+ // no results
+ if (body.contents === undefined) {
+ debug("Empty body, no results")
+ return { service: 'ytmusic' };
+ }
+
+ let results;
+ if (body.contents.tabbedSearchResultsRenderer !== undefined) {
+ results = body.contents.tabbedSearchResultsRenderer.tabs[0].tabRenderer.content
+ } else {
+ results = body.contents.sectionListRenderer.contents
+ }
+
+ // no results
+ if (results.length == 1 && results.itemSectionRenderer !== undefined) {
+ debug("Only itemSectionRenderer, no results")
+ return { service: 'ytmusic' };
+ }
+
+ for (const result of results) {
+ if (result.musicShelfRenderer === undefined) {
+ continue;
+ }
+
+ const matches = parse_result_content(result.musicShelfRenderer.contents, data.type)
+ // This could probably be done without extra lookups, but it would involve parsing deeply the response.
+ // If there's some kind of rate limit on ytmusic's side, this is a good play to start refactoring
+ for (const match of matches) {
+ const possibleMatch = await lookupId(match, data.type)
+ const nameMatch = possibleMatch.name == data.name;
+ const artistMatch = data.artist.name == "" ? possibleMatch.artist.name === 'Various Artists' : data.artist.name == possibleMatch.artist.name;
+ if (nameMatch && artistMatch) {
+ return possibleMatch
+ }
+ }
+ }
+ debug("Finished looking up, no results")
+ return { service: 'ytmusic' };
+}
+
+function parse_result_content(contents, type) {
+ let matches = []
+ for (const result of contents) {
+ const data = result.musicResponsiveListItemRenderer;
+ const informed_type = data.flexColumns[1].musicResponsiveListItemFlexColumnRenderer.text.runs[0].text
+ if (["Video", "Playlist"].includes(informed_type)) {
+ continue;
+ }
+ let matchId;
+ if (type == "track") {
+ matchId = data.overlay?.musicItemThumbnailOverlayRenderer.content.musicPlayButtonRenderer.playNavigationEndpoint.watchEndpoint?.videoId
+ } else if (type == "album") {
+ matchId = data.navigationEndpoint?.browseEndpoint.browseId
+ }
+ if(matchId) {
+ matches.push(matchId)
+ }
+ }
+
+ return matches
+}
+
+async function lookupTrack(id) {
+ let endpoint = "https://www.youtube.com/get_video_info"
+ const { body } = await request.get(endpoint).query({ video_id: id, hl: "en", el: "detailpage" })
+
+ if (body.player_response === undefined) {
+ throw new Error();
+ }
+ let player_response = JSON.parse(body.player_response)
+ let song_meta = player_response.videoDetails
+
+ let description = song_meta.shortDescription.split("\n\n")
+ let album_name = description[2]
+ let artists = description[1].split(' · ').slice(1)
+
+ const artwork = {
+ small: song_meta.thumbnail.thumbnails[0].url,
+ large: song_meta.thumbnail.thumbnails[song_meta.thumbnail.thumbnails.length-1].url,
+ };
+
+ return Promise.resolve({
+ service: 'ytmusic',
+ type: 'track',
+ id: song_meta.videoId,
+ name: song_meta.title,
+ streamUrl: `https://music.youtube.com/watch?v=${song_meta.videoId}`,
+ purchaseUrl: null,
+ artwork,
+ artist: {
+ name: artists.join(", "),
+ },
+ album: {
+ name: album_name,
+ },
+ });
+}
+
+async function lookupAlbum(id) {
+ let request_body = {'browseEndpointContextSupportedConfigs': {'browseEndpointContextMusicConfig': {'pageType': 'MUSIC_PAGE_TYPE_ALBUM'}}, 'browseId': id, ...standard_body }
+
+ const { body } = await request.post("https://music.youtube.com/youtubei/v1/browse")
+ .set(standard_headers)
+ .query(standard_params)
+ .send(request_body)
+
+ let data = body.frameworkUpdates?.entityBatchUpdate.mutations
+ if (data === undefined) {
+ throw new Error()
+ }
+ let album_data = data.find((entry) => {
+ if (entry.payload.musicAlbumRelease !== undefined) {
+ return true
+ }
+ return false
+ }).payload.musicAlbumRelease;
+ let artists;
+ if (album_data.primaryArtists) {
+ artists= data.filter((entry) => {
+ if (entry.payload.musicArtist !== undefined) {
+ if (album_data.primaryArtists.includes(entry.entityKey)) {
+ return true
+ }
+ }
+ return false
+ }).map((entry) => entry.payload.musicArtist.name);
+ } else { // Various artists, most likely
+ artists = [album_data.artistDisplayName];
+ }
+
+ const artwork = {
+ small: album_data.thumbnailDetails.thumbnails[0].url,
+ large: album_data.thumbnailDetails.thumbnails[album_data.thumbnailDetails.thumbnails.length-1].url,
+ };
+ return Promise.resolve({
+ service: 'ytmusic',
+ type: 'album',
+ id,
+ name: album_data.title,
+ streamUrl: null,
+ streamUrl: `https://music.youtube.com/browse/${id}`,
+ purchaseUrl: null,
+ artwork,
+ artist: {
+ name: artists.join(", "),
+ },
+ playlistId: album_data.audioPlaylistId
+ });
+}
+
+async function lookupPlaylist(id) {
+ let request_body = {enablePersistentPlaylistPanel: true, isAudioOnly: true, playlistId: id, ...standard_body}
+ const { body } = await request.post("https://music.youtube.com/youtubei/v1/next")
+ .set(standard_headers)
+ .query(standard_params)
+ .send(request_body)
+
+ // The playlist object is rather complex, but here's what I'm doing: I'll parse the very minimum to get to the first track.
+ // At that point, I'm going to check the id of the album in that track. And make a lookup on it. If the album looked up
+ // has the same playlist id as the one I'm looking up, it means it's an album and not a playlist and we're good.
+ const watchNextRenderer = body.contents.singleColumnMusicWatchNextResultsRenderer.tabbedRenderer.watchNextTabbedResultsRenderer
+ const firstTrack = watchNextRenderer.tabs[0].tabRenderer.content.musicQueueRenderer.content.playlistPanelRenderer.contents[0]
+ const runs = firstTrack.playlistPanelVideoRenderer.longBylineText.runs
+ const reverse_last_artist_idx = runs.reverse().findIndex((entry) => {
+ if (entry.navigationEndpoint === undefined) {
+ return false
+ }
+ return entry.navigationEndpoint.browseEndpoint.browseId.startsWith("UC") ||
+ entry.navigationEndpoint.browseEndpoint.browseId.startsWith("FEmusic_library_privately_owned_artist")
+ });
+ if (reverse_last_artist_idx == -1) {
+ debug("Could not find an artist. Implement extra logic from ytmusicapi!");
+ throw new Error();
+ }
+ const last_artist_idx = runs.length - reverse_last_artist_idx - 1;
+ if (runs.length - last_artist_idx != 5) {
+ debug("No album found, can't find this.");
+ throw new Error();
+ }
+ const albumId = runs[last_artist_idx + 2].navigationEndpoint.browseEndpoint.browseId
+ const possibleAlbum = await lookupAlbum(albumId)
+ if (possibleAlbum.playlistId = id) {
+ return possibleAlbum;
+ }
+ throw new Error();
+}
+
+export async function lookupId(id, type) {
+ if (type == 'track') {
+ return lookupTrack(id);
+ } else if (type == 'album') {
+ return lookupAlbum(id);
+ } else if (type == 'playlist') {
+ return lookupPlaylist(id);
+ }
+ return { service: 'ytmusic', id };
+}
+
+export function parseUrl(url) {
+ const parsed = parse(url);
+ const query = querystring.parse(parsed.query);
+ let id = query.v;
+ let list_id = query.list;
+ let match;
+
+ if (parsed.path.match(/^\/watch/) && id !== undefined) {
+ return lookupId(id, 'track');
+ } else if (match = parsed.path.match(/^\/browse\/([A-Za-z0-9_]+)/)) {
+ return lookupId(match[1], 'album');
+ } else if (match = parsed.path.match(/^\/playlist/) && list_id !== undefined) {
+ return lookupId(list_id, 'playlist');
+ }
+ throw new Error();
+}
+export const id = 'ytmusic';
+export const match = urlMatch;
diff --git a/lib/services/ytmusic/url.js b/lib/services/ytmusic/url.js
new file mode 100644
index 0000000..b4b3aae
--- /dev/null
+++ b/lib/services/ytmusic/url.js
@@ -0,0 +1,10 @@
+import { parse } from 'url';
+import querystring from 'querystring';
+
+export default function match(url) {
+ const parsed = parse(url);
+ if (parsed.host.match(/music\.youtube\.com$/)) {
+ return true;
+ }
+ return false;
+}
diff --git a/models/album.cjs b/models/album.cjs
index 98e7d77..83e7d04 100644
--- a/models/album.cjs
+++ b/models/album.cjs
@@ -8,7 +8,8 @@ module.exports = function (sequelize, DataTypes) {
'itunes',
'spotify',
'xbox',
- 'youtube'
+ 'youtube',
+ 'ytmusic'
),
name: DataTypes.TEXT,
artistId: DataTypes.INTEGER,
diff --git a/models/match.cjs b/models/match.cjs
index 677ad45..2e8c39e 100644
--- a/models/match.cjs
+++ b/models/match.cjs
@@ -10,7 +10,8 @@ module.exports = function (sequelize, DataTypes) {
'itunes',
'spotify',
'xbox',
- 'youtube'
+ 'youtube',
+ 'ytmusic'
),
name: DataTypes.TEXT,
streamUrl: DataTypes.TEXT,
diff --git a/models/track.cjs b/models/track.cjs
index c09bf48..294c483 100644
--- a/models/track.cjs
+++ b/models/track.cjs
@@ -8,7 +8,8 @@ module.exports = function (sequelize, DataTypes) {
'itunes',
'spotify',
'xbox',
- 'youtube'
+ 'youtube',
+ 'ytmusic'
),
name: DataTypes.TEXT,
artistId: DataTypes.INTEGER,
diff --git a/public/assets/images/ytmusic.png b/public/assets/images/ytmusic.png
new file mode 100644
index 0000000..96743d4
Binary files /dev/null and b/public/assets/images/ytmusic.png differ
diff --git a/public/src/views/index.vue b/public/src/views/index.vue
index 32670f2..b9e90b0 100644
--- a/public/src/views/index.vue
+++ b/public/src/views/index.vue
@@ -10,7 +10,7 @@
Combine.fm makes sharing from music services better. What happens when you share your favourite song on Spotify with a friend, but they don't use Spotify?
- We match album and track links from Youtube, Spotify, Google Music, Apple Musicm, Groove Music and Deezer and give you back one link with matches we find on all of them.
+ We match album and track links from Youtube, Spotify, Google Music, Apple Music, Deezer and Youtube Music and give you back one link with matches we find on all of them.
diff --git a/test/services/ytmusic.js b/test/services/ytmusic.js
new file mode 100644
index 0000000..ad10834
--- /dev/null
+++ b/test/services/ytmusic.js
@@ -0,0 +1,60 @@
+import 'should';
+import * as ytmusic from '../../lib/services/ytmusic/index.js';
+
+describe('ytmusic', function(){
+ describe('lookupId', () => {
+ it('should find album by ID', async function testV() {
+ const result = await ytmusic.lookupId('MPREb_nlOKEssnatr', 'album');
+ result.name.should.equal('Carne de Pescoço');
+ });
+
+ it('should find track by ID', async function (){
+ const result = await ytmusic.lookupId('9zrYXvUXiQk', 'track');
+ result.name.should.equal('One Vision (Remastered 2011)');
+ result.artist.name.should.equal('Queen');
+ });
+ });
+ describe('search', () => {
+ it('should find album by search', async function (){
+ const result = await ytmusic.search({type: 'album', artist: {name: 'Jamie xx'}, name: 'In Colour'});
+ result.name.should.startWith('In Colour');
+ result.id.should.equal("MPREb_IbDz5pAZFvJ");
+ });
+
+ it('should find album with various artists by search', async function (){
+ const result = await ytmusic.search({type: 'album', artist: {name: 'Various Artists'}, name: 'Sambabook João Nogueira'});
+ result.name.should.equal('Sambabook João Nogueira');
+ result.id.should.equal('MPREb_iZt1VjORlv7');
+ });
+
+ it('should find album and make sure it makes sense by search', async function(){
+ const result = await ytmusic.search({type: 'album', artist: {name: 'The Beatles'}, name: 'The Beatles'});
+ result.name.should.equal('The Beatles');
+ result.id.should.equal('MPREb_S5TiUIYvI78');
+ });
+
+ it('should find track by search', async function (){
+ const result = await ytmusic.search({type: 'track', artist: {name: 'Oasis'}, albumName: 'Stop The Clocks', name: 'Wonderwall'});
+ result.name.should.equal('Wonderwall');
+ result.id.should.equal('Gvfgut8nAgw');
+ });
+ });
+ describe('lookupUrl', () => {
+ describe('parseUrl', () => {
+ it('should parse track url into ID', async function (){
+ const result = await ytmusic.parseUrl('https://music.youtube.com/watch?v=YLp2cW7ICCU&feature=share');
+ result.id.should.equal("YLp2cW7ICCU");
+ result.streamUrl.should.equal("https://music.youtube.com/watch?v=YLp2cW7ICCU");
+ });
+ it('should parse album url into ID', async function (){
+ const result = await ytmusic.parseUrl('https://music.youtube.com/browse/MPREb_9C36yscfgmJ');
+ result.id.should.equal("MPREb_9C36yscfgmJ");
+ result.streamUrl.should.equal("https://music.youtube.com/browse/MPREb_9C36yscfgmJ");
+ });
+ it('should parse alternative album url into ID', async function (){
+ const result = await ytmusic.parseUrl('https://music.youtube.com/playlist?list=OLAK5uy_lx9K5RpiBEwd3E4C1GKqY7e06qTlwydvs');
+ result.id.should.equal("MPREb_9C36yscfgmJ");
+ });
+ });
+ });
+});