Bump axios from 1.5.1 to 1.6.0

Bumps [axios](https://github.com/axios/axios) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.5.1...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Bump libs (#179 )
2025-12-21 17:33:29 +01:00 · 2023-11-11 10:51:37 +00:00 · 2023-10-11 17:19:24 +11:00 · 2023-10-11 12:45:27 +11:00 · 2023-10-10 11:25:55 +11:00 · 2023-10-10 10:59:57 +11:00
19 changed files with 1170 additions and 780 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,6 +3,7 @@ FROM node:16-bullseye
 LABEL maintainer=simojenki

 ENV JEST_TIMEOUT=60000
+EXPOSE 4534

 RUN apt-get update && \
    apt-get -y upgrade && \
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,12 @@
    "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",
    "features": {
        "ghcr.io/devcontainers/features/docker-in-docker:1": {
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,9 +17,9 @@ jobs:
    steps:
      -
        name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
          node-version: '16'
      -
@@ -29,37 +29,47 @@ jobs:


  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,linux/arm64
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .vscode
 build
 ignore
+.ignore
 node_modules
 .yarn/*
 !.yarn/patches
--- a/5
+++ b/5
@@ -48,7 +48,10 @@ RUN apt-get update && \

 FROM node:16-bullseye-slim

-LABEL maintainer=simojenki
+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
--- a/README.md
+++ b/README.md
@@ -25,7 +25,23 @@ Support for Subsonic API clones (tested against Navidrome and Gonic).

 ## 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 | Laster build from master, probably works, however is currently under test in
+vX.Y.Z | Fixed release versions from tags, for those that want to pin to specific release
+

 ### Full sonos device auto-discovery and auto-registration using docker --network host

@@ -147,6 +163,7 @@ BNB_URL | http://$(hostname):4534 | URL (including path) for bonob so that sonos
 BNB_SECRET | bonob | secret used for encrypting credentials
 BNB_AUTH_TIMEOUT | 1h | Timeout for the sonos auth token, described in the format [ms](https://github.com/vercel/ms), ie. '5s' == 5 seconds, '11h' == 11 hours.  In the case of using Navidrome this should be less than the value for ND_SESSIONTIMEOUT
 BNB_LOG_LEVEL | info | Log level. One of ['debug', 'info', 'warn', 'error']
+BNB_DISABLE_PLAYLIST_ART | undefined | Disables playlist art generation, ie. when there are many playlists and art generation takes too long
 BNB_SERVER_LOG_REQUESTS | false | Whether or not to log http requests
 BNB_SONOS_AUTO_REGISTER | false | Whether or not to try and auto-register on startup
 BNB_SONOS_DEVICE_DISCOVERY | true | Enable/Disable sonos device discovery entirely.  Setting this to 'false' will disable sonos device search, regardless of whether a seed host is specified.
--- a/package.json
+++ b/package.json
@@ -7,53 +7,52 @@
  "license": "GPL-3.0-only",
  "dependencies": {
    "@svrooij/sonos": "^2.5.0",
-    "@types/express": "^4.17.17",
-    "@types/fs-extra": "^11.0.1",
-    "@types/jsonwebtoken": "^9.0.1",
-    "@types/jws": "^3.2.5",
-    "@types/morgan": "^1.9.4",
+    "@types/express": "^4.17.19",
+    "@types/fs-extra": "^11.0.2",
+    "@types/jsonwebtoken": "^9.0.3",
+    "@types/jws": "^3.2.6",
+    "@types/morgan": "^1.9.6",
    "@types/node": "^16.11.7",
-    "@types/randomstring": "^1.1.8",
-    "@types/sharp": "^0.31.1",
-    "@types/underscore": "^1.11.4",
-    "@types/uuid": "^9.0.1",
-    "@types/xmldom": "0.1.31",
-    "axios": "^1.3.4",
-    "dayjs": "^1.11.7",
+    "@types/randomstring": "^1.1.9",
+    "@types/underscore": "^1.11.11",
+    "@types/uuid": "^9.0.5",
+    "@types/xmldom": "0.1.32",
+    "axios": "^1.6.0",
+    "dayjs": "^1.11.10",
    "eta": "^2.0.1",
    "express": "^4.18.2",
-    "fp-ts": "^2.13.1",
-    "fs-extra": "^11.1.0",
-    "jsonwebtoken": "^9.0.0",
+    "fp-ts": "^2.16.1",
+    "fs-extra": "^11.1.1",
+    "jsonwebtoken": "^9.0.2",
    "jws": "^4.0.0",
-    "libxmljs2": "^0.31.0",
+    "libxmljs2": "^0.32.0",
    "morgan": "^1.10.0",
-    "node-html-parser": "^6.1.5",
-    "randomstring": "^1.2.3",
-    "sharp": "^0.31.3",
+    "node-html-parser": "^6.1.10",
+    "randomstring": "^1.3.0",
+    "sharp": "^0.32.6",
    "soap": "^1.0.0",
    "ts-md5": "^1.3.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.2.2",
    "underscore": "^1.13.6",
    "urn-lib": "^2.0.0",
-    "uuid": "^9.0.0",
-    "winston": "^3.8.2",
+    "uuid": "^9.0.1",
+    "winston": "^3.11.0",
    "xmldom-ts": "^0.3.1"
  },
  "devDependencies": {
-    "@types/chai": "^4.3.4",
-    "@types/jest": "^29.4.0",
-    "@types/mocha": "^10.0.1",
-    "@types/supertest": "^2.0.12",
-    "@types/tmp": "^0.2.3",
-    "chai": "^4.3.7",
-    "get-port": "^6.1.2",
-    "image-js": "^0.35.3",
-    "jest": "^29.4.3",
-    "nodemon": "^2.0.21",
+    "@types/chai": "^4.3.7",
+    "@types/jest": "^29.5.5",
+    "@types/mocha": "^10.0.2",
+    "@types/supertest": "^2.0.14",
+    "@types/tmp": "^0.2.4",
+    "chai": "^4.3.10",
+    "get-port": "^7.0.0",
+    "image-js": "^0.35.4",
+    "jest": "^29.7.0",
+    "nodemon": "^3.0.1",
    "supertest": "^6.3.3",
    "tmp": "^0.2.1",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.1",
    "ts-mockito": "^2.6.1",
    "ts-node": "^10.9.1",
    "xmldom-ts": "^0.3.1",
@@ -62,9 +61,9 @@
  "scripts": {
    "clean": "rm -Rf build node_modules",
    "build": "tsc",
-    "dev": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_SERVICE_NAME=bonobDev BNB_SONOS_DEVICE_DISCOVERY=true nodemon -V ./src/app.ts",
-    "devr": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_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_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_DISABLE_PLAYLIST_ART=true BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_ICON_FOREGROUND_COLOR=white BNB_ICON_BACKGROUND_COLOR=darkgrey BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_SONOS_AUTO_REGISTER=true BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
+    "register-dev": "ts-node ./src/register.ts http://${BNB_DEV_HOST_IP}:4534",
    "test": "jest",
    "gitinfo": "git describe --tags > .gitinfo"
  },
--- a/src/config.ts
+++ b/src/config.ts
@@ -98,7 +98,7 @@ export default function () {
      sid: bnbEnvVar<number>("SONOS_SERVICE_ID", { default: 246, parser: asInt }),
    },
    subsonic: {
-      url: bnbEnvVar("SUBSONIC_URL", { legacy: ["BONOB_NAVIDROME_URL"], default: `http://${hostname()}:4533` })!,
+      url: url(bnbEnvVar("SUBSONIC_URL", { legacy: ["BONOB_NAVIDROME_URL"], default: `http://${hostname()}:4533` })!),
      customClientsFor: bnbEnvVar<string>("SUBSONIC_CUSTOM_CLIENTS", { legacy: ["BONOB_NAVIDROME_CUSTOM_CLIENTS"] }),
      artistImageCache: bnbEnvVar<string>("SUBSONIC_ARTIST_IMAGE_CACHE"),
    },
--- a/src/i8n.ts
+++ b/src/i8n.ts
@@ -4,7 +4,7 @@ import { option as O } from "fp-ts";
 import _ from "underscore";

 export type LANG = "en-US" | "da-DK" | "de-DE" | "es-ES" | "fr-FR" | "it-IT" | "ja-JP" | "nb-NO" | "nl-NL" | "pt-BR" | "sv-SE" | "zh-CN"
-export type SUPPORTED_LANG = "en-US" | "da-DK" | "nl-NL";
+export type SUPPORTED_LANG = "en-US" | "da-DK" | "fr-FR" | "nl-NL";
 export type KEY =
  | "AppLinkMessage"
  | "artists"
@@ -129,6 +129,47 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
    LOVE: "Synes godt om",
    LOVE_SUCCESS: "Syntes godt om"
  },
+  "fr-FR": {
+    AppLinkMessage: "Associer Sonos à $BNB_SONOS_SERVICE_NAME",
+    artists: "Artistes",
+    albums: "Albums",
+    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",
+    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",
--- a/src/server.ts
+++ b/src/server.ts
@@ -307,13 +307,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 +327,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 +338,9 @@ function server(
          <browseIconSizeMap>
              <sizeEntry size="0" substitution="/size/legacy"/>
              ${SONOS_RECOMMENDED_IMAGE_SIZES.map(
-                (size) =>
-                  `<sizeEntry size="${size}" substitution="/size/${size}"/>`
-              ).join("")}
+      (size) =>
+        `<sizeEntry size="${size}" substitution="/size/${size}"/>`
+    ).join("")}
            </browseIconSizeMap>
        </Match>
      </PresentationMap>
@@ -406,13 +406,17 @@ function server(
              trackId: id,
              range: req.headers["range"] || undefined,
            })
+            .then((stream) => {
+              res.on('close', () => {
+                stream.stream.destroy()
+              });
+              return stream;
+            })
            .then((stream) => ({ musicLibrary: it, stream }))
        )
        .then(({ musicLibrary, stream }) => {
          logger.debug(
-            `${trace} bnb<- stream response from music service for ${id}, status=${
-              stream.status
-            }, headers=(${JSON.stringify(stream.headers)})`
+            `${trace} bnb<- stream response from music service for ${id}, status=${stream.status}, headers=(${JSON.stringify(stream.headers)})`
          );

          const sonosisfyContentType = (contentType: string) =>
@@ -436,9 +440,7 @@ function server(
            nowPlaying: boolean;
          }) => {
            logger.debug(
-              `${trace} bnb-> ${
-                req.path
-              }, status=${status}, headers=${JSON.stringify(headers)}`
+              `${trace} bnb-> ${req.path}, status=${status}, headers=${JSON.stringify(headers)}`
            );
            (nowPlaying
              ? musicLibrary.nowPlaying(id)
@@ -450,8 +452,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()
            });
          };

@@ -513,15 +515,15 @@ function server(
      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
--- a/src/smapi.ts
+++ b/src/smapi.ts
@@ -266,6 +266,9 @@ export const playlistAlbumArtURL = (
  bonobUrl: URLBuilder,
  playlist: Playlist
 ) => {
+  // todo: this should be put into config, or even just removed for the ND music source
+  if(process.env["BNB_DISABLE_PLAYLIST_ART"]) return iconArtURI(bonobUrl, "music");
+
  const burns: BUrn[] = uniq(
    playlist.entries.filter((it) => it.coverArt != undefined),
    (it) => it.album.id
@@ -868,8 +871,13 @@ function bindSmapiSoapServiceToExpress(
                      .playlists()
                      .then((it) =>
                        Promise.all(
-                          it.map((playlist) =>
-                            musicLibrary.playlist(playlist.id)
+                          it.map((playlist) => {
+                            return {
+                              id: playlist.id,
+                              name: playlist.name,
+                              entries: []
+                            };
+                           }
                          )
                        )
                      )
--- a/src/subsonic.ts
+++ b/src/subsonic.ts
@@ -32,6 +32,7 @@ import { b64Encode, b64Decode } from "./b64";
 import logger from "./logger";
 import { assertSystem, BUrn } from "./burn";
 import { artist } from "./smapi";
+import { URLBuilder } from "./url_builder";

 export const BROWSER_HEADERS = {
  accept:
@@ -344,28 +345,28 @@ export type ImageFetcher = (url: string) => Promise<CoverArt | undefined>;

 export const cachingImageFetcher =
  (cacheDir: string, delegate: ImageFetcher) =>
-  async (url: string): Promise<CoverArt | undefined> => {
-    const filename = path.join(cacheDir, `${Md5.hashStr(url)}.png`);
-    return fse
-      .readFile(filename)
-      .then((data) => ({ contentType: "image/png", data }))
-      .catch(() =>
-        delegate(url).then((image) => {
-          if (image) {
-            return sharp(image.data)
-              .png()
-              .toBuffer()
-              .then((png) => {
-                return fse
-                  .writeFile(filename, png)
-                  .then(() => ({ contentType: "image/png", data: png }));
-              });
-          } else {
-            return undefined;
-          }
-        })
-      );
-  };
+    async (url: string): Promise<CoverArt | undefined> => {
+      const filename = path.join(cacheDir, `${Md5.hashStr(url)}.png`);
+      return fse
+        .readFile(filename)
+        .then((data) => ({ contentType: "image/png", data }))
+        .catch(() =>
+          delegate(url).then((image) => {
+            if (image) {
+              return sharp(image.data)
+                .png()
+                .toBuffer()
+                .then((png) => {
+                  return fse
+                    .writeFile(filename, png)
+                    .then(() => ({ contentType: "image/png", data: png }));
+                });
+            } else {
+              return undefined;
+            }
+          })
+        );
+    };

 export const axiosImageFetcher = (url: string): Promise<CoverArt | undefined> =>
  axios
@@ -412,12 +413,12 @@ interface SubsonicMusicLibrary extends MusicLibrary {
 }

 export class Subsonic implements MusicService {
-  url: string;
+  url: URLBuilder;
  streamClientApplication: StreamClientApplication;
  externalImageFetcher: ImageFetcher;

  constructor(
-    url: string,
+    url: URLBuilder,
    streamClientApplication: StreamClientApplication = DEFAULT,
    externalImageFetcher: ImageFetcher = axiosImageFetcher
  ) {
@@ -433,7 +434,7 @@ export class Subsonic implements MusicService {
    config: AxiosRequestConfig | undefined = {}
  ) =>
    axios
-      .get(`${this.url}${path}`, {
+      .get(this.url.append({ pathname: path }).href(), {
        params: asURLSearchParams({
          u: username,
          v: "1.16.1",
@@ -955,6 +956,7 @@ export class Subsonic implements MusicService {
    };

    if (credentials.type == "navidrome") {
+      // todo: there does not seem to be a test for this??
      return Promise.resolve({
        ...genericSubsonic,
        flavour: () => "navidrome",
@@ -963,7 +965,7 @@ export class Subsonic implements MusicService {
            TE.tryCatch(
              () =>
                axios.post(
-                  `${this.url}/auth/login`,
+                  this.url.append({ pathname: '/auth/login' }).href(),
                  _.pick(credentials, "username", "password")
                ),
              () => new AuthFailure("Failed to get bearerToken")
--- a/tests/config.test.ts
+++ b/tests/config.test.ts
@@ -374,23 +374,31 @@ describe("config", () => {
        "BONOB_NAVIDROME_URL",
      ])("%s", (k) => {
        describe(`when ${k} is not specified`, () => {
-          it(`should default to http://${hostname()}:4533`, () => {
-            expect(config().subsonic.url).toEqual(`http://${hostname()}:4533`);
+          it(`should default to http://${hostname()}:4533/`, () => {
+            expect(config().subsonic.url.href()).toEqual(`http://${hostname()}:4533/`);
          });
        });

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

        describe(`when ${k} is specified`, () => {
          it(`should use it for ${k}`, () => {
-            const url = "http://navidrome.example.com:1234";
+            const url = "http://navidrome.example.com:1234/some-context-path";
            process.env[k] = url;
-            expect(config().subsonic.url).toEqual(url);
+            expect(config().subsonic.url.href()).toEqual(url);
+          });
+        });
+
+        describe(`when ${k} is specified with trailing slash`, () => {
+          it(`should maintain the trailing slash as URLBuilder will remove it when required ${k}`, () => {
+            const url = "http://navidrome.example.com:1234/";
+            process.env[k] = url;
+            expect(config().subsonic.url.href()).toEqual(url);
          });
        });
      });
--- a/tests/i8n.test.ts
+++ b/tests/i8n.test.ts
@@ -34,7 +34,7 @@ describe("i8n", () => {

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

--- a/tests/server.test.ts
+++ b/tests/server.test.ts
@@ -755,15 +755,22 @@ describe("server", () => {
        const trackId = `t-${uuid()}`;
        const smapiAuthToken: SmapiToken = { token: `token-${uuid()}`, key: `key-${uuid()}` };

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

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

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

                expect(res.status).toEqual(404);
                expect(res.body).toEqual({});
+
+                expect(trackStream.stream.destroyed).toBe(true);
              });
            });
          });
@@ -916,6 +927,8 @@ describe("server", () => {
  
                expect(musicLibrary.nowPlaying).not.toHaveBeenCalled();
                expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                expect(stream.stream.destroyed).toBe(true);
              });
            });
  
@@ -959,6 +972,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1000,6 +1015,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1040,6 +1057,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1083,6 +1102,8 @@ describe("server", () => {
                  expect(musicService.login).toHaveBeenCalledWith(serviceToken);
                  expect(musicLibrary.nowPlaying).toHaveBeenCalledWith(trackId);
                  expect(musicLibrary.stream).toHaveBeenCalledWith({ trackId });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
            });
@@ -1131,6 +1152,8 @@ describe("server", () => {
                    trackId,
                    range: requestedRange,
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
  
@@ -1178,6 +1201,8 @@ describe("server", () => {
                    trackId,
                    range: "4000-5000",
                  });
+
+                  expect(stream.stream.destroyed).toBe(true);
                });
              });
            });
--- a/tests/smapi.test.ts
+++ b/tests/smapi.test.ts
@@ -135,8 +135,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"
          );
        });
@@ -519,30 +519,30 @@ describe("playlistAlbumArtURL", () => {
  });

  describe("when the playlist has external ids", () => {
+    const bonobUrl = url("http://localhost:1234/context-path?search=yes");
+    const externalArt1 = {
+      system: "external",
+      resource: "http://example.com/image1.jpg",
+    };
+    const externalArt2 = {
+      system: "external",
+      resource: "http://example.com/image2.jpg",
+    };
+
+    const playlist = aPlaylist({
+      entries: [
+        aTrack({
+          coverArt: externalArt1,
+          album: anAlbumSummary({ id: "album1" }),
+        }),
+        aTrack({
+          coverArt: externalArt2,
+          album: anAlbumSummary({ id: "album2" }),
+        }),
+      ],
+    });
+
    it("should format the url with encrypted urn", () => {
-      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)
@@ -551,6 +551,26 @@ describe("playlistAlbumArtURL", () => {
        )}/size/180?search=yes`
      );
    }); 
+
+    describe("when BNB_NO_PLAYLIST_ART is set", () => {
+      const OLD_ENV = process.env;
+
+      beforeEach(() => {
+        process.env = { ...OLD_ENV };
+    
+        process.env["BNB_DISABLE_PLAYLIST_ART"] = "true";
+      });
+    
+      afterEach(() => {
+        process.env = OLD_ENV;
+      });
+    
+      it("should return an icon", () => {
+        expect(playlistAlbumArtURL(bonobUrl, playlist).href()).toEqual(
+          `http://localhost:1234/context-path/icon/music/size/legacy?search=yes`
+        );
+      });
+    });
  });

  describe("when the playlist has 4 tracks from 2 different albums, including some tracks that are missing coverArt urns", () => {
@@ -1651,10 +1671,10 @@ describe("wsdl api", () => {
            });

            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];

--- a/tests/subsonic.test.ts
+++ b/tests/subsonic.test.ts
@@ -62,6 +62,7 @@ import {
 } from "./builders";
 import { b64Encode } from "../src/b64";
 import { BUrn } from "../src/burn";
+import { URLBuilder } from "../src/url_builder";

 describe("t", () => {
  it("should be an md5 of the password and the salt", () => {
@@ -688,7 +689,7 @@ describe("asTrack", () => {
 });

 describe("Subsonic", () => {
-  const url = "http://127.0.0.22:4567";
+  const url = new URLBuilder("http://127.0.0.22:4567/some-context-path");
  const username = `user1-${uuid()}`;
  const password = `pass1-${uuid()}`;
  const salt = "saltysalty";
@@ -756,7 +757,7 @@ describe("Subsonic", () => {
  
          expect(parseToken(token.serviceToken)).toEqual({ username, password, type: PING_OK["subsonic-response"].type })
  
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/ping.view`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/ping.view' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -777,7 +778,7 @@ describe("Subsonic", () => {
  
          expect(parseToken(token.serviceToken)).toEqual({ username, password, type })
  
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/ping.view`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/ping.view' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -802,11 +803,11 @@ describe("Subsonic", () => {
  
          expect(parseToken(token.serviceToken)).toEqual({ username, password, type: "navidrome", bearer: navidromeToken })
  
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/ping.view`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/ping.view' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
-          expect(axios.post).toHaveBeenCalledWith(`${url}/auth/login`, {
+          expect(axios.post).toHaveBeenCalledWith(url.append({ pathname: '/auth/login' }).href(), {
            username,
            password,
          });
@@ -848,7 +849,7 @@ describe("Subsonic", () => {
  
          expect(parseToken(refreshedToken.serviceToken)).toEqual({ username, password, type })
  
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/ping.view`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/ping.view' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -876,11 +877,11 @@ describe("Subsonic", () => {
  
          expect(parseToken(refreshedToken.serviceToken)).toEqual({ username, password, type: "navidrome", bearer: navidromeToken })
  
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/ping.view`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/ping.view' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
-          expect(axios.post).toHaveBeenCalledWith(`${url}/auth/login`, {
+          expect(axios.post).toHaveBeenCalledWith(url.append({ pathname: '/auth/login' }).href(), {
            username,
            password,
          });
@@ -927,6 +928,34 @@ describe("Subsonic", () => {
    });
  });

+  describe("bearerToken", () => {
+    describe("when flavour is generic subsonic", () => {
+      it("should return undefined", async () => {
+        const credentials = { username: "foo", password: "bar" };
+        const token = { ...credentials, type: "subsonic", bearer: undefined  }
+        const client = await subsonic.login(asToken(token));
+        
+        const bearerToken = await pipe(client.bearerToken(credentials))();
+        expect(bearerToken).toStrictEqual(E.right(undefined));
+      });
+    });
+
+    describe("when flavour is navidrome", () => {
+      it("should get a bearerToken from navidrome", async () => {
+        const credentials = { username: "foo", password: "bar" };
+        const token = { ...credentials, type: "navidrome", bearer: undefined  }
+        const client = await subsonic.login(asToken(token));
+
+        mockPOST.mockImplementationOnce(() => Promise.resolve(ok({ token: 'theBearerToken' })))
+        
+        const bearerToken = await pipe(client.bearerToken(credentials))();
+        expect(bearerToken).toStrictEqual(E.right('theBearerToken'));
+
+        expect(axios.post).toHaveBeenCalledWith(url.append({ pathname: '/auth/login' }).href(), credentials)
+      });
+    });
+  });
+
  describe("getting genres", () => {
    describe("when there are none", () => {
      beforeEach(() => {
@@ -941,7 +970,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getGenres`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getGenres' }).href(), {
          params: asURLSearchParams(authParamsPlusJson),
          headers,
        });
@@ -968,7 +997,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([{ id: b64Encode("genre1"), name: "genre1" }]);

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getGenres`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getGenres' }).href(), {
          params: asURLSearchParams(authParamsPlusJson),
          headers,
        });
@@ -1003,7 +1032,7 @@ describe("Subsonic", () => {
          { id: b64Encode("g4"), name: "g4" },
        ]);

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getGenres`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getGenres' }).href(), {
          params: asURLSearchParams(authParamsPlusJson),
          headers,
        });
@@ -1059,7 +1088,7 @@ describe("Subsonic", () => {
            similarArtists: artist.similarArtists,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1067,7 +1096,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1118,7 +1147,7 @@ describe("Subsonic", () => {
            similarArtists: artist.similarArtists,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1126,7 +1155,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1171,7 +1200,7 @@ describe("Subsonic", () => {
            similarArtists: artist.similarArtists,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1179,7 +1208,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1225,7 +1254,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1233,7 +1262,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1276,7 +1305,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1284,7 +1313,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1327,7 +1356,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1335,7 +1364,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1379,7 +1408,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1387,7 +1416,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1432,7 +1461,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1440,7 +1469,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1483,7 +1512,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1491,7 +1520,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1532,7 +1561,7 @@ describe("Subsonic", () => {
            similarArtists: [],
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtist`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1540,7 +1569,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtistInfo2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtistInfo2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: artist.id,
@@ -1661,7 +1690,7 @@ describe("Subsonic", () => {
            total: 1,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -1702,7 +1731,7 @@ describe("Subsonic", () => {
            total: 4,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -1730,7 +1759,7 @@ describe("Subsonic", () => {

          expect(artists).toEqual({ results: expectedResults, total: 4 });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -1786,12 +1815,12 @@ describe("Subsonic", () => {
            total: 2,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "byGenre",
@@ -1838,12 +1867,12 @@ describe("Subsonic", () => {
            total: 3,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "newest",
@@ -1889,12 +1918,12 @@ describe("Subsonic", () => {
            total: 2,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "recent",
@@ -1931,12 +1960,12 @@ describe("Subsonic", () => {
            total: 1,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "frequent",
@@ -1973,12 +2002,12 @@ describe("Subsonic", () => {
            total: 1,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "highest",
@@ -2024,12 +2053,12 @@ describe("Subsonic", () => {
          total: 1,
        });

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
          params: asURLSearchParams(authParamsPlusJson),
          headers,
        });

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            type: "alphabeticalByArtist",
@@ -2074,12 +2103,12 @@ describe("Subsonic", () => {
          total: 0,
        });

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
          params: asURLSearchParams(authParamsPlusJson),
          headers,
        });

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            type: "alphabeticalByArtist",
@@ -2139,12 +2168,12 @@ describe("Subsonic", () => {
            total: 6,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "alphabeticalByArtist",
@@ -2190,12 +2219,12 @@ describe("Subsonic", () => {
            total: 6,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbumList2`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbumList2' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              type: "alphabeticalByArtist",
@@ -2263,13 +2292,13 @@ describe("Subsonic", () => {
              total: 4,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2320,13 +2349,13 @@ describe("Subsonic", () => {
              total: 4,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2376,13 +2405,13 @@ describe("Subsonic", () => {
              total: 4,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2442,13 +2471,13 @@ describe("Subsonic", () => {
              total: 5,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2506,13 +2535,13 @@ describe("Subsonic", () => {
              total: 5,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2568,13 +2597,13 @@ describe("Subsonic", () => {
              total: 5,
            });

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getArtists`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getArtists' }).href(), {
              params: asURLSearchParams(authParamsPlusJson),
              headers,
            });

            expect(axios.get).toHaveBeenCalledWith(
-              `${url}/rest/getAlbumList2`,
+              url.append({ pathname: '/rest/getAlbumList2' }).href(),
              {
                params: asURLSearchParams({
                  ...authParamsPlusJson,
@@ -2620,7 +2649,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(album);

-        expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+        expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id: album.id,
@@ -2698,7 +2727,7 @@ describe("Subsonic", () => {

          expect(result).toEqual([track1, track2, track3, track4]);

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: album.id,
@@ -2745,7 +2774,7 @@ describe("Subsonic", () => {

          expect(result).toEqual([track]);

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: album.id,
@@ -2780,7 +2809,7 @@ describe("Subsonic", () => {

          expect(result).toEqual([]);

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: album.id,
@@ -2831,7 +2860,7 @@ describe("Subsonic", () => {
            rating: { love: true, stars: 4 },
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getSong`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getSong' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: track.id,
@@ -2839,7 +2868,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: album.id,
@@ -2878,7 +2907,7 @@ describe("Subsonic", () => {
            rating: { love: false, stars: 0 },
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getSong`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getSong' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: track.id,
@@ -2886,7 +2915,7 @@ describe("Subsonic", () => {
            headers,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getAlbum`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getAlbum' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: album.id,
@@ -3033,7 +3062,7 @@ describe("Subsonic", () => {
            });
            expect(result.stream).toEqual(stream);

-            expect(axios.get).toHaveBeenCalledWith(`${url}/rest/stream`, {
+            expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/stream' }).href(), {
              params: asURLSearchParams({
                ...authParams,
                id: trackId,
@@ -3139,7 +3168,7 @@ describe("Subsonic", () => {
          });
          expect(result.stream).toEqual(stream);

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/stream`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/stream' }).href(), {
            params: asURLSearchParams({
              ...authParams,
              id: trackId,
@@ -3182,7 +3211,7 @@ describe("Subsonic", () => {
            .then((it) => it.stream({ trackId, range: undefined }));

          expect(streamClientApplication).toHaveBeenCalledWith(track);
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/stream`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/stream' }).href(), {
            params: asURLSearchParams({
              ...authParams,
              id: trackId,
@@ -3224,7 +3253,7 @@ describe("Subsonic", () => {
            .then((it) => it.stream({ trackId, range }));

          expect(streamClientApplication).toHaveBeenCalledWith(track);
-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/stream`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/stream' }).href(), {
            params: asURLSearchParams({
              ...authParams,
              id: trackId,
@@ -3267,7 +3296,7 @@ describe("Subsonic", () => {
            data: streamResponse.data,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getCoverArt`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getCoverArt' }).href(), {
            params: asURLSearchParams({
              ...authParams,
              id: coverArtId,
@@ -3303,7 +3332,7 @@ describe("Subsonic", () => {
            data: streamResponse.data,
          });

-          expect(axios.get).toHaveBeenCalledWith(`${url}/rest/getCoverArt`, {
+          expect(axios.get).toHaveBeenCalledWith(url.append({ pathname: '/rest/getCoverArt' }).href(), {
            params: asURLSearchParams({
              ...authParams,
              id: coverArtId,
@@ -3429,7 +3458,7 @@ describe("Subsonic", () => {
          });

          expect(axios.get).toHaveBeenCalledWith(
-            `${url}/rest/getCoverArt`,
+            url.append({ pathname: '/rest/getCoverArt' }).href(),
            {
              params: asURLSearchParams({
                ...authParams,
@@ -3495,7 +3524,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/star`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/star' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: trackId,
@@ -3528,7 +3557,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/unstar`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/unstar' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: trackId,
@@ -3587,7 +3616,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/setRating`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/setRating' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: trackId,
@@ -3648,14 +3677,14 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/unstar`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/unstar' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: trackId,
            }),
            headers,
          });
-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/setRating`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/setRating' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              id: trackId,
@@ -3715,7 +3744,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(true);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/scrobble`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/scrobble' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id,
@@ -3744,7 +3773,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(false);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/scrobble`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/scrobble' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id,
@@ -3770,7 +3799,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(true);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/scrobble`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/scrobble' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id,
@@ -3799,7 +3828,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(false);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/scrobble`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/scrobble' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id,
@@ -3827,7 +3856,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([artistToArtistSummary(artist1)]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 20,
@@ -3861,7 +3890,7 @@ describe("Subsonic", () => {
          artistToArtistSummary(artist2),
        ]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 20,
@@ -3887,7 +3916,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 20,
@@ -3923,7 +3952,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([albumToAlbumSummary(album)]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -3973,7 +4002,7 @@ describe("Subsonic", () => {
          albumToAlbumSummary(album2),
        ]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -3999,7 +4028,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -4045,7 +4074,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -4117,7 +4146,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track1, track2]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -4143,7 +4172,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/search3`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/search3' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            artistCount: 0,
@@ -4174,7 +4203,7 @@ describe("Subsonic", () => {

          expect(result).toEqual([playlist]);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getPlaylists`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getPlaylists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -4199,7 +4228,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(playlists);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getPlaylists`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getPlaylists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -4219,7 +4248,7 @@ describe("Subsonic", () => {

          expect(result).toEqual([]);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getPlaylists`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getPlaylists' }).href(), {
            params: asURLSearchParams(authParamsPlusJson),
            headers,
          });
@@ -4304,7 +4333,7 @@ describe("Subsonic", () => {
              ],
            });

-            expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getPlaylist`, {
+            expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getPlaylist' }).href(), {
              params: asURLSearchParams({
                ...authParamsPlusJson,
                id,
@@ -4331,7 +4360,7 @@ describe("Subsonic", () => {

            expect(result).toEqual(playlist);

-            expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getPlaylist`, {
+            expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getPlaylist' }).href(), {
              params: asURLSearchParams({
                ...authParamsPlusJson,
                id: playlist.id,
@@ -4359,7 +4388,7 @@ describe("Subsonic", () => {

        expect(result).toEqual({ id, name });

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/createPlaylist`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/createPlaylist' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            f: "json",
@@ -4383,7 +4412,7 @@ describe("Subsonic", () => {

        expect(result).toEqual(true);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/deletePlaylist`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/deletePlaylist' }).href(), {
          params: asURLSearchParams({
            ...authParamsPlusJson,
            id,
@@ -4408,7 +4437,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/updatePlaylist`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/updatePlaylist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              playlistId,
@@ -4433,7 +4462,7 @@ describe("Subsonic", () => {

          expect(result).toEqual(true);

-          expect(mockGET).toHaveBeenCalledWith(`${url}/rest/updatePlaylist`, {
+          expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/updatePlaylist' }).href(), {
            params: asURLSearchParams({
              ...authParamsPlusJson,
              playlistId,
@@ -4480,7 +4509,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track1]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getSimilarSongs2`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getSimilarSongs2' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
@@ -4550,7 +4579,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track1, track2, track3]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getSimilarSongs2`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getSimilarSongs2' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
@@ -4577,7 +4606,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getSimilarSongs2`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getSimilarSongs2' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
@@ -4644,7 +4673,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track1]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getTopSongs`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getTopSongs' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
@@ -4711,7 +4740,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([track1, track2, track3]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getTopSongs`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getTopSongs' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
@@ -4751,7 +4780,7 @@ describe("Subsonic", () => {

        expect(result).toEqual([]);

-        expect(mockGET).toHaveBeenCalledWith(`${url}/rest/getTopSongs`, {
+        expect(mockGET).toHaveBeenCalledWith(url.append({ pathname: '/rest/getTopSongs' }).href(), {
          params: asURLSearchParams({
            ...authParams,
            f: "json",
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -50,7 +50,7 @@
    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
    "typeRoots": [
      "./typings",
-      "node_modules/@types"
+      "./node_modules/@types"
    ]
     /* List of folders to include type definitions from. */,
    // "types": ["src/customTypes/scale-that-svg.d.ts"],                           /* Type declaration files to be included in compilation. */
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
dependabot[bot]	e522caeb29	Bump axios from 1.5.1 to 1.6.0 Bumps [axios](https://github.com/axios/axios) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.5.1...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-11-11 10:51:37 +00: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