Icons for years (#220 )

bump node to v22 (#218 )
Removed libxmljs2 (#219 )
2025-12-21 17:33:29 +01:00 · 2025-02-07 11:52:59 +11:00 · 2025-02-04 20:14:46 +11:00 · 2025-02-04 19:56:45 +11:00 · 2025-02-04 06:28:45 +11:00 · 2025-02-01 15:03:37 +11:00
39 changed files with 10067 additions and 154299 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-bullseye
+FROM node:22-bullseye

 LABEL maintainer=simojenki

--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,10 +10,19 @@
        "BNB_DEV_SUBSONIC_URL": "${localEnv:BNB_DEV_SUBSONIC_URL}"
    },
    "remoteUser": "node",
+    "forwardPorts": [4534],
    "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:1": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
            "version": "latest",
            "moby": true
        }
+    },
+    "customizations": {
+        "vscode": {
+          "extensions": [
+            "esbenp.prettier-vscode",
+            "redhat.vscode-xml"
+        ]
+        }
    }
 }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,11 +21,11 @@ jobs:
      -
        uses: actions/setup-node@v3
        with:
-          node-version: '16'
+          node-version: 20
      -
-        run: yarn install
+        run: npm install
      -
-        run: yarn test
+        run: npm test


  push_to_registry:
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .vscode
 build
 ignore
+.ignore
 node_modules
 .yarn/*
 !.yarn/patches
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
+fetch-timeout=60000
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-16.6.2
--- a/.yarn/releases/yarn-1.22.19.cjs
+++ b/.yarn/releases/yarn-1.22.19.cjs
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,3 +0,0 @@
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-1.22.19.cjs
--- a/36
+++ b/36
@@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim as build
+FROM node:22-bullseye-slim AS build

 WORKDIR /bonob

@@ -9,12 +9,11 @@ COPY typings ./typings
 COPY web ./web
 COPY tests ./tests
 COPY jest.config.js .
-COPY package.json .
 COPY register.js .
+COPY .npmrc .
 COPY tsconfig.json .
-COPY yarn.lock .
-COPY .yarnrc.yml .
-COPY .yarn/releases ./.yarn/releases
+COPY package.json .
+COPY package-lock.json .

 ENV JEST_TIMEOUT=60000
 ENV DEBIAN_FRONTEND=noninteractive
@@ -29,24 +28,15 @@ RUN apt-get update && \
        g++ && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/* && \
-    yarn config set network-timeout 600000 -g && \
-    yarn install \
-        --prefer-offline \
-        --frozen-lockfile \
-        --non-interactive \
-        --production=false && \
-    yarn test --no-cache && \
-    yarn gitinfo && \
-    yarn build && \
+    npm install && \
+    npm test && \
+    npm run gitinfo && \
+    npm run build && \
    rm -Rf node_modules && \
-    NODE_ENV=production yarn install \
-        --prefer-offline \
-        --pure-lockfile \
-        --non-interactive \
-        --production=true
+    NODE_ENV=production npm install --omit=dev


-FROM node:16-bullseye-slim
+FROM node:22-bullseye-slim

 LABEL   maintainer="simojenki" \
        org.opencontainers.image.source="https://github.com/simojenki/bonob" \
@@ -62,20 +52,20 @@ EXPOSE $BNB_PORT
 WORKDIR /bonob

 COPY package.json .
-COPY yarn.lock .
+COPY package-lock.json .

 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.4-20190411.142401-3.wsdl ./src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
+COPY src/Sonoswsdl-1.19.6-20231024.wsdl ./src/Sonoswsdl-1.19.6-20231024.wsdl

 RUN apt-get update && \
    apt-get -y upgrade && \
    apt-get -y install --no-install-recommends \
        libvips \
        tzdata \
-				wget && \
+        wget && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/*

--- a/README.md
+++ b/README.md
@@ -9,19 +9,20 @@ Support for Subsonic API clones (tested against Navidrome and Gonic).
 ## Features

 - Integrates with Subsonic API clones (Navidrome, Gonic)
- Browse by Artist, Albums, Random, Favourites, Top Rated, Playlist, Genres, Recently Added Albums, Recently Played Albums, Most Played Albums
+- Browse by Artist, Albums, Random, Favourites, Top Rated, Playlist, Genres, Years, Recently Added Albums, Recently Played Albums, Most Played Albums
 - Artist & Album Art
 - View Related Artists via Artist -> '...' -> Menu -> Related Arists
 - Now playing & Track Scrobbling
 - Search by Album, Artist, Track
 - Playlist editing through sonos app.
 - Marking of songs as favourites and with ratings through the sonos app.
- Localization (only en-US, da-DK & nl-NL supported currently, require translations for other languages).  [Sonos localization and supported languages](https://developer.sonos.com/build/content-service-add-features/strings-and-localization/)
+- Localization (only en-US, da-DK, nl-NL & fr-FR supported currently, require translations for other languages).  [Sonos localization and supported languages](https://docs.sonos.com/docs/localization)
 - Auto discovery of sonos devices
 - Discovery of sonos devices using seed IP address
 - Auto registration with sonos on start
 - Multiple registrations within a single household.
- Transcoding support for flacs using a specific player for the flac mimeType bonob/sonos
+- Transcoding within subsonic clone
+- Custom players by mime type, allowing custom transcoding rules for different file types

 ## Running

@@ -39,8 +40,8 @@ docker pull ghcr.io/simojenki/bonob
 tag | description
 --- | ---
 latest | Latest release, intended to be stable
-master | Laster build from master, probably works, however is currently under test in
-vX.Y.Z | Fixed release versions from tags, for those that want to pin to specific release
+master | Lastest build from master, probably works, however is currently under test
+vX.Y.Z | Fixed release versions from tags, for those that want to pin to a specific release


 ### Full sonos device auto-discovery and auto-registration using docker --network host
@@ -163,7 +164,6 @@ BNB_URL | http://$(hostname):4534 | URL (including path) for bonob so that sonos
 BNB_SECRET | bonob | secret used for encrypting credentials
 BNB_AUTH_TIMEOUT | 1h | Timeout for the sonos auth token, described in the format [ms](https://github.com/vercel/ms), ie. '5s' == 5 seconds, '11h' == 11 hours.  In the case of using Navidrome this should be less than the value for ND_SESSIONTIMEOUT
 BNB_LOG_LEVEL | info | Log level. One of ['debug', 'info', 'warn', 'error']
-BNB_DISABLE_PLAYLIST_ART | undefined | Disables playlist art generation, ie. when there are many playlists and art generation takes too long
 BNB_SERVER_LOG_REQUESTS | false | Whether or not to log http requests
 BNB_SONOS_AUTO_REGISTER | false | Whether or not to try and auto-register on startup
 BNB_SONOS_DEVICE_DISCOVERY | true | Enable/Disable sonos device discovery entirely.  Setting this to 'false' will disable sonos device search, regardless of whether a seed host is specified.
@@ -171,7 +171,7 @@ BNB_SONOS_SEED_HOST | undefined | sonos device seed host for discovery, or ommit
 BNB_SONOS_SERVICE_NAME | bonob | service name for sonos
 BNB_SONOS_SERVICE_ID | 246 | service id for sonos
 BNB_SUBSONIC_URL | http://$(hostname):4533 | URL for subsonic clone
-BNB_SUBSONIC_CUSTOM_CLIENTS | undefined | Comma delimeted mime types for custom subsonic clients when streaming. ie. "audio/flac,audio/ogg" would use client = 'bonob+audio/flac' for flacs, and 'bonob+audio/ogg' for oggs.
+BNB_SUBSONIC_CUSTOM_CLIENTS | undefined | Comma delimeted mime types for custom subsonic clients when streaming. <P>Must specify the source mime type and optionally the transcoded mime type. <p>For example; <p>If you want to simply re-encode some flacs, then you could specify just "audio/flac".  <p>However; <p>if your subsonic server will transcode the track then you need to specify the resulting mime type, ie. "audio/flac>audio/mp3" <p>If you want to specify many something like; "audio/flac>audio/mp3,audio/ogg" would use client = 'bonob+audio/flac' for flacs, and 'bonob+audio/ogg' for oggs.  <p>Disclaimer: Getting this configuration wrong will cause sonos to refuse to play your music, by all means experiment, however know that this may well break your setup.
 BNB_SUBSONIC_ARTIST_IMAGE_CACHE | undefined | Path for caching of artist images that are sourced externally. ie. Navidrome provides spotify URLs. Remember to provide a volume-mapping for Docker, when enabling this cache.
 BNB_SCROBBLE_TRACKS | true | Whether to scrobble the playing of a track if it has been played for >30s
 BNB_REPORT_NOW_PLAYING | true | Whether to report a track as now playing
@@ -218,19 +218,22 @@ Afterwards the Sonos app displays a dropdown underneath the service, allowing to
 - Implement the MusicService/MusicLibrary interface
 - Startup bonob with your new implementation.

-## A note on transcoding
+## Transcoding

-tldr; Transcoding to mp3/m4a is not supported as sonos devices will not play the track.  However transcoding to flac does work, use BNB_SUBSONIC_CUSTOM_CLIENTS=audio/flac if you want to transcode flac->flac ie. to downsample HD flacs (see below).
+### Transcode everything

-Sonos devices are very particular about how audio streams are presented to them, see [streaming basics](https://developer.sonos.com/build/content-service-add-features/streaming-basics/).  When using transcoding both Navidrome and Gonic report no 'content-length', nor do they support range queries, this will cause the sonos device to fail to play the track.
+The simplest transcoding solution is to simply change the player ('bonob') in your subsonic server to transcode all content to something sonos supports (ie. mp3 & flac)

-### Audio File type specific transcoding options within Subsonic
+### Audio file type specific transcoding

-In some situations you may wish to have different 'Players' within you Subsonic server so that you can configure different transcoding options depending on the file type.  For example if you have flacs with a mixture of frequency formats where not all are supported by sonos [See issue #52](https://github.com/simojenki/bonob/issues/52) & [Sonos supported audio formats](https://developer.sonos.com/build/content-service-add-features/supported-audio-formats/)
+Disclaimer: The following configuration is more complicated, and if you get the configuration wrong sonos will refuse to play your content.
+
+In some situations you may wish to have different 'Players' within your Subsonic server so that you can configure different transcoding options depending on the file type.  For example if you have flacs with a mixture of frequency formats where not all are supported by sonos [See issue #52](https://github.com/simojenki/bonob/issues/52) & [Sonos supported audio formats](https://docs.sonos.com/docs/supported-audio-formats)

 In this case you could set;

 ```bash
+# This is equivalent to setting BNB_SUBSONIC_CUSTOM_CLIENTS="audio/flac>audio/flac"
 BNB_SUBSONIC_CUSTOM_CLIENTS="audio/flac"
 ```

@@ -246,7 +249,16 @@ ffmpeg -i %s -af aformat=sample_fmts=s16|s32:sample_rates=8000|11025|16000|22050
 ffmpeg -i %s -af aformat=sample_fmts=s16:sample_rates=8000|11025|16000|22050|24000|32000|44100|48000 -f flac -
 ```

-### Changing Icon colors
+Alternatively perhaps you have some aac (audio/mpeg) files that will not play in sonos (ie. voice recordings from an iPhone), however you do not want to transcode all everything, just those audio/mpeg files.  Let's say you want to transcode them to mp3s, you could set the following;
+
+```bash
+BNB_SUBSONIC_CUSTOM_CLIENTS="audio/mpeg>audio/mp3"
+```
+
+And then configure the 'bonob+audio/mpeg' player in your subsonic server.
+
+
+## Changing Icon colors

 ```bash
 -e BNB_ICON_FOREGROUND_COLOR=white \
@@ -276,6 +288,7 @@ ffmpeg -i %s -af aformat=sample_fmts=s16:sample_rates=8000|11025|16000|22050|240

 ![Spotify-ish](https://github.com/simojenki/bonob/blob/master/docs/images/spotify-ish.png?raw=true)

+
 ## Credits

 - Icons courtesy of: [Navidrome](https://www.navidrome.org/), [Vectornator](https://www.vectornator.io/icons), and @jicho
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,67 +6,70 @@
  "author": "simojenki <simojenki@users.noreply.github.com>",
  "license": "GPL-3.0-only",
  "dependencies": {
-    "@svrooij/sonos": "^2.5.0",
-    "@types/express": "^4.17.17",
-    "@types/fs-extra": "^11.0.1",
-    "@types/jsonwebtoken": "^9.0.1",
-    "@types/jws": "^3.2.5",
-    "@types/morgan": "^1.9.4",
-    "@types/node": "^16.11.7",
-    "@types/randomstring": "^1.1.8",
-    "@types/sharp": "^0.31.1",
-    "@types/underscore": "^1.11.4",
-    "@types/uuid": "^9.0.1",
-    "@types/xmldom": "0.1.31",
-    "axios": "^1.3.4",
-    "dayjs": "^1.11.7",
-    "eta": "^2.0.1",
-    "express": "^4.18.2",
-    "fp-ts": "^2.13.1",
-    "fs-extra": "^11.1.0",
-    "jsonwebtoken": "^9.0.0",
+    "@svrooij/sonos": "^2.6.0-beta.11",
+    "@types/express": "^4.17.21",
+    "@types/fs-extra": "^11.0.4",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/jws": "^3.2.10",
+    "@types/morgan": "^1.9.9",
+    "@types/node": "^20.11.5",
+    "@types/randomstring": "^1.3.0",
+    "@types/underscore": "^1.13.0",
+    "@types/uuid": "^10.0.0",
+    "@types/xmldom": "^0.1.34",
+    "@xmldom/xmldom": "^0.9.7",
+    "axios": "^1.7.8",
+    "dayjs": "^1.11.13",
+    "eta": "^2.2.0",
+    "express": "^4.18.3",
+    "fp-ts": "^2.16.9",
+    "fs-extra": "^11.2.0",
+    "jsonwebtoken": "^9.0.2",
    "jws": "^4.0.0",
-    "libxmljs2": "^0.31.0",
    "morgan": "^1.10.0",
-    "node-html-parser": "^6.1.5",
-    "randomstring": "^1.2.3",
-    "sharp": "^0.31.3",
-    "soap": "^1.0.0",
+    "node-html-parser": "^6.1.13",
+    "randomstring": "^1.3.0",
+    "sharp": "^0.33.5",
+    "soap": "^1.1.6",
    "ts-md5": "^1.3.1",
-    "typescript": "^4.9.5",
-    "underscore": "^1.13.6",
+    "typescript": "^5.7.2",
+    "underscore": "^1.13.7",
    "urn-lib": "^2.0.0",
-    "uuid": "^9.0.0",
-    "winston": "^3.8.2",
-    "xmldom-ts": "^0.3.1"
+    "uuid": "^11.0.3",
+    "winston": "^3.17.0",
+    "xmldom-ts": "^0.3.1",
+    "xpath": "^0.0.34"
  },
  "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/jest": "^29.4.0",
-    "@types/mocha": "^10.0.1",
-    "@types/supertest": "^2.0.12",
-    "@types/tmp": "^0.2.3",
-    "chai": "^4.3.7",
-    "get-port": "^6.1.2",
-    "image-js": "^0.35.3",
-    "jest": "^29.4.3",
-    "nodemon": "^2.0.21",
-    "supertest": "^6.3.3",
-    "tmp": "^0.2.1",
-    "ts-jest": "^29.0.5",
+    "@types/chai": "^5.0.1",
+    "@types/jest": "^29.5.14",
+    "@types/mocha": "^10.0.10",
+    "@types/supertest": "^6.0.2",
+    "@types/tmp": "^0.2.6",
+    "chai": "^5.1.2",
+    "get-port": "^7.1.0",
+    "image-js": "^0.35.6",
+    "jest": "^29.7.0",
+    "nodemon": "^3.1.7",
+    "supertest": "^7.0.0",
+    "tmp": "^0.2.3",
+    "ts-jest": "^29.2.5",
    "ts-mockito": "^2.6.1",
-    "ts-node": "^10.9.1",
-    "xmldom-ts": "^0.3.1",
+    "ts-node": "^10.9.2",
    "xpath-ts": "^1.3.13"
  },
+  "overrides": {
+    "axios-ntlm": "npm:dry-uninstall",
+    "axios": "$axios"
+  },
  "scripts": {
    "clean": "rm -Rf build node_modules",
    "build": "tsc",
-    "dev": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
-    "devr": "BNB_DISABLE_PLAYLIST_ART=true BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey 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",
+    "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",
    "register-dev": "ts-node ./src/register.ts http://${BNB_DEV_HOST_IP}:4534",
    "test": "jest",
+    "testw": "jest --watch",
    "gitinfo": "git describe --tags > .gitinfo"
-  },
-  "packageManager": "yarn@1.22.19"
+  }
 }
--- a/src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
+++ b/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"/>
+                        <xs:element name="key" type="xs:string" minOccurs="0"/>
                        <xs:element name="householdId" type="xs:string"/>
                    </xs:sequence>
                </xs:complexType>
@@ -111,11 +111,12 @@
                </xs:simpleType>
            </xs:element>

-            <xs:simpleType name="userAccountType">
+            <xs:simpleType name="userAccountTier">
                <xs:restriction base="xs:string">
-                    <xs:enumeration value="premium"/>
-                    <xs:enumeration value="trial"/>
+                    <xs:enumeration value="paidPremium"/>
+                    <xs:enumeration value="paidLimited"/>
                    <xs:enumeration value="free"/>
+                    <xs:enumeration value="none"/>
                </xs:restriction>
            </xs:simpleType>

@@ -239,6 +240,12 @@
                </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"/>
@@ -355,13 +362,11 @@

            <xs:complexType name="userInfo">
                <xs:sequence>
-                    <!-- Everything except userIdHashCode and nickname are for future use -->
+                    <!--  accountStatus potentially for future use -->
                    <xs:element name="userIdHashCode" type="xs:string" minOccurs="1"/>
-                    <xs:element name="accountType" type="tns:userAccountType" minOccurs="0"/>
+                    <xs:element name="accountTier" type="tns:userAccountTier" 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>

@@ -888,7 +893,10 @@
                        <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:element name="contentKey" 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="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"/>
@@ -2059,7 +2067,7 @@

    <wsdl:service name="Sonos">
        <wsdl:port name="SonosSoap" binding="tns:SonosSoap">
-		<soap:address location="/about"/>
+		<soap:address location="http://moapi.sonos.com/Test/TestService.php"/>
        </wsdl:port>
    </wsdl:service>

--- a/src/app.ts
+++ b/src/app.ts
@@ -4,11 +4,12 @@ import server from "./server";
 import logger from "./logger";

 import {
-  appendMimeTypeToClientFor,
  axiosImageFetcher,
  cachingImageFetcher,
-  DEFAULT,
-  Subsonic,
+  SubsonicMusicService,
+  TranscodingCustomPlayers,
+  NO_CUSTOM_PLAYERS,
+  Subsonic
 } from "./subsonic";
 import { InMemoryAPITokens, sha256 } from "./api_tokens";
 import { InMemoryLinkCodes } from "./link_codes";
@@ -32,18 +33,21 @@ const bonob = bonobService(

 const sonosSystem = sonos(config.sonos.discovery);

-const streamUserAgent = config.subsonic.customClientsFor
-  ? appendMimeTypeToClientFor(config.subsonic.customClientsFor.split(","))
-  : DEFAULT;
+const customPlayers = config.subsonic.customClientsFor
+  ? TranscodingCustomPlayers.from(config.subsonic.customClientsFor)
+  : NO_CUSTOM_PLAYERS;

 const artistImageFetcher = config.subsonic.artistImageCache
  ? cachingImageFetcher(config.subsonic.artistImageCache, axiosImageFetcher)
  : axiosImageFetcher;

-const subsonic = new Subsonic(
-  config.subsonic.url,
-  streamUserAgent,
-  artistImageFetcher
+const subsonic = new SubsonicMusicService(
+  new Subsonic(
+    config.subsonic.url,
+    customPlayers,
+    artistImageFetcher
+  ),
+  customPlayers
 );

 const featureFlagAwareMusicService: MusicService = {
--- a/src/burn.ts
+++ b/src/burn.ts
@@ -1,6 +1,8 @@
 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";

@@ -78,7 +80,13 @@ export const parse = (burn: string): BUrn => {
    resource: result.resource as string,
  };
  if(x.system == "encrypted") {
-    return parse(encryptor.decrypt(x.resource));
+    return pipe(
+      encryptor.decrypt(x.resource),
+      E.match(
+        (err) => { throw new Error(err) },
+        (z) => parse(z)
+      )
+    );
  } else {
    return x;
  }
--- a/src/config.ts
+++ b/src/config.ts
@@ -98,7 +98,7 @@ export default function () {
      sid: bnbEnvVar<number>("SONOS_SERVICE_ID", { default: 246, parser: asInt }),
    },
    subsonic: {
-      url: bnbEnvVar("SUBSONIC_URL", { legacy: ["BONOB_NAVIDROME_URL"], default: `http://${hostname()}:4533` })!,
+      url: url(bnbEnvVar("SUBSONIC_URL", { legacy: ["BONOB_NAVIDROME_URL"], default: `http://${hostname()}:4533` })!),
      customClientsFor: bnbEnvVar<string>("SUBSONIC_CUSTOM_CLIENTS", { legacy: ["BONOB_NAVIDROME_CUSTOM_CLIENTS"] }),
      artistImageCache: bnbEnvVar<string>("SUBSONIC_ARTIST_IMAGE_CACHE"),
    },
--- a/src/encryption.ts
+++ b/src/encryption.ts
@@ -4,13 +4,14 @@ 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;
@@ -18,7 +19,7 @@ export type Hash = {

 export type Encryption = {
  encrypt: (value: string) => string;
-  decrypt: (value: string) => string;
+  decrypt: (value: string) => Either<string, string>;
 };

 export const jwsEncryption = (secret: string): Encryption => {
@@ -28,7 +29,15 @@ export const jwsEncryption = (secret: string): Encryption => {
      payload: value,
      secret: secret,
    }),
-    decrypt: (value: string) => jws.decode(value).payload
+    decrypt: (value: string) => pipe(
+      jws.decode(value),
+      O.fromNullable,
+      O.map(it => it.payload),
+      O.match(
+        () => left("Failed to decrypt jws"),
+        (payload) => right(payload)
+      )
+    )
  }
 }

@@ -36,7 +45,8 @@ export const cryptoEncryption = (secret: string): Encryption => {
  const key = createHash("sha256")
    .update(String(secret))
    .digest("base64")
-    .substr(0, 32);
+    .substring(0, 32);
+
  return {
    encrypt: (value: string) => {
      const cipher = createCipheriv(ALGORITHM, key, IV);
@@ -45,20 +55,23 @@ export const cryptoEncryption = (secret: string): Encryption => {
        cipher.final(),
      ]).toString("hex")}`;
    },
-    decrypt: (value: string) => {
-      const parts = value.split(".");
-      if(parts.length != 2) throw `Invalid value to decrypt`;
-
-      const decipher = createDecipheriv(
-        ALGORITHM,
-        key,
-        Buffer.from(parts[0]!, "hex")
-      );
-      return Buffer.concat([
-        decipher.update(Buffer.from(parts[1]!, "hex")),
-        decipher.final(),
-      ]).toString();
-    },
+    decrypt: (value: string) => pipe(
+      right(value),
+      E.map(it => it.split(".")),
+      E.flatMap(it => it.length == 2 ? right({ iv: it[0]!, data: it[1]! }) : left("Invalid value to decrypt")),
+      E.map(it => ({
+        hash: it,
+        decipher: createDecipheriv(
+          ALGORITHM,
+          key,
+          Buffer.from(it.iv, "hex")
+        )
+      })),
+      E.map(it => Buffer.concat([
+        it.decipher.update(Buffer.from(it.hash.data, "hex")),
+        it.decipher.final(),
+      ]).toString())
+    ),
  };
 };

--- a/src/i8n.ts
+++ b/src/i8n.ts
@@ -4,11 +4,12 @@ import { option as O } from "fp-ts";
 import _ from "underscore";

 export type LANG = "en-US" | "da-DK" | "de-DE" | "es-ES" | "fr-FR" | "it-IT" | "ja-JP" | "nb-NO" | "nl-NL" | "pt-BR" | "sv-SE" | "zh-CN"
-export type SUPPORTED_LANG = "en-US" | "da-DK" | "nl-NL";
+export type SUPPORTED_LANG = "en-US" | "da-DK" | "fr-FR" | "nl-NL";
 export type KEY =
  | "AppLinkMessage"
  | "artists"
  | "albums"
+  | "internetRadio"  
  | "playlists"
  | "genres"
  | "random"
@@ -39,6 +40,7 @@ export type KEY =
  | "loginFailed" 
  | "noSonosDevices" 
  | "favourites"
+  | "years"
  | "LOVE"
  | "LOVE_SUCCESS"
  | "STAR" 
@@ -51,6 +53,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    AppLinkMessage: "Linking sonos with $BNB_SONOS_SERVICE_NAME",
    artists: "Artists",
    albums: "Albums",
+    internetRadio: "Internet Radio",
    tracks: "Tracks",
    playlists: "Playlists",
    genres: "Genres",
@@ -81,6 +84,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    loginFailed: "Login failed!",
    noSonosDevices: "No sonos devices",
    favourites: "Favourites",
+    years: "Years",
    STAR: "Star",
    UNSTAR: "Un-star",
    STAR_SUCCESS: "Track starred",
@@ -92,6 +96,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    AppLinkMessage: "Forbinder Sonos med $BNB_SONOS_SERVICE_NAME",
    artists: "Kunstnere",
    albums: "Album",
+    internetRadio: "Internet Radio",
    tracks: "Numre",
    playlists: "Afspilningslister",
    genres: "Genre",
@@ -122,6 +127,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    loginFailed: "Log på fejlede!",
    noSonosDevices: "Ingen Sonos enheder",
    favourites: "Favoritter",
+    years: "Flere år",
    STAR: "Tilføj stjerne",
    UNSTAR: "Fjern stjerne",
    STAR_SUCCESS: "Stjerne tilføjet",
@@ -129,10 +135,54 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    LOVE: "Synes godt om",
    LOVE_SUCCESS: "Syntes godt om"
  },
+  "fr-FR": {
+    AppLinkMessage: "Associer Sonos à $BNB_SONOS_SERVICE_NAME",
+    artists: "Artistes",
+    albums: "Albums",
+    internetRadio: "Radio Internet",
+    tracks: "Pistes",
+    playlists: "Playlists",
+    genres: "Genres",
+    random: "Aléatoire",
+    topRated: "Les mieux notés",
+    recentlyAdded: "Récemment ajouté",
+    recentlyPlayed: "Récemment joué",
+    mostPlayed: "Les plus joué",
+    success: "Succès",
+    failure: "Échec",
+    expectedConfig: "Configuration attendue",
+    existingServiceConfig: "La configuration de service existe",
+    noExistingServiceRegistration: "Aucun enregistrement de service existant",
+    register: "Inscription",
+    removeRegistration: "Supprimer l'inscription",
+    devices: "Appareils",
+    services: "Services",
+    login: "Se connecter",
+    logInToBonob: "Se connecter à $BNB_SONOS_SERVICE_NAME",
+    username: "Nom d'utilisateur",
+    password: "Mot de passe",
+    successfullyRegistered: "Connecté avec succès",
+    registrationFailed: "Échec de la connexion !",
+    successfullyRemovedRegistration: "Inscription supprimée avec succès",
+    failedToRemoveRegistration: "Échec de la suppression de l'inscription !",
+    invalidLinkCode: "Code non valide !",
+    loginSuccessful: "Connexion réussie !",
+    loginFailed: "La connexion a échoué !",
+    noSonosDevices: "Aucun appareil Sonos",
+    favourites: "Favoris",
+    years: "Années",
+    STAR: "Suivre",
+    UNSTAR: "Ne plus suivre",
+    STAR_SUCCESS: "Piste suivie",
+    UNSTAR_SUCCESS: "Piste non suivie",
+    LOVE: "Aimer",
+    LOVE_SUCCESS: "Pistes aimée"
+  },
  "nl-NL": {
    AppLinkMessage: "Sonos koppelen aan $BNB_SONOS_SERVICE_NAME",
    artists: "Artiesten",
    albums: "Albums",
+    internetRadio: "Internet Radio",
    tracks: "Nummers",
    playlists: "Afspeellijsten",
    genres: "Genres",
@@ -163,6 +213,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    loginFailed: "Inloggen mislukt!",
    noSonosDevices: "Geen Sonos-apparaten",
    favourites: "Favorieten",
+    years: "Jaren",
    STAR: "Ster ",
    UNSTAR: "Een ster",
    STAR_SUCCESS: "Nummer met ster",
--- a/src/icon.ts
+++ b/src/icon.ts
@@ -1,4 +1,5 @@
-import libxmljs, { Element, Attribute } from "libxmljs2";
+import * as xpath from "xpath";
+import { DOMParser, Node } from '@xmldom/xmldom';
 import _ from "underscore";
 import fs from "fs";

@@ -13,11 +14,10 @@ import {
  isMay4,
  SystemClock,
 } from "./clock";
+import { xmlTidy } from "./utils";
 import path from "path";

-const SVG_NS = {
-  svg: "http://www.w3.org/2000/svg",
-};
+const SVG_NS = "http://www.w3.org/2000/svg";

 class ViewBox {
  minX: number;
@@ -48,8 +48,16 @@ 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;
@@ -93,17 +101,11 @@ export class SvgIcon implements Icon {

  constructor(
    svg: string,
-    features: Partial<IconFeatures> = {
-      viewPortIncreasePercent: undefined,
-      backgroundColor: undefined,
-      foregroundColor: undefined,
-    }
+    features: Partial<IconFeatures> = {}
  ) {
    this.svg = svg;
    this.features = {
-      viewPortIncreasePercent: undefined,
-      backgroundColor: undefined,
-      foregroundColor: undefined,
+      ...NO_FEATURES,
      ...features,
    };
  }
@@ -117,38 +119,44 @@ export class SvgIcon implements Icon {
    });

  public toString = () => {
-    const xml = libxmljs.parseXmlString(this.svg, {
-      noblanks: true,
-      net: false,
-    });
-    const viewBoxAttr = xml.get("//svg:svg/@viewBox", SVG_NS) as Attribute;
-    let viewBox = new ViewBox(viewBoxAttr.value());
+    const doc = new DOMParser().parseFromString(this.svg, 'text/xml') as unknown as Document;
+    const select = xpath.useNamespaces({ svg: SVG_NS });
+
+    const elements = (path: string) => (select(path, doc) as Element[])
+    const element = (path: string) => elements(path)[0]!
+
+    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);
-      viewBoxAttr.value(viewBox.toString());
+      element("//svg:svg").setAttribute("viewBox", viewBox.toString());
    }
-    if (this.features.backgroundColor) {
-      (xml.get("//svg:svg/*[1]", SVG_NS) as Element).addPrevSibling(
-        new Element(xml, "rect").attr({
-          x: `${viewBox.minX}`,
-          y: `${viewBox.minY}`,
-          width: `${Math.abs(viewBox.minX) + viewBox.width}`,
-          height: `${Math.abs(viewBox.minY) + viewBox.height}`,
-          fill: this.features.backgroundColor,
-        })
-      );
-    }
-    if (this.features.foregroundColor) {
-      (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! });
+    if(this.features.text) {
+      elements("//svg:text").forEach((text) => {
+        text.textContent = this.features.text!
      });
    }
-    return xml.toString();
+    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");
+      rect.setAttribute("x", `${viewBox.minX}`);
+      rect.setAttribute("y", `${viewBox.minY}`);
+      rect.setAttribute("width", `${Math.abs(viewBox.minX) + viewBox.width}`);
+      rect.setAttribute("height", `${Math.abs(viewBox.minY) + viewBox.height}`);
+      rect.setAttribute("fill", this.features.backgroundColor);
+      
+      const svg = element("//svg:svg")
+      svg.insertBefore(rect, svg.childNodes[0]!);
+    }
+    
+    return xmlTidy(doc as unknown as Node);
  };
 }

@@ -163,6 +171,7 @@ export const HOLI_COLORS = [
 export type ICON =
  | "artists"
  | "albums"
+  | "radio"
  | "playlists"
  | "genres"
  | "random"
@@ -228,19 +237,24 @@ export type ICON =
  | "yoda" 
  | "heart"
  | "star" 
-  | "solidStar";
+  | "solidStar"
+  | "yy"
+  | "yyyy";

-const iconFrom = (name: string) =>
+const svgFrom = (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"),
-  blank: iconFrom("blank.svg"),
+  radio: iconFrom("navidrome-radio.svg"),
+  blank: svgFrom("blank.svg"),
  playlists: iconFrom("navidrome-playlists.svg"),
  genres: iconFrom("Theatre-Mask-111172.svg"),
  random: iconFrom("navidrome-random.svg"),
@@ -305,7 +319,9 @@ 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];
--- a/src/music_service.ts
+++ b/src/music_service.ts
@@ -46,15 +46,24 @@ export type Genre = {
  id: string;
 }

+export type Year = {
+  year: string;
+}
+
 export type Rating = {
  love: boolean;
  stars: number;
 }

+export type Encoding = {
+  player: string,
+  mimeType: string
+}
+
 export type Track = {
  id: string;
  name: string;
-  mimeType: string;
+  encoding: Encoding,
  duration: number;
  number: number | undefined;
  genre: Genre | undefined;
@@ -64,6 +73,13 @@ export type Track = {
  rating: Rating;
 };

+export type RadioStation = {
+  id: string,
+  name: string,
+  url: string,
+  homePage?: string
+}
+
 export type Paging = {
  _index: number;
  _count: number;
@@ -88,11 +104,13 @@ export const asResult = <T>([results, total]: [T[], number]) => ({

 export type ArtistQuery = Paging;

-export type AlbumQueryType = 'alphabeticalByArtist' | 'alphabeticalByName' | 'byGenre' | 'random' | 'recentlyPlayed' | 'mostPlayed' | 'recentlyAdded' | 'favourited' | 'starred';
+export type AlbumQueryType = 'alphabeticalByArtist' | 'alphabeticalByName' | 'byGenre' | 'byYear' | 'random' | 'recentlyPlayed' | 'mostPlayed' | 'recentlyAdded' | 'favourited' | 'starred';

 export type AlbumQuery = Paging & {
  type: AlbumQueryType;
  genre?: string;
+  fromYear?: string;
+  toYear?: string;
 };

 export const artistToArtistSummary = (it: Artist): ArtistSummary => ({
@@ -113,7 +131,8 @@ export const albumToAlbumSummary = (it: Album): AlbumSummary => ({

 export const playlistToPlaylistSummary = (it: Playlist): PlaylistSummary => ({
  id: it.id,
-  name: it.name
+  name: it.name,
+  coverArt: it.coverArt
 })

 export type StreamingHeader = "content-type" | "content-length" | "content-range" | "accept-ranges";
@@ -131,7 +150,8 @@ export type CoverArt = {

 export type PlaylistSummary = {
  id: string,
-  name: string
+  name: string,
+  coverArt?: BUrn | undefined
 }

 export type Playlist = PlaylistSummary & {
@@ -159,6 +179,7 @@ export interface MusicLibrary {
  tracks(albumId: string): Promise<Track[]>;
  track(trackId: string): Promise<Track>;
  genres(): Promise<Genre[]>;
+  years(): Promise<Year[]>;
  stream({
    trackId,
    range,
@@ -181,4 +202,6 @@ export interface MusicLibrary {
  removeFromPlaylist(playlistId: string, indicies: number[]): Promise<boolean>
  similarSongs(id: string): Promise<Track[]>;
  topSongs(artistId: string): Promise<Track[]>;
+  radioStation(id: string): Promise<RadioStation>
+  radioStations(): Promise<RadioStation[]>
 }
--- a/src/server.ts
+++ b/src/server.ts
@@ -31,9 +31,8 @@ import { pipe } from "fp-ts/lib/function";
 import { URLBuilder } from "./url_builder";
 import makeI8N, { asLANGs, KEY, keys as i8nKeys, LANG } from "./i8n";
 import { Icon, ICONS, festivals, features } from "./icon";
-import _, { shuffle } from "underscore";
+import _ from "underscore";
 import morgan from "morgan";
-import { takeWithRepeats } from "./utils";
 import { parse } from "./burn";
 import { axiosImageFetcher, ImageFetcher } from "./subsonic";
 import {
@@ -307,13 +306,13 @@ function server(
      return `<Match propname="rating" value="${value}">
        <Ratings>
          <Rating Id="${ratingAsInt(
-            nextLove
-          )}" AutoSkip="NEVER" OnSuccessStringId="LOVE_SUCCESS" StringId="LOVE">
+        nextLove
+      )}" AutoSkip="NEVER" OnSuccessStringId="LOVE_SUCCESS" StringId="LOVE">
            <Icon Controller="universal" LastModified="${LastModified}" Uri="${loveRatingIcon}" />
          </Rating>
          <Rating Id="${-ratingAsInt(
-            nextStar
-          )}" AutoSkip="NEVER" OnSuccessStringId="STAR_SUCCESS" StringId="STAR">
+        nextStar
+      )}" AutoSkip="NEVER" OnSuccessStringId="STAR_SUCCESS" StringId="STAR">
            <Icon Controller="universal" LastModified="${LastModified}" Uri="${starsRatingIcon}" />
          </Rating>
        </Ratings>
@@ -327,9 +326,9 @@ function server(
        <Match>
          <imageSizeMap>
            ${SONOS_RECOMMENDED_IMAGE_SIZES.map(
-              (size) =>
-                `<sizeEntry size="${size}" substitution="/size/${size}"/>`
-            ).join("")}
+      (size) =>
+        `<sizeEntry size="${size}" substitution="/size/${size}"/>`
+    ).join("")}
          </imageSizeMap>
        </Match>
      </PresentationMap>
@@ -338,9 +337,9 @@ function server(
          <browseIconSizeMap>
              <sizeEntry size="0" substitution="/size/legacy"/>
              ${SONOS_RECOMMENDED_IMAGE_SIZES.map(
-                (size) =>
-                  `<sizeEntry size="${size}" substitution="/size/${size}"/>`
-              ).join("")}
+      (size) =>
+        `<sizeEntry size="${size}" substitution="/size/${size}"/>`
+    ).join("")}
            </browseIconSizeMap>
        </Match>
      </PresentationMap>
@@ -406,13 +405,17 @@ function server(
              trackId: id,
              range: req.headers["range"] || undefined,
            })
+            .then((stream) => {
+              res.on('close', () => {
+                stream.stream.destroy()
+              });
+              return stream;
+            })
            .then((stream) => ({ musicLibrary: it, stream }))
        )
        .then(({ musicLibrary, stream }) => {
          logger.debug(
-            `${trace} bnb<- stream response from music service for ${id}, status=${
-              stream.status
-            }, headers=(${JSON.stringify(stream.headers)})`
+            `${trace} bnb<- stream response from music service for ${id}, status=${stream.status}, headers=(${JSON.stringify(stream.headers)})`
          );

          const sonosisfyContentType = (contentType: string) =>
@@ -436,9 +439,7 @@ function server(
            nowPlaying: boolean;
          }) => {
            logger.debug(
-              `${trace} bnb-> ${
-                req.path
-              }, status=${status}, headers=${JSON.stringify(headers)}`
+              `${trace} bnb-> ${req.path}, status=${status}, headers=${JSON.stringify(headers)}`
            );
            (nowPlaying
              ? musicLibrary.nowPlaying(id)
@@ -450,8 +451,8 @@ function server(
                .forEach(([header, value]) => {
                  res.setHeader(header, value!);
                });
-              if (sendStream) stream.stream.pipe(filter).pipe(res);
-              else res.send();
+              if (sendStream) stream.stream.pipe(filter).pipe(res)
+              else res.send()
            });
          };

@@ -497,38 +498,40 @@ function server(
    }
  });

-  app.get("/icon/:type/size/:size", (req, res) => {
-    const type = req.params["type"]!;
+  app.get("/icon/:type_text/size/:size", (req, res) => {
+    const match = (req.params["type_text"] || "")!.match("^([A-Za-z0-9]+)(?:\:([A-Za-z0-9]+))?$")
+    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;
      const spec =
        size == "legacy"
          ? {
-              mimeType: "image/png",
-              responseFormatter: (svg: string): Promise<Buffer | string> =>
-                sharp(Buffer.from(svg)).resize(80).png().toBuffer(),
-            }
+            mimeType: "image/png",
+            responseFormatter: (svg: string): Promise<Buffer | string> =>
+              sharp(Buffer.from(svg)).resize(80).png().toBuffer(),
+          }
          : {
-              mimeType: "image/svg+xml",
-              responseFormatter: (svg: string): Promise<Buffer | string> =>
-                Promise.resolve(svg),
-            };
+            mimeType: "image/svg+xml",
+            responseFormatter: (svg: string): Promise<Buffer | string> =>
+              Promise.resolve(svg),
+          };

      return Promise.resolve(
        icon
          .apply(
            features({
-              viewPortIncreasePercent: 80,
              ...serverOpts.iconColors,
+              text: text
            })
          )
          .apply(festivals(clock))
@@ -556,23 +559,11 @@ function server(
    });
  });

-  const GRAVITY_9 = [
-    "north",
-    "northeast",
-    "east",
-    "southeast",
-    "south",
-    "southwest",
-    "west",
-    "northwest",
-    "centre",
-  ];
-
-  app.get("/art/:burns/size/:size", (req, res) => {
+  app.get("/art/:burn/size/:size", (req, res) => {
    const serviceToken = apiTokens.authTokenFor(
      req.query[BONOB_ACCESS_TOKEN_HEADER] as string
    );
-    const urns = req.params["burns"]!.split("&").map(parse);
+    const urn = parse(req.params["burn"]!);
    const size = Number.parseInt(req.params["size"]!);

    if (!serviceToken) {
@@ -583,55 +574,24 @@ function server(

    return musicService
      .login(serviceToken)
-      .then((musicLibrary) =>
-        Promise.all(
-          urns.map((it) => {
-            if (it.system == "external") {
-              return serverOpts.externalImageResolver(it.resource);
-            } else {
-              return musicLibrary.coverArt(it, size);
-            }
-          })
-        )
-      )
-      .then((coverArts) => coverArts.filter((it) => it))
-      .then(shuffle)
-      .then((coverArts) => {
-        if (coverArts.length == 1) {
-          const coverArt = coverArts[0]!;
+      .then((musicLibrary) => {
+        if (urn.system == "external") {
+          return serverOpts.externalImageResolver(urn.resource);
+        } else {
+          return musicLibrary.coverArt(urn, size);
+        }
+      })
+      .then((coverArt) => {
+        if(coverArt) {
          res.status(200);
          res.setHeader("content-type", coverArt.contentType);
          return res.send(coverArt.data);
-        } else if (coverArts.length > 1) {
-          const gravity = [...GRAVITY_9];
-          return sharp({
-            create: {
-              width: size * 3,
-              height: size * 3,
-              channels: 3,
-              background: { r: 255, g: 255, b: 255 },
-            },
-          })
-            .composite(
-              takeWithRepeats(coverArts, 9).map((art) => ({
-                input: art?.data,
-                gravity: gravity.pop(),
-              }))
-            )
-            .png()
-            .toBuffer()
-            .then((image) => sharp(image).resize(size).png().toBuffer())
-            .then((image) => {
-              res.status(200);
-              res.setHeader("content-type", "image/png");
-              return res.send(image);
-            });
        } else {
          return res.status(404).send();
        }
-      })
+    })
      .catch((e: Error) => {
-        logger.error(`Failed fetching image ${urns.join("&")}/size/${size}`, {
+        logger.error(`Failed fetching image ${urn}/size/${size}`, {
          cause: e,
        });
        return res.status(500).send();
--- a/src/smapi.ts
+++ b/src/smapi.ts
@@ -15,8 +15,10 @@ import {
  AlbumSummary,
  ArtistSummary,
  Genre,
+  Year,
  MusicService,
  Playlist,
+  RadioStation,
  Rating,
  slice2,
  Track,
@@ -26,7 +28,7 @@ import { Clock } from "./clock";
 import { URLBuilder } from "./url_builder";
 import { asLANGs, I8N } from "./i8n";
 import { ICON, iconForGenre } from "./icon";
-import _, { uniq } from "underscore";
+import _ from "underscore";
 import { BUrn, formatForURL } from "./burn";
 import {
  isExpiredTokenError,
@@ -60,7 +62,7 @@ export const SONOS_RECOMMENDED_IMAGE_SIZES = [

 const WSDL_FILE = path.resolve(
  __dirname,
-  "Sonoswsdl-1.19.4-20190411.142401-3.wsdl"
+  "Sonoswsdl-1.19.6-20231024.wsdl"
 );

 export type Credentials = {
@@ -243,17 +245,25 @@ export type Container = {
 };

 const genre = (bonobUrl: URLBuilder, genre: Genre) => ({
-  itemType: "container",
+  itemType: "albumList",
  id: `genre:${genre.id}`,
  title: genre.name,
  albumArtURI: iconArtURI(bonobUrl, iconForGenre(genre.name)).href(),
 });

+const yyyy = (bonobUrl: URLBuilder, year: Year) => ({
+  itemType: "albumList",
+  id: `year:${year.year}`,
+  title: year.year,
+  // todo: maybe year.year should be nullable?
+  albumArtURI: year.year !== "?" ? iconArtURI(bonobUrl, "yyyy", year.year).href() : iconArtURI(bonobUrl, "music").href(),
+});
+
 const playlist = (bonobUrl: URLBuilder, playlist: Playlist) => ({
  itemType: "playlist",
  id: `playlist:${playlist.id}`,
  title: playlist.name,
-  albumArtURI: playlistAlbumArtURL(bonobUrl, playlist).href(),
+  albumArtURI: coverArtURI(bonobUrl, playlist).href(),
  canPlay: true,
  attributes: {
    readOnly: false,
@@ -262,32 +272,9 @@ const playlist = (bonobUrl: URLBuilder, playlist: Playlist) => ({
  },
 });

-export const playlistAlbumArtURL = (
+export const coverArtURI = (
  bonobUrl: URLBuilder,
-  playlist: Playlist
-) => {
-  // todo: this should be put into config, or even just removed for the ND music source
-  if(process.env["BNB_DISABLE_PLAYLIST_ART"]) return iconArtURI(bonobUrl, "music");
-
-  const burns: BUrn[] = uniq(
-    playlist.entries.filter((it) => it.coverArt != undefined),
-    (it) => it.album.id
-  ).map((it) => it.coverArt!);
-  if (burns.length == 0) {
-    return iconArtURI(bonobUrl, "error");
-  } else {
-    return bonobUrl.append({
-      pathname: `/art/${burns
-        .slice(0, 9)
-        .map((it) => encodeURIComponent(formatForURL(it)))
-        .join("&")}/size/180`,
-    });
-  }
-};
-
-export const defaultAlbumArtURI = (
-  bonobUrl: URLBuilder,
-  { coverArt }: { coverArt: BUrn | undefined }
+  { coverArt }: { coverArt?: BUrn | undefined }
 ) =>
  pipe(
    coverArt,
@@ -300,26 +287,11 @@ export const defaultAlbumArtURI = (
    O.getOrElseW(() => iconArtURI(bonobUrl, "vinyl"))
  );

-export const iconArtURI = (bonobUrl: URLBuilder, icon: ICON) =>
+export const iconArtURI = (bonobUrl: URLBuilder, icon: ICON, text: string | undefined = undefined) =>
  bonobUrl.append({
-    pathname: `/icon/${icon}/size/legacy`,
+    pathname: `/icon/${text == undefined ? icon : `${icon}:${text}`}/size/legacy`,
  });

-export const defaultArtistArtURI = (
-  bonobUrl: URLBuilder,
-  artist: ArtistSummary
-) =>
-  pipe(
-    artist.image,
-    O.fromNullable,
-    O.map((it) =>
-      bonobUrl.append({
-        pathname: `/art/${encodeURIComponent(formatForURL(it))}/size/180`,
-      })
-    ),
-    O.getOrElseW(() => iconArtURI(bonobUrl, "vinyl"))
-  );
-
 export const sonosifyMimeType = (mimeType: string) =>
  mimeType == "audio/x-flac" ? "audio/flac" : mimeType;

@@ -329,7 +301,7 @@ export const album = (bonobUrl: URLBuilder, album: AlbumSummary) => ({
  artist: album.artistName,
  artistId: `artist:${album.artistId}`,
  title: album.name,
-  albumArtURI: defaultAlbumArtURI(bonobUrl, album).href(),
+  albumArtURI: coverArtURI(bonobUrl, album).href(),
  canPlay: true,
  // defaults
  // canScroll: false,
@@ -337,10 +309,17 @@ export const album = (bonobUrl: URLBuilder, album: AlbumSummary) => ({
  // canAddToFavorites: true
 });

+export const internetRadioStation = (station: RadioStation) => ({
+  itemType: "stream",
+  id: `internetRadioStation:${station.id}`,
+  title: station.name,
+  mimeType: "audio/mpeg",
+});
+
 export const track = (bonobUrl: URLBuilder, track: Track) => ({
  itemType: "track",
  id: `track:${track.id}`,
-  mimeType: sonosifyMimeType(track.mimeType),
+  mimeType: sonosifyMimeType(track.encoding.mimeType),
  title: track.name,

  trackMetadata: {
@@ -348,7 +327,7 @@ export const track = (bonobUrl: URLBuilder, track: Track) => ({
    albumId: `album:${track.album.id}`,
    albumArtist: track.artist.name,
    albumArtistId: track.artist.id ? `artist:${track.artist.id}` : undefined,
-    albumArtURI: defaultAlbumArtURI(bonobUrl, track).href(),
+    albumArtURI: coverArtURI(bonobUrl, track).href(),
    artist: track.artist.name,
    artistId: track.artist.id ? `artist:${track.artist.id}` : undefined,
    duration: track.duration,
@@ -366,7 +345,7 @@ export const artist = (bonobUrl: URLBuilder, artist: ArtistSummary) => ({
  id: `artist:${artist.id}`,
  artistId: artist.id,
  title: artist.name,
-  albumArtURI: defaultArtistArtURI(bonobUrl, artist).href(),
+  albumArtURI: coverArtURI(bonobUrl, { coverArt: artist.image }).href(),
 });

 function splitId<T>(id: string) {
@@ -464,9 +443,7 @@ function bindSmapiSoapServiceToExpress(
            },
          },
        })),
-        TE.getOrElse(() =>
-          T.of(SMAPI_FAULT_LOGIN_UNAUTHORIZED)
-        )
+        TE.getOrElse(() => T.of(SMAPI_FAULT_LOGIN_UNAUTHORIZED))
      )();
    } else {
      throw authOrFail.toSmapiFault();
@@ -525,27 +502,38 @@ function bindSmapiSoapServiceToExpress(
          ) =>
            login(soapyHeaders?.credentials)
              .then(splitId(id))
-              .then(({ credentials, type, typeId }) => ({
-                getMediaURIResult: bonobUrl
-                  .append({
-                    pathname: `/stream/${type}/${typeId}`,
-                  })
-                  .href(),
-                httpHeaders: [
-                  {
-                    httpHeader: {
-                      header: "bnbt",
-                      value: credentials.loginToken.token,
-                    },
-                  },
-                  {
-                    httpHeader: {
-                      header: "bnbk",
-                      value: credentials.loginToken.key,
-                    },
-                  },
-                ],
-              })),
+              .then(({ musicLibrary, credentials, type, typeId }) => {
+                switch (type) {
+                  case "internetRadioStation":
+                    return musicLibrary.radioStation(typeId).then((it) => ({
+                      getMediaURIResult: it.url,
+                    }));
+                  case "track":
+                    return {
+                      getMediaURIResult: bonobUrl
+                        .append({
+                          pathname: `/stream/${type}/${typeId}`,
+                        })
+                        .href(),
+                      httpHeaders: [
+                        {
+                          httpHeader: {
+                            header: "bnbt",
+                            value: credentials.loginToken.token,
+                          },
+                        },
+                        {
+                          httpHeader: {
+                            header: "bnbk",
+                            value: credentials.loginToken.key,
+                          },
+                        },
+                      ],
+                    };
+                  default:
+                    throw `Unsupported type:${type}`;
+                  }
+              }),
          getMediaMetadata: async (
            { id }: { id: string },
            _,
@@ -553,11 +541,20 @@ function bindSmapiSoapServiceToExpress(
          ) =>
            login(soapyHeaders?.credentials)
              .then(splitId(id))
-              .then(async ({ musicLibrary, apiKey, typeId }) =>
-                musicLibrary.track(typeId!).then((it) => ({
-                  getMediaMetadataResult: track(urlWithToken(apiKey), it),
-                }))
-              ),
+              .then(async ({ musicLibrary, apiKey, type, typeId }) => {
+                switch (type) {
+                  case "internetRadioStation":
+                    return musicLibrary.radioStation(typeId).then((it) => ({
+                      getMediaMetadataResult: internetRadioStation(it),
+                    }));
+                  case "track":
+                    return musicLibrary.track(typeId!).then((it) => ({
+                      getMediaMetadataResult: track(urlWithToken(apiKey), it),
+                    }));
+                  default:
+                    throw `Unsupported type:${type}`;
+                }
+              }),
          search: async (
            { id, term }: { id: string; term: string },
            _,
@@ -752,6 +749,12 @@ function bindSmapiSoapServiceToExpress(
                          albumArtURI: iconArtURI(bonobUrl, "genres").href(),
                          itemType: "container",
                        },
+                        {
+                          id: "years",
+                          title: lang("years"),
+                          albumArtURI: iconArtURI(bonobUrl, "music").href(),
+                          itemType: "container",
+                        },
                        {
                          id: "recentlyAdded",
                          title: lang("recentlyAdded"),
@@ -779,6 +782,12 @@ function bindSmapiSoapServiceToExpress(
                          ).href(),
                          itemType: "albumList",
                        },
+                        {
+                          id: "internetRadio",
+                          title: lang("internetRadio"),
+                          albumArtURI: iconArtURI(bonobUrl, "radio").href(),
+                          itemType: "stream",
+                        },
                      ],
                    });
                  case "search":
@@ -823,6 +832,13 @@ function bindSmapiSoapServiceToExpress(
                      genre: typeId,
                      ...paging,
                    });
+                  case "year":
+                    return albums({
+                      type: "byYear",
+                      fromYear: typeId,
+                      toYear: typeId,
+                      ...paging,
+                    });
                  case "randomAlbums":
                    return albums({
                      type: "random",
@@ -853,6 +869,32 @@ function bindSmapiSoapServiceToExpress(
                      type: "mostPlayed",
                      ...paging,
                    });
+                  case "internetRadio":
+                    return musicLibrary
+                      .radioStations()
+                      .then(slice2(paging))
+                      .then(([page, total]) =>
+                        getMetadataResult({
+                          mediaMetadata: page.map((it) =>
+                            internetRadioStation(it)
+                          ),
+                          index: paging._index,
+                          total,
+                        })
+                      );
+                  case "years":
+                    return musicLibrary
+                      .years()
+                      .then(slice2(paging))
+                      .then(([page, total]) =>
+                        getMetadataResult({
+                          mediaCollection: page.map((it) =>
+                            yyyy(bonobUrl, it)
+                          ),
+                          index: paging._index,
+                          total,
+                        })
+                      );
                  case "genres":
                    return musicLibrary
                      .genres()
@@ -871,9 +913,16 @@ function bindSmapiSoapServiceToExpress(
                      .playlists()
                      .then((it) =>
                        Promise.all(
-                          it.map((playlist) =>
-                            musicLibrary.playlist(playlist.id)
-                          )
+                          it.map((playlist) => {
+                            // todo: whats this odd copy all about, can we just delete it?
+                            return {
+                              id: playlist.id,
+                              name: playlist.name,
+                              coverArt: playlist.coverArt,
+                              // todo: are these every important?
+                              entries: [],
+                            };
+                          })
                        )
                      )
                      .then(slice2(paging))
@@ -905,15 +954,15 @@ function bindSmapiSoapServiceToExpress(
                      .artist(typeId!)
                      .then((artist) => artist.albums)
                      .then(slice2(paging))
-                      .then(([page, total]) => {
-                        return getMetadataResult({
+                      .then(([page, total]) =>
+                        getMetadataResult({
                          mediaCollection: page.map((it) =>
                            album(urlWithToken(apiKey), it)
                          ),
                          index: paging._index,
                          total,
-                        });
-                      });
+                        })
+                      );
                  case "relatedArtists":
                    return musicLibrary
                      .artist(typeId!)
--- a/src/sonos.ts
+++ b/src/sonos.ts
@@ -176,7 +176,7 @@ export function autoDiscoverySonos(sonosSeedHost?: string): Sonos {
        }
      })
      .catch((e) => {
-        logger.error(`Failed looking for sonos devices`, { cause: e });
+        logger.error(`Failed looking for sonos devices - ${e}`, { cause: e });
        return [];
      });
  };
--- a/src/subsonic.ts
+++ b/src/subsonic.ts
@@ -20,6 +20,9 @@ import {
  AlbumQueryType,
  Artist,
  AuthFailure,
+  PlaylistSummary,
+  Encoding,
+  AuthSuccess,
 } from "./music_service";
 import sharp from "sharp";
 import _ from "underscore";
@@ -32,6 +35,7 @@ import { b64Encode, b64Decode } from "./b64";
 import logger from "./logger";
 import { assertSystem, BUrn } from "./burn";
 import { artist } from "./smapi";
+import { URLBuilder } from "./url_builder";

 export const BROWSER_HEADERS = {
  accept:
@@ -161,7 +165,8 @@ export type song = {
  duration: number | undefined;
  bitRate: number | undefined;
  suffix: string | undefined;
-  contentType: string | undefined;
+  contentType: string;
+  transcodedContentType: string | undefined;
  type: string | undefined;
  userRating: number | undefined;
  starred: string | undefined;
@@ -176,12 +181,15 @@ type GetAlbumResponse = {
 type playlist = {
  id: string;
  name: string;
+  coverArt: string | undefined;
 };

 type GetPlaylistResponse = {
+  // todo: isnt the type here a composite? playlistSummary && { entry: song[]; }
  playlist: {
    id: string;
    name: string;
+    coverArt: string | undefined;
    entry: song[];
  };
 };
@@ -198,6 +206,15 @@ type GetTopSongsResponse = {
  topSongs: { song: song[] };
 };

+type GetInternetRadioStationsResponse = {
+  internetRadioStations: { internetRadioStation: { 
+    id: string,
+    name: string, 
+    streamUrl: string, 
+    homePageUrl?: string }[] 
+  }
+} 
+
 type GetSongResponse = {
  song: song;
 };
@@ -269,10 +286,16 @@ export const artistImageURN = (
  }
 };

-export const asTrack = (album: Album, song: song): Track => ({
+export const asTrack = (album: Album, song: song, customPlayers: CustomPlayers): Track => ({
  id: song.id,
  name: song.title,
-  mimeType: song.contentType!,
+  encoding: pipe(
+    customPlayers.encodingFor({ mimeType: song.contentType }),
+    O.getOrElse(() => ({ 
+      player: DEFAULT_CLIENT_APPLICATION, 
+      mimeType: song.transcodedContentType ? song.transcodedContentType : song.contentType
+    }))
+  ),
  duration: song.duration || 0,
  number: song.track || 0,
  genre: maybeAsGenre(song.genre),
@@ -304,6 +327,13 @@ const asAlbum = (album: album): Album => ({
  coverArt: coverArtURN(album.coverArt),
 });

+// coverArtURN
+const asPlayListSummary = (playlist: playlist): PlaylistSummary => ({
+  id: playlist.id,
+  name: playlist.name,
+  coverArt: coverArtURN(playlist.coverArt),
+});
+
 export const asGenre = (genreName: string) => ({
  id: b64Encode(genreName),
  name: genreName,
@@ -317,19 +347,57 @@ const maybeAsGenre = (genreName: string | undefined): Genre | undefined =>
    O.getOrElseW(() => undefined)
  );

-export type StreamClientApplication = (track: Track) => string;
+export const asYear = (year: string) => ({
+  year: year,
+});
+
+export interface CustomPlayers {
+  encodingFor({ mimeType }: { mimeType: string }): O.Option<Encoding>
+}
+
+export type CustomClient = {
+  mimeType: string;
+  transcodedMimeType: string;
+};
+
+export class TranscodingCustomPlayers implements CustomPlayers {
+  transcodings: Map<string, string>;
+
+  constructor(transcodings: Map<string, string>) {
+    this.transcodings = transcodings;
+  }
+
+  static from(config: string): TranscodingCustomPlayers {
+    const parts: [string, string][] = config
+      .split(",")
+      .map((it) => it.split(">"))
+      .map((pair) => {
+        if (pair.length == 1) return [pair[0]!, pair[0]!];
+        else if (pair.length == 2) return [pair[0]!, pair[1]!];
+        else throw new Error(`Invalid configuration item ${config}`);
+      });
+    return new TranscodingCustomPlayers(new Map(parts));
+  }
+
+  encodingFor = ({ mimeType }: { mimeType: string }): O.Option<Encoding> => pipe(
+    this.transcodings.get(mimeType),
+    O.fromNullable,
+    O.map(transcodedMimeType => ({ 
+      player:`${DEFAULT_CLIENT_APPLICATION}+${mimeType}`, 
+      mimeType: transcodedMimeType
+    }))
+  )
+}
+
+export const NO_CUSTOM_PLAYERS: CustomPlayers = {
+  encodingFor(_) {
+    return O.none
+  },
+}

 const DEFAULT_CLIENT_APPLICATION = "bonob";
 const USER_AGENT = "bonob";

-export const DEFAULT: StreamClientApplication = (_: Track) =>
-  DEFAULT_CLIENT_APPLICATION;
-
-export function appendMimeTypeToClientFor(mimeTypes: string[]) {
-  return (track: Track) =>
-    mimeTypes.includes(track.mimeType) ? `bonob+${track.mimeType}` : "bonob";
-}
-
 export const asURLSearchParams = (q: any) => {
  const urlSearchParams = new URLSearchParams();
  Object.keys(q).forEach((k) => {
@@ -383,6 +451,7 @@ const AlbumQueryTypeToSubsonicType: Record<AlbumQueryType, string> = {
  alphabeticalByArtist: "alphabeticalByArtist",
  alphabeticalByName: "alphabeticalByName",
  byGenre: "byGenre",
+  byYear: "byYear",
  random: "random",
  recentlyPlayed: "recent",
  mostPlayed: "frequent",
@@ -401,28 +470,452 @@ type SubsonicCredentials = Credentials & {

 export const asToken = (credentials: SubsonicCredentials) =>
  b64Encode(JSON.stringify(credentials));
+
 export const parseToken = (token: string): SubsonicCredentials =>
  JSON.parse(b64Decode(token));

-interface SubsonicMusicLibrary extends MusicLibrary {
-  flavour(): string;
-  bearerToken(
-    credentials: Credentials
-  ): TE.TaskEither<Error, string | undefined>;
+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)
+
+  artists = (q: ArtistQuery): Promise<Result<ArtistSummary>> =>
+    this.subsonic
+      .getArtists(this.credentials)
+      .then(slice2(q))
+      .then(([page, total]) => ({
+        total,
+        results: page.map((it) => ({
+          id: it.id,
+          name: it.name,
+          image: it.image,
+        })),
+      }))
+
+  artist = async (id: string): Promise<Artist> =>
+    this.subsonic.getArtistWithInfo(this.credentials, id)
+
+  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
+      .getJSON<GetGenresResponse>(this.credentials, "/rest/getGenres")
+      .then((it) =>
+        pipe(
+          it.genres.genre || [],
+          A.filter((it) => it.albumCount > 0),
+          A.map((it) => it.value),
+          A.sort(ordString),
+          A.map((it) => ({ id: b64Encode(it), name: it }))
+        )
+      )
+
+  tracks = (albumId: string) =>
+    this.subsonic
+      .getJSON<GetAlbumResponse>(this.credentials, "/rest/getAlbum", {
+        id: albumId,
+      })
+      .then((it) => it.album)
+      .then((album) =>
+        (album.song || []).map((song) => asTrack(asAlbum(album), song, this.customPlayers))
+      )
+
+  track = (trackId: string) => this.subsonic.getTrack(this.credentials, trackId)
+
+  rate = (trackId: string, rating: Rating) =>
+    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(
+            this.subsonic.getJSON(
+              this.credentials,
+              `/rest/${rating.love ? "star" : "unstar"}`,
+              {
+                id: trackId,
+              }
+            )
+          );
+        }
+        if (track.rating.stars != rating.stars) {
+          thingsToUpdate.push(
+            this.subsonic.getJSON(this.credentials, `/rest/setRating`, {
+              id: trackId,
+              rating: 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
+            .get(
+              this.credentials,
+              `/rest/stream`,
+              {
+                id: trackId,
+                c: track.encoding.player,
+              },
+              {
+                headers: pipe(
+                  range,
+                  O.fromNullable,
+                  O.map((range) => ({
+                    "User-Agent": USER_AGENT,
+                    Range: range,
+                  })),
+                  O.getOrElse(() => ({
+                    "User-Agent": USER_AGENT,
+                  }))
+                ),
+                responseType: "stream",
+              }
+            )
+            .then((stream) => ({
+              status: stream.status,
+              headers: {
+                "content-type": stream.headers["content-type"],
+                "content-length": stream.headers["content-length"],
+                "content-range": stream.headers["content-range"],
+                "accept-ranges": stream.headers["accept-ranges"],
+              },
+              stream: stream.data,
+            }))
+        )
+
+    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;
+        })
+
+    scrobble = async (id: string) =>
+      this.subsonic
+        .getJSON(this.credentials, `/rest/scrobble`, {
+          id,
+          submission: true,
+        })
+        .then((_) => true)
+        .catch(() => false)
+
+    nowPlaying = async (id: string) =>
+        this.subsonic
+          .getJSON(this.credentials, `/rest/scrobble`, {
+            id,
+            submission: false,
+          })
+          .then((_) => true)
+          .catch(() => 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
+        .getJSON<GetPlaylistsResponse>(this.credentials, "/rest/getPlaylists")
+        .then(({ playlists }) => (playlists.playlist || []).map(asPlayListSummary))
+
+    playlist = async (id: string) =>
+      this.subsonic
+        .getJSON<GetPlaylistResponse>(this.credentials, "/rest/getPlaylist", {
+          id,
+        })
+        .then(({ playlist }) => {
+          let trackNumber = 1;
+          return {
+            id: playlist.id,
+            name: playlist.name,
+            coverArt: coverArtURN(playlist.coverArt),
+            entries: (playlist.entry || []).map((entry) => ({
+              ...asTrack(
+                {
+                  id: entry.albumId!,
+                  name: entry.album!,
+                  year: entry.year,
+                  genre: maybeAsGenre(entry.genre),
+                  artistName: entry.artist,
+                  artistId: entry.artistId,
+                  coverArt: coverArtURN(entry.coverArt),
+                },
+                entry,
+                this.customPlayers
+              ),
+              number: trackNumber++,
+            })),
+          };
+        })
+
+    createPlaylist = async (name: string) =>
+      this.subsonic
+        .getJSON<GetPlaylistResponse>(this.credentials, "/rest/createPlaylist", {
+          name,
+        })
+        .then(({ playlist }) => ({
+          id: playlist.id,
+          name: playlist.name,
+          coverArt: coverArtURN(playlist.coverArt),
+        }))
+
+    deletePlaylist = async (id: string) =>
+      this.subsonic
+        .getJSON<GetPlaylistResponse>(this.credentials, "/rest/deletePlaylist", {
+          id,
+        })
+        .then((_) => true)
+
+    addToPlaylist = async (playlistId: string, trackId: string) =>
+      this.subsonic
+        .getJSON<GetPlaylistResponse>(this.credentials, "/rest/updatePlaylist", {
+          playlistId,
+          songIdToAdd: trackId,
+        })
+        .then((_) => true)
+
+    removeFromPlaylist = async (playlistId: string, indicies: number[]) =>
+      this.subsonic
+        .getJSON<GetPlaylistResponse>(this.credentials, "/rest/updatePlaylist", {
+          playlistId,
+          songIndexToRemove: indicies,
+        })
+        .then((_) => true)
+
+    similarSongs = async (id: string) =>
+      this.subsonic
+        .getJSON<GetSimilarSongsResponse>(
+          this.credentials,
+          "/rest/getSimilarSongs2",
+          { id, count: 50 }
+        )
+        .then((it) => it.similarSongs2.song || [])
+        .then((songs) =>
+          Promise.all(
+            songs.map((song) =>
+              this.subsonic
+                .getAlbum(this.credentials, song.albumId!)
+                .then((album) => asTrack(album, song, this.customPlayers))
+            )
+          )
+        )
+
+    topSongs = async (artistId: string) =>
+      this.subsonic.getArtist(this.credentials, artistId).then(({ name }) =>
+        this.subsonic
+          .getJSON<GetTopSongsResponse>(this.credentials, "/rest/getTopSongs", {
+            artist: name,
+            count: 50,
+          })
+          .then((it) => it.topSongs.song || [])
+          .then((songs) =>
+            Promise.all(
+              songs.map((song) =>
+                this.subsonic
+                  .getAlbum(this.credentials, song.albumId!)
+                  .then((album) => asTrack(album, song, this.customPlayers))
+              )
+            )
+          )
+      )
+
+    radioStations = async () => this.subsonic
+      .getJSON<GetInternetRadioStationsResponse>(
+        this.credentials,
+        "/rest/getInternetRadioStations"
+      )
+      .then((it) => it.internetRadioStations.internetRadioStation || [])
+      .then((stations) => stations.map((it) => ({
+        id: it.id,
+        name: it.name,
+        url: it.streamUrl,
+        homePage: it.homePageUrl
+      })))
+
+  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;
+    }
 }

-export class Subsonic implements MusicService {
-  url: string;
-  streamClientApplication: StreamClientApplication;
+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> => {
+    const x: TE.TaskEither<AuthFailure, PingResponse> = TE.tryCatch(
+      () =>
+        this.subsonic.getJSON<PingResponse>(
+          _.pick(credentials, "username", "password"),
+          "/rest/ping.view"
+        ),
+      (e) => new AuthFailure(e as string)
+    )
+    return pipe(
+      x,
+      TE.flatMap(({ type }) =>
+        pipe(
+          TE.tryCatch(
+            () => this.libraryFor({ ...credentials, type }),
+            () => new AuthFailure("Failed to get library")
+          ),
+          TE.map((library) => ({ type, 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 Subsonic {
+  url: URLBuilder;
+  customPlayers: CustomPlayers;
  externalImageFetcher: ImageFetcher;

  constructor(
-    url: string,
-    streamClientApplication: StreamClientApplication = DEFAULT,
+    url: URLBuilder,
+    customPlayers: CustomPlayers = NO_CUSTOM_PLAYERS,
    externalImageFetcher: ImageFetcher = axiosImageFetcher
  ) {
    this.url = url;
-    this.streamClientApplication = streamClientApplication;
+    this.customPlayers = customPlayers;
    this.externalImageFetcher = externalImageFetcher;
  }

@@ -433,7 +926,7 @@ export class Subsonic implements MusicService {
    config: AxiosRequestConfig | undefined = {}
  ) =>
    axios
-      .get(`${this.url}${path}`, {
+      .get(this.url.append({ pathname: path }).href(), {
        params: asURLSearchParams({
          u: username,
          v: "1.16.1",
@@ -468,41 +961,6 @@ export class Subsonic implements MusicService {
        else return json as unknown as T;
      });

-  generateToken = (credentials: Credentials) =>
-    pipe(
-      TE.tryCatch(
-        () =>
-          this.getJSON<PingResponse>(
-            _.pick(credentials, "username", "password"),
-            "/rest/ping.view"
-          ),
-        (e) => new AuthFailure(e as string)
-      ),
-      TE.chain(({ type }) =>
-        pipe(
-          TE.tryCatch(
-            () => this.libraryFor({ ...credentials, type }),
-            () => new AuthFailure("Failed to get library")
-          ),
-          TE.map((library) => ({ type, library }))
-        )
-      ),
-      TE.chain(({ 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));
-
  getArtists = (
    credentials: Credentials
  ): Promise<(IdName & { albumCount: number; image: BUrn | undefined })[]> =>
@@ -617,7 +1075,7 @@ export class Subsonic implements MusicService {
      .then((it) => it.song)
      .then((song) =>
        this.getAlbum(credentials, song.albumId!).then((album) =>
-          asTrack(album, song)
+          asTrack(album, song, this.customPlayers)
        )
      );

@@ -657,6 +1115,8 @@ export class Subsonic implements MusicService {
      this.getJSON<GetAlbumListResponse>(credentials, "/rest/getAlbumList2", {
        type: AlbumQueryTypeToSubsonicType[q.type],
        ...(q.genre ? { genre: b64Decode(q.genre) } : {}),
+        ...(q.fromYear ? { fromYear: q.fromYear} : {}),
+        ...(q.toYear ? { toYear: q.toYear} : {}),
        size: 500,
        offset: q._index,
      })
@@ -674,305 +1134,4 @@ export class Subsonic implements MusicService {
  //       albums: it.album.map(asAlbum),
  //     }));

-  login = async (token: string) => this.libraryFor(parseToken(token));
-
-  private libraryFor = (
-    credentials: Credentials & { type: string }
-  ): Promise<SubsonicMusicLibrary> => {
-    const subsonic = this;
-
-    const genericSubsonic: SubsonicMusicLibrary = {
-      flavour: () => "subsonic",
-      bearerToken: (_: Credentials) => TE.right(undefined),
-      artists: (q: ArtistQuery): Promise<Result<ArtistSummary>> =>
-        subsonic
-          .getArtists(credentials)
-          .then(slice2(q))
-          .then(([page, total]) => ({
-            total,
-            results: page.map((it) => ({
-              id: it.id,
-              name: it.name,
-              image: it.image,
-            })),
-          })),
-      artist: async (id: string): Promise<Artist> =>
-        subsonic.getArtistWithInfo(credentials, id),
-      albums: async (q: AlbumQuery): Promise<Result<AlbumSummary>> =>
-        subsonic.getAlbumList2(credentials, q),
-      album: (id: string): Promise<Album> => subsonic.getAlbum(credentials, id),
-      genres: () =>
-        subsonic
-          .getJSON<GetGenresResponse>(credentials, "/rest/getGenres")
-          .then((it) =>
-            pipe(
-              it.genres.genre || [],
-              A.filter((it) => it.albumCount > 0),
-              A.map((it) => it.value),
-              A.sort(ordString),
-              A.map((it) => ({ id: b64Encode(it), name: it }))
-            )
-          ),
-      tracks: (albumId: string) =>
-        subsonic
-          .getJSON<GetAlbumResponse>(credentials, "/rest/getAlbum", {
-            id: albumId,
-          })
-          .then((it) => it.album)
-          .then((album) =>
-            (album.song || []).map((song) => asTrack(asAlbum(album), song))
-          ),
-      track: (trackId: string) => subsonic.getTrack(credentials, trackId),
-      rate: (trackId: string, rating: Rating) =>
-        Promise.resolve(true)
-          .then(() => {
-            if (rating.stars >= 0 && rating.stars <= 5) {
-              return subsonic.getTrack(credentials, trackId);
-            } else {
-              throw `Invalid rating.stars value of ${rating.stars}`;
-            }
-          })
-          .then((track) => {
-            const thingsToUpdate = [];
-            if (track.rating.love != rating.love) {
-              thingsToUpdate.push(
-                subsonic.getJSON(
-                  credentials,
-                  `/rest/${rating.love ? "star" : "unstar"}`,
-                  {
-                    id: trackId,
-                  }
-                )
-              );
-            }
-            if (track.rating.stars != rating.stars) {
-              thingsToUpdate.push(
-                subsonic.getJSON(credentials, `/rest/setRating`, {
-                  id: trackId,
-                  rating: rating.stars,
-                })
-              );
-            }
-            return Promise.all(thingsToUpdate);
-          })
-          .then(() => true)
-          .catch(() => false),
-      stream: async ({
-        trackId,
-        range,
-      }: {
-        trackId: string;
-        range: string | undefined;
-      }) =>
-        subsonic.getTrack(credentials, trackId).then((track) =>
-          subsonic
-            .get(
-              credentials,
-              `/rest/stream`,
-              {
-                id: trackId,
-                c: this.streamClientApplication(track),
-              },
-              {
-                headers: pipe(
-                  range,
-                  O.fromNullable,
-                  O.map((range) => ({
-                    "User-Agent": USER_AGENT,
-                    Range: range,
-                  })),
-                  O.getOrElse(() => ({
-                    "User-Agent": USER_AGENT,
-                  }))
-                ),
-                responseType: "stream",
-              }
-            )
-            .then((res) => ({
-              status: res.status,
-              headers: {
-                "content-type": res.headers["content-type"],
-                "content-length": res.headers["content-length"],
-                "content-range": res.headers["content-range"],
-                "accept-ranges": res.headers["accept-ranges"],
-              },
-              stream: res.data,
-            }))
-        ),
-      coverArt: async (coverArtURN: BUrn, size?: number) =>
-        Promise.resolve(coverArtURN)
-          .then((it) => assertSystem(it, "subsonic"))
-          .then((it) => it.resource.split(":")[1]!)
-          .then((it) => subsonic.getCoverArt(credentials, it, 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;
-          }),
-      scrobble: async (id: string) =>
-        subsonic
-          .getJSON(credentials, `/rest/scrobble`, {
-            id,
-            submission: true,
-          })
-          .then((_) => true)
-          .catch(() => false),
-      nowPlaying: async (id: string) =>
-        subsonic
-          .getJSON(credentials, `/rest/scrobble`, {
-            id,
-            submission: false,
-          })
-          .then((_) => true)
-          .catch(() => false),
-      searchArtists: async (query: string) =>
-        subsonic
-          .search3(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) =>
-        subsonic
-          .search3(credentials, { query, albumCount: 20 })
-          .then(({ albums }) => subsonic.toAlbumSummary(albums)),
-      searchTracks: async (query: string) =>
-        subsonic
-          .search3(credentials, { query, songCount: 20 })
-          .then(({ songs }) =>
-            Promise.all(
-              songs.map((it) => subsonic.getTrack(credentials, it.id))
-            )
-          ),
-      playlists: async () =>
-        subsonic
-          .getJSON<GetPlaylistsResponse>(credentials, "/rest/getPlaylists")
-          .then((it) => it.playlists.playlist || [])
-          .then((playlists) =>
-            playlists.map((it) => ({ id: it.id, name: it.name }))
-          ),
-      playlist: async (id: string) =>
-        subsonic
-          .getJSON<GetPlaylistResponse>(credentials, "/rest/getPlaylist", {
-            id,
-          })
-          .then((it) => it.playlist)
-          .then((playlist) => {
-            let trackNumber = 1;
-            return {
-              id: playlist.id,
-              name: playlist.name,
-              entries: (playlist.entry || []).map((entry) => ({
-                ...asTrack(
-                  {
-                    id: entry.albumId!,
-                    name: entry.album!,
-                    year: entry.year,
-                    genre: maybeAsGenre(entry.genre),
-                    artistName: entry.artist,
-                    artistId: entry.artistId,
-                    coverArt: coverArtURN(entry.coverArt),
-                  },
-                  entry
-                ),
-                number: trackNumber++,
-              })),
-            };
-          }),
-      createPlaylist: async (name: string) =>
-        subsonic
-          .getJSON<GetPlaylistResponse>(credentials, "/rest/createPlaylist", {
-            name,
-          })
-          .then((it) => it.playlist)
-          .then((it) => ({ id: it.id, name: it.name })),
-      deletePlaylist: async (id: string) =>
-        subsonic
-          .getJSON<GetPlaylistResponse>(credentials, "/rest/deletePlaylist", {
-            id,
-          })
-          .then((_) => true),
-      addToPlaylist: async (playlistId: string, trackId: string) =>
-        subsonic
-          .getJSON<GetPlaylistResponse>(credentials, "/rest/updatePlaylist", {
-            playlistId,
-            songIdToAdd: trackId,
-          })
-          .then((_) => true),
-      removeFromPlaylist: async (playlistId: string, indicies: number[]) =>
-        subsonic
-          .getJSON<GetPlaylistResponse>(credentials, "/rest/updatePlaylist", {
-            playlistId,
-            songIndexToRemove: indicies,
-          })
-          .then((_) => true),
-      similarSongs: async (id: string) =>
-        subsonic
-          .getJSON<GetSimilarSongsResponse>(
-            credentials,
-            "/rest/getSimilarSongs2",
-            { id, count: 50 }
-          )
-          .then((it) => it.similarSongs2.song || [])
-          .then((songs) =>
-            Promise.all(
-              songs.map((song) =>
-                subsonic
-                  .getAlbum(credentials, song.albumId!)
-                  .then((album) => asTrack(album, song))
-              )
-            )
-          ),
-      topSongs: async (artistId: string) =>
-        subsonic.getArtist(credentials, artistId).then(({ name }) =>
-          subsonic
-            .getJSON<GetTopSongsResponse>(credentials, "/rest/getTopSongs", {
-              artist: name,
-              count: 50,
-            })
-            .then((it) => it.topSongs.song || [])
-            .then((songs) =>
-              Promise.all(
-                songs.map((song) =>
-                  subsonic
-                    .getAlbum(credentials, song.albumId!)
-                    .then((album) => asTrack(album, song))
-                )
-              )
-            )
-        ),
-    };
-
-    if (credentials.type == "navidrome") {
-      return Promise.resolve({
-        ...genericSubsonic,
-        flavour: () => "navidrome",
-        bearerToken: (credentials: Credentials) =>
-          pipe(
-            TE.tryCatch(
-              () =>
-                axios.post(
-                  `${this.url}/auth/login`,
-                  _.pick(credentials, "username", "password")
-                ),
-              () => new AuthFailure("Failed to get bearerToken")
-            ),
-            TE.map((it) => it.data.token as string | undefined)
-          ),
-      });
-    } else {
-      return Promise.resolve(genericSubsonic);
-    }
-  };
 }
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,7 +1,34 @@
+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);
+}
+
--- a/tests/builders.ts
+++ b/tests/builders.ts
@@ -14,6 +14,7 @@ import {
  Playlist,
  SimilarArtist,
  AlbumSummary,
+  RadioStation
 } from "../src/music_service";

 import { b64Encode } from "../src/b64";
@@ -173,7 +174,10 @@ export function aTrack(fields: Partial<Track> = {}): Track {
  return {
    id,
    name: `Track ${id}`,
-    mimeType: `audio/mp3-${id}`,
+    encoding: {
+      player: "bonob",
+      mimeType: `audio/mp3-${id}`
+    },
    duration: randomInt(500),
    number: randomInt(100),
    genre,
@@ -201,6 +205,17 @@ export function anAlbum(fields: Partial<Album> = {}): Album {
  };
 };

+export function aRadioStation(fields: Partial<RadioStation> = {}): RadioStation {
+  const id = uuid()
+  const name = `Station-${id}`;
+  return {
+    id,
+    name,
+    url: `http://example.com/${name}`,
+    ...fields
+  }
+}
+
 export function anAlbumSummary(fields: Partial<AlbumSummary> = {}): AlbumSummary {
  const id = uuid();
  return {
--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@@ -374,23 +374,31 @@ describe("config", () => {
        "BONOB_NAVIDROME_URL",
      ])("%s", (k) => {
        describe(`when ${k} is not specified`, () => {
-          it(`should default to http://${hostname()}:4533`, () => {
-            expect(config().subsonic.url).toEqual(`http://${hostname()}:4533`);
+          it(`should default to http://${hostname()}:4533/`, () => {
+            expect(config().subsonic.url.href()).toEqual(`http://${hostname()}:4533/`);
          });
        });

        describe(`when ${k} is ''`, () => {
-          it(`should default to http://${hostname()}:4533`, () => {
+          it(`should default to http://${hostname()}:4533/`, () => {
            process.env[k] = "";
-            expect(config().subsonic.url).toEqual(`http://${hostname()}:4533`);
+            expect(config().subsonic.url.href()).toEqual(`http://${hostname()}:4533/`);
          });
        });

        describe(`when ${k} is specified`, () => {
          it(`should use it for ${k}`, () => {
-            const url = "http://navidrome.example.com:1234";
+            const url = "http://navidrome.example.com:1234/some-context-path";
            process.env[k] = url;
-            expect(config().subsonic.url).toEqual(url);
+            expect(config().subsonic.url.href()).toEqual(url);
+          });
+        });
+
+        describe(`when ${k} is specified with trailing slash`, () => {
+          it(`should maintain the trailing slash as URLBuilder will remove it when required ${k}`, () => {
+            const url = "http://navidrome.example.com:1234/";
+            process.env[k] = url;
+            expect(config().subsonic.url.href()).toEqual(url);
          });
        });
      });
--- a/tests/encryption.test.ts
+++ b/tests/encryption.test.ts
@@ -1,3 +1,5 @@
+import { left, right } from 'fp-ts/Either'
+
 import { cryptoEncryption, jwsEncryption } from '../src/encryption';

 describe("jwsEncryption", () => {
@@ -7,7 +9,7 @@ describe("jwsEncryption", () => {
    const value = "bobs your uncle"
    const hash = e.encrypt(value)
    expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(value);
+    expect(e.decrypt(hash)).toEqual(right(value));
  });

  it("returns different values for different secrets", () => {
@@ -29,7 +31,7 @@ describe("cryptoEncryption", () => {
    const value = "bobs your uncle"
    const hash = e.encrypt(value)
    expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(value);
+    expect(e.decrypt(hash)).toEqual(right(value));
  });

  it("returns different values for different secrets", () => {
@@ -42,4 +44,10 @@ 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"));
+  });
 })
--- a/tests/i8n.test.ts
+++ b/tests/i8n.test.ts
@@ -34,7 +34,7 @@ describe("i8n", () => {

  describe("langs", () => {
    it("should be all langs that are explicitly defined", () => {
-      expect(langs()).toEqual(["en-US", "da-DK", "nl-NL"]);
+      expect(langs()).toEqual(["en-US", "da-DK", "fr-FR", "nl-NL"]);
    });
  });

--- a/tests/icon.test.ts
+++ b/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,7 +61,9 @@ 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>
          `)
          );
@@ -110,7 +112,9 @@ 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>
        `)
        );
@@ -134,7 +138,9 @@ 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>
        `)
        );
@@ -152,7 +158,9 @@ 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>
        `)
        );
@@ -172,7 +180,9 @@ 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>
        `)
        );
@@ -182,7 +192,7 @@ describe("SvgIcon", () => {

  describe("foreground color", () => {
    describe("with no viewPort increase", () => {
-      it("should add a rectangle the same size as the original viewPort", () => {
+      it("should change the fill values", () => {
        expect(
          new SvgIcon(svgIcon24)
            .with({ features: { foregroundColor: "red" } })
@@ -192,7 +202,9 @@ 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>
        `)
        );
@@ -200,7 +212,7 @@ describe("SvgIcon", () => {
    });

    describe("with a viewPort increase", () => {
-      it("should add a rectangle the same size as the original viewPort", () => {
+      it("should change the fill values", () => {
        expect(
          new SvgIcon(svgIcon24)
            .with({
@@ -215,7 +227,9 @@ 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>
        `)
        );
@@ -233,7 +247,9 @@ 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>
        `)
        );
@@ -252,7 +268,9 @@ 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>
        `)
        );
@@ -260,6 +278,48 @@ 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", () => {
@@ -318,10 +378,14 @@ describe("SvgIcon", () => {

 class DummyIcon implements Icon {
  svg: string;
-  features: Partial<IconFeatures>;
+  features: IconFeatures;
+
  constructor(svg: string, features: Partial<IconFeatures>) {
    this.svg = svg;
-    this.features = features;
+    this.features = {
+      ...NO_FEATURES,
+      ...features
+    };
  }

  public apply = (transformer: Transformer): Icon => transformer(this);
@@ -350,6 +414,7 @@ describe("transform", () => {
            viewPortIncreasePercent: 100,
            foregroundColor: "blue",
            backgroundColor: "blue",
+            text: "a",
          },
        })
        .apply(
@@ -357,6 +422,7 @@ describe("transform", () => {
            features: {
              foregroundColor: "override1",
              backgroundColor: "override2",
+              text: "b",
            },
          })
        ) as DummyIcon;
@@ -366,6 +432,7 @@ describe("transform", () => {
        viewPortIncreasePercent: 100,
        foregroundColor: "override1",
        backgroundColor: "override2",
+        text: "b",
      });
    });
  });
@@ -382,6 +449,7 @@ describe("transform", () => {
            viewPortIncreasePercent: 100,
            foregroundColor: "blue",
            backgroundColor: "blue",
+            text: "bob",
          },
        })
        .apply(
@@ -395,6 +463,7 @@ describe("transform", () => {
        viewPortIncreasePercent: 100,
        foregroundColor: "blue",
        backgroundColor: "blue",
+        text: "bob"
      });
    });
  });
@@ -411,6 +480,7 @@ describe("features", () => {
        viewPortIncreasePercent: 100,
        foregroundColor: "blue",
        backgroundColor: "blue",
+        text: "foobar"
      })
    ) as DummyIcon;

@@ -418,6 +488,7 @@ describe("features", () => {
      viewPortIncreasePercent: 100,
      foregroundColor: "blue",
      backgroundColor: "blue",
+      text: "foobar"
    });
  });
 });
--- a/tests/in_memory_music_service.ts
+++ b/tests/in_memory_music_service.ts
@@ -161,6 +161,9 @@ export class InMemoryMusicService implements MusicService {
        Promise.reject("Unsupported operation"),
      similarSongs: async (_: string) => Promise.resolve([]),
      topSongs: async (_: string) => Promise.resolve([]),
+      radioStations: async () => Promise.resolve([]),
+      radioStation: async (_: string) => Promise.reject("Unsupported operation"),
+      years: async () => Promise.resolve([]),
    });
  }

--- a/tests/server.test.ts
+++ b/tests/server.test.ts
@@ -2,9 +2,7 @@ import { v4 as uuid } from "uuid";
 import dayjs from "dayjs";
 import request from "supertest";
 import Image from "image-js";
-import fs from "fs";
 import { either as E, taskEither as TE } from "fp-ts";
-import path from "path";

 import { AuthFailure, MusicService } from "../src/music_service";
 import makeServer, {
@@ -755,15 +753,22 @@ describe("server", () => {
        const trackId = `t-${uuid()}`;
        const smapiAuthToken: SmapiToken = { token: `token-${uuid()}`, key: `key-${uuid()}` };

-        const streamContent = (content: string) => ({
-          pipe: (_: Transform) => {
-            return {
-              pipe: (res: Response) => {
-                res.send(content);
-              },
-            };
-          },
-        });
+        const streamContent = (content: string) => {
+          const self = {
+            destroyed: false,
+            pipe: (_: Transform) => {
+              return {
+                pipe: (res: Response) => {
+                  res.send(content);
+                }
+              };
+            },
+            destroy: () => {
+              self.destroyed = true;
+            }
+          };
+          return self;
+        };

        describe("HEAD requests", () => {
          describe("when there is no Bearer token", () => {
@@ -829,6 +834,8 @@ describe("server", () => {
                );
                expect(res.headers["content-length"]).toEqual("123");
                expect(res.body).toEqual({});
+
+                expect(trackStream.stream.destroyed).toBe(true);
              });
            });

@@ -854,6 +861,8 @@ describe("server", () => {

                expect(res.status).toEqual(404);
                expect(res.body).toEqual({});
+
+                expect(trackStream.stream.destroyed).toBe(true);
              });
            });
          });
@@ -916,6 +925,8 @@ describe("server", () => {
  
                expect(musicLibrary.nowPlaying).not.toHaveBeenCalled();
                expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                expect(stream.stream.destroyed).toBe(true);
              });
            });
  
@@ -959,6 +970,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1000,6 +1013,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1040,6 +1055,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1083,6 +1100,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
            });
@@ -1131,6 +1150,8 @@ describe("server", () => {
                    trackId,
                    range: requestedRange,
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1178,6 +1199,8 @@ describe("server", () => {
                    trackId,
                    range: "4000-5000",
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
            });
@@ -1298,279 +1321,6 @@ describe("server", () => {
              });
            });

-            describe("fetching multiple images as a collage", () => {
-              const png = fs.readFileSync(
-                path.join(
-                  __dirname,
-                  "..",
-                  "docs",
-                  "images",
-                  "chartreuseFuchsia.png"
-                )
-              );
-
-              describe("fetching a collage of 4 when all are available", () => {
-                it("should return the image and a 200", async () => {
-                  const urns = [
-                    "art:1",
-                    "art:2",
-                    "art:3",
-                    "art:4",
-                  ].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  urns.forEach((_) => {
-                    musicLibrary.coverArt.mockResolvedValueOnce(
-                      coverArtResponse({
-                        data: png,
-                      })
-                    );
-                  });
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/200?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(200);
-                  expect(res.header["content-type"]).toEqual("image/png");
-
-                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
-                  urns.forEach((it) => {
-                    expect(musicLibrary.coverArt).toHaveBeenCalledWith(it, 200);
-                  });
-
-                  const image = await Image.load(res.body);
-                  expect(image.width).toEqual(200);
-                  expect(image.height).toEqual(200);
-                });
-              });
-
-              describe("fetching a collage of 4, however only 1 is available", () => {
-                it("should return the single image", async () => {
-                  const urns = ["art:1", "art:2", "art:3", "art:4"].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(
-                    coverArtResponse({
-                      data: png,
-                      contentType: "image/some-mime-type",
-                    })
-                  );
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/200?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(200);
-                  expect(res.header["content-type"]).toEqual(
-                    "image/some-mime-type"
-                  );
-                });
-              });
-
-              describe("fetching a collage of 4 and all are missing", () => {
-                it("should return a 404", async () => {
-                  const urns = ["art:1", "art:2", "art:3", "art:4"].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  urns.forEach((_) => {
-                    musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  });
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/200?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(404);
-                });
-              });
-
-              describe("fetching a collage of 9 when all are available", () => {
-                it("should return the image and a 200", async () => {
-                  const urns = [
-                    "artist:1",
-                    "artist:2",
-                    "coverArt:3",
-                    "artist:4",
-                    "artist:5",
-                    "artist:6",
-                    "artist:7",
-                    "artist:8",
-                    "artist:9",
-                  ].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  urns.forEach((_) => {
-                    musicLibrary.coverArt.mockResolvedValueOnce(
-                      coverArtResponse({
-                        data: png,
-                      })
-                    );
-                  });
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/180?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(200);
-                  expect(res.header["content-type"]).toEqual("image/png");
-
-                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
-                  urns.forEach((it) => {
-                    expect(musicLibrary.coverArt).toHaveBeenCalledWith(it, 180);
-                  });
-
-                  const image = await Image.load(res.body);
-                  expect(image.width).toEqual(180);
-                  expect(image.height).toEqual(180);
-                });
-              });
-
-              describe("fetching a collage of 9 when only 2 are available", () => {
-                it("should still return an image and a 200", async () => {
-                  const urns = [
-                    "artist:1",
-                    "artist:2",
-                    "artist:3",
-                    "artist:4",
-                    "artist:5",
-                    "artist:6",
-                    "artist:7",
-                    "artist:8",
-                    "artist:9",
-                  ].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  musicLibrary.coverArt.mockResolvedValueOnce(
-                    coverArtResponse({
-                      data: png,
-                    })
-                  );
-                  musicLibrary.coverArt.mockResolvedValueOnce(
-                    coverArtResponse({
-                      data: png,
-                    })
-                  );
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-                  musicLibrary.coverArt.mockResolvedValueOnce(undefined);
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/180?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(200);
-                  expect(res.header["content-type"]).toEqual("image/png");
-
-                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
-                  urns.forEach((urn) => {
-                    expect(musicLibrary.coverArt).toHaveBeenCalledWith(urn, 180);
-                  });
-
-                  const image = await Image.load(res.body);
-                  expect(image.width).toEqual(180);
-                  expect(image.height).toEqual(180);
-                });
-              });
-
-              describe("fetching a collage of 11", () => {
-                it("should still return an image and a 200, though will only display 9", async () => {
-                  const urns = [
-                    "artist:1",
-                    "artist:2",
-                    "artist:3",
-                    "artist:4",
-                    "artist:5",
-                    "artist:6",
-                    "artist:7",
-                    "artist:8",
-                    "artist:9",
-                    "artist:10",
-                    "artist:11",
-                  ].map(resource => ({ system:"subsonic", resource }));
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-
-                  urns.forEach((_) => {
-                    musicLibrary.coverArt.mockResolvedValueOnce(
-                      coverArtResponse({
-                        data: png,
-                      })
-                    );
-                  });
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${urns.map(it => encodeURIComponent(formatForURL(it))).join(
-                        "&"
-                      )}/size/180?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(200);
-                  expect(res.header["content-type"]).toEqual("image/png");
-
-                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
-                  urns.forEach((it) => {
-                    expect(musicLibrary.coverArt).toHaveBeenCalledWith(it, 180);
-                  });
-
-                  const image = await Image.load(res.body);
-                  expect(image.width).toEqual(180);
-                  expect(image.height).toEqual(180);
-                });
-              });
-
-              describe("when the image is not available", () => {
-                it("should return a 404", async () => {
-                  const coverArtURN = { system:"subsonic", resource:"art:404"};
-
-                  musicService.login.mockResolvedValue(musicLibrary);
-                  musicLibrary.coverArt.mockResolvedValue(undefined);
-
-                  const res = await request(server)
-                    .get(
-                      `/art/${encodeURIComponent(formatForURL(coverArtURN))}/size/180?${BONOB_ACCESS_TOKEN_HEADER}=${apiToken}`
-                    )
-                    .set(BONOB_ACCESS_TOKEN_HEADER, apiToken);
-
-                  expect(res.status).toEqual(404);
-                });
-              });
-            });
-
            describe("when there is an error", () => {
              it("should return a 500", async () => {
                musicService.login.mockResolvedValue(musicLibrary);
@@ -1616,11 +1366,25 @@ describe("server", () => {
            "..%2F..%2Ffoo",
            "%2Fetc%2Fpasswd",
            ".%2Fbob.js",
-            ".",
-            "..",
-            "1",
            "%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",
            "notAValidIcon",
+            "notAValidIcon:withSomeText"
          ].forEach((type) => {
            describe(`trying to retrieve an icon with name ${type}`, () => {
              it(`should fail`, async () => {
@@ -1648,6 +1412,20 @@ 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",
@@ -1777,6 +1555,41 @@ 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>`
+              );
+            });
+          });
+        });
      });
    });
  });
--- a/tests/smapi.test.ts
+++ b/tests/smapi.test.ts
@@ -18,14 +18,13 @@ import {
  track,
  artist,
  album,
-  defaultAlbumArtURI,
-  defaultArtistArtURI,
+  coverArtURI,
  searchResult,
  iconArtURI,
-  playlistAlbumArtURL,
  sonosifyMimeType,
  ratingAsInt,
  ratingFromInt,
+  internetRadioStation
 } from "../src/smapi";

 import { keys as i8nKeys } from "../src/i8n";
@@ -41,7 +40,7 @@ import {
  TRIP_HOP,
  PUNK,
  aPlaylist,
-  anAlbumSummary,
+  aRadioStation,
 } from "./builders";
 import { InMemoryMusicService } from "./in_memory_music_service";
 import supersoap from "./supersoap";
@@ -56,7 +55,6 @@ import dayjs from "dayjs";
 import url, { URLBuilder } from "../src/url_builder";
 import { iconForGenre } from "../src/icon";
 import { formatForURL } from "../src/burn";
-import { range } from "underscore";
 import { FixedClock } from "../src/clock";
 import { ExpiredTokenError, InvalidTokenError, SmapiAuthTokens, SmapiToken, ToSmapiFault } from "../src/smapi_auth";

@@ -135,8 +133,8 @@ describe("service config", () => {
            "Sonos koppelen aan music land"
          );

-          // no fr-FR translation, so use en-US
-          expect(sonosString("AppLinkMessage", "fr-FR")).toEqual(
+          // no pt-BR translation, so use en-US
+          expect(sonosString("AppLinkMessage", "pt-BR")).toEqual(
            "Linking sonos with music land"
          );
        });
@@ -356,7 +354,10 @@ describe("track", () => {
    const someTrack = aTrack({
      id: uuid(),
      // audio/x-flac should be mapped to audio/flac
-      mimeType: "audio/x-flac",
+      encoding: {
+        player: "something",
+        mimeType: "audio/x-flac"
+      },
      name: "great song",
      duration: randomInt(1000),
      number: randomInt(100),
@@ -411,7 +412,10 @@ describe("track", () => {
      const someTrack = aTrack({
        id: uuid(),
        // audio/x-flac should be mapped to audio/flac
-        mimeType: "audio/x-flac",
+        encoding: {
+          player: "something",
+          mimeType: "audio/x-flac"
+        },
        name: "great song",
        duration: randomInt(1000),
        number: randomInt(100),
@@ -471,7 +475,7 @@ describe("album", () => {
      itemType: "album",
      id: `album:${someAlbum.id}`,
      title: someAlbum.name,
-      albumArtURI: defaultAlbumArtURI(bonobUrl, someAlbum).href(),
+      albumArtURI: coverArtURI(bonobUrl, someAlbum).href(),
      canPlay: true,
      artist: someAlbum.artistName,
      artistId: `artist:${someAlbum.artistId}`,
@@ -479,6 +483,18 @@ describe("album", () => {
  });
 });

+describe("internetRadioStation", () => {
+  it("should map to a sonos internet stream", () => {
+    const station = aRadioStation()
+    expect(internetRadioStation(station)).toEqual({
+      itemType: "stream",
+      id: `internetRadioStation:${station.id}`,
+      title: station.name,
+      mimeType: "audio/mpeg"
+    })
+  });
+});
+
 describe("sonosifyMimeType", () => {
  describe("when is audio/x-flac", () => {
    it("should be mapped to audio/flac", () => {
@@ -495,299 +511,8 @@ describe("sonosifyMimeType", () => {
  });
 });

-describe("playlistAlbumArtURL", () => {
-  const coverArt1 = { system: "subsonic", resource: "1" };
-  const coverArt2 = { system: "subsonic", resource: "2" };
-  const coverArt3 = { system: "subsonic", resource: "3" };
-  const coverArt4 = { system: "subsonic", resource: "4" };
-  const coverArt5 = { system: "subsonic", resource: "5" };

-  describe("when the playlist has no coverArt ids", () => {
-    it("should return question mark icon", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({ coverArt: undefined }),
-          aTrack({ coverArt: undefined }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/icon/error/size/legacy?search=yes`
-      );
-    });
-  });
-
-  describe("when the playlist has external ids", () => {
-    const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-    const externalArt1 = {
-      system: "external",
-      resource: "http://example.com/image1.jpg",
-    };
-    const externalArt2 = {
-      system: "external",
-      resource: "http://example.com/image2.jpg",
-    };
-
-    const playlist = aPlaylist({
-      entries: [
-        aTrack({
-          coverArt: externalArt1,
-          album: anAlbumSummary({ id: "album1" }),
-        }),
-        aTrack({
-          coverArt: externalArt2,
-          album: anAlbumSummary({ id: "album2" }),
-        }),
-      ],
-    });
-
-    it("should format the url with encrypted urn", () => {
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(externalArt1)
-        )}&${encodeURIComponent(
-          formatForURL(externalArt2)
-        )}/size/180?search=yes`
-      );
-    }); 
-
-    describe("when BNB_NO_PLAYLIST_ART is set", () => {
-      const OLD_ENV = process.env;
-
-      beforeEach(() => {
-        process.env = { ...OLD_ENV };
-    
-        process.env["BNB_DISABLE_PLAYLIST_ART"] = "true";
-      });
-    
-      afterEach(() => {
-        process.env = OLD_ENV;
-      });
-    
-      it("should return an icon", () => {
-        expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-          `http://localhost:1234/context-path/icon/music/size/legacy?search=yes`
-        );
-      });
-    });
-  });
-
-  describe("when the playlist has 4 tracks from 2 different albums, including some tracks that are missing coverArt urns", () => {
-    it("should use the cover art once per album", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({
-            coverArt: undefined,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt1,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt2,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: undefined,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: coverArt3,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt4,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: undefined,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(coverArt1)
-        )}&${encodeURIComponent(formatForURL(coverArt2))}/size/180?search=yes`
-      );
-    });
-  });
-
-  describe("when the playlist has 4 tracks from 2 different albums", () => {
-    it("should use the cover art once per album", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({
-            coverArt: coverArt1,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt2,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: coverArt3,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt4,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(coverArt1)
-        )}&${encodeURIComponent(formatForURL(coverArt2))}/size/180?search=yes`
-      );
-    });
-  });
-
-  describe("when the playlist has 4 tracks from 3 different albums", () => {
-    it("should use the cover art once per album", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({
-            coverArt: coverArt1,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt2,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: coverArt3,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt4,
-            album: anAlbumSummary({ id: "album3" }),
-          }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(coverArt1)
-        )}&${encodeURIComponent(formatForURL(coverArt2))}&${encodeURIComponent(
-          formatForURL(coverArt4)
-        )}/size/180?search=yes`
-      );
-    });
-  });
-
-  describe("when the playlist has 4 tracks from 4 different albums", () => {
-    it("should return them on the url to the image", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({
-            coverArt: coverArt1,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-          aTrack({
-            coverArt: coverArt2,
-            album: anAlbumSummary({ id: "album2" }),
-          }),
-          aTrack({
-            coverArt: coverArt3,
-            album: anAlbumSummary({ id: "album3" }),
-          }),
-          aTrack({
-            coverArt: coverArt4,
-            album: anAlbumSummary({ id: "album4" }),
-          }),
-          aTrack({
-            coverArt: coverArt5,
-            album: anAlbumSummary({ id: "album1" }),
-          }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(coverArt1)
-        )}&${encodeURIComponent(formatForURL(coverArt2))}&${encodeURIComponent(
-          formatForURL(coverArt3)
-        )}&${encodeURIComponent(formatForURL(coverArt4))}/size/180?search=yes`
-      );
-    });
-  });
-
-  describe("when the playlist has at least 9 distinct albumIds", () => {
-    it("should return the first 9 of the ids on the url", () => {
-      const bonobUrl = url("http://localhost:1234/context-path?search=yes");
-      const playlist = aPlaylist({
-        entries: [
-          aTrack({
-            coverArt: { system: "subsonic", resource: "1" },
-            album: anAlbumSummary({ id: "1" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "2" },
-            album: anAlbumSummary({ id: "2" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "3" },
-            album: anAlbumSummary({ id: "3" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "4" },
-            album: anAlbumSummary({ id: "4" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "5" },
-            album: anAlbumSummary({ id: "5" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "6" },
-            album: anAlbumSummary({ id: "6" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "7" },
-            album: anAlbumSummary({ id: "7" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "8" },
-            album: anAlbumSummary({ id: "8" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "9" },
-            album: anAlbumSummary({ id: "9" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "10" },
-            album: anAlbumSummary({ id: "10" }),
-          }),
-          aTrack({
-            coverArt: { system: "subsonic", resource: "11" },
-            album: anAlbumSummary({ id: "11" }),
-          }),
-        ],
-      });
-
-      const burns = range(1, 10)
-        .map((i) =>
-          encodeURIComponent(
-            formatForURL({ system: "subsonic", resource: `${i}` })
-          )
-        )
-        .join("&");
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${burns}/size/180?search=yes`
-      );
-    });
-  });
-});
-
-describe("defaultAlbumArtURI", () => {
+describe("coverArtURI", () => {
  const bonobUrl = new URLBuilder(
    "http://bonob.example.com:8080/context?search=yes"
  );
@@ -797,7 +522,7 @@ describe("defaultAlbumArtURI", () => {
      it("should use it", () => {
        const coverArt = { system: "subsonic", resource: "12345" };
        expect(
-          defaultAlbumArtURI(bonobUrl, anAlbum({ coverArt })).href()
+          coverArtURI(bonobUrl, anAlbum({ coverArt })).href()
        ).toEqual(
          `http://bonob.example.com:8080/context/art/${encodeURIComponent(
            formatForURL(coverArt)
@@ -813,7 +538,7 @@ describe("defaultAlbumArtURI", () => {
          resource: "http://example.com/someimage.jpg",
        };
        expect(
-          defaultAlbumArtURI(bonobUrl, anAlbum({ coverArt })).href()
+          coverArtURI(bonobUrl, anAlbum({ coverArt })).href()
        ).toEqual(
          `http://bonob.example.com:8080/context/art/${encodeURIComponent(
            formatForURL(coverArt)
@@ -826,7 +551,7 @@ describe("defaultAlbumArtURI", () => {
  describe("when there is no album coverArt", () => {
    it("should return a vinly icon image", () => {
      expect(
-        defaultAlbumArtURI(bonobUrl, anAlbum({ coverArt: undefined })).href()
+        coverArtURI(bonobUrl, anAlbum({ coverArt: undefined })).href()
      ).toEqual(
        "http://bonob.example.com:8080/context/icon/vinyl/size/legacy?search=yes"
      );
@@ -834,46 +559,20 @@ describe("defaultAlbumArtURI", () => {
  });
 });

-describe("defaultArtistArtURI", () => {
-  describe("when the artist has no image", () => {
-    it("should return an icon", () => {
-      const bonobUrl = url("http://localhost:1234/something?s=123");
-      const artist = anArtist({ image: undefined });
+describe("iconArtURI", () => {
+  const bonobUrl = new URLBuilder(
+    "http://bonob.example.com:8080/context?search=yes"
+  );

-      expect(defaultArtistArtURI(bonobUrl, artist).href()).toEqual(
-        `http://localhost:1234/something/icon/vinyl/size/legacy?s=123`
-      );
+  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("when the resource is subsonic", () => {
-    it("should use the resource", () => {
-      const bonobUrl = url("http://localhost:1234/something?s=123");
-      const image = { system: "subsonic", resource: "art:1234" };
-      const artist = anArtist({ image });
-
-      expect(defaultArtistArtURI(bonobUrl, artist).href()).toEqual(
-        `http://localhost:1234/something/art/${encodeURIComponent(
-          formatForURL(image)
-        )}/size/180?s=123`
-      );
-    });
-  });
-
-  describe("when the resource is external", () => {
-    it("should encrypt the resource", () => {
-      const bonobUrl = url("http://localhost:1234/something?s=123");
-      const image = {
-        system: "external",
-        resource: "http://example.com/something.jpg",
-      };
-      const artist = anArtist({ image });
-
-      expect(defaultArtistArtURI(bonobUrl, artist).href()).toEqual(
-        `http://localhost:1234/something/art/${encodeURIComponent(
-          formatForURL(image)
-        )}/size/180?s=123`
-      );
+  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")
    });
  });
 });
@@ -894,6 +593,8 @@ describe("wsdl api", () => {
    artists: jest.fn(),
    artist: jest.fn(),
    genres: jest.fn(),
+    years: jest.fn(),
+    year: jest.fn(),
    playlists: jest.fn(),
    playlist: jest.fn(),
    album: jest.fn(),
@@ -910,6 +611,8 @@ describe("wsdl api", () => {
    scrobble: jest.fn(),
    nowPlaying: jest.fn(),
    rate: jest.fn(),
+    radioStation: jest.fn(),
+    radioStations: jest.fn(),
  };
  const apiTokens = {
    mint: jest.fn(),
@@ -1470,6 +1173,12 @@ describe("wsdl api", () => {
                      albumArtURI: iconArtURI(bonobUrl, "genres").href(),
                      itemType: "container",
                    },
+                    {
+                      id: "years",
+                      title: "Years",
+                      albumArtURI: iconArtURI(bonobUrl, "music").href(),
+                      itemType: "container",
+                    },
                    {
                      id: "recentlyAdded",
                      title: "Recently added",
@@ -1491,6 +1200,12 @@ describe("wsdl api", () => {
                      albumArtURI: iconArtURI(bonobUrl, "mostPlayed").href(),
                      itemType: "albumList",
                    },
+                    {
+                      id: "internetRadio",
+                      title: "Internet Radio",
+                      albumArtURI: iconArtURI(bonobUrl, "radio").href(),
+                      itemType: "stream",
+                    },
                  ];
                  expect(root[0]).toEqual(
                    getMetadataResult({
@@ -1558,6 +1273,12 @@ describe("wsdl api", () => {
                      albumArtURI: iconArtURI(bonobUrl, "genres").href(),
                      itemType: "container",
                    },
+                    {
+                      id: "years",
+                      title: "Jaren",
+                      albumArtURI: iconArtURI(bonobUrl, "music").href(),
+                      itemType: "container",
+                    },
                    {
                      id: "recentlyAdded",
                      title: "Onlangs toegevoegd",
@@ -1579,6 +1300,12 @@ describe("wsdl api", () => {
                      albumArtURI: iconArtURI(bonobUrl, "mostPlayed").href(),
                      itemType: "albumList",
                    },
+                    {
+                      id: "internetRadio",
+                      title: "Internet Radio",
+                      albumArtURI: iconArtURI(bonobUrl, "radio").href(),
+                      itemType: "stream",
+                    },
                  ];
                  expect(root[0]).toEqual(
                    getMetadataResult({
@@ -1629,7 +1356,7 @@ describe("wsdl api", () => {
                  expect(result[0]).toEqual(
                    getMetadataResult({
                      mediaCollection: expectedGenres.map((genre) => ({
-                        itemType: "container",
+                        itemType: "albumList",
                        id: `genre:${genre.id}`,
                        title: genre.name,
                        albumArtURI: iconArtURI(
@@ -1654,7 +1381,7 @@ describe("wsdl api", () => {
                  expect(result[0]).toEqual(
                    getMetadataResult({
                      mediaCollection: [PUNK, ROCK].map((genre) => ({
-                        itemType: "container",
+                        itemType: "albumList",
                        id: `genre:${genre.id}`,
                        title: genre.name,
                        albumArtURI: iconArtURI(
@@ -1670,11 +1397,75 @@ describe("wsdl api", () => {
              });
            });

+            describe("asking for a year", () => {
+              const expectedYears = [{ year: "?" }, { year: "1969" }, { year: "1980" }, { year: "2001" }, { year: "2010" }];
+
+              beforeEach(() => {
+                musicLibrary.years.mockResolvedValue(expectedYears);
+              });
+
+              describe("asking for all years", () => {
+                it("should return a collection of years", async () => {
+                  const result = await ws.getMetadataAsync({
+                    id: `years`,
+                    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: [
+                        albumListForYear("?",    iconArtURI(bonobUrl, "music")),
+                        albumListForYear("1969", iconArtURI(bonobUrl, "yyyy", "1969")),
+                        albumListForYear("1980", iconArtURI(bonobUrl, "yyyy", "1980")),
+                        albumListForYear("2001", iconArtURI(bonobUrl, "yyyy", "2001")),
+                        albumListForYear("2010", iconArtURI(bonobUrl, "yyyy", "2010")),
+                      ],
+                      index: 0,
+                      total: expectedYears.length,
+                    })
+                  );
+                });
+              });
+
+              describe("asking for a page of years", () => {
+                it("should return just that page", async () => {
+                  const result = await ws.getMetadataAsync({
+                    id: `years`,
+                    index: 2,
+                    count: 2,
+                  });
+                  expect(result[0]).toEqual(
+                    getMetadataResult({
+                      mediaCollection: [{ year: "1980" }, { year: "2001" }].map((year) => ({
+                        itemType: "albumList",
+                        id: `year:${year.year}`,
+                        title: year.year,
+                        albumArtURI: iconArtURI(
+                          bonobUrl,
+                          "yyyy",
+                          year.year
+                        ).href(),
+                      })),
+                      index: 2,
+                      total: expectedYears.length,
+                    })
+                  );
+                });
+              });
+            });
+
            describe("asking for playlists", () => {
-              const playlist1 = aPlaylist({ id: "1", name: "pl1" });
-              const playlist2 = aPlaylist({ id: "2", name: "pl2" });
-              const playlist3 = aPlaylist({ id: "3", name: "pl3" });
-              const playlist4 = aPlaylist({ id: "4", name: "pl4" });
+              const playlist1 = aPlaylist({ id: "1", name: "pl1", entries: []});
+              const playlist2 = aPlaylist({ id: "2", name: "pl2", entries: []});
+              const playlist3 = aPlaylist({ id: "3", name: "pl3", entries: []});
+              const playlist4 = aPlaylist({ id: "4", name: "pl4", entries: []});

              const playlists = [playlist1, playlist2, playlist3, playlist4];

@@ -1701,7 +1492,7 @@ describe("wsdl api", () => {
                        itemType: "playlist",
                        id: `playlist:${playlist.id}`,
                        title: playlist.name,
-                        albumArtURI: playlistAlbumArtURL(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          playlist
                        ).href(),
@@ -1733,7 +1524,7 @@ describe("wsdl api", () => {
                          itemType: "playlist",
                          id: `playlist:${playlist.id}`,
                          title: playlist.name,
-                          albumArtURI: playlistAlbumArtURL(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            playlist
                          ).href(),
@@ -1777,7 +1568,7 @@ describe("wsdl api", () => {
                          itemType: "album",
                          id: `album:${it.id}`,
                          title: it.name,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            it
                          ).href(),
@@ -1814,7 +1605,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -1866,9 +1657,9 @@ describe("wsdl api", () => {
                        id: `artist:${it.id}`,
                        artistId: it.id,
                        title: it.name,
-                        albumArtURI: defaultArtistArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
-                          it
+                          { coverArt: it.image }
                        ).href(),
                      })),
                      index: 0,
@@ -1911,9 +1702,9 @@ describe("wsdl api", () => {
                        id: `artist:${it.id}`,
                        artistId: it.id,
                        title: it.name,
-                        albumArtURI: defaultArtistArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
-                          it
+                          { coverArt: it.image }
                        ).href(),
                      })),
                      index: 1,
@@ -1972,9 +1763,9 @@ describe("wsdl api", () => {
                          id: `artist:${it.id}`,
                          artistId: it.id,
                          title: it.name,
-                          albumArtURI: defaultArtistArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
-                            it
+                            { coverArt: it.image }
                          ).href(),
                        })),
                        index: 0,
@@ -2001,9 +1792,9 @@ describe("wsdl api", () => {
                            id: `artist:${it.id}`,
                            artistId: it.id,
                            title: it.name,
-                            albumArtURI: defaultArtistArtURI(
+                            albumArtURI: coverArtURI(
                              bonobUrlWithAccessToken,
-                              it
+                              { coverArt: it.image }
                            ).href(),
                          })
                        ),
@@ -2118,7 +1909,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2166,7 +1957,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2214,7 +2005,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2262,7 +2053,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2310,7 +2101,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2358,7 +2149,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2404,7 +2195,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2450,7 +2241,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2494,7 +2285,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2541,7 +2332,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2708,6 +2499,71 @@ describe("wsdl api", () => {
                });
              });
            });
+
+            describe("asking for internet radio stations", () => {
+              const station1 = aRadioStation();
+              const station2 = aRadioStation();
+              const station3 = aRadioStation();
+              const station4 = aRadioStation();
+
+              const stations = [station1, station2, station3, station4];
+
+              beforeEach(() => {
+                musicLibrary.radioStations.mockResolvedValue(stations);
+              });
+
+              describe("when they all fit on the page", () => {
+                it("should return them all", async () => {
+                  const paging = {
+                    index: 0,
+                    count: 100,
+                  };
+
+                  const result = await ws.getMetadataAsync({
+                    id: `internetRadio`,
+                    ...paging,
+                  });
+
+                  expect(result[0]).toEqual(
+                    getMetadataResult({
+                      mediaMetadata: stations.map((it) =>
+                        internetRadioStation(it)
+                      ),
+                      index: 0,
+                      total: stations.length,
+                    })
+                  );
+                  expect(musicLibrary.radioStations).toHaveBeenCalled();
+                });
+              });
+
+              describe("asking for a single page of stations", () => {
+                const pageOfStations = [station3, station4];
+
+                it("should return only that page", async () => {
+                  const paging = {
+                    index: 2,
+                    count: 2,
+                  };
+
+                  const result = await ws.getMetadataAsync({
+                    id: `internetRadio`,
+                    ...paging,
+                  });
+
+                  expect(result[0]).toEqual(
+                    getMetadataResult({
+                      mediaMetadata: pageOfStations.map((it) =>
+                        internetRadioStation(it)
+                      ),
+                      index: paging.index,
+                      total: stations.length,
+                    })
+                  );
+                  expect(musicLibrary.radioStations).toHaveBeenCalled();
+                });
+              });
+            });
          });
        });

@@ -2918,7 +2774,7 @@ describe("wsdl api", () => {
                        id: `track:${track.id}`,
                        itemType: "track",
                        title: track.name,
-                        mimeType: track.mimeType,
+                        mimeType: track.encoding.mimeType,
                        trackMetadata: {
                          artistId: `artist:${track.artist.id}`,
                          artist: track.artist.name,
@@ -2929,7 +2785,7 @@ describe("wsdl api", () => {
                          genre: track.genre?.name,
                          genreId: track.genre?.id,
                          duration: track.duration,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            track
                          ).href(),
@@ -2966,7 +2822,7 @@ describe("wsdl api", () => {
                        id: `track:${track.id}`,
                        itemType: "track",
                        title: track.name,
-                        mimeType: track.mimeType,
+                        mimeType: track.encoding.mimeType,
                        trackMetadata: {
                          artistId: `artist:${track.artist.id}`,
                          artist: track.artist.name,
@@ -2977,7 +2833,7 @@ describe("wsdl api", () => {
                          genre: track.genre?.name,
                          genreId: track.genre?.id,
                          duration: track.duration,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            track
                          ).href(),
@@ -3020,7 +2876,7 @@ describe("wsdl api", () => {
                      itemType: "album",
                      id: `album:${album.id}`,
                      title: album.name,
-                      albumArtURI: defaultAlbumArtURI(
+                      albumArtURI: coverArtURI(
                        bonobUrlWithAccessToken,
                        album
                      ).href(),
@@ -3085,6 +2941,27 @@ describe("wsdl api", () => {
                expect(musicService.login).toHaveBeenCalledWith(serviceToken);
              });
            });
+
+            describe("asking for a URI to stream a radio station", () => {
+              const someStation = aRadioStation()
+
+              beforeEach(() => {
+                musicLibrary.radioStation.mockResolvedValue(someStation);
+              })
+
+              it("should return the radio stations uri", async () => {
+                const root = await ws.getMediaURIAsync({
+                  id: `internetRadioStation:${someStation.id}`,
+                });
+
+                expect(root[0]).toEqual({
+                  getMediaURIResult: someStation.url,
+                });
+
+                expect(musicService.login).toHaveBeenCalledWith(serviceToken);
+                expect(musicLibrary.radioStation).toHaveBeenCalledWith(someStation.id);
+              });
+            });            
          });
        });

@@ -3096,7 +2973,6 @@ describe("wsdl api", () => {
          describe("when valid credentials are provided", () => {
            let ws: Client;

-            const someTrack = aTrack();

            beforeEach(async () => {
              ws = await createClientAsync(`${service.uri}?wsdl`, {
@@ -3104,10 +2980,15 @@ describe("wsdl api", () => {
                httpClient: supersoap(server),
              });
              setupAuthenticatedRequest(ws);
-              musicLibrary.track.mockResolvedValue(someTrack);
            });

            describe("asking for media metadata for a track", () => {
+              const someTrack = aTrack();
+
+              beforeEach(async () => {
+                musicLibrary.track.mockResolvedValue(someTrack);
+              });
+
              it("should return it with auth header", async () => {
                const root = await ws.getMediaMetadataAsync({
                  id: `track:${someTrack.id}`,
@@ -3126,6 +3007,27 @@ describe("wsdl api", () => {
                expect(musicLibrary.track).toHaveBeenCalledWith(someTrack.id);
              });
            });
+
+            describe("asking for media metadata for an internet radio station", () => {
+              const someStation = aRadioStation()
+
+              beforeEach(() => {
+                musicLibrary.radioStation.mockResolvedValue(someStation);
+              })
+
+              it("should return it with no auth header", async () => {
+                const root = await ws.getMediaMetadataAsync({
+                  id: `internetRadioStation:${someStation.id}`,
+                });
+
+                expect(root[0]).toEqual({
+                  getMediaMetadataResult: internetRadioStation(someStation),
+                });
+                expect(musicService.login).toHaveBeenCalledWith(serviceToken);
+                expect(apiTokens.mint).toHaveBeenCalledWith(serviceToken);
+                expect(musicLibrary.radioStation).toHaveBeenCalledWith(someStation.id);
+              });
+          });
          });
        });

--- a/tests/subsonic.test.ts
+++ b/tests/subsonic.test.ts
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -50,7 +50,7 @@
    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
    "typeRoots": [
      "./typings",
-      "node_modules/@types"
+      "./node_modules/@types"
    ]
     /* List of folders to include type definitions from. */,
    // "types": ["src/customTypes/scale-that-svg.d.ts"],                           /* Type declaration files to be included in compilation. */
--- a/web/icons/navidrome-radio.svg
+++ b/web/icons/navidrome-radio.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path d="M20 6H8.3l8.26-3.34L15.88 1 3.24 6.15C2.51 6.43 2 7.17 2 8v12c0 1.1.89 2 2 2h16c1.11 0 2-.9 2-2V8c0-1.11-.89-2-2-2zm0 2v3h-2V9h-2v2H4V8h16zM4 20v-7h16v7H4z"></path>
+    <circle cx="8" cy="16.48" r="2.5"></circle>
+</svg>
--- a/web/icons/yy.svg
+++ b/web/icons/yy.svg
@@ -0,0 +1,3 @@
+<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>
--- a/web/icons/yyyy.svg
+++ b/web/icons/yyyy.svg
@@ -0,0 +1,3 @@
+<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>
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Simon J	2961b651d9	Icons for years (#220 )	2025-02-07 11:52:59 +11:00
Simon J	d8d532e35f	bump node to v22 (#218 )	2025-02-04 20:14:46 +11:00
Simon J	a581100d29	Removed libxmljs2 (#219 )	2025-02-04 19:56:45 +11:00
Simon J	6bc4c79f02	pull subsonic out into proper class (#217 )	2025-02-04 06:28:45 +11:00
Simon J	dd52c5706b	Update sonos wsdl (#215 )	2025-02-01 15:03:37 +11:00
Simon J	996582ce93	bump libs (#211 )	2024-11-30 21:30:30 +11:00
Jonathan Virga	0488f398c1	Add years menu (#202 )	2024-04-23 10:06:18 +10:00
Simon J	e7f5f5871e	Ability to play radio stations from subsonic api (#199 )	2024-02-26 05:51:30 +11:00
Simon J	eb3124b705	README updates (#197 )	2024-02-08 15:49:35 +11:00
Simon J	4b7be66385	Upgrade @svrooij/sonos to ^2.6.0-beta.7 (#195 )	2024-02-08 12:36:36 +11:00
Simon J	212f6e34dc	Update README.md (#196 )	2024-02-08 12:36:26 +11:00
Simon J	9b9a348b20	Fix issue where transcoded files would not play, provide support for custom clients to transcode (#194 )	2024-02-07 16:21:28 +11:00
Simon J	6bf89b87e2	Feature/no more sharp (#193 ) * Playlist icons working as rendered by ND * remove duplication in cover art image url creation * Remove unused ability to create collages of images	2024-02-05 17:22:27 +11:00
Simon J	66c248fe44	Use transcodedContentType when available to indicate to sonos device the transcoded mimeType #191 (#192 )	2024-02-02 19:43:53 +11:00
Daniel Hammer	1a251400ec	Update README.md (#189 )	2024-01-25 08:48:14 +11:00
Simon J	0c9513bec9	Rollback version of fast-xml-parser used by @svrooij/sonos as newest version causes error (#188 )	2024-01-24 20:40:25 +11:00
Simon J	b7beb4c610	- Upgrade to node v20 (#187 )	2024-01-24 12:25:48 +11:00
Simon J	5ce2e4efb7	Bump libs (#179 )	2023-10-11 17:19:24 +11:00
Simon J	8ef9ca80b6	Fix issue #177 (#178 )	2023-10-11 12:45:27 +11:00
Simon J	a5689c3d4b	Feature/move close stream (#176 ) * Move stream destroy closer to where stream is retrieved * Change BNB_SUBSONIC_URL to be of type URLBuilder to better handle URL construction rather than string concat, should addresse #169	2023-10-10 11:25:55 +11:00
dependabot[bot]	b8caf90e06	Bump semver from 5.7.1 to 5.7.2 (#165 ) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-10 10:59:57 +11:00
dependabot[bot]	9b01f07484	Bump get-func-name from 2.0.0 to 2.0.2 (#173 ) Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/chaijs/get-func-name/releases) - [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2) --- updated-dependencies: - dependency-name: get-func-name dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-10 10:59:46 +11:00
Simon J	fb5f8e81ec	Ensure streams and destroyed on end of /stream request to see if addressess TCP leak issue (#175 )	2023-10-09 16:19:00 +11:00
Simon J	9786d9f1dd	Support for fr-FR LANG (#172 )	2023-09-14 16:38:56 +10:00
dhalem	a9d88bd9eb	No longer fetch entities for playlists when getting the list. (#161 )	2023-04-27 19:34:59 +10:00