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
44 changed files with 10586 additions and 10696 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,16 @@
+FROM node:22-bullseye
+
+LABEL maintainer=simojenki
+
+ENV JEST_TIMEOUT=60000
+EXPOSE 4534
+
+RUN apt-get update && \
+    apt-get -y upgrade && \
+    apt-get -y install --no-install-recommends \
+        libvips-dev \
+        python3 \
+        make \
+        git \
+        g++ \
+        vim
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,28 @@
+{
+    "name": "bonob",
+    "build": { 
+        "dockerfile": "Dockerfile" 
+    },
+    "containerEnv": {
+        // these env vars need to be configured appropriately for your local dev env
+        "BNB_DEV_SONOS_DEVICE_IP": "${localEnv:BNB_DEV_SONOS_DEVICE_IP}",
+        "BNB_DEV_HOST_IP": "${localEnv:BNB_DEV_HOST_IP}",
+        "BNB_DEV_SUBSONIC_URL": "${localEnv:BNB_DEV_SUBSONIC_URL}"
+    },
+    "remoteUser": "node",
+    "forwardPorts": [4534],
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
+            "version": "latest",
+            "moby": true
+        }
+    },
+    "customizations": {
+        "vscode": {
+          "extensions": [
+            "esbenp.prettier-vscode",
+            "redhat.vscode-xml"
+        ]
+        }
+    }
+}
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.devcontainer
+.github
+.yarn/cache
+.yarn/install-state.gz
+build
+node_modules
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,54 +15,64 @@ jobs:
  build_and_test:
    runs-on: ubuntu-latest
    steps:
-      - 
+      -
        name: Check out the repo
-        uses: actions/checkout@v2
-      - 
-        uses: actions/setup-node@v1
+        uses: actions/checkout@v3
+      -
+        uses: actions/setup-node@v3
        with:
-          node-version: '16'
-      - 
-        run: yarn install
-      - 
-        run: yarn test
+          node-version: 20
+      -
+        run: npm install
+      -
+        run: npm test


  push_to_registry:
-    name: Push Docker image to Docker Hub
+    name: Push Docker image to Docker registries
    needs: build_and_test
    runs-on: ubuntu-latest
    steps:
-      - 
+      -
        name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      -
        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
      -
        name: Docker meta
        id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
        with:
-          images: simojenki/bonob
+          images: |
+            simojenki/bonob
+            ghcr.io/simojenki/bonob
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: Push to Docker Hub
-        uses: docker/build-push-action@v2
+      -
+        name: Log in to GitHub Container registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Push image
+        uses: docker/build-push-action@v4
        with:
          context: .
-          platforms: linux/amd64,linux/arm/v7
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
--- 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-berry.cjs
+++ b/.yarn/releases/yarn-berry.cjs
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,3 +0,0 @@
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-berry.cjs
--- a/37
+++ b/37
@@ -1,4 +1,4 @@
-FROM node:16-bullseye as build
+FROM node:22-bullseye-slim AS build

 WORKDIR /bonob

@@ -9,14 +9,13 @@ 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=30000
+ENV JEST_TIMEOUT=60000
 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update && \
@@ -29,13 +28,20 @@ RUN apt-get update && \
        g++ && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/* && \
-    yarn install --immutable && \
-    yarn gitinfo && \
-    yarn test --no-cache && \
-    yarn build
+    npm install && \
+    npm test && \
+    npm run gitinfo && \
+    npm run build && \
+    rm -Rf node_modules && \
+    NODE_ENV=production npm install --omit=dev


-FROM node:16-bullseye
+FROM node:22-bullseye-slim
+
+LABEL   maintainer="simojenki" \
+        org.opencontainers.image.source="https://github.com/simojenki/bonob" \
+        org.opencontainers.image.description="bonob SONOS SMAPI implementation" \
+        org.opencontainers.image.licenses="GPLv3"

 ENV BNB_PORT=4534
 ENV DEBIAN_FRONTEND=noninteractive
@@ -46,17 +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 && \
+    apt-get -y install --no-install-recommends \
+        libvips \
+        tzdata \
+        wget && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/*

--- a/README.md
+++ b/README.md
@@ -9,23 +9,40 @@ 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 & 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

-bonob is distributed via docker and can be run in a number of ways
+bonob is packaged as an OCI image to both the docker hub registry and github registry.
+
+ie. 
+```bash
+docker pull docker.io/simojenki/bonob
+```
+or
+```bash
+docker pull ghcr.io/simojenki/bonob
+```
+
+tag | description
+--- | ---
+latest | Latest release, intended to be stable
+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

@@ -126,8 +143,8 @@ services:
      # ip address of your machine running bonob
      BNB_URL: http://192.168.1.111:4534  
      BNB_SECRET: changeme
-      BNB_SONOS_AUTO_REGISTER: true
-      BNB_SONOS_DEVICE_DISCOVERY: true
+      BNB_SONOS_AUTO_REGISTER: "true"
+      BNB_SONOS_DEVICE_DISCOVERY: "true"
      BNB_SONOS_SERVICE_ID: 246
      # ip address of one of your sonos devices
      BNB_SONOS_SEED_HOST: 192.168.1.121
@@ -146,14 +163,16 @@ BNB_PORT | 4534 | Default http port for bonob to listen on
 BNB_URL | http://$(hostname):4534 | URL (including path) for bonob so that sonos devices can communicate. **This must be either the public IP or DNS entry of the bonob instance so that the sonos devices can communicate with it.**
 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_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.
 BNB_SONOS_SEED_HOST | undefined | sonos device seed host for discovery, or ommitted for for auto-discovery
 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_ARTIST_IMAGE_CACHE | undefined | Path for caching of artist images as are sourced externally.  ie. Navidrome provides spotify URLs
+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
 BNB_ICON_FOREGROUND_COLOR | undefined | Icon foreground color in sonos app, must be a valid [svg color](https://www.december.com/html/spec/colorsvg.html)
@@ -188,34 +207,58 @@ Generally speaking you will not need to do this very often.  However on occassio

 Service should now be registered and everything should work as expected.

+## Multiple registrations within a single household.
+
+It's possible to register multiple Subsonic clone users for the bonob service in Sonos.
+Basically this consist of repeating the Sonos app ["Add a service"](#initialising-service-within-sonos-app) steps for each additional user.
+Afterwards the Sonos app displays a dropdown underneath the service, allowing to switch between users.
+
 ## Implementing a different music source other than a subsonic clone

 - 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"
 ```

-This would result in 2 players in Navidrome, one called 'bonob', the other called 'bonob+audio/flac'.  You could then configure a custom flac transcoder in Navidrome that re-samples the flacs to a sonos supported format, ie [Using something like this](https://stackoverflow.com/questions/41420391/ffmpeg-flac-24-bit-96khz-to-16-bit-48khz);
+This would result in 2 players in Navidrome, one called 'bonob', the other called 'bonob+audio/flac'.  You could then configure a custom flac transcoder in Navidrome that re-samples the flacs to a sonos supported format, ie [Using something like this](https://stackoverflow.com/questions/41420391/ffmpeg-flac-24-bit-96khz-to-16-bit-48khz) or [this](https://stackoverflow.com/questions/52119489/ffmpeg-limit-audio-sample-rate):

 ```bash
-ffmpeg -i %s -af aresample=resampler=soxr:out_sample_fmt=s16:out_sample_rate=48000 -f flac -
+ffmpeg -i %s -af aformat=sample_fmts=s16|s32:sample_rates=8000|11025|16000|22050|24000|32000|44100|48000 -f flac -
 ```

-### Changing Icon colors
+**Note for Sonos S1:** [24-bit depth is only supported by Sonos S2](https://support.sonos.com/s/article/79?language=en_US), so if your system is still on Sonos S1, transcoding should convert all FLACs to 16-bit:
+
+```bash
+ffmpeg -i %s -af aformat=sample_fmts=s16:sample_rates=8000|11025|16000|22050|24000|32000|44100|48000 -f flac -
+```
+
+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 \
@@ -245,6 +288,7 @@ ffmpeg -i %s -af aresample=resampler=soxr:out_sample_fmt=s16:out_sample_rate=480

 ![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/jest.config.js
+++ b/jest.config.js
@@ -5,5 +5,6 @@ module.exports = {
  modulePathIgnorePatterns: [
    '<rootDir>/node_modules',
    '<rootDir>/build',
-    ],
+  ],
+  testTimeout: Number.parseInt(process.env["JEST_TIMEOUT"] || "5000")
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,64 +6,70 @@
  "author": "simojenki <simojenki@users.noreply.github.com>",
  "license": "GPL-3.0-only",
  "dependencies": {
-    "@svrooij/sonos": "^2.4.0",
-    "@types/express": "^4.17.13",
-    "@types/fs-extra": "^9.0.13",
-    "@types/jsonwebtoken": "^8.5.5",
-    "@types/jws": "^3.2.4",
-    "@types/morgan": "^1.9.3",
-    "@types/node": "^16.7.13",
-    "@types/randomstring": "^1.1.8",
-    "@types/sharp": "^0.28.6",
-    "@types/underscore": "^1.11.3",
-    "@types/uuid": "^8.3.1",
-    "axios": "^0.21.4",
-    "dayjs": "^1.10.6",
-    "eta": "^1.12.3",
-    "express": "^4.17.1",
-    "fp-ts": "^2.11.1",
-    "fs-extra": "^10.0.0",
-    "jsonwebtoken": "^8.5.1",
+    "@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.28.0",
    "morgan": "^1.10.0",
-    "node-html-parser": "^4.1.4",
-    "randomstring": "^1.2.1",
-    "sharp": "^0.29.1",
-    "soap": "^0.42.0",
-    "ts-md5": "^1.2.9",
-    "typescript": "^4.4.2",
-    "underscore": "^1.13.1",
+    "node-html-parser": "^6.1.13",
+    "randomstring": "^1.3.0",
+    "sharp": "^0.33.5",
+    "soap": "^1.1.6",
+    "ts-md5": "^1.3.1",
+    "typescript": "^5.7.2",
+    "underscore": "^1.13.7",
    "urn-lib": "^2.0.0",
-    "uuid": "^8.3.2",
-    "winston": "^3.3.3"
+    "uuid": "^11.0.3",
+    "winston": "^3.17.0",
+    "xmldom-ts": "^0.3.1",
+    "xpath": "^0.0.34"
  },
  "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/jest": "^27.0.1",
-    "@types/mocha": "^9.0.0",
-    "@types/supertest": "^2.0.11",
-    "@types/tmp": "^0.2.1",
-    "chai": "^4.3.4",
-    "get-port": "^5.1.1",
-    "image-js": "^0.33.0",
-    "jest": "^27.1.0",
-    "nodemon": "^2.0.12",
-    "supertest": "^6.1.6",
-    "tmp": "^0.2.1",
-    "ts-jest": "^27.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.2.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_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_SERVICE_NAME=bonobDev BNB_SONOS_DEVICE_DISCOVERY=true nodemon -V ./src/app.ts",
-    "devr": "BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_SERVICE_NAME=bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_SONOS_AUTO_REGISTER=true nodemon -V ./src/app.ts",
-    "register-dev": "ts-node ./src/register.ts http://$(hostname):4534",
+    "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"
  }
 }
--- 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 = {
@@ -88,14 +92,14 @@ const app = server(
    clock,
    iconColors: config.icons,
    applyContextPath: true,
-    logRequests: true,
+    logRequests: config.logRequests,
    version,
    smapiAuthTokens: new JWTSmapiLoginTokens(clock, config.secret, config.authTimeout),
    externalImageResolver: artistImageFetcher
  }
 );

-app.listen(config.port, () => {
+const expressServer = app.listen(config.port, () => {
  logger.info(`Listening on ${config.port} available @ ${config.bonobUrl}`);
 });

@@ -113,6 +117,15 @@ if (config.sonos.autoRegister) {
      logger.info(`Found device ${d.name}(${d.group}) @ ${d.ip}:${d.port}`);
    });
  });
-}
+};
+
+process.on('SIGTERM', () => {
+  logger.info('SIGTERM signal received: closing HTTP server');
+  expressServer.close(() => {
+    logger.info('HTTP server closed');
+  });
+  process.exit(0);
+});
+

 export default app;
--- 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/clock.ts
+++ b/src/clock.ts
@@ -1,13 +1,38 @@
 import dayjs, { Dayjs } from "dayjs";

-export const isChristmas = (clock: Clock = SystemClock) => clock.now().month() == 11 && clock.now().date() == 25;
-export const isMay4 = (clock: Clock = SystemClock) => clock.now().month() == 4 && clock.now().date() == 4;
-export const isHalloween = (clock: Clock = SystemClock) => clock.now().month() == 9 && clock.now().date() == 31
-export const isHoli = (clock: Clock = SystemClock) => ["2022/03/18", "2023/03/07", "2024/03/25", "2025/03/14"].map(dayjs).find(it => it.isSame(clock.now())) != undefined
-export const isCNY = (clock: Clock = SystemClock) => ["2022/02/01", "2023/01/22", "2024/02/10", "2025/02/29"].map(dayjs).find(it => it.isSame(clock.now())) != undefined
-export const isCNY_2022 = (clock: Clock = SystemClock) => clock.now().isSame(dayjs("2022/02/01"))
-export const isCNY_2023 = (clock: Clock = SystemClock) => clock.now().isSame(dayjs("2023/01/22"))
-export const isCNY_2024 = (clock: Clock = SystemClock) => clock.now().isSame(dayjs("2024/02/10"))
+function fixedDateMonthEvent(dateMonth: string) {
+  const date = Number.parseInt(dateMonth.split("/")[0]!);
+  const month = Number.parseInt(dateMonth.split("/")[1]!);
+  return (clock: Clock = SystemClock) => {
+    return clock.now().date() == date && clock.now().month() == month - 1;
+  };
+}
+
+function fixedDateEvent(date: string) {
+  const dayjsDate = dayjs(date);
+  return (clock: Clock = SystemClock) => {
+    return clock.now().isSame(dayjsDate, "day");
+  };
+}
+
+function anyOf(rules: ((clock: Clock) => boolean)[]) {
+  return (clock: Clock = SystemClock) => {
+    return rules.find((rule) => rule(clock)) != undefined;
+  };
+}
+
+export const isChristmas = fixedDateMonthEvent("25/12");
+export const isMay4 = fixedDateMonthEvent("04/05");
+export const isHalloween = fixedDateMonthEvent("31/10");
+export const isHoli = anyOf(
+  ["2022/03/18", "2023/03/07", "2024/03/25", "2025/03/14"].map(fixedDateEvent)
+)
+
+export const isCNY_2022 = fixedDateEvent("2022/02/01");
+export const isCNY_2023 = fixedDateEvent("2023/01/22");
+export const isCNY_2024 = fixedDateEvent("2024/02/10");
+export const isCNY_2025 = fixedDateEvent("2025/02/29");
+export const isCNY = anyOf([isCNY_2022, isCNY_2023, isCNY_2024, isCNY_2025]);

 export interface Clock {
  now(): Dayjs;
@@ -17,12 +42,13 @@ export const SystemClock = { now: () => dayjs() };

 export class FixedClock implements Clock {
  time: Dayjs;
-  
+
  constructor(time: Dayjs = dayjs()) {
    this.time = time;
  }

-  add = (t: number, unit: dayjs.UnitTypeShort) => this.time = this.time.add(t, unit)
+  add = (t: number, unit: dayjs.UnitTypeShort) =>
+    (this.time = this.time.add(t, unit));

  now = () => this.time;
-}
+}
--- a/src/config.ts
+++ b/src/config.ts
@@ -5,20 +5,22 @@ import url from "./url_builder";
 export const WORD = /^\w+$/;
 export const COLOR = /^#?\w+$/;

-type EnvVarOpts = {
-  default: string | undefined;
+type EnvVarOpts<T> = {
+  default: T | undefined;
  legacy: string[] | undefined;
  validationPattern: RegExp | undefined;
+  parser: ((value: string) => T) | undefined
 };

-export function envVar(
+export function envVar<T>(
  name: string,
-  opts: Partial<EnvVarOpts> = {
+  opts: Partial<EnvVarOpts<T>> = {
    default: undefined,
    legacy: undefined,
    validationPattern: undefined,
+    parser: undefined
  }
-) {
+): T {
  const result = [name, ...(opts.legacy || [])]
    .map((it) => ({ key: it, value: process.env[it] }))
    .find((it) => it.value);
@@ -36,17 +38,28 @@ export function envVar(
    logger.warn(`Configuration key '${result.key}' is deprecated, replace with '${name}'`)
  }

-  return result?.value || opts.default;
+  let value: T | undefined = undefined;
+
+  if(result?.value && opts.parser) {
+    value = opts.parser(result?.value)
+  } else if(result?.value)
+    value = result?.value as any as T
+
+  return value == undefined ? opts.default as T : value;
 }

-export const bnbEnvVar = (key: string, opts: Partial<EnvVarOpts> = {}) =>
+export const bnbEnvVar = <T>(key: string, opts: Partial<EnvVarOpts<T>> = {}) =>
  envVar(`BNB_${key}`, {
    ...opts,
    legacy: [`BONOB_${key}`, ...(opts.legacy || [])],
  });

+const asBoolean = (value: string) => value == "true";
+
+const asInt = (value: string) => Number.parseInt(value);
+
 export default function () {
-  const port = +bnbEnvVar("PORT", { default: "4534" })!;
+  const port = bnbEnvVar<number>("PORT", { default: 4534, parser: asInt })!;
  const bonobUrl = bnbEnvVar("URL", {
    legacy: ["BONOB_WEB_ADDRESS"],
    default: `http://${hostname()}:${port}`,
@@ -62,34 +75,35 @@ export default function () {
  return {
    port,
    bonobUrl: url(bonobUrl),
-    secret: bnbEnvVar("SECRET", { default: "bonob" })!,
-    authTimeout: bnbEnvVar("AUTH_TIMEOUT", { default: "1h" })!,
+    secret: bnbEnvVar<string>("SECRET", { default: "bonob" })!,
+    authTimeout: bnbEnvVar<string>("AUTH_TIMEOUT", { default: "1h" })!,
    icons: {
-      foregroundColor: bnbEnvVar("ICON_FOREGROUND_COLOR", {
+      foregroundColor: bnbEnvVar<string>("ICON_FOREGROUND_COLOR", {
        validationPattern: COLOR,
      }),
-      backgroundColor: bnbEnvVar("ICON_BACKGROUND_COLOR", {
+      backgroundColor: bnbEnvVar<string>("ICON_BACKGROUND_COLOR", {
        validationPattern: COLOR,
      }),
    },
+    logRequests: bnbEnvVar<boolean>("SERVER_LOG_REQUESTS", { default: false, parser: asBoolean }),
    sonos: {
-      serviceName: bnbEnvVar("SONOS_SERVICE_NAME", { default: "bonob" })!,
+      serviceName: bnbEnvVar<string>("SONOS_SERVICE_NAME", { default: "bonob" })!,
      discovery: {
        enabled:
-          bnbEnvVar("SONOS_DEVICE_DISCOVERY", { default: "true" }) == "true",
-        seedHost: bnbEnvVar("SONOS_SEED_HOST"),
+          bnbEnvVar<boolean>("SONOS_DEVICE_DISCOVERY", { default: true, parser: asBoolean }),
+        seedHost: bnbEnvVar<string>("SONOS_SEED_HOST"),
      },
      autoRegister:
-        bnbEnvVar("SONOS_AUTO_REGISTER", { default: "false" }) == "true",
-      sid: Number(bnbEnvVar("SONOS_SERVICE_ID", { default: "246" })),
+        bnbEnvVar<boolean>("SONOS_AUTO_REGISTER", { default: false, parser: asBoolean }),
+      sid: bnbEnvVar<number>("SONOS_SERVICE_ID", { default: 246, parser: asInt }),
    },
    subsonic: {
-      url: bnbEnvVar("SUBSONIC_URL", { legacy: ["BONOB_NAVIDROME_URL"], default: `http://${hostname()}:4533` })!,
-      customClientsFor: bnbEnvVar("SUBSONIC_CUSTOM_CLIENTS", { legacy: ["BONOB_NAVIDROME_CUSTOM_CLIENTS"] }),
-      artistImageCache: bnbEnvVar("SUBSONIC_ARTIST_IMAGE_CACHE"),
+      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"),
    },
-    scrobbleTracks: bnbEnvVar("SCROBBLE_TRACKS", { default: "true" }) == "true",
+    scrobbleTracks: bnbEnvVar<boolean>("SCROBBLE_TRACKS", { default: true, parser: asBoolean }),
    reportNowPlaying:
-      bnbEnvVar("REPORT_NOW_PLAYING", { default: "true" }) == "true",
+      bnbEnvVar<boolean>("REPORT_NOW_PLAYING", { default: true, parser: asBoolean }),
  };
 }
--- 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" | "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",
@@ -88,10 +92,97 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    LOVE: "Love",
    LOVE_SUCCESS: "Track loved"
  },
+  "da-DK": {
+    AppLinkMessage: "Forbinder Sonos med $BNB_SONOS_SERVICE_NAME",
+    artists: "Kunstnere",
+    albums: "Album",
+    internetRadio: "Internet Radio",
+    tracks: "Numre",
+    playlists: "Afspilningslister",
+    genres: "Genre",
+    random: "Tilfældig",
+    topRated: "Højst vurderet",
+    recentlyAdded: "Senest tilføjet",
+    recentlyPlayed: "Senest afspillet",
+    mostPlayed: "Flest afspilninger",
+    success: "Succes",
+    failure: "Fejl",
+    expectedConfig: "Forventet konfiguration",
+    existingServiceConfig: "Eksisterende tjeneste konfiguration",
+    noExistingServiceRegistration: "Ingen eksisterende tjeneste registrering",
+    register: "Registrer",
+    removeRegistration: "Fjern registrering",
+    devices: "Enheder",
+    services: "Tjenester",
+    login: "Log på",
+    logInToBonob: "Log på $BNB_SONOS_SERVICE_NAME",
+    username: "Brugernavn",
+    password: "Adgangskode",
+    successfullyRegistered: "Registreret med succes",
+    registrationFailed: "Registrering fejlede!",
+    successfullyRemovedRegistration: "Registrering fjernet med succes",
+    failedToRemoveRegistration: "FJernelse af registrering fejlede!",
+    invalidLinkCode: "Ugyldig linkCode!",
+    loginSuccessful: "Log på succes!",
+    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",
+    UNSTAR_SUCCESS: "Stjerne fjernet",
+    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",
@@ -122,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/logger.ts
+++ b/src/logger.ts
@@ -6,7 +6,7 @@ export function debugIt<T>(thing: T): T {
 }

 const logger = createLogger({
-    level: 'debug',
+    level: process.env["BNB_LOG_LEVEL"] || 'info',
    format: format.combine(
      format.timestamp({
        format: 'YYYY-MM-DD HH:mm:ss'
--- 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>
@@ -374,7 +373,7 @@ function server(
    const id = req.params["id"]!;
    const trace = uuid();

-    logger.info(
+    logger.debug(
      `${trace} bnb<- ${req.method} ${req.path}?${JSON.stringify(
        req.query
      )}, headers=${JSON.stringify({ ...req.headers, "bnbt": "*****", "bnbk": "*****" })}`
@@ -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.info(
-            `${trace} bnb<- stream response from music service for ${id}, status=${
-              stream.status
-            }, headers=(${JSON.stringify(stream.headers)})`
+          logger.debug(
+            `${trace} bnb<- stream response from music service for ${id}, status=${stream.status}, headers=(${JSON.stringify(stream.headers)})`
          );

          const sonosisfyContentType = (contentType: string) =>
@@ -435,10 +438,8 @@ function server(
            sendStream: boolean;
            nowPlaying: boolean;
          }) => {
-            logger.info(
-              `${trace} bnb-> ${
-                req.path
-              }, status=${status}, headers=${JSON.stringify(headers)}`
+            logger.debug(
+              `${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,29 +272,9 @@ const playlist = (bonobUrl: URLBuilder, playlist: Playlist) => ({
  },
 });

-export const playlistAlbumArtURL = (
+export const coverArtURI = (
  bonobUrl: URLBuilder,
-  playlist: Playlist
-) => {
-  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,
@@ -297,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;

@@ -326,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,
@@ -334,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: {
@@ -345,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,
@@ -363,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) {
@@ -461,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();
@@ -522,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 },
            _,
@@ -550,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 },
            _,
@@ -749,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"),
@@ -776,6 +782,12 @@ function bindSmapiSoapServiceToExpress(
                          ).href(),
                          itemType: "albumList",
                        },
+                        {
+                          id: "internetRadio",
+                          title: lang("internetRadio"),
+                          albumArtURI: iconArtURI(bonobUrl, "radio").href(),
+                          itemType: "stream",
+                        },
                      ],
                    });
                  case "search":
@@ -820,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",
@@ -850,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()
@@ -868,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))
@@ -902,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!)
@@ -1066,8 +1118,9 @@ function bindSmapiSoapServiceToExpress(

  soapyService.log = (type, data) => {
    switch (type) {
+      // routing all soap info messages to debug so less noisy
      case "info":
-        logger.info({ level: "info", data });
+        logger.debug({ level: "info", data });
        break;
      case "warn":
        logger.warn({ level: "warn", data });
--- 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
--- 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/clock.test.ts
+++ b/tests/clock.test.ts
@@ -1,58 +1,85 @@
-import dayjs from "dayjs";
-import { isChristmas, isCNY, isHalloween, isHoli } from "../src/clock";
+import { randomInt } from "crypto";
+import dayjs, { Dayjs } from "dayjs";
+import timezone from "dayjs/plugin/timezone";
+dayjs.extend(timezone);

-describe("isChristmas", () => {
-  ["2000/12/25", "2022/12/25", "2030/12/25"].forEach((date) => {
-    it(`should return true for ${date} regardless of year`, () => {
-      expect(isChristmas({ now: () => dayjs(date) })).toEqual(true);
+import { Clock, isChristmas, isCNY, isCNY_2022, isCNY_2023, isCNY_2024, isCNY_2025, isHalloween, isHoli, isMay4 } from "../src/clock";
+
+
+
+const randomDate = () => dayjs().subtract(randomInt(1, 1000), 'days');
+const randomDates = (count: number, exclude: string[]) => {
+  const result: Dayjs[] = [];
+  while(result.length < count) {
+    const next = randomDate();
+    if(!exclude.find(it => dayjs(it).isSame(next, 'date'))) {
+      result.push(next)
+    }
+  }
+  return result
+}
+
+function describeFixedDateMonthEvent(
+  name: string, 
+  dateMonth: string,
+  f: (clock: Clock) => boolean
+) {
+  const randomYear = randomInt(2020, 3000);
+  const date = dateMonth.split("/")[0];
+  const month = dateMonth.split("/")[1];
+
+  describe(name, () => {
+    it(`should return true for ${randomYear}-${month}-${date}T00:00:00 ragardless of year`, () => {
+      expect(f({ now: () => dayjs(`${randomYear}-${month}-${date}T00:00:00Z`) })).toEqual(true);
+    });
+  
+    it(`should return true for ${randomYear}-${month}-${date}T12:00:00 regardless of year`, () => {
+      expect(f({ now: () => dayjs(`${randomYear}-${month}-${date}T12:00:00Z`) })).toEqual(true);
+    });
+  
+    it(`should return true for ${randomYear}-${month}-${date}T23:59:00 regardless of year`, () => {
+      expect(f({ now: () => dayjs(`${randomYear}-${month}-${date}T23:59:00`) })).toEqual(true);
+    });
+  
+    ["2000/12/24", "2000/12/26", "2021/01/01"].forEach((date) => {
+      it(`should return false for ${date}`, () => {
+        expect(f({ now: () => dayjs(date) })).toEqual(false);
+      });
    });
  });
+}

-  ["2000/12/24", "2000/12/26", "2021/01/01"].forEach((date) => {
-    it(`should return false for ${date} regardless of year`, () => {
-      expect(isChristmas({ now: () => dayjs(date) })).toEqual(false);
+function describeFixedDateEvent(
+  name: string,
+  dates: string[],
+  f: (clock: Clock) => boolean
+) {
+  describe(name, () => {
+    dates.forEach((date) => {
+      it(`should return true for ${date}T00:00:00`, () => {
+        expect(f({ now: () => dayjs(`${date}T00:00:00`) })).toEqual(true);
+      });
+  
+      it(`should return true for ${date}T23:59:59`, () => {
+        expect(f({ now: () => dayjs(`${date}T23:59:59`) })).toEqual(true);
+      });
+    });
+    
+    randomDates(10, dates).forEach((date) => {
+      it(`should return false for ${date}`, () => {
+        expect(f({ now: () => dayjs(date) })).toEqual(false);
+      });
    });
  });
-});
+}

-describe("isHalloween", () => {
-  ["2000/10/31", "2022/10/31", "2030/10/31"].forEach((date) => {
-    it(`should return true for ${date} regardless of year`, () => {
-      expect(isHalloween({ now: () => dayjs(date) })).toEqual(true);
-    });
-  });
+describeFixedDateMonthEvent("christmas", "25/12", isChristmas);
+describeFixedDateMonthEvent("halloween", "31/10", isHalloween);
+describeFixedDateMonthEvent("may4", "04/05", isMay4);

-  ["2000/09/31", "2000/10/30", "2021/01/01"].forEach((date) => {
-    it(`should return false for ${date} regardless of year`, () => {
-      expect(isHalloween({ now: () => dayjs(date) })).toEqual(false);
-    });
-  });
-});
-
-describe("isHoli", () => {
-  ["2022/03/18", "2023/03/07", "2024/03/25", "2025/03/14"].forEach((date) => {
-    it(`should return true for ${date} regardless of year`, () => {
-      expect(isHoli({ now: () => dayjs(date) })).toEqual(true);
-    });
-  });
-
-  ["2000/09/31", "2000/10/30", "2021/01/01"].forEach((date) => {
-    it(`should return false for ${date} regardless of year`, () => {
-      expect(isHoli({ now: () => dayjs(date) })).toEqual(false);
-    });
-  });
-});
-
-describe("isCNY", () => {
-  ["2022/02/01", "2023/01/22", "2024/02/10", "2025/02/29"].forEach((date) => {
-    it(`should return true for ${date} regardless of year`, () => {
-      expect(isCNY({ now: () => dayjs(date) })).toEqual(true);
-    });
-  });
-
-  ["2000/09/31", "2000/10/30", "2021/01/01"].forEach((date) => {
-    it(`should return false for ${date} regardless of year`, () => {
-      expect(isCNY({ now: () => dayjs(date) })).toEqual(false);
-    });
-  });
-});
+describeFixedDateEvent("holi", ["2022-03-18", "2023-03-07", "2024-03-25", "2025-03-14"], isHoli);
+describeFixedDateEvent("cny", ["2022-02-01", "2023-01-22", "2024-02-10", "2025-02-29"], isCNY);
+describeFixedDateEvent("cny 2022", ["2022-02-01"], isCNY_2022);
+describeFixedDateEvent("cny 2023", ["2023/01/22"], isCNY_2023);
+describeFixedDateEvent("cny 2024", ["2024/02/10"], isCNY_2024);
+describeFixedDateEvent("cny 2025", ["2025/02/29"], isCNY_2025);
--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@@ -96,42 +96,35 @@ describe("config", () => {
    propertyGetter: (config: any) => any
  ) {
    describe(name, () => {
-      function expecting({
-        value,
-        expected,
-      }: {
-        value: string;
-        expected: boolean;
-      }) {
-        describe(`when value is '${value}'`, () => {
-          it(`should be ${expected}`, () => {
-            process.env[envVar] = value;
-            expect(propertyGetter(config())).toEqual(expected);
-          });
-        });
-      }
-
-      expecting({ value: "", expected: expectedDefault });
-      expecting({ value: "true", expected: true });
-      expecting({ value: "false", expected: false });
-      expecting({ value: "foo", expected: false });
+      it.each([
+        [expectedDefault, ""],
+        [expectedDefault, undefined],
+        [true, "true"],
+        [false, "false"],
+        [false, "foo"],
+      ])("should be %s when env var is '%s'", (expected, value) => {
+        process.env[envVar] = value;
+        expect(propertyGetter(config())).toEqual(expected);
+      })
    });
  }

  describe("bonobUrl", () => {
-    ["BNB_URL", "BONOB_URL", "BONOB_WEB_ADDRESS"].forEach((key) => {
-      describe(`when ${key} is specified`, () => {
+      describe.each([
+        "BNB_URL", 
+        "BONOB_URL", 
+        "BONOB_WEB_ADDRESS"
+      ])("when %s is specified", (k) => {
        it("should be used", () => {
          const url = "http://bonob1.example.com:8877/";

          process.env["BNB_URL"] = "";
          process.env["BONOB_URL"] = "";
          process.env["BONOB_WEB_ADDRESS"] = "";
-          process.env[key] = url;
+          process.env[k] = url;

          expect(config().bonobUrl.href()).toEqual(url);
        });
-      });
    });

    describe("when none of BNB_URL, BONOB_URL, BONOB_WEB_ADDRESS are specified", () => {
@@ -165,87 +158,89 @@ describe("config", () => {

  describe("icons", () => {
    describe("foregroundColor", () => {
-      ["BNB_ICON_FOREGROUND_COLOR", "BONOB_ICON_FOREGROUND_COLOR"].forEach(
-        (k) => {
-          describe(`when ${k} is not specified`, () => {
-            it(`should default to undefined`, () => {
-              expect(config().icons.foregroundColor).toEqual(undefined);
-            });
+      describe.each([
+        "BNB_ICON_FOREGROUND_COLOR",
+        "BONOB_ICON_FOREGROUND_COLOR",
+      ])("%s", (k) => {
+        describe(`when ${k} is not specified`, () => {
+          it(`should default to undefined`, () => {
+            expect(config().icons.foregroundColor).toEqual(undefined);
          });
+        });

-          describe(`when ${k} is ''`, () => {
-            it(`should default to undefined`, () => {
-              process.env[k] = "";
-              expect(config().icons.foregroundColor).toEqual(undefined);
-            });
+        describe(`when ${k} is ''`, () => {
+          it(`should default to undefined`, () => {
+            process.env[k] = "";
+            expect(config().icons.foregroundColor).toEqual(undefined);
          });
+        });

-          describe(`when ${k} is specified as a color`, () => {
-            it(`should use it`, () => {
-              process.env[k] = "pink";
-              expect(config().icons.foregroundColor).toEqual("pink");
-            });
+        describe(`when ${k} is specified as a color`, () => {
+          it(`should use it`, () => {
+            process.env[k] = "pink";
+            expect(config().icons.foregroundColor).toEqual("pink");
          });
+        });

-          describe(`when ${k} is specified as hex`, () => {
-            it(`should use it`, () => {
-              process.env[k] = "#1db954";
-              expect(config().icons.foregroundColor).toEqual("#1db954");
-            });
+        describe(`when ${k} is specified as hex`, () => {
+          it(`should use it`, () => {
+            process.env[k] = "#1db954";
+            expect(config().icons.foregroundColor).toEqual("#1db954");
          });
+        });

-          describe(`when ${k} is an invalid string`, () => {
-            it(`should blow up`, () => {
-              process.env[k] = "!dfasd";
-              expect(() => config()).toThrow(
-                `Invalid value specified for 'BNB_ICON_FOREGROUND_COLOR', must match ${COLOR}`
-              );
-            });
+        describe(`when ${k} is an invalid string`, () => {
+          it(`should blow up`, () => {
+            process.env[k] = "!dfasd";
+            expect(() => config()).toThrow(
+              `Invalid value specified for 'BNB_ICON_FOREGROUND_COLOR', must match ${COLOR}`
+            );
          });
-        }
-      );
+        });
+      });
    });

    describe("backgroundColor", () => {
-      ["BNB_ICON_BACKGROUND_COLOR", "BONOB_ICON_BACKGROUND_COLOR"].forEach(
-        (k) => {
-          describe(`when ${k} is not specified`, () => {
-            it(`should default to undefined`, () => {
-              expect(config().icons.backgroundColor).toEqual(undefined);
-            });
+      describe.each([
+        "BNB_ICON_BACKGROUND_COLOR",
+        "BONOB_ICON_BACKGROUND_COLOR",
+      ])("%s", (k) => {
+        describe(`when ${k} is not specified`, () => {
+          it(`should default to undefined`, () => {
+            expect(config().icons.backgroundColor).toEqual(undefined);
          });
+        });

-          describe(`when ${k} is ''`, () => {
-            it(`should default to undefined`, () => {
-              process.env[k] = "";
-              expect(config().icons.backgroundColor).toEqual(undefined);
-            });
+        describe(`when ${k} is ''`, () => {
+          it(`should default to undefined`, () => {
+            process.env[k] = "";
+            expect(config().icons.backgroundColor).toEqual(undefined);
          });
+        });

-          describe(`when ${k} is specified as a color`, () => {
-            it(`should use it`, () => {
-              process.env[k] = "blue";
-              expect(config().icons.backgroundColor).toEqual("blue");
-            });
+        describe(`when ${k} is specified as a color`, () => {
+          it(`should use it`, () => {
+            process.env[k] = "blue";
+            expect(config().icons.backgroundColor).toEqual("blue");
          });
+        });

-          describe(`when ${k} is specified as hex`, () => {
-            it(`should use it`, () => {
-              process.env[k] = "#1db954";
-              expect(config().icons.backgroundColor).toEqual("#1db954");
-            });
+        describe(`when ${k} is specified as hex`, () => {
+          it(`should use it`, () => {
+            process.env[k] = "#1db954";
+            expect(config().icons.backgroundColor).toEqual("#1db954");
          });
+        });

-          describe(`when ${k} is an invalid string`, () => {
-            it(`should blow up`, () => {
-              process.env[k] = "!red";
-              expect(() => config()).toThrow(
-                `Invalid value specified for 'BNB_ICON_BACKGROUND_COLOR', must match ${COLOR}`
-              );
-            });
+        describe(`when ${k} is an invalid string`, () => {
+          it(`should blow up`, () => {
+            process.env[k] = "!red";
+            expect(() => config()).toThrow(
+              `Invalid value specified for 'BNB_ICON_BACKGROUND_COLOR', must match ${COLOR}`
+            );
          });
-        }
-      );
+        });
+      });
    });
  });

@@ -254,9 +249,12 @@ describe("config", () => {
      expect(config().secret).toEqual("bonob");
    });

-    ["BNB_SECRET", "BONOB_SECRET"].forEach((key) => {
-      it(`should be overridable using ${key}`, () => {
-        process.env[key] = "new secret";
+    describe.each([
+      "BNB_SECRET", 
+      "BONOB_SECRET"
+    ])("%s", (k) => {
+      it(`should be overridable using ${k}`, () => {
+        process.env[k] = "new secret";
        expect(config().secret).toEqual("new secret");
      });
    });
@@ -271,7 +269,16 @@ describe("config", () => {
      process.env["BNB_AUTH_TIMEOUT"] = "33s";
      expect(config().authTimeout).toEqual("33s");
    });
-});
+  });
+  
+  describe("logRequests", () => {
+    describeBooleanConfigValue(
+      "logRequests",
+      "BNB_SERVER_LOG_REQUESTS",
+      false,
+      (config) => config.logRequests
+    );
+  });

  describe("sonos", () => {
    describe("serviceName", () => {
@@ -279,91 +286,122 @@ describe("config", () => {
        expect(config().sonos.serviceName).toEqual("bonob");
      });

-      ["BNB_SONOS_SERVICE_NAME", "BONOB_SONOS_SERVICE_NAME"].forEach((k) => {
-        it("should be overridable", () => {
-          process.env[k] = "foobar1000";
-          expect(config().sonos.serviceName).toEqual("foobar1000");
-        });
-      });
+      describe.each([
+        "BNB_SONOS_SERVICE_NAME", 
+        "BONOB_SONOS_SERVICE_NAME"
+      ])(
+        "%s",
+        (k) => {
+          it("should be overridable", () => {
+            process.env[k] = "foobar1000";
+            expect(config().sonos.serviceName).toEqual("foobar1000");
+          });
+        }
+      );
    });

-    ["BNB_SONOS_DEVICE_DISCOVERY", "BONOB_SONOS_DEVICE_DISCOVERY"].forEach(
-      (k) => {
-        describeBooleanConfigValue(
-          "deviceDiscovery",
-          k,
-          true,
-          (config) => config.sonos.discovery.enabled
-        );
-      }
-    );
+    describe.each([
+      "BNB_SONOS_DEVICE_DISCOVERY",
+      "BONOB_SONOS_DEVICE_DISCOVERY",
+    ])("%s", (k) => {
+      describeBooleanConfigValue(
+        "deviceDiscovery",
+        k,
+        true,
+        (config) => config.sonos.discovery.enabled
+      );
+    });

    describe("seedHost", () => {
      it("should default to undefined", () => {
        expect(config().sonos.discovery.seedHost).toBeUndefined();
      });

-      ["BNB_SONOS_SEED_HOST", "BONOB_SONOS_SEED_HOST"].forEach((k) => {
-        it("should be overridable", () => {
-          process.env[k] = "123.456.789.0";
-          expect(config().sonos.discovery.seedHost).toEqual("123.456.789.0");
-        });
-      });
-    });
-
-    ["BNB_SONOS_AUTO_REGISTER", "BONOB_SONOS_AUTO_REGISTER"].forEach((k) => {
-      describeBooleanConfigValue(
-        "autoRegister",
-        k,
-        false,
-        (config) => config.sonos.autoRegister
+      describe.each([
+        "BNB_SONOS_SEED_HOST", 
+        "BONOB_SONOS_SEED_HOST"
+      ])(
+        "%s",
+        (k) => {
+          it("should be overridable", () => {
+            process.env[k] = "123.456.789.0";
+            expect(config().sonos.discovery.seedHost).toEqual("123.456.789.0");
+          });
+        }
      );
    });

+    describe.each([
+      "BNB_SONOS_AUTO_REGISTER", 
+      "BONOB_SONOS_AUTO_REGISTER"
+    ])(
+      "%s",
+      (k) => {
+        describeBooleanConfigValue(
+          "autoRegister",
+          k,
+          false,
+          (config) => config.sonos.autoRegister
+        );
+      }
+    );
+
    describe("sid", () => {
      it("should default to 246", () => {
        expect(config().sonos.sid).toEqual(246);
      });

-      ["BNB_SONOS_SERVICE_ID", "BONOB_SONOS_SERVICE_ID"].forEach((k) => {
-        it("should be overridable", () => {
-          process.env[k] = "786";
-          expect(config().sonos.sid).toEqual(786);
-        });
-      });
+      describe.each([
+        "BNB_SONOS_SERVICE_ID", 
+        "BONOB_SONOS_SERVICE_ID"
+      ])(
+        "%s",
+        (k) => {
+          it("should be overridable", () => {
+            process.env[k] = "786";
+            expect(config().sonos.sid).toEqual(786);
+          });
+        }
+      );
    });
  });

  describe("subsonic", () => {
    describe("url", () => {
-      ["BNB_SUBSONIC_URL", "BONOB_SUBSONIC_URL", "BONOB_NAVIDROME_URL"].forEach(
-        (k) => {
-          describe(`when ${k} is not specified`, () => {
-            it(`should default to http://${hostname()}:4533`, () => {
-              expect(config().subsonic.url).toEqual(
-                `http://${hostname()}:4533`
-              );
-            });
+      describe.each([
+        "BNB_SUBSONIC_URL",
+        "BONOB_SUBSONIC_URL",
+        "BONOB_NAVIDROME_URL",
+      ])("%s", (k) => {
+        describe(`when ${k} is not specified`, () => {
+          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`, () => {
-              process.env[k] = "";
-              expect(config().subsonic.url).toEqual(
-                `http://${hostname()}:4533`
-              );
-            });
+        describe(`when ${k} is ''`, () => {
+          it(`should default to http://${hostname()}:4533/`, () => {
+            process.env[k] = "";
+            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";
-              process.env[k] = url;
-              expect(config().subsonic.url).toEqual(url);
-            });
+        describe(`when ${k} is specified`, () => {
+          it(`should use it for ${k}`, () => {
+            const url = "http://navidrome.example.com:1234/some-context-path";
+            process.env[k] = 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);
+          });
+        });
+      });
    });

    describe("customClientsFor", () => {
@@ -371,11 +409,11 @@ describe("config", () => {
        expect(config().subsonic.customClientsFor).toBeUndefined();
      });

-      [
+      describe.each([
        "BNB_SUBSONIC_CUSTOM_CLIENTS",
        "BONOB_SUBSONIC_CUSTOM_CLIENTS",
        "BONOB_NAVIDROME_CUSTOM_CLIENTS",
-      ].forEach((k) => {
+      ])("%s", (k) => {
        it(`should be overridable for ${k}`, () => {
          process.env[k] = "whoop/whoop";
          expect(config().subsonic.customClientsFor).toEqual("whoop/whoop");
@@ -395,7 +433,10 @@ describe("config", () => {
    });
  });

-  ["BNB_SCROBBLE_TRACKS", "BONOB_SCROBBLE_TRACKS"].forEach((k) => {
+  describe.each([
+    "BNB_SCROBBLE_TRACKS", 
+    "BONOB_SCROBBLE_TRACKS"
+  ])("%s", (k) => {
    describeBooleanConfigValue(
      "scrobbleTracks",
      k,
@@ -404,12 +445,18 @@ describe("config", () => {
    );
  });

-  ["BNB_REPORT_NOW_PLAYING", "BONOB_REPORT_NOW_PLAYING"].forEach((k) => {
-    describeBooleanConfigValue(
-      "reportNowPlaying",
-      k,
-      true,
-      (config) => config.reportNowPlaying
-    );
-  });
+  describe.each([
+    "BNB_REPORT_NOW_PLAYING", 
+    "BONOB_REPORT_NOW_PLAYING"
+  ])(
+    "%s",
+    (k) => {
+      describeBooleanConfigValue(
+        "reportNowPlaying",
+        k,
+        true,
+        (config) => config.reportNowPlaying
+      );
+    }
+  );
 });
--- 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", "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, {
@@ -167,15 +165,13 @@ describe("RangeBytesFromFilter", () => {


 describe("server", () => {
-  jest.setTimeout(Number.parseInt(process.env["JEST_TIMEOUT"] || "2000"));
-  
  beforeEach(() => {
    jest.clearAllMocks();
    jest.resetAllMocks();
  });

-  const bonobUrlWithNoContextPath = url("http://bonob.localhost:1234");
-  const bonobUrlWithContextPath = url("http://bonob.localhost:1234/aContext");
+  const bonobUrlWithNoContextPath = url("http://localhost:1234");
+  const bonobUrlWithContextPath = url("http://localhost:1234/aContext");

  const langName = randomLang();
  const acceptLanguage = `le-ET,${langName};q=0.9,en;q=0.8`;
@@ -757,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", () => {
@@ -831,6 +834,8 @@ describe("server", () => {
                );
                expect(res.headers["content-length"]).toEqual("123");
                expect(res.body).toEqual({});
+
+                expect(trackStream.stream.destroyed).toBe(true);
              });
            });

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

                expect(res.status).toEqual(404);
                expect(res.body).toEqual({});
+
+                expect(trackStream.stream.destroyed).toBe(true);
              });
            });
          });
@@ -918,6 +925,8 @@ describe("server", () => {
  
                expect(musicLibrary.nowPlaying).not.toHaveBeenCalled();
                expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                expect(stream.stream.destroyed).toBe(true);
              });
            });
  
@@ -961,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);
                });
              });
  
@@ -1002,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);
                });
              });
  
@@ -1042,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);
                });
              });
  
@@ -1085,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);
                });
              });
            });
@@ -1133,6 +1150,8 @@ describe("server", () => {
                    trackId,
                    range: requestedRange,
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1180,6 +1199,8 @@ describe("server", () => {
                    trackId,
                    range: "4000-5000",
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
            });
@@ -1300,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);
@@ -1618,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 () => {
@@ -1650,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",
@@ -1779,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";

@@ -120,7 +118,7 @@ describe("service config", () => {

      describe(STRINGS_ROUTE, () => {
        it("should return xml for the strings", async () => {
-          const xml = await fetchStringsXml();
+          const xml: Document = await fetchStringsXml();

          const sonosString = (id: string, lang: string) =>
            xpath.select(
@@ -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,279 +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", () => {
-    it("should format the url with encrypted urn", () => {
-      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" }),
-          }),
-        ],
-      });
-
-      expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
-        `http://localhost:1234/context-path/art/${encodeURIComponent(
-          formatForURL(externalArt1)
-        )}&${encodeURIComponent(
-          formatForURL(externalArt2)
-        )}/size/180?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"
  );
@@ -777,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)
@@ -793,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)
@@ -806,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"
      );
@@ -814,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")
    });
  });
 });
@@ -874,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(),
@@ -890,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(),
@@ -1450,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",
@@ -1471,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({
@@ -1538,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",
@@ -1559,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({
@@ -1609,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(
@@ -1634,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(
@@ -1650,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];

@@ -1681,7 +1492,7 @@ describe("wsdl api", () => {
                        itemType: "playlist",
                        id: `playlist:${playlist.id}`,
                        title: playlist.name,
-                        albumArtURI: playlistAlbumArtURL(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          playlist
                        ).href(),
@@ -1713,7 +1524,7 @@ describe("wsdl api", () => {
                          itemType: "playlist",
                          id: `playlist:${playlist.id}`,
                          title: playlist.name,
-                          albumArtURI: playlistAlbumArtURL(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            playlist
                          ).href(),
@@ -1757,7 +1568,7 @@ describe("wsdl api", () => {
                          itemType: "album",
                          id: `album:${it.id}`,
                          title: it.name,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            it
                          ).href(),
@@ -1794,7 +1605,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -1846,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,
@@ -1891,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,
@@ -1952,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,
@@ -1981,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(),
                          })
                        ),
@@ -2098,7 +1909,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2146,7 +1957,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2194,7 +2005,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2242,7 +2053,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2290,7 +2101,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2338,7 +2149,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2384,7 +2195,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2430,7 +2241,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2474,7 +2285,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2521,7 +2332,7 @@ describe("wsdl api", () => {
                        itemType: "album",
                        id: `album:${it.id}`,
                        title: it.name,
-                        albumArtURI: defaultAlbumArtURI(
+                        albumArtURI: coverArtURI(
                          bonobUrlWithAccessToken,
                          it
                        ).href(),
@@ -2688,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();
+                });
+              });
+            });
          });
        });

@@ -2898,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,
@@ -2909,7 +2785,7 @@ describe("wsdl api", () => {
                          genre: track.genre?.name,
                          genreId: track.genre?.id,
                          duration: track.duration,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            track
                          ).href(),
@@ -2946,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,
@@ -2957,7 +2833,7 @@ describe("wsdl api", () => {
                          genre: track.genre?.name,
                          genreId: track.genre?.id,
                          duration: track.duration,
-                          albumArtURI: defaultAlbumArtURI(
+                          albumArtURI: coverArtURI(
                            bonobUrlWithAccessToken,
                            track
                          ).href(),
@@ -3000,7 +2876,7 @@ describe("wsdl api", () => {
                      itemType: "album",
                      id: `album:${album.id}`,
                      title: album.name,
-                      albumArtURI: defaultAlbumArtURI(
+                      albumArtURI: coverArtURI(
                        bonobUrlWithAccessToken,
                        album
                      ).href(),
@@ -3065,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);
+              });
+            });            
          });
        });

@@ -3076,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`, {
@@ -3084,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}`,
@@ -3106,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,11 +50,11 @@
    // "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. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
--- 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
Simon J	f6fc7ab920	Ability to disable album art for playlists (#159 )	2023-04-22 10:54:38 +10:00
simojenki	8111041551	Additional documentation around where to pull image from	2023-03-18 08:47:16 +11:00
simojenki	df2ef9b152	Add some labels to docker image	2023-03-17 10:37:42 +11:00
Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs	33473cd387	ci: Push image to GHCR (#153 ) * ci: Push image to GHCR * ci: Update build actions	2023-03-17 10:26:43 +11:00
Simon J	7f743aaa7e	Change some messages from info to debug, route all soap info to debug (#151 )	2023-03-13 08:47:32 +11:00
simojenki	d4bed77c54	Set default log level to info	2023-03-12 07:52:43 +00:00
Simon J	29531a6e01	Ability to configure log level, default to 'warn' (#150 )	2023-03-12 13:52:38 +11:00
Simon J	e78b6c4fbc	Ability to configure whether to log http requests (#149 )	2023-03-12 09:21:49 +11:00
Simon J	2941f6f595	Add wget to image	2023-03-09 06:55:58 +11:00
Daniel Hammer	2c48d08b0e	Expanded BNB_SUBSONIC_ARTIST_IMAGE_CACHE description to reflect maintainer insights. (#146 ) @see https://github.com/simojenki/bonob/issues/138#issuecomment-1455001557 Co-authored-by: Daniel Hammer <daniel.hammer+oss@gmail.com>	2023-03-08 16:16:03 +11:00
Daniel Hammer	de48ee0fca	Added initial da-DK i18n. (#140 )	2023-03-06 18:40:08 +11:00
Simon J	cefdf5e2d5	Switch to node:16-bullsys-slim images to reduce final image size (#144 )	2023-03-06 18:39:40 +11:00
Daniel Hammer	f86a78b338	Added initial documentation for multiple registrations. (#141 ) @see https://github.com/simojenki/bonob/issues/139 Co-authored-by: Daniel Hammer <daniel.hammer+oss@gmail.com>	2023-03-06 10:41:55 +11:00
dependabot[bot]	4d23885d7c	Bump @xmldom/xmldom from 0.7.6 to 0.7.9 (#143 ) Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.6 to 0.7.9. - [Release notes](https://github.com/xmldom/xmldom/releases) - [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md) - [Commits](https://github.com/xmldom/xmldom/compare/0.7.6...0.7.9) --- updated-dependencies: - dependency-name: "@xmldom/xmldom" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-06 10:41:19 +11:00
dependabot[bot]	8c80c00089	Bump qs from 6.10.1 to 6.11.0 (#142 ) Bumps [qs](https://github.com/ljharb/qs) from 6.10.1 to 6.11.0. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.10.1...v6.11.0) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-06 10:41:08 +11:00
dependabot[bot]	ebf385e918	Bump http-cache-semantics from 4.1.0 to 4.1.1 (#133 ) Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-06 10:40:52 +11:00
dependabot[bot]	a20fdcbc5f	Bump eta from 1.12.3 to 2.0.0 (#131 ) Bumps [eta](https://github.com/eta-dev/eta) from 1.12.3 to 2.0.0. - [Release notes](https://github.com/eta-dev/eta/releases) - [Commits](https://github.com/eta-dev/eta/compare/v1.12.3...v2.0.0) --- updated-dependencies: - dependency-name: eta dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-06 10:40:40 +11:00
dependabot[bot]	f763dbd8b9	Bump cookiejar from 2.1.2 to 2.1.4 (#130 ) Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.2 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-06 10:40:25 +11:00
dependabot[bot]	2d3e5dc635	Bump json5 from 2.2.0 to 2.2.3 (#126 )	2023-03-06 08:10:21 +11:00
dependabot[bot]	6091308266	Bump jsonwebtoken from 8.5.1 to 9.0.0 (#125 )	2023-03-06 08:10:14 +11:00
dependabot[bot]	fed6e9663d	Bump express from 4.17.1 to 4.17.3 (#124 )	2023-03-06 08:10:01 +11:00
dependabot[bot]	03b5b04c73	Bump minimatch from 3.0.4 to 3.1.2 (#120 )	2023-03-06 07:54:15 +11:00
simojenki	4a529b46e1	Fix incorrect boolean usage with docker-compose, had to quote the "true"	2022-11-14 00:34:04 +00:00
simojenki	5c9fbede7a	Add devcontainer for building bonob	2022-11-14 00:33:35 +00:00
dependabot[bot]	94e25e03ea	Bump follow-redirects from 1.14.3 to 1.15.2 (#119 ) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.3 to 1.15.2. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.3...v1.15.2) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-20 19:34:27 +11:00
dependabot[bot]	d9c3a3edcb	Bump jpeg-js from 0.4.3 to 0.4.4 (#118 ) Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.3 to 0.4.4. - [Release notes](https://github.com/eugeneware/jpeg-js/releases) - [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.3...v0.4.4) --- updated-dependencies: - dependency-name: jpeg-js dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-20 19:34:17 +11:00
dependabot[bot]	f22b094d83	Bump minimist from 1.2.5 to 1.2.7 (#117 ) Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.7) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-20 19:34:06 +11:00
dependabot[bot]	4ae71675e8	Bump async from 3.2.0 to 3.2.4 (#116 ) Bumps [async](https://github.com/caolan/async) from 3.2.0 to 3.2.4. - [Release notes](https://github.com/caolan/async/releases) - [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md) - [Commits](https://github.com/caolan/async/compare/v3.2.0...v3.2.4) --- updated-dependencies: - dependency-name: async dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-20 19:33:53 +11:00
simojenki	84866dfd60	Trying to make server tests more stable	2022-10-20 16:35:18 +11:00
simojenki	719fd998b1	Set jest timeout globally for all tests as tests break in GH actions due to timeout	2022-10-20 13:29:37 +11:00
dependabot[bot]	91995678a4	Bump tar from 6.1.8 to 6.1.11 (#115 )	2022-10-18 09:06:15 +11:00
dependabot[bot]	67d6c4a730	Bump node-fetch from 2.6.1 to 2.6.7 (#114 )	2022-10-18 09:05:58 +11:00
dependabot[bot]	3df4f4daa7	Bump nth-check from 2.0.0 to 2.1.1 (#113 )	2022-10-18 09:05:19 +11:00
dependabot[bot]	bd63408ec3	Bump tmpl from 1.0.4 to 1.0.5 (#112 )	2022-10-18 09:04:50 +11:00
dependabot[bot]	da5491b474	Bump sharp from 0.29.1 to 0.30.5 (#106 )	2022-10-18 09:04:27 +11:00
dependabot[bot]	bbd676b5b8	Bump @xmldom/xmldom from 0.7.4 to 0.7.6 (#111 ) Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.4 to 0.7.6. - [Release notes](https://github.com/xmldom/xmldom/releases) - [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md) - [Commits](https://github.com/xmldom/xmldom/compare/0.7.4...0.7.6) --- updated-dependencies: - dependency-name: "@xmldom/xmldom" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-18 08:03:05 +11:00
simojenki	d01c747c96	handling SIGTERM	2022-07-30 17:28:30 +10:00
Laurent le Beau-Martin	192f65a56b	Improve ffmpeg command to transcode flac (#99 ) * Improve ffmpeg command to transcode flac The command previously suggested forced the output sample rate to 48 kHz, even if the input was lower, at 44.1 kHz. This new command lets `ffmpeg` select the appropriate output sample rate to minimize conversion. Documentation: https://www.ffmpeg.org/ffmpeg-filters.html#aformat-1 * Update transcoding command - Support more sample rates and bit depths. - Add note about S1	2022-03-10 15:06:56 +11:00
Simon J	9b3df4ce1a	Support for using boolean values when using yaml docker-compose files rather than strings for booleans (#98 )	2022-02-28 22:07:17 +11:00
Simon J	df9a6d4663	Improve date handling (#94 )	2022-02-02 13:26:01 +11:00
simojenki	d0c80b2f20	Add linux/arm64 to platforms supported	2021-12-30 09:30:49 +11:00