ar

.devcontainer/Dockerfile

@@ -1,16 +0,0 @@
-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

.devcontainer/devcontainer.json

@@ -1,28 +0,0 @@
-{
-    "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"
-        ]
-        }
-    }
-}

.dockerignore

@@ -1,6 +0,0 @@
-.devcontainer
-.github
-.yarn/cache
-.yarn/install-state.gz
-build
-node_modules

.github/workflows/ci.yml

@@ -1,76 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches:
-      - 'master'
-    tags:
-      - 'v*'
-  pull_request:
-    branches:
-      - 'master'
-
-jobs:
-
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Check out the repo
-        uses: actions/checkout@v3
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      -
-        run: npm install
-      -
-        run: npm test
-
-
-  push_to_registry:
-    name: Push Docker image to Docker registries
-    needs: build_and_test
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Check out the repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            simojenki/bonob
-            ghcr.io/simojenki/bonob
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Log in to GitHub Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Push image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/master.yml

@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches: [ master ]
+  # pull_request:
+  #   branches: [ master ]
+
+jobs:
+
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: yarn install
+      - run: yarn test
+
+  push_to_registry:
+    needs: build_and_test
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: simojenki/bonob
+          tag_with_ref: true      

.github/workflows/pr.yml

@@ -0,0 +1,15 @@
+name: Test PR
+
+on: pull_request
+
+jobs:
+
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: yarn install
+      - run: yarn test

.gitignore

@@ -2,7 +2,6 @@
 .vscode
 build
 ignore
-.ignore
 node_modules
 .yarn/*
 !.yarn/patches
@@ -11,6 +10,3 @@ node_modules
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
-log.txt
-navidrome.txt
-bonob.txt

.npmrc

@@ -1 +0,0 @@
-fetch-timeout=60000

.nvmrc

@@ -0,0 +1 @@
+16.6.2

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-berry.cjs

CLAUDE.md

@@ -1,187 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-bonob is a Sonos SMAPI (Sonos Music API) implementation that bridges Subsonic API clones (like Navidrome and Gonic) with Sonos devices. It acts as a middleware service that translates between the Subsonic API and Sonos's proprietary music service protocol, allowing users to stream their personal music libraries to Sonos speakers.
-
-## Development Commands
-
-### Building and Running
-```bash
-# Build TypeScript to JavaScript
-npm run build
-
-# Development mode with auto-reload (requires environment variables)
-npm run dev
-# OR with auto-registration
-npm run devr
-
-# Register bonob service with Sonos devices
-npm run register-dev
-```
-
-### Testing
-```bash
-# Run all tests
-npm test
-
-# Run tests in watch mode
-npm run testw
-
-# Set custom test timeout (default: 5000ms)
-JEST_TIMEOUT=10000 npm test
-```
-
-### Environment Variables for Development
-When running locally, you need to set several environment variables:
-- `BNB_DEV_HOST_IP`: Your machine's IP address (so Sonos can reach bonob)
-- `BNB_DEV_SONOS_DEVICE_IP`: IP address of a Sonos device for discovery
-- `BNB_DEV_SUBSONIC_URL`: URL of your Subsonic API server (e.g., Navidrome)
-
-## Architecture
-
-### Core Components
-
-**`src/app.ts`** - Application entry point
-- Reads configuration from environment variables
-- Initializes all services (Subsonic, Sonos, authentication)
-- Wires together the Express server with appropriate dependencies
-- Handles SIGTERM for graceful shutdown
-
-**`src/server.ts`** - Express HTTP server
-- Serves web UI for service registration and login
-- Handles music streaming (`/stream/track/:id`)
-- Generates icons and cover art (`/icon/...`, `/art/...`)
-- Serves Sonos-specific XML files (strings, presentation map)
-- Binds SOAP service for Sonos SMAPI communication
-
-**`src/smapi.ts`** - Sonos SMAPI SOAP implementation (1200+ lines)
-- Implements the Sonos Music API Protocol via SOAP/XML
-- Core operations: `getMetadata`, `getMediaURI`, `search`, `getExtendedMetadata`
-- Handles authentication flow with link codes and device auth tokens
-- Manages token refresh and session management
-- Maps music library concepts to Sonos browse hierarchy
-
-**`src/subsonic.ts`** - Subsonic API client
-- Implements `MusicService` and `MusicLibrary` interfaces
-- Handles authentication with Subsonic servers using token-based auth
-- Translates between Subsonic data models and bonob's domain types
-- Supports custom player configurations for transcoding
-- Special handling for Navidrome (bearer token authentication)
-- Implements artist image fetching with optional caching
-
-**`src/music_service.ts`** - Core domain types and interfaces
-- Defines `MusicService` interface (auth and login)
-- Defines `MusicLibrary` interface (browsing, search, streaming, rating, scrobbling)
-- Domain types: `Artist`, `Album`, `Track`, `Playlist`, `Genre`, `Rating`, etc.
-- Uses `fp-ts` for functional programming patterns (`TaskEither`, `Option`, `Either`)
-
-**`src/sonos.ts`** - Sonos device discovery and registration
-- Discovers Sonos devices on the network using SSDP/UPnP
-- Registers/unregisters bonob as a music service with Sonos systems
-- Supports both auto-discovery and seed-host based discovery
-- Uses `@svrooij/sonos` library for device communication
-
-**`src/smapi_auth.ts`** - Authentication token management
-- Implements JWT-based SMAPI tokens (token + key pairs)
-- Handles token verification and expiry
-- Token refresh flow using `fp-ts` `TaskEither`
-
-**`src/config.ts`** - Configuration management
-- Reads and validates environment variables (all prefixed with `BNB_`)
-- Legacy environment variable support (BONOB_ prefix)
-- Type-safe configuration with defaults
-
-### Key Abstractions
-
-**BUrn (Bonob URN)** - Resource identifier system (`src/burn.ts`)
-- Format: `{ system: string, resource: string }`
-- Systems: `subsonic` (for cover art), `external` (for URLs like Spotify images)
-- Used for abstracting art/image sources across different backends
-
-**URL Builder** (`src/url_builder.ts`)
-- Wraps URL manipulation with a builder pattern
-- Handles context path for reverse proxy deployments
-- Used throughout for generating URLs that Sonos devices can access
-
-**Custom Players** (`src/subsonic.ts`)
-- Allows mime-type specific transcoding configurations
-- Maps source mime types to transcoded types
-- Creates custom "client" names in Subsonic (e.g., "bonob+audio/flac")
-- Example: `BNB_SUBSONIC_CUSTOM_CLIENTS="audio/flac>audio/mp3"`
-
-### Data Flow
-
-1. **Sonos App Request** → SOAP endpoint (`/ws/sonos`)
-2. **SOAP Service** → Verifies auth token, calls `MusicLibrary` methods
-3. **MusicLibrary** → Makes Subsonic API calls, transforms data
-4. **SOAP Response** → Returns XML formatted for Sonos
-
-For streaming:
-1. **Sonos Device** → `GET /stream/track/:id` with custom headers (bnbt, bnbk)
-2. **Stream Handler** → Verifies token, calls `MusicLibrary.stream()`
-3. **Subsonic Stream** → Proxies audio with proper mime-type handling
-4. **Response** → Streams audio to Sonos, reports "now playing"
-
-### Icon System (`src/icon.ts`)
-- SVG-based icon generation with dynamic colors
-- Supports foreground/background color customization via `BNB_ICON_FOREGROUND_COLOR` and `BNB_ICON_BACKGROUND_COLOR`
-- Genre-specific icons
-- Text overlay support (e.g., year icons like "1984")
-- Holiday/festival decorations (auto-applied based on date)
-- Legacy mode: renders to 80x80 PNG for older Sonos systems
-
-### Authentication Flow
-1. Sonos app requests link code via `getAppLink()`
-2. User visits login URL with link code
-3. User enters Subsonic credentials
-4. bonob validates with Subsonic, generates service token
-5. bonob associates link code with service token
-6. Sonos polls `getDeviceAuthToken()` with link code
-7. bonob returns SMAPI token (JWT) to Sonos
-8. Subsequent requests use SMAPI token, which maps to service token
-
-### Testing Philosophy
-- Jest with ts-jest preset
-- In-memory implementations for `LinkCodes`, `APITokens` for testing
-- Mocking with `ts-mockito`
-- Test helpers in `tests/` directory
-- Console.log suppressed in tests (see `tests/setup.js`)
-
-## Common Patterns
-
-### Error Handling
-- Use `fp-ts` `TaskEither<AuthFailure, T>` for async operations that can fail with auth errors
-- SOAP faults for Sonos-specific errors (see SMAPI_FAULT_* constants)
-- Promise-based error handling with `.catch()` for most async operations
-
-### Type Safety
-- Strict TypeScript (`strict: true`, `noImplicitAny: true`, `noUncheckedIndexedAccess: true`)
-- Extensive use of discriminated unions
-- Interface-based design for pluggable services
-
-### Logging
-- Winston-based logger (`src/logger.ts`)
-- Log level controlled by `BNB_LOG_LEVEL`
-- Request logging optional via `BNB_SERVER_LOG_REQUESTS`
-
-### Functional Programming
-- Heavy use of `fp-ts` for `Option`, `Either`, `TaskEither`
-- Pipe-based composition (`pipe(data, fn1, fn2, ...)`)
-- Immutable data transformations
-
-## File Organization
-- `src/` - TypeScript source code
-- `tests/` - Jest test files (mirrors src/ structure)
-- `build/` - Compiled JavaScript (gitignored)
-- `web/` - HTML templates (Eta templating) and static assets
-- `typings/` - Custom TypeScript definitions
-
-## Important Constraints
-- bonob must be accessible from Sonos devices at `BNB_URL`
-- `BNB_URL` cannot contain "localhost" (validation error)
-- Sonos requires specific XML formats (SMAPI WSDL v1.19.6)
-- Streaming must handle HTTP range requests for seek functionality
-- Token lifetime (`BNB_AUTH_TIMEOUT`) should be less than Subsonic session timeout

DOCUMENTATION.md

@@ -1,91 +0,0 @@
-# Bonob Source Code Documentation
-
-This document provides an overview of the source files in the `src` directory, explaining the purpose and functionality of each.
-
-### `api_tokens.ts`
-
-Manages API tokens for authentication. It includes an in-memory implementation for storing and retrieving tokens, using SHA256 to mint new tokens.
-
-### `app.ts`
-
-This is the main entry point of the application. It initializes the server, configures the music service (Subsonic), and sets up the integration with Sonos. It reads the application config, sets up the Subsonic connection, and starts the Express server.
-
-### `b64.ts`
-
-Provides simple utility functions for Base64 encoding and decoding of strings.
-
-### `burn.ts`
-
-Handles the creation and parsing of "Bonob URNs" (BURNs), which are unique resource identifiers used within the system. It supports encryption and shorthand notations for more compact URNs.
-
-### `clock.ts`
-
-Provides an abstraction for time-related functions, which is useful for testing. It includes a `SystemClock` that uses the actual system time and a `FixedClock` for tests. It also contains logic for detecting special dates like Christmas and Halloween for seasonal features.
-
-### `config.ts`
-
-Manages the application's configuration by reading environment variables. It defines settings for the server, Sonos integration, Subsonic connection, and other features like scrobbling.
-
-### `encryption.ts`
-
-Implements encryption and decryption functionality using JSON Web Signatures (JWS). It provides a simple interface for encrypting and decrypting strings.
-
-### `i8n.ts`
-
-Handles internationalization (i18n) by providing translations for different languages supported by the Sonos app. It includes translations for UI elements and messages.
-
-### `icon.ts`
-
-Manages SVG icons used in the Sonos app. It allows for transformations like changing colors and applying special styles for festivals and holidays.
-
-### `link_codes.ts`
-
-Implements a system for linking Sonos devices with user accounts. It generates temporary codes that users can use to log in and associate their accounts.
-
-### `logger.ts`
-
-Configures the application-wide logger using Winston. It sets up logging levels and formats.
-
-### `music_service.ts`
-
-Defines the interfaces for a generic music service. This includes methods for authentication, browsing content (artists, albums, tracks), streaming audio, and managing playlists.
-
-### `register.ts`
-
-A command-line script used to register the Bonob service with Sonos devices on the local network.
-
-### `registrar.ts`
-
-Contains the core logic for registering the Bonob service with Sonos devices. It fetches service details from the Bonob server and sends the registration request to a Sonos device.
-
-### `server.ts`
-
-Sets up the Express web server. It defines the routes for the web interface, the Sonos Music API (SMAPI) endpoints, and audio streaming. It also handles user authentication and session management.
-
-### `smapi_auth.ts`
-
-Handles authentication for the Sonos Music API (SMAPI). It is responsible for issuing and verifying JWTs (JSON Web Tokens) that secure the communication between Sonos devices and the Bonob server.
-
-### `smapi_token_store.ts`
-
-Provides an interface and two implementations (in-memory and file-based) for storing SMAPI authentication tokens. This allows the server to persist user sessions.
-
-### `smapi.ts`
-
-Implements the Sonos Music API (SMAPI) using SOAP. This file is responsible for handling all the requests from Sonos devices, such as browsing music, searching, and getting track metadata.
-
-### `sonos.ts`
-
-Manages interactions with Sonos devices on the local network. This includes device discovery and service registration.
-
-### `subsonic.ts`
-
-Implements the `MusicService` interface for Subsonic-compatible media servers (like Navidrome). It handles all communication with the Subsonic API to fetch music data and stream audio.
-
-### `url_builder.ts`
-
-A utility class for building and manipulating URLs in a structured way.
-
-### `utils.ts`
-
-Contains miscellaneous utility functions used throughout the application, such as a function for tidying up XML strings.

Dockerfile

@@ -1,77 +1,46 @@
-FROM node:22-trixie-slim AS build
+FROM node:16.6-alpine as build
 
 WORKDIR /bonob
 
-COPY .git ./.git
 COPY src ./src
-COPY docs ./docs
-COPY typings ./typings
 COPY web ./web
 COPY tests ./tests
 COPY jest.config.js .
-COPY register.js .
-COPY .npmrc .
-COPY tsconfig.json .
 COPY package.json .
-COPY package-lock.json .
+COPY register.js .
+COPY tsconfig.json .
+COPY yarn.lock .
+COPY .yarnrc.yml .
+COPY .yarn/releases ./.yarn/releases
 
-ENV JEST_TIMEOUT=60000
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get -y install --no-install-recommends \
-        libvips-dev \
+RUN apk add --no-cache --update --virtual .gyp \
+        vips-dev \
         python3 \
         make \
-        git \
         g++ && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    npm install && \
-    npm test && \
-    npm run gitinfo && \
-    npm run build && \
-    rm -Rf node_modules && \
-    NODE_ENV=production npm install --omit=dev
+    yarn install --immutable && \
+    yarn test --no-cache && \
+    yarn build
 
 
-FROM node:22-trixie-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"
+FROM node:16.6-alpine
 
-ENV BNB_PORT=4534
-ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=UTC
+ENV BONOB_PORT=4534
 
-EXPOSE $BNB_PORT
+EXPOSE $BONOB_PORT
 
 WORKDIR /bonob
 
 COPY package.json .
-COPY package-lock.json .
-
-COPY --from=build /bonob/build/src ./src
+COPY yarn.lock .
+COPY --from=build /bonob/build/src/* ./
 COPY --from=build /bonob/node_modules ./node_modules
-COPY --from=build /bonob/.gitinfo ./
-COPY web ./web
-COPY src/Sonoswsdl-1.19.6-20231024.wsdl ./src/Sonoswsdl-1.19.6-20231024.wsdl
+COPY web web
+COPY src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl /bonob/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
 
-RUN apt-get update && \
-    apt-get -y upgrade && \
-    apt-get -y install --no-install-recommends \
-        libvips \
-        tzdata \
-        wget && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache --update vips
 
 USER nobody 
-WORKDIR /bonob/src
 
-HEALTHCHECK CMD wget -O- http://localhost:${BNB_PORT}/about || exit 1   
-
-CMD ["node", "app.js"]
+CMD ["node", "./app.js"]

README.md

@@ -2,69 +2,50 @@
 
 A sonos SMAPI implementation to allow registering sources of music with sonos.  
 
-Support for Subsonic API clones (tested against Navidrome and Gonic).
+Currently only a single integration allowing Navidrome to be registered with sonos. In theory as Navidrome implements the subsonic API, it *may* work with other subsonic api clones.
 
 ![Build](https://github.com/simojenki/bonob/workflows/Build/badge.svg)
 
 ## Features
 
-- Integrates with Subsonic API clones (Navidrome, Gonic)
-- Browse by Artist, Albums, Random, Favourites, Top Rated, Playlist, Genres, Years, Recently Added Albums, Recently Played Albums, Most Played Albums
-- Artist & Album Art
+- Integrates with Navidrome
+- Browse by Artist, Albums, Genres, Playlist, Random Albums, Starred Albums, Recently Added Albums, Recently Played Albums, Most Played Albums
+- Artist Art
+- Album Art
 - View Related Artists via Artist -> '...' -> Menu -> Related Arists
 - Now playing & Track Scrobbling
-- Search by Album, Artist, Track
-- Playlist editing through sonos app.
-- Marking of songs as favourites and with ratings through the sonos app.
-- Localization (only en-US, da-DK, nl-NL & 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
+- Auto register bonob service with sonos system
 - Multiple registrations within a single household.
-- Transcoding within subsonic clone
-- Custom players by mime type, allowing custom transcoding rules for different file types
+- Transcoding performed by Navidrome with specific player for bonob/sonos, customisable by mimeType
+- Ability to search by Album, Artist, Track
+- Ability to play a playlist
+- Ability to add/remove playlists
+- Ability to add/remove tracks from a playlist
 
 ## Running
 
-bonob is packaged as an OCI image to both the docker hub registry and github registry.
+bonob is ditributed via docker and can be run in a number of ways
 
-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
+### Full sonos device auto-discovery by using docker --network host
 
 ```bash
 docker run \
-    -e BNB_SONOS_AUTO_REGISTER=true \
-    -e BNB_SONOS_DEVICE_DISCOVERY=true \
     -p 4534:4534 \
     --network host \
     simojenki/bonob
 ```
 
-Now open http://localhost:4534 in your browser, you should see sonos devices, and service configuration.  Bonob will auto-register itself with your sonos system on startup.
+Now open http://localhost:4534 in your browser, you should see sonos devices, and service configuration.  By pressing 'Re-register' bonob will register itself in your sonos system, and should then show up in the "Services" list.
 
 ### Full sonos device auto-discovery and auto-registration on custom port by using a sonos seed device, without requiring docker host networking
 
 ```bash
 docker run \
-    -e BNB_PORT=3000 \
-    -e BNB_SONOS_SEED_HOST=192.168.1.123 \
-    -e BNB_SONOS_AUTO_REGISTER=true \
-    -e BNB_SONOS_DEVICE_DISCOVERY=true \
+    -e BONOB_PORT=3000 \
+    -e BONOB_SONOS_AUTO_REGISTER=true \
+    -e BONOB_SONOS_SEED_HOST=192.168.1.123 \
     -p 3000:3000 \
     simojenki/bonob
 ```
@@ -81,21 +62,19 @@ Start bonob outside the LAN with sonos discovery & registration disabled as they
 
 ```bash
 docker run \
-    -e BNB_PORT=4534 \
-    -e BNB_SONOS_SERVICE_NAME=MyAwesomeMusic \
-    -e BNB_SECRET=changeme \
-    -e BNB_URL=https://my-server.example.com/bonob \
-    -e BNB_SONOS_AUTO_REGISTER=false \
-    -e BNB_SONOS_DEVICE_DISCOVERY=false \
-    -e BNB_SUBSONIC_URL=https://my-navidrome-service.com:4533 \
+    -e BONOB_PORT=4534 \
+    -e BONOB_SONOS_SERVICE_NAME=MyAwesomeMusic \
+    -e BONOB_SECRET=changeme \
+    -e BONOB_URL=https://my-server.example.com/bonob \
+    -e BONOB_SONOS_AUTO_REGISTER=false \
+    -e BONOB_SONOS_DEVICE_DISCOVERY=false \
+    -e BONOB_NAVIDROME_URL=https://my-navidrome-service.com:4533 \
     -p 4534:4534 \
     simojenki/bonob
 ```
 
 Now within the LAN that contains the sonos devices run bonob the registration process.
 
-#### Using auto-discovery
-
 ```bash
 docker run \
     --rm \
@@ -103,15 +82,6 @@ docker run \
     simojenki/bonob register https://my-server.example.com/bonob
 ```
 
-#### Using a seed host
-
-```bash
-docker run \
-    --rm \
-    -e BNB_SONOS_SEED_HOST=192.168.1.163 \
-    simojenki/bonob register https://my-server.example.com/bonob
-```
-
 ### Running bonob and navidrome using docker-compose
 
 ```yaml
@@ -139,156 +109,52 @@ services:
       - "4534:4534"
     restart: unless-stopped
     environment:
-      BNB_PORT: 4534
+      BONOB_PORT: 4534
       # 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_SERVICE_ID: 246
+      BONOB_URL: http://192.168.1.111:4534  
+      BONOB_SECRET: changeme
+      BONOB_SONOS_SERVICE_ID: 246 
+      BONOB_SONOS_AUTO_REGISTER: "true"
+      BONOB_SONOS_DEVICE_DISCOVERY: "true"
       # ip address of one of your sonos devices
-      BNB_SONOS_SEED_HOST: 192.168.1.121
-      BNB_SUBSONIC_URL: http://navidrome:4533
+      BONOB_SONOS_SEED_HOST: 192.168.1.121
+      BONOB_NAVIDROME_URL: http://navidrome:4533
 ```
 
-### Running bonob on synology
-
-[See this issue](https://github.com/simojenki/bonob/issues/15)
-
 ## Configuration
 
 item | default value | description
 ---- | ------------- | -----------
-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. <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)
-BNB_ICON_BACKGROUND_COLOR | undefined | Icon background color in sonos app, must be a valid [svg color](https://www.december.com/html/spec/colorsvg.html)
-TZ | UTC | Your timezone from the [tz database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) ie. 'Australia/Melbourne'
+BONOB_PORT | 4534 | Default http port for bonob to listen on
+BONOB_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.**
+BONOB_SECRET | bonob | secret used for encrypting credentials
+BONOB_SONOS_AUTO_REGISTER | false | Whether or not to try and auto-register on startup
+BONOB_SONOS_DEVICE_DISCOVERY | true | whether or not sonos device discovery should be enabled
+BONOB_SONOS_SEED_HOST | undefined | sonos device seed host for discovery, or ommitted for for auto-discovery
+BONOB_SONOS_SERVICE_NAME | bonob | service name for sonos
+BONOB_SONOS_SERVICE_ID | 246 | service id for sonos
+BONOB_NAVIDROME_URL | http://$(hostname):4533 | URL for navidrome
+BONOB_NAVIDROME_CUSTOM_CLIENTS | undefined | Comma delimeted mime types for custom navidrome clients when streaming. ie. "audio/flac,audio/ogg" would use client = 'bonob+audio/flac' for flacs, and 'bonob+audio/ogg' for oggs.
+BONOB_SCROBBLE_TRACKS | true | Whether to scrobble the playing of a track if it has been played for >30s
+BONOB_REPORT_NOW_PLAYING | true | Whether to report a track as now playing
 
 ## Initialising service within sonos app
 
-- Configure bonob, make sure to set BNB_URL. **bonob must be accessible from your sonos devices on BNB_URL, otherwise it will fail to initialise within the sonos app, so make sure you test this in your browser by putting BNB_URL in the address bar and seeing the bonob information page**
-- Start bonob
 - Open sonos app on your device
 - Settings -> Services & Voice -> + Add a Service
-- Select your Music Service, default name is 'bonob', can be overriden with configuration BNB_SONOS_SERVICE_NAME
+- Select your Music Service, default name is 'bonob', can be overriden with configuration BONOB_SONOS_SERVICE_NAME
 - Press 'Add to Sonos' -> 'Linking sonos with bonob' -> Authorize
-- Your device should open a browser and you should now see a login screen, enter your subsonic clone credentials
+- Your device should open a browser and you should now see a login screen, enter your navidrome credentials
 - You should get 'Login successful!'
 - Go back into the sonos app and complete the process
-- You should now be able to play music on your sonos devices from you subsonic clone
-- Within the subsonic clone a new player will be created, 'bonob (username)', so you can configure transcoding specifically for sonos
+- You should now be able to play music from navidrome
+- Within navidrome a new player will be created, 'bonob (username)', so you can configure transcoding specifically for sonos
 
-## Re-registering your bonob service with sonos App
-
-Generally speaking you will not need to do this very often.  However on occassion bonob will change the implementation of the authentication between sonos and bonob, which will require a re-registration.  Your sonos app will complain about not being able to browse the service, to re-register execute the following steps (taken from the iOS app);
-
-- Open the sonos app
-- Settings -> Services & Voice
-- Your bonob service, will likely have name of either 'bonob' or $BNB_SONOS_SERVICE_NAME
-- Reauthorize Account
-- Authorize
-- Enter credentials, you should see 'Login Successful!'
-- Done
-
-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
+## Implementing a different music source other than navidrome
 
 - Implement the MusicService/MusicLibrary interface
 - Startup bonob with your new implementation.
 
-## Transcoding
+## TODO
 
-### Transcode everything
-
-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
-
-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) or [this](https://stackoverflow.com/questions/52119489/ffmpeg-limit-audio-sample-rate):
-
-```bash
-ffmpeg -i %s -af aformat=sample_fmts=s16|s32:sample_rates=8000|11025|16000|22050|24000|32000|44100|48000 -f flac -
-```
-
-**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 \
--e BNB_ICON_BACKGROUND_COLOR=darkgrey
-```
-
-![White & Dark Grey](https://github.com/simojenki/bonob/blob/master/docs/images/whiteDarkGrey.png?raw=true)
-
-```bash
--e BNB_ICON_FOREGROUND_COLOR=chartreuse \
--e BNB_ICON_BACKGROUND_COLOR=fuchsia
-```
-
-![Chartreuse & Fuchsia](https://github.com/simojenki/bonob/blob/master/docs/images/chartreuseFuchsia.png?raw=true)
-
-```bash
--e BNB_ICON_FOREGROUND_COLOR=lime \
--e BNB_ICON_BACKGROUND_COLOR=aliceblue
-```
-
-![Lime & Alice Blue](https://github.com/simojenki/bonob/blob/master/docs/images/limeAliceBlue.png?raw=true)
-
-```bash
--e 'BNB_ICON_FOREGROUND_COLOR=#1db954' \
--e 'BNB_ICON_BACKGROUND_COLOR=#121212'
-```
-
-![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
+- Artist Radio

UPDATES.md

@@ -1,45 +0,0 @@
-# Updates for SMAPI
-
-Run Bonob on your server.
-
-Bonob now needs a volume to store OAuth Tokens. In the example below that directory is `/var/containers/bonob`. Adapt as needed.
-Also the example below uses a `bonob` user on the system with ID `1210` and group `100`. The directory should be owned by that user.
-
-Example systemd file (`/usr/lib/systemd/system/bonob.service`):
-```
-[Unit]
-Description=bonob Container Service
-Wants=network.target
-After=network-online.target
-
-[Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=always
-ExecStartPre=-/usr/bin/podman rm -f bonob
-ExecStart=/usr/bin/podman run --rm \
-  --name bonob \
-  --label "io.containers.autoupdate=image" \
-  --user 1210:100 \
-  --env BNB_SONOS_SERVICE_NAME="Navidrome" \
-  --env BNB_PORT=8200 \
-  --env BNB_URL="https://bonob.mydomain.com" \
-  --env BNB_SECRET="Some random string" \
-  --env BNB_SONOS_SERVICE_ID=Your Sonos ID \
-  --env BNB_SUBSONIC_URL=https://music.mydomain.com \
-  --env BNB_ICON_FOREGROUND_COLOR="black" \
-  --env BNB_ICON_BACKGROUND_COLOR="#65d7f4" \
-  --env BNB_SONOS_AUTO_REGISTER=false \
-  --env BNB_SONOS_DEVICE_DISCOVERY=false \
-  --env BNB_LOG_LEVEL="info" \
-  --env TZ="Europe/Vienna" \
-  --volume /var/containers/bonob:/config:Z \
-  --publish 8200:8200 \
-  quay.io/wkulhanek/bonob:latest
-ExecStop=/usr/bin/podman rm -f bonob
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=bonob
-
-[Install]
-WantedBy=multi-user.target default.target
-```

etc/docker-compose.yaml

@@ -22,13 +22,13 @@ services:
       - "4534:4534"
     restart: unless-stopped
     environment:
-      BNB_PORT: 4534
+      BONOB_PORT: 4534
       # ip address of your machine running bonob
-      BNB_URL: http://192.168.1.111:4534  
-      BNB_SECRET: changeme
-      BNB_SONOS_SERVICE_ID: 246 
-      BNB_SONOS_AUTO_REGISTER: "true"
-      BNB_SONOS_DEVICE_DISCOVERY: "true"
+      BONOB_URL: http://192.168.1.111:4534  
+      BONOB_SECRET: changeme
+      BONOB_SONOS_SERVICE_ID: 246 
+      BONOB_SONOS_AUTO_REGISTER: "true"
+      BONOB_SONOS_DEVICE_DISCOVERY: "true"
       # ip address of one of your sonos devices
-      BNB_SONOS_SEED_HOST: 192.168.1.121
-      BNB_SUBSONIC_URL: http://navidrome:4533
+      BONOB_SONOS_SEED_HOST: 192.168.1.121
+      BONOB_NAVIDROME_URL: http://navidrome:4533

jest.config.js

@@ -2,9 +2,4 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   setupFilesAfterEnv: ["<rootDir>/tests/setup.js"],
-  modulePathIgnorePatterns: [
-    '<rootDir>/node_modules',
-    '<rootDir>/build',
-  ],
-  testTimeout: Number.parseInt(process.env["JEST_TIMEOUT"] || "5000")
 };

package.json

@@ -6,72 +6,50 @@
   "author": "simojenki <simojenki@users.noreply.github.com>",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@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",
-    "better-sqlite3": "^12.4.1",
-    "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",
+    "@svrooij/sonos": "^2.3.0",
+    "@types/express": "^4.17.11",
+    "@types/morgan": "^1.9.2",
+    "@types/node": "^14.14.22",
+    "@types/sharp": "^0.27.1",
+    "@types/underscore": "1.10.24",
+    "@types/uuid": "^8.3.0",
+    "axios": "^0.21.1",
+    "dayjs": "^1.10.4",
+    "eta": "^1.12.1",
+    "express": "^4.17.1",
+    "fp-ts": "^2.9.5",
     "morgan": "^1.10.0",
-    "node-html-parser": "^6.1.13",
-    "randomstring": "^1.3.0",
-    "sharp": "^0.33.5",
-    "soap": "^1.1.6",
-    "ts-md5": "^1.3.1",
-    "typescript": "^5.7.2",
-    "underscore": "^1.13.7",
-    "urn-lib": "^2.0.0",
-    "uuid": "^11.0.3",
-    "winston": "^3.17.0",
-    "xmldom-ts": "^0.3.1",
-    "xpath": "^0.0.34"
+    "node-html-parser": "^2.1.0",
+    "sharp": "^0.27.2",
+    "soap": "^0.37.0",
+    "ts-md5": "^1.2.7",
+    "typescript": "^4.1.3",
+    "underscore": "^1.12.1",
+    "uuid": "^8.3.2",
+    "winston": "^3.3.3",
+    "x2js": "^3.4.1"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@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",
+    "@types/chai": "^4.2.14",
+    "@types/jest": "^26.0.20",
+    "@types/mocha": "^8.2.0",
+    "@types/supertest": "^2.0.10",
+    "chai": "^4.2.0",
+    "get-port": "^5.1.1",
+    "jest": "^26.6.3",
+    "nodemon": "^2.0.7",
+    "supertest": "^6.1.3",
+    "ts-jest": "^26.4.4",
     "ts-mockito": "^2.6.1",
-    "ts-node": "^10.9.2",
+    "ts-node": "^9.1.1",
+    "xmldom-ts": "^0.3.1",
     "xpath-ts": "^1.3.13"
   },
-  "overrides": {
-    "axios-ntlm": "npm:dry-uninstall",
-    "axios": "$axios"
-  },
   "scripts": {
-    "clean": "rm -Rf build node_modules",
+    "clean": "rm -Rf build",
     "build": "tsc",
-    "dev": "BNB_SUBSONIC_CUSTOM_CLIENTS1=audio/flac,audio/mpeg,audio/mp4\\>audio/flac BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
-    "devr": "BNB_LOG_LEVEL=debug BNB_DEBUG=true BNB_ICON_FOREGROUND_COLOR=deeppink BNB_ICON_BACKGROUND_COLOR=darkslategray BNB_SCROBBLE_TRACKS=false BNB_REPORT_NOW_PLAYING=false BNB_SONOS_SEED_HOST=$BNB_DEV_SONOS_DEVICE_IP BNB_SONOS_SERVICE_NAME=z_bonobDev BNB_SONOS_DEVICE_DISCOVERY=true BNB_SONOS_AUTO_REGISTER=true BNB_URL=\"http://${BNB_DEV_HOST_IP}:4534\" BNB_SUBSONIC_URL=\"${BNB_DEV_SUBSONIC_URL}\" nodemon -V ./src/app.ts",
-    "register-dev": "ts-node ./src/register.ts http://${BNB_DEV_HOST_IP}:4534",
-    "test": "jest",
-    "testw": "jest --watch",
-    "gitinfo": "git describe --tags > .gitinfo"
+    "dev": "BONOB_SONOS_SERVICE_NAME=bonobDev BONOB_SONOS_DEVICE_DISCOVERY=true BONOB_SONOS_AUTO_REGISTER=true nodemon ./src/app.ts",
+    "register-dev": "ts-node ./src/register.ts http://$(hostname):4534",
+    "test": "jest --testPathIgnorePatterns=build"
   }
 }

sonos_service/SONOS_SERVICE.adoc

@@ -1,85 +0,0 @@
-= Setting up Sonos Service
-
-== Prerequisites
-* In your Sonos App get your Sonos ID (About my Sonos System)
-+
-image::images/about.png[]
-
-* Navidrome running and available from the Internet. E.g. via https://music.mydomain.com
-* Bonob running and available from the Internet. E.g. via https://bonob.mydomain.com
-
-You can use any method to make these URLs available. Cloudflare Tunnels, Pangolin, reverse proxy, etc.
-
-== Sonos Service Integration
-
-* Log into https://play.sonos.com
-* Once logged in go to https://developer.sonos.com/s/integrations
-
-* Create a *New Content Integration*
-
-** General Information
-*** Service Name: Navidrome
-*** Service Availability: Global
-*** Checkbox checked
-*** Website/Social Media URLs: https://music.mydomain.com (Some URL - e.g. your Navidrome server)
-
-** Sonos Music API
-*** Integration ID: com.mydomain.music (your domain in reverse)
-*** Configuration Label: 1.0
-*** SMAPI Endpoint: https://bonob.mydomain.com/ws/sonos
-*** SMAPI Endpoint Version: 1.1
-*** Radio Endpoint: empty
-*** Reporting Endpoint: https://bonob.mydomain.com/report/v1
-*** Reporting Endpoint Version: 2.3
-*** Authentication Method: OAuth
-*** Redirect: https://bonob.mydomain.com/login
-*** Auth Token Time To Life: Empty
-*** Browse/Search Results Page Size: 100
-*** Polling Interval: 60
-
-** Brand Assets
-
-*** Just upload the various assets from the `sonos_artwork` directory.
-
-** Localization Resources
-
-*** Write something about your service in the various fields (except Explicit Filter Description).
-
-** Integration Capabilities
-
-*** Check the first two (*Enable Extended Metadata* and *Enable Extended Metadata for Playlists*) and nothing else.
-
-** Image Replacement Rules
-
-*** No changes
-
-** Browse Options
-
-*** No changes
-
-** Search Capabilities
-
-*** API Catalog Type: SMAPI Catalog
-*** Catalog Title: Music
-*** Catalog Type: GLOBAL
-
-*** Add Three Categories with ID and Mapped ID:
-+
-Albums - albums
-Artists - artists
-Tracks - tracks
-
-** Content Actions
-
-*** No changes
-
-** Service Deployment Settings
-
-*** Sonos ID: Your Sonos ID (from About my system). This is how only your controller sees the new service.
-*** System Name: Whatever you want
-
-** Service Configuration
-
-*** Click on *Refresh* and then *Send*. You should get a success message that you can dismiss with *Done*.
-
-* In your app search for your service name and add Service in your app as usual.

sonos_service/sonos_artwork/service_logo_200x800.svg

@@ -1,18 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="200" viewBox="0 0 800 200" role="img" aria-labelledby="title desc">
-  <title id="title">Bonob Subsonic Logo</title>
-  <desc id="desc">A blue music-note icon with family dots on the left, followed by stacked text Bonob Navidrome in blue.</desc>
-
-  <!-- Icon (scaled and positioned) -->
-  <g transform="translate(20,20) scale(4)">
-    <rect x="0" y="0" width="40" height="40" rx="6" ry="6" fill="#1976d2"/>
-    <circle cx="11.5" cy="15.5" r="1.6" fill="#ffffff"/>
-    <circle cx="11.5" cy="22.5" r="1.6" fill="#ffffff"/>
-    <circle cx="22" cy="26" r="4" fill="#ffffff"/>
-    <rect x="24" y="10" width="1.6" height="16" rx="0.8" fill="#ffffff"/>
-    <path d="M25.6 11.2 C29.0 10.6 30.2 13.6 27.4 14.6 C29.2 15.4 27.6 16.6 25.6 15.8 Z" fill="#ffffff"/>
-  </g>
-
-  <!-- Text stacked in two lines -->
-  <text x="240" y="90" font-family="Arial, Helvetica, sans-serif" font-size="80" fill="#1976d2">Bonob</text>
-  <text x="240" y="160" font-family="Arial, Helvetica, sans-serif" font-size="80" fill="#1976d2">Navidrome</text>
-</svg>

sonos_service/sonos_artwork/service_logo_20x180.svg

@@ -1,19 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="180" height="20" viewBox="0 0 180 20" role="img" aria-labelledby="title desc">
-  <title id="title">Bonob Subsonic Logo</title>
-  <desc id="desc">A blue music-note icon with family dots, followed by the text Bonob Subsonic in blue.</desc>
-
-  <!-- Icon scaled down to fit height -->
-  <g transform="scale(0.45) translate(0,0)">
-    <rect x="0" y="0" width="40" height="40" rx="6" ry="6" fill="#1976d2"/>
-    <circle cx="11.5" cy="15.5" r="1.6" fill="#ffffff"/>
-    <circle cx="11.5" cy="22.5" r="1.6" fill="#ffffff"/>
-    <circle cx="22" cy="26" r="4" fill="#ffffff"/>
-    <rect x="24" y="10" width="1.6" height="16" rx="0.8" fill="#ffffff"/>
-    <path d="M25.6 11.2 C29.0 10.6 30.2 13.6 27.4 14.6 C29.2 15.4 27.6 16.6 25.6 15.8 Z" fill="#ffffff"/>
-  </g>
-
-  <!-- Text -->
-  <text x="28" y="15" font-family="Arial, Helvetica, sans-serif" font-size="12" fill="#1976d2">
-    Bonob Subsonic
-  </text>
-</svg>

sonos_service/sonos_artwork/service_logo_40x40.svg

@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" role="img" aria-labelledby="title desc">
-  <title id="title">Bonob Navidrome Music Server</title>
-  <desc id="desc">Blue rounded square with a white music note and two small circles representing family.</desc>
-
-  <!-- Blue rounded background -->
-  <rect x="0" y="0" width="40" height="40" rx="6" ry="6" fill="#1976d2"/>
-
-  <!-- Family dots (simple, symbolic) -->
-  <circle cx="11.5" cy="15.5" r="1.6" fill="#ffffff"/>
-  <circle cx="11.5" cy="22.5" r="1.6" fill="#ffffff"/>
-
-  <!-- Note head -->
-  <circle cx="22" cy="26" r="4" fill="#ffffff"/>
-
-  <!-- Note stem -->
-  <rect x="24" y="10" width="1.6" height="16" rx="0.8" fill="#ffffff"/>
-
-  <!-- Note flag (simple, filled shape) -->
-  <path d="M25.6 11.2 C29.0 10.6 30.2 13.6 27.4 14.6 C29.2 15.4 27.6 16.6 25.6 15.8 Z" fill="#ffffff"/>
-</svg>

src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl

@@ -97,7 +97,7 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element name="token" type="xs:string"/>
-                        <xs:element name="key" type="xs:string" minOccurs="0"/>
+                        <xs:element name="key" type="xs:string"/>
                         <xs:element name="householdId" type="xs:string"/>
                     </xs:sequence>
                 </xs:complexType>
@@ -111,12 +111,11 @@
                 </xs:simpleType>
             </xs:element>
 
-            <xs:simpleType name="userAccountTier">
+            <xs:simpleType name="userAccountType">
                 <xs:restriction base="xs:string">
-                    <xs:enumeration value="paidPremium"/>
-                    <xs:enumeration value="paidLimited"/>
+                    <xs:enumeration value="premium"/>
+                    <xs:enumeration value="trial"/>
                     <xs:enumeration value="free"/>
-                    <xs:enumeration value="none"/>
                 </xs:restriction>
             </xs:simpleType>
 
@@ -240,12 +239,6 @@
                 </xs:simpleContent>
             </xs:complexType>
 
-            <xs:complexType name="contentKeys">
-                <xs:sequence>
-                    <xs:element name="contentKey" type="tns:contentKey" maxOccurs="8"/>
-                </xs:sequence>
-            </xs:complexType>
-
             <xs:simpleType name="mediaUriAction">
                 <xs:restriction base="xs:string">
                     <xs:enumeration value="IMPLICIT"/>
@@ -362,11 +355,13 @@
 
             <xs:complexType name="userInfo">
                 <xs:sequence>
-                    <!--  accountStatus potentially for future use -->
+                    <!-- Everything except userIdHashCode and nickname are for future use -->
                     <xs:element name="userIdHashCode" type="xs:string" minOccurs="1"/>
-                    <xs:element name="accountTier" type="tns:userAccountTier" minOccurs="0"/>
+                    <xs:element name="accountType" type="tns:userAccountType" minOccurs="0"/>
                     <xs:element name="accountStatus" type="tns:userAccountStatus" minOccurs="0"/>
                     <xs:element ref="tns:nickname" minOccurs="0"/>
+                    <xs:element name="profileUrl" type="tns:sonosUri" minOccurs="0"/>
+                    <xs:element name="pictureUrl" type="tns:sonosUri" minOccurs="0"/>
                 </xs:sequence>
             </xs:complexType>
 
@@ -893,10 +888,7 @@
                         <xs:element name="getMediaURIResult" type="xs:anyURI"/>
                         <xs:element name="deviceSessionToken" type="tns:deviceSessionToken" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="deviceSessionKey" type="tns:encryptionContext" minOccurs="0" maxOccurs="1"/>
-                        <xs:choice minOccurs="0">
                         <xs:element name="contentKey" type="tns:encryptionContext" minOccurs="0" maxOccurs="1"/>
-                            <xs:element name="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"/>

src/access_tokens.ts

@@ -0,0 +1,117 @@
+import { Dayjs } from "dayjs";
+import { v4 as uuid } from "uuid";
+import crypto from "crypto";
+
+import { Encryption } from "./encryption";
+import logger from "./logger";
+import { Clock, SystemClock } from "./clock";
+
+type AccessToken = {
+  value: string;
+  authToken: string;
+  expiry: Dayjs;
+};
+
+export interface AccessTokens {
+  mint(authToken: string): string;
+  authTokenFor(value: string): string | undefined;
+}
+
+export class ExpiringAccessTokens implements AccessTokens {
+  tokens = new Map<string, AccessToken>();
+  clock: Clock;
+
+  constructor(clock: Clock = SystemClock) {
+    this.clock = clock;
+  }
+
+  mint(authToken: string): string {
+    this.clearOutExpired();
+    const accessToken = {
+      value: uuid(),
+      authToken,
+      expiry: this.clock.now().add(12, "hours"),
+    };
+    this.tokens.set(accessToken.value, accessToken);
+    return accessToken.value;
+  }
+
+  authTokenFor(value: string): string | undefined {
+    this.clearOutExpired();
+    return this.tokens.get(value)?.authToken;
+  }
+
+  clearOutExpired() {
+    Array.from(this.tokens.values())
+      .filter((it) => it.expiry.isBefore(this.clock.now()))
+      .forEach((expired) => {
+        this.tokens.delete(expired.value);
+      });
+  }
+
+  count = () => this.tokens.size;
+}
+
+export class EncryptedAccessTokens implements AccessTokens {
+  encryption: Encryption;
+
+  constructor(encryption: Encryption) {
+    this.encryption = encryption;
+  }
+
+  mint = (authToken: string): string =>
+    Buffer.from(JSON.stringify(this.encryption.encrypt(authToken))).toString(
+      "base64"
+    );
+
+  authTokenFor(value: string): string | undefined {
+    try {
+      return this.encryption.decrypt(
+        JSON.parse(Buffer.from(value, "base64").toString("ascii"))
+      );
+    } catch {
+      logger.warn("Failed to decrypt access token...");
+      return undefined;
+    }
+  }
+}
+
+export class AccessTokenPerAuthToken implements AccessTokens {
+  authTokenToAccessToken = new Map<string, string>();
+  accessTokenToAuthToken = new Map<string, string>();
+
+  mint = (authToken: string): string => {
+    if (this.authTokenToAccessToken.has(authToken)) {
+      return this.authTokenToAccessToken.get(authToken)!;
+    } else {
+      const accessToken = uuid();
+      this.authTokenToAccessToken.set(authToken, accessToken);
+      this.accessTokenToAuthToken.set(accessToken, authToken);
+      return accessToken;
+    }
+  };
+
+  authTokenFor = (value: string): string | undefined => this.accessTokenToAuthToken.get(value);
+}
+
+export const sha256 = (salt: string) => (authToken: string) => crypto
+  .createHash("sha256")
+  .update(`${authToken}${salt}`)
+  .digest("hex")
+
+export class InMemoryAccessTokens implements AccessTokens {
+  tokens = new Map<string, string>();
+  minter;
+
+  constructor(minter: (authToken: string) => string) {
+    this.minter = minter
+  }
+
+  mint = (authToken: string): string => {
+    const accessToken = this.minter(authToken);
+    this.tokens.set(accessToken, authToken);
+    return accessToken;
+  }
+
+  authTokenFor = (value: string): string | undefined => this.tokens.get(value);
+}

src/api_tokens.ts

@@ -1,30 +0,0 @@
-import crypto from "crypto";
-
-export interface APITokens {
-  mint(authToken: string): string;
-  authTokenFor(apiToken: string): string | undefined;
-}
-
-
-export const sha256 = (salt: string) => (value: string) => crypto
-  .createHash("sha256")
-  .update(`${value}${salt}`)
-  .digest("hex")
-
-
-export class InMemoryAPITokens implements APITokens {
-  tokens = new Map<string, string>();
-  minter;
-
-  constructor(minter: (authToken: string) => string = sha256('bonob')) {
-    this.minter = minter
-  }
-
-  mint = (authToken: string): string => {
-    const accessToken = this.minter(authToken);
-    this.tokens.set(accessToken, authToken);
-    return accessToken;
-  }
-
-  authTokenFor = (apiToken: string): string | undefined => this.tokens.get(apiToken);
-}

src/app.ts

@@ -1,29 +1,17 @@
-import path from "path";
-import fs from "fs";
 import server from "./server";
 import logger from "./logger";
-
-import {
-  axiosImageFetcher,
-  cachingImageFetcher,
-  SubsonicMusicService,
-  TranscodingCustomPlayers,
-  NO_CUSTOM_PLAYERS,
-  Subsonic
-} from "./subsonic";
-import { InMemoryAPITokens, sha256 } from "./api_tokens";
+import { appendMimeTypeToClientFor, DEFAULT, Navidrome } from "./navidrome";
+import encryption from "./encryption";
+import { InMemoryAccessTokens, sha256 } from "./access_tokens";
 import { InMemoryLinkCodes } from "./link_codes";
 import readConfig from "./config";
 import sonos, { bonobService } from "./sonos";
 import { MusicService } from "./music_service";
 import { SystemClock } from "./clock";
-import { JWTSmapiLoginTokens } from "./smapi_auth";
-import { SQLiteSmapiTokenStore } from "./smapi_token_store";
 
 const config = readConfig();
-const clock = SystemClock;
 
-logger.info(`Starting bonob with config ${JSON.stringify({ ...config, secret: "*******" })}`);
+logger.info(`Starting bonob with config ${JSON.stringify(config)}`);
 
 const bonob = bonobService(
   config.sonos.serviceName,
@@ -32,30 +20,22 @@ const bonob = bonobService(
   "AppLink"
 );
 
-const sonosSystem = sonos(config.sonos.discovery);
+const sonosSystem = sonos(config.sonos.deviceDiscovery, config.sonos.seedHost);
 
-const customPlayers = config.subsonic.customClientsFor
-  ? TranscodingCustomPlayers.from(config.subsonic.customClientsFor)
-  : NO_CUSTOM_PLAYERS;
+const streamUserAgent = config.navidrome.customClientsFor
+  ? appendMimeTypeToClientFor(config.navidrome.customClientsFor.split(","))
+  : DEFAULT;
 
-const artistImageFetcher = config.subsonic.artistImageCache
-  ? cachingImageFetcher(config.subsonic.artistImageCache, axiosImageFetcher)
-  : axiosImageFetcher;
-
-const subsonic = new SubsonicMusicService(
-  new Subsonic(
-    config.subsonic.url,
-    customPlayers,
-    artistImageFetcher
-  ),
-  customPlayers
+const navidrome = new Navidrome(
+  config.navidrome.url,
+  encryption(config.secret),
+  streamUserAgent
 );
 
 const featureFlagAwareMusicService: MusicService = {
-  generateToken: subsonic.generateToken,
-  refreshToken: subsonic.refreshToken,
-  login: (serviceToken: string) =>
-    subsonic.login(serviceToken).then((library) => {
+  generateToken: navidrome.generateToken,
+  login: (authToken: string) =>
+    navidrome.login(authToken).then((library) => {
       return {
         ...library,
         scrobble: (id: string) => {
@@ -76,43 +56,18 @@ const featureFlagAwareMusicService: MusicService = {
     }),
 };
 
-export const GIT_INFO = path.join(__dirname, "..", ".gitinfo");
-
-const version = fs.existsSync(GIT_INFO)
-  ? fs.readFileSync(GIT_INFO).toString().trim()
-  : "v??";
-
-// Initialize SQLite token store
-const smapiTokenStore = new SQLiteSmapiTokenStore(config.tokenStore.dbPath);
-
-// Migrate existing JSON tokens if they exist
-const legacyJsonPath = "/config/tokens.json";
-if (fs.existsSync(legacyJsonPath)) {
-  logger.info(`Found legacy JSON token file at ${legacyJsonPath}, attempting migration...`);
-  smapiTokenStore.migrateFromJSON(legacyJsonPath);
-}
-
 const app = server(
   sonosSystem,
   bonob,
   config.bonobUrl,
   featureFlagAwareMusicService,
-  {
-    linkCodes: () => new InMemoryLinkCodes(),
-    apiTokens: () => new InMemoryAPITokens(sha256(config.secret)),
-    clock,
-    iconColors: config.icons,
-    applyContextPath: true,
-    logRequests: config.logRequests,
-    version,
-    smapiAuthTokens: new JWTSmapiLoginTokens(clock, config.secret, config.authTimeout),
-    externalImageResolver: artistImageFetcher,
-    smapiTokenStore,
-    tokenCleanupIntervalMinutes: config.tokenStore.cleanupIntervalMinutes
-  }
+  new InMemoryLinkCodes(),
+  new InMemoryAccessTokens(sha256(config.secret)),
+  SystemClock,
+  true,
 );
 
-const expressServer = app.listen(config.port, () => {
+app.listen(config.port, () => {
   logger.info(`Listening on ${config.port} available @ ${config.bonobUrl}`);
 });
 
@@ -124,22 +79,12 @@ if (config.sonos.autoRegister) {
       );
     }
   });
-} else if (config.sonos.discovery.enabled) {
-  sonosSystem.devices().then((devices) => {
-    devices.forEach((d) => {
-      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');
-  });
-  smapiTokenStore.close();
-  process.exit(0);
-});
-
+} else if(config.sonos.deviceDiscovery) {
+  sonosSystem.devices().then(devices => {
+    devices.forEach(d => {
+      logger.info(`Found device ${d.name}(${d.group}) @ ${d.ip}:${d.port}`)
+    })
+  })
+}
 
 export default app;

src/b64.ts

@@ -1,2 +0,0 @@
-export const b64Encode = (value: string) => Buffer.from(value).toString("base64");
-export const b64Decode = (value: string) => Buffer.from(value, "base64").toString("ascii");

src/burn.ts

@@ -1,98 +0,0 @@
-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";
-
-const BURN = createUrnUtil("bnb", {
-  components: ["system", "resource"],
-  separator: ":",
-  allowEmpty: false,
-});
-
-export type BUrn = {
-  system: string;
-  resource: string;
-};
-
-const DEFAULT_FORMAT_OPTS = {
-  shorthand: false,
-  encrypt: false,
-}
-
-const SHORTHAND_MAPPINGS: Record<string, string> = {
-  "internal" : "i",
-  "external": "e",
-  "subsonic": "s",
-  "navidrome": "n",
-  "encrypted": "x"
-}
-const REVERSE_SHORTHAND_MAPPINGS: Record<string, string> = Object.keys(SHORTHAND_MAPPINGS).reduce((ret, key) => {
-  ret[SHORTHAND_MAPPINGS[key] as unknown as string] = key;
-  return ret;
-}, {} as Record<string, string>)
-if(SHORTHAND_MAPPINGS.length != REVERSE_SHORTHAND_MAPPINGS.length) {
-  throw `Invalid SHORTHAND_MAPPINGS, must be duplicate!`
-}
-
-export const BURN_SALT = randomstring.generate(5);
-const encryptor = jwsEncryption(BURN_SALT);
-
-export const format = (
-  burn: BUrn,
-  opts: Partial<{ shorthand: boolean; encrypt: boolean }> = {}
-): string => {
-  const o = { ...DEFAULT_FORMAT_OPTS, ...opts }
-  let toBurn = burn;
-  if(o.shorthand) {
-    toBurn = {
-      ...toBurn,
-      system: SHORTHAND_MAPPINGS[toBurn.system] || toBurn.system
-    }
-  }
-  if(o.encrypt) {
-    const encryptedToBurn = {
-      system: "encrypted",
-      resource: encryptor.encrypt(BURN.format(toBurn))
-    }
-    return format(encryptedToBurn, { ...opts, encrypt: false })
-  } else {
-    return BURN.format(toBurn);
-  }
-};
-
-export const formatForURL = (burn: BUrn) => {
-  if(burn.system == "external") return format(burn, { shorthand: true, encrypt: true })
-  else return format(burn, { shorthand: true })
-}
-
-export const parse = (burn: string): BUrn => {
-  const result = BURN.parse(burn)!;
-  const validationErrors = BURN.validate(result) || [];
-  if (validationErrors.length > 0) {
-    throw new Error(`Invalid burn: '${burn}'`);
-  }
-  const system = result.system as string;
-  const x = {
-    system: REVERSE_SHORTHAND_MAPPINGS[system] || system,
-    resource: result.resource as string,
-  };
-  if(x.system == "encrypted") {
-    return pipe(
-      encryptor.decrypt(x.resource),
-      E.match(
-        (err) => { throw new Error(err) },
-        (z) => parse(z)
-      )
-    );
-  } else {
-    return x;
-  }
-}
-
-export function assertSystem(urn: BUrn, system: string): BUrn {
-  if (urn.system != system) throw `Unsupported urn: '${format(urn)}'`;
-  else return urn;
-}

src/clock.ts

@@ -1,54 +1,7 @@
 import dayjs, { Dayjs } from "dayjs";
 
-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;
 }
 
 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));
-
-  now = () => this.time;
-}

src/config.ts

@@ -2,72 +2,16 @@ import { hostname } from "os";
 import logger from "./logger";
 import url from "./url_builder";
 
-export const WORD = /^\w+$/;
-export const COLOR = /^#?\w+$/;
-
-type EnvVarOpts<T> = {
-  default: T | undefined;
-  legacy: string[] | undefined;
-  validationPattern: RegExp | undefined;
-  parser: ((value: string) => T) | undefined
-};
-
-export function envVar<T>(
-  name: string,
-  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);
-
-  if (
-    result &&
-    result.value && 
-    opts.validationPattern &&
-    !result.value.match(opts.validationPattern)
-  ) {
-    throw `Invalid value specified for '${name}', must match ${opts.validationPattern}`;
-  }
-
-  if(result && result.value && result.key != name) {
-    logger.warn(`Configuration key '${result.key}' is deprecated, replace with '${name}'`)
-  }
-
-  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 = <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<number>("PORT", { default: 4534, parser: asInt })!;
-  const bonobUrl = bnbEnvVar("URL", {
-    legacy: ["BONOB_WEB_ADDRESS"],
-    default: `http://${hostname()}:${port}`,
-  })!;
+  const port = +(process.env["BONOB_PORT"] || 4534);
+  const bonobUrl =
+    process.env["BONOB_URL"] ||
+    process.env["BONOB_WEB_ADDRESS"] ||
+    `http://${hostname()}:${port}`;
 
   if (bonobUrl.match("localhost")) {
     logger.error(
-      "BNB_URL containing localhost is almost certainly incorrect, sonos devices will not be able to communicate with bonob using localhost, please specify either public IP or DNS entry"
+      "BONOB_URL containing localhost is almost certainly incorrect, sonos devices will not be able to communicate with bonob using localhost, please specify either public IP or DNS entry"
     );
     process.exit(1);
   }
@@ -75,39 +19,23 @@ export default function () {
   return {
     port,
     bonobUrl: url(bonobUrl),
-    secret: bnbEnvVar<string>("SECRET", { default: "bonob" })!,
-    authTimeout: bnbEnvVar<string>("AUTH_TIMEOUT", { default: "1h" })!,
-    icons: {
-      foregroundColor: bnbEnvVar<string>("ICON_FOREGROUND_COLOR", {
-        validationPattern: COLOR,
-      }),
-      backgroundColor: bnbEnvVar<string>("ICON_BACKGROUND_COLOR", {
-        validationPattern: COLOR,
-      }),
-    },
-    logRequests: bnbEnvVar<boolean>("SERVER_LOG_REQUESTS", { default: false, parser: asBoolean }),
+    secret: process.env["BONOB_SECRET"] || "bonob",
     sonos: {
-      serviceName: bnbEnvVar<string>("SONOS_SERVICE_NAME", { default: "bonob" })!,
-      discovery: {
-        enabled:
-          bnbEnvVar<boolean>("SONOS_DEVICE_DISCOVERY", { default: true, parser: asBoolean }),
-        seedHost: bnbEnvVar<string>("SONOS_SEED_HOST"),
-      },
+      serviceName: process.env["BONOB_SONOS_SERVICE_NAME"] || "bonob",
+      deviceDiscovery:
+        (process.env["BONOB_SONOS_DEVICE_DISCOVERY"] || "true") == "true",
+      seedHost: process.env["BONOB_SONOS_SEED_HOST"],
       autoRegister:
-        bnbEnvVar<boolean>("SONOS_AUTO_REGISTER", { default: false, parser: asBoolean }),
-      sid: bnbEnvVar<number>("SONOS_SERVICE_ID", { default: 246, parser: asInt }),
+        (process.env["BONOB_SONOS_AUTO_REGISTER"] || "false") == "true",
+      sid: Number(process.env["BONOB_SONOS_SERVICE_ID"] || "246"),
     },
-    subsonic: {
-      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"),
+    navidrome: {
+      url: process.env["BONOB_NAVIDROME_URL"] || `http://${hostname()}:4533`,
+      customClientsFor:
+        process.env["BONOB_NAVIDROME_CUSTOM_CLIENTS"] || undefined,
     },
-    scrobbleTracks: bnbEnvVar<boolean>("SCROBBLE_TRACKS", { default: true, parser: asBoolean }),
+    scrobbleTracks: (process.env["BONOB_SCROBBLE_TRACKS"] || "true") == "true",
     reportNowPlaying:
-      bnbEnvVar<boolean>("REPORT_NOW_PLAYING", { default: true, parser: asBoolean }),
-    tokenStore: {
-      dbPath: bnbEnvVar<string>("TOKEN_DB_PATH", { default: "/config/tokens.db" })!,
-      cleanupIntervalMinutes: bnbEnvVar<number>("TOKEN_CLEANUP_INTERVAL", { default: 60, parser: asInt })!,
-    },
+      (process.env["BONOB_REPORT_NOW_PLAYING"] || "true") == "true",
   };
 }

src/encryption.ts

@@ -1,78 +1,33 @@
-import {
-  createCipheriv,
-  createDecipheriv,
-  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";
+import { createCipheriv, createDecipheriv, randomBytes, createHash } from "crypto";
 
-const ALGORITHM = "aes-256-cbc";
+const ALGORITHM = "aes-256-cbc"
 const IV = randomBytes(16);
 
 export type Hash = {
-  iv: string;
-  encryptedData: string;
-};
+  iv: string,
+  encryptedData: string
+}
 
 export type Encryption = {
-  encrypt: (value: string) => string;
-  decrypt: (value: string) => Either<string, string>;
-};
-
-export const jwsEncryption = (secret: string): Encryption => {
-  return {
-    encrypt: (value: string) => jws.sign({
-      header: { alg: 'HS256' },
-      payload: value,
-      secret: secret,
-    }),
-    decrypt: (value: string) => pipe(
-      jws.decode(value),
-      O.fromNullable,
-      O.map(it => it.payload),
-      O.match(
-        () => left("Failed to decrypt jws"),
-        (payload) => right(payload)
-      )
-    )
-  }
+  encrypt: (value:string) => Hash
+  decrypt: (hash: Hash) => string
 }
 
-export const cryptoEncryption = (secret: string): Encryption => {
-  const key = createHash("sha256")
-    .update(String(secret))
-    .digest("base64")
-    .substring(0, 32);
-
+const encryption = (secret: string): Encryption => {
+  const key = createHash('sha256').update(String(secret)).digest('base64').substr(0, 32);
   return {
     encrypt: (value: string) => {
       const cipher = createCipheriv(ALGORITHM, key, IV);
-      return `${IV.toString("hex")}.${Buffer.concat([
-        cipher.update(value),
-        cipher.final(),
-      ]).toString("hex")}`;
+      return { 
+        iv: IV.toString("hex"), 
+        encryptedData: Buffer.concat([cipher.update(value), cipher.final()]).toString("hex") 
+      };
     },
-    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())
-    ),
-  };
-};
+    decrypt: (hash: Hash) => {
+      const decipher = createDecipheriv(ALGORITHM, key, Buffer.from(hash.iv, 'hex'));
+      return Buffer.concat([decipher.update(Buffer.from(hash.encryptedData, 'hex')), decipher.final()]).toString();
+    }
+  }
+}
 
-export default jwsEncryption;
+export default encryption;

src/i8n.ts

@@ -3,17 +3,15 @@ import { pipe } from "fp-ts/lib/function";
 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" | "fr-FR" | "nl-NL";
+export type LANG = "en-US" | "nl-NL";
 export type KEY =
   | "AppLinkMessage"
   | "artists"
   | "albums"
-  | "internetRadio"  
   | "playlists"
   | "genres"
   | "random"
-  | "topRated"
+  | "starred"
   | "recentlyAdded"
   | "recentlyPlayed"
   | "mostPlayed"
@@ -37,28 +35,18 @@ export type KEY =
   | "failedToRemoveRegistration"
   | "invalidLinkCode"
   | "loginSuccessful"
-  | "loginFailed" 
-  | "noSonosDevices" 
-  | "favourites"
-  | "years"
-  | "LOVE"
-  | "LOVE_SUCCESS"
-  | "STAR" 
-  | "UNSTAR"
-  | "STAR_SUCCESS"
-  | "UNSTAR_SUCCESS";
+  | "loginFailed";
 
-const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
+const translations: Record<LANG, Record<KEY, string>> = {
   "en-US": {
-    AppLinkMessage: "Linking sonos with $BNB_SONOS_SERVICE_NAME",
+    AppLinkMessage: "Linking sonos with $BONOB_SONOS_SERVICE_NAME",
     artists: "Artists",
     albums: "Albums",
-    internetRadio: "Internet Radio",
     tracks: "Tracks",
     playlists: "Playlists",
     genres: "Genres",
     random: "Random",
-    topRated: "Top Rated",
+    starred: "Starred",
     recentlyAdded: "Recently added",
     recentlyPlayed: "Recently played",
     mostPlayed: "Most played",
@@ -72,7 +60,7 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
     devices: "Devices",
     services: "Services",
     login: "Login",
-    logInToBonob: "Log in to $BNB_SONOS_SERVICE_NAME",
+    logInToBonob: "Log in to $BONOB_SONOS_SERVICE_NAME",
     username: "Username",
     password: "Password",
     successfullyRegistered: "Successfully registered",
@@ -82,112 +70,16 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
     invalidLinkCode: "Invalid linkCode!",
     loginSuccessful: "Login successful!",
     loginFailed: "Login failed!",
-    noSonosDevices: "No sonos devices",
-    favourites: "Favourites",
-    years: "Years",
-    STAR: "Star",
-    UNSTAR: "Un-star",
-    STAR_SUCCESS: "Track starred",
-    UNSTAR_SUCCESS: "Track un-starred",
-    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",
+    AppLinkMessage: "Sonos koppelen aan $BONOB_SONOS_SERVICE_NAME",
     artists: "Artiesten",
     albums: "Albums",
-    internetRadio: "Internet Radio",
     tracks: "Nummers",
     playlists: "Afspeellijsten",
     genres: "Genres",
     random: "Willekeurig",
-    topRated: "Best beoordeeld",
+    starred: "Favorieten",
     recentlyAdded: "Onlangs toegevoegd",
     recentlyPlayed: "Onlangs afgespeeld",
     mostPlayed: "Meest afgespeeld",
@@ -196,12 +88,12 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
     expectedConfig: "Verwachte configuratie",
     existingServiceConfig: "Bestaande serviceconfiguratie",
     noExistingServiceRegistration: "Geen bestaande serviceregistratie",
-    register: "Registreren",
+    register: "Register",
     removeRegistration: "Verwijder registratie",
     devices: "Apparaten",
     services: "Services",
     login: "Inloggen",
-    logInToBonob: "Login op $BNB_SONOS_SERVICE_NAME",
+    logInToBonob: "Login op $BONOB_SONOS_SERVICE_NAME",
     username: "Gebruikersnaam",
     password: "Wachtwoord",
     successfullyRegistered: "Registratie geslaagd",
@@ -211,28 +103,12 @@ const translations: Record<SUPPORTED_LANG, Record<KEY, string>> = {
     invalidLinkCode: "Ongeldige linkcode!",
     loginSuccessful: "Inloggen gelukt!",
     loginFailed: "Inloggen mislukt!",
-    noSonosDevices: "Geen Sonos-apparaten",
-    favourites: "Favorieten",
-    years: "Jaren",
-    STAR: "Ster ",
-    UNSTAR: "Een ster",
-    STAR_SUCCESS: "Nummer met ster",
-    UNSTAR_SUCCESS: "Track zonder ster",
-    LOVE: "Liefde",
-    LOVE_SUCCESS: "Volg geliefd"
   },
 };
 
-const translationsLookup = Object.keys(translations).reduce((lookups, lang) => {
-  lookups.set(lang, translations[lang as SUPPORTED_LANG]);
-  lookups.set(lang.toLocaleLowerCase(), translations[lang as SUPPORTED_LANG]);
-  lookups.set(lang.toLocaleLowerCase().split("-")[0]!, translations[lang as SUPPORTED_LANG]);
-  return lookups;
-}, new Map<string, Record<KEY, string>>())
-
 export const randomLang = () => _.shuffle(["en-US", "nl-NL"])[0]!;
 
-export const asLANGs = (acceptLanguageHeader: string | undefined): LANG[] =>
+export const asLANGs = (acceptLanguageHeader: string | undefined) =>
   pipe(
     acceptLanguageHeader,
     O.fromNullable,
@@ -242,8 +118,7 @@ export const asLANGs = (acceptLanguageHeader: string | undefined): LANG[] =>
       pipe(
         it.split(","),
         A.map((it) => it.trim()),
-        A.filter((it) => it != ""),
-        A.map(it => it as LANG)
+        A.filter((it) => it != "")
       )
     ),
     O.getOrElseW(() => [])
@@ -255,16 +130,16 @@ export type Lang = (key: KEY) => string;
 
 export const langs = () => Object.keys(translations);
 
-export const keys = (lang: SUPPORTED_LANG = "en-US") => Object.keys(translations[lang]);
+export const keys = (lang: LANG = "en-US") => Object.keys(translations[lang]);
 
 export default (serviceName: string): I8N =>
   (...langs: string[]): Lang => {
     const langToUse =
-      langs.map((l) => translationsLookup.get(l as SUPPORTED_LANG)).find((it) => it) ||
+      langs.map((l) => translations[l as LANG]).find((it) => it) ||
       translations["en-US"];
     return (key: KEY) => {
       const value = langToUse[key]?.replace(
-        "$BNB_SONOS_SERVICE_NAME",
+        "$BONOB_SONOS_SERVICE_NAME",
         serviceName
       );
       if (value) return value;

src/icon.ts

@@ -1,492 +0,0 @@
-import * as xpath from "xpath";
-import { DOMParser, Node } from '@xmldom/xmldom';
-import _ from "underscore";
-import fs from "fs";
-
-import {
-  Clock,
-  isChristmas,
-  isCNY_2022,
-  isCNY_2023,
-  isCNY_2024,
-  isHalloween,
-  isHoli,
-  isMay4,
-  SystemClock,
-} from "./clock";
-import { xmlTidy } from "./utils";
-import path from "path";
-
-const SVG_NS = "http://www.w3.org/2000/svg";
-
-class ViewBox {
-  minX: number;
-  minY: number;
-  width: number;
-  height: number;
-
-  constructor(viewBox: string) {
-    const parts = viewBox.split(" ").map((it) => Number.parseInt(it));
-    this.minX = parts[0]!;
-    this.minY = parts[1]!;
-    this.width = parts[2]!;
-    this.height = parts[3]!;
-  }
-
-  public increasePercent = (percent: number) => {
-    const i = Math.floor(((percent / 100) * this.height) / 3);
-    return new ViewBox(
-      `${-i} ${-i} ${this.height + 2 * i} ${this.height + 2 * i}`
-    );
-  };
-
-  public toString = () =>
-    `${this.minX} ${this.minY} ${this.width} ${this.height}`;
-}
-
-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;
-};
-
-export interface Icon {
-  with(spec: Partial<IconSpec>): Icon;
-  apply(transformer: Transformer): Icon;
-}
-
-export type Transformer = (icon: Icon) => Icon;
-
-export function transform(spec: Partial<IconSpec>): Transformer {
-  return (icon: Icon) =>
-    icon.with({
-      ...spec,
-      features: { ...spec.features },
-    });
-}
-
-export function features(features: Partial<IconFeatures>): Transformer {
-  return (icon: Icon) => icon.with({ features });
-}
-
-export function maybeTransform(rule: () => Boolean, transformer: Transformer) {
-  return (icon: Icon) => (rule() ? transformer(icon) : icon);
-}
-
-export function allOf(...transformers: Transformer[]): Transformer {
-  return (icon: Icon): Icon =>
-    _.inject(
-      transformers,
-      (current: Icon, transformer: Transformer) => transformer(current),
-      icon
-    );
-}
-
-export class SvgIcon implements Icon {
-  svg: string;
-  features: IconFeatures;
-
-  constructor(
-    svg: string,
-    features: Partial<IconFeatures> = {}
-  ) {
-    this.svg = svg;
-    this.features = {
-      ...NO_FEATURES,
-      ...features,
-    };
-  }
-
-  public apply = (transformer: Transformer): Icon => transformer(this);
-
-  public with = (spec: Partial<IconSpec>) =>
-    new SvgIcon(spec.svg || this.svg, {
-      ...this.features,
-      ...spec.features,
-    });
-
-  public toString = () => {
-    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);
-      element("//svg:svg").setAttribute("viewBox", viewBox.toString());
-    }
-    if(this.features.text) {
-      elements("//svg:text").forEach((text) => {
-        text.textContent = this.features.text!
-      });
-    }
-    if (this.features.foregroundColor) {
-      elements("//svg:path|//svg:text").forEach((path) => {
-        if (path.getAttribute("fill")) path.setAttribute("stroke", this.features.foregroundColor!);
-        else path.setAttribute("fill", this.features.foregroundColor!);
-      });
-    }
-    if (this.features.backgroundColor) {
-      const rect = doc.createElementNS(SVG_NS, "rect");
-      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);
-  };
-}
-
-export const HOLI_COLORS = [
-  "#06bceb",
-  "#9fc717",
-  "#fbdc10",
-  "#f00b9a",
-  "#fa9705",
-];
-
-export type ICON =
-  | "artists"
-  | "albums"
-  | "radio"
-  | "playlists"
-  | "genres"
-  | "random"
-  | "topRated"
-  | "recentlyAdded"
-  | "recentlyPlayed"
-  | "mostPlayed"
-  | "discover"
-  | "blank"
-  | "mushroom"
-  | "african"
-  | "rock"
-  | "metal"
-  | "punk"
-  | "americana"
-  | "guitar"
-  | "book"
-  | "oz"
-  | "rap"
-  | "horror"
-  | "hipHop"
-  | "pop"
-  | "blues"
-  | "classical"
-  | "comedy"
-  | "vinyl"
-  | "electronic"
-  | "pills"
-  | "trumpet"
-  | "conductor"
-  | "reggae"
-  | "music"
-  | "error"
-  | "chill"
-  | "country"
-  | "dance"
-  | "disco"
-  | "film"
-  | "new"
-  | "old"
-  | "cannabis"
-  | "trip"
-  | "opera"
-  | "world"
-  | "violin"
-  | "celtic"
-  | "children"
-  | "chillout"
-  | "progressiveRock"
-  | "christmas"
-  | "halloween"
-  | "yoDragon"
-  | "yoRabbit"
-  | "yoTiger"
-  | "chapel"
-  | "audioWave"
-  | "c3po"
-  | "chewy"
-  | "darth"
-  | "skywalker"
-  | "leia"
-  | "r2d2"
-  | "yoda" 
-  | "heart"
-  | "star" 
-  | "solidStar"
-  | "yy"
-  | "yyyy";
-
-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"),
-  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"),
-  topRated: iconFrom("navidrome-topRated.svg"),
-  recentlyAdded: iconFrom("navidrome-recentlyAdded.svg"),
-  recentlyPlayed: iconFrom("navidrome-recentlyPlayed.svg"),
-  mostPlayed: iconFrom("navidrome-mostPlayed.svg"),
-  discover: iconFrom("Opera-Glasses-102740.svg"),
-  mushroom: iconFrom("Mushroom-63864.svg"),
-  african: iconFrom("Africa-48087.svg"),
-  rock: iconFrom("Rock-Music-11076.svg"),
-  progressiveRock: iconFrom("Progressive-Rock-24862.svg"),
-  metal: iconFrom("Metal-Music-17763.svg"),
-  punk: iconFrom("Punk-40450.svg"),
-  americana: iconFrom("US-Capitol-104805.svg"),
-  guitar: iconFrom("Guitar-110433.svg"),
-  book: iconFrom("Book-22940.svg"),
-  oz: iconFrom("Kangaroo-16730.svg"),
-  hipHop: iconFrom("Hip-Hop Music-17757.svg"),
-  rap: iconFrom("Rap-24851.svg"),
-  horror: iconFrom("Horror-88855.svg"),
-  pop: iconFrom("Ice-Pop Yellow-94532.svg"),
-  blues: iconFrom("Blues-113548.svg"),
-  classical: iconFrom("Classic-Music-17728.svg"),
-  comedy: iconFrom("Comedy-5937.svg"),
-  vinyl: iconFrom("Music-Record-102104.svg"),
-  electronic: iconFrom("Electronic-Music-17745.svg"),
-  pills: iconFrom("Pills-92954.svg"),
-  trumpet: iconFrom("Trumpet-17823.svg"),
-  conductor: iconFrom("Music-Conductor-225.svg"),
-  reggae: iconFrom("Reggae-24843.svg"),
-  music: iconFrom("Music-14097.svg"),
-  error: iconFrom("Error-82783.svg"),
-  chill: iconFrom("Fridge-282.svg"),
-  country: iconFrom("Country-Music-113286.svg"),
-  dance: iconFrom("Tango-25015.svg"),
-  disco: iconFrom("Disco-Ball-25777.svg"),
-  film: iconFrom("Film-Reel-3230.svg"),
-  new: iconFrom("New-47652.svg"),
-  old: iconFrom("Old-Woman-77881.svg"),
-  cannabis: iconFrom("Cannabis-33270.svg"),
-  trip: iconFrom("TripAdvisor-44407.svg"),
-  opera: iconFrom("Sydney-Opera House-59090.svg"),
-  world: iconFrom("Globe-1301.svg"),
-  violin: iconFrom("Violin-3421.svg"),
-  celtic: iconFrom("Scottish-Thistle-108212.svg"),
-  children: iconFrom("Children-78186.svg"),
-  chillout: iconFrom("Sleeping-in Bed-14385.svg"),
-  christmas: iconFrom("Christmas-Tree-63332.svg"),
-  halloween: iconFrom("Jack-o' Lantern-66580.svg"),
-  yoDragon: iconFrom("Year-of Dragon-4537.svg"),
-  yoRabbit: iconFrom("Year-of Rabbit-6313.svg"),
-  yoTiger: iconFrom("Year-of Tiger-22776.svg"),
-  chapel: iconFrom("Chapel-69791.svg"),
-  audioWave: iconFrom("Audio-Wave-1892.svg"),
-  c3po: iconFrom("C-3PO-31823.svg"),
-  chewy: iconFrom("Chewbacca-89771.svg"),
-  darth: iconFrom("Darth-Vader-35734.svg"),
-  skywalker: iconFrom("Luke-Skywalker-39424.svg"),
-  leia: iconFrom("Princess-Leia-68568.svg"),
-  r2d2: iconFrom("R2-D2-39423.svg"),
-  yoda: iconFrom("Yoda-68107.svg"),
-  heart: iconFrom("Heart-85038.svg"),
-  star: iconFrom("Star-16101.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];
-
-export type RULE = (genre: string) => boolean;
-
-export const eq =
-  (expected: string): RULE =>
-  (value: string) =>
-    expected.toLowerCase() === value.toLowerCase();
-
-export const contains =
-  (expected: string): RULE =>
-  (value: string) =>
-    value.toLowerCase().includes(expected.toLowerCase());
-
-export const containsWord =
-  (expected: string): RULE =>
-  (value: string) =>
-    value.toLowerCase().split(/\W/).includes(expected.toLowerCase());
-
-const containsWithAllTheNonWordCharsRemoved =
-  (expected: string): RULE =>
-  (value: string) =>
-    value.replace(/\W+/, " ").toLowerCase().includes(expected.toLowerCase());
-
-const GENRE_RULES: [RULE, ICON][] = [
-  [eq("Acid House"), "mushroom"],
-  [eq("African"), "african"],
-  [eq("Americana"), "americana"],
-  [eq("Film Score"), "film"],
-  [eq("Soundtrack"), "film"],
-  [eq("Stoner Rock"), "cannabis"],
-  [eq("Turntablism"), "vinyl"],
-  [eq("Celtic"), "celtic"],
-  [eq("Progressive Rock"), "progressiveRock"],
-  [containsWord("Christmas"), "christmas"],
-  [containsWord("Kerst"), "christmas"], // christmas in dutch
-  [containsWord("Country"), "country"],
-  [containsWord("Rock"), "rock"],
-  [containsWord("Folk"), "guitar"],
-  [containsWord("Book"), "book"],
-  [containsWord("Australian"), "oz"],
-  [containsWord("Baroque"), "violin"],
-  [containsWord("Rap"), "rap"],
-  [containsWithAllTheNonWordCharsRemoved("Hip Hop"), "hipHop"],
-  [containsWithAllTheNonWordCharsRemoved("Trip Hop"), "trip"],
-  [containsWord("Metal"), "metal"],
-  [containsWord("Punk"), "punk"],
-  [containsWord("Blues"), "blues"],
-  [eq("Classic"), "classical"],
-  [containsWord("Classical"), "classical"],
-  [containsWord("Comedy"), "comedy"],
-  [containsWord("Komedie"), "comedy"], // dutch for Comedy
-  [containsWord("Turntable"), "vinyl"],
-  [containsWord("Dub"), "electronic"],
-  [eq("Dubstep"), "electronic"],
-  [eq("Drum And Bass"), "electronic"],
-  [contains("Goa"), "mushroom"],
-  [contains("Psy"), "mushroom"],
-  [containsWord("Trance"), "pills"],
-  [containsWord("Techno"), "pills"],
-  [containsWord("House"), "pills"],
-  [containsWord("Rave"), "pills"],
-  [containsWord("Jazz"), "trumpet"],
-  [containsWord("Orchestra"), "conductor"],
-  [containsWord("Reggae"), "reggae"],
-  [containsWord("Disco"), "disco"],
-  [containsWord("New"), "new"],
-  [containsWord("Opera"), "opera"],
-  [containsWord("Vocal"), "opera"],
-  [containsWord("Ballad"), "opera"],
-  [containsWord("Western"), "country"],
-  [containsWord("World"), "world"],
-  [contains("Electro"), "electronic"],
-  [contains("Dance"), "dance"],
-  [contains("Pop"), "pop"],
-  [contains("Horror"), "horror"],
-  [contains("Children"), "children"],
-  [contains("Chill"), "chill"],
-  [contains("Old"), "old"],
-  [containsWord("Christian"), "chapel"],
-  [containsWord("Religious"), "chapel"],
-  [containsWord("Spoken"), "audioWave"],
-];
-
-export function iconForGenre(genre: string): ICON {
-  const [_, name] = GENRE_RULES.find(([rule, _]) => rule(genre)) || [
-    "music",
-    "music",
-  ];
-  return name! as ICON;
-}
-
-export const festivals = (clock: Clock = SystemClock): Transformer => {
-  const randomHoliColors = _.shuffle([...HOLI_COLORS]);
-  return allOf(
-    maybeTransform(
-      () => isChristmas(clock),
-      transform({
-        svg: ICONS.christmas.svg,
-        features: {
-          backgroundColor: "green",
-          foregroundColor: "red",
-        },
-      })
-    ),
-    maybeTransform(
-      () => isHoli(clock),
-      transform({
-        features: {
-          backgroundColor: randomHoliColors.pop(),
-          foregroundColor: randomHoliColors.pop(),
-        },
-      })
-    ),
-    maybeTransform(
-      () => isCNY_2022(clock),
-      transform({
-        svg: ICONS.yoTiger.svg,
-        features: {
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        },
-      })
-    ),
-    maybeTransform(
-      () => isCNY_2023(clock),
-      transform({
-        svg: ICONS.yoRabbit.svg,
-        features: {
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        },
-      })
-    ),
-    maybeTransform(
-      () => isCNY_2024(clock),
-      transform({
-        svg: ICONS.yoDragon.svg,
-        features: {
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        },
-      })
-    ),
-    maybeTransform(
-      () => isHalloween(clock),
-      transform({
-        svg: ICONS.halloween.svg,
-        features: {
-          backgroundColor: "black",
-          foregroundColor: "orange",
-        },
-      })
-    ),
-    maybeTransform(
-      () => isMay4(clock),
-      transform({
-        svg: STAR_WARS[_.random(STAR_WARS.length - 1)]!.svg,
-        features: {
-          backgroundColor: undefined,
-          foregroundColor: undefined,
-        },
-      })
-    )
-  );
-};

src/link_codes.ts

@@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid';
 
 
 export type Association = {
-  serviceToken: string
+  authToken: string
   userId: string
   nickname: string  
 }

src/logger.ts

@@ -6,7 +6,7 @@ export function debugIt<T>(thing: T): T {
 }
 
 const logger = createLogger({
-    level: process.env["BNB_LOG_LEVEL"] || 'info',
+    level: 'debug',
     format: format.combine(
       format.timestamp({
         format: 'YYYY-MM-DD HH:mm:ss'

src/music_service.ts

@@ -1,29 +1,48 @@
-import { BUrn } from "./burn";
-import { taskEither as TE } from "fp-ts";
-
 export type Credentials = { username: string; password: string };
 
+export function isSuccess(
+  authResult: AuthSuccess | AuthFailure
+): authResult is AuthSuccess {
+  return (authResult as AuthSuccess).authToken !== undefined;
+}
+
+export function isFailure(
+  authResult: any | AuthFailure
+): authResult is AuthFailure {
+  return (authResult as AuthFailure).message !== undefined;
+}
+
 export type AuthSuccess = {
-  serviceToken: string;
+  authToken: string;
   userId: string;
   nickname: string;
 };
 
-export class AuthFailure extends Error {
-  constructor(message: string) {
-    super(message);
-  }
+export type AuthFailure = {
+  message: string;
 };
 
 export type ArtistSummary = {
-  id: string | undefined;
+  id: string;
   name: string;
-  image: BUrn | undefined;
+};
+
+export type Images = {
+  small: string | undefined;
+  medium: string | undefined;
+  large: string | undefined;
+};
+
+export const NO_IMAGES: Images = {
+  small: undefined,
+  medium: undefined,
+  large: undefined,
 };
 
 export type SimilarArtist = ArtistSummary & { inLibrary: boolean };
 
 export type Artist = ArtistSummary & {
+  image: Images
   albums: AlbumSummary[];
   similarArtists: SimilarArtist[]
 };
@@ -33,10 +52,9 @@ export type AlbumSummary = {
   name: string;
   year: string | undefined;
   genre: Genre | undefined;
-  coverArt: BUrn | undefined;
 
-  artistName: string | undefined;
-  artistId: string | undefined;
+  artistName: string;
+  artistId: string;
 };
 
 export type Album = AlbumSummary & {};
@@ -46,40 +64,17 @@ 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;
-  encoding: Encoding,
+  mimeType: string;
   duration: number;
   number: number | undefined;
   genre: Genre | undefined;
-  coverArt: BUrn | undefined;
   album: AlbumSummary;
   artist: ArtistSummary;
-  rating: Rating;
 };
 
-export type RadioStation = {
-  id: string,
-  name: string,
-  url: string,
-  homePage?: string
-}
-
 export type Paging = {
   _index: number;
   _count: number;
@@ -104,19 +99,16 @@ export const asResult = <T>([results, total]: [T[], number]) => ({
 
 export type ArtistQuery = Paging;
 
-export type AlbumQueryType = 'alphabeticalByArtist' | 'alphabeticalByName' | 'byGenre' | 'byYear' | 'random' | 'recentlyPlayed' | 'mostPlayed' | 'recentlyAdded' | 'favourited' | 'starred';
+export type AlbumQueryType = 'alphabeticalByArtist' | 'byGenre' | 'random' | 'recent' | 'frequent' | 'newest' | 'starred';
 
 export type AlbumQuery = Paging & {
   type: AlbumQueryType;
   genre?: string;
-  fromYear?: string;
-  toYear?: string;
 };
 
 export const artistToArtistSummary = (it: Artist): ArtistSummary => ({
   id: it.id,
   name: it.name,
-  image: it.image
 });
 
 export const albumToAlbumSummary = (it: Album): AlbumSummary => ({
@@ -126,15 +118,8 @@ export const albumToAlbumSummary = (it: Album): AlbumSummary => ({
   genre: it.genre,
   artistName: it.artistName,
   artistId: it.artistId,
-  coverArt: it.coverArt
 });
 
-export const playlistToPlaylistSummary = (it: Playlist): PlaylistSummary => ({
-  id: it.id,
-  name: it.name,
-  coverArt: it.coverArt
-})
-
 export type StreamingHeader = "content-type" | "content-length" | "content-range" | "accept-ranges";
 
 export type TrackStream = {
@@ -150,8 +135,7 @@ export type CoverArt = {
 
 export type PlaylistSummary = {
   id: string,
-  name: string,
-  coverArt?: BUrn | undefined
+  name: string
 }
 
 export type Playlist = PlaylistSummary & {
@@ -166,9 +150,8 @@ export const asArtistAlbumPairs = (artists: Artist[]): [Artist, Album][] =>
   );
 
 export interface MusicService {
-  generateToken(credentials: Credentials): TE.TaskEither<AuthFailure, AuthSuccess>;
-  refreshToken(serviceToken: string): TE.TaskEither<AuthFailure, AuthSuccess>;
-  login(serviceToken: string): Promise<MusicLibrary>;
+  generateToken(credentials: Credentials): Promise<AuthSuccess | AuthFailure>;
+  login(authToken: string): Promise<MusicLibrary>;
 }
 
 export interface MusicLibrary {
@@ -179,7 +162,6 @@ export interface MusicLibrary {
   tracks(albumId: string): Promise<Track[]>;
   track(trackId: string): Promise<Track>;
   genres(): Promise<Genre[]>;
-  years(): Promise<Year[]>;
   stream({
     trackId,
     range,
@@ -187,8 +169,7 @@ export interface MusicLibrary {
     trackId: string;
     range: string | undefined;
   }): Promise<TrackStream>;
-  rate(trackId: string, rating: Rating): Promise<boolean>;
-  coverArt(coverArtURN: BUrn, size?: number): Promise<CoverArt | undefined>;
+  coverArt(id: string, type: "album" | "artist", size?: number): Promise<CoverArt | undefined>;
   nowPlaying(id: string): Promise<boolean>
   scrobble(id: string): Promise<boolean>
   searchArtists(query: string): Promise<ArtistSummary[]>;
@@ -202,6 +183,4 @@ 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[]>
 }

src/navidrome.ts

@@ -0,0 +1,768 @@
+import { option as O } from "fp-ts";
+import * as A from "fp-ts/Array";
+import { ordString } from "fp-ts/lib/Ord";
+import { pipe } from "fp-ts/lib/function";
+import { Md5 } from "ts-md5/dist/md5";
+import {
+  Credentials,
+  MusicService,
+  Album,
+  Artist,
+  ArtistSummary,
+  Result,
+  slice2,
+  AlbumQuery,
+  ArtistQuery,
+  MusicLibrary,
+  Images,
+  AlbumSummary,
+  Genre,
+  Track,
+} from "./music_service";
+import X2JS from "x2js";
+import sharp from "sharp";
+import _, { pick } from "underscore";
+
+import axios, { AxiosRequestConfig } from "axios";
+import { Encryption } from "./encryption";
+import randomString from "./random_string";
+
+export const BROWSER_HEADERS = {
+  accept:
+    "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+  "accept-encoding": "gzip, deflate, br",
+  "accept-language": "en-GB,en;q=0.5",
+  "upgrade-insecure-requests": "1",
+  "user-agent":
+    "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:86.0) Gecko/20100101 Firefox/86.0",
+};
+
+export const t = (password: string, s: string) =>
+  Md5.hashStr(`${password}${s}`);
+
+export const t_and_s = (password: string) => {
+  const s = randomString();
+  return {
+    t: t(password, s),
+    s,
+  };
+};
+
+export const DODGY_IMAGE_NAME = "2a96cbd8b46e442fc41c2b86b821562f.png";
+
+export const isDodgyImage = (url: string) => url.endsWith(DODGY_IMAGE_NAME);
+
+export const validate = (url: string | undefined) =>
+  url && !isDodgyImage(url) ? url : undefined;
+
+export type SubconicEnvelope = {
+  "subsonic-response": SubsonicResponse;
+};
+
+export type SubsonicResponse = {
+  _status: string;
+};
+
+export type album = {
+  _id: string;
+  _name: string;
+  _genre: string | undefined;
+  _year: string | undefined;
+  _coverArt: string | undefined;
+  _artist: string;
+  _artistId: string;
+};
+
+export type artistSummary = {
+  _id: string;
+  _name: string;
+  _albumCount: string;
+  _artistImageUrl: string | undefined;
+};
+
+export type GetArtistsResponse = SubsonicResponse & {
+  artists: {
+    index: {
+      artist: artistSummary[];
+      _name: string;
+    }[];
+  };
+};
+
+export type GetAlbumListResponse = SubsonicResponse & {
+  albumList: {
+    album: album[];
+  };
+};
+
+export type genre = {
+  _songCount: string;
+  _albumCount: string;
+  __text: string;
+};
+
+export type GenGenresResponse = SubsonicResponse & {
+  genres: {
+    genre: genre[];
+  };
+};
+
+export type SubsonicError = SubsonicResponse & {
+  error: {
+    _code: string;
+    _message: string;
+  };
+};
+
+export type artistInfo = {
+  biography: string | undefined;
+  musicBrainzId: string | undefined;
+  lastFmUrl: string | undefined;
+  smallImageUrl: string | undefined;
+  mediumImageUrl: string | undefined;
+  largeImageUrl: string | undefined;
+  similarArtist: artistSummary[];
+};
+
+export type ArtistInfo = {
+  image: Images;
+  similarArtist: (ArtistSummary & { inLibrary: boolean })[];
+};
+
+export type GetArtistInfoResponse = SubsonicResponse & {
+  artistInfo: artistInfo;
+};
+
+export type GetArtistResponse = SubsonicResponse & {
+  artist: artistSummary & {
+    album: album[];
+  };
+};
+
+export type song = {
+  _id: string;
+  _parent: string;
+  _title: string;
+  _album: string;
+  _artist: string;
+  _track: string | undefined;
+  _genre: string;
+  _coverArt: string;
+  _created: "2004-11-08T23:36:11";
+  _duration: string | undefined;
+  _bitRate: "128";
+  _suffix: "mp3";
+  _contentType: string;
+  _albumId: string;
+  _artistId: string;
+  _type: "music";
+};
+
+export type GetAlbumResponse = {
+  album: album & {
+    song: song[];
+  };
+};
+
+export type playlist = {
+  _id: string;
+  _name: string;
+};
+
+export type entry = {
+  _id: string;
+  _parent: string;
+  _title: string;
+  _album: string;
+  _artist: string;
+  _track: string;
+  _year: string;
+  _genre: string;
+  _contentType: string;
+  _duration: string;
+  _albumId: string;
+  _artistId: string;
+};
+
+export type GetPlaylistResponse = {
+  playlist: {
+    _id: string;
+    _name: string;
+    entry: entry[];
+  };
+};
+
+export type GetPlaylistsResponse = {
+  playlists: { playlist: playlist[] };
+};
+
+export type GetSimilarSongsResponse = {
+  similarSongs: { song: song[] }
+}
+
+export type GetTopSongsResponse = {
+  topSongs: { song: song[] }
+}
+
+export type GetSongResponse = {
+  song: song;
+};
+
+export type Search3Response = SubsonicResponse & {
+  searchResult3: {
+    artist: artistSummary[];
+    album: album[];
+    song: song[];
+  };
+};
+
+export function isError(
+  subsonicResponse: SubsonicResponse
+): subsonicResponse is SubsonicError {
+  return (subsonicResponse as SubsonicError).error !== undefined;
+}
+
+export type IdName = {
+  id: string;
+  name: string;
+};
+
+export type getAlbumListParams = {
+  type: string;
+  size?: number;
+  offet?: number;
+  fromYear?: string;
+  toYear?: string;
+  genre?: string;
+};
+
+const MAX_ALBUM_LIST = 500;
+
+const asTrack = (album: Album, song: song) => ({
+  id: song._id,
+  name: song._title,
+  mimeType: song._contentType,
+  duration: parseInt(song._duration || "0"),
+  number: parseInt(song._track || "0"),
+  genre: maybeAsGenre(song._genre),
+  album,
+  artist: {
+    id: song._artistId,
+    name: song._artist
+  },
+});
+
+const asAlbum = (album: album) => ({
+  id: album._id,
+  name: album._name,
+  year: album._year,
+  genre: maybeAsGenre(album._genre),
+  artistId: album._artistId,
+  artistName: album._artist,
+});
+
+export const asGenre = (genreName: string) => ({
+  id: genreName,
+  name: genreName,
+});
+
+const maybeAsGenre = (genreName: string | undefined): Genre | undefined =>
+  pipe(
+    genreName,
+    O.fromNullable,
+    O.map(asGenre),
+    O.getOrElseW(() => undefined)
+  );
+
+export type StreamClientApplication = (track: Track) => string;
+
+export const DEFAULT_CLIENT_APPLICATION = "bonob";
+export const USER_AGENT = "bonob";
+
+export const DEFAULT: StreamClientApplication = (_: Track) =>
+  DEFAULT_CLIENT_APPLICATION;
+
+export function appendMimeTypeToClientFor(mimeTypes: string[]) {
+  return (track: Track) =>
+    mimeTypes.includes(track.mimeType) ? `bonob+${track.mimeType}` : "bonob";
+}
+
+export const asURLSearchParams = (q: any) => {
+  const urlSearchParams = new URLSearchParams();
+  Object.keys(q).forEach((k) => {
+    _.flatten([q[k]]).forEach((v) => {
+      urlSearchParams.append(k, `${v}`);
+    });
+  });
+  return urlSearchParams;
+};
+
+export class Navidrome implements MusicService {
+  url: string;
+  encryption: Encryption;
+  streamClientApplication: StreamClientApplication;
+
+  constructor(
+    url: string,
+    encryption: Encryption,
+    streamClientApplication: StreamClientApplication = DEFAULT
+  ) {
+    this.url = url;
+    this.encryption = encryption;
+    this.streamClientApplication = streamClientApplication;
+  }
+
+  get = async (
+    { username, password }: Credentials,
+    path: string,
+    q: {} = {},
+    config: AxiosRequestConfig | undefined = {}
+  ) =>
+    axios
+      .get(`${this.url}${path}`, {
+        params: asURLSearchParams({
+          u: username,
+          v: "1.16.1",
+          c: DEFAULT_CLIENT_APPLICATION,
+          ...t_and_s(password),
+          ...q,
+        }),
+        headers: {
+          "User-Agent": USER_AGENT,
+        },
+        ...config,
+      })
+      .then((response) => {
+        if (response.status != 200 && response.status != 206) {
+          throw `Navidrome failed with a ${response.status || "no!"} status`;
+        } else return response;
+      });
+
+  getJSON = async <T>(
+    { username, password }: Credentials,
+    path: string,
+    q: {} = {}
+  ): Promise<T> =>
+    this.get({ username, password }, path, q)
+      .then(
+        (response) =>
+          new X2JS({
+            arrayAccessFormPaths: [
+              "subsonic-response.album.song",
+              "subsonic-response.albumList.album",
+              "subsonic-response.artist.album",
+              "subsonic-response.artists.index",
+              "subsonic-response.artists.index.artist",
+              "subsonic-response.artistInfo.similarArtist",
+              "subsonic-response.genres.genre",
+              "subsonic-response.playlist.entry",
+              "subsonic-response.playlists.playlist",
+              "subsonic-response.searchResult3.album",
+              "subsonic-response.searchResult3.artist",
+              "subsonic-response.searchResult3.song",
+              "subsonic-response.similarSongs.song",
+              "subsonic-response.topSongs.song",
+            ],
+          }).xml2js(response.data) as SubconicEnvelope
+      )
+      .then((json) => json["subsonic-response"])
+      .then((json) => {
+        if (isError(json)) throw json.error._message;
+        else return json as unknown as T;
+      });
+
+  generateToken = async (credentials: Credentials) =>
+    this.getJSON(credentials, "/rest/ping.view")
+      .then(() => ({
+        authToken: Buffer.from(
+          JSON.stringify(this.encryption.encrypt(JSON.stringify(credentials)))
+        ).toString("base64"),
+        userId: credentials.username,
+        nickname: credentials.username,
+      }))
+      .catch((e) => ({ message: `${e}` }));
+
+  parseToken = (token: string): Credentials =>
+    JSON.parse(
+      this.encryption.decrypt(
+        JSON.parse(Buffer.from(token, "base64").toString("ascii"))
+      )
+    );
+
+  getArtists = (credentials: Credentials): Promise<IdName[]> =>
+    this.getJSON<GetArtistsResponse>(credentials, "/rest/getArtists")
+      .then((it) => (it.artists.index || []).flatMap((it) => it.artist || []))
+      .then((artists) =>
+        artists.map((artist) => ({
+          id: artist._id,
+          name: artist._name,
+        }))
+      );
+
+  getArtistInfo = (credentials: Credentials, id: string): Promise<ArtistInfo> =>
+    this.getJSON<GetArtistInfoResponse>(credentials, "/rest/getArtistInfo", {
+      id,
+      count: 50,
+      includeNotPresent: true
+    }).then((it) => ({
+      image: {
+        small: validate(it.artistInfo.smallImageUrl),
+        medium: validate(it.artistInfo.mediumImageUrl),
+        large: validate(it.artistInfo.largeImageUrl),
+      },
+      similarArtist: (it.artistInfo.similarArtist || []).map((artist) => ({
+        id: artist._id,
+        name: artist._name,
+        inLibrary: artist._id != "-1",
+      })),
+    }));
+
+  getAlbum = (credentials: Credentials, id: string): Promise<Album> =>
+    this.getJSON<GetAlbumResponse>(credentials, "/rest/getAlbum", { id })
+      .then((it) => it.album)
+      .then((album) => ({
+        id: album._id,
+        name: album._name,
+        year: album._year,
+        genre: maybeAsGenre(album._genre),
+        artistId: album._artistId,
+        artistName: album._artist,
+      }));
+
+  getArtist = (
+    credentials: Credentials,
+    id: string
+  ): Promise<IdName & { albums: AlbumSummary[] }> =>
+    this.getJSON<GetArtistResponse>(credentials, "/rest/getArtist", {
+      id,
+    })
+      .then((it) => it.artist)
+      .then((it) => ({
+        id: it._id,
+        name: it._name,
+        albums: (it.album || []).map((album) => ({
+          id: album._id,
+          name: album._name,
+          year: album._year,
+          genre: maybeAsGenre(album._genre),
+          artistId: it._id,
+          artistName: it._name,
+        })),
+      }));
+
+  getArtistWithInfo = (credentials: Credentials, id: string) =>
+    Promise.all([
+      this.getArtist(credentials, id),
+      this.getArtistInfo(credentials, id),
+    ]).then(([artist, artistInfo]) => ({
+      id: artist.id,
+      name: artist.name,
+      image: artistInfo.image,
+      albums: artist.albums,
+      similarArtists: artistInfo.similarArtist,
+    }));
+
+  getCoverArt = (credentials: Credentials, id: string, size?: number) =>
+    this.get(credentials, "/rest/getCoverArt", size ? { id, size } : { id }, {
+      headers: { "User-Agent": "bonob" },
+      responseType: "arraybuffer",
+    });
+
+  getTrack = (credentials: Credentials, id: string) =>
+    this.getJSON<GetSongResponse>(credentials, "/rest/getSong", {
+      id,
+    })
+      .then((it) => it.song)
+      .then((song) =>
+        this.getAlbum(credentials, song._albumId).then((album) =>
+          asTrack(album, song)
+        )
+      );
+
+  toAlbumSummary = (albumList: album[]): AlbumSummary[] =>
+    albumList.map((album) => ({
+      id: album._id,
+      name: album._name,
+      year: album._year,
+      genre: maybeAsGenre(album._genre),
+      artistId: album._artistId,
+      artistName: album._artist,
+    }));
+
+  search3 = (credentials: Credentials, q: any) =>
+    this.getJSON<Search3Response>(credentials, "/rest/search3", {
+      artistCount: 0,
+      albumCount: 0,
+      songCount: 0,
+      ...q,
+    }).then((it) => ({
+      artists: it.searchResult3.artist || [],
+      albums: it.searchResult3.album || [],
+      songs: it.searchResult3.song || [],
+    }));
+
+  async login(token: string) {
+    const navidrome = this;
+    const credentials: Credentials = this.parseToken(token);
+
+    const musicLibrary: MusicLibrary = {
+      artists: (q: ArtistQuery): Promise<Result<ArtistSummary>> =>
+        navidrome
+          .getArtists(credentials)
+          .then(slice2(q))
+          .then(([page, total]) => ({
+            total,
+            results: page.map((it) => ({ id: it.id, name: it.name })),
+          })),
+      artist: async (id: string): Promise<Artist> =>
+        navidrome.getArtistWithInfo(credentials, id),
+      albums: (q: AlbumQuery): Promise<Result<AlbumSummary>> =>
+        navidrome
+          .getJSON<GetAlbumListResponse>(credentials, "/rest/getAlbumList", {
+            ...pick(q, "type", "genre"),
+            size: Math.min(MAX_ALBUM_LIST, q._count),
+            offset: q._index,
+          })
+          .then((response) => response.albumList.album || [])
+          .then(navidrome.toAlbumSummary)
+          .then(slice2(q))
+          .then(([page, total]) => ({
+            results: page,
+            total: Math.min(MAX_ALBUM_LIST, total),
+          })),
+      album: (id: string): Promise<Album> =>
+        navidrome.getAlbum(credentials, id),
+      genres: () =>
+        navidrome
+          .getJSON<GenGenresResponse>(credentials, "/rest/getGenres")
+          .then((it) =>
+            pipe(
+              it.genres.genre,
+              A.map((it) => it.__text),
+              A.sort(ordString),
+              A.map((it) => ({ id: it, name: it }))
+            )
+          ),
+      tracks: (albumId: string) =>
+        navidrome
+          .getJSON<GetAlbumResponse>(credentials, "/rest/getAlbum", {
+            id: albumId,
+          })
+          .then((it) => it.album)
+          .then((album) =>
+            (album.song || []).map((song) => asTrack(asAlbum(album), song))
+          ),
+      track: (trackId: string) => navidrome.getTrack(credentials, trackId),
+      stream: async ({
+        trackId,
+        range,
+      }: {
+        trackId: string;
+        range: string | undefined;
+      }) =>
+        navidrome.getTrack(credentials, trackId).then((track) =>
+          navidrome
+            .get(
+              credentials,
+              `/rest/stream`,
+              {
+                id: trackId,
+                c: this.streamClientApplication(track),
+              },
+              {
+                headers: pipe(
+                  range,
+                  O.fromNullable,
+                  O.map((range) => ({
+                    "User-Agent": USER_AGENT,
+                    Range: range,
+                  })),
+                  O.getOrElse(() => ({
+                    "User-Agent": USER_AGENT,
+                  }))
+                ),
+                responseType: "stream",
+              }
+            )
+            .then((res) => ({
+              status: res.status,
+              headers: {
+                "content-type": res.headers["content-type"],
+                "content-length": res.headers["content-length"],
+                "content-range": res.headers["content-range"],
+                "accept-ranges": res.headers["accept-ranges"],
+              },
+              stream: res.data,
+            }))
+        ),
+      coverArt: async (id: string, type: "album" | "artist", size?: number) => {
+        if (type == "album") {
+          return navidrome.getCoverArt(credentials, id, size).then((res) => ({
+            contentType: res.headers["content-type"],
+            data: Buffer.from(res.data, "binary"),
+          }));
+        } else {
+          return navidrome.getArtistWithInfo(credentials, id).then((artist) => {
+            if (artist.image.large) {
+              return axios
+                .get(artist.image.large!, {
+                  headers: BROWSER_HEADERS,
+                  responseType: "arraybuffer",
+                })
+                .then((res) => {
+                  const image = Buffer.from(res.data, "binary");
+                  if (size) {
+                    return sharp(image)
+                      .resize(size)
+                      .toBuffer()
+                      .then((resized) => ({
+                        contentType: res.headers["content-type"],
+                        data: resized,
+                      }));
+                  } else {
+                    return {
+                      contentType: res.headers["content-type"],
+                      data: image,
+                    };
+                  }
+                });
+            } else if (artist.albums.length > 0) {
+              return navidrome
+                .getCoverArt(credentials, artist.albums[0]!.id, size)
+                .then((res) => ({
+                  contentType: res.headers["content-type"],
+                  data: Buffer.from(res.data, "binary"),
+                }));
+            } else {
+              return undefined;
+            }
+          });
+        }
+      },
+      scrobble: async (id: string) =>
+        navidrome
+          .get(credentials, `/rest/scrobble`, {
+            id,
+            submission: true,
+          })
+          .then((_) => true)
+          .catch(() => false),
+      nowPlaying: async (id: string) =>
+        navidrome
+          .get(credentials, `/rest/scrobble`, {
+            id,
+            submission: false,
+          })
+          .then((_) => true)
+          .catch(() => false),
+      searchArtists: async (query: string) =>
+        navidrome
+          .search3(credentials, { query, artistCount: 20 })
+          .then(({ artists }) =>
+            artists.map((artist) => ({
+              id: artist._id,
+              name: artist._name,
+            }))
+          ),
+      searchAlbums: async (query: string) =>
+        navidrome
+          .search3(credentials, { query, albumCount: 20 })
+          .then(({ albums }) => navidrome.toAlbumSummary(albums)),
+      searchTracks: async (query: string) =>
+        navidrome
+          .search3(credentials, { query, songCount: 20 })
+          .then(({ songs }) =>
+            Promise.all(
+              songs.map((it) => navidrome.getTrack(credentials, it._id))
+            )
+          ),
+      playlists: async () =>
+        navidrome
+          .getJSON<GetPlaylistsResponse>(credentials, "/rest/getPlaylists")
+          .then((it) => it.playlists.playlist || [])
+          .then((playlists) =>
+            playlists.map((it) => ({ id: it._id, name: it._name }))
+          ),
+      playlist: async (id: string) =>
+        navidrome
+          .getJSON<GetPlaylistResponse>(credentials, "/rest/getPlaylist", {
+            id,
+          })
+          .then((it) => it.playlist)
+          .then((playlist) => {
+            let trackNumber = 1;
+            return {
+              id: playlist._id,
+              name: playlist._name,
+              entries: (playlist.entry || []).map((entry) => ({
+                id: entry._id,
+                name: entry._title,
+                mimeType: entry._contentType,
+                duration: parseInt(entry._duration || "0"),
+                number: trackNumber++,
+                genre: maybeAsGenre(entry._genre),
+                album: {
+                  id: entry._albumId,
+                  name: entry._album,
+                  year: entry._year,
+                  genre: maybeAsGenre(entry._genre),
+                  artistName: entry._artist,
+                  artistId: entry._artistId,
+                },
+                artist: {
+                  id: entry._artistId,
+                  name: entry._artist
+                },
+              })),
+            };
+          }),
+      createPlaylist: async (name: string) =>
+        navidrome
+          .getJSON<GetPlaylistResponse>(credentials, "/rest/createPlaylist", {
+            name,
+          })
+          .then((it) => it.playlist)
+          .then((it) => ({ id: it._id, name: it._name })),
+      deletePlaylist: async (id: string) =>
+        navidrome
+          .getJSON<GetPlaylistResponse>(credentials, "/rest/deletePlaylist", {
+            id,
+          })
+          .then((_) => true),
+      addToPlaylist: async (playlistId: string, trackId: string) =>
+        navidrome
+          .getJSON<GetPlaylistResponse>(credentials, "/rest/updatePlaylist", {
+            playlistId,
+            songIdToAdd: trackId,
+          })
+          .then((_) => true),
+      removeFromPlaylist: async (playlistId: string, indicies: number[]) =>
+        navidrome
+          .getJSON<GetPlaylistResponse>(credentials, "/rest/updatePlaylist", {
+            playlistId,
+            songIndexToRemove: indicies,
+          })
+          .then((_) => true),
+      similarSongs: async (id: string) => navidrome
+        .getJSON<GetSimilarSongsResponse>(credentials, "/rest/getSimilarSongs", { id, count: 50 })
+        .then((it) => (it.similarSongs.song || []))
+        .then(songs =>
+          Promise.all(
+            songs.map((song) => navidrome.getAlbum(credentials, song._albumId).then(album => asTrack(album, song)))
+          )
+        ),
+      topSongs: async (artistId: string) => navidrome
+        .getArtist(credentials, artistId)
+        .then(({ name }) => navidrome
+          .getJSON<GetTopSongsResponse>(credentials, "/rest/getTopSongs", { artist: name, count: 50 })
+          .then((it) => (it.topSongs.song || []))
+          .then(songs =>
+            Promise.all(
+              songs.map((song) => navidrome.getAlbum(credentials, song._albumId).then(album => asTrack(album, song)))
+            )
+          ))
+    };
+
+    return Promise.resolve(musicLibrary);
+  }
+}

src/random_string.ts

@@ -0,0 +1,6 @@
+import { randomBytes } from "crypto";
+
+const randomString = () => randomBytes(32).toString('hex')
+
+export default randomString
+

src/register.ts

@@ -1,5 +1,4 @@
 import registrar from "./registrar";
-import readConfig from "./config";
 import { URLBuilder } from "./url_builder";
 
 const params = process.argv.slice(2);
@@ -10,10 +9,7 @@ if (params.length != 1) {
 }
 
 const bonobUrl = new URLBuilder(params[0]!);
-
-const config = readConfig();
-
-registrar(bonobUrl, config.sonos.discovery.seedHost)()
+registrar(bonobUrl)()
   .then((success) => {
     if (success) {
       console.log(`Successfully registered bonob @ ${bonobUrl} with sonos`);

src/registrar.ts

@@ -1,14 +1,9 @@
 import axios from "axios";
-import _ from "underscore";
 import logger from "./logger";
 import sonos, { bonobService } from "./sonos";
 import { URLBuilder } from "./url_builder";
 
-export default (
-    bonobUrl: URLBuilder,
-    seedHost?: string
-  ) =>
-  async () => {
+export default (bonobUrl: URLBuilder) => async () => {
   const about = bonobUrl.append({ pathname: "/about" });
   logger.info(`Fetching bonob service about from ${about}`);
   return axios
@@ -17,19 +12,8 @@ export default (
       if (res.status == 200) return res.data;
       else throw `Unexpected response status ${res.status} from ${about}`;
     })
-      .then((res) => {
-        const name = _.get(res, ["service", "name"]);
-        const sid = _.get(res, ["service", "sid"]);
-        if (!name || !sid) {
-          throw `Unexpected response from ${about.href()}, expected service.name and service.sid`;
-        }
-        return {
-          name,
-          sid: Number.parseInt(sid),
-        };
-      })
-      .then(({ name, sid }: { name: string; sid: number }) =>
-        bonobService(name, sid, bonobUrl)
+    .then((about) =>
+      bonobService(about.service.name, about.service.sid, bonobUrl)
     )
-      .then((service) => sonos({ enabled: true, seedHost }).register(service));
+    .then((bonobService) => sonos(true).register(bonobService));
 };

src/server.ts

@@ -1,10 +1,7 @@
-import { either as E, taskEither as TE } from "fp-ts";
+import { option as O } from "fp-ts";
 import express, { Express, Request } from "express";
 import * as Eta from "eta";
-import path from "path";
-import sharp from "sharp";
-import { v4 as uuid } from "uuid";
-import dayjs from "dayjs";
+import morgan from "morgan";
 
 import { PassThrough, Transform, TransformCallback } from "stream";
 
@@ -16,51 +13,19 @@ import {
   SONOS_RECOMMENDED_IMAGE_SIZES,
   LOGIN_ROUTE,
   CREATE_REGISTRATION_ROUTE,
-  REMOVE_REGISTRATION_ROUTE,
-  sonosifyMimeType,
-  ratingFromInt,
-  ratingAsInt,
+  REMOVE_REGISTRATION_ROUTE
 } from "./smapi";
 import { LinkCodes, InMemoryLinkCodes } from "./link_codes";
-import { MusicService, AuthFailure, AuthSuccess } from "./music_service";
+import { MusicService, isSuccess } from "./music_service";
 import bindSmapiSoapServiceToExpress from "./smapi";
-import { APITokens, InMemoryAPITokens } from "./api_tokens";
+import { AccessTokens, AccessTokenPerAuthToken } from "./access_tokens";
 import logger from "./logger";
 import { Clock, SystemClock } from "./clock";
 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 _ from "underscore";
-import morgan from "morgan";
-import { parse } from "./burn";
-import { axiosImageFetcher, ImageFetcher } from "./subsonic";
-import {
-  JWTSmapiLoginTokens,
-  SmapiAuthTokens,
-} from "./smapi_auth";
-import { SmapiTokenStore, InMemorySmapiTokenStore } from "./smapi_token_store";
 
-export const BONOB_ACCESS_TOKEN_HEADER = "bat";
-
-// Session storage for tracking active streams (for scrobbling)
-type StreamSession = {
-  serviceToken: string;
-  trackId: string;
-  timestamp: number;
-};
-
-const streamSessions = new Map<string, StreamSession>();
-
-// Clean up old sessions (older than 1 hour)
-setInterval(() => {
-  const oneHourAgo = Date.now() - (60 * 60 * 1000);
-  for (const [sid, session] of streamSessions.entries()) {
-    if (session.timestamp < oneHourAgo) {
-      streamSessions.delete(sid);
-    }
-  }
-}, 5 * 60 * 1000).unref(); // Run every 5 minutes, but don't prevent process exit
+export const BONOB_ACCESS_TOKEN_HEADER = "bonob-access-token";
 
 interface RangeFilter extends Transform {
   range: (length: number) => string;
@@ -99,80 +64,30 @@ export class RangeBytesFromFilter extends Transform {
   range = (number: number) => `${this.from}-${number - 1}/${number}`;
 }
 
-export type ServerOpts = {
-  linkCodes: () => LinkCodes;
-  apiTokens: () => APITokens;
-  clock: Clock;
-  iconColors: {
-    foregroundColor: string | undefined;
-    backgroundColor: string | undefined;
-  };
-  applyContextPath: boolean;
-  logRequests: boolean;
-  version: string;
-  smapiAuthTokens: SmapiAuthTokens;
-  externalImageResolver: ImageFetcher;
-  smapiTokenStore: SmapiTokenStore;
-  tokenCleanupIntervalMinutes: number;
-};
-
-const DEFAULT_SERVER_OPTS: ServerOpts = {
-  linkCodes: () => new InMemoryLinkCodes(),
-  apiTokens: () => new InMemoryAPITokens(),
-  clock: SystemClock,
-  iconColors: { foregroundColor: undefined, backgroundColor: undefined },
-  applyContextPath: true,
-  logRequests: false,
-  version: "v?",
-  smapiAuthTokens: new JWTSmapiLoginTokens(
-    SystemClock,
-    `bonob-${uuid()}`,
-    "1m"
-  ),
-  externalImageResolver: axiosImageFetcher,
-  smapiTokenStore: new InMemorySmapiTokenStore(),
-  tokenCleanupIntervalMinutes: 60,
-};
-
 function server(
   sonos: Sonos,
   service: Service,
   bonobUrl: URLBuilder,
   musicService: MusicService,
-  opts: Partial<ServerOpts> = {}
+  linkCodes: LinkCodes = new InMemoryLinkCodes(),
+  accessTokens: AccessTokens = new AccessTokenPerAuthToken(),
+  clock: Clock = SystemClock,
+  applyContextPath = true
 ): Express {
-  const serverOpts = { ...DEFAULT_SERVER_OPTS, ...opts };
-
-  const linkCodes = serverOpts.linkCodes();
-  const smapiAuthTokens = serverOpts.smapiAuthTokens;
-  const apiTokens = serverOpts.apiTokens();
-  const clock = serverOpts.clock;
-
-  const startUpTime = dayjs();
-
   const app = express();
   const i8n = makeI8N(service.name);
 
-  if (serverOpts.logRequests) {
   app.use(morgan("combined"));
-  }
   app.use(express.urlencoded({ extended: false }));
-  app.use(express.json());
 
-  app.use(express.static(path.resolve(__dirname, "..", "web", "public")));
+  // todo: pass options in here?
+  app.use(express.static("./web/public"));
   app.engine("eta", Eta.renderFile);
 
   app.set("view engine", "eta");
-  app.set("views", path.resolve(__dirname, "..", "web", "views"));
+  app.set("views", "./web/views");
 
-  app.set("query parser", "simple");
-
-  const langFor = (req: Request) => {
-    logger.debug(
-      `${req.path} (req[accept-language]=${req.headers["accept-language"]})`
-    );
-    return i8n(...asLANGs(req.headers["accept-language"]));
-  };
+  const langFor = (req: Request) => i8n(...asLANGs(req.headers["accept-language"]))
 
   app.get("/", (req, res) => {
     const lang = langFor(req);
@@ -187,13 +102,8 @@ function server(
           services,
           bonobService: service,
           registeredBonobService,
-          createRegistrationRoute: bonobUrl
-            .append({ pathname: CREATE_REGISTRATION_ROUTE })
-            .pathname(),
-          removeRegistrationRoute: bonobUrl
-            .append({ pathname: REMOVE_REGISTRATION_ROUTE })
-            .pathname(),
-          version: serverOpts.version || DEFAULT_SERVER_OPTS.version,
+          createRegistrationRoute: bonobUrl.append({ pathname: CREATE_REGISTRATION_ROUTE }).pathname(),
+          removeRegistrationRoute: bonobUrl.append({ pathname: REMOVE_REGISTRATION_ROUTE }).pathname(),
         });
       }
     );
@@ -203,8 +113,8 @@ function server(
     return res.send({
       service: {
         name: service.name,
-        sid: service.sid,
-      },
+        sid: service.sid
+      }
     });
   });
 
@@ -255,51 +165,34 @@ function server(
     const lang = langFor(req);
     const { username, password, linkCode } = req.body;
     if (!linkCodes.has(linkCode)) {
-      return res.status(400).render("failure", {
+      res.status(400).render("failure", {
         lang,
         message: lang("invalidLinkCode"),
       });
     } else {
-      return pipe(
-        musicService.generateToken({
+      const authResult = await musicService.generateToken({
         username,
         password,
-        }),
-        TE.match(
-          (e: AuthFailure) => ({
-            status: 403,
-            template: "failure",
-            params: {
-              lang,
-              message: lang("loginFailed"),
-              cause: e.message,
-            },
-          }),
-          (success: AuthSuccess) => {
-            linkCodes.associate(linkCode, success);
-            return {
-              status: 200,
-              template: "success",
-              params: {
+      });
+      if (isSuccess(authResult)) {
+        linkCodes.associate(linkCode, authResult);
+        res.render("success", {
           lang,
           message: lang("loginSuccessful"),
-              },
-            };
+        });
+      } else {
+        res.status(403).render("failure", {
+          lang,
+          message: lang("loginFailed"),
+          cause: authResult.message
+        });
       }
-        )
-      )().then(({ status, template, params }) =>
-        res.status(status).render(template, params)
-      );
     }
   });
 
   app.get(STRINGS_ROUTE, (_, res) => {
-    const stringNode = (id: string, value: string) =>
-      `<string stringId="${id}"><![CDATA[${value}]]></string>`;
-    const stringtableNode = (langName: string) =>
-      `<stringtable rev="1" xml:lang="${langName}">${i8nKeys()
-        .map((key) => stringNode(key, i8n(langName as LANG)(key as KEY)))
-        .join("")}</stringtable>`;
+    const stringNode = (id: string, value: string) => `<string stringId="${id}"><![CDATA[${value}]]></string>`
+    const stringtableNode = (langName: string) => `<stringtable rev="1" xml:lang="${langName}">${i8nKeys().map(key => stringNode(key, i8n(langName as LANG)(key as KEY))).join("")}</stringtable>`
 
     res.type("application/xml").send(`<?xml version="1.0" encoding="utf-8" ?>
 <stringtables xmlns="http://sonos.com/sonosapi">
@@ -309,65 +202,18 @@ function server(
   });
 
   app.get(PRESENTATION_MAP_ROUTE, (_, res) => {
-    const LastModified = startUpTime.format("HH:mm:ss D MMM YYYY");
-
-    const nowPlayingRatingsMatch = (value: number) => {
-      const rating = ratingFromInt(value);
-      const nextLove = { ...rating, love: !rating.love };
-      const nextStar = {
-        ...rating,
-        stars: rating.stars === 5 ? 0 : rating.stars + 1,
-      };
-
-      const loveRatingIcon = bonobUrl
-        .append({
-          pathname: rating.love ? "/love-selected.svg" : "/love-unselected.svg",
-        })
-        .href();
-      const starsRatingIcon = bonobUrl
-        .append({ pathname: `/star${rating.stars}.svg` })
-        .href();
-
-      return `<Match propname="rating" value="${value}">
-        <Ratings>
-          <Rating Id="${ratingAsInt(
-        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">
-            <Icon Controller="universal" LastModified="${LastModified}" Uri="${starsRatingIcon}" />
-          </Rating>
-        </Ratings>
-      </Match>`;
-    };
-
     res.type("application/xml").send(`<?xml version="1.0" encoding="utf-8" ?>
     <Presentation>
-      <BrowseOptions PageSize="30" />
       <PresentationMap type="ArtWorkSizeMap">
         <Match>
           <imageSizeMap>
             ${SONOS_RECOMMENDED_IMAGE_SIZES.map(
       (size) =>
-        `<sizeEntry size="${size}" substitution="/size/${size}"/>`
+        `<sizeEntry size="${size}" substitution="/art/size/${size}"/>`
     ).join("")}
           </imageSizeMap>
         </Match>
       </PresentationMap>
-      <PresentationMap type="BrowseIconSizeMap">
-        <Match>
-          <browseIconSizeMap>
-              <sizeEntry size="0" substitution="/size/legacy"/>
-              ${SONOS_RECOMMENDED_IMAGE_SIZES.map(
-      (size) =>
-        `<sizeEntry size="${size}" substitution="/size/${size}"/>`
-    ).join("")}
-            </browseIconSizeMap>
-        </Match>
-      </PresentationMap>
       <PresentationMap type="Search">
         <Match>
           <SearchCategories>
@@ -377,87 +223,39 @@ function server(
           </SearchCategories>
         </Match>
       </PresentationMap>
-      <PresentationMap type="NowPlayingRatings" trackEnabled="true" programEnabled="false">
-        ${nowPlayingRatingsMatch(100)}
-        ${nowPlayingRatingsMatch(101)}
-        ${nowPlayingRatingsMatch(110)}
-        ${nowPlayingRatingsMatch(111)}
-        ${nowPlayingRatingsMatch(120)}
-        ${nowPlayingRatingsMatch(121)}
-        ${nowPlayingRatingsMatch(130)}
-        ${nowPlayingRatingsMatch(131)}
-        ${nowPlayingRatingsMatch(140)}
-        ${nowPlayingRatingsMatch(141)}
-        ${nowPlayingRatingsMatch(150)}
-        ${nowPlayingRatingsMatch(151)}
-      </PresentationMap>
     </Presentation>`);
   });
 
   app.get("/stream/track/:id", async (req, res) => {
     const id = req.params["id"]!;
-    const trace = uuid();
-
-    logger.debug(
-      `${trace} bnb<- ${req.method} ${req.path}?${JSON.stringify(
-        req.query
-      )}, headers=${JSON.stringify({ ...req.headers, "bnbt": "*****", "bnbk": "*****" })}`
+    logger.info(
+      `-> /stream/track/${id}, headers=${JSON.stringify(req.headers)}`
     );
-
-    const serviceToken = pipe(
-      E.fromNullable("Missing bnbt header")(req.headers["bnbt"] as string),
-      E.chain(token => pipe(
-        E.fromNullable("Missing bnbk header")(req.headers["bnbk"] as string),
-        E.map(key => ({ token, key }))
-      )),
-      E.chain((auth) =>
-        pipe(
-          smapiAuthTokens.verify(auth),
-          E.mapLeft((_) => "Auth token failed to verify")
-        )
-      ),
-      E.getOrElseW(() => undefined)
-    )
-
-    if (!serviceToken) {
+    const authToken = pipe(
+      req.header(BONOB_ACCESS_TOKEN_HEADER),
+      O.fromNullable,
+      O.map((accessToken) => accessTokens.authTokenFor(accessToken)),
+      O.getOrElseW(() => undefined)
+    );
+    if (!authToken) {
       return res.status(401).send();
     } else {
-      // Store session for scrobbling later (when Sonos reports playback)
-      streamSessions.set(id, {
-        serviceToken,
-        trackId: id,
-        timestamp: Date.now(),
-      });
-      logger.debug(`Stored stream session for track ${id}`);
-
       return musicService
-        .login(serviceToken)
+        .login(authToken)
         .then((it) =>
           it
             .stream({
               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)})`
+          logger.info(
+            `stream response from music service for ${id}, status=${stream.status
+            }, headers=(${JSON.stringify(stream.headers)})`
           );
 
-          const sonosisfyContentType = (contentType: string) =>
-            contentType
-              .split(";")
-              .map((it) => it.trim())
-              .map(sonosifyMimeType)
-              .join("; ");
-
           const respondWith = ({
             status,
             filter,
@@ -467,25 +265,25 @@ function server(
           }: {
             status: number;
             filter: Transform;
-            headers: Record<string, string>;
+            headers: Record<string, string | undefined>;
             sendStream: boolean;
             nowPlaying: boolean;
           }) => {
-            logger.debug(
-              `${trace} bnb-> ${req.path}, status=${status}, headers=${JSON.stringify(headers)}`
+            logger.info(
+              `<- /stream/track/${id}, status=${status}, headers=${JSON.stringify(
+                headers
+              )}`
             );
             (nowPlaying
               ? musicLibrary.nowPlaying(id)
               : Promise.resolve(true)
             ).then((_) => {
               res.status(status);
-              Object.entries(headers)
+              Object.entries(stream.headers)
                 .filter(([_, v]) => v !== undefined)
-                .forEach(([header, value]) => {
-                  res.setHeader(header, value!);
-                });
-              if (sendStream) stream.stream.pipe(filter).pipe(res)
-              else res.send()
+                .forEach(([header, value]) => res.setHeader(header, value));
+              if (sendStream) stream.stream.pipe(filter).pipe(res);
+              else res.send();
             });
           };
 
@@ -494,9 +292,7 @@ function server(
               status: 200,
               filter: new PassThrough(),
               headers: {
-                "content-type": sonosisfyContentType(
-                  stream.headers["content-type"]
-                ),
+                "content-type": stream.headers["content-type"],
                 "content-length": stream.headers["content-length"],
                 "accept-ranges": stream.headers["accept-ranges"],
               },
@@ -508,9 +304,7 @@ function server(
               status: 206,
               filter: new PassThrough(),
               headers: {
-                "content-type": sonosisfyContentType(
-                  stream.headers["content-type"]
-                ),
+                "content-type": stream.headers["content-type"],
                 "content-length": stream.headers["content-length"],
                 "content-range": stream.headers["content-range"],
                 "accept-ranges": stream.headers["accept-ranges"],
@@ -531,210 +325,43 @@ function server(
     }
   });
 
-  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)) {
-      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/svg+xml",
-            responseFormatter: (svg: string): Promise<Buffer | string> =>
-              Promise.resolve(svg),
-          };
-
-      return Promise.resolve(
-        icon
-          .apply(
-            features({
-              ...serverOpts.iconColors,
-              text: text
-            })
-          )
-          .apply(festivals(clock))
-          .toString()
-      )
-        .then(spec.responseFormatter)
-        .then((data) => res.status(200).type(spec.mimeType).send(data));
-    }
+  app.get("/stream/artistRadio/:id", async (req, res) => {
+    const id = req.params["id"]!;
+    console.log(`----------> Streaming artist radio!! ${id}`)
+    res.status(404).send()
   });
 
-  app.get("/icons", (_, res) => {
-    res.render("icons", {
-      icons: Object.keys(ICONS).map((k) => [
-        k,
-        ((ICONS as any)[k] as Icon)
-          .apply(
-            features({
-              viewPortIncreasePercent: 80,
-              ...serverOpts.iconColors,
-            })
-          )
-          .toString()
-          .replace('<?xml version="1.0" encoding="UTF-8"?>', ""),
-      ]),
-    });
-  });
-
-  app.get("/art/:burn/size/:size", (req, res) => {
-    const serviceToken = apiTokens.authTokenFor(
+  app.get("/:type/:id/art/size/:size", (req, res) => {
+    const authToken = accessTokens.authTokenFor(
       req.query[BONOB_ACCESS_TOKEN_HEADER] as string
     );
-    const urn = parse(req.params["burn"]!);
+    const type = req.params["type"]!;
+    const id = req.params["id"]!;
     const size = Number.parseInt(req.params["size"]!);
-
-    if (!serviceToken) {
+    if (!authToken) {
       return res.status(401).send();
-    } else if (!(size > 0)) {
+    } else if (type != "artist" && type != "album") {
       return res.status(400).send();
-    }
-
-    return musicService
-      .login(serviceToken)
-      .then((musicLibrary) => {
-        if (urn.system == "external") {
-          return serverOpts.externalImageResolver(urn.resource);
     } else {
-          return musicLibrary.coverArt(urn, size);
-        }
-      })
+      return musicService
+        .login(authToken)
+        .then((it) => it.coverArt(id, type, size))
         .then((coverArt) => {
           if (coverArt) {
             res.status(200);
             res.setHeader("content-type", coverArt.contentType);
-          return res.send(coverArt.data);
+            res.send(coverArt.data);
           } else {
-          return res.status(404).send();
+            res.status(404).send();
           }
         })
         .catch((e: Error) => {
-        logger.error(`Failed fetching image ${urn}/size/${size}`, {
-          cause: e,
-        });
-        return res.status(500).send();
-      });
-  });
-
-  // Sonos Reporting Endpoint for playback analytics
-  app.post("/report/:version/timePlayed", async (req, res) => {
-    const version = req.params["version"];
-    logger.debug(`Received Sonos reporting event (v${version}): ${JSON.stringify(req.body)}`);
-
-    try {
-      // Sonos may send an array of reports or a single report with items array
-      const reports = Array.isArray(req.body) ? req.body : [req.body];
-
-      for (const report of reports) {
-        // Handle both direct report format and items array format
-        const items = report.items || [report];
-
-        for (const item of items) {
-          const {
-            reportId,
-            mediaUrl,
-            durationPlayedMillis,
-            positionMillis,
-            type,
-          } = item;
-
-        // Extract track ID from mediaUrl (format: /stream/track/{id} or x-sonos-http:track%3a{id}.mp3)
-        let trackId: string | undefined;
-
-        if (mediaUrl) {
-          // Try standard URL format first
-          const standardMatch = mediaUrl.match(/\/stream\/track\/([^?]+)/);
-          if (standardMatch) {
-            trackId = standardMatch[1];
-          } else {
-            // Try x-sonos-http format (track%3a{id}.mp3)
-            const sonosMatch = mediaUrl.match(/track%3[aA]([^.?&]+)/);
-            if (sonosMatch) {
-              trackId = sonosMatch[1];
-            }
-          }
-        }
-
-        if (!trackId) {
-          logger.warn(`Could not extract track ID from mediaUrl: ${mediaUrl}, full report: ${JSON.stringify(report)}`);
-          continue; // Skip this report, process next one
-        }
-
-        const durationPlayedSeconds = Math.floor((durationPlayedMillis || 0) / 1000);
-
-        logger.info(
-          `Sonos reporting: type=${type}, trackId=${trackId}, reportId=${reportId}, ` +
-          `durationPlayed=${durationPlayedSeconds}s, position=${positionMillis}ms`
+          logger.error(
+            `Failed fetching image ${type}/${id}/size/${size}: ${e.message}`,
+            e
           );
-
-        // For "final" reports, determine if we should scrobble
-        if (type === "final" && durationPlayedSeconds > 0) {
-          // Retrieve authentication from stream session storage
-          const session = streamSessions.get(trackId!);
-          let serviceToken: string | undefined = session?.serviceToken;
-
-          if (!serviceToken) {
-            // Fallback: try to extract from Authorization header (if present)
-            const authHeader = req.headers["authorization"];
-            if (authHeader && authHeader.startsWith("Bearer ")) {
-              const token = authHeader.substring(7);
-              const smapiToken = serverOpts.smapiTokenStore.get(token);
-              if (smapiToken) {
-                serviceToken = pipe(
-                  smapiAuthTokens.verify({ token, key: smapiToken.key }),
-                  E.getOrElseW(() => undefined)
-                );
-              }
-            }
-          }
-
-          if (serviceToken) {
-            await musicService.login(serviceToken).then((musicLibrary) => {
-              // Get track duration to determine scrobbling threshold
-              return musicLibrary.track(trackId!).then((track) => {
-                const shouldScrobble =
-                  (track.duration < 30 && durationPlayedSeconds >= 10) ||
-                  (track.duration >= 30 && durationPlayedSeconds >= 30);
-
-                if (shouldScrobble) {
-                  logger.info(`Scrobbling track ${trackId} after ${durationPlayedSeconds}s playback`);
-                  return musicLibrary.scrobble(trackId!);
-                } else {
-                  logger.debug(
-                    `Not scrobbling track ${trackId}: duration=${track.duration}s, played=${durationPlayedSeconds}s`
-                  );
-                  return Promise.resolve(false);
-                }
+          res.status(500).send();
         });
-            }).catch((e) => {
-              logger.error(`Failed to process scrobble for track ${trackId}`, { error: e });
-            });
-          } else {
-            logger.debug("No authentication available for reporting endpoint scrobble");
-          }
-        }
-        }
-      }
-
-      return res.status(200).json({ status: "ok" });
-    } catch (error) {
-      logger.error("Error processing Sonos reporting event", { error });
-      return res.status(500).json({ status: "error" });
     }
   });
 
@@ -744,16 +371,12 @@ function server(
     bonobUrl,
     linkCodes,
     musicService,
-    apiTokens,
+    accessTokens,
     clock,
-    i8n,
-    serverOpts.smapiAuthTokens,
-    serverOpts.smapiTokenStore,
-    serverOpts.logRequests,
-    serverOpts.tokenCleanupIntervalMinutes
+    i8n
   );
 
-  if (serverOpts.applyContextPath) {
+  if (applyContextPath) {
     const container = express();
     container.use(bonobUrl.path(), app);
     return container;

src/smapi_auth.ts

@@ -1,192 +0,0 @@
-import { either as E } from "fp-ts";
-import jwt from "jsonwebtoken";
-import { v4 as uuid } from "uuid";
-import { b64Decode, b64Encode } from "./b64";
-import { Clock } from "./clock";
-
-import logger from "./logger";
-
-export type SmapiFault = { Fault: { faultcode: string; faultstring: string } };
-export type SmapiRefreshTokenResultFault = SmapiFault & {
-  Fault: {
-    detail: {
-      refreshAuthTokenResult: { authToken: string; privateKey: string };
-    };
-  };
-};
-
-function isError(thing: any): thing is Error {
-  logger.debug("isError check", { thing });
-  return thing.name && thing.message;
-}
-
-export function isSmapiRefreshTokenResultFault(
-  fault: SmapiFault
-): fault is SmapiRefreshTokenResultFault {
-  return (fault.Fault as any).detail?.refreshAuthTokenResult != undefined;
-}
-
-export type SmapiToken = {
-  token: string;
-  key: string;
-};
-
-export interface ToSmapiFault {
-  _tag: string;
-  toSmapiFault(): SmapiFault
-}
-
-export const SMAPI_FAULT_LOGIN_UNAUTHORIZED = {
-  Fault: {
-    faultcode: "Client.LoginUnauthorized",
-    faultstring:
-      "Failed to authenticate, try Re-Authorising your account in the sonos app",
-  },
-};
-
-export const SMAPI_FAULT_LOGIN_UNSUPPORTED = {
-  Fault: {
-    faultcode: "Client.LoginUnsupported",
-    faultstring: "Missing credentials...",
-  },
-};
-
-export class MissingLoginTokenError extends Error implements ToSmapiFault {
-  _tag = "MissingLoginTokenError";
-
-  constructor() {
-    super("Missing Login Token");
-  }
-
-  toSmapiFault = () => SMAPI_FAULT_LOGIN_UNSUPPORTED;
-}
-
-
-export class InvalidTokenError extends Error implements ToSmapiFault {
-  _tag = "InvalidTokenError";
-
-  constructor(message: string) {
-    super(message);
-  }
-
-  toSmapiFault = () => SMAPI_FAULT_LOGIN_UNAUTHORIZED;
-}
-
-export function isExpiredTokenError(thing: any): thing is ExpiredTokenError {
-  return thing._tag == "ExpiredTokenError";
-}
-
-export class ExpiredTokenError extends Error implements ToSmapiFault {
-  _tag = "ExpiredTokenError";
-  expiredToken: string;
-
-  constructor(expiredToken: string) {
-    super("SMAPI token has expired");
-    this.expiredToken = expiredToken;
-  }
-
-  toSmapiFault = () => ({
-    Fault: {
-      faultcode: "Client.TokenRefreshRequired",
-      faultstring: "Token has expired",
-    },
-  });
-}
-
-export type SmapiAuthTokens = {
-  issue: (serviceToken: string) => SmapiToken;
-  verify: (smapiToken: SmapiToken) => E.Either<ToSmapiFault, string>;
-};
-
-type TokenExpiredError = {
-  name: string;
-  message: string;
-  expiredAt: number;
-};
-
-function isTokenExpiredError(thing: any): thing is TokenExpiredError {
-  return thing.name == "TokenExpiredError";
-}
-
-export const smapiTokenAsString = (smapiToken: SmapiToken) =>
-  b64Encode(
-    JSON.stringify({
-      token: smapiToken.token,
-      key: smapiToken.key,
-    })
-  );
-export const smapiTokenFromString = (smapiTokenString: string): SmapiToken =>
-  JSON.parse(b64Decode(smapiTokenString));
-
-export const SMAPI_TOKEN_VERSION = 2;
-
-export class JWTSmapiLoginTokens implements SmapiAuthTokens {
-  private readonly clock: Clock;
-  private readonly secret: string;
-  private readonly expiresIn: string;
-  private readonly version: number;
-  private readonly keyGenerator: () => string;
-
-  constructor(
-    clock: Clock,
-    secret: string,
-    expiresIn: string,
-    keyGenerator: () => string = uuid,
-    version: number = SMAPI_TOKEN_VERSION
-  ) {
-    this.clock = clock;
-    this.secret = secret;
-    this.expiresIn = expiresIn;
-    this.version = version;
-    this.keyGenerator = keyGenerator;
-  }
-
-  issue = (serviceToken: string) => {
-    const key = this.keyGenerator();
-    return {
-      token: jwt.sign(
-        { serviceToken, iat: this.clock.now().unix() },
-        this.secret + this.version + key,
-        { expiresIn: this.expiresIn }
-      ),
-      key,
-    };
-  };
-
-  verify = (smapiToken: SmapiToken): E.Either<ToSmapiFault, string> => {
-    logger.debug("Verifying JWT", {
-      token: smapiToken.token,
-      key: smapiToken.key,
-      secret: this.secret,
-      version: this.version,
-      secretKey: this.secret + this.version + smapiToken.key,
-    });
-    try {
-      return E.right(
-        (
-          jwt.verify(
-            smapiToken.token,
-            this.secret + this.version + smapiToken.key
-          ) as any
-        ).serviceToken
-      );
-    } catch (e) {
-      const err = e as Error;
-      if (isTokenExpiredError(e)) {
-        logger.debug("JWT token expired, will attempt refresh", { expiredAt: (e as TokenExpiredError).expiredAt });
-        const serviceToken = (
-          jwt.verify(
-            smapiToken.token,
-            this.secret + this.version + smapiToken.key,
-            { ignoreExpiration: true }
-          ) as any
-        ).serviceToken;
-        return E.left(new ExpiredTokenError(serviceToken));
-      } else {
-        logger.warn("JWT verification failed - token may be invalid or from different secret", { message: err.message });
-        if (isError(e)) return E.left(new InvalidTokenError(err.message));
-        else return E.left(new InvalidTokenError("Failed to verify token"));
-      }
-    }
-  };
-}

src/smapi_token_store.ts

@@ -1,166 +0,0 @@
-import fs from "fs";
-import path from "path";
-import logger from "./logger";
-import { SmapiToken, SmapiAuthTokens } from "./smapi_auth";
-import { either as E } from "fp-ts";
-
-export { SQLiteSmapiTokenStore } from "./sqlite_smapi_token_store";
-
-export interface SmapiTokenStore {
-  get(token: string): SmapiToken | undefined;
-  set(token: string, fullSmapiToken: SmapiToken): void;
-  delete(token: string): void;
-  getAll(): { [tokenKey: string]: SmapiToken };
-  cleanupExpired(smapiAuthTokens: SmapiAuthTokens): number;
-}
-
-export class InMemorySmapiTokenStore implements SmapiTokenStore {
-  private tokens: { [tokenKey: string]: SmapiToken } = {};
-
-  get(token: string): SmapiToken | undefined {
-    return this.tokens[token];
-  }
-
-  set(token: string, fullSmapiToken: SmapiToken): void {
-    this.tokens[token] = fullSmapiToken;
-  }
-
-  delete(token: string): void {
-    delete this.tokens[token];
-  }
-
-  getAll(): { [tokenKey: string]: SmapiToken } {
-    return this.tokens;
-  }
-
-  cleanupExpired(smapiAuthTokens: SmapiAuthTokens): number {
-    const tokenKeys = Object.keys(this.tokens);
-    let deletedCount = 0;
-
-    for (const tokenKey of tokenKeys) {
-      const smapiToken = this.tokens[tokenKey];
-      if (smapiToken) {
-        const verifyResult = smapiAuthTokens.verify(smapiToken);
-        // Only delete if token verification fails with InvalidTokenError
-        // Do NOT delete ExpiredTokenError as those can still be refreshed
-        if (E.isLeft(verifyResult)) {
-          const error = verifyResult.left;
-          // Only delete invalid tokens, not expired ones (which can be refreshed)
-          if (error._tag === 'InvalidTokenError') {
-            logger.debug(`Deleting invalid token from in-memory store`);
-            delete this.tokens[tokenKey];
-            deletedCount++;
-          }
-        }
-      }
-    }
-
-    if (deletedCount > 0) {
-      logger.info(`Cleaned up ${deletedCount} invalid token(s) from in-memory store`);
-    }
-
-    return deletedCount;
-  }
-}
-
-export class FileSmapiTokenStore implements SmapiTokenStore {
-  private tokens: { [tokenKey: string]: SmapiToken } = {};
-  private readonly filePath: string;
-
-  constructor(filePath: string) {
-    this.filePath = filePath;
-    this.loadFromFile();
-  }
-
-  private loadFromFile(): void {
-    try {
-      // Ensure the directory exists
-      const dir = path.dirname(this.filePath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-        logger.info(`Created token storage directory: ${dir}`);
-      }
-
-      // Load existing tokens if file exists
-      if (fs.existsSync(this.filePath)) {
-        const data = fs.readFileSync(this.filePath, "utf8");
-        this.tokens = JSON.parse(data);
-        logger.info(
-          `Loaded ${Object.keys(this.tokens).length} token(s) from ${this.filePath}`
-        );
-      } else {
-        logger.info(`No existing token file found at ${this.filePath}, starting fresh`);
-        this.tokens = {};
-        this.saveToFile();
-      }
-    } catch (error) {
-      logger.error(`Failed to load tokens from ${this.filePath}`, { error });
-      this.tokens = {};
-    }
-  }
-
-  private saveToFile(): void {
-    try {
-      // Ensure the directory exists before writing
-      const dir = path.dirname(this.filePath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-        logger.info(`Created token storage directory: ${dir}`);
-      }
-
-      const data = JSON.stringify(this.tokens, null, 2);
-      fs.writeFileSync(this.filePath, data, "utf8");
-      logger.debug(`Saved ${Object.keys(this.tokens).length} token(s) to ${this.filePath}`);
-    } catch (error) {
-      logger.error(`Failed to save tokens to ${this.filePath}`, { error });
-    }
-  }
-
-  get(token: string): SmapiToken | undefined {
-    return this.tokens[token];
-  }
-
-  set(token: string, fullSmapiToken: SmapiToken): void {
-    this.tokens[token] = fullSmapiToken;
-    this.saveToFile();
-  }
-
-  delete(token: string): void {
-    delete this.tokens[token];
-    this.saveToFile();
-  }
-
-  getAll(): { [tokenKey: string]: SmapiToken } {
-    return this.tokens;
-  }
-
-  cleanupExpired(smapiAuthTokens: SmapiAuthTokens): number {
-    const tokenKeys = Object.keys(this.tokens);
-    let deletedCount = 0;
-
-    for (const tokenKey of tokenKeys) {
-      const smapiToken = this.tokens[tokenKey];
-      if (smapiToken) {
-        const verifyResult = smapiAuthTokens.verify(smapiToken);
-        // Only delete if token verification fails with InvalidTokenError
-        // Do NOT delete ExpiredTokenError as those can still be refreshed
-        if (E.isLeft(verifyResult)) {
-          const error = verifyResult.left;
-          // Only delete invalid tokens, not expired ones (which can be refreshed)
-          if (error._tag === 'InvalidTokenError') {
-            logger.debug(`Deleting invalid token from file store`);
-            delete this.tokens[tokenKey];
-            deletedCount++;
-          }
-        }
-      }
-    }
-
-    if (deletedCount > 0) {
-      logger.info(`Cleaned up ${deletedCount} invalid token(s) from file store`);
-      this.saveToFile();
-    }
-
-    return deletedCount;
-  }
-}

src/sonos.ts

@@ -7,45 +7,33 @@ import logger from "./logger";
 import { SOAP_PATH, STRINGS_ROUTE, PRESENTATION_MAP_ROUTE } from "./smapi";
 import qs from "querystring";
 import { URLBuilder } from "./url_builder";
-import { LANG } from "./i8n";
 
-export const SONOS_LANG: 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 const SONOS_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 const PRESENTATION_AND_STRINGS_VERSION =
-  process.env["BNB_DEBUG"] === "true"
-    ? `${Math.round(new Date().getTime() / 1000)}`
-    : "23";
+export const PRESENTATION_AND_STRINGS_VERSION = "20";
 
-// NOTE: manifest requires https for the URL, otherwise you will get an error trying to register
+// NOTE: manifest requires https for the URL,
+// otherwise you will get an error trying to register
 export type Capability =
   | "search"
-  | "trFavorites" // Favorites: Adding/Removing Tracks (deprecated)
-  | "alFavorites" // Favorites: Adding/Removing Albums (deprecated)
-  | "ucPlaylists" // User Content Playlists
-  | "extendedMD" // Extended Metadata (More Menu, Info & Options)
+  | "trFavorites"
+  | "alFavorites"
+  | "ucPlaylists"
+  | "extendedMD"
+  | "radioExtendedMD"
   | "contextHeaders"
   | "authorizationHeader"
-  | "logging" // Playback duration logging at track end (deprecated)
+  | "logging"
   | "manifest";
 
 export const BONOB_CAPABILITIES: Capability[] = [
   "search",
+  // "trFavorites",
+  // "alFavorites",
   "ucPlaylists",
   "extendedMD",
   "logging",
+  "radioExtendedMD"
 ];
 
 export type Device = {
@@ -101,8 +89,8 @@ export interface Sonos {
 export const SONOS_DISABLED: Sonos = {
   devices: () => Promise.resolve([]),
   services: () => Promise.resolve([]),
-  remove: (_: number) => Promise.resolve(false),
-  register: (_: Service) => Promise.resolve(false),
+  remove: (_: number) => Promise.resolve(true),
+  register: (_: Service) => Promise.resolve(true),
 };
 
 export const asService = (musicService: MusicService): Service => ({
@@ -131,7 +119,7 @@ export const asDevice = (sonosDevice: SonosDevice): Device => ({
 
 export const asRemoveCustomdForm = (csrfToken: string, sid: number) => ({
   csrfToken,
-  sid: `${sid}`,
+  sid: `${sid}`
 });
 
 export const asCustomdForm = (csrfToken: string, service: Service) => ({
@@ -176,15 +164,12 @@ export function autoDiscoverySonos(sonosSeedHost?: string): Sonos {
         }
       })
       .catch((e) => {
-        logger.error(`Failed looking for sonos devices - ${e}`, { cause: e });
+        logger.error(`Failed looking for sonos devices ${e}`);
         return [];
       });
   };
 
-  const post = async (
-    action: string,
-    customdForm: (csrfToken: string) => any
-  ) => {
+  const post = async (action: string, customdForm: (csrfToken: string) => any) => {
     const anyDevice = await sonosDevices().then((devices) => head(devices));
 
     if (!anyDevice) {
@@ -211,7 +196,7 @@ export function autoDiscoverySonos(sonosSeedHost?: string): Sonos {
       );
       return false;
     }
-    const form = customdForm(csrfToken);
+    const form = customdForm(csrfToken)
     logger.info(`${action} with sonos @ ${customd}`, { form });
     return axios
       .post(customd, new URLSearchParams(qs.stringify(form)), {
@@ -234,20 +219,16 @@ export function autoDiscoverySonos(sonosSeedHost?: string): Sonos {
         )
         .then((it) => it.map(asService)),
 
-    remove: async (sid: number) =>
-      post("remove", (csrfToken) => asRemoveCustomdForm(csrfToken, sid)),
+    remove: async (sid: number) => post("remove", (csrfToken) => asRemoveCustomdForm(csrfToken, sid)),
 
-    register: async (service: Service) =>
-      post("register", (csrfToken) => asCustomdForm(csrfToken, service)),
+    register: async (service: Service) => post("register", (csrfToken) => asCustomdForm(csrfToken, service)),
   };
 }
 
-export type Discovery = {
-  enabled: boolean;
-  seedHost?: string;
-};
+const sonos = (
+  discoveryEnabled: boolean = true,
+  sonosSeedHost: string | undefined = undefined
+): Sonos =>
+  discoveryEnabled ? autoDiscoverySonos(sonosSeedHost) : SONOS_DISABLED;
 
-export default (sonosDiscovery: Discovery = { enabled: true }): Sonos =>
-  sonosDiscovery.enabled
-    ? autoDiscoverySonos(sonosDiscovery.seedHost)
-    : SONOS_DISABLED;
+export default sonos;

src/sqlite_smapi_token_store.ts

@@ -1,200 +0,0 @@
-import Database from "better-sqlite3";
-import path from "path";
-import fs from "fs";
-import logger from "./logger";
-import { SmapiToken, SmapiAuthTokens } from "./smapi_auth";
-import { either as E } from "fp-ts";
-import { SmapiTokenStore } from "./smapi_token_store";
-
-export class SQLiteSmapiTokenStore implements SmapiTokenStore {
-  private db!: Database.Database;
-  private readonly dbPath: string;
-
-  constructor(dbPath: string) {
-    this.dbPath = dbPath;
-    this.initializeDatabase();
-  }
-
-  private initializeDatabase(): void {
-    try {
-      // Ensure the directory exists
-      const dir = path.dirname(this.dbPath);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-        logger.info(`Created token storage directory: ${dir}`);
-      }
-
-      // Open database connection
-      this.db = new Database(this.dbPath);
-
-      // Create table if it doesn't exist
-      this.db.exec(`
-        CREATE TABLE IF NOT EXISTS smapi_tokens (
-          token_key TEXT PRIMARY KEY,
-          token TEXT NOT NULL,
-          key TEXT NOT NULL,
-          created_at INTEGER NOT NULL DEFAULT (strftime('%s', 'now'))
-        )
-      `);
-
-      // Create index for faster lookups
-      this.db.exec(`
-        CREATE INDEX IF NOT EXISTS idx_created_at ON smapi_tokens(created_at)
-      `);
-
-      const count = this.db.prepare("SELECT COUNT(*) as count FROM smapi_tokens").get() as { count: number };
-      logger.info(`SQLite token store initialized at ${this.dbPath} with ${count.count} token(s)`);
-    } catch (error) {
-      logger.error(`Failed to initialize SQLite token store at ${this.dbPath}`, { error });
-      throw error;
-    }
-  }
-
-  get(tokenKey: string): SmapiToken | undefined {
-    try {
-      const stmt = this.db.prepare("SELECT token, key FROM smapi_tokens WHERE token_key = ?");
-      const row = stmt.get(tokenKey) as { token: string; key: string } | undefined;
-
-      if (!row) {
-        return undefined;
-      }
-
-      return {
-        token: row.token,
-        key: row.key,
-      };
-    } catch (error) {
-      logger.error(`Failed to get token from SQLite store`, { error });
-      return undefined;
-    }
-  }
-
-  set(tokenKey: string, fullSmapiToken: SmapiToken): void {
-    try {
-      const stmt = this.db.prepare(`
-        INSERT OR REPLACE INTO smapi_tokens (token_key, token, key)
-        VALUES (?, ?, ?)
-      `);
-      stmt.run(tokenKey, fullSmapiToken.token, fullSmapiToken.key);
-      logger.debug(`Saved token to SQLite store`);
-    } catch (error) {
-      logger.error(`Failed to save token to SQLite store`, { error });
-    }
-  }
-
-  delete(tokenKey: string): void {
-    try {
-      const stmt = this.db.prepare("DELETE FROM smapi_tokens WHERE token_key = ?");
-      stmt.run(tokenKey);
-      logger.debug(`Deleted token from SQLite store`);
-    } catch (error) {
-      logger.error(`Failed to delete token from SQLite store`, { error });
-    }
-  }
-
-  getAll(): { [tokenKey: string]: SmapiToken } {
-    try {
-      const stmt = this.db.prepare("SELECT token_key, token, key FROM smapi_tokens");
-      const rows = stmt.all() as Array<{ token_key: string; token: string; key: string }>;
-
-      const tokens: { [tokenKey: string]: SmapiToken } = {};
-      for (const row of rows) {
-        tokens[row.token_key] = {
-          token: row.token,
-          key: row.key,
-        };
-      }
-
-      return tokens;
-    } catch (error) {
-      logger.error(`Failed to get all tokens from SQLite store`, { error });
-      return {};
-    }
-  }
-
-  cleanupExpired(smapiAuthTokens: SmapiAuthTokens): number {
-    try {
-      const tokens = this.getAll();
-      const tokenKeys = Object.keys(tokens);
-      let deletedCount = 0;
-
-      for (const tokenKey of tokenKeys) {
-        const smapiToken = tokens[tokenKey];
-        if (smapiToken) {
-          const verifyResult = smapiAuthTokens.verify(smapiToken);
-          // Only delete if token verification fails with InvalidTokenError
-          // Do NOT delete ExpiredTokenError as those can still be refreshed
-          if (E.isLeft(verifyResult)) {
-            const error = verifyResult.left;
-            // Only delete invalid tokens, not expired ones (which can be refreshed)
-            if (error._tag === 'InvalidTokenError') {
-              logger.debug(`Deleting invalid token from SQLite store`);
-              this.delete(tokenKey);
-              deletedCount++;
-            }
-          }
-        }
-      }
-
-      if (deletedCount > 0) {
-        logger.info(`Cleaned up ${deletedCount} invalid token(s) from SQLite store`);
-      }
-
-      return deletedCount;
-    } catch (error) {
-      logger.error(`Failed to cleanup expired tokens from SQLite store`, { error });
-      return 0;
-    }
-  }
-
-  /**
-   * Migrate tokens from a JSON file to the SQLite database
-   * @param jsonFilePath Path to the JSON file containing tokens
-   * @returns Number of tokens migrated
-   */
-  migrateFromJSON(jsonFilePath: string): number {
-    try {
-      if (!fs.existsSync(jsonFilePath)) {
-        logger.info(`No JSON token file found at ${jsonFilePath}, skipping migration`);
-        return 0;
-      }
-
-      const data = fs.readFileSync(jsonFilePath, "utf8");
-      const tokens: { [tokenKey: string]: SmapiToken } = JSON.parse(data);
-      const tokenKeys = Object.keys(tokens);
-
-      let migratedCount = 0;
-      for (const tokenKey of tokenKeys) {
-        const token = tokens[tokenKey];
-        if (token) {
-          this.set(tokenKey, token);
-          migratedCount++;
-        }
-      }
-
-      logger.info(`Migrated ${migratedCount} token(s) from ${jsonFilePath} to SQLite`);
-
-      // Optionally rename the old JSON file to .bak
-      const backupPath = `${jsonFilePath}.bak`;
-      fs.renameSync(jsonFilePath, backupPath);
-      logger.info(`Backed up original JSON file to ${backupPath}`);
-
-      return migratedCount;
-    } catch (error) {
-      logger.error(`Failed to migrate tokens from JSON file ${jsonFilePath}`, { error });
-      return 0;
-    }
-  }
-
-  /**
-   * Close the database connection
-   */
-  close(): void {
-    try {
-      this.db.close();
-      logger.info("SQLite token store connection closed");
-    } catch (error) {
-      logger.error("Failed to close SQLite token store connection", { error });
-    }
-  }
-}

src/utils.ts

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

tests/access_tokens.test.ts

@@ -0,0 +1,273 @@
+import { v4 as uuid } from "uuid";
+import dayjs from "dayjs";
+
+import {
+  AccessTokenPerAuthToken,
+  EncryptedAccessTokens,
+  ExpiringAccessTokens,
+  InMemoryAccessTokens,
+  sha256
+} from "../src/access_tokens";
+import { Encryption } from "../src/encryption";
+
+describe("ExpiringAccessTokens", () => {
+  let now = dayjs();
+
+  const accessTokens = new ExpiringAccessTokens({ now: () => now });
+
+  describe("tokens", () => {
+    it("they should be unique", () => {
+      const authToken = uuid();
+      expect(accessTokens.mint(authToken)).not.toEqual(
+        accessTokens.mint(authToken)
+      );
+    });
+  });
+
+  describe("tokens that dont exist", () => {
+    it("should return undefined", () => {
+      expect(accessTokens.authTokenFor("doesnt exist")).toBeUndefined();
+    });
+  });
+
+  describe("tokens that have not expired", () => {
+    it("should be able to return them", () => {
+      const authToken = uuid();
+
+      const accessToken = accessTokens.mint(authToken);
+
+      expect(accessTokens.authTokenFor(accessToken)).toEqual(authToken);
+    });
+
+    it("should be able to have many per authToken", () => {
+      const authToken = uuid();
+
+      const accessToken1 = accessTokens.mint(authToken);
+      const accessToken2 = accessTokens.mint(authToken);
+
+      expect(accessTokens.authTokenFor(accessToken1)).toEqual(authToken);
+      expect(accessTokens.authTokenFor(accessToken2)).toEqual(authToken);
+    });
+  });
+
+  describe("tokens that have expired", () => {
+    describe("retrieving it", () => {
+      it("should return undefined", () => {
+        const authToken = uuid();
+
+        now = dayjs();
+        const accessToken = accessTokens.mint(authToken);
+
+        now = now.add(12, "hours").add(1, "second");
+
+        expect(accessTokens.authTokenFor(accessToken)).toBeUndefined();
+      });
+    });
+
+    describe("should be cleared out", () => {
+      const authToken1 = uuid();
+      const authToken2 = uuid();
+
+      now = dayjs();
+
+      const accessToken1_1 = accessTokens.mint(authToken1);
+      const accessToken2_1 = accessTokens.mint(authToken2);
+
+      expect(accessTokens.count()).toEqual(2);
+      expect(accessTokens.authTokenFor(accessToken1_1)).toEqual(authToken1);
+      expect(accessTokens.authTokenFor(accessToken2_1)).toEqual(authToken2);
+
+      now = now.add(12, "hours").add(1, "second");
+
+      const accessToken1_2 = accessTokens.mint(authToken1);
+
+      expect(accessTokens.count()).toEqual(1);
+      expect(accessTokens.authTokenFor(accessToken1_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken1_2)).toEqual(authToken1);
+
+      now = now.add(6, "hours");
+
+      const accessToken2_2 = accessTokens.mint(authToken2);
+
+      expect(accessTokens.count()).toEqual(2);
+      expect(accessTokens.authTokenFor(accessToken1_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken1_2)).toEqual(authToken1);
+      expect(accessTokens.authTokenFor(accessToken2_2)).toEqual(authToken2);
+
+      now = now.add(6, "hours").add(1, "minute");
+
+      expect(accessTokens.authTokenFor(accessToken1_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken1_2)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_2)).toEqual(authToken2);
+      expect(accessTokens.count()).toEqual(1);
+
+      now = now.add(6, "hours").add(1, "minute");
+
+      expect(accessTokens.authTokenFor(accessToken1_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_1)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken1_2)).toBeUndefined();
+      expect(accessTokens.authTokenFor(accessToken2_2)).toBeUndefined();
+      expect(accessTokens.count()).toEqual(0);
+    });
+  });
+});
+
+describe("EncryptedAccessTokens", () => {
+  const encryption = {
+    encrypt: jest.fn(),
+    decrypt: jest.fn(),
+  };
+
+  const accessTokens = new EncryptedAccessTokens(
+    (encryption as unknown) as Encryption
+  );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+  });
+
+  describe("encrypt and decrypt", () => {
+    it("should be able to round trip the token", () => {
+      const authToken = `the token - ${uuid()}`;
+      const hash = {
+        encryptedData: "the encrypted token",
+        iv: "vi",
+      };
+
+      encryption.encrypt.mockReturnValue(hash);
+      encryption.decrypt.mockReturnValue(authToken);
+
+      const accessToken = accessTokens.mint(authToken);
+
+      expect(accessToken).not.toContain(authToken);
+      expect(accessToken).toEqual(
+        Buffer.from(JSON.stringify(hash)).toString("base64")
+      );
+
+      expect(accessTokens.authTokenFor(accessToken)).toEqual(authToken);
+
+      expect(encryption.encrypt).toHaveBeenCalledWith(authToken);
+      expect(encryption.decrypt).toHaveBeenCalledWith(hash);
+    });
+  });
+
+  describe("when the token is a valid Hash but doesnt decrypt", () => {
+    it("should return undefined", () => {
+      const hash = {
+        encryptedData: "valid hash",
+        iv: "vi",
+      };
+      encryption.decrypt.mockImplementation(() => {
+        throw "Boooooom decryption failed!!!";
+      });
+      expect(
+        accessTokens.authTokenFor(
+          Buffer.from(JSON.stringify(hash)).toString("base64")
+        )
+      ).toBeUndefined();
+    });
+  });
+
+  describe("when the token is not even a valid hash", () => {
+    it("should return undefined", () => {
+      encryption.decrypt.mockImplementation(() => {
+        throw "Boooooom decryption failed!!!";
+      });
+      expect(accessTokens.authTokenFor("some rubbish")).toBeUndefined();
+    });
+  });
+});
+
+describe("AccessTokenPerAuthToken", () => {
+  const accessTokens = new AccessTokenPerAuthToken();
+
+  it("should return the same access token for the same auth token", () => {
+    const authToken = "token1";
+    
+    const accessToken1 = accessTokens.mint(authToken);
+    const accessToken2 = accessTokens.mint(authToken);
+
+    expect(accessToken1).not.toEqual(authToken);
+    expect(accessToken1).toEqual(accessToken2);
+  });
+
+  describe("when there is an auth token for the access token", () => {
+    it("should be able to retrieve it", () => {
+      const authToken = uuid();
+      const accessToken = accessTokens.mint(authToken);
+
+      expect(accessTokens.authTokenFor(accessToken)).toEqual(authToken);
+    });
+  });
+
+  describe("when there is no auth token for the access token", () => {
+    it("should return undefined", () => {
+      expect(accessTokens.authTokenFor(uuid())).toBeUndefined();
+    });
+  });
+});
+
+describe('sha256 minter', () => {
+  it('should return the same value for the same salt and authToken', () => {
+    const authToken = uuid();
+    const token1 = sha256("salty")(authToken);
+    const token2 = sha256("salty")(authToken);
+
+    expect(token1).not.toEqual(authToken);
+    expect(token1).toEqual(token2);
+  });
+
+  it('should returrn different values for the same salt but different authTokens', () => {
+    const authToken1 = uuid();
+    const authToken2 = uuid();
+
+    const token1 = sha256("salty")(authToken1);
+    const token2= sha256("salty")(authToken2);
+
+    expect(token1).not.toEqual(token2);
+  });
+
+  it('should return different values for the same authToken but different salts', () => {
+    const authToken = uuid();
+
+    const token1 = sha256("salt1")(authToken);
+    const token2= sha256("salt2")(authToken);
+
+    expect(token1).not.toEqual(token2);
+  });
+});
+
+describe("InMemoryAccessTokens", () => {
+  const reverseAuthToken = (authToken: string) => authToken.split("").reverse().join("");
+
+  const accessTokens = new InMemoryAccessTokens(reverseAuthToken);
+
+  it("should return the same access token for the same auth token", () => {
+    const authToken = "token1";
+    
+    const accessToken1 = accessTokens.mint(authToken);
+    const accessToken2 = accessTokens.mint(authToken);
+
+    expect(accessToken1).not.toEqual(authToken);
+    expect(accessToken1).toEqual(accessToken2);
+  });
+
+  describe("when there is an auth token for the access token", () => {
+    it("should be able to retrieve it", () => {
+      const authToken = uuid();
+      const accessToken = accessTokens.mint(authToken);
+
+      expect(accessTokens.authTokenFor(accessToken)).toEqual(authToken);
+    });
+  });
+
+  describe("when there is no auth token for the access token", () => {
+    it("should return undefined", () => {
+      expect(accessTokens.authTokenFor(uuid())).toBeUndefined();
+    });
+  });
+});

tests/api_tokens.test.ts

@@ -1,67 +0,0 @@
-import { v4 as uuid } from "uuid";
-
-import {
-  InMemoryAPITokens,
-  sha256
-} from "../src/api_tokens";
-
-describe('sha256 minter', () => {
-  it('should return the same value for the same salt and authToken', () => {
-    const authToken = uuid();
-    const token1 = sha256("salty")(authToken);
-    const token2 = sha256("salty")(authToken);
-
-    expect(token1).not.toEqual(authToken);
-    expect(token1).toEqual(token2);
-  });
-
-  it('should returrn different values for the same salt but different authTokens', () => {
-    const authToken1 = uuid();
-    const authToken2 = uuid();
-
-    const token1 = sha256("salty")(authToken1);
-    const token2= sha256("salty")(authToken2);
-
-    expect(token1).not.toEqual(token2);
-  });
-
-  it('should return different values for the same authToken but different salts', () => {
-    const authToken = uuid();
-
-    const token1 = sha256("salt1")(authToken);
-    const token2= sha256("salt2")(authToken);
-
-    expect(token1).not.toEqual(token2);
-  });
-});
-
-describe("InMemoryAPITokens", () => {
-  const reverseAuthToken = (authToken: string) => authToken.split("").reverse().join("");
-
-  const accessTokens = new InMemoryAPITokens(reverseAuthToken);
-
-  it("should return the same access token for the same auth token", () => {
-    const authToken = "token1";
-    
-    const accessToken1 = accessTokens.mint(authToken);
-    const accessToken2 = accessTokens.mint(authToken);
-
-    expect(accessToken1).not.toEqual(authToken);
-    expect(accessToken1).toEqual(accessToken2);
-  });
-
-  describe("when there is an auth token for the access token", () => {
-    it("should be able to retrieve it", () => {
-      const authToken = uuid();
-      const accessToken = accessTokens.mint(authToken);
-
-      expect(accessTokens.authTokenFor(accessToken)).toEqual(authToken);
-    });
-  });
-
-  describe("when there is no auth token for the access token", () => {
-    it("should return undefined", () => {
-      expect(accessTokens.authTokenFor(uuid())).toBeUndefined();
-    });
-  });
-});

tests/b64.test.ts

@@ -1,17 +0,0 @@
-import { b64Encode, b64Decode } from "../src/b64";
-
-describe("b64", () => {
-    const value = "foobar100";
-    const encoded = Buffer.from(value).toString("base64");
-
-    describe("encode", () => {
-        it("should encode", () => {
-            expect(b64Encode(value)).toEqual(encoded);
-        });
-    });
-    describe("decode", () => {
-        it("should decode", () => {
-            expect(b64Decode(encoded)).toEqual(value);
-        });
-    });
-});

tests/builders.ts

@@ -1,24 +1,10 @@
 import { SonosDevice } from "@svrooij/sonos/lib";
 import { v4 as uuid } from "uuid";
-import randomstring from "randomstring";
-
 import { Credentials } from "../src/smapi";
-import { Service, Device } from "../src/sonos";
-import {
-  Album,
-  Artist,
-  Track,
-  albumToAlbumSummary,
-  artistToArtistSummary,
-  PlaylistSummary,
-  Playlist,
-  SimilarArtist,
-  AlbumSummary,
-  RadioStation
-} from "../src/music_service";
 
-import { b64Encode } from "../src/b64";
-import { artistImageURN } from "../src/subsonic";
+import { Service, Device } from "../src/sonos";
+import { Album, Artist, Track, albumToAlbumSummary, artistToArtistSummary, PlaylistSummary, Playlist } from "../src/music_service";
+import randomString from "../src/random_string";
 
 const randomInt = (max: number) => Math.floor(Math.random() * Math.floor(max));
 const randomIpAddress = () => `127.0.${randomInt(255)}.${randomInt(255)}`;
@@ -42,23 +28,21 @@ export const aService = (fields: Partial<Service> = {}): Service => ({
   ...fields,
 });
 
-export function aPlaylistSummary(
-  fields: Partial<PlaylistSummary> = {}
-): PlaylistSummary {
+export function aPlaylistSummary(fields: Partial<PlaylistSummary> = {}): PlaylistSummary {
   return {
     id: `playlist-${uuid()}`,
-    name: `playlistname-${randomstring.generate()}`,
-    ...fields,
-  };
+    name: `playlistname-${randomString()}`,
+    ...fields
+  }
 }
 
 export function aPlaylist(fields: Partial<Playlist> = {}): Playlist {
   return {
     id: `playlist-${uuid()}`,
-    name: `playlist-${randomstring.generate()}`,
+    name: `playlist-${randomString()}`,
     entries: [aTrack(), aTrack()],
-    ...fields,
-  };
+    ...fields
+  }
 } 
 
 export function aDevice(fields: Partial<Device> = {}): Device {
@@ -91,11 +75,10 @@ export function getAppLinkMessage() {
   };
 }
 
-export function someCredentials({ token, key } : { token: string, key: string }): Credentials {
+export function someCredentials(token: string): Credentials {
   return {
     loginToken: {
       token,
-      key,
       householdId: "hh1",
     },
     deviceId: "d1",
@@ -103,90 +86,58 @@ export function someCredentials({ token, key } : { token: string, key: string })
   };
 }
 
-export function aSimilarArtist(
-  fields: Partial<SimilarArtist> = {}
-): SimilarArtist {
-  const id = fields.id || uuid();
-  return {
-    id,
-    name: `Similar Artist ${id}`,
-    image: artistImageURN({ artistId: id }),
-    inLibrary: true,
-    ...fields,
-  };
-}
-
 export function anArtist(fields: Partial<Artist> = {}): Artist {
-  const id = fields.id || uuid();
+  const id = uuid();
   const artist = {
     id,
     name: `Artist ${id}`,
     albums: [anAlbum(), anAlbum(), anAlbum()],
-    image: { system: "subsonic", resource: `art:${id}` },
+    image: {
+      small: `/artist/art/${id}/small`,
+      medium: `/artist/art/${id}/small`,
+      large: `/artist/art/${id}/large`,
+    },
     similarArtists: [
-      aSimilarArtist({ id: uuid(), name: "Similar artist1", inLibrary: true }),
-      aSimilarArtist({ id: uuid(), name: "Similar artist2", inLibrary: true }),
-      aSimilarArtist({
-        id: "-1",
-        name: "Artist not in library",
-        inLibrary: false,
-      }),
+      { id: uuid(), name: "Similar artist1", inLibrary: true },
+      { id: uuid(), name: "Similar artist2", inLibrary: true },
+      { id: "-1", name: "Artist not in library", inLibrary: false },
     ],
     ...fields,
   };
-  artist.albums.forEach((album) => {
+  artist.albums.forEach(album => {
     album.artistId = artist.id;
     album.artistName = artist.name;
-  });
+  })
   return artist;
 }
 
-export const aGenre = (name: string) => ({ id: b64Encode(name), name });
+export const HIP_HOP = { id: "genre_hip_hop", name: "Hip-Hop" };
+export const METAL = { id: "genre_metal", name: "Metal" };
+export const NEW_WAVE = { id: "genre_new_wave", name: "New Wave" };
+export const POP = { id: "genre_pop", name: "Pop" };
+export const POP_ROCK = { id: "genre_pop_rock", name: "Pop Rock" };
+export const REGGAE = { id: "genre_reggae", name: "Reggae" };
+export const ROCK = { id: "genre_rock", name: "Rock" };
+export const SKA = { id: "genre_ska", name: "Ska" };
+export const PUNK = { id: "genre_punk", name: "Punk" };
+export const TRIP_HOP = { id: "genre_trip_hop", name: "Trip Hop" };
 
-export const HIP_HOP = aGenre("Hip-Hop");
-export const METAL = aGenre("Metal");
-export const NEW_WAVE = aGenre("New Wave");
-export const POP = aGenre("Pop");
-export const POP_ROCK = aGenre("Pop Rock");
-export const REGGAE = aGenre("Reggae");
-export const ROCK = aGenre("Rock");
-export const SKA = aGenre("Ska");
-export const PUNK = aGenre("Punk");
-export const TRIP_HOP = aGenre("Trip Hop");
-
-export const SAMPLE_GENRES = [
-  HIP_HOP,
-  METAL,
-  NEW_WAVE,
-  POP,
-  POP_ROCK,
-  REGGAE,
-  ROCK,
-  SKA,
-];
+export const SAMPLE_GENRES = [HIP_HOP, METAL, NEW_WAVE, POP, POP_ROCK, REGGAE, ROCK, SKA];
 export const randomGenre = () => SAMPLE_GENRES[randomInt(SAMPLE_GENRES.length)];
 
 export function aTrack(fields: Partial<Track> = {}): Track {
   const id = uuid();
   const artist = anArtist();
   const genre = fields.genre || randomGenre();
-  const rating = { love: false, stars: Math.floor(Math.random() * 5) };
   return {
     id,
     name: `Track ${id}`,
-    encoding: {
-      player: "bonob",
-      mimeType: `audio/mp3-${id}`
-    },
+    mimeType: `audio/mp3-${id}`,
     duration: randomInt(500),
     number: randomInt(100),
     genre,
     artist: artistToArtistSummary(artist),
-    album: albumToAlbumSummary(
-      anAlbum({ artistId: artist.id, artistName: artist.name, genre })
-    ),
-    coverArt: { system: "subsonic", resource: `art:${uuid()}`},
-    rating,
+    album: albumToAlbumSummary(anAlbum({ artistId: artist.id, artistName: artist.name, genre })),
     ...fields,
   };
 }
@@ -199,36 +150,10 @@ export function anAlbum(fields: Partial<Album> = {}): Album {
     genre: randomGenre(),
     year: `19${randomInt(99)}`,
     artistId: `Artist ${uuid()}`,
-    artistName: `Artist ${randomstring.generate()}`,
-    coverArt: { system: "subsonic", resource: `art:${uuid()}` },
+    artistName: `Artist ${randomString()}`,
     ...fields,
   };
-};
-
-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 {
-    id,
-    name: `Album ${id}`,
-    year: `19${randomInt(99)}`,
-    genre: randomGenre(),
-    coverArt: { system: "subsonic", resource: `art:${uuid()}` },
-    artistId: `Artist ${uuid()}`,
-    artistName: `Artist ${randomstring.generate()}`,
-    ...fields
-  }
-};
 
 export const BLONDIE_ID = uuid();
 export const BLONDIE_NAME = "Blondie";
@@ -242,8 +167,7 @@ export const BLONDIE: Artist = {
       year: "1976",
       genre: NEW_WAVE,
       artistId: BLONDIE_ID,
-      artistName: BLONDIE_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
+      artistName: BLONDIE_NAME
     },
     {
       id: uuid(),
@@ -251,11 +175,14 @@ export const BLONDIE: Artist = {
       year: "1978",
       genre: POP_ROCK,
       artistId: BLONDIE_ID,
-      artistName: BLONDIE_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
+      artistName: BLONDIE_NAME
     },
   ],
-  image: { system: "external", resource: "http://localhost:1234/images/blondie.jpg" },
+  image: {
+    small: undefined,
+    medium: undefined,
+    large: undefined,
+  },
   similarArtists: [],
 };
 
@@ -265,35 +192,15 @@ export const BOB_MARLEY: Artist = {
   id: BOB_MARLEY_ID,
   name: BOB_MARLEY_NAME,
   albums: [
-    {
-      id: uuid(),
-      name: "Burin'",
-      year: "1973",
-      genre: REGGAE,
-      artistId: BOB_MARLEY_ID,
-      artistName: BOB_MARLEY_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
-    },
-    {
-      id: uuid(),
-      name: "Exodus",
-      year: "1977",
-      genre: REGGAE,
-      artistId: BOB_MARLEY_ID,
-      artistName: BOB_MARLEY_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
-    },
-    {
-      id: uuid(),
-      name: "Kaya",
-      year: "1978",
-      genre: SKA,
-      artistId: BOB_MARLEY_ID,
-      artistName: BOB_MARLEY_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
-    },
+    { id: uuid(), name: "Burin'", year: "1973", genre: REGGAE, artistId: BOB_MARLEY_ID, artistName: BOB_MARLEY_NAME },
+    { id: uuid(), name: "Exodus", year: "1977", genre: REGGAE, artistId: BOB_MARLEY_ID, artistName: BOB_MARLEY_NAME },
+    { id: uuid(), name: "Kaya", year: "1978", genre: SKA, artistId: BOB_MARLEY_ID, artistName: BOB_MARLEY_NAME },
   ],
-  image: { system: "subsonic", resource: BOB_MARLEY_ID },
+  image: {
+    small: "http://localhost/BOB_MARLEY/sml",
+    medium: "http://localhost/BOB_MARLEY/med",
+    large: "http://localhost/BOB_MARLEY/lge",
+  },
   similarArtists: [],
 };
 
@@ -304,8 +211,9 @@ export const MADONNA: Artist = {
   name: MADONNA_NAME,
   albums: [],
   image: {
-    system: "external",
-    resource: "http://localhost:1234/images/madonna.jpg",
+    small: "http://localhost/MADONNA/sml",
+    medium: undefined,
+    large: "http://localhost/MADONNA/lge",
   },
   similarArtists: [],
 };
@@ -323,7 +231,6 @@ export const METALLICA: Artist = {
       genre: METAL,
       artistId: METALLICA_ID,
       artistName: METALLICA_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
     },
     {
       id: uuid(),
@@ -332,10 +239,13 @@ export const METALLICA: Artist = {
       genre: METAL,
       artistId: METALLICA_ID,
       artistName: METALLICA_NAME,
-      coverArt: { system: "subsonic", resource: `art:${uuid()}`},
     },
   ],
-  image: { system: "subsonic", resource: METALLICA_ID },
+  image: {
+    small: "http://localhost/METALLICA/sml",
+    medium: "http://localhost/METALLICA/med",
+    large: "http://localhost/METALLICA/lge",
+  },
   similarArtists: [],
 };
 

tests/burn.test.ts

@@ -1,114 +0,0 @@
-import { assertSystem, BUrn, format, formatForURL, parse } from "../src/burn";
-
-type BUrnSpec = {
-  burn: BUrn;
-  asString: string;
-  shorthand: string;
-};
-
-describe("BUrn", () => {
-  describe("format", () => {
-    (
-      [
-        {
-          burn: { system: "internal", resource: "icon:error" },
-          asString: "bnb:internal:icon:error",
-          shorthand: "bnb:i:icon:error",
-        },
-        {
-          burn: {
-            system: "external",
-            resource: "http://example.com/widget.jpg",
-          },
-          asString: "bnb:external:http://example.com/widget.jpg",
-          shorthand: "bnb:e:http://example.com/widget.jpg",
-        },
-        {
-          burn: { system: "subsonic", resource: "art:1234" },
-          asString: "bnb:subsonic:art:1234",
-          shorthand: "bnb:s:art:1234",
-        },
-        {
-          burn: { system: "navidrome", resource: "art:1234" },
-          asString: "bnb:navidrome:art:1234",
-          shorthand: "bnb:n:art:1234",
-        },
-      ] as BUrnSpec[]
-    ).forEach(({ burn, asString, shorthand }) => {
-      describe(asString, () => {
-        it("can be formatted as string and then roundtripped back into BUrn", () => {
-          const stringValue = format(burn);
-          expect(stringValue).toEqual(asString);
-          expect(parse(stringValue)).toEqual(burn);
-        });
-
-        it("can be formatted as shorthand string and then roundtripped back into BUrn", () => {
-          const stringValue = format(burn, { shorthand: true });
-          expect(stringValue).toEqual(shorthand);
-          expect(parse(stringValue)).toEqual(burn);
-        });
-
-        describe(`encrypted ${asString}`, () => {
-          it("can be formatted as an encrypted string and then roundtripped back into BUrn", () => {
-            const stringValue = format(burn, { encrypt: true });
-            expect(stringValue.startsWith("bnb:encrypted:")).toBeTruthy();
-            expect(stringValue).not.toContain(burn.system);
-            expect(stringValue).not.toContain(burn.resource);
-            expect(parse(stringValue)).toEqual(burn);
-          });
-
-          it("can be formatted as an encrypted shorthand string and then roundtripped back into BUrn", () => {
-            const stringValue = format(burn, {
-              shorthand: true,
-              encrypt: true,
-            });
-            expect(stringValue.startsWith("bnb:x:")).toBeTruthy();
-            expect(stringValue).not.toContain(burn.system);
-            expect(stringValue).not.toContain(burn.resource);
-            expect(parse(stringValue)).toEqual(burn);
-          });
-        });
-      });
-    });
-  });
-
-  describe("formatForURL", () => {
-    describe("external", () => {
-      it("should be encrypted", () => {
-        const burn = {
-          system: "external",
-          resource: "http://example.com/foo.jpg",
-        };
-        const formatted = formatForURL(burn);
-        expect(formatted.startsWith("bnb:x:")).toBeTruthy();
-        expect(formatted).not.toContain("http://example.com/foo.jpg");
-
-        expect(parse(formatted)).toEqual(burn);
-      });
-    });
-
-    describe("not external", () => {
-      it("should be shorthand form", () => {
-        expect(formatForURL({ system: "internal", resource: "foo" })).toEqual(
-          "bnb:i:foo"
-        );
-        expect(
-          formatForURL({ system: "subsonic", resource: "foo:bar" })
-        ).toEqual("bnb:s:foo:bar");
-      });
-    });
-  });
-
-  describe("assertSystem", () => {
-    it("should fail if the system is not equal", () => {
-      const burn = { system: "external", resource: "something"};
-      expect(() => assertSystem(burn, "subsonic")).toThrow(`Unsupported urn: '${format(burn)}'`)
-    });
-
-    it("should pass if the system is equal", () => {
-      const burn = { system: "external", resource: "something"};
-      expect(assertSystem(burn, "external")).toEqual(burn);
-    });
-  });
-});
-

tests/clock.test.ts

@@ -1,85 +0,0 @@
-import { randomInt } from "crypto";
-import dayjs, { Dayjs } from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-dayjs.extend(timezone);
-
-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);
-      });
-    });
-  });
-}
-
-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);
-      });
-    });
-  });
-}
-
-describeFixedDateMonthEvent("christmas", "25/12", isChristmas);
-describeFixedDateMonthEvent("halloween", "31/10", isHalloween);
-describeFixedDateMonthEvent("may4", "04/05", isMay4);
-
-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);

tests/config.test.ts

@@ -1,81 +1,5 @@
 import { hostname } from "os";
-import config, { COLOR, envVar } from "../src/config";
-
-describe("envVar", () => {
-  const OLD_ENV = process.env;
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = { ...OLD_ENV };
-
-    process.env["bnb-var"] = "bnb-var-value";
-    process.env["bnb-legacy2"] = "bnb-legacy2-value";
-    process.env["bnb-legacy3"] = "bnb-legacy3-value";
-  });
-
-  afterEach(() => {
-    process.env = OLD_ENV;
-  });
-
-  describe("when the env var exists", () => {
-    describe("and there are no legacy env vars that match", () => {
-      it("should return the env var", () => {
-        expect(envVar("bnb-var")).toEqual("bnb-var-value");
-      });
-    });
-
-    describe("and there are legacy env vars that match", () => {
-      it("should return the env var", () => {
-        expect(
-          envVar("bnb-var", {
-            default: "not valid",
-            legacy: ["bnb-legacy1", "bnb-legacy2", "bnb-legacy3"],
-          })
-        ).toEqual("bnb-var-value");
-      });
-    });
-  });
-
-  describe("when the env var doesnt exist", () => {
-    describe("and there are no legacy env vars specified", () => {
-      describe("and there is no default value specified", () => {
-        it("should be undefined", () => {
-          expect(envVar("bnb-not-set")).toBeUndefined();
-        });
-      });
-
-      describe("and there is a default value specified", () => {
-        it("should return the default", () => {
-          expect(envVar("bnb-not-set", { default: "widget" })).toEqual(
-            "widget"
-          );
-        });
-      });
-    });
-
-    describe("when there are legacy env vars specified", () => {
-      it("should return the value from the first matched legacy env var", () => {
-        expect(
-          envVar("bnb-not-set", {
-            legacy: ["bnb-legacy1", "bnb-legacy2", "bnb-legacy3"],
-          })
-        ).toEqual("bnb-legacy2-value");
-      });
-    });
-  });
-
-  describe("validationPattern", () => {
-    it("should fail when the value does not match the pattern", () => {
-      expect(() =>
-        envVar("bnb-var", {
-          validationPattern: /^foobar$/,
-        })
-      ).toThrowError(
-        `Invalid value specified for 'bnb-var', must match ${/^foobar$/}`
-      );
-    });
-  });
-});
+import config from "../src/config";
 
 describe("config", () => {
   const OLD_ENV = process.env;
@@ -96,38 +20,49 @@ describe("config", () => {
     propertyGetter: (config: any) => any
   ) {
     describe(name, () => {
-      it.each([
-        [expectedDefault, ""],
-        [expectedDefault, undefined],
-        [true, "true"],
-        [false, "false"],
-        [false, "foo"],
-      ])("should be %s when env var is '%s'", (expected, value) => {
+      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 });
     });
   }
 
   describe("bonobUrl", () => {
-      describe.each([
-        "BNB_URL", 
-        "BONOB_URL", 
-        "BONOB_WEB_ADDRESS"
-      ])("when %s is specified", (k) => {
+    describe("when BONOB_URL is specified", () => {
       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[k] = url;
+        process.env["BONOB_URL"] = url;
 
         expect(config().bonobUrl.href()).toEqual(url);
       });
     });
 
-    describe("when none of BNB_URL, BONOB_URL, BONOB_WEB_ADDRESS are specified", () => {
+    describe("when BONOB_URL is not specified, however legacy BONOB_WEB_ADDRESS is specified", () => {
+      it("should be used", () => {
+        const url = "http://bonob2.example.com:9988/";
+        process.env["BONOB_URL"] = "";
+        process.env["BONOB_WEB_ADDRESS"] = url;
+
+        expect(config().bonobUrl.href()).toEqual(url);
+      });
+    });
+
+    describe("when neither BONOB_URL nor BONOB_WEB_ADDRESS are specified", () => {
       describe("when BONOB_PORT is not specified", () => {
         it(`should default to http://${hostname()}:4534`, () => {
           expect(config().bonobUrl.href()).toEqual(
@@ -136,15 +71,6 @@ describe("config", () => {
         });
       });
 
-      describe("when BNB_PORT is specified as 3322", () => {
-        it(`should default to http://${hostname()}:3322`, () => {
-          process.env["BNB_PORT"] = "3322";
-          expect(config().bonobUrl.href()).toEqual(
-            `http://${hostname()}:3322/`
-          );
-        });
-      });
-
       describe("when BONOB_PORT is specified as 3322", () => {
         it(`should default to http://${hostname()}:3322`, () => {
           process.env["BONOB_PORT"] = "3322";
@@ -156,89 +82,26 @@ describe("config", () => {
     });
   });
 
-  describe("icons", () => {
-    describe("foregroundColor", () => {
-      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("navidrome", () => {
+    describe("url", () => {
+      describe("when BONOB_NAVIDROME_URL is not specified", () => {
+        it(`should default to http://${hostname()}:4533`, () => {
+          expect(config().navidrome.url).toEqual(`http://${hostname()}:4533`);
         });
       });
 
-        describe(`when ${k} is ''`, () => {
-          it(`should default to undefined`, () => {
-            process.env[k] = "";
-            expect(config().icons.foregroundColor).toEqual(undefined);
+      describe("when BONOB_NAVIDROME_URL is ''", () => {
+        it(`should default to http://${hostname()}:4533`, () => {
+          process.env["BONOB_NAVIDROME_URL"] = "";
+          expect(config().navidrome.url).toEqual(`http://${hostname()}:4533`);
         });
       });
 
-        describe(`when ${k} is specified as a color`, () => {
+      describe("when BONOB_NAVIDROME_URL is specified", () => {
         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 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", () => {
-      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 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 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}`
-            );
-          });
+          const url = "http://navidrome.example.com:1234";
+          process.env["BONOB_NAVIDROME_URL"] = url;
+          expect(config().navidrome.url).toEqual(url);
         });
       });
     });
@@ -249,36 +112,11 @@ describe("config", () => {
       expect(config().secret).toEqual("bonob");
     });
 
-    describe.each([
-      "BNB_SECRET", 
-      "BONOB_SECRET"
-    ])("%s", (k) => {
-      it(`should be overridable using ${k}`, () => {
-        process.env[k] = "new secret";
+    it("should be overridable", () => {
+      process.env["BONOB_SECRET"] = "new secret";
       expect(config().secret).toEqual("new secret");
     });
   });
-  });
-
-  describe("authTimeout", () => {
-    it("should default to 1h", () => {
-      expect(config().authTimeout).toEqual("1h");
-    });
-
-    it(`should be overridable using BNB_AUTH_TIMEOUT`, () => {
-      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", () => {
@@ -286,177 +124,83 @@ describe("config", () => {
         expect(config().sonos.serviceName).toEqual("bonob");
       });
 
-      describe.each([
-        "BNB_SONOS_SERVICE_NAME", 
-        "BONOB_SONOS_SERVICE_NAME"
-      ])(
-        "%s",
-        (k) => {
       it("should be overridable", () => {
-            process.env[k] = "foobar1000";
+        process.env["BONOB_SONOS_SERVICE_NAME"] = "foobar1000";
         expect(config().sonos.serviceName).toEqual("foobar1000");
       });
-        }
-      );
     });
 
-    describe.each([
-      "BNB_SONOS_DEVICE_DISCOVERY",
-      "BONOB_SONOS_DEVICE_DISCOVERY",
-    ])("%s", (k) => {
     describeBooleanConfigValue(
       "deviceDiscovery",
-        k,
+      "BONOB_SONOS_DEVICE_DISCOVERY",
       true,
-        (config) => config.sonos.discovery.enabled
+      (config) => config.sonos.deviceDiscovery
     );
-    });
 
     describe("seedHost", () => {
       it("should default to undefined", () => {
-        expect(config().sonos.discovery.seedHost).toBeUndefined();
+        expect(config().sonos.seedHost).toBeUndefined();
       });
 
-      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");
+        process.env["BONOB_SONOS_SEED_HOST"] = "123.456.789.0";
+        expect(config().sonos.seedHost).toEqual("123.456.789.0");
       });
-        }
-      );
     });
 
-    describe.each([
-      "BNB_SONOS_AUTO_REGISTER", 
-      "BONOB_SONOS_AUTO_REGISTER"
-    ])(
-      "%s",
-      (k) => {
     describeBooleanConfigValue(
       "autoRegister",
-          k,
+      "BONOB_SONOS_AUTO_REGISTER",
       false,
       (config) => config.sonos.autoRegister
     );
-      }
-    );
 
     describe("sid", () => {
       it("should default to 246", () => {
         expect(config().sonos.sid).toEqual(246);
       });
 
-      describe.each([
-        "BNB_SONOS_SERVICE_ID", 
-        "BONOB_SONOS_SERVICE_ID"
-      ])(
-        "%s",
-        (k) => {
       it("should be overridable", () => {
-            process.env[k] = "786";
+        process.env["BONOB_SONOS_SERVICE_ID"] = "786";
         expect(config().sonos.sid).toEqual(786);
       });
-        }
-      );
     });
   });
 
-  describe("subsonic", () => {
+  describe("navidrome", () => {
     describe("url", () => {
-      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/`);
-          });
+      it("should default to http://${hostname()}:4533", () => {
+        expect(config().navidrome.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/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);
-          });
-        });
+      it("should be overridable", () => {
+        process.env["BONOB_NAVIDROME_URL"] = "http://farfaraway.com";
+        expect(config().navidrome.url).toEqual("http://farfaraway.com");
       });
     });
 
     describe("customClientsFor", () => {
       it("should default to undefined", () => {
-        expect(config().subsonic.customClientsFor).toBeUndefined();
+        expect(config().navidrome.customClientsFor).toBeUndefined();
       });
 
-      describe.each([
-        "BNB_SUBSONIC_CUSTOM_CLIENTS",
-        "BONOB_SUBSONIC_CUSTOM_CLIENTS",
-        "BONOB_NAVIDROME_CUSTOM_CLIENTS",
-      ])("%s", (k) => {
-        it(`should be overridable for ${k}`, () => {
-          process.env[k] = "whoop/whoop";
-          expect(config().subsonic.customClientsFor).toEqual("whoop/whoop");
+      it("should be overridable", () => {
+        process.env["BONOB_NAVIDROME_CUSTOM_CLIENTS"] = "whoop/whoop";
+        expect(config().navidrome.customClientsFor).toEqual("whoop/whoop");
       });
     });
   });
 
-    describe("artistImageCache", () => {
-      it("should default to undefined", () => {
-        expect(config().subsonic.artistImageCache).toBeUndefined();
-      });
-
-      it(`should be overridable for BNB_SUBSONIC_ARTIST_IMAGE_CACHE`, () => {
-        process.env["BNB_SUBSONIC_ARTIST_IMAGE_CACHE"] = "/some/path";
-        expect(config().subsonic.artistImageCache).toEqual("/some/path");
-      });
-    });
-  });
-
-  describe.each([
-    "BNB_SCROBBLE_TRACKS", 
-    "BONOB_SCROBBLE_TRACKS"
-  ])("%s", (k) => {
   describeBooleanConfigValue(
     "scrobbleTracks",
-      k,
+    "BONOB_SCROBBLE_TRACKS",
     true,
     (config) => config.scrobbleTracks
   );
-  });
-
-  describe.each([
-    "BNB_REPORT_NOW_PLAYING", 
-    "BONOB_REPORT_NOW_PLAYING"
-  ])(
-    "%s",
-    (k) => {
   describeBooleanConfigValue(
     "reportNowPlaying",
-        k,
+    "BONOB_REPORT_NOW_PLAYING",
     true,
     (config) => config.reportNowPlaying
   );
-    }
-  );
 });

tests/encryption.test.ts

@@ -1,53 +1,12 @@
-import { left, right } from 'fp-ts/Either'
+import encryption from '../src/encryption';
 
-import { cryptoEncryption, jwsEncryption } from '../src/encryption';
+describe("encrypt", () => {
+  const e = encryption("secret squirrel");
 
-describe("jwsEncryption", () => {
   it("can encrypt and decrypt", () => {
-    const e = jwsEncryption("secret squirrel");
-
     const value = "bobs your uncle"
     const hash = e.encrypt(value)
-    expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(right(value));
-  });
-
-  it("returns different values for different secrets", () => {
-    const e1 = jwsEncryption("e1");
-    const e2 = jwsEncryption("e2");
-
-    const value = "bobs your uncle"
-    const h1 = e1.encrypt(value)
-    const h2 = e2.encrypt(value)
-
-    expect(h1).not.toEqual(h2);
-  });
-})
-
-describe("cryptoEncryption", () => {
-  it("can encrypt and decrypt", () => {
-    const e = cryptoEncryption("secret squirrel");
-
-    const value = "bobs your uncle"
-    const hash = e.encrypt(value)
-    expect(hash).not.toContain(value);
-    expect(e.decrypt(hash)).toEqual(right(value));
-  });
-
-  it("returns different values for different secrets", () => {
-    const e1 = cryptoEncryption("e1");
-    const e2 = cryptoEncryption("e2");
-
-    const value = "bobs your uncle"
-    const h1 = e1.encrypt(value)
-    const h2 = e2.encrypt(value)
-
-    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"));
+    expect(hash.encryptedData).not.toEqual(value);
+    expect(e.decrypt(hash)).toEqual(value);
   });
 })

tests/i8n.test.ts

@@ -1,4 +1,4 @@
-import i8n, { langs, LANG, KEY, keys, asLANGs, SUPPORTED_LANG } from "../src/i8n";
+import i8n, { langs, LANG, KEY, keys, asLANGs } from "../src/i8n";
 
 describe("i8n", () => {
   describe("asLANGs", () => {
@@ -34,14 +34,14 @@ describe("i8n", () => {
 
   describe("langs", () => {
     it("should be all langs that are explicitly defined", () => {
-      expect(langs()).toEqual(["en-US", "da-DK", "fr-FR", "nl-NL"]);
+      expect(langs()).toEqual(["en-US", "nl-NL"]);
     });
   });
 
   describe("validity of translations", () => {
     it("all langs should have same keys as US", () => {
       langs().forEach((l) => {
-        expect(keys(l as SUPPORTED_LANG)).toEqual(keys("en-US"));
+        expect(keys(l as LANG)).toEqual(keys("en-US"));
       });
     });
   });
@@ -54,23 +54,6 @@ describe("i8n", () => {
 
   describe("fetching translations", () => {
     describe("with a single lang", () => {
-      describe("and the lang is not represented", () => {
-        describe("and there is no templating", () => {
-          it("should return the en-US value", () => {
-            expect(i8n("foo")("en-AU" as LANG)("artists")).toEqual("Artists");
-          });
-        });
-  
-        describe("and there is templating of the service name", () => {
-          it("should return the en-US value templated", () => {
-            expect(i8n("service123")("en-AU" as LANG)("AppLinkMessage")).toEqual(
-              "Linking sonos with service123"
-            );
-          });
-        });
-      });
-  
-      describe("and the lang is represented", () => {
       describe("and there is no templating", () => {
         it("should return the value", () => {
           expect(i8n("foo")("en-US")("artists")).toEqual("Artists");
@@ -89,94 +72,61 @@ describe("i8n", () => {
         });
       });
     });
-    });
 
     describe("with multiple langs", () => {
-      function itShouldReturn(serviceName: string, langs: string[], key: KEY, expected: string) {
-        it(`should return '${expected}' for the serviceName=${serviceName}, langs=${langs}`, () => {
-          expect(i8n(serviceName)(...langs)(key)).toEqual(expected);
-        });
-      };
-
-      describe("and the first lang is an exact match", () => {
+      describe("and the first lang is a match", () => {
         describe("and there is no templating", () => {
-          itShouldReturn("foo", ["en-US", "nl-NL"], "artists", "Artists");
-          itShouldReturn("foo", ["nl-NL", "en-US"], "artists", "Artiesten");
+          it("should return the value for the first lang", () => {
+            expect(i8n("foo")("en-US", "nl-NL")("artists")).toEqual("Artists");
+            expect(i8n("foo")("nl-NL", "en-US")("artists")).toEqual("Artiesten");
+          });
         });
   
         describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["en-US", "nl-NL"], "AppLinkMessage", "Linking sonos with service123");
-          itShouldReturn("service456", ["nl-NL", "en-US"], "AppLinkMessage", "Sonos koppelen aan service456");
+          it("should return the value for the firt lang", () => {
+            expect(i8n("service123")("en-US", "nl-NL")("AppLinkMessage")).toEqual(
+              "Linking sonos with service123"
+            );
+            expect(i8n("service456")("nl-NL", "en-US")("AppLinkMessage")).toEqual(
+              "Sonos koppelen aan service456"
+            );
+          });
         });
       });
 
-      describe("and the first lang is a case insensitive match", () => {
+      describe("and the first lang is not a match, however there is a match in the provided langs", () => {
         describe("and there is no templating", () => {
-          itShouldReturn("foo", ["en-us", "nl-NL"], "artists", "Artists");
-          itShouldReturn("foo", ["nl-nl", "en-US"], "artists", "Artiesten");
+          it("should return the value for the first lang", () => {
+            expect(i8n("foo")("something", "en-US", "nl-NL")("artists")).toEqual("Artists");
+            expect(i8n("foo")("something", "nl-NL", "en-US")("artists")).toEqual("Artiesten");
+          });
         });
   
         describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["en-us", "nl-NL"], "AppLinkMessage", "Linking sonos with service123");
-          itShouldReturn("service456", ["nl-nl", "en-US"], "AppLinkMessage", "Sonos koppelen aan service456");
+          it("should return the value for the firt lang", () => {
+            expect(i8n("service123")("something", "en-US", "nl-NL")("AppLinkMessage")).toEqual(
+              "Linking sonos with service123"
+            );
+            expect(i8n("service456")("something", "nl-NL", "en-US")("AppLinkMessage")).toEqual(
+              "Sonos koppelen aan service456"
+            );
           });
         });
-
-      describe("and the first lang is a lang match without region", () => {
-        describe("and there is no templating", () => {
-          itShouldReturn("foo", ["en", "nl-NL"], "artists", "Artists");
-          itShouldReturn("foo", ["nl", "en-US"], "artists", "Artiesten");
-        });
-  
-        describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["en", "nl-NL"], "AppLinkMessage", "Linking sonos with service123");
-          itShouldReturn("service456", ["nl", "en-US"], "AppLinkMessage", "Sonos koppelen aan service456");
-        });
-      });
-
-      describe("and the first lang is not a match, however there is an exact match in the provided langs", () => {
-        describe("and there is no templating", () => {
-          itShouldReturn("foo", ["something", "en-US", "nl-NL"], "artists", "Artists")
-          itShouldReturn("foo", ["something", "nl-NL", "en-US"], "artists", "Artiesten")
-        });
-  
-        describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["something", "en-US", "nl-NL"], "AppLinkMessage", "Linking sonos with service123")
-          itShouldReturn("service456", ["something", "nl-NL", "en-US"], "AppLinkMessage", "Sonos koppelen aan service456")
-        });
-      });      
-
-      describe("and the first lang is not a match, however there is a case insensitive match in the provided langs", () => {
-        describe("and there is no templating", () => {
-          itShouldReturn("foo", ["something", "en-us", "nl-nl"], "artists", "Artists")
-          itShouldReturn("foo", ["something", "nl-nl", "en-us"], "artists", "Artiesten")
-        });
-  
-        describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["something", "en-us", "nl-nl"], "AppLinkMessage", "Linking sonos with service123")
-          itShouldReturn("service456", ["something", "nl-nl", "en-us"], "AppLinkMessage", "Sonos koppelen aan service456")
-        });
-      });      
-
-      describe("and the first lang is not a match, however there is a lang match without region", () => {
-        describe("and there is no templating", () => {
-          itShouldReturn("foo", ["something", "en", "nl-nl"], "artists", "Artists")
-          itShouldReturn("foo", ["something", "nl", "en-us"], "artists", "Artiesten")
-        });
-  
-        describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["something", "en", "nl-nl"], "AppLinkMessage", "Linking sonos with service123")
-          itShouldReturn("service456", ["something", "nl", "en-us"], "AppLinkMessage", "Sonos koppelen aan service456")
-        });
       });      
 
       describe("and no lang is a match", () => {
         describe("and there is no templating", () => {
-          itShouldReturn("foo", ["something", "something2"], "artists", "Artists")
+          it("should return the value for the first lang", () => {
+            expect(i8n("foo")("something", "something2")("artists")).toEqual("Artists");
+          });
         });
   
         describe("and there is templating of the service name", () => {
-          itShouldReturn("service123", ["something", "something2"], "AppLinkMessage", "Linking sonos with service123")
+          it("should return the value for the firt lang", () => {
+            expect(i8n("service123")("something", "something2")("AppLinkMessage")).toEqual(
+              "Linking sonos with service123"
+            );
+          });
         });
       });          
     });
@@ -189,5 +139,20 @@ describe("i8n", () => {
       });
     });
 
+    describe("when the lang is not represented", () => {
+      describe("and there is no templating", () => {
+        it("should return the en-US value", () => {
+          expect(i8n("foo")("en-AU" as LANG)("artists")).toEqual("Artists");
+        });
+      });
+
+      describe("and there is templating of the service name", () => {
+        it("should return the en-US value templated", () => {
+          expect(i8n("service123")("en-AU" as LANG)("AppLinkMessage")).toEqual(
+            "Linking sonos with service123"
+          );
+        });
+      });
+    });
   });
 });

tests/icon.test.ts

@@ -1,907 +0,0 @@
-import dayjs from "dayjs";
-import { FixedClock } from "../src/clock";
-import { xmlTidy } from "../src/utils";
-
-import {
-  contains,
-  containsWord,
-  eq,
-  HOLI_COLORS,
-  Icon,
-  iconForGenre,
-  SvgIcon,
-  IconFeatures,
-  IconSpec,
-  ICONS,
-  Transformer,
-  transform,
-  maybeTransform,
-  festivals,
-  allOf,
-  features,
-  STAR_WARS,
-  NO_FEATURES,
-} from "../src/icon";
-
-describe("SvgIcon", () => {
-  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>
-`;
-
-  const svgIcon128 = `<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
-  <path d="path1"/>
-  <path d="path2" fill="none" stroke="#000"/>
-  <path d="path3"/>
-</svg>
-`;
-
-  describe("with no features", () => {
-    it("should be the same", () => {
-      expect(new SvgIcon(svgIcon24).toString()).toEqual(xmlTidy(svgIcon24));
-    });
-  });
-
-  describe("with a view port increase", () => {
-    describe("of 50%", () => {
-      describe("when the viewPort is of size 0 0 24 24", () => {
-        it("should resize the viewPort", () => {
-          expect(
-            new SvgIcon(svgIcon24)
-              .with({ features: { viewPortIncreasePercent: 50 } })
-              .toString()
-          ).toEqual(
-            xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <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>
-          `)
-          );
-        });
-      });
-      describe("when the viewPort is of size 0 0 128 128", () => {
-        it("should resize the viewPort", () => {
-          expect(
-            new SvgIcon(svgIcon128)
-              .with({ features: { viewPortIncreasePercent: 50 } })
-              .toString()
-          ).toEqual(
-            xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="-21 -21 170 170">
-              <path d="path1"/>
-              <path d="path2" fill="none" stroke="#000"/>
-              <path d="path3"/>
-            </svg>
-          `)
-          );
-        });
-      });
-    });
-
-    describe("of 0%", () => {
-      it("should do nothing", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { viewPortIncreasePercent: 0 } })
-            .toString()
-        ).toEqual(xmlTidy(svgIcon24));
-      });
-    });
-  });
-
-  describe("background color", () => {
-    describe("with no viewPort increase", () => {
-      it("should add a rectangle the same size as the original viewPort", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { backgroundColor: "red" } })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-              <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>
-        `)
-        );
-      });
-    });
-
-    describe("with a viewPort increase", () => {
-      it("should add a rectangle the same size as the original viewPort", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({
-              features: {
-                backgroundColor: "pink",
-                viewPortIncreasePercent: 50,
-              },
-            })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -4 32 32">
-              <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>
-        `)
-        );
-      });
-    });
-
-    describe("of undefined", () => {
-      it("should not do anything", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { backgroundColor: 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("multiple times", () => {
-      it("should use the most recent", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { backgroundColor: "green" } })
-            .with({ features: { backgroundColor: "red" } })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-              <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>
-        `)
-        );
-      });
-    });
-  });
-
-  describe("foreground color", () => {
-    describe("with no viewPort increase", () => {
-      it("should change the fill values", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { foregroundColor: "red" } })
-            .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" 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>
-        `)
-        );
-      });
-    });
-
-    describe("with a viewPort increase", () => {
-      it("should change the fill values", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({
-              features: {
-                foregroundColor: "pink",
-                viewPortIncreasePercent: 50,
-              },
-            })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-            <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>
-        `)
-        );
-      });
-    });
-
-    describe("of undefined", () => {
-      it("should not do anything", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { foregroundColor: 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("mutliple times", () => {
-      it("should use the most recent", () => {
-        expect(
-          new SvgIcon(svgIcon24)
-            .with({ features: { foregroundColor: "blue" } })
-            .with({ features: { foregroundColor: "red" } })
-            .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" 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>
-        `)
-        );
-      });
-    });
-  });
-
-  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", () => {
-        expect(
-          new SvgIcon(svgIcon24, {
-            foregroundColor: "blue",
-            backgroundColor: "green",
-            viewPortIncreasePercent: 50,
-          })
-            .with({ svg: svgIcon128 })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="-21 -21 170 170">
-            <rect x="-21" y="-21" width="191" height="191" fill="green"/>
-            <path d="path1" fill="blue"/>
-            <path d="path2" fill="none" stroke="blue"/>
-            <path d="path3" fill="blue"/>
-          </svg>
-        `)
-        );
-      });
-    });
-
-    describe("with no other changes", () => {
-      it("should swap out the svg, but maintain the IconFeatures", () => {
-        expect(
-          new SvgIcon(svgIcon24, {
-            foregroundColor: "blue",
-            backgroundColor: "green",
-            viewPortIncreasePercent: 50,
-          })
-            .with({
-              svg: svgIcon128,
-              features: {
-                foregroundColor: "pink",
-                backgroundColor: "red",
-                viewPortIncreasePercent: 0,
-              },
-            })
-            .toString()
-        ).toEqual(
-          xmlTidy(`<?xml version="1.0" encoding="UTF-8"?>
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
-            <rect x="0" y="0" width="128" height="128" fill="red"/>
-            <path d="path1" fill="pink"/>
-            <path d="path2" fill="none" stroke="pink"/>
-            <path d="path3" fill="pink"/>
-          </svg>
-        `)
-        );
-      });
-    });
-  });
-});
-
-class DummyIcon implements Icon {
-  svg: string;
-  features: IconFeatures;
-
-  constructor(svg: string, features: Partial<IconFeatures>) {
-    this.svg = svg;
-    this.features = {
-      ...NO_FEATURES,
-      ...features
-    };
-  }
-
-  public apply = (transformer: Transformer): Icon => transformer(this);
-
-  public with = ({ svg, features }: Partial<IconSpec>) => {
-    return new DummyIcon(svg || this.svg, {
-      ...this.features,
-      ...(features || {}),
-    });
-  };
-
-  public toString = () =>
-    JSON.stringify({ svg: this.svg, features: this.features });
-}
-
-describe("transform", () => {
-  describe("when the features contains no svg", () => {
-    it("should apply the overriding transform ontop of the requested transform", () => {
-      const original = new DummyIcon("original", {
-        backgroundColor: "black",
-        foregroundColor: "black",
-      });
-      const result = original
-        .with({
-          features: {
-            viewPortIncreasePercent: 100,
-            foregroundColor: "blue",
-            backgroundColor: "blue",
-            text: "a",
-          },
-        })
-        .apply(
-          transform({
-            features: {
-              foregroundColor: "override1",
-              backgroundColor: "override2",
-              text: "b",
-            },
-          })
-        ) as DummyIcon;
-
-      expect(result.svg).toEqual("original");
-      expect(result.features).toEqual({
-        viewPortIncreasePercent: 100,
-        foregroundColor: "override1",
-        backgroundColor: "override2",
-        text: "b",
-      });
-    });
-  });
-
-  describe("when the features contains an svg", () => {
-    it("should use the newly provided svg", () => {
-      const original = new DummyIcon("original", {
-        backgroundColor: "black",
-        foregroundColor: "black",
-      });
-      const result = original
-        .with({
-          features: {
-            viewPortIncreasePercent: 100,
-            foregroundColor: "blue",
-            backgroundColor: "blue",
-            text: "bob",
-          },
-        })
-        .apply(
-          transform({
-            svg: "new",
-          })
-        ) as DummyIcon;
-
-      expect(result.svg).toEqual("new");
-      expect(result.features).toEqual({
-        viewPortIncreasePercent: 100,
-        foregroundColor: "blue",
-        backgroundColor: "blue",
-        text: "bob"
-      });
-    });
-  });
-});
-
-describe("features", () => {
-  it("should apply the features", () => {
-    const original = new DummyIcon("original", {
-      backgroundColor: "black",
-      foregroundColor: "black",
-    });
-    const result = original.apply(
-      features({
-        viewPortIncreasePercent: 100,
-        foregroundColor: "blue",
-        backgroundColor: "blue",
-        text: "foobar"
-      })
-    ) as DummyIcon;
-
-    expect(result.features).toEqual({
-      viewPortIncreasePercent: 100,
-      foregroundColor: "blue",
-      backgroundColor: "blue",
-      text: "foobar"
-    });
-  });
-});
-
-describe("allOf", () => {
-  it("should apply all composed transforms", () => {
-    const result = new DummyIcon("original", {
-      foregroundColor: "black",
-      backgroundColor: "black",
-      viewPortIncreasePercent: 0,
-    }).apply(
-      allOf(
-        (icon: Icon) => icon.with({ svg: "foo" }),
-        (icon: Icon) => icon.with({ features: { backgroundColor: "red" } }),
-        (icon: Icon) => icon.with({ features: { foregroundColor: "blue" } })
-      )
-    ) as DummyIcon;
-
-    expect(result.svg).toEqual("foo");
-    expect(result.features).toEqual({
-      foregroundColor: "blue",
-      backgroundColor: "red",
-      viewPortIncreasePercent: 0,
-    });
-  });
-});
-
-describe("maybeTransform", () => {
-  describe("when the rule matches", () => {
-    const original = new DummyIcon("original", {
-      backgroundColor: "black",
-      foregroundColor: "black",
-    });
-
-    describe("transforming the color", () => {
-      const result = original
-        .with({
-          features: {
-            viewPortIncreasePercent: 99,
-            backgroundColor: "shouldBeIgnored",
-            foregroundColor: "shouldBeIgnored",
-          },
-        })
-        .apply(
-          maybeTransform(
-            () => true,
-            transform({
-              features: {
-                backgroundColor: "blue",
-                foregroundColor: "red",
-              },
-            })
-          )
-        ) as DummyIcon;
-
-      describe("with", () => {
-        it("should be the with of the underlieing icon with the overriden colors", () => {
-          expect(result.svg).toEqual("original");
-          expect(result.features).toEqual({
-            viewPortIncreasePercent: 99,
-            backgroundColor: "blue",
-            foregroundColor: "red",
-          });
-        });
-      });
-    });
-
-    describe("overriding all options", () => {
-      const result = original
-        .with({
-          features: {
-            viewPortIncreasePercent: 99,
-            backgroundColor: "shouldBeIgnored",
-            foregroundColor: "shouldBeIgnored",
-          },
-        })
-        .apply(
-          maybeTransform(
-            () => true,
-            transform({
-              features: {
-                backgroundColor: "blue",
-                foregroundColor: "red",
-              },
-            })
-          )
-        ) as DummyIcon;
-
-      describe("with", () => {
-        it("should be the with of the underlieing icon with the overriden colors", () => {
-          expect(result.features).toEqual({
-            viewPortIncreasePercent: 99,
-            backgroundColor: "blue",
-            foregroundColor: "red",
-          });
-        });
-      });
-    });
-  });
-
-  describe("when the rule doesnt match", () => {
-    const original = new DummyIcon("original", {
-      backgroundColor: "black",
-      foregroundColor: "black",
-    });
-    const result = original
-      .with({
-        features: {
-          viewPortIncreasePercent: 88,
-          backgroundColor: "shouldBeUsed",
-          foregroundColor: "shouldBeUsed",
-        },
-      })
-      .apply(
-        maybeTransform(
-          () => false,
-          transform({
-            features: { backgroundColor: "blue", foregroundColor: "red" },
-          })
-        )
-      ) as DummyIcon;
-
-    describe("with", () => {
-      it("should use the provided features", () => {
-        expect(result.features).toEqual({
-          viewPortIncreasePercent: 88,
-          backgroundColor: "shouldBeUsed",
-          foregroundColor: "shouldBeUsed",
-        });
-      });
-    });
-  });
-});
-
-describe("festivals", () => {
-  const original = new DummyIcon("original", {
-    backgroundColor: "black",
-    foregroundColor: "black",
-  });
-  const clock = new FixedClock(dayjs());
-
-  describe("on a day that isn't festive", () => {
-    beforeEach(() => {
-      clock.time = dayjs("2022/10/12");
-    });
-
-    it("should use the given colors", () => {
-      const result = original
-        .apply(
-          features({
-            viewPortIncreasePercent: 88,
-            backgroundColor: "shouldBeUsed",
-            foregroundColor: "shouldBeUsed",
-          })
-        )
-        .apply(festivals(clock)) as DummyIcon;
-
-      expect(result.toString()).toEqual(
-        new DummyIcon("original", {
-          backgroundColor: "shouldBeUsed",
-          foregroundColor: "shouldBeUsed",
-          viewPortIncreasePercent: 88,
-        }).toString()
-      );
-    });
-  });
-
-  describe("on christmas day", () => {
-    beforeEach(() => {
-      clock.time = dayjs("2022/12/25");
-    });
-
-    it("should use the christmas theme colors", () => {
-      const result = original.apply(
-        allOf(
-          features({
-            viewPortIncreasePercent: 25,
-            backgroundColor: "shouldNotBeUsed",
-            foregroundColor: "shouldNotBeUsed",
-          }),
-          festivals(clock)
-        )
-      ) as DummyIcon;
-
-      expect(result.svg).toEqual(ICONS.christmas.svg);
-      expect(result.features).toEqual({
-        backgroundColor: "green",
-        foregroundColor: "red",
-        viewPortIncreasePercent: 25,
-      });
-    });
-  });
-
-  describe("on halloween", () => {
-    beforeEach(() => {
-      clock.time = dayjs("2022/10/31");
-    });
-
-    it("should use the given colors", () => {
-      const result = original
-        .apply(
-          features({
-            viewPortIncreasePercent: 12,
-            backgroundColor: "shouldNotBeUsed",
-            foregroundColor: "shouldNotBeUsed",
-          })
-        )
-        .apply(festivals(clock)) as DummyIcon;
-
-      expect(result.svg).toEqual(ICONS.halloween.svg);
-      expect(result.features).toEqual({
-        viewPortIncreasePercent: 12,
-        backgroundColor: "black",
-        foregroundColor: "orange",
-      });
-    });
-  });
-
-  describe("on may 4", () => {
-    beforeEach(() => {
-      clock.time = dayjs("2022/5/4");
-    });
-
-    it("should use the undefined colors, so no color", () => {
-      const result = original
-        .apply(
-          features({
-            viewPortIncreasePercent: 12,
-            backgroundColor: "shouldNotBeUsed",
-            foregroundColor: "shouldNotBeUsed",
-          })
-        )
-        .apply(festivals(clock)) as DummyIcon;
-
-      expect(STAR_WARS.map(it => it.svg)).toContain(result.svg);
-      expect(result.features).toEqual({
-        viewPortIncreasePercent: 12,
-        backgroundColor: undefined,
-        foregroundColor: undefined,
-      });
-    });
-  });
-
-  describe("on cny", () => {
-    describe("2022", () => {
-      beforeEach(() => {
-        clock.time = dayjs("2022/02/01");
-      });
-
-      it("should use the cny theme", () => {
-        const result = original
-          .apply(
-            features({
-              viewPortIncreasePercent: 12,
-              backgroundColor: "shouldNotBeUsed",
-              foregroundColor: "shouldNotBeUsed",
-            })
-          )
-          .apply(festivals(clock)) as DummyIcon;
-
-        expect(result.svg).toEqual(ICONS.yoTiger.svg);
-        expect(result.features).toEqual({
-          viewPortIncreasePercent: 12,
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        });
-      });
-    });
-
-    describe("2023", () => {
-      beforeEach(() => {
-        clock.time = dayjs("2023/01/22");
-      });
-
-      it("should use the cny theme", () => {
-        const result = original
-          .apply(
-            features({
-              viewPortIncreasePercent: 12,
-              backgroundColor: "shouldNotBeUsed",
-              foregroundColor: "shouldNotBeUsed",
-            })
-          )
-          .apply(festivals(clock)) as DummyIcon;
-
-        expect(result.svg).toEqual(ICONS.yoRabbit.svg);
-        expect(result.features).toEqual({
-          viewPortIncreasePercent: 12,
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        });
-      });
-    });
-
-    describe("2024", () => {
-      beforeEach(() => {
-        clock.time = dayjs("2024/02/10");
-      });
-
-      it("should use the cny theme", () => {
-        const result = original
-          .apply(
-            features({
-              viewPortIncreasePercent: 12,
-              backgroundColor: "shouldNotBeUsed",
-              foregroundColor: "shouldNotBeUsed",
-            })
-          )
-          .apply(festivals(clock)) as DummyIcon;
-
-        expect(result.svg).toEqual(ICONS.yoDragon.svg);
-        expect(result.features).toEqual({
-          viewPortIncreasePercent: 12,
-          backgroundColor: "red",
-          foregroundColor: "yellow",
-        });
-      });
-    });
-  });
-
-  describe("on holi", () => {
-    beforeEach(() => {
-      clock.time = dayjs("2022/03/18");
-    });
-
-    it("should use the given colors", () => {
-      const result = original
-        .apply(
-          features({
-            viewPortIncreasePercent: 12,
-            backgroundColor: "shouldNotBeUsed",
-            foregroundColor: "shouldNotBeUsed",
-          })
-        )
-        .apply(festivals(clock)) as DummyIcon;
-
-      expect(result.features.viewPortIncreasePercent).toEqual(12);
-      expect(HOLI_COLORS.includes(result.features.backgroundColor!)).toEqual(
-        true
-      );
-      expect(HOLI_COLORS.includes(result.features.foregroundColor!)).toEqual(
-        true
-      );
-      expect(result.features.backgroundColor).not.toEqual(
-        result.features.foregroundColor
-      );
-    });
-  });
-});
-
-describe("eq", () => {
-  it("should be true when ===", () => {
-    expect(eq("Foo")("foo")).toEqual(true);
-  });
-
-  it("should be false when not ===", () => {
-    expect(eq("Foo")("bar")).toEqual(false);
-  });
-});
-
-describe("contains", () => {
-  it("should be true word is a substring", () => {
-    expect(contains("Foo")("some foo bar")).toEqual(true);
-  });
-
-  it("should be false when not ===", () => {
-    expect(contains("Foo")("some bar")).toEqual(false);
-  });
-});
-
-describe("containsWord", () => {
-  it("should be true word is a substring with space delim", () => {
-    expect(containsWord("Foo")("some   foo   bar")).toEqual(true);
-  });
-
-  it("should be true word is a substring with hyphen delim", () => {
-    expect(containsWord("Foo")("some----foo-bar")).toEqual(true);
-  });
-
-  it("should be false when not ===", () => {
-    expect(containsWord("Foo")("somefoobar")).toEqual(false);
-  });
-});
-
-describe("iconForGenre", () => {
-  [
-    ["Acid House", "mushroom"],
-    ["African", "african"],
-    ["Alternative Rock", "rock"],
-    ["Americana", "americana"],
-    ["Anti-Folk", "guitar"],
-    ["Audio-Book", "book"],
-    ["Australian Hip Hop", "oz"],
-    ["Rap", "rap"],
-    ["Hip Hop", "hipHop"],
-    ["Hip-Hop", "hipHop"],
-    ["Metal", "metal"],
-    ["Horrorcore", "horror"],
-    ["Punk", "punk"],
-    ["blah", "music"],
-  ].forEach(([genre, expected]) => {
-    describe(`a genre of ${genre}`, () => {
-      it(`should have an icon of ${expected}`, () => {
-        const name = iconForGenre(genre!)!;
-        expect(name).toEqual(expected);
-      });
-    });
-
-    describe(`a genre of ${genre!.toLowerCase()}`, () => {
-      it(`should have an icon of ${expected}`, () => {
-        const name = iconForGenre(genre!)!;
-        expect(name).toEqual(expected);
-      });
-    });
-  });
-});

tests/in_memory_music_service.test.ts

@@ -1,8 +1,6 @@
-import { taskEither as TE } from "fp-ts";
-import { pipe } from "fp-ts/lib/function";
-
 import { InMemoryMusicService } from "./in_memory_music_service";
 import {
+  AuthSuccess,
   MusicLibrary,
   artistToArtistSummary,
   albumToAlbumSummary,
@@ -18,8 +16,6 @@ import {
   HIP_HOP,
   SKA,
 } from "./builders";
-import _ from "underscore";
-
 
 describe("InMemoryMusicService", () => {
   const service = new InMemoryMusicService();
@@ -30,15 +26,12 @@ describe("InMemoryMusicService", () => {
 
       service.hasUser(credentials);
 
-      const token = await pipe(
-        service.generateToken(credentials),
-        TE.getOrElse(e => { throw e })
-      )();
+      const token = (await service.generateToken(credentials)) as AuthSuccess;
 
       expect(token.userId).toEqual(credentials.username);
       expect(token.nickname).toEqual(credentials.username);
 
-      const musicLibrary = service.login(token.serviceToken);
+      const musicLibrary = service.login(token.authToken);
 
       expect(musicLibrary).toBeDefined();
     });
@@ -48,19 +41,34 @@ describe("InMemoryMusicService", () => {
 
       service.hasUser(credentials);
 
-      const token = await pipe(
-        service.generateToken(credentials),
-        TE.getOrElse(e => { throw e })
-      )();
+      const token = (await service.generateToken(credentials)) as AuthSuccess;
 
       service.clear();
 
-      return expect(service.login(token.serviceToken)).rejects.toEqual(
+      return expect(service.login(token.authToken)).rejects.toEqual(
         "Invalid auth token"
       );
     });
   });
 
+  describe("artistToArtistSummary", () => {
+    it("should map fields correctly", () => {
+      const artist = anArtist({
+        id: uuid(),
+        name: "The Artist",
+        image: {
+          small: "/path/to/small/jpg",
+          medium: "/path/to/medium/jpg",
+          large: "/path/to/large/jpg",
+        },
+      });
+      expect(artistToArtistSummary(artist)).toEqual({
+        id: artist.id,
+        name: artist.name,
+      });
+    });
+  });
+
   describe("Music Library", () => {
     const user = { username: "user100", password: "password100" };
     let musicLibrary: MusicLibrary;
@@ -70,12 +78,8 @@ describe("InMemoryMusicService", () => {
 
       service.hasUser(user);
 
-      const token = await pipe(
-        service.generateToken(user),
-        TE.getOrElse(e => { throw e })
-      )();
-
-      musicLibrary = (await service.login(token.serviceToken)) as MusicLibrary;
+      const token = (await service.generateToken(user)) as AuthSuccess;
+      musicLibrary = (await service.login(token.authToken)) as MusicLibrary;
     });
 
     describe("artists", () => {
@@ -138,8 +142,8 @@ describe("InMemoryMusicService", () => {
 
       describe("when it exists", () => {
         it("should provide an artist", async () => {
-          expect(await musicLibrary.artist(artist1.id!)).toEqual(artist1);
-          expect(await musicLibrary.artist(artist2.id!)).toEqual(artist2);
+          expect(await musicLibrary.artist(artist1.id)).toEqual(artist1);
+          expect(await musicLibrary.artist(artist2.id)).toEqual(artist2);
         });
       });
 
@@ -170,8 +174,8 @@ describe("InMemoryMusicService", () => {
       describe("fetching tracks for an album", () => {
         it("should return only tracks on that album", async () => {
           expect(await musicLibrary.tracks(artist1Album1.id)).toEqual([
-            { ...track1, rating: { love: false, stars: 0 } },
-            { ...track2, rating: { love: false, stars: 0 } },
+            track1,
+            track2,
           ]);
         });
       });
@@ -187,7 +191,7 @@ describe("InMemoryMusicService", () => {
       describe("fetching a single track", () => {
         describe("when it exists", () => {
           it("should return the track", async () => {
-            expect(await musicLibrary.track(track3.id)).toEqual({ ...track3, rating: { love: false, stars: 0 } },);
+            expect(await musicLibrary.track(track3.id)).toEqual(track3);
           });
         });
       });
@@ -206,7 +210,6 @@ describe("InMemoryMusicService", () => {
       const artist3_album2 = anAlbum({ genre: POP });
 
       const artist1 = anArtist({
-        name: "artist1",
         albums: [
           artist1_album1,
           artist1_album2,
@@ -215,11 +218,8 @@ describe("InMemoryMusicService", () => {
           artist1_album5,
         ],
       });
-      const artist2 = anArtist({ name: "artist2", albums: [artist2_album1] });
-      const artist3 = anArtist({
-        name: "artist3",
-        albums: [artist3_album1, artist3_album2],
-      });
+      const artist2 = anArtist({ albums: [artist2_album1] });
+      const artist3 = anArtist({ albums: [artist3_album1, artist3_album2] });
       const artistWithNoAlbums = anArtist({ albums: [] });
 
       const allAlbums = [artist1, artist2, artist3, artistWithNoAlbums].flatMap(
@@ -256,7 +256,7 @@ describe("InMemoryMusicService", () => {
             });
 
             expect(albums.total).toEqual(totalAlbumCount);
-            expect(albums.results.length).toEqual(3);
+            expect(albums.results.length).toEqual(3)
             // cannot really assert the results and they will change every time
           });
         });
@@ -265,7 +265,6 @@ describe("InMemoryMusicService", () => {
       describe("fetching multiple albums", () => {
         describe("with no filtering", () => {
           describe("fetching all on one page", () => {
-            describe("alphabeticalByArtist", () => {
             it("should return all the albums for all the artists", async () => {
               expect(
                 await musicLibrary.albums({
@@ -291,22 +290,6 @@ describe("InMemoryMusicService", () => {
             });
           });
 
-            describe("alphabeticalByName", () => {
-              it("should return all the albums for all the artists", async () => {
-                expect(
-                  await musicLibrary.albums({
-                    _index: 0,
-                    _count: 100,
-                    type: "alphabeticalByName",
-                  })
-                ).toEqual({
-                  results: _.sortBy(allAlbums, "name").map(albumToAlbumSummary),
-                  total: totalAlbumCount,
-                });
-              });
-            });
-          });
-
           describe("fetching a page", () => {
             it("should return only that page", async () => {
               expect(
@@ -463,9 +446,9 @@ describe("InMemoryMusicService", () => {
         it("should provide an array of artists", async () => {
           expect(await musicLibrary.genres()).toEqual([
             HIP_HOP,
-            SKA,
             POP,
             ROCK,
+            SKA,
           ]);
         });
       });

tests/in_memory_music_service.ts

@@ -1,12 +1,10 @@
-import { option as O, taskEither as TE } from "fp-ts";
+import { option as O } from "fp-ts";
 import * as A from "fp-ts/Array";
 import { fromEquals } from "fp-ts/lib/Eq";
 import { pipe } from "fp-ts/lib/function";
 import { ordString, fromCompare } from "fp-ts/lib/Ord";
 import { shuffle } from "underscore";
 
-import { b64Encode, b64Decode } from "../src/b64";
-
 import {
   MusicService,
   Credentials,
@@ -22,9 +20,7 @@ import {
   albumToAlbumSummary,
   Track,
   Genre,
-  Rating,
 } from "../src/music_service";
-import { BUrn } from "../src/burn";
 
 export class InMemoryMusicService implements MusicService {
   users: Record<string, string> = {};
@@ -34,29 +30,28 @@ export class InMemoryMusicService implements MusicService {
   generateToken({
     username,
     password,
-  }: Credentials): TE.TaskEither<AuthFailure, AuthSuccess> {
+  }: Credentials): Promise<AuthSuccess | AuthFailure> {
     if (
       username != undefined &&
       password != undefined &&
       this.users[username] == password
     ) {
-      return TE.right({
-        serviceToken: b64Encode(JSON.stringify({ username, password })),
+      return Promise.resolve({
+        authToken: Buffer.from(JSON.stringify({ username, password })).toString(
+          "base64"
+        ),
         userId: username,
         nickname: username,
-        type: "in-memory"
       });
     } else {
-      return TE.left(new AuthFailure(`Invalid user:${username}`));
+      return Promise.resolve({ message: `Invalid user:${username}` });
     }
   }
 
-  refreshToken(serviceToken: string): TE.TaskEither<AuthFailure, AuthSuccess> {
-    return this.generateToken(JSON.parse(b64Decode(serviceToken)))
-  }
-
-  login(serviceToken: string): Promise<MusicLibrary> {
-    const credentials = JSON.parse(b64Decode(serviceToken)) as Credentials;
+  login(token: string): Promise<MusicLibrary> {
+    const credentials = JSON.parse(
+      Buffer.from(token, "base64").toString("ascii")
+    ) as Credentials;
     if (this.users[credentials.username] != credentials.password)
       return Promise.reject("Invalid auth token");
 
@@ -82,10 +77,6 @@ export class InMemoryMusicService implements MusicService {
             switch (q.type) {
               case "alphabeticalByArtist":
                 return artist2Album;
-              case "alphabeticalByName":
-                return artist2Album.sort((a, b) =>
-                  a.album.name.localeCompare(b.album.name)
-                );
               case "byGenre":
                 return artist2Album.filter(
                   (it) => it.album.genre?.id === q.genre
@@ -116,29 +107,26 @@ export class InMemoryMusicService implements MusicService {
             A.map((it) => O.fromNullable(it.genre)),
             A.compact,
             A.uniq(fromEquals((x, y) => x.id === y.id)),
-            A.sort(fromCompare<Genre>((x, y) => ordString.compare(x.id, y.id)))
+            A.sort(
+              fromCompare<Genre>((x, y) => ordString.compare(x.id, y.id))
+            )
           )
         ),
       tracks: (albumId: string) =>
-        Promise.resolve(
-          this.tracks
-            .filter((it) => it.album.id === albumId)
-            .map((it) => ({ ...it, rating: { love: false, stars: 0 } }))
-        ),
-      rate: (_: string, _2: Rating) => Promise.resolve(false),
+        Promise.resolve(this.tracks.filter((it) => it.album.id === albumId)),
       track: (trackId: string) =>
         pipe(
           this.tracks.find((it) => it.id === trackId),
           O.fromNullable,
-          O.map((it) => Promise.resolve({ ...it, rating: { love: false, stars: 0 } })),
+          O.map((it) => Promise.resolve(it)),
           O.getOrElse(() =>
             Promise.reject(`Failed to find track with id ${trackId}`)
           )
         ),
       stream: (_: { trackId: string; range: string | undefined }) =>
         Promise.reject("unsupported operation"),
-      coverArt: (coverArtURN: BUrn, size?: number) =>
-        Promise.reject(`Cannot retrieve coverArt for ${coverArtURN}, size ${size}`),
+      coverArt: (id: string, _: "album" | "artist", size?: number) =>
+        Promise.reject(`Cannot retrieve coverArt for ${id}, size ${size}`),
       scrobble: async (_: string) => {
         return Promise.resolve(true);
       },
@@ -151,19 +139,12 @@ export class InMemoryMusicService implements MusicService {
       playlists: async () => Promise.resolve([]),
       playlist: async (id: string) =>
         Promise.reject(`No playlist with id ${id}`),
-      createPlaylist: async (_: string) =>
-        Promise.reject("Unsupported operation"),
-      deletePlaylist: async (_: string) =>
-        Promise.reject("Unsupported operation"),
-      addToPlaylist: async (_: string) =>
-        Promise.reject("Unsupported operation"),
-      removeFromPlaylist: async (_: string, _2: number[]) =>
-        Promise.reject("Unsupported operation"),
+      createPlaylist: async (_: string) => Promise.reject("Unsupported operation"),
+      deletePlaylist: async (_: string) => Promise.reject("Unsupported operation"),
+      addToPlaylist: async (_: string) => Promise.reject("Unsupported operation"),
+      removeFromPlaylist: async (_: string, _2: number[]) => 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([]),
     });
   }
 

tests/link_codes.test.ts

@@ -18,7 +18,7 @@ describe("InMemoryLinkCodes", () => {
     describe('when token is valid', () => {
       it('should associate the token', () => {
         const linkCode = linkCodes.mint();
-        const association = { serviceToken: "token123", nickname: "bob", userId: "1" };
+        const association = { authToken: "token123", nickname: "bob", userId: "1" };
 
         linkCodes.associate(linkCode, association);
 
@@ -29,7 +29,7 @@ describe("InMemoryLinkCodes", () => {
     describe('when token is valid', () => {
       it('should throw an error', () => {
         const invalidLinkCode = "invalidLinkCode";
-        const association = { serviceToken: "token456", nickname: "bob", userId: "1" };
+        const association = { authToken: "token456", nickname: "bob", userId: "1" };
 
         expect(() => linkCodes.associate(invalidLinkCode, association)).toThrow(`Invalid linkCode ${invalidLinkCode}`)
       }); 

tests/music_service.test.ts

@@ -1,22 +0,0 @@
-import { v4 as uuid } from "uuid";
-
-import { anArtist } from "./builders";
-import { artistToArtistSummary } from "../src/music_service";
-
-describe("artistToArtistSummary", () => {
-  it("should map fields correctly", () => {
-    const artist = anArtist({
-      id: uuid(),
-      name: "The Artist",
-      image: {
-        system: "external",
-        resource: "http://example.com:1234/image.jpg",
-      },
-    });
-    expect(artistToArtistSummary(artist)).toEqual({
-      id: artist.id,
-      name: artist.name,
-      image: artist.image,
-    });
-  });
-});

tests/random_string.test.ts

@@ -0,0 +1,16 @@
+import randomString from "../src/random_string";
+
+describe('randomString', () => {
+  it('should produce different strings...', () => {
+    const s1 = randomString()
+    const s2 = randomString()
+    const s3 = randomString()
+    const s4 = randomString()
+
+    expect(s1.length).toEqual(64)
+    
+    expect(s1).not.toEqual(s2);
+    expect(s1).not.toEqual(s3);
+    expect(s1).not.toEqual(s4);
+  });
+});

tests/registrar.test.ts

@@ -1,137 +0,0 @@
-import axios from "axios";
-jest.mock("axios");
-
-const fakeSonos = {
-  register: jest.fn(),
-};
-
-import sonos, { bonobService } from "../src/sonos";
-jest.mock("../src/sonos");
-
-import registrar from "../src/registrar";
-import { URLBuilder } from "../src/url_builder";
-
-describe("registrar", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.resetAllMocks();
-  });
-
-  describe("when the bonob service can not be found", () => {
-    it("should fail", async () => {
-      const status = 409;
-
-      (axios.get as jest.Mock).mockResolvedValue({
-        status,
-      });
-
-      const bonobUrl = new URLBuilder("http://fail.example.com/bonob");
-
-      return expect(registrar(bonobUrl)()).rejects.toEqual(
-        `Unexpected response status ${status} from ${bonobUrl
-          .append({ pathname: "/about" })
-          .href()}`
-      );
-    });
-  });
-
-  describe("when the bonob service returns unexpected content", () => {
-    it("should fail", async () => {
-      (axios.get as jest.Mock).mockResolvedValue({
-        status: 200,
-        // invalid response from /about as does not have name and sid
-        data: {}
-      });
-
-      const bonobUrl = new URLBuilder("http://fail.example.com/bonob");
-
-      return expect(registrar(bonobUrl)()).rejects.toEqual(
-        `Unexpected response from ${bonobUrl
-          .append({ pathname: "/about" })
-          .href()}, expected service.name and service.sid`
-      );
-    });
-  });
-
-  describe("when the bonob service can be found", () => {
-    const bonobUrl = new URLBuilder("http://success.example.com/bonob");
-
-    const serviceDetails = {
-      name: "bob",
-      sid: 123,
-    };
-
-    const service = "service";
-
-    beforeEach(() => {
-      (axios.get as jest.Mock).mockResolvedValue({
-        status: 200,
-        data: {
-          service: serviceDetails,
-        },
-      });
-
-      (bonobService as jest.Mock).mockResolvedValue(service);
-      (sonos as jest.Mock).mockReturnValue(fakeSonos);
-    });
-
-    describe("seedHost", () => {
-      describe("is specified", () => {
-        it("should register using the seed host", async () => {
-          fakeSonos.register.mockResolvedValue(true);
-          const seedHost = "127.0.0.11";
-  
-          expect(await registrar(bonobUrl, seedHost)()).toEqual(
-            true
-          );
-  
-          expect(bonobService).toHaveBeenCalledWith(
-            serviceDetails.name,
-            serviceDetails.sid,
-            bonobUrl
-          );
-          expect(sonos).toHaveBeenCalledWith({ enabled: true, seedHost });
-          expect(fakeSonos.register).toHaveBeenCalledWith(service);
-        });
-      });
-
-      describe("is not specified", () => {
-        it("should register without using the seed host", async () => {
-          fakeSonos.register.mockResolvedValue(true);
-
-          expect(await registrar(bonobUrl)()).toEqual(
-            true
-          );
-  
-          expect(bonobService).toHaveBeenCalledWith(
-            serviceDetails.name,
-            serviceDetails.sid,
-            bonobUrl
-          );
-          expect(sonos).toHaveBeenCalledWith({ enabled: true });
-          expect(fakeSonos.register).toHaveBeenCalledWith(service);
-        });
-      });
-    });
-
-    describe("when registration succeeds", () => {
-      it("should fetch the service details and register", async () => {
-        fakeSonos.register.mockResolvedValue(true);
-
-        expect(await registrar(bonobUrl)()).toEqual(
-          true
-        );
-      });
-    });
-
-    describe("when registration fails", () => {
-      it("should fetch the service details and register", async () => {
-        fakeSonos.register.mockResolvedValue(false);
-
-        expect(await registrar(bonobUrl)()).toEqual(
-          false
-        );
-      });
-    });
-  });
-});

tests/scenarios.test.ts

@@ -9,7 +9,6 @@ import {
   GetMetadataResponse,
 } from "../src/smapi";
 import {
-  aDevice,
   BLONDIE,
   BOB_MARLEY,
   getAppLinkMessage,
@@ -20,7 +19,7 @@ import { InMemoryMusicService } from "./in_memory_music_service";
 import { InMemoryLinkCodes } from "../src/link_codes";
 import { Credentials } from "../src/music_service";
 import makeServer from "../src/server";
-import { Service, bonobService, Sonos } from "../src/sonos";
+import { Service, bonobService, SONOS_DISABLED } from "../src/sonos";
 import supersoap from "./supersoap";
 import url, { URLBuilder } from "../src/url_builder";
 
@@ -33,10 +32,9 @@ class LoggedInSonosDriver {
     this.client = client;
     this.token = token;
     this.client.addSoapHeader({
-      credentials: someCredentials({
-        token: this.token.getDeviceAuthTokenResult.authToken,
-        key: this.token.getDeviceAuthTokenResult.privateKey
-      }),
+      credentials: someCredentials(
+        this.token.getDeviceAuthTokenResult.authToken
+      ),
     });
   }
 
@@ -94,7 +92,7 @@ class SonosDriver {
       .get(this.bonobUrl.append({ pathname: "/" }).pathname())
       .expect(200)
       .then((response) => {
-        const m = response.text.match(/ action="([^"]+)"/i);
+        const m = response.text.match(/ action="(.*)" /i);
         return m![1]!;
       });
 
@@ -140,6 +138,8 @@ class SonosDriver {
               return m![1]!;
             });
 
+          console.log(`posting to action ${action}`);
+
           return request(this.server)
             .post(action)
             .type("form")
@@ -173,17 +173,6 @@ describe("scenarios", () => {
   );
   const linkCodes = new InMemoryLinkCodes();
 
-  const fakeSonos: Sonos = {
-    devices: () => Promise.resolve([aDevice({
-      name: "device1",
-      ip: "172.0.0.1",
-      port: 4301,
-    })]),
-    services: () => Promise.resolve([]),
-    remove: () => Promise.resolve(true),
-    register: () => Promise.resolve(true),
-  };
-
   beforeEach(() => {
     musicService.clear();
     linkCodes.clear();
@@ -256,7 +245,7 @@ describe("scenarios", () => {
                   ...BLONDIE.albums,
                   ...BOB_MARLEY.albums,
                   ...MADONNA.albums,
-                ].map((it) => it.name).sort()
+                ].map((it) => it.name)
               )
             );
         });
@@ -268,13 +257,11 @@ describe("scenarios", () => {
     const bonobUrl = url("http://localhost:1234");
     const bonob = bonobService("bonob", 123, bonobUrl);
     const server = makeServer(
-      fakeSonos,
+      SONOS_DISABLED,
       bonob,
       bonobUrl,
       musicService,
-      {
-        linkCodes: () => linkCodes,
-      }
+      linkCodes
     );
 
     const sonosDriver = new SonosDriver(server, bonobUrl, bonob);
@@ -286,13 +273,11 @@ describe("scenarios", () => {
     const bonobUrl = url("http://localhost:1234/");
     const bonob = bonobService("bonob", 123, bonobUrl);
     const server = makeServer(
-      fakeSonos,
+      SONOS_DISABLED,
       bonob,
       bonobUrl,
       musicService,
-      {
-        linkCodes: () => linkCodes
-      }
+      linkCodes
     );
 
     const sonosDriver = new SonosDriver(server, bonobUrl, bonob);
@@ -304,13 +289,11 @@ describe("scenarios", () => {
     const bonobUrl = url("http://localhost:1234/context-for-bonob");
     const bonob = bonobService("bonob", 123, bonobUrl);
     const server = makeServer(
-      fakeSonos,
+      SONOS_DISABLED,
       bonob,
       bonobUrl,
       musicService,
-      {
-        linkCodes: () => linkCodes
-      }
+      linkCodes
     );
 
     const sonosDriver = new SonosDriver(server, bonobUrl, bonob);

tests/smapi_auth.test.ts

@@ -1,188 +0,0 @@
-import { v4 as uuid } from "uuid";
-import jwt from "jsonwebtoken";
-
-import {
-  ExpiredTokenError,
-  InvalidTokenError,
-  isSmapiRefreshTokenResultFault,
-  JWTSmapiLoginTokens,
-  smapiTokenAsString,
-  smapiTokenFromString,
-  SMAPI_TOKEN_VERSION,
-} from "../src/smapi_auth";
-import { either as E } from "fp-ts";
-import { FixedClock } from "../src/clock";
-import dayjs from "dayjs";
-import { b64Encode } from "../src/b64";
-
-describe("smapiTokenAsString", () => {
-  it("can round trip token to and from string", () => {
-    const smapiToken = { token: uuid(), key: uuid(), someOtherStuff: 'this needs to be explicitly ignored' };
-    const asString = smapiTokenAsString(smapiToken)
-
-    expect(asString).toEqual(b64Encode(JSON.stringify({
-      token: smapiToken.token,
-      key: smapiToken.key,
-    })));
-    expect(smapiTokenFromString(asString)).toEqual({
-      token: smapiToken.token,
-      key: smapiToken.key
-    });
-  });
-});
-
-describe("isSmapiRefreshTokenResultFault", () => {
-  it("should return true for a refreshAuthTokenResult fault", () => {
-    const faultWithRefreshAuthToken = {
-      Fault: {
-        faultcode: "",
-        faultstring: "",
-        detail: {
-          refreshAuthTokenResult: {
-            authToken: "x",
-            privateKey: "x",
-          },
-        },
-      },
-    };
-    expect(isSmapiRefreshTokenResultFault(faultWithRefreshAuthToken)).toEqual(
-      true
-    );
-  });
-
-  it("should return false when is not a refreshAuthTokenResult", () => {
-    expect(isSmapiRefreshTokenResultFault({ Fault: { faultcode: "", faultstring:" " }})).toEqual(
-      false
-    );
-  });
-});
-
-describe("auth", () => {
-  describe("JWTSmapiLoginTokens", () => {
-    const clock = new FixedClock(dayjs());
-
-    const expiresIn = "1h";
-    const secret = `secret-${uuid()}`;
-    const key = uuid();
-    const smapiLoginTokens = new JWTSmapiLoginTokens(clock, secret, expiresIn, () => key);
-
-    describe("issuing a new token", () => {
-      it("should issue a token that can then be verified", () => {
-        const serviceToken = `service-token-${uuid()}`;
-
-        const smapiToken = smapiLoginTokens.issue(serviceToken);
-
-        const expected = jwt.sign(
-          {
-            serviceToken,
-            iat: clock.now().unix(),
-          },
-          secret + SMAPI_TOKEN_VERSION + key,
-          { expiresIn }
-        );
-
-        expect(smapiToken.token).toEqual(expected);
-        expect(smapiToken.token).not.toContain(serviceToken);
-        expect(smapiToken.token).not.toContain(secret);
-        expect(smapiToken.token).not.toContain(":");
-
-        const roundTripped = smapiLoginTokens.verify(smapiToken);
-
-        expect(roundTripped).toEqual(E.right(serviceToken));
-      });
-    });
-
-    describe("when verifying the token fails", () => {
-      describe("due to the version changing", () => {
-        it("should return an error", () => {
-          const authToken = uuid();
-
-          const vXSmapiTokens = new JWTSmapiLoginTokens(
-            clock,
-            secret,
-            expiresIn,
-            uuid,
-            SMAPI_TOKEN_VERSION
-          );
-
-          const vXPlus1SmapiTokens = new JWTSmapiLoginTokens(
-            clock,
-            secret,
-            expiresIn,
-            () => uuid(),
-            SMAPI_TOKEN_VERSION + 1
-          );
-
-          const v1Token = vXSmapiTokens.issue(authToken);
-          expect(vXSmapiTokens.verify(v1Token)).toEqual(E.right(authToken));
-
-          const result = vXPlus1SmapiTokens.verify(v1Token);
-          expect(result).toEqual(
-            E.left(new InvalidTokenError("invalid signature"))
-          );
-        });
-      });
-      
-      describe("due to secret changing", () => {
-        it("should return an error", () => {
-          const authToken = uuid();
-
-          const smapiToken = new JWTSmapiLoginTokens(
-            clock,
-            "A different secret",
-            expiresIn
-          ).issue(authToken);
-
-          const result = smapiLoginTokens.verify(smapiToken);
-          expect(result).toEqual(
-            E.left(new InvalidTokenError("invalid signature"))
-          );
-        });
-      });
-
-      describe("due to key changing", () => {
-        it("should return an error", () => {
-          const authToken = uuid();
-
-          const smapiToken = smapiLoginTokens.issue(authToken);
-
-          const result = smapiLoginTokens.verify({
-            ...smapiToken,
-            key: "some other key",
-          });
-          expect(result).toEqual(
-            E.left(new InvalidTokenError("invalid signature"))
-          );
-        });
-      });
-    });
-
-    describe("when the token has expired", () => {
-      it("should return an ExpiredTokenError, with the authToken", () => {
-        const authToken = uuid();
-        const now = dayjs();
-        const tokenIssuedAt = now.subtract(31, "seconds");
-
-        const tokensWith30SecondExpiry = new JWTSmapiLoginTokens(
-          clock,
-          uuid(),
-          "30s"
-        );
-
-        clock.time = tokenIssuedAt;
-        const expiredToken = tokensWith30SecondExpiry.issue(authToken);
-
-        clock.time = now;
-
-        const result = tokensWith30SecondExpiry.verify(expiredToken);
-        expect(result).toEqual(
-          E.left(
-            new ExpiredTokenError(
-              authToken
-            )
-          )
-        );
-      });
-    });
-  });
-});

tests/sonos.test.ts

@@ -274,13 +274,12 @@ describe("sonos", () => {
 
   describe("when is disabled", () => {
     it("should return a disabled client", async () => {
-      const disabled = sonos({ enabled: false });
+      const disabled = sonos(false);
 
       expect(disabled).toEqual(SONOS_DISABLED);
       expect(await disabled.devices()).toEqual([]);
       expect(await disabled.services()).toEqual([]);
-      expect(await disabled.register(aService())).toEqual(false);
-      expect(await disabled.remove(123)).toEqual(false);
+      expect(await disabled.register(aService())).toEqual(true);
     });
   });
 
@@ -311,7 +310,7 @@ describe("sonos", () => {
         );
         sonosManager.InitializeWithDiscovery.mockResolvedValue(true);
 
-        const actualDevices = await sonos({ enabled: true }).devices();
+        const actualDevices = await sonos(true, undefined).devices();
 
         expect(SonosManager).toHaveBeenCalledTimes(1);
         expect(sonosManager.InitializeWithDiscovery).toHaveBeenCalledWith(10);
@@ -332,7 +331,7 @@ describe("sonos", () => {
         );
         sonosManager.InitializeWithDiscovery.mockResolvedValue(true);
 
-        const actualDevices = await sonos({ enabled: true, seedHost: "" }).devices();
+        const actualDevices = await sonos(true, "").devices();
 
         expect(SonosManager).toHaveBeenCalledTimes(1);
         expect(sonosManager.InitializeWithDiscovery).toHaveBeenCalledWith(10);
@@ -355,7 +354,7 @@ describe("sonos", () => {
         );
         sonosManager.InitializeFromDevice.mockResolvedValue(true);
 
-        const actualDevices = await sonos({ enabled: true, seedHost }).devices();
+        const actualDevices = await sonos(true, seedHost).devices();
 
         expect(SonosManager).toHaveBeenCalledTimes(1);
         expect(sonosManager.InitializeFromDevice).toHaveBeenCalledWith(
@@ -378,7 +377,7 @@ describe("sonos", () => {
         );
         sonosManager.InitializeWithDiscovery.mockResolvedValue(true);
 
-        const actualDevices = await sonos({ enabled: true, seedHost: undefined }).devices();
+        const actualDevices = await sonos(true, undefined).devices();
 
         expect(actualDevices).toEqual([
           {
@@ -409,7 +408,7 @@ describe("sonos", () => {
         );
         sonosManager.InitializeWithDiscovery.mockResolvedValue(false);
 
-        expect(await sonos({ enabled: true, seedHost: "" }).devices()).toEqual([]);
+        expect(await sonos(true, "").devices()).toEqual([]);
       });
     });
   });

tests/sqlite_smapi_token_store.test.ts

@@ -1,234 +0,0 @@
-import fs from "fs";
-import path from "path";
-import { SQLiteSmapiTokenStore } from "../src/sqlite_smapi_token_store";
-import { SmapiToken } from "../src/smapi_auth";
-import { JWTSmapiLoginTokens } from "../src/smapi_auth";
-import { SystemClock } from "../src/clock";
-
-describe("SQLiteSmapiTokenStore", () => {
-  const testDbPath = path.join(__dirname, "test-tokens.db");
-  const testJsonPath = path.join(__dirname, "test-tokens.json");
-  let tokenStore: SQLiteSmapiTokenStore;
-
-  beforeEach(() => {
-    // Clean up any existing test files
-    if (fs.existsSync(testDbPath)) {
-      fs.unlinkSync(testDbPath);
-    }
-    if (fs.existsSync(testJsonPath)) {
-      fs.unlinkSync(testJsonPath);
-    }
-    if (fs.existsSync(`${testJsonPath}.bak`)) {
-      fs.unlinkSync(`${testJsonPath}.bak`);
-    }
-
-    tokenStore = new SQLiteSmapiTokenStore(testDbPath);
-  });
-
-  afterEach(() => {
-    tokenStore.close();
-
-    // Clean up test files
-    if (fs.existsSync(testDbPath)) {
-      fs.unlinkSync(testDbPath);
-    }
-    if (fs.existsSync(testJsonPath)) {
-      fs.unlinkSync(testJsonPath);
-    }
-    if (fs.existsSync(`${testJsonPath}.bak`)) {
-      fs.unlinkSync(`${testJsonPath}.bak`);
-    }
-  });
-
-  describe("Database Initialization", () => {
-    it("should create database file on initialization", () => {
-      expect(fs.existsSync(testDbPath)).toBe(true);
-    });
-
-    it("should create parent directory if it doesn't exist", () => {
-      const nestedPath = path.join(__dirname, "nested", "dir", "tokens.db");
-      const nestedStore = new SQLiteSmapiTokenStore(nestedPath);
-
-      expect(fs.existsSync(nestedPath)).toBe(true);
-
-      nestedStore.close();
-      fs.unlinkSync(nestedPath);
-      fs.rmdirSync(path.dirname(nestedPath));
-      fs.rmdirSync(path.dirname(path.dirname(nestedPath)));
-    });
-  });
-
-  describe("Token Operations", () => {
-    const testToken: SmapiToken = {
-      token: "test-jwt-token",
-      key: "test-key-123",
-    };
-
-    it("should set and get a token", () => {
-      tokenStore.set("token1", testToken);
-      const retrieved = tokenStore.get("token1");
-
-      expect(retrieved).toEqual(testToken);
-    });
-
-    it("should return undefined for non-existent token", () => {
-      const retrieved = tokenStore.get("non-existent");
-      expect(retrieved).toBeUndefined();
-    });
-
-    it("should update existing token", () => {
-      tokenStore.set("token1", testToken);
-
-      const updatedToken: SmapiToken = {
-        token: "updated-jwt-token",
-        key: "updated-key-456",
-      };
-
-      tokenStore.set("token1", updatedToken);
-      const retrieved = tokenStore.get("token1");
-
-      expect(retrieved).toEqual(updatedToken);
-    });
-
-    it("should delete a token", () => {
-      tokenStore.set("token1", testToken);
-      tokenStore.delete("token1");
-      const retrieved = tokenStore.get("token1");
-
-      expect(retrieved).toBeUndefined();
-    });
-
-    it("should get all tokens", () => {
-      const token1: SmapiToken = { token: "jwt1", key: "key1" };
-      const token2: SmapiToken = { token: "jwt2", key: "key2" };
-      const token3: SmapiToken = { token: "jwt3", key: "key3" };
-
-      tokenStore.set("tokenKey1", token1);
-      tokenStore.set("tokenKey2", token2);
-      tokenStore.set("tokenKey3", token3);
-
-      const allTokens = tokenStore.getAll();
-
-      expect(Object.keys(allTokens).length).toBe(3);
-      expect(allTokens["tokenKey1"]).toEqual(token1);
-      expect(allTokens["tokenKey2"]).toEqual(token2);
-      expect(allTokens["tokenKey3"]).toEqual(token3);
-    });
-
-    it("should return empty object when no tokens exist", () => {
-      const allTokens = tokenStore.getAll();
-      expect(allTokens).toEqual({});
-    });
-  });
-
-  describe("Token Cleanup", () => {
-    it("should cleanup invalid tokens", () => {
-      const smapiAuthTokens = new JWTSmapiLoginTokens(SystemClock, "test-secret", "1h");
-
-      // Create valid tokens
-      const validToken1 = smapiAuthTokens.issue("service-token-1");
-      const validToken2 = smapiAuthTokens.issue("service-token-2");
-
-      // Create invalid token (wrong secret)
-      const invalidAuthTokens = new JWTSmapiLoginTokens(SystemClock, "different-secret", "1h");
-      const invalidToken = invalidAuthTokens.issue("service-token-3");
-
-      tokenStore.set("valid1", validToken1);
-      tokenStore.set("valid2", validToken2);
-      tokenStore.set("invalid", invalidToken);
-
-      // Clean up
-      const deletedCount = tokenStore.cleanupExpired(smapiAuthTokens);
-
-      expect(deletedCount).toBe(1);
-      expect(tokenStore.get("valid1")).toBeDefined();
-      expect(tokenStore.get("valid2")).toBeDefined();
-      expect(tokenStore.get("invalid")).toBeUndefined();
-    });
-
-    it("should not cleanup expired tokens that can be refreshed", () => {
-      // Note: This test would require mocking time to create an expired token
-      // For now, we just verify the function runs without error
-      const smapiAuthTokens = new JWTSmapiLoginTokens(SystemClock, "test-secret", "1h");
-      const validToken = smapiAuthTokens.issue("service-token-1");
-
-      tokenStore.set("token1", validToken);
-      const deletedCount = tokenStore.cleanupExpired(smapiAuthTokens);
-
-      expect(deletedCount).toBe(0);
-      expect(tokenStore.get("token1")).toBeDefined();
-    });
-  });
-
-  describe("JSON Migration", () => {
-    it("should migrate tokens from JSON file", () => {
-      const jsonTokens = {
-        token1: { token: "jwt1", key: "key1" },
-        token2: { token: "jwt2", key: "key2" },
-        token3: { token: "jwt3", key: "key3" },
-      };
-
-      fs.writeFileSync(testJsonPath, JSON.stringify(jsonTokens, null, 2), "utf8");
-
-      const migratedCount = tokenStore.migrateFromJSON(testJsonPath);
-
-      expect(migratedCount).toBe(3);
-      expect(tokenStore.get("token1")).toEqual(jsonTokens.token1);
-      expect(tokenStore.get("token2")).toEqual(jsonTokens.token2);
-      expect(tokenStore.get("token3")).toEqual(jsonTokens.token3);
-    });
-
-    it("should create backup of original JSON file", () => {
-      const jsonTokens = {
-        token1: { token: "jwt1", key: "key1" },
-      };
-
-      fs.writeFileSync(testJsonPath, JSON.stringify(jsonTokens, null, 2), "utf8");
-      tokenStore.migrateFromJSON(testJsonPath);
-
-      expect(fs.existsSync(`${testJsonPath}.bak`)).toBe(true);
-      expect(fs.existsSync(testJsonPath)).toBe(false);
-    });
-
-    it("should return 0 when JSON file does not exist", () => {
-      const migratedCount = tokenStore.migrateFromJSON(testJsonPath);
-      expect(migratedCount).toBe(0);
-    });
-
-    it("should handle empty JSON file", () => {
-      fs.writeFileSync(testJsonPath, JSON.stringify({}), "utf8");
-      const migratedCount = tokenStore.migrateFromJSON(testJsonPath);
-
-      expect(migratedCount).toBe(0);
-    });
-  });
-
-  describe("Persistence", () => {
-    it("should persist tokens across instances", () => {
-      const testToken: SmapiToken = { token: "jwt1", key: "key1" };
-
-      tokenStore.set("token1", testToken);
-      tokenStore.close();
-
-      // Create new instance with same database
-      const newStore = new SQLiteSmapiTokenStore(testDbPath);
-      const retrieved = newStore.get("token1");
-
-      expect(retrieved).toEqual(testToken);
-
-      newStore.close();
-    });
-  });
-
-  describe("Close", () => {
-    it("should close database connection without error", () => {
-      expect(() => tokenStore.close()).not.toThrow();
-    });
-
-    it("should handle multiple close calls gracefully", () => {
-      tokenStore.close();
-      // Second close should not throw
-      expect(() => tokenStore.close()).not.toThrow();
-    });
-  });
-});

tests/supersoap.ts

@@ -1,10 +1,7 @@
 import { Express } from "express";
-import { ReadStream } from "fs";
-import { IHttpClient } from "soap";
 import request from "supertest";
-import * as req from "axios";
 
-function supersoap(server: Express): IHttpClient {
+function supersoap(server: Express) {
   return {
     request: (
       rurl: string,
@@ -18,19 +15,12 @@ function supersoap(server: Express): IHttpClient {
         data == null
           ? request(server).get(withoutHost).send()
           : request(server).post(withoutHost).send(data);
-      return req
+      req
         .set(exheaders || {})
         .then((response) => callback(null, response, response.text))
         .catch(callback);
     },
-
-    requestStream: (
-      _: string,
-      _2: any
-    ): req.AxiosPromise<ReadStream> => {
-      throw "Not Implemented!!";
-    },
-  };
+  }
 }
 
-export default supersoap;
+export default supersoap

tests/tsconfig.json

@@ -10,7 +10,6 @@
       "strict": true,
       "noImplicitAny": false,
       "typeRoots" : [
-      "../typings",
         "../node_modules/@types"
       ]
     },

tests/url_builder.test.ts

@@ -138,19 +138,15 @@ describe("URLBuilder", () => {
       describe("with URLSearchParams", () => {
         it("should return a new URLBuilder with the new search params appended", () => {
           const original = url("https://example.com/some-path?a=b&c=d");
-          const searchParams = new URLSearchParams({ x: "y" });
-          searchParams.append("z", "1");
-          searchParams.append("z", "2");
-
           const updated = original.append({
-            searchParams,
+            searchParams: new URLSearchParams({ x: "y", z: "1" }),
           });
     
           expect(original.href()).toEqual("https://example.com/some-path?a=b&c=d");
           expect(`${original.searchParams()}`).toEqual("a=b&c=d")
     
-          expect(updated.href()).toEqual("https://example.com/some-path?a=b&c=d&x=y&z=1&z=2");
-          expect(`${updated.searchParams()}`).toEqual("a=b&c=d&x=y&z=1&z=2")
+          expect(updated.href()).toEqual("https://example.com/some-path?a=b&c=d&x=y&z=1");
+          expect(`${updated.searchParams()}`).toEqual("a=b&c=d&x=y&z=1")
         });
       });
     });
@@ -172,19 +168,15 @@ describe("URLBuilder", () => {
     
         it("should return a new URLBuilder with the new search params", () => {
           const original = url("https://example.com/some-path?a=b&c=d");
-          const searchParams = new URLSearchParams({ x: "y" });
-          searchParams.append("z", "1");
-          searchParams.append("z", "2");
-
           const updated = original.with({
-            searchParams,
+            searchParams: { x: "y", z: "1" },
           });
     
           expect(original.href()).toEqual("https://example.com/some-path?a=b&c=d");
           expect(`${original.searchParams()}`).toEqual("a=b&c=d")
     
-          expect(updated.href()).toEqual("https://example.com/some-path?x=y&z=1&z=2");
-          expect(`${updated.searchParams()}`).toEqual("x=y&z=1&z=2")
+          expect(updated.href()).toEqual("https://example.com/some-path?x=y&z=1");
+          expect(`${updated.searchParams()}`).toEqual("x=y&z=1")
         });
       });
 
@@ -204,19 +196,15 @@ describe("URLBuilder", () => {
     
         it("should return a new URLBuilder with the new search params", () => {
           const original = url("https://example.com/some-path?a=b&c=d");
-          const searchParams = new URLSearchParams({ x: "y" });
-          searchParams.append("z", "1");
-          searchParams.append("z", "2");
-
           const updated = original.with({
-            searchParams,
+            searchParams: new URLSearchParams({ x: "y", z: "1" }),
           });
     
           expect(original.href()).toEqual("https://example.com/some-path?a=b&c=d");
           expect(`${original.searchParams()}`).toEqual("a=b&c=d")
     
-          expect(updated.href()).toEqual("https://example.com/some-path?x=y&z=1&z=2");
-          expect(`${updated.searchParams()}`).toEqual("x=y&z=1&z=2")
+          expect(updated.href()).toEqual("https://example.com/some-path?x=y&z=1");
+          expect(`${updated.searchParams()}`).toEqual("x=y&z=1")
         });
       });
     });

tests/utils.test.ts

@@ -1,35 +0,0 @@
-import { takeWithRepeats } from "../src/utils";
-
-describe("takeWithRepeat", () => {
-  describe("when there is nothing in the input", () => {
-    it("should return an array of undefineds", () => {
-      expect(takeWithRepeats([], 3)).toEqual([undefined, undefined, undefined]);
-    });
-  });
-
-  describe("when there are exactly the amount required", () => {
-    it("should return them all", () => {
-      expect(takeWithRepeats(["a", undefined, "c"], 3)).toEqual([
-        "a",
-        undefined,
-        "c",
-      ]);
-      expect(takeWithRepeats(["a"], 1)).toEqual(["a"]);
-      expect(takeWithRepeats([undefined], 1)).toEqual([undefined]);
-    });
-  });
-
-  describe("when there are less than the amount required", () => {
-    it("should cycle through the ones available", () => {
-      expect(takeWithRepeats(["a", "b"], 3)).toEqual(["a", "b", "a"]);
-      expect(takeWithRepeats(["a", "b"], 5)).toEqual(["a", "b", "a", "b", "a"]);
-    });
-  });
-
-  describe("when there more than the amount required", () => {
-    it("should return the first n items", () => {
-      expect(takeWithRepeats(["a", "b", "c"], 2)).toEqual(["a", "b"]);
-      expect(takeWithRepeats(["a", undefined, "c"], 2)).toEqual(["a", undefined]);
-    });
-  });
-});

tsconfig.json

@@ -4,11 +4,9 @@
 
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-    "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-    "lib": [
-      "es2019"
-    ] /* Specify library files to be included in the compilation. */,
+    "target": "ES2019",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "lib": ["es2019"],                        /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
@@ -16,8 +14,8 @@
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "./build" /* Redirect output structure to the directory. */,
-    "rootDir": "." /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    "outDir": "./build",                      /* Redirect output structure to the directory. */
+    "rootDir": ".",                           /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                     /* Enable project compilation */
     // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
     // "removeComments": true,                /* Do not emit comments to output. */
@@ -27,35 +25,31 @@
     // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-    "strict": true /* Enable all strict type-checking options. */,
-    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,              /* Enable strict null checks. */
     // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
     // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */,
+    "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
     // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
     // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
 
     /* Additional Checks */
-    "noUnusedLocals": true /* Report errors on unused locals. */,
-    "noUnusedParameters": true /* Report errors on unused parameters. */,
-    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
-    "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
-    "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
+    "noUnusedLocals": true,                /* Report errors on unused locals. */
+    "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+    "noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
 
     /* Module Resolution Options */
     // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    "typeRoots": [
-      "./typings",
-      "./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. */
-    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* 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. */
+    "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. */
 
@@ -70,7 +64,7 @@
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */
-    "skipLibCheck": true /* Skip type checking of declaration files. */,
+    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
     "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
   }
 }

typings/scale-that-svg/index.d.ts

@@ -1,4 +0,0 @@
-declare module "scale-that-svg" {
-  const noTypesYet: any;
-  export default noTypesYet;
-}

web/icons/Africa-48087.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path d="M4.96 2.126l.613.416c.301.204.663.321.982.425.158.051.396.128.466.173l.035.023.01.006c.13.084.309.2.535.272C7.748 3.488 7.906 3.513 8.06 3.513c.339 0 .651-.12.881-.339.274.105.601.224.972.25.038.135.068.273.1.423.057.267.122.569.239.889.089.259.208.609.491.91.17.203.355.324.48.407l.031.021c.029.04.076.119.111.179.075.128.166.282.29.437.124.187.296.347.49.456-.088.076-.18.15-.278.222-.365.24-.64.498-.839.788L11.004 8.19l-.02.035-.027.047c-.217.377-.542.941-.423 1.627.034.285.108.529.174.745.017.055.034.11.05.166l-.022.011-.034.02c-.096.056-.938.57-.938 1.369 0 .095.01.182.027.262-.218.2-.351.476-.354.785-.104.14-.181.278-.247.397-.023.042-.046.085-.071.126-.071.037-.216.084-.395.12-.093-.214-.222-.361-.308-.457-.158-.228-.362-.396-.544-.545-.039-.032-.089-.073-.131-.109-.014-.118-.032-.235-.059-.34-.099-.385-.315-.667-.489-.894-.032-.041-.073-.095-.105-.14.02-.049.046-.108.068-.156.099-.221.234-.523.265-.894l.004-.043v-.043c0-.499-.127-.942-.395-1.371.057-.163.105-.375.093-.624C7.139 8.2 7.158 8.088 7.158 7.957c0-.008-.022-.643-.291-1.164C6.855 6.754 6.841 6.716 6.825 6.678 6.626 6.218 6.181 5.985 5.5 5.985c-.04 0-.09 0-.148 0-.586 0-1.988 0-2.326-.001C2.999 5.971 2.972 5.955 2.946 5.94L2.741 5.824C2.63 5.762 2.451 5.662 2.269 5.557c.006-.015.011-.03.016-.045.221-.641.094-1.106-.069-1.397.039-.033.081-.064.126-.094l.06-.034c.237-.13.73-.402.92-1.048.023-.09.036-.175.042-.252.069-.054.145-.12.219-.201.005 0 .01 0 .014 0 .419 0 .775-.15 1.034-.259C4.678 2.209 4.72 2.191 4.761 2.175 4.827 2.156 4.893 2.14 4.96 2.126M5.889 1C5.382 1.035 4.911 1.071 4.441 1.211c-.25.091-.553.26-.841.26-.046 0-.092-.004-.137-.014-.109-.035-.181-.105-.29-.105-.109 0-.217.035-.254.105-.036.071 0 .105 0 .176C2.883 1.913 2.448 1.984 2.376 2.23c-.036.141 0 .316-.036.457C2.268 2.932 2.014 3.038 1.833 3.144c-.326.211-.579.457-.76.808C1.036 4.022 1 4.093 1 4.162c0 .141.217.281.29.386C1.434 4.725 1.398 4.97 1.326 5.181c-.073.211-.217.386-.29.562C1 5.814 1 5.885 1 5.919c.036.035.073.07.109.106.326.246 1.145.686 1.326.792.157.091.341.18.505.182C3 7 5 7 5.5 7c0 0 .5 0 .375.133C6.02 7.238 6.142 7.817 6.142 7.957c0 .14-.073.246-.036.352.036.387-.349.597-.096.913.254.316.398.632.398 1.054-.036.422-.362.773-.362 1.194 0 .457.543.808.652 1.23.036.141.036.316.073.457.073.316.639.597.82.878.073.106.181.175.217.316 0 .071 0 .141 0 .211 0 .175.145.351.326.422C8.166 14.995 8.201 15 8.238 15c.09 0 .192-.025.294-.05.398-.035 1.123-.175 1.376-.527.158-.219.254-.492.434-.668.109-.105.217-.211.181-.351-.036-.071-.073-.106-.073-.141 0-.071.145-.106.217-.106.073 0 .145 0 .217 0 .181-.035.254-.246.217-.386-.036-.175-.217-.281-.29-.457-.036-.035-.036-.07-.036-.105 0-.141.254-.387.434-.492.217-.105.471-.211.579-.422.073-.175.073-.351 0-.527-.073-.352-.217-.668-.254-1.019-.073-.351.145-.703.326-1.019.145-.211.362-.387.579-.527C13.167 7.677 13.891 6.878 14 6c-.254.211-.688.272-1.05.306-.109 0-.217 0-.29-.035-.073-.035-.145-.106-.181-.175C12.262 5.85 12.153 5.498 11.9 5.288c-.145-.106-.29-.175-.398-.317-.145-.141-.217-.352-.29-.563-.217-.598-.217-1.09-.471-1.687-.073-.14-.145-.316-.29-.316-.073 0-.145 0-.254 0-.045.007-.091.009-.136.009-.456 0-.912-.296-1.373-.391C8.645 2.009 8.594 2 8.544 2c-.07 0-.138.017-.18.058C8.256 2.164 8.348 2.335 8.24 2.44 8.197 2.481 8.13 2.498 8.06 2.498c-.049 0-.101-.008-.146-.023C7.805 2.44 7.701 2.369 7.592 2.299 7.23 2.053 6.506 1.948 6.144 1.702c.073-.105.109-.211.145-.317.036-.105-.038-.28-.146-.35C6.07 1 5.961 1 5.889 1L5.889 1zM13.875 10c-.099.215-.232.465-.398.571-.132.071-.299.143-.365.285-.099.179 0 .393-.033.571 0 .071-.033.143-.066.215-.033.179 0 .393.066.571.033.107.099.25.199.285.066 0 .166-.035.232-.107.066-.071.132-.215.166-.321s.033-.215.033-.321c.033-.321.199-.643.266-.965.033-.215.033-.429 0-.643C13.942 10.071 13.909 10 13.875 10l.017.035c.009.009.017.018.017.035l-.017-.035C13.884 10.027 13.875 10.018 13.875 10L13.875 10z"/>
-</svg>

web/icons/Audio-Wave-1892.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26">
-  <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="1.9" d="M19 3L19 22M22 9L22 16M25 11L25 14M16 7L16 18M10 9L10 16M13 11L13 14M7 4L7 21M1 11L1 14M4 8L4 17"/>
-</svg>

web/icons/Blues-113548.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-  <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M4,14c0,0.691,4.925,1,11,1s11-0.309,11-1"/>
-  <path d="M15 12c5.66 0 8-.588 8-.588S22.07 3 19.5 3 17.436 4 15 4s-1.991-1-4.5-1S7 11.412 7 11.412 9.34 12 15 12zM12 24h-2c-1.657 0-3-1.343-3-3v-1c0-1.105.895-2 2-2h3c1.105 0 2 .895 2 2v2C14 23.105 13.105 24 12 24zM16 22v-2c0-1.105.895-2 2-2h3c1.105 0 2 .895 2 2v1c0 1.657-1.343 3-3 3h-2C16.895 24 16 23.105 16 22z"/>
-  <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M13 20L17 20"/>
-</svg>

web/icons/Book-22940.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M25,27H9c-1.105,0-2-0.895-2-2V7c0-1.105,0.895-2,2-2h16V27z"/>
-  <path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="2" d="M7 25c0-1.105.895-2 2-2h16M11 10L22 10"/>
-</svg>

web/icons/C-3PO-31823.svg

@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="c3po" viewBox="0 0 48 48">
-  <path fill="#f4b10b" d="M16 39h16v6H16V39zM39 18C39 18 39 18.1 39 18c-.3-3.8-1.8-7.2-4.2-9.8-1.8-1.9-4.1-3.1-6.8-3.8-.8-.4-1.6-.8-2.3-1.4l-1.1-.9c-.4-.3-.9-.3-1.3 0l-1.1.9c-.7.6-1.5 1-2.3 1.4-2.6.6-4.9 1.9-6.7 3.8-2.5 2.5-3.9 5.9-4.2 9.7 0 0 0 0-.1 0 0 0-2 1.7-2 2 .1 2.6.4 4.8.8 7 .1.3 2.3 1 2.3 1 .2 1 .5 2 .8 3l1.1 2h24l1.1-2c.3-1 .5-2 .8-3 0 0 2.2-.7 2.3-1 .5-2.2.8-4.4.9-7C41 19.7 39 18 39 18z"/>
-  <path fill="#b57f08" d="M12,32h24v4H12V32z"/>
-  <path fill="#ffd600" d="M24,42c-3.7,0-6.2-1.5-7.7-2.7c-0.8-0.7-1.4-1.6-1.7-2.6c-1.3-4.9-3.5-10.6-3.6-17 C10.8,12.5,15.3,6,24,6s13.2,6.5,13,13.7c-0.2,6.3-2.3,12.1-3.6,17c-0.3,1-0.8,2-1.7,2.6C30.2,40.5,27.7,42,24,42z"/>
-  <path fill="#684903" d="M26,36h-4c-0.6,0-1-0.4-1-1s0.4-1,1-1h4c0.6,0,1,0.4,1,1S26.6,36,26,36z"/>
-  <path fill="#ffc107" d="M27,32l-3-3l-3,3l-6-6l4-2h10l4,2L27,32z"/>
-  <path fill="#f4b10b" d="M29,18c-2.8,0-4.3,2.3-5,3c-0.7-0.7-2.2-3-5-3s-5,2.2-5,5s2.2,5,5,5c2.9,0,5-3,5-3s2.1,3,5,3 c2.8,0,5-2.2,5-5S31.8,18,29,18z"/>
-  <path fill="#ffea00" d="M22 23c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S22 21.3 22 23zM32 23c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3S32 21.3 32 23z"/>
-  <path fill="#684903" d="M30,23c0,0.6-0.4,1-1,1s-1-0.4-1-1s0.4-1,1-1S30,22.4,30,23z"/>
-  <path fill="#ffd600" d="M25,4c0,0.6-0.4,1-1,1s-1-0.4-1-1s0.4-1,1-1S25,3.4,25,4z"/>
-  <path fill="#684903" d="M20,23c0,0.6-0.4,1-1,1s-1-0.4-1-1s0.4-1,1-1S20,22.4,20,23z"/>
-  <path fill="#dd9f05" d="M12,38c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1s1,0.4,1,1v6C13,37.6,12.6,38,12,38z"/>
-  <path fill="#ffd600" d="M33,46H15c-0.6,0-1-0.4-1-1s0.4-1,1-1h18c0.6,0,1,0.4,1,1S33.6,46,33,46z"/>
-  <path fill="#dd9f05" d="M36,38c-0.6,0-1-0.4-1-1v-6c0-0.6,0.4-1,1-1s1,0.4,1,1v6C37,37.6,36.6,38,36,38z"/>
-</svg>

web/icons/Cannabis-33270.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <path d="M28,18.77v-2.557l-1.875-0.256c-0.092-0.013-1.249-0.121-2.58-0.127c1.445-2.708,2-5.083,2.006-5.111l0.311-1.358l-1.166-0.762l-0.071-0.046l-0.993-0.649l-1.046,0.56c-0.252,0.135-1.802,0.987-3.357,2.336c-0.293-2.623-0.967-4.824-1.245-5.53L17.488,4h-1.363h-0.219h-1.33l-0.514,1.226c-0.058,0.138-1.26,3.041-1.557,6.491c-1.651-1.342-4.443-2.884-4.443-2.884l-2.107,1.644l0.201,1.035C6.373,12.529,7.453,15,7.453,15C6.333,15,4,15.393,4,15.393v2.644c0,0,1.875,1.587,4.036,2.731c-0.092,0.087-0.152,0.149-0.179,0.177l-0.94,0.804l0.279,1.075l0.296,1.142L8.645,24.3c0.167,0.043,1.237,0.258,2.41,0.258c0.827,0,1.61-0.106,2.328-0.314c0.075-0.02,0.15-0.041,0.223-0.063c0.211,1.205,0.468,2.166,0.517,2.346L14.527,28H21c-1.292-1.333-2.18-3.417-2.18-3.417c-0.01-0.013-0.019-0.027-0.029-0.042c0.792,0.333,1.833,0.458,2.803,0.481l1.362-0.083l0.547-0.895l0.538-0.919c0,0-0.458-1.083-0.979-1.549c1.541-0.57,3.388-1.408,4.172-2.155L28,18.77z M21.5,19.986c-0.583,0.167-2.268,0.396-2.896,0.473c0,0,2.415,1.398,2.811,2.44c-0.001,0.01,0.006,0.023,0.005,0.034c-0.023-0.001-0.044-0.015-0.068-0.013c-1.875,0.146-4.823-1.502-5.161-1.79c0.072,1.068,0.455,3.57,1.356,4.838L17.519,26h-1.467c0,0-1.095-2.928-1.021-4.969c-0.513,0.437-1.105,1.001-2.205,1.293c-0.609,0.177-1.226,0.235-1.771,0.235c-0.858,0-1.715-0.144-1.913-0.195l-0.01-0.04c0,0,1.422-1.311,3.255-1.748c0.22-0.073,0.44-0.146,0.66-0.146c-0.733-0.146-1.466-0.291-2.273-0.583c-2.406-0.888-4.471-2.46-4.665-2.656L6.105,17.15c0,0,0.767-0.042,1.348-0.042c0.944,0,2.493,0.112,4.127,0.698c0.44,0.146,0.88,0.292,1.247,0.51c-0.607-0.536-3.639-3.066-4.539-6.874l0,0c0,0,4.4,2.266,6.691,5.891c-0.333-1.583-0.539-3.305-0.539-4.131C14.44,9.496,15.906,6,15.906,6h0.219c0.345,0.88,1.246,3.995,1.246,7.203c0,1.087-0.303,3.604-0.365,4.093c0.163-0.388,0.777-1.594,1.607-2.858c1.599-2.434,4.919-4.211,4.919-4.211l0.071,0.046c-0.115,0.501-0.891,3.306-2.637,6.002c-0.435,0.672-1.79,1.949-1.906,2.041c0.205-0.052,0.911-0.329,3.007-0.447c0.504-0.029,0.965-0.039,1.375-0.039c1.295,0,2.411,0.108,2.411,0.108l0.003,0.035C25.244,18.554,23.259,19.482,21.5,19.986z"/>
-</svg>

web/icons/Chapel-69791.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path fill="none" stroke="#000" stroke-linejoin="round" stroke-miterlimit="10" d="M10.5 7.125L10.494 3.529 7.494 0.5 4.5 3.5 4.5 7.125"/>
-  <path fill="none" stroke="#000" stroke-linejoin="round" stroke-miterlimit="10" d="M2.5 13.5L2.5 8.5 7.5 5.5 12.5 8.5 12.5 13.5M7 13.5L2 13.5"/>
-  <path fill="none" stroke="#000" stroke-linejoin="round" stroke-miterlimit="10" d="M8.5 13.5v-3c0-.552-.448-1-1-1s-1 .448-1 1v3M13 13.5L8 13.5"/>
-  <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M10.5 10.5L10.5 13.5M4.5 10.5L4.5 13.5M7.5 3.5L7.5 5.5"/>
-</svg>

web/icons/Chewbacca-89771.svg

@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="chewy" viewBox="0 0 48 48">
-  <path fill="#6d4c41" d="M39,25c0-2,0-0.216,0-2C39,9,34,2,24,2S9,10,9,22c0,1.784,0,1,0,3H39z"/>
-  <path fill="#a1887f" d="M39,25L39,25c0-7-4-12-7-12v-3c-3,0-4,2-4,2V8c0,0-3,1-4,3c-1-2-4-3-4-3s0,1,0,3c0,0-1-1-4-1v3 c-3,0-7,5-7,12v0c0,9-2.375,14.125-3,15h5v5l6-3l3,4l4-3l4,3l3-4l6,3v-5h5C41.375,39.125,39,34,39,25z"/>
-  <path fill="#8d6e63" d="M23 29c-.127 0-.877 0-1 0-6 0-7 6-7 6s2-3 4-3 3 0 3 0c.552 0 1-.448 1-1V29zM25 29c.127 0 .877 0 1 0 6 0 7 6 7 6s-2-3-4-3-3 0-3 0c-.552 0-1-.448-1-1V29z"/>
-  <path fill="#212121" d="M29,36H19c-1.1,0-2-0.9-2-2v0c0-1.1,0.9-2,2-2h10c1.1,0,2,0.9,2,2v0C31,35.1,30.1,36,29,36z"/>
-  <path fill="#fff" d="M19 32L20 34 21 32zM27 32L28 34 29 32zM27 36L26 34 25 36zM23 36L22 34 21 36z"/>
-  <path fill="#424242" d="M27,28c0,0.82-0.67,1.63-2,1.9c-0.3,0.07-0.63,0.1-1,0.1s-0.7-0.03-1-0.1c-1.33-0.27-2-1.08-2-1.9 c0-0.5,1-3,3-3S27,27.5,27,28z"/>
-  <path fill="#212121" d="M23 29.5v.4c-1.33-.27-2-1.08-2-1.9h.5C22.33 28 23 28.67 23 29.5zM27 28c0 .82-.67 1.63-2 1.9v-.4c0-.83.67-1.5 1.5-1.5H27z"/>
-  <path fill="#6d4c41" d="M29,18c-1.657,0-3,1.343-3,3s1.343,3,3,3c5,0,6,2,6,2S35,18,29,18z"/>
-  <path fill="#212121" d="M29 20A1 1 0 1 0 29 22A1 1 0 1 0 29 20Z"/>
-  <path fill="#6d4c41" d="M19,18c1.657,0,3,1.343,3,3s-1.343,3-3,3c-5,0-6,2-6,2S13,18,19,18z"/>
-  <path fill="#212121" d="M19 20A1 1 0 1 0 19 22A1 1 0 1 0 19 20Z"/>
-</svg>

web/icons/Children-78186.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-  <path d="M9 2A3 3 0 1 0 9 8 3 3 0 1 0 9 2zM6 25.967C6 26.537 6.463 27 7.033 27c.544 0 .995-.422 1.031-.965L8.466 20H6V25.967zM9.936 26.036C9.972 26.578 10.423 27 10.967 27 11.537 27 12 26.537 12 25.967V20H9.534L9.936 26.036zM11 10h-.277C10.376 10.595 9.738 11 9 11s-1.376-.405-1.723-1H7c-1.654 0-3 1.346-3 3v6c0 .553.447 1 1 1s1-.447 1-1v-2h6v2c0 .553.447 1 1 1s1-.447 1-1v-6C14 11.346 12.654 10 11 10zM24 19v-6c0-1.657-1.343-3-3-3s-3 1.343-3 3v6H24zM18 22v3.967C18 26.537 18.463 27 19.033 27c.544 0 .995-.422 1.031-.964L20.333 22H18zM21.667 22l.269 4.035C21.972 26.578 22.423 27 22.967 27 23.537 27 24 26.537 24 25.967V22H21.667zM21 2A3 3 0 1 0 21 8 3 3 0 1 0 21 2z"/>
-  <path d="M26.249 6.751c.827.827.749 2.247.749 2.247s-1.42.078-2.247-.749-.749-2.247-.749-2.247S25.422 5.924 26.249 6.751zM17.998 6.002c0 0 .078 1.42-.749 2.247s-2.247.749-2.247.749-.078-1.42.749-2.247S17.998 6.002 17.998 6.002z"/>
-  <path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M25,19l-1.515-6.06C23.2,11.8,22.175,11,21,11h0c-1.175,0-2.2,0.8-2.485,1.94L17,19"/>
-  <path d="M24 17L18 17 17 20 25 20z"/>
-</svg>