Extract all icons, add mapping including names

Add font-icon-extractor tool
2026-08-31 14:57:17 +00:00 · 2026-03-28 15:49:06 +01:00 · 2026-03-28 15:49:06 +01:00
616 changed files with 4602 additions and 17566 deletions
@@ -28,15 +28,6 @@
    },
    {
      "pattern": "^\\.\\./images/(dashboard-home|account-creation|account-dashboard|usb-remote-services|device-discovery|device-registration|account-migration|migration-setup|migration-progress|migration-health|migration-complete|backup-setup)\\.png$"
-    },
-    {
-      "pattern": "https://www.contributor-covenant.org/version/2/0/code_of_conduct.html"
-    },
-    {
-      "pattern": "https://www.apkmirror.com/apk/bose-corporation/bose-soundtouch/"
-    },
-    {
-      "pattern": "https://apkpure.com/bose-soundtouch/com.bose.soundtouch"
    }
  ],
  "replacementPatterns": [
@@ -34,9 +34,6 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-go-

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Download dependencies
        run: go mod download

@@ -73,9 +70,6 @@ jobs:
        with:
          go-version-file: "go.mod"

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Run golangci-lint
        uses: golangci/golangci-lint-action@v9
        with:
@@ -133,9 +127,6 @@ jobs:
        with:
          go-version-file: "go.mod"

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Run basic vulnerability check
        run: |
          go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -156,9 +147,11 @@ jobs:
        uses: actions/checkout@v6

      - name: Check documentation links
-        run: |
-          npm install -g markdown-link-check
-          find . -name "*.md" -not -path "./tests/*" -not -path "./node_modules/*" -print0 | xargs -0 -n1 markdown-link-check -q -v -c .github/markdown-link-check.json
+        uses: gaurav-nelson/github-action-markdown-link-check@v1
+        with:
+          use-quiet-mode: "yes"
+          use-verbose-mode: "yes"
+          config-file: ".github/markdown-link-check.json"

      - name: Warn on pending images
        run: |
@@ -279,8 +272,8 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Extract metadata (tags, labels) for soundtouch-service
-        id: meta-service
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}
@@ -288,36 +281,14 @@ jobs:
            type=raw,value=edge,enable=${{ github.ref == 'refs/heads/main' }}
            type=ref,event=pr

-      - name: Build and push soundtouch-service Docker image
+      - name: Build and push Docker image
        uses: docker/build-push-action@v7
        with:
          context: .
-          target: soundtouch-service
          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-          tags: ${{ steps.meta-service.outputs.tags }}
-          labels: ${{ steps.meta-service.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Extract metadata (tags, labels) for soundtouch-web
-        id: meta-web
-        uses: docker/metadata-action@v6
-        with:
-          images: ghcr.io/${{ github.repository }}-web
-          tags: |
-            type=raw,value=edge,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=pr
-
-      - name: Build and push soundtouch-web Docker image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          target: soundtouch-web
-          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
-          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-          tags: ${{ steps.meta-web.outputs.tags }}
-          labels: ${{ steps.meta-web.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

@@ -355,7 +326,7 @@ jobs:

      - name: Update commit status
        if: always()
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        with:
          script: |
            try {
@@ -22,14 +22,14 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v6
      - name: Setup Pages
-        uses: actions/configure-pages@v6
+        uses: actions/configure-pages@v5
      - name: Build with Jekyll
        uses: actions/jekyll-build-pages@v1
        with:
          source: 'docs/'
          destination: '_site'
      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v5
+        uses: actions/upload-pages-artifact@v4
        with:
          path: '_site'
      - name: Deploy to GitHub Pages
@@ -68,9 +68,6 @@ jobs:
        with:
          go-version-file: ${{ env.GO_VERSION_FILE }}

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Run tests before release
        run: |
          echo "Running final tests before release..."
@@ -168,16 +165,12 @@ jobs:

          # Build Service
          build_binary "soundtouch-service" "./cmd/soundtouch-service"
-
-          # Build Web
-          build_binary "soundtouch-web" "./cmd/soundtouch-web"
        id: build

      - name: Generate individual checksums
        run: |
          CLI_NAME="${{ steps.build.outputs.soundtouch-cli }}"
          SVC_NAME="${{ steps.build.outputs.soundtouch-service }}"
-          WEB_NAME="${{ steps.build.outputs.soundtouch-web }}"

          # Use atomic operations to avoid conflicts
          TEMP_DIR=$(mktemp -d)
@@ -193,7 +186,6 @@ jobs:

          generate_checksums "$CLI_NAME"
          generate_checksums "$SVC_NAME"
-          generate_checksums "$WEB_NAME"

          # Cleanup
          rm -rf "$TEMP_DIR"
@@ -206,7 +198,6 @@ jobs:
          path: |
            build/soundtouch-cli-v*
            build/soundtouch-service-v*
-            build/soundtouch-web-v*
          retention-days: 1

  checksums:
@@ -233,7 +224,7 @@ jobs:
          mkdir -p release-files

          # Move all files from subdirectories to the collection directory
-          find . -mindepth 2 -type f \( -name "soundtouch-cli-*" -o -name "soundtouch-service-*" -o -name "soundtouch-web-*" \) -exec mv {} release-files/ \;
+          find . -mindepth 2 -type f \( -name "soundtouch-cli-*" -o -name "soundtouch-service-*" \) -exec mv {} release-files/ \;

          # Remove empty directories
          find . -type d -empty -delete
@@ -255,7 +246,7 @@ jobs:
            cat checksums.sha256

            # Verify all expected files are present (binaries only, not checksum files)
-            EXPECTED_COUNT=21  # 7 platforms * 3 binaries
+            EXPECTED_COUNT=14  # 7 platforms * 2 binaries
            ACTUAL_COUNT=$(ls soundtouch-* | grep -v '\.sha256$' | grep -v '\.sha512$' | wc -l)

            if [[ $ACTUAL_COUNT -ne $EXPECTED_COUNT ]]; then
@@ -386,12 +377,6 @@ jobs:
          ./soundtouch-service
          \`\`\`

-          ### SoundTouch Web
-          \`\`\`bash
-          # Start the web app
-          ./soundtouch-web
-          \`\`\`
-
          ## 🧪 Tested Hardware

          - Bose SoundTouch 10
@@ -410,7 +395,7 @@ jobs:
          - Windows (amd64)
          - FreeBSD (amd64)

-          `soundtouch-cli`, `soundtouch-service`, and `soundtouch-web` are included.
+          Both `soundtouch-cli` and `soundtouch-service` are included.

          ## 🔐 Checksums

@@ -455,7 +440,7 @@ jobs:
          echo "release_notes_file=release_notes.md" >> $GITHUB_OUTPUT

      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ github.event.inputs.tag }}
          name: "Bose SoundTouch Go Library ${{ github.event.inputs.tag }}"
@@ -465,7 +450,6 @@ jobs:
          files: |
            release-assets/soundtouch-cli-v*
            release-assets/soundtouch-service-v*
-            release-assets/soundtouch-web-v*
            release-assets/checksums.sha256
            release-assets/checksums.sha512
          fail_on_unmatched_files: true
@@ -486,13 +470,12 @@ jobs:
          path: ./release-assets

      - name: Upload additional assets to existing release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ github.event.release.tag_name }}
          files: |
            release-assets/soundtouch-cli-v*
            release-assets/soundtouch-service-v*
-            release-assets/soundtouch-web-v*
            release-assets/checksums.sha256
            release-assets/checksums.sha512
          fail_on_unmatched_files: true
@@ -518,8 +501,8 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Extract metadata (tags, labels) for soundtouch-service
-        id: meta-service
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}
@@ -528,37 +511,14 @@ jobs:
            type=semver,pattern={{major}}.{{minor}},value=v${{ needs.validate.outputs.version }}
            type=raw,value=latest,enable=${{ needs.validate.outputs.is_prerelease == 'false' }}

-      - name: Build and push soundtouch-service Docker image
+      - name: Build and push Docker image
        uses: docker/build-push-action@v7
        with:
          context: .
-          target: soundtouch-service
          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
          push: true
-          tags: ${{ steps.meta-service.outputs.tags }}
-          labels: ${{ steps.meta-service.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Extract metadata (tags, labels) for soundtouch-web
-        id: meta-web
-        uses: docker/metadata-action@v6
-        with:
-          images: ghcr.io/${{ github.repository }}-web
-          tags: |
-            type=semver,pattern={{version}},value=v${{ needs.validate.outputs.version }}
-            type=semver,pattern={{major}}.{{minor}},value=v${{ needs.validate.outputs.version }}
-            type=raw,value=latest,enable=${{ needs.validate.outputs.is_prerelease == 'false' }}
-
-      - name: Build and push soundtouch-web Docker image
-        uses: docker/build-push-action@v7
-        with:
-          context: .
-          target: soundtouch-web
-          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
-          push: true
-          tags: ${{ steps.meta-web.outputs.tags }}
-          labels: ${{ steps.meta-web.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

@@ -572,7 +532,7 @@ jobs:
      - name: Notify success
        run: |
          echo "🎉 Release ${{ needs.validate.outputs.version }} completed successfully!"
-          echo "📦 Binaries built for 7 platforms (CLI, Service, and Web)"
+          echo "📦 Binaries built for 7 platforms (CLI and Service)"
          echo "🐳 Docker image published to ghcr.io"
          echo "🔐 Checksums generated and verified"
          echo "📋 Release notes automatically generated"
@@ -26,9 +26,6 @@ jobs:
        with:
          go-version-file: "go.mod"

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Install security scanning tools
        run: |
          go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -70,9 +67,6 @@ jobs:
        with:
          go-version-file: "go.mod"

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Install static analysis tools
        run: |
          go install honnef.co/go/tools/cmd/staticcheck@latest
@@ -112,9 +106,6 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v6

-      - name: Install libpcap
-        run: sudo apt-get install -y libpcap-dev
-
      - name: Initialize CodeQL
        uses: github/codeql-action/init@v4
        with:
@@ -14,7 +14,6 @@ dist/
 # Root-level binary executables (exclude built binaries in root)
 /soundtouch-cli
 /soundtouch-service
-/soundtouch-web
 /example-mdns
 /example-upnp
 /example-unified
@@ -1,5 +1,5 @@
 # Build stage
-FROM --platform=$BUILDPLATFORM golang:1.26.2-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26.1-alpine AS builder

 # Declare automatic platform ARGs to make them available in build stage
 # See https://docs.docker.com/reference/dockerfile#automatic-platform-args-in-the-global-scope
@@ -24,47 +24,31 @@ RUN if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /soundtouch-service ./cmd/soundtouch-service; \
    fi

-# Build the soundtouch-web
-RUN if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} go build -o /soundtouch-web ./cmd/soundtouch-web; \
-    else \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /soundtouch-web ./cmd/soundtouch-web; \
-    fi
-
-# soundtouch-service image
-FROM alpine:3.23 AS soundtouch-service
+# Final stage
+FROM alpine:3.23

+# Install necessary runtime dependencies
 RUN apk add --no-cache ca-certificates tzdata

 WORKDIR /app

+# Copy the binary from the builder stage
 COPY --from=builder /soundtouch-service /app/soundtouch-service

 # Verify the binary works on the target platform
 RUN /app/soundtouch-service version || echo "Binary verification complete"

+# Create data directory for persistence
 RUN mkdir -p /app/data

+# Set environment variables with defaults
 ENV PORT=8000
 ENV DATA_DIR=/app/data
 ENV LOG_PROXY_BODY=false
 ENV REDACT_PROXY_LOGS=true

+# Expose the service port
 EXPOSE 8000

+# Run the service
 ENTRYPOINT ["/app/soundtouch-service"]
-
-# soundtouch-web image
-FROM alpine:3.23 AS soundtouch-web
-
-RUN apk add --no-cache ca-certificates tzdata
-
-WORKDIR /app
-
-COPY --from=builder /soundtouch-web /app/soundtouch-web
-
-ENV PORT=8080
-
-EXPOSE 8080
-
-ENTRYPOINT ["/app/soundtouch-web"]
@@ -14,8 +14,6 @@ BINARY_NAME=soundtouch-cli
 BINARY_PATH=./cmd/$(BINARY_NAME)
 SERVICE_NAME=soundtouch-service
 SERVICE_PATH=./cmd/$(SERVICE_NAME)
-WEB_NAME=soundtouch-web
-WEB_PATH=./cmd/$(WEB_NAME)
 EXAMPLE_MDNS_NAME=example-mdns
 EXAMPLE_MDNS_PATH=./cmd/$(EXAMPLE_MDNS_NAME)
 EXAMPLE_UPNP_NAME=example-upnp
@@ -31,7 +29,7 @@ BUILD_DIR=./build

 all: check build

-build: build-cli build-service build-web build-examples build-favicon-gen
+build: build-cli build-service build-examples build-favicon-gen

 build-cli:
 	@echo "Building $(BINARY_NAME)..."
@@ -43,11 +41,6 @@ build-service:
 	@mkdir -p $(BUILD_DIR)
 	$(GOBUILD) -o $(BUILD_DIR)/$(SERVICE_NAME) $(SERVICE_PATH)

-build-web:
-	@echo "Building $(WEB_NAME)..."
-	@mkdir -p $(BUILD_DIR)
-	$(GOBUILD) -o $(BUILD_DIR)/$(WEB_NAME) $(WEB_PATH)
-
 build-examples:
 	@echo "Building $(EXAMPLE_MDNS_NAME)..."
 	@mkdir -p $(BUILD_DIR)
@@ -113,49 +106,33 @@ test-coverage:
 check: fmt vet test test-http-client

 test-http-client:
-	@echo "Starting services with docker compose..."
-	@docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build
-	@echo "Waiting for services to start..."
-	@sleep 10
-	@echo "Running .http tests..."
+	@echo "Running HTTP client integration tests..."
+	@docker network create soundtouch-test-net || true
+	@docker build -t soundtouch-service-test .
+	@docker run -d --name soundtouch-service --network soundtouch-test-net \
+		-e PORT=8000 \
+		soundtouch-service-test
+	@echo "Waiting for service to start..."
+	@sleep 5
 	@docker run --rm --network soundtouch-test-net \
-		-v "$(PWD)/tests/integration/http-client:/workdir" \
+		-v $(PWD)/tests/integration/http-client:/workdir \
 		jetbrains/intellij-http-client:2026.1 \
 		--env-file /workdir/http-client.env.json \
 		--env ci \
-		/workdir/spotify_registration.http \
 		/workdir/create_account.http \
 		/workdir/register_device.http \
-		/workdir/spotify_full_flow.http \
-		/workdir/customer_support.http \
 		/workdir/power_on.http \
-		/workdir/get_bmx_services.http \
-		/workdir/get_sourceproviders.http \
-		/workdir/get_software_update.http \
-		/workdir/get_soundtouch_updates.http \
-		/workdir/get_streaming_token.http \
-		/workdir/post_oauth_token.http \
 		/workdir/get_provider_settings.http \
-		/workdir/tunein_playback_station.http \
-		/workdir/set_preset_6.http \
-		/workdir/get_presets.http \
-		/workdir/delete_preset_6.http \
-		/workdir/set_preset_5.http \
-		/workdir/post_recent.http \
-		/workdir/get_recents.http \
-		/workdir/get_account_presets.http \
-		/workdir/get_account_devices.http \
-		/workdir/get_account_sources.http \
-		/workdir/get_api_versions.http \
-		/workdir/post_musicprovider_is_eligible.http \
 		/workdir/get_full_account.http \
 		/workdir/get_group.http \
 		/workdir/unregister_device.http \
 		--report; \
 	EXIT_CODE=$$?; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs soundtouch-service; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs spotify-mock; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml down; \
+	docker logs soundtouch-service; \
+	docker stop soundtouch-service; \
+	docker rm soundtouch-service; \
+	docker rmi soundtouch-service-test; \
+	docker network rm soundtouch-test-net; \
 	exit $$EXIT_CODE

 fmt:
@@ -247,31 +224,10 @@ dev-scan-http: build-examples
 	@echo "Scanning for HTTP mDNS services..."
 	$(BUILD_DIR)/$(SCANNER_NAME) -service _http._tcp -v

-dev-web: build-web
-	@echo "Starting web UI (default port 8080)..."
-	cd cmd/soundtouch-web && ../../$(BUILD_DIR)/$(WEB_NAME)
-
-dev-web-port: build-web
-	@echo "Starting web UI on custom port..."
-	@if [ -z "$(PORT)" ]; then \
-		echo "Usage: make dev-web-port PORT=8888"; \
-		exit 1; \
-	fi
-	cd cmd/soundtouch-web && ../../$(BUILD_DIR)/$(WEB_NAME) -port $(PORT)
-
-dev-web-host: build-web
-	@echo "Starting web UI with specific host..."
-	@if [ -z "$(HOST)" ]; then \
-		echo "Usage: make dev-web-host HOST=192.168.1.10"; \
-		exit 1; \
-	fi
-	cd cmd/soundtouch-web && ../../$(BUILD_DIR)/$(WEB_NAME) -host $(HOST)
-
-install: build-cli build-service build-web
+install: build-cli build-service
 	@echo "Installing binaries to $(GOPATH)/bin..."
 	cp $(BUILD_DIR)/$(BINARY_NAME) $(GOPATH)/bin/
 	cp $(BUILD_DIR)/$(SERVICE_NAME) $(GOPATH)/bin/
-	cp $(BUILD_DIR)/$(WEB_NAME) $(GOPATH)/bin/

 clean:
 	@echo "Cleaning..."
@@ -291,7 +247,7 @@ release: clean check build-all

 docker-build:
 	@echo "Building Docker image..."
-	docker build --target soundtouch-service -t soundtouch-service .
+	docker build -t soundtouch-service .

 docker-run-host:
 	@echo "Running Docker container..."
@@ -331,9 +287,6 @@ help:
 	@echo "  dev-scan-all     - Scan all mDNS services on network"
 	@echo "  dev-scan-soundtouch - Scan specifically for SoundTouch mDNS services"
 	@echo "  dev-scan-http    - Scan for HTTP mDNS services"
-	@echo "  dev-web          - Build and run web UI (default port 8080)"
-	@echo "  dev-web-port     - Build and run web UI on custom port (PORT=8888)"
-	@echo "  dev-web-host     - Build and run web UI with specific device (HOST=ip)"
 	@echo "  install       - Install binaries to GOPATH/bin"
 	@echo "  clean         - Clean build artifacts"
 	@echo "  release       - Create release binaries"
@@ -355,8 +308,5 @@ help:
 	@echo "  make dev-upnp-timeout TIMEOUT=10s"
 	@echo "  make dev-scan-all"
 	@echo "  make dev-scan-soundtouch"
-	@echo "  make dev-web"
-	@echo "  make dev-web-port PORT=8888"
-	@echo "  make dev-web-host HOST=192.168.1.10"
 	@echo "  make test"
 	@echo "  make build-all"
@@ -480,7 +480,7 @@ SoundTouch is a trademark of Bose Corporation.

 This Go library will continue to work as it uses the local Web API for direct device control, which is unaffected by the cloud service discontinuation. The local preset management functionality implemented in this library (discovered through the [SoundTouch Plus Wiki](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API)) provides an alternative to the cloud-based preset features that will be discontinued.

-**Community Alternatives**: See the [Related Projects & Credits](#related-projects--credits) section below for additional tools like SoundCork that provide cloud service alternatives and the SoundTouch Plus project that offers comprehensive Home Assistant integration.
+**Community Alternatives**: See the [Related Projects](#related-projects) section below for additional tools like SoundCork that provide cloud service alternatives and the SoundTouch Plus project that offers comprehensive Home Assistant integration.

 ## Related Projects & Credits

@@ -0,0 +1 @@
+test_output/
@@ -0,0 +1,305 @@
+// Package main provides a utility to extract icons from Bose-branded TrueType fonts.
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/png"
+	"log"
+	"os"
+	"path/filepath"
+	"sort"
+
+	"github.com/srwiley/rasterx"
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/sfnt"
+	"golang.org/x/image/math/fixed"
+)
+
+type IconMapping struct {
+	Hex       string `json:"hex"`
+	GlyphName string `json:"glyph_name"`
+	File      string `json:"file"`
+	SVGFile   string `json:"svg_file,omitempty"`
+}
+
+func main() {
+	fontPath := flag.String("font", "/path/to/bose.ttf", "Path to the TTF font file")
+	outputDir := flag.String("output", "extracted_icons", "Output directory for icons")
+	imgSize := flag.Int("size", 256, "Size of the PNG icons")
+
+	flag.Parse()
+
+	if err := os.MkdirAll(*outputDir, 0755); err != nil {
+		log.Fatalf("Failed to create output directory: %v", err)
+	}
+
+	data, err := os.ReadFile(*fontPath)
+	if err != nil {
+		log.Fatalf("Failed to read font file: %v", err)
+	}
+
+	f, err := sfnt.Parse(data)
+	if err != nil {
+		log.Fatalf("Failed to parse font: %v", err)
+	}
+
+	var (
+		buffer     sfnt.Buffer
+		glyphIndex sfnt.GlyphIndex
+		glyphName  string
+		segments   sfnt.Segments
+		pngFile    *os.File
+	)
+
+	unitsPerEm := f.UnitsPerEm()
+	ppem := fixed.Int26_6(unitsPerEm) << 6
+
+	m, err := f.Metrics(&buffer, ppem, font.HintingNone)
+	if err != nil {
+		log.Fatalf("Failed to get metrics: %v", err)
+	}
+
+	mapping := make(map[rune]IconMapping)
+
+	// Iterate through common ranges
+	ranges := []struct{ start, end rune }{
+		{0x20, 0x7E},     // Basic Latin
+		{0xA0, 0xFF},     // Latin-1 Supplement
+		{0xE000, 0xF8FF}, // Private Use Area
+	}
+
+	for _, rg := range ranges {
+		for r := rg.start; r <= rg.end; r++ {
+			glyphIndex, err = f.GlyphIndex(&buffer, r)
+			if err != nil || glyphIndex == 0 {
+				continue
+			}
+
+			glyphName, err = f.GlyphName(&buffer, glyphIndex)
+			if err != nil {
+				glyphName = fmt.Sprintf("uni%04X", r)
+			}
+
+			segments, err = f.LoadGlyph(&buffer, glyphIndex, ppem, nil)
+			if err != nil {
+				fmt.Printf("Failed to load glyph 0x%04X: %v\n", r, err)
+				continue
+			}
+
+			if len(segments) == 0 {
+				continue
+			}
+
+			charHex := fmt.Sprintf("%04X", r)
+			pngFilename := fmt.Sprintf("icon_%s.png", charHex)
+			svgFilename := fmt.Sprintf("icon_%s.svg", charHex)
+
+			// 1. Extract SVG
+			svgPath := segmentsToSVGPath(segments)
+			totalHeight := float64(m.Ascent+m.Descent) / 64.0
+			svgContent := fmt.Sprintf(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 %g %d %g">
+  <g transform="scale(1, -1)">
+    <path d="%s" />
+  </g>
+</svg>`, -float64(m.Ascent)/64.0, int(unitsPerEm), totalHeight, svgPath)
+
+			if err = os.WriteFile(filepath.Join(*outputDir, svgFilename), []byte(svgContent), 0644); err != nil {
+				fmt.Printf("Failed to write SVG 0x%s: %v\n", charHex, err)
+			}
+
+			// 2. Render PNG
+			img := renderGlyphToPNG(segments, int(unitsPerEm), int(m.Ascent), int(m.Descent), *imgSize)
+
+			pngFile, err = os.Create(filepath.Join(*outputDir, pngFilename))
+			if err == nil {
+				if err = png.Encode(pngFile, img); err != nil {
+					fmt.Printf("Failed to encode PNG 0x%s: %v\n", charHex, err)
+				}
+
+				pngFile.Close()
+			} else {
+				fmt.Printf("Failed to create PNG file 0x%s: %v\n", charHex, err)
+			}
+
+			mapping[r] = IconMapping{
+				Hex:       fmt.Sprintf("0x%s", charHex),
+				GlyphName: glyphName,
+				File:      pngFilename,
+				SVGFile:   svgFilename,
+			}
+		}
+	}
+
+	// Save mapping.json
+	mappingList := make(map[string]IconMapping)
+
+	var keys []int
+
+	for r, m := range mapping {
+		mappingList[fmt.Sprintf("%d", r)] = m
+		keys = append(keys, int(r))
+	}
+
+	sort.Ints(keys)
+
+	jsonData, err := json.MarshalIndent(mappingList, "", "    ")
+	if err != nil {
+		log.Fatalf("Failed to marshal mapping: %v", err)
+	}
+
+	_ = os.WriteFile(filepath.Join(*outputDir, "mapping.json"), jsonData, 0644)
+
+	// Save mapping.md
+	mdFile, _ := os.Create(filepath.Join(*outputDir, "mapping.md"))
+	fmt.Fprintln(mdFile, "# Bose Icons Mapping")
+	fmt.Fprintln(mdFile, "")
+	fmt.Fprintln(mdFile, "| Char Code | Glyph Name | PNG | SVG |")
+	fmt.Fprintln(mdFile, "| --- | --- | --- | --- |")
+
+	for _, k := range keys {
+		m := mapping[rune(k)]
+		fmt.Fprintf(mdFile, "| %s | %s | ![%s](%s) | [SVG](%s) |\n", m.Hex, m.GlyphName, m.GlyphName, m.File, m.SVGFile)
+	}
+
+	mdFile.Close()
+
+	fmt.Printf("Extracted %d icons to %s\n", len(mapping), *outputDir)
+}
+
+func segmentsToSVGPath(segments sfnt.Segments) string {
+	var path string
+
+	for _, seg := range segments {
+		switch seg.Op {
+		case sfnt.SegmentOpMoveTo:
+			path += fmt.Sprintf("M%g %g ", float64(seg.Args[0].X)/64.0, -float64(seg.Args[0].Y)/64.0)
+		case sfnt.SegmentOpLineTo:
+			path += fmt.Sprintf("L%g %g ", float64(seg.Args[0].X)/64.0, -float64(seg.Args[0].Y)/64.0)
+		case sfnt.SegmentOpQuadTo:
+			path += fmt.Sprintf("Q%g %g %g %g ", float64(seg.Args[0].X)/64.0, -float64(seg.Args[0].Y)/64.0, float64(seg.Args[1].X)/64.0, -float64(seg.Args[1].Y)/64.0)
+		case sfnt.SegmentOpCubeTo:
+			path += fmt.Sprintf("C%g %g %g %g %g %g ", float64(seg.Args[0].X)/64.0, -float64(seg.Args[0].Y)/64.0, float64(seg.Args[1].X)/64.0, -float64(seg.Args[1].Y)/64.0, float64(seg.Args[2].X)/64.0, -float64(seg.Args[2].Y)/64.0)
+		}
+	}
+
+	return path
+}
+
+func renderGlyphToPNG(segments sfnt.Segments, _, _, _, imgSize int) image.Image {
+	rgba := image.NewRGBA(image.Rect(0, 0, imgSize, imgSize))
+	draw.Draw(rgba, rgba.Bounds(), image.Transparent, image.Point{}, draw.Src)
+
+	// Calculate glyph bounds
+	var xmin, ymin, xmax, ymax float64
+
+	initialized := false
+
+	for _, seg := range segments {
+		for _, arg := range seg.Args {
+			x, y := float64(arg.X)/64.0, float64(arg.Y)/64.0
+			if !initialized {
+				xmin, xmax = x, x
+				ymin, ymax = y, y
+				initialized = true
+			} else {
+				if x < xmin {
+					xmin = x
+				}
+
+				if x > xmax {
+					xmax = x
+				}
+
+				if y < ymin {
+					ymin = y
+				}
+
+				if y > ymax {
+					ymax = y
+				}
+			}
+		}
+	}
+
+	w := xmax - xmin
+	h := ymax - ymin
+
+	// If no width/height, return empty image
+	if w <= 0 || h <= 0 {
+		return rgba
+	}
+
+	// Calculate scale to fit in imgSize with padding
+	padding := 20.0
+	available := float64(imgSize) - 2*padding
+
+	scale := available / w
+	if h*scale > available {
+		scale = available / h
+	}
+
+	// Center the glyph
+	// X: center of image (imgSize/2) - (center of glyph (xmin+xmax)/2) * scale
+	offsetX := float64(imgSize)/2.0 - (xmin+xmax)/2.0*scale
+	// Y: center of image (imgSize/2) - (center of glyph (ymin+ymax)/2) * scale
+	offsetY := float64(imgSize)/2.0 - (ymin+ymax)/2.0*scale
+
+	scanner := rasterx.NewScannerGV(imgSize, imgSize, rgba, rgba.Bounds())
+	filler := rasterx.NewFiller(imgSize, imgSize, scanner)
+	filler.SetColor(color.Black)
+
+	for _, seg := range segments {
+		switch seg.Op {
+		case sfnt.SegmentOpMoveTo:
+			filler.Start(fixedP(
+				offsetX+float64(seg.Args[0].X)/64.0*scale,
+				offsetY+float64(seg.Args[0].Y)/64.0*scale,
+			))
+		case sfnt.SegmentOpLineTo:
+			filler.Line(fixedP(
+				offsetX+float64(seg.Args[0].X)/64.0*scale,
+				offsetY+float64(seg.Args[0].Y)/64.0*scale,
+			))
+		case sfnt.SegmentOpQuadTo:
+			filler.QuadBezier(
+				fixedP(
+					offsetX+float64(seg.Args[0].X)/64.0*scale,
+					offsetY+float64(seg.Args[0].Y)/64.0*scale,
+				),
+				fixedP(
+					offsetX+float64(seg.Args[1].X)/64.0*scale,
+					offsetY+float64(seg.Args[1].Y)/64.0*scale,
+				),
+			)
+		case sfnt.SegmentOpCubeTo:
+			filler.CubeBezier(
+				fixedP(
+					offsetX+float64(seg.Args[0].X)/64.0*scale,
+					offsetY+float64(seg.Args[0].Y)/64.0*scale,
+				),
+				fixedP(
+					offsetX+float64(seg.Args[1].X)/64.0*scale,
+					offsetY+float64(seg.Args[1].Y)/64.0*scale,
+				),
+				fixedP(
+					offsetX+float64(seg.Args[2].X)/64.0*scale,
+					offsetY+float64(seg.Args[2].Y)/64.0*scale,
+				),
+			)
+		}
+	}
+
+	filler.Stop(true)
+	filler.Draw()
+
+	return rgba
+}
+
+func fixedP(x, y float64) fixed.Point26_6 {
+	return fixed.Point26_6{X: fixed.Int26_6(x * 64), Y: fixed.Int26_6(y * 64)}
+}
@@ -0,0 +1,103 @@
+package main
+
+import (
+	"fmt"
+	"image/png"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/sfnt"
+	"golang.org/x/image/math/fixed"
+)
+
+func TestExtractE115(t *testing.T) {
+	fontPath := "testdata/bose_subset.ttf"
+	outputDir := "test_output"
+	refDir := "testdata/references"
+	imgSize := 256
+	targetRune := rune(0xE115)
+
+	if err := os.MkdirAll(outputDir, 0755); err != nil {
+		t.Fatalf("Failed to create output directory: %v", err)
+	}
+
+	data, err := os.ReadFile(fontPath)
+	if err != nil {
+		t.Fatalf("Failed to read font file: %v", err)
+	}
+
+	f, err := sfnt.Parse(data)
+	if err != nil {
+		t.Fatalf("Failed to parse font: %v", err)
+	}
+
+	var buffer sfnt.Buffer
+	unitsPerEm := f.UnitsPerEm()
+	ppem := fixed.Int26_6(unitsPerEm) << 6
+
+	m, err := f.Metrics(&buffer, ppem, font.HintingNone)
+	if err != nil {
+		t.Fatalf("Failed to get metrics: %v", err)
+	}
+
+	glyphIndex, err := f.GlyphIndex(&buffer, targetRune)
+	if err != nil || glyphIndex == 0 {
+		t.Fatalf("Failed to find glyph for 0x%X", targetRune)
+	}
+
+	segments, err := f.LoadGlyph(&buffer, glyphIndex, ppem, nil)
+	if err != nil {
+		t.Fatalf("Failed to load glyph 0x%X: %v", targetRune, err)
+	}
+
+	charHex := fmt.Sprintf("%04X", targetRune)
+	pngFilename := fmt.Sprintf("icon_%s.png", charHex)
+	svgFilename := fmt.Sprintf("icon_%s.svg", charHex)
+
+	// 1. Extract SVG
+	svgPath := segmentsToSVGPath(segments)
+	totalHeight := float64(m.Ascent+m.Descent) / 64.0
+	svgContent := fmt.Sprintf(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 %g %d %g">
+  <g transform="scale(1, -1)">
+    <path d="%s" />
+  </g>
+</svg>`, -float64(m.Ascent)/64.0, int(unitsPerEm), totalHeight, svgPath)
+
+	svgFilePath := filepath.Join(outputDir, svgFilename)
+	if err = os.WriteFile(svgFilePath, []byte(svgContent), 0644); err != nil {
+		t.Errorf("Failed to write SVG 0x%s: %v", charHex, err)
+	}
+
+	// 2. Render PNG
+	img := renderGlyphToPNG(segments, int(unitsPerEm), int(m.Ascent), int(m.Descent), imgSize)
+
+	pngFilePath := filepath.Join(outputDir, pngFilename)
+	pngFile, err := os.Create(pngFilePath)
+	if err == nil {
+		if err = png.Encode(pngFile, img); err != nil {
+			t.Errorf("Failed to encode PNG 0x%s: %v", charHex, err)
+		}
+		pngFile.Close()
+	} else {
+		t.Errorf("Failed to create PNG file 0x%s: %v", charHex, err)
+	}
+
+	// 3. Compare with references
+	for _, filename := range []string{svgFilename, pngFilename} {
+		generated, err := os.ReadFile(filepath.Join(outputDir, filename))
+		if err != nil {
+			t.Errorf("Failed to read generated file %s: %v", filename, err)
+			continue
+		}
+		reference, err := os.ReadFile(filepath.Join(refDir, filename))
+		if err != nil {
+			t.Errorf("Failed to read reference file %s: %v", filename, err)
+			continue
+		}
+		if string(generated) != string(reference) {
+			t.Errorf("Mismatch in %s: generated does not match reference", filename)
+		}
+	}
+}
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M119 -31 L828 678 L871 635 L162 -74 L119 -31 M206 194 L206 405 Q206 426 220 440 Q235 455 256 455 L405 455 L602 654 L668 654 L668 638 L607 572 L430 394 L267 394 L267 204 L269 204 L222 157 Q206 171 206 194 M435 112 L478 155 L607 26 L607 285 L668 345 L668 -56 L602 -56 L435 112 " />
+  </g>
+</svg>
@@ -1,23 +0,0 @@
-// Package main provides a mock Spotify server for testing purposes.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-
-	"github.com/gesellix/bose-soundtouch/pkg/testutils/spotify"
-)
-
-func main() {
-	port := flag.Int("port", 8080, "Port to listen on")
-
-	flag.Parse()
-
-	log.Printf("Starting mock Spotify server on port %d", *port)
-
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", *port), spotify.NewSpotifyHandler()); err != nil {
-		log.Fatal(err)
-	}
-}
@@ -37,16 +37,16 @@ func TestFetchTuneInMetadata(t *testing.T) {

 	if metadata == nil {
 		t.Fatal("fetchTuneInMetadata() returned nil metadata")
-	} else {
-		expectedName := "WDR 2 Rheinland"
-		if metadata.Name != expectedName {
-			t.Errorf("metadata.Name = %v, want %v", metadata.Name, expectedName)
-		}
+	}

-		expectedArtwork := "https://cdn-radiotime-logos.tunein.com/s213886g.png"
-		if metadata.Artwork != expectedArtwork {
-			t.Errorf("metadata.Artwork = %v, want %v", metadata.Artwork, expectedArtwork)
-		}
+	expectedName := "WDR 2 Rheinland"
+	if metadata.Name != expectedName {
+		t.Errorf("metadata.Name = %v, want %v", metadata.Name, expectedName)
+	}
+
+	expectedArtwork := "https://cdn-radiotime-logos.tunein.com/s213886g.png"
+	if metadata.Artwork != expectedArtwork {
+		t.Errorf("metadata.Artwork = %v, want %v", metadata.Artwork, expectedArtwork)
 	}
 }

@@ -192,15 +192,15 @@ func TestFetchSpotifyMetadata(t *testing.T) {

 	if metadata == nil {
 		t.Fatal("fetchSpotifyMetadata() returned nil metadata")
-	} else {
-		expectedName := "Terminal Caribe - Album by Santi & Tuğçe"
-		if metadata.Name != expectedName {
-			t.Errorf("metadata.Name = %v, want %v", metadata.Name, expectedName)
-		}
+	}

-		expectedArtwork := "https://i.scdn.co/image/ab67616d0000b273f0e55478f4a15182405bcb47"
-		if metadata.Artwork != expectedArtwork {
-			t.Errorf("metadata.Artwork = %v, want %v", metadata.Artwork, expectedArtwork)
-		}
+	expectedName := "Terminal Caribe - Album by Santi & Tuğçe"
+	if metadata.Name != expectedName {
+		t.Errorf("metadata.Name = %v, want %v", metadata.Name, expectedName)
+	}
+
+	expectedArtwork := "https://i.scdn.co/image/ab67616d0000b273f0e55478f4a15182405bcb47"
+	if metadata.Artwork != expectedArtwork {
+		t.Errorf("metadata.Artwork = %v, want %v", metadata.Artwork, expectedArtwork)
 	}
 }
@@ -34,15 +34,10 @@ var (
 	version = "dev"
 	commit  = "unknown"
 	date    = "unknown"
-	repoURL = "https://github.com/gesellix/bose-soundtouch"
 )

 func updateBuildInfo() {
 	if info, ok := debug.ReadBuildInfo(); ok {
-		if info.Main.Path != "" {
-			repoURL = "https://" + info.Main.Path
-		}
-
 		if info.Main.Version != "" && info.Main.Version != "(devel)" {
 			version = info.Main.Version
 		}
@@ -53,66 +48,7 @@ func updateBuildInfo() {
 				commit = setting.Value
 			case "vcs.time":
 				if t, err := time.Parse(time.RFC3339, setting.Value); err == nil {
-					date = t.Format("2006-01-02 15:04:05")
-				}
-			}
-		}
-	}
-}
-
-func initializeDefaultSources(ds *datastore.DataStore) {
-	// Ensure default sources exist for all known devices on startup
-	allDevices, _ := ds.ListAllDevices()
-	for i := range allDevices {
-		dev := &allDevices[i]
-		if sources, errGet := ds.GetConfiguredSources(dev.AccountID, dev.DeviceID); errGet == nil {
-			log.Printf("Initializing default Sources.xml for existing device %s", dev.DeviceID)
-
-			// Find default sources and merge them if missing or outdated tokens.
-			// claimed tracks which stored sources have already been matched by a default,
-			// so two defaults with the same SourceKeyType but different SourceProviderIDs
-			// (e.g. INTERNET_RADIO/2 and INTERNET_RADIO/39) are treated as distinct entries.
-			defaults := ds.GetDefaultSources()
-			modified := false
-			claimed := make(map[int]bool)
-
-			for i := range defaults {
-				def := defaults[i]
-				foundIdx := -1
-
-				for j := range sources {
-					if claimed[j] || sources[j].SourceKeyType != def.SourceKeyType {
-						continue
-					}
-					// When both sides have a providerID, require it to match.
-					if def.SourceProviderID != "" && sources[j].SourceProviderID != "" && sources[j].SourceProviderID != def.SourceProviderID {
-						continue
-					}
-
-					foundIdx = j
-
-					break
-				}
-
-				if foundIdx >= 0 {
-					claimed[foundIdx] = true
-
-					if sources[foundIdx].Secret == "" && def.Secret != "" {
-						log.Printf("Initializing missing token for source %s on device %s", def.SourceKeyType, dev.DeviceID)
-						sources[foundIdx].Secret = def.Secret
-						sources[foundIdx].SecretType = def.SecretType
-						modified = true
-					}
-				} else {
-					log.Printf("Adding missing default source %s (providerID=%s) to device %s", def.SourceKeyType, def.SourceProviderID, dev.DeviceID)
-					sources = append(sources, def)
-					modified = true
-				}
-			}
-
-			if modified {
-				if errSave := ds.SaveConfiguredSources(dev.AccountID, dev.DeviceID, sources); errSave != nil {
-					log.Printf("Failed to save updated sources for %s: %v", dev.DeviceID, errSave)
+					date = t.Format("2006-01-02_15:04:05")
 				}
 			}
 		}
@@ -226,16 +162,6 @@ func main() {
 				Value:   "ueberboese-login://spotify",
 				EnvVars: []string{"SPOTIFY_REDIRECT_URI"},
 			},
-			&cli.StringFlag{
-				Name:    "spotify-token-url",
-				Usage:   "Spotify OAuth token URL (for testing)",
-				EnvVars: []string{"SPOTIFY_TOKEN_URL"},
-			},
-			&cli.StringFlag{
-				Name:    "spotify-api-base",
-				Usage:   "Spotify API base URL (for testing)",
-				EnvVars: []string{"SPOTIFY_API_BASE"},
-			},
 			&cli.StringFlag{
 				Name:    "mgmt-username",
 				Usage:   "Management API username for HTTP Basic Auth",
@@ -317,7 +243,7 @@ func main() {
 			server := handlers.NewServer(ds, sm, config.serverURL, config.redact, config.logBody, config.record)
 			sm.GetDNSRunning = server.GetDNSRunning
 			server.SetHTTPServerURL(config.httpsServerURL)
-			server.SetVersionInfo(version, commit, date, repoURL)
+			server.SetVersionInfo(version, commit, date)
 			server.SetDiscoverySettings(config.discoveryInterval, persisted.DiscoveryEnabled)
 			server.SetDNSSettings(persisted.DNSEnabled, strings.Join(persisted.DNSUpstream, ","), persisted.DNSBindAddr)
 			server.SetMirrorSettings(persisted.MirrorEnabled, persisted.MirrorEndpoints, persisted.SkipMirrorEndpoints, persisted.PreferredSource)
@@ -332,14 +258,6 @@ func main() {
 					config.spotifyRedirectURI,
 					config.dataDir,
 				)
-				if config.spotifyTokenURL != "" || config.spotifyAPIBase != "" {
-					spotifyService.SetEndpoints(config.spotifyTokenURL, config.spotifyAPIBase)
-				}
-
-				if err := spotifyService.Load(); err != nil {
-					log.Printf("[Spotify] Failed to load accounts: %v", err)
-				}
-
 				server.SetSpotifyService(spotifyService)

 				clientIDPrefix := config.spotifyClientID
@@ -403,8 +321,6 @@ func main() {

 			server.SetRecorder(recorder)

-			initializeDefaultSources(ds)
-
 			tlsConfig, err := cm.GetServerTLSConfig(config.domains)
 			if err != nil {
 				log.Printf("Warning: Failed to setup TLS: %v", err)
@@ -470,8 +386,6 @@ type serviceConfig struct {
 	spotifyClientID     string
 	spotifyClientSecret string
 	spotifyRedirectURI  string
-	spotifyTokenURL     string
-	spotifyAPIBase      string
 	mgmtUsername        string
 	mgmtPassword        string
 	migrationEnabled    bool
@@ -536,8 +450,6 @@ func loadConfig(c *cli.Context) serviceConfig {
 	spotifyClientID := c.String("spotify-client-id")
 	spotifyClientSecret := c.String("spotify-client-secret")
 	spotifyRedirectURI := c.String("spotify-redirect-uri")
-	spotifyTokenURL := c.String("spotify-token-url")
-	spotifyAPIBase := c.String("spotify-api-base")
 	mgmtUsername := c.String("mgmt-username")
 	mgmtPassword := c.String("mgmt-password")
 	mirrorEnabled := c.Bool("mirror-enabled")
@@ -571,8 +483,6 @@ func loadConfig(c *cli.Context) serviceConfig {
 		spotifyClientID:     spotifyClientID,
 		spotifyClientSecret: spotifyClientSecret,
 		spotifyRedirectURI:  spotifyRedirectURI,
-		spotifyTokenURL:     spotifyTokenURL,
-		spotifyAPIBase:      spotifyAPIBase,
 		mgmtUsername:        mgmtUsername,
 		mgmtPassword:        mgmtPassword,
 		migrationEnabled:    migrationEnabled,
@@ -751,109 +661,72 @@ func setupRouter(server *handlers.Server) *chi.Mux {

 	r.Route("/bmx", func(r chi.Router) {
 		r.Get("/registry/v1/services", server.HandleBMXRegistry)
-		r.Get("/registry/v1/servicesAvailability", server.HandleBMXServicesAvailability)
-
-		r.Route("/tunein", func(r chi.Router) {
-			r.Get("/v1/playback/station/{stationID}", server.HandleTuneInPlayback)
-			r.Get("/v1/playback/episodes/{podcastID}", server.HandleTuneInPodcastInfo)
-			r.Get("/v1/playback/episode/{podcastID}", server.HandleTuneInPlaybackPodcast)
-			r.Post("/v1/token", server.HandleTuneInToken)
-			r.Post("/v1/report", server.HandleTuneInReport)
-			r.Get("/v1/navigate", server.HandleTuneInNavigate)
-			r.Get("/v1/navigate/*", server.HandleTuneInNavigate)
-			r.Get("/v1/search", server.HandleTuneInSearch)
-		})
-
+		r.Get("/tunein/v1/playback/station/{stationID}", server.HandleTuneInPlayback)
+		r.Get("/tunein/v1/playback/episodes/{podcastID}", server.HandleTuneInPodcastInfo)
+		r.Get("/tunein/v1/playback/episode/{podcastID}", server.HandleTuneInPlaybackPodcast)
 		r.Post("/orion/v1/playback/station/{data}", server.HandleOrionPlayback)
 	})

+	// Legacy or direct domain calls without /bmx prefix
+	r.Get("/registry/v1/services", server.HandleBMXRegistry)
+	r.Get("/tunein/v1/playback/station/{stationID}", server.HandleTuneInPlayback)
+	r.Get("/tunein/v1/playback/episodes/{podcastID}", server.HandleTuneInPodcastInfo)
+	r.Get("/tunein/v1/playback/episode/{podcastID}", server.HandleTuneInPlaybackPodcast)
+	r.Post("/orion/v1/playback/station/{data}", server.HandleOrionPlayback)
 	r.Get("/custom/v1/playback/{encodedURL}", server.HandleCustomPlayback)

-	r.Route("/streaming", func(r chi.Router) {
+	streamingRoutes := func(r chi.Router) {
 		r.Get("/sourceproviders", server.HandleMargeSourceProviders)
 		r.Post("/account", server.HandleMargeCreateAccount)
 		r.Post("/account/login", server.HandleMargeLogin)
-		r.Post("/account/{account}/source", server.HandleMargeAddSource)
-
-		r.Route("/account/{account}", func(r chi.Router) {
-			r.Get("/emailaddress", server.HandleMargeGetEmailAddress)
-			r.Get("/full", server.HandleMargeAccountFull)
-			r.Get("/sources", server.HandleMargeAccountSources)
-			r.Get("/devices", server.HandleMargeAccountDevices)
-			r.Get("/presets", server.HandleMargeAccountPresets)
-			r.Get("/presets/all", server.HandleMargeAccountPresets)
-			r.Get("/provider_settings", server.HandleMargeProviderSettings)
-
-			r.Route("/device", func(r chi.Router) {
-				r.Post("/", server.HandleMargeAddDevice)
-				r.Post("/{device}", server.HandleMargeAddDevice)
-			})
-
-			r.Route("/device/{device}", func(r chi.Router) {
-				r.Get("/presets", server.HandleMargePresets)
-				r.Post("/presets/{presetNumber}", server.HandleMargeUpdatePreset)
-				r.Put("/preset/{presetNumber}", server.HandleMargeUpdatePreset)
-				r.Delete("/preset/{presetNumber}", server.HandleMargeRemovePreset)
-				r.Get("/recent", server.HandleMargeRecents)
-				r.Get("/recents", server.HandleMargeRecents)
-				r.Post("/recent", server.HandleMargeAddRecent)
-
-				r.Get("/group", server.HandleMargeDeviceGroup)
-				r.Get("/group/", server.HandleMargeDeviceGroup)
-				r.Get("/group/server", server.HandleMargeDeviceGroupServer)
-				r.Get("/group/member", server.HandleMargeDeviceGroupMember)
-			})
-
-			r.Delete("/device/{device}", server.HandleMargeRemoveDevice)
-		})
-
+		r.Get("/account/{account}/device/{device}/recent", server.HandleMargeRecents)
+		r.Post("/account/{account}/device/{device}/recent", server.HandleMargeAddRecent)
+		r.Get("/account/{account}/device/{device}/presets", server.HandleMargePresets)
+		r.Post("/account/{account}/device/{device}/presets/{presetNumber}", server.HandleMargeUpdatePreset)
+		r.Post("/support/power_on", server.HandleMargePowerOn)
+		r.Get("/account/{account}/provider_settings", server.HandleMargeProviderSettings)
 		r.Get("/device/{device}/streaming_token", server.HandleMargeStreamingToken)
-
+		r.Post("/support/customersupport", server.HandleMargeCustomerSupport)
 		r.Get("/device_setting/account/{account}/device/{device}/device_settings", server.HandleMargeGetDeviceSettings)
+		r.Get("/account/{account}/device/{device}/group", server.HandleMargeDeviceGroup)
+		r.Get("/account/{account}/device/{device}/group/", server.HandleMargeDeviceGroup)
+		r.Get("/account/{account}/device/{device}/group/server", server.HandleMargeDeviceGroupServer)
+		r.Get("/account/{account}/device/{device}/group/member", server.HandleMargeDeviceGroupMember)
 		r.Post("/device_setting/account/{account}/device/{device}/device_settings", server.HandleMargeUpdateDeviceSettings)
-
+		r.Get("/account/{account}/emailaddress", server.HandleMargeGetEmailAddress)
+		r.Get("/account/{account}/full", server.HandleMargeAccountFull)
 		r.Get("/software/update/account/{account}", server.HandleMargeSoftwareUpdate)

-		r.Route("/support", func(r chi.Router) {
-			r.Post("/power_on", server.HandleMargePowerOn)
-			r.Post("/customersupport", server.HandleMargeCustomerSupport)
-		})
-
 		r.Route("/stats", func(r chi.Router) {
 			r.Post("/usage", server.HandleUsageStats)
 			r.Post("/error", server.HandleErrorStats)
 		})
+	}

-		r.Route("/music", func(r chi.Router) {
-			r.Route("/musicprovider/{providerID}", func(r chi.Router) {
-				r.Post("/is_eligible", server.HandleMusicProviderIsEligible)
-			})
-		})
+	accountsRoutes := func(r chi.Router) {
+		r.Get("/{account}/full", server.HandleMargeAccountFull)
+		r.Get("/{account}/devices/{device}/presets", server.HandleMargePresets)
+		r.Post("/{account}/devices/{device}/presets/{presetNumber}", server.HandleMargeUpdatePreset)
+		r.Get("/{account}/devices/{device}/recents", server.HandleMargeRecents)
+		r.Post("/{account}/devices/{device}/recents", server.HandleMargeAddRecent)
+		r.Post("/{account}/devices", server.HandleMargeAddDevice)
+		r.Delete("/{account}/devices/{device}", server.HandleMargeRemoveDevice)
+		r.Get("/{account}/devices/{device}/group", server.HandleMargeDeviceGroup)
+		r.Get("/{account}/devices/{device}/group/", server.HandleMargeDeviceGroup)
+		r.Get("/{account}/devices/{device}/group/server", server.HandleMargeDeviceGroupServer)
+		r.Get("/{account}/devices/{device}/group/member", server.HandleMargeDeviceGroupMember)
+	}

-		r.Get("/resources/api_versions.xml", server.HandleMargeAPIVersions)
-	})
+	r.Route("/marge", func(r chi.Router) {
+		r.Route("/streaming", streamingRoutes)
+		r.Route("/accounts", accountsRoutes)

-	r.Route("/accounts", func(r chi.Router) {
-		r.Route("/{account}", func(r chi.Router) {
-			r.Get("/full", server.HandleMargeAccountFull)
-			r.Get("/sources", server.HandleMargeAccountSources)
-			r.Get("/devices", server.HandleMargeAccountDevices)
-
-			r.Post("/devices", server.HandleMargeAddDevice)
-
-			r.Delete("/devices/{device}", server.HandleMargeRemoveDevice)
-			r.Get("/devices/{device}/group", server.HandleMargeDeviceGroup)
-			r.Get("/devices/{device}/group/", server.HandleMargeDeviceGroup)
-			r.Get("/devices/{device}/group/server", server.HandleMargeDeviceGroupServer)
-			r.Get("/devices/{device}/group/member", server.HandleMargeDeviceGroupMember)
-			r.Get("/devices/{device}/presets", server.HandleMargePresets)
-			r.Get("/devices/{device}/recents", server.HandleMargeRecents)
-
-			r.Post("/devices/{device}/presets/{presetNumber}", server.HandleMargeUpdatePreset)
-			r.Post("/devices/{device}/recents", server.HandleMargeAddRecent)
-		})
+		r.Get("/updates/soundtouch", server.HandleMargeSoftwareUpdate)
 	})

+	// Legacy or direct domain calls without /marge prefix
+	r.Route("/streaming", streamingRoutes)
+	r.Route("/accounts", accountsRoutes)
 	r.Get("/updates/soundtouch", server.HandleMargeSoftwareUpdate)

 	r.Route("/customer", func(r chi.Router) {
@@ -865,17 +738,12 @@ func setupRouter(server *handlers.Server) *chi.Mux {
 	r.Route("/oauth", func(r chi.Router) {
 		r.Post("/device/{deviceID}/music/musicprovider/{sourceID}/token/cs3", server.HandleBoseToken)
 		r.Post("/device/{deviceID}/music/musicprovider/{sourceID}/token", server.HandleBoseLegacyToken)
-		r.Post("/account/{account}/music/musicprovider/{sourceID}/token/cs", server.HandleBoseAccountToken)
 		r.HandleFunc("/*", server.HandleBoseProxy)
 	})

 	r.Route("/v1", func(r chi.Router) {
 		r.Post("/stapp/{deviceId}", server.HandleAppEvents)
 		r.Post("/scmudc/{deviceId}", server.HandleAppEvents)
-		// Return 405 Method Not Allowed as the upstream behavior also returns 405
-		r.Get("/blacklist/{deviceId}", func(w http.ResponseWriter, _ *http.Request) {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-		})
 	})

 	r.Route("/mgmt", func(r chi.Router) {
@@ -1,104 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"reflect"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
-	"github.com/go-chi/chi/v5"
-)
-
-func TestPrintRoutes(t *testing.T) {
-	// Initialize a minimal server to get the router
-	server := handlers.NewServer(nil, nil, "http://localhost:8000", true, true, true)
-	r := setupRouter(server)
-
-	var routes []string
-	walkFunc := func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
-		route = strings.ReplaceAll(route, "/*/", "/")
-		handlerName := runtime.FuncForPC(reflect.ValueOf(handler).Pointer()).Name()
-		// Clean up the handler name (remove package path)
-		// For example, "github.com/gesellix/bose-soundtouch/cmd/soundtouch-service.setupRouter.func1"
-		// or "command-line-arguments.setupRouter.func1"
-		// or "main.setupRouter.func1"
-		parts := strings.Split(handlerName, "/")
-		if len(parts) > 0 {
-			handlerName = parts[len(parts)-1]
-		}
-		// Now we might have "soundtouch-service.setupRouter.func1"
-		// or "command-line-arguments.setupRouter.func1"
-		// or "main.setupRouter.func1"
-		// Let's remove the first part if it's a known varying package name
-		if idx := strings.Index(handlerName, "setupRouter"); idx != -1 {
-			handlerName = handlerName[idx:]
-		}
-		// In case it's not setupRouter but still has a package prefix
-		for {
-			dotIdx := strings.Index(handlerName, ".")
-			if dotIdx == -1 {
-				break
-			}
-			prefix := handlerName[:dotIdx]
-			if prefix == "main" || prefix == "command-line-arguments" || strings.Contains(prefix, "soundtouch-service") {
-				handlerName = handlerName[dotIdx+1:]
-			} else {
-				break
-			}
-		}
-
-		// Also remove any ".funcN" suffix if it's an anonymous function
-		if idx := strings.Index(handlerName, ".func"); idx != -1 {
-			handlerName = handlerName[:idx]
-		}
-
-		routes = append(routes, fmt.Sprintf("%-8s %-60s %s", method, route, handlerName))
-		return nil
-	}
-
-	if err := chi.Walk(r, walkFunc); err != nil {
-		t.Fatalf("Failed to walk routes: %v", err)
-	}
-
-	sort.Strings(routes)
-
-	output := strings.Join(routes, "\n") + "\n"
-
-	// Define snapshot path
-	snapshotPath := "testdata/router_routes.txt"
-	actualPath := "testdata/router_routes.actual.txt"
-
-	// Always write the current (actual) routes to a file
-	if err := os.WriteFile(actualPath, []byte(output), 0644); err != nil {
-		t.Fatalf("Failed to write actual routes: %v", err)
-	}
-
-	// Check if snapshot exists
-	if _, err := os.Stat(snapshotPath); os.IsNotExist(err) {
-		// Create testdata directory if it doesn't exist
-		if err := os.MkdirAll("testdata", 0755); err != nil {
-			t.Fatalf("Failed to create testdata directory: %v", err)
-		}
-		// Initial snapshot creation
-		if err := os.WriteFile(snapshotPath, []byte(output), 0644); err != nil {
-			t.Fatalf("Failed to write snapshot: %v", err)
-		}
-		t.Logf("Initial snapshot created at %s", snapshotPath)
-		return
-	}
-
-	// Read existing snapshot
-	existingOutput, err := os.ReadFile(snapshotPath)
-	if err != nil {
-		t.Fatalf("Failed to read snapshot: %v", err)
-	}
-
-	if string(existingOutput) != output {
-		t.Errorf("Router routes changed! Diff the snapshot at %s with %s", snapshotPath, actualPath)
-	}
-}
@@ -1 +0,0 @@
-*.actual.txt
@@ -1,134 +0,0 @@
-CONNECT  /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-DELETE   /accounts/{account}/devices/{device}                         handlers.(*Server).HandleMargeRemoveDevice-fm
-DELETE   /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-DELETE   /setup/devices/{deviceId}                                    handlers.(*Server).HandleRemoveDevice-fm
-DELETE   /setup/dns-discoveries                                       handlers.(*Server).HandleClearDNSDiscoveries-fm
-DELETE   /setup/interactions/sessions                                 handlers.(*Server).HandleCleanupSessions-fm
-DELETE   /setup/interactions/sessions/{session}                       handlers.(*Server).HandleDeleteSession-fm
-DELETE   /setup/parity-mismatches                                     handlers.(*Server).HandleClearParityMismatches-fm
-DELETE   /streaming/account/{account}/device/{device}/preset/{presetNumber} handlers.(*Server).HandleMargeRemovePreset-fm
-GET      /                                                            handlers.(*Server).HandleRoot-fm
-GET      /accounts/{account}/devices                                  handlers.(*Server).HandleMargeAccountDevices-fm
-GET      /accounts/{account}/devices/{device}/group                   handlers.(*Server).HandleMargeDeviceGroup-fm
-GET      /accounts/{account}/devices/{device}/group/                  handlers.(*Server).HandleMargeDeviceGroup-fm
-GET      /accounts/{account}/devices/{device}/group/member            handlers.(*Server).HandleMargeDeviceGroupMember-fm
-GET      /accounts/{account}/devices/{device}/group/server            handlers.(*Server).HandleMargeDeviceGroupServer-fm
-GET      /accounts/{account}/devices/{device}/presets                 handlers.(*Server).HandleMargePresets-fm
-GET      /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleMargeRecents-fm
-GET      /accounts/{account}/full                                     handlers.(*Server).HandleMargeAccountFull-fm
-GET      /accounts/{account}/sources                                  handlers.(*Server).HandleMargeAccountSources-fm
-GET      /bmx/registry/v1/services                                    handlers.(*Server).HandleBMXRegistry-fm
-GET      /bmx/registry/v1/servicesAvailability                        handlers.(*Server).HandleBMXServicesAvailability-fm
-GET      /bmx/tunein/v1/navigate                                      handlers.(*Server).HandleTuneInNavigate-fm
-GET      /bmx/tunein/v1/navigate/*                                    handlers.(*Server).HandleTuneInNavigate-fm
-GET      /bmx/tunein/v1/playback/episode/{podcastID}                  handlers.(*Server).HandleTuneInPlaybackPodcast-fm
-GET      /bmx/tunein/v1/playback/episodes/{podcastID}                 handlers.(*Server).HandleTuneInPodcastInfo-fm
-GET      /bmx/tunein/v1/playback/station/{stationID}                  handlers.(*Server).HandleTuneInPlayback-fm
-GET      /bmx/tunein/v1/search                                        handlers.(*Server).HandleTuneInSearch-fm
-GET      /custom/v1/playback/{encodedURL}                             handlers.(*Server).HandleCustomPlayback-fm
-GET      /customer/account/{account}                                  handlers.(*Server).HandleMargeAccountProfile-fm
-GET      /docs/*                                                      handlers.(*Server).HandleDocs-fm
-GET      /favicon.ico                                                 setupRouter
-GET      /health                                                      handlers.(*Server).HandleHealth-fm
-GET      /media/*                                                     handlers.(*Server).HandleMedia
-GET      /mgmt/accounts/                                              handlers.(*Server).HandleMgmtListAccounts-fm
-GET      /mgmt/accounts/{accountId}                                   handlers.(*Server).HandleMgmtAccountDetails-fm
-GET      /mgmt/accounts/{accountId}/speakers                          handlers.(*Server).HandleMgmtListSpeakers-fm
-GET      /mgmt/devices/{deviceId}/events                              handlers.(*Server).HandleMgmtDeviceEvents-fm
-GET      /mgmt/spotify/accounts                                       handlers.(*Server).HandleMgmtSpotifyAccounts-fm
-GET      /mgmt/spotify/callback                                       handlers.(*Server).HandleMgmtSpotifyCallback-fm
-GET      /mgmt/spotify/token                                          handlers.(*Server).HandleMgmtSpotifyToken-fm
-GET      /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-GET      /proxy/*                                                     handlers.(*Server).HandleProxyRequest-fm
-GET      /setup/ca.crt                                                handlers.(*Server).HandleGetCACert-fm
-GET      /setup/devices                                               handlers.(*Server).HandleListDiscoveredDevices-fm
-GET      /setup/devices/{deviceId}/events                             handlers.(*Server).HandleGetDeviceEvents-fm
-GET      /setup/discovery-status                                      handlers.(*Server).HandleGetDiscoveryStatus-fm
-GET      /setup/dns-discoveries                                       handlers.(*Server).HandleGetDNSDiscoveries-fm
-GET      /setup/dns-discoveries/download                              handlers.(*Server).HandleDownloadDNSDiscoveries-fm
-GET      /setup/info/{deviceId}                                       handlers.(*Server).HandleGetDeviceInfo-fm
-GET      /setup/interaction-content                                   handlers.(*Server).HandleGetInteractionContent-fm
-GET      /setup/interaction-stats                                     handlers.(*Server).HandleGetInteractionStats-fm
-GET      /setup/interactions                                          handlers.(*Server).HandleListInteractions-fm
-GET      /setup/interactions/sessions/{session}/download              handlers.(*Server).HandleDownloadSession-fm
-GET      /setup/parity-mismatches                                     handlers.(*Server).HandleListParityMismatches-fm
-GET      /setup/proxy-settings                                        handlers.(*Server).HandleGetProxySettings-fm
-GET      /setup/settings                                              handlers.(*Server).HandleGetSettings-fm
-GET      /setup/summary/{deviceId}                                    handlers.(*Server).HandleGetMigrationSummary-fm
-GET      /setup/version                                               handlers.(*Server).HandleGetVersionInfo-fm
-GET      /streaming/account/{account}/device/{device}/group           handlers.(*Server).HandleMargeDeviceGroup-fm
-GET      /streaming/account/{account}/device/{device}/group/          handlers.(*Server).HandleMargeDeviceGroup-fm
-GET      /streaming/account/{account}/device/{device}/group/member    handlers.(*Server).HandleMargeDeviceGroupMember-fm
-GET      /streaming/account/{account}/device/{device}/group/server    handlers.(*Server).HandleMargeDeviceGroupServer-fm
-GET      /streaming/account/{account}/device/{device}/presets         handlers.(*Server).HandleMargePresets-fm
-GET      /streaming/account/{account}/device/{device}/recent          handlers.(*Server).HandleMargeRecents-fm
-GET      /streaming/account/{account}/device/{device}/recents         handlers.(*Server).HandleMargeRecents-fm
-GET      /streaming/account/{account}/devices                         handlers.(*Server).HandleMargeAccountDevices-fm
-GET      /streaming/account/{account}/emailaddress                    handlers.(*Server).HandleMargeGetEmailAddress-fm
-GET      /streaming/account/{account}/full                            handlers.(*Server).HandleMargeAccountFull-fm
-GET      /streaming/account/{account}/presets                         handlers.(*Server).HandleMargeAccountPresets-fm
-GET      /streaming/account/{account}/presets/all                     handlers.(*Server).HandleMargeAccountPresets-fm
-GET      /streaming/account/{account}/provider_settings               handlers.(*Server).HandleMargeProviderSettings-fm
-GET      /streaming/account/{account}/sources                         handlers.(*Server).HandleMargeAccountSources-fm
-GET      /streaming/device/{device}/streaming_token                   handlers.(*Server).HandleMargeStreamingToken-fm
-GET      /streaming/device_setting/account/{account}/device/{device}/device_settings handlers.(*Server).HandleMargeGetDeviceSettings-fm
-GET      /streaming/resources/api_versions.xml                        handlers.(*Server).HandleMargeAPIVersions-fm
-GET      /streaming/software/update/account/{account}                 handlers.(*Server).HandleMargeSoftwareUpdate-fm
-GET      /streaming/sourceproviders                                   handlers.(*Server).HandleMargeSourceProviders-fm
-GET      /updates/soundtouch                                          handlers.(*Server).HandleMargeSoftwareUpdate-fm
-GET      /v1/blacklist/{deviceId}                                     setupRouter
-GET      /web/*                                                       setupRouter.(*Server).HandleWeb
-HEAD     /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-OPTIONS  /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-PATCH    /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-POST     /accounts/{account}/devices                                  handlers.(*Server).HandleMargeAddDevice-fm
-POST     /accounts/{account}/devices/{device}/presets/{presetNumber}  handlers.(*Server).HandleMargeUpdatePreset-fm
-POST     /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleMargeAddRecent-fm
-POST     /bmx/orion/v1/playback/station/{data}                        handlers.(*Server).HandleOrionPlayback-fm
-POST     /bmx/tunein/v1/report                                        handlers.(*Server).HandleTuneInReport-fm
-POST     /bmx/tunein/v1/token                                         handlers.(*Server).HandleTuneInToken-fm
-POST     /customer/account/{account}                                  handlers.(*Server).HandleMargeUpdateAccountProfile-fm
-POST     /customer/account/{account}/password                         handlers.(*Server).HandleMargeChangePassword-fm
-POST     /mgmt/accounts/{accountId}/language                          handlers.(*Server).HandleMgmtUpdateAccountLanguage-fm
-POST     /mgmt/accounts/{accountId}/provider-settings                 handlers.(*Server).HandleMgmtUpdateAccountProviderSetting-fm
-POST     /mgmt/spotify/confirm                                        handlers.(*Server).HandleMgmtSpotifyConfirm-fm
-POST     /mgmt/spotify/entity                                         handlers.(*Server).HandleMgmtSpotifyEntity-fm
-POST     /mgmt/spotify/init                                           handlers.(*Server).HandleMgmtSpotifyInit-fm
-POST     /mgmt/spotify/prime                                          handlers.(*Server).HandleMgmtPrimeDevice-fm
-POST     /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-POST     /oauth/account/{account}/music/musicprovider/{sourceID}/token/cs handlers.(*Server).HandleBoseAccountToken-fm
-POST     /oauth/device/{deviceID}/music/musicprovider/{sourceID}/token handlers.(*Server).HandleBoseLegacyToken-fm
-POST     /oauth/device/{deviceID}/music/musicprovider/{sourceID}/token/cs3 handlers.(*Server).HandleBoseToken-fm
-POST     /setup/backup/{deviceId}                                     handlers.(*Server).HandleBackupConfig-fm
-POST     /setup/devices                                               handlers.(*Server).HandleAddManualDevice-fm
-POST     /setup/discover                                              handlers.(*Server).HandleTriggerDiscovery-fm
-POST     /setup/ensure-remote-services/{deviceId}                     handlers.(*Server).HandleEnsureRemoteServices-fm
-POST     /setup/migrate/{deviceId}                                    handlers.(*Server).HandleMigrateDevice-fm
-POST     /setup/proxy-settings                                        handlers.(*Server).HandleUpdateProxySettings-fm
-POST     /setup/reboot/{deviceId}                                     handlers.(*Server).HandleRebootDevice-fm
-POST     /setup/remove-remote-services/{deviceId}                     handlers.(*Server).HandleRemoveRemoteServices-fm
-POST     /setup/revert/{deviceId}                                     handlers.(*Server).HandleRevertMigration-fm
-POST     /setup/settings                                              handlers.(*Server).HandleUpdateSettings-fm
-POST     /setup/sync/{deviceId}                                       handlers.(*Server).HandleInitialSync-fm
-POST     /setup/test-connection/{deviceId}                            handlers.(*Server).HandleTestConnection-fm
-POST     /setup/test-dns/{deviceId}                                   handlers.(*Server).HandleTestDNSRedirection-fm
-POST     /setup/test-hosts/{deviceId}                                 handlers.(*Server).HandleTestHostsRedirection-fm
-POST     /setup/trust-ca/{deviceId}                                   handlers.(*Server).HandleTrustCACert-fm
-POST     /streaming/account                                           handlers.(*Server).HandleMargeCreateAccount-fm
-POST     /streaming/account/login                                     handlers.(*Server).HandleMargeLogin-fm
-POST     /streaming/account/{account}/device/                         handlers.(*Server).HandleMargeAddDevice-fm
-POST     /streaming/account/{account}/device/{device}                 handlers.(*Server).HandleMargeAddDevice-fm
-POST     /streaming/account/{account}/device/{device}/presets/{presetNumber} handlers.(*Server).HandleMargeUpdatePreset-fm
-POST     /streaming/account/{account}/device/{device}/recent          handlers.(*Server).HandleMargeAddRecent-fm
-POST     /streaming/account/{account}/source                          handlers.(*Server).HandleMargeAddSource-fm
-POST     /streaming/device_setting/account/{account}/device/{device}/device_settings handlers.(*Server).HandleMargeUpdateDeviceSettings-fm
-POST     /streaming/music/musicprovider/{providerID}/is_eligible      handlers.(*Server).HandleMusicProviderIsEligible-fm
-POST     /streaming/stats/error                                       handlers.(*Server).HandleErrorStats-fm
-POST     /streaming/stats/usage                                       handlers.(*Server).HandleUsageStats-fm
-POST     /streaming/support/customersupport                           handlers.(*Server).HandleMargeCustomerSupport-fm
-POST     /streaming/support/power_on                                  handlers.(*Server).HandleMargePowerOn-fm
-POST     /v1/scmudc/{deviceId}                                        handlers.(*Server).HandleAppEvents-fm
-POST     /v1/stapp/{deviceId}                                         handlers.(*Server).HandleAppEvents-fm
-PUT      /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
-PUT      /streaming/account/{account}/device/{device}/preset/{presetNumber} handlers.(*Server).HandleMargeUpdatePreset-fm
-TRACE    /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
@@ -1,2 +0,0 @@
-soundtouch-web
-soundtouch-web-test
@@ -1,276 +0,0 @@
-# SoundTouch Web Implementation
-
-## Overview
-
-The `soundtouch-web` tool provides a modern single-page application (SPA) for controlling Bose SoundTouch devices. Built with a JSON API backend and client-side JavaScript rendering, it offers superior performance and eliminates template rendering issues.
-
-## Architecture
-
-### Single-Page Application Design
-
-The architecture eliminates Go template dependencies and provides:
- **JSON API Backend**: Pure Go server returning only JSON responses
- **Client-Side Rendering**: JavaScript handles all HTML generation
- **WebSocket Real-time**: Bi-directional communication for live updates
- **Better Performance**: No server-side template processing
- **Easier Development**: Clear separation of frontend/backend concerns
-
-### Core Components
-
-#### 1. Main Application (`main.go`)
- **Entry Point**: Handles command-line arguments and application initialization
- **SPA Routing**: Serves static HTML file for all non-API routes
- **Device Discovery**: Automatic discovery of SoundTouch devices using unified discovery service
- **JSON API Server**: Configures API routes and serves the SPA
- **Context Management**: Proper context handling for timeouts and cancellation
-
-#### 2. HTTP Handlers (`handlers/handlers.go`)
- **WebApp Structure**: Central application state management
- **JSON API Endpoints**: RESTful API returning only JSON responses
- **Device Control**: Device control with proper validation and error handling
- **Modular Design**: Separated control actions into focused functions
-
-#### 3. WebSocket Support (`handlers/websocket.go`)
- **Real-time Updates**: Live device status streaming to web clients
- **Device WebSocket Connections**: Maintains persistent connections to SoundTouch devices
- **Event Handling**: Processes nowPlaying, volume, and connection state updates
- **Status Synchronization**: Keeps device status current across all connected clients
-
-#### 4. Type Definitions (`webtypes/types.go`)
- **Device Management**: Structures for device connections and status
- **API Responses**: Standardized JSON response format
- **WebSocket Messages**: Real-time message types
- **Template Data**: HTML template data structures
-
-### Key Features Implemented
-
-#### Device Discovery & Management
- **Auto-discovery**: Finds SoundTouch devices on local network using mDNS/UPnP
- **Multi-device Support**: Manages multiple devices simultaneously
- **Connection Tracking**: Monitors device availability and connection status
- **Device Information**: Displays device details (name, type, IP address)
-
-#### Real-time Control Interface
- **Now Playing**: Live track information with artwork display
- **Playback Controls**: Play/pause/stop/next/previous with visual feedback
- **Volume Control**: Real-time volume slider with mute functionality
- **Bass Adjustment**: Bass level control for supported devices
- **Preset Management**: Quick access to saved presets (1-6)
- **Source Selection**: Input switching (Spotify, TuneIn, Bluetooth, AUX, etc.)
-
-#### Web Interface
- **Single-Page Application**: Self-contained HTML file with embedded CSS and JavaScript
- **Responsive Design**: Bootstrap 5-based UI optimized for desktop and mobile
- **Client-Side Routing**: JavaScript handles page navigation without page reloads
- **Dynamic Rendering**: All HTML generated client-side from JSON data
- **Real-time Updates**: WebSocket-powered live status updates
- **Performance Optimized**: Fast loading and no template rendering delays
-
-#### API Endpoints
-```
-GET  /                          # SPA - serves static/index.html
-GET  /api/devices              # List all devices (JSON)
-GET  /api/device/{id}          # Get device info (JSON)
-POST /api/discover             # Trigger device discovery
-GET  /api/control/{id}/play    # Playback control
-GET  /api/control/{id}/pause   # Pause playback
-GET  /api/control/{id}/stop    # Stop playback
-GET  /api/control/{id}/next    # Next track
-GET  /api/control/{id}/previous # Previous track
-POST /api/control/{id}/volume  # Set volume (JSON body)
-GET  /api/control/{id}/mute    # Toggle mute
-POST /api/control/{id}/bass    # Set bass level (JSON body)
-GET  /api/control/{id}/preset?id=N # Select preset
-GET  /api/control/{id}/source?name=X # Select source
-```
-
-#### WebSocket Events
- **Connection**: `ws://localhost:8080/ws`
- **Device Updates**: Real-time device list changes
- **Status Updates**: Live playback and volume changes
- **Connection Monitoring**: Device availability status
-
-## Technical Implementation
-
-### Frontend Architecture
- **Single HTML File**: Complete application in `static/index.html`
- **Embedded CSS**: Bootstrap 5 with custom Bose-inspired styling
- **Vanilla JavaScript**: No framework dependencies, fast performance
- **Client-Side Routing**: JavaScript manages page state without reloads
- **Dynamic Components**: HTML elements generated from JSON API responses
-
-### Error Handling & Validation
- **Input Validation**: Proper bounds checking for volume (0-100) and bass (-9 to 9)
- **HTTP Status Codes**: Appropriate response codes for different error conditions
- **JSON Error Responses**: Structured error messages for API consumers
- **Client-Side Error Display**: JavaScript toast notifications for user feedback
-
-### Code Quality
- **golangci-lint Compliance**: Passes all configured lint checks
- **Context Handling**: Proper context propagation and timeout management
- **Error Checking**: All JSON encoding/decoding operations checked
- **Type Safety**: Strong typing with dedicated type package
- **Test Coverage**: Comprehensive unit tests for handlers and types
-
-### WebSocket Integration
- **Gabbo Protocol**: Native SoundTouch WebSocket protocol implementation
- **Event Processing**: Handles all documented SoundTouch WebSocket events
- **Connection Management**: Automatic reconnection and health monitoring
- **Bi-directional Communication**: Both status monitoring and device control
-
-## Dependencies
-
-### Core Libraries
- **chi v5**: HTTP router (inherited from existing codebase)
- **gorilla/websocket**: WebSocket implementation
- **Go standard library**: html/template, net/http, encoding/json
-
-### Project Dependencies
- **pkg/client**: SoundTouch HTTP and WebSocket client library
- **pkg/discovery**: Device discovery service (mDNS/UPnP)
- **pkg/models**: XML/JSON data structures for SoundTouch API
- **pkg/config**: Configuration management
-
-### Frontend Dependencies
- **Bootstrap 5**: CSS framework for responsive design
- **Bootstrap Icons**: Icon library for UI elements
- **Vanilla JavaScript**: No external JS frameworks, pure WebSocket implementation
-
-## Build & Testing
-
-### Build Commands
-```bash
-# Build the web application
-cd cmd/soundtouch-web
-go build -o soundtouch-web
-
-# Build all project components (includes soundtouch-web)
-make build
-
-# Cross-platform builds
-make build-all
-```
-
-### Testing
-```bash
-# Run unit tests
-go test ./cmd/soundtouch-web/...
-
-# Run with coverage
-go test -cover ./cmd/soundtouch-web/...
-
-# Lint checking
-golangci-lint run cmd/soundtouch-web/...
-```
-
-### Development Server
-```bash
-# Run development server
-cd cmd/soundtouch-web
-go run main.go -port 8080
-
-# Access the web interface
-open http://localhost:8080
-```
-
-## Configuration
-
-### Command Line Options
-```bash
-soundtouch-web [options]
-
-Options:
-  -port string    Web server port (default "8080")
-  -host string    Specific device host for single-device mode (optional)
-```
-
-### File Structure
-```
-cmd/soundtouch-web/
-├── main.go                    # Application entry point
-├── soundtouch-web            # Built binary
-├── handlers/
-│   ├── handlers.go           # HTTP request handlers
-│   ├── handlers_test.go      # Handler tests
-│   └── websocket.go          # WebSocket functionality
-├── webtypes/
-│   ├── types.go              # Type definitions
-│   └── types_test.go         # Type tests
-├── templates/
-│   ├── layout.html           # Base HTML layout
-│   ├── index.html            # Device list page
-│   └── device.html           # Device control page
-├── static/
-│   └── style.css             # Additional CSS styles
-└── README.md                 # User documentation
-```
-
-## Browser Compatibility
-
-### Supported Browsers
- **Chrome 80+** (recommended)
- **Firefox 75+**
- **Safari 13+**
- **Edge 80+**
-
-### Required Features
- WebSocket support
- CSS Grid and Flexbox
- ES6 JavaScript features
- JSON API support
-
-## Security Considerations
-
-### Design Principles
- **Local Network Only**: Designed for trusted local network environments
- **No Authentication**: Assumes local network security
- **CORS Policy**: Restricted to same-origin requests
- **Input Validation**: All user inputs validated on server side
-
-### Network Security
- **Port Usage**: Uses standard HTTP port (configurable)
- **WebSocket Security**: Same-origin WebSocket connections only
- **No External Dependencies**: All resources served locally
-
-## Performance Characteristics
-
-### Resource Usage
- **Memory**: Minimal footprint, scales with number of discovered devices
- **CPU**: Low usage, event-driven architecture
- **Network**: Efficient WebSocket connections, HTTP REST for control
-
-### Scalability
- **Device Limits**: Designed for typical home networks (5-20 devices)
- **Concurrent Users**: Multiple browser sessions supported
- **Update Frequency**: Real-time updates without polling
-
-## Future Enhancements
-
-### Potential Features
- **Zone Management**: Multi-room audio control
- **Preset Programming**: Advanced preset configuration
- **Mobile PWA**: Progressive Web App for mobile installation
- **Theme Support**: Additional UI themes
- **Device Grouping**: Logical device organization
-
-### Technical Improvements
- **Caching**: Enhanced device status caching
- **Compression**: WebSocket message compression
- **Persistence**: Device settings persistence
- **Metrics**: Usage analytics and performance monitoring
-
-## Integration with Main Project
-
-### Project Alignment
- **Consistent Architecture**: Follows established project patterns
- **Shared Libraries**: Leverages existing pkg/ modules
- **Build Integration**: Included in main Makefile targets
- **Documentation**: Consistent with project documentation standards
-
-### Migration Path
- **Cloud Replacement**: Serves as local alternative to Bose cloud services
- **API Compatibility**: Maintains compatibility with existing SoundTouch APIs
- **User Experience**: Familiar interface for existing SoundTouch app users
- **Long-term Support**: Designed for continued operation post-2026
-
-This implementation provides a robust, feature-complete web interface for SoundTouch device control, ensuring continued functionality beyond the official app's lifecycle while maintaining high code quality and user experience standards.
@@ -1,330 +0,0 @@
-# SoundTouch Web UI
-
-A modern single-page web application (SPA) for controlling Bose SoundTouch devices. Built with a JSON API backend and client-side JavaScript rendering for superior performance and maintainability.
-
-## Architecture
-
-```
-Browser → Static HTML → JavaScript → JSON API → Go Server
-                     ↓
-               Client-Side Rendering
-```
-
-### Key Benefits
- **Better Performance**: No server-side template processing overhead
- **Improved Maintainability**: Clear separation between frontend (JavaScript) and backend (Go)
- **Real-time Experience**: Smooth client-side updates without page reloads
- **Mobile Ready**: The JSON API can power both this web interface and mobile applications
-
-## Features
-
-Based on captured WebSocket interactions and device API capabilities, this web UI provides:
-
-### Device Management
- **Auto-discovery** of SoundTouch devices on the network
- **Real-time status monitoring** via WebSocket connections
- **Multi-device support** with centralized control
- **Connection status** indicators and health monitoring
-
-### Playback Control
- **Play/Pause/Stop/Next/Previous** controls
- **Now playing information** with artwork, track details, and progress
- **Real-time updates** of playback state changes
- **Source selection** from available inputs (Spotify, TuneIn, Bluetooth, AUX, etc.)
-
-### Audio Controls
- **Volume control** with real-time slider updates
- **Mute/Unmute** functionality
- **Bass adjustment** (on supported models)
- **Audio level monitoring** and statistics
-
-### Preset Management
- **6 preset buttons** with visual feedback
- **Preset content display** showing station/playlist names
- **One-click preset selection**
-
-### Advanced Features
- **WebSocket real-time updates** for instant state synchronization
- **Responsive design** optimized for desktop and mobile
- **Dark mode support** (auto-detects system preference)
- **Accessibility features** (keyboard navigation, screen reader support)
- **Network statistics** and device health monitoring
-
-## Screenshots
-
-### Main Device Overview
-The main page shows all discovered devices with their current status, now-playing information, and quick controls.
-
-### Detailed Device Control
-Individual device pages provide full control over:
- Detailed now-playing information with artwork
- Comprehensive audio controls (volume, bass)
- Full preset and source selection
- Real-time status updates
-
-## Installation
-
-### Prerequisites
- Go 1.21 or later
- Access to SoundTouch devices on the same network
- Modern web browser with WebSocket support
-
-### Building
-```bash
-# From project root
-make build
-
-# Or manually
-cd cmd/soundtouch-web
-go build -o soundtouch-web
-```
-
-### Running
-```bash
-# Run with default settings (port 8080)
-./soundtouch-web
-
-# Specify custom port
-./soundtouch-web -port 8888
-
-# Connect to specific device
-./soundtouch-web -host 192.168.1.100
-```
-
-### Command Line Options
-```
-port string    Web server port (default "8080")
-host string    Specific SoundTouch device host (optional, enables single-device mode)
-help          Show help information
-```
-
-## Usage
-
-### Accessing the Interface
-1. Start the application
-2. Open your web browser and navigate to `http://localhost:8080`
-3. Click "Discover Devices" to find SoundTouch devices on your network
-4. Click on any device for detailed control, or use quick controls from the main page
-
-### Device Discovery
-The application automatically discovers SoundTouch devices using:
- **mDNS discovery** for local network devices
- **UPnP/SSDP discovery** as fallback
- **Manual device addition** via IP address
-
-### Real-time Updates
-The interface maintains WebSocket connections to each device for instant updates of:
- Now playing information and artwork
- Volume and audio settings changes
- Playback status (play/pause/stop)
- Connection status and device health
-
-### Responsive Design
- **Desktop**: Full-featured interface with side-by-side panels
- **Tablet**: Optimized layout with touch-friendly controls
- **Mobile**: Stacked interface with gesture support
-
-## API Endpoints
-
-The web UI exposes a REST API for programmatic control:
-
-### Device Management
-```
-GET  /api/devices           # List all discovered devices
-GET  /api/device/{id}       # Get specific device info
-POST /api/discover          # Trigger device discovery
-```
-
-### Device Control
-```
-GET  /api/control/{id}/play        # Start playback
-GET  /api/control/{id}/pause       # Pause playback
-GET  /api/control/{id}/stop        # Stop playback
-GET  /api/control/{id}/next        # Next track
-GET  /api/control/{id}/previous    # Previous track
-POST /api/control/{id}/volume      # Set volume (body: {"level": 50})
-GET  /api/control/{id}/mute        # Mute audio
-GET  /api/control/{id}/unmute      # Unmute audio
-POST /api/control/{id}/bass        # Set bass (body: {"level": 0})
-GET  /api/control/{id}/preset?id=1 # Select preset
-GET  /api/control/{id}/source?name=SPOTIFY # Select source
-```
-
-### WebSocket Events
-Connect to `/ws` for real-time updates:
-```javascript
-const ws = new WebSocket('ws://localhost:8080/ws');
-ws.onmessage = function(event) {
-    const data = JSON.parse(event.data);
-    // Handle device updates, status changes, etc.
-};
-```
-
-## Architecture
-
-### Single-Page Application Architecture
- **JSON API Backend**: Go server providing RESTful endpoints
- **Client-Side Rendering**: JavaScript handles all UI rendering
- **WebSocket Real-time**: Bi-directional real-time communication
- **No Template Dependencies**: Eliminates server-side template issues
-
-### Backend Components
- **Discovery Service**: Finds and manages SoundTouch devices
- **WebSocket Manager**: Maintains real-time connections to devices
- **JSON API Server**: RESTful interface returning only JSON
- **Device Manager**: Tracks device state and health
-
-### Frontend Components
- **Bootstrap 5**: Modern responsive UI framework
- **Vanilla JavaScript**: No framework dependencies, fast loading
- **WebSocket Client**: Real-time bidirectional communication
- **Dynamic Rendering**: Client-side HTML generation from JSON
-
-### Communication Flow
-1. **SPA Loading**: Single HTML file with embedded CSS and JavaScript
-2. **JSON API**: Device discovery and control via REST endpoints
-3. **WebSocket (Device)**: Real-time status updates from SoundTouch devices
-4. **WebSocket (Browser)**: Real-time UI updates to web clients
-5. **Client Rendering**: JavaScript dynamically creates all UI elements
-
-## Development
-
-### Project Structure
-```
-cmd/soundtouch-web/
-├── main.go              # Application entry point and SPA routing
-├── handlers/            # HTTP and WebSocket handlers
-│   ├── handlers.go     # JSON API endpoints
-│   └── websocket.go    # WebSocket management
-├── webtypes/           # Type definitions
-│   └── types.go        # Request/response types
-├── static/             # Static assets
-│   ├── index.html      # Single-page application
-│   └── js/             # Legacy JS files (reference)
-├── templates/          # Legacy templates (unused in SPA)
-└── README.md          # This file
-```
-
-### Adding New Features
-1. **API Endpoints**: Add new JSON routes in `setupRoutes()` and `handlers.go`
-2. **WebSocket Events**: Extend event handlers in WebSocket client
-3. **UI Components**: Add JavaScript rendering functions in `static/index.html`
-4. **Device Controls**: Implement new control commands and update client-side handlers
-
-### Testing
-```bash
-# Unit tests
-go test ./...
-
-# Manual testing with multiple devices
-./soundtouch-web -port 8080
-
-# API testing
-curl http://localhost:8080/api/devices
-```
-
-## WebSocket Protocol Analysis
-
-This UI is based on extensive analysis of captured SoundTouch WebSocket interactions, including:
-
-### Message Types Implemented
- **SoundTouchSdkInfo**: Initial handshake and version info
- **nowPlayingUpdated**: Real-time track information
- **volumeUpdated**: Audio level changes
- **recentsUpdated**: Recently played items
- **userActivityUpdate**: User interaction notifications
-
-### Request/Response Patterns
- **Device Information**: System details and capabilities
- **Audio Controls**: Volume, bass, mute controls
- **Playback Control**: Play/pause/stop/skip commands
- **Source Selection**: Input switching (Spotify, TuneIn, etc.)
- **Preset Management**: Saved station/playlist access
-
-### Gabbo Protocol Features
- **Persistent Connections**: Maintains long-lived WebSocket connections
- **Request Correlation**: Uses request IDs for response matching
- **Real-time Events**: Instant updates for all device state changes
- **Bi-directional Control**: Both status monitoring and device control
-
-## Browser Compatibility
-
-### Supported Browsers
- **Chrome 80+** (recommended)
- **Firefox 75+**
- **Safari 13+**
- **Edge 80+**
-
-### Required Features
- WebSocket support
- CSS Grid and Flexbox
- ES6 JavaScript features
- Responsive CSS media queries
-
-## Security Considerations
-
- **Local Network Only**: Designed for local network device control
- **No Authentication**: Assumes trusted local network environment
- **CORS Policy**: Restricted to same-origin requests
- **WebSocket Security**: Uses same-origin WebSocket connections
-
-## Troubleshooting
-
-### Common Issues
-
-**Devices Not Found**
- Ensure devices are on the same network
- Check firewall settings (ports 8090, 8080)
- Click "Discover Devices" button to trigger discovery
-
-**WebSocket Connection Failed**
- Verify device supports WebSocket connections
- Check browser console for connection errors
- Refresh the page to reconnect WebSocket
-
-**Control Commands Not Working**
- Check device is powered on and connected
- Verify device is not in exclusive mode (e.g., Spotify Connect active)
- Look for error notifications in the UI
-
-**Page Shows Template Errors**
- This has been fixed in the SPA implementation
- Ensure you're accessing the correct URL (localhost:8080)
- Clear browser cache if you see old template-based content
-
-### Debug Mode
-Add verbose logging by setting environment variable:
-```bash
-export DEBUG=true
-./soundtouch-web
-```
-
-## Contributing
-
-This web UI is part of the larger SoundTouch Go library project. See the main project README for contribution guidelines.
-
-### Architecture Benefits
-The new SPA approach provides:
- **Better Performance**: No server-side template rendering
- **Easier Development**: Clear separation of frontend/backend
- **Mobile Ready**: Same JSON API can power mobile apps
- **Scalable**: Single-page app architecture
-
-### Feature Requests
-Based on WebSocket interaction analysis, potential future features:
- Zone/multi-room management
- Clock display control
- Software update management
- Advanced preset programming
- Progressive Web App (PWA) features
-
-## License
-
-Same as the parent project - see main repository LICENSE file.
-
-## Acknowledgments
-
- Built on the comprehensive SoundTouch Go library
- UI design inspired by modern audio control interfaces
- WebSocket protocol reverse-engineered from captured device interactions
- Bootstrap and Bootstrap Icons for responsive design components
@@ -1,648 +0,0 @@
-// Package handlers contains HTTP handlers for the SoundTouch web UI.
-package handlers
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/webtypes"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	bmxpkg "github.com/gesellix/bose-soundtouch/pkg/service/bmx"
-	"github.com/go-chi/chi/v5"
-	"github.com/gorilla/websocket"
-)
-
-// WebApp holds the application state and dependencies
-type WebApp struct {
-	Devices   map[string]*webtypes.DeviceConnection
-	Upgrader  websocket.Upgrader
-	WSClients map[*websocket.Conn]bool
-	WSMutex   sync.RWMutex
-}
-
-// NewWebApp creates a new WebApp instance for SPA mode
-func NewWebApp() *WebApp {
-	return &WebApp{
-		Devices:   make(map[string]*webtypes.DeviceConnection),
-		WSClients: make(map[*websocket.Conn]bool),
-		Upgrader: websocket.Upgrader{
-			CheckOrigin: func(_ *http.Request) bool { return true },
-		},
-	}
-}
-
-// HandleAPIDevices returns all devices as JSON
-func (app *WebApp) HandleAPIDevices(w http.ResponseWriter, _ *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
-
-	// Return all devices as JSON
-	devices := make(map[string]interface{})
-	for id, device := range app.Devices {
-		devices[id] = map[string]interface{}{
-			"info":     device.DeviceInfo,
-			"status":   device.Status,
-			"lastSeen": device.LastSeen,
-		}
-	}
-
-	response := webtypes.APIResponse{
-		Success: true,
-		Data:    devices,
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// HandleAPIDevice returns a specific device as JSON
-func (app *WebApp) HandleAPIDevice(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-	if deviceID == "" {
-		app.sendError(w, "Device ID required", http.StatusBadRequest)
-		return
-	}
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	// Update device status to get fresh power state
-	app.UpdateDeviceStatus(deviceID, device)
-
-	// Connect WebSocket for real-time updates if not already connected
-	if device.WebSocket == nil {
-		go app.ConnectDeviceWebSocket(deviceID, device)
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	response := webtypes.APIResponse{
-		Success: true,
-		Data: map[string]interface{}{
-			"info":   device.DeviceInfo,
-			"status": device.Status,
-		},
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// HandleAPIControl handles device control commands
-func (app *WebApp) HandleAPIControl(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-	action := chi.URLParam(r, "action")
-
-	if deviceID == "" {
-		app.sendError(w, "Device ID required", http.StatusBadRequest)
-		return
-	}
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	// Connect WebSocket for real-time updates if not already connected
-	if device.WebSocket == nil {
-		go app.ConnectDeviceWebSocket(deviceID, device)
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	app.handleControlAction(w, r, action, device)
-}
-
-// handleControlAction processes different control actions
-func (app *WebApp) handleControlAction(w http.ResponseWriter, r *http.Request, action string, device *webtypes.DeviceConnection) {
-	switch action {
-	case "play":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.Play()
-		app.sendControlResponse(w, err, "Started playback")
-	case "pause":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.Pause()
-		app.sendControlResponse(w, err, "Paused playback")
-	case "stop":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.Stop()
-		app.sendControlResponse(w, err, "Stopped playback")
-	case "next":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.NextTrack()
-		app.sendControlResponse(w, err, "Next track")
-	case "previous":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.PrevTrack()
-		app.sendControlResponse(w, err, "Previous track")
-	case "volume":
-		app.handleVolumeControl(w, r, device)
-	case "mute":
-		if device.Client == nil {
-			app.sendError(w, "Device client not available", http.StatusInternalServerError)
-			return
-		}
-
-		err := device.Client.SendKey(models.KeyMute)
-		app.sendControlResponse(w, err, "Toggled mute")
-	case "preset":
-		app.handlePresetControl(w, r, device)
-	case "bass":
-		app.handleBassControl(w, r, device)
-	case "source":
-		app.handleSourceControl(w, r, device)
-	default:
-		app.sendError(w, "Unknown action", http.StatusBadRequest)
-	}
-}
-
-// handleVolumeControl processes volume control requests
-func (app *WebApp) handleVolumeControl(w http.ResponseWriter, r *http.Request, device *webtypes.DeviceConnection) {
-	if r.Method != http.MethodPost {
-		app.sendError(w, "POST required for volume control", http.StatusMethodNotAllowed)
-		return
-	}
-
-	var volumeReq webtypes.VolumeRequest
-	if err := json.NewDecoder(r.Body).Decode(&volumeReq); err != nil {
-		app.sendError(w, "Invalid volume data", http.StatusBadRequest)
-		return
-	}
-
-	if volumeReq.Level < 0 || volumeReq.Level > 100 {
-		app.sendError(w, "Volume must be between 0 and 100", http.StatusBadRequest)
-		return
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	err := device.Client.SetVolume(volumeReq.Level)
-	app.sendControlResponse(w, err, fmt.Sprintf("Volume set to %d", volumeReq.Level))
-}
-
-// handlePresetControl processes preset control requests
-func (app *WebApp) handlePresetControl(w http.ResponseWriter, r *http.Request, device *webtypes.DeviceConnection) {
-	presetParam := r.URL.Query().Get("id")
-	if presetParam == "" {
-		app.sendError(w, "Preset ID required", http.StatusBadRequest)
-		return
-	}
-
-	presetID, err := strconv.Atoi(presetParam)
-	if err != nil {
-		app.sendError(w, "Invalid preset ID", http.StatusBadRequest)
-		return
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	err = device.Client.SelectPreset(presetID)
-	app.sendControlResponse(w, err, fmt.Sprintf("Selected preset %d", presetID))
-}
-
-// handleBassControl processes bass control requests
-func (app *WebApp) handleBassControl(w http.ResponseWriter, r *http.Request, device *webtypes.DeviceConnection) {
-	if r.Method != http.MethodPost {
-		app.sendError(w, "POST required for bass control", http.StatusMethodNotAllowed)
-		return
-	}
-
-	var bassReq webtypes.BassRequest
-	if err := json.NewDecoder(r.Body).Decode(&bassReq); err != nil {
-		app.sendError(w, "Invalid bass data", http.StatusBadRequest)
-		return
-	}
-
-	if bassReq.Level < -9 || bassReq.Level > 9 {
-		app.sendError(w, "Bass must be between -9 and 9", http.StatusBadRequest)
-		return
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	err := device.Client.SetBass(bassReq.Level)
-	app.sendControlResponse(w, err, fmt.Sprintf("Bass set to %d", bassReq.Level))
-}
-
-// handleSourceControl processes source control requests
-func (app *WebApp) handleSourceControl(w http.ResponseWriter, r *http.Request, device *webtypes.DeviceConnection) {
-	sourceParam := r.URL.Query().Get("name")
-	if sourceParam == "" {
-		app.sendError(w, "Source name required", http.StatusBadRequest)
-		return
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	err := device.Client.SelectSource(sourceParam, "")
-	app.sendControlResponse(w, err, fmt.Sprintf("Selected source %s", sourceParam))
-}
-
-// sendControlResponse sends a control command response
-func (app *WebApp) sendControlResponse(w http.ResponseWriter, err error, successMessage string) {
-	if err != nil {
-		app.sendError(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	response := webtypes.APIResponse{
-		Success: true,
-		Data:    map[string]string{"message": successMessage},
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// sendError sends an error response
-func (app *WebApp) sendError(w http.ResponseWriter, message string, statusCode int) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(statusCode)
-
-	response := webtypes.APIResponse{
-		Success: false,
-		Error:   message,
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode error response", http.StatusInternalServerError)
-	}
-}
-
-// HandleDeviceKey handles sending key commands to devices
-func (app *WebApp) HandleDeviceKey(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-	key := chi.URLParam(r, "key")
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	// Connect WebSocket for real-time updates if not already connected
-	if device.WebSocket == nil {
-		go app.ConnectDeviceWebSocket(deviceID, device)
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	err := device.Client.SendKey(key)
-	app.sendControlResponse(w, err, fmt.Sprintf("Sent key command: %s", key))
-}
-
-// HandleDirectVolumeControl handles direct volume setting via URL parameter
-func (app *WebApp) HandleDirectVolumeControl(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-
-	volumeLevel, err := strconv.Atoi(chi.URLParam(r, "volume"))
-	if err != nil || volumeLevel < 0 || volumeLevel > 100 {
-		app.sendError(w, "Invalid volume level (0-100)", http.StatusBadRequest)
-		return
-	}
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	// Connect WebSocket for real-time updates if not already connected
-	if device.WebSocket == nil {
-		go app.ConnectDeviceWebSocket(deviceID, device)
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	err = device.Client.SetVolume(volumeLevel)
-	app.sendControlResponse(w, err, fmt.Sprintf("Volume set to %d", volumeLevel))
-}
-
-// HandleDevicePower handles power toggle commands for devices
-func (app *WebApp) HandleDevicePower(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	// Connect WebSocket for real-time updates if not already connected
-	if device.WebSocket == nil {
-		go app.ConnectDeviceWebSocket(deviceID, device)
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	// Send POWER key command to toggle device power
-	err := device.Client.SendKey("POWER")
-	app.sendControlResponse(w, err, "Power toggle command sent")
-}
-
-// HandleDevicePowerStatus handles lightweight power status check
-func (app *WebApp) HandleDevicePowerStatus(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	if device.Client == nil {
-		app.sendError(w, "Device client not available", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	// Quick power status check by getting now playing
-	nowPlaying, err := device.Client.GetNowPlaying()
-	if err != nil {
-		app.sendControlResponse(w, err, "Failed to get power status")
-		return
-	}
-
-	isPoweredOn := nowPlaying != nil && nowPlaying.Source != "STANDBY"
-
-	response := webtypes.APIResponse{
-		Success: true,
-		Data: map[string]interface{}{
-			"deviceId":    deviceID,
-			"isPoweredOn": isPoweredOn,
-			"source":      nowPlaying.Source,
-		},
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// BroadcastDeviceList sends updated device list to all connected WebSocket clients
-func (app *WebApp) BroadcastDeviceList() {
-	app.WSMutex.RLock()
-	defer app.WSMutex.RUnlock()
-
-	devices := make(map[string]interface{})
-	for id, device := range app.Devices {
-		devices[id] = map[string]interface{}{
-			"info":     device.DeviceInfo,
-			"status":   device.Status,
-			"lastSeen": device.LastSeen,
-		}
-	}
-
-	message := webtypes.WebSocketMessage{
-		Type: "devices",
-		Data: devices,
-	}
-
-	// Send to all connected clients
-	var failedClients []*websocket.Conn
-
-	for client := range app.WSClients {
-		if err := client.WriteJSON(message); err != nil {
-			log.Printf("Failed to send device update to WebSocket client: %v", err)
-			// Mark for removal to avoid modifying map during iteration
-			failedClients = append(failedClients, client)
-		}
-	}
-
-	// Remove failed clients
-	for _, client := range failedClients {
-		delete(app.WSClients, client)
-		client.Close()
-	}
-}
-
-// BroadcastDiscoveryStatus sends discovery progress updates to all connected WebSocket clients
-func (app *WebApp) BroadcastDiscoveryStatus(status string, deviceCount int) {
-	app.WSMutex.RLock()
-	defer app.WSMutex.RUnlock()
-
-	message := webtypes.WebSocketMessage{
-		Type: "discovery_status",
-		Data: map[string]interface{}{
-			"status":      status,
-			"deviceCount": deviceCount,
-		},
-	}
-
-	// Send to all connected clients
-	var failedClients []*websocket.Conn
-
-	for client := range app.WSClients {
-		if err := client.WriteJSON(message); err != nil {
-			log.Printf("Failed to send discovery status to WebSocket client: %v", err)
-			// Mark for removal to avoid modifying map during iteration
-			failedClients = append(failedClients, client)
-		}
-	}
-
-	// Remove failed clients
-	for _, client := range failedClients {
-		delete(app.WSClients, client)
-		client.Close()
-	}
-}
-
-// HandleTuneInSearch handles TuneIn search requests, proxying directly to the bmx package.
-func (app *WebApp) HandleTuneInSearch(w http.ResponseWriter, r *http.Request) {
-	query := r.URL.Query().Get("q")
-	if query == "" {
-		app.sendError(w, "query parameter 'q' is required", http.StatusBadRequest)
-		return
-	}
-
-	resp, err := bmxpkg.TuneInSearch(query)
-	if err != nil {
-		app.sendError(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	if encErr := json.NewEncoder(w).Encode(webtypes.APIResponse{Success: true, Data: resp}); encErr != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// HandleTuneInNavigate handles TuneIn browse/navigate requests, proxying directly to the bmx package.
-// Supported path suffixes (relative to /api/tunein/navigate):
-//   - (empty)                             → top-level browse
-//   - /{encodedURI}                       → browse the given TuneIn URI
-//   - /sub/{n}/{encodedURI}               → single subsection
-//   - /profiles/{type}/{id}/{encodedURI}  → artist/program profile
-func (app *WebApp) HandleTuneInNavigate(w http.ResponseWriter, r *http.Request) {
-	wildcard := chi.URLParam(r, "*")
-
-	var (
-		resp interface{}
-		err  error
-	)
-
-	if wildcard == "" {
-		resp, err = bmxpkg.TuneInNavigate("", nil)
-	} else {
-		firstSlash := strings.Index(wildcard, "/")
-		if firstSlash == -1 {
-			resp, err = bmxpkg.TuneInNavigate(wildcard, nil)
-		} else {
-			pfx := wildcard[:firstSlash]
-			rest := wildcard[firstSlash+1:]
-
-			switch pfx {
-			case "sub":
-				secondSlash := strings.Index(rest, "/")
-				if secondSlash == -1 {
-					resp, err = bmxpkg.TuneInNavigate(rest, nil)
-				} else {
-					n, parseErr := strconv.Atoi(rest[:secondSlash])
-					if parseErr != nil {
-						resp, err = bmxpkg.TuneInNavigate(wildcard, nil)
-					} else {
-						resp, err = bmxpkg.TuneInNavigate(rest[secondSlash+1:], &n)
-					}
-				}
-			case "profiles":
-				parts := strings.SplitN(rest, "/", 3)
-				if len(parts) < 3 {
-					resp, err = bmxpkg.TuneInNavigate(wildcard, nil)
-				} else {
-					resp, err = bmxpkg.TuneInNavigateProfile(parts[2])
-				}
-			default:
-				resp, err = bmxpkg.TuneInNavigate(wildcard, nil)
-			}
-		}
-	}
-
-	if err != nil {
-		app.sendError(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	if encErr := json.NewEncoder(w).Encode(webtypes.APIResponse{Success: true, Data: resp}); encErr != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// HandlePlayTuneIn plays a TuneIn content item on a specific device via POST /select.
-func (app *WebApp) HandlePlayTuneIn(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-	if deviceID == "" {
-		app.sendError(w, "Device ID required", http.StatusBadRequest)
-		return
-	}
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		app.sendError(w, fmt.Sprintf("Device '%s' not found", deviceID), http.StatusNotFound)
-		return
-	}
-
-	var req struct {
-		Location     string `json:"location"`
-		Name         string `json:"name"`
-		Type         string `json:"type"`
-		ContainerArt string `json:"containerArt"`
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		app.sendError(w, "Invalid request body", http.StatusBadRequest)
-		return
-	}
-
-	if req.Location == "" {
-		app.sendError(w, "location is required", http.StatusBadRequest)
-		return
-	}
-
-	itemType := req.Type
-	if itemType == "" {
-		itemType = "stationurl"
-	}
-
-	contentItem := &models.ContentItem{
-		Source:       "TUNEIN",
-		Type:         itemType,
-		Location:     req.Location,
-		ItemName:     req.Name,
-		IsPresetable: true,
-		ContainerArt: req.ContainerArt,
-	}
-
-	if err := device.Client.SelectContentItem(contentItem); err != nil {
-		app.sendError(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	if encErr := json.NewEncoder(w).Encode(webtypes.APIResponse{Success: true, Data: map[string]string{"message": "Playing " + req.Name}}); encErr != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
@@ -1,588 +0,0 @@
-// Package handlers contains tests for HTTP handlers.
-package handlers
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/webtypes"
-	"github.com/gesellix/bose-soundtouch/pkg/client"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/go-chi/chi/v5"
-)
-
-func createTestApp() *WebApp {
-	app := NewWebApp()
-
-	// Add test device with minimal data
-	deviceInfo := &models.DeviceInfo{
-		Name: "Test Speaker",
-		Type: "SoundTouch 30",
-		NetworkInfo: []models.NetworkInfo{
-			{MacAddress: "TEST123", IPAddress: "192.168.1.100"},
-		},
-	}
-
-	device := &webtypes.DeviceConnection{
-		Client:     nil, // No real client for unit tests
-		DeviceInfo: deviceInfo,
-		LastSeen:   time.Now(),
-		Status: webtypes.DeviceStatus{
-			Volume:       &models.Volume{ActualVolume: 50, MuteEnabled: false},
-			Bass:         &models.Bass{ActualBass: 0},
-			IsConnected:  true,
-			LastActivity: time.Now(),
-		},
-	}
-
-	app.Devices["test-device"] = device
-	return app
-}
-
-func withChiParams(r *http.Request, params map[string]string) *http.Request {
-	rctx := chi.NewRouteContext()
-	for k, v := range params {
-		rctx.URLParams.Add(k, v)
-	}
-	return r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, rctx))
-}
-
-func TestNewWebApp(t *testing.T) {
-	app := NewWebApp()
-
-	// Use require-style checks that satisfy static analyzer
-	if app == nil {
-		t.Fatal("NewWebApp returned nil")
-	}
-	if app.Devices == nil {
-		t.Fatal("Devices map not initialized")
-	}
-
-	// At this point we know app and app.Devices are not nil
-	if len(app.Devices) != 0 {
-		t.Errorf("Expected empty devices map, got %d devices", len(app.Devices))
-	}
-}
-
-func TestHandleAPIDevices(t *testing.T) {
-	app := createTestApp()
-
-	req := httptest.NewRequest("GET", "/api/devices", nil)
-	w := httptest.NewRecorder()
-
-	app.HandleAPIDevices(w, req)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("Expected status 200, got %d", w.Code)
-	}
-
-	contentType := w.Header().Get("Content-Type")
-	if !strings.Contains(contentType, "application/json") {
-		t.Errorf("Expected JSON content type, got %s", contentType)
-	}
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode response: %v", err)
-	}
-
-	if !response.Success {
-		t.Errorf("Expected success=true, got false")
-	}
-
-	// Check that devices data is present
-	data, ok := response.Data.(map[string]interface{})
-	if !ok {
-		t.Fatalf("Expected data to be map[string]interface{}")
-	}
-
-	if _, exists := data["test-device"]; !exists {
-		t.Errorf("Expected 'test-device' in response data")
-	}
-}
-
-func TestHandleAPIDevice(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name           string
-		path           string
-		chiID          string
-		expectedStatus int
-		expectSuccess  bool
-	}{
-		{
-			name:           "valid device",
-			path:           "/api/device/test-device",
-			chiID:          "test-device",
-			expectedStatus: http.StatusOK,
-			expectSuccess:  true,
-		},
-		{
-			name:           "missing device ID",
-			path:           "/api/device/",
-			chiID:          "",
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-		{
-			name:           "unknown device",
-			path:           "/api/device/unknown",
-			chiID:          "unknown",
-			expectedStatus: http.StatusNotFound,
-			expectSuccess:  false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest("GET", tt.path, nil)
-			if tt.chiID != "" {
-				req = withChiParams(req, map[string]string{"id": tt.chiID})
-			}
-			w := httptest.NewRecorder()
-
-			app.HandleAPIDevice(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			contentType := w.Header().Get("Content-Type")
-			if !strings.Contains(contentType, "application/json") {
-				t.Errorf("Expected JSON content type, got %s", contentType)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success != tt.expectSuccess {
-				t.Errorf("Expected success=%v, got %v", tt.expectSuccess, response.Success)
-			}
-		})
-	}
-}
-
-func TestHandleAPIControl_InvalidDevice(t *testing.T) {
-	app := createTestApp()
-
-	req := httptest.NewRequest("GET", "/api/control/unknown-device/play", nil)
-	req = withChiParams(req, map[string]string{"id": "unknown-device", "action": "play"})
-	w := httptest.NewRecorder()
-
-	app.HandleAPIControl(w, req)
-
-	if w.Code != http.StatusNotFound {
-		t.Errorf("Expected status 404, got %d", w.Code)
-	}
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode response: %v", err)
-	}
-
-	if response.Success {
-		t.Errorf("Expected success=false, got true")
-	}
-
-	if response.Error != "Device not found" {
-		t.Errorf("Expected 'Device not found' error, got '%s'", response.Error)
-	}
-}
-
-func TestHandleAPIControl_InvalidPath(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name string
-		path string
-	}{
-		{"missing action", "/api/control/test-device"},
-		{"missing device and action", "/api/control/"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest("GET", tt.path, nil)
-			w := httptest.NewRecorder()
-
-			app.HandleAPIControl(w, req)
-
-			if w.Code != http.StatusBadRequest {
-				t.Errorf("Expected status 400, got %d", w.Code)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success {
-				t.Errorf("Expected success=false, got true")
-			}
-		})
-	}
-}
-
-func TestHandleAPIControl_VolumeValidation(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name           string
-		method         string
-		body           string
-		expectedStatus int
-		expectSuccess  bool
-	}{
-		{
-			name:           "invalid method",
-			method:         "GET",
-			body:           "",
-			expectedStatus: http.StatusMethodNotAllowed,
-			expectSuccess:  false,
-		},
-		{
-			name:           "invalid JSON",
-			method:         "POST",
-			body:           `invalid json`,
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-		{
-			name:           "volume too low",
-			method:         "POST",
-			body:           `{"level": -1}`,
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-		{
-			name:           "volume too high",
-			method:         "POST",
-			body:           `{"level": 101}`,
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var req *http.Request
-			if tt.body != "" {
-				req = httptest.NewRequest(tt.method, "/api/control/test-device/volume", strings.NewReader(tt.body))
-			} else {
-				req = httptest.NewRequest(tt.method, "/api/control/test-device/volume", nil)
-			}
-			req = withChiParams(req, map[string]string{"id": "test-device", "action": "volume"})
-			req.Header.Set("Content-Type", "application/json")
-
-			w := httptest.NewRecorder()
-			app.HandleAPIControl(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success != tt.expectSuccess {
-				t.Errorf("Expected success=%v, got %v", tt.expectSuccess, response.Success)
-			}
-		})
-	}
-}
-
-func TestHandleAPIControl_BassValidation(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name           string
-		method         string
-		body           string
-		expectedStatus int
-		expectSuccess  bool
-	}{
-		{
-			name:           "bass too low",
-			method:         "POST",
-			body:           `{"level": -10}`,
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-		{
-			name:           "bass too high",
-			method:         "POST",
-			body:           `{"level": 10}`,
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest(tt.method, "/api/control/test-device/bass", strings.NewReader(tt.body))
-			req = withChiParams(req, map[string]string{"id": "test-device", "action": "bass"})
-			req.Header.Set("Content-Type", "application/json")
-
-			w := httptest.NewRecorder()
-			app.HandleAPIControl(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success != tt.expectSuccess {
-				t.Errorf("Expected success=%v, got %v", tt.expectSuccess, response.Success)
-			}
-		})
-	}
-}
-
-func TestHandleAPIControl_PresetValidation(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name           string
-		query          string
-		expectedStatus int
-		expectSuccess  bool
-	}{
-		{
-			name:           "missing preset ID",
-			query:          "",
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-		{
-			name:           "invalid preset ID",
-			query:          "?id=abc",
-			expectedStatus: http.StatusBadRequest,
-			expectSuccess:  false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest("GET", "/api/control/test-device/preset"+tt.query, nil)
-			req = withChiParams(req, map[string]string{"id": "test-device", "action": "preset"})
-			w := httptest.NewRecorder()
-
-			app.HandleAPIControl(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success != tt.expectSuccess {
-				t.Errorf("Expected success=%v, got %v", tt.expectSuccess, response.Success)
-			}
-		})
-	}
-}
-
-func TestHandleAPIControl_SourceValidation(t *testing.T) {
-	app := createTestApp()
-
-	req := httptest.NewRequest("GET", "/api/control/test-device/source", nil)
-	req = withChiParams(req, map[string]string{"id": "test-device", "action": "source"})
-	w := httptest.NewRecorder()
-
-	app.HandleAPIControl(w, req)
-
-	if w.Code != http.StatusBadRequest {
-		t.Errorf("Expected status 400, got %d", w.Code)
-	}
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode response: %v", err)
-	}
-
-	if response.Success {
-		t.Errorf("Expected success=false, got true")
-	}
-
-	if response.Error != "Source name required" {
-		t.Errorf("Expected 'Source name required' error, got '%s'", response.Error)
-	}
-}
-
-func TestHandleAPIDiscover(t *testing.T) {
-	app := createTestApp()
-
-	tests := []struct {
-		name           string
-		method         string
-		expectedStatus int
-		expectSuccess  bool
-	}{
-		{
-			name:           "valid POST request",
-			method:         "POST",
-			expectedStatus: http.StatusOK,
-			expectSuccess:  true,
-		},
-		{
-			name:           "invalid GET request",
-			method:         "GET",
-			expectedStatus: http.StatusMethodNotAllowed,
-			expectSuccess:  false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest(tt.method, "/api/discover", nil)
-			w := httptest.NewRecorder()
-
-			app.HandleAPIDiscover(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Fatalf("Failed to decode response: %v", err)
-			}
-
-			if response.Success != tt.expectSuccess {
-				t.Errorf("Expected success=%v, got %v", tt.expectSuccess, response.Success)
-			}
-		})
-	}
-}
-
-func TestSendError(t *testing.T) {
-	app := createTestApp()
-
-	w := httptest.NewRecorder()
-	app.sendError(w, "Test error", http.StatusBadRequest)
-
-	if w.Code != http.StatusBadRequest {
-		t.Errorf("Expected status 400, got %d", w.Code)
-	}
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode response: %v", err)
-	}
-
-	if response.Success {
-		t.Errorf("Expected success=false, got true")
-	}
-
-	if response.Error != "Test error" {
-		t.Errorf("Expected 'Test error', got '%s'", response.Error)
-	}
-
-	contentType := w.Header().Get("Content-Type")
-	if contentType != "application/json" {
-		t.Errorf("Expected Content-Type 'application/json', got '%s'", contentType)
-	}
-}
-
-func TestHandleWebSocket_InvalidUpgrade(t *testing.T) {
-	app := createTestApp()
-
-	// Test without proper WebSocket headers (should fail gracefully)
-	req := httptest.NewRequest("GET", "/ws", nil)
-	w := httptest.NewRecorder()
-
-	// This will fail because it's not a real WebSocket upgrade, but should not panic
-	app.HandleWebSocket(w, req)
-
-	// We're just checking that the handler doesn't panic
-	// The actual upgrade will fail in test environment without proper headers
-}
-
-func TestHandleAPIControl_UnsupportedAction(t *testing.T) {
-	app := createTestApp()
-
-	req := httptest.NewRequest("GET", "/api/control/test-device/unsupported", nil)
-	req = withChiParams(req, map[string]string{"id": "test-device", "action": "unsupported"})
-	w := httptest.NewRecorder()
-
-	app.HandleAPIControl(w, req)
-
-	if w.Code != http.StatusBadRequest {
-		t.Errorf("Expected status 400, got %d", w.Code)
-	}
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode response: %v", err)
-	}
-
-	if response.Success {
-		t.Errorf("Expected success=false, got true")
-	}
-
-	if response.Error != "Unknown action" {
-		t.Errorf("Expected 'Unknown action' error, got '%s'", response.Error)
-	}
-}
-
-// Benchmark tests
-func BenchmarkHandleAPIDevices(b *testing.B) {
-	app := createTestApp()
-
-	// Add more devices for realistic benchmarking
-	for i := 0; i < 10; i++ {
-		deviceID := "device-" + string(rune('0'+i))
-		app.Devices[deviceID] = &webtypes.DeviceConnection{
-			Client:     &client.Client{},
-			DeviceInfo: &models.DeviceInfo{Name: "Test Device " + deviceID},
-			Status:     webtypes.DeviceStatus{IsConnected: true},
-		}
-	}
-
-	req := httptest.NewRequest("GET", "/api/devices", nil)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		w := httptest.NewRecorder()
-		app.HandleAPIDevices(w, req)
-	}
-}
-
-func BenchmarkHandleAPIDevice(b *testing.B) {
-	app := createTestApp()
-	req := httptest.NewRequest("GET", "/api/device/test-device", nil)
-	req = withChiParams(req, map[string]string{"id": "test-device"})
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		w := httptest.NewRecorder()
-		app.HandleAPIDevice(w, req)
-	}
-}
-
-func BenchmarkSendError(b *testing.B) {
-	app := createTestApp()
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		w := httptest.NewRecorder()
-		app.sendError(w, "Test error", http.StatusBadRequest)
-	}
-}
@@ -1,329 +0,0 @@
-// Package handlers contains WebSocket handlers for real-time communication.
-package handlers
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/webtypes"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/go-chi/chi/v5"
-	"github.com/gorilla/websocket"
-)
-
-// HandleWebSocket handles WebSocket connections for real-time updates
-func (app *WebApp) HandleWebSocket(w http.ResponseWriter, r *http.Request) {
-	conn, err := app.Upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("WebSocket upgrade failed: %v", err)
-		return
-	}
-
-	defer func() {
-		// Unregister client
-		app.WSMutex.Lock()
-		delete(app.WSClients, conn)
-		app.WSMutex.Unlock()
-		conn.Close()
-	}()
-
-	// Register client
-	app.WSMutex.Lock()
-	app.WSClients[conn] = true
-	app.WSMutex.Unlock()
-
-	// Send initial device list
-	devices := make(map[string]interface{})
-	for id, device := range app.Devices {
-		devices[id] = map[string]interface{}{
-			"info":     device.DeviceInfo,
-			"status":   device.Status,
-			"lastSeen": device.LastSeen,
-		}
-	}
-
-	initialMessage := webtypes.WebSocketMessage{
-		Type: "devices",
-		Data: devices,
-	}
-
-	if err := conn.WriteJSON(initialMessage); err != nil {
-		log.Printf("Failed to send initial data: %v", err)
-		return
-	}
-
-	// Keep connection alive and send updates
-	ticker := time.NewTicker(5 * time.Second)
-	defer ticker.Stop()
-
-	// Set up ping handler to detect client disconnects
-	conn.SetPongHandler(func(string) error {
-		conn.SetReadDeadline(time.Now().Add(60 * time.Second))
-		return nil
-	})
-
-	// Set initial read deadline
-	conn.SetReadDeadline(time.Now().Add(60 * time.Second))
-
-	// Handle incoming messages in a separate goroutine
-	go func() {
-		defer conn.Close()
-
-		for {
-			if _, _, err := conn.NextReader(); err != nil {
-				log.Printf("WebSocket read error: %v", err)
-				return
-			}
-		}
-	}()
-
-	// Main loop for sending periodic updates
-	for range ticker.C {
-		// Send ping to check if client is still connected
-		if err := conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
-			log.Printf("Failed to send ping: %v", err)
-			return
-		}
-
-		// Send periodic status updates
-		for id, device := range app.Devices {
-			if device.Status.IsConnected {
-				statusMessage := webtypes.WebSocketMessage{
-					Type:     "status_update",
-					DeviceID: id,
-					Data:     device.Status,
-				}
-
-				if err := conn.WriteJSON(statusMessage); err != nil {
-					log.Printf("Failed to send status update: %v", err)
-					return
-				}
-			}
-		}
-	}
-}
-
-// HandleAPIDiscover triggers device discovery
-func (app *WebApp) HandleAPIDiscover(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		app.sendError(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	// Discovery will be triggered by the main app
-	w.Header().Set("Content-Type", "application/json")
-
-	response := webtypes.APIResponse{
-		Success: true,
-		Data:    map[string]string{"message": "Discovery started"},
-	}
-
-	if err := json.NewEncoder(w).Encode(response); err != nil {
-		http.Error(w, "Failed to encode response", http.StatusInternalServerError)
-	}
-}
-
-// ConnectDeviceWebSocket establishes a WebSocket connection to a device
-func (app *WebApp) ConnectDeviceWebSocket(deviceID string, conn *webtypes.DeviceConnection) {
-	// Skip WebSocket connection if client is not available (e.g., in tests)
-	if conn.Client == nil {
-		return
-	}
-
-	wsClient := conn.Client.NewWebSocketClient(nil)
-
-	// Setup event handlers
-	wsClient.OnNowPlaying(func(event *models.NowPlayingUpdatedEvent) {
-		conn.Status.NowPlaying = &event.NowPlaying
-		conn.Status.LastActivity = time.Now()
-	})
-
-	wsClient.OnVolumeUpdated(func(event *models.VolumeUpdatedEvent) {
-		conn.Status.Volume = &event.Volume
-		conn.Status.LastActivity = time.Now()
-	})
-
-	wsClient.OnConnectionState(func(event *models.ConnectionStateUpdatedEvent) {
-		conn.Status.IsConnected = event.ConnectionState.IsConnected()
-		conn.Status.LastActivity = time.Now()
-	})
-
-	wsClient.OnPresetUpdated(func(event *models.PresetUpdatedEvent) {
-		conn.Status.Presets = &event.Presets
-		conn.Status.LastActivity = time.Now()
-	})
-
-	// Connect WebSocket
-	if err := wsClient.Connect(); err != nil {
-		log.Printf("Failed to connect WebSocket for device %s: %v", deviceID, err)
-		return
-	}
-
-	conn.WebSocket = wsClient
-	conn.Status.IsConnected = true
-
-	log.Printf("WebSocket connected for device %s", deviceID)
-
-	// Wait for disconnection
-	wsClient.Wait()
-
-	conn.Status.IsConnected = false
-
-	log.Printf("WebSocket disconnected for device %s", deviceID)
-}
-
-// UpdateDeviceStatus fetches current status from device
-func (app *WebApp) UpdateDeviceStatus(_ string, conn *webtypes.DeviceConnection) {
-	// Skip status update if client is not available (e.g., in tests)
-	if conn.Client == nil {
-		return
-	}
-
-	statusUpdated := false
-
-	// Get current now playing
-	if nowPlaying, err := conn.Client.GetNowPlaying(); err == nil {
-		conn.Status.NowPlaying = nowPlaying
-		statusUpdated = true
-	}
-
-	// Get current volume
-	if volume, err := conn.Client.GetVolume(); err == nil {
-		conn.Status.Volume = volume
-		statusUpdated = true
-	}
-
-	// Get presets
-	if presets, err := conn.Client.GetPresets(); err == nil {
-		conn.Status.Presets = presets
-		statusUpdated = true
-	}
-
-	// Update last activity if any status was updated
-	if statusUpdated {
-		conn.Status.LastActivity = time.Now()
-	}
-	// Get sources
-	if sources, err := conn.Client.GetSources(); err == nil {
-		conn.Status.Sources = sources
-		statusUpdated = true
-	}
-
-	// Get bass (if available)
-	if bass, err := conn.Client.GetBass(); err == nil {
-		conn.Status.Bass = bass
-		statusUpdated = true
-	}
-
-	// Mark as connected if we successfully got at least one status
-	conn.Status.IsConnected = statusUpdated
-	conn.Status.LastActivity = time.Now()
-}
-
-// HandleDeviceWebSocket handles individual device WebSocket connections for real-time device-specific updates
-func (app *WebApp) HandleDeviceWebSocket(w http.ResponseWriter, r *http.Request) {
-	deviceID := chi.URLParam(r, "id")
-	if deviceID == "" {
-		http.Error(w, "Device ID required", http.StatusBadRequest)
-		return
-	}
-
-	device, exists := app.Devices[deviceID]
-	if !exists {
-		http.Error(w, "Device not found", http.StatusNotFound)
-		return
-	}
-
-	conn, err := app.Upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Printf("Device WebSocket upgrade failed for %s: %v", deviceID, err)
-		return
-	}
-	defer conn.Close()
-
-	log.Printf("Device WebSocket connected for %s", deviceID)
-
-	// Send initial device status
-	initialMessage := webtypes.WebSocketMessage{
-		Type:     "device_status",
-		DeviceID: deviceID,
-		Data: map[string]interface{}{
-			"info":   device.DeviceInfo,
-			"status": device.Status,
-		},
-	}
-
-	if err := conn.WriteJSON(initialMessage); err != nil {
-		log.Printf("Failed to send initial device status: %v", err)
-		return
-	}
-
-	// Set up ping handler to detect client disconnects
-	conn.SetPongHandler(func(string) error {
-		conn.SetReadDeadline(time.Now().Add(60 * time.Second))
-		return nil
-	})
-
-	// Set initial read deadline
-	conn.SetReadDeadline(time.Now().Add(60 * time.Second))
-
-	// Handle incoming messages in a separate goroutine
-	go func() {
-		defer conn.Close()
-
-		for {
-			if _, _, err := conn.NextReader(); err != nil {
-				log.Printf("Device WebSocket read error for %s: %v", deviceID, err)
-				return
-			}
-		}
-	}()
-
-	// Send periodic device status updates
-	ticker := time.NewTicker(10 * time.Second)
-	defer ticker.Stop()
-
-	for range ticker.C {
-		// Send ping to check if client is still connected
-		if err := conn.WriteMessage(websocket.PingMessage, []byte{}); err != nil {
-			log.Printf("Failed to send ping to device WebSocket %s: %v", deviceID, err)
-			return
-		}
-
-		// Send device status update
-		statusMessage := webtypes.WebSocketMessage{
-			Type:     "device_status",
-			DeviceID: deviceID,
-			Data: map[string]interface{}{
-				"info":   device.DeviceInfo,
-				"status": device.Status,
-			},
-		}
-
-		if err := conn.WriteJSON(statusMessage); err != nil {
-			log.Printf("Failed to send device status update for %s: %v", deviceID, err)
-			return
-		}
-
-		// If device has active WebSocket connection to SoundTouch device,
-		// also send any real-time updates from that connection
-		if device.WebSocket != nil && device.Status.IsConnected {
-			realtimeMessage := webtypes.WebSocketMessage{
-				Type:     "device_realtime",
-				DeviceID: deviceID,
-				Data: map[string]interface{}{
-					"nowPlaying": device.Status.NowPlaying,
-					"volume":     device.Status.Volume,
-					"timestamp":  time.Now(),
-				},
-			}
-
-			if err := conn.WriteJSON(realtimeMessage); err != nil {
-				log.Printf("Failed to send realtime update for %s: %v", deviceID, err)
-				return
-			}
-		}
-	}
-}
@@ -1,215 +0,0 @@
-// Package main provides a web UI for controlling Bose SoundTouch devices.
-package main
-
-import (
-	"context"
-	"embed"
-	"io/fs"
-	"log"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/handlers"
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/webtypes"
-	"github.com/gesellix/bose-soundtouch/pkg/client"
-	"github.com/gesellix/bose-soundtouch/pkg/config"
-	"github.com/gesellix/bose-soundtouch/pkg/discovery"
-	"github.com/go-chi/chi/v5"
-	"github.com/urfave/cli/v2"
-)
-
-//go:embed static
-var staticFS embed.FS
-
-func main() {
-	app := &cli.App{
-		Name:  "soundtouch-web",
-		Usage: "Web UI for controlling Bose SoundTouch devices",
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:    "port",
-				Aliases: []string{"p"},
-				Usage:   "HTTP port to listen on",
-				Value:   "8080",
-				EnvVars: []string{"PORT"},
-			},
-			&cli.StringFlag{
-				Name:    "bind",
-				Usage:   "Network interface to bind to",
-				EnvVars: []string{"BIND_ADDR"},
-			},
-		},
-		Action: func(c *cli.Context) error {
-			port := c.String("port")
-			bindAddr := c.String("bind")
-
-			addr := ":" + port
-			if bindAddr != "" {
-				addr = bindAddr + ":" + port
-			}
-
-			// Create web app without templates (SPA mode)
-			webApp := handlers.NewWebApp()
-
-			// Initialize discovery service
-			cfg, err := config.LoadFromEnv()
-			if err != nil {
-				log.Printf("Failed to load config: %v, using defaults", err)
-
-				cfg = config.DefaultConfig()
-			}
-
-			cfg.DiscoveryTimeout = 10 * time.Second
-			cfg.CacheEnabled = true
-
-			discoveryService := discovery.NewUnifiedDiscoveryService(cfg)
-
-			// Discover devices on startup
-			go func() {
-				ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-				defer cancel()
-
-				webApp.BroadcastDiscoveryStatus("starting", len(webApp.Devices))
-
-				discoverDevices(ctx, webApp, discoveryService)
-
-				webApp.BroadcastDiscoveryStatus("completed", len(webApp.Devices))
-				webApp.BroadcastDeviceList()
-			}()
-
-			r := setupRoutes(webApp, discoveryService)
-
-			log.Printf("SoundTouch Web UI starting on http://%s", addr)
-
-			return http.ListenAndServe(addr, r)
-		},
-	}
-
-	if err := app.Run(os.Args); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func setupRoutes(app *handlers.WebApp, discoveryService *discovery.UnifiedDiscoveryService) *chi.Mux {
-	r := chi.NewRouter()
-
-	// Static assets (embedded in binary)
-	subFS, _ := fs.Sub(staticFS, "static")
-	r.Get("/static/*", http.StripPrefix("/static", http.FileServer(http.FS(subFS))).ServeHTTP)
-
-	// Serve index.html for SPA routes
-	serveIndex := func(w http.ResponseWriter, _ *http.Request) {
-		data, _ := staticFS.ReadFile("static/index.html")
-
-		w.Header().Set("Content-Type", "text/html")
-		_, _ = w.Write(data)
-	}
-
-	// WebSocket endpoint
-	r.Get("/ws", app.HandleWebSocket)
-
-	// API endpoints
-	r.Get("/api/devices", app.HandleAPIDevices)
-	r.Get("/api/device/{id}", app.HandleAPIDevice)
-	r.Post("/api/discover", func(w http.ResponseWriter, r *http.Request) {
-		app.HandleAPIDiscover(w, r)
-		// Trigger discovery
-		//nolint:contextcheck // Context is created within goroutine
-		go func() {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-
-			// Broadcast discovery start
-			app.BroadcastDiscoveryStatus("starting", len(app.Devices))
-
-			discoverDevices(ctx, app, discoveryService)
-
-			// Broadcast discovery completion and updated device list
-			app.BroadcastDiscoveryStatus("completed", len(app.Devices))
-			app.BroadcastDeviceList()
-		}()
-	})
-
-	// Device control endpoints (GET for most actions, POST for volume/bass)
-	r.Get("/api/control/{id}/{action}", app.HandleAPIControl)
-	r.Post("/api/control/{id}/{action}", app.HandleAPIControl)
-
-	// TuneIn browse, search, and playback
-	r.Get("/api/tunein/search", app.HandleTuneInSearch)
-	r.Get("/api/tunein/navigate", app.HandleTuneInNavigate)
-	r.Get("/api/tunein/navigate/*", app.HandleTuneInNavigate)
-	r.Post("/api/tunein/play/{id}", app.HandlePlayTuneIn)
-
-	// Enhanced device control endpoints
-	r.Post("/api/device-key/{id}/{key}", app.HandleDeviceKey)
-	r.Post("/api/device-volume/{id}/{volume}", app.HandleDirectVolumeControl)
-	r.Post("/api/device-power/{id}", app.HandleDevicePower)
-	r.Get("/api/device-power-status/{id}", app.HandleDevicePowerStatus)
-	r.Get("/api/device-ws/{id}", app.HandleDeviceWebSocket)
-
-	// SPA routes - serve index.html for client-side routing
-	r.Get("/", serveIndex)
-	r.Get("/devices", serveIndex)
-	r.Get("/device/*", serveIndex)
-
-	return r
-}
-
-func discoverDevices(ctx context.Context, app *handlers.WebApp, discoveryService *discovery.UnifiedDiscoveryService) {
-	log.Println("Starting device discovery...")
-
-	devices, err := discoveryService.DiscoverDevices(ctx)
-	if err != nil {
-		log.Printf("Discovery failed: %v", err)
-		app.BroadcastDiscoveryStatus("failed", len(app.Devices))
-
-		return
-	}
-
-	log.Printf("Found %d devices", len(devices))
-
-	for _, device := range devices {
-		deviceID := device.Host // Use host as unique ID for now
-
-		// Skip if we already have this device
-		if _, exists := app.Devices[deviceID]; exists {
-			app.Devices[deviceID].LastSeen = time.Now()
-			continue
-		}
-
-		// Create new device connection
-		clientConfig := &client.Config{
-			Host:    device.Host,
-			Port:    device.Port,
-			Timeout: 10 * time.Second,
-		}
-
-		soundTouchClient := client.NewClient(clientConfig)
-
-		// Get device info
-		deviceInfo, err := soundTouchClient.GetDeviceInfo()
-		if err != nil {
-			log.Printf("Failed to get device info for %s: %v", device.Host, err)
-			continue
-		}
-
-		// Create device connection
-		conn := &webtypes.DeviceConnection{
-			Client:     soundTouchClient,
-			DeviceInfo: deviceInfo,
-			LastSeen:   time.Now(),
-			Status: webtypes.DeviceStatus{
-				IsConnected:  false,
-				LastActivity: time.Now(),
-			},
-		}
-
-		// Initial status fetch asynchronously to avoid blocking discovery
-		go app.UpdateDeviceStatus(deviceID, conn)
-
-		app.Devices[deviceID] = conn
-
-		log.Printf("Added device: %s (%s) at %s", deviceInfo.Name, deviceInfo.Type, device.Host)
-	}
-}
@@ -1,368 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/handlers"
-	"github.com/gesellix/bose-soundtouch/cmd/soundtouch-web/webtypes"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/go-chi/chi/v5"
-)
-
-func withChiParams(r *http.Request, params map[string]string) *http.Request {
-	rctx := chi.NewRouteContext()
-	for k, v := range params {
-		rctx.URLParams.Add(k, v)
-	}
-	return r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, rctx))
-}
-
-func TestSPARouting(t *testing.T) {
-	tests := []struct {
-		name           string
-		path           string
-		expectedStatus int
-		expectedHTML   bool
-	}{
-		{
-			name:           "root path serves HTML",
-			path:           "/",
-			expectedStatus: http.StatusOK,
-			expectedHTML:   true,
-		},
-		{
-			name:           "device path serves HTML",
-			path:           "/device/test-device",
-			expectedStatus: http.StatusOK,
-			expectedHTML:   true,
-		},
-		{
-			name:           "arbitrary path serves HTML",
-			path:           "/some/random/path",
-			expectedStatus: http.StatusOK,
-			expectedHTML:   true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest("GET", tt.path, nil)
-			w := httptest.NewRecorder()
-
-			// Simulate SPA routing handler
-			spaHandler := func(w http.ResponseWriter, r *http.Request) {
-				// If it's an API route, let it pass through
-				if strings.HasPrefix(r.URL.Path, "/api/") || strings.HasPrefix(r.URL.Path, "/static/") || strings.HasPrefix(r.URL.Path, "/ws") {
-					http.NotFound(w, r)
-					return
-				}
-
-				// Serve the SPA index.html content (simulated)
-				w.Header().Set("Content-Type", "text/html")
-				w.WriteHeader(http.StatusOK)
-				w.Write([]byte(`<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8" />
-    <title>SoundTouch Control Center</title>
-</head>
-<body>
-    <div id="app">SPA Content</div>
-</body>
-</html>`))
-			}
-
-			spaHandler(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			if tt.expectedHTML {
-				contentType := w.Header().Get("Content-Type")
-				if !strings.Contains(contentType, "text/html") {
-					t.Errorf("Expected HTML content type, got %s", contentType)
-				}
-
-				body := w.Body.String()
-				if !strings.Contains(body, "<!doctype html>") {
-					t.Errorf("Expected HTML content, got: %s", body)
-				}
-			}
-		})
-	}
-}
-
-func TestAPIEndpoints(t *testing.T) {
-	app := handlers.NewWebApp()
-
-	tests := []struct {
-		name           string
-		path           string
-		method         string
-		expectedStatus int
-		expectedJSON   bool
-	}{
-		{
-			name:           "devices API returns JSON",
-			path:           "/api/devices",
-			method:         "GET",
-			expectedStatus: http.StatusOK,
-			expectedJSON:   true,
-		},
-		{
-			name:           "discover API accepts POST",
-			path:           "/api/discover",
-			method:         "POST",
-			expectedStatus: http.StatusOK,
-			expectedJSON:   true,
-		},
-		{
-			name:           "device API with ID",
-			path:           "/api/device/test-device",
-			method:         "GET",
-			expectedStatus: http.StatusNotFound, // Device won't exist in test
-			expectedJSON:   true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req := httptest.NewRequest(tt.method, tt.path, nil)
-			w := httptest.NewRecorder()
-
-			switch tt.path {
-			case "/api/devices":
-				app.HandleAPIDevices(w, req)
-			case "/api/discover":
-				app.HandleAPIDiscover(w, req)
-			default:
-				if strings.HasPrefix(tt.path, "/api/device/") {
-					deviceID := strings.TrimPrefix(tt.path, "/api/device/")
-					req = withChiParams(req, map[string]string{"id": deviceID})
-					app.HandleAPIDevice(w, req)
-				}
-			}
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
-			}
-
-			if tt.expectedJSON {
-				contentType := w.Header().Get("Content-Type")
-				if !strings.Contains(contentType, "application/json") {
-					t.Errorf("Expected JSON content type, got %s", contentType)
-				}
-
-				// Validate JSON response structure
-				var response webtypes.APIResponse
-				if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-					t.Errorf("Invalid JSON response: %v", err)
-				}
-			}
-		})
-	}
-}
-
-func TestAPIResponseFormat(t *testing.T) {
-	app := handlers.NewWebApp()
-
-	req := httptest.NewRequest("GET", "/api/devices", nil)
-	w := httptest.NewRecorder()
-
-	app.HandleAPIDevices(w, req)
-
-	var response webtypes.APIResponse
-	if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-		t.Fatalf("Failed to decode JSON response: %v", err)
-	}
-
-	// Check API response structure
-	if !response.Success {
-		t.Errorf("Expected success=true, got success=%v", response.Success)
-	}
-
-	if response.Data == nil {
-		t.Errorf("Expected data field to be present")
-	}
-
-	// Data should be an empty map for no devices
-	dataMap, ok := response.Data.(map[string]interface{})
-	if !ok {
-		t.Errorf("Expected data to be a map, got %T", response.Data)
-	}
-
-	if len(dataMap) != 0 {
-		t.Errorf("Expected empty device map, got %d devices", len(dataMap))
-	}
-}
-
-func TestControlAPIValidation(t *testing.T) {
-	app := handlers.NewWebApp()
-
-	tests := []struct {
-		name           string
-		path           string
-		method         string
-		body           string
-		expectedStatus int
-		chiParams      map[string]string
-	}{
-		{
-			name:           "missing device ID",
-			path:           "/api/control//play",
-			method:         "GET",
-			expectedStatus: http.StatusBadRequest,
-		},
-		{
-			name:           "invalid control path",
-			path:           "/api/control/device",
-			method:         "GET",
-			expectedStatus: http.StatusBadRequest,
-		},
-		{
-			name:           "unknown action",
-			path:           "/api/control/nonexistent/invalid",
-			method:         "GET",
-			expectedStatus: http.StatusNotFound,
-			chiParams:      map[string]string{"id": "nonexistent", "action": "invalid"},
-		},
-		{
-			name:           "nonexistent device",
-			path:           "/api/control/nonexistent/play",
-			method:         "GET",
-			expectedStatus: http.StatusNotFound,
-			chiParams:      map[string]string{"id": "nonexistent", "action": "play"},
-		},
-		{
-			name:           "unknown action with valid device",
-			path:           "/api/control/testdevice/unknownaction",
-			method:         "GET",
-			expectedStatus: http.StatusBadRequest,
-			chiParams:      map[string]string{"id": "testdevice", "action": "unknownaction"},
-		},
-	}
-
-	// Add a mock device for testing unknown action validation
-	mockDevice := &webtypes.DeviceConnection{
-		Client:     nil,
-		DeviceInfo: &models.DeviceInfo{Name: "Test Device"},
-		LastSeen:   time.Now(),
-		Status:     webtypes.DeviceStatus{IsConnected: true},
-	}
-	app.Devices["testdevice"] = mockDevice
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var req *http.Request
-			if tt.body != "" {
-				req = httptest.NewRequest(tt.method, tt.path, strings.NewReader(tt.body))
-				req.Header.Set("Content-Type", "application/json")
-			} else {
-				req = httptest.NewRequest(tt.method, tt.path, nil)
-			}
-			if tt.chiParams != nil {
-				req = withChiParams(req, tt.chiParams)
-			}
-
-			w := httptest.NewRecorder()
-			app.HandleAPIControl(w, req)
-
-			if w.Code != tt.expectedStatus {
-				t.Errorf("Test %s: Expected status %d, got %d. Response: %s", tt.name, tt.expectedStatus, w.Code, w.Body.String())
-			}
-
-			// Validate error response format
-			contentType := w.Header().Get("Content-Type")
-			if !strings.Contains(contentType, "application/json") {
-				t.Errorf("Expected JSON content type, got %s", contentType)
-			}
-
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Errorf("Invalid JSON response: %v", err)
-			}
-
-			if response.Success {
-				t.Errorf("Expected success=false for error case, got success=true")
-			}
-
-			if response.Error == "" {
-				t.Errorf("Expected error message, got empty string")
-			}
-		})
-	}
-}
-
-func TestWebSocketUpgrade(t *testing.T) {
-	app := handlers.NewWebApp()
-
-	// Test WebSocket upgrade request
-	req := httptest.NewRequest("GET", "/ws", nil)
-	req.Header.Set("Connection", "upgrade")
-	req.Header.Set("Upgrade", "websocket")
-	req.Header.Set("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==")
-	req.Header.Set("Sec-WebSocket-Version", "13")
-
-	w := httptest.NewRecorder()
-
-	// The actual WebSocket upgrade will fail in test environment,
-	// but we can check that the handler exists and accepts the request
-	app.HandleWebSocket(w, req)
-
-	// In a real test environment, this would fail with a websocket upgrade error
-	// We're just checking the handler doesn't panic and processes the request
-}
-
-func TestJSONAPIConsistency(t *testing.T) {
-	app := handlers.NewWebApp()
-
-	endpoints := []string{
-		"/api/devices",
-		"/api/device/test",
-	}
-
-	for _, endpoint := range endpoints {
-		t.Run("JSON consistency for "+endpoint, func(t *testing.T) {
-			req := httptest.NewRequest("GET", endpoint, nil)
-			w := httptest.NewRecorder()
-
-			switch endpoint {
-			case "/api/devices":
-				app.HandleAPIDevices(w, req)
-			default:
-				if strings.HasPrefix(endpoint, "/api/device/") {
-					deviceID := strings.TrimPrefix(endpoint, "/api/device/")
-					req = withChiParams(req, map[string]string{"id": deviceID})
-					app.HandleAPIDevice(w, req)
-				}
-			}
-
-			// All API endpoints should return JSON
-			contentType := w.Header().Get("Content-Type")
-			if !strings.Contains(contentType, "application/json") {
-				t.Errorf("Endpoint %s should return JSON, got %s", endpoint, contentType)
-			}
-
-			// All responses should follow APIResponse structure
-			var response webtypes.APIResponse
-			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
-				t.Errorf("Endpoint %s returned invalid JSON: %v", endpoint, err)
-			}
-
-			// Response should have either data or error
-			if response.Success && response.Data == nil {
-				t.Errorf("Endpoint %s: success response should have data", endpoint)
-			}
-			if !response.Success && response.Error == "" {
-				t.Errorf("Endpoint %s: error response should have error message", endpoint)
-			}
-		})
-	}
-}
@@ -1,200 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>SoundTouch Control Center</title>
-        <link
-            href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css"
-            rel="stylesheet"
-        />
-        <link
-            href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.0/font/bootstrap-icons.css"
-            rel="stylesheet"
-        />
-        <link href="/static/css/app.css" rel="stylesheet" />
-    </head>
-    <body>
-        <nav class="navbar navbar-expand-lg navbar-dark">
-            <div class="container">
-                <a class="navbar-brand" href="#" onclick="showPage('devices')">
-                    <i class="bi bi-speaker"></i>
-                    SoundTouch Control
-                </a>
-                <div class="navbar-nav ms-auto">
-                    <a
-                        class="nav-link"
-                        href="#"
-                        onclick="showPage('devices')"
-                        title="Home"
-                    >
-                        <i class="bi bi-house"></i>
-                    </a>
-                    <a
-                        class="nav-link tunein-nav-link"
-                        href="#"
-                        onclick="showPage('tunein')"
-                        title="TuneIn Browse"
-                    >
-                        <img
-                            src="/static/img/tunein-mono.svg"
-                            alt="TuneIn"
-                            class="tunein-nav-icon"
-                        />
-                    </a>
-                    <a
-                        class="nav-link"
-                        href="#"
-                        onclick="discoverDevices()"
-                        title="Discover Devices"
-                    >
-                        <i class="bi bi-search"></i>
-                    </a>
-                    <button
-                        class="theme-toggle nav-link"
-                        onclick="toggleTheme()"
-                        title="Toggle Dark Mode"
-                    >
-                        <i id="theme-icon" class="bi bi-moon"></i>
-                    </button>
-                </div>
-            </div>
-        </nav>
-
-        <div class="container mt-4">
-            <!-- Device List Page -->
-            <div id="devices-page" class="page active">
-                <div
-                    class="d-flex justify-content-between align-items-center mb-4"
-                >
-                    <h2>Your SoundTouch Devices</h2>
-                    <button class="btn btn-primary" onclick="discoverDevices()">
-                        <i class="bi bi-search"></i>
-                        Discover Devices
-                    </button>
-                </div>
-
-                <div id="devices-loading" class="loading-spinner"></div>
-
-                <div id="devices-list" class="row">
-                    <!-- Device cards will be inserted here by JavaScript -->
-                </div>
-
-                <div
-                    id="no-devices"
-                    style="display: none"
-                    class="text-center py-5"
-                >
-                    <i class="bi bi-speaker display-1 text-muted"></i>
-                    <h4 class="mt-3">No Devices Found</h4>
-                    <p class="text-muted">
-                        Click "Discover Devices" to search for SoundTouch
-                        speakers on your network.
-                    </p>
-                    <button class="btn btn-primary" onclick="discoverDevices()">
-                        <i class="bi bi-search"></i>
-                        Start Discovery
-                    </button>
-                </div>
-            </div>
-
-            <!-- TuneIn Browse Page -->
-            <div id="tunein-page" class="page">
-                <div class="d-flex justify-content-between align-items-center mb-3">
-                    <h2><img src="/static/img/tunein-dark.svg" alt="TuneIn" class="tunein-heading-icon me-2" />TuneIn Browse</h2>
-                </div>
-
-                <div class="tunein-search-bar mb-3">
-                    <div class="input-group">
-                        <input
-                            type="text"
-                            id="tunein-search-input"
-                            class="form-control"
-                            placeholder="Search stations, podcasts..."
-                        />
-                        <button
-                            class="btn btn-primary"
-                            onclick="tuneInSearch(document.getElementById('tunein-search-input').value)"
-                        >
-                            <i class="bi bi-search"></i>
-                            Search
-                        </button>
-                        <button
-                            class="btn btn-outline-secondary"
-                            onclick="tuneInBrowse()"
-                            title="Browse top level"
-                        >
-                            <i class="bi bi-house"></i>
-                        </button>
-                    </div>
-                </div>
-
-                <nav id="tunein-breadcrumb" class="mb-3" style="display: none">
-                    <!-- filled by JavaScript -->
-                </nav>
-
-                <div id="tunein-results">
-                    <!-- filled by JavaScript -->
-                </div>
-            </div>
-
-            <!-- Device Control Page -->
-            <div id="device-page" class="page">
-                <div class="back-button">
-                    <button
-                        class="btn btn-outline-secondary"
-                        onclick="showPage('devices')"
-                    >
-                        <i class="bi bi-arrow-left"></i>
-                        Back to Devices
-                    </button>
-                </div>
-
-                <div id="device-content">
-                    <!-- Device control content will be inserted here by JavaScript -->
-                </div>
-            </div>
-        </div>
-
-        <footer class="footer">
-            <div class="container text-center">
-                <small>
-                    SoundTouch Web Control Interface -
-                    <a
-                        href="https://github.com/gesellix/Bose-SoundTouch"
-                        target="_blank"
-                        class="text-decoration-none"
-                    >
-                        Open Source Project
-                    </a>
-                </small>
-            </div>
-        </footer>
-
-        <!-- Toast container for notifications -->
-        <div class="toast-container"></div>
-
-        <!-- Device picker for TuneIn playback -->
-        <div class="modal fade" id="devicePickerModal" tabindex="-1" aria-labelledby="devicePickerLabel" aria-hidden="true">
-            <div class="modal-dialog modal-sm">
-                <div class="modal-content">
-                    <div class="modal-header py-2">
-                        <h6 class="modal-title" id="devicePickerLabel">
-                            <i class="bi bi-speaker me-2"></i>Play on device
-                        </h6>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                    </div>
-                    <div class="modal-body p-2" id="devicePickerList">
-                        <!-- device buttons filled by JavaScript -->
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Bootstrap JS -->
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
-
-        <!-- Application JavaScript -->
-        <script src="/static/js/app.js"></script>
-    </body>
-</html>
@@ -1,74 +0,0 @@
-// Package webtypes contains type definitions for the SoundTouch web UI.
-package webtypes
-
-import (
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/pkg/client"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-)
-
-// SoundTouchClient defines the interface for SoundTouch client operations
-type SoundTouchClient interface {
-	Play() error
-	Pause() error
-	Stop() error
-	NextTrack() error
-	PrevTrack() error
-	SetVolume(level int) error
-	SetBass(level int) error
-	SelectPreset(id int) error
-	SelectSource(source, account string) error
-	SendKey(key string) error
-	GetDeviceInfo() (*models.DeviceInfo, error)
-	GetNowPlaying() (*models.NowPlaying, error)
-	GetVolume() (*models.Volume, error)
-	GetPresets() (*models.Presets, error)
-	GetSources() (*models.Sources, error)
-	GetBass() (*models.Bass, error)
-	NewWebSocketClient(config interface{}) *client.WebSocketClient
-}
-
-// DeviceConnection wraps a SoundTouch client with WebSocket connection
-type DeviceConnection struct {
-	Client     *client.Client
-	WebSocket  *client.WebSocketClient
-	DeviceInfo *models.DeviceInfo
-	LastSeen   time.Time
-	Status     DeviceStatus
-}
-
-// DeviceStatus represents the current device state
-type DeviceStatus struct {
-	NowPlaying   *models.NowPlaying `json:"nowPlaying,omitempty"`
-	Volume       *models.Volume     `json:"volume,omitempty"`
-	Presets      *models.Presets    `json:"presets,omitempty"`
-	Sources      *models.Sources    `json:"sources,omitempty"`
-	Bass         *models.Bass       `json:"bass,omitempty"`
-	IsConnected  bool               `json:"isConnected"`
-	LastActivity time.Time          `json:"lastActivity"`
-}
-
-// APIResponse is a standard JSON response wrapper
-type APIResponse struct {
-	Success bool        `json:"success"`
-	Data    interface{} `json:"data,omitempty"`
-	Error   string      `json:"error,omitempty"`
-}
-
-// VolumeRequest represents a volume control request
-type VolumeRequest struct {
-	Level int `json:"level"`
-}
-
-// BassRequest represents a bass control request
-type BassRequest struct {
-	Level int `json:"level"`
-}
-
-// WebSocketMessage represents messages sent over WebSocket
-type WebSocketMessage struct {
-	Type     string      `json:"type"`
-	DeviceID string      `json:"deviceId,omitempty"`
-	Data     interface{} `json:"data,omitempty"`
-}
@@ -1,280 +0,0 @@
-// Package types contains tests for type definitions.
-package webtypes
-
-import (
-	"testing"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-)
-
-func TestAPIResponse(t *testing.T) {
-	tests := []struct {
-		name     string
-		response APIResponse
-		wantJSON string
-	}{
-		{
-			name: "success response",
-			response: APIResponse{
-				Success: true,
-				Data:    map[string]string{"message": "OK"},
-			},
-			wantJSON: `{"success":true,"data":{"message":"OK"}}`,
-		},
-		{
-			name: "error response",
-			response: APIResponse{
-				Success: false,
-				Error:   "Something went wrong",
-			},
-			wantJSON: `{"success":false,"error":"Something went wrong"}`,
-		},
-		{
-			name: "success with nil data",
-			response: APIResponse{
-				Success: true,
-			},
-			wantJSON: `{"success":true}`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test that the struct fields are correctly set
-			if tt.response.Success != (tt.name == "success response" || tt.name == "success with nil data") {
-				t.Errorf("Expected success to match test case")
-			}
-		})
-	}
-}
-
-func TestVolumeRequest(t *testing.T) {
-	tests := []struct {
-		name  string
-		req   VolumeRequest
-		level int
-	}{
-		{"zero volume", VolumeRequest{Level: 0}, 0},
-		{"mid volume", VolumeRequest{Level: 50}, 50},
-		{"max volume", VolumeRequest{Level: 100}, 100},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.req.Level != tt.level {
-				t.Errorf("Expected level %d, got %d", tt.level, tt.req.Level)
-			}
-		})
-	}
-}
-
-func TestBassRequest(t *testing.T) {
-	tests := []struct {
-		name  string
-		req   BassRequest
-		level int
-	}{
-		{"min bass", BassRequest{Level: -9}, -9},
-		{"neutral bass", BassRequest{Level: 0}, 0},
-		{"max bass", BassRequest{Level: 9}, 9},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.req.Level != tt.level {
-				t.Errorf("Expected level %d, got %d", tt.level, tt.req.Level)
-			}
-		})
-	}
-}
-
-func TestWebSocketMessage(t *testing.T) {
-	tests := []struct {
-		name     string
-		msg      WebSocketMessage
-		wantType string
-	}{
-		{
-			name: "devices message",
-			msg: WebSocketMessage{
-				Type: "devices",
-				Data: map[string]interface{}{"device1": "data"},
-			},
-			wantType: "devices",
-		},
-		{
-			name: "status update message",
-			msg: WebSocketMessage{
-				Type:     "status_update",
-				DeviceID: "device1",
-				Data:     DeviceStatus{IsConnected: true},
-			},
-			wantType: "status_update",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.msg.Type != tt.wantType {
-				t.Errorf("Expected type %s, got %s", tt.wantType, tt.msg.Type)
-			}
-		})
-	}
-}
-
-func TestDeviceConnection(t *testing.T) {
-	deviceInfo := &models.DeviceInfo{
-		Name: "Test Speaker",
-		Type: "SoundTouch 30",
-		NetworkInfo: []models.NetworkInfo{
-			{MacAddress: "TEST123", IPAddress: "192.168.1.100"},
-		},
-	}
-
-	nowPlaying := &models.NowPlaying{
-		Track:      "Test Track",
-		Artist:     "Test Artist",
-		Album:      "Test Album",
-		PlayStatus: models.PlayStatusPlaying,
-		Source:     "SPOTIFY",
-	}
-
-	volume := &models.Volume{
-		ActualVolume: 50,
-		MuteEnabled:  false,
-	}
-
-	conn := &DeviceConnection{
-		DeviceInfo: deviceInfo,
-		LastSeen:   time.Now(),
-		Status: DeviceStatus{
-			NowPlaying:   nowPlaying,
-			Volume:       volume,
-			IsConnected:  true,
-			LastActivity: time.Now(),
-		},
-	}
-
-	t.Run("device connection fields", func(t *testing.T) {
-		if conn.DeviceInfo.Name != "Test Speaker" {
-			t.Errorf("Expected device name 'Test Speaker', got '%s'", conn.DeviceInfo.Name)
-		}
-
-		if conn.Status.NowPlaying.Track != "Test Track" {
-			t.Errorf("Expected track 'Test Track', got '%s'", conn.Status.NowPlaying.Track)
-		}
-
-		if conn.Status.Volume.ActualVolume != 50 {
-			t.Errorf("Expected volume 50, got %d", conn.Status.Volume.ActualVolume)
-		}
-
-		if !conn.Status.IsConnected {
-			t.Error("Expected device to be connected")
-		}
-	})
-}
-
-func TestDeviceStatus(t *testing.T) {
-	status := DeviceStatus{
-		NowPlaying: &models.NowPlaying{
-			Track:      "Test Track",
-			PlayStatus: models.PlayStatusPlaying,
-		},
-		Volume: &models.Volume{
-			ActualVolume: 75,
-			MuteEnabled:  false,
-		},
-		Bass: &models.Bass{
-			ActualBass: 3,
-		},
-		IsConnected:  true,
-		LastActivity: time.Now(),
-	}
-
-	t.Run("device status fields", func(t *testing.T) {
-		if status.NowPlaying == nil {
-			t.Error("Expected now playing to be set")
-		}
-
-		if status.Volume == nil {
-			t.Error("Expected volume to be set")
-		}
-
-		if status.Bass == nil {
-			t.Error("Expected bass to be set")
-		}
-
-		if !status.IsConnected {
-			t.Error("Expected device to be connected")
-		}
-
-		if status.LastActivity.IsZero() {
-			t.Error("Expected last activity to be set")
-		}
-	})
-
-	t.Run("nil fields", func(t *testing.T) {
-		emptyStatus := DeviceStatus{}
-
-		if emptyStatus.NowPlaying != nil {
-			t.Error("Expected now playing to be nil")
-		}
-
-		if emptyStatus.Volume != nil {
-			t.Error("Expected volume to be nil")
-		}
-
-		if emptyStatus.IsConnected {
-			t.Error("Expected device to be disconnected by default")
-		}
-	})
-}
-
-// Benchmark tests
-func BenchmarkAPIResponse(b *testing.B) {
-	response := APIResponse{
-		Success: true,
-		Data:    map[string]string{"message": "OK"},
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = response.Success
-		_ = response.Data
-	}
-}
-
-func BenchmarkDeviceStatus(b *testing.B) {
-	status := DeviceStatus{
-		NowPlaying:   &models.NowPlaying{Track: "Test Track"},
-		Volume:       &models.Volume{ActualVolume: 50},
-		IsConnected:  true,
-		LastActivity: time.Now(),
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = status.IsConnected
-		_ = status.NowPlaying.Track
-		_ = status.Volume.ActualVolume
-	}
-}
-
-func BenchmarkWebSocketMessage(b *testing.B) {
-	msg := WebSocketMessage{
-		Type:     "status_update",
-		DeviceID: "device1",
-		Data: DeviceStatus{
-			IsConnected:  true,
-			LastActivity: time.Now(),
-		},
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = msg.Type
-		_ = msg.DeviceID
-		_ = msg.Data
-	}
-}
@@ -1,12 +0,0 @@
-services:
-  soundtouch-service:
-    build:
-      context: .
-      target: soundtouch-service
-    volumes:
-      - ./tests/integration/testdata:/app/data
-    environment:
-      - SPOTIFY_CLIENT_ID=mock-id
-      - SPOTIFY_CLIENT_SECRET=mock-secret
-      - SPOTIFY_TOKEN_URL=http://spotify-mock:8080/api/token
-      - SPOTIFY_API_BASE=http://spotify-mock:8080
@@ -8,8 +8,6 @@ services:
    ports:
      - "8000:8000"
      - "8443:8443"
-    networks:
-      - soundtouch-test-net
    environment:
      - PORT=8000
      - HTTPS_PORT=8443
@@ -37,22 +35,6 @@ services:
          cpus: '0.25'
          memory: 128M

-  spotify-mock:
-    image: golang:1.26.2-alpine
-    container_name: spotify-mock
-    working_dir: /app
-    volumes:
-      - .:/app
-    command: go run ./cmd/mock-spotify/main.go -port 8080
-    ports:
-      - "8081:8080"
-    networks:
-      - soundtouch-test-net
-
-networks:
-  soundtouch-test-net:
-    name: soundtouch-test-net
-
 volumes:
  soundtouch-data:
    # Named volumes are preferred in Swarm. For multi-node persistence,
@@ -1,114 +0,0 @@
-# Bose SoundTouch Device Setup Flow
-
-This document details the multi-step process required to fully set up a Bose SoundTouch device, as derived from the Stockholm firmware (`setup/js/`) analysis.
-
-A complete setup flow involves a sequence of local (WebSocket) and cloud (HTTP) actions that move the device from a factory-reset state to a fully registered, functional system.
-
-## 1. Local Coordination Stage (WebSocket)
-
-Before a device can be controlled, it must be configured on the local network and named. These actions occur via a WebSocket connection to the device on port 8080.
-
-### 1.1 Language Configuration (Optional)
-If the device is in a factory-reset state, the UI typically ensures the device language matches the user's choice.
- **WebSocket Action**: `set_language`
- **Internal Logic**: `SetupWizard.js` handles this via `set_device_language`.
-
-### 1.2 Network Configuration (WiFi)
-Configures the device to connect to a specific wireless access point.
- **File Reference**: `setup/js/workflow_wifi_setup.js`
- **Logic**: Triggers a site survey, then sends SSID and credentials.
- **WebSocket Command**: `set_WIFI_OLED` or similar internal method calls to configure the network profile.
-
-### 1.3 Device Naming (Rename Step)
-Assigns a user-friendly name (e.g., "Living Room") to the device.
- **File Reference**: `setup/js/workflow_rename.js`
- **WebSocket Action**: `name`
- **XML Payload**:
-    ```xml
-    <name>Living Room</name>
-    ```
- **Implementation**: The `RenameDevices.do_rename_devices()` function sends this to the device. The device then updates its local name and mDNS/SSDP broadcasts.
-
-## 2. Cloud Interaction Stage (HTTP)
-
-The device needs to be linked to a Bose "Marge" account to enable cloud-based features and music services.
-
-### 2.1 Account Creation (Registration)
-If a user doesn't have an account, the setup client creates one.
- **File Reference**: `setup/js/workflow_marge.js`
- **Cloud Endpoint**: `POST https://streaming.bose.com/streaming/account`
- **Payload**: XML containing name, email, password, and country.
- **Content-Type**: `application/vnd.bose.customer-v1.0+xml`
-
-### 2.2 Cloud Authentication (Login)
-The setup client must obtain a valid `accountId` and `userAuthToken` to pair the device.
- **File Reference**: `setup/js/workflow_marge.js`
- **Cloud Endpoint**: `POST https://streaming.bose.com/streaming/account/login`
- **Payload**: XML containing username and password.
- **Content-Type**: `application/vnd.bose.streaming-v1.2+xml`
- **Result**: Returns a session token in the `Credentials` response header and the user's `account ID` in the XML body.
-
-## 3. Registration Bridge (WebSocket to Cloud)
-
-This is the final "pairing" step where the client tells the device which account it belongs to.
-
-### 3.1 Device Registration (The "Pair" Step)
-The client sends the user's credentials to the device, which then registers itself with the cloud.
- **File Reference**: `setup/js/workflow_add_devices.js`
- **WebSocket Action**: `setMargeAccount`
- **XML Payload**:
-    ```xml
-    <PairDeviceWithAccount>
-        <accountId>12345</accountId>
-        <userAuthToken>jGwE... (truncated)</userAuthToken>
-    </PairDeviceWithAccount>
-    ```
- **Device Reaction**: Upon receiving this, the device makes its own outbound HTTP POST to the Marge service:
-    `POST https://streaming.bose.com/{accountId}/devices`
-
-## 4. Finalization
-
-Once the registration is complete, the setup application (Stockholm) performs final cleanup. It's important to distinguish between **App State** (the Stockholm UI's persistent settings) and **Device State** (the physical speaker's configuration).
-
-### 4.1 Exiting Setup Mode (App Settings)
-The Stockholm app communicates with its "native container" (the WebView bridge on iOS/Android/Windows/macOS) using a `setData` command in **JSON format**. This is an internal message to the application's persistent storage, **not a network command sent to the physical speaker**.
-
-This command tells the Stockholm app which page to load on startup, effectively marking the setup as complete in the UI.
-
- **Internal Command**: `setData`
- **Parameter**: `startupPage`
- **Normal Value**: `index.html` (Normal mode)
- **Setup Value**: `setup/index.html` (Setup mode)
-
-**JSON Payload (Internal to Stockholm App)**:
-```json
-{
-    "method": "setData",
-    "params": {
-        "name": "startupPage",
-        "value": "index.html"
-    }
-}
-```
-
-**Other Common Internal Parameters**:
- `changeStartupPage`: Set to `false` after a successful setup or update.
- `tipsEnabled`: Set to `false` to suppress the "Getting Started" tutorials.
- `promptUpdate`: Set to `true` if a firmware update was deferred during setup.
-
-### 4.2 Device Finalization
-The physical speaker considers the setup "done" once it successfully processes the `<PairDeviceWithAccount>` XML message and completes its own handshake with the Marge cloud. There is no specific "Finalize" XML command sent to the speaker; the successful registration is the signal.
-
-The `SetupWizard.js` calls `single_device_setup_done()` to trigger the internal `setData` updates described above. If these are not saved in the app's local storage, the Stockholm UI may return to the setup flow on next launch, even if the speaker is already paired.
-
---
-
-## Summary of Scriptable Requirements
-
-To automate a device setup using a custom tool (like `soundtouch-cli`), you must perform the following:
-1.  **Configure WiFi**: (Assumed if device is reachable over IP).
-2.  **Set Name**: Send the `<name>` WebSocket message (XML) to update the device identity.
-3.  **Obtain Token**: Authenticate against the cloud service (Marge) via HTTP.
-4.  **Pair Device**: Send the `<PairDeviceWithAccount>` WebSocket message (XML) with the account ID and token.
-
-**Note**: The JSON `setData` commands are only necessary if you are building/controlling a version of the Stockholm UI itself. They are not required to configure the physical hardware.
@@ -1,66 +0,0 @@
-# Technical Proposal: External Service Provider Abstraction
-
-This document outlines a strategy to refactor the SoundTouch Service's content handling into a modular provider-based system.
-
-## 1. Problem Statement
-Currently, content handling for BMX (Bose Media Exchange) services like TuneIn or RadioBrowser is deeply intertwined with the HTTP handlers and XML models. Adding a new content provider (e.g., Local Media, Podcast RSS) requires modifying several files and duplicating boilerplate code for HTTP requests and error handling.
-
-## 2. Proposed Architecture
-
-### 2.1 The Provider Interface
-We define a generic `ContentProvider` interface that abstracts away the source-specific logic (API calls, data parsing).
-
-```go
-package provider
-
-import "github.com/gesellix/bose-soundtouch/pkg/models"
-
-type ContentProvider interface {
-    // ID returns the unique identifier for this provider (e.g. "RADIO_BROWSER")
-    ID() string
-
-    // Resolve returns playback details for a given content identifier
-    Resolve(id string) (*models.BmxPlaybackResponse, error)
-
-    // Search allows finding content within this provider
-    Search(query string) ([]models.ContentItem, error)
-}
-```
-
-### 2.2 Provider Registry
-A central registry in `soundtouch-service` manages the lifecycle and selection of providers.
-
-```go
-type Registry struct {
-    providers map[string]ContentProvider
-}
-
-func (r *Registry) Register(p ContentProvider) { ... }
-func (r *Registry) Get(id string) ContentProvider { ... }
-```
-
-## 3. Implementation Plan
-
-### 3.1 Phase 1: Modularize RadioBrowser
-1.  **Extract Logic**: Move current RadioBrowser logic from `bmx.go` into a new package `pkg/service/providers/radiobrowser`.
-2.  **Add Failover**: Implement the **API Failover** logic inspired by OpenCloudTouch.
-    -   Maintain a list of active RadioBrowser mirrors (e.g., `de1.api.radio-browser.info`, `nl1.api.radio-browser.info`).
-    -   Implement a round-robin or health-based selection strategy.
-3.  **Implements Interface**: Ensure the new package satisfies the `ContentProvider` interface.
-
-### 3.2 Phase 2: Refactor BMX Handlers
-   Update `HandleTuneInPlayback` and `HandleOrionPlayback` to use the registry.
-   The handlers will look up the provider based on the request context or URL parameters and delegate the resolution.
-
-### 3.3 Phase 3: Dynamic Service Advertising
-   Modify `HandleBMXRegistry` to dynamically generate the `bmx_services.json` content based on the currently registered and enabled providers.
-
-## 4. Benefits
-   **Resilience**: Centralized error handling and failover strategies for all external APIs.
-   **Extensibility**: New services can be added by simply implementing the interface and registering them at startup.
-   **Testability**: Providers can be unit-tested in isolation without mocking the entire HTTP server stack.
-   **Unified UI**: A future Web UI can query the registry to show available content sources and their statuses.
-
-## 5. Next Steps
-1.  Refine the `ContentProvider` interface to include metadata (icons, user-friendly names).
-2.  Create a prototype for the `radiobrowser` provider with failover support.
@@ -1,45 +0,0 @@
-# Parity Analysis: Bose-SoundTouch (Go) vs. OpenCloudTouch (Python)
-
-This document provides a comparative analysis of the current Go implementation and the `scheilch/opencloudtouch` project, identifying functional gaps and potential improvements.
-
-## 1. Core Architecture and Language
- **Bose-SoundTouch (Go)**: A high-performance, strongly typed backend with a CLI and background service. Focuses on full API coverage, parity testing, and robust hardware control (DSP, zones).
- **OpenCloudTouch (OCT)**: A modern full-stack application (FastAPI + React/TypeScript). Prioritizes user experience with a web-based setup wizard and a clean abstraction for internet radio.
-
-## 2. Functional Comparison
-
-| Feature                 | Bose-SoundTouch (Go)                                       | OpenCloudTouch (Python)                                                 |
-|:------------------------|:-----------------------------------------------------------|:------------------------------------------------------------------------|
-| **Setup Experience**    | CLI-driven or manual API calls for migration (SSH, XML).   | Web-based **Setup Wizard** guides through SSH, backup, and redirection. |
-| **Radio Support**       | Static integration of **RadioBrowser** and TuneIn.         | Dynamic **RadioBrowserAdapter** with automatic **API Failover**.        |
-| **Commercial Services** | Deep integration (Spotify priming, Pandora, Deezer, etc.). | Basic support, focus is on local content and radio.                     |
-| **Hardware Control**    | Extensive (Bass, Treble, Soundbar levels, Clock display).  | Basic playback and zone controls.                                       |
-| **Cloud Emulation**     | High-fidelity parity (mirroring, discrepancy logging).     | Functional emulation for local preset/recent persistence.               |
-| **Notifications**       | Built-in **TTS** and custom URL audio alerts.              | Not a primary focus.                                                    |
-
-## 3. Key Strengths of OpenCloudTouch
- **Guided Onboarding**: The setup wizard reduces the entry barrier for non-technical users significantly.
- **Resilient Radio**: The API failover for RadioBrowser ensures continuous service even if specific community-hosted API instances go offline.
- **Modern API Stack**: Uses OpenAPI and generated TypeScript types for a seamless frontend integration.
- **Provider Abstraction**: A cleaner internal separation between the "Bose World" (XML/BMX) and external content providers (RadioBrowser).
-
-## 4. Suggested Improvements for Bose-SoundTouch
-
-### A. Web-based Setup Wizard (High Priority)
- Implement a state-driven wizard in the `soundtouch-service` to handle:
-  - SSH activation (checking `/remote_services` via USB).
-  - Automated backup of speaker configuration.
-  - Verification of DNS/Hosts redirection.
- Expose this via a simple embedded Web UI (using Go's `embed` package).
-
-### B. RadioBrowser Failover (Medium Priority)
- Adapt the failover logic from OCT:
-  - Periodically refresh the list of available RadioBrowser API servers.
-  - Implement a retry mechanism that switches servers on 5xx errors or timeouts.
-
-### C. External Service Abstraction (Medium Priority)
- Refactor the hardcoded BMX logic into a more modular **Provider System** (see `EXTERNAL-SERVICES-ABSTRACTION.md`).
- This will allow easier addition of new sources (e.g., local DLNA, generic M3U playlists) without touching the core BMX handlers.
-
-## 5. Summary
-While our Go project provides the most complete technical coverage of SoundTouch hardware and commercial services, OpenCloudTouch sets a higher standard for **user onboarding** and **service resilience** for community-driven content. Integrating a setup wizard and a more robust radio backend would make our project significantly more accessible and reliable.
@@ -21,7 +21,7 @@ This document describes the most important patterns for the Bose SoundTouch API

 **Key Aspects:**
 - **Native Builds**: Full API functionality for CLI and server
- **WASM Builds**: Browser-compatible subset functionality
+- **WASM Builds**: Browser-compatible subset functionality  
 - **Cross-Platform**: Linux, macOS, Windows support
 - **Embedded Assets**: Web UI directly embedded in binary

@@ -66,7 +66,7 @@ func (c *Client) GetNowPlaying() (*models.NowPlaying, error) {
        return nil, err
    }
    defer resp.Body.Close()
-
+    
    var nowPlaying models.NowPlaying
    err = xml.NewDecoder(resp.Body).Decode(&nowPlaying)
    return &nowPlaying, err
@@ -77,7 +77,7 @@ func (c *Client) GetNowPlaying() (*models.NowPlaying, error) {
 ```go
 func (c *Client) SendKey(key models.Key) error {
    keyXML := fmt.Sprintf(`<key state="press" sender="GoClient">%s</key>`, key)
-
+    
    resp, err := c.httpClient.Post(
        c.baseURL+"/key",
        "application/xml",
@@ -117,14 +117,14 @@ func (d *DiscoveryService) DiscoverDevices() ([]Device, error) {
        return nil, err
    }
    defer conn.Close()
-
+    
    // Send M-SEARCH request
    searchRequest := "M-SEARCH * HTTP/1.1\r\n" +
        "HOST: 239.255.255.250:1900\r\n" +
        "MAN: \"ssdp:discover\"\r\n" +
        "ST: urn:schemas-upnp-org:device:MediaRenderer:1\r\n" +
        "MX: 3\r\n\r\n"
-
+    
    // Implementation details...
    return devices, nil
 }
@@ -158,13 +158,13 @@ func (e *EventClient) Subscribe(eventType string, handler EventHandler) {

 func (e *EventClient) Start() error {
    u := url.URL{Scheme: "ws", Host: e.client.host + ":8090", Path: "/"}
-
+    
    conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
    if err != nil {
        return err
    }
    e.conn = conn
-
+    
    go e.eventLoop()
    return nil
 }
@@ -184,7 +184,7 @@ func (e *EventClient) eventLoop() {
                }
                return
            }
-
+            
            if handler, exists := e.handlers[event.Type]; exists {
                go handler(event)
            }
@@ -220,7 +220,7 @@ func wasmDiscoverDevices(this js.Value, args []js.Value) interface{} {
    handler := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
        go func() {
            devices, err := discovery.NewDiscoveryService(5*time.Second).DiscoverDevices()
-
+            
            result := make(map[string]interface{})
            if err != nil {
                result["error"] = err.Error()
@@ -228,13 +228,13 @@ func wasmDiscoverDevices(this js.Value, args []js.Value) interface{} {
                devicesJSON, _ := json.Marshal(devices)
                result["devices"] = string(devicesJSON)
            }
-
+            
            // Call JavaScript callback
            args[0].Invoke(js.ValueOf(result))
        }()
        return nil
    })
-
+    
    return handler
 }
 ```
@@ -280,7 +280,7 @@ func main() {
                    if err != nil {
                        return err
                    }
-
+                    
                    for i, device := range devices {
                        fmt.Printf("%d: %s (%s)\n", i+1, device.Name, device.Host)
                    }
@@ -300,7 +300,7 @@ func main() {
            },
        },
    }
-
+    
    app.Run(os.Args)
 }

@@ -311,7 +311,7 @@ func getClientFromContext(c *cli.Context) *client.Client {
        devices, _ := discovery.DiscoverDevices()
        deviceHost = selectDeviceInteractive(devices)
    }
-
+    
    return client.NewClient(deviceHost, 8090)
 }
 ```
@@ -327,34 +327,34 @@ var webAssets embed.FS

 func main() {
    mux := http.NewServeMux()
-
+    
    // Embedded web assets
    webFS, err := fs.Sub(webAssets, "web")
    if err != nil {
        log.Fatal(err)
    }
-
+    
    // SPA routing
    mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
        if r.URL.Path != "/" {
            http.FileServer(http.FS(webFS)).ServeHTTP(w, r)
            return
        }
-
+        
        data, err := webAssets.ReadFile("web/index.html")
        if err != nil {
            http.Error(w, "Not found", http.StatusNotFound)
            return
        }
-
+        
        w.Header().Set("Content-Type", "text/html")
        w.Write(data)
    })
-
+    
    // API endpoints
    mux.HandleFunc("/api/devices", handleDeviceDiscovery)
    mux.HandleFunc("/api/client/", handleClientProxy)
-
+    
    log.Println("SoundTouch Web UI starting on :8080")
    log.Fatal(http.ListenAndServe(":8080", mux))
 }
@@ -370,36 +370,36 @@ func handleClientProxy(w http.ResponseWriter, r *http.Request) {
        http.Error(w, "Invalid path", http.StatusBadRequest)
        return
    }
-
+    
    deviceIP := pathParts[3]
    apiPath := "/" + strings.Join(pathParts[4:], "/")
-
+    
    // Proxy request to SoundTouch device
    targetURL := fmt.Sprintf("http://%s:8090%s", deviceIP, apiPath)
-
+    
    proxyReq, err := http.NewRequest(r.Method, targetURL, r.Body)
    if err != nil {
        http.Error(w, err.Error(), http.StatusInternalServerError)
        return
    }
-
+    
    // Copy headers
    for k, v := range r.Header {
        proxyReq.Header[k] = v
    }
-
+    
    resp, err := http.DefaultClient.Do(proxyReq)
    if err != nil {
        http.Error(w, err.Error(), http.StatusInternalServerError)
        return
    }
    defer resp.Body.Close()
-
+    
    // Enable CORS
    w.Header().Set("Access-Control-Allow-Origin", "*")
    w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
    w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
-
+    
    // Copy response
    w.WriteHeader(resp.StatusCode)
    io.Copy(w, resp.Body)
@@ -448,7 +448,7 @@ func (p *PlayStatus) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error
    if err := d.DecodeElement(&s, &start); err != nil {
        return err
    }
-
+    
    switch s {
    case string(PlayStatusPlaying), string(PlayStatusPaused), string(PlayStatusStopped):
        *p = PlayStatus(s)
@@ -469,41 +469,41 @@ type Config struct {
    // Server configuration
    WebPort      int           `env:"WEB_PORT" default:"8080"`
    APITimeout   time.Duration `env:"API_TIMEOUT" default:"10s"`
-
+    
    // Discovery configuration
    DiscoveryTimeout time.Duration `env:"DISCOVERY_TIMEOUT" default:"5s"`
    CacheDevices     bool          `env:"CACHE_DEVICES" default:"true"`
-
+    
    // CORS configuration (for web proxy)
    CORSOrigins []string `env:"CORS_ORIGINS" default:"*"`
-
+    
    // Logging
    LogLevel string `env:"LOG_LEVEL" default:"info"`
 }

 func Load() Config {
    var cfg Config
-
+    
    // Load from .env file
    loadDotEnv()
-
+    
    // Parse environment variables with reflection
    parseEnvVars(&cfg)
-
+    
    return cfg
 }

 func parseEnvVars(cfg interface{}) {
    v := reflect.ValueOf(cfg).Elem()
    t := v.Type()
-
+    
    for i := 0; i < v.NumField(); i++ {
        field := v.Field(i)
        fieldType := t.Field(i)
-
+        
        envTag := fieldType.Tag.Get("env")
        defaultTag := fieldType.Tag.Get("default")
-
+        
        if envTag != "" {
            if envValue := os.Getenv(envTag); envValue != "" {
                setFieldValue(field, envValue)
@@ -545,11 +545,11 @@ func (m *MockClient) GetNowPlaying() (*models.NowPlaying, error) {
    if err, exists := m.errors["now_playing"]; exists {
        return nil, err
    }
-
+    
    if resp, exists := m.responses["now_playing"]; exists {
        return resp.(*models.NowPlaying), nil
    }
-
+    
    return &models.NowPlaying{
        Track:  "Mock Track",
        Artist: "Mock Artist",
@@ -577,8 +577,8 @@ CMD ["go", "test", "-v", "./..."]
 ```bash
 # Makefile test target
 test-integration:
-	docker compose -f test/docker-compose.yml up --build --abort-on-container-exit
-	docker compose -f test/docker-compose.yml down
+	docker-compose -f test/docker-compose.yml up --build --abort-on-container-exit
+	docker-compose -f test/docker-compose.yml down
 ```

 ## Recommended Project Structure
@@ -741,7 +741,7 @@ type APIError struct {
    Message string `xml:",innerxml"`
 }

-// pkg/models/device.go
+// pkg/models/device.go  
 type DeviceInfo struct {
    XMLResponse
    Name     string `xml:"name"`
@@ -773,7 +773,7 @@ func main() {
            },
        },
    }
-
+    
    app.Run(os.Args)
 }
 ```
@@ -802,4 +802,4 @@ func main() {

 ## Conclusion

-This pattern collection enables the development of robust API clients for hardware devices that function both as native tools and as web applications. The combination of Go's type safety, WASM support, and a structured build system makes it possible to use a single codebase for various deployment scenarios.
+This pattern collection enables the development of robust API clients for hardware devices that function both as native tools and as web applications. The combination of Go's type safety, WASM support, and a structured build system makes it possible to use a single codebase for various deployment scenarios.
@@ -8,7 +8,7 @@ Welcome to the documentation for the Bose SoundTouch Toolkit. This comprehensive
 - **[Complete Migration Guide](guides/MIGRATION-GUIDE.md)** - Step-by-step guide from Bose Cloud to local control
 - **[Getting Started](guides/GETTING-STARTED.md)** - Quick introduction to the toolkit

-### For Existing Users
+### For Existing Users  
 - **[Cloud Shutdown Survival Guide](guides/SURVIVAL-GUIDE.md)** - Prepare for the May 2026 shutdown
 - **[SoundTouch Service Guide](guides/SOUNDTOUCH-SERVICE.md)** - Advanced service configuration

@@ -17,7 +17,7 @@ Welcome to the documentation for the Bose SoundTouch Toolkit. This comprehensive
 The documentation is organized into three main categories:

 ### 1. **User Guides** - For everyday users migrating and managing devices
-### 2. **Technical Reference** - For developers and advanced configuration
+### 2. **Technical Reference** - For developers and advanced configuration  
 ### 3. **Concept Documentation** - For contributors and system architects

 ## 🗂 Documentation Structure
@@ -47,7 +47,6 @@ The documentation is organized into three main categories:

 ### API Documentation
 - [API Endpoints](reference/API-ENDPOINTS.md) - REST API reference
- [Spotify Account Addition](reference/spotify-account-addition.md) - Technical requests for Spotify
 - [WebSocket Events](reference/WEBSOCKET-EVENTS.md) - Real-time events
 - [Zone Management](reference/ZONE-MANAGEMENT.md) - Multi-room control
 - [Preset Management](reference/PRESET-MANAGEMENT.md) - Preset operations
@@ -9,7 +9,6 @@
 * [Getting Started](guides/GETTING-STARTED.md)
 * [SoundTouch Service](guides/SOUNDTOUCH-SERVICE.md)
 * [Initial Device Setup](guides/DEVICE-INITIAL-SETUP.md)
-* [Device Setup Flow](DEVICE-SETUP.md)
 * [MAC Address Mapping](guides/MAC-ADDRESS-MAPPING.md)
 * [HTTPS Setup](guides/HTTPS-SETUP.md)
 * [Deployment](guides/DEPLOYMENT.md)
@@ -29,7 +28,6 @@
 ## Technical Reference
 * [API Cookbook](reference/API-COOKBOOK.md)
 * [API Endpoints](reference/API-ENDPOINTS.md)
-* [Spotify Account Addition](reference/spotify-account-addition.md)
 * [Cloud API Emulation](reference/CLOUD-API.md)
 * [System Endpoints](reference/SYSTEM-ENDPOINTS.md)
 * [Speaker Endpoint](reference/SPEAKER-ENDPOINT.md)
@@ -58,17 +56,12 @@
 * [Wiki API Comparison](analysis/WIKI-COMPARISON.md)
 * [IoT Config Summary](analysis/IOT-CONFIG-SUMMARY.md)
 * [IoT Configuration Analysis](analysis/IOT-CONFIGURATION-ANALYSIS.md)
-* [Bose Lab Runbook](analysis/BOSE-LAB-RUNBOOK.md)
-* [Missing Routes Spotify](analysis/MISSING-ROUTES-SPOTIFY.md)
-* [Bose App ADB Emulator](analysis/BOSE-APP-ADB-Emulator.md)

 ## Parity Analysis
 * [Parity Improvements](PARITY-IMPROVEMENTS.md)
 * [Parity SoundCork](PARITY-SOUNDCORK.md)
-* [Parity OpenCloudTouch](PARITY-OPENCLOUDTOUCH.md)

 ## Appendix (Other Documents)
-* [External Services Abstraction](EXTERNAL-SERVICES-ABSTRACTION.md)
 * [API Navigation Reference](API-NAVIGATION-REFERENCE.md)
 * [Claude Instructions](CLAUDE.md)
 * [Content Selection Implementation](CONTENT-SELECTION-IMPLEMENTATION.md)
@@ -1,341 +0,0 @@
-# Bose SoundTouch Traffic Interception Runbook
-
-Intercept HTTPS/WebSocket traffic from the Bose SoundTouch Android app using an Android emulator, mitmproxy, and Frida. Tested on Apple Silicon (ARM64) Mac.
-
-## Prerequisites
-
- Android Studio installed (for SDK tools and emulator)
- Docker installed
- mitmproxy installed (`pip install mitmproxy` or via your preferred method)
- The Bose SoundTouch APK (extracted from a real device, see below)
-
-Add Android SDK tools to your PATH (add to `~/.zshrc`):
-
-```bash
-export PATH=$PATH:~/Library/Android/sdk/emulator
-export PATH=$PATH:~/Library/Android/sdk/platform-tools
-```
-
---
-
-## 1. Extract APK from Real Device
-
-Connect your Android device via USB with USB debugging enabled.
-
-```bash
-adb devices
-# note your device ID, e.g. "ABC123"
-
-adb -s ABC123 shell pm path com.bose.soundtouch
-# output e.g.: package:/data/app/~~xyz/com.bose.soundtouch-abc/base.apk
-
-adb -s ABC123 pull /data/app/~~xyz/com.bose.soundtouch-abc/base.apk bose.apk
-```
-
---
-
-## 2. Create Android Emulator (ARM64, API 33)
-
-On Apple Silicon you need an ARM64 image. Use the `avdmanager` and `sdkmanager` CLI tools.
-
-```bash
-# Install the system image
-~/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager \
-  "system-images;android-33;google_apis;arm64-v8a"
-
-# Create the AVD
-~/Library/Android/sdk/cmdline-tools/latest/bin/avdmanager create avd \
-  -n Pixel_6_API33 \
-  -k "system-images;android-33;google_apis;arm64-v8a" \
-  -d "pixel_6"
-```
-
-Alternatively create the AVD via Android Studio Device Manager (choose "Google APIs", arm64-v8a, API 33).
-
---
-
-## 3. Start Emulator with Writable System
-
-```bash
-# List available AVDs
-~/Library/Android/sdk/emulator/emulator -list-avds
-
-# Start with writable system partition
-~/Library/Android/sdk/emulator/emulator -avd Pixel_6_API33 -writable-system
-```
-
-Wait until the emulator has fully booted, then:
-
-```bash
-adb -s emulator-5554 root
-adb -s emulator-5554 shell avbctl disable-verification
-adb -s emulator-5554 reboot
-
-# After reboot:
-adb -s emulator-5554 root
-```
-
---
-
-## 4. Install Bose APK
-
-```bash
-adb -s emulator-5554 install bose.apk
-```
-
---
-
-## 5. Set Up mitmproxy
-
-```bash
-# Start mitmproxy (generates CA cert on first run)
-mitmweb --port 8080 --mode regular -w bose_traffic.mitm
-```
-
-Extract the CA certificate (without private key):
-
-```bash
-openssl x509 -in ~/.mitmproxy/mitmproxy-ca.pem -out ~/.mitmproxy/mitmproxy-ca-cert.pem
-
-# Verify it's the mitmproxy cert, not another cert:
-openssl x509 -in ~/.mitmproxy/mitmproxy-ca-cert.pem -noout -issuer
-# should show: issuer= /CN=mitmproxy/O=mitmproxy
-```
-
---
-
-## 6. Install mitmproxy CA Certificate in Emulator
-
-```bash
-HASH=$(openssl x509 -inform PEM -subject_hash_old \
-  -in ~/.mitmproxy/mitmproxy-ca-cert.pem | head -1)
-
-adb -s emulator-5554 push ~/.mitmproxy/mitmproxy-ca-cert.pem /data/local/tmp/mitmproxy.pem
-
-adb -s emulator-5554 shell su 0 mkdir -p /data/misc/user/0/cacerts-added
-
-adb -s emulator-5554 shell su 0 \
-  cp /data/local/tmp/mitmproxy.pem /data/misc/user/0/cacerts-added/${HASH}.0
-
-adb -s emulator-5554 shell su 0 \
-  chmod 644 /data/misc/user/0/cacerts-added/${HASH}.0
-```
-
---
-
-## 7. Set System Proxy in Emulator
-
-Find your Mac's local IP:
-
-```bash
-ipconfig getifaddr en0
-# e.g. 192.168.1.123
-```
-
-Set the proxy:
-
-```bash
-adb -s emulator-5554 shell settings put global http_proxy 192.168.1.123:8080
-```
-
---
-
-## 8. Set Up Frida (via Python venv)
-
-```bash
-python3 -m venv /tmp/frida-venv
-/tmp/frida-venv/bin/pip install frida==17.9.1 frida-tools==14.8.1
-```
-
-Download the frida-server binary for ARM64 Android:
-
-```bash
-FRIDA_VERSION=17.9.1
-
-curl -L "https://github.com/frida/frida/releases/download/${FRIDA_VERSION}/frida-server-${FRIDA_VERSION}-android-arm64.xz" \
-  -o /tmp/frida-server.xz
-
-unxz /tmp/frida-server.xz
-mv /tmp/frida-server-${FRIDA_VERSION}-android-arm64 /tmp/frida-server
-```
-
-Push to emulator and start:
-
-```bash
-adb -s emulator-5554 push /tmp/frida-server /data/local/tmp/frida-server
-adb -s emulator-5554 shell su 0 chmod 755 /data/local/tmp/frida-server
-adb -s emulator-5554 shell su 0 /data/local/tmp/frida-server &
-```
-
---
-
-## 9. Download SSL Bypass Scripts
-
-```bash
-BASE=https://raw.githubusercontent.com/httptoolkit/frida-interception-and-unpinning/main
-
-curl -L "${BASE}/config.js" -o /tmp/config.js
-curl -L "${BASE}/android/android-system-certificate-injection.js" \
-  -o /tmp/android-system-certificate-injection.js
-curl -L "${BASE}/android/android-proxy-override.js" \
-  -o /tmp/android-proxy-override.js
-curl -L "${BASE}/android/android-certificate-unpinning.js" \
-  -o /tmp/android-certificate-unpinning.js
-curl -L "${BASE}/android/android-certificate-unpinning-fallback.js" \
-  -o /tmp/android-certificate-unpinning-fallback.js
-```
-
---
-
-## 10. Configure config.js
-
-Edit `/tmp/config.js` and set:
-
-```javascript
-const CERT_PEM = `<contents of ~/.mitmproxy/mitmproxy-ca-cert.pem>`;
-
-const PROXY_HOST = '192.168.1.123';  // your Mac IP
-const PROXY_PORT = 8080;
-```
-
-Insert the full PEM content (from `-----BEGIN CERTIFICATE-----` to `-----END CERTIFICATE-----`) between the backticks.
-
-Quick check that the right cert is in place:
-
-```bash
-# The issuer inside config.js should be mitmproxy, not SoundTouch
-grep -A3 "CERT_PEM" /tmp/config.js | head -5
-```
-
---
-
-## 11. Start Interception
-
-Make sure mitmweb is running, then:
-
-```bash
-/tmp/frida-venv/bin/frida \
-  -U \
-  -f com.bose.soundtouch \
-  -l /tmp/config.js \
-  -l /tmp/android-system-certificate-injection.js \
-  -l /tmp/android-proxy-override.js \
-  -l /tmp/android-certificate-unpinning.js \
-  -l /tmp/android-certificate-unpinning-fallback.js
-```
-
-Expected output in the Frida REPL:
-
-```
-== System certificate trust injected ==
-== Proxy system configuration overridden to 192.168.1.123:8080 ==
-== Proxy configuration overridden to 192.168.1.123:8080 ==
-== Certificate unpinning completed ==
-== Unpinning fallback auto-patcher installed ==
-```
-
-Open mitmweb at `http://127.0.0.1:8081` to observe traffic live.
-
---
-
-## 12. Save & Replay Recordings
-
-Traffic is saved to `bose_traffic.mitm` (set via `-w` flag in step 5).
-
-```bash
-# Replay/analyse a saved recording:
-mitmweb -r bose_traffic.mitm
-```
-
---
-
-## Cleanup
-
-```bash
-# Remove proxy setting from emulator
-adb -s emulator-5554 shell settings delete global http_proxy
-
-# Remove venv
-rm -rf /tmp/frida-venv /tmp/frida-server /tmp/frida-server.xz
-rm /tmp/config.js /tmp/android-*.js
-
-# Stop emulator
-adb -s emulator-5554 emu kill
-```
-
---
-
-## Troubleshooting
-
-| Symptom                                 | Cause                                            | Fix                                                                            |
-|-----------------------------------------|--------------------------------------------------|--------------------------------------------------------------------------------|
-| `remount failed`                        | ARM64 emulator doesn't support overlayfs remount | Use `/data/misc/user/0/cacerts-added/` method instead                          |
-| `TLS: Trust anchor not found`           | Wrong certificate in config.js                   | Check issuer: must be mitmproxy, not SoundTouch                                |
-| `Chain validation failed`               | Private key included in cert                     | Re-extract with `openssl x509 -in mitmproxy-ca.pem -out mitmproxy-ca-cert.pem` |
-| `frida-server: connection refused`      | frida-server not running                         | Re-run `adb shell su 0 /data/local/tmp/frida-server &`                         |
-| frida and frida-server version mismatch | Versions must be identical                       | Pin both to same version (e.g. `17.9.1`)                                       |
-| `emulator: multiple AVDs` error         | Emulator already running                         | Kill first: `adb emu kill`, then restart with `-writable-system`               |
-
---
-
-## App Automation Options
-
-For most traffic-recording purposes, manually operating the app while mitmproxy captures is sufficient. If you need to automate specific interactions (e.g. to repeatably capture the requests triggered by startup or a particular action), the following tools are available.
-
-### Starting the App
-
-```bash
-# Via app drawer: swipe up on the home screen and tap "Bose SoundTouch"
-
-# Via adb monkey (simplest)
-adb -s emulator-5554 shell monkey -p com.bose.soundtouch 1
-
-# Via explicit intent (if the activity name is known)
-adb -s emulator-5554 shell am start -n com.bose.soundtouch/.MainActivity
-
-# Look up all activities if the name is unknown
-adb -s emulator-5554 shell dumpsys package com.bose.soundtouch | grep Activity
-```
-
-### adb — sufficient for simple cases
-
-```bash
-# Tap at screen coordinates
-adb shell input tap 540 960
-
-# Swipe
-adb shell input swipe 540 1500 540 500
-
-# Type text
-adb shell input text "mytext"
-
-# Take a screenshot
-adb shell screencap /sdcard/screen.png && adb pull /sdcard/screen.png
-```
-
-### UIAutomator2 — inspect UI elements
-
-```bash
-# Dump the current UI hierarchy to find element IDs
-adb shell uiautomator dump /sdcard/ui.xml
-adb pull /sdcard/ui.xml
-```
-
-Open `ui.xml` to find element resource IDs, then target them precisely in scripts.
-
-### Appium — full scripted automation
-
-```python
-from appium import webdriver
-
-driver = webdriver.Remote('http://localhost:4723/wd/hub', {
-    'platformName': 'Android',
-    'appPackage': 'com.bose.soundtouch',
-    'appActivity': '.MainActivity',
-})
-
-# Find an element by resource ID and tap it
-driver.find_element('id', 'com.bose.soundtouch:id/play_button').click()
-```
-
-> **Note:** `monkey` is a stress-test tool that sends random events — use it only to launch the app, not to drive specific interactions.
@@ -1,892 +0,0 @@
-# Bose SoundTouch – Traffic Analysis Runbook
-
-> **Goal:** Set up a Raspberry Pi as a transparent access point to fully observe the traffic of the Bose SoundTouch app – specifically the pairing flow with the Bose Cloud. This serves as a basis for later reverse engineering / simulation of the cloud endpoints.
-
---
-
-## Prerequisites
-
-| Component          | Details                                                          |
-|--------------------|------------------------------------------------------------------|
-| Raspberry Pi       | Pi 3 or newer, Raspberry Pi OS (Bullseye, Bookworm, Trixie)      |
-| Network interfaces | `eth0` → LAN cable to FritzBox, `wlan0` → own Access Point       |
-| FritzBox           | Unchanged, assigns an IP to the Pi via DHCP on eth0              |
-| Custom DNS Server  | Already present (or see Appendix A), incl. custom CA certificate |
-| Phone              | Android, connects to the Pi's Wi-Fi                              |
-
-### Network Architecture
-
-```
-Internet
-    ↓
-FritzBox  (existing, unchanged)
-    ↓  LAN cable (eth0)
-Raspberry Pi
-  ├── DNS Server       → selective logging / redirection
-  ├── hostapd          → custom Wi-Fi Access Point ("Bose-Lab")
-  ├── dnsmasq          → DHCP for clients, DNS to custom server
-  ├── iptables         → NAT, Forwarding eth0 ↔ wlan0
-  ├── tcpdump          → full traffic capture
-  └── (optional) mitmproxy → HTTPS decryption
-    ↓  Wi-Fi ("Bose-Lab")
-Android Phone
-  └── Bose SoundTouch App
-```
-
---
-
-## Step 1 – Install Packages
-
-```bash
-sudo apt update && sudo apt install -y \
-  hostapd \          # Wi-Fi Access Point daemon
-  dnsmasq \          # DHCP + DNS forwarding
-  nftables \         # Modern NAT / firewall / forwarding
-  tcpdump \          # Packet capture at all levels
-  wireshark-common   # tshark CLI (optional, for live analysis)
-```
-
---
-
-## Step 2 – Enable IP Forwarding
-
-The Pi must forward packets between `wlan0` (phone) and `eth0` (FritzBox).
-
-```bash
-# Active immediately (no reboot required)
-sudo sysctl -w net.ipv4.ip_forward=1
-
-# Permanent (survives reboots)
-# On modern Debian, using a dedicated file in sysctl.d/ is more reliable:
-echo "net.ipv4.ip_forward=1" | sudo tee /etc/sysctl.d/99-ip-forward.conf
-
-# Apply changes immediately
-sudo sysctl --system
-```
-
-**Verify:**
-```bash
-# After a reboot, ensure it is still '1'
-cat /proc/sys/net/ipv4/ip_forward
-```
-
---
-
-## Step 3 – Static IP on wlan0 (systemd-networkd)
-
-On modern Debian (Bookworm/Trixie), `dhcpcd` is replaced by `systemd-networkd`.
-
-```bash
-# Create network configuration
-sudo tee /etc/systemd/network/08-wlan0.network << 'EOF'
-[Match]
-Name=wlan0
-
-[Network]
-Address=192.168.10.1/24
-IPForward=yes
-ConfigureWithoutCarrier=yes
-DHCP=no
-IPv6AcceptRA=no
-EOF
-
-# Restart service
-sudo systemctl enable systemd-networkd
-sudo systemctl restart systemd-networkd
-
-# Ensure wpa_supplicant and NetworkManager don't interfere
-sudo nmcli device set wlan0 managed no
-sudo systemctl stop wpa_supplicant@wlan0
-sudo systemctl mask wpa_supplicant@wlan0
-```
-
-**Verify:**
-```bash
-ip addr show wlan0
-# Expected: ONLY inet 192.168.10.1/24 (NO second DHCP IP)
-```
-
---
-
-## Step 4 – hostapd (Access Point)
-
-```bash
-sudo tee /etc/hostapd/hostapd.conf << 'EOF'
-interface=wlan0
-driver=nl80211
-ssid=Bose-Lab
-hw_mode=b
-#hw_mode=g
-channel=1
-#channel=6
-wmm_enabled=0
-auth_algs=1
-wpa=2
-wpa_passphrase=secret123
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=CCMP
-EOF
-
-# The modern way is to just use hostapd.service which defaults to /etc/hostapd/hostapd.conf
-sudo systemctl unmask hostapd
-sudo systemctl enable --now hostapd
-```
-
-**Verify:**
-```bash
-sudo systemctl status hostapd
-# Expected: active (running)
-```
-
---
-
-## Step 5 – dnsmasq (DHCP + DNS)
-
-dnsmasq gives the phone an IP and forwards DNS queries to the custom DNS server.
-
-```bash
-# Back up original config
-sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.bak
-
-sudo tee /etc/dnsmasq.conf << 'EOF'
-interface=wlan0
-dhcp-range=192.168.10.100,192.168.10.200,24h
-dhcp-option=3,192.168.10.1
-dhcp-option=6,192.168.10.1
-
-# DNS Upstream: custom server on localhost (adjust port if necessary)
-server=127.0.0.1#5353    # Example: custom server on port 5353
-# Alternatively: server=1.1.1.1 if DNS server runs directly on port 53
-
-# Log all DNS queries (for initial analysis)
-log-queries
-log-facility=/var/log/dnsmasq.log
-EOF
-
-sudo systemctl restart dnsmasq
-```
-
-**Observe DNS log live:**
-```bash
-sudo tail -f /var/log/dnsmasq.log
-```
-
---
-
-## Step 6 – NAT and Forwarding (nftables)
-
-On modern Debian (Bookworm/Trixie), `nftables` is the default and recommended way to manage NAT and traffic forwarding.
-
-```bash
-# Define the NAT and Forwarding rules
-sudo tee /etc/nftables.conf << 'EOF'
-#!/usr/sbin/nft -f
-
-flush ruleset
-
-table inet filter {
-    chain forward {
-        type filter hook forward priority 0; policy drop;
-
-        # Allow traffic from phone (wlan0) to internet (eth0)
-        iifname "wlan0" oifname "eth0" accept
-
-        # Allow established/related traffic back to the phone
-        iifname "eth0" oifname "wlan0" ct state established,related accept
-    }
-}
-
-table ip nat {
-    chain posterouting {
-        type nat hook postrouting priority 100; policy accept;
-
-        # MASQUERADE outgoing packets on eth0
-        oifname "eth0" masquerade
-    }
-}
-EOF
-
-# Enable and start nftables
-sudo systemctl enable nftables
-sudo systemctl restart nftables
-```
-
-**Verify:**
-```bash
-sudo nft list ruleset
-# Expected: ruleset showing the forward and nat chains
-```
-
-### WiFi "Bose-Lab" not visible?
-
-If you cannot see the `Bose-Lab` SSID on your phone:
-
-1.  **Check hostapd status:** `sudo systemctl status hostapd`. If it failed with "nl80211: Driver does not support configured mode", try changing `hw_mode=g` to `hw_mode=b`.
-2.  **Interface blocking:** Ensure `rfkill` hasn't blocked WiFi: `sudo rfkill unblock wlan`.
-3.  **Country Code:** Some systems require a country code in `hostapd.conf` to enable the radio. Add `country_code=DE` (or your country) to the top of `/etc/hostapd/hostapd.conf` and restart hostapd: `sudo systemctl restart hostapd`.
-4.  **Local Radio Check:** You can verify that the radio is actually configured as an AP: `iw dev wlan0 info`. Look for `type AP` and your SSID.
-    > **Note:** Do NOT rely on `iw dev wlan0 scan` for your own SSID; many WiFi drivers cannot "scan" and "broadcast" simultaneously.
-5.  **Debug Mode:** If the scan still returns nothing, stop the service and run hostapd in the foreground to see real-time errors:
-    ```bash
-    sudo systemctl stop hostapd
-    sudo hostapd -dd /etc/hostapd/hostapd.conf
-    ```
-    Look for messages like `nl80211: Failed to set interface wlan0 into AP mode`. This usually means the hardware is busy or doesn't support the current `hw_mode` / `channel` combination.
-6.  **Conflicting Services:** Ensure nothing else is managing `wlan0`. NetworkManager is common on modern Debian:
-    ```bash
-    sudo nmcli device set wlan0 managed no
-    ```
-7.  **Ghost IP Conflict:** If `ip addr show wlan0` shows both `192.168.10.1` and another IP (like `192.168.178.x`), `hostapd` will fail. This is usually caused by NetworkManager managing the interface. Ensure you've run:
-    ```bash
-    sudo nmcli device set wlan0 managed no
-    # If the ghost IP is still there, remove it manually:
-    sudo ip addr del 192.168.178.X/24 dev wlan0
-    ```
-
---
-
-## Step 7 – Install Custom CA Certificate on the Phone
-
-Since a custom DNS server with a custom CA certificate is used, it must be trusted on the phone – otherwise, the app will block HTTPS connections to redirected domains.
-
-### Copy CA Certificate to the Pi (if not already there)
-
-If you haven't created a CA yet, follow **Appendix A** first.
-
-```bash
-# Certificate is located e.g. at /etc/my-dns-ca/ca.crt
-# Temporarily make reachable via HTTP for easy download:
-cd /etc/my-dns-ca/
-python3 -m http.server 8080
-# → Reachable at http://192.168.10.1:8080/ca.crt
-```
-
-### Install on Android
-
-1. Connect phone to `Bose-Lab`
-2. Open browser → `http://192.168.10.1:8080/ca.crt`
-3. Download certificate
-4. **Settings → Security → Credentials → Install CA Certificate**
-5. Select certificate and confirm
-
-> **Note:** Android distinguishes between system CAs and user CAs. User-installed CAs are accepted by many apps, but apps with certificate pinning (hardcoded certificate hashes) ignore them. Whether Bose uses pinning will be visible in the capture (Connection Reset after TLS ClientHello).
-
-### Android 14+ Special Case
-
-From Android 14 onwards, apps do not trust user CAs by default unless explicitly declared in the manifest. If the Bose app rejects the CA certificate:
-
-```bash
-# Option A: Root + Magisk module "MagiskTrustUserCerts"
-#   → moves user CAs to the system store
-
-# Option B: Root + manually copy to system CA directory
-adb push ca.crt /system/etc/security/cacerts/
-adb shell chmod 644 /system/etc/security/cacerts/ca.crt
-```
-
---
-
-## Step 8 – Capture Traffic
-
-### All at once (recommended)
-
-```bash
-# Full capture of all protocols on wlan0
-# Filename with timestamp for multiple sessions
-sudo tcpdump -i wlan0 \
-  -w /tmp/bose-$(date +%Y%m%d-%H%M%S).pcap \
-  -s 0        # full packet length (no truncation)
-
-# End session: Ctrl+C
-```
-
-### Targeted by protocol
-
-```bash
-# DNS only (Port 53) – shows if app uses standard DNS
-sudo tcpdump -i wlan0 -n port 53
-
-# HTTPS only – TLS connections to Bose Cloud
-sudo tcpdump -i wlan0 -n 'tcp port 443'
-
-# mDNS (ZeroConf) – device discovery in LAN
-# Multicast group 224.0.0.1, Port 5353
-sudo tcpdump -i wlan0 -n 'udp port 5353'
-
-# SSDP/UPnP – alternative device discovery
-sudo tcpdump -i wlan0 -n 'udp port 1900'
-
-# Everything except DNS (reduces noise)
-sudo tcpdump -i wlan0 -n 'not port 53' -w /tmp/bose-nodns.pcap
-
-# Traffic of a specific host only (filter by phone IP)
-# Read phone IP from dnsmasq.leases beforehand (see below)
-sudo tcpdump -i wlan0 -n host 192.168.10.101
-```
-
-### Read SNI from TLS Traffic (without decryption)
-
-```bash
-# Extract domains from TLS ClientHello (SNI is unencrypted)
-sudo tcpdump -i wlan0 -n 'tcp port 443' -A 2>/dev/null \
-  | grep -oP '(?<=\x00)([a-zA-Z0-9.-]+\.(?:com|net|io|cloud|bose\.com))'
-```
-
-### Readable mDNS Announcements output
-
-```bash
-# tshark decodes mDNS directly
-sudo tshark -i wlan0 -f 'udp port 5353' -T fields \
-  -e dns.qry.name \
-  -e dns.resp.name \
-  -e dns.a
-```
-
---
-
-## Step 9 – Analysis with Wireshark (on PC)
-
-Transfer `.pcap` files from the Pi to the PC:
-
-```bash
-# From the PC (scp)
-scp pi@192.168.10.1:/tmp/bose-*.pcap ~/Desktop/
-```
-
-**Important Wireshark Filters:**
-
-```
-# DNS only
-dns
-
-# HTTPS only
-tcp.port == 443
-
-# WebSocket connections (HTTP Upgrade)
-websocket
-
-# mDNS
-mdns
-
-# TLS Handshakes (SNI visible)
-tls.handshake.extensions_server_name
-
-# Traffic of a specific domain (resolve by IP)
-http.host contains "bose"
-
-# WebSocket frames
-websocket.payload
-```
-
-> **Tip:** Wireshark decodes WebSocket frames automatically if it sees the HTTP Upgrade handshake in the same capture. For the pairing flow: filtering for `tls.handshake.extensions_server_name` shows all domains the app contacts, even without decryption.
-
---
-
-## Step 10 – mitmproxy (optional, for HTTPS content)
-
-Only useful if the CA certificate on the phone is trusted and no certificate pinning is active. `mitmproxy` acts as a Man-in-the-Middle by generating fake, on-the-fly certificates for any domain (e.g., `global.api.bose.io`) using your custom CA.
-
-### 1. Configure mitmproxy to use your Custom CA
-
-By default, `mitmproxy` creates its own CA in `~/.mitmproxy/`. To ensure the phone (which already trusts your `ca.crt`) accepts the traffic, you must tell `mitmproxy` to use your existing CA:
-
-```bash
-# mitmproxy expects the CA in a specific PEM format (cert + key in one file)
-sudo mkdir -p ~/.mitmproxy
-sudo cat /etc/my-dns-ca/ca.crt /etc/my-dns-ca/ca.key | sudo tee ~/.mitmproxy/mitmproxy-ca.pem > /dev/null
-```
-
-### 2. Install and Start mitmproxy
-
-```bash
-# Install mitmproxy binary (stable version for aarch64)
-cd /tmp
-wget https://downloads.mitmproxy.org/12.2.1/mitmproxy-12.2.1-linux-aarch64.tar.gz
-tar -xzf mitmproxy-12.2.1-linux-aarch64.tar.gz
-sudo mv mitmproxy mitmdump mitmweb /usr/local/bin/
-rm mitmproxy-12.2.1-linux-aarch64.tar.gz
-
-mitmproxy --version
-
-# Transparent proxy on port 8080
-# It will now use the CA from ~/.mitmproxy/mitmproxy-ca.pem
-mitmproxy --mode transparent --listen-port 8080
-
-# Alternatively: mitmdump for automatic logging to file
-# mitmdump --mode transparent --listen-port 8080 -w /tmp/bose-https.mitm
-```
-
-### 3. Troubleshooting: TLS Handshake Failures
-
-If you see `Client TLS handshake failed. The client does not trust the proxy's certificate for www.google.com` (or other domains) in the `mitmproxy` logs:
-
-1.  **HSTS and Pre-installed Pinning:** High-security sites like `www.google.com` use **HSTS (HTTP Strict Transport Security)** and have their certificates hardcoded (pinned) into browsers like Chrome and the Android system. **These will always fail with a User-installed CA.**
-2.  **User vs. System CA Store:** On Android 7.0+, apps **do not trust User-installed CAs by default**. They only trust the "System" store.
-    *   **The Bose app:** If it fails, it's because it only trusts the System store or uses its own certificate pinning.
-    *   **The Fix (Rooted Phone):** Use a Magisk module like `AlwaysTrustUserCerts` or manually move your `ca.crt` to `/system/etc/security/cacerts/` (see Step 7).
-3.  **The "Golden Rule" - Verify the Proxy is Working:**
-    To confirm your CA and `mitmproxy` are correctly configured, test with a non-HSTS site on the phone's browser (e.g., `http://neverssl.com`). Once redirected to HTTPS, **inspect the certificate**. It should say it was issued by your "Bose-Lab Root CA" (or "SoundTouch Root CA").
-
-    *   **If this works:** Your "factory" (mitmproxy + CA) is 100% correct. Any failure in the Bose app is due to its own security policy (ignore User Store or Pinning).
-    *   **If this fails:** Your CA is not trusted by the browser or `mitmproxy` is not using your PEM file.
-
-    Alternatively, use `curl` from a terminal emulator on the phone:
-    ```bash
-    # This should work if the CA is in the user store and curl is told to use it
-    curl -v --cacert /path/to/ca.crt https://example.com
-    ```
-4.  **Check mitmproxy CA:** Ensure `mitmproxy` is actually using your CA. When it starts, it should NOT generate a new CA in `~/.mitmproxy/mitmproxy-ca.pem` if you've already placed yours there.
-
---
-
-**nftables rule: redirect HTTPS traffic to mitmproxy**
-
-```bash
-# Create a temporary file for the redirection rule
-sudo nft add table ip mitm
-sudo nft add chain ip mitm prerouting { type nat hook prerouting priority -100 \; }
-sudo nft add rule ip mitm prerouting iifname "wlan0" tcp dport 443 redirect to :8080
-```
-
-**Remove rule when no longer needed:**
-
-```bash
-sudo nft delete table ip mitm
-```
-
-> **Detecting Certificate Pinning:** If the app immediately disconnects after mitmproxy redirection (connection reset directly after TLS ClientHello), pinning is active. In this case, Frida + root is needed to patch the pinning.
-
---
-
-## Step 11 – Bypassing Android Trust Restrictions
-
-If `neverssl.com` works in the browser but the Bose app shows `TLS handshake failed` in `mitmproxy`, the app is either ignoring the **User CA store** (common on Android 7+) or using **Certificate Pinning**.
-
-### Option A: Move CA to System Store (Requires Root/Magisk)
-
-This is the most reliable way to make apps trust your CA without modifying the app itself.
-
-1.  **Using Magisk (Recommended):**
-    Install the **"AlwaysTrustUserCerts"** or **"Move Certificates"** module in Magisk. It automatically mirrors all certificates from the User store to the System store on every boot.
-
-2.  **Manual Move (via ADB):**
-    Android system certificates are stored in `/system/etc/security/cacerts/` and must be named using the hash of the certificate.
-
-    ```bash
-    # 1. Get the hash of your certificate
-    hash=$(openssl x509 -inform PEM -subject_hash_old -in ca.crt | head -1)
-
-    # 2. Rename the certificate locally
-    cp ca.crt ${hash}.0
-
-    # 3. Push to the phone (requires remounting /system as read-write)
-    adb push ${hash}.0 /sdcard/
-    adb shell
-    su
-    mount -o rw,remount /
-    cp /sdcard/${hash}.0 /system/etc/security/cacerts/
-    chmod 644 /system/etc/security/cacerts/${hash}.0
-    chown root:root /system/etc/security/cacerts/${hash}.0
-    reboot
-    ```
-
-### Option B: Patching the App (No Root Required)
-
-If you cannot root your phone, you can modify the app's APK to trust user-installed certificates. This involves obtaining the APK, decompiling it, adding a network security configuration, and then repackaging and signing it.
-
-#### 0. How to get the .apk file?
-
-You have two main ways to get the official Bose SoundTouch APK:
-
-**Method 1: Extract from your phone (Safest)**
-If the app is already installed on your phone, you can pull it using `adb`:
-```bash
-# 1. Find the package name (usually com.bose.soundtouch)
-adb shell pm list packages | grep bose
-
-# 2. Get the full path to the APK on the phone
-adb shell pm path com.bose.soundtouch
-# Output: package:/data/app/~~...==/com.bose.soundtouch-.../base.apk
-
-# 3. Pull the file to your computer
-adb pull /data/app/~~...==/com.bose.soundtouch-.../base.apk Bose-SoundTouch.apk
-```
-
-**Method 2: Download from a Mirror (Easiest)**
-You can download the APK from reputable third-party sites.
-> **Warning:** Always verify the site's reputation.
-*   [APKMirror](https://www.apkmirror.com/apk/bose-corporation/bose-soundtouch/)
-*   [APKPure](https://apkpure.com/bose-soundtouch/com.bose.soundtouch)
-
-#### 1. Automated Method: apk-mitm (Recommended)
-The easiest way is to use `apk-mitm`, which automates the entire process including fixing common certificate pinning libraries.
-
-```bash
-# Requires Node.js installed on your PC
-npx apk-mitm Bose-SoundTouch.apk
-```
-This will produce a `Bose-SoundTouch-patched.apk` which you can install on your phone.
-
-#### 2. Manual Method: Network Security Config
-If you prefer to do it manually:
-
-1.  **Decompile the APK:**
-    ```bash
-    apktool d Bose-SoundTouch.apk
-    ```
-2.  **Create/Modify `res/xml/network_security_config.xml`:**
-    ```xml
-    <?xml version="1.0" encoding="utf-8"?>
-    <network-security-config>
-        <base-config>
-            <trust-anchors>
-                <certificates src="system" />
-                <certificates src="user" />
-            </trust-anchors>
-        </base-config>
-    </network-security-config>
-    ```
-3.  **Update `AndroidManifest.xml`:**
-    Ensure the `<application>` tag includes: `android:networkSecurityConfig="@xml/network_security_config"`.
-4.  **Repackage and Sign:**
-    ```bash
-    apktool b Bose-SoundTouch -o Bose-SoundTouch-patched.apk
-    # Sign with your own key
-    # 1. Generate a keystore (if you don't have one)
-    # Note: You can use ANY name/values here. The phone does not need to "know" or "trust" this key beforehand.
-    # It only needs the APK to be digitally signed so the Android installer accepts it.
-    keytool -genkey -v -keystore my-release-key.keystore -alias alias_name -keyalg RSA -keysize 2048 -validity 10000
-
-    # 2. Sign the APK
-    apksigner sign --ks my-release-key.keystore --out Bose-SoundTouch-patched-signed.apk Bose-SoundTouch-patched.apk
-
-    # Alternatively, use uber-apk-signer (recommended for simplicity)
-    # It handles zipalign and signing automatically.
-    java -jar uber-apk-signer.jar --apk Bose-SoundTouch-patched.apk
-    ```
-
-#### 3. Install the Patched APK
-
-Once you have your `Bose-SoundTouch-patched.apk` (and it is signed), you need to install it on your phone.
-
-**Important:** You must **uninstall the original Bose app first**. Android will not allow you to "update" the official app with your patched version because the digital signatures won't match.
-
-**Method 1: via ADB (Recommended)**
-```bash
-# 1. Uninstall the original app
-adb uninstall com.bose.soundtouch
-
-# 2. Install your patched version
-adb install Bose-SoundTouch-patched.apk
-```
-
-**Method 2: Manual Transfer**
-1.  Copy the `Bose-SoundTouch-patched.apk` to your phone's storage (via USB, Google Drive, or the Pi's HTTP server).
-2.  On the phone, use a File Manager to open the APK.
-3.  If prompted, allow "Install from Unknown Sources" for your File Manager.
-
-### Option C: Using the macOS Bose SoundTouch App (No Root/Patching Required)
-
-If you have a Mac, using the macOS version of the Bose SoundTouch app is often a good alternative. However, because the app is built on an **older version of Qt (5.7.0)**, it has specific trust and TLS compatibility issues that require extra steps.
-
-#### 1. Install the Custom CA in macOS Keychain
-
-1.  Open **Keychain Access** on your Mac.
-2.  Select the **System** keychain (or **login** if System is locked).
-3.  Drag and drop your `ca.crt` file into the list.
-4.  Double-click the newly added certificate (e.g., "Bose-Lab Root CA").
-5.  Expand the **Trust** section.
-6.  Set "When using this certificate" to **Always Trust**.
-7.  Close the window and authenticate with your Mac password.
-
-#### 2. Configure the Proxy
-
-You can either configure the macOS system proxy manually or use `mitmproxy`'s automatic interception.
-
-**Method 1: System Proxy (Manual)**
-1.  Go to **System Settings → Network → Wi-Fi → Details... → Proxies**.
-2.  Enable **HTTP Proxy** and **HTTPS Proxy**.
-3.  Set Server to your Pi's IP (`192.168.10.1`) and Port to `8080`.
-4.  Click **OK** and **Apply**.
-
-**Method 2: mitmproxy Local Redirect (Automatic)**
-If you are running `mitmproxy` directly on your Mac (instead of the Pi), you can use the modern "Local Redirect" mode which doesn't require proxy settings:
-```bash
-# Install mitmproxy via Homebrew
-brew install mitmproxy
-
-# Start mitmproxy in local redirect mode
-# This uses a macOS Network Extension to intercept traffic from specific apps
-mitmproxy --mode local
-```
-
-#### 3. Special Troubleshooting: Legacy Qt 5.7.0 SSL Failures
-
-If you see `SSL handshake failed` in the `mitmproxy` logs or the app's internal log (`log.txt`), the app's older networking stack is rejecting the connection. This is common because Qt 5.7.0 (2016) lacks support for **TLS 1.3** and many modern root certificates (like Let's Encrypt's **ISRG Root X1**).
-
-**The Solution: Launch with SSL Bypass Flags**
-
-Since the Bose macOS app is a hybrid of **Qt/Chromium** and **Node.js**, you must bypass the trust checks for both engines by launching the app from the terminal:
-
-```bash
-# 1. Bypass QtWebEngine/Chromium (Qt 5.7) trust
-export QTWEBENGINE_CHROMIUM_FLAGS="--ignore-certificate-errors"
-
-# 2. Bypass Node.js (SoundTouch Music Server) trust
-export NODE_TLS_REJECT_UNAUTHORIZED=0
-
-# 3. (Optional) Provide your custom CA directly to Node.js
-export NODE_EXTRA_CA_CERTS="/path/to/your/ca.crt"
-
-# 4. Launch the application
-"/Applications/SoundTouch/SoundTouch.app/Contents/MacOS/SoundTouch"
-```
-
-#### 4. Verify and Capture
-
-1.  Open Safari and visit `https://neverssl.com`. Verify the certificate is issued by your custom CA.
-2.  Launch the Bose app using the terminal command above.
-3.  Watch the traffic flow in `mitmproxy`.
-
-> **Note:** Even on macOS, **Certificate Pinning** is still possible if Bose implemented it specifically in the desktop app code. However, it is much less common on desktop apps than on mobile apps. If it works, you've saved yourself hours of Android patching!
-
-### Option D: Patching the App with Frida (Requires Root)
-
-If the app uses **Certificate Pinning** (hardcoded hashes), even moving the CA to the System store won't work. You must disable the pinning check in the app's code.
-
-1.  **Install Frida** on your PC and `frida-server` on the rooted phone.
-2.  **Use a universal bypass script:**
-    ```bash
-    frida -U -f com.bose.soundtouch -l https://codeshare.frida.re/@pcipolloni/universal-android-ssl-pinning-bypass-with-frida/ --no-pause
-    ```
-    *(Replace `com.bose.soundtouch` with the actual package name if different).*
-
-## Step 12 – Alternative: Regular HTTP Proxy Mode
-
-If the **Transparent AP** setup (Steps 1–6) is too complex or you are experiencing routing issues, you can use `mitmproxy` as a **Regular HTTP Proxy**.
-
-### 1. How it works
-In this mode, the Pi acts as a simple server on port 8080. You tell your phone's Wi-Fi settings to send all traffic to `192.168.10.1:8080`.
-
-*   **Pros:** No complex `nftables` or NAT rules required.
-*   **Cons:** Many Android apps (and background processes) ignore system-wide proxy settings. **HTTPS still requires a trusted CA for decryption.**
-
-### 2. Start mitmproxy in Regular Mode
-```bash
-# Stop transparent mode first if it's running
-# No special flags needed for regular mode
-mitmproxy --listen-port 8080
-```
-
-### 3. Configure the Phone
-1.  Go to **Settings → Wi-Fi → Bose-Lab**.
-2.  Select **Modify Network** (or the "i" icon).
-3.  Set **Proxy** to **Manual**.
-4.  **Proxy hostname:** `192.168.10.1`
-5.  **Proxy port:** `8080`
-6.  Save and try to browse a site.
-
---
-
-## Step 13 – Extracting for soundtouch-service
-
-You can extract interactions (especially unencrypted WebSockets on port 8090) from a `.pcap` and format them for use in `soundtouch-service`.
-
-### 1. Extract Traffic using Go
-
-A helper script is provided in `scripts/extract-ws.go`. It automatically detects, unmasks, and decompresses (GZIP) WebSocket frames, and also extracts DNS, MDNS, and SSDP traffic.
-
-```bash
-# Install dependencies
-go get github.com/google/gopacket
-
-# Run extraction (outputs multiple files: .ws.http, .dns.txt, .mdns.txt, .ssdp.txt)
-# The results will be saved beside your .pcap file
-go run scripts/extract-ws.go your_capture.pcap [filter_ip]
-
-# Example: Filter for a specific speaker's IP in WebSocket messages
-go run scripts/extract-ws.go capture.pcap 192.168.100.1
-```
-
-### 2. Manual Extraction with tshark
-
-If you only need a quick look at the payloads:
-
-```bash
-# Extract all WebSocket text payloads
-tshark -r your_capture.pcap -Y "websocket.payload.text" -T fields -e websocket.payload.text
-```
-
---
-
-## Step 14 – Extracting from Internal App Logs (macOS)
-
-If you are using the macOS app and cannot decrypt the cloud traffic due to pinning, you can still extract the JSON/XML messages from the app's internal communication log.
-
-A helper script is provided in `scripts/extract-log-interactions.go`. It parses the interleaved "Native" and "Network" calls to reconstruct the application's internal state and cloud requests.
-
-```bash
-# Run extraction from the log file
-# Outputs a chronological record of internal events and network URLs
-go run scripts/extract-log-interactions.go path/to/log.txt > extracted-interactions.http
-```
-
-**What this shows:**
- **TO NETWORK:** The URLs the app is about to call (intercepted before encryption).
- **FROM NATIVE:** Data being returned from the OS or Cloud to the UI.
- **TO NATIVE:** Commands being sent from the UI to the underlying engines.
-
-This is a powerful "Plan B" when HTTPS decryption is blocked, as the app essentially logs its own decrypted data for you.
-
---
-
-## Helper Commands / Troubleshooting
-
-After a Pi reboot, everything should come up automatically. If not:
-
-```bash
-# Restart and enable all core services
-sudo systemctl restart systemd-networkd
-sudo systemctl enable --now hostapd
-sudo systemctl enable --now dnsmasq
-sudo systemctl restart nftables
-
-# Verify the unmanaged state of wlan0 (nmcli)
-sudo nmcli device set wlan0 managed no
-```
-
---
-
-## What to Expect
-
-| Protocol             | Port       | Tool                     | Visibility                                     |
-|----------------------|------------|--------------------------|------------------------------------------------|
-| DNS (Standard)       | UDP 53     | tcpdump, dnsmasq log     | Full, plaintext                                |
-| HTTPS / REST         | TCP 443    | tcpdump (SNI), mitmproxy | SNI without decryption, content with mitmproxy |
-| WebSockets           | TCP 443/80 | Wireshark                | Frames decoded if TLS is broken                |
-| mDNS / ZeroConf      | UDP 5353   | tcpdump, tshark          | Full, plaintext                                |
-| SSDP / UPnP          | UDP 1900   | tcpdump                  | Full, plaintext                                |
-| SoundTouch local API | TCP 8090   | tcpdump                  | Full, plaintext (no TLS)                       |
-
-> **Expectation for Bose SoundTouch:** The app likely uses standard DNS (older app generation), REST/HTTPS for the pairing flow with the cloud, WebSockets for push events from the device, and mDNS for local device discovery. The local device API on port 8090 is HTTP without TLS – this traffic is always readable.
-
---
-
-## Next Steps After Analysis
-
-1. Extract domains from DNS log and SNI → List of all Bose endpoints
-2. HTTP methods and paths from mitmproxy log → Reconstruct API structure
-3. Document auth flow (OAuth2? Proprietary? Token format?)
-4. Build a minimal mock server simulating the critical endpoints
-5. Testing: App against mock server → does pairing work offline?
-
---
-
-## Appendix A – Generating a Custom CA Certificate
-
-If you don't have a custom DNS server with a CA yet, you can create one directly on the Pi. Alternatively, if you are already using the `soundtouch-service` from this repository, you can reuse its CA certificate located in the `data/certs/` directory.
-
-### 0. (Optional) Copy an Existing CA from another host
-
-If you are already using the `soundtouch-service` on another machine (e.g., your notebook), you can copy the existing CA to the Pi instead of generating a new one:
-
-```bash
-# On your Pi:
-sudo mkdir -p /etc/my-dns-ca
-sudo chown $USER:$USER /etc/my-dns-ca
-
-# Run this on your notebook (replace hostnames and paths):
-# Note: This is easiest if your SSH key is added to the Pi and soundtouch-service host.
-# If you run into permission issues with sudo, ensure the source user has passwordless sudo for 'cat'.
-
-# Step A: Download from source to your notebook
-ssh soundtouch-service "sudo cat /var/lib/soundtouch-service/certs/ca.crt" > ca.crt
-ssh soundtouch-service "sudo cat /var/lib/soundtouch-service/certs/ca.key" > ca.key
-
-# Step B: Upload from notebook to the Pi
-scp ca.crt ca.key soundtouch-access-point:/tmp/
-ssh soundtouch-access-point "sudo mv /tmp/ca.crt /tmp/ca.key /etc/my-dns-ca/ && sudo chown root:root /etc/my-dns-ca/ca.*"
-rm ca.crt ca.key
-```
-
-### 1. Create CA Key and Certificate
-
-```bash
-sudo mkdir -p /etc/my-dns-ca
-cd /etc/my-dns-ca
-
-# Generate CA private key
-sudo openssl genrsa -out ca.key 4096
-
-# Generate Root CA certificate
-# Note: we explicitly add basicConstraints=CA:TRUE for modern TLS clients
-sudo openssl req -x509 -new -nodes -key ca.key -sha256 -days 3650 \
-  -out ca.crt \
-  -subj "/C=DE/O=Bose-Lab/CN=Bose-Lab Root CA" \
-  -addext "basicConstraints=critical,CA:TRUE" \
-  -addext "keyUsage=critical,keyCertSign,cRLSign"
-```
-
-### 2. Generate a Certificate for Interception (Example)
-
-To intercept `global.api.bose.io`, you need a certificate for it, signed by your CA:
-
-```bash
-# Generate server key
-sudo openssl genrsa -out bose.key 2048
-
-# Create CSR (Certificate Signing Request) configuration
-sudo tee bose.ext << 'EOF'
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = global.api.bose.io
-DNS.2 = *.bose.io
-EOF
-
-# Generate CSR
-sudo openssl req -new -key bose.key -out bose.csr \
-  -subj "/C=DE/O=Bose-Lab/CN=global.api.bose.io"
-
-# Sign the certificate with your CA
-sudo openssl x509 -req -in bose.csr -CA ca.crt -CAkey ca.key \
-  -CAcreateserial -out bose.crt -days 365 -sha256 -extfile bose.ext
-```
-
-### 3. Usage in your DNS/HTTPS Server
-
-Your custom server (e.g., a small Go or Python script) would then use `bose.crt` and `bose.key` to serve HTTPS traffic for those domains.
-
-## Appendix B – Helpful Commands
-
-```bash
-# Which IPs did the phone receive?
-cat /var/lib/misc/dnsmasq.leases
-
-# Is the access point active?
-sudo systemctl status hostapd
-
-# Is dnsmasq active?
-sudo systemctl status dnsmasq
-
-# Check interfaces and IPs
-ip addr show
-
-# Check routing table
-ip route show
-
-# Show active nftables rules
-sudo nft list ruleset
-
-# All running tcpdump processes
-pgrep -a tcpdump
-
-# Test the Pi's own DNS resolution
-dig @127.0.0.1 -p 5353 global.api.bose.io
-
-# Check network connectivity from the phone (from the Pi)
-ping 192.168.10.101   # Phone IP from dnsmasq.leases
-```
@@ -1,43 +0,0 @@
-# Spotify Account Addition Implementation Status
-
-To fully replace Bose cloud services for the Spotify account addition flow in the "Stockholm" SoundTouch application, the following routes have been implemented in the `soundtouch-service`:
-
-## 1. OAuth Token Exchange (Bose Cloud)
-
-The Stockholm background worker (in `worker_common.js` and `spotify_worker.js`) performs a token exchange using an authorization code.
-
-*   **Route**: `POST /oauth/account/{account}/music/musicprovider/{sourceID}/token/cs`
-*   **Purpose**: To exchange the Spotify authorization code for a Bose-mediated token.
-*   **Implementation**: `HandleBoseAccountToken` in `pkg/service/handlers/handlers_oauth.go`.
-*   **Registration**: Registered in `cmd/soundtouch-service/main.go` under the `/oauth` route group.
-
-## 2. Cloud Source Registration (Marge Service)
-
-The SoundTouch application registers a new music source (e.g., Spotify) with the Bose cloud profile.
-
-*   **Route**: `POST /streaming/account/{account}/source`
-*   **Purpose**: To add the new source (username, credentials, display name) to the user's emulated cloud profile.
-*   **Implementation**: `HandleMargeAddSource` in `pkg/service/handlers/handlers_marge.go`.
-*   **Registration**: Registered in `cmd/soundtouch-service/main.go` under the `/streaming` route group.
-*   **Payload Format**: XML `application/vnd.bose.streaming-v1.1+xml` containing `<source>` with `<username>`, `<sourceproviderid>`, and `<credential type="token_version_3">`.
-
-## 3. Redirect Handling (Browser to App)
-
-The `soundtouch://` deep link redirect URI is handled by the management interface which provides the OAuth callback.
-
-*   **Callback Route**: `GET /mgmt/spotify/callback`
-*   **Implementation**: `HandleMgmtSpotifyCallback` in `pkg/service/handlers/handlers_mgmt.go`.
-*   **Confirmation Route**: `POST /mgmt/spotify/confirm` (used by mobile apps for deep-link codes).
-*   **Implementation**: `HandleMgmtSpotifyConfirm` in `pkg/service/handlers/handlers_mgmt.go`.
-
-## Implementation Details
-
-1.  **Marge Add Source**:
-    *   `HandleMargeAddSource` in `pkg/service/handlers/handlers_marge.go` parses the incoming XML and persists the new source to the `DataStore` for the corresponding account.
-
-2.  **OAuth Account Token Exchange**:
-    *   `HandleBoseAccountToken` in `pkg/service/handlers/handlers_oauth.go` supports the `/oauth/account/.../token/cs` path.
-    *   It responds with a JSON payload including `access_token` and `token_type` "Bearer" after exchanging the code via `ExchangeCodeAndStore`.
-
-3.  **Router Registration**:
-    *   These paths are registered in `cmd/soundtouch-service/main.go` within the `/streaming`, `/oauth`, and `/mgmt` route blocks.
@@ -185,7 +185,7 @@ type NowPlaying struct {
 type PlayStatus string
 const (
    PlayStatusPlaying PlayStatus = "PLAY_STATE"
-    PlayStatusPaused  PlayStatus = "PAUSE_STATE"
+    PlayStatusPaused  PlayStatus = "PAUSE_STATE" 
    PlayStatusStopped PlayStatus = "STOP_STATE"
 )

@@ -277,19 +277,19 @@ type Config struct {
    // Server configuration
    WebPort      int           `env:"WEB_PORT" default:"8080"`
    APITimeout   time.Duration `env:"API_TIMEOUT" default:"10s"`
-
-    // Discovery configuration
+    
+    // Discovery configuration  
    DiscoveryTimeout time.Duration `env:"DISCOVERY_TIMEOUT" default:"5s"`
    CacheDevices     bool          `env:"CACHE_DEVICES" default:"true"`
    CacheTTL         time.Duration `env:"CACHE_TTL" default:"5m"`
-
+    
    // CORS configuration (for web proxy)
    CORSOrigins      []string `env:"CORS_ORIGINS" default:"*"`
-
+    
    // Logging
    LogLevel    string `env:"LOG_LEVEL" default:"info"`
    LogFormat   string `env:"LOG_FORMAT" default:"json"`
-
+    
    // Development
    DevMode     bool `env:"DEV_MODE" default:"false"`
 }
@@ -537,7 +537,7 @@ build-all: build-linux build-darwin build-windows
 dev-cli:
 	air -c .air-cli.toml

-dev-webapp:
+dev-webapp: 
 	air -c .air-webapp.toml

 dev-wasm:
@@ -556,7 +556,7 @@ check: fmt vet lint test

 # Docker development environment
 docker-dev:
-	docker compose up --build
+	docker-compose up --build

 # Release packaging
 release: build-all
@@ -596,7 +596,7 @@ import (
    "fmt"
    "log"
    "time"
-
+    
    "github.com/gesellix/bose-soundtouch/pkg/client"
    "github.com/gesellix/bose-soundtouch/pkg/discovery"
    "github.com/gesellix/bose-soundtouch/pkg/models"
@@ -609,36 +609,36 @@ func main() {
    if err != nil {
        log.Fatal(err)
    }
-
+    
    if len(devices) == 0 {
        log.Fatal("No SoundTouch devices found")
    }
-
+    
    // Create client for first device
    client := client.NewClient(client.ClientConfig{
        Host:    devices[0].Host,
        Port:    8090,
        Timeout: 10 * time.Second,
    })
-
+    
    // Get device info
    info, err := client.GetDeviceInfo()
    if err != nil {
        log.Fatal(err)
    }
    fmt.Printf("Connected to: %s\n", info.Name)
-
+    
    // Get current playback
    nowPlaying, err := client.GetNowPlaying()
    if err != nil {
        log.Fatal(err)
    }
-
+    
    if nowPlaying.PlayStatus == models.PlayStatusPlaying {
-        fmt.Printf("Playing: %s - %s (%s)\n",
+        fmt.Printf("Playing: %s - %s (%s)\n", 
            nowPlaying.Artist, nowPlaying.Track, nowPlaying.Album)
    }
-
+    
    // Control playback
    if nowPlaying.PlayStatus == models.PlayStatusPlaying {
        client.SendKey(models.KeyPause)
@@ -737,11 +737,11 @@ docker run -p 8080:8080 soundtouch-webapp
 ```bash
 # Local development with hot reload
 make dev-webapp    # Web app development
-make dev-wasm      # WASM development
+make dev-wasm      # WASM development  
 make dev-cli       # CLI development

 # Full development environment
-docker compose up  # Mock devices + web app
+docker-compose up  # Mock devices + web app
 ```

 ## Success Criteria
@@ -781,7 +781,7 @@ docker compose up  # Mock devices + web app

 - [Bose SoundTouch Web API Documentation](https://assets.bosecreative.com/m/496577402d128874/original/SoundTouch-Web-API.pdf)
 - [Go WebAssembly](https://github.com/golang/go/wiki/WebAssembly)
- [UPnP Device Architecture](http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.0.pdf)
+- [UPnP Device Architecture](http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.0.pdf) 
 - [Go Embed Directive](https://pkg.go.dev/embed)
 - [Gorilla WebSocket](https://github.com/gorilla/websocket)
 - [PROJECT-PATTERNS.md](../PROJECT-PATTERNS.md) - Detailed pattern documentation
@@ -816,7 +816,7 @@ func TestAccountManager_CreateAccount(t *testing.T) {
            wantErr: true,
        },
    }
-
+    
    for _, tt := range tests {
        t.Run(tt.name, func(t *testing.T) {
            got, err := manager.CreateAccount(tt.input)
@@ -848,18 +848,6 @@ go test ./... -v -cover
 go test -bench=. ./...
 ```

-## Performance Requirements
-
-### Response Time Targets
- Local API requests: < 100ms (95th percentile)
- Mirror requests: < 200ms overhead (asynchronous)
- Discovery time: < 5s for network scan
-
-### Resource Constraints
- Memory usage: < 64MB for small deployments
- CPU usage: < 5% on dual-core ARM systems (idle)
- Storage: < 100MB for interaction logs (rotatable)
-
 ### Security Considerations

 #### Simple Security Model
@@ -961,12 +949,12 @@ func (s *Server) HandleHealthCheck(w http.ResponseWriter, r *http.Request) {
        Version:   version,
        Uptime:    time.Since(startTime).String(),
    }
-
+    
    // Simple checks
    if !s.canWriteToDataDir() {
        health.Status = "error"
    }
-
+    
    w.Header().Set("Content-Type", "application/json")
    json.NewEncoder(w).Encode(health)
 }
@@ -998,4 +986,4 @@ func (m *SimpleMetrics) Save(dataDir string) error {
 }
 ```

-This technical specification provides comprehensive details for implementing the enhanced state management system while maintaining compatibility with existing SoundTouch service functionality and meeting the performance requirements for small hardware deployments.
+This technical specification provides comprehensive details for implementing the enhanced state management system while maintaining compatibility with existing SoundTouch service functionality and meeting the performance requirements for small hardware deployments.
@@ -129,7 +129,7 @@ For each SoundTouch device:
 1. **Prepare a USB drive**:
   - Format as FAT32
   - Create an empty file named `remote_services` (no extension)
-   - ~~(Optional) Firmware update/reset.~~ The official Bose SoundTouch USB update website is not available anymore.
+   - (Optional) Firmware update/reset, see [Bose SoundTouch USB Update](https://downloads.bose.com/ced/soundtouch/soundtouch_usb/index.html)

 2. **Insert USB drive** into your SoundTouch speaker
 3. **Power cycle** the device (unplug for 10 seconds, then reconnect)
@@ -116,7 +116,7 @@ volumes:
 And run:

 ```bash
-docker compose up -d
+docker-compose up -d
 ```

 ## Quick Start
@@ -2,42 +2,6 @@

 - 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.
- RadioBrowser provides a native SoundTouch-compatible API at `https://all.api.radio-browser.info/soundtouch`.
-
-### Architecture
-
-This service registers RadioBrowser in its BMX service registry (provider ID 39) pointing to RadioBrowser's SoundTouch API. The device discovers it from there and communicates directly with RadioBrowser for browsing and playback — the local service does not proxy streams.
-
-The source is registered with type `RADIO_BROWSER` in the Marge sources list. The RadioBrowser provider ID (39) in the source entry identifies it as RadioBrowser within the BMX layer.
-
-The device's own `Sources.xml` (`/mnt/nv/BoseApp-Persistence/1/Sources.xml`) must contain a `RADIO_BROWSER` entry for playback to work:
-
-```xml
-<source secret="" secretType="">
-    <sourceKey type="RADIO_BROWSER" account="" />
-</source>
-```
-
-**A device reboot is required after adding this entry.** The firmware only registers `RADIO_BROWSER` as a selectable source type during the boot-time `Sources.xml` load. The Marge runtime sync stores the source in the registry but does not complete the activation — without a reboot, selecting a `RADIO_BROWSER` station results in `INVALID_SOURCE`.
-
-A reboot achieves two things in sequence:
-
-1. The speaker fetches all sources from the soundtouch-service via a `/full` request, which updates the device-local `Sources.xml`.
-2. The firmware initialises and registers the `RADIO_BROWSER` source type from that updated file.
-
-The `INVALID_SOURCE_TYPE` message from the Bluetooth daemon visible in device logs (e.g. during `GET /serviceAvailability`) is informational noise and does not affect playback.
-
-### Triggering a sources refresh without rebooting
-
-Step 1 above (the `/full` fetch that updates `Sources.xml`) can be triggered independently by posting a `sourcesUpdated` notification directly to the speaker. This is useful for verifying that the soundtouch-service serves the correct sources list before committing to a full reboot:
-
-```bash
-curl -v -X POST http://<speaker-ip>:8090/notification \
-     -H "Content-Type: application/xml" \
-     -d '<updates deviceID="<deviceID>"><sourcesUpdated/></updates>'
-```
-
-Replace `<speaker-ip>` with your speaker's IP address and `<deviceID>` with its device ID (visible in `/info`). After this call the speaker re-fetches its sources from the service. Step 2 (source-type registration) still requires a reboot.

 ### Search for stations

@@ -45,7 +9,10 @@ Replace `<speaker-ip>` with your speaker's IP address and `<deviceID>` with its
 - Click on the station and copy the UUID from the URL.
 - e.g. `https://www.radio-browser.info/history/d28420a4-eccf-47a2-ace1-088c7e7cb7e0`

-### Playing the station
+### RADIO_BROWSER
+
+- This project supports source type RADIO_BROWSER to play radio stations.
+- Set the `location` attribute to `/stations/byuuid/{UUID}`.

 ```xml
 <ContentItem
@@ -53,34 +20,15 @@ Replace `<speaker-ip>` with your speaker's IP address and `<deviceID>` with its
  type="stationurl"
  isPresetable="true"
  location="/stations/byuuid/9610c454-0601-11e8-ae97-52543be04c81">
-  <itemName>Radio Station Name</itemName>
+  <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
 ```
-
-### BMX service registry entry
-
-The entry in `pkg/service/handlers/static/bmx_services.json` that enables RadioBrowser:
-
-```json
-{
-  "baseUrl": "https://all.api.radio-browser.info/soundtouch",
-  "id": {
-    "name": "RADIO_BROWSER",
-    "value": 39
-  },
-  "streamTypes": ["liveRadio", "onDemand"],
-  "authenticationModel": {
-    "anonymousAccount": {
-      "autoCreate": true,
-      "enabled": true
-    }
-  }
-}
-```
@@ -1,197 +0,0 @@
-# Spotify Account Addition Technical Reference
-
-This document details the exact network requests performed by the Bose SoundTouch "Stockholm" application and the SoundTouch speaker when adding a new Spotify account. This information is based on analysis of the Stockholm firmware version `27.0.13-4277-8963611`.
-
-## Flow Overview
-
-1.  **User Authorization Initiation**: The app opens the system browser to Spotify's authorization page.
-2.  **Redirect Handling**: After authorization, Spotify redirects back to the app via a custom URI scheme, delivering an authorization `code`.
-3.  **OAuth Token Exchange**: The app sends this `code` to the background worker, which exchanges it for a Bose-mediated token.
-4.  **Cloud Source Registration**: The app registers the Spotify account as a "source" in the user's Bose Cloud (Marge) profile.
-5.  **Local Device Sync**: The app notifies the local SoundTouch speaker about the new source, which then updates its internal configuration.
-
---
-
-## 0. User Authorization Initiation
-
-The process begins in the Stockholm UI when the user selects Spotify to add a new account.
-
-### Request Details (App to Browser)
- **Action**: Open System Browser
- **Base URL**: `[SPOTIFY_AUTH_URL]` (e.g., `https://accounts.spotify.com/authorize`)
- **Query Parameters**:
-    - `client_id`: Bose Spotify Client ID
-    - `response_type`: `code`
-    - `redirect_uri`: `http://localhost` (often used as a placeholder or specifically handled by the app's internal webview/proxy)
-    - `scope`: `user-read-private user-read-email ...`
-    - `state`: A base64-encoded JSON object containing metadata, e.g., `{"service": "SPOTIFY"}`.
-
-### Redirect (Browser to App)
-Upon successful login and authorization, Spotify redirects the browser to a URL that the SoundTouch app intercepts.
-
- **URL Format**: `soundtouch://bose/musicservice/spotify/login?code=[AUTH_CODE]&state=[STATE]`
- **App Action**: The `UIMain` component (in `ui_main.js`) handles this "deep link". It extracts the `code` from the query parameters and prepares to send it to the background worker.
-
---
-
-## 1. OAuth Token Exchange (Bose Cloud)
-
-After the UI intercepts the redirect and extracts the `code`, it sends a `createOAuthAccountRequest` to the background `SpotifyWorker`. The worker then performs the exchange for a Bose-mediated token.
-
-### What is a "Bose-mediated token"?
-The "Bose-mediated token" is a token issued by the Bose OAuth proxy. When the app (or device) requests a token via `oauth.streaming.bose.com`, Bose's service performs the actual OAuth2 exchange with Spotify.
-
- **It is not directly a Spotify refresh token**: Instead, it is a Bose-issued token that *represents* the underlying Spotify session.
- **Token Version 3**: Modern firmware uses `token_version_3`, which signifies that the device doesn't store the raw Spotify tokens but instead uses a Bose-specific "secret" that the Bose Cloud uses to fetch fresh Spotify access tokens on the device's behalf.
- **Access vs Refresh**: The initial response from the `.../token/cs` endpoint typically contains an `access_token` (valid for ~1 hour) and a `token_type: "Bearer"`. The Bose cloud service manages the persistent refresh token internally.
-
-### Internal Message (UI to Worker)
- **Message Type**: `createOAuthAccountRequest`
- **Payload**:
-    ```json
-    {
-      "source": "SPOTIFY",
-      "code": "[AUTH_CODE_FROM_REDIRECT]",
-      "credentialType": "token_version_3"
-    }
-    ```
-
-### Outgoing Request (Worker to Bose OAuth Proxy)
- **Endpoint**: `https://oauth.streaming.bose.com/oauth/account/[ACCOUNT_ID]/music/musicprovider/15/token/cs`
- **Method**: `POST`
- **Headers**:
-    - `Content-Type: application/json`
-    - `Accept: application/json`
-    - `Authorization: Bearer [SESSION_TOKEN]` (The user's Bose account session token)
-
-### Payload (JSON)
-```json
-{
-  "grant_type": "authorization_code",
-  "code": "[AUTH_CODE_FROM_SPOTIFY]",
-  "redirect_uri": "http://localhost"
-}
-```
-
-### curl Example
-```bash
-curl -X POST "https://oauth.streaming.bose.com/oauth/account/[ACCOUNT_ID]/music/musicprovider/15/token/cs" \
-     -H "Content-Type: application/json" \
-     -H "Authorization: Bearer [SESSION_TOKEN]" \
-     -d '{
-       "grant_type": "authorization_code",
-       "code": "[AUTH_CODE_FROM_SPOTIFY]",
-       "redirect_uri": "http://localhost"
-     }'
-```
-
---
-
-## 2. Cloud Source Registration (Marge)
-
-The app now registers the Spotify account with the Bose "Marge" service. This makes the source available across all devices linked to the same Bose account.
-
-### Request Details
- **Endpoint**: `https://streaming.bose.com/streaming/account/[ACCOUNT_ID]/source`
- **Method**: `POST`
- **Headers**:
-    - `Content-Type: application/vnd.bose.streaming-v1.1+xml`
-    - `Authorization: [MARGE_TOKEN]`
-    - `GUID: [DEVICE_GUID]`
-    - `ClientType: Stockholm`
-
-### Payload (XML)
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<source>
-    <username>[SPOTIFY_USER_ID]</username>
-    <sourceproviderid>15</sourceproviderid>
-    <credential type="token_version_3">[SECRET_TOKEN_OBTAINED_IN_STEP_1]</credential>
-    <sourcename>[DISPLAY_NAME_E_G_EMAIL]</sourcename>
-</source>
-```
-
-### curl Example
-```bash
-curl -X POST "https://streaming.bose.com/streaming/account/[ACCOUNT_ID]/source" \
-     -H "Content-Type: application/vnd.bose.streaming-v1.1+xml" \
-     -H "Authorization: [MARGE_TOKEN]" \
-     -d '<?xml version="1.0" encoding="UTF-8"?><source><username>[USER]</username><sourceproviderid>15</sourceproviderid><credential type="token_version_3">[TOKEN]</credential><sourcename>[NAME]</sourcename></source>'
-```
-
---
-
-### Local Device Sync (LISA API)
-
-The app notifies the physical SoundTouch speaker about the new source. This is usually done via the device's management API on port 8090.
-
-#### Modern Flow (OAuth)
- **Endpoint**: `http://[DEVICE_IP]:8090/setMusicServiceOAuthAccount`
- **Method**: `POST`
- **Payload**:
-```xml
-<OAuthCredentials source="SPOTIFY" displayName="[DISPLAY_NAME]">
-    <user>[SPOTIFY_USER_ID]</user>
-    <code>[AUTH_CODE_OR_TOKEN]</code>
-    <version>token_version_3</version>
-</OAuthCredentials>
-```
-
-#### Marge-Sync Notification (Fall-back)
-If the speaker returns `1029 UNKNOWN_ACTION_ERROR`, it signifies the LISA API version is too old for the OAuth flow. Stockholm-based firmware often expects the account to be registered in Marge first, followed by a notification to sync.
- **Endpoint**: `http://[DEVICE_IP]:8090/notification`
- **Method**: `POST`
- **Payload**:
-```xml
-<updates deviceID="[DEVICE_UID]">
-    <sourcesUpdated></sourcesUpdated>
-</updates>
-```
-
-#### Legacy Flow (Fall-back)
-For older firmware that doesn't use Marge for Spotify:
- **Endpoint**: `http://[DEVICE_IP]:8090/setMusicServiceAccount`
- **Method**: `POST`
- **Payload**:
-```xml
-<credentials source="SPOTIFY" displayName="Spotify Premium">
-    <user>[USER]</user>
-    <pass>[TOKEN]</pass>
-</credentials>
-```
-
---
-
-## Implementation in SoundTouch-Service
-
-This project implements the "Bose-mediated token" flow as follows:
-
-1.  **Surrogate Secrets**: When a user links their Spotify account via `soundtouch-service`, the service generates a 32-character hex string (a "Bose Secret").
-2.  **Marge & LISA registration**: This secret is sent to the speaker and stored in the emulated Marge cloud as the `credential`. The raw Spotify refresh token never leaves the server.
-3.  **Token Refresh Proxy**: When the speaker needs a fresh Spotify `access_token`, it calls the `soundtouch-service` proxy (`/oauth/device/.../token/cs3`) providing this secret. The server maps the secret back to the actual Spotify account, performs the refresh with Spotify, and returns a fresh short-lived `access_token` to the speaker.
-
---
-
-## Placeholders and Constants
-
-| Placeholder       | Description                                         |
-|:------------------|:----------------------------------------------------|
-| `[ACCOUNT_ID]`    | The internal Bose account ID (UUID).                |
-| `[SESSION_TOKEN]` | Temporary token from Bose login.                    |
-| `[MARGE_TOKEN]`   | Persistent authorization token for Marge services.  |
-| `[DEVICE_GUID]`   | Unique identifier for the controller app instance.  |
-| `[DEVICE_IP]`     | Local IP address of the SoundTouch speaker.         |
-| `15`              | Constant `sourceproviderid` for Spotify.            |
-| `token_version_3` | Credential type for modern OAuth2 Spotify accounts. |
-
---
-
-## Resulting Persistence
-
-Once these requests succeed, the device updates its `/mnt/nv/BoseApp-Persistence/1/Sources.xml` file:
-
-```xml
-<source displayName="user@example.com" secret="[SECRET_BLOB]" secretType="token_version_3">
-    <sourceKey type="SPOTIFY" account="user" />
-</source>
-```
@@ -1,8 +1,8 @@
 module navigation-station-demo

-go 1.26.2
+go 1.26.1

-require github.com/gesellix/bose-soundtouch v0.57.0
+require github.com/gesellix/bose-soundtouch v0.43.0

 require github.com/gorilla/websocket v1.5.3 // indirect

@@ -1,8 +1,8 @@
 module preset-management-example

-go 1.26.2
+go 1.26.1

-require github.com/gesellix/bose-soundtouch v0.57.0
+require github.com/gesellix/bose-soundtouch v0.43.0

 require github.com/gorilla/websocket v1.5.3 // indirect

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M101 600 L528 300 L101 1 L101 600 M610 600 L713 600 L713 1 L610 1 L610 600 M795 600 L897 600 L897 1 L795 1 L795 600 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M328 598 L770 299 L328 -1 L328 598 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M338 595 L766 295 L338 -4 L338 595 M659 295 L399 478 L399 113 L659 295 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M305 595 L407 595 L407 -3 L305 -3 L305 595 M590 595 L693 595 L693 -3 L590 -3 L590 595 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M358 600 L419 600 L419 2 L358 2 L358 600 M584 600 L645 600 L645 2 L584 2 L584 600 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M46 302 L487 601 L487 352 L853 601 L853 2 L487 251 L487 2 L46 302 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M59 295 L486 594 L486 337 L853 594 L853 -5 L486 253 L486 -5 L59 295 M425 477 L165 295 L425 112 L425 477 M792 477 L532 295 L792 112 L792 477 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M260 598 L363 598 L363 347 L731 598 L731 -1 L363 250 L363 -1 L260 -1 L260 598 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M284 597 L345 597 L345 340 L713 597 L713 -1 L345 257 L345 -1 L284 -1 L284 597 M652 480 L392 299 L652 116 L652 480 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M80 598 L182 598 L182 348 L551 598 L551 349 L918 598 L918 -0 L551 249 L551 -0 L182 250 L182 -0 L80 -0 L80 598 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M98 600 L159 600 L159 343 L527 600 L527 343 L895 600 L895 1 L527 259 L527 1 L159 260 L159 1 L98 1 L98 600 M466 483 L206 301 L466 119 L466 483 M834 483 L573 301 L834 119 L834 483 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M147 600 L514 351 L514 600 L956 301 L514 2 L514 251 L147 2 L147 600 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M145 594 L512 336 L512 594 L939 294 L512 -5 L512 252 L145 -5 L145 594 M466 294 L206 476 L206 112 L466 294 M833 294 L573 476 L573 112 L833 294 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M260 598 L629 347 L629 598 L731 598 L731 -1 L629 -1 L629 250 L260 -1 L260 598 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M284 597 L652 339 L652 597 L713 597 L713 -1 L652 -1 L652 256 L284 -1 L284 597 M605 298 L345 480 L345 116 L605 298 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M80 598 L447 349 L447 598 L815 348 L815 598 L918 598 L918 -0 L815 -0 L815 250 L447 -0 L447 248 L80 -0 L80 598 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M98 599 L465 342 L465 599 L833 341 L833 599 L894 599 L894 1 L833 1 L833 258 L465 1 L465 257 L98 1 L98 599 M419 300 L159 482 L159 118 L419 300 M786 300 L526 482 L526 118 L786 300 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M200 597 L798 597 L798 -2 L200 -2 L200 597 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M200 597 L798 597 L798 -2 L200 -2 L200 597 M737 59 L737 536 L260 536 L260 59 L737 59 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M155 178 L334 357 L377 314 L271 209 L614 209 Q658 209 695 231 Q732 253 754 290 Q776 327 776 371 Q776 415 754 452 Q732 489 695 511 Q658 533 614 533 L431 533 L431 594 L614 594 Q674 594 725 564 Q777 534 807 482 Q837 431 837 371 Q837 311 807 259 Q777 208 725 178 Q674 148 614 148 L272 148 L379 41 L336 -2 L155 178 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M466 140 L318 140 Q297 140 282 155 Q268 170 268 191 L268 402 Q268 423 282 437 Q297 452 317 452 L467 452 L664 651 L730 651 L730 -59 L664 -59 L466 140 M669 570 L510 410 L492 391 L329 391 L329 201 L492 201 L509 183 L669 23 L669 570 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M119 -31 L828 678 L871 635 L162 -74 L119 -31 M206 194 L206 405 Q206 426 220 440 Q235 455 256 455 L405 455 L602 654 L668 654 L668 638 L607 572 L430 394 L267 394 L267 204 L269 204 L222 157 Q206 171 206 194 M435 112 L478 155 L607 26 L607 285 L668 345 L668 -56 L602 -56 L435 112 " />
+  </g>
+</svg>
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -765 1000 924">
+  <g transform="scale(1, -1)">
+    <path d="M238 141 L90 141 Q69 141 54 156 Q39 171 39 191 L39 403 Q39 423 53 438 Q68 453 89 453 L238 453 L435 652 L501 652 L501 -58 L435 -58 L238 141 M440 570 L281 410 L264 392 L100 392 L100 202 L263 202 L440 24 L440 570 M784 272 L665 272 L665 333 L784 333 L784 446 L845 446 L845 333 L964 333 L964 272 L845 272 L845 147 L784 147 L784 272 " />
+  </g>
+</svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tobias Gesellchen	e424ee6546	Extract all icons, add mapping including names	2026-03-28 15:49:06 +01:00
Tobias Gesellchen	d9d9a67f0e	Add font-icon-extractor tool	2026-03-28 15:49:06 +01:00