bob

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:23-bullseye
+FROM node:20-bullseye
 
 LABEL maintainer=simojenki
 

.github/workflows/ci.yml

@@ -40,10 +40,10 @@ jobs:
           fetch-depth: 0
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Docker meta
         id: meta
@@ -69,10 +69,12 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Push image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+# linux/arm/v6,
+

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:23-bullseye-slim AS build
+FROM node:20-bullseye-slim as build
 
 WORKDIR /bonob
 
@@ -36,7 +36,7 @@ RUN apt-get update && \
     NODE_ENV=production npm install --omit=dev
 
 
-FROM node:23-bullseye-slim
+FROM node:20-bullseye-slim
 
 LABEL   maintainer="simojenki" \
         org.opencontainers.image.source="https://github.com/simojenki/bonob" \
@@ -58,7 +58,7 @@ COPY --from=build /bonob/build/src ./src
 COPY --from=build /bonob/node_modules ./node_modules
 COPY --from=build /bonob/.gitinfo ./
 COPY web ./web
-COPY src/Sonoswsdl-1.19.6-20231024.wsdl ./src/Sonoswsdl-1.19.6-20231024.wsdl
+COPY src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl ./src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
 
 RUN apt-get update && \
     apt-get -y upgrade && \

package.json

@@ -6,56 +6,56 @@
   "author": "simojenki <simojenki@users.noreply.github.com>",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@svrooij/sonos": "^2.6.0-beta.11",
+    "@svrooij/sonos": "^2.6.0-beta.7",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.4",
-    "@types/jsonwebtoken": "^9.0.7",
+    "@types/jsonwebtoken": "^9.0.5",
-    "@types/jws": "^3.2.10",
+    "@types/jws": "^3.2.9",
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.11.5",
-    "@types/randomstring": "^1.3.0",
+    "@types/randomstring": "^1.1.11",
-    "@types/underscore": "^1.13.0",
+    "@types/underscore": "^1.11.15",
-    "@types/uuid": "^10.0.0",
+    "@types/uuid": "^9.0.7",
-    "@types/xmldom": "^0.1.34",
+    "@types/xmldom": "0.1.34",
-    "@xmldom/xmldom": "^0.9.7",
+    "axios": "^1.6.5",
-    "axios": "^1.7.8",
+    "dayjs": "^1.11.10",
-    "dayjs": "^1.11.13",
     "eta": "^2.2.0",
-    "express": "^4.18.3",
+    "express": "^4.18.2",
-    "fp-ts": "^2.16.9",
+    "fp-ts": "^2.16.2",
     "fs-extra": "^11.2.0",
     "jsonwebtoken": "^9.0.2",
     "jws": "^4.0.0",
+    "libxmljs2": "^0.33.0",
     "morgan": "^1.10.0",
-    "node-html-parser": "^6.1.13",
+    "node-html-parser": "^6.1.12",
     "randomstring": "^1.3.0",
-    "sharp": "^0.33.5",
+    "sharp": "^0.33.2",
-    "soap": "^1.1.6",
+    "soap": "^1.0.0",
     "ts-md5": "^1.3.1",
-    "typescript": "^5.7.2",
+    "typescript": "^5.3.3",
-    "underscore": "^1.13.7",
+    "underscore": "^1.13.6",
     "urn-lib": "^2.0.0",
-    "uuid": "^11.0.3",
+    "uuid": "^9.0.1",
-    "winston": "^3.17.0",
+    "winston": "^3.11.0",
-    "xmldom-ts": "^0.3.1",
+    "xmldom-ts": "^0.3.1"
-    "xpath": "^0.0.34"
   },
   "devDependencies": {
-    "@types/chai": "^5.0.1",
+    "@types/chai": "^4.3.11",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.11",
-    "@types/mocha": "^10.0.10",
+    "@types/mocha": "^10.0.6",
     "@types/supertest": "^6.0.2",
     "@types/tmp": "^0.2.6",
-    "chai": "^5.1.2",
+    "chai": "^5.0.0",
-    "get-port": "^7.1.0",
+    "get-port": "^7.0.0",
-    "image-js": "^0.35.6",
+    "image-js": "^0.35.5",
     "jest": "^29.7.0",
-    "nodemon": "^3.1.7",
+    "nodemon": "^3.0.3",
-    "supertest": "^7.0.0",
+    "supertest": "^6.3.4",
-    "tmp": "^0.2.3",
+    "tmp": "^0.2.1",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.2",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.2",
+    "xmldom-ts": "^0.3.1",
     "xpath-ts": "^1.3.13"
   },
   "overrides": {
@@ -66,7 +66,7 @@
     "clean": "rm -Rf build node_modules",
     "build": "tsc",
     "dev": "BNB_SUBSONIC_CUSTOM_CLIENTS1=audio/flac,audio/mpeg,audio/mp4\\>audio/flac BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
-    "devr": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_ICON_FOREGROUND_COLOR=deeppink BNB_ICON_BACKGROUND_COLOR=darkslategray BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_SONOS_AUTO_REGISTER=true BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
+    "devr": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_SONOS_AUTO_REGISTER=true BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
     "register-dev": "ts-node ./src/register.ts http://${BNB_DEV_HOST_IP}:4534",
     "test": "jest",
     "testw": "jest --watch",

src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl

@@ -97,7 +97,7 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element name="token" type="xs:string"/>
-                        <xs:element name="key" type="xs:string" minOccurs="0"/>
+                        <xs:element name="key" type="xs:string"/>
                         <xs:element name="householdId" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
@@ -111,12 +111,11 @@
                 </xs:simpleType>
             </xs:element>
 
-            <xs:simpleType name="userAccountTier">
+            <xs:simpleType name="userAccountType">
                 <xs:restriction base="xs:string">
-                    <xs:enumeration value="paidPremium"/>
+                    <xs:enumeration value="premium"/>
-                    <xs:enumeration value="paidLimited"/>
+                    <xs:enumeration value="trial"/>
                     <xs:enumeration value="free"/>
-                    <xs:enumeration value="none"/>
                 </xs:restriction>
             </xs:simpleType>
 
@@ -240,12 +239,6 @@
                 </xs:simpleContent>
             </xs:complexType>
 
-            <xs:complexType name="contentKeys">
-                <xs:sequence>
-                    <xs:element name="contentKey" type="tns:contentKey" maxOccurs="8"/>
-                </xs:sequence>
-            </xs:complexType>
-
             <xs:simpleType name="mediaUriAction">
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="IMPLICIT"/>
@@ -362,11 +355,13 @@
 
             <xs:complexType name="userInfo">
                 <xs:sequence>
-                    <!--  accountStatus potentially for future use -->
+                    <!-- Everything except userIdHashCode and nickname are for future use -->
                     <xs:element name="userIdHashCode" type="xs:string" minOccurs="1"/>
-                    <xs:element name="accountTier" type="tns:userAccountTier" minOccurs="0"/>
+                    <xs:element name="accountType" type="tns:userAccountType" minOccurs="0"/>
                     <xs:element name="accountStatus" type="tns:userAccountStatus" minOccurs="0"/>
                     <xs:element ref="tns:nickname" minOccurs="0"/>
+                    <xs:element name="profileUrl" type="tns:sonosUri" minOccurs="0"/>
+                    <xs:element name="pictureUrl" type="tns:sonosUri" minOccurs="0"/>
                 </xs:sequence>
             </xs:complexType>
 
@@ -893,10 +888,7 @@
                         <xs:element name="getMediaURIResult" type="xs:anyURI"/>
                         <xs:element name="deviceSessionToken" type="tns:deviceSessionToken" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="deviceSessionKey" type="tns:encryptionContext" minOccurs="0" maxOccurs="1"/>
-                        <xs:choice minOccurs="0">
+                        <xs:element name="contentKey" type="tns:encryptionContext" minOccurs="0" maxOccurs="1"/>
-                            <xs:element name="contentKey" type="tns:encryptionContext" minOccurs="0" maxOccurs="1"/>
-                            <xs:element name="contentKeys" type="tns:contentKeys" minOccurs="0" maxOccurs="1"/>
-                        </xs:choice>
                         <xs:element name="httpHeaders" type="tns:httpHeaders" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="uriTimeout" type="xs:int" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="positionInformation" type="tns:positionInformation" minOccurs="0" maxOccurs="1"/>
@@ -2067,7 +2059,7 @@
 
     <wsdl:service name="Sonos">
         <wsdl:port name="SonosSoap" binding="tns:SonosSoap">
-		<soap:address location="http://moapi.sonos.com/Test/TestService.php"/>
+		<soap:address location="/about"/>
         </wsdl:port>
     </wsdl:service>
 

src/app.ts

@@ -6,16 +6,15 @@ import logger from "./logger";
 import {
   axiosImageFetcher,
   cachingImageFetcher,
+  Subsonic,
   TranscodingCustomPlayers,
-  NO_CUSTOM_PLAYERS,
+  NO_CUSTOM_PLAYERS
-  Subsonic
 } from "./subsonic";
-import { SubsonicMusicService} from "./subsonic_music_library";
 import { InMemoryAPITokens, sha256 } from "./api_tokens";
 import { InMemoryLinkCodes } from "./link_codes";
 import readConfig from "./config";
 import sonos, { bonobService } from "./sonos";
-import { MusicService } from "./music_library";
+import { MusicService } from "./music_service";
 import { SystemClock } from "./clock";
 import { JWTSmapiLoginTokens } from "./smapi_auth";
 
@@ -41,13 +40,10 @@ const artistImageFetcher = config.subsonic.artistImageCache
   ? cachingImageFetcher(config.subsonic.artistImageCache, axiosImageFetcher)
   : axiosImageFetcher;
 
-const subsonic = new SubsonicMusicService(
+const subsonic = new Subsonic(
-  new Subsonic(
+  config.subsonic.url,
-    config.subsonic.url,
+  customPlayers,
-    customPlayers,
+  artistImageFetcher
-    artistImageFetcher
-  ),
-  customPlayers
 );
 
 const featureFlagAwareMusicService: MusicService = {

src/burn.ts

@@ -1,8 +1,6 @@
 import _ from "underscore";
 import { createUrnUtil } from "urn-lib";
 import randomstring from "randomstring";
-import { pipe } from "fp-ts/lib/function";
-import { either as E } from "fp-ts";
 
 import jwsEncryption from "./encryption";
 
@@ -80,13 +78,7 @@ export const parse = (burn: string): BUrn => {
     resource: result.resource as string,
   };
   if(x.system == "encrypted") {
-    return pipe(
+    return parse(encryptor.decrypt(x.resource));
-      encryptor.decrypt(x.resource),
-      E.match(
-        (err) => { throw new Error(err) },
-        (z) => parse(z)
-      )
-    );
   } else {
     return x;
   }

src/encryption.ts

@@ -4,14 +4,13 @@ import {
   randomBytes,
   createHash,
 } from "crypto";
-import { option as O, either as E } from "fp-ts";
+
-import { Either, left, right } from 'fp-ts/Either'
-import { pipe } from "fp-ts/lib/function";
 import jws from "jws";
 
 const ALGORITHM = "aes-256-cbc";
 const IV = randomBytes(16);
 
+
 export type Hash = {
   iv: string;
   encryptedData: string;
@@ -19,7 +18,7 @@ export type Hash = {
 
 export type Encryption = {
   encrypt: (value: string) => string;
-  decrypt: (value: string) => Either<string, string>;
+  decrypt: (value: string) => string;
 };
 
 export const jwsEncryption = (secret: string): Encryption => {
@@ -29,15 +28,7 @@ export const jwsEncryption = (secret: string): Encryption => {
       payload: value,
       secret: secret,
     }),
-    decrypt: (value: string) => pipe(
+    decrypt: (value: string) => jws.decode(value).payload
-      jws.decode(value),
-      O.fromNullable,
-      O.map(it => it.payload),
-      O.match(
-        () => left("Failed to decrypt jws"),
-        (payload) => right(payload)
-      )
-    )
   }
 }
 
@@ -45,8 +36,7 @@ export const cryptoEncryption = (secret: string): Encryption => {
   const key = createHash("sha256")
     .update(String(secret))
     .digest("base64")
-    .substring(0, 32);
+    .substr(0, 32);
-
   return {
     encrypt: (value: string) => {
       const cipher = createCipheriv(ALGORITHM, key, IV);
@@ -55,23 +45,20 @@ export const cryptoEncryption = (secret: string): Encryption => {
         cipher.final(),
       ]).toString("hex")}`;
     },
-    decrypt: (value: string) => pipe(
+    decrypt: (value: string) => {
-      right(value),
+      const parts = value.split(".");
-      E.map(it => it.split(".")),
+      if(parts.length != 2) throw `Invalid value to decrypt`;
-      E.flatMap(it => it.length == 2 ? right({ iv: it[0]!, data: it[1]! }) : left("Invalid value to decrypt")),
+
-      E.map(it => ({
+      const decipher = createDecipheriv(
-        hash: it,
+        ALGORITHM,
-        decipher: createDecipheriv(
+        key,
-          ALGORITHM,
+        Buffer.from(parts[0]!, "hex")
-          key,
+      );
-          Buffer.from(it.iv, "hex")
+      return Buffer.concat([
-        )
+        decipher.update(Buffer.from(parts[1]!, "hex")),
-      })),
+        decipher.final(),
-      E.map(it => Buffer.concat([
+      ]).toString();
-        it.decipher.update(Buffer.from(it.hash.data, "hex")),
+    },
-        it.decipher.final(),
-      ]).toString())
-    ),
   };
 };
 

src/icon.ts

@@ -1,5 +1,4 @@
-import * as xpath from "xpath";
+import libxmljs, { Element, Attribute } from "libxmljs2";
-import { DOMParser, Node } from '@xmldom/xmldom';
 import _ from "underscore";
 import fs from "fs";
 
@@ -14,10 +13,11 @@ import {
   isMay4,
   SystemClock,
 } from "./clock";
-import { xmlTidy } from "./utils";
 import path from "path";
 
-const SVG_NS = "http://www.w3.org/2000/svg";
+const SVG_NS = {
+  svg: "http://www.w3.org/2000/svg",
+};
 
 class ViewBox {
   minX: number;
@@ -48,16 +48,8 @@ export type IconFeatures = {
   viewPortIncreasePercent: number | undefined;
   backgroundColor: string | undefined;
   foregroundColor: string | undefined;
-  text: string | undefined;
 };
 
-export const NO_FEATURES: IconFeatures = {
-  viewPortIncreasePercent: undefined,
-  backgroundColor: undefined,
-  foregroundColor: undefined,
-  text: undefined
-}
-
 export type IconSpec = {
   svg: string | undefined;
   features: Partial<IconFeatures> | undefined;
@@ -101,11 +93,17 @@ export class SvgIcon implements Icon {
 
   constructor(
     svg: string,
-    features: Partial<IconFeatures> = {}
+    features: Partial<IconFeatures> = {
+      viewPortIncreasePercent: undefined,
+      backgroundColor: undefined,
+      foregroundColor: undefined,
+    }
   ) {
     this.svg = svg;
     this.features = {
-      ...NO_FEATURES,
+      viewPortIncreasePercent: undefined,
+      backgroundColor: undefined,
+      foregroundColor: undefined,
       ...features,
     };
   }
@@ -119,44 +117,38 @@ export class SvgIcon implements Icon {
     });
 
   public toString = () => {
-    const doc = new DOMParser().parseFromString(this.svg, 'text/xml') as unknown as Document;
+    const xml = libxmljs.parseXmlString(this.svg, {
-    const select = xpath.useNamespaces({ svg: SVG_NS });
+      noblanks: true,
-
+      net: false,
-    const elements = (path: string) => (select(path, doc) as Element[])
+    });
-    const element = (path: string) => elements(path)[0]!
+    const viewBoxAttr = xml.get("//svg:svg/@viewBox", SVG_NS) as Attribute;
-
+    let viewBox = new ViewBox(viewBoxAttr.value());
-    let viewBox = new ViewBox(select("string(//svg:svg/@viewBox)", doc) as string);
     if (
       this.features.viewPortIncreasePercent &&
       this.features.viewPortIncreasePercent > 0
     ) {
       viewBox = viewBox.increasePercent(this.features.viewPortIncreasePercent);
-      element("//svg:svg").setAttribute("viewBox", viewBox.toString());
+      viewBoxAttr.value(viewBox.toString());
-    }
-    if(this.features.text) {
-      elements("//svg:text").forEach((text) => {
-        text.textContent = this.features.text!
-      });
-    }
-    if (this.features.foregroundColor) {
-      elements("//svg:path|//svg:text").forEach((path) => {
-        if (path.getAttribute("fill")) path.setAttribute("stroke", this.features.foregroundColor!);
-        else path.setAttribute("fill", this.features.foregroundColor!);
-      });
     }
     if (this.features.backgroundColor) {
-      const rect = doc.createElementNS(SVG_NS, "rect");
+      (xml.get("//svg:svg/*[1]", SVG_NS) as Element).addPrevSibling(
-      rect.setAttribute("x", `${viewBox.minX}`);
+        new Element(xml, "rect").attr({
-      rect.setAttribute("y", `${viewBox.minY}`);
+          x: `${viewBox.minX}`,
-      rect.setAttribute("width", `${Math.abs(viewBox.minX) + viewBox.width}`);
+          y: `${viewBox.minY}`,
-      rect.setAttribute("height", `${Math.abs(viewBox.minY) + viewBox.height}`);
+          width: `${Math.abs(viewBox.minX) + viewBox.width}`,
-      rect.setAttribute("fill", this.features.backgroundColor);
+          height: `${Math.abs(viewBox.minY) + viewBox.height}`,
-      
+          fill: this.features.backgroundColor,
-      const svg = element("//svg:svg")
+        })
-      svg.insertBefore(rect, svg.childNodes[0]!);
+      );
     }
-    
+    if (this.features.foregroundColor) {
-    return xmlTidy(doc as unknown as Node);
+      (xml.find("//svg:path", SVG_NS) as Element[]).forEach((path) => {
+        if (path.attr("fill"))
+          path.attr({ stroke: this.features.foregroundColor! });
+        else path.attr({ fill: this.features.foregroundColor! });
+      });
+    }
+    return xml.toString();
   };
 }
 
@@ -237,24 +229,20 @@ export type ICON =
   | "yoda" 
   | "heart"
   | "star" 
-  | "solidStar"
+  | "solidStar";
-  | "yy"
-  | "yyyy";
 
-const svgFrom = (name: string) =>
+const iconFrom = (name: string) =>
   new SvgIcon(
     fs
       .readFileSync(path.resolve(__dirname, "..", "web", "icons", name))
       .toString()
   );
 
-const iconFrom = (name: string) => svgFrom(name).with({ features: { viewPortIncreasePercent: 80 } });
-    
 export const ICONS: Record<ICON, SvgIcon> = {
   artists: iconFrom("navidrome-artists.svg"),
   albums: iconFrom("navidrome-all.svg"),
   radio: iconFrom("navidrome-radio.svg"),
-  blank: svgFrom("blank.svg"),
+  blank: iconFrom("blank.svg"),
   playlists: iconFrom("navidrome-playlists.svg"),
   genres: iconFrom("Theatre-Mask-111172.svg"),
   random: iconFrom("navidrome-random.svg"),
@@ -319,9 +307,7 @@ export const ICONS: Record<ICON, SvgIcon> = {
   yoda: iconFrom("Yoda-68107.svg"),
   heart: iconFrom("Heart-85038.svg"),
   star: iconFrom("Star-16101.svg"),
-  solidStar: iconFrom("Star-43879.svg"),
+  solidStar: iconFrom("Star-43879.svg")
-  yy: svgFrom("yy.svg"),
-  yyyy: svgFrom("yyyy.svg"),
 };
 
 export const STAR_WARS = [ICONS.c3po, ICONS.chewy, ICONS.darth, ICONS.skywalker, ICONS.leia, ICONS.r2d2, ICONS.yoda];

src/music_service.ts

@@ -23,8 +23,7 @@ export type ArtistSummary = {
 
 export type SimilarArtist = ArtistSummary & { inLibrary: boolean };
 
-// todo: maybe is should be artist.summary rather than an artist also being a summary?
+export type Artist = ArtistSummary & {
-export type Artist = Pick<ArtistSummary, "id" | "name" | "image">  & {
   albums: AlbumSummary[];
   similarArtists: SimilarArtist[]
 };
@@ -35,11 +34,12 @@ export type AlbumSummary = {
   year: string | undefined;
   genre: Genre | undefined;
   coverArt: BUrn | undefined;
+
   artistName: string | undefined;
   artistId: string | undefined;
 };
 
-export type Album = Pick<AlbumSummary, "id" | "name" | "year" | "genre" | "coverArt" | "artistName" | "artistId"> & { tracks: Track[] };
+export type Album = AlbumSummary & {};
 
 export type Genre = {
   name: string;
@@ -60,7 +60,7 @@ export type Encoding = {
   mimeType: string
 }
 
-export type TrackSummary = {
+export type Track = {
   id: string;
   name: string;
   encoding: Encoding,
@@ -68,12 +68,9 @@ export type TrackSummary = {
   number: number | undefined;
   genre: Genre | undefined;
   coverArt: BUrn | undefined;
+  album: AlbumSummary;
   artist: ArtistSummary;
   rating: Rating;
-}
-
-export type Track = TrackSummary & {
-  album: AlbumSummary;
 };
 
 export type RadioStation = {
@@ -132,18 +129,6 @@ export const albumToAlbumSummary = (it: Album): AlbumSummary => ({
   coverArt: it.coverArt
 });
 
-export const trackToTrackSummary = (it: Track): TrackSummary => ({
-  id: it.id,
-  name: it.name,
-  encoding: it.encoding,
-  duration: it.duration,
-  number: it.number,
-  genre: it.genre,
-  coverArt: it.coverArt,
-  artist: it.artist,
-  rating: it.rating
-});
-
 export const playlistToPlaylistSummary = (it: Playlist): PlaylistSummary => ({
   id: it.id,
   name: it.name,
@@ -191,6 +176,7 @@ export interface MusicLibrary {
   artist(id: string): Promise<Artist>;
   albums(q: AlbumQuery): Promise<Result<AlbumSummary>>;
   album(id: string): Promise<Album>;
+  tracks(albumId: string): Promise<Track[]>;
   track(trackId: string): Promise<Track>;
   genres(): Promise<Genre[]>;
   years(): Promise<Year[]>;
@@ -214,8 +200,8 @@ export interface MusicLibrary {
   deletePlaylist(id: string): Promise<boolean>
   addToPlaylist(playlistId: string, trackId: string): Promise<boolean>
   removeFromPlaylist(playlistId: string, indicies: number[]): Promise<boolean>
-  similarSongs(id: string): Promise<TrackSummary[]>;
+  similarSongs(id: string): Promise<Track[]>;
-  topSongs(artistId: string): Promise<TrackSummary[]>;
+  topSongs(artistId: string): Promise<Track[]>;
   radioStation(id: string): Promise<RadioStation>
   radioStations(): Promise<RadioStation[]>
 }

src/server.ts

@@ -22,7 +22,7 @@ import {
   ratingAsInt,
 } from "./smapi";
 import { LinkCodes, InMemoryLinkCodes } from "./link_codes";
-import { MusicService, AuthFailure, AuthSuccess } from "./music_library";
+import { MusicService, AuthFailure, AuthSuccess } from "./music_service";
 import bindSmapiSoapServiceToExpress from "./smapi";
 import { APITokens, InMemoryAPITokens } from "./api_tokens";
 import logger from "./logger";
@@ -498,18 +498,16 @@ function server(
     }
   });
 
-  app.get("/icon/:type_text/size/:size", (req, res) => {
+  app.get("/icon/:type/size/:size", (req, res) => {
-    const match = (req.params["type_text"] || "")!.match("^([A-Za-z0-9]+)(?:\:([A-Za-z0-9]+))?$")
+    const type = req.params["type"]!;
-    if (!match)
-      return res.status(400).send();
-    
-    const type = match[1]!
-    const text = match[2]
     const size = req.params["size"]!;
 
     if (!Object.keys(ICONS).includes(type)) {
       return res.status(404).send();
-    } else if (size != "legacy" && !SONOS_RECOMMENDED_IMAGE_SIZES.includes(size)) {
+    } else if (
+      size != "legacy" &&
+      !SONOS_RECOMMENDED_IMAGE_SIZES.includes(size)
+    ) {
       return res.status(400).send();
     } else {
       let icon = (ICONS as any)[type]! as Icon;
@@ -530,8 +528,8 @@ function server(
         icon
           .apply(
             features({
+              viewPortIncreasePercent: 80,
               ...serverOpts.iconColors,
-              text: text
             })
           )
           .apply(festivals(clock))

src/smapi.ts

@@ -10,6 +10,7 @@ import logger from "./logger";
 
 import { LinkCodes } from "./link_codes";
 import {
+  Album,
   AlbumQuery,
   AlbumSummary,
   ArtistSummary,
@@ -21,7 +22,7 @@ import {
   Rating,
   slice2,
   Track,
-} from "./music_library";
+} from "./music_service";
 import { APITokens } from "./api_tokens";
 import { Clock } from "./clock";
 import { URLBuilder } from "./url_builder";
@@ -61,7 +62,7 @@ export const SONOS_RECOMMENDED_IMAGE_SIZES = [
 
 const WSDL_FILE = path.resolve(
   __dirname,
-  "Sonoswsdl-1.19.6-20231024.wsdl"
+  "Sonoswsdl-1.19.4-20190411.142401-3.wsdl"
 );
 
 export type Credentials = {
@@ -250,12 +251,11 @@ const genre = (bonobUrl: URLBuilder, genre: Genre) => ({
   albumArtURI: iconArtURI(bonobUrl, iconForGenre(genre.name)).href(),
 });
 
-const yyyy = (bonobUrl: URLBuilder, year: Year) => ({
+const year = (bonobUrl: URLBuilder, year: Year) => ({
   itemType: "albumList",
   id: `year:${year.year}`,
   title: year.year,
-  // todo: maybe year.year should be nullable?
+  albumArtURI: iconArtURI(bonobUrl, "music").href(),
-  albumArtURI: year.year !== "?" ? iconArtURI(bonobUrl, "yyyy", year.year).href() : iconArtURI(bonobUrl, "music").href(),
 });
 
 const playlist = (bonobUrl: URLBuilder, playlist: Playlist) => ({
@@ -286,9 +286,9 @@ export const coverArtURI = (
     O.getOrElseW(() => iconArtURI(bonobUrl, "vinyl"))
   );
 
-export const iconArtURI = (bonobUrl: URLBuilder, icon: ICON, text: string | undefined = undefined) =>
+export const iconArtURI = (bonobUrl: URLBuilder, icon: ICON) =>
   bonobUrl.append({
-    pathname: `/icon/${text == undefined ? icon : `${icon}:${text}`}/size/legacy`,
+    pathname: `/icon/${icon}/size/legacy`,
   });
 
 export const sonosifyMimeType = (mimeType: string) =>
@@ -611,7 +611,7 @@ function bindSmapiSoapServiceToExpress(
                 switch (type) {
                   case "artist":
                     return musicLibrary.artist(typeId).then((artist) => {
-                      const [page, total] = slice2<AlbumSummary>(paging)(
+                      const [page, total] = slice2<Album>(paging)(
                         artist.albums
                       );
                       return {
@@ -888,7 +888,7 @@ function bindSmapiSoapServiceToExpress(
                       .then(([page, total]) =>
                         getMetadataResult({
                           mediaCollection: page.map((it) =>
-                            yyyy(bonobUrl, it)
+                            year(bonobUrl, it)
                           ),
                           index: paging._index,
                           total,
@@ -981,8 +981,7 @@ function bindSmapiSoapServiceToExpress(
                       });
                   case "album":
                     return musicLibrary
-                      .album(typeId!)
+                      .tracks(typeId!)
-                      .then(it => it.tracks)
                       .then(slice2(paging))
                       .then(([page, total]) => {
                         return getMetadataResult({

src/subsonic_music_library.ts

@@ -1,320 +0,0 @@
-import { taskEither as TE } from "fp-ts";
-import { pipe } from "fp-ts/lib/function";
-import {
-  Credentials,
-  MusicService,
-  ArtistSummary,
-  Result,
-  slice2,
-  AlbumQuery,
-  ArtistQuery,
-  MusicLibrary,
-  Album,
-  AlbumSummary,
-  Rating,
-  Artist,
-  AuthFailure,
-  AuthSuccess,
-} from "./music_library";
-import {
-  Subsonic,
-  CustomPlayers,
-  NO_CUSTOM_PLAYERS,
-  asToken,
-  parseToken,
-  artistImageURN,
-  asYear,
-  isValidImage
-} from "./subsonic";
-import _ from "underscore";
-
-import axios from "axios";
-import logger from "./logger";
-import { assertSystem, BUrn } from "./burn";
-
-export class SubsonicMusicService implements MusicService {
-  subsonic: Subsonic;
-  customPlayers: CustomPlayers;
-
-  constructor(
-    subsonic: Subsonic,
-    customPlayers: CustomPlayers = NO_CUSTOM_PLAYERS
-  ) {
-    this.subsonic = subsonic;
-    this.customPlayers = customPlayers;
-  }
-
-  generateToken = (
-    credentials: Credentials
-  ): TE.TaskEither<AuthFailure, AuthSuccess> => 
-    pipe(
-      this.subsonic.ping(credentials),
-      TE.flatMap(({ type }) => TE.tryCatch(
-        () => this.libraryFor({ ...credentials, type }).then(library => ({ type, library })),
-        () => new AuthFailure("Failed to get library")
-      )),
-      TE.flatMap(({ library, type }) => pipe(
-        library.bearerToken(credentials),
-        TE.map(bearer => ({ bearer, type }))
-      )),
-      TE.map(({ bearer, type}) => ({
-        serviceToken: asToken({ ...credentials, bearer, type }),
-        userId: credentials.username,
-        nickname: credentials.username,
-      }))
-    );
-
-  refreshToken = (serviceToken: string) =>
-    this.generateToken(parseToken(serviceToken));
-
-  login = async (token: string) => this.libraryFor(parseToken(token));
-
-  private libraryFor = (
-    credentials: Credentials & { type: string }
-  ): Promise<SubsonicMusicLibrary> => {
-    const genericSubsonic = new SubsonicMusicLibrary(
-      this.subsonic,
-      credentials,
-      this.customPlayers
-    );
-    // return Promise.resolve(genericSubsonic);
-
-    if (credentials.type == "navidrome") {
-      // todo: there does not seem to be a test for this??
-      const nd: SubsonicMusicLibrary = {
-        ...genericSubsonic,
-        flavour: () => "navidrome",
-        bearerToken: (credentials: Credentials) =>
-          pipe(
-            TE.tryCatch(
-              () =>
-                axios.post(
-                  this.subsonic.url.append({ pathname: "/auth/login" }).href(),
-                  _.pick(credentials, "username", "password")
-                ),
-              () => new AuthFailure("Failed to get bearerToken")
-            ),
-            TE.map((it) => it.data.token as string | undefined)
-          ),
-      };
-      return Promise.resolve(nd);
-    } else {
-      return Promise.resolve(genericSubsonic);
-    }
-  };
-}
-
-export class SubsonicMusicLibrary implements MusicLibrary {
-  subsonic: Subsonic;
-  credentials: Credentials;
-  customPlayers: CustomPlayers;
-
-  constructor(
-    subsonic: Subsonic,
-    credentials: Credentials,
-    customPlayers: CustomPlayers
-  ) {
-    this.subsonic = subsonic;
-    this.credentials = credentials;
-    this.customPlayers = customPlayers;
-  }
-
-  flavour = () => "subsonic";
-
-  bearerToken = (_: Credentials) =>
-    TE.right<AuthFailure, string | undefined>(undefined);
-
-  // todo: q needs to support greater than the max page size supported by subsonic
-  // maybe subsonic should error?
-  artists = (q: ArtistQuery): Promise<Result<ArtistSummary>> =>
-    this.subsonic
-      .getArtists(this.credentials)
-      .then(slice2(q))
-      .then(([page, total]) => ({
-        total,
-        results: page,
-      }));
-
-  artist = async (id: string): Promise<Artist> =>
-    Promise.all([
-      this.subsonic.getArtist(this.credentials, id),
-      this.subsonic.getArtistInfo(this.credentials, id),
-    ]).then(([artist, artistInfo]) => ({
-      id: artist.id,
-      name: artist.name,
-      image: artistImageURN({
-        artistId: artist.id,
-        artistImageURL: [
-          artist.artistImageUrl,
-          // todo: subsonic.artistInfo should just return a valid image or undefined, then the music lib just chooses first undefined
-          // out of artist.image and artistInfo.image
-          artistInfo.images.l,
-          artistInfo.images.m,
-          artistInfo.images.s,
-          // todo: do we still need this isValidImage?
-        ].find(isValidImage),
-      }),
-      albums: artist.albums,
-      similarArtists: artistInfo.similarArtist,
-    }));
-
-  albums = async (q: AlbumQuery): Promise<Result<AlbumSummary>> =>
-    this.subsonic.getAlbumList2(this.credentials, q);
-
-  album = (id: string): Promise<Album> =>
-    this.subsonic.getAlbum(this.credentials, id);
-
-  genres = () => 
-    this.subsonic.getGenres(this.credentials);
-
-  track = (trackId: string) =>
-    this.subsonic.getTrack(this.credentials, trackId);
-
-  rate = (trackId: string, rating: Rating) => 
-    // todo: this is a bit odd
-    Promise.resolve(true)
-      .then(() => {
-        if (rating.stars >= 0 && rating.stars <= 5) {
-          return this.subsonic.getTrack(this.credentials, trackId);
-        } else {
-          throw `Invalid rating.stars value of ${rating.stars}`;
-        }
-      })
-      .then((track) => {
-        const thingsToUpdate = [];
-        if (track.rating.love != rating.love) {
-          thingsToUpdate.push(
-            (rating.love ? this.subsonic.star : this.subsonic.unstar)(this.credentials,{ id: trackId })
-          );
-        }
-        if (track.rating.stars != rating.stars) {
-          thingsToUpdate.push(
-            this.subsonic.setRating(this.credentials, trackId, rating.stars)
-          );
-        }
-        return Promise.all(thingsToUpdate);
-      })
-      .then(() => true)
-      .catch(() => false);
-
-  stream = async ({
-    trackId,
-    range,
-  }: {
-    trackId: string;
-    range: string | undefined;
-  }) =>
-    this.subsonic
-      .getTrack(this.credentials, trackId)
-      .then((track) =>
-        this.subsonic.stream(this.credentials, trackId, track.encoding.player, range)
-      );
-
-  coverArt = async (coverArtURN: BUrn, size?: number) =>
-    Promise.resolve(coverArtURN)
-      .then((it) => assertSystem(it, "subsonic"))
-      .then((it) =>
-        this.subsonic.getCoverArt(
-          this.credentials,
-          it.resource.split(":")[1]!,
-          size
-        )
-      )
-      .then((res) => ({
-        contentType: res.headers["content-type"],
-        data: Buffer.from(res.data, "binary"),
-      }))
-      .catch((e) => {
-        logger.error(`Failed getting coverArt for urn:'${coverArtURN}': ${e}`);
-        return undefined;
-      });
-
-  // todo: unit test the difference between scrobble and nowPlaying
-  scrobble = async (id: string) =>
-    this.subsonic.scrobble(this.credentials, id, true);
-
-  nowPlaying = async (id: string) =>
-    this.subsonic.scrobble(this.credentials, id, false);
-
-  searchArtists = async (query: string) =>
-    this.subsonic
-      .search3(this.credentials, { query, artistCount: 20 })
-      .then(({ artists }) =>
-        artists.map((artist) => ({
-          id: artist.id,
-          name: artist.name,
-          image: artistImageURN({
-            artistId: artist.id,
-            artistImageURL: artist.artistImageUrl,
-          }),
-        }))
-      );
-
-  searchAlbums = async (query: string) =>
-    this.subsonic
-      .search3(this.credentials, { query, albumCount: 20 })
-      .then(({ albums }) => this.subsonic.toAlbumSummary(albums));
-
-  searchTracks = async (query: string) =>
-    this.subsonic
-      .search3(this.credentials, { query, songCount: 20 })
-      .then(({ songs }) =>
-        Promise.all(
-          songs.map((it) => this.subsonic.getTrack(this.credentials, it.id))
-        )
-      );
-
-  playlists = async () =>
-    this.subsonic.playlists(this.credentials);
-
-  playlist = async (id: string) =>
-    this.subsonic.playlist(this.credentials, id);
-
-  createPlaylist = async (name: string) =>
-    this.subsonic.createPlayList(this.credentials, name);
-
-  deletePlaylist = async (id: string) =>
-    this.subsonic.deletePlayList(this.credentials, id);
-
-  addToPlaylist = async (playlistId: string, trackId: string) =>
-    this.subsonic.updatePlaylist(this.credentials, playlistId, { songIdToAdd: trackId });
-
-  removeFromPlaylist = async (playlistId: string, indicies: number[]) =>
-    this.subsonic.updatePlaylist(this.credentials, playlistId, { songIndexToRemove: indicies });
-
-  similarSongs = async (id: string) => 
-    this.subsonic.getSimilarSongs2(this.credentials, id)
-
-  topSongs = async (artistId: string) =>
-    this.subsonic.getArtist(this.credentials, artistId)
-      .then(({ name }) =>
-        this.subsonic.getTopSongs(this.credentials, name)
-      );
-
-  radioStations = async () =>
-    this.subsonic.getInternetRadioStations(this.credentials);
-
-  radioStation = async (id: string) =>
-    this.radioStations().then((it) => it.find((station) => station.id === id)!);
-
-  years = async () => {
-    const q: AlbumQuery = {
-      _index: 0,
-      _count: 100000, // FIXME: better than this, probably doesnt work anyway as max _count is 500 or something
-      type: "alphabeticalByArtist",
-    };
-    const years = this.subsonic
-      .getAlbumList2(this.credentials, q)
-      .then(({ results }) =>
-        results
-          .map((album) => album.year || "?")
-          .filter((item, i, ar) => ar.indexOf(item) === i)
-          .sort()
-          .map((year) => ({
-            ...asYear(year),
-          }))
-          .reverse()
-      );
-    return years;
-  };
-}

src/utils.ts

@@ -1,34 +1,7 @@
-import { DOMParser, XMLSerializer, Node } from '@xmldom/xmldom';
-
 export function takeWithRepeats<T>(things:T[], count: number) {
   const result = [];
   for(let i = 0; i < count; i++) {
     result.push(things[i % things.length])
   }
   return result;
-}
+}
-
-function xmlRemoveWhitespaceNodes(node: Node) {
-  let child = node.firstChild;
-  while (child) {
-      const nextSibling = child.nextSibling;
-      if (child.nodeType === 3 && !child.nodeValue?.trim()) {
-          // Remove empty text nodes
-          node.removeChild(child);
-      } else {
-          // Recursively process child nodes
-          xmlRemoveWhitespaceNodes(child);
-      }
-      child = nextSibling;
-  }
-}
-
-export function xmlTidy(xml: string | Node) {
-  const xmlToString = new XMLSerializer().serializeToString
-
-  const xmlString = xml instanceof Node ? xmlToString(xml as any) : xml
-  const doc = new DOMParser().parseFromString(xmlString, 'text/xml') as unknown as Node;
-  xmlRemoveWhitespaceNodes(doc);
-  return xmlToString(doc as any);
-}
-

tests/builders.ts

@@ -8,14 +8,14 @@ import {
   Album,
   Artist,
   Track,
+  albumToAlbumSummary,
+  artistToArtistSummary,
   PlaylistSummary,
   Playlist,
   SimilarArtist,
   AlbumSummary,
   RadioStation,
-  ArtistSummary,
+} from "../src/music_service";
-  TrackSummary
-} from "../src/music_library";
 
 import { b64Encode } from "../src/b64";
 import { artistImageURN } from "../src/subsonic";
@@ -116,26 +116,13 @@ export function aSimilarArtist(
   };
 }
 
-export function anArtistSummary(fields: Partial<ArtistSummary> = {}): ArtistSummary {
-  const id = fields.id || uuid();
-  return {
-    id,
-    name: `Artist ${id}`,
-    image: { system: "subsonic", resource: `art:${id}` },
-  }
-}
-
 export function anArtist(fields: Partial<Artist> = {}): Artist {
   const id = fields.id || uuid();
-  const name = `Artist ${randomstring.generate()}`
-  const albums = fields.albums || [
-    anAlbumSummary({ artistId: id, artistName: name }), 
-    anAlbumSummary({ artistId: id, artistName: name }), 
-    anAlbumSummary({ artistId: id, artistName: name })
-  ];
   const artist = {
-    ...anArtistSummary({ id, name }),
+    id,
-    albums,
+    name: `Artist ${id}`,
+    albums: [anAlbum(), anAlbum(), anAlbum()],
+    image: { system: "subsonic", resource: `art:${id}` },
     similarArtists: [
       aSimilarArtist({ id: uuid(), name: "Similar artist1", inLibrary: true }),
       aSimilarArtist({ id: uuid(), name: "Similar artist2", inLibrary: true }),
@@ -179,9 +166,15 @@ export const SAMPLE_GENRES = [
 ];
 export const randomGenre = () => SAMPLE_GENRES[randomInt(SAMPLE_GENRES.length)];
 
-export function aTrackSummary(fields: Partial<TrackSummary> = {}): TrackSummary {
+export const aYear = (year: string) => ({ id: year, year });
+
+export const Y2024 = aYear("2024");
+export const Y2023 = aYear("2023");
+export const Y1969 = aYear("1969");
+
+export function aTrack(fields: Partial<Track> = {}): Track {
   const id = uuid();
-  const artist = fields.artist || anArtistSummary();
+  const artist = anArtist();
   const genre = fields.genre || randomGenre();
   const rating = { love: false, stars: Math.floor(Math.random() * 5) };
   return {
@@ -194,53 +187,28 @@ export function aTrackSummary(fields: Partial<TrackSummary> = {}): TrackSummary
     duration: randomInt(500),
     number: randomInt(100),
     genre,
-    artist,
+    artist: artistToArtistSummary(artist),
+    album: albumToAlbumSummary(
+      anAlbum({ artistId: artist.id, artistName: artist.name, genre })
+    ),
     coverArt: { system: "subsonic", resource: `art:${uuid()}`},
     rating,
     ...fields,
   };
-};
+}
 
-export function aTrack(fields: Partial<Track> = {}): Track {
+export function anAlbum(fields: Partial<Album> = {}): Album {
-  const summary = aTrackSummary(fields);
-  const album = fields.album || anAlbumSummary({ artistId: summary.artist.id, artistName: summary.artist.name, genre: summary.genre })
-  return {
-    ...summary,
-    album,
-    ...fields
-  };
-};
-
-export function anAlbumSummary(fields: Partial<AlbumSummary> = {}): AlbumSummary {
   const id = uuid();
   return {
     id,
     name: `Album ${id}`,
-    year: `19${randomInt(99)}`,
     genre: randomGenre(),
-    coverArt: { system: "subsonic", resource: `art:${uuid()}` },
+    year: `19${randomInt(99)}`,
     artistId: `Artist ${uuid()}`,
     artistName: `Artist ${randomstring.generate()}`,
-    ...fields
+    coverArt: { system: "subsonic", resource: `art:${uuid()}` },
-  };
-};
-
-export function anAlbum(fields: Partial<Album> = {}): Album {
-  const albumSummary = anAlbumSummary()
-  const album = {
-    ...albumSummary,
-    tracks: [],
     ...fields,
   };
-  const artistSummary = anArtistSummary({ id: album.artistId, name: album.artistName })
-  const tracks = fields.tracks || [ 
-    aTrack({ album: albumSummary, artist: artistSummary }),
-    aTrack({ album: albumSummary, artist: artistSummary }) 
-  ]
-  return {
-    ...album,
-    tracks
-  };
 };
 
 export function aRadioStation(fields: Partial<RadioStation> = {}): RadioStation {
@@ -254,6 +222,20 @@ export function aRadioStation(fields: Partial<RadioStation> = {}): RadioStation
   }
 }
 
+export function anAlbumSummary(fields: Partial<AlbumSummary> = {}): AlbumSummary {
+  const id = uuid();
+  return {
+    id,
+    name: `Album ${id}`,
+    year: `19${randomInt(99)}`,
+    genre: randomGenre(),
+    coverArt: { system: "subsonic", resource: `art:${uuid()}` },
+    artistId: `Artist ${uuid()}`,
+    artistName: `Artist ${randomstring.generate()}`,
+    ...fields
+  }
+};
+
 export const BLONDIE_ID = uuid();
 export const BLONDIE_NAME = "Blondie";
 export const BLONDIE: Artist = {

tests/encryption.test.ts

@@ -1,5 +1,3 @@
-import { left, right } from 'fp-ts/Either'
-
 import { cryptoEncryption, jwsEncryption } from '../src/encryption';
 
 describe("jwsEncryption", () => {
@@ -9,7 +7,7 @@ describe("jwsEncryption", () => {
     const value = "bobs your uncle"
     const hash = e.encrypt(value)
     expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(right(value));
+    expect(e.decrypt(hash)).toEqual(value);
   });
 
   it("returns different values for different secrets", () => {
@@ -31,7 +29,7 @@ describe("cryptoEncryption", () => {
     const value = "bobs your uncle"
     const hash = e.encrypt(value)
     expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(right(value));
+    expect(e.decrypt(hash)).toEqual(value);
   });
 
   it("returns different values for different secrets", () => {
@@ -44,10 +42,4 @@ describe("cryptoEncryption", () => {
 
     expect(h1).not.toEqual(h2);
   });
-  
-  it("should return left on invalid value", () => {
-    const e = cryptoEncryption("secret squirrel");
-
-    expect(e.decrypt("not-valid")).toEqual(left("Invalid value to decrypt"));
-  });
 })

tests/icon.test.ts

@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
+import libxmljs from "libxmljs2";
 import { FixedClock } from "../src/clock";
-import { xmlTidy } from "../src/utils";
 
 import {
   contains,
@@ -20,17 +20,17 @@ import {
   allOf,
   features,
   STAR_WARS,
-  NO_FEATURES,
 } from "../src/icon";
 
 describe("SvgIcon", () => {
+  const xmlTidy = (xml: string) =>
+    libxmljs.parseXmlString(xml, { noblanks: true, net: false }).toString();
+
   const svgIcon24 = `<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="path1"/>
   <path d="path2" fill="none" stroke="#000"/>
-  <text font-size="25" fill="none">80's</text>
   <path d="path3"/>
-  <text font-size="25">80's</text>
 </svg>
 `;
 
@@ -61,9 +61,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -4 32 32">
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>
               <path d="path3"/>
-              <text font-size="25">80's</text>
             </svg>
           `)
           );
@@ -112,9 +110,7 @@ describe("SvgIcon", () => {
               <rect x="0" y="0" width="24" height="24" fill="red"/>
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>
               <path d="path3"/>
-              <text font-size="25">80's</text>
             </svg>
         `)
         );
@@ -138,9 +134,7 @@ describe("SvgIcon", () => {
               <rect x="-4" y="-4" width="36" height="36" fill="pink"/>
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>
               <path d="path3"/>
-              <text font-size="25">80's</text>
             </svg>
         `)
         );
@@ -158,9 +152,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>
               <path d="path3"/>
-              <text font-size="25">80's</text>
             </svg>
         `)
         );
@@ -180,9 +172,7 @@ describe("SvgIcon", () => {
               <rect x="0" y="0" width="24" height="24" fill="red"/>
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>
               <path d="path3"/>
-              <text font-size="25">80's</text>
             </svg>
         `)
         );
@@ -192,7 +182,7 @@ describe("SvgIcon", () => {
 
   describe("foreground color", () => {
     describe("with no viewPort increase", () => {
-      it("should change the fill values", () => {
+      it("should add a rectangle the same size as the original viewPort", () => {
         expect(
           new SvgIcon(svgIcon24)
             .with({ features: { foregroundColor: "red" } })
@@ -202,9 +192,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
               <path d="path1" fill="red"/>
               <path d="path2" fill="none" stroke="red"/>
-              <text font-size="25" fill="none" stroke="red">80's</text>
               <path d="path3" fill="red"/>
-              <text font-size="25" fill="red">80's</text>
             </svg>
         `)
         );
@@ -212,7 +200,7 @@ describe("SvgIcon", () => {
     });
 
     describe("with a viewPort increase", () => {
-      it("should change the fill values", () => {
+      it("should add a rectangle the same size as the original viewPort", () => {
         expect(
           new SvgIcon(svgIcon24)
             .with({
@@ -227,9 +215,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -4 32 32">
               <path d="path1" fill="pink"/>
               <path d="path2" fill="none" stroke="pink"/>
-              <text font-size="25" fill="none" stroke="pink">80's</text>
               <path d="path3" fill="pink"/>
-              <text font-size="25" fill="pink">80's</text>
             </svg>
         `)
         );
@@ -247,9 +233,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
               <path d="path1"/>
               <path d="path2" fill="none" stroke="#000"/>
-              <text font-size="25" fill="none">80's</text>              
               <path d="path3"/>
-              <text font-size="25">80's</text>              
             </svg>
         `)
         );
@@ -268,9 +252,7 @@ describe("SvgIcon", () => {
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
               <path d="path1" fill="red"/>
               <path d="path2" fill="none" stroke="red"/>
-              <text font-size="25" fill="none" stroke="red">80's</text>              
               <path d="path3" fill="red"/>
-              <text font-size="25" fill="red">80's</text>              
             </svg>
         `)
         );
@@ -278,48 +260,6 @@ describe("SvgIcon", () => {
     });
   });
 
-  describe("text", () => {
-    describe("when text value specified", () => {
-      it("should change the text values", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { text: "yipppeeee" } })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path d="path1"/>
-  <path d="path2" fill="none" stroke="#000"/>
-  <text font-size="25" fill="none">yipppeeee</text>
-  <path d="path3"/>
-  <text font-size="25">yipppeeee</text>
-</svg>
-        `)
-        );
-      });
-    });
-
-    describe("of undefined", () => {
-      it("should not do anything", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { text: undefined } })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path d="path1"/>
-  <path d="path2" fill="none" stroke="#000"/>
-  <text font-size="25" fill="none">80's</text>
-  <path d="path3"/>
-  <text font-size="25">80's</text>
-</svg>
-        `)
-        );
-      });
-    });
-  });
-
   describe("swapping the svg", () => {
     describe("with no other changes", () => {
       it("should swap out the svg, but maintain the IconFeatures", () => {
@@ -378,14 +318,10 @@ describe("SvgIcon", () => {
 
 class DummyIcon implements Icon {
   svg: string;
-  features: IconFeatures;
+  features: Partial<IconFeatures>;
-
   constructor(svg: string, features: Partial<IconFeatures>) {
     this.svg = svg;
-    this.features = {
+    this.features = features;
-      ...NO_FEATURES,
-      ...features
-    };
   }
 
   public apply = (transformer: Transformer): Icon => transformer(this);
@@ -414,7 +350,6 @@ describe("transform", () => {
             viewPortIncreasePercent: 100,
             foregroundColor: "blue",
             backgroundColor: "blue",
-            text: "a",
           },
         })
         .apply(
@@ -422,7 +357,6 @@ describe("transform", () => {
             features: {
               foregroundColor: "override1",
               backgroundColor: "override2",
-              text: "b",
             },
           })
         ) as DummyIcon;
@@ -432,7 +366,6 @@ describe("transform", () => {
         viewPortIncreasePercent: 100,
         foregroundColor: "override1",
         backgroundColor: "override2",
-        text: "b",
       });
     });
   });
@@ -449,7 +382,6 @@ describe("transform", () => {
             viewPortIncreasePercent: 100,
             foregroundColor: "blue",
             backgroundColor: "blue",
-            text: "bob",
           },
         })
         .apply(
@@ -463,7 +395,6 @@ describe("transform", () => {
         viewPortIncreasePercent: 100,
         foregroundColor: "blue",
         backgroundColor: "blue",
-        text: "bob"
       });
     });
   });
@@ -480,7 +411,6 @@ describe("features", () => {
         viewPortIncreasePercent: 100,
         foregroundColor: "blue",
         backgroundColor: "blue",
-        text: "foobar"
       })
     ) as DummyIcon;
 
@@ -488,7 +418,6 @@ describe("features", () => {
       viewPortIncreasePercent: 100,
       foregroundColor: "blue",
       backgroundColor: "blue",
-      text: "foobar"
     });
   });
 });

tests/in_memory_music_service.test.ts

@@ -5,7 +5,8 @@ import { InMemoryMusicService } from "./in_memory_music_service";
 import {
   MusicLibrary,
   artistToArtistSummary,
-} from "../src/music_library";
+  albumToAlbumSummary,
+} from "../src/music_service";
 import { v4 as uuid } from "uuid";
 import {
   anArtist,
@@ -16,7 +17,6 @@ import {
   METAL,
   HIP_HOP,
   SKA,
-  anAlbumSummary,
 } from "./builders";
 import _ from "underscore";
 
@@ -167,6 +167,23 @@ describe("InMemoryMusicService", () => {
         service.hasTracks(track1, track2, track3, track4);
       });
 
+      describe("fetching tracks for an album", () => {
+        it("should return only tracks on that album", async () => {
+          expect(await musicLibrary.tracks(artist1Album1.id)).toEqual([
+            { ...track1, rating: { love: false, stars: 0 } },
+            { ...track2, rating: { love: false, stars: 0 } },
+          ]);
+        });
+      });
+
+      describe("fetching tracks for an album that doesnt exist", () => {
+        it("should return empty array", async () => {
+          expect(await musicLibrary.tracks("non existant album id")).toEqual(
+            []
+          );
+        });
+      });
+
       describe("fetching a single track", () => {
         describe("when it exists", () => {
           it("should return the track", async () => {
@@ -177,16 +194,16 @@ describe("InMemoryMusicService", () => {
     });
 
     describe("albums", () => {
-      const artist1_album1 = anAlbumSummary({ genre: POP });
+      const artist1_album1 = anAlbum({ genre: POP });
-      const artist1_album2 = anAlbumSummary({ genre: ROCK });
+      const artist1_album2 = anAlbum({ genre: ROCK });
-      const artist1_album3 = anAlbumSummary({ genre: METAL });
+      const artist1_album3 = anAlbum({ genre: METAL });
-      const artist1_album4 = anAlbumSummary({ genre: POP });
+      const artist1_album4 = anAlbum({ genre: POP });
-      const artist1_album5 = anAlbumSummary({ genre: POP });
+      const artist1_album5 = anAlbum({ genre: POP });
 
-      const artist2_album1 = anAlbumSummary({ genre: METAL });
+      const artist2_album1 = anAlbum({ genre: METAL });
 
-      const artist3_album1 = anAlbumSummary({ genre: HIP_HOP });
+      const artist3_album1 = anAlbum({ genre: HIP_HOP });
-      const artist3_album2 = anAlbumSummary({ genre: POP });
+      const artist3_album2 = anAlbum({ genre: POP });
 
       const artist1 = anArtist({
         name: "artist1",
@@ -195,8 +212,8 @@ describe("InMemoryMusicService", () => {
           artist1_album2,
           artist1_album3,
           artist1_album4,
-          artist1_album5
+          artist1_album5,
-        ]
+        ],
       });
       const artist2 = anArtist({ name: "artist2", albums: [artist2_album1] });
       const artist3 = anArtist({
@@ -258,16 +275,16 @@ describe("InMemoryMusicService", () => {
                   })
                 ).toEqual({
                   results: [
-                    artist1_album1,
+                    albumToAlbumSummary(artist1_album1),
-                    artist1_album2,
+                    albumToAlbumSummary(artist1_album2),
-                    artist1_album3,
+                    albumToAlbumSummary(artist1_album3),
-                    artist1_album4,
+                    albumToAlbumSummary(artist1_album4),
-                    artist1_album5,
+                    albumToAlbumSummary(artist1_album5),
 
-                    artist2_album1,
+                    albumToAlbumSummary(artist2_album1),
 
-                    artist3_album1,
+                    albumToAlbumSummary(artist3_album1),
-                    artist3_album2,
+                    albumToAlbumSummary(artist3_album2),
                   ],
                   total: totalAlbumCount,
                 });
@@ -283,7 +300,7 @@ describe("InMemoryMusicService", () => {
                     type: "alphabeticalByName",
                   })
                 ).toEqual({
-                  results: _.sortBy(allAlbums, "name"),
+                  results: _.sortBy(allAlbums, "name").map(albumToAlbumSummary),
                   total: totalAlbumCount,
                 });
               });
@@ -300,9 +317,9 @@ describe("InMemoryMusicService", () => {
                 })
               ).toEqual({
                 results: [
-                  artist1_album5,
+                  albumToAlbumSummary(artist1_album5),
-                  artist2_album1,
+                  albumToAlbumSummary(artist2_album1),
-                  artist3_album1,
+                  albumToAlbumSummary(artist3_album1),
                 ],
                 total: totalAlbumCount,
               });
@@ -319,8 +336,8 @@ describe("InMemoryMusicService", () => {
                 })
               ).toEqual({
                 results: [
-                  artist3_album1,
+                  albumToAlbumSummary(artist3_album1),
-                  artist3_album2,
+                  albumToAlbumSummary(artist3_album2),
                 ],
                 total: totalAlbumCount,
               });
@@ -340,10 +357,10 @@ describe("InMemoryMusicService", () => {
                 })
               ).toEqual({
                 results: [
-                  artist1_album1,
+                  albumToAlbumSummary(artist1_album1),
-                  artist1_album4,
+                  albumToAlbumSummary(artist1_album4),
-                  artist1_album5,
+                  albumToAlbumSummary(artist1_album5),
-                  artist3_album2,
+                  albumToAlbumSummary(artist3_album2),
                 ],
                 total: 4,
               });
@@ -362,8 +379,8 @@ describe("InMemoryMusicService", () => {
                   })
                 ).toEqual({
                   results: [
-                    artist1_album4,
+                    albumToAlbumSummary(artist1_album4),
-                    artist1_album5,
+                    albumToAlbumSummary(artist1_album5),
                   ],
                   total: 4,
                 });
@@ -380,7 +397,7 @@ describe("InMemoryMusicService", () => {
                     _count: 100,
                   })
                 ).toEqual({
-                  results: [artist3_album2],
+                  results: [albumToAlbumSummary(artist3_album2)],
                   total: 4,
                 });
               });
@@ -407,10 +424,7 @@ describe("InMemoryMusicService", () => {
         describe("when it exists", () => {
           it("should provide an album", async () => {
             expect(await musicLibrary.album(artist1_album5.id)).toEqual(
-              {
+              artist1_album5
-                ...artist1_album5,
-                tracks: []
-              }
             );
           });
         });

tests/in_memory_music_service.ts

@@ -19,10 +19,11 @@ import {
   slice2,
   asResult,
   artistToArtistSummary,
+  albumToAlbumSummary,
   Track,
   Genre,
   Rating,
-} from "../src/music_library";
+} from "../src/music_service";
 import { BUrn } from "../src/burn";
 
 export class InMemoryMusicService implements MusicService {
@@ -96,13 +97,14 @@ export class InMemoryMusicService implements MusicService {
             }
           })
           .then((matches) => matches.map((it) => it.album))
+          .then((it) => it.map(albumToAlbumSummary))
           .then(slice2(q))
           .then(asResult),
       album: (id: string) =>
         pipe(
           this.artists.flatMap((it) => it.albums).find((it) => it.id === id),
           O.fromNullable,
-          O.map((it) => Promise.resolve({ ...it, tracks: [] })),
+          O.map((it) => Promise.resolve(it)),
           O.getOrElse(() => Promise.reject(`No album with id '${id}'`))
         ),
       genres: () =>
@@ -117,6 +119,12 @@ export class InMemoryMusicService implements MusicService {
             A.sort(fromCompare<Genre>((x, y) => ordString.compare(x.id, y.id)))
           )
         ),
+      tracks: (albumId: string) =>
+        Promise.resolve(
+          this.tracks
+            .filter((it) => it.album.id === albumId)
+            .map((it) => ({ ...it, rating: { love: false, stars: 0 } }))
+        ),
       rate: (_: string, _2: Rating) => Promise.resolve(false),
       track: (trackId: string) =>
         pipe(

tests/music_service.test.ts

@@ -1,7 +1,7 @@
 import { v4 as uuid } from "uuid";
 
 import { anArtist } from "./builders";
-import { artistToArtistSummary } from "../src/music_library";
+import { artistToArtistSummary } from "../src/music_service";
 
 describe("artistToArtistSummary", () => {
   it("should map fields correctly", () => {

tests/scenarios.test.ts

@@ -18,7 +18,7 @@ import {
 } from "./builders";
 import { InMemoryMusicService } from "./in_memory_music_service";
 import { InMemoryLinkCodes } from "../src/link_codes";
-import { Credentials } from "../src/music_library";
+import { Credentials } from "../src/music_service";
 import makeServer from "../src/server";
 import { Service, bonobService, Sonos } from "../src/sonos";
 import supersoap from "./supersoap";

tests/server.test.ts

@@ -4,7 +4,7 @@ import request from "supertest";
 import Image from "image-js";
 import { either as E, taskEither as TE } from "fp-ts";
 
-import { AuthFailure, MusicService } from "../src/music_library";
+import { AuthFailure, MusicService } from "../src/music_service";
 import makeServer, {
   BONOB_ACCESS_TOKEN_HEADER,
   RangeBytesFromFilter,
@@ -1366,25 +1366,11 @@ describe("server", () => {
             "..%2F..%2Ffoo",
             "%2Fetc%2Fpasswd",
             ".%2Fbob.js",
-            "%23%24",
+            ".",
-          ].forEach((type) => {
+            "..",
-            describe(`trying to retrieve an icon with name ${type}`, () => {
-              it(`should fail`, async () => {
-                const response = await request(server()).get(
-                  `/icon/${type}/size/legacy`
-                );
-
-                expect(response.status).toEqual(400);
-              });
-            });
-          });
-        });
-
-        describe("missing icons", () => {
-          [
             "1",
+            "%23%24",
             "notAValidIcon",
-            "notAValidIcon:withSomeText"
           ].forEach((type) => {
             describe(`trying to retrieve an icon with name ${type}`, () => {
               it(`should fail`, async () => {
@@ -1412,20 +1398,6 @@ describe("server", () => {
           });
         });
 
-        describe("invalid text", () => {
-          ["..", "foobar.123", "_dog_", "{ whoop }"].forEach((text) => {
-            describe(`trying to retrieve an icon with text ${text}`, () => {
-              it(`should fail`, async () => {
-                const response = await request(server()).get(
-                  `/icon/yyyy:${text}/size/60`
-                );
-
-                expect(response.status).toEqual(400);
-              });
-            });
-          });
-        });        
-
         describe("fetching", () => {
           [
             "artists",
@@ -1555,41 +1527,6 @@ describe("server", () => {
             });
           });
         });
-
-        describe("specifing some text", () => {
-          const text = "somethingWicked"
-
-          describe(`legacy icon`, () => {
-            it("should return the png image", async () => {
-              const response = await request(server()).get(
-                `/icon/yyyy:${text}/size/legacy`
-              );
-
-              expect(response.status).toEqual(200);
-              expect(response.header["content-type"]).toEqual("image/png");
-              const image = await Image.load(response.body);
-              expect(image.width).toEqual(80);
-              expect(image.height).toEqual(80);
-            });
-          });
-
-          describe("svg icon", () => {
-            it(`should return an svg image with the text replaced`, async () => {
-              const response = await request(server()).get(
-                `/icon/yyyy:${text}/size/60`
-              );
-
-              expect(response.status).toEqual(200);
-              expect(response.header["content-type"]).toEqual(
-                "image/svg+xml; charset=utf-8"
-              );
-              const svg = Buffer.from(response.body).toString();
-              expect(svg).toContain(
-                `>${text}</text>`
-              );
-            });
-          });
-        });
       });
     });
   });

tests/smapi.test.ts

@@ -39,10 +39,11 @@ import {
   ROCK,
   TRIP_HOP,
   PUNK,
+  Y2024,
+  Y2023,
+  Y1969,
   aPlaylist,
   aRadioStation,
-  anArtistSummary,
-  anAlbumSummary,
 } from "./builders";
 import { InMemoryMusicService } from "./in_memory_music_service";
 import supersoap from "./supersoap";
@@ -51,7 +52,7 @@ import {
   artistToArtistSummary,
   MusicService,
   playlistToPlaylistSummary,
-} from "../src/music_library";
+} from "../src/music_service";
 import { APITokens } from "../src/api_tokens";
 import dayjs from "dayjs";
 import url, { URLBuilder } from "../src/url_builder";
@@ -561,24 +562,6 @@ describe("coverArtURI", () => {
   });
 });
 
-describe("iconArtURI", () => {
-  const bonobUrl = new URLBuilder(
-    "http://bonob.example.com:8080/context?search=yes"
-  );
-
-  describe("with no text", () => {
-    it("should return just the icon uri", () => {
-      expect(iconArtURI(bonobUrl, "mushroom").href()).toEqual("http://bonob.example.com:8080/context/icon/mushroom/size/legacy?search=yes")
-    });
-  });
-
-  describe("with text", () => {
-    it("should return just the icon uri", () => {
-      expect(iconArtURI(bonobUrl, "yyyy", "foobar10000").href()).toEqual("http://bonob.example.com:8080/context/icon/yyyy:foobar10000/size/legacy?search=yes")
-    });
-  });
-});
-
 describe("wsdl api", () => {
   const musicService = {
     generateToken: jest.fn(),
@@ -1400,7 +1383,7 @@ describe("wsdl api", () => {
             });
 
             describe("asking for a year", () => {
-              const expectedYears = [{ year: "?" }, { year: "1969" }, { year: "1980" }, { year: "2001" }, { year: "2010" }];
+              const expectedYears = [Y1969, Y2023, Y2024];
 
               beforeEach(() => {
                 musicLibrary.years.mockResolvedValue(expectedYears);
@@ -1413,22 +1396,17 @@ describe("wsdl api", () => {
                     index: 0,
                     count: 100,
                   });
-                  const albumListForYear = (year: string, icon: URLBuilder) => ({
-                    itemType: "albumList",
-                    id: `year:${year}`,
-                    title: year,
-                    albumArtURI: icon.href(),
-                  });
-
                   expect(result[0]).toEqual(
                     getMetadataResult({
-                      mediaCollection: [
+                      mediaCollection: expectedYears.map((year) => ({
-                        albumListForYear("?",    iconArtURI(bonobUrl, "music")),
+                        itemType: "albumList",
-                        albumListForYear("1969", iconArtURI(bonobUrl, "yyyy", "1969")),
+                        id: `year:${year.id}`,
-                        albumListForYear("1980", iconArtURI(bonobUrl, "yyyy", "1980")),
+                        title: year.year,
-                        albumListForYear("2001", iconArtURI(bonobUrl, "yyyy", "2001")),
+                        albumArtURI: iconArtURI(
-                        albumListForYear("2010", iconArtURI(bonobUrl, "yyyy", "2010")),
+                          bonobUrl,
-                      ],
+                          "music",
+                        ).href(),
+                      })),
                       index: 0,
                       total: expectedYears.length,
                     })
@@ -1440,22 +1418,21 @@ describe("wsdl api", () => {
                 it("should return just that page", async () => {
                   const result = await ws.getMetadataAsync({
                     id: `years`,
-                    index: 2,
+                    index: 1,
                     count: 2,
                   });
                   expect(result[0]).toEqual(
                     getMetadataResult({
-                      mediaCollection: [{ year: "1980" }, { year: "2001" }].map((year) => ({
+                      mediaCollection: [Y2023, Y2024].map((year) => ({
                         itemType: "albumList",
-                        id: `year:${year.year}`,
+                        id: `year:${year.id}`,
                         title: year.year,
                         albumArtURI: iconArtURI(
                           bonobUrl,
-                          "yyyy",
+                          "music"
-                          year.year
                         ).href(),
                       })),
-                      index: 2,
+                      index: 1,
                       total: expectedYears.length,
                     })
                   );
@@ -2358,8 +2335,10 @@ describe("wsdl api", () => {
             });
 
             describe("asking for an album", () => {
-              const album = anAlbumSummary();
+              const album = anAlbum();
-              const artist = anArtistSummary();
+              const artist = anArtist({
+                albums: [album],
+              });
 
               const track1 = aTrack({ artist, album, number: 1 });
               const track2 = aTrack({ artist, album, number: 2 });
@@ -2370,12 +2349,7 @@ describe("wsdl api", () => {
               const tracks = [track1, track2, track3, track4, track5];
 
               beforeEach(() => {
-                musicLibrary.album.mockResolvedValue(anAlbum({ 
+                musicLibrary.tracks.mockResolvedValue(tracks);
-                  ...album, 
-                  artistName: artist.name, 
-                  artistId: artist.id, 
-                  tracks
-                }));
               });
 
               describe("asking for all for an album", () => {
@@ -2399,7 +2373,7 @@ describe("wsdl api", () => {
                       total: tracks.length,
                     })
                   );
-                  expect(musicLibrary.album).toHaveBeenCalledWith(album.id);
+                  expect(musicLibrary.tracks).toHaveBeenCalledWith(album.id);
                 });
               });
 
@@ -2426,7 +2400,7 @@ describe("wsdl api", () => {
                       total: tracks.length,
                     })
                   );
-                  expect(musicLibrary.album).toHaveBeenCalledWith(album.id);
+                  expect(musicLibrary.tracks).toHaveBeenCalledWith(album.id);
                 });
               });
             });

web/icons/yy.svg

@@ -1,3 +0,0 @@
-<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <text x="50" y="75" font-size="65" text-anchor="middle" font-family="Arial, sans-serif" font-weight="bold">80s</text>
-</svg>

web/icons/yyyy.svg

@@ -1,3 +0,0 @@
-<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <text x="50" y="65" font-size="35" text-anchor="middle" font-family="Arial, sans-serif" font-weight="bold">1980</text>
-</svg>