music-assistant · marcelveldt · Mar 22, 2024 · Mar 22, 2024 · Mar 22, 2024
diff --git a/music_assistant/server/providers/snapcast/__init__.py b/music_assistant/server/providers/snapcast/__init__.py
@@ -3,11 +3,12 @@
 from __future__ import annotations
 
 import asyncio
+import pathlib
 import random
 import socket
 import time
 from contextlib import suppress
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Final, cast
 
 from snapcast.control import create_server
 from snapcast.control.client import Snapclient
@@ -60,6 +61,8 @@
 }
 DEFAULT_SNAPSERVER_PORT = 1705
 
+SNAPWEB_DIR: Final[pathlib.Path] = pathlib.Path(__file__).parent.resolve().joinpath("snapweb")
+
 
 async def setup(
     mass: MusicAssistant, manifest: ProviderManifest, config: ProviderConfig
@@ -136,9 +139,14 @@ def supported_features(self) -> tuple[ProviderFeature, ...]:
 
     async def handle_async_init(self) -> None:
         """Handle async initialization of the provider."""
-        self._snapcast_server_host = self.config.get_value(CONF_SERVER_HOST)
-        self._snapcast_server_control_port = self.config.get_value(CONF_SERVER_CONTROL_PORT)
         self._use_builtin_server = not self.config.get_value(CONF_USE_EXTERNAL_SERVER)
+        if self._use_builtin_server:
+            self._snapcast_server_host = "127.0.0.1"
+            self._snapcast_server_control_port = DEFAULT_SNAPSERVER_PORT
+        else:
+            self._snapcast_server_host = self.config.get_value(CONF_SERVER_HOST)
+            self._snapcast_server_control_port = self.config.get_value(CONF_SERVER_CONTROL_PORT)
+
         self._stream_tasks = {}
 
         if self._use_builtin_server:
@@ -174,10 +182,10 @@ async def unload(self) -> None:
         """Handle close/cleanup of the provider."""
         for client in self._snapserver.clients:
             await self.cmd_stop(client.identifier)
+        self._snapserver.stop()
         if self._snapserver_runner and not self._snapserver_runner.done():
             self._snapserver_runner.cancel()
-        await asyncio.sleep(6)  # prevent race conditions when reloading
-        self._snapserver.stop()
+        await asyncio.sleep(10)  # prevent race conditions when reloading
         self._snapserver_started.clear()
 
     def on_player_config_removed(self, player_id: str) -> None:
@@ -442,7 +450,7 @@ async def _builtin_server_runner(self) -> None:
                     properties={"is_mass": "true"},
                     addresses=[await get_ip_pton(self.mass.webserver.publish_ip)],
                     port=port,
-                    server=f"{socket.gethostname()}",
+                    server=f"{socket.gethostname()}.local",
                 )
                 attr_name = f"zc_service_set{name}"
                 if getattr(self, attr_name, None):
@@ -458,8 +466,19 @@ async def _builtin_server_runner(self) -> None:
                 self.logger.exception(
                     "Could not register mdns record for %s: %s", zeroconf_type, str(err)
                 )
+        args = [
+            "snapserver",
+            # config settings taken from
+            # https://raw.githubusercontent.com/badaix/snapcast/86cd4b2b63e750a72e0dfe6a46d47caf01426c8d/server/etc/snapserver.conf
+            f"--server.datadir={self.mass.storage_path}",
+            "--http.enabled=true",
+            "--http.port=1780",
+            f"--http.doc_root={SNAPWEB_DIR}",
+            "--tcp.enabled=true",
+            "--tcp.port=1705",
+        ]
         async with AsyncProcess(
-            ["snapserver"], enable_stdin=False, enable_stdout=True, enable_stderr=False
+            args, enable_stdin=False, enable_stdout=True, enable_stderr=False
         ) as snapserver_proc:
             # keep reading from stderr until exit
             async for data in snapserver_proc.iter_any():

diff --git a/music_assistant/server/providers/snapcast/snapweb/apple-touch-icon-180x180.png b/music_assistant/server/providers/snapcast/snapweb/apple-touch-icon-180x180.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/assets/10-seconds-of-silence-j39Pm5R-.mp3 b/music_assistant/server/providers/snapcast/snapweb/assets/10-seconds-of-silence-j39Pm5R-.mp3
diff --git a/music_assistant/server/providers/snapcast/snapweb/assets/index-BDBx6C_I.css b/music_assistant/server/providers/snapcast/snapweb/assets/index-BDBx6C_I.css
diff --git a/music_assistant/server/providers/snapcast/snapweb/assets/index-DDLZhQdU.js b/music_assistant/server/providers/snapcast/snapweb/assets/index-DDLZhQdU.js
diff --git a/music_assistant/server/providers/snapcast/snapweb/assets/logo192-wKJb_L8G.png b/music_assistant/server/providers/snapcast/snapweb/assets/logo192-wKJb_L8G.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/assets/snapcast-512-B1PzHP_P.png b/music_assistant/server/providers/snapcast/snapweb/assets/snapcast-512-B1PzHP_P.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/favicon.ico b/music_assistant/server/providers/snapcast/snapweb/favicon.ico
diff --git a/music_assistant/server/providers/snapcast/snapweb/index.html b/music_assistant/server/providers/snapcast/snapweb/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="/favicon.ico" sizes="48x48">
+  <link rel="icon" href="/logo.svg" sizes="any" type="image/svg+xml">
+  <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="theme-color" content="#000000" />
+  <meta name="author" content="Johannes M. Pohl" />
+  <meta name="description" content="Snapcast web client" />
+  <title>Snapweb</title>
+  <script type="module" crossorigin src="/assets/index-DDLZhQdU.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-BDBx6C_I.css">
+<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root"></div>
+</body>
+
+</html>
diff --git a/music_assistant/server/providers/snapcast/snapweb/logo.svg b/music_assistant/server/providers/snapcast/snapweb/logo.svg
diff --git a/music_assistant/server/providers/snapcast/snapweb/manifest.webmanifest b/music_assistant/server/providers/snapcast/snapweb/manifest.webmanifest
@@ -0,0 +1 @@
+{"name":"Snapweb - Snapcast web client","short_name":"Snapweb","start_url":"/","display":"standalone","background_color":"#ffffff","lang":"en","scope":"/","theme_color":"#ffffff","icons":[{"src":"pwa-64x64.png","sizes":"64x64","type":"image/png"},{"src":"pwa-192x192.png","sizes":"192x192","type":"image/png"},{"src":"pwa-512x512.png","sizes":"512x512","type":"image/png"},{"src":"maskable-icon-512x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"}]}
diff --git a/music_assistant/server/providers/snapcast/snapweb/maskable-icon-512x512.png b/music_assistant/server/providers/snapcast/snapweb/maskable-icon-512x512.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/pwa-192x192.png b/music_assistant/server/providers/snapcast/snapweb/pwa-192x192.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/pwa-512x512.png b/music_assistant/server/providers/snapcast/snapweb/pwa-512x512.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/pwa-64x64.png b/music_assistant/server/providers/snapcast/snapweb/pwa-64x64.png
diff --git a/music_assistant/server/providers/snapcast/snapweb/registerSW.js b/music_assistant/server/providers/snapcast/snapweb/registerSW.js
@@ -0,0 +1 @@
+if('serviceWorker' in navigator) {window.addEventListener('load', () => {navigator.serviceWorker.register('/sw.js', { scope: '/' })})}
diff --git a/music_assistant/server/providers/snapcast/snapweb/robots.txt b/music_assistant/server/providers/snapcast/snapweb/robots.txt
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
diff --git a/music_assistant/server/providers/snapcast/snapweb/sw.js b/music_assistant/server/providers/snapcast/snapweb/sw.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"Snapweb - Snapcast web client","short_name":"Snapweb","start_url":"/","display":"standalone","background_color":"#ffffff","lang":"en","scope":"/","theme_color":"#ffffff","icons":[{"src":"pwa-64x64.png","sizes":"64x64","type":"image/png"},{"src":"pwa-192x192.png","sizes":"192x192","type":"image/png"},{"src":"pwa-512x512.png","sizes":"512x512","type":"image/png"},{"src":"maskable-icon-512x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"}]}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		if('serviceWorker' in navigator) {window.addEventListener('load', () => {navigator.serviceWorker.register('/sw.js', { scope: '/' })})}