Revert back to v1.0.15-beta.2

This reverts commit ba932ce. This reverts commit 2fe7690. This reverts commit f31a40e. This reverts commit 85e9592. This reverts commit 364ee0e.
RoyXiang · Nov 16, 2022 · 73711ac · 73711ac
1 parent ba932ce
commit 73711ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 65 deletions.
diff --git a/handler/const.go b/handler/const.go
@@ -5,8 +5,6 @@ import (
 )
 
 const (
-	domainPlexTv = "plex.tv"
-
 	headerPlexPrefix     = "X-Plex-"
 	headerCacheStatus    = "X-Plex-Cache-Status"
 	headerClientIdentity = "X-Plex-Client-Identifier"

diff --git a/handler/main.go b/handler/main.go
@@ -3,8 +3,6 @@ package handler
 import (
 	"log"
 	"net/http"
-	"net/http/httputil"
-	"net/url"
 	"os"
 
 	"github.com/go-chi/chi/v5/middleware"
@@ -23,7 +21,6 @@ var (
 func init() {
 	plexClient = NewPlexClient(PlexConfig{
 		BaseUrl:          os.Getenv("PLEX_BASEURL"),
-		SslHost:          os.Getenv("PLEX_SSL_HOST"),
 		Token:            os.Getenv("PLEX_TOKEN"),
 		PlaxtUrl:         os.Getenv("PLAXT_URL"),
 		RedirectWebApp:   os.Getenv("REDIRECT_WEB_APP"),
@@ -49,25 +46,14 @@ func NewRouter() http.Handler {
 	if !plexClient.NoRequestLogs {
 		r.Use(middleware.Logger)
 	}
+	r.Use(wrapMiddleware, middleware.Recoverer, trafficMiddleware)
 
-	plexTvUrl, _ := url.Parse("https://www." + domainPlexTv)
-	plexTvProxy := httputil.NewSingleHostReverseProxy(plexTvUrl)
-	plexTvRouter := r.Host(domainPlexTv).Subrouter()
-	updateRouter := plexTvRouter.Methods(http.MethodPost, http.MethodPut).Subrouter()
-	updateRouter.Use(plexTvMiddleware)
-	updateRouter.PathPrefix("/").Handler(plexTvProxy)
-	plexTvRouter.PathPrefix("/").Handler(plexTvProxy)
-
-	pmsRouter := r.MatcherFunc(func(r *http.Request, match *mux.RouteMatch) bool {
-		return r.Host != domainPlexTv
-	}).Subrouter()
-	pmsRouter.Use(wrapMiddleware, middleware.Recoverer, trafficMiddleware)
 	if redisClient != nil {
 		// bypass cache
-		pmsRouter.PathPrefix("/:/").Handler(plexClient)
-		pmsRouter.PathPrefix("/library/parts/").Handler(plexClient)
+		r.PathPrefix("/:/").Handler(plexClient)
+		r.PathPrefix("/library/parts/").Handler(plexClient)
 
-		staticRouter := pmsRouter.Methods(http.MethodGet).Subrouter()
+		staticRouter := r.Methods(http.MethodGet).Subrouter()
 		staticRouter.Use(staticMiddleware)
 		staticRouter.Path("/library/media/{key}/chapterImages/{id}").Handler(plexClient)
 		staticRouter.Path("/library/metadata/{key}/art/{id}").Handler(plexClient)
@@ -76,11 +62,11 @@ func NewRouter() http.Handler {
 		staticRouter.PathPrefix("/web/js/").Handler(plexClient)
 		staticRouter.PathPrefix("/web/static/").Handler(plexClient)
 
-		dynamicRouter := pmsRouter.Methods(http.MethodGet).Subrouter()
+		dynamicRouter := r.Methods(http.MethodGet).Subrouter()
 		dynamicRouter.Use(dynamicMiddleware)
 		dynamicRouter.PathPrefix("/").Handler(plexClient)
 	}
-	pmsRouter.PathPrefix("/").Handler(plexClient)
 
+	r.PathPrefix("/").Handler(plexClient)
 	return r
 }
diff --git a/handler/middleware.go b/handler/middleware.go
@@ -10,7 +10,6 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"path/filepath"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -22,47 +21,8 @@ var (
 	cacheInfoCtxKey = &ctxKeyType{"cacheInfo"}
 	tokenCtxKey     = &ctxKeyType{"token"}
 	userCtxKey      = &ctxKeyType{"user"}
-
-	reLocalAddresses = regexp.MustCompile(` localAddresses="[^"]*"`)
 )
 
-func plexTvMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if plexClient.sslHost == "" {
-			next.ServeHTTP(w, r)
-			return
-		}
-
-		var bodyBytes []byte
-		path := r.URL.EscapedPath()
-		query := r.URL.Query()
-		if r.Body != nil {
-			bodyBytes, _ = io.ReadAll(r.Body)
-			common.GetLogger().Printf("%s", string(bodyBytes))
-		}
-
-		switch path {
-		case "/servers.xml":
-			sslHost := fmt.Sprintf("address=\"%s\" scheme=\"https\"", plexClient.sslHost)
-			bodyBytes = bytes.ReplaceAll(bodyBytes, []byte("host=\"\""), []byte(sslHost))
-			bodyBytes = reLocalAddresses.ReplaceAll(bodyBytes, []byte(""))
-		default:
-			if strings.HasPrefix(path, "/devices/") {
-				name := "Connection[][uri]"
-				if query.Has(name) {
-					query.Set(name, "https://"+plexClient.sslHost)
-				}
-			}
-		}
-
-		nr := cloneRequest(r, r.Header, query)
-		if bodyBytes != nil {
-			nr.Body = io.NopCloser(bytes.NewReader(bodyBytes))
-		}
-		next.ServeHTTP(w, nr)
-	})
-}
-
 func normalizeMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		headers := http.Header{}

diff --git a/handler/plex.go b/handler/plex.go
@@ -21,7 +21,6 @@ import (
 
 type PlexConfig struct {
 	BaseUrl          string
-	SslHost          string
 	Token            string
 	PlaxtUrl         string
 	RedirectWebApp   string
@@ -33,7 +32,6 @@ type PlexClient struct {
 	proxy  *httputil.ReverseProxy
 	client *plex.Plex
 
-	sslHost          string
 	plaxtUrl         string
 	redirectWebApp   bool
 	disableTranscode bool
@@ -94,7 +92,6 @@ func NewPlexClient(config PlexConfig) *PlexClient {
 	return &PlexClient{
 		proxy:            proxy,
 		client:           client,
-		sslHost:          config.SslHost,
 		plaxtUrl:         plaxtUrl,
 		redirectWebApp:   redirectWebApp,
 		disableTranscode: disableTranscode,