Add BaseURL configuration (fixes #103)

server/app/app.go

@@ -15,22 +15,23 @@ import (
 )
 
 type Router struct {
-	ds   model.DataStore
-	mux  http.Handler
-	path string
+	ds  model.DataStore
+	mux http.Handler
 }
 
-func New(ds model.DataStore, path string) *Router {
-	r := &Router{ds: ds, path: path}
-	r.mux = r.routes()
-	return r
+func New(ds model.DataStore) *Router {
+	return &Router{ds: ds}
+}
+
+func (app *Router) Setup(path string) {
+	app.mux = app.routes(path)
 }
 
 func (app *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	app.mux.ServeHTTP(w, r)
 }
 
-func (app *Router) routes() http.Handler {
+func (app *Router) routes(path string) http.Handler {
 	r := chi.NewRouter()
 
 	r.Post("/login", Login(app.ds))
@@ -52,7 +53,7 @@ func (app *Router) routes() http.Handler {
 
 	// Serve UI app assets
 	r.Handle("/", ServeIndex(app.ds))
-	r.Handle("/*", http.StripPrefix(app.path, http.FileServer(assets.AssetFile())))
+	r.Handle("/*", http.StripPrefix(path, http.FileServer(assets.AssetFile())))
 
 	return r
 }

server/app/serve_index.go

@@ -5,8 +5,10 @@ import (
 	"html/template"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"github.com/deluan/navidrome/assets"
+	"github.com/deluan/navidrome/conf"
 	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
@@ -31,6 +33,7 @@ func ServeIndex(ds model.DataStore) http.HandlerFunc {
 		t, _ = t.Parse(string(indexStr))
 		appConfig := map[string]interface{}{
 			"firstTime": firstTime,
+			"baseURL":   strings.TrimSuffix(conf.Server.BaseURL, "/"),
 		}
 		j, _ := json.Marshal(appConfig)
 		data := map[string]interface{}{

server/server.go

@@ -3,10 +3,12 @@ package server
 import (
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"time"
 
 	"github.com/deluan/navidrome/conf"
+	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
 	"github.com/deluan/navidrome/scanner"
@@ -15,6 +17,11 @@ import (
 	"github.com/go-chi/cors"
 )
 
+type Handler interface {
+	http.Handler
+	Setup(path string)
+}
+
 type Server struct {
 	Scanner *scanner.Scanner
 	router  *chi.Mux
@@ -29,11 +36,13 @@ func New(scanner *scanner.Scanner, ds model.DataStore) *Server {
 	return a
 }
 
-func (a *Server) MountRouter(path string, subRouter http.Handler) {
-	log.Info("Mounting routes", "path", path)
+func (a *Server) MountRouter(urlPath string, subRouter Handler) {
+	urlPath = path.Join(conf.Server.BaseURL, urlPath)
+	log.Info("Mounting routes", "path", urlPath)
+	subRouter.Setup(urlPath)
 	a.router.Group(func(r chi.Router) {
 		r.Use(RequestLogger)
-		r.Mount(path, subRouter)
+		r.Mount(urlPath, subRouter)
 	})
 }
 
@@ -53,8 +62,9 @@ func (a *Server) initRoutes() {
 	r.Use(middleware.Heartbeat("/ping"))
 	r.Use(InjectLogger)
 
+	indexHtml := path.Join(conf.Server.BaseURL, consts.URLPathUI, "index.html")
 	r.Get("/", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/app", 302)
+		http.Redirect(w, r, indexHtml, 302)
 	})
 
 	workDir, _ := os.Getwd()

server/subsonic/api.go

@@ -42,6 +42,8 @@ func New(browser engine.Browser, cover engine.Cover, listGenerator engine.ListGe
 	return r
 }
 
+func (api *Router) Setup(path string) {}
+
 func (api *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	api.mux.ServeHTTP(w, r)
 }