Attempt resolution if it's not a numeric IP

Allow empty dns upstream config (default to system nameservers)
Fallback to the system's dns resolver by default
2026-08-24 14:47:23 +00:00 · 2026-02-22 14:17:01 +01:00 · 2026-02-22 13:58:30 +01:00 · 2026-02-22 13:36:58 +01:00 · 2026-02-22 01:03:50 +01:00 · 2026-02-22 00:33:15 +01:00
51 changed files with 5117 additions and 464 deletions
@@ -41,3 +41,20 @@ PREFERRED_DEVICES="Living Room@192.168.1.100:8090;Kitchen@192.168.1.101;192.168.
 # Alternative format examples:
 # PREFERRED_DEVICES="192.168.178.35;192.168.178.28"
 # PREFERRED_DEVICES="SoundTouch 10@192.168.178.35;SoundTouch 20@192.168.178.28"
+
+# Spotify Integration
+# Create an app at https://developer.spotify.com/dashboard
+# SPOTIFY_CLIENT_ID=your_client_id
+# SPOTIFY_CLIENT_SECRET=your_client_secret
+# Auth confirmation url using GET, works in browsers
+# SPOTIFY_REDIRECT_URI=https://your-server.example.com/mgmt/spotify/callback
+# Auth confirmation url using POST, works with the ueberboese-app (https://github.com/julius-d/ueberboese-app)
+# SPOTIFY_REDIRECT_URI=https://your-server.example.com/mgmt/spotify/confirm
+
+# Management API Authentication
+# Protects /mgmt/* endpoints (Spotify token access, account management)
+MGMT_USERNAME=admin
+MGMT_PASSWORD=change_me!
+
+# External base URL (required when behind a reverse proxy for OAuth callbacks)
+# BASE_URL=https://your-server.example.com
@@ -17,6 +17,7 @@ A comprehensive solution for controlling and preserving Bose SoundTouch devices,
 - ⚡ **Real-time Events**: WebSocket connection for live device state monitoring
 - 🔍 **Device Discovery**: Automatic discovery via UPnP/SSDP and mDNS
 - 📻 **Content Navigation**: Browse and search TuneIn, Pandora, Spotify, local music
+- 📻 **RadioBrowser**: Access thousands of internet radio stations via [radio-browser.info](docs/reference/radio-browser.md)
 - 🎙️ **Station Management**: Add and play radio stations without presets
 - 🖥️ **CLI Tool**: Comprehensive command-line interface
 - 🌐 **SoundTouch Service**: Emulate Bose cloud services for offline device operation
@@ -319,8 +320,8 @@ func main() {
        Port: 8090,
    })
    
-    // Play Text-to-Speech message
-    err := c.PlayTTS("Welcome home!", "your-app-key", 70)
+    // Play Text-to-Speech message (language code "EN", "DE", etc.)
+    err := c.PlayTTS("Welcome home!", "your-app-key", "EN", 70)
    if err != nil {
        log.Fatal(err)
    }
@@ -389,6 +389,10 @@ func handleSpecialMessage(message *models.SpecialMessage, filters map[string]boo
 			if !filters["userActivity"] {
 				return
 			}
+		case models.MessageTypeUserInactivity:
+			if !filters["userInactivity"] {
+				return
+			}
 		}
 	}

@@ -402,6 +406,12 @@ func handleSpecialMessage(message *models.SpecialMessage, filters map[string]boo
 	case models.MessageTypeUserActivity:
 		fmt.Printf("\n👤 User Activity [%s]\n", message.DeviceID)

+		if verbose {
+			fmt.Printf("  ⏰ Timestamp: %s\n", message.Timestamp.Format("15:04:05"))
+		}
+	case models.MessageTypeUserInactivity:
+		fmt.Printf("\n💤 User Inactivity [%s]\n", message.DeviceID)
+
 		if verbose {
 			fmt.Printf("  ⏰ Timestamp: %s\n", message.Timestamp.Format("15:04:05"))
 		}
@@ -2,7 +2,6 @@ package main

 import (
 	"fmt"
-	"net/url"
 	"strings"

 	"github.com/gesellix/bose-soundtouch/pkg/models"
@@ -35,23 +34,12 @@ func playTTS(c *cli.Context) error {
 		return err
 	}

-	// URL encode the text for Google TTS
-	encodedText := url.QueryEscape(text)
-
-	// Build TTS URL with language support
-	ttsURL := fmt.Sprintf("http://translate.google.com/translate_tts?ie=UTF-8&tl=%s&client=tw-ob&q=%s", language, encodedText)
-
 	// Create PlayInfo for TTS
-	playInfo := &models.PlayInfo{
-		URL:     ttsURL,
-		AppKey:  appKey,
-		Service: "TTS Notification",
-		Message: "Google TTS",
-		Reason:  text,
-	}
-
+	var playInfo *models.PlayInfo
 	if volume > 0 {
-		playInfo.SetVolume(volume)
+		playInfo = models.NewTTSPlayInfo(text, appKey, language, volume)
+	} else {
+		playInfo = models.NewTTSPlayInfo(text, appKey, language)
 	}

 	err = client.PlayCustom(playInfo)
@@ -121,10 +109,11 @@ func playURL(c *cli.Context) error {
 	}

 	// Create PlayInfo for URL content
-	playInfo := models.NewURLPlayInfo(urlStr, appKey, service, message, reason)
-
+	var playInfo *models.PlayInfo
 	if volume > 0 {
-		playInfo.SetVolume(volume)
+		playInfo = models.NewURLPlayInfo(urlStr, appKey, service, message, reason, volume)
+	} else {
+		playInfo = models.NewURLPlayInfo(urlStr, appKey, service, message, reason)
 	}

 	err = client.PlayCustom(playInfo)
@@ -23,6 +23,7 @@ import (
 	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
 	"github.com/gesellix/bose-soundtouch/pkg/service/proxy"
 	"github.com/gesellix/bose-soundtouch/pkg/service/setup"
+	"github.com/gesellix/bose-soundtouch/pkg/service/spotify"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/urfave/cli/v2"
@@ -145,8 +146,8 @@ func main() {
 			},
 			&cli.StringFlag{
 				Name:    "dns-upstream",
-				Usage:   "Upstream DNS server for non-Bose queries",
-				Value:   "8.8.8.8",
+				Usage:   "Upstream DNS server(s) for non-Bose queries (comma-separated). If empty, /etc/resolv.conf is used.",
+				Value:   "",
 				EnvVars: []string{"DNS_UPSTREAM"},
 			},
 			&cli.StringFlag{
@@ -155,6 +156,39 @@ func main() {
 				Value:   ":53",
 				EnvVars: []string{"DNS_BIND_ADDR"},
 			},
+			&cli.StringFlag{
+				Name:    "spotify-client-id",
+				Usage:   "Spotify OAuth client ID",
+				EnvVars: []string{"SPOTIFY_CLIENT_ID"},
+			},
+			&cli.StringFlag{
+				Name:    "spotify-client-secret",
+				Usage:   "Spotify OAuth client secret",
+				EnvVars: []string{"SPOTIFY_CLIENT_SECRET"},
+			},
+			&cli.StringFlag{
+				Name:    "spotify-redirect-uri",
+				Usage:   "Spotify OAuth redirect URI",
+				Value:   "ueberboese-login://spotify",
+				EnvVars: []string{"SPOTIFY_REDIRECT_URI"},
+			},
+			&cli.StringFlag{
+				Name:    "mgmt-username",
+				Usage:   "Management API username for HTTP Basic Auth",
+				Value:   "admin",
+				EnvVars: []string{"MGMT_USERNAME"},
+			},
+			&cli.StringFlag{
+				Name:    "mgmt-password",
+				Usage:   "Management API password for HTTP Basic Auth",
+				Value:   "change_me!",
+				EnvVars: []string{"MGMT_PASSWORD"},
+			},
+			&cli.StringFlag{
+				Name:    "base-url",
+				Usage:   "External base URL for OAuth callbacks behind reverse proxy",
+				EnvVars: []string{"BASE_URL"},
+			},
 		},
 		Action: func(c *cli.Context) error {
 			config := loadConfig(c)
@@ -177,13 +211,34 @@ func main() {

 			cm := initCertificateManager(config.dataDir)
 			sm := setup.NewManager(config.serverURL, ds, cm)
+			sm.MgmtUsername = config.mgmtUsername
+			sm.MgmtPassword = config.mgmtPassword
 			server := handlers.NewServer(ds, sm, config.serverURL, config.redact, config.logBody, config.record, config.enableSoundcorkProxy)
 			sm.GetDNSRunning = server.GetDNSRunning
 			server.SetSoundcorkURL(config.soundcorkURL)
 			server.SetHTTPServerURL(config.httpsServerURL)
 			server.SetVersionInfo(version, commit, date)
 			server.SetDiscoverySettings(config.discoveryInterval, persisted.DiscoveryEnabled)
-			server.SetDNSSettings(persisted.DNSEnabled, persisted.DNSUpstream, persisted.DNSBindAddr)
+			server.SetDNSSettings(persisted.DNSEnabled, strings.Join(persisted.DNSUpstream, ","), persisted.DNSBindAddr)
+			server.SetSpotifyConfig(config.spotifyClientID, config.spotifyClientSecret, config.spotifyRedirectURI)
+			server.SetMgmtConfig(config.mgmtUsername, config.mgmtPassword)
+
+			if config.spotifyClientID != "" {
+				spotifyService := spotify.NewSpotifyService(
+					config.spotifyClientID,
+					config.spotifyClientSecret,
+					config.spotifyRedirectURI,
+					config.dataDir,
+				)
+				server.SetSpotifyService(spotifyService)
+
+				clientIDPrefix := config.spotifyClientID
+				if len(clientIDPrefix) > 8 {
+					clientIDPrefix = clientIDPrefix[:8]
+				}
+
+				log.Printf("Spotify service initialized (client ID: %s...)", clientIDPrefix)
+			}

 			// Load and set initial DNS discoveries
 			dnsDiscoveries, err := ds.LoadDNSDiscoveries()
@@ -298,6 +353,11 @@ type serviceConfig struct {
 	dnsBind              string
 	discoveryInterval    time.Duration
 	domains              []string
+	spotifyClientID      string
+	spotifyClientSecret  string
+	spotifyRedirectURI   string
+	mgmtUsername         string
+	mgmtPassword         string
 }

 func loadConfig(c *cli.Context) serviceConfig {
@@ -356,6 +416,12 @@ func loadConfig(c *cli.Context) serviceConfig {
 		discoveryInterval = 5 * time.Minute
 	}

+	spotifyClientID := c.String("spotify-client-id")
+	spotifyClientSecret := c.String("spotify-client-secret")
+	spotifyRedirectURI := c.String("spotify-redirect-uri")
+	mgmtUsername := c.String("mgmt-username")
+	mgmtPassword := c.String("mgmt-password")
+
 	return serviceConfig{
 		port:                 port,
 		bindAddr:             bindAddr,
@@ -374,6 +440,11 @@ func loadConfig(c *cli.Context) serviceConfig {
 		dnsBind:              dnsBind,
 		discoveryInterval:    discoveryInterval,
 		domains:              domains,
+		spotifyClientID:      spotifyClientID,
+		spotifyClientSecret:  spotifyClientSecret,
+		spotifyRedirectURI:   spotifyRedirectURI,
+		mgmtUsername:         mgmtUsername,
+		mgmtPassword:         mgmtPassword,
 	}
 }

@@ -436,8 +507,8 @@ func applyPersistedSettings(ds *datastore.DataStore, config *serviceConfig) data
 	config.enableSoundcorkProxy = persisted.EnableSoundcorkProxy

 	config.dnsEnabled = persisted.DNSEnabled
-	if persisted.DNSUpstream != "" {
-		config.dnsUpstream = persisted.DNSUpstream
+	if len(persisted.DNSUpstream) > 0 {
+		config.dnsUpstream = strings.Join(persisted.DNSUpstream, ",")
 	}

 	if persisted.DNSBindAddr != "" {
@@ -459,7 +530,7 @@ func createDefaultSettings(ds *datastore.DataStore, config serviceConfig) datast
 		DiscoveryEnabled:     true,
 		EnableSoundcorkProxy: config.enableSoundcorkProxy,
 		DNSEnabled:           config.dnsEnabled,
-		DNSUpstream:          config.dnsUpstream,
+		DNSUpstream:          strings.Split(config.dnsUpstream, ","),
 		DNSBindAddr:          config.dnsBind,
 		Shortcuts: map[string]int{
 			"/.well-known/appspecific/com.chrome.devtools.json": http.StatusNotFound,
@@ -586,6 +657,26 @@ func setupRouter(server *handlers.Server) *chi.Mux {
 		r.Post("/error", server.HandleErrorStats)
 	})

+	r.Route("/mgmt", func(r chi.Router) {
+		// Browser OAuth callback — no auth required (Spotify redirects the
+		// user's browser here directly). The authorization code is single-use,
+		// short-lived, and useless without the client_secret.
+		r.Get("/spotify/callback", server.HandleMgmtSpotifyCallback)
+
+		// All other management endpoints require Basic Auth.
+		r.Group(func(r chi.Router) {
+			r.Use(server.BasicAuthMgmt())
+			r.Get("/accounts/{accountId}/speakers", server.HandleMgmtListSpeakers)
+			r.Get("/devices/{deviceId}/events", server.HandleMgmtDeviceEvents)
+			r.Post("/spotify/init", server.HandleMgmtSpotifyInit)
+			r.Post("/spotify/confirm", server.HandleMgmtSpotifyConfirm)
+			r.Get("/spotify/accounts", server.HandleMgmtSpotifyAccounts)
+			r.Get("/spotify/token", server.HandleMgmtSpotifyToken)
+			r.Post("/spotify/entity", server.HandleMgmtSpotifyEntity)
+			r.Post("/spotify/prime", server.HandleMgmtPrimeDevice)
+		})
+	})
+
 	r.Get("/proxy/*", server.HandleProxyRequest)

 	r.Route("/setup", func(r chi.Router) {
@@ -596,19 +687,19 @@ func setupRouter(server *handlers.Server) *chi.Mux {
 		r.Get("/discovery-status", server.HandleGetDiscoveryStatus)
 		r.Get("/settings", server.HandleGetSettings)
 		r.Post("/settings", server.HandleUpdateSettings)
-		r.Get("/info/{deviceIP}", server.HandleGetDeviceInfo)
-		r.Get("/summary/{deviceIP}", server.HandleGetMigrationSummary)
-		r.Post("/migrate/{deviceIP}", server.HandleMigrateDevice)
-		r.Post("/revert/{deviceIP}", server.HandleRevertMigration)
-		r.Post("/reboot/{deviceIP}", server.HandleRebootDevice)
-		r.Post("/trust-ca/{deviceIP}", server.HandleTrustCACert)
-		r.Post("/ensure-remote-services/{deviceIP}", server.HandleEnsureRemoteServices)
-		r.Post("/remove-remote-services/{deviceIP}", server.HandleRemoveRemoteServices)
-		r.Post("/backup/{deviceIP}", server.HandleBackupConfig)
-		r.Post("/sync/{deviceIP}", server.HandleInitialSync)
-		r.Post("/test-connection/{deviceIP}", server.HandleTestConnection)
-		r.Post("/test-hosts/{deviceIP}", server.HandleTestHostsRedirection)
-		r.Post("/test-dns/{deviceIP}", server.HandleTestDNSRedirection)
+		r.Get("/info/{deviceId}", server.HandleGetDeviceInfo)
+		r.Get("/summary/{deviceId}", server.HandleGetMigrationSummary)
+		r.Post("/migrate/{deviceId}", server.HandleMigrateDevice)
+		r.Post("/revert/{deviceId}", server.HandleRevertMigration)
+		r.Post("/reboot/{deviceId}", server.HandleRebootDevice)
+		r.Post("/trust-ca/{deviceId}", server.HandleTrustCACert)
+		r.Post("/ensure-remote-services/{deviceId}", server.HandleEnsureRemoteServices)
+		r.Post("/remove-remote-services/{deviceId}", server.HandleRemoveRemoteServices)
+		r.Post("/backup/{deviceId}", server.HandleBackupConfig)
+		r.Post("/sync/{deviceId}", server.HandleInitialSync)
+		r.Post("/test-connection/{deviceId}", server.HandleTestConnection)
+		r.Post("/test-hosts/{deviceId}", server.HandleTestHostsRedirection)
+		r.Post("/test-dns/{deviceId}", server.HandleTestDNSRedirection)
 		r.Get("/ca.crt", server.HandleGetCACert)
 		r.Get("/proxy-settings", server.HandleGetProxySettings)
 		r.Post("/proxy-settings", server.HandleUpdateProxySettings)
@@ -621,6 +712,7 @@ func setupRouter(server *handlers.Server) *chi.Mux {
 		r.Delete("/interactions/sessions", server.HandleCleanupSessions)

 		r.Get("/dns-discoveries", server.HandleGetDNSDiscoveries)
+		r.Get("/dns-discoveries/download", server.HandleDownloadDNSDiscoveries)
 		r.Delete("/dns-discoveries", server.HandleClearDNSDiscoveries)

 		r.Get("/devices/{deviceId}/events", server.HandleGetDeviceEvents)
@@ -33,10 +33,15 @@
 * [Preset Management](reference/PRESET-MANAGEMENT.md)
 * [Source Selection](reference/SOURCE-SELECTION.md)
 * [Volume Controls](reference/VOLUME-CONTROLS.md)
+* [RadioBrowser](reference/radio-browser.md)
 * [Bass Controls](reference/BASS-CONTROLS.md)
 * [Key Controls](reference/KEY-CONTROLS.md)
 * [Feature Mapping](reference/FEATURE-MAPPING.md)

+## Concepts
+* [Spotify Priming Strategy](concepts/spotify-priming-strategy.md)
+* [Spotify OAuth](concepts/spotify-oauth.md)
+
 ## Analysis & Research
 * [API Coverage Analysis](analysis/API-COVERAGE.md)
 * [Supported URLs](analysis/SUPPORTED-URLS.md)
@@ -370,7 +370,7 @@ soundtouch-cli speaker beep
 **Go Client Usage:**
 ```go
 // Text-to-Speech
-client.PlayTTS("Hello World", "your-app-key", 70)
+client.PlayTTS("Hello World", "your-app-key", "EN", 70)

 // URL content
 client.PlayURL("https://example.com/audio.mp3", "your-app-key", "Service", "Message", "Reason", 60)
@@ -1044,4 +1044,4 @@ The SoundTouch Plus Wiki provides comprehensive documentation for **64 additiona

 This documentation provides the complete foundation for implementing all endpoints from the SoundTouch Plus Wiki, enabling this Go library to become the definitive SoundTouch integration solution for everything from basic home automation to professional audio installations.

-*All examples and XML structures are verified against real SoundTouch hardware and extensively tested by the SoundTouch Plus community.*
+*All examples and XML structures are verified against real SoundTouch hardware and extensively tested by the SoundTouch Plus community.*
@@ -0,0 +1,137 @@
+# Spotify OAuth Integration
+
+The SoundTouch service supports Spotify OAuth integration to broker access tokens for SoundTouch speakers. This is particularly useful for maintaining Spotify Connect functionality after the Bose cloud shutdown (scheduled for May 2026).
+
+## OAuth Flows
+
+The service supports two primary OAuth flows: a browser-based flow and a mobile app-based flow (specifically for the [ueberboese](https://github.com/julius-d/ueberboese-app) app).
+
+### 1. Browser-based Flow
+
+The user initiates the flow, completes authorization in their browser, and is redirected back to the service.
+
+```mermaid
+sequenceDiagram
+    participant Client as Client (curl/app)
+    participant Service as Service
+    participant Spotify as Spotify Auth Server
+    participant Browser as User's Browser
+
+    Client->>Service: POST /mgmt/spotify/init [Basic Auth]
+    Service-->>Client: {"redirectUrl": "https://accounts.spotify.com/authorize?..."}
+    
+    Client->>Browser: User opens URL
+    Browser->>Spotify: User logs in & grants access
+    Spotify-->>Browser: Redirect to /mgmt/spotify/callback?code=abc
+    
+    Browser->>Service: GET /mgmt/spotify/callback?code=abc
+    Note over Service: No auth needed for callback
+    
+    Service->>Spotify: POST /api/token (exchange code)
+    Spotify-->>Service: {access_token, refresh_token}
+    
+    Service->>Spotify: GET /v1/me (fetch profile)
+    Spotify-->>Service: {id, display_name, email}
+    
+    Note over Service: Store account to disk
+    
+    Service-->>Browser: HTML: "Spotify Connected. You can close this window."
+```
+
+### 2. Mobile App Flow (ueberboese)
+
+The mobile app handles the redirect via a deep link and then confirms the authorization with the service.
+
+```mermaid
+sequenceDiagram
+    participant App as ueberboese Flutter App
+    participant Service as Service
+    participant Spotify as Spotify Auth Server
+
+    App->>Service: POST /mgmt/spotify/init [Basic Auth]
+    Service-->>App: {"redirectUrl": "https://..."}
+    
+    App->>Spotify: Open in-app browser (User authorizes)
+    Spotify-->>App: Deep link redirect: ueberboese-login://spotify?code=abc
+    
+    App->>Service: POST /mgmt/spotify/confirm?code=abc [Basic Auth]
+    
+    Service->>Spotify: POST /api/token (exchange code)
+    Spotify-->>Service: {access_token, refresh_token}
+    
+    Service->>Spotify: GET /v1/me (fetch profile)
+    Spotify-->>Service: {profile}
+    
+    Service-->>App: {"ok": true}
+```
+
+### 3. Token Retrieval (Boot Primer / Speaker Setup)
+
+Once an account is linked, access tokens can be retrieved for use with speakers (e.g., via the `addUser` ZeroConf command).
+
+```mermaid
+sequenceDiagram
+    participant Primer as Boot Primer Script
+    participant Service as Service
+    participant Spotify as Spotify Token API
+    participant Speaker as Speaker (Bose ST 20)
+
+    Primer->>Service: GET /mgmt/spotify/token [Basic Auth]
+    
+    alt Token expired
+        Service->>Spotify: POST /api/token (refresh)
+        Spotify-->>Service: new tokens
+    end
+    
+    Service-->>Primer: {"access_token": "...", "username": "..."}
+    
+    Note over Primer: Spotify Connect ZeroConf
+    Primer->>Speaker: POST /SpotifyConnect (addUser with token)
+    Speaker-->>Primer: OK
+    Note over Speaker: Speaker now has Spotify access
+```
+
+## Boot Primer Script
+
+A boot primer script that uses these endpoints to feed Spotify tokens to speakers via ZeroConf is available in the `scripts/spotify/` directory: [spotify-boot-primer.sh](../../scripts/spotify/spotify-boot-primer.sh).
+
+This script can be installed on the speaker itself (which runs embedded Linux) to automatically prime Spotify Connect at boot time. See [README.md](../../scripts/spotify/README.md) and [INSTALL.md](../../scripts/spotify/INSTALL.md) for instructions.
+
+### Automated Installation via Service
+
+The SoundTouch service provides a dedicated management endpoint to automatically handle the installation of the Spotify boot primer on the speaker:
+`POST /mgmt/devices/{deviceId}/spotify/install-primer`
+
+### Automated Installation Steps
+When you run the Spotify primer installation, the service performs the following:
+1.  **Directories**: Creates `/mnt/nv/bin` and `/mnt/nv/BoseApp-Persistence/1` on the speaker.
+2.  **Binary**: Uploads the `spotify-boot-primer` script to the speaker.
+3.  **Configuration**: Automatically generates and uploads `spotify-primer.conf` containing the service's URL and management credentials.
+4.  **Boot Hook**: Injects a call to the primer in the speaker's `/mnt/nv/rc.local` using idempotent markers.
+5.  **Environment**: Updates `/mnt/nv/.profile` to include `/mnt/nv/bin` in the `PATH` for easier manual troubleshooting via SSH.
+
+- **Idempotent Patching**: The service uses explicit markers to inject the hook, ensuring it doesn't corrupt existing content.
+- **Coexistence**: The service-injected hook is designed to coexist with a manually installed `rc.local` (e.g., from the community gist). It only adds a call to `/mnt/nv/bin/spotify-boot-primer` if it's not already managed by a service-controlled block.
+- **Markers**: Look for the following markers in your speaker's `/mnt/nv/rc.local`:
+  - `# --- Aftertouch Spotify hook START ---`
+  - `# --- Aftertouch Spotify hook END ---`
+- **Cleanup**: Reverting a migration via the service will cleanly remove these marker-delimited blocks.
+
+## Endpoints
+
+| Method | Path                                              | Auth  | Purpose                                                               |
+|--------|---------------------------------------------------|-------|-----------------------------------------------------------------------|
+| POST   | `/mgmt/devices/{deviceId}/spotify/install-primer` | Basic | Install Spotify boot primer on speaker (deviceId or IP)               |
+| GET    | `/mgmt/spotify/callback`                          | None  | Browser OAuth callback (redirect from Spotify, returns HTML)          |
+| POST   | `/mgmt/spotify/init`                              | Basic | Start OAuth flow, returns authorization URL                           |
+| POST   | `/mgmt/spotify/confirm`                           | Basic | Mobile app confirm (ueberboese deep link delivers code, returns JSON) |
+| GET    | `/mgmt/spotify/accounts`                          | Basic | List linked Spotify accounts (tokens stripped)                        |
+| GET    | `/mgmt/spotify/token`                             | Basic | Get fresh access token (auto-refreshes if expired)                    |
+| POST   | `/mgmt/spotify/entity`                            | Basic | Resolve Spotify URI to name + image URL                               |
+
+## Security
+
+- `/mgmt/spotify/callback` is intentionally outside Basic Auth to allow direct redirects from Spotify's authorization server.
+- All other `/mgmt/*` endpoints require Basic Auth as configured by `--mgmt-username` and `--mgmt-password`.
+- Tokens are persisted to disk as JSON with restricted file permissions (`0600`).
+- The `GetAccounts` endpoint strips sensitive tokens from the response.
@@ -0,0 +1,84 @@
+# Spotify Priming Strategy
+
+This document outlines the strategy for ensuring Bose SoundTouch devices are correctly "primed" for Spotify Connect integration within the AfterTouch ecosystem.
+
+## Overview
+
+To enable Spotify Connect for SoundTouch devices, especially for remote availability outside the local network, the speaker must be associated with a Spotify account via a process called "priming." This involves sending an `addUser` command to the speaker's ZeroConf API (port 8200) containing a valid Spotify username and OAuth access token.
+
+AfterTouch adopts a **Server-Centric Hybrid Model** that prioritizes device cleanliness and user intent while providing automated self-healing.
+
+## Core Principles
+
+### 1. User Intent (Opt-in)
+AfterTouch replicates the native Bose "Add Source" experience. No Spotify priming occurs until a user explicitly links their Spotify account through the AfterTouch Management Dashboard. This ensures privacy and respects users who do not wish to use Spotify.
+
+### 2. Device Cleanliness (Minimalist Footprint)
+We avoid invasive modifications to the speaker's filesystem. 
+- **No On-Device Scripts:** We deprecate the use of internal boot-primer scripts.
+- **Native Communication:** We rely on the speaker's native ability to talk to Bose services, which are intercepted via DNS to point to the AfterTouch server.
+
+### 3. Triggers for Priming
+Priming is triggered when the speaker signals it is active and ready, specifically:
+
+- **Power On:** When the speaker calls the `/marge/streaming/support/power_on` endpoint, AfterTouch ensures the device's ZeroConf state is correctly primed. This is the primary trigger.
+- **Manual Override:** Users can manually trigger a "Prime Spotify" from the device list in the UI if needed.
+
+During any of these events, the server:
+1. Checks if a Spotify account is linked in AfterTouch.
+2. Checks the device's current priming status (via ZeroConf).
+3. If unprimed and an account is linked, it pushes the priming command.
+
+### 4. Automated Recovery
+AfterTouch ensures that if a speaker loses its session (due to a crash or power loss), it is re-primed when it next powers on and reaches out to the service.
+
+### 5. Decoupling
+The logic for account management and device interaction remains decoupled:
+- **Spotify Service:** Manages OAuth tokens and account state.
+- **Discovery Service:** Finds devices and tracks their network presence.
+- **Orchestrator:** Connects the two, deciding when to push tokens to discovered devices based on the current link status.
+
+## Workflow
+
+### Initial Setup (The "Add Source" UX)
+1. User opens the AfterTouch Dashboard.
+2. User selects "Link Spotify Account."
+3. OAuth flow completes; AfterTouch stores the token.
+4. AfterTouch immediately triggers a discovery run to find and prime all compatible speakers.
+
+### Maintenance (The "Watchdog" UX)
+1. A speaker reboots or loses its token.
+2. A discovery event occurs (periodic or triggered by UI).
+3. AfterTouch detects the "Empty" user state on the speaker.
+4. AfterTouch pushes a fresh token from the Spotify Service.
+5. UI reflects that the device is "Managed by AfterTouch" and healthy.
+
+### Manual Override
+Users can manually trigger a "Re-prime" or "Refresh Link" from the device list in the UI if they suspect the automated self-healing is delayed or if they want to force a specific account onto a device.
+
+## Network Topology & Deployment Scenarios
+
+The strategy adapts based on where the AfterTouch server is deployed:
+
+### Local Deployment (Home Server / Docker)
+- **Mechanism:** Both "Pull" (Marge) and "Push" (ZeroConf side-channel) are used.
+- **Advantage:** The server can proactively fix the speaker's state via port 8200 as soon as it sees a "Liveness Signal."
+
+### External Deployment (Cloud VPS)
+- **Mechanism:** Primarily relies on "Pull" (Marge).
+- **Constraint:** The server cannot reach port 8200 on the speaker due to NAT/Firewall.
+- **Strategy:** In this scenario, AfterTouch acts as a passive token provider. The speaker must initiate the connection to our intercepted Bose endpoints to receive its Spotify configuration. If the speaker completely loses its user state and stops "pulling," a manual re-prime from a local machine or a temporary local discovery run might be required.
+
+## Transition & Cleanup
+
+As AfterTouch moves to the Server-Centric model, we will:
+1.  **Revert On-Device Migration:** Update the Setup Manager to remove legacy `spotify-boot-primer` scripts and `rc.local` hooks from the speakers.
+2.  **Consolidated Directory:** We maintain the `/mnt/nv/soundtouch-service/` base directory for other configuration needs (e.g., `aftertouch.resolv.conf`), but it will no longer contain Spotify-specific credentials or scripts.
+3.  **No On-Device Credentials:** The `/mnt/nv/soundtouch-service/spotify-primer.conf` will be removed, ensuring that no sensitive AfterTouch login details are stored on the speaker in plain text.
+
+## Implementation Roadmap (Conceptual)
+
+1. **Revert On-Device Migration:** Update the Setup Manager to remove legacy scripts and `rc.local` hooks.
+2. **Server-Side Priming Logic:** Implement a `PrimeDevice(ip)` method in the server that fetches a fresh token and calls the ZeroConf API.
+3. **Discovery Hook:** Integrate `PrimeDevice` into the discovery handler (`handleDiscoveredDevice`) with a check for unprimed state.
+4. **UI Enhancements:** Update the Speaker List to show "Spotify Linked" status and provide manual refresh buttons.
@@ -241,21 +241,54 @@ curl "http://192.168.1.100:8090/presets"
 curl "http://localhost:8000/events/192.168.1.100"
 ```

-#### ResolvConf Migration (DNS Redirection)
+#### ResolvConf Migration (DHCP-Aware DNS Redirection)

-The most robust migration method. Instead of modifying specific host files, it configures the device to use the AfterTouch service as its primary DNS server.
+The most robust and flexible DNS-based migration method. It utilizes the device's persistent `/mnt/nv/rc.local` script to inject a priority DNS hook into the system's DHCP configuration.

 > **Note**: This method requires the DNS Discovery Server to be bound to **port 53** on your local IP and **actually running**. Most devices do not support custom DNS ports in `/etc/resolv.conf`. If you use a custom port for testing, remember to switch back to `:53` and ensure the server has successfully bound to it (check Settings for status) before the actual migration.

 **Advantages:**
 - **Discovery**: Automatically discover all Bose endpoints queried by the device.
 - **Dynamic Interception**: Intercept new or unknown services without further device modifications.
- **Fail-Safe**: Can fall back to upstream DNS for non-intercepted queries.
+- **Fail-Safe**: Falls back to the standard network DNS (provided by your router) if the Aftertouch service is unavailable.
+- **DHCP Compatible**: Preserves your router's assigned search domain and secondary DNS servers.
+- **Wildcard Support**: Seamlessly handles `*.bose.com` redirection via your local DNS server.
+- **Persistent**: Survives reboots and DHCP renewals.
+
+**How it works:**
+1. **Configuration**: A custom file named `/mnt/nv/aftertouch.resolv.conf` is created on the device's persistent partition.
+2. **Boot Hook**: On every boot, `/mnt/nv/rc.local` checks if the system's DHCP scripts (`/etc/udhcpc.d/50default` or `/opt/Bose/udhcpc.script`) have been patched.
+3. **Surgical Patch**: If not patched, it injects a one-line check into the relevant DHCP scripts.
+4. **Resolution**: Whenever the device acquires a DHCP lease, the scripts now read your `aftertouch.resolv.conf` first, placing your DNS server at the top of `/etc/resolv.conf` while keeping all other DHCP-provided settings.

 **Setup:**
-1. Enable DNS discovery in the service settings.
-2. Select the `resolv` method when migrating a device.
-3. The service will automatically make `/etc/resolv.conf` immutable (`chattr +i`) to prevent DHCP overrides.
+1. Enable SSH via the `remote_services` USB trick.
+2. Create `/mnt/nv/aftertouch.resolv.conf` with your server details:
+   ```text
+   # Created by Aftertouch/SoundTouch-Service
+   # Priority nameserver for Bose service redirection
+   nameserver 192.168.1.XXX
+   ```
+3. Update `/mnt/nv/rc.local` with the idempotent patch:
+   ```sh
+   #!/bin/sh
+   # Aftertouch DNS hook: prioritizes our custom nameserver if it exists
+   HOOK_MARKER="/mnt/nv/aftertouch.resolv.conf"
+   if [ -f "$HOOK_MARKER" ]; then
+       # Patch 50default if it exists
+       TARGET_FILE="/etc/udhcpc.d/50default"
+       if [ -f "$TARGET_FILE" ] && ! grep -q "$HOOK_MARKER" "$TARGET_FILE"; then
+           sed -i '/echo "search \$domain"/a \        [ -f '"$HOOK_MARKER"' ] && cat '"$HOOK_MARKER"' && dns=""' "$TARGET_FILE"
+       fi
+       # Patch udhcpc.script if it exists (e.g. SoundTouch 10)
+       TARGET_SCRIPT="/opt/Bose/udhcpc.script"
+       if [ -f "$TARGET_SCRIPT" ] && ! grep -q "$HOOK_MARKER" "$TARGET_SCRIPT"; then
+           sed -i '/echo "search \$search_list # \$interface" >> \$RESOLV_CONF/a \                [ -f '"$HOOK_MARKER"' ] && cat '"$HOOK_MARKER"' >> '"\$RESOLV_CONF"' && dns=""' "$TARGET_SCRIPT"
+       fi
+   fi
+   ```
+4. Make the script executable: `chmod +x /mnt/nv/rc.local`.
+5. Reboot the speaker.

 ### DNS Discovery Server

@@ -272,7 +305,7 @@ When enabled, the DNS server:
 You can enable and configure the DNS server via the Web UI or environment variables:
 - `ENABLE_DNS_DISCOVERY=true`: Turns on the DNS server.
 - `DNS_BIND_ADDR=:53`: The port to listen on (requires root privileges for port 53).
- `DNS_UPSTREAM=1.1.1.1`: Your preferred upstream DNS provider.
+- `DNS_UPSTREAM=1.1.1.1`: Your preferred upstream DNS provider. **Note:** Ensure this is not set to the same address as the DNS server itself (loopback or local IP) to avoid forwarding loops. The server includes built-in loop prevention, but misconfiguration will cause forwarding to fail. DNS Discovery cannot be enabled if this setting is empty.

 #### Manual Discovery via DNS
 Even without migrating a device, you can use the DNS server to discover what a device is querying by manually setting your router's DNS or the device's DNS to point to the AfterTouch service.
@@ -43,7 +43,7 @@ To migrate your speakers, the service needs SSH access. You can enable it by:
 3. Rebooting the speaker (unplug/replug).

 **Verify SSH Access:**
- Confirm the device responds to SSH without a password: `ssh -oHostKeyAlgorithms=+ssh-rsa root@<IP>`
+- Confirm the device responds to SSH without a password: `ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa root@<IP>`
 - Or use the **Migration** tab in the Web UI to see if the device shows a "✅ Success" status for SSH.
 Once enabled, you can log in as `root` (no password).

@@ -38,6 +38,7 @@ The Bose SoundTouch Go client provides comprehensive source selection functional
 - `IHEARTRADIO` - iHeartRadio streaming
 - `STORED_MUSIC` - Local/network stored music
 - `AIRPLAY` - Apple AirPlay (device dependent)
+- `RADIO_BROWSER` - [RadioBrowser](radio-browser.md) internet radio directory

 ## Client Library Usage

@@ -68,14 +68,14 @@ func main() {
    
    client := client.NewClient(config)
    
-    // Play TTS at current volume
-    err := client.PlayTTS("Hello, this is a test message", "YOUR_APP_KEY")
+    // Play TTS at current volume (language code "EN", "DE", etc.)
+    err := client.PlayTTS("Hello, this is a test message", "YOUR_APP_KEY", "EN")
    if err != nil {
        log.Fatal(err)
    }
    
    // Play TTS at specific volume (70)
-    err = client.PlayTTS("Volume test message", "YOUR_APP_KEY", 70)
+    err = client.PlayTTS("Volume test message", "YOUR_APP_KEY", "EN", 70)
    if err != nil {
        log.Fatal(err)
    }
@@ -277,7 +277,7 @@ You'll need to provide your own application key. The format and generation metho

 ```go
 // Doorbell notification
-client.PlayTTS("Someone is at the front door", "home-automation-key", 80)
+client.PlayTTS("Someone is at the front door", "home-automation-key", "EN", 80)

 // Security alert
 client.PlayURL(
@@ -311,4 +311,4 @@ soundtouch-cli speaker url --url "https://www.soundjay.com/misc/sounds/bell-ring
 4. **URL content fails**: Ensure URL is accessible and contains valid audio
 5. **Volume not restored**: May occur if device is powered off during playback

-For more information, see the [SoundTouch WebServices API documentation](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API).
+For more information, see the [SoundTouch WebServices API documentation](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API).
@@ -0,0 +1,34 @@
+## radio-browser.info
+
+- https://www.radio-browser.info is a community driven radio station database.
+- It provides an API to access the data and allows users to submit new stations or update existing ones.
+
+### Search for stations
+
+- Go to https://www.radio-browser.info and find a station you like.
+- Click on the station and copy the UUID from the URL.
+- e.g. `https://www.radio-browser.info/history/d28420a4-eccf-47a2-ace1-088c7e7cb7e0`
+
+### RADIO_BROWSER
+
+- This project supports source type RADIO_BROWSER to play radio stations.
+- Set the `location` attribute to `/stations/byuuid/{UUID}`.
+
+```xml
+<ContentItem
+  source="RADIO_BROWSER"
+  type="stationurl"
+  isPresetable="true"
+  location="/stations/byuuid/9610c454-0601-11e8-ae97-52543be04c81">
+  <itemName>RADIO_BROWSER</itemName>
+  <containerArt></containerArt>
+</ContentItem>
+```
+
+### Playing the station
+
+To start the radio stream replace `<uuid>` and `<soundtouch>` and run curl like this:
+
+```bash
+curl -d '<ContentItem source="RADIO_BROWSER" type="stationurl" location="/stations/byuuid/<uuid>"/>' <soundtouch>:8090/select
+```
@@ -6,6 +6,7 @@ require (
 	github.com/go-chi/chi/v5 v5.2.5
 	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/mdns v1.0.6
+	github.com/miekg/dns v1.1.72
 	github.com/russross/blackfriday/v2 v2.1.0
 	github.com/urfave/cli/v2 v2.27.7
 	golang.org/x/crypto v0.48.0
@@ -13,7 +14,6 @@ require (

 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/miekg/dns v1.1.72 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	golang.org/x/mod v0.33.0 // indirect
 	golang.org/x/net v0.50.0 // indirect
@@ -1769,8 +1769,8 @@ func (c *Client) hasCapability(capabilities *models.Capabilities, capability str
 }

 // PlayTTS plays a Text-To-Speech message using Google TTS on the speaker
-func (c *Client) PlayTTS(text, appKey string, volume ...int) error {
-	playInfo := models.NewTTSPlayInfo(text, appKey, volume...)
+func (c *Client) PlayTTS(text, appKey, language string, volume ...int) error {
+	playInfo := models.NewTTSPlayInfo(text, appKey, language, volume...)

 	if err := playInfo.Validate(); err != nil {
 		return fmt.Errorf("invalid TTS request: %w", err)
@@ -4,6 +4,7 @@ package discovery
 import (
 	"fmt"
 	"log"
+	"net"
 	"strings"
 	"sync"
 	"time"
@@ -14,7 +15,7 @@ import (
 // DNSDiscovery handles DNS queries and records discovered hosts.
 type DNSDiscovery struct {
 	// Configuration
-	upstreamDNS string
+	upstreamDNS []string
 	serviceIP   string

 	// State
@@ -27,6 +28,13 @@ type DNSDiscovery struct {
 	// Servers for Shutdown
 	udpServer *dns.Server
 	tcpServer *dns.Server
+
+	// Address for loop prevention
+	bindAddr string
+
+	// Log throttling
+	lastLog   map[string]time.Time
+	lastLogMu sync.Mutex
 }

 // DiscoveredHost represents a host discovered via DNS queries.
@@ -41,11 +49,12 @@ type DiscoveredHost struct {
 }

 // NewDNSDiscovery creates a new DNSDiscovery instance.
-func NewDNSDiscovery(upstreamDNS, serviceIP string) *DNSDiscovery {
+func NewDNSDiscovery(upstreamDNS []string, serviceIP string) *DNSDiscovery {
 	return &DNSDiscovery{
 		upstreamDNS: upstreamDNS,
 		serviceIP:   serviceIP,
 		discovered:  make(map[string]*DiscoveredHost),
+		lastLog:     make(map[string]time.Time),
 	}
 }

@@ -72,14 +81,38 @@ func (d *DNSDiscovery) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 	if isIntercepted {
 		// Return your service IP
 		d.respondWithIP(w, r, d.serviceIP)
-		log.Printf("[DNS] Intercepting %s (type %d) -> %s", hostname, q.Qtype, d.serviceIP)
+		d.throttledLog(fmt.Sprintf("[DNS] Intercepting %s (type %d) -> %s", hostname, q.Qtype, d.serviceIP))
 	} else {
 		// Forward to real DNS
-		log.Printf("[DNS] Forwarding %s (type %d) to %s", hostname, q.Qtype, d.upstreamDNS)
+		if len(d.upstreamDNS) == 0 {
+			d.throttledLog("[DNS ERROR] No upstream DNS configured, cannot forward")
+
+			m := new(dns.Msg)
+			m.SetReply(r)
+			m.Rcode = dns.RcodeServerFailure
+			_ = w.WriteMsg(m)
+
+			return
+		}
+
+		d.throttledLog(fmt.Sprintf("[DNS] Forwarding %s (type %d) to %v", hostname, q.Qtype, d.upstreamDNS))
 		d.forward(w, r)
 	}
 }

+func (d *DNSDiscovery) throttledLog(msg string) {
+	d.lastLogMu.Lock()
+	defer d.lastLogMu.Unlock()
+
+	now := time.Now()
+	if last, ok := d.lastLog[msg]; ok && now.Sub(last) < 10*time.Second {
+		return
+	}
+
+	d.lastLog[msg] = now
+	log.Print(msg)
+}
+
 // recordQuery logs a DNS query and updates the internal state.
 func (d *DNSDiscovery) recordQuery(hostname string, isIntercepted bool, remoteAddr string) {
 	d.mu.Lock()
@@ -123,13 +156,17 @@ func (d *DNSDiscovery) shouldIntercept(hostname string) bool {
 		"marge.bose.com",
 		"bmx.bose.com",
 		"streaming.bose.com",
+		"streamingoauth.bose.com",
 		"updates.bose.com",
 		"stats.bose.com",
 		"content.api.bose.io",
 		"events.api.bosecm.com",
 		"bose-prod.apigee.net",
+		"bose-test.apigee.net",
 		"worldwide.bose.com",
 		"music.api.bose.com",
+		"bosecm.com",
+		"bose.io",
 	}

 	for _, service := range interceptList {
@@ -156,19 +193,78 @@ func (d *DNSDiscovery) respondWithIP(w dns.ResponseWriter, r *dns.Msg, ip string
 	q := r.Question[0]
 	log.Printf("[DNS] Intercepted query for %s (type %d) from %s", q.Name, q.Qtype, w.RemoteAddr())

+	resolvedIP := ip
+	if net.ParseIP(ip) == nil {
+		// Attempt resolution if it's not a numeric IP
+		ips, err := net.LookupIP(ip)
+		if err == nil && len(ips) > 0 {
+			for _, rIP := range ips {
+				if rIP.To4() != nil {
+					resolvedIP = rIP.String()
+					break
+				}
+			}
+
+			if resolvedIP == ip && len(ips) > 0 {
+				resolvedIP = ips[0].String()
+			}
+		}
+	}
+
 	switch q.Qtype {
 	case dns.TypeA, dns.TypeANY:
-		rr, err := dns.NewRR(fmt.Sprintf("%s 60 IN A %s", q.Name, ip))
-		if err == nil {
-			m.Answer = append(m.Answer, rr)
+		if net.ParseIP(resolvedIP) == nil || strings.Contains(resolvedIP, ":") {
+			// If it's still not a valid IPv4 address, we can't create an A record.
+			// Try CNAME as a fallback if it looks like a hostname.
+			if !strings.Contains(resolvedIP, ":") {
+				// Normalize hostname for CNAME
+				target := resolvedIP
+				if !strings.HasSuffix(target, ".") {
+					target += "."
+				}

-			log.Printf("[DNS] Returning A record %s -> %s", q.Name, ip)
+				rr, err := dns.NewRR(fmt.Sprintf("%s 60 IN CNAME %s", q.Name, target))
+				if err == nil {
+					m.Answer = append(m.Answer, rr)
+
+					log.Printf("[DNS] Returning CNAME record %s -> %s", q.Name, target)
+				} else {
+					log.Printf("[DNS] Error creating CNAME fallback for %s: %v", target, err)
+
+					m.Rcode = dns.RcodeServerFailure
+				}
+			} else {
+				m.Rcode = dns.RcodeServerFailure
+			}
 		} else {
-			log.Printf("[DNS] Error creating A record: %v", err)
+			rr, err := dns.NewRR(fmt.Sprintf("%s 60 IN A %s", q.Name, resolvedIP))
+			if err == nil {
+				m.Answer = append(m.Answer, rr)
+
+				log.Printf("[DNS] Returning A record %s -> %s", q.Name, resolvedIP)
+			} else {
+				log.Printf("[DNS] Error creating A record for %s: %v", resolvedIP, err)
+
+				m.Rcode = dns.RcodeServerFailure
+			}
 		}
 	case dns.TypeAAAA:
-		// Explicitly return SUCCESS with no data for AAAA to prevent fallback issues
-		log.Printf("[DNS] Returning empty AAAA success (NODATA) for %s", q.Name)
+		// Check if we have an IPv6 address
+		if net.ParseIP(resolvedIP) != nil && strings.Contains(resolvedIP, ":") {
+			rr, err := dns.NewRR(fmt.Sprintf("%s 60 IN AAAA %s", q.Name, resolvedIP))
+			if err == nil {
+				m.Answer = append(m.Answer, rr)
+
+				log.Printf("[DNS] Returning AAAA record %s -> %s", q.Name, resolvedIP)
+			} else {
+				log.Printf("[DNS] Error creating AAAA record for %s: %v", resolvedIP, err)
+
+				m.Rcode = dns.RcodeServerFailure
+			}
+		} else {
+			// Explicitly return SUCCESS with no data for AAAA to prevent fallback issues if no IPv6
+			log.Printf("[DNS] Returning empty AAAA success (NODATA) for %s", q.Name)
+		}
 	default:
 		log.Printf("[DNS] Returning empty success for type %d", q.Qtype)
 	}
@@ -183,8 +279,10 @@ func (d *DNSDiscovery) forward(w dns.ResponseWriter, r *dns.Msg) {
 		return
 	}

+	q := r.Question[0]
+
 	// Don't forward PTR queries for our own service IP to avoid loops or slow timeouts
-	if r.Question[0].Qtype == dns.TypePTR {
+	if q.Qtype == dns.TypePTR {
 		m := new(dns.Msg)
 		m.SetReply(r)

@@ -197,29 +295,43 @@ func (d *DNSDiscovery) forward(w dns.ResponseWriter, r *dns.Msg) {
 	}

 	c := new(dns.Client)
-	// Add port 53 if not present
-	upstream := d.upstreamDNS
-	if !strings.Contains(upstream, ":") {
-		upstream += ":53"
-	}
+	c.Timeout = 2 * time.Second

-	in, _, err := c.Exchange(r, upstream)
-	if err != nil {
-		log.Printf("[DNS ERROR] Forward failed for %s (type %d): %v", r.Question[0].Name, r.Question[0].Qtype, err)
-		// Return a failure response instead of just dropping
-		m := new(dns.Msg)
-		m.SetReply(r)
-
-		m.Rcode = dns.RcodeServerFailure
-		if err := w.WriteMsg(m); err != nil {
-			log.Printf("[DNS ERROR] Failed to write failure response: %v", err)
+	for _, upstream := range d.upstreamDNS {
+		// Add port 53 if not present
+		if !strings.Contains(upstream, ":") {
+			upstream += ":53"
 		}

-		return
+		// Loop prevention: don't forward to ourselves
+		if upstream == d.bindAddr || (strings.HasPrefix(upstream, "127.0.0.1:") && strings.HasSuffix(d.bindAddr, upstream[9:])) {
+			d.throttledLog(fmt.Sprintf("[DNS ERROR] Refusing to forward %s to ourselves (%s)", q.Name, upstream))
+			continue
+		}
+
+		in, _, err := c.Exchange(r, upstream)
+		if err == nil {
+			if in.Rcode == dns.RcodeSuccess {
+				if writeErr := w.WriteMsg(in); writeErr != nil {
+					log.Printf("[DNS ERROR] Failed to write forwarded response from %s: %v", upstream, writeErr)
+				}
+
+				return
+			}
+
+			d.throttledLog(fmt.Sprintf("[DNS] Upstream %s returned %s for %s, trying next", upstream, dns.RcodeToString[in.Rcode], q.Name))
+		} else {
+			d.throttledLog(fmt.Sprintf("[DNS ERROR] Forward failed for %s (type %d) via %s: %v", q.Name, q.Qtype, upstream, err))
+		}
 	}

-	if err := w.WriteMsg(in); err != nil {
-		log.Printf("[DNS ERROR] Failed to write forwarded response: %v", err)
+	// If we reach here, all upstreams failed
+	m := new(dns.Msg)
+	m.SetReply(r)
+	m.Rcode = dns.RcodeServerFailure
+
+	if err := w.WriteMsg(m); err != nil {
+		log.Printf("[DNS ERROR] Failed to write failure response: %v", err)
 	}
 }

@@ -267,6 +379,7 @@ func (d *DNSDiscovery) Start(addr string) error {
 	mux.HandleFunc(".", d.ServeDNS)

 	d.mu.Lock()
+	d.bindAddr = addr
 	d.udpServer = &dns.Server{
 		Addr:    addr,
 		Net:     "udp",
@@ -278,6 +391,10 @@ func (d *DNSDiscovery) Start(addr string) error {
 		Net:     "tcp",
 		Handler: mux,
 	}
+
+	// Capture server references before releasing mutex to avoid race condition
+	udpServer := d.udpServer
+	tcpServer := d.tcpServer
 	d.mu.Unlock()

 	errChan := make(chan error, 2)
@@ -285,7 +402,7 @@ func (d *DNSDiscovery) Start(addr string) error {
 	go func() {
 		log.Printf("[DNS] UDP Discovery server starting on %s", addr)

-		if err := d.udpServer.ListenAndServe(); err != nil {
+		if err := udpServer.ListenAndServe(); err != nil {
 			errChan <- fmt.Errorf("UDP server failed: %w", err)
 		}
 	}()
@@ -293,7 +410,7 @@ func (d *DNSDiscovery) Start(addr string) error {
 	go func() {
 		log.Printf("[DNS] TCP Discovery server starting on %s", addr)

-		if err := d.tcpServer.ListenAndServe(); err != nil {
+		if err := tcpServer.ListenAndServe(); err != nil {
 			errChan <- fmt.Errorf("TCP server failed: %w", err)
 		}
 	}()
@@ -1,7 +1,9 @@
 package discovery

 import (
+	"log"
 	"net"
+	"strings"
 	"testing"
 	"time"

@@ -10,7 +12,7 @@ import (

 func TestDNSDiscovery_Interception(t *testing.T) {
 	serviceIP := "192.168.1.100"
-	upstreamDNS := "8.8.8.8"
+	upstreamDNS := []string{"8.8.8.8"}
 	d := NewDNSDiscovery(upstreamDNS, serviceIP)

 	// Test intercepting Bose service
@@ -36,6 +38,24 @@ func TestDNSDiscovery_Interception(t *testing.T) {
 		t.Errorf("Expected A record, got %T", rw.msg.Answer[0])
 	}

+	// Test intercepting streamingoauth.bose.com
+	m3 := new(dns.Msg)
+	m3.SetQuestion("streamingoauth.bose.com.", dns.TypeA)
+	rw3 := &mockResponseWriter{}
+	d.ServeDNS(rw3, m3)
+
+	if rw3.msg == nil || len(rw3.msg.Answer) == 0 {
+		t.Fatal("Expected response for streamingoauth.bose.com")
+	}
+
+	if a, ok := rw3.msg.Answer[0].(*dns.A); ok {
+		if a.A.String() != serviceIP {
+			t.Errorf("Expected intercepted IP %s for streamingoauth.bose.com, got %s", serviceIP, a.A.String())
+		}
+	} else {
+		t.Errorf("Expected A record for streamingoauth.bose.com, got %T", rw3.msg.Answer[0])
+	}
+
 	// Test aftertouch.test
 	m2 := new(dns.Msg)
 	m2.SetQuestion("aftertouch.test.", dns.TypeA)
@@ -59,7 +79,7 @@ func TestDNSDiscovery_Forwarding(t *testing.T) {
 	// This test is harder because it needs a real upstream or a mock.
 	// For now, let's just test that it calls forward and record.
 	serviceIP := "192.168.1.100"
-	upstreamDNS := "127.0.0.1:5353" // Use a port that is likely closed or we can mock
+	upstreamDNS := []string{"127.0.0.1:5353"} // Use a port that is likely closed or we can mock
 	d := NewDNSDiscovery(upstreamDNS, serviceIP)

 	m := new(dns.Msg)
@@ -100,7 +120,7 @@ func TestDNSDiscovery_Forwarding(t *testing.T) {

 func TestDNSDiscovery_StartTCP(t *testing.T) {
 	serviceIP := "192.168.1.100"
-	upstreamDNS := "8.8.8.8"
+	upstreamDNS := []string{"8.8.8.8"}
 	d := NewDNSDiscovery(upstreamDNS, serviceIP)

 	addr := "127.0.0.1:5354"
@@ -149,7 +169,7 @@ func TestDNSDiscovery_StartTCP(t *testing.T) {

 func TestDNSDiscovery_IsRunning(t *testing.T) {
 	serviceIP := "192.168.1.100"
-	upstreamDNS := "8.8.8.8"
+	upstreamDNS := []string{"8.8.8.8"}
 	d := NewDNSDiscovery(upstreamDNS, serviceIP)

 	addr := "127.0.0.1:5355"
@@ -192,3 +212,230 @@ func (m *mockResponseWriter) Close() error                { return nil }
 func (m *mockResponseWriter) TsigStatus() error           { return nil }
 func (m *mockResponseWriter) TsigTimersOnly(bool)         {}
 func (m *mockResponseWriter) Hijack()                     {}
+
+func TestDNSDiscovery_LogThrottling(t *testing.T) {
+	d := NewDNSDiscovery([]string{"8.8.8.8"}, "192.168.1.100")
+
+	// Capture log output
+	var logBuf strings.Builder
+	oldOutput := log.Writer()
+	log.SetOutput(&logBuf)
+	defer log.SetOutput(oldOutput)
+
+	msg := "Test log message"
+	d.throttledLog(msg)
+	d.throttledLog(msg)
+	d.throttledLog(msg)
+
+	count := strings.Count(logBuf.String(), msg)
+	if count != 1 {
+		t.Errorf("Expected log message to appear once due to throttling, but appeared %d times", count)
+	}
+
+	// Advance time by 11 seconds to bypass throttling
+	d.lastLogMu.Lock()
+	d.lastLog[msg] = time.Now().Add(-11 * time.Second)
+	d.lastLogMu.Unlock()
+
+	d.throttledLog(msg)
+	count = strings.Count(logBuf.String(), msg)
+	if count != 2 {
+		t.Errorf("Expected log message to appear twice after advancing time, but appeared %d times", count)
+	}
+}
+
+func TestDNSDiscovery_LoopPrevention(t *testing.T) {
+	serviceIP := "192.168.1.100"
+	bindAddr := "127.0.0.1:53"
+	upstreamDNS := []string{"127.0.0.1:53"}
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+	d.bindAddr = bindAddr
+
+	// Capture log output to avoid panic if it's being throttled/logged
+	var logBuf strings.Builder
+	oldOutput := log.Writer()
+	log.SetOutput(&logBuf)
+	defer log.SetOutput(oldOutput)
+
+	m := new(dns.Msg)
+	m.SetQuestion("google.com.", dns.TypeA)
+
+	rw := &mockResponseWriter{}
+	d.forward(rw, m)
+
+	if rw.msg == nil {
+		t.Fatal("Expected a response message")
+	}
+
+	if rw.msg.Rcode != dns.RcodeServerFailure {
+		t.Errorf("Expected RcodeServerFailure (2), got %d", rw.msg.Rcode)
+	}
+}
+
+func TestDNSDiscovery_EmptyUpstream(t *testing.T) {
+	serviceIP := "192.168.1.100"
+	var upstreamDNS []string // Empty upstream
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+	d.bindAddr = ":53"
+
+	m := new(dns.Msg)
+	m.SetQuestion("google.com.", dns.TypeA)
+
+	rw := &mockResponseWriter{}
+	d.ServeDNS(rw, m)
+
+	if rw.msg == nil {
+		t.Fatal("Expected a response message, got nil")
+	}
+
+	if rw.msg.Rcode != dns.RcodeServerFailure {
+		t.Errorf("Expected RcodeServerFailure (2) for empty upstream, got %d", rw.msg.Rcode)
+	}
+
+	// Verify log message (optional, but good to check it's the simplified one)
+}
+
+func TestDNSDiscovery_ForwardTimeout(t *testing.T) {
+	serviceIP := "192.168.1.100"
+	// Use an IP that is unroutable or doesn't exist on the network to ensure timeout
+	upstreamDNS := []string{"192.0.2.1:53"} // TEST-NET-1, usually non-routable
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+
+	m := new(dns.Msg)
+	m.SetQuestion("google.com.", dns.TypeA)
+
+	rw := &mockResponseWriter{}
+
+	start := time.Now()
+	d.forward(rw, m)
+	duration := time.Since(start)
+
+	if duration < 2*time.Second {
+		t.Errorf("Expected forward to take at least 2 seconds (timeout), but took %v", duration)
+	}
+
+	if rw.msg == nil || rw.msg.Rcode != dns.RcodeServerFailure {
+		t.Errorf("Expected RcodeServerFailure after timeout")
+	}
+}
+
+func TestDNSDiscovery_MultipleUpstreams(t *testing.T) {
+	serviceIP := "192.168.1.100"
+
+	// Mock server 1: returns NXDOMAIN
+	mux1 := dns.NewServeMux()
+	mux1.HandleFunc("test.com.", func(w dns.ResponseWriter, r *dns.Msg) {
+		m := new(dns.Msg)
+		m.SetReply(r)
+		m.Rcode = dns.RcodeNameError
+		_ = w.WriteMsg(m)
+	})
+	ts1 := &dns.Server{Addr: "127.0.0.1:5356", Net: "udp", Handler: mux1}
+	go func() { _ = ts1.ListenAndServe() }()
+	defer func() { _ = ts1.Shutdown() }()
+
+	// Mock server 2: succeeds
+	mux2 := dns.NewServeMux()
+	mux2.HandleFunc("test.com.", func(w dns.ResponseWriter, r *dns.Msg) {
+		m := new(dns.Msg)
+		m.SetReply(r)
+		m.Answer = append(m.Answer, &dns.A{
+			Hdr: dns.RR_Header{Name: r.Question[0].Name, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 300},
+			A:   net.ParseIP("1.2.3.4"),
+		})
+		_ = w.WriteMsg(m)
+	})
+	ts2 := &dns.Server{Addr: "127.0.0.1:5357", Net: "udp", Handler: mux2}
+	go func() { _ = ts2.ListenAndServe() }()
+	defer func() { _ = ts2.Shutdown() }()
+
+	time.Sleep(100 * time.Millisecond)
+
+	upstreamDNS := []string{"127.0.0.1:5356", "127.0.0.1:5357"}
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+
+	m := new(dns.Msg)
+	m.SetQuestion("test.com.", dns.TypeA)
+	rw := &mockResponseWriter{}
+
+	d.forward(rw, m)
+
+	if rw.msg == nil {
+		t.Fatal("Expected a response message")
+	}
+
+	// It should succeed because it falls back to the second upstream
+	if rw.msg.Rcode != dns.RcodeSuccess {
+		t.Errorf("Expected RcodeSuccess (0), got %d. Fallback failed.", rw.msg.Rcode)
+	}
+
+	if len(rw.msg.Answer) == 0 {
+		t.Fatal("Expected an answer from the second upstream")
+	}
+}
+
+func TestDNSDiscovery_HostnameServiceIP(t *testing.T) {
+	// Use localhost which should resolve to 127.0.0.1
+	serviceIP := "localhost"
+	upstreamDNS := []string{"8.8.8.8"}
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+
+	m := new(dns.Msg)
+	m.SetQuestion("api.bose.com.", dns.TypeA)
+
+	rw := &mockResponseWriter{}
+	d.ServeDNS(rw, m)
+
+	if rw.msg == nil {
+		t.Fatal("Expected a response message, got nil")
+	}
+
+	if len(rw.msg.Answer) == 0 {
+		t.Fatal("Expected an answer in the response")
+	}
+
+	if a, ok := rw.msg.Answer[0].(*dns.A); ok {
+		// It should be resolved to 127.0.0.1 (or whatever localhost resolves to)
+		if a.A.String() == "" {
+			t.Error("Expected a non-empty IP address")
+		}
+		log.Printf("Resolved localhost to %s", a.A.String())
+	} else if cname, ok := rw.msg.Answer[0].(*dns.CNAME); ok {
+		// Fallback to CNAME is also acceptable if resolution failed but it shouldn't for localhost
+		if cname.Target != "localhost." {
+			t.Errorf("Expected CNAME to localhost., got %s", cname.Target)
+		}
+	} else {
+		t.Errorf("Expected A or CNAME record, got %T", rw.msg.Answer[0])
+	}
+}
+
+func TestDNSDiscovery_UnresolvableHostname(t *testing.T) {
+	// Use a likely unresolvable hostname
+	serviceIP := "this.hostname.does.not.exist.at.all.invalid"
+	upstreamDNS := []string{"8.8.8.8"}
+	d := NewDNSDiscovery(upstreamDNS, serviceIP)
+
+	m := new(dns.Msg)
+	m.SetQuestion("api.bose.com.", dns.TypeA)
+
+	rw := &mockResponseWriter{}
+	d.ServeDNS(rw, m)
+
+	if rw.msg == nil {
+		t.Fatal("Expected a response message, got nil")
+	}
+
+	if len(rw.msg.Answer) == 0 {
+		t.Fatal("Expected an answer in the response (CNAME fallback)")
+	}
+
+	if cname, ok := rw.msg.Answer[0].(*dns.CNAME); ok {
+		expected := serviceIP + "."
+		if cname.Target != expected {
+			t.Errorf("Expected CNAME to %s, got %s", expected, cname.Target)
+		}
+	} else {
+		t.Errorf("Expected CNAME record for unresolvable hostname, got %T", rw.msg.Answer[0])
+	}
+}
@@ -3,6 +3,8 @@ package models
 import (
 	"encoding/xml"
 	"errors"
+	"fmt"
+	"net/url"
 )

 // Error constants for speaker validation
@@ -57,9 +59,9 @@ func (p *PlayInfo) SetVolume(volume int) *PlayInfo {
 }

 // NewTTSPlayInfo creates a PlayInfo for Google TTS playback
-func NewTTSPlayInfo(text, appKey string, volume ...int) *PlayInfo {
+func NewTTSPlayInfo(text, appKey, language string, volume ...int) *PlayInfo {
 	// URL encode the text for Google TTS
-	url := "http://translate.google.com/translate_tts?ie=UTF-8&tl=EN&client=tw-ob&q=" + text
+	url := fmt.Sprintf("http://translate.google.com/translate_tts?ie=UTF-8&tl=%s&client=tw-ob&q=%s", language, url.QueryEscape(text))

 	playInfo := &PlayInfo{
 		XMLName: xml.Name{Local: "play_info"},
@@ -35,9 +35,9 @@ func TestNewPlayInfo(t *testing.T) {

 func TestNewTTSPlayInfo(t *testing.T) {
 	// Test without volume
-	playInfo := NewTTSPlayInfo("Hello World", "test-key")
+	playInfo := NewTTSPlayInfo("Hello World", "test-key", "EN")

-	expectedURL := "http://translate.google.com/translate_tts?ie=UTF-8&tl=EN&client=tw-ob&q=Hello World"
+	expectedURL := "http://translate.google.com/translate_tts?ie=UTF-8&tl=EN&client=tw-ob&q=Hello+World"
 	if playInfo.URL != expectedURL {
 		t.Errorf("Expected URL '%s', got '%s'", expectedURL, playInfo.URL)
 	}
@@ -63,7 +63,7 @@ func TestNewTTSPlayInfo(t *testing.T) {
 	}

 	// Test with volume
-	playInfoWithVolume := NewTTSPlayInfo("Hello World", "test-key", 50)
+	playInfoWithVolume := NewTTSPlayInfo("Hello World", "test-key", "EN", 50)
 	if playInfoWithVolume.Volume == nil || *playInfoWithVolume.Volume != 50 {
 		t.Errorf("Expected Volume to be 50, got %v", playInfoWithVolume.Volume)
 	}
@@ -304,8 +304,9 @@ type SpecialMessageType string

 // Constants for special message types
 const (
-	MessageTypeSdkInfo      SpecialMessageType = "sdkInfo"
-	MessageTypeUserActivity SpecialMessageType = "userActivity"
+	MessageTypeSdkInfo        SpecialMessageType = "sdkInfo"
+	MessageTypeUserActivity   SpecialMessageType = "userActivity"
+	MessageTypeUserInactivity SpecialMessageType = "userInactivity"
 )

 // SoundTouchSdkInfo represents the SDK info message sent on connection
@@ -321,6 +322,12 @@ type UserActivityUpdate struct {
 	DeviceID string   `xml:"deviceID,attr"`
 }

+// UserInactivityUpdate represents user inactivity notifications
+type UserInactivityUpdate struct {
+	XMLName  xml.Name `xml:"userInactivityUpdate"`
+	DeviceID string   `xml:"deviceID,attr"`
+}
+
 // SpecialMessage represents non-updates WebSocket messages
 type SpecialMessage struct {
 	Type      SpecialMessageType
@@ -604,6 +611,22 @@ func ParseSpecialMessage(data []byte) (*SpecialMessage, error) {
 		}, nil
 	}

+	// Check for userInactivityUpdate
+	if strings.Contains(dataStr, "<userInactivityUpdate") {
+		var userInactivity UserInactivityUpdate
+		if err := xml.Unmarshal(data, &userInactivity); err != nil {
+			return nil, fmt.Errorf("failed to parse userInactivityUpdate: %w", err)
+		}
+
+		return &SpecialMessage{
+			Type:      MessageTypeUserInactivity,
+			DeviceID:  userInactivity.DeviceID,
+			Data:      &userInactivity,
+			RawData:   data,
+			Timestamp: time.Now(),
+		}, nil
+	}
+
 	return nil, fmt.Errorf("unknown special message type: %s", dataStr)
 }

@@ -629,6 +652,17 @@ func (sm *SpecialMessage) GetUserActivity() *UserActivityUpdate {
 	return nil
 }

+// GetUserInactivity returns the parsed UserInactivity data if the message is of that type
+func (sm *SpecialMessage) GetUserInactivity() *UserInactivityUpdate {
+	if sm.Type == MessageTypeUserInactivity {
+		if userInactivity, ok := sm.Data.(*UserInactivityUpdate); ok {
+			return userInactivity
+		}
+	}
+
+	return nil
+}
+
 // String returns a string representation of the special message
 func (sm *SpecialMessage) String() string {
 	switch sm.Type {
@@ -638,6 +672,8 @@ func (sm *SpecialMessage) String() string {
 		}
 	case MessageTypeUserActivity:
 		return fmt.Sprintf("User Activity [Device: %s]", sm.DeviceID)
+	case MessageTypeUserInactivity:
+		return fmt.Sprintf("User Inactivity [Device: %s]", sm.DeviceID)
 	}

 	return fmt.Sprintf("Unknown Special Message - Type: %s", sm.Type)
@@ -41,6 +41,7 @@ var Providers = []string{
 	"RADIO.COM",
 	"RADIO_COM",
 	"SIRIUSXM_EVEREST",
+	"RADIO_BROWSER",
 }

 // Common file and path constants used by the datastore and setup logic.
@@ -709,7 +709,7 @@ type Settings struct {
 	DiscoveryEnabled     bool           `json:"discovery_enabled"`
 	EnableSoundcorkProxy bool           `json:"enable_soundcork_proxy"`
 	DNSEnabled           bool           `json:"dns_enabled"`
-	DNSUpstream          string         `json:"dns_upstream,omitempty"`
+	DNSUpstream          []string       `json:"dns_upstream,omitempty"`
 	DNSBindAddr          string         `json:"dns_bind_addr,omitempty"`
 	Shortcuts            map[string]int `json:"shortcuts,omitempty"`
 }
@@ -0,0 +1,84 @@
+package handlers
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+
+	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
+)
+
+func TestDNSSettingsValidation(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "dns-validation-test")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	ds := datastore.NewDataStore(tempDir)
+	_ = ds.Initialize()
+
+	r, server := setupRouter("http://localhost:8001", ds)
+
+	// Test Case 1: Enable DNS with empty upstream (should fallback to system DNS)
+	update := map[string]interface{}{
+		"dns_enabled":   true,
+		"dns_upstream":  "",
+		"dns_bind_addr": ":5353",
+	}
+
+	body, err := json.Marshal(update)
+	if err != nil {
+		t.Fatalf("Failed to marshal update: %v", err)
+	}
+	req := httptest.NewRequest("POST", "/setup/settings", bytes.NewBuffer(body))
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("Expected status 200 when enabling DNS without upstream (fallback to system), got %d. Body: %s", w.Code, w.Body.String())
+	}
+
+	// Verify DNS state in server
+	if !server.dnsEnabled {
+		t.Error("DNS should be enabled in server state")
+	}
+
+	// Verify it TRIED to start (either it is running, or it failed due to port conflict but state is enabled)
+	if !server.dnsEnabled {
+		t.Error("DNS state should be enabled")
+	}
+
+	// Test Case 2: Enable DNS with valid upstream
+	// Using a random port to avoid conflicts and ensure it's fast
+	updateValid := map[string]interface{}{
+		"dns_enabled":   true,
+		"dns_upstream":  "8.8.8.8",
+		"dns_bind_addr": "127.0.0.1:0", // Random port
+	}
+
+	bodyValid, err := json.Marshal(updateValid)
+	if err != nil {
+		t.Fatalf("Failed to marshal updateValid: %v", err)
+	}
+	reqValid := httptest.NewRequest("POST", "/setup/settings", bytes.NewBuffer(bodyValid))
+	wValid := httptest.NewRecorder()
+	r.ServeHTTP(wValid, reqValid)
+
+	if wValid.Code != http.StatusOK {
+		t.Errorf("Expected status 200 when enabling DNS with valid upstream, got %d. Body: %s", wValid.Code, wValid.Body.String())
+	}
+
+	// Verify DNS state in server
+	if !server.dnsEnabled {
+		t.Error("DNS should be enabled in server state")
+	}
+
+	// Shutdown server to clean up
+	if server.dnsDiscovery != nil {
+		_ = server.dnsDiscovery.Shutdown()
+	}
+}
@@ -4,6 +4,7 @@ import (
 	"encoding/xml"
 	"io"
 	"log"
+	"net"
 	"net/http"
 	"strconv"
 	"time"
@@ -56,7 +57,43 @@ func (s *Server) HandleMargeAccountFull(w http.ResponseWriter, r *http.Request)
 }

 // HandleMargePowerOn handles the Marge power on request.
-func (s *Server) HandleMargePowerOn(w http.ResponseWriter, _ *http.Request) {
+func (s *Server) HandleMargePowerOn(w http.ResponseWriter, r *http.Request) {
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		log.Printf("[Marge] Failed to read power_on body: %v", err)
+		w.WriteHeader(http.StatusOK) // Silent failure is usually better for device requests
+
+		return
+	}
+
+	var req models.CustomerSupportRequest
+	if err := xml.Unmarshal(body, &req); err != nil {
+		log.Printf("[Marge] Failed to parse power_on body: %v", err)
+
+		// Fallback to remote address if body parsing fails
+		if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+			go s.PrimeDeviceWithSpotify(host)
+		}
+
+		w.WriteHeader(http.StatusOK)
+
+		return
+	}
+
+	deviceID := req.Device.ID
+	deviceIP := req.DiagnosticData.DeviceLandscape.IPAddress
+
+	log.Printf("[Marge] Device %s powered on (IP: %s)", deviceID, deviceIP)
+
+	if deviceIP != "" {
+		go s.PrimeDeviceWithSpotify(deviceIP)
+	} else {
+		// Fallback to remote address if IP is missing from XML
+		if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+			go s.PrimeDeviceWithSpotify(host)
+		}
+	}
+
 	w.WriteHeader(http.StatusOK)
 }

@@ -414,16 +414,28 @@ func TestMargePowerOn(t *testing.T) {
 	ts := httptest.NewServer(r)
 	defer ts.Close()

-	res, err := http.Post(ts.URL+"/marge/streaming/support/power_on", "application/xml", bytes.NewReader([]byte("<powerOn/>")))
-	if err != nil {
-		t.Fatal(err)
-	}
+	t.Run("EmptyBody", func(t *testing.T) {
+		res, err := http.Post(ts.URL+"/marge/streaming/support/power_on", "application/xml", bytes.NewReader([]byte("<powerOn/>")))
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer func() { _ = res.Body.Close() }()
+		if res.StatusCode != http.StatusOK {
+			t.Errorf("Expected status OK, got %v", res.Status)
+		}
+	})

-	defer func() { _ = res.Body.Close() }()
-
-	if res.StatusCode != http.StatusOK {
-		t.Errorf("Expected status OK, got %v", res.Status)
-	}
+	t.Run("FullBody", func(t *testing.T) {
+		payload := `<?xml version="1.0" encoding="UTF-8" ?><device-data><device id="A81B6A536A98"><serialnumber>I6332527703739342000020</serialnumber><firmware-version>27.0.6.46330</firmware-version><product product_code="SoundTouch 10 sm2" type="5"><serialnumber>069231P63364828AE</serialnumber></product></device><diagnostic-data><device-landscape><rssi>Excellent</rssi><gateway-ip-address>192.168.1.1</gateway-ip-address><macaddresses><macaddress>A81B6A536A98</macaddress></macaddresses><ip-address>192.168.1.100</ip-address><network-connection-type>Wireless</network-connection-type></device-landscape></diagnostic-data></device-data>`
+		res, err := http.Post(ts.URL+"/marge/streaming/support/power_on", "application/vnd.bose.streaming-v1.2+xml", strings.NewReader(payload))
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer func() { _ = res.Body.Close() }()
+		if res.StatusCode != http.StatusOK {
+			t.Errorf("Expected status OK, got %v", res.Status)
+		}
+	})
 }

 func TestMargeAdvancedFeatures(t *testing.T) {
@@ -0,0 +1,313 @@
+package handlers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
+)
+
+// BasicAuthMgmt returns a Basic Auth middleware using the server's management credentials.
+func (s *Server) BasicAuthMgmt() func(http.Handler) http.Handler {
+	s.mu.RLock()
+	username := s.mgmtUsername
+	password := s.mgmtPassword
+	s.mu.RUnlock()
+
+	return middleware.BasicAuth("Management API", map[string]string{username: password})
+}
+
+// HandleMgmtListSpeakers returns discovered speakers for the given account.
+func (s *Server) HandleMgmtListSpeakers(w http.ResponseWriter, r *http.Request) {
+	_ = chi.URLParam(r, "accountId")
+
+	allDevices, err := s.ds.ListAllDevices()
+	if err != nil {
+		log.Printf("[Mgmt] Failed to list devices: %v", err)
+
+		allDevices = nil
+	}
+
+	type speaker struct {
+		IPAddress string `json:"ipAddress"`
+		Name      string `json:"name"`
+		DeviceID  string `json:"deviceId"`
+		Type      string `json:"type"`
+	}
+
+	speakers := make([]speaker, 0, len(allDevices))
+	for i := range allDevices {
+		d := &allDevices[i]
+		speakers = append(speakers, speaker{
+			IPAddress: d.IPAddress,
+			Name:      d.Name,
+			DeviceID:  d.DeviceID,
+			Type:      d.ProductCode,
+		})
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := json.NewEncoder(w).Encode(map[string]interface{}{
+		"speakers": speakers,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode speakers: %v", err)
+	}
+}
+
+// HandleMgmtDeviceEvents returns events for a device (currently a placeholder).
+func (s *Server) HandleMgmtDeviceEvents(w http.ResponseWriter, r *http.Request) {
+	deviceID := chi.URLParam(r, "deviceId")
+
+	events := s.ds.GetDeviceEvents(deviceID)
+	if events == nil {
+		events = nil // will marshal as empty array via wrapper
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	// Return the events in the structure the Flutter app expects.
+	// Use an explicit empty slice to ensure JSON "[]" instead of "null".
+	type eventEntry struct {
+		Type string                 `json:"type"`
+		Time string                 `json:"time"`
+		Data map[string]interface{} `json:"data"`
+	}
+
+	result := make([]eventEntry, 0, len(events))
+	for _, e := range events {
+		result = append(result, eventEntry{
+			Type: e.Type,
+			Time: e.Time,
+			Data: e.Data,
+		})
+	}
+
+	if err := json.NewEncoder(w).Encode(map[string]interface{}{
+		"events": result,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode events: %v", err)
+	}
+}
+
+// HandleMgmtSpotifyInit starts the Spotify OAuth flow by returning an authorization URL.
+func (s *Server) HandleMgmtSpotifyInit(w http.ResponseWriter, _ *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		http.Error(w, `{"error":"spotify not configured"}`, http.StatusServiceUnavailable)
+		return
+	}
+
+	redirectURL := svc.BuildAuthorizeURL()
+
+	w.Header().Set("Content-Type", "application/json")
+	enc := json.NewEncoder(w)
+	enc.SetEscapeHTML(false)
+
+	if err := enc.Encode(map[string]string{
+		"redirectUrl": redirectURL,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode redirect URL: %v", err)
+	}
+}
+
+// HandleMgmtSpotifyCallback is the browser OAuth callback from Spotify.
+// Not protected by Basic Auth — Spotify redirects the user's browser here directly.
+// Returns an HTML page the user can close.
+func (s *Server) HandleMgmtSpotifyCallback(w http.ResponseWriter, r *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		w.Header().Set("Content-Type", "text/html")
+		w.WriteHeader(http.StatusServiceUnavailable)
+		_, _ = w.Write([]byte(`<html><body><h1>Error</h1><p>Spotify integration not configured</p></body></html>`))
+
+		return
+	}
+
+	if errMsg := r.URL.Query().Get("error"); errMsg != "" {
+		w.Header().Set("Content-Type", "text/html")
+		w.WriteHeader(http.StatusBadRequest)
+		_, _ = w.Write([]byte(`<html><body><h1>Spotify Authorization Failed</h1><p>Error: ` + errMsg + `</p></body></html>`))
+
+		return
+	}
+
+	code := r.URL.Query().Get("code")
+	if code == "" {
+		w.Header().Set("Content-Type", "text/html")
+		w.WriteHeader(http.StatusBadRequest)
+		_, _ = w.Write([]byte(`<html><body><h1>Missing authorization code</h1></body></html>`))
+
+		return
+	}
+
+	if err := svc.ExchangeCodeAndStore(code); err != nil {
+		log.Printf("[Mgmt] Spotify callback failed: %v", err)
+		w.Header().Set("Content-Type", "text/html")
+		w.WriteHeader(http.StatusInternalServerError)
+		_, _ = w.Write([]byte(`<html><body><h1>Error</h1><p>Token exchange failed</p></body></html>`))
+
+		return
+	}
+
+	w.Header().Set("Content-Type", "text/html")
+	_, _ = w.Write([]byte(`<html><body><h1>Spotify Connected</h1><p>You can close this window.</p></body></html>`))
+}
+
+// HandleMgmtSpotifyConfirm exchanges an authorization code for tokens.
+// Used by the ueberboese mobile app after the deep link callback delivers the code.
+// Protected by Basic Auth.
+func (s *Server) HandleMgmtSpotifyConfirm(w http.ResponseWriter, r *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		http.Error(w, `{"error":"spotify not configured"}`, http.StatusServiceUnavailable)
+		return
+	}
+
+	code := r.URL.Query().Get("code")
+	if code == "" {
+		http.Error(w, `{"error":"missing code parameter"}`, http.StatusBadRequest)
+		return
+	}
+
+	if err := svc.ExchangeCodeAndStore(code); err != nil {
+		log.Printf("[Mgmt] Spotify confirm failed: %v", err)
+		http.Error(w, `{"error":"token exchange failed"}`, http.StatusInternalServerError)
+
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte(`{"ok":true}`))
+}
+
+// HandleMgmtSpotifyAccounts returns linked Spotify accounts (tokens stripped).
+func (s *Server) HandleMgmtSpotifyAccounts(w http.ResponseWriter, _ *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		http.Error(w, `{"error":"spotify not configured"}`, http.StatusServiceUnavailable)
+		return
+	}
+
+	accounts := svc.GetAccounts()
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := json.NewEncoder(w).Encode(map[string]interface{}{
+		"accounts": accounts,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode accounts: %v", err)
+	}
+}
+
+// HandleMgmtSpotifyToken returns a fresh Spotify access token for the linked account.
+func (s *Server) HandleMgmtSpotifyToken(w http.ResponseWriter, _ *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		http.Error(w, `{"error":"spotify not configured"}`, http.StatusServiceUnavailable)
+		return
+	}
+
+	accessToken, username, err := svc.GetFreshToken()
+	if err != nil {
+		log.Printf("[Mgmt] Spotify token error: %v", err)
+		http.Error(w, `{"error":"no token available"}`, http.StatusInternalServerError)
+
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := json.NewEncoder(w).Encode(map[string]string{
+		"access_token": accessToken,
+		"username":     username,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode token: %v", err)
+	}
+}
+
+// HandleMgmtSpotifyEntity resolves a Spotify URI to name and image URL.
+func (s *Server) HandleMgmtSpotifyEntity(w http.ResponseWriter, r *http.Request) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		http.Error(w, `{"error":"spotify not configured"}`, http.StatusServiceUnavailable)
+		return
+	}
+
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		http.Error(w, `{"error":"failed to read body"}`, http.StatusBadRequest)
+		return
+	}
+
+	var request struct {
+		URI string `json:"uri"`
+	}
+	if unmarshalErr := json.Unmarshal(body, &request); unmarshalErr != nil || request.URI == "" {
+		http.Error(w, `{"error":"missing or invalid uri"}`, http.StatusBadRequest)
+		return
+	}
+
+	name, imageURL, err := svc.ResolveEntity(request.URI)
+	if err != nil {
+		log.Printf("[Mgmt] Spotify entity resolve error: %v", err)
+		http.Error(w, `{"error":"entity resolution failed"}`, http.StatusInternalServerError)
+
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := json.NewEncoder(w).Encode(map[string]string{
+		"name":     name,
+		"imageUrl": imageURL,
+	}); err != nil {
+		log.Printf("[Mgmt] Failed to encode entity: %v", err)
+	}
+}
+
+// HandleMgmtPrimeDevice triggers a Spotify priming for a specific device.
+func (s *Server) HandleMgmtPrimeDevice(w http.ResponseWriter, r *http.Request) {
+	deviceID := r.URL.Query().Get("deviceId")
+
+	if deviceID == "" {
+		http.Error(w, `{"error":"missing deviceId"}`, http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		log.Printf("[Mgmt] Prime failed: %v", err)
+		http.Error(w, fmt.Sprintf(`{"error":"%v"}`, err), http.StatusNotFound)
+
+		return
+	}
+
+	// Trigger priming
+	go s.PrimeDeviceWithSpotify(deviceIP)
+
+	w.Header().Set("Content-Type", "application/json")
+	_, _ = w.Write([]byte(`{"status":"Priming triggered"}`))
+}
@@ -0,0 +1,266 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
+	"github.com/gesellix/bose-soundtouch/pkg/service/spotify"
+	"github.com/go-chi/chi/v5"
+)
+
+func TestHandleMgmtSpotifyInit(t *testing.T) {
+	s := &Server{}
+	// No spotify service configured
+	req := httptest.NewRequest("POST", "/mgmt/spotify/init", nil)
+	w := httptest.NewRecorder()
+	s.HandleMgmtSpotifyInit(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("expected 503, got %d", w.Code)
+	}
+
+	// With spotify service
+	svc := spotify.NewSpotifyService("cid", "secret", "http://localhost/cb", t.TempDir())
+	s.SetSpotifyService(svc)
+
+	w = httptest.NewRecorder()
+	s.HandleMgmtSpotifyInit(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("expected 200, got %d", w.Code)
+	}
+
+	var resp map[string]string
+	if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
+		t.Fatal(err)
+	}
+
+	if !strings.Contains(resp["redirectUrl"], "client_id=cid") {
+		t.Errorf("expected redirectUrl to contain client_id=cid, got %s", resp["redirectUrl"])
+	}
+}
+
+func TestHandleMgmtSpotifyAccounts(t *testing.T) {
+	s := &Server{}
+	svc := spotify.NewSpotifyService("cid", "secret", "http://localhost/cb", t.TempDir())
+	s.SetSpotifyService(svc)
+
+	req := httptest.NewRequest("GET", "/mgmt/spotify/accounts", nil)
+	w := httptest.NewRecorder()
+	s.HandleMgmtSpotifyAccounts(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("expected 200, got %d", w.Code)
+	}
+
+	var resp map[string][]spotify.Account
+	if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
+		t.Fatal(err)
+	}
+
+	if len(resp["accounts"]) != 0 {
+		t.Errorf("expected 0 accounts, got %d", len(resp["accounts"]))
+	}
+}
+
+func TestHandleMgmtListSpeakers(t *testing.T) {
+	tmpDir := t.TempDir()
+	ds := datastore.NewDataStore(tmpDir)
+	_, s := setupRouter("http://localhost:8000", ds)
+
+	req := httptest.NewRequest("GET", "/mgmt/accounts/default/speakers", nil)
+	w := httptest.NewRecorder()
+	s.HandleMgmtListSpeakers(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("expected 200, got %d", w.Code)
+	}
+
+	var resp map[string]interface{}
+	if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, ok := resp["speakers"]; !ok {
+		t.Error("expected 'speakers' in response")
+	}
+}
+
+func TestHandleMgmtSpotifyCallback(t *testing.T) {
+	s := &Server{}
+	svc := spotify.NewSpotifyService("cid", "secret", "http://localhost/cb", t.TempDir())
+	s.SetSpotifyService(svc)
+
+	// Mock Spotify token and profile endpoints
+	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		json.NewEncoder(w).Encode(map[string]interface{}{
+			"access_token":  "at",
+			"refresh_token": "rt",
+			"expires_in":    3600,
+		})
+	}))
+	defer tokenServer.Close()
+
+	profileServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		json.NewEncoder(w).Encode(map[string]interface{}{
+			"id":           "user123",
+			"display_name": "Test User",
+		})
+	}))
+	defer profileServer.Close()
+
+	// Use internal members to override URLs (available because we are in the same package)
+	// Actually we need to reach through s.spotifyService which is private.
+	// But s.spotifyService is *spotify.Service, which we have a handle to (svc).
+	// We can't access private fields of spotify.Service from handlers package.
+	// Wait, I can't override tokenURL from here if it's unexported in spotify package.
+	// Let's check service.go again. Yes, tokenURL and apiBase are unexported.
+
+	// Since I can't easily mock the external Spotify API here without exported fields,
+	// I will test the error paths.
+
+	t.Run("Missing code", func(t *testing.T) {
+		req := httptest.NewRequest("GET", "/mgmt/spotify/callback", nil)
+		w := httptest.NewRecorder()
+		s.HandleMgmtSpotifyCallback(w, req)
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("expected 400, got %d", w.Code)
+		}
+		if !strings.Contains(w.Body.String(), "Missing authorization code") {
+			t.Errorf("expected missing code error message, got %s", w.Body.String())
+		}
+	})
+
+	t.Run("Spotify error", func(t *testing.T) {
+		req := httptest.NewRequest("GET", "/mgmt/spotify/callback?error=access_denied", nil)
+		w := httptest.NewRecorder()
+		s.HandleMgmtSpotifyCallback(w, req)
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("expected 400, got %d", w.Code)
+		}
+		if !strings.Contains(w.Body.String(), "access_denied") {
+			t.Errorf("expected access_denied error message, got %s", w.Body.String())
+		}
+	})
+}
+
+func TestHandleMgmtSpotifyConfirm(t *testing.T) {
+	s := &Server{}
+	svc := spotify.NewSpotifyService("cid", "secret", "http://localhost/cb", t.TempDir())
+	s.SetSpotifyService(svc)
+
+	t.Run("Missing code", func(t *testing.T) {
+		req := httptest.NewRequest("POST", "/mgmt/spotify/confirm", nil)
+		w := httptest.NewRecorder()
+		s.HandleMgmtSpotifyConfirm(w, req)
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("expected 400, got %d", w.Code)
+		}
+	})
+}
+
+func TestHandleMgmtDeviceEvents(t *testing.T) {
+	tmpDir := t.TempDir()
+	ds := datastore.NewDataStore(tmpDir)
+	_, s := setupRouter("http://localhost:8000", ds)
+
+	r := chi.NewRouter()
+	r.Get("/mgmt/devices/{deviceId}/events", s.HandleMgmtDeviceEvents)
+
+	req := httptest.NewRequest("GET", "/mgmt/devices/device123/events", nil)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("expected 200, got %d", w.Code)
+	}
+
+	var resp map[string]interface{}
+	if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, ok := resp["events"]; !ok {
+		t.Error("expected 'events' in response")
+	}
+}
+
+func TestBasicAuthMgmt(t *testing.T) {
+	s := &Server{}
+	s.SetMgmtConfig("admin", "secret123")
+
+	handler := s.BasicAuthMgmt()(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("OK"))
+	}))
+
+	t.Run("Valid credentials", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/mgmt/test", nil)
+		req.SetBasicAuth("admin", "secret123")
+		rr := httptest.NewRecorder()
+
+		handler.ServeHTTP(rr, req)
+
+		if rr.Code != http.StatusOK {
+			t.Errorf("expected status %d, got %d", http.StatusOK, rr.Code)
+		}
+		if rr.Body.String() != "OK" {
+			t.Errorf("expected body 'OK', got %q", rr.Body.String())
+		}
+	})
+
+	t.Run("Wrong username", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/mgmt/test", nil)
+		req.SetBasicAuth("wrong", "secret123")
+		rr := httptest.NewRecorder()
+
+		handler.ServeHTTP(rr, req)
+
+		if rr.Code != http.StatusUnauthorized {
+			t.Errorf("expected status %d, got %d", http.StatusUnauthorized, rr.Code)
+		}
+		if rr.Header().Get("WWW-Authenticate") == "" {
+			t.Error("expected WWW-Authenticate header to be set")
+		}
+	})
+
+	t.Run("Wrong password", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/mgmt/test", nil)
+		req.SetBasicAuth("admin", "wrongpass")
+		rr := httptest.NewRecorder()
+
+		handler.ServeHTTP(rr, req)
+
+		if rr.Code != http.StatusUnauthorized {
+			t.Errorf("expected status %d, got %d", http.StatusUnauthorized, rr.Code)
+		}
+	})
+
+	t.Run("Missing auth header", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/mgmt/test", nil)
+		rr := httptest.NewRecorder()
+
+		handler.ServeHTTP(rr, req)
+
+		if rr.Code != http.StatusUnauthorized {
+			t.Errorf("expected status %d, got %d", http.StatusUnauthorized, rr.Code)
+		}
+	})
+
+	t.Run("Empty credentials", func(t *testing.T) {
+		req := httptest.NewRequest(http.MethodGet, "/mgmt/test", nil)
+		req.SetBasicAuth("", "")
+		rr := httptest.NewRecorder()
+
+		handler.ServeHTTP(rr, req)
+
+		if rr.Code != http.StatusUnauthorized {
+			t.Errorf("expected status %d, got %d", http.StatusUnauthorized, rr.Code)
+		}
+	})
+}
@@ -48,6 +48,13 @@ func (s *Server) ServeProxy(target *url.URL) http.HandlerFunc {
 		lp.RecordEnabled = s.recordEnabled
 		lp.SetRecorder(s.recorder)

+		// Capture request body for recording, as it will be consumed by the proxy
+		var reqBody []byte
+		if r.Body != nil {
+			reqBody, _ = io.ReadAll(r.Body)
+			r.Body = io.NopCloser(bytes.NewBuffer(reqBody))
+		}
+
 		rp := httputil.NewSingleHostReverseProxy(target)
 		rp.Transport = &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
@@ -75,6 +82,11 @@ func (s *Server) ServeProxy(target *url.URL) http.HandlerFunc {
 				res.Header["ETag"] = etags
 			}

+			// Restore captured request body for the recorder
+			if reqBody != nil {
+				res.Request.Body = io.NopCloser(bytes.NewBuffer(reqBody))
+			}
+
 			lp.LogResponse(res)

 			return nil
@@ -0,0 +1,96 @@
+package handlers
+
+import (
+	"bytes"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
+	"github.com/gesellix/bose-soundtouch/pkg/service/proxy"
+)
+
+func TestHandleProxyRequest_RequestBodyRecording(t *testing.T) {
+	t.Setenv("RECORDER_ASYNC", "false")
+	tmpDir, err := os.MkdirTemp("", "proxy-request-body-test")
+	if err != nil {
+		t.Fatalf("failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	// Start a backend server to receive the proxied request
+	backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Read the body to ensure it's consumed
+		_, _ = io.ReadAll(r.Body)
+		w.Header().Set("Content-Type", "application/xml")
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("<response>ok</response>"))
+	}))
+	defer backend.Close()
+
+	ds := datastore.NewDataStore(filepath.Join(tmpDir, "test.db"))
+	server := NewServer(ds, nil, "http://localhost:8000", false, false, false, false)
+	server.recordEnabled = true
+	server.proxyLogBody = true
+	recorder := proxy.NewRecorder(tmpDir)
+	server.SetRecorder(recorder)
+
+	// Create a proxy request to the backend
+	requestBody := "<request>data</request>"
+	targetURL := backend.URL
+	proxyPath := "/proxy/" + targetURL
+	req := httptest.NewRequest("POST", proxyPath, bytes.NewBufferString(requestBody))
+	req.Header.Set("Content-Type", "application/xml")
+
+	w := httptest.NewRecorder()
+	server.HandleProxyRequest(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("Expected status 200, got %d", w.Code)
+	}
+
+	// Verify that the interaction was recorded and contains the request body
+	sessionID := recorder.SessionID
+
+	// The recorder uses sanitized segments for the directory.
+	// Since the target URL is http://127.0.0.1:PORT, the path is empty,
+	// so it should be in the "root" directory under the category.
+
+	// We'll search recursively to be sure
+	foundBody := false
+	err = filepath.Walk(filepath.Join(tmpDir, "interactions", sessionID), func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() && strings.HasSuffix(path, ".http") {
+			content, err := os.ReadFile(path)
+			if err != nil {
+				return err
+			}
+			if strings.Contains(string(content), requestBody) {
+				foundBody = true
+			}
+		}
+		return nil
+	})
+
+	if err != nil {
+		t.Fatalf("failed to walk interactions dir: %v", err)
+	}
+
+	if !foundBody {
+		t.Errorf("request body %q not found in any recorded interaction file", requestBody)
+		// List all files found for debugging
+		_ = filepath.Walk(filepath.Join(tmpDir, "interactions", sessionID), func(path string, info os.FileInfo, err error) error {
+			if !info.IsDir() {
+				content, _ := os.ReadFile(path)
+				t.Logf("Found file %s with content:\n%s", path, string(content))
+			}
+			return nil
+		})
+	}
+}
@@ -8,6 +8,7 @@ import (
 	"os"
 	"sort"
 	"strconv"
+	"strings"
 	"time"

 	"fmt"
@@ -156,6 +157,7 @@ func (s *Server) HandleGetSettings(w http.ResponseWriter, _ *http.Request) {
 	enableSoundcorkProxy := s.enableSoundcorkProxy
 	redact, logBody, record := s.proxyRedact, s.proxyLogBody, s.recordEnabled
 	shortcuts := s.shortcuts
+	spotifyConfigured := s.spotifyService != nil
 	s.mu.RUnlock()

 	dnsRunning, actualBind := s.GetDNSRunning()
@@ -169,13 +171,14 @@ func (s *Server) HandleGetSettings(w http.ResponseWriter, _ *http.Request) {
 		"dns_enabled":            dnsEnabled,
 		"dns_running":            dnsRunning,
 		"dns_actual_bind":        actualBind,
-		"dns_upstream":           dnsUpstream,
+		"dns_upstream":           strings.Join(dnsUpstream, ","),
 		"dns_bind_addr":          dnsBindAddr,
 		"enable_soundcork_proxy": enableSoundcorkProxy,
 		"redact_logs":            redact,
 		"log_bodies":             logBody,
 		"record_interactions":    record,
 		"shortcuts":              shortcuts,
+		"spotify_configured":     spotifyConfigured,
 	}); err != nil {
 		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 		return
@@ -200,6 +203,12 @@ func (s *Server) HandleUpdateSettings(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	if settings.DNSEnabled && settings.DNSUpstream == "" {
+		// No strict requirement for DNSUpstream here as SetDNSSettings will
+		// try to fall back to system DNS. We only log it if both are empty later.
+		log.Printf("[DNS] DNS Discovery enabled without explicit upstreams, will try system DNS.")
+	}
+
 	interval, err := time.ParseDuration(settings.DiscoveryInterval)
 	if err != nil && settings.DiscoveryInterval != "" {
 		http.Error(w, "Invalid discovery interval: "+err.Error(), http.StatusBadRequest)
@@ -216,7 +225,20 @@ func (s *Server) HandleUpdateSettings(w http.ResponseWriter, r *http.Request) {

 	s.discoveryEnabled = settings.DiscoveryEnabled
 	s.dnsEnabled = settings.DNSEnabled
-	s.dnsUpstream = settings.DNSUpstream
+
+	// Handle comma-separated upstream DNS servers
+	var upstreamList []string
+
+	if settings.DNSUpstream != "" {
+		for _, u := range strings.Split(settings.DNSUpstream, ",") {
+			u = strings.TrimSpace(u)
+			if u != "" {
+				upstreamList = append(upstreamList, u)
+			}
+		}
+	}
+
+	s.dnsUpstream = upstreamList
 	s.dnsBindAddr = settings.DNSBindAddr

 	s.enableSoundcorkProxy = settings.EnableSoundcorkProxy
@@ -251,8 +273,15 @@ func (s *Server) HandleUpdateSettings(w http.ResponseWriter, r *http.Request) {
 		EnableSoundcorkProxy: s.enableSoundcorkProxy,
 		Shortcuts:            s.shortcuts,
 	})
+
+	dnsEnabled := s.dnsEnabled
+	dnsUpstreamStr := strings.Join(s.dnsUpstream, ",")
+	dnsBindAddr := s.dnsBindAddr
+
 	s.mu.Unlock()

+	s.SetDNSSettings(dnsEnabled, dnsUpstreamStr, dnsBindAddr)
+
 	if err != nil {
 		http.Error(w, "Failed to save settings: "+err.Error(), http.StatusInternalServerError)
 		return
@@ -268,9 +297,15 @@ func (s *Server) HandleUpdateSettings(w http.ResponseWriter, r *http.Request) {

 // HandleGetDeviceInfo returns live information for a device.
 func (s *Server) HandleGetDeviceInfo(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Device IP is required", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Device ID is required", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -290,9 +325,15 @@ func (s *Server) HandleGetDeviceInfo(w http.ResponseWriter, r *http.Request) {

 // HandleGetMigrationSummary returns a summary of the migration plan for a device.
 func (s *Server) HandleGetMigrationSummary(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Device IP is required", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Device ID is required", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -323,12 +364,25 @@ func (s *Server) HandleGetMigrationSummary(w http.ResponseWriter, r *http.Reques

 // HandleMigrateDevice starts the migration process for a device.
 func (s *Server) HandleMigrateDevice(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -371,12 +425,25 @@ func (s *Server) HandleMigrateDevice(w http.ResponseWriter, r *http.Request) {

 // HandleRevertMigration reverts the migration for a device.
 func (s *Server) HandleRevertMigration(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -407,6 +474,32 @@ func (s *Server) HandleRevertMigration(w http.ResponseWriter, r *http.Request) {

 // HandleGetDNSDiscoveries returns recorded DNS discoveries.
 func (s *Server) HandleGetDNSDiscoveries(w http.ResponseWriter, _ *http.Request) {
+	result := s.getMergedDNSDiscoveries()
+
+	w.Header().Set("Content-Type", "application/json")
+
+	if err := json.NewEncoder(w).Encode(result); err != nil {
+		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+		return
+	}
+}
+
+// HandleDownloadDNSDiscoveries returns recorded DNS discoveries as a downloadable JSON file.
+func (s *Server) HandleDownloadDNSDiscoveries(w http.ResponseWriter, _ *http.Request) {
+	result := s.getMergedDNSDiscoveries()
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Content-Disposition", "attachment; filename=\"dns-discoveries.json\"")
+
+	encoder := json.NewEncoder(w)
+	encoder.SetIndent("", "  ")
+
+	if err := encoder.Encode(result); err != nil {
+		log.Printf("Error encoding DNS discoveries for download: %v", err)
+	}
+}
+
+func (s *Server) getMergedDNSDiscoveries() []datastore.DNSDiscoveryEntry {
 	// 1. Get current in-memory discoveries
 	inMemory := s.GetDNSDiscovery()

@@ -457,12 +550,7 @@ func (s *Server) HandleGetDNSDiscoveries(w http.ResponseWriter, _ *http.Request)
 		log.Printf("Warning: Failed to persist merged DNS discoveries: %v", err)
 	}

-	w.Header().Set("Content-Type", "application/json")
-
-	if err := json.NewEncoder(w).Encode(result); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-		return
-	}
+	return result
 }

 // HandleClearDNSDiscoveries clears recorded DNS discoveries.
@@ -486,12 +574,25 @@ func (s *Server) HandleClearDNSDiscoveries(w http.ResponseWriter, _ *http.Reques

 // HandleTrustCACert injects the local Root CA into the device's shared trust store.
 func (s *Server) HandleTrustCACert(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -522,12 +623,25 @@ func (s *Server) HandleTrustCACert(w http.ResponseWriter, r *http.Request) {

 // HandleEnsureRemoteServices ensures that remote services are configured on a device.
 func (s *Server) HandleEnsureRemoteServices(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -558,12 +672,25 @@ func (s *Server) HandleEnsureRemoteServices(w http.ResponseWriter, r *http.Reque

 // HandleRemoveRemoteServices removes remote services configuration from a device.
 func (s *Server) HandleRemoveRemoteServices(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -594,12 +721,25 @@ func (s *Server) HandleRemoveRemoteServices(w http.ResponseWriter, r *http.Reque

 // HandleBackupConfig creates a backup of the device configuration.
 func (s *Server) HandleBackupConfig(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -719,9 +859,15 @@ func (s *Server) HandleUpdateProxySettings(w http.ResponseWriter, r *http.Reques

 // HandleTestHostsRedirection performs a preliminary check for /etc/hosts redirection.
 func (s *Server) HandleTestHostsRedirection(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Device IP is required", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Device ID is required", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -759,9 +905,15 @@ func (s *Server) HandleTestHostsRedirection(w http.ResponseWriter, r *http.Reque

 // HandleTestDNSRedirection performs a check for DNS redirection to the AfterTouch service.
 func (s *Server) HandleTestDNSRedirection(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Device IP is required", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Device ID is required", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -799,9 +951,15 @@ func (s *Server) HandleTestDNSRedirection(w http.ResponseWriter, r *http.Request

 // HandleInitialSync fetches presets, recents and sources from the device and saves them to the datastore.
 func (s *Server) HandleInitialSync(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Missing deviceIP", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Missing deviceId", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -816,12 +974,25 @@ func (s *Server) HandleInitialSync(w http.ResponseWriter, r *http.Request) {

 // HandleRebootDevice reboots a device.
 func (s *Server) HandleRebootDevice(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)

-		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device IP is required"}); err != nil {
+		if err := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": "Device ID is required"}); err != nil {
+			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
+			return
+		}
+
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusNotFound)
+
+		if encodeErr := json.NewEncoder(w).Encode(map[string]interface{}{"ok": false, "message": err.Error()}); encodeErr != nil {
 			http.Error(w, "Failed to encode response", http.StatusInternalServerError)
 			return
 		}
@@ -852,9 +1023,15 @@ func (s *Server) HandleRebootDevice(w http.ResponseWriter, r *http.Request) {

 // HandleTestConnection performs a connection check from the device to the server.
 func (s *Server) HandleTestConnection(w http.ResponseWriter, r *http.Request) {
-	deviceIP := chi.URLParam(r, "deviceIP")
-	if deviceIP == "" {
-		http.Error(w, "Device IP is required", http.StatusBadRequest)
+	deviceID := chi.URLParam(r, "deviceId")
+	if deviceID == "" {
+		http.Error(w, "Device ID is required", http.StatusBadRequest)
+		return
+	}
+
+	deviceIP, err := s.resolveDeviceIDToIP(deviceID)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}

@@ -7,8 +7,10 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"

+	"github.com/gesellix/bose-soundtouch/pkg/models"
 	"github.com/gesellix/bose-soundtouch/pkg/service/certmanager"
 	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
 	"github.com/gesellix/bose-soundtouch/pkg/service/setup"
@@ -140,7 +142,7 @@ func TestMigrationAndCA(t *testing.T) {
 	sm := setup.NewManager("http://localhost:8000", ds, cm)
 	// Mock SSH to avoid real connections
 	sm.NewSSH = func(host string) setup.SSHClient {
-		return &mockSSH{}
+		return &mockSSH{host: host}
 	}

 	r, server := setupRouter("http://localhost:8001", ds)
@@ -149,6 +151,13 @@ func TestMigrationAndCA(t *testing.T) {
 	ts := httptest.NewServer(r)
 	defer ts.Close()

+	// Add device to datastore for resolution
+	_ = ds.SaveDeviceInfo("default", "192.168.1.10", &models.ServiceDeviceInfo{
+		DeviceID:  "192.168.1.10",
+		IPAddress: "192.168.1.10",
+		AccountID: "default",
+	})
+
 	// 1. Test GET /setup/ca.crt
 	res, err := http.Get(ts.URL + "/setup/ca.crt")
 	if err != nil {
@@ -338,12 +347,27 @@ func TestRemoveDevice(t *testing.T) {
 	}
 }

-type mockSSH struct{}
+type mockSSH struct {
+	host     string
+	runCount int
+}

 func (m *mockSSH) Run(command string) (string, error) {
-	if command == "cat /etc/hosts" {
+	if strings.Contains(command, "cat /etc/hosts") {
+		m.runCount++
+		if m.runCount > 1 {
+			// Return updated hosts for verification
+			return "127.0.0.1 localhost\n192.168.1.100\tstreaming.bose.com\n192.168.1.100\tupdates.bose.com\n192.168.1.100\tstats.bose.com\n192.168.1.100\tbmx.bose.com\n192.168.1.100\tcontent.api.bose.io\n192.168.1.100\tevents.api.bosecm.com\n192.168.1.100\tbose-prod.apigee.net\n192.168.1.100\tworldwide.bose.com", nil
+		}
 		return "127.0.0.1 localhost", nil
 	}
+	if strings.HasPrefix(command, "[ -f") {
+		return "", nil // Pretend file exists for backups
+	}
+	if strings.HasPrefix(command, "grep -F") {
+		return "matched", nil // CA trusted
+	}
 	return "", nil
 }
+
 func (m *mockSSH) UploadContent(content []byte, remotePath string) error { return nil }
@@ -87,14 +87,14 @@ func setupRouter(targetURL string, ds *datastore.DataStore) (*chi.Mux, *Server)
 		r.Post("/settings", server.HandleUpdateSettings)
 		r.Get("/proxy-settings", server.HandleGetProxySettings)
 		r.Post("/proxy-settings", server.HandleUpdateProxySettings)
-		r.Post("/ensure-remote-services/{deviceIP}", server.HandleEnsureRemoteServices)
-		r.Post("/remove-remote-services/{deviceIP}", server.HandleRemoveRemoteServices)
-		r.Post("/migrate/{deviceIP}", server.HandleMigrateDevice)
-		r.Post("/revert/{deviceIP}", server.HandleRevertMigration)
-		r.Post("/reboot/{deviceIP}", server.HandleRebootDevice)
-		r.Post("/trust-ca/{deviceIP}", server.HandleTrustCACert)
-		r.Post("/test-connection/{deviceIP}", server.HandleTestConnection)
-		r.Post("/test-hosts/{deviceIP}", server.HandleTestHostsRedirection)
+		r.Post("/ensure-remote-services/{deviceId}", server.HandleEnsureRemoteServices)
+		r.Post("/remove-remote-services/{deviceId}", server.HandleRemoveRemoteServices)
+		r.Post("/migrate/{deviceId}", server.HandleMigrateDevice)
+		r.Post("/revert/{deviceId}", server.HandleRevertMigration)
+		r.Post("/reboot/{deviceId}", server.HandleRebootDevice)
+		r.Post("/trust-ca/{deviceId}", server.HandleTrustCACert)
+		r.Post("/test-connection/{deviceId}", server.HandleTestConnection)
+		r.Post("/test-hosts/{deviceId}", server.HandleTestHostsRedirection)
 		r.Get("/ca.crt", server.HandleGetCACert)
 	})

@@ -2,9 +2,13 @@ package handlers

 import (
 	"context"
+	"fmt"
+	"io"
 	"log"
+	"net"
 	"net/http"
 	"net/url"
+	"strings"
 	"sync"
 	"time"

@@ -13,6 +17,8 @@ import (
 	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
 	"github.com/gesellix/bose-soundtouch/pkg/service/proxy"
 	"github.com/gesellix/bose-soundtouch/pkg/service/setup"
+	"github.com/gesellix/bose-soundtouch/pkg/service/spotify"
+	"github.com/miekg/dns"
 )

 // Server handles HTTP requests for the SoundTouch service.
@@ -30,7 +36,7 @@ type Server struct {
 	discoveryInterval    time.Duration
 	discoveryEnabled     bool
 	dnsEnabled           bool
-	dnsUpstream          string
+	dnsUpstream          []string
 	dnsBindAddr          string
 	enableSoundcorkProxy bool
 	shortcuts            map[string]int
@@ -40,6 +46,12 @@ type Server struct {
 	Version              string
 	Commit               string
 	Date                 string
+	mgmtUsername         string
+	mgmtPassword         string
+	spotifyClientID      string
+	spotifyClientSecret  string
+	spotifyRedirectURI   string
+	spotifyService       *spotify.Service
 }

 // NewServer creates a new SoundTouch service server.
@@ -78,6 +90,47 @@ func (s *Server) SetDiscoverySettings(interval time.Duration, enabled bool) {
 	s.discoveryEnabled = enabled
 }

+// parseUpstreamDNS splits a comma-separated string of DNS servers.
+func parseUpstreamDNS(upstream string) []string {
+	var upstreamList []string
+
+	if upstream != "" {
+		for _, u := range strings.Split(upstream, ",") {
+			u = strings.TrimSpace(u)
+			if u != "" {
+				upstreamList = append(upstreamList, u)
+			}
+		}
+	}
+
+	return upstreamList
+}
+
+// getSystemDNS returns the DNS servers from /etc/resolv.conf.
+func getSystemDNS() []string {
+	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
+	if config != nil && len(config.Servers) > 0 {
+		return config.Servers
+	}
+
+	return nil
+}
+
+// areUpstreamsEqual compares two slices of DNS server addresses.
+func areUpstreamsEqual(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+
+	return true
+}
+
 // SetDNSSettings sets the DNS discovery settings for the server.
 func (s *Server) SetDNSSettings(enabled bool, upstream, bind string) {
 	s.mu.Lock()
@@ -87,11 +140,23 @@ func (s *Server) SetDNSSettings(enabled bool, upstream, bind string) {
 	oldUpstream := s.dnsUpstream

 	s.dnsEnabled = enabled
-	s.dnsUpstream = upstream
 	s.dnsBindAddr = bind

+	upstreamList := parseUpstreamDNS(upstream)
+
+	// Try to get system DNS if none provided
+	if enabled && len(upstreamList) == 0 {
+		upstreamList = getSystemDNS()
+		if len(upstreamList) > 0 {
+			log.Printf("[DNS] Using system DNS servers from /etc/resolv.conf: %v", upstreamList)
+		}
+	}
+
+	s.dnsUpstream = upstreamList
+	upstreamChanged := !areUpstreamsEqual(upstreamList, oldUpstream)
+
 	if s.dnsDiscovery != nil {
-		if !enabled || bind != oldBind || upstream != oldUpstream {
+		if !enabled || bind != oldBind || upstreamChanged {
 			log.Printf("[DNS] Settings changed, stopping DNS discovery server")

 			_ = s.dnsDiscovery.Shutdown()
@@ -99,27 +164,39 @@ func (s *Server) SetDNSSettings(enabled bool, upstream, bind string) {
 		}
 	}

-	if enabled && s.dnsDiscovery == nil {
-		log.Printf("[DNS] Starting DNS discovery server on %s", bind)
+	if enabled && len(upstreamList) == 0 {
+		log.Printf("[DNS] Cannot start DNS discovery server: upstream DNS is empty and no system DNS found")

-		u, _ := url.Parse(s.serverURL)
+		s.dnsEnabled = false

-		serviceIP := u.Hostname()
-		if serviceIP == "localhost" || serviceIP == "" {
-			serviceIP = "127.0.0.1"
-		}
-
-		if s.sm != nil {
-			serviceIP = s.sm.GetResolvedIP(serviceIP)
-		}
-
-		s.dnsDiscovery = discovery.NewDNSDiscovery(upstream, serviceIP)
-		go func(d *discovery.DNSDiscovery, addr string) {
-			if err := d.Start(addr); err != nil {
-				log.Printf("Warning: DNS discovery server error: %v", err)
-			}
-		}(s.dnsDiscovery, bind)
+		return
 	}
+
+	if enabled && s.dnsDiscovery == nil {
+		s.startDNSDiscovery(bind, upstreamList)
+	}
+}
+
+func (s *Server) startDNSDiscovery(bind string, upstreamList []string) {
+	log.Printf("[DNS] Starting DNS discovery server on %s", bind)
+
+	u, _ := url.Parse(s.serverURL)
+
+	serviceIP := u.Hostname()
+	if serviceIP == "localhost" || serviceIP == "" {
+		serviceIP = "127.0.0.1"
+	}
+
+	if s.sm != nil {
+		serviceIP = s.sm.GetResolvedIP(serviceIP)
+	}
+
+	s.dnsDiscovery = discovery.NewDNSDiscovery(upstreamList, serviceIP)
+	go func(d *discovery.DNSDiscovery, addr string) {
+		if err := d.Start(addr); err != nil {
+			log.Printf("Warning: DNS discovery server error: %v", err)
+		}
+	}(s.dnsDiscovery, bind)
 }

 // GetDNSRunning returns whether DNS discovery is active and its bind address.
@@ -207,6 +284,33 @@ func (s *Server) SetRecorder(r *proxy.Recorder) {
 	}
 }

+// SetSpotifyConfig sets the Spotify OAuth configuration.
+func (s *Server) SetSpotifyConfig(clientID, clientSecret, redirectURI string) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.spotifyClientID = clientID
+	s.spotifyClientSecret = clientSecret
+	s.spotifyRedirectURI = redirectURI
+}
+
+// SetMgmtConfig sets the management API authentication credentials.
+func (s *Server) SetMgmtConfig(username, password string) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.mgmtUsername = username
+	s.mgmtPassword = password
+}
+
+// SetSpotifyService sets the Spotify OAuth service.
+func (s *Server) SetSpotifyService(ss *spotify.Service) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	s.spotifyService = ss
+}
+
 // GetRecordEnabled returns whether recording is enabled.
 func (s *Server) GetRecordEnabled() bool {
 	s.mu.RLock()
@@ -223,6 +327,14 @@ func (s *Server) GetSettings() (string, string, string) {
 	return s.serverURL, s.soundcorkURL, s.httpsServerURL
 }

+// IsSpotifyConfigured returns whether Spotify integration is configured.
+func (s *Server) IsSpotifyConfigured() bool {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	return s.spotifyService != nil
+}
+
 // GetProxySettings returns the current proxy settings.
 func (s *Server) GetProxySettings() (bool, bool, bool, bool) {
 	s.mu.RLock()
@@ -266,6 +378,75 @@ func (s *Server) DiscoverDevices(ctx context.Context) {
 	s.mergeOverlappingDevices()
 }

+// PrimeDeviceWithSpotify triggers a Spotify priming of the speaker if a Spotify account is linked.
+func (s *Server) PrimeDeviceWithSpotify(deviceIP string) {
+	s.mu.RLock()
+	svc := s.spotifyService
+	s.mu.RUnlock()
+
+	if svc == nil {
+		return
+	}
+
+	accounts := svc.GetAccounts()
+	if len(accounts) == 0 {
+		return
+	}
+
+	// We'll use the first linked account. In the future, we might want to let the user
+	// pick or map accounts to speakers, but for now, we follow the "One linked account" model.
+	accessToken, username, err := svc.GetFreshToken()
+	if err != nil {
+		log.Printf("[Spotify Watchdog] Failed to get fresh token for %s: %v", deviceIP, err)
+		return
+	}
+
+	log.Printf("[Spotify Watchdog] Proactively priming %s with Spotify user %s", deviceIP, username)
+
+	if err := s.pushSpotifyTokenToDevice(deviceIP, username, accessToken); err != nil {
+		log.Printf("[Spotify Watchdog] Failed to prime %s: %v", deviceIP, err)
+	} else {
+		log.Printf("[Spotify Watchdog] Successfully primed %s", deviceIP)
+	}
+}
+
+func (s *Server) pushSpotifyTokenToDevice(deviceIP, username, accessToken string) error {
+	// ZeroConf API endpoint on the speaker
+	var zcURL string
+	if _, _, err := net.SplitHostPort(deviceIP); err == nil {
+		// If port is specified (e.g. in tests), keep it but usually it's just IP
+		zcURL = fmt.Sprintf("http://%s/zc", deviceIP)
+	} else {
+		// If no port specified, default to 8200
+		zcURL = fmt.Sprintf("http://%s:8200/zc", deviceIP)
+	}
+
+	data := url.Values{}
+	data.Set("action", "addUser")
+	data.Set("userName", username)
+	data.Set("blob", accessToken)
+	data.Set("clientKey", "")
+	data.Set("tokenType", "accesstoken")
+
+	client := &http.Client{
+		Timeout: 10 * time.Second,
+	}
+
+	resp, err := client.PostForm(zcURL, data)
+	if err != nil {
+		return fmt.Errorf("POST to %s failed: %w", zcURL, err)
+	}
+
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("POST to %s returned status %d: %s", zcURL, resp.StatusCode, string(body))
+	}
+
+	return nil
+}
+
 func (s *Server) handleDiscoveredDevice(d models.DiscoveredDevice) {
 	log.Printf("Discovered Bose device: %s at %s (Serial: %s)", d.Name, d.Host, d.SerialNo)

@@ -428,3 +609,20 @@ func (s *Server) findExistingDeviceInfo(d models.DiscoveredDevice) *models.Servi

 	return nil
 }
+
+func (s *Server) resolveDeviceIDToIP(deviceID string) (string, error) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	// 1. Try to find in Datastore
+	devices, err := s.ds.ListAllDevices()
+	if err == nil {
+		for i := range devices {
+			if devices[i].DeviceID == deviceID {
+				return devices[i].IPAddress, nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf("device not found: %s", deviceID)
+}
@@ -170,6 +170,46 @@
        "liveRadio",
        "onDemand"
      ]
+    },
+    {
+      "_links": {
+        "bmx_navigate": {
+          "href": "/v1/navigate"
+        },
+        "bmx_token": {
+          "href": "/v1/token"
+        },
+        "self": {
+          "href": "/"
+        }
+      },
+      "askAdapter": false,
+      "assets": {
+        "color": "#000000",
+        "description": "RadioBrowser is an open source internet radio directory. It provides access to thousands of internet radio stations worldwide. RadioBrowser is community driven and relies on user contributions to keep the station database up to date.",
+        "icons": {
+          "largeSvg": "{MEDIA_SERVER}/orion-monochrome.svg",
+          "monochromePng": "{MEDIA_SERVER}/orion-monochrome_v2.png",
+          "monochromeSvg": "{MEDIA_SERVER}/orion-monochrome.svg",
+          "smallSvg": "{MEDIA_SERVER}/orion-monochrome.svg"
+        },
+        "name": "RadioBrowser"
+      },
+      "authenticationModel": {
+        "anonymousAccount": {
+          "autoCreate": true,
+          "enabled": true
+        }
+      },
+      "baseUrl": "https://all.api.radio-browser.info/soundtouch",
+      "id": {
+        "name": "RADIO_BROWSER",
+        "value": 39
+      },
+      "streamTypes": [
+        "liveRadio",
+        "onDemand"
+      ]
    }
  ]
 }
@@ -103,6 +103,43 @@ pre { background-color: #eee; padding: 10px; overflow-x: auto; font-size: 12px;
 .status-success { background-color: #e8f5e9; color: #2e7d32; }
 .status-error { background-color: #ffebee; color: #c62828; }

+.info-toggle {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
+    text-align: center;
+    background-color: #607D8B;
+    color: white;
+    border-radius: 50%;
+    font-size: 12px;
+    cursor: pointer;
+    margin-left: 5px;
+    font-style: normal;
+    user-select: none;
+}
+.info-toggle:hover {
+    background-color: #455A64;
+}
+.info-details {
+    display: none;
+    background-color: #f0f7ff;
+    border: 1px solid #d0e0f0;
+    padding: 10px;
+    margin-top: 5px;
+    border-radius: 4px;
+    font-size: 0.85em;
+    color: #333;
+    line-height: 1.4;
+    max-width: 400px;
+}
+.info-details code {
+    background-color: #e3f2fd;
+    padding: 2px 4px;
+    border-radius: 3px;
+    font-family: monospace;
+}
+
 .badge {
    padding: 2px 8px;
    border-radius: 10px;
@@ -108,8 +108,13 @@
                    </label>
                    <div style="margin-left: 20px; margin-bottom: 5px;">
                        <label for="dns-upstream">Upstream DNS:</label>
-                        <input type="text" id="dns-upstream" placeholder="8.8.8.8" style="width: 150px;">
-                        <span style="font-size: 0.8em; color: #666; margin-left: 5px;">(For non-intercepted queries)</span>
+                        <input type="text" id="dns-upstream" placeholder="Default: system nameservers" style="width: 200px;">
+                        <span class="info-toggle" onclick="toggleInfo('dns-upstream-info')">ⓘ</span>
+                        <div id="dns-upstream-info" class="info-details">
+                            Optional: comma-separated list of DNS servers (e.g., <code>1.1.1.1, 8.8.8.8</code>).<br>
+                            If empty, AfterTouch defaults to the system nameservers (e.g. from <code>/etc/resolv.conf</code>).<br>
+                            <div id="dns-current-upstream" style="margin-top: 5px; font-weight: bold;"></div>
+                        </div>
                    </div>
                    <div style="margin-left: 20px;">
                        <label for="dns-bind">DNS Bind Address:</label>
@@ -118,6 +123,12 @@
                    </div>
                </div>
            </div>
+            <div style="margin-bottom: 20px;">
+                <strong>Spotify Integration:</strong>
+                <div id="spotify-config-status" style="margin-top: 5px; font-size: 0.9em;">
+                    Checking configuration...
+                </div>
+            </div>
            <div style="margin-bottom: 20px;">
                <strong>Proxy Logging:</strong>
                <div style="margin-top: 5px;">
@@ -134,7 +145,13 @@

        <!-- Tab 2: Devices -->
        <div id="tab-devices" class="tab-content">
-            <h2>Known Devices <span id="discovery-indicator" style="font-size: 0.5em; vertical-align: middle; display: none;">🔍 Scanning...</span></h2>
+            <div style="display: flex; justify-content: space-between; align-items: center;">
+                <h2>Known Devices <span id="discovery-indicator" style="font-size: 0.5em; vertical-align: middle; display: none;">🔍 Scanning...</span></h2>
+                <div id="spotify-status-header" style="background: #f0f0f0; padding: 5px 15px; border-radius: 20px; font-size: 0.9em; display: flex; align-items: center; gap: 10px;">
+                    Spotify: <span id="spotify-account-name" style="font-weight: bold;">Not Linked</span>
+                    <button id="link-spotify-btn" onclick="linkSpotify()" style="font-size: 0.8em; padding: 2px 8px; background: #1DB954; color: white; border: none; border-radius: 10px; cursor: pointer;">Link Account</button>
+                </div>
+            </div>
            <div id="device-list">Loading devices...</div>
            <div style="margin-top: 20px;">
                <button onclick="triggerDiscovery()">Scan Again</button>
@@ -179,8 +196,9 @@
            </div>

            <div id="migration-summary" class="summary-box" style="display: none;">
-                <h3>Migration Summary for <span id="summary-ip"></span></h3>
+                <h3>Migration Summary for <span id="summary-device-display"></span></h3>
                <p>Migration Status: <span id="migration-status"></span></p>
+                <input type="hidden" id="summary-device-id">
                <p>SSH Connection: <span id="ssh-status"></span></p>
                <p id="original-config-status" style="display: none;">Backup: ✅ Found .original config at <code>/opt/Bose/etc/SoundTouchSdkPrivateCfg.xml.original</code> <button onclick="toggleOriginalConfig()">Show Original Config</button></p>
                <p id="no-original-config-status" style="display: none;">Backup: ❌ Not found <button id="backup-config-btn">Backup Config Now</button></p>
@@ -229,7 +247,7 @@
                    <select id="migration-method" onchange="toggleMigrationMethod()">
                        <option value="xml">XML Configuration (Recommended - redirects specific services)</option>
                        <option value="hosts">/etc/hosts + Root CA (Advanced - global redirection)</option>
-                        <option value="resolv">/etc/resolv.conf (DNS Discovery Mode - robust)</option>
+                        <option value="resolv">/etc/resolv.conf (DHCP-Aware - Redirect via DNS Hook)</option>
                    </select>
                    <div id="dns-port-warning" style="margin-top: 5px; color: #d32f2f; font-weight: bold; font-size: 0.9em; display: none;"></div>
                </div>
@@ -308,10 +326,10 @@
                        </div>
                    </div>
                    <div id="planned-resolv-pane" class="diff-pane" style="display: none;">
-                        <span class="config-header">Planned /etc/resolv.conf</span>
+                        <span class="config-header">Planned /etc/resolv.conf Hook</span>
                        <pre id="planned-resolv"></pre>
-                        <div style="margin-top: 10px; font-size: 0.9em; color: #666;">
-                            <strong>Note:</strong> This method prepends AfterTouch as the nameserver and makes the file immutable (<code>chattr +i</code>). It also injects the Local Root CA.
+                        <div id="resolv-note" style="margin-top: 10px; font-size: 0.9em; color: #666;">
+                            <strong>Note:</strong> This method injects a persistent DNS priority hook into the DHCP logic (<code>/etc/udhcpc.d/50default</code>). It preserves your router's search domain and secondary DNS servers. It also injects the Local Root CA.
                        </div>
                    </div>
                </div>
@@ -406,7 +424,10 @@
            <div id="dns-discoveries" class="summary-box" style="margin-top: 20px;">
                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 15px;">
                    <h3 style="margin: 0;">DNS Discoveries</h3>
-                    <button onclick="clearDNSDiscoveries()" class="btn-danger">Clear DNS Logs</button>
+                    <div style="display: flex; gap: 10px;">
+                        <button onclick="downloadDNSDiscoveries()" class="btn-info">Download JSON</button>
+                        <button onclick="clearDNSDiscoveries()" class="btn-danger">Clear DNS Logs</button>
+                    </div>
                </div>
                <p style="font-size: 0.85em; color: #666;">Hosts discovered via the AfterTouch DNS server. "Self" means the domain was intercepted and redirected to this service.</p>
                <div id="dns-discoveries-list-container" style="max-height: 400px; overflow-y: auto;">
@@ -1,3 +1,124 @@
+async function fetchSpotifyStatus() {
+    try {
+        const settingsResponse = await fetch('/setup/settings');
+        const settings = await settingsResponse.json();
+        const header = document.getElementById('spotify-status-header');
+
+        if (!settings.spotify_configured) {
+            if (header) header.style.display = 'none';
+            return;
+        }
+
+        if (header) header.style.display = 'flex';
+
+        const response = await fetch('/mgmt/spotify/accounts');
+        if (!response.ok) return;
+        const data = await response.json();
+        const nameEl = document.getElementById('spotify-account-name');
+        const linkBtn = document.getElementById('link-spotify-btn');
+
+        if (data.accounts && data.accounts.length > 0) {
+            header.style.background = '#e6ffed';
+            header.style.border = '1px solid #28a745';
+            nameEl.innerText = data.accounts[0].display_name || data.accounts[0].user_id || 'Linked';
+            if (linkBtn) linkBtn.style.display = 'none';
+
+            // Show Prime Spotify buttons on all devices
+            document.querySelectorAll('.btn-spotify').forEach(btn => {
+                btn.style.display = 'inline-block';
+            });
+        } else {
+            header.style.background = '#f0f0f0';
+            header.style.border = '1px solid #ccc';
+            nameEl.innerText = 'Not Linked';
+            if (linkBtn) linkBtn.style.display = 'inline-block';
+
+            document.querySelectorAll('.btn-spotify').forEach(btn => {
+                btn.style.display = 'none';
+            });
+        }
+    } catch (error) {
+        console.error('Failed to fetch Spotify status', error);
+    }
+}
+
+function toggleInfo(id) {
+    const el = document.getElementById(id);
+    if (el) {
+        el.style.display = el.style.display === 'block' ? 'none' : 'block';
+    }
+}
+
+async function linkSpotify() {
+    try {
+        const response = await fetch('/mgmt/spotify/init', { method: 'POST' });
+        if (!response.ok) {
+            const err = await response.text();
+            alert('Failed to initialize Spotify link: ' + err);
+            return;
+        }
+        const data = await response.json();
+        if (data.redirectUrl) {
+            // Open in a new tab
+            const win = window.open(data.redirectUrl, '_blank');
+            if (win) {
+                win.focus();
+                // Start polling for status change
+                const pollInterval = setInterval(async () => {
+                    const statusResponse = await fetch('/mgmt/spotify/accounts');
+                    if (statusResponse.ok) {
+                        const statusData = await statusResponse.json();
+                        if (statusData.accounts && statusData.accounts.length > 0) {
+                            clearInterval(pollInterval);
+                            fetchSpotifyStatus();
+                        }
+                    }
+                }, 2000);
+                // Stop polling after 2 minutes
+                setTimeout(() => clearInterval(pollInterval), 120000);
+            } else {
+                alert('Please allow popups to link your Spotify account.');
+            }
+        }
+    } catch (error) {
+        alert('Error linking Spotify: ' + error.message);
+    }
+}
+
+async function primeSpotify(deviceId) {
+    const btn = document.getElementById('prime-spotify-' + deviceId);
+    const originalText = btn.innerText;
+    btn.innerText = 'Priming...';
+    btn.disabled = true;
+
+    try {
+        const response = await fetch(`/mgmt/spotify/prime?deviceId=${encodeURIComponent(deviceId)}`, {
+            method: 'POST'
+        });
+        if (response.ok) {
+            btn.innerText = '✅ Primed';
+            btn.style.background = '#28a745';
+            setTimeout(() => {
+                btn.innerText = originalText;
+                btn.style.background = '';
+                btn.disabled = false;
+            }, 3000);
+        } else {
+            const err = await response.text();
+            alert('Failed to prime Spotify: ' + err);
+            btn.innerText = '❌ Failed';
+            setTimeout(() => {
+                btn.innerText = originalText;
+                btn.disabled = false;
+            }, 3000);
+        }
+    } catch (error) {
+        alert('Error priming Spotify: ' + error.message);
+        btn.innerText = originalText;
+        btn.disabled = false;
+    }
+}
+
 async function fetchSettings() {
    try {
        const response = await fetch('/setup/settings');
@@ -23,10 +144,30 @@ async function fetchSettings() {
        if (settings.dns_bind_addr) {
            document.getElementById('dns-bind').value = settings.dns_bind_addr;
        }
+
+        const dnsCurrentUpstream = document.getElementById('dns-current-upstream');
+        if (dnsCurrentUpstream && settings.dns_upstream) {
+            dnsCurrentUpstream.innerText = 'Current upstreams: ' + settings.dns_upstream;
+        } else if (dnsCurrentUpstream) {
+            dnsCurrentUpstream.innerText = '';
+        }
+
        if (settings.enable_soundcork_proxy !== undefined) {
            document.getElementById('enable-soundcork-proxy').checked = settings.enable_soundcork_proxy;
        }
+
+        const spotifyStatus = document.getElementById('spotify-config-status');
+        if (spotifyStatus) {
+            if (settings.spotify_configured) {
+                spotifyStatus.innerHTML = '<span style="color: green;">✅ Configured</span> (Client ID present)';
+            } else {
+                spotifyStatus.innerHTML = '<span style="color: #666;">❌ Not Configured</span><br>' +
+                    '<span style="font-size: 0.85em; color: #888;">To enable Spotify, provide <code>SPOTIFY_CLIENT_ID</code> and <code>SPOTIFY_CLIENT_SECRET</code> to the server.</span>';
+            }
+        }
+
        fetchProxySettings();
+        fetchSpotifyStatus();
    } catch (error) {
        console.error('Failed to fetch settings', error);
    }
@@ -127,33 +268,34 @@ async function fetchDevices() {
            devices.forEach(d => {
                const methodLabel = d.discovery_method === 'manual' ? '👤 Manual' : '🔍 Auto';
                html += `
-                    <tr id="device-row-${d.ip_address.replace(/\./g, '-')}">
+                    <tr id="device-row-${d.device_id}">
                        <td class="col-name-model"><div class="col-name">${d.name}</div><div class="col-model" style="font-size: 0.8em; color: #666;">${d.product_code}</div></td>
                        <td class="col-ip">${d.ip_address}</td>
                        <td class="col-ids"><div class="col-deviceid">${d.device_id}</div><div class="col-accountid" style="font-size: 0.8em; color: #666;">${d.account_id || 'default'}</div></td>
                        <td class="col-fw-serial"><div class="col-firmware">${d.firmware_version || '0.0.0'}</div><div class="col-serial" style="font-size: 0.8em; color: #666;">${d.device_serial_number}</div></td>
                        <td class="col-method">${methodLabel}</td>
                        <td>
-                            <button onclick="prepareSync('${d.ip_address}')">Sync Data</button>
-                            <button onclick="prepareMigration('${d.ip_address}')">Migrate</button>
+                            <button onclick="prepareSync('${d.device_id}')">Sync Data</button>
+                            <button onclick="prepareMigration('${d.device_id}')">Migrate</button>
+                            <button id="prime-spotify-${d.device_id}" class="btn-spotify" style="display: none;" onclick="primeSpotify('${d.device_id}')">Prime Spotify</button>
                            <button class="btn-danger" onclick="removeDevice('${d.device_id}', '${d.name}')">Remove</button>
                        </td>
                    </tr>
                `;

                const optSync = document.createElement('option');
-                optSync.value = d.ip_address;
+                optSync.value = d.device_id;
                optSync.textContent = `${d.name} (${d.ip_address})`;
                syncSelector.appendChild(optSync);

                const optMigrate = document.createElement('option');
-                optMigrate.value = d.ip_address;
+                optMigrate.value = d.device_id;
                optMigrate.textContent = `${d.name} (${d.ip_address})`;
                migrationSelector.appendChild(optMigrate);

                if (eventSelector) {
                    const optEvent = document.createElement('option');
-                    optEvent.value = d.device_id || d.ip_address;
+                    optEvent.value = d.device_id;
                    optEvent.textContent = `${d.name} (${d.ip_address})`;
                    eventSelector.appendChild(optEvent);
                }
@@ -166,22 +308,23 @@ async function fetchDevices() {
            if (eventSelector && currentEventVal) eventSelector.value = currentEventVal;

            // Asynchronously fetch live info for each device
-            devices.forEach(d => updateDeviceInfo(d.ip_address));
+            devices.forEach(d => updateDeviceInfo(d.device_id, d.ip_address));
+            fetchSpotifyStatus();
        }
    } catch (error) {
        document.getElementById('device-list').innerHTML = 'Error loading devices: ' + error;
    }
 }

-function prepareSync(ip) {
-    document.getElementById('sync-device-list').value = ip;
+function prepareSync(deviceId) {
+    document.getElementById('sync-device-list').value = deviceId;
    openTab(null, 'tab-sync');
 }

-function prepareMigration(ip) {
-    document.getElementById('migration-device-list').value = ip;
+function prepareMigration(deviceId) {
+    document.getElementById('migration-device-list').value = deviceId;
    openTab(null, 'tab-migration');
-    showSummary(ip);
+    showSummary(deviceId);
 }

 function openTab(evt, tabId) {
@@ -220,9 +363,46 @@ function openTab(evt, tabId) {
    }
 }

+function getDeviceDisplayName(deviceId) {
+    if (!deviceId) return "Unknown Device";
+
+    // 1. Try migration selector
+    const migrationSelector = document.getElementById('migration-device-list');
+    if (migrationSelector) {
+        for (let opt of migrationSelector.options) {
+            if (opt.value === deviceId && opt.textContent !== '-- Select a device --') {
+                return opt.textContent;
+            }
+        }
+    }
+
+    // 2. Try sync selector
+    const syncSelector = document.getElementById('sync-device-list');
+    if (syncSelector) {
+        for (let opt of syncSelector.options) {
+            if (opt.value === deviceId && opt.textContent !== '-- Select a device --') {
+                return opt.textContent;
+            }
+        }
+    }
+
+    // 3. Try table lookup
+    const rows = document.querySelectorAll('#device-list tr');
+    for (const row of rows) {
+        const idCell = row.querySelector('.col-deviceid');
+        if (idCell && idCell.innerText === deviceId) {
+            const name = row.querySelector('.col-name').innerText;
+            const ip = row.querySelector('.col-ip').innerText;
+            return `${name} (${ip})`;
+        }
+    }
+
+    return deviceId;
+}
+
 async function startSync() {
-    const ip = document.getElementById('sync-device-list').value;
-    if (!ip) {
+    const deviceId = document.getElementById('sync-device-list').value;
+    if (!deviceId) {
        alert('Please select a device first');
        return;
    }
@@ -233,24 +413,25 @@ async function startSync() {

    status.style.display = 'block';
    status.style.backgroundColor = '#eef';
-    status.textContent = 'Syncing data from ' + ip + '...';
+    const display = getDeviceDisplayName(deviceId);
+    status.textContent = 'Syncing data from ' + display + '...';
    results.style.display = 'none';
    log.innerHTML = '';

    try {
-        const response = await fetch('/setup/sync/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/sync/' + encodeURIComponent(deviceId), { method: 'POST' });
        if (response.ok) {
            status.style.backgroundColor = '#dfd';
-            status.textContent = '✅ Sync completed successfully!';
+            status.textContent = '✅ Sync completed successfully for ' + display + '!';
            results.style.display = 'block';
-            log.innerHTML = 'Data fetched and saved to local datastore.\nPresets: OK\nRecents: OK\nSources: OK';
+            log.innerHTML = 'Data fetched and saved to local datastore for ' + display + '.\nPresets: OK\nRecents: OK\nSources: OK';
        } else {
            const err = await response.text();
            throw new Error(err);
        }
    } catch (error) {
        status.style.backgroundColor = '#fdd';
-        status.textContent = '❌ Sync failed: ' + error.message;
+        status.textContent = '❌ Sync failed for ' + display + ': ' + error.message;
    }
 }

@@ -585,6 +766,10 @@ async function clearDNSDiscoveries() {
    }
 }

+function downloadDNSDiscoveries() {
+    window.location.href = '/setup/dns-discoveries/download';
+}
+
 async function showDeviceEvents() {
    const overlay = document.getElementById('device-events-overlay');
    overlay.style.display = 'block';
@@ -725,13 +910,13 @@ async function pollDiscoveryStatus() {
    }
 }

-async function updateDeviceInfo(ip) {
+async function updateDeviceInfo(deviceId, ip) {
    try {
-        const response = await fetch('/setup/info/' + ip);
+        const response = await fetch('/setup/info/' + encodeURIComponent(deviceId));
        if (!response.ok) return;
        const info = await response.json();

-        const rowId = 'device-row-' + ip.replace(/\./g, '-');
+        const rowId = 'device-row-' + deviceId;
        const row = document.getElementById(rowId);
        if (row) {
            const nameEl = row.querySelector('.col-name');
@@ -757,8 +942,8 @@ async function updateDeviceInfo(ip) {
    }
 }

-async function showSummary(ip) {
-    if (!ip) {
+async function showSummary(deviceId) {
+    if (!deviceId) {
        document.getElementById('migration-summary').style.display = 'none';
        return;
    }
@@ -775,18 +960,20 @@ async function showSummary(ip) {
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Fetching summary for ' + ip + '...';
+
+    const display = getDeviceDisplayName(deviceId);
+    statusDiv.innerHTML = 'Fetching summary for ' + display + '...';
+
+    const outputBox = document.getElementById('command-output-box');
+    if (outputBox) outputBox.style.display = 'none';

    let query = '?target_url=' + encodeURIComponent(targetUrl) + '&proxy_url=' + encodeURIComponent(proxyUrl);
    for (let k in opts) {
        query += '&' + k + '=' + encodeURIComponent(opts[k]);
    }

-    const outputBox = document.getElementById('command-output-box');
-    if (outputBox) outputBox.style.display = 'none';
-
    try {
-        const response = await fetch('/setup/summary/' + ip + query);
+        const response = await fetch('/setup/summary/' + encodeURIComponent(deviceId) + query);
        if (!response.ok) {
            const errorText = await response.text();
            throw new Error(errorText);
@@ -794,10 +981,15 @@ async function showSummary(ip) {
        const summary = await response.json();

        statusDiv.style.display = 'none';
-        document.getElementById('summary-ip').innerText = ip;
+
+        const ip = summary.ip_address || deviceId;
+        const finalDisplay = summary.device_name ? `${summary.device_name} (${ip})` : ip;
+        document.getElementById('summary-device-display').innerText = finalDisplay;
+        // Keep deviceId hidden for subsequent calls
+        document.getElementById('summary-device-id').value = deviceId;

        // Update table row if it exists
-        const rowId = 'device-row-' + ip.replace(/\./g, '-');
+        const rowId = 'device-row-' + deviceId;
        const row = document.getElementById(rowId);
        if (row) {
            const nameEl = row.querySelector('.col-name');
@@ -860,7 +1052,7 @@ async function showSummary(ip) {
            caTrustStatus.innerText = summary.ca_cert_trusted ? '✅ Yes' : '❌ No';
            caTrustStatus.style.color = summary.ca_cert_trusted ? 'green' : 'red';
            document.getElementById('trust-ca-btn').style.display = summary.ca_cert_trusted ? 'none' : 'inline-block';
-            document.getElementById('trust-ca-btn').onclick = () => trustCA(ip);
+            document.getElementById('trust-ca-btn').onclick = () => trustCA(deviceId, ip);
        } else {
            remoteStatus.innerText = '❓ Unknown';
            remoteStatus.style.color = 'gray';
@@ -877,7 +1069,7 @@ async function showSummary(ip) {

        document.getElementById('planned-config').innerText = summary.planned_config;
        document.getElementById('planned-hosts').innerText = summary.planned_hosts || '';
-        document.getElementById('planned-resolv').innerText = `nameserver ${new URL(targetUrl).hostname}\n${summary.current_resolv_conf || ''}`;
+        document.getElementById('planned-resolv').innerText = summary.planned_resolv || '';

        const currentResolvElem = document.getElementById('current-resolv-content');
        if (currentResolvElem) {
@@ -890,51 +1082,51 @@ async function showSummary(ip) {
        testResultDiv.style.display = 'none';
        testResultDiv.innerText = '';

-        document.getElementById('test-connection-explicit-btn').onclick = () => testConnection(ip, true);
-        document.getElementById('test-connection-trusted-btn').onclick = () => testConnection(ip, false);
-        document.getElementById('test-hosts-btn').onclick = () => testHostsRedirection(ip);
-        document.getElementById('test-dns-btn').onclick = () => testDNSRedirection(ip);
+        document.getElementById('test-connection-explicit-btn').onclick = () => testConnection(deviceId, true);
+        document.getElementById('test-connection-trusted-btn').onclick = () => testConnection(deviceId, false);
+        document.getElementById('test-hosts-btn').onclick = () => testHostsRedirection(deviceId);
+        document.getElementById('test-dns-btn').onclick = () => testDNSRedirection(deviceId);

        toggleMigrationMethod();

        const migrateBtn = document.getElementById('confirm-migrate-btn');
-        migrateBtn.onclick = () => migrate(ip);
+        migrateBtn.onclick = () => migrate(deviceId, ip);
        migrateBtn.disabled = !summary.ssh_success;

        const revertBtn = document.getElementById('revert-migrate-btn');
-        revertBtn.onclick = () => revert(ip);
+        revertBtn.onclick = () => revert(deviceId, ip);
        revertBtn.disabled = !summary.ssh_success;
        revertBtn.style.display = summary.original_config ? 'inline-block' : 'none';

        const rebootBtn = document.getElementById('reboot-speaker-btn');
-        rebootBtn.onclick = () => reboot(ip);
+        rebootBtn.onclick = () => reboot(deviceId, ip);
        rebootBtn.disabled = !summary.ssh_success;
        rebootBtn.style.border = 'none'; // Reset border if it was set during migration

        const remoteBtn = document.getElementById('ensure-remote-btn');
-        remoteBtn.onclick = () => ensureRemoteServices(ip);
+        remoteBtn.onclick = () => ensureRemoteServices(deviceId, ip);
        remoteBtn.disabled = !summary.ssh_success;

        const removeRemoteBtn = document.getElementById('remove-remote-btn');
-        removeRemoteBtn.onclick = () => removeRemoteServices(ip);
+        removeRemoteBtn.onclick = () => removeRemoteServices(deviceId, ip);
        removeRemoteBtn.disabled = !summary.ssh_success || !summary.remote_services_enabled;

        const backupBtn = document.getElementById('backup-config-btn');
-        backupBtn.onclick = () => backupConfig(ip);
+        backupBtn.onclick = () => backupConfig(deviceId, ip);
        backupBtn.disabled = !summary.ssh_success || !!summary.original_config;

        document.getElementById('migration-summary').style.display = 'block';
        document.getElementById('migration-summary').scrollIntoView();
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error fetching summary for ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error fetching summary for ' + display + ': ' + error;
    }
 }

 function refreshSummary() {
-    const ip = document.getElementById('summary-ip').innerText;
-    if (ip) {
-        showSummary(ip);
+    const deviceId = document.getElementById('summary-device-id').value;
+    if (deviceId) {
+        showSummary(deviceId);
    }
 }

@@ -949,12 +1141,13 @@ function showCommandOutput(result) {
    }
 }

-async function revert(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function revert(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
-    if (!confirm('Are you sure you want to revert ' + ip + ' to Bose cloud defaults?')) {
+    const display = getDeviceDisplayName(deviceId);
+    if (!confirm('Are you sure you want to revert ' + display + ' to Bose cloud defaults?')) {
        return;
    }

@@ -964,59 +1157,60 @@ async function revert(ip) {
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Reverting ' + ip + ' to defaults...';
+    statusDiv.innerHTML = 'Reverting ' + display + ' to defaults...';

    try {
-        const response = await fetch('/setup/revert/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/revert/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully started revert for ' + ip + '.';
+            statusDiv.innerHTML = 'Successfully started revert for ' + display + '.';
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Revert failed for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Revert failed for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error reverting ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error reverting ' + display + ': ' + error;
    }
 }

-async function reboot(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function reboot(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
-    if (!confirm('Are you sure you want to reboot the speaker at ' + ip + '?')) {
+    const display = getDeviceDisplayName(deviceId);
+    if (!confirm('Are you sure you want to reboot the speaker at ' + display + '?')) {
        return;
    }

    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Rebooting ' + ip + '...';
+    statusDiv.innerHTML = 'Rebooting ' + display + '...';

    try {
-        const response = await fetch('/setup/reboot/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/reboot/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully started reboot for ' + ip + '.';
+            statusDiv.innerHTML = 'Successfully started reboot for ' + display + '.';
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Reboot failed for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Reboot failed for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error rebooting ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error rebooting ' + display + ': ' + error;
    }
 }

-async function migrate(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function migrate(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
    const targetUrl = document.getElementById('target-domain').value;
@@ -1036,7 +1230,8 @@ async function migrate(ip) {
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Migrating ' + ip + ' using ' + method + '...';
+    const display = getDeviceDisplayName(deviceId);
+    statusDiv.innerHTML = 'Migrating ' + display + ' using ' + method + '...';

    let query = '?method=' + encodeURIComponent(method) + '&target_url=' + encodeURIComponent(targetUrl) + '&proxy_url=' + encodeURIComponent(proxyUrl);
    for (let k in opts) {
@@ -1044,12 +1239,12 @@ async function migrate(ip) {
    }

    try {
-        const response = await fetch('/setup/migrate/' + ip + query, { method: 'POST' });
+        const response = await fetch('/setup/migrate/' + encodeURIComponent(deviceId) + query, { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully started migration for ' + ip + '. <strong>Please reboot the device to activate the changes.</strong>';
+            statusDiv.innerHTML = 'Successfully started migration for ' + display + '. <strong>Please reboot the device to activate the changes.</strong>';

            // Make reboot button available and prominent
            const rebootBtn = document.getElementById('reboot-speaker-btn');
@@ -1061,45 +1256,46 @@ async function migrate(ip) {
            summaryDiv.style.display = 'block';
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Migration failed for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Migration failed for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error migrating ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error migrating ' + display + ': ' + error;
    }
 }

-async function trustCA(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function trustCA(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Injecting Root CA into shared trust store on ' + ip + '...';
+    const display = getDeviceDisplayName(deviceId);
+    statusDiv.innerHTML = 'Injecting Root CA into shared trust store on ' + display + '...';

    try {
-        const response = await fetch('/setup/trust-ca/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/trust-ca/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully injected Root CA on ' + ip + '.';
-            showSummary(ip); // Refresh to update status
+            statusDiv.innerHTML = 'Successfully injected Root CA on ' + display + '.';
+            showSummary(deviceId); // Refresh to update status
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Failed to trust CA on ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Failed to trust CA on ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error trusting CA on ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error trusting CA on ' + display + ': ' + error;
    }
 }

-async function ensureRemoteServices(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function ensureRemoteServices(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
    const summaryDiv = document.getElementById('migration-summary');
@@ -1108,31 +1304,33 @@ async function ensureRemoteServices(ip) {
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Ensuring remote services for ' + ip + '...';
+    const display = getDeviceDisplayName(deviceId);
+    statusDiv.innerHTML = 'Ensuring remote services for ' + display + '...';

    try {
-        const response = await fetch('/setup/ensure-remote-services/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/ensure-remote-services/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully ensured remote services for ' + ip + '.';
+            statusDiv.innerHTML = 'Successfully ensured remote services for ' + display + '.';
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Failed to ensure remote services for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Failed to ensure remote services for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error ensuring remote services for ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error ensuring remote services for ' + display + ': ' + error;
    }
 }

-async function removeRemoteServices(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function removeRemoteServices(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
-    if (!confirm('Are you sure you want to remove remote services from ' + ip + '?')) {
+    const display = getDeviceDisplayName(deviceId);
+    if (!confirm('Are you sure you want to remove remote services from ' + display + '?')) {
        return;
    }
    const summaryDiv = document.getElementById('migration-summary');
@@ -1141,65 +1339,67 @@ async function removeRemoteServices(ip) {
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Removing remote services for ' + ip + '...';
+    statusDiv.innerHTML = 'Removing remote services for ' + display + '...';

    try {
-        const response = await fetch('/setup/remove-remote-services/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/remove-remote-services/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully removed remote services from ' + ip + '.';
+            statusDiv.innerHTML = 'Successfully removed remote services from ' + display + '.';
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Failed to remove remote services for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Failed to remove remote services for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error removing remote services for ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error removing remote services for ' + display + ': ' + error;
    }
 }

-async function backupConfig(ip) {
-    if (!ip) {
-        alert('Please enter a valid IP address.');
+async function backupConfig(deviceId, ip) {
+    if (!deviceId) {
+        alert('Please select a device.');
        return;
    }
    const statusDiv = document.getElementById('status');
    statusDiv.style.display = 'block';
    statusDiv.style.backgroundColor = '#ffffcc';
-    statusDiv.innerHTML = 'Creating backup for ' + ip + '...';
+    const display = getDeviceDisplayName(deviceId);
+    statusDiv.innerHTML = 'Creating backup for ' + display + '...';

    try {
-        const response = await fetch('/setup/backup/' + ip, { method: 'POST' });
+        const response = await fetch('/setup/backup/' + encodeURIComponent(deviceId), { method: 'POST' });
        const result = await response.json();
        showCommandOutput(result);
        if (result.ok) {
            statusDiv.style.backgroundColor = '#ccffcc';
-            statusDiv.innerHTML = 'Successfully created backup for ' + ip + '.';
-            showSummary(ip); // Refresh
+            statusDiv.innerHTML = 'Successfully created backup for ' + display + '.';
+            showSummary(deviceId); // Refresh
        } else {
            statusDiv.style.backgroundColor = '#ffcccc';
-            statusDiv.innerHTML = 'Backup failed for ' + ip + ': ' + (result.message || 'Unknown error');
+            statusDiv.innerHTML = 'Backup failed for ' + display + ': ' + (result.message || 'Unknown error');
        }
    } catch (error) {
        statusDiv.style.backgroundColor = '#ffcccc';
-        statusDiv.innerHTML = 'Error creating backup for ' + ip + ': ' + error;
+        statusDiv.innerHTML = 'Error creating backup for ' + display + ': ' + error;
    }
 }

-async function testConnection(ip, useExplicitCA) {
+async function testConnection(deviceId, useExplicitCA) {
    const testUrl = document.getElementById('test-url').innerText;
    const testResultDiv = document.getElementById('test-result');
+    const display = getDeviceDisplayName(deviceId);

    testResultDiv.style.display = 'block';
    testResultDiv.style.backgroundColor = '#f0f0f0';
    testResultDiv.style.color = 'black';
-    testResultDiv.innerText = 'Running connection test from ' + ip + '...\n(This may take a few seconds)';
+    testResultDiv.innerText = 'Running connection test from ' + display + '...\n(This may take a few seconds)';

    try {
        const query = `?target_url=${encodeURIComponent(testUrl)}&use_explicit_ca=${useExplicitCA}`;
-        const response = await fetch(`/setup/test-connection/${ip}${query}`, { method: 'POST' });
+        const response = await fetch(`/setup/test-connection/${encodeURIComponent(deviceId)}${query}`, { method: 'POST' });
        const result = await response.json();

        if (result.ok) {
@@ -1215,18 +1415,19 @@ async function testConnection(ip, useExplicitCA) {
    }
 }

-async function testHostsRedirection(ip) {
+async function testHostsRedirection(deviceId) {
    const targetUrl = document.getElementById('target-domain').value;
    const testResultDiv = document.getElementById('hosts-test-result');
+    const display = getDeviceDisplayName(deviceId);

    testResultDiv.style.display = 'block';
    testResultDiv.style.backgroundColor = '#f0f0f0';
    testResultDiv.style.color = 'black';
-    testResultDiv.innerText = 'Running hosts redirection test from ' + ip + '...\n(This may take a few seconds)';
+    testResultDiv.innerText = 'Running hosts redirection test from ' + display + '...\n(This may take a few seconds)';

    try {
        const query = `?target_url=${encodeURIComponent(targetUrl)}`;
-        const response = await fetch(`/setup/test-hosts/${ip}${query}`, { method: 'POST' });
+        const response = await fetch(`/setup/test-hosts/${encodeURIComponent(deviceId)}${query}`, { method: 'POST' });
        const result = await response.json();

        if (result.ok) {
@@ -1242,18 +1443,19 @@ async function testHostsRedirection(ip) {
    }
 }

-async function testDNSRedirection(ip) {
+async function testDNSRedirection(deviceId) {
    const targetUrl = document.getElementById('target-domain').value;
    const testResultDiv = document.getElementById('dns-test-result');
+    const display = getDeviceDisplayName(deviceId);

    testResultDiv.style.display = 'block';
    testResultDiv.style.backgroundColor = '#f0f0f0';
    testResultDiv.style.color = 'black';
-    testResultDiv.innerText = 'Running DNS redirection test from ' + ip + '...\n(This may take a few seconds)';
+    testResultDiv.innerText = 'Running DNS redirection test from ' + display + '...\n(This may take a few seconds)';

    try {
        const query = `?target_url=${encodeURIComponent(targetUrl)}`;
-        const response = await fetch(`/setup/test-dns/${ip}${query}`, { method: 'POST' });
+        const response = await fetch(`/setup/test-dns/${encodeURIComponent(deviceId)}${query}`, { method: 'POST' });
        const result = await response.json();

        if (result.ok) {
@@ -1302,11 +1504,16 @@ async function toggleMigrationMethod() {
        plannedXmlPane.style.display = 'none';
        plannedHostsPane.style.display = 'none';
        plannedResolvPane.style.display = 'block';
-        currentResolvPane.style.display = 'block';
+        currentResolvPane.style.display = 'none';
        serviceOptions.style.display = 'none';
        hostsTestPane.style.display = 'none';
        dnsTestPane.style.display = 'block';

+        const resolvNote = document.getElementById('resolv-note');
+        if (resolvNote) {
+            resolvNote.innerHTML = '<strong>Note:</strong> This method injects a persistent DNS priority hook into the DHCP logic (<code>/etc/udhcpc.d/50default</code>). It preserves your router\'s search domain and secondary DNS servers. It also injects the Local Root CA.';
+        }
+
        // Check DNS settings
        try {
            const response = await fetch('/setup/settings');
@@ -106,7 +106,7 @@ func formatHeaders(h http.Header, redact bool) string {
 			val = "[REDACTED]"
 		}

-		sb.WriteString(fmt.Sprintf("    %s: %s\n", k, val))
+		fmt.Fprintf(&sb, "    %s: %s\n", k, val)
 	}

 	return strings.TrimSuffix(sb.String(), "\n")
@@ -27,7 +27,7 @@ const (
 	MigrationMethodXML MigrationMethod = "xml"
 	// MigrationMethodHosts redirects services by modifying /etc/hosts and updating the CA trust store.
 	MigrationMethodHosts MigrationMethod = "hosts"
-	// MigrationMethodResolvConf redirects services by modifying /etc/resolv.conf and updating the CA trust store.
+	// MigrationMethodResolvConf redirects services by injecting a priority DNS hook into the DHCP logic and updating the CA trust store.
 	MigrationMethodResolvConf MigrationMethod = "resolv"
 )

@@ -67,6 +67,7 @@ type MigrationSummary struct {
 	CACertTrusted            bool        `json:"ca_cert_trusted"`
 	ServerHTTPSURL           string      `json:"server_https_url,omitempty"`
 	CurrentResolvConf        string      `json:"current_resolv_conf,omitempty"`
+	PlannedResolv            string      `json:"planned_resolv,omitempty"`
 	IsMigrated               bool        `json:"is_migrated"`
 }

@@ -85,6 +86,10 @@ type Manager struct {

 	// GetDNSRunning is an optional callback to check the actual state of the DNS server.
 	GetDNSRunning func() (bool, string)
+
+	// Spotify management credentials for the boot primer
+	MgmtUsername string
+	MgmtPassword string
 }

 // NewManager creates a new Manager with the given base server URL.
@@ -96,6 +101,8 @@ func NewManager(serverURL string, ds *datastore.DataStore, cm *certmanager.Certi
 		NewSSH: func(host string) SSHClient {
 			return ssh.NewClient(host)
 		},
+		MgmtUsername: "admin",
+		MgmtPassword: "change_me!",
 	}
 }

@@ -215,6 +222,10 @@ func (m *Manager) GetMigrationSummary(deviceIP, targetURL, proxyURL string, opti
 		if hostName != "" && hostName != "localhost" {
 			client := m.NewSSH(deviceIP)
 			hostIP := m.resolveIP(hostName, client)
+
+			// Predicted aftertouch.resolv.conf
+			summary.PlannedResolv = fmt.Sprintf("# Created by Aftertouch/SoundTouch-Service\n# Priority nameserver for Bose service redirection\nnameserver %s\n", hostIP)
+
 			domains := []string{
 				"streaming.bose.com",
 				"updates.bose.com",
@@ -317,18 +328,28 @@ func (m *Manager) checkIsMigrated(summary *MigrationSummary, deviceIP string) {
 		}
 	}

-	// Case 3: /etc/resolv.conf Migration
-	// Check if /etc/resolv.conf contains our target nameserver
-	if summary.CurrentResolvConf != "" {
-		targetURL := m.ServerURL
+	// Case 3: /etc/resolv.conf Migration (including Aftertouch hook)
+	// Check if /etc/resolv.conf contains our target nameserver OR if hook marker exists
+	if summary.SSHSuccess {
+		// Check for aftertouch.resolv.conf
+		if _, err := client.Run("[ -f /mnt/nv/aftertouch.resolv.conf ]"); err == nil {
+			if summary.CACertTrusted {
+				summary.IsMigrated = true
+				return
+			}
+		}

-		parsedTarget, err := url.Parse(targetURL)
-		if err == nil {
-			targetHost := parsedTarget.Hostname()
-			if strings.Contains(summary.CurrentResolvConf, targetHost) {
-				if summary.CACertTrusted {
-					summary.IsMigrated = true
-					return
+		if summary.CurrentResolvConf != "" {
+			targetURL := m.ServerURL
+
+			parsedTarget, err := url.Parse(targetURL)
+			if err == nil {
+				targetHost := parsedTarget.Hostname()
+				if strings.Contains(summary.CurrentResolvConf, targetHost) {
+					if summary.CACertTrusted {
+						summary.IsMigrated = true
+						return
+					}
 				}
 			}
 		}
@@ -698,6 +719,31 @@ func (m *Manager) migrateViaXML(deviceIP, targetURL, proxyURL string, options ma

 	logs += "Uploaded new configuration to " + remotePath + "\n"

+	// 2. Verify the configuration on device
+	if verification, err := client.Run(fmt.Sprintf("cat %s", remotePath)); err == nil {
+		if !strings.Contains(verification, cfg.MargeServerUrl) {
+			return logs, fmt.Errorf("verification failed: uploaded config on %s does not contain expected margeServerUrl", deviceIP)
+		}
+
+		logs += "Verified configuration on device\n"
+	} else {
+		logs += fmt.Sprintf("Warning: could not verify configuration on device: %v\n", err)
+	}
+
+	// 3. Inject CA Certificate (optional but recommended)
+	summary := &MigrationSummary{}
+	m.checkCACertTrusted(summary, deviceIP)
+
+	if !summary.CACertTrusted {
+		out, err := m.TrustCACert(deviceIP)
+
+		logs += "Trusting CA:\n" + out + "\n"
+
+		if err != nil {
+			fmt.Printf("Warning: failed to trust CA: %v\n", err)
+		}
+	}
+
 	return logs, nil
 }

@@ -957,7 +1003,54 @@ func (m *Manager) migrateViaHosts(deviceIP, targetURL string) (string, error) {
 		return logs, fmt.Errorf("failed to read /etc/hosts: %w", err)
 	}

-	lines := strings.Split(hostsContent, "\n")
+	hostsContent = m.generateHostsContent(hostsContent, domains, hostIP)
+
+	// 3. Upload new /etc/hosts
+	out, _ := client.Run(rwCmd)
+	logs += rwCmd + ": " + out + "\n"
+	// Backup /etc/hosts if it doesn't exist
+	if _, err := client.Run("[ -f /etc/hosts.original ]"); err != nil {
+		out, _ := client.Run("cp /etc/hosts /etc/hosts.original")
+		logs += "cp /etc/hosts /etc/hosts.original: " + out + "\n"
+	}
+
+	if err := client.UploadContent([]byte(hostsContent), "/etc/hosts"); err != nil {
+		return logs, fmt.Errorf("failed to update /etc/hosts: %w", err)
+	}
+
+	logs += "Uploaded updated /etc/hosts\n"
+
+	// 4. Verify /etc/hosts on device
+	if err := m.verifyHosts(client, domains, hostIP, deviceIP); err != nil {
+		return logs, err
+	}
+
+	logs += "Verified /etc/hosts on device\n"
+
+	fmt.Printf("Updated /etc/hosts on %s:\n%s\n", deviceIP, hostsContent)
+
+	// 5. Inject CA Certificate
+	summary := &MigrationSummary{}
+	m.checkCACertTrusted(summary, deviceIP)
+
+	if !summary.CACertTrusted {
+		out, err := m.TrustCACert(deviceIP)
+
+		logs += "Trusting CA:\n" + out + "\n"
+		if err != nil {
+			return logs, err
+		}
+	} else {
+		logs += "CA certificate already trusted, skipping injection\n"
+
+		fmt.Printf("CA certificate already trusted on %s, skipping injection\n", deviceIP)
+	}
+
+	return logs, nil
+}
+
+func (m *Manager) generateHostsContent(currentContent string, domains []string, hostIP string) string {
+	lines := strings.Split(currentContent, "\n")

 	var newLines []string

@@ -1001,46 +1094,27 @@ func (m *Manager) migrateViaHosts(deviceIP, targetURL string) (string, error) {
 		}
 	}

-	hostsContent = strings.Join(newLines, "\n")
+	hostsContent := strings.Join(newLines, "\n")
 	if !strings.HasSuffix(hostsContent, "\n") {
 		hostsContent += "\n"
 	}

-	// 3. Upload new /etc/hosts
-	out, _ := client.Run(rwCmd)
-	logs += rwCmd + ": " + out + "\n"
-	// Backup /etc/hosts if it doesn't exist
-	if _, err := client.Run("[ -f /etc/hosts.original ]"); err != nil {
-		out, _ := client.Run("cp /etc/hosts /etc/hosts.original")
-		logs += "cp /etc/hosts /etc/hosts.original: " + out + "\n"
+	return hostsContent
+}
+
+func (m *Manager) verifyHosts(client SSHClient, domains []string, hostIP, deviceIP string) error {
+	verification, err := client.Run("cat /etc/hosts")
+	if err != nil {
+		return fmt.Errorf("could not verify /etc/hosts on device: %w", err)
 	}

-	if err := client.UploadContent([]byte(hostsContent), "/etc/hosts"); err != nil {
-		return logs, fmt.Errorf("failed to update /etc/hosts: %w", err)
-	}
-
-	logs += "Uploaded updated /etc/hosts\n"
-
-	fmt.Printf("Updated /etc/hosts on %s:\n%s\n", deviceIP, hostsContent)
-
-	// 4. Inject CA Certificate
-	summary := &MigrationSummary{}
-	m.checkCACertTrusted(summary, deviceIP)
-
-	if !summary.CACertTrusted {
-		out, err := m.TrustCACert(deviceIP)
-
-		logs += "Trusting CA:\n" + out + "\n"
-		if err != nil {
-			return logs, err
+	for _, domain := range domains {
+		if !strings.Contains(verification, domain) || !strings.Contains(verification, hostIP) {
+			return fmt.Errorf("verification failed: /etc/hosts on %s does not contain expected redirection for %s", deviceIP, domain)
 		}
-	} else {
-		logs += "CA certificate already trusted, skipping injection\n"
-
-		fmt.Printf("CA certificate already trusted on %s, skipping injection\n", deviceIP)
 	}

-	return logs, nil
+	return nil
 }

 func (m *Manager) migrateViaResolvConf(deviceIP, targetURL string) (string, error) {
@@ -1063,64 +1137,55 @@ func (m *Manager) migrateViaResolvConf(deviceIP, targetURL string) (string, erro
 	hostIP := m.resolveIP(hostName, client)
 	logs += fmt.Sprintf("Resolved %s to %s\n", hostName, hostIP)

-	// 2. Prepare /etc/resolv.conf content
-	// We prepend our nameserver to the existing ones
-	resolvConf, err := client.Run("cat /etc/resolv.conf")
+	// 2. Prepare /mnt/nv/soundtouch-service/aftertouch.resolv.conf content
+	resolvContent := fmt.Sprintf("# Created by Aftertouch/SoundTouch-Service\n# Priority nameserver for Bose service redirection\nnameserver %s\n", hostIP)
+
+	// 3. Upload /mnt/nv/soundtouch-service/aftertouch.resolv.conf
+	// Ensure /mnt/nv/soundtouch-service exists
+	_, _ = client.Run("mkdir -p /mnt/nv/soundtouch-service")
+
+	if uploadErr := client.UploadContent([]byte(resolvContent), "/mnt/nv/soundtouch-service/aftertouch.resolv.conf"); uploadErr != nil {
+		return logs, fmt.Errorf("failed to upload /mnt/nv/soundtouch-service/aftertouch.resolv.conf: %w", uploadErr)
+	}
+
+	logs += "Uploaded /mnt/nv/soundtouch-service/aftertouch.resolv.conf\n"
+
+	// 4. Update /mnt/nv/rc.local with idempotent patch
+	patchOut, err := m.updateRcLocalWithDNSHook(client)
+	logs += patchOut

-	logs += "cat /etc/resolv.conf: " + resolvConf + "\n"
 	if err != nil {
-		return logs, fmt.Errorf("failed to read /etc/resolv.conf: %w", err)
+		return logs, err
 	}

-	lines := strings.Split(resolvConf, "\n")
+	// 5. Cleanup legacy file
+	_, _ = client.Run("rm -f /mnt/nv/aftertouch.resolv.conf")

-	var newLines []string
+	// 6. Apply patch immediately to /etc/udhcpc.d/50default
+	rwOut, _ := client.Run(rwCmd)
+	logs += rwCmd + ": " + rwOut + "\n"

-	newLines = append(newLines, "# Added by AfterTouch migration")
-	newLines = append(newLines, fmt.Sprintf("nameserver %s", hostIP))
+	hookMarker := "/mnt/nv/soundtouch-service/aftertouch.resolv.conf"
+	targetDHCPFile := "/etc/udhcpc.d/50default"
+	dhcpPatchOut, err := m.patchDHCPFile(client, targetDHCPFile, hookMarker)
+	logs += dhcpPatchOut

-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "nameserver") {
-			fields := strings.Fields(trimmed)
-			if len(fields) >= 2 && fields[1] == hostIP {
-				// Avoid duplicate nameserver entry
-				continue
-			}
+	if err != nil {
+		logs += fmt.Sprintf("Warning: could not apply/verify patch on %s: %v\n", targetDHCPFile, err)
+	}
+
+	// Apply patch immediately to /opt/Bose/udhcpc.script if it exists
+	targetScript := "/opt/Bose/udhcpc.script"
+	if _, err := client.Run(fmt.Sprintf("[ -f %s ]", targetScript)); err == nil {
+		scriptPatchOut, err := m.patchUdhcpcScript(client, targetScript, hookMarker)
+		logs += scriptPatchOut
+
+		if err != nil {
+			logs += fmt.Sprintf("Warning: could not apply/verify patch on %s: %v\n", targetScript, err)
 		}
-
-		newLines = append(newLines, line)
 	}

-	resolvConf = strings.Join(newLines, "\n")
-	if !strings.HasSuffix(resolvConf, "\n") {
-		resolvConf += "\n"
-	}
-
-	// 3. Upload new /etc/resolv.conf
-	out, _ := client.Run(rwCmd)
-	logs += rwCmd + ": " + out + "\n"
-
-	// Backup /etc/resolv.conf if it doesn't exist
-	if _, err := client.Run("[ -f /etc/resolv.conf.original ]"); err != nil {
-		out, _ := client.Run("cp /etc/resolv.conf /etc/resolv.conf.original")
-		logs += "cp /etc/resolv.conf /etc/resolv.conf.original: " + out + "\n"
-	}
-
-	if err := client.UploadContent([]byte(resolvConf), "/etc/resolv.conf"); err != nil {
-		return logs, fmt.Errorf("failed to update /etc/resolv.conf: %w", err)
-	}
-
-	logs += "Uploaded updated /etc/resolv.conf\n"
-
-	// 3b. Make it immutable if chattr is available
-	if _, err := client.Run("chattr +i /etc/resolv.conf"); err == nil {
-		logs += "Made /etc/resolv.conf immutable with chattr +i\n"
-	}
-
-	fmt.Printf("Updated /etc/resolv.conf on %s:\n%s\n", deviceIP, resolvConf)
-
-	// 4. Inject CA Certificate
+	// 6. Inject CA Certificate
 	summary := &MigrationSummary{}
 	m.checkCACertTrusted(summary, deviceIP)

@@ -1138,6 +1203,167 @@ func (m *Manager) migrateViaResolvConf(deviceIP, targetURL string) (string, erro
 	return logs, nil
 }

+func (m *Manager) updateRcLocalWithDNSHook(client SSHClient) (string, error) {
+	var logs string
+
+	rcLocalPath := "/mnt/nv/rc.local"
+	targetDHCPFile := "/etc/udhcpc.d/50default"
+	hookMarker := "/mnt/nv/soundtouch-service/aftertouch.resolv.conf"
+
+	// Check if rc.local exists and read it
+	currentRcLocal, rcErr := client.Run(fmt.Sprintf("cat %s", rcLocalPath))
+	if rcErr != nil {
+		currentRcLocal = ""
+	}
+
+	if strings.Contains(currentRcLocal, hookMarker) {
+		return fmt.Sprintf("%s already contains Aftertouch hook logic\n", rcLocalPath), nil
+	}
+
+	patchStartMarker := "# --- Aftertouch DNS hook START ---"
+	patchEndMarker := "# --- Aftertouch DNS hook END ---"
+
+	patchLogic := fmt.Sprintf(`
+%s
+# prioritizes our custom nameserver if it exists
+if [ -f "%s" ]; then
+    if [ -f "%s" ] && ! grep -q "%s" "%s"; then
+        logger -t "aftertouch" "Patching %s with Aftertouch DNS hook"
+        sed -i '/echo "search \$domain"/a \        [ -f '"%s"' ] && cat '"%s"' && dns=""' "%s"
+    fi
+    targetScript="/opt/Bose/udhcpc.script"
+    if [ -f "$targetScript" ] && ! grep -q "%s" "$targetScript"; then
+        logger -t "aftertouch" "Patching $targetScript with Aftertouch DNS hook"
+        sed -i '/echo "search \$search_list # \$interface" >> \$RESOLV_CONF/a \                [ -f '"%s"' ] && cat '"%s"' >> '"\$RESOLV_CONF"' && dns=""' "$targetScript"
+    fi
+fi
+%s
+`, patchStartMarker, hookMarker, targetDHCPFile, hookMarker, targetDHCPFile, targetDHCPFile, hookMarker, hookMarker, targetDHCPFile, hookMarker, hookMarker, hookMarker, patchEndMarker)
+
+	newRcLocal := currentRcLocal
+	// Remove old-style DNS hook if it exists
+	if strings.Contains(newRcLocal, "# Aftertouch DNS hook") && !strings.Contains(newRcLocal, patchStartMarker) {
+		// Old removal: filter out lines between the marker and the first 'fi'
+		lines := strings.Split(newRcLocal, "\n")
+
+		var filteredLines []string
+
+		skip := false
+
+		for _, line := range lines {
+			if strings.Contains(line, "# Aftertouch DNS hook") {
+				skip = true
+				continue
+			}
+
+			if skip && strings.TrimSpace(line) == "fi" {
+				skip = false
+				continue
+			}
+
+			if !skip {
+				filteredLines = append(filteredLines, line)
+			}
+		}
+
+		newRcLocal = strings.Join(filteredLines, "\n")
+	}
+
+	// Remove existing marker-based hook if it exists (for update)
+	if strings.Contains(newRcLocal, patchStartMarker) {
+		startIdx := strings.Index(newRcLocal, patchStartMarker)
+
+		endIdx := strings.Index(newRcLocal, patchEndMarker)
+		if startIdx != -1 && endIdx != -1 {
+			newRcLocal = newRcLocal[:startIdx] + newRcLocal[endIdx+len(patchEndMarker):]
+		}
+	}
+	// Remove "cat: can't open..." error message if it was accidentally saved in the file
+	if strings.Contains(newRcLocal, "cat: can't open") {
+		newRcLocal = ""
+	}
+
+	if !strings.HasPrefix(newRcLocal, "#!/bin/sh") {
+		newRcLocal = "#!/bin/sh\n" + strings.TrimPrefix(newRcLocal, "#!/bin/sh")
+	}
+
+	if !strings.HasSuffix(newRcLocal, "\n") {
+		newRcLocal += "\n"
+	}
+
+	newRcLocal += patchLogic
+
+	if err := client.UploadContent([]byte(newRcLocal), rcLocalPath); err != nil {
+		return logs, fmt.Errorf("failed to update %s: %w", rcLocalPath, err)
+	}
+
+	logs += fmt.Sprintf("Updated %s with DNS hook logic\n", rcLocalPath)
+
+	// Make it executable
+	_, _ = client.Run(fmt.Sprintf("chmod +x %s", rcLocalPath))
+
+	return logs, nil
+}
+
+func (m *Manager) patchDHCPFile(client SSHClient, targetDHCPFile, hookMarker string) (string, error) {
+	var logs string
+
+	// Backup if it doesn't exist
+	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", targetDHCPFile)); err != nil {
+		out, _ := client.Run(fmt.Sprintf("cp %s %s.original", targetDHCPFile, targetDHCPFile))
+		logs += fmt.Sprintf("cp %s %s.original: %s\n", targetDHCPFile, targetDHCPFile, out)
+	} else {
+		// If backup exists, revert to it first to ensure we start from a clean state
+		_, _ = client.Run(fmt.Sprintf("cp %s.original %s", targetDHCPFile, targetDHCPFile))
+	}
+
+	// Run the patch logic via SSH to apply it now
+	patchCmd := fmt.Sprintf("sed -i '/echo \"search \\$domain\"/a \\        [ -f '\"%s\"' ] && cat '\"%s\"' && dns=\"\"' %s", hookMarker, hookMarker, targetDHCPFile)
+	if _, err := client.Run(patchCmd); err != nil {
+		return logs, fmt.Errorf("failed to apply patch immediately to %s: %w", targetDHCPFile, err)
+	}
+
+	logs += fmt.Sprintf("Applied patch to %s\n", targetDHCPFile)
+
+	// Verify patch on 50default
+	if verification, err := client.Run(fmt.Sprintf("grep -q \"%s\" %s && echo \"OK\"", hookMarker, targetDHCPFile)); err == nil && strings.TrimSpace(verification) == "OK" {
+		logs += fmt.Sprintf("Verified patch on %s\n", targetDHCPFile)
+	} else {
+		return logs, fmt.Errorf("could not verify patch on %s: %w", targetDHCPFile, err)
+	}
+
+	return logs, nil
+}
+
+func (m *Manager) patchUdhcpcScript(client SSHClient, targetScript, hookMarker string) (string, error) {
+	var logs string
+
+	// Backup if it doesn't exist
+	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", targetScript)); err != nil {
+		out, _ := client.Run(fmt.Sprintf("cp %s %s.original", targetScript, targetScript))
+		logs += fmt.Sprintf("cp %s %s.original: %s\n", targetScript, targetScript, out)
+	} else {
+		// If backup exists, revert to it first to ensure we start from a clean state
+		_, _ = client.Run(fmt.Sprintf("cp %s.original %s", targetScript, targetScript))
+	}
+
+	patchCmdScript := fmt.Sprintf("sed -i '/echo \"search \\$search_list # \\$interface\" >> \\$RESOLV_CONF/a \\                [ -f '\"%s\"' ] && cat '\"%s\"' >> '\"\\$RESOLV_CONF\"' && dns=\"\"' %s", hookMarker, hookMarker, targetScript)
+	if _, err := client.Run(patchCmdScript); err != nil {
+		return logs, fmt.Errorf("failed to apply patch immediately to %s: %w", targetScript, err)
+	}
+
+	logs += fmt.Sprintf("Applied patch to %s\n", targetScript)
+
+	// Verify patch on udhcpc.script
+	if verification, err := client.Run(fmt.Sprintf("grep -q \"%s\" %s && echo \"OK\"", hookMarker, targetScript)); err == nil && strings.TrimSpace(verification) == "OK" {
+		logs += fmt.Sprintf("Verified patch on %s\n", targetScript)
+	} else {
+		return logs, fmt.Errorf("could not verify patch on %s: %w", targetScript, err)
+	}
+
+	return logs, nil
+}
+
 // RevertMigration reverts the speaker to its original Bose cloud configuration.
 func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 	client := m.NewSSH(deviceIP)
@@ -1146,6 +1372,31 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 	var logs string

 	// 1. Revert SoundTouchSdkPrivateCfg.xml
+	out, err := m.revertXMLConfig(client, rwCmd)
+
+	logs += out
+	if err != nil {
+		return logs, err
+	}
+
+	// 2. Revert /etc/hosts
+	logs += m.revertHosts(client, rwCmd)
+
+	// 2b. Revert /etc/resolv.conf
+	logs += m.revertResolvConf(client, rwCmd)
+
+	// 2c. Revert Aftertouch DNS Hook
+	logs += m.revertAftertouchHook(client, rwCmd)
+
+	// 3. Remove CA certificate from trust store if it exists
+	logs += m.revertCACert(client, rwCmd)
+
+	return logs, nil
+}
+
+func (m *Manager) revertXMLConfig(client SSHClient, rwCmd string) (string, error) {
+	var logs string
+
 	remotePath := SoundTouchSdkPrivateCfgPath
 	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", remotePath)); err == nil {
 		logs += fmt.Sprintf("Reverting %s from backup\n", remotePath)
@@ -1160,7 +1411,12 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 		return logs, fmt.Errorf("backup %s.original not found, cannot revert", remotePath)
 	}

-	// 2. Revert /etc/hosts
+	return logs, nil
+}
+
+func (m *Manager) revertHosts(client SSHClient, rwCmd string) string {
+	var logs string
+
 	hostsPath := "/etc/hosts"
 	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", hostsPath)); err == nil {
 		logs += fmt.Sprintf("Reverting %s from backup\n", hostsPath)
@@ -1169,12 +1425,16 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {

 		logs += fmt.Sprintf("cp %s.original %s: %s\n", hostsPath, hostsPath, out)
 		if err != nil {
-			// Don't return error here, try to continue with other reverts
 			fmt.Printf("Warning: failed to revert %s: %v\n", hostsPath, err)
 		}
 	}

-	// 2b. Revert /etc/resolv.conf
+	return logs
+}
+
+func (m *Manager) revertResolvConf(client SSHClient, rwCmd string) string {
+	var logs string
+
 	resolvPath := "/etc/resolv.conf"
 	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", resolvPath)); err == nil {
 		logs += fmt.Sprintf("Reverting %s from backup\n", resolvPath)
@@ -1191,7 +1451,144 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 		}
 	}

-	// 3. Remove CA certificate from trust store if it exists
+	return logs
+}
+
+func (m *Manager) revertAftertouchHook(client SSHClient, rwCmd string) string {
+	var logs string
+
+	aftertouchConfPath := "/mnt/nv/soundtouch-service/aftertouch.resolv.conf"
+	legacyConfPath := "/mnt/nv/aftertouch.resolv.conf"
+	rcLocalPath := "/mnt/nv/rc.local"
+	targetDHCPFile := "/etc/udhcpc.d/50default"
+
+	for _, p := range []string{aftertouchConfPath, legacyConfPath} {
+		if _, err := client.Run(fmt.Sprintf("[ -f %s ]", p)); err == nil {
+			logs += fmt.Sprintf("Removing %s\n", p)
+			fmt.Printf("Removing %s\n", p)
+			_, _ = client.Run(fmt.Sprintf("rm %s", p))
+		}
+	}
+
+	logs += m.removeRcLocalHooks(client, rcLocalPath)
+
+	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", targetDHCPFile)); err == nil {
+		logs += fmt.Sprintf("Reverting %s from backup\n", targetDHCPFile)
+		fmt.Printf("Reverting %s from backup\n", targetDHCPFile)
+		out, err := client.Run(fmt.Sprintf("%s && cp %s.original %s", rwCmd, targetDHCPFile, targetDHCPFile))
+
+		logs += fmt.Sprintf("cp %s.original %s: %s\n", targetDHCPFile, targetDHCPFile, out)
+		if err != nil {
+			fmt.Printf("Warning: failed to revert %s: %v\n", targetDHCPFile, err)
+		}
+	}
+
+	targetScript := "/opt/Bose/udhcpc.script"
+	if _, err := client.Run(fmt.Sprintf("[ -f %s.original ]", targetScript)); err == nil {
+		logs += fmt.Sprintf("Reverting %s from backup\n", targetScript)
+		fmt.Printf("Reverting %s from backup\n", targetScript)
+		out, err := client.Run(fmt.Sprintf("%s && cp %s.original %s", rwCmd, targetScript, targetScript))
+
+		logs += fmt.Sprintf("cp %s.original %s: %s\n", targetScript, targetScript, out)
+		if err != nil {
+			fmt.Printf("Warning: failed to revert %s: %v\n", targetScript, err)
+		}
+	}
+
+	return logs
+}
+
+func (m *Manager) removeRcLocalHooks(client SSHClient, rcLocalPath string) string {
+	var logs string
+
+	patchStartMarker := "# --- Aftertouch DNS hook START ---"
+	patchEndMarker := "# --- Aftertouch DNS hook END ---"
+	spotifyPatchStartMarker := "# --- Aftertouch Spotify hook START ---"
+	spotifyPatchEndMarker := "# --- Aftertouch Spotify hook END ---"
+	aftertouchConfPath := "/mnt/nv/soundtouch-service/aftertouch.resolv.conf"
+	legacyAftertouchConfPath := "/mnt/nv/aftertouch.resolv.conf"
+
+	currentRcLocal, err := client.Run(fmt.Sprintf("cat %s", rcLocalPath))
+	if err != nil {
+		return ""
+	}
+
+	// Remove "cat: can't open..." error message if it was accidentally saved in the file
+	if strings.Contains(currentRcLocal, "cat: can't open") {
+		logs += fmt.Sprintf("Removing corrupted %s\n", rcLocalPath)
+		_, _ = client.Run(fmt.Sprintf("rm %s", rcLocalPath))
+
+		return logs
+	}
+
+	modified := false
+
+	if strings.Contains(currentRcLocal, patchStartMarker) {
+		logs += fmt.Sprintf("Removing Aftertouch hook logic from %s\n", rcLocalPath)
+		fmt.Printf("Removing Aftertouch hook logic from %s\n", rcLocalPath)
+
+		startIdx := strings.Index(currentRcLocal, patchStartMarker)
+		endIdx := strings.Index(currentRcLocal, patchEndMarker)
+
+		if startIdx != -1 && endIdx != -1 {
+			currentRcLocal = currentRcLocal[:startIdx] + currentRcLocal[endIdx+len(patchEndMarker):]
+			modified = true
+		}
+	} else if strings.Contains(currentRcLocal, aftertouchConfPath) || strings.Contains(currentRcLocal, legacyAftertouchConfPath) || strings.Contains(currentRcLocal, "# Aftertouch DNS hook") {
+		logs += fmt.Sprintf("Removing legacy Aftertouch hook logic from %s\n", rcLocalPath)
+		fmt.Printf("Removing legacy Aftertouch hook logic from %s\n", rcLocalPath)
+
+		lines := strings.Split(currentRcLocal, "\n")
+
+		var newLines []string
+
+		skip := false
+
+		for _, line := range lines {
+			if strings.Contains(line, "# Aftertouch DNS hook") {
+				skip = true
+				continue
+			}
+
+			if skip && strings.TrimSpace(line) == "fi" {
+				skip = false
+				continue
+			}
+
+			if !skip {
+				newLines = append(newLines, line)
+			}
+		}
+
+		currentRcLocal = strings.Join(newLines, "\n")
+		modified = true
+	}
+
+	if strings.Contains(currentRcLocal, spotifyPatchStartMarker) {
+		logs += fmt.Sprintf("Removing Spotify hook logic from %s\n", rcLocalPath)
+		fmt.Printf("Removing Spotify hook logic from %s\n", rcLocalPath)
+
+		startIdx := strings.Index(currentRcLocal, spotifyPatchStartMarker)
+		endIdx := strings.Index(currentRcLocal, spotifyPatchEndMarker)
+
+		if startIdx != -1 && endIdx != -1 {
+			currentRcLocal = currentRcLocal[:startIdx] + currentRcLocal[endIdx+len(spotifyPatchEndMarker):]
+			modified = true
+		}
+	}
+
+	if modified {
+		if err := client.UploadContent([]byte(currentRcLocal), rcLocalPath); err != nil {
+			fmt.Printf("Warning: failed to update %s: %v\n", rcLocalPath, err)
+		}
+	}
+
+	return logs
+}
+
+func (m *Manager) revertCACert(client SSHClient, rwCmd string) string {
+	var logs string
+
 	bundlePath := "/etc/pki/tls/certs/ca-bundle.crt"
 	if bundleContent, err := client.Run(fmt.Sprintf("cat %s", bundlePath)); err == nil && strings.Contains(bundleContent, CALabel) {
 		logs += fmt.Sprintf("Removing local CA certificate from %s\n", bundlePath)
@@ -1222,6 +1619,7 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 		out, _ := client.Run(rwCmd)

 		logs += rwCmd + ": " + out + "\n"
+
 		if err := client.UploadContent([]byte(bundleContent), bundlePath); err != nil {
 			logs += "Warning: failed to remove CA from " + bundlePath + ": " + err.Error() + "\n"
 			fmt.Printf("Warning: failed to remove CA from %s: %v\n", bundlePath, err)
@@ -1230,7 +1628,7 @@ func (m *Manager) RevertMigration(deviceIP string) (string, error) {
 		}
 	}

-	return logs, nil
+	return logs
 }

 // RemoveRemoteServices removes remote services from the device by deleting the known remote_services files.
@@ -52,6 +52,10 @@ func TestMigrateViaHosts(t *testing.T) {
 			runFunc: func(command string) (string, error) {
 				runCalls = append(runCalls, command)
 				if command == "cat /etc/hosts" {
+					// Handle both initial read and verification read
+					if len(runCalls) > 2 { // Rough heuristic: verification happens after upload
+						return "192.168.1.100\tstreaming.bose.com\n192.168.1.100\tupdates.bose.com\n192.168.1.100\tstats.bose.com\n192.168.1.100\tbmx.bose.com\n192.168.1.100\tcontent.api.bose.io\n192.168.1.100\tevents.api.bosecm.com\n192.168.1.100\tbose-prod.apigee.net\n192.168.1.100\tworldwide.bose.com", nil
+					}
 					return "127.0.0.1 localhost", nil
 				}
 				if strings.HasPrefix(command, "[ -f") {
@@ -122,9 +126,14 @@ func TestMigrateViaHosts_UpdateExisting(t *testing.T) {
 	m := NewManager("http://192.168.1.100:8000", nil, cm)

 	m.NewSSH = func(host string) SSHClient {
+		runCount := 0
 		return &mockSSH{
 			runFunc: func(command string) (string, error) {
+				runCount++
 				if command == "cat /etc/hosts" {
+					if runCount > 1 {
+						return "127.0.0.1 localhost\n192.168.1.100\tstreaming.bose.com\n192.168.1.100\tupdates.bose.com\n192.168.1.100\tstats.bose.com\n192.168.1.100\tbmx.bose.com\n192.168.1.100\tcontent.api.bose.io\n192.168.1.100\tevents.api.bosecm.com\n192.168.1.100\tbose-prod.apigee.net\n192.168.1.100\tworldwide.bose.com", nil
+					}
 					return "127.0.0.1 localhost\n1.2.3.4\tstreaming.bose.com\n1.2.3.4\tupdates.bose.com", nil
 				}
 				if strings.HasPrefix(command, "[ -f") {
@@ -265,9 +274,9 @@ func TestGetMigrationSummary_WithProxyOptions(t *testing.T) {
 		t.Errorf("Expected default marge URL when SSH fails, got: %s", summary.PlannedConfig)
 	}

-	// Test PlannedHosts
-	if !contains(summary.PlannedHosts, "target\tstreaming.bose.com") {
-		t.Errorf("Expected PlannedHosts to contain redirect for target, got: %s", summary.PlannedHosts)
+	// Test PlannedResolv
+	if !contains(summary.PlannedResolv, "nameserver target") {
+		t.Errorf("Expected PlannedResolv to contain nameserver target, got: %s", summary.PlannedResolv)
 	}
 }

@@ -598,6 +607,10 @@ func TestMigrateViaHosts_SkipCAIfTrusted(t *testing.T) {
 			runFunc: func(command string) (string, error) {
 				runCalls = append(runCalls, command)
 				if command == "cat /etc/hosts" {
+					// Handle both initial read and verification read
+					if len(runCalls) > 2 { // Rough heuristic: verification happens after upload
+						return "192.168.1.100\tstreaming.bose.com\n192.168.1.100\tupdates.bose.com\n192.168.1.100\tstats.bose.com\n192.168.1.100\tbmx.bose.com\n192.168.1.100\tcontent.api.bose.io\n192.168.1.100\tevents.api.bosecm.com\n192.168.1.100\tbose-prod.apigee.net\n192.168.1.100\tworldwide.bose.com", nil
+					}
 					return "127.0.0.1 localhost", nil
 				}
 				if strings.HasPrefix(command, "grep -F") {
@@ -701,9 +714,14 @@ func TestRevertMigration(t *testing.T) {
 				if command == "cat /etc/pki/tls/certs/ca-bundle.crt" {
 					return "existing content\n" + CALabel + "\nCERT DATA\n" + CALabel + "\nmore content", nil
 				}
+				if command == "cat /mnt/nv/rc.local" {
+					return "#!/bin/sh\n# Aftertouch DNS hook\nlogic\nfi\n", nil
+				}
 				// Mock file existence checks for .original files
-				if strings.HasPrefix(command, "[ -f") && strings.Contains(command, ".original") {
-					return "", nil // file exists
+				if strings.HasPrefix(command, "[ -f") {
+					if strings.Contains(command, ".original") || strings.Contains(command, "/mnt/nv/soundtouch-service/aftertouch.resolv.conf") || strings.Contains(command, "/mnt/nv/aftertouch.resolv.conf") {
+						return "", nil // file exists
+					}
 				}
 				return "", nil
 			},
@@ -725,6 +743,9 @@ func TestRevertMigration(t *testing.T) {
 	foundResolvRevert := false
 	foundChattrRemove := false
 	foundReboot := false
+	foundAftertouchConfRemove := false
+	foundDHCPRevert := false
+
 	for _, call := range runCalls {
 		if strings.Contains(call, "cp "+SoundTouchSdkPrivateCfgPath+".original "+SoundTouchSdkPrivateCfgPath) {
 			foundXMLRevert = true
@@ -741,6 +762,12 @@ func TestRevertMigration(t *testing.T) {
 		if strings.Contains(call, "reboot") {
 			foundReboot = true
 		}
+		if strings.Contains(call, "rm /mnt/nv/aftertouch.resolv.conf") {
+			foundAftertouchConfRemove = true
+		}
+		if strings.Contains(call, "cp /etc/udhcpc.d/50default.original /etc/udhcpc.d/50default") {
+			foundDHCPRevert = true
+		}
 	}

 	if !foundXMLRevert {
@@ -755,10 +782,25 @@ func TestRevertMigration(t *testing.T) {
 	if !foundChattrRemove {
 		t.Errorf("Expected chattr -i /etc/resolv.conf")
 	}
+	if !foundAftertouchConfRemove {
+		t.Errorf("Expected /mnt/nv/aftertouch.resolv.conf removal")
+	}
+	if !foundDHCPRevert {
+		t.Errorf("Expected /etc/udhcpc.d/50default revert")
+	}
 	if foundReboot {
 		t.Errorf("Expected reboot NOT to be called automatically during revert")
 	}

+	// Verify rc.local cleanup
+	if content, ok := uploadCalls["/mnt/nv/rc.local"]; ok {
+		if strings.Contains(content, "# Aftertouch DNS hook") {
+			t.Errorf("Expected Aftertouch hook to be removed from rc.local, got: %s", content)
+		}
+	} else {
+		t.Errorf("Expected rc.local to be updated")
+	}
+
 	// Verify RemoveRemoteServices was NOT called
 	for _, call := range runCalls {
 		if strings.Contains(call, "rm -f /etc/remote_services") {
@@ -779,6 +821,47 @@ func TestRevertMigration(t *testing.T) {
 	}
 }

+func TestRevertMigration_CorruptedRcLocal(t *testing.T) {
+	m := NewManager("http://localhost:8000", nil, nil)
+
+	runCalls := []string{}
+	m.NewSSH = func(host string) SSHClient {
+		return &mockSSH{
+			runFunc: func(command string) (string, error) {
+				runCalls = append(runCalls, command)
+				if command == "cat /mnt/nv/rc.local" {
+					return "cat: can't open '/mnt/nv/rc.local': No such file or directory", nil
+				}
+				if strings.HasPrefix(command, "[ -f") {
+					if strings.Contains(command, ".original") {
+						if strings.Contains(command, "SoundTouchSdkPrivateCfg.xml") {
+							return "", nil // Pretend XML backup exists to satisfy RevertMigration
+						}
+						return "", fmt.Errorf("not found")
+					}
+				}
+				return "", nil
+			},
+		}
+	}
+
+	_, err := m.RevertMigration("192.168.1.10")
+	if err != nil {
+		t.Fatalf("RevertMigration failed: %v", err)
+	}
+
+	foundRmRcLocal := false
+	for _, call := range runCalls {
+		if call == "rm /mnt/nv/rc.local" {
+			foundRmRcLocal = true
+			break
+		}
+	}
+	if !foundRmRcLocal {
+		t.Errorf("Expected corrupted rc.local to be removed")
+	}
+}
+
 func TestRevertMigration_NoBackup(t *testing.T) {
 	m := NewManager("http://localhost:8000", nil, nil)

@@ -1036,30 +1119,25 @@ func TestMigrateViaResolvConf(t *testing.T) {
 	m := NewManager("http://192.168.1.100:8000", nil, cm)

 	runCalls := []string{}
+	uploads := make(map[string]string)
+
 	m.NewSSH = func(host string) SSHClient {
 		return &mockSSH{
 			runFunc: func(command string) (string, error) {
 				runCalls = append(runCalls, command)
-				if command == "cat /etc/resolv.conf" {
-					return "nameserver 8.8.8.8", nil
+				if command == "cat /mnt/nv/rc.local" {
+					return "#!/bin/sh\n", nil
+				}
+				if strings.HasPrefix(command, "grep -q \"/mnt/nv/soundtouch-service/aftertouch.resolv.conf\"") {
+					return "OK", nil
 				}
 				if strings.HasPrefix(command, "[ -f") {
 					return "", fmt.Errorf("file not found")
 				}
-				if strings.HasPrefix(command, "grep -F") {
-					return "", fmt.Errorf("not found")
-				}
 				return "", nil
 			},
 			uploadContentFunc: func(content []byte, remotePath string) error {
-				if remotePath == "/etc/resolv.conf" {
-					if !strings.Contains(string(content), "nameserver 192.168.1.100") {
-						t.Errorf("Expected resolv.conf content to contain nameserver, got %s", string(content))
-					}
-					if !strings.Contains(string(content), "nameserver 8.8.8.8") {
-						t.Errorf("Expected resolv.conf content to retain old nameserver, got %s", string(content))
-					}
-				}
+				uploads[remotePath] = string(content)
 				return nil
 			},
 		}
@@ -1070,27 +1148,223 @@ func TestMigrateViaResolvConf(t *testing.T) {
 		t.Fatalf("migrateViaResolvConf failed: %v", err)
 	}

-	// Verify backups were attempted
-	foundResolvBackup := false
-	for _, call := range runCalls {
-		if strings.Contains(call, "cp /etc/resolv.conf /etc/resolv.conf.original") {
-			foundResolvBackup = true
-		}
-	}
-	if !foundResolvBackup {
-		t.Errorf("Expected /etc/resolv.conf backup to be attempted")
+	// Verify uploads
+	if !strings.Contains(uploads["/mnt/nv/soundtouch-service/aftertouch.resolv.conf"], "nameserver 192.168.1.100") {
+		t.Errorf("aftertouch.resolv.conf missing nameserver")
 	}

-	// Verify chattr +i was attempted
-	foundChattr := false
+	if !strings.Contains(uploads["/mnt/nv/rc.local"], "/mnt/nv/soundtouch-service/aftertouch.resolv.conf") {
+		t.Errorf("rc.local missing hook logic")
+	}
+
+	// Verify immediate patch
+	foundPatch := false
 	for _, call := range runCalls {
-		if strings.Contains(call, "chattr +i /etc/resolv.conf") {
-			foundChattr = true
+		if strings.Contains(call, "sed -i") && strings.Contains(call, "/etc/udhcpc.d/50default") {
+			foundPatch = true
 			break
 		}
 	}
-	if !foundChattr {
-		t.Errorf("Expected chattr +i /etc/resolv.conf to be attempted")
+	if !foundPatch {
+		t.Errorf("Expected immediate patch to /etc/udhcpc.d/50default")
+	}
+}
+
+func TestMigrateViaResolvConf_CorruptedRcLocal(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "setup-test-resolv-corrupted")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs"))
+	if err := cm.EnsureCA(); err != nil {
+		t.Fatalf("Failed to ensure CA: %v", err)
+	}
+
+	m := NewManager("http://192.168.1.100:8000", nil, cm)
+
+	uploads := make(map[string]string)
+
+	m.NewSSH = func(host string) SSHClient {
+		return &mockSSH{
+			runFunc: func(command string) (string, error) {
+				if command == "cat /mnt/nv/rc.local" {
+					// Simulate corrupted file containing error message
+					return "cat: can't open '/mnt/nv/rc.local': No such file or directory", nil
+				}
+				if strings.HasPrefix(command, "grep -q \"/mnt/nv/soundtouch-service/aftertouch.resolv.conf\"") {
+					return "OK", nil
+				}
+				if strings.HasPrefix(command, "[ -f") {
+					return "", fmt.Errorf("file not found")
+				}
+				return "", nil
+			},
+			uploadContentFunc: func(content []byte, remotePath string) error {
+				uploads[remotePath] = string(content)
+				return nil
+			},
+		}
+	}
+
+	_, err = m.migrateViaResolvConf("192.168.1.10", "http://192.168.1.100:8000")
+	if err != nil {
+		t.Fatalf("migrateViaResolvConf failed: %v", err)
+	}
+
+	// Verify uploads - rc.local should have been sanitized and only contain shebang and hook
+	rcLocal := uploads["/mnt/nv/rc.local"]
+	if strings.Contains(rcLocal, "cat: can't open") {
+		t.Errorf("rc.local still contains corrupted content: %s", rcLocal)
+	}
+	if !strings.HasPrefix(rcLocal, "#!/bin/sh") {
+		t.Errorf("rc.local missing shebang: %s", rcLocal)
+	}
+	if !strings.Contains(rcLocal, "/mnt/nv/soundtouch-service/aftertouch.resolv.conf") {
+		t.Errorf("rc.local missing hook logic: %s", rcLocal)
+	}
+}
+
+func TestMigrateViaResolvConf_UdhcpcScript(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "setup-test-resolv-script")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	cm := certmanager.NewCertificateManager(filepath.Join(tempDir, "certs"))
+	if err := cm.EnsureCA(); err != nil {
+		t.Fatalf("Failed to ensure CA: %v", err)
+	}
+
+	m := NewManager("http://192.168.1.100:8000", nil, cm)
+
+	runCalls := []string{}
+	uploads := make(map[string]string)
+
+	targetScript := "/opt/Bose/udhcpc.script"
+
+	m.NewSSH = func(host string) SSHClient {
+		return &mockSSH{
+			runFunc: func(command string) (string, error) {
+				runCalls = append(runCalls, command)
+				if command == "cat /mnt/nv/rc.local" {
+					return "#!/bin/sh\n", nil
+				}
+				if strings.HasPrefix(command, "grep -q \"/mnt/nv/soundtouch-service/aftertouch.resolv.conf\"") {
+					return "OK", nil
+				}
+				if command == "[ -f "+targetScript+" ]" {
+					return "", nil // file exists
+				}
+				if strings.HasPrefix(command, "[ -f") {
+					return "", fmt.Errorf("file not found")
+				}
+				return "", nil
+			},
+			uploadContentFunc: func(content []byte, remotePath string) error {
+				uploads[remotePath] = string(content)
+				return nil
+			},
+		}
+	}
+
+	_, err = m.migrateViaResolvConf("192.168.1.10", "http://192.168.1.100:8000")
+	if err != nil {
+		t.Fatalf("migrateViaResolvConf failed: %v", err)
+	}
+
+	// Verify immediate patch to udhcpc.script
+	foundPatch := false
+	for _, call := range runCalls {
+		if strings.Contains(call, "sed -i") && strings.Contains(call, targetScript) {
+			foundPatch = true
+			break
+		}
+	}
+	if !foundPatch {
+		t.Errorf("Expected immediate patch to %s", targetScript)
+	}
+
+	// Verify rc.local contains patch for udhcpc.script
+	rcLocal := uploads["/mnt/nv/rc.local"]
+	if !strings.Contains(rcLocal, "targetScript=\"/opt/Bose/udhcpc.script\"") {
+		t.Errorf("rc.local missing targetScript definition: %s", rcLocal)
+	}
+	if !strings.Contains(rcLocal, "sed -i '/echo \"search \\$search_list # \\$interface\" >> \\$RESOLV_CONF/a \\                [ -f '\"$HOOK_MARKER\"' ] && cat '\"$HOOK_MARKER\"' >> '\"\\$RESOLV_CONF\"' && dns=\"\"' \"$targetScript\"") {
+		// Note: The actual string in rcLocal might have variables expanded or escaped depending on how it was constructed.
+		// Let's check for the critical part: the escaped $RESOLV_CONF
+		if !strings.Contains(rcLocal, ">> '\"\\$RESOLV_CONF\"'") {
+			t.Errorf("rc.local missing correctly escaped RESOLV_CONF in sed patch for udhcpc.script: %s", rcLocal)
+		}
+	}
+}
+
+func TestRevertMigration_ResolvConf(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "setup-test-revert-resolv")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	m := NewManager("http://192.168.1.100:8000", nil, nil)
+
+	runCalls := []string{}
+	uploads := make(map[string]string)
+	targetDHCPFile := "/etc/udhcpc.d/50default"
+	targetScript := "/opt/Bose/udhcpc.script"
+
+	m.NewSSH = func(host string) SSHClient {
+		return &mockSSH{
+			runFunc: func(command string) (string, error) {
+				runCalls = append(runCalls, command)
+				if command == "cat /mnt/nv/rc.local" {
+					return "#!/bin/sh\n# Aftertouch DNS hook\nif [ -f \"/mnt/nv/soundtouch-service/aftertouch.resolv.conf\" ]; then\n    sed ...\nfi\n", nil
+				}
+				if strings.Contains(command, ".original ]") {
+					return "", nil // backup exists
+				}
+				if strings.Contains(command, "[ -f /mnt/nv/soundtouch-service/aftertouch.resolv.conf ]") || strings.Contains(command, "[ -f /mnt/nv/aftertouch.resolv.conf ]") {
+					return "", nil
+				}
+				return "", nil
+			},
+			uploadContentFunc: func(content []byte, remotePath string) error {
+				uploads[remotePath] = string(content)
+				return nil
+			},
+		}
+	}
+
+	_, err = m.RevertMigration("192.168.1.10")
+	if err != nil {
+		t.Fatalf("RevertMigration failed: %v", err)
+	}
+
+	// Verify backups were restored
+	foundDHCPRestore := false
+	foundScriptRestore := false
+	for _, call := range runCalls {
+		if strings.Contains(call, "cp "+targetDHCPFile+".original "+targetDHCPFile) {
+			foundDHCPRestore = true
+		}
+		if strings.Contains(call, "cp "+targetScript+".original "+targetScript) {
+			foundScriptRestore = true
+		}
+	}
+
+	if !foundDHCPRestore {
+		t.Errorf("Expected %s to be restored from backup", targetDHCPFile)
+	}
+	if !foundScriptRestore {
+		t.Errorf("Expected %s to be restored from backup", targetScript)
+	}
+
+	// Verify rc.local was cleaned up
+	rcLocal := uploads["/mnt/nv/rc.local"]
+	if strings.Contains(rcLocal, "# Aftertouch DNS hook") {
+		t.Errorf("rc.local still contains hook logic after revert: %s", rcLocal)
 	}
 }

@@ -0,0 +1,478 @@
+// Package spotify provides Spotify OAuth integration and token management
+// for the SoundTouch service, ported from soundcork's Python implementation.
+package spotify
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+)
+
+const (
+	// SpotifyAuthorizeURL is the Spotify OAuth authorization endpoint.
+	SpotifyAuthorizeURL = "https://accounts.spotify.com/authorize"
+	// SpotifyTokenURL is the Spotify OAuth token endpoint.
+	SpotifyTokenURL = "https://accounts.spotify.com/api/token"
+	// SpotifyAPIBase is the base URL for the Spotify Web API.
+	SpotifyAPIBase = "https://api.spotify.com/v1"
+	// SpotifyScopes are the OAuth scopes required for speaker playback and user info.
+	SpotifyScopes = "streaming user-read-private user-read-email user-read-playback-state user-modify-playback-state"
+)
+
+// Account represents a stored Spotify account with tokens.
+type Account struct {
+	UserID       string `json:"user_id"`
+	DisplayName  string `json:"display_name"`
+	Email        string `json:"email"`
+	AccessToken  string `json:"access_token"`
+	RefreshToken string `json:"refresh_token"`
+	ExpiresAt    int64  `json:"expires_at"`
+}
+
+// Service manages Spotify OAuth flow and token lifecycle.
+type Service struct {
+	clientID     string
+	clientSecret string
+	redirectURI  string
+	dataDir      string
+	mu           sync.RWMutex
+	accounts     map[string]*Account
+
+	// Overridable URLs for testing
+	tokenURL string
+	apiBase  string
+}
+
+// NewSpotifyService creates a new Service and loads any persisted accounts.
+func NewSpotifyService(clientID, clientSecret, redirectURI, dataDir string) *Service {
+	s := &Service{
+		clientID:     clientID,
+		clientSecret: clientSecret,
+		redirectURI:  redirectURI,
+		dataDir:      dataDir,
+		accounts:     make(map[string]*Account),
+		tokenURL:     SpotifyTokenURL,
+		apiBase:      SpotifyAPIBase,
+	}
+	if err := s.load(); err != nil {
+		log.Printf("[Spotify] Failed to load accounts: %v", err)
+	}
+
+	return s
+}
+
+// BuildAuthorizeURL constructs the Spotify OAuth authorization URL.
+func (s *Service) BuildAuthorizeURL() string {
+	params := url.Values{
+		"client_id":     {s.clientID},
+		"response_type": {"code"},
+		"redirect_uri":  {s.redirectURI},
+		"scope":         {SpotifyScopes},
+	}
+
+	return SpotifyAuthorizeURL + "?" + params.Encode()
+}
+
+// ExchangeCodeAndStore exchanges an authorization code for tokens,
+// fetches the user profile, and stores the account.
+func (s *Service) ExchangeCodeAndStore(code string) error {
+	// Exchange code for tokens
+	tokenResp, err := s.exchangeCode(code)
+	if err != nil {
+		return fmt.Errorf("token exchange: %w", err)
+	}
+
+	accessToken, _ := tokenResp["access_token"].(string)
+	refreshToken, _ := tokenResp["refresh_token"].(string)
+
+	expiresIn, _ := tokenResp["expires_in"].(float64)
+	if expiresIn == 0 {
+		expiresIn = 3600
+	}
+
+	// Fetch user profile
+	profile, err := s.getUserProfile(accessToken)
+	if err != nil {
+		return fmt.Errorf("fetch profile: %w", err)
+	}
+
+	userID, _ := profile["id"].(string)
+	displayName, _ := profile["display_name"].(string)
+	email, _ := profile["email"].(string)
+
+	account := &Account{
+		UserID:       userID,
+		DisplayName:  displayName,
+		Email:        email,
+		AccessToken:  accessToken,
+		RefreshToken: refreshToken,
+		ExpiresAt:    time.Now().Unix() + int64(expiresIn),
+	}
+
+	s.mu.Lock()
+	s.accounts[userID] = account
+	s.mu.Unlock()
+
+	if err := s.save(); err != nil {
+		return fmt.Errorf("save accounts: %w", err)
+	}
+
+	log.Printf("[Spotify] Account linked: %s (%s)", displayName, userID)
+
+	return nil
+}
+
+func (s *Service) exchangeCode(code string) (map[string]interface{}, error) {
+	data := url.Values{
+		"grant_type":   {"authorization_code"},
+		"code":         {code},
+		"redirect_uri": {s.redirectURI},
+	}
+
+	req, err := http.NewRequest(http.MethodPost, s.tokenURL, strings.NewReader(data.Encode()))
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.SetBasicAuth(s.clientID, s.clientSecret)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("token request: %w", err)
+	}
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("read response: %w", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("token exchange failed (%d): %s", resp.StatusCode, string(body))
+	}
+
+	var result map[string]interface{}
+	if err := json.Unmarshal(body, &result); err != nil {
+		return nil, fmt.Errorf("parse response: %w", err)
+	}
+
+	return result, nil
+}
+
+func (s *Service) getUserProfile(accessToken string) (map[string]interface{}, error) {
+	req, err := http.NewRequest(http.MethodGet, s.apiBase+"/me", nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("Authorization", "Bearer "+accessToken)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("profile request: %w", err)
+	}
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("read response: %w", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("profile fetch failed (%d): %s", resp.StatusCode, string(body))
+	}
+
+	var result map[string]interface{}
+	if err := json.Unmarshal(body, &result); err != nil {
+		return nil, fmt.Errorf("parse profile: %w", err)
+	}
+
+	return result, nil
+}
+
+// RefreshAccessToken refreshes the access token for the given account.
+func (s *Service) RefreshAccessToken(account *Account) error {
+	data := url.Values{
+		"grant_type":    {"refresh_token"},
+		"refresh_token": {account.RefreshToken},
+	}
+
+	req, err := http.NewRequest(http.MethodPost, s.tokenURL, strings.NewReader(data.Encode()))
+	if err != nil {
+		return err
+	}
+
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.SetBasicAuth(s.clientID, s.clientSecret)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("refresh request: %w", err)
+	}
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("read response: %w", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("token refresh failed (%d): %s", resp.StatusCode, string(body))
+	}
+
+	var result map[string]interface{}
+	if err := json.Unmarshal(body, &result); err != nil {
+		return fmt.Errorf("parse response: %w", err)
+	}
+
+	s.mu.Lock()
+	account.AccessToken, _ = result["access_token"].(string)
+
+	expiresIn, _ := result["expires_in"].(float64)
+	if expiresIn == 0 {
+		expiresIn = 3600
+	}
+
+	account.ExpiresAt = time.Now().Unix() + int64(expiresIn)
+	if newRefresh, ok := result["refresh_token"].(string); ok && newRefresh != "" {
+		account.RefreshToken = newRefresh
+	}
+	s.mu.Unlock()
+
+	if err := s.save(); err != nil {
+		return fmt.Errorf("save accounts: %w", err)
+	}
+
+	return nil
+}
+
+// GetFreshToken returns a valid access token and username, refreshing if needed.
+func (s *Service) GetFreshToken() (accessToken, username string, err error) {
+	s.mu.RLock()
+
+	if len(s.accounts) == 0 {
+		s.mu.RUnlock()
+		return "", "", fmt.Errorf("no Spotify accounts linked")
+	}
+
+	// Get the first account
+	var account *Account
+	for _, a := range s.accounts {
+		account = a
+		break
+	}
+
+	s.mu.RUnlock()
+
+	// Check if token needs refresh (expired or within 60s of expiry)
+	if account.ExpiresAt < time.Now().Unix()+60 {
+		if err := s.RefreshAccessToken(account); err != nil {
+			return "", "", fmt.Errorf("refresh token: %w", err)
+		}
+	}
+
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	return account.AccessToken, account.UserID, nil
+}
+
+// GetAccounts returns a copy of all accounts with tokens stripped for API responses.
+func (s *Service) GetAccounts() []Account {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	result := make([]Account, 0, len(s.accounts))
+	for _, a := range s.accounts {
+		result = append(result, Account{
+			UserID:      a.UserID,
+			DisplayName: a.DisplayName,
+			Email:       a.Email,
+			ExpiresAt:   a.ExpiresAt,
+			// AccessToken and RefreshToken deliberately omitted
+		})
+	}
+
+	return result
+}
+
+// ResolveEntity resolves a Spotify URI to a name and image URL.
+func (s *Service) ResolveEntity(uri string) (name, imageURL string, err error) {
+	entityType, entityID, err := parseSpotifyURI(uri)
+	if err != nil {
+		return "", "", err
+	}
+
+	accessToken, _, err := s.GetFreshToken()
+	if err != nil {
+		return "", "", fmt.Errorf("get token: %w", err)
+	}
+
+	apiURL := fmt.Sprintf("%s/%s/%s", s.apiBase, entityType, entityID)
+
+	req, err := http.NewRequest(http.MethodGet, apiURL, nil)
+	if err != nil {
+		return "", "", err
+	}
+
+	req.Header.Set("Authorization", "Bearer "+accessToken)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", "", fmt.Errorf("API request: %w", err)
+	}
+
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", "", fmt.Errorf("read response: %w", err)
+	}
+
+	if resp.StatusCode == http.StatusNotFound {
+		return "", "", fmt.Errorf("spotify entity not found")
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return "", "", fmt.Errorf("spotify API error (%d): %s", resp.StatusCode, string(body))
+	}
+
+	var data map[string]interface{}
+	if err := json.Unmarshal(body, &data); err != nil {
+		return "", "", fmt.Errorf("parse response: %w", err)
+	}
+
+	name, _ = data["name"].(string)
+	if name == "" {
+		name = "Unknown"
+	}
+
+	// Extract image URL — location varies by entity type
+	imageURL = extractImageURL(data, entityType)
+
+	return name, imageURL, nil
+}
+
+// extractImageURL extracts the first image URL from a Spotify API response.
+// For tracks, images are stored on the album object.
+func extractImageURL(data map[string]interface{}, entityType string) string {
+	images, _ := data["images"].([]interface{})
+	if len(images) == 0 && entityType == "tracks" {
+		// Tracks store images on the album
+		album, _ := data["album"].(map[string]interface{})
+		if album != nil {
+			images, _ = album["images"].([]interface{})
+		}
+	}
+
+	if len(images) > 0 {
+		if img, ok := images[0].(map[string]interface{}); ok {
+			url, _ := img["url"].(string)
+			return url
+		}
+	}
+
+	return ""
+}
+
+// parseSpotifyURI parses a Spotify URI like "spotify:track:abc" into
+// the pluralized API type ("tracks") and ID ("abc").
+func parseSpotifyURI(uri string) (entityType, entityID string, err error) {
+	parts := strings.Split(uri, ":")
+	if len(parts) != 3 || parts[0] != "spotify" {
+		return "", "", fmt.Errorf("invalid Spotify URI format: %s", uri)
+	}
+
+	typ := parts[1]
+	id := parts[2]
+
+	validTypes := map[string]string{
+		"track":    "tracks",
+		"album":    "albums",
+		"playlist": "playlists",
+		"artist":   "artists",
+	}
+
+	plural, ok := validTypes[typ]
+	if !ok {
+		return "", "", fmt.Errorf("unsupported Spotify entity type: %s", typ)
+	}
+
+	return plural, id, nil
+}
+
+// save persists accounts to disk as JSON.
+func (s *Service) save() error {
+	s.mu.RLock()
+
+	data := make(map[string]*Account, len(s.accounts))
+	for k, v := range s.accounts {
+		data[k] = v
+	}
+
+	s.mu.RUnlock()
+
+	dir := filepath.Join(s.dataDir, "spotify")
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return fmt.Errorf("create directory: %w", err)
+	}
+
+	jsonData, err := json.MarshalIndent(data, "", "  ")
+	if err != nil {
+		return fmt.Errorf("marshal accounts: %w", err)
+	}
+
+	path := filepath.Join(dir, "accounts.json")
+	if err := os.WriteFile(path, jsonData, 0600); err != nil {
+		return fmt.Errorf("write file: %w", err)
+	}
+
+	return nil
+}
+
+// load reads persisted accounts from disk.
+func (s *Service) load() error {
+	path := filepath.Join(s.dataDir, "spotify", "accounts.json")
+
+	jsonData, err := os.ReadFile(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil // No accounts file yet, not an error
+		}
+
+		return fmt.Errorf("read file: %w", err)
+	}
+
+	var accounts map[string]*Account
+	if err := json.Unmarshal(jsonData, &accounts); err != nil {
+		return fmt.Errorf("unmarshal accounts: %w", err)
+	}
+
+	s.mu.Lock()
+	s.accounts = accounts
+	s.mu.Unlock()
+
+	log.Printf("[Spotify] Loaded %d account(s)", len(accounts))
+
+	return nil
+}
@@ -0,0 +1,426 @@
+package spotify
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestBuildAuthorizeURL(t *testing.T) {
+	svc := NewSpotifyService("test-client-id", "test-secret", "http://localhost/callback", t.TempDir())
+
+	url := svc.BuildAuthorizeURL()
+
+	if !strings.Contains(url, "client_id=test-client-id") {
+		t.Errorf("URL should contain client_id, got: %s", url)
+	}
+	if !strings.Contains(url, "redirect_uri=") {
+		t.Errorf("URL should contain redirect_uri, got: %s", url)
+	}
+	if !strings.Contains(url, "scope=") {
+		t.Errorf("URL should contain scope, got: %s", url)
+	}
+	if !strings.Contains(url, "response_type=code") {
+		t.Errorf("URL should contain response_type=code, got: %s", url)
+	}
+	if !strings.HasPrefix(url, SpotifyAuthorizeURL) {
+		t.Errorf("URL should start with %s, got: %s", SpotifyAuthorizeURL, url)
+	}
+}
+
+func TestGetAccountsStripsTokens(t *testing.T) {
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", t.TempDir())
+
+	// Manually add an account with tokens
+	svc.mu.Lock()
+	svc.accounts["user1"] = &Account{
+		UserID:       "user1",
+		DisplayName:  "Test User",
+		Email:        "test@example.com",
+		AccessToken:  "secret-access-token",
+		RefreshToken: "secret-refresh-token",
+		ExpiresAt:    time.Now().Add(1 * time.Hour).Unix(),
+	}
+	svc.mu.Unlock()
+
+	accounts := svc.GetAccounts()
+
+	if len(accounts) != 1 {
+		t.Fatalf("expected 1 account, got %d", len(accounts))
+	}
+
+	if accounts[0].AccessToken != "" {
+		t.Errorf("AccessToken should be stripped, got: %s", accounts[0].AccessToken)
+	}
+	if accounts[0].RefreshToken != "" {
+		t.Errorf("RefreshToken should be stripped, got: %s", accounts[0].RefreshToken)
+	}
+	if accounts[0].UserID != "user1" {
+		t.Errorf("UserID should be preserved, got: %s", accounts[0].UserID)
+	}
+	if accounts[0].DisplayName != "Test User" {
+		t.Errorf("DisplayName should be preserved, got: %s", accounts[0].DisplayName)
+	}
+}
+
+func TestGetFreshTokenRefreshesExpired(t *testing.T) {
+	// Set up a mock Spotify token endpoint
+	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			t.Errorf("expected POST, got %s", r.Method)
+		}
+		if err := r.ParseForm(); err != nil {
+			t.Fatal(err)
+		}
+		if r.Form.Get("grant_type") != "refresh_token" {
+			t.Errorf("expected grant_type=refresh_token, got %s", r.Form.Get("grant_type"))
+		}
+		if r.Form.Get("refresh_token") != "my-refresh-token" {
+			t.Errorf("expected refresh_token=my-refresh-token, got %s", r.Form.Get("refresh_token"))
+		}
+
+		// Verify Basic Auth
+		user, pass, ok := r.BasicAuth()
+		if !ok || user != "cid" || pass != "csecret" {
+			t.Errorf("expected Basic Auth cid:csecret, got %s:%s (ok=%v)", user, pass, ok)
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		json.NewEncoder(w).Encode(map[string]interface{}{
+			"access_token":  "new-access-token",
+			"token_type":    "Bearer",
+			"expires_in":    3600,
+			"refresh_token": "new-refresh-token",
+		})
+	}))
+	defer tokenServer.Close()
+
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", t.TempDir())
+
+	// Override the token URL for testing
+	svc.tokenURL = tokenServer.URL
+
+	// Add an account with an expired token
+	svc.mu.Lock()
+	svc.accounts["user1"] = &Account{
+		UserID:       "user1",
+		DisplayName:  "Test User",
+		AccessToken:  "old-expired-token",
+		RefreshToken: "my-refresh-token",
+		ExpiresAt:    time.Now().Add(-1 * time.Hour).Unix(), // expired
+	}
+	svc.mu.Unlock()
+
+	accessToken, username, err := svc.GetFreshToken()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if accessToken != "new-access-token" {
+		t.Errorf("expected new-access-token, got %s", accessToken)
+	}
+	if username != "user1" {
+		t.Errorf("expected user1, got %s", username)
+	}
+
+	// Verify the account was updated
+	svc.mu.RLock()
+	account := svc.accounts["user1"]
+	svc.mu.RUnlock()
+
+	if account.RefreshToken != "new-refresh-token" {
+		t.Errorf("refresh token should be updated, got %s", account.RefreshToken)
+	}
+}
+
+func TestResolveEntityParsesURI(t *testing.T) {
+	tests := []struct {
+		uri          string
+		expectedType string
+		expectedID   string
+		shouldErr    bool
+	}{
+		{"spotify:track:abc123", "tracks", "abc123", false},
+		{"spotify:album:xyz789", "albums", "xyz789", false},
+		{"spotify:playlist:pl1", "playlists", "pl1", false},
+		{"spotify:artist:ar1", "artists", "ar1", false},
+		{"invalid-uri", "", "", true},
+		{"spotify:invalid_type:id", "", "", true},
+		{"spotify:track", "", "", true},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.uri, func(t *testing.T) {
+			entityType, entityID, err := parseSpotifyURI(tc.uri)
+			if tc.shouldErr {
+				if err == nil {
+					t.Errorf("expected error for URI %s", tc.uri)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error for URI %s: %v", tc.uri, err)
+			}
+			if entityType != tc.expectedType {
+				t.Errorf("expected type %s, got %s", tc.expectedType, entityType)
+			}
+			if entityID != tc.expectedID {
+				t.Errorf("expected id %s, got %s", tc.expectedID, entityID)
+			}
+		})
+	}
+}
+
+func TestResolveEntityFetchesFromAPI(t *testing.T) {
+	// Mock Spotify API
+	apiServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Check Authorization header
+		auth := r.Header.Get("Authorization")
+		if auth != "Bearer fresh-token" {
+			t.Errorf("expected Bearer fresh-token, got %s", auth)
+		}
+
+		switch r.URL.Path {
+		case "/tracks/abc123":
+			json.NewEncoder(w).Encode(map[string]interface{}{
+				"name": "Test Track",
+				"album": map[string]interface{}{
+					"images": []map[string]interface{}{
+						{"url": "http://img.example.com/track.jpg"},
+					},
+				},
+			})
+		case "/albums/xyz789":
+			json.NewEncoder(w).Encode(map[string]interface{}{
+				"name": "Test Album",
+				"images": []map[string]interface{}{
+					{"url": "http://img.example.com/album.jpg"},
+				},
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer apiServer.Close()
+
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", t.TempDir())
+	svc.apiBase = apiServer.URL
+
+	// Add a non-expired account
+	svc.mu.Lock()
+	svc.accounts["user1"] = &Account{
+		UserID:       "user1",
+		AccessToken:  "fresh-token",
+		RefreshToken: "refresh",
+		ExpiresAt:    time.Now().Add(1 * time.Hour).Unix(),
+	}
+	svc.mu.Unlock()
+
+	// Test track (images come from album)
+	name, imageURL, err := svc.ResolveEntity("spotify:track:abc123")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if name != "Test Track" {
+		t.Errorf("expected Test Track, got %s", name)
+	}
+	if imageURL != "http://img.example.com/track.jpg" {
+		t.Errorf("expected track image URL, got %s", imageURL)
+	}
+
+	// Test album (images at top level)
+	name, imageURL, err = svc.ResolveEntity("spotify:album:xyz789")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if name != "Test Album" {
+		t.Errorf("expected Test Album, got %s", name)
+	}
+	if imageURL != "http://img.example.com/album.jpg" {
+		t.Errorf("expected album image URL, got %s", imageURL)
+	}
+}
+
+func TestSaveAndLoad(t *testing.T) {
+	dir := t.TempDir()
+
+	// Create and populate
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", dir)
+	svc.mu.Lock()
+	svc.accounts["user1"] = &Account{
+		UserID:       "user1",
+		DisplayName:  "Test User",
+		Email:        "test@example.com",
+		AccessToken:  "at",
+		RefreshToken: "rt",
+		ExpiresAt:    1234567890,
+	}
+	svc.accounts["user2"] = &Account{
+		UserID:       "user2",
+		DisplayName:  "User Two",
+		Email:        "two@example.com",
+		AccessToken:  "at2",
+		RefreshToken: "rt2",
+		ExpiresAt:    9876543210,
+	}
+	svc.mu.Unlock()
+
+	// Save
+	if err := svc.save(); err != nil {
+		t.Fatalf("save failed: %v", err)
+	}
+
+	// Verify file exists
+	accountsFile := filepath.Join(dir, "spotify", "accounts.json")
+	if _, err := os.Stat(accountsFile); os.IsNotExist(err) {
+		t.Fatal("accounts.json was not created")
+	}
+
+	// Load into new service
+	svc2 := NewSpotifyService("cid", "csecret", "http://localhost/cb", dir)
+
+	svc2.mu.RLock()
+	defer svc2.mu.RUnlock()
+
+	if len(svc2.accounts) != 2 {
+		t.Fatalf("expected 2 accounts after load, got %d", len(svc2.accounts))
+	}
+
+	u1, ok := svc2.accounts["user1"]
+	if !ok {
+		t.Fatal("user1 not found after load")
+	}
+	if u1.DisplayName != "Test User" {
+		t.Errorf("expected Test User, got %s", u1.DisplayName)
+	}
+	if u1.AccessToken != "at" {
+		t.Errorf("expected at, got %s", u1.AccessToken)
+	}
+	if u1.ExpiresAt != 1234567890 {
+		t.Errorf("expected ExpiresAt 1234567890, got %d", u1.ExpiresAt)
+	}
+}
+
+func TestExchangeCodeAndStore(t *testing.T) {
+	// Mock token endpoint
+	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if err := r.ParseForm(); err != nil {
+			t.Fatal(err)
+		}
+
+		switch r.Form.Get("grant_type") {
+		case "authorization_code":
+			if r.Form.Get("code") != "test-auth-code" {
+				t.Errorf("expected code=test-auth-code, got %s", r.Form.Get("code"))
+			}
+			user, pass, ok := r.BasicAuth()
+			if !ok || user != "cid" || pass != "csecret" {
+				t.Errorf("bad Basic Auth: %s:%s ok=%v", user, pass, ok)
+			}
+
+			w.Header().Set("Content-Type", "application/json")
+			json.NewEncoder(w).Encode(map[string]interface{}{
+				"access_token":  "new-at",
+				"refresh_token": "new-rt",
+				"expires_in":    3600,
+			})
+		default:
+			t.Errorf("unexpected grant_type: %s", r.Form.Get("grant_type"))
+			http.Error(w, "bad request", 400)
+		}
+	}))
+	defer tokenServer.Close()
+
+	// Mock profile endpoint
+	profileServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		auth := r.Header.Get("Authorization")
+		if auth != "Bearer new-at" {
+			t.Errorf("expected Bearer new-at, got %s", auth)
+		}
+		json.NewEncoder(w).Encode(map[string]interface{}{
+			"id":           "spotify-user-123",
+			"display_name": "Spotify User",
+			"email":        "user@spotify.com",
+		})
+	}))
+	defer profileServer.Close()
+
+	dir := t.TempDir()
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", dir)
+	svc.tokenURL = tokenServer.URL
+	svc.apiBase = profileServer.URL
+
+	err := svc.ExchangeCodeAndStore("test-auth-code")
+	if err != nil {
+		t.Fatalf("ExchangeCodeAndStore failed: %v", err)
+	}
+
+	// Verify account stored
+	svc.mu.RLock()
+	account, ok := svc.accounts["spotify-user-123"]
+	svc.mu.RUnlock()
+
+	if !ok {
+		t.Fatal("account not found after exchange")
+	}
+	if account.DisplayName != "Spotify User" {
+		t.Errorf("expected Spotify User, got %s", account.DisplayName)
+	}
+	if account.Email != "user@spotify.com" {
+		t.Errorf("expected user@spotify.com, got %s", account.Email)
+	}
+	if account.AccessToken != "new-at" {
+		t.Errorf("expected new-at, got %s", account.AccessToken)
+	}
+	if account.RefreshToken != "new-rt" {
+		t.Errorf("expected new-rt, got %s", account.RefreshToken)
+	}
+
+	// Verify saved to disk
+	accountsFile := filepath.Join(dir, "spotify", "accounts.json")
+	data, err := os.ReadFile(accountsFile)
+	if err != nil {
+		t.Fatalf("failed to read accounts file: %v", err)
+	}
+	if !strings.Contains(string(data), "spotify-user-123") {
+		t.Error("accounts file should contain the user ID")
+	}
+}
+
+func TestGetFreshTokenNoAccounts(t *testing.T) {
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", t.TempDir())
+
+	_, _, err := svc.GetFreshToken()
+	if err == nil {
+		t.Error("expected error when no accounts exist")
+	}
+}
+
+func TestGetFreshTokenNotExpired(t *testing.T) {
+	svc := NewSpotifyService("cid", "csecret", "http://localhost/cb", t.TempDir())
+
+	svc.mu.Lock()
+	svc.accounts["user1"] = &Account{
+		UserID:       "user1",
+		AccessToken:  "valid-token",
+		RefreshToken: "rt",
+		ExpiresAt:    time.Now().Add(1 * time.Hour).Unix(),
+	}
+	svc.mu.Unlock()
+
+	token, username, err := svc.GetFreshToken()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if token != "valid-token" {
+		t.Errorf("expected valid-token, got %s", token)
+	}
+	if username != "user1" {
+		t.Errorf("expected user1, got %s", username)
+	}
+}
@@ -58,6 +58,15 @@ REDACT_PROXY_LOGS="${REDACT_PROXY_LOGS:-true}"
 RECORD_INTERACTIONS="${RECORD_INTERACTIONS:-true}"
 DISCOVERY_INTERVAL="${DISCOVERY_INTERVAL:-5m}"

+# Spotify OAuth config (optional)
+SPOTIFY_CLIENT_ID="${SPOTIFY_CLIENT_ID:-}"
+SPOTIFY_CLIENT_SECRET="${SPOTIFY_CLIENT_SECRET:-}"
+SPOTIFY_REDIRECT_URI="${SPOTIFY_REDIRECT_URI:-ueberboese-login://spotify}"
+
+# Management API credentials
+MGMT_USERNAME="${MGMT_USERNAME:-admin}"
+MGMT_PASSWORD="${MGMT_PASSWORD:-change_me!}"
+
 # Override if you want to force a specific asset suffix:
 #   ARCH_ASSET=linux-armv7|linux-arm64|linux-amd64
 ARCH_ASSET="${ARCH_ASSET:-}"
@@ -198,31 +207,53 @@ self_update() {
    return
  fi

-  log "Newer installer found for ${VERSION}. Re-executing..."
-  chmod +x "${tmp_script}"
+  log "Newer installer found for ${VERSION}. Updating ${SCRIPT_PATH} and re-executing..."
+  install -m 0755 "${tmp_script}" "${SCRIPT_PATH}"
+  rm -f "${tmp_script}"

  # Export current env vars to the new script
  export IS_SELF_UPDATE="true"
  export VERSION HOSTNAME_FQDN HTTP_PORT HTTPS_PORT DATA_DIR BIN_PATH CONFIG_DIR ENV_FILE SERVICE_USER SERVICE_GROUP
+  export SPOTIFY_CLIENT_ID SPOTIFY_CLIENT_SECRET SPOTIFY_REDIRECT_URI MGMT_USERNAME MGMT_PASSWORD

-  exec "${tmp_script}" "$@"
+  exec "${SCRIPT_PATH}" "$@"
 }

 write_env_file() {
-  log "Writing env file: ${ENV_FILE}"
-  cat > "${ENV_FILE}" <<EOF
-PORT=${HTTP_PORT}
-HTTPS_PORT=${HTTPS_PORT}
-DATA_DIR=${DATA_DIR}
+  log "Updating env file: ${ENV_FILE}"

-LOG_PROXY_BODY=${LOG_PROXY_BODY}
-REDACT_PROXY_LOGS=${REDACT_PROXY_LOGS}
-RECORD_INTERACTIONS=${RECORD_INTERACTIONS}
-DISCOVERY_INTERVAL=${DISCOVERY_INTERVAL}
+  # 1. Start with a list of all variables we want to manage
+  local vars=(
+    "PORT=${HTTP_PORT}"
+    "HTTPS_PORT=${HTTPS_PORT}"
+    "DATA_DIR=${DATA_DIR}"
+    "LOG_PROXY_BODY=${LOG_PROXY_BODY}"
+    "REDACT_PROXY_LOGS=${REDACT_PROXY_LOGS}"
+    "RECORD_INTERACTIONS=${RECORD_INTERACTIONS}"
+    "DISCOVERY_INTERVAL=${DISCOVERY_INTERVAL}"
+    "SERVER_URL=${SERVER_URL}"
+    "HTTPS_SERVER_URL=${HTTPS_SERVER_URL}"
+    "SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID}"
+    "SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET}"
+    "SPOTIFY_REDIRECT_URI=${SPOTIFY_REDIRECT_URI}"
+    "MGMT_USERNAME=${MGMT_USERNAME}"
+    "MGMT_PASSWORD=${MGMT_PASSWORD}"
+  )
+
+  if [[ ! -f "${ENV_FILE}" ]]; then
+    for entry in "${vars[@]}"; do
+      echo "${entry}" >> "${ENV_FILE}"
+    done
+  else
+    for entry in "${vars[@]}"; do
+      local key="${entry%%=*}"
+      local val="${entry#*=}"
+      if ! grep -q "^${key}=" "${ENV_FILE}"; then
+        echo "${key}=${val}" >> "${ENV_FILE}"
+      fi
+    done
+  fi

-SERVER_URL=${SERVER_URL}
-HTTPS_SERVER_URL=${HTTPS_SERVER_URL}
-EOF
  chmod 0640 "${ENV_FILE}"
  # group-readable so you can add yourself to the group if desired
  chown root:"${SERVICE_GROUP}" "${ENV_FILE}" || true
@@ -0,0 +1,97 @@
+# On-Speaker Spotify Boot Primer for Bose SoundTouch
+Self-contained boot-time Spotify primer that runs directly on the speaker.
+No Spotify credentials on the device — it fetches a fresh token from a
+[Bose-SoundTouch](https://github.com/gesellix/Bose-SoundTouch) server at boot.
+No jq, no rootfs modification — just files on persistent storage.
+
+## How It Works
+Bose SoundTouch speakers run embedded Linux with a persistent writable volume
+at `/mnt/nv`. The init script `shelby_local` (S97) has a built-in hook:
+```
+[ -x /mnt/nv/rc.local ] && /mnt/nv/rc.local
+```
+This runs before SoundTouch itself (S99), so we background a primer script
+that waits for the Spotify Connect ZeroConf endpoint (port 8200) to come up,
+fetches a fresh Spotify token from the service, and primes the speaker — all
+within ~30 seconds of boot.
+
+## File Layout
+```
+/mnt/nv/
+  rc.local                                      boot hook (S97 checks this)
+  .profile                                      PATH setup for interactive SSH
+  bin/
+    spotify-boot-primer                         main script
+  BoseApp-Persistence/1/
+    spotify-primer.conf                         service credentials (mode 600)
+    Sources.xml, Presets.xml, ...               existing speaker data
+```
+Scripts live in `/mnt/nv/bin/` (added to PATH via `.profile`), config lives
+alongside the speaker's own persistence files in `/mnt/nv/BoseApp-Persistence/1/`.
+
+## Speaker Environment
+Tested on SoundTouch 20. Other SoundTouch models likely similar.
+| Item | Detail |
+|------|--------|
+| OS | Linux 3.14.43+ ARM (hostname `spotty`) |
+| Root FS | Read-only ubifs (can be remounted rw) |
+| Persistent storage | `/mnt/nv` — writable ubifs, ~24M free |
+| curl | 7.50.3 with OpenSSL (HTTPS works) |
+| bash/grep/sed/awk | Available via busybox |
+| jq | **Not available** (not needed) |
+| Init | SysV, runlevel 5 |
+| Production mode | Yes — cron is disabled |
+
+## Prerequisites
+1. **SSH access to the speaker**:
+   ```
+   ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa root@SPEAKER_IP
+   ```
+2. **A running [Bose-SoundTouch](https://github.com/gesellix/Bose-SoundTouch) server** with:
+   - A linked Spotify account (via the management API OAuth flow)
+   - The `GET /mgmt/spotify/token` endpoint (returns `{accessToken, username}`)
+   - Management API credentials (HTTP Basic Auth)
+
+## Installation
+SSH into the speaker and run:
+```bash
+# 1. Create bin directory
+mkdir -p /mnt/nv/bin
+# 2. Create the config file with your service connection info
+cat > /mnt/nv/BoseApp-Persistence/1/spotify-primer.conf << 'EOF'
+SOUNDTOUCH_URL=https://soundtouch.example.com
+SOUNDTOUCH_USER=admin
+SOUNDTOUCH_PASS=secret
+EOF
+chmod 600 /mnt/nv/BoseApp-Persistence/1/spotify-primer.conf
+# 3. Copy spotify-boot-primer to the speaker
+#    From your local machine:
+#    cat scripts/spotify/spotify-boot-primer | ssh root@SPEAKER_IP "cat > /mnt/nv/bin/spotify-boot-primer"
+chmod +x /mnt/nv/bin/spotify-boot-primer
+# 4. Create the boot hook
+cat > /mnt/nv/rc.local << 'EOF'
+#!/bin/bash
+/mnt/nv/bin/spotify-boot-primer &
+EOF
+chmod +x /mnt/nv/rc.local
+# 5. Set up PATH for interactive SSH sessions (optional but convenient)
+cat > /mnt/nv/.profile << 'EOF'
+export PATH="/mnt/nv/bin:$PATH"
+EOF
+```
+
+## Testing
+```bash
+# Manual test (speaker must be running):
+/mnt/nv/bin/spotify-boot-primer
+# Check logs:
+logread | grep spotify-primer
+# Full test — reboot the speaker:
+reboot
+# Wait ~30s, then SSH back in and check:
+logread | grep spotify-primer
+curl -s "http://localhost:8200/zc?action=getInfo" | grep activeUser
+```
+
+## Related
+- [Bose-SoundTouch](https://github.com/gesellix/Bose-SoundTouch) — Comprehensive Go toolkit with migration automation
@@ -0,0 +1,6 @@
+# Spotify Scripts
+
+This directory contains scripts and configuration files for the Spotify OAuth integration, specifically for priming Bose SoundTouch speakers.
+
+These files were adapted from the community gist:
+https://gist.github.com/timvw/84ef8768ff876ef6805012b3eb4015b0
@@ -0,0 +1,318 @@
+# ZeroConf Analysis - Spotify Connect Integration for Bose SoundTouch
+
+## Overview
+
+This document provides a comprehensive analysis of the Spotify Connect ZeroConf protocol as implemented by Bose SoundTouch speakers. ZeroConf enables seamless integration between Spotify clients and SoundTouch hardware without requiring manual configuration.
+
+## What is ZeroConf in This Context?
+
+ZeroConf (Zero Configuration) in the Bose SoundTouch ecosystem is a **Spotify Connect integration protocol** that allows Spotify clients (mobile apps, desktop applications) to discover and control SoundTouch speakers automatically. The speakers expose an HTTP API on **port 8200** that implements Spotify's official ZeroConf specification.
+
+## Network Discovery
+
+### mDNS/Bonjour Advertisement
+
+SoundTouch speakers advertise themselves on the local network using:
+- **Service Type**: `_spotify-connect._tcp`
+- **Port**: 8200
+- **TXT Record**: `CPath=/zc` (points to the ZeroConf endpoint)
+
+This allows Spotify applications to automatically discover available speakers without manual configuration.
+
+### Endpoint Structure
+
+```
+http://[SPEAKER_IP]:8200/zc?action=[ACTION]&[PARAMETERS]
+```
+
+Example: `http://192.168.1.100:8200/zc?action=getInfo`
+
+## The getInfo Action
+
+### Purpose
+
+The `getInfo` action retrieves comprehensive device information and current status. This is the most commonly used ZeroConf action for:
+- Device discovery and identification
+- Checking Spotify authentication status
+- Retrieving device capabilities
+- Monitoring multiroom configurations
+
+### Request Format
+
+```http
+GET http://[SPEAKER_IP]:8200/zc?action=getInfo&version=2.10.0
+```
+
+The `version` parameter is optional but recommended for compatibility.
+
+### Response Properties
+
+#### Mandatory Fields (Present in All Responses)
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `status` | Integer | Operation result code (101 = success) |
+| `statusString` | String | Human-readable status description |
+| `spotifyError` | Integer | Last Spotify SDK error code (0 = no error) |
+| `responseSource` | String | Entity identifier (e.g., "Bose") |
+
+#### Device Information Fields
+
+| Property | Required | Type | Description |
+|----------|----------|------|-------------|
+| `version` | Yes | String | ZeroConf API version (e.g., "2.10.0") |
+| `deviceID` | Yes | String | Unique device identifier (MAC-based) |
+| `publicKey` | Yes | String | Device's public key for secure communication |
+| `remoteName` | Yes | String | User-friendly device name shown in Spotify |
+| `deviceType` | No | String | Device category (e.g., "SPEAKER") |
+| `brandDisplayName` | Yes | String | Brand name displayed in Spotify apps |
+| `modelDisplayName` | No | String | Model name for user display |
+| `libraryVersion` | Yes | String | Spotify Connect library version |
+| `resolverVersion` | Yes | String | DNS resolution version |
+| `groupStatus` | Yes | String | Multiroom status: "NONE", "GROUP", or "SLAVE" |
+| `tokenType` | Yes | String | Authentication token type ("accesstoken") |
+| `clientID` | Yes | String | Spotify client identifier |
+| `productID` | Yes | Integer | Spotify product identifier |
+| `scope` | Yes | String | Permission scope (typically "streaming") |
+| `availability` | Yes | String | Device availability status |
+
+#### Status Fields
+
+| Property | Required | Type | Description |
+|----------|----------|------|-------------|
+| `activeUser` | No | String | Currently logged-in Spotify username (if any) |
+
+#### Advanced Fields (Optional)
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `aliases` | Array | Virtual devices for multiroom zones |
+| `supported_drm_media_formats` | Array | Supported audio formats with DRM capabilities |
+| `supported_capabilities` | Integer | Bitmasked device capabilities |
+
+### Example Response
+
+```json
+{
+    "status": 101,
+    "statusString": "OK",
+    "spotifyError": 0,
+    "responseSource": "Bose",
+    "version": "2.10.0",
+    "deviceID": "0007F537F5ED",
+    "deviceType": "SPEAKER",
+    "remoteName": "Living Room Speaker",
+    "publicKey": "BgIwVfz9ZXQG...",
+    "brandDisplayName": "Bose",
+    "modelDisplayName": "SoundTouch 30",
+    "libraryVersion": "master-v3.15.1-g7890abcd",
+    "resolverVersion": "1",
+    "groupStatus": "NONE",
+    "tokenType": "accesstoken",
+    "clientID": "65b708073fc0480ea92a077233ca87bd",
+    "productID": 0,
+    "scope": "streaming",
+    "availability": "",
+    "activeUser": "spotify_username",
+    "supported_drm_media_formats": [
+        {"drm": 0, "formats": 35},
+        {"drm": 1, "formats": 35},
+        {"drm": 3, "formats": 1168}
+    ],
+    "supported_capabilities": 1
+}
+```
+
+## Key Properties Analysis
+
+### Critical Status Indicators
+
+- **`activeUser`**: Most important field for determining if Spotify is active
+  - Present and non-empty: Spotify is authenticated and ready
+  - Empty or missing: No active Spotify session
+
+- **`remoteName`**: The display name users see in Spotify Connect device lists
+  - Should be descriptive and user-friendly
+  - Can contain UTF-8 characters and special symbols
+
+### Device Identification
+
+- **`deviceID`**: Unique identifier for targeting specific speakers
+  - Typically derived from MAC address
+  - Used for device-specific API calls
+
+- **`groupStatus`**: Critical for multiroom functionality
+  - `"NONE"`: Standalone device
+  - `"GROUP"`: Multiroom master/coordinator
+  - `"SLAVE"`: Member of a multiroom group
+
+### Display Properties
+
+- **`brandDisplayName`** and **`modelDisplayName`**: Shown in Spotify client UIs
+  - Should be marketing-appropriate names
+  - Support UTF-8 for international markets
+
+## Practical Usage Examples
+
+### 1. Status Checking
+
+```bash
+# Check if Spotify is active
+curl -s "http://192.168.1.100:8200/zc?action=getInfo" | \
+  grep -o '"activeUser" *: *"[^"]*"' | \
+  sed 's/"activeUser" *: *"//;s/"$//'
+```
+
+### 2. Device Discovery
+
+```bash
+# Get device name and ID
+info=$(curl -s "http://192.168.1.100:8200/zc?action=getInfo")
+device_name=$(echo "$info" | grep -o '"remoteName" *: *"[^"]*"' | sed 's/"remoteName" *: *"//;s/"$//')
+device_id=$(echo "$info" | grep -o '"deviceID" *: *"[^"]*"' | sed 's/"deviceID" *: *"//;s/"$//')
+```
+
+### 3. Multiroom Detection
+
+```bash
+# Check multiroom status
+group_status=$(curl -s "http://192.168.1.100:8200/zc?action=getInfo" | \
+  grep -o '"groupStatus" *: *"[^"]*"' | \
+  sed 's/"groupStatus" *: *"//;s/"$//')
+```
+
+## Authentication Flow
+
+The ZeroConf API supports the `addUser` action for Spotify authentication:
+
+```bash
+curl -X POST "http://192.168.1.100:8200/zc" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -d "action=addUser&userName=${SPOTIFY_USER}&blob=${ACCESS_TOKEN}&clientKey=&tokenType=accesstoken"
+```
+
+### Token Requirements
+
+- **Access Token**: Valid Spotify OAuth access token
+- **Username**: Spotify username associated with the token
+- **Token Type**: Always "accesstoken" for current implementations
+- **Client Key**: Empty string for current protocol version
+
+### Token Lifecycle
+
+1. Tokens expire after 1 hour (3600 seconds)
+2. Speakers must be re-primed after reboot
+3. Use `getInfo` to verify successful authentication via `activeUser` field
+
+## Security Considerations
+
+### Communication Security
+
+- **Protocol**: HTTP (plain text) is standard, HTTPS supported but optional
+- **Network Scope**: Local network only (port 8200 typically not exposed externally)
+- **Authentication**: Token-based, no permanent credentials stored
+
+### Best Practices
+
+1. **Token Management**: 
+   - Never store long-lived tokens on devices
+   - Implement token refresh mechanisms
+   - Use centralized token servers when possible
+
+2. **Network Security**:
+   - Ensure port 8200 is not accessible from external networks
+   - Consider HTTPS for enhanced security
+   - Implement proper firewall rules
+
+3. **Error Handling**:
+   - Always check `status` and `spotifyError` fields
+   - Implement retry mechanisms for network failures
+   - Log authentication failures for debugging
+
+## Integration Patterns
+
+### Boot-time Automation
+
+See `spotify-boot-primer.sh` for a complete example of:
+1. Waiting for ZeroConf endpoint availability
+2. Checking current authentication status
+3. Fetching fresh tokens from a management server
+4. Automatically priming speakers at startup
+
+### Manual Priming
+
+See `spotify-prime-speaker.sh` for standalone token injection:
+1. Validate access tokens against Spotify API
+2. Extract username from token metadata
+3. Prime individual speakers
+4. Verify successful authentication
+
+### Monitoring and Health Checks
+
+```bash
+#!/bin/bash
+# Health check script
+SPEAKER_IP="192.168.1.100"
+info=$(curl -sf --max-time 5 "http://${SPEAKER_IP}:8200/zc?action=getInfo" 2>/dev/null)
+
+if [ $? -eq 0 ]; then
+    active_user=$(echo "$info" | grep -o '"activeUser" *: *"[^"]*"' | sed 's/"activeUser" *: *"//;s/"$//')
+    if [ -n "$active_user" ]; then
+        echo "✅ Spotify active (user: $active_user)"
+    else
+        echo "⚠️  Speaker reachable but Spotify not active"
+    fi
+else
+    echo "❌ Speaker unreachable"
+fi
+```
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Port 8200 Unreachable**
+   - Check network connectivity
+   - Verify speaker is powered on
+   - Confirm IP address is correct
+
+2. **Empty `activeUser` After Authentication**
+   - Wait 2-5 seconds after `addUser` request
+   - Verify access token is valid and not expired
+   - Check `spotifyError` field for SDK errors
+
+3. **Authentication Failures**
+   - Ensure token has correct scopes
+   - Verify username matches token owner
+   - Check token expiration time
+
+### Diagnostic Commands
+
+```bash
+# Test basic connectivity
+curl -sf --max-time 5 "http://192.168.1.100:8200/zc?action=getInfo"
+
+# Check detailed response
+curl -s "http://192.168.1.100:8200/zc?action=getInfo" | jq .
+
+# Monitor authentication status
+while true; do
+    active=$(curl -s "http://192.168.1.100:8200/zc?action=getInfo" | \
+             grep -o '"activeUser" *: *"[^"]*"' | sed 's/"activeUser" *: *"//;s/"$//')
+    echo "$(date): activeUser = '$active'"
+    sleep 10
+done
+```
+
+## References
+
+- [Spotify ZeroConf API Documentation](https://developer.spotify.com/documentation/commercial-hardware/implementation/guides/zeroconf)
+- [Bose SoundTouch Toolkit](https://github.com/gesellix/Bose-SoundTouch)
+- Scripts in this directory:
+  - `spotify-boot-primer.sh`: Automated boot-time priming
+  - `spotify-prime-speaker.sh`: Manual speaker priming
+  - `spotify-primer.conf.example`: Configuration template
+
+---
+
+*This analysis is based on Spotify's official ZeroConf specification and practical implementation experience with Bose SoundTouch speakers.*
@@ -0,0 +1,4 @@
+#!/bin/bash
+# /mnt/nv/rc.local — runs at boot via shelby_local (S97)
+# Launches Spotify boot primer in background since SoundTouch starts at S99
+/mnt/nv/bin/spotify-boot-primer &
@@ -0,0 +1,144 @@
+#!/bin/bash
+#
+# spotify-boot-primer — Self-contained Spotify primer for Bose SoundTouch speakers
+#
+# Runs at boot (via /mnt/nv/rc.local), waits for the ZeroConf endpoint to
+# come up, fetches a fresh Spotify token from a soundtouch-service server, and
+# primes the speaker. No Spotify credentials stored on the device.
+#
+# Only needs: curl, grep, sed (all available on the speaker via busybox).
+#
+# Install:
+#   1. mkdir -p /mnt/nv/soundtouch-service
+#   2. Copy this script to /mnt/nv/soundtouch-service/spotify-boot-primer
+#   3. Create /mnt/nv/soundtouch-service/spotify-primer.conf
+#   4. Create /mnt/nv/rc.local that backgrounds this script
+#   5. chmod +x /mnt/nv/rc.local /mnt/nv/soundtouch-service/spotify-boot-primer
+#
+# Config file format (/mnt/nv/soundtouch-service/spotify-primer.conf):
+#   SOUNDTOUCH_URL=https://soundtouch.example.com
+#   SOUNDTOUCH_USER=admin
+#   SOUNDTOUCH_PASS=secret
+#
+# Related:
+#   https://github.com/gesellix/Bose-SoundTouch
+#
+set -uo pipefail
+
+CONF="/mnt/nv/soundtouch-service/spotify-primer.conf"
+LOG_TAG="spotify-primer[$$]"
+ZC_URL="http://localhost:8200/zc"
+MAX_WAIT=120    # max seconds to wait for port 8200
+RETRY_DELAY=3   # seconds between retries
+
+# --- Logging ---
+log() {
+    logger -s -t "$LOG_TAG" -p "$1" "$2"
+}
+
+# --- JSON parsing without jq ---
+# Extract a string value: echo '{"key":"val"}' | json_str key
+json_str() {
+    grep -o "\"$1\" *: *\"[^\"]*\"" | sed "s/\"$1\" *: *\"//;s/\"$//"
+}
+
+# Extract a numeric value: echo '{"key":123}' | json_num key
+json_num() {
+    grep -o "\"$1\" *: *[0-9]*" | sed "s/\"$1\" *: *//"
+}
+
+# --- Load config ---
+if [ ! -f "$CONF" ]; then
+    log err "Config not found: $CONF"
+    exit 1
+fi
+
+. "$CONF"
+
+for var in SOUNDTOUCH_URL SOUNDTOUCH_USER SOUNDTOUCH_PASS; do
+    if [ -z "${!var:-}" ]; then
+        log err "Missing $var in $CONF"
+        exit 1
+    fi
+done
+
+log info "Config loaded (server=${SOUNDTOUCH_URL})"
+
+# --- Wait for ZeroConf endpoint (port 8200) ---
+log info "Waiting for ZeroConf endpoint (max ${MAX_WAIT}s)..."
+waited=0
+while true; do
+    if curl -sf --max-time 2 "${ZC_URL}?action=getInfo" >/dev/null 2>&1; then
+        break
+    fi
+    waited=$((waited + RETRY_DELAY))
+    if [ $waited -ge $MAX_WAIT ]; then
+        log err "ZeroConf endpoint not available after ${MAX_WAIT}s — giving up"
+        exit 1
+    fi
+    sleep $RETRY_DELAY
+done
+log info "ZeroConf endpoint is up (waited ${waited}s)"
+
+# --- Check if already primed ---
+info=$(curl -sf --max-time 5 "${ZC_URL}?action=getInfo" 2>/dev/null)
+active_user=$(echo "$info" | json_str activeUser)
+device_name=$(echo "$info" | json_str remoteName)
+
+if [ -n "$active_user" ]; then
+    log info "Already primed (device=$device_name, activeUser=$active_user) — nothing to do"
+    exit 0
+fi
+
+log info "Speaker '$device_name' has no active Spotify user — priming..."
+
+# --- Get token from soundtouch-service server ---
+log info "Requesting Spotify token from soundtouch-service..."
+token_response=$(curl -sf --max-time 15 \
+    -u "${SOUNDTOUCH_USER}:${SOUNDTOUCH_PASS}" \
+    "${SOUNDTOUCH_URL}/mgmt/spotify/token" \
+    2>&1)
+
+if [ $? -ne 0 ] || [ -z "$token_response" ]; then
+    log err "Failed to get token from soundtouch-service (is the server reachable?)"
+    exit 1
+fi
+
+access_token=$(echo "$token_response" | json_str accessToken)
+user=$(echo "$token_response" | json_str username)
+
+if [ -z "$access_token" ] || [ -z "$user" ]; then
+    error_msg=$(echo "$token_response" | json_str detail)
+    log err "soundtouch-service returned error: ${error_msg:-no token/username in response}"
+    exit 1
+fi
+
+log info "Got token for user $user (${access_token:0:10}...)"
+
+# --- Prime the speaker ---
+result=$(curl -sf --max-time 10 -X POST "$ZC_URL" \
+    -H "Content-Type: application/x-www-form-urlencoded" \
+    -d "action=addUser&userName=${user}&blob=${access_token}&clientKey=&tokenType=accesstoken" \
+    2>&1)
+
+status=$(echo "$result" | json_num status)
+status_str=$(echo "$result" | json_str statusString)
+
+if [ "$status" != "101" ]; then
+    log err "addUser failed: status=$status ($status_str)"
+    exit 1
+fi
+
+# --- Verify (retry — speaker needs a few seconds after cold boot) ---
+log info "addUser accepted (status 101) — verifying..."
+for i in 1 2 3 4 5; do
+    sleep $((i * 2))
+    active_user=$(curl -sf --max-time 5 "${ZC_URL}?action=getInfo" | json_str activeUser)
+    if [ -n "$active_user" ]; then
+        log info "Speaker primed successfully (activeUser=$active_user)"
+        exit 0
+    fi
+done
+
+log warning "Speaker accepted addUser but activeUser still empty after 30s"
+exit 1
@@ -0,0 +1,141 @@
+#!/usr/bin/env bash
+#
+# spotify-prime-speaker — Prime a Bose SoundTouch speaker for Spotify playback
+#
+# Activates Spotify on a SoundTouch speaker by sending an access token
+# via the Spotify Connect ZeroConf endpoint (port 8200). This is the
+# same mechanism the Spotify desktop app uses internally.
+#
+# Works standalone — no soundtouch-service, ueberboese, or other server required.
+#
+# Requirements: curl, jq
+#
+# Usage:
+#   ./spotify-prime-speaker SPEAKER_IP ACCESS_TOKEN
+#
+# Example:
+#   ./spotify-prime-speaker 192.168.1.143 BQDj...your_token...
+#
+# How to get an access token:
+#   - Spotify Developer Console: https://developer.spotify.com
+#     (create an app, use the "Get Token" button)
+#   - Via soundtouch-service management API: POST /mgmt/spotify/auth/init
+#   - Via ueberboese management API: POST /mgmt/spotify/init
+#   - Any Spotify OAuth Authorization Code flow with user-read-email scope
+#
+# Notes:
+#   - Access tokens expire after 1 hour (3600 seconds)
+#   - The speaker must be on the same network and reachable on port 8200
+#   - After priming, Spotify presets on the speaker should work immediately
+#   - Re-run after each speaker reboot (or use a server like soundtouch-service
+#     to automate this)
+#
+# How it works:
+#   The Bose SoundTouch speaker exposes a Spotify Connect ZeroConf API
+#   on port 8200. By sending an addUser request with a valid Spotify
+#   access token, the speaker activates its built-in Spotify Connect
+#   client. No encryption is needed — the token is sent as plain text,
+#   exactly like the Spotify desktop app does it.
+#
+# Related:
+#   - https://github.com/gesellix/Bose-SoundTouch (comprehensive toolkit)
+set -euo pipefail
+
+# --- Argument parsing ---
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 SPEAKER_IP ACCESS_TOKEN"
+  echo ""
+  echo "Prime a Bose SoundTouch speaker for Spotify playback."
+  echo ""
+  echo "Arguments:"
+  echo "  SPEAKER_IP     IP address of the SoundTouch speaker"
+  echo "  ACCESS_TOKEN   Spotify access token (starts with BQ...)"
+  echo ""
+  echo "Get a token at https://developer.spotify.com or via a server's OAuth flow."
+  exit 1
+fi
+
+SPEAKER_IP="$1"
+TOKEN="$2"
+ZC_URL="http://${SPEAKER_IP}:8200/zc"
+
+# --- Dependency check ---
+for cmd in curl jq; do
+  if ! command -v "$cmd" &>/dev/null; then
+    echo "Error: $cmd is required but not installed." >&2
+    exit 1
+  fi
+done
+
+# --- Step 1: Discover Spotify username from token ---
+echo "Discovering Spotify user from token..."
+ME_RESPONSE=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
+  https://api.spotify.com/v1/me 2>&1) || {
+  echo "Error: Failed to call Spotify /me API. Is the token valid?" >&2
+  echo "  (tokens expire after 1 hour)" >&2
+  exit 1
+}
+
+USER=$(echo "$ME_RESPONSE" | jq -r '.id // empty')
+if [ -z "$USER" ]; then
+  echo "Error: Could not extract user ID from Spotify response." >&2
+  echo "$ME_RESPONSE" >&2
+  exit 1
+fi
+echo "  Spotify user: $USER"
+
+# --- Step 2: Check current speaker status ---
+echo "Checking speaker at ${SPEAKER_IP}:8200..."
+INFO=$(curl -sf "${ZC_URL}?action=getInfo" 2>&1) || {
+  echo "Error: Could not reach speaker at ${SPEAKER_IP}:8200." >&2
+  echo "  Is the speaker on and on the same network?" >&2
+  exit 1
+}
+
+ACTIVE=$(echo "$INFO" | jq -r '.activeUser // empty')
+DEVICE_NAME=$(echo "$INFO" | jq -r '.remoteName // empty')
+
+if [ -n "$DEVICE_NAME" ]; then
+  echo "  Speaker: $DEVICE_NAME"
+fi
+
+if [ -n "$ACTIVE" ]; then
+  echo "  Already primed (activeUser=$ACTIVE)"
+  echo "Done — speaker is ready for Spotify playback."
+  exit 0
+fi
+
+echo "  No active Spotify user — priming now..."
+
+# --- Step 3: Send addUser ---
+RESULT=$(curl -sf -X POST "${ZC_URL}" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -d "action=addUser&userName=${USER}&blob=${TOKEN}&clientKey=&tokenType=accesstoken" \
+  2>&1) || {
+  echo "Error: addUser request failed." >&2
+  exit 1
+}
+
+STATUS=$(echo "$RESULT" | jq -r '.status // -1')
+STATUS_STR=$(echo "$RESULT" | jq -r '.statusString // empty')
+
+if [ "$STATUS" != "101" ]; then
+  echo "Error: Speaker returned status $STATUS ($STATUS_STR)" >&2
+  echo "$RESULT" | jq . >&2
+  exit 1
+fi
+
+echo "  Speaker accepted the token (status 101)."
+
+# --- Step 4: Verify ---
+echo "  Verifying (waiting 2 seconds)..."
+sleep 2
+ACTIVE=$(curl -sf "${ZC_URL}?action=getInfo" | jq -r '.activeUser // empty')
+
+if [ -n "$ACTIVE" ]; then
+  echo "Done — speaker primed for Spotify (activeUser=$ACTIVE)"
+else
+  echo "Warning: Speaker returned 101 but activeUser is still empty."
+  echo "  The speaker may need more time. Try pressing a Spotify preset."
+  exit 1
+fi
@@ -0,0 +1,6 @@
+# /mnt/nv/BoseApp-Persistence/1/spotify-primer.conf — service connection for boot primer
+# The speaker fetches a fresh Spotify token from the service at boot.
+# No Spotify credentials needed on the device.
+SOUNDTOUCH_URL=https://soundtouch.example.com
+SOUNDTOUCH_USER=admin
+SOUNDTOUCH_PASS=secret
Author	SHA1	Message	Date
Tobias Gesellchen	6a65376784	Attempt resolution if it's not a numeric IP	2026-02-22 14:17:01 +01:00
Tobias Gesellchen	44d04a2b41	Allow empty dns upstream config (default to system nameservers)	2026-02-22 13:58:30 +01:00
Tobias Gesellchen	0f802e65c6	Fallback to the system's dns resolver by default	2026-02-22 13:36:58 +01:00
Tobias Gesellchen	01d702c745	Fix the Raspberry Pi install script (self-update, env variables)	2026-02-22 01:03:50 +01:00
Tobias Gesellchen	7823b68bdd	Prime Spotify only on speaker boot/power_on	2026-02-22 00:33:15 +01:00
Tobias Gesellchen	e1f3fc36c8	Fix Spotify link display	2026-02-22 00:07:52 +01:00
Tobias Gesellchen	d68599896d	Add Spotify primer	2026-02-21 23:40:45 +01:00
Tobias Gesellchen	d18b67d80f	Remove device-local Spotify primer	2026-02-21 23:40:45 +01:00
Tobias Gesellchen	8642ecfc5c	Prepare Spotify primer	2026-02-21 23:40:45 +01:00
Tobias Gesellchen	c37e94b5f8	Remove unused BaseURL	2026-02-21 11:22:46 +01:00
Tobias Gesellchen	4e33f6948f	Add DNS discovery download	2026-02-21 11:22:46 +01:00
Tobias Gesellchen	743ff5e061	Add streamingoauth.bose.com to the intercepted DNS records	2026-02-21 11:22:46 +01:00
Tobias Gesellchen	ec8bbb2f86	Lint: cleanup	2026-02-21 00:42:07 +01:00
Tobias Gesellchen	e75e2bea0c	Update Raspberry Pi installation script to include Spotify	2026-02-21 00:42:07 +01:00
Tobias Gesellchen	dd5aa2ad53	Disable HTML escaping in JSON response	2026-02-21 00:42:07 +01:00
Tobias Gesellchen	aced0f3f81	Use the Chi BasicAuth middleware	2026-02-21 00:42:07 +01:00
Tobias Gesellchen	a886518cad	Add example redirect URIs for both browser and ueberboese-app	2026-02-21 00:42:07 +01:00
Tim Van Wassenhove	dc81b0aa81	feat: separate browser callback and mobile app confirm endpoints - Add GET /mgmt/spotify/callback (no auth) for browser OAuth redirect - Restore POST /mgmt/spotify/confirm (Basic Auth) for ueberboese mobile app - Callback returns HTML success/error pages; confirm returns JSON - Both call the same ExchangeCodeAndStore() logic	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	c648027735	fix: OAuth callback as GET outside auth group, remove dead zeroconf flag, update .env.example - Change /mgmt/spotify/confirm from POST to GET (Spotify redirects via GET) - Move confirm endpoint outside Basic Auth group (code is single-use, needs client_secret) - Remove --zeroconf-primer-enabled flag (no ZeroConf primer code on this branch) - Add Spotify/mgmt env var documentation to .env.example	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	fced88a8a6	feat: add management API endpoints matching ueberboese-app	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	0ee673c097	feat: wire Spotify service into server	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	395b2fec8e	feat: add Spotify OAuth service with token management	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	be7e44e14b	feat: add Basic Auth middleware for management API	2026-02-21 00:21:52 +01:00
Tim Van Wassenhove	a87783d8c6	feat: add Spotify, management, and ZeroConf CLI flags	2026-02-21 00:21:52 +01:00
Tobias Gesellchen	be017440b7	Add userInactivity event	2026-02-20 09:18:53 +01:00
Tobias Gesellchen	10de011c18	Simplify the PlayTTS method cmd	2026-02-19 08:46:55 +01:00
Tobias Gesellchen	f7b74db3ea	Make the linter happy	2026-02-19 08:44:26 +01:00
Tobias Gesellchen	72d75133c4	Capture server references before releasing mutex to avoid race condition	2026-02-19 08:44:26 +01:00
Tobias Gesellchen	e4c12471b4	Add more upstream domains to the intercept list	2026-02-19 08:44:26 +01:00
Tobias Gesellchen	3329149282	Add support for RADIO_BROWSER source This implementation follows the reference from soundcork pull request #158. It adds RADIO_BROWSER to the known providers and includes the service configuration in bmx_services.json. Documentation has also been added to explain how to use the RadioBrowser feature. Credits to @gmuth (https://github.com/gmuth) for the original idea and implementation in soundcork. Reference: https://github.com/deborahgu/soundcork/pull/158	2026-02-16 22:18:33 +01:00
Tobias Gesellchen	523ff0eb17	Fix deadlock in settings update and add efficient DNS settings validation	2026-02-16 21:02:42 +01:00
Tobias Gesellchen	025e15d65c	Implement log throttling, loop prevention, and empty upstream handling in DNS discovery server	2026-02-16 21:02:42 +01:00
Tobias Gesellchen	7d140b3e2a	Fix TestMigrationAndCA by enhancing mock SSH client This commit updates the mock SSH client in the handler tests to support the recently added verification steps. It now correctly handles stateful responses for /etc/hosts and properly responds to file existence and CA trust checks.	2026-02-16 20:17:25 +01:00
Tobias Gesellchen	69210638e5	Add verification steps to speaker migration process This update adds explicit verification checks after applying changes via XML, Hosts, and ResolvConf migration methods. The service now verifies that configuration files are correctly updated on the device before considering the migration successful, preventing unreliable states.	2026-02-16 20:17:25 +01:00
Tobias Gesellchen	6aef2b807d	Enhance ResolvConf migration to support multiple DHCP script variants This update allows the service to correctly patch both /etc/udhcpc.d/50default and /opt/Bose/udhcpc.script (used in SoundTouch 10 firmware) for DNS redirection. It also improves robustness by adding file existence checks in rc.local and ensures clean state by reverting to .original backups during migration.	2026-02-16 18:52:25 +01:00
Tobias Gesellchen	95f5e9c831	fix(setup): prevent and clean up corrupted rc.local with cat error message	2026-02-16 18:20:16 +01:00
Tobias Gesellchen	7337296ae9	refactor(setup): reduce cyclomatic complexity of RevertMigration	2026-02-16 18:04:28 +01:00
Tobias Gesellchen	92a5d3592c	feat(setup): replace obsolete resolv method with persistent DHCP-aware DNS hook	2026-02-16 18:04:28 +01:00
Tobias Gesellchen	2f04af872b	feat(setup): implement Aftertouch Hook (DHCP-aware DNS redirection); update UI and tests; docs now use aftertouch.resolv.conf	2026-02-16 18:04:28 +01:00
Tobias Gesellchen	9479d6d11d	Fix missing request body in recorded proxy interactions	2026-02-16 16:30:41 +01:00
Tobias Gesellchen	f687ba0d82	go mod tidy	2026-02-16 12:45:04 +01:00