Fix #495: use custom user-agent instead of go-http-client

backend/app.go

@@ -66,7 +66,7 @@ func (a *App) VersionTag() string {
 	return a.appVersionTag
 }
 
-func StartupApp(appName, displayAppName, appVersionTag, latestReleaseURL string) (*App, error) {
+func StartupApp(appName, displayAppName, appVersion, appVersionTag, latestReleaseURL string) (*App, error) {
 	var confDir, cacheDir string
 	portableMode := false
 	if p := checkPortablePath(); p != "" {
@@ -118,7 +118,7 @@ func StartupApp(appName, displayAppName, appVersionTag, latestReleaseURL string)
 		return nil, err
 	}
 
-	a.ServerManager = NewServerManager(appName, a.Config, !portableMode /*use keyring*/)
+	a.ServerManager = NewServerManager(appName, appVersion, a.Config, !portableMode /*use keyring*/)
 	a.PlaybackManager = NewPlaybackManager(a.bgrndCtx, a.ServerManager, a.LocalPlayer, &a.Config.Scrobbling, &a.Config.Transcoding, &a.Config.Application)
 	a.ImageManager = NewImageManager(a.bgrndCtx, a.ServerManager, cacheDir)
 	a.Config.Application.MaxImageCacheSizeMB = clamp(a.Config.Application.MaxImageCacheSizeMB, 1, 500)

backend/servermanager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"errors"
+	"fmt"
 	"log"
 	"net/http"
 	"time"
@@ -26,6 +27,7 @@ type ServerManager struct {
 	useKeyring        bool
 	prefetchCoverCB   func(string)
 	appName           string
+	appVersion        string
 	config            *Config
 	onServerConnected []func()
 	onLogout          []func()
@@ -33,8 +35,13 @@ type ServerManager struct {
 
 var ErrUnreachable = errors.New("server is unreachable")
 
-func NewServerManager(appName string, config *Config, useKeyring bool) *ServerManager {
-	return &ServerManager{appName: appName, config: config, useKeyring: useKeyring}
+func NewServerManager(appName, appVersion string, config *Config, useKeyring bool) *ServerManager {
+	return &ServerManager{
+		appName:    appName,
+		appVersion: appVersion,
+		config:     config,
+		useKeyring: useKeyring,
+	}
 }
 
 func (s *ServerManager) SetPrefetchAlbumCoverCallback(cb func(string)) {
@@ -194,8 +201,10 @@ func (s *ServerManager) connect(connection ServerConnection, password string) (m
 			}
 		}
 	} else {
+		ua := fmt.Sprintf("%s/%s", s.appName, s.appVersion)
 		cli = &subsonicMP.SubsonicServer{
 			Client: subsonic.Client{
+				UserAgent:    ua,
 				Client:       &http.Client{Timeout: 10 * time.Second},
 				BaseUrl:      connection.Hostname,
 				User:         connection.Username,
@@ -206,6 +215,7 @@ func (s *ServerManager) connect(connection ServerConnection, password string) (m
 		s.checkSetInsecureSkipVerify(cli.(*subsonicMP.SubsonicServer).Client.Client)
 		altCli = &subsonicMP.SubsonicServer{
 			Client: subsonic.Client{
+				UserAgent:    ua,
 				Client:       &http.Client{Timeout: 10 * time.Second},
 				BaseUrl:      connection.AltHostname,
 				User:         connection.Username,