diff --git a/src/music_service.ts b/src/music_service.ts index 193b675..6af4ab7 100644 --- a/src/music_service.ts +++ b/src/music_service.ts @@ -22,15 +22,19 @@ export type AuthFailure = { message: string; }; - -export type Artist = { +export type ArtistSummary = { id: string; name: string; - image: { - small: string | undefined, - medium: string | undefined, - large: string | undefined, - } + image: Images +} + +export type Images = { + small: string | undefined, + medium: string | undefined, + large: string | undefined, +} + +export type Artist = ArtistSummary & { }; export type Album = { @@ -71,7 +75,7 @@ export interface MusicService { } export interface MusicLibrary { - artists(q: ArtistQuery): Promise>; - artist(id: string): Artist; + artists(q: ArtistQuery): Promise>; + artist(id: string): Promise; albums(q: AlbumQuery): Promise>; } diff --git a/src/navidrome.ts b/src/navidrome.ts index a0542e0..3d3db8e 100644 --- a/src/navidrome.ts +++ b/src/navidrome.ts @@ -4,11 +4,14 @@ import { MusicService, Album, Artist, + ArtistSummary, Result, slice2, asResult, AlbumQuery, ArtistQuery, + MusicLibrary, + Images, } from "./music_service"; import X2JS from "x2js"; @@ -35,15 +38,17 @@ export type SubsonicResponse = { _status: string; }; +export type artist = { + _id: string; + _name: string; + _albumCount: string; + _artistImageUrl: string | undefined; +}; + export type GetArtistsResponse = SubsonicResponse & { artists: { index: { - artist: { - _id: string; - _name: string; - _albumCount: string; - _artistImageUrl: string | undefined; - }[]; + artist: artist[]; _name: string; }[]; }; @@ -65,16 +70,29 @@ export type artistInfo = { largeImageUrl: string | undefined; }; +export type ArtistInfo = { + image: Images; +}; + export type GetArtistInfoResponse = { artistInfo: artistInfo; }; +export type GetArtistResponse = { + artist: artist; +}; + export function isError( subsonicResponse: SubsonicResponse ): subsonicResponse is SubsonicError { return (subsonicResponse as SubsonicError).error !== undefined; } +export type IdName = { + id: string; + name: string; +}; + export class Navidrome implements MusicService { url: string; encryption: Encryption; @@ -124,46 +142,80 @@ export class Navidrome implements MusicService { ) ); + artistInfo = (credentials: Credentials, id: string): Promise => + this.get(credentials, "/rest/getArtistInfo", { + id, + }).then((it) => ({ + image: { + small: it.artistInfo.smallImageUrl, + medium: it.artistInfo.mediumImageUrl, + large: it.artistInfo.largeImageUrl, + }, + })); + async login(token: string) { const navidrome = this; const credentials: Credentials = this.parseToken(token); - return Promise.resolve({ - artists: (q: ArtistQuery): Promise> => + + const musicLibrary: MusicLibrary = { + artists: (q: ArtistQuery): Promise> => navidrome .get(credentials, "/rest/getArtists") - .then((it) => it.artists.index.flatMap((it) => it.artist)) + .then((it) => it.artists.index.flatMap((it) => it.artist || [])) .then((artists) => + artists.map((artist) => ({ + id: artist._id, + name: artist._name, + })) + ) + .then(slice2(q)) + .then(asResult) + .then((result) => Promise.all( - artists.map((artist) => - navidrome - .get( - credentials, - "/rest/getArtistInfo", - { id: artist._id } - ) - .then((it) => it.artistInfo) - .then((artistInfo) => ({ - id: artist._id, - name: artist._name, - image: { - small: artistInfo.smallImageUrl, - medium: artistInfo.mediumImageUrl, - large: artistInfo.largeImageUrl, - }, - })) + result.results.map((idName: IdName) => + navidrome.artistInfo(credentials, idName.id).then((artist) => ({ + total: result.total, + result: { + id: idName.id, + name: idName.name, + image: artist.image, + }, + })) ) ) ) - .then(slice2(q)) - .then(asResult), - artist: (id: string) => ({ - id, - name: id, - image: { small: undefined, medium: undefined, large: undefined }, - }), + .then((resultWithInfo) => { + return { + total: resultWithInfo[0]?.total || 0, + results: resultWithInfo.map((it) => it.result), + }; + }), + artist: async (id: string): Promise => { + return navidrome + .get(credentials, "/rest/getArtist", { + id, + }) + .then(async (artist: GetArtistResponse) => { + return navidrome + .get(credentials, "/rest/getArtistInfo", { + id, + }) + .then((artistInfo: GetArtistInfoResponse) => ({ + id: artist.artist._id, + name: artist.artist._name, + image: { + small: artistInfo.artistInfo.smallImageUrl, + medium: artistInfo.artistInfo.mediumImageUrl, + large: artistInfo.artistInfo.largeImageUrl, + }, + })); + }); + }, albums: (_: AlbumQuery): Promise> => { return Promise.resolve({ results: [], total: 0 }); }, - }); + }; + + return Promise.resolve(musicLibrary); } } diff --git a/src/server.ts b/src/server.ts index 62f7f9e..8a39ded 100644 --- a/src/server.ts +++ b/src/server.ts @@ -2,17 +2,18 @@ import express, { Express } from "express"; import * as Eta from "eta"; import morgan from "morgan"; +import { Sonos, Service } from "./sonos"; import { - Sonos, - Service, -} from "./sonos"; -import { SOAP_PATH, STRINGS_ROUTE, PRESENTATION_MAP_ROUTE, LOGIN_ROUTE } from './smapi'; + SOAP_PATH, + STRINGS_ROUTE, + PRESENTATION_MAP_ROUTE, + LOGIN_ROUTE, +} from "./smapi"; import { LinkCodes, InMemoryLinkCodes } from "./link_codes"; import { MusicService, isSuccess } from "./music_service"; // import logger from "./logger"; import bindSmapiSoapServiceToExpress from "./smapi"; - function server( sonos: Sonos, bonobService: Service, @@ -65,7 +66,7 @@ function server( res.render("login", { bonobService, linkCode: req.query.linkCode, - loginRoute: LOGIN_ROUTE + loginRoute: LOGIN_ROUTE, }); }); @@ -85,7 +86,7 @@ function server( res.render("success", { message: `Login successful!`, }); - } else { + } else { res.status(403).render("failure", { message: `Login failed! ${authResult.message}!`, }); @@ -112,7 +113,33 @@ function server( res.send(""); }); - bindSmapiSoapServiceToExpress(app, SOAP_PATH, webAddress, linkCodes, musicService); + // app.get("/artist/:artistId/image", (req, res) => { + // console.log(`Trying to load image for ${req.params["artistId"]}, token ${JSON.stringify(req.cookies)}`) + // const authToken = req.headers["X-AuthToken"]! as string; + // const artistId = req.params["artistId"]!; + // musicService + // .login(authToken) + // .then((it) => it.artist(artistId)) + // .then(artist => artist.image.small) + // .then((url) => { + // if (url) { + // console.log(`${artistId} sending 307 -> ${url}`) + // res.setHeader("Location", url); + // res.status(307).send(); + // } else { + // console.log(`${artistId} sending 404`) + // res.status(404).send(); + // } + // }); + // }); + + bindSmapiSoapServiceToExpress( + app, + SOAP_PATH, + webAddress, + linkCodes, + musicService + ); return app; } diff --git a/src/smapi.ts b/src/smapi.ts index adca06b..fcc565a 100644 --- a/src/smapi.ts +++ b/src/smapi.ts @@ -6,7 +6,12 @@ import path from "path"; import logger from "./logger"; import { LinkCodes } from "./link_codes"; -import { Album, Artist, MusicLibrary, MusicService } from "./music_service"; +import { + Album, + ArtistSummary, + MusicLibrary, + MusicService, +} from "./music_service"; export const LOGIN_ROUTE = "/login"; export const SOAP_PATH = "/ws/sonos"; @@ -227,35 +232,41 @@ function bindSmapiSoapServiceToExpress( case "artists": return await musicLibrary .artists(paging) - .then(({ results, total }: { results: Artist[], total: number}) => - getMetadataResult({ - mediaCollection: results.map((it) => - ({ + .then( + ({ + results, + total, + }: { + results: ArtistSummary[]; + total: number; + }) => + getMetadataResult({ + mediaCollection: results.map((it) => ({ itemType: "artist", id: `artist:${it.id}`, artistId: it.id, title: it.name, - albumArtURI: it.image.small - }) - ), - index: paging._index, - total, - }) + albumArtURI: it.image.small, + })), + index: paging._index, + total, + }) ); case "albums": return await musicLibrary .albums(paging) - .then(({ results, total }: { results: Album[], total: number}) => - getMetadataResult({ - mediaCollection: results.map((it) => - container({ - id: `album:${it.id}`, - title: it.name, - }) - ), - index: paging._index, - total, - }) + .then( + ({ results, total }: { results: Album[]; total: number }) => + getMetadataResult({ + mediaCollection: results.map((it) => + container({ + id: `album:${it.id}`, + title: it.name, + }) + ), + index: paging._index, + total, + }) ); default: throw `Unsupported id:${id}`; diff --git a/tests/in_memory_music_service.test.ts b/tests/in_memory_music_service.test.ts index 14a6885..f07e22a 100644 --- a/tests/in_memory_music_service.test.ts +++ b/tests/in_memory_music_service.test.ts @@ -1,4 +1,8 @@ -import { InMemoryMusicService, artistWithAlbumsToArtist } from "./in_memory_music_service"; +import { + InMemoryMusicService, + artistWithAlbumsToArtist, + artistWithAlbumsToArtistSummary, +} from "./in_memory_music_service"; import { AuthSuccess, MusicLibrary } from "../src/music_service"; import { v4 as uuid } from "uuid"; import { @@ -48,8 +52,18 @@ describe("InMemoryMusicService", () => { expect(artistWithAlbumsToArtist(BOB_MARLEY)).toEqual({ id: BOB_MARLEY.id, name: BOB_MARLEY.name, - image: BOB_MARLEY.image - }) + image: BOB_MARLEY.image, + }); + }); + }); + + describe("artistWithAlbumsToArtistSummary", () => { + it("should map fields correctly", () => { + expect(artistWithAlbumsToArtistSummary(BOB_MARLEY)).toEqual({ + id: BOB_MARLEY.id, + name: BOB_MARLEY.name, + image: BOB_MARLEY.image, + }); }); }); @@ -71,12 +85,14 @@ describe("InMemoryMusicService", () => { describe("fetching all", () => { it("should provide an array of artists", async () => { const artists = [ - artistWithAlbumsToArtist(BOB_MARLEY), - artistWithAlbumsToArtist(MADONNA), - artistWithAlbumsToArtist(BLONDIE), - artistWithAlbumsToArtist(METALLICA), + artistWithAlbumsToArtistSummary(BOB_MARLEY), + artistWithAlbumsToArtistSummary(MADONNA), + artistWithAlbumsToArtistSummary(BLONDIE), + artistWithAlbumsToArtistSummary(METALLICA), ]; - expect(await musicLibrary.artists({ _index: 0, _count: 100 })).toEqual({ + expect( + await musicLibrary.artists({ _index: 0, _count: 100 }) + ).toEqual({ results: artists, total: 4, }); @@ -86,8 +102,8 @@ describe("InMemoryMusicService", () => { describe("fetching the second page", () => { it("should provide an array of artists", async () => { const artists = [ - artistWithAlbumsToArtist(BLONDIE), - artistWithAlbumsToArtist(METALLICA), + artistWithAlbumsToArtistSummary(BLONDIE), + artistWithAlbumsToArtistSummary(METALLICA), ]; expect(await musicLibrary.artists({ _index: 2, _count: 2 })).toEqual({ results: artists, @@ -99,9 +115,9 @@ describe("InMemoryMusicService", () => { describe("fetching the more items than fit on the second page", () => { it("should provide an array of artists", async () => { const artists = [ - artistWithAlbumsToArtist(MADONNA), - artistWithAlbumsToArtist(BLONDIE), - artistWithAlbumsToArtist(METALLICA), + artistWithAlbumsToArtistSummary(MADONNA), + artistWithAlbumsToArtistSummary(BLONDIE), + artistWithAlbumsToArtistSummary(METALLICA), ]; expect( await musicLibrary.artists({ _index: 1, _count: 50 }) @@ -112,15 +128,19 @@ describe("InMemoryMusicService", () => { describe("artist", () => { describe("when it exists", () => { - it("should provide an artist", () => { - expect(musicLibrary.artist(MADONNA.id)).toEqual(artistWithAlbumsToArtist(MADONNA)); - expect(musicLibrary.artist(BLONDIE.id)).toEqual(artistWithAlbumsToArtist(BLONDIE)); + it("should provide an artist", async () => { + expect(await musicLibrary.artist(MADONNA.id)).toEqual( + artistWithAlbumsToArtist(MADONNA) + ); + expect(await musicLibrary.artist(BLONDIE.id)).toEqual( + artistWithAlbumsToArtist(BLONDIE) + ); }); }); describe("when it doesnt exist", () => { - it("should provide an artist", () => { - expect(() => musicLibrary.artist("-1")).toThrow( + it("should blow up", async () => { + return expect(musicLibrary.artist("-1")).rejects.toEqual( "No artist with id '-1'" ); }); @@ -130,30 +150,50 @@ describe("InMemoryMusicService", () => { describe("albums", () => { describe("fetching with no filtering", () => { it("should return all the albums for all the artists", async () => { - expect(await musicLibrary.albums({ _index: 0, _count: 100 })).toEqual({ - results: ALL_ALBUMS, - total: ALL_ALBUMS.length, - }); + expect(await musicLibrary.albums({ _index: 0, _count: 100 })).toEqual( + { + results: ALL_ALBUMS, + total: ALL_ALBUMS.length, + } + ); }); }); describe("fetching for a single artist", () => { it("should return them all if the artist has some", async () => { - expect(await musicLibrary.albums({ artistId: BLONDIE.id, _index: 0, _count: 100 })).toEqual({ + expect( + await musicLibrary.albums({ + artistId: BLONDIE.id, + _index: 0, + _count: 100, + }) + ).toEqual({ results: BLONDIE.albums, total: BLONDIE.albums.length, }); }); it("should return empty list of the artists does not have any", async () => { - expect(await musicLibrary.albums({ artistId: MADONNA.id, _index: 0, _count: 100 })).toEqual({ + expect( + await musicLibrary.albums({ + artistId: MADONNA.id, + _index: 0, + _count: 100, + }) + ).toEqual({ results: [], total: 0, }); }); it("should return empty list if the artist id is not valid", async () => { - expect(await musicLibrary.albums({ artistId: uuid(), _index: 0, _count: 100 })).toEqual({ + expect( + await musicLibrary.albums({ + artistId: uuid(), + _index: 0, + _count: 100, + }) + ).toEqual({ results: [], total: 0, }); diff --git a/tests/in_memory_music_service.ts b/tests/in_memory_music_service.ts index 2282b1c..74a7dd5 100644 --- a/tests/in_memory_music_service.ts +++ b/tests/in_memory_music_service.ts @@ -13,18 +13,20 @@ import { AlbumQuery, slice2, asResult, + ArtistSummary, } from "../src/music_service"; -export const artistWithAlbumsToArtist = (it: ArtistWithAlbums): Artist => ({ +export const artistWithAlbumsToArtistSummary = ( + it: ArtistWithAlbums +): ArtistSummary => ({ id: it.id, name: it.name, - image: it.image + image: it.image, }); -const getOrThrow = (message: string) => - O.getOrElseW(() => { - throw message; - }); +export const artistWithAlbumsToArtist = (it: ArtistWithAlbums): Artist => ({ + ...artistWithAlbumsToArtistSummary(it), +}); type P = (t: T) => boolean; const all: P = (_: any) => true; @@ -60,7 +62,7 @@ export class InMemoryMusicService implements MusicService { return Promise.reject("Invalid auth token"); return Promise.resolve({ artists: (q: ArtistQuery) => - Promise.resolve(this.artists.map(artistWithAlbumsToArtist)) + Promise.resolve(this.artists.map(artistWithAlbumsToArtistSummary)) .then(slice2(q)) .then(asResult), artist: (id: string) => @@ -68,7 +70,8 @@ export class InMemoryMusicService implements MusicService { this.artists.find((it) => it.id === id), O.fromNullable, O.map(artistWithAlbumsToArtist), - getOrThrow(`No artist with id '${id}'`) + O.map(it => Promise.resolve(it)), + O.getOrElse(() => Promise.reject(`No artist with id '${id}'`)) ), albums: (q: AlbumQuery) => Promise.resolve( diff --git a/tests/navidrome.test.ts b/tests/navidrome.test.ts index df7066c..fcacbe3 100644 --- a/tests/navidrome.test.ts +++ b/tests/navidrome.test.ts @@ -1,13 +1,13 @@ import { Md5 } from "ts-md5/dist/md5"; -import { Navidrome, t, artistInfo } from "../src/navidrome"; +import { Navidrome, t } from "../src/navidrome"; import encryption from "../src/encryption"; import axios from "axios"; jest.mock("axios"); import randomString from "../src/random_string"; -import { AuthSuccess } from "../src/music_service"; +import { Artist, AuthSuccess, Images } from "../src/music_service"; jest.mock("../src/random_string"); describe("t", () => { @@ -24,23 +24,21 @@ const ok = (data: string) => ({ }); const artistInfoXml = ( - artistInfo: Partial + images: Images ) => ` - ${artistInfo.smallImageUrl || ""} - ${ - artistInfo.mediumImageUrl || "" - } - ${artistInfo.largeImageUrl || ""} + ${images.small || ""} + ${images.medium || ""} + ${images.large || ""} `; const PING_OK = ``; -describe("navidrome", () => { +describe("Navidrome", () => { const url = "http://127.0.0.22:4567"; const username = "user1"; const password = "pass1"; @@ -49,7 +47,7 @@ describe("navidrome", () => { const navidrome = new Navidrome(url, encryption("secret")); const mockedRandomString = (randomString as unknown) as jest.Mock; - const mockGET = jest.fn() + const mockGET = jest.fn(); beforeEach(() => { jest.clearAllMocks(); @@ -102,54 +100,147 @@ describe("navidrome", () => { }); }); - describe("getArtists", () => { - const getArtistsXml = ` - - - - - - - - - - - - - `; + describe("getArtist", () => { + const artistId = "someUUID_123"; + const artistName = "BananaMan"; - const artist1_getArtistInfoXml = artistInfoXml({ - smallImageUrl: "sml1", - mediumImageUrl: "med1", - largeImageUrl: "lge1", - }); - const artist2_getArtistInfoXml = artistInfoXml({ - smallImageUrl: "sml2", - mediumImageUrl: undefined, - largeImageUrl: "lge2", - }); - const artist3_getArtistInfoXml = artistInfoXml({ - smallImageUrl: undefined, - mediumImageUrl: "med3", - largeImageUrl: undefined, - }); - const artist4_getArtistInfoXml = artistInfoXml({ - smallImageUrl: "sml4", - mediumImageUrl: "med4", - largeImageUrl: "lge4", + const artistXml = ` + + + `; + + const getArtistInfoXml = artistInfoXml({ + small: "sml1", + medium: "med1", + large: "lge1", }); beforeEach(() => { mockGET - .mockImplementationOnce(() => Promise.resolve(ok(PING_OK))) - .mockImplementationOnce(() => Promise.resolve(ok(getArtistsXml))) - .mockImplementationOnce(() => Promise.resolve(ok(artist1_getArtistInfoXml))) - .mockImplementationOnce(() => Promise.resolve(ok(artist2_getArtistInfoXml))) - .mockImplementationOnce(() => Promise.resolve(ok(artist3_getArtistInfoXml))) - .mockImplementationOnce(() => Promise.resolve(ok(artist4_getArtistInfoXml))); + .mockImplementationOnce(() => Promise.resolve(ok(PING_OK))) + .mockImplementationOnce(() => Promise.resolve(ok(artistXml))) + .mockImplementationOnce(() => Promise.resolve(ok(getArtistInfoXml))); + }); + + it("should do it", async () => { + const artist = await navidrome + .generateToken({ username, password }) + .then((it) => it as AuthSuccess) + .then((it) => navidrome.login(it.authToken)) + .then((it) => it.artist(artistId)); + + expect(artist).toEqual({ + id: artistId, + name: artistName, + image: { small: "sml1", medium: "med1", large: "lge1" }, + }); + + expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, { + params: { + id: artistId, + ...authParams, + }, + }); + + expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { + params: { + id: artistId, + ...authParams, + }, + }); + }); + }); + + describe("getArtists", () => { + const artist1: Artist = { + id: "artist1.id", + name: "artist1.name", + image: { small: "s1", medium: "m1", large: "l1" }, + }; + const artist2: Artist = { + id: "artist2.id", + name: "artist2.name", + image: { small: "s2", medium: "m2", large: "l2" }, + }; + const artist3: Artist = { + id: "artist3.id", + name: "artist3.name", + image: { small: "s3", medium: "m3", large: "l3" }, + }; + const artist4: Artist = { + id: "artist4.id", + name: "artist4.name", + image: { small: "s4", medium: "m4", large: "l4" }, + }; + + const getArtistsXml = ` + + + + + + + + + + + + + `; + + describe("when there are no results", () => { + beforeEach(() => { + mockGET + .mockImplementationOnce(() => Promise.resolve(ok(PING_OK))) + .mockImplementationOnce(() => + Promise.resolve( + ok(` + + + + + + + + + `) + ) + ); + }); + + it("should return empty", async () => { + const artists = await navidrome + .generateToken({ username, password }) + .then((it) => it as AuthSuccess) + .then((it) => navidrome.login(it.authToken)) + .then((it) => it.artists({ _index: 0, _count: 100 })); + + expect(artists).toEqual({ + results: [], + total: 0, + }); + }); }); describe("when no paging is in effect", () => { + beforeEach(() => { + mockGET + .mockImplementationOnce(() => Promise.resolve(ok(PING_OK))) + .mockImplementationOnce(() => Promise.resolve(ok(getArtistsXml))) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist1.image))) + ) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist2.image))) + ) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist3.image))) + ) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist4.image))) + ); + }); + it("should return all the artists", async () => { const artists = await navidrome .generateToken({ username, password }) @@ -157,54 +248,35 @@ describe("navidrome", () => { .then((it) => navidrome.login(it.authToken)) .then((it) => it.artists({ _index: 0, _count: 100 })); - const expectedArtists = [ - { - id: "2911b2d67a6b11eb804dd360a6225680", - name: "artist1", - image: { small: "sml1", medium: "med1", large: "lge1" }, - }, - { - id: "3c0b9d7a7a6b11eb9773f398e6236ad6", - name: "artist2", - image: { small: "sml2", medium: "", large: "lge2" }, - }, - { - id: "3c5113007a6b11eb87173bfb9b07f9b1", - name: "artist3", - image: { small: "", medium: "med3", large: "" }, - }, - { - id: "3ca781c27a6b11eb897ebbb5773603ad", - name: "artist4", - image: { small: "sml4", medium: "med4", large: "lge4" }, - }, - ]; - expect(artists).toEqual({ results: expectedArtists, total: 4 }); + expect(artists).toEqual({ + results: [artist1, artist2, artist3, artist4], + total: 4, + }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, { params: authParams, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "2911b2d67a6b11eb804dd360a6225680", + id: artist1.id, ...authParams, }, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "3c0b9d7a7a6b11eb9773f398e6236ad6", + id: artist2.id, ...authParams, }, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "3c5113007a6b11eb87173bfb9b07f9b1", + id: artist3.id, ...authParams, }, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "3ca781c27a6b11eb897ebbb5773603ad", + id: artist4.id, ...authParams, }, }); @@ -212,6 +284,18 @@ describe("navidrome", () => { }); describe("when paging specified", () => { + beforeEach(() => { + mockGET + .mockImplementationOnce(() => Promise.resolve(ok(PING_OK))) + .mockImplementationOnce(() => Promise.resolve(ok(getArtistsXml))) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist2.image))) + ) + .mockImplementationOnce(() => + Promise.resolve(ok(artistInfoXml(artist3.image))) + ); + }); + it("should return only the correct page of artists", async () => { const artists = await navidrome .generateToken({ username, password }) @@ -219,44 +303,20 @@ describe("navidrome", () => { .then((it) => navidrome.login(it.authToken)) .then((it) => it.artists({ _index: 1, _count: 2 })); - const expectedArtists = [ - { - id: "3c0b9d7a7a6b11eb9773f398e6236ad6", - name: "artist2", - image: { small: "sml2", medium: "", large: "lge2" }, - }, - { - id: "3c5113007a6b11eb87173bfb9b07f9b1", - name: "artist3", - image: { small: "", medium: "med3", large: "" }, - }, - ]; - expect(artists).toEqual({ results: expectedArtists, total: 4 }); + expect(artists).toEqual({ results: [artist2, artist3], total: 4 }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, { params: authParams, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "2911b2d67a6b11eb804dd360a6225680", + id: artist2.id, ...authParams, }, }); expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { params: { - id: "3c0b9d7a7a6b11eb9773f398e6236ad6", - ...authParams, - }, - }); - expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { - params: { - id: "3c5113007a6b11eb87173bfb9b07f9b1", - ...authParams, - }, - }); - expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo`, { - params: { - id: "3ca781c27a6b11eb897ebbb5773603ad", + id: artist3.id, ...authParams, }, });